summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-07-22 06:14:55 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-07-22 06:14:55 +0000
commit5d7e1fcc62a7f9dd5441eaccbc274f9327efcf00 (patch)
tree59a6e5c3c090f1f83dfd20359ab321fb69713e00
parentc4e9058ee26841baae4c0fd51e081949747d5f48 (diff)
Cleanups and version bump
-rw-r--r--src/emu/bus/a1bus/a1bus.c3
-rw-r--r--src/emu/bus/a1bus/a1cassette.c3
-rw-r--r--src/emu/bus/a1bus/a1cffa.c5
-rw-r--r--src/emu/bus/a2bus/a2diskiing.c3
-rw-r--r--src/emu/bus/a2bus/a2dx1.c10
-rw-r--r--src/emu/bus/a2bus/a2mcms.c29
-rw-r--r--src/emu/bus/amiga/zorro/a2052.c4
-rw-r--r--src/emu/bus/amiga/zorro/a2232.c4
-rw-r--r--src/emu/bus/amiga/zorro/a590.c4
-rw-r--r--src/emu/bus/amiga/zorro/action_replay.c12
-rw-r--r--src/emu/bus/amiga/zorro/buddha.c4
-rw-r--r--src/emu/bus/amiga/zorro/cards.c2
-rw-r--r--src/emu/bus/amiga/zorro/zorro.c4
-rw-r--r--src/emu/bus/c64/ieee488.c2
-rw-r--r--src/emu/bus/c64/xl80.c10
-rw-r--r--src/emu/bus/comx35/clm.c8
-rw-r--r--src/emu/bus/cpc/cpc_pds.c2
-rw-r--r--src/emu/bus/cpc/cpc_rs232.c2
-rw-r--r--src/emu/bus/ecbbus/grip.c4
-rw-r--r--src/emu/bus/gameboy/gb_slot.c4
-rw-r--r--src/emu/bus/isa/aga.c24
-rw-r--r--src/emu/bus/isa/cga.c4
-rw-r--r--src/emu/bus/isa/mach32.c8
-rw-r--r--src/emu/bus/isa/mda.c4
-rw-r--r--src/emu/bus/isa/omti8621.c6
-rw-r--r--src/emu/bus/isa/p1_hdc.c2
-rw-r--r--src/emu/bus/isa/vga_ati.c4
-rw-r--r--src/emu/bus/msx_cart/arc.c1
-rw-r--r--src/emu/bus/msx_cart/ascii.c5
-rw-r--r--src/emu/bus/msx_cart/bm_012.c2
-rw-r--r--src/emu/bus/msx_cart/cartridge.c3
-rw-r--r--src/emu/bus/msx_cart/crossblaim.c1
-rw-r--r--src/emu/bus/msx_cart/dooly.c1
-rw-r--r--src/emu/bus/msx_cart/fmpac.c1
-rw-r--r--src/emu/bus/msx_cart/halnote.c1
-rw-r--r--src/emu/bus/msx_cart/hfox.c1
-rw-r--r--src/emu/bus/msx_cart/holy_quran.c1
-rw-r--r--src/emu/bus/msx_cart/konami.c9
-rw-r--r--src/emu/bus/msx_cart/korean.c1
-rw-r--r--src/emu/bus/msx_cart/majutsushi.c1
-rw-r--r--src/emu/bus/msx_cart/msx_audio.c5
-rw-r--r--src/emu/bus/msx_cart/msx_audio_kb.c2
-rw-r--r--src/emu/bus/msx_cart/msxdos2.c1
-rw-r--r--src/emu/bus/msx_cart/nomapper.c17
-rw-r--r--src/emu/bus/msx_cart/rtype.c1
-rw-r--r--src/emu/bus/msx_cart/super_swangi.c1
-rw-r--r--src/emu/bus/msx_cart/superloderunner.c1
-rw-r--r--src/emu/bus/msx_cart/yamaha.c21
-rw-r--r--src/emu/bus/msx_slot/bunsetsu.c1
-rw-r--r--src/emu/bus/msx_slot/cartridge.c12
-rw-r--r--src/emu/bus/msx_slot/disk.c6
-rw-r--r--src/emu/bus/msx_slot/fs4600.c1
-rw-r--r--src/emu/bus/msx_slot/music.c1
-rw-r--r--src/emu/bus/msx_slot/panasonic08.c1
-rw-r--r--src/emu/bus/msx_slot/ram.c1
-rw-r--r--src/emu/bus/msx_slot/ram_mm.c1
-rw-r--r--src/emu/bus/msx_slot/rom.c2
-rw-r--r--src/emu/bus/msx_slot/slot.c1
-rw-r--r--src/emu/bus/msx_slot/sony08.c1
-rw-r--r--src/emu/bus/neogeo/banked_cart.c7
-rw-r--r--src/emu/bus/neogeo/bootleg_cart.c2
-rw-r--r--src/emu/bus/neogeo/bootleg_prot.c3
-rw-r--r--src/emu/bus/neogeo/cmc_cart.c1
-rw-r--r--src/emu/bus/neogeo/cmc_prot.c2
-rw-r--r--src/emu/bus/neogeo/fatfury2_cart.c2
-rw-r--r--src/emu/bus/neogeo/fatfury2_prot.c1
-rw-r--r--src/emu/bus/neogeo/kof2002_cart.c1
-rw-r--r--src/emu/bus/neogeo/kof2002_prot.c3
-rw-r--r--src/emu/bus/neogeo/kof98_cart.c2
-rw-r--r--src/emu/bus/neogeo/kof98_prot.c3
-rw-r--r--src/emu/bus/neogeo/mslugx_cart.c2
-rw-r--r--src/emu/bus/neogeo/mslugx_prot.c5
-rw-r--r--src/emu/bus/neogeo/neogeo_carts.c20
-rw-r--r--src/emu/bus/neogeo/neogeo_intf.c1
-rw-r--r--src/emu/bus/neogeo/neogeo_slot.c14
-rw-r--r--src/emu/bus/neogeo/pcm2_cart.c2
-rw-r--r--src/emu/bus/neogeo/pcm2_prot.c1
-rw-r--r--src/emu/bus/neogeo/pvc_cart.c7
-rw-r--r--src/emu/bus/neogeo/pvc_prot.c3
-rw-r--r--src/emu/bus/neogeo/rom.c2
-rw-r--r--src/emu/bus/neogeo/sbp_prot.c3
-rw-r--r--src/emu/bus/neogeo/sma_cart.c2
-rw-r--r--src/emu/bus/neogeo/sma_prot.c3
-rw-r--r--src/emu/bus/nes/2a03pur.c40
-rw-r--r--src/emu/bus/plus4/c1551.c2
-rw-r--r--src/emu/bus/ql/cst_qdisc.c2
-rw-r--r--src/emu/bus/ql/cumana_fdi.c2
-rw-r--r--src/emu/bus/ql/qubide.c2
-rw-r--r--src/emu/bus/ql/rom.c2
-rw-r--r--src/emu/bus/ql/sandy_superdisk.c46
-rw-r--r--src/emu/bus/ql/sandy_superqboard.c48
-rw-r--r--src/emu/bus/ql/trumpcard.c24
-rw-r--r--src/emu/bus/scsi/scsi.c2
-rw-r--r--src/emu/bus/scsi/scsihle.c4
-rw-r--r--src/emu/bus/vtech/ioexp/carts.c2
-rw-r--r--src/emu/bus/vtech/ioexp/ioexp.c4
-rw-r--r--src/emu/bus/vtech/ioexp/joystick.c2
-rw-r--r--src/emu/bus/vtech/ioexp/printer.c6
-rw-r--r--src/emu/bus/vtech/memexp/carts.c2
-rw-r--r--src/emu/bus/vtech/memexp/floppy.c4
-rw-r--r--src/emu/bus/vtech/memexp/memexp.c4
-rw-r--r--src/emu/bus/vtech/memexp/memory.c2
-rw-r--r--src/emu/bus/vtech/memexp/rs232.c2
-rw-r--r--src/emu/bus/vtech/memexp/wordpro.c2
-rw-r--r--src/emu/bus/wangpc/lvc.c22
-rw-r--r--src/emu/bus/wangpc/mvc.c22
-rw-r--r--src/emu/clifront.c4
-rw-r--r--src/emu/cpu/alto2/alto2cpu.c2
-rw-r--r--src/emu/cpu/g65816/g65816.c34
-rw-r--r--src/emu/cpu/i86/i86.c8
-rw-r--r--src/emu/cpu/m6809/hd6309.c36
-rw-r--r--src/emu/cpu/m6809/konami.c3
-rw-r--r--src/emu/cpu/mb86233/mb86233.c2
-rw-r--r--src/emu/cpu/mb86235/mb86235.c1
-rw-r--r--src/emu/cpu/minx/minx.c1
-rw-r--r--src/emu/cpu/mips/mips3.c1
-rw-r--r--src/emu/cpu/mips/mips3drc.c1
-rw-r--r--src/emu/cpu/powerpc/ppccom.c5
-rw-r--r--src/emu/cpu/powerpc/ppcdrc.c1
-rw-r--r--src/emu/cpu/rsp/rsp.c16
-rw-r--r--src/emu/cpu/sh2/sh2.c21
-rw-r--r--src/emu/cpu/sh2/sh2comn.c1
-rw-r--r--src/emu/cpu/sh2/sh2drc.c1
-rw-r--r--src/emu/cpu/sh4/sh4.c3
-rw-r--r--src/emu/cpu/sh4/sh4dmac.c1
-rw-r--r--src/emu/cpu/tms34010/tms34010.c1
-rw-r--r--src/emu/cpu/tms57002/tms57002.c6
-rw-r--r--src/emu/cpu/tms7000/tms7000.c50
-rw-r--r--src/emu/cpu/z80/tmpz84c011.c2
-rw-r--r--src/emu/cpu/z80/tmpz84c015.c12
-rw-r--r--src/emu/emupal.c2
-rw-r--r--src/emu/image.c10
-rw-r--r--src/emu/imagedev/cassette.c2
-rw-r--r--src/emu/luaengine.c139
-rw-r--r--src/emu/machine.c2
-rw-r--r--src/emu/machine/53c810.c6
-rw-r--r--src/emu/machine/6532riot.c2
-rw-r--r--src/emu/machine/68307.c2
-rw-r--r--src/emu/machine/6840ptm.c4
-rw-r--r--src/emu/machine/aakart.c144
-rw-r--r--src/emu/machine/adc0808.c6
-rw-r--r--src/emu/machine/akiko.c12
-rw-r--r--src/emu/machine/amigafdc.c12
-rw-r--r--src/emu/machine/atahle.c20
-rw-r--r--src/emu/machine/autoconfig.c2
-rw-r--r--src/emu/machine/corvushd.c32
-rw-r--r--src/emu/machine/cr511b.c7
-rw-r--r--src/emu/machine/dmac.c1
-rw-r--r--src/emu/machine/eepromser.c44
-rw-r--r--src/emu/machine/gayle.c4
-rw-r--r--src/emu/machine/hd63450.c6
-rw-r--r--src/emu/machine/i8255.c4
-rw-r--r--src/emu/machine/i8271.c4
-rw-r--r--src/emu/machine/keyboard.c6
-rw-r--r--src/emu/machine/mb89363b.c80
-rw-r--r--src/emu/machine/mc68681.c13
-rw-r--r--src/emu/machine/ncr539x.c8
-rw-r--r--src/emu/machine/netlist.c8
-rw-r--r--src/emu/machine/roc10937.c12
-rw-r--r--src/emu/machine/upd765.c2
-rw-r--r--src/emu/machine/wd17xx.c6
-rw-r--r--src/emu/machine/wd7600.c6
-rw-r--r--src/emu/machine/wozfdc.c29
-rw-r--r--src/emu/machine/ym2148.c3
-rw-r--r--src/emu/machine/z80ctc.c4
-rw-r--r--src/emu/mame.c33
-rw-r--r--src/emu/memory.c1
-rw-r--r--src/emu/netlist/analog/nld_bjt.c12
-rw-r--r--src/emu/netlist/analog/nld_fourterm.c44
-rw-r--r--src/emu/netlist/analog/nld_opamps.c41
-rw-r--r--src/emu/netlist/analog/nld_solver.c402
-rw-r--r--src/emu/netlist/analog/nld_twoterm.c22
-rw-r--r--src/emu/netlist/devices/net_lib.c32
-rw-r--r--src/emu/netlist/devices/nld_4020.c129
-rw-r--r--src/emu/netlist/devices/nld_7400.c10
-rw-r--r--src/emu/netlist/devices/nld_74123.c147
-rw-r--r--src/emu/netlist/devices/nld_7474.c22
-rw-r--r--src/emu/netlist/devices/nld_7490.c8
-rw-r--r--src/emu/netlist/devices/nld_74ls629.c6
-rw-r--r--src/emu/netlist/devices/nld_9316.c10
-rw-r--r--src/emu/netlist/devices/nld_legacy.c12
-rw-r--r--src/emu/netlist/devices/nld_ne555.c6
-rw-r--r--src/emu/netlist/devices/nld_r2r_dac.c27
-rw-r--r--src/emu/netlist/devices/nld_system.c60
-rw-r--r--src/emu/netlist/nl_base.c232
-rw-r--r--src/emu/netlist/nl_parser.c2
-rw-r--r--src/emu/netlist/nl_setup.c36
-rw-r--r--src/emu/softlist.c2
-rw-r--r--src/emu/sound/2203intf.c2
-rw-r--r--src/emu/sound/2608intf.c2
-rw-r--r--src/emu/sound/2610intf.c2
-rw-r--r--src/emu/sound/ay8910.c100
-rw-r--r--src/emu/sound/es5506.c2
-rw-r--r--src/emu/sound/k053260.c3
-rw-r--r--src/emu/sound/k054539.c4
-rw-r--r--src/emu/sound/pokey.c2
-rw-r--r--src/emu/sound/rf5c68.c2
-rw-r--r--src/emu/video.c20
-rw-r--r--src/emu/video/crt9007.c4
-rw-r--r--src/emu/video/hd44780.c4
-rw-r--r--src/emu/video/i8275.c14
-rw-r--r--src/emu/video/mc6845.c32
-rw-r--r--src/emu/video/resnet.c8
-rw-r--r--src/emu/video/snes_ppu.c38
-rw-r--r--src/emu/video/tms3556.c264
-rw-r--r--src/emu/video/voodoo.c14
-rw-r--r--src/emu/webengine.c54
-rw-r--r--src/lib/formats/ap2_dsk.c32
-rw-r--r--src/lib/formats/msx_dsk.c1
-rw-r--r--src/lib/formats/oric_dsk.c4
-rw-r--r--src/lib/formats/rx50_dsk.c116
-rw-r--r--src/lib/lua/lapi.c1673
-rw-r--r--src/lib/lua/lauxlib.c1087
-rw-r--r--src/lib/lua/lbaselib.c579
-rw-r--r--src/lib/lua/lbitlib.c207
-rw-r--r--src/lib/lua/lcode.c1207
-rw-r--r--src/lib/lua/lcorolib.c193
-rw-r--r--src/lib/lua/lctype.c70
-rw-r--r--src/lib/lua/ldblib.c525
-rw-r--r--src/lib/lua/ldebug.c825
-rw-r--r--src/lib/lua/ldo.c930
-rw-r--r--src/lib/lua/ldump.c184
-rw-r--r--src/lib/lua/lfunc.c193
-rw-r--r--src/lib/lua/lgc.c1500
-rw-r--r--src/lib/lua/lib/lsqlite3.c2820
-rw-r--r--src/lib/lua/linit.c51
-rw-r--r--src/lib/lua/liolib.c745
-rw-r--r--src/lib/lua/llex.c721
-rw-r--r--src/lib/lua/lmathlib.c305
-rw-r--r--src/lib/lua/lmem.c77
-rw-r--r--src/lib/lua/loadlib.c761
-rw-r--r--src/lib/lua/lobject.c367
-rw-r--r--src/lib/lua/lopcodes.c165
-rw-r--r--src/lib/lua/loslib.c353
-rw-r--r--src/lib/lua/lparser.c2237
-rw-r--r--src/lib/lua/lstate.c356
-rw-r--r--src/lib/lua/lstring.c189
-rw-r--r--src/lib/lua/lstrlib.c1467
-rw-r--r--src/lib/lua/ltable.c720
-rw-r--r--src/lib/lua/ltablib.c377
-rw-r--r--src/lib/lua/ltm.c71
-rw-r--r--src/lib/lua/lua.c631
-rw-r--r--src/lib/lua/luac.c612
-rw-r--r--src/lib/lua/lundump.c306
-rw-r--r--src/lib/lua/lvm.c1419
-rw-r--r--src/lib/lua/lzio.c80
-rw-r--r--src/lib/sqlite3/shell.c6042
-rw-r--r--src/lib/util/corealloc.c2
-rw-r--r--src/lib/util/zippath.c4
-rw-r--r--src/lib/web/mongoose.c7088
-rw-r--r--src/mame/audio/cage.c3
-rw-r--r--src/mame/audio/cinemat.c4
-rw-r--r--src/mame/audio/dcs.c10
-rw-r--r--src/mame/audio/midway.c8
-rw-r--r--src/mame/drivers/1942.c28
-rw-r--r--src/mame/drivers/8080bw.c2
-rw-r--r--src/mame/drivers/88games.c12
-rw-r--r--src/mame/drivers/aces1.c22
-rw-r--r--src/mame/drivers/ajax.c12
-rw-r--r--src/mame/drivers/aliens.c14
-rw-r--r--src/mame/drivers/alpha68k.c4
-rw-r--r--src/mame/drivers/alvg.c2
-rw-r--r--src/mame/drivers/amaticmg.c2
-rw-r--r--src/mame/drivers/arachnid.c2
-rw-r--r--src/mame/drivers/astinvad.c6
-rw-r--r--src/mame/drivers/astrof.c2
-rw-r--r--src/mame/drivers/atari_s1.c4
-rw-r--r--src/mame/drivers/atarigt.c16
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/bagman.c2
-rw-r--r--src/mame/drivers/bfm_sc1.c42
-rw-r--r--src/mame/drivers/bfm_sc4.c35780
-rw-r--r--src/mame/drivers/bfm_sc45_helper.c79
-rw-r--r--src/mame/drivers/bfm_sc4h.c46
-rw-r--r--src/mame/drivers/blktiger.c4
-rw-r--r--src/mame/drivers/blockhl.c12
-rw-r--r--src/mame/drivers/bnstars.c4
-rw-r--r--src/mame/drivers/boogwing.c4
-rw-r--r--src/mame/drivers/bottom9.c2
-rw-r--r--src/mame/drivers/byvid.c4
-rw-r--r--src/mame/drivers/capcom.c4
-rw-r--r--src/mame/drivers/cave.c2
-rw-r--r--src/mame/drivers/chanbara.c4
-rw-r--r--src/mame/drivers/chihiro.c30
-rw-r--r--src/mame/drivers/chqflag.c12
-rw-r--r--src/mame/drivers/cliffhgr.c2
-rw-r--r--src/mame/drivers/cninja.c2
-rw-r--r--src/mame/drivers/cobra.c4
-rw-r--r--src/mame/drivers/cocoloco.c118
-rw-r--r--src/mame/drivers/coinmstr.c2
-rw-r--r--src/mame/drivers/coolridr.c2
-rw-r--r--src/mame/drivers/crimfght.c8
-rw-r--r--src/mame/drivers/csplayh5.c4
-rw-r--r--src/mame/drivers/cubo.c18
-rw-r--r--src/mame/drivers/darkseal.c2
-rw-r--r--src/mame/drivers/dassault.c2
-rw-r--r--src/mame/drivers/dbz.c2
-rw-r--r--src/mame/drivers/de_3.c2
-rw-r--r--src/mame/drivers/deco32.c8
-rw-r--r--src/mame/drivers/dreamwld.c2
-rw-r--r--src/mame/drivers/dwarfd.c4
-rw-r--r--src/mame/drivers/ecoinf2.c6
-rw-r--r--src/mame/drivers/ecoinf3.c8
-rw-r--r--src/mame/drivers/fireball.c169
-rw-r--r--src/mame/drivers/fortecar.c2
-rw-r--r--src/mame/drivers/funworld.c186
-rw-r--r--src/mame/drivers/g627.c14
-rw-r--r--src/mame/drivers/galaxold.c20
-rw-r--r--src/mame/drivers/gbusters.c12
-rw-r--r--src/mame/drivers/gcpinbal.c2
-rw-r--r--src/mame/drivers/ghosteo.c2
-rw-r--r--src/mame/drivers/goldstar.c376
-rw-r--r--src/mame/drivers/goodejan.c34
-rw-r--r--src/mame/drivers/gp_1.c2
-rw-r--r--src/mame/drivers/gstriker.c10
-rw-r--r--src/mame/drivers/gticlub.c8
-rw-r--r--src/mame/drivers/hornet.c20
-rw-r--r--src/mame/drivers/icecold.c6
-rw-r--r--src/mame/drivers/igs011.c2
-rw-r--r--src/mame/drivers/igs017.c2
-rw-r--r--src/mame/drivers/itech32.c2
-rw-r--r--src/mame/drivers/jpmmps.c4
-rw-r--r--src/mame/drivers/jpmsys5.c2
-rw-r--r--src/mame/drivers/kenseim.c42
-rw-r--r--src/mame/drivers/kingdrby.c2
-rw-r--r--src/mame/drivers/kingpin.c4
-rw-r--r--src/mame/drivers/lucky74.c2
-rw-r--r--src/mame/drivers/magicard.c2
-rw-r--r--src/mame/drivers/malzak.c4
-rw-r--r--src/mame/drivers/maygay1b.c24
-rw-r--r--src/mame/drivers/maygay1bsw.c2
-rw-r--r--src/mame/drivers/maygayv1.c12
-rw-r--r--src/mame/drivers/megaphx.c8
-rw-r--r--src/mame/drivers/meritm.c2
-rw-r--r--src/mame/drivers/metalmx.c2
-rw-r--r--src/mame/drivers/midas.c5
-rw-r--r--src/mame/drivers/midvunit.c10
-rw-r--r--src/mame/drivers/midxunit.c2
-rw-r--r--src/mame/drivers/midzeus.c16
-rw-r--r--src/mame/drivers/model2.c68
-rw-r--r--src/mame/drivers/mpu4hw.c4
-rw-r--r--src/mame/drivers/mpu4sw.c4
-rw-r--r--src/mame/drivers/mpu4vid.c14
-rw-r--r--src/mame/drivers/mrgame.c4
-rw-r--r--src/mame/drivers/mustache.c2
-rw-r--r--src/mame/drivers/mystwarr.c2
-rw-r--r--src/mame/drivers/naomi.c18
-rw-r--r--src/mame/drivers/naughtyb.c4
-rw-r--r--src/mame/drivers/nbmj9195.c11
-rw-r--r--src/mame/drivers/neogeo.c29
-rw-r--r--src/mame/drivers/neogeo_noslot.c7
-rw-r--r--src/mame/drivers/niyanpai.c2
-rw-r--r--src/mame/drivers/nl_pongd.c702
-rw-r--r--src/mame/drivers/norautp.c28
-rw-r--r--src/mame/drivers/nwk-tr.c14
-rw-r--r--src/mame/drivers/nyny.c2
-rw-r--r--src/mame/drivers/parodius.c4
-rw-r--r--src/mame/drivers/pcxt.c2
-rw-r--r--src/mame/drivers/pgm.c2
-rw-r--r--src/mame/drivers/phoenix.c4
-rw-r--r--src/mame/drivers/play_5.c4
-rw-r--r--src/mame/drivers/playmark.c36
-rw-r--r--src/mame/drivers/pong.c12
-rw-r--r--src/mame/drivers/popeye.c4
-rw-r--r--src/mame/drivers/proconn.c4
-rw-r--r--src/mame/drivers/quakeat.c1
-rw-r--r--src/mame/drivers/rastersp.c2
-rw-r--r--src/mame/drivers/re900.c2
-rw-r--r--src/mame/drivers/rohga.c6
-rw-r--r--src/mame/drivers/rollerg.c2
-rw-r--r--src/mame/drivers/rpunch.c4
-rw-r--r--src/mame/drivers/sam.c401
-rw-r--r--src/mame/drivers/sanremo.c2
-rw-r--r--src/mame/drivers/savquest.c2
-rw-r--r--src/mame/drivers/scramble.c4
-rw-r--r--src/mame/drivers/seattle.c18
-rw-r--r--src/mame/drivers/segas16b.c2
-rw-r--r--src/mame/drivers/segaxbd.c2
-rw-r--r--src/mame/drivers/sg1000a.c4
-rw-r--r--src/mame/drivers/simpl156.c2
-rw-r--r--src/mame/drivers/simpsons.c2
-rw-r--r--src/mame/drivers/skylncr.c62
-rw-r--r--src/mame/drivers/spy.c8
-rw-r--r--src/mame/drivers/statriv2.c4
-rw-r--r--src/mame/drivers/supercrd.c4
-rw-r--r--src/mame/drivers/surpratk.c2
-rw-r--r--src/mame/drivers/taito_b.c4
-rw-r--r--src/mame/drivers/taito_l.c2
-rw-r--r--src/mame/drivers/taitopjc.c44
-rw-r--r--src/mame/drivers/tapatune.c6
-rw-r--r--src/mame/drivers/tatsumi.c20
-rw-r--r--src/mame/drivers/tempest.c38
-rw-r--r--src/mame/drivers/thunderx.c16
-rw-r--r--src/mame/drivers/tigeroad.c12
-rw-r--r--src/mame/drivers/timeplt.c2
-rw-r--r--src/mame/drivers/triforce.c84
-rw-r--r--src/mame/drivers/turbo.c8
-rw-r--r--src/mame/drivers/vectrex.c10
-rw-r--r--src/mame/drivers/vegas.c28
-rw-r--r--src/mame/drivers/vroulet.c2
-rw-r--r--src/mame/drivers/williams.c2
-rw-r--r--src/mame/drivers/wpc_95.c2054
-rw-r--r--src/mame/drivers/wpc_dcs.c162
-rw-r--r--src/mame/drivers/wpc_s.c2020
-rw-r--r--src/mame/drivers/wyvernf0.c62
-rw-r--r--src/mame/drivers/zr107.c4
-rw-r--r--src/mame/machine/archimds.c12
-rw-r--r--src/mame/machine/balsente.c4
-rw-r--r--src/mame/machine/bfm_bd1.c2
-rw-r--r--src/mame/machine/fd1094.c216
-rw-r--r--src/mame/machine/midwayic.c26
-rw-r--r--src/mame/machine/ng_memcard.c12
-rw-r--r--src/mame/machine/pcshare.c2
-rw-r--r--src/mame/machine/tigeroad.c2
-rw-r--r--src/mame/machine/wpc_out.c2
-rw-r--r--src/mame/machine/wpc_pic.c2
-rw-r--r--src/mame/video/armedf.c4
-rw-r--r--src/mame/video/cps1.c132
-rw-r--r--src/mame/video/deco16ic.c2
-rw-r--r--src/mame/video/deco_zoomspr.c17
-rw-r--r--src/mame/video/decospr.c2
-rw-r--r--src/mame/video/dkong.c34
-rw-r--r--src/mame/video/excellent_spr.c10
-rw-r--r--src/mame/video/gaiden.c8
-rw-r--r--src/mame/video/galspnbl.c4
-rw-r--r--src/mame/video/gstriker.c4
-rw-r--r--src/mame/video/k001005.c30
-rw-r--r--src/mame/video/k001006.c3
-rw-r--r--src/mame/video/k051316.c14
-rw-r--r--src/mame/video/k051960.c10
-rw-r--r--src/mame/video/k052109.c10
-rw-r--r--src/mame/video/k053246_k053247_k055673.c27
-rw-r--r--src/mame/video/k053936.c2
-rw-r--r--src/mame/video/k054156_k054157_k056832.c3
-rw-r--r--src/mame/video/k054338.c6
-rw-r--r--src/mame/video/kaneko16.c20
-rw-r--r--src/mame/video/konamigx.c2
-rw-r--r--src/mame/video/mappy.c2
-rw-r--r--src/mame/video/mb60553.c9
-rw-r--r--src/mame/video/midzeus2.c1
-rw-r--r--src/mame/video/model3.c8
-rw-r--r--src/mame/video/namcos21.c22
-rw-r--r--src/mame/video/nemesis.c2
-rw-r--r--src/mame/video/neogeo.c7
-rw-r--r--src/mame/video/neogeo_spr.c32
-rw-r--r--src/mame/video/nitedrvr.c2
-rw-r--r--src/mame/video/nmk16.c2
-rw-r--r--src/mame/video/pc080sn.c2
-rw-r--r--src/mame/video/pc090oj.c2
-rw-r--r--src/mame/video/spbactn.c2
-rw-r--r--src/mame/video/tc0080vco.c2
-rw-r--r--src/mame/video/tc0100scn.c6
-rw-r--r--src/mame/video/tc0480scp.c6
-rw-r--r--src/mame/video/tecmo_mix.c21
-rw-r--r--src/mame/video/tecmo_spr.c40
-rw-r--r--src/mame/video/tetrisp2.c4
-rw-r--r--src/mame/video/vulgus.c6
-rw-r--r--src/mame/video/wpc_dmd.c2
-rw-r--r--src/mess/drivers/a2600.c2
-rw-r--r--src/mess/drivers/a310.c70
-rw-r--r--src/mess/drivers/a7800.c4
-rw-r--r--src/mess/drivers/abc1600.c2
-rw-r--r--src/mess/drivers/abc80x.c50
-rw-r--r--src/mess/drivers/ace.c2
-rw-r--r--src/mess/drivers/alphatro.c2
-rw-r--r--src/mess/drivers/altos5.c6
-rw-r--r--src/mess/drivers/amiga.c58
-rw-r--r--src/mess/drivers/ampro.c4
-rw-r--r--src/mess/drivers/amstrad.c4
-rw-r--r--src/mess/drivers/apf.c8
-rw-r--r--src/mess/drivers/apogee.c2
-rw-r--r--src/mess/drivers/apple2.c10
-rw-r--r--src/mess/drivers/applix.c2
-rw-r--r--src/mess/drivers/at.c4
-rw-r--r--src/mess/drivers/atom.c4
-rw-r--r--src/mess/drivers/bebox.c2
-rw-r--r--src/mess/drivers/bml3.c2
-rw-r--r--src/mess/drivers/bullet.c2
-rw-r--r--src/mess/drivers/c80.c2
-rw-r--r--src/mess/drivers/cc40.c28
-rw-r--r--src/mess/drivers/coco12.c2
-rw-r--r--src/mess/drivers/coco3.c2
-rw-r--r--src/mess/drivers/compis.c2
-rw-r--r--src/mess/drivers/crvision.c2
-rw-r--r--src/mess/drivers/cybiko.c6
-rw-r--r--src/mess/drivers/d6800.c2
-rw-r--r--src/mess/drivers/dragon.c2
-rw-r--r--src/mess/drivers/einstein.c2
-rw-r--r--src/mess/drivers/ep64.c2
-rw-r--r--src/mess/drivers/esq5505.c2
-rw-r--r--src/mess/drivers/exelv.c53
-rw-r--r--src/mess/drivers/fanucspmg.c38
-rw-r--r--src/mess/drivers/fb01.c3
-rw-r--r--src/mess/drivers/fc100.c2
-rw-r--r--src/mess/drivers/fmtowns.c4
-rw-r--r--src/mess/drivers/fp1100.c22
-rw-r--r--src/mess/drivers/galaxy.c8
-rw-r--r--src/mess/drivers/gimix.c14
-rw-r--r--src/mess/drivers/hprot1.c30
-rw-r--r--src/mess/drivers/interact.c2
-rw-r--r--src/mess/drivers/iq151.c2
-rw-r--r--src/mess/drivers/isbc.c6
-rw-r--r--src/mess/drivers/kim1.c2
-rw-r--r--src/mess/drivers/lviv.c2
-rw-r--r--src/mess/drivers/mac.c4
-rw-r--r--src/mess/drivers/mbc200.c12
-rw-r--r--src/mess/drivers/mbee.c4
-rw-r--r--src/mess/drivers/mc1000.c2
-rw-r--r--src/mess/drivers/mikro80.c2
-rw-r--r--src/mess/drivers/mikrosha.c2
-rw-r--r--src/mess/drivers/minicom.c90
-rw-r--r--src/mess/drivers/mmd1.c8
-rw-r--r--src/mess/drivers/ms0515.c12
-rw-r--r--src/mess/drivers/ms9540.c2
-rw-r--r--src/mess/drivers/msx.c42
-rw-r--r--src/mess/drivers/mtx.c2
-rw-r--r--src/mess/drivers/myb3k.c2
-rw-r--r--src/mess/drivers/mz2000.c2
-rw-r--r--src/mess/drivers/mz700.c2
-rw-r--r--src/mess/drivers/nascom1.c2
-rw-r--r--src/mess/drivers/nes.c2
-rw-r--r--src/mess/drivers/newbrain.c2
-rw-r--r--src/mess/drivers/next.c2
-rw-r--r--src/mess/drivers/ng_aes.c6
-rw-r--r--src/mess/drivers/ondra.c2
-rw-r--r--src/mess/drivers/orao.c2
-rw-r--r--src/mess/drivers/oric.c58
-rw-r--r--src/mess/drivers/orion.c6
-rw-r--r--src/mess/drivers/osbexec.c52
-rw-r--r--src/mess/drivers/osborne1.c52
-rw-r--r--src/mess/drivers/partner.c2
-rw-r--r--src/mess/drivers/pasopia7.c2
-rw-r--r--src/mess/drivers/pc1500.c4
-rw-r--r--src/mess/drivers/pc1512.c8
-rw-r--r--src/mess/drivers/pc8801.c2
-rw-r--r--src/mess/drivers/pcm.c2
-rw-r--r--src/mess/drivers/pecom.c2
-rw-r--r--src/mess/drivers/pet.c2
-rw-r--r--src/mess/drivers/phc25.c2
-rw-r--r--src/mess/drivers/poisk1.c12
-rw-r--r--src/mess/drivers/ptcsol.c4
-rw-r--r--src/mess/drivers/pve500.c16
-rw-r--r--src/mess/drivers/px4.c2
-rw-r--r--src/mess/drivers/pyl601.c4
-rw-r--r--src/mess/drivers/ql.c2
-rw-r--r--src/mess/drivers/qx10.c2
-rw-r--r--src/mess/drivers/radio86.c2
-rw-r--r--src/mess/drivers/rainbow.c202
-rw-r--r--src/mess/drivers/samcoupe.c2
-rw-r--r--src/mess/drivers/saturn.c2
-rw-r--r--src/mess/drivers/sdk85.c10
-rw-r--r--src/mess/drivers/sdk86.c8
-rw-r--r--src/mess/drivers/selz80.c8
-rw-r--r--src/mess/drivers/sg1000.c2
-rw-r--r--src/mess/drivers/sorcerer.c4
-rw-r--r--src/mess/drivers/special.c2
-rw-r--r--src/mess/drivers/spectrum.c2
-rw-r--r--src/mess/drivers/sun3.c58
-rw-r--r--src/mess/drivers/super80.c2
-rw-r--r--src/mess/drivers/svi318.c2
-rw-r--r--src/mess/drivers/tecnbras.c32
-rw-r--r--src/mess/drivers/ti630.c88
-rw-r--r--src/mess/drivers/tiki100.c2
-rw-r--r--src/mess/drivers/trs80.c2
-rw-r--r--src/mess/drivers/ut88.c4
-rw-r--r--src/mess/drivers/vt100.c2
-rw-r--r--src/mess/drivers/vtech1.c4
-rw-r--r--src/mess/drivers/wicat.c4
-rw-r--r--src/mess/drivers/x1.c8
-rw-r--r--src/mess/drivers/x1twin.c2
-rw-r--r--src/mess/drivers/x68k.c4
-rw-r--r--src/mess/drivers/xerox820.c2
-rw-r--r--src/mess/drivers/z9001.c2
-rw-r--r--src/mess/drivers/zorba.c4
-rw-r--r--src/mess/drivers/zx.c2
-rw-r--r--src/mess/machine/amstrad.c2
-rw-r--r--src/mess/machine/apollo.c28
-rw-r--r--src/mess/machine/apple1.c2
-rw-r--r--src/mess/machine/apple2.c4
-rw-r--r--src/mess/machine/apple3.c15
-rw-r--r--src/mess/machine/beta.c2
-rw-r--r--src/mess/machine/dec_lk201.c29
-rw-r--r--src/mess/machine/genpc.c2
-rw-r--r--src/mess/machine/hp48.c6
-rw-r--r--src/mess/machine/msx.c1
-rw-r--r--src/mess/machine/msx_matsushita.c1
-rw-r--r--src/mess/machine/msx_s1985.c1
-rw-r--r--src/mess/machine/msx_switched.c1
-rw-r--r--src/mess/machine/msx_systemflags.c1
-rw-r--r--src/mess/machine/nes.c2
-rw-r--r--src/mess/machine/radio86.c1
-rw-r--r--src/mess/machine/rmnimbus.c1
-rw-r--r--src/mess/machine/super80.c14
-rw-r--r--src/mess/tools/castool/main.c2
-rw-r--r--src/mess/tools/imgtool/modules/hp48.c721
-rw-r--r--src/mess/video/a7800.c18
-rw-r--r--src/mess/video/abc1600.c10
-rw-r--r--src/mess/video/abc806.c2
-rw-r--r--src/mess/video/bbc.c4
-rw-r--r--src/mess/video/k1ge.c4
-rw-r--r--src/mess/video/pc1512.c2
-rw-r--r--src/mess/video/pc_t1t.c4
-rw-r--r--src/mess/video/rmnimbus.c4
-rw-r--r--src/mess/video/vtvideo.c49
-rw-r--r--src/osd/modules/debugger/debugqt.c3
-rw-r--r--src/osd/modules/debugger/none.c1
-rw-r--r--src/osd/modules/sound/direct_sound.c1
-rw-r--r--src/osd/modules/sound/js_sound.c16
-rw-r--r--src/osd/modules/sound/none.c2
-rw-r--r--src/osd/osdepend.c50
-rw-r--r--src/osd/osdmini/minifile.c2
-rw-r--r--src/osd/sdl/drawogl.c26
-rw-r--r--src/osd/sdl/sdlmain.c1
-rw-r--r--src/osd/sdl/video.c4
-rw-r--r--src/osd/windows/output.c2
-rw-r--r--src/osd/windows/vconv.c2
-rw-r--r--src/osd/windows/winmain.c6
-rw-r--r--src/tools/chdman.c2
-rw-r--r--src/tools/nltool.c6
-rw-r--r--src/version.c2
620 files changed, 43577 insertions, 43809 deletions
diff --git a/src/emu/bus/a1bus/a1bus.c b/src/emu/bus/a1bus/a1bus.c
index 42e6ce69320..48c23fed772 100644
--- a/src/emu/bus/a1bus/a1bus.c
+++ b/src/emu/bus/a1bus/a1bus.c
@@ -4,7 +4,7 @@
license: BSD-3-Clause
copyright-holders: R. Belmont
-
+
***************************************************************************/
#include "emu.h"
@@ -203,4 +203,3 @@ void device_a1bus_card_interface::install_bank(offs_t start, offs_t end, offs_t
{
m_a1bus->install_bank(start, end, mask, mirror, tag, data);
}
-
diff --git a/src/emu/bus/a1bus/a1cassette.c b/src/emu/bus/a1bus/a1cassette.c
index 08f14adb1fa..97fedb05a76 100644
--- a/src/emu/bus/a1bus/a1cassette.c
+++ b/src/emu/bus/a1bus/a1cassette.c
@@ -3,7 +3,7 @@
a1cassette.c
Apple I Cassette Interface
-
+
*********************************************************************/
#include "a1cassette.h"
@@ -196,4 +196,3 @@ WRITE8_MEMBER(a1bus_cassette_device::cassette_w)
cassette_toggle_output();
}
-
diff --git a/src/emu/bus/a1bus/a1cffa.c b/src/emu/bus/a1bus/a1cffa.c
index 7c81992ace9..4417b4863de 100644
--- a/src/emu/bus/a1bus/a1cffa.c
+++ b/src/emu/bus/a1bus/a1cffa.c
@@ -2,8 +2,8 @@
a1cffa.c
- Rich Dreher's Compact Flash for Apple I
-
+ Rich Dreher's Compact Flash for Apple I
+
*********************************************************************/
#include "a1cffa.h"
@@ -153,4 +153,3 @@ WRITE8_MEMBER(a1bus_cffa_device::cffa_w)
}
}
-
diff --git a/src/emu/bus/a2bus/a2diskiing.c b/src/emu/bus/a2bus/a2diskiing.c
index 7f63f940d9c..71c6c19c622 100644
--- a/src/emu/bus/a2bus/a2diskiing.c
+++ b/src/emu/bus/a2bus/a2diskiing.c
@@ -21,7 +21,7 @@
const device_type A2BUS_DISKIING = &device_creator<a2bus_diskiing_device>;
-#define WOZFDC_TAG "wozfdc"
+#define WOZFDC_TAG "wozfdc"
#define DISKII_ROM_REGION "diskii_rom"
static SLOT_INTERFACE_START( a2_floppies )
@@ -120,4 +120,3 @@ UINT8 a2bus_diskiing_device::read_cnxx(address_space &space, UINT8 offset)
{
return m_rom[offset];
}
-
diff --git a/src/emu/bus/a2bus/a2dx1.c b/src/emu/bus/a2bus/a2dx1.c
index cb4b191e8c0..e3b4fcc3fc5 100644
--- a/src/emu/bus/a2bus/a2dx1.c
+++ b/src/emu/bus/a2bus/a2dx1.c
@@ -5,7 +5,7 @@
a2dx1.c
Implementation of the Decillionix DX-1 sampler card
-
+
*********************************************************************/
#include "a2dx1.h"
@@ -84,13 +84,13 @@ UINT8 a2bus_dx1_device::read_c0nx(address_space &space, UINT8 offset)
{
switch (offset)
{
- case 1: // ADC input
+ case 1: // ADC input
return 0;
case 3: // busy flag
- return 0x80; // indicate not busy
+ return 0x80; // indicate not busy
- case 7: // 1-bit ADC input (bit 7 of c0n1, probably)
+ case 7: // 1-bit ADC input (bit 7 of c0n1, probably)
return 0;
}
@@ -101,7 +101,7 @@ void a2bus_dx1_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data
{
switch (offset)
{
- case 5: // volume
+ case 5: // volume
m_volume = data;
m_dac->write_unsigned16(data*m_lastdac);
break;
diff --git a/src/emu/bus/a2bus/a2mcms.c b/src/emu/bus/a2bus/a2mcms.c
index 93188574af9..9b57980979d 100644
--- a/src/emu/bus/a2bus/a2mcms.c
+++ b/src/emu/bus/a2bus/a2mcms.c
@@ -7,7 +7,7 @@
Implementation of the Mountain Computer Music System.
This was sold standalone and also used as part of the alphaSyntauri
and SoundChaser systems.
-
+
*********************************************************************/
#include "a2mcms.h"
@@ -35,7 +35,7 @@ const device_type MCMS = &device_creator<mcms_device>;
const device_type A2BUS_MCMS1 = &device_creator<a2bus_mcms1_device>;
const device_type A2BUS_MCMS2 = &device_creator<a2bus_mcms2_device>;
-#define ENGINE_TAG "engine"
+#define ENGINE_TAG "engine"
#define MCFG_MCMS_IRQ_CALLBACK(_cb) \
devcb = &mcms_device::set_irq_cb(*device, DEVCB_##_cb);
@@ -109,7 +109,7 @@ UINT8 a2bus_mcms1_device::read_c0nx(address_space &space, UINT8 offset)
m_mcms->control_w(space, CTRL_IRQS, 1);
}
- return 0xff;
+ return 0xff;
}
// read at Cn00: light gun in bit 7, bits 0-5 = 'random' number
@@ -130,7 +130,7 @@ void a2bus_mcms1_device::write_cnxx(address_space &space, UINT8 offset, UINT8 da
mcms_device *a2bus_mcms1_device::get_engine(void)
{
return m_mcms;
-}
+}
WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w)
{
@@ -208,7 +208,7 @@ void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 da
/*
- Sound device implementation
+ Sound device implementation
*/
mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
@@ -257,13 +257,13 @@ void mcms_device::device_timer(emu_timer &timer, device_timer_id tid, int param,
{
if (tid == 0)
{
- m_write_irq(ASSERT_LINE);
+ m_write_irq(ASSERT_LINE);
// clear this IRQ in 10 cycles (?)
m_clrtimer->adjust(attotime::from_usec(10), 0);
}
else if (tid == 1)
{
- m_write_irq(CLEAR_LINE);
+ m_write_irq(CLEAR_LINE);
}
}
@@ -307,7 +307,7 @@ void mcms_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
}
else
{
- for (i = 0; i < samples; i++)
+ for (i = 0; i < samples; i++)
{
outL[i] = outR[i] = 0;
}
@@ -319,18 +319,18 @@ WRITE8_MEMBER(mcms_device::voiceregs_w)
m_stream->update();
if (offset >= 0x20)
{
- if (offset & 1) // amp
+ if (offset & 1) // amp
{
m_vols[(offset-0x21)/2] = data;
}
- else // wavetable page
+ else // wavetable page
{
m_table[(offset-0x20)/2] = data;
}
}
else
{
- if (offset & 1) // freq L
+ if (offset & 1) // freq L
{
if (offset == 0x1f)
{
@@ -344,7 +344,7 @@ WRITE8_MEMBER(mcms_device::voiceregs_w)
m_freq[reg] |= data;
}
}
- else // freq H
+ else // freq H
{
int reg = (offset/2);
m_freq[reg] &= 0x00ff;
@@ -369,12 +369,12 @@ WRITE8_MEMBER(mcms_device::control_w)
}
else
{
- m_timer->adjust(attotime::zero, 0, attotime::from_hz(125));
+ m_timer->adjust(attotime::zero, 0, attotime::from_hz(125));
}
break;
case CTRL_DMA:
- m_enabled = (data == 0) ? false : true;
+ m_enabled = (data == 0) ? false : true;
break;
case CTRL_MASTERVOL:
@@ -382,4 +382,3 @@ WRITE8_MEMBER(mcms_device::control_w)
break;
}
}
-
diff --git a/src/emu/bus/amiga/zorro/a2052.c b/src/emu/bus/amiga/zorro/a2052.c
index 0a65e831d6e..7ce9d1653d9 100644
--- a/src/emu/bus/amiga/zorro/a2052.c
+++ b/src/emu/bus/amiga/zorro/a2052.c
@@ -1,11 +1,11 @@
/***************************************************************************
- Commodore A2052
+ Commodore A2052
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Zorro-II RAM Expansion (0.5, 1 or 2 MB)
+ Zorro-II RAM Expansion (0.5, 1 or 2 MB)
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/a2232.c b/src/emu/bus/amiga/zorro/a2232.c
index 1d7e657e0d1..b1542d60bae 100644
--- a/src/emu/bus/amiga/zorro/a2232.c
+++ b/src/emu/bus/amiga/zorro/a2232.c
@@ -1,11 +1,11 @@
/***************************************************************************
- Commodore A2232
+ Commodore A2232
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Zorro-II Serial Card
+ Zorro-II Serial Card
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/a590.c b/src/emu/bus/amiga/zorro/a590.c
index bb207b02576..cfea3bd416a 100644
--- a/src/emu/bus/amiga/zorro/a590.c
+++ b/src/emu/bus/amiga/zorro/a590.c
@@ -1,11 +1,11 @@
/***************************************************************************
- Commodore A590 / A2091
+ Commodore A590 / A2091
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- DMAC based HD controller for the Amiga 500 and Zorro-II
+ DMAC based HD controller for the Amiga 500 and Zorro-II
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/action_replay.c b/src/emu/bus/amiga/zorro/action_replay.c
index 890e0081373..3baee614d25 100644
--- a/src/emu/bus/amiga/zorro/action_replay.c
+++ b/src/emu/bus/amiga/zorro/action_replay.c
@@ -1,17 +1,17 @@
/***************************************************************************
- Datel Action Replay
+ Datel Action Replay
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Freezer cartridge for Amiga 500 and Amiga 2000
+ Freezer cartridge for Amiga 500 and Amiga 2000
- Skeleton device, just loads the ROMs and generates the NMI
- for now.
+ Skeleton device, just loads the ROMs and generates the NMI
+ for now.
- Hardware notes:
- - http://www.mways.co.uk/amiga/howtocode/text/actionreplay.php
+ Hardware notes:
+ - http://www.mways.co.uk/amiga/howtocode/text/actionreplay.php
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/buddha.c b/src/emu/bus/amiga/zorro/buddha.c
index 98f49346481..22aa2bc819e 100644
--- a/src/emu/bus/amiga/zorro/buddha.c
+++ b/src/emu/bus/amiga/zorro/buddha.c
@@ -1,11 +1,11 @@
/***************************************************************************
- Buddha
+ Buddha
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Zorro-II IDE controller
+ Zorro-II IDE controller
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/cards.c b/src/emu/bus/amiga/zorro/cards.c
index ada1ae9ba37..fc1334d606a 100644
--- a/src/emu/bus/amiga/zorro/cards.c
+++ b/src/emu/bus/amiga/zorro/cards.c
@@ -1,6 +1,6 @@
/***************************************************************************
- Amiga Zorro Cards
+ Amiga Zorro Cards
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/zorro.c b/src/emu/bus/amiga/zorro/zorro.c
index 47c2db44dcd..661a507c233 100644
--- a/src/emu/bus/amiga/zorro/zorro.c
+++ b/src/emu/bus/amiga/zorro/zorro.c
@@ -1,11 +1,11 @@
/***************************************************************************
- Amiga Zorro Slots
+ Amiga Zorro Slots
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- 86-pin Expansion Slot (Zorro-I), Zorro-II, Zorro-III
+ 86-pin Expansion Slot (Zorro-I), Zorro-II, Zorro-III
***************************************************************************/
diff --git a/src/emu/bus/c64/ieee488.c b/src/emu/bus/c64/ieee488.c
index caba811afea..e5f1213a069 100644
--- a/src/emu/bus/c64/ieee488.c
+++ b/src/emu/bus/c64/ieee488.c
@@ -150,7 +150,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_ieee488 )
MCFG_TPI6525_OUT_PB_CB(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
MCFG_TPI6525_IN_PC_CB(READ8(c64_ieee488_device, tpi_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c64_ieee488_device, tpi_pc_w))
-
+
MCFG_CBM_IEEE488_ADD(NULL)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END
diff --git a/src/emu/bus/c64/xl80.c b/src/emu/bus/c64/xl80.c
index 4cf88e5df70..c1f7fe0f1dd 100644
--- a/src/emu/bus/c64/xl80.c
+++ b/src/emu/bus/c64/xl80.c
@@ -84,25 +84,25 @@ const rom_entry *c64_xl80_device::device_rom_region() const
MC6845_UPDATE_ROW( c64_xl80_device::crtc_update_row )
{
const pen_t *pen = m_palette->pens();
-
+
for (int column = 0; column < x_count; column++)
{
UINT8 code = m_ram[((ma + column) & 0x7ff)];
UINT16 addr = (code << 3) | (ra & 0x07);
UINT8 data = m_char_rom->base()[addr & 0x7ff];
-
+
if (column == cursor_x)
{
data = 0xff;
}
-
+
for (int bit = 0; bit < 8; bit++)
{
int x = (column * 8) + bit;
int color = BIT(data, 7) && de;
-
+
bitmap.pix32(vbp + y, hbp + x) = pen[color];
-
+
data <<= 1;
}
}
diff --git a/src/emu/bus/comx35/clm.c b/src/emu/bus/comx35/clm.c
index a0e5b3becdf..a29fecd698d 100644
--- a/src/emu/bus/comx35/clm.c
+++ b/src/emu/bus/comx35/clm.c
@@ -107,18 +107,18 @@ MC6845_UPDATE_ROW( comx_clm_device::crtc_update_row )
UINT8 code = m_video_ram[((ma + column) & 0x7ff)];
UINT16 addr = (code << 3) | (ra & 0x07);
UINT8 data = m_char_rom->base()[addr & 0x7ff];
-
+
if (BIT(ra, 3) && column == cursor_x)
{
data = 0xff;
}
-
+
for (int bit = 0; bit < 8; bit++)
{
int x = (column * 8) + bit;
-
+
bitmap.pix32(vbp + y, hbp + x) = m_palette->pen(BIT(data, 7) && de);
-
+
data <<= 1;
}
}
diff --git a/src/emu/bus/cpc/cpc_pds.c b/src/emu/bus/cpc/cpc_pds.c
index 6e2a4b14685..5cf78675728 100644
--- a/src/emu/bus/cpc/cpc_pds.c
+++ b/src/emu/bus/cpc/cpc_pds.c
@@ -17,7 +17,7 @@ const device_type CPC_PDS = &device_creator<cpc_pds_device>;
static MACHINE_CONFIG_FRAGMENT( cpc_pds )
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz) // no clock on the PCB, so will presume that it uses the CPC's clock
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz) // no clock on the PCB, so will presume that it uses the CPC's clock
// no pass-through seen on remake PCBs, unknown if actual hardware had a pass-through port or not
MACHINE_CONFIG_END
diff --git a/src/emu/bus/cpc/cpc_rs232.c b/src/emu/bus/cpc/cpc_rs232.c
index 26fd984b5e3..6708852d29c 100644
--- a/src/emu/bus/cpc/cpc_rs232.c
+++ b/src/emu/bus/cpc/cpc_rs232.c
@@ -33,7 +33,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_rs232 )
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart",z80dart_device,rxa_w))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("dart",z80dart_device,dcda_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart",z80dart_device,ctsa_w))
-// MCFG_RS232_RI_HANDLER(DEVWRITELINE("dart",z80dart_device,ria_w))
+// MCFG_RS232_RI_HANDLER(DEVWRITELINE("dart",z80dart_device,ria_w))
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
diff --git a/src/emu/bus/ecbbus/grip.c b/src/emu/bus/ecbbus/grip.c
index af28cbfa57b..3da3aa6f161 100644
--- a/src/emu/bus/ecbbus/grip.c
+++ b/src/emu/bus/ecbbus/grip.c
@@ -232,12 +232,12 @@ MC6845_UPDATE_ROW( grip_device::crtc_update_row )
{
UINT16 address = (m_page << 12) | (((ma + column) & 0xfff) << 3) | (ra & 0x07);
UINT8 data = m_video_ram[address];
-
+
for (int bit = 0; bit < 8; bit++)
{
int x = (column * 8) + bit;
int color = (m_flash ? 0 : BIT(data, bit)) && de;
-
+
bitmap.pix32(vbp + y, hbp + x) = m_palette->pen(color);
}
}
diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c
index 64d66006829..56d5fe64f2a 100644
--- a/src/emu/bus/gameboy/gb_slot.c
+++ b/src/emu/bus/gameboy/gb_slot.c
@@ -543,14 +543,14 @@ int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
if (count == 4876)
{
-// printf("Li Cheng %d\n", count);
+// printf("Li Cheng %d\n", count);
type = GB_MBC_LICHENG;
}
if (count == 4138 || count == 4125)
{
// Zhi Huan Wang uses 4138
// most sintax use 4125
-// printf("Sintax %d!\n", count);
+// printf("Sintax %d!\n", count);
type = GB_MBC_SINTAX;
}
}
diff --git a/src/emu/bus/isa/aga.c b/src/emu/bus/isa/aga.c
index fc8c49d9605..24525ce521a 100644
--- a/src/emu/bus/isa/aga.c
+++ b/src/emu/bus/isa/aga.c
@@ -306,7 +306,7 @@ machine_config_constructor isa8_aga_device::device_mconfig_additions() const
*************************************/
/* colors need fixing in the mda_text_* functions ! */
-MC6845_UPDATE_ROW( isa8_aga_device::mda_text_inten_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::mda_text_inten_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
UINT8 *videoram = m_videoram;
@@ -367,7 +367,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::mda_text_inten_update_row )
}
-MC6845_UPDATE_ROW( isa8_aga_device::mda_text_blink_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::mda_text_blink_update_row )
{
UINT8 *videoram = m_videoram;
const rgb_t *palette = m_palette->palette()->entry_list_raw();
@@ -429,7 +429,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::mda_text_blink_update_row )
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_update_row )
{
UINT8 *videoram = m_videoram;
const rgb_t *palette = m_palette->palette()->entry_list_raw();
@@ -460,7 +460,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_update_row )
}
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_alt_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_alt_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
UINT8 *videoram = m_videoram;
@@ -490,7 +490,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_alt_update_row )
}
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
UINT8 *videoram = m_videoram;
@@ -524,7 +524,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_update_row )
}
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_alt_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_alt_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
UINT8 *videoram = m_videoram;
@@ -560,7 +560,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_alt_update_row )
}
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bppl_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bppl_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
UINT8 *videoram = m_videoram;
@@ -586,7 +586,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bppl_update_row )
}
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bpph_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bpph_update_row )
{
UINT8 *videoram = m_videoram;
const rgb_t *palette = m_palette->palette()->entry_list_raw();
@@ -620,7 +620,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bpph_update_row )
}
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_2bpp_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_2bpp_update_row )
{
UINT8 *videoram = m_videoram;
const rgb_t *palette = m_palette->palette()->entry_list_raw();
@@ -646,7 +646,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_2bpp_update_row )
}
}
-MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_1bpp_update_row )
+MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_1bpp_update_row )
{
UINT8 *videoram = m_videoram;
const rgb_t *palette = m_palette->palette()->entry_list_raw();
@@ -723,7 +723,7 @@ WRITE8_MEMBER ( isa8_aga_device::pc_aga_mda_w )
case 8:
m_mda_mode_control = data;
- switch (m_mda_mode_control & 0x2a)
+ switch (m_mda_mode_control & 0x2a)
{
case 0x08:
m_update_row_type = MDA_TEXT_INTEN;
@@ -807,7 +807,7 @@ WRITE8_MEMBER (isa8_aga_device:: pc_aga_cga_w )
break;
case 8:
m_cga_mode_control = data;
-
+
//logerror("mode set to %02X\n", m_cga_mode_control & 0x3F );
switch ( m_cga_mode_control & 0x3F ) {
case 0x08: case 0x09: case 0x0C: case 0x0D:
diff --git a/src/emu/bus/isa/cga.c b/src/emu/bus/isa/cga.c
index aa205c53e48..0487f05753c 100644
--- a/src/emu/bus/isa/cga.c
+++ b/src/emu/bus/isa/cga.c
@@ -180,7 +180,7 @@ MC6845_UPDATE_ROW( isa8_cga_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case CGA_TEXT_INTEN:
@@ -221,7 +221,7 @@ MC6845_UPDATE_ROW( isa8_cga_pc1512_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case PC1512_GFX_4BPP:
diff --git a/src/emu/bus/isa/mach32.c b/src/emu/bus/isa/mach32.c
index b44949131d6..4f7496e7209 100644
--- a/src/emu/bus/isa/mach32.c
+++ b/src/emu/bus/isa/mach32.c
@@ -34,13 +34,13 @@ mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_t
// SVGA device
mach32_device::mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ati_vga_device(mconfig, ATIMACH32, "ATi mach32", tag, owner, clock, "mach32", __FILE__),
- m_8514a(*this,"8514a")
+ m_8514a(*this,"8514a")
{
}
mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source),
- m_8514a(*this,"8514a")
+ m_8514a(*this,"8514a")
{
}
@@ -98,13 +98,13 @@ mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_t
// SVGA device
mach64_device::mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mach32_device(mconfig, ATIMACH64, "ATi mach64", tag, owner, clock, "mach64", __FILE__),
- m_8514a(*this,"8514a")
+ m_8514a(*this,"8514a")
{
}
mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: mach32_device(mconfig, type, name, tag, owner, clock, shortname, source),
- m_8514a(*this,"8514a")
+ m_8514a(*this,"8514a")
{
}
diff --git a/src/emu/bus/isa/mda.c b/src/emu/bus/isa/mda.c
index dd96a7119fc..f15451b07c3 100644
--- a/src/emu/bus/isa/mda.c
+++ b/src/emu/bus/isa/mda.c
@@ -362,7 +362,7 @@ MC6845_UPDATE_ROW( isa8_mda_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case MDA_TEXT_INTEN:
@@ -379,7 +379,7 @@ MC6845_UPDATE_ROW( isa8_hercules_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case HERCULES_GFX_BLINK:
diff --git a/src/emu/bus/isa/omti8621.c b/src/emu/bus/isa/omti8621.c
index 5af63c70f9e..1e0e697e4d0 100644
--- a/src/emu/bus/isa/omti8621.c
+++ b/src/emu/bus/isa/omti8621.c
@@ -229,7 +229,7 @@ FLOPPY_FORMATS_END
// and a PC BIOS to make the card bootable on a PC.
// we have the Z8 program, we still need the PC BIOS.
ROM_START( omti8621 )
- ROM_REGION(0x4000, OMTI_CPU_REGION, 0) // disassembles fine as Z8 code
+ ROM_REGION(0x4000, OMTI_CPU_REGION, 0) // disassembles fine as Z8 code
ROM_LOAD( "omti_8621_102640-b.bin", 0x000000, 0x004000, CRC(e6f20dbb) SHA1(cf1990ad72eac6b296485410f5fa3309a0d6d078) )
ROM_REGION(0x1000, OMTI_BIOS_REGION, 0)
@@ -875,7 +875,7 @@ void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
set_data_transfer(disk->m_esdi_defect_list, sizeof(disk->m_esdi_defect_list));
break;
-#if 0 // this command seems unused by Domain/OS, and it's unclear what the intent of the code is (it makes some versions of GCC quite unhappy)
+#if 0 // this command seems unused by Domain/OS, and it's unclear what the intent of the code is (it makes some versions of GCC quite unhappy)
case OMTI_CMD_ASSIGN_ALTERNATE_TRACK: // 0x11
log_data();
alternate_track_address[0] = get_disk_track(cdb);
@@ -1212,7 +1212,7 @@ UINT32 omti8621_device::get_sector(INT32 diskaddr, UINT8 *data_buffer, UINT32 le
}
else
{
-// LOG1(("omti8621_get_sector %x on lun %d", diskaddr, lun));
+// LOG1(("omti8621_get_sector %x on lun %d", diskaddr, lun));
// restrict length to size of 1 sector (i.e. 1024 Byte)
length = length < OMTI_DISK_SECTOR_SIZE ? length : OMTI_DISK_SECTOR_SIZE;
diff --git a/src/emu/bus/isa/p1_hdc.c b/src/emu/bus/isa/p1_hdc.c
index 5c2011221a2..c8dd356c755 100644
--- a/src/emu/bus/isa/p1_hdc.c
+++ b/src/emu/bus/isa/p1_hdc.c
@@ -44,7 +44,7 @@ static MACHINE_CONFIG_FRAGMENT( hdc_b942 )
MCFG_WD2010_IN_WF_CB(VCC)
MCFG_WD2010_IN_TK000_CB(VCC)
MCFG_WD2010_IN_SC_CB(VCC)
-
+
MCFG_HARDDISK_ADD("hard0")
MCFG_HARDDISK_ADD("hard1")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/isa/vga_ati.c b/src/emu/bus/isa/vga_ati.c
index 55768d605be..356e5a1a728 100644
--- a/src/emu/bus/isa/vga_ati.c
+++ b/src/emu/bus/isa/vga_ati.c
@@ -7,8 +7,8 @@
* ATi Graphics Ultra Pro ISA Video card
* - ATi 68800-3 (Mach32, combined VGA and 8514/A)
*
- * ATi mach64 ISA Video card
- * - ATi 88800 (Mach64, combined VGA and 8514/A)
+ * ATi mach64 ISA Video card
+ * - ATi 88800 (Mach64, combined VGA and 8514/A)
*
* Created on: 9/09/2012
*/
diff --git a/src/emu/bus/msx_cart/arc.c b/src/emu/bus/msx_cart/arc.c
index 60d01ee6088..fae904f7f04 100644
--- a/src/emu/bus/msx_cart/arc.c
+++ b/src/emu/bus/msx_cart/arc.c
@@ -60,4 +60,3 @@ READ8_MEMBER(msx_cart_arc::io_7f_r)
{
return ((m_7f & 0x03) == 0x03) ? 0xda : 0xff;
}
-
diff --git a/src/emu/bus/msx_cart/ascii.c b/src/emu/bus/msx_cart/ascii.c
index fa8d7a51d12..202c9add301 100644
--- a/src/emu/bus/msx_cart/ascii.c
+++ b/src/emu/bus/msx_cart/ascii.c
@@ -136,7 +136,7 @@ void msx_cart_ascii16::initialize_cartridge()
UINT32 size = get_rom_size();
if ( size > 256 * 0x4000 )
- {
+ {
fatalerror("ascii16: ROM is too big\n");
}
@@ -371,7 +371,7 @@ void msx_cart_ascii16_sram::initialize_cartridge()
UINT32 size = get_rom_size();
if ( size > 128 * 0x4000 )
- {
+ {
fatalerror("ascii16_sram: ROM is too big\n");
}
@@ -439,4 +439,3 @@ WRITE8_MEMBER(msx_cart_ascii16_sram::write_cart)
}
}
}
-
diff --git a/src/emu/bus/msx_cart/bm_012.c b/src/emu/bus/msx_cart/bm_012.c
index 5108a59bdee..4e6a39a2de6 100644
--- a/src/emu/bus/msx_cart/bm_012.c
+++ b/src/emu/bus/msx_cart/bm_012.c
@@ -108,5 +108,3 @@ WRITE_LINE_MEMBER(msx_cart_bm_012::midi_in)
m_mdthru->write_txd(state);
m_tmpz84c015af->rxb_w(state);
}
-
-
diff --git a/src/emu/bus/msx_cart/cartridge.c b/src/emu/bus/msx_cart/cartridge.c
index ac4e014e3ca..40c83346f32 100644
--- a/src/emu/bus/msx_cart/cartridge.c
+++ b/src/emu/bus/msx_cart/cartridge.c
@@ -38,7 +38,7 @@ SLOT_INTERFACE_START(msx_cart)
SLOT_INTERFACE_INTERNAL("superloderunner", MSX_CART_SUPERLODERUNNER)
SLOT_INTERFACE_INTERNAL("synthesizer", MSX_CART_SYNTHESIZER)
SLOT_INTERFACE_INTERNAL("cross_blaim", MSX_CART_CROSSBLAIM)
-// SLOT_INTERFACE_INTERNAL("disk_rom", MSX_CART_DISK_ROM)
+// SLOT_INTERFACE_INTERNAL("disk_rom", MSX_CART_DISK_ROM)
SLOT_INTERFACE_INTERNAL("korean_80in1", MSX_CART_KOREAN_80IN1)
SLOT_INTERFACE_INTERNAL("korean_90in1", MSX_CART_KOREAN_90IN1)
SLOT_INTERFACE_INTERNAL("korean_126in1", MSX_CART_KOREAN_126IN1)
@@ -92,4 +92,3 @@ SLOT_INTERFACE_START(msx_yamaha_60pin)
SLOT_INTERFACE("sfg01", MSX_CART_SFG01)
SLOT_INTERFACE("sfg05", MSX_CART_SFG05)
SLOT_INTERFACE_END
-
diff --git a/src/emu/bus/msx_cart/crossblaim.c b/src/emu/bus/msx_cart/crossblaim.c
index 304364a84db..8ff864b8cf3 100644
--- a/src/emu/bus/msx_cart/crossblaim.c
+++ b/src/emu/bus/msx_cart/crossblaim.c
@@ -78,4 +78,3 @@ WRITE8_MEMBER(msx_cart_crossblaim::write_cart)
}
setup_bank();
}
-
diff --git a/src/emu/bus/msx_cart/dooly.c b/src/emu/bus/msx_cart/dooly.c
index d3e9e113aa7..b75a72856db 100644
--- a/src/emu/bus/msx_cart/dooly.c
+++ b/src/emu/bus/msx_cart/dooly.c
@@ -63,4 +63,3 @@ WRITE8_MEMBER(msx_cart_dooly::write_cart)
}
}
}
-
diff --git a/src/emu/bus/msx_cart/fmpac.c b/src/emu/bus/msx_cart/fmpac.c
index 62703094b22..6e135642fef 100644
--- a/src/emu/bus/msx_cart/fmpac.c
+++ b/src/emu/bus/msx_cart/fmpac.c
@@ -169,4 +169,3 @@ WRITE8_MEMBER(msx_cart_fmpac::write_ym2413)
m_ym2413->write(space, offset & 1, data);
}
}
-
diff --git a/src/emu/bus/msx_cart/halnote.c b/src/emu/bus/msx_cart/halnote.c
index ad7fbc32caf..570d4dae7c5 100644
--- a/src/emu/bus/msx_cart/halnote.c
+++ b/src/emu/bus/msx_cart/halnote.c
@@ -155,4 +155,3 @@ WRITE8_MEMBER(msx_cart_halnote::write_cart)
break;
}
}
-
diff --git a/src/emu/bus/msx_cart/hfox.c b/src/emu/bus/msx_cart/hfox.c
index 24ee0bcaa39..1ed6194f7d8 100644
--- a/src/emu/bus/msx_cart/hfox.c
+++ b/src/emu/bus/msx_cart/hfox.c
@@ -75,4 +75,3 @@ WRITE8_MEMBER(msx_cart_hfox::write_cart)
break;
}
}
-
diff --git a/src/emu/bus/msx_cart/holy_quran.c b/src/emu/bus/msx_cart/holy_quran.c
index 424cf3b5315..77c64c67ad8 100644
--- a/src/emu/bus/msx_cart/holy_quran.c
+++ b/src/emu/bus/msx_cart/holy_quran.c
@@ -115,4 +115,3 @@ WRITE8_MEMBER(msx_cart_holy_quran::write_cart)
break;
}
}
-
diff --git a/src/emu/bus/msx_cart/konami.c b/src/emu/bus/msx_cart/konami.c
index 55c217574f0..f8fe82d4ffb 100644
--- a/src/emu/bus/msx_cart/konami.c
+++ b/src/emu/bus/msx_cart/konami.c
@@ -712,17 +712,17 @@ WRITE8_MEMBER(msx_cart_konami_sound::write_cart)
}
switch (offset & 0x1800)
{
- case 0x1000: // 0x9000-0x97ff
+ case 0x1000: // 0x9000-0x97ff
m_selected_bank[2] = data;
m_scc_active = ( ( data & 0x3f ) == 0x3f );
setup_bank(2);
break;
- case 0x1800: // 0x9800-0x9fff
+ case 0x1800: // 0x9800-0x9fff
if ( m_scc_active )
{
offset &= 0xff;
-
+
if (offset < 0x80)
{
m_k052539->k051649_waveform_w(space, offset, data);
@@ -837,7 +837,7 @@ void msx_cart_konami_sound_snatcher::initialize_cartridge()
// The Snatcher Sound cartridge has 64KB RAM available by selecting ram banks 0-7
for (int i = 0; i < 8; i++)
- {
+ {
m_ram_bank[i] = get_ram_base() + i * 0x2000;
}
}
@@ -933,4 +933,3 @@ READ8_MEMBER(msx_cart_keyboard_master::io_00_r)
{
return m_vlm5030->bsy() ? 0x10 : 0x00;
}
-
diff --git a/src/emu/bus/msx_cart/korean.c b/src/emu/bus/msx_cart/korean.c
index a6688cb3340..228030ffc99 100644
--- a/src/emu/bus/msx_cart/korean.c
+++ b/src/emu/bus/msx_cart/korean.c
@@ -294,4 +294,3 @@ WRITE8_MEMBER(msx_cart_korean_126in1::write_cart)
setup_bank(bank);
}
}
-
diff --git a/src/emu/bus/msx_cart/majutsushi.c b/src/emu/bus/msx_cart/majutsushi.c
index a89ad1f2328..f0141948006 100644
--- a/src/emu/bus/msx_cart/majutsushi.c
+++ b/src/emu/bus/msx_cart/majutsushi.c
@@ -111,4 +111,3 @@ WRITE8_MEMBER(msx_cart_majutsushi::write_cart)
break;
}
}
-
diff --git a/src/emu/bus/msx_cart/msx_audio.c b/src/emu/bus/msx_cart/msx_audio.c
index c6fc781feb6..f70a903fbc2 100644
--- a/src/emu/bus/msx_cart/msx_audio.c
+++ b/src/emu/bus/msx_cart/msx_audio.c
@@ -180,9 +180,9 @@ WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205::irq_write)
{
// Trigger IRQ on the maincpu
// The 8950 seems to trigger an irq on reset, this causes an infinite loop of continuously triggering
- // the MSX's interrupt handler. The 8950 irq will never be cleared the nms1205's irq handler hook hasn't
+ // the MSX's interrupt handler. The 8950 irq will never be cleared the nms1205's irq handler hook hasn't
// been installed yet.
-// m_out_irq_cb(state);
+// m_out_irq_cb(state);
}
@@ -383,4 +383,3 @@ READ8_MEMBER(msx_cart_msx_audio_fsca1::y8950_io_r)
{
return m_io_config->read();
}
-
diff --git a/src/emu/bus/msx_cart/msx_audio_kb.c b/src/emu/bus/msx_cart/msx_audio_kb.c
index 565525fadc7..ccf03ae5c22 100644
--- a/src/emu/bus/msx_cart/msx_audio_kb.c
+++ b/src/emu/bus/msx_cart/msx_audio_kb.c
@@ -309,5 +309,3 @@ SLOT_INTERFACE_START( msx_audio_keyboards )
SLOT_INTERFACE("hxmu901", MSX_AUDIO_KB_HXMU901)
SLOT_INTERFACE("nms1160", MSX_AUDIO_KB_NMS1160)
SLOT_INTERFACE_END
-
-
diff --git a/src/emu/bus/msx_cart/msxdos2.c b/src/emu/bus/msx_cart/msxdos2.c
index 10af9d6de28..3a17d5ed7c7 100644
--- a/src/emu/bus/msx_cart/msxdos2.c
+++ b/src/emu/bus/msx_cart/msxdos2.c
@@ -63,4 +63,3 @@ WRITE8_MEMBER(msx_cart_msxdos2::write_cart)
restore_banks();
}
}
-
diff --git a/src/emu/bus/msx_cart/nomapper.c b/src/emu/bus/msx_cart/nomapper.c
index 9b88c4fcb2d..766cbba068f 100644
--- a/src/emu/bus/msx_cart/nomapper.c
+++ b/src/emu/bus/msx_cart/nomapper.c
@@ -25,14 +25,14 @@ void msx_cart_nomapper::initialize_cartridge()
// determine start address
// default to $4000
m_start_address = 0x4000;
-
+
switch (size)
{
/* 8KB/16KB */
case 0x2000: case 0x4000:
{
UINT16 start = rom[3] << 8 | rom[2];
-
+
// start address of $0000: call address in the $4000 region: $4000, else $8000
if (start == 0)
{
@@ -41,11 +41,11 @@ void msx_cart_nomapper::initialize_cartridge()
else
m_start_address = 0x8000;
}
-
+
// start address in the $8000 region: $8000, else default
else if ((start & 0xc000) == 0x8000)
m_start_address = 0x8000;
-
+
break;
}
@@ -55,12 +55,12 @@ void msx_cart_nomapper::initialize_cartridge()
if (rom[0] != 'A' && rom[1] != 'B' && rom[0x4000] == 'A' && rom[0x4001] == 'B')
{
UINT16 start = rom[0x4003] << 8 | rom[0x4002];
-
+
// start address of $0000 and call address in the $4000 region, or start address outside the $8000 region: $0000, else default
if ((start == 0 && (rom[0x4005] & 0xc0) == 0x40) || start < 0x8000 || start >= 0xc000)
m_start_address = 0;
}
-
+
break;
/* 48KB */
@@ -70,9 +70,9 @@ void msx_cart_nomapper::initialize_cartridge()
m_start_address = 0x4000;
else
m_start_address = 0;
-
+
break;
-
+
/* 64KB */
default:
m_start_address = 0;
@@ -90,4 +90,3 @@ READ8_MEMBER(msx_cart_nomapper::read_cart)
}
return 0xff;
}
-
diff --git a/src/emu/bus/msx_cart/rtype.c b/src/emu/bus/msx_cart/rtype.c
index 25c1ec18f89..9752746a180 100644
--- a/src/emu/bus/msx_cart/rtype.c
+++ b/src/emu/bus/msx_cart/rtype.c
@@ -74,4 +74,3 @@ WRITE8_MEMBER(msx_cart_rtype::write_cart)
m_bank_base[1] = get_rom_base() + m_selected_bank * 0x4000;
}
}
-
diff --git a/src/emu/bus/msx_cart/super_swangi.c b/src/emu/bus/msx_cart/super_swangi.c
index f3505f787fc..10c4d49f704 100644
--- a/src/emu/bus/msx_cart/super_swangi.c
+++ b/src/emu/bus/msx_cart/super_swangi.c
@@ -68,4 +68,3 @@ WRITE8_MEMBER(msx_cart_super_swangi::write_cart)
logerror("msx_cart_super_swangi: unhandled write %02x to %04x\n", data, offset);
}
}
-
diff --git a/src/emu/bus/msx_cart/superloderunner.c b/src/emu/bus/msx_cart/superloderunner.c
index 209f892310b..5449e1e8efd 100644
--- a/src/emu/bus/msx_cart/superloderunner.c
+++ b/src/emu/bus/msx_cart/superloderunner.c
@@ -58,4 +58,3 @@ WRITE8_MEMBER(msx_cart_superloderunner::banking)
m_selected_bank = data;
restore_banks();
}
-
diff --git a/src/emu/bus/msx_cart/yamaha.c b/src/emu/bus/msx_cart/yamaha.c
index f66ed7cd2c3..9a50f60f4fc 100644
--- a/src/emu/bus/msx_cart/yamaha.c
+++ b/src/emu/bus/msx_cart/yamaha.c
@@ -147,7 +147,7 @@ READ8_MEMBER(msx_cart_sfg::read_cart)
switch (offset & 0x3fff)
{
case 0x3ff0: // YM-2151 status read
- case 0x3ff1: // YM-2151 status read mirror?
+ case 0x3ff1: // YM-2151 status read mirror?
return m_ym2151->status_r(space, 0);
case 0x3ff2: // YM-2148 keyboard column read
@@ -155,8 +155,8 @@ READ8_MEMBER(msx_cart_sfg::read_cart)
case 0x3ff4: // YM-2148 --
case 0x3ff5: // YM-2148 MIDI UART data read register
case 0x3ff6: // YM-2148 MIDI UART status register
- // ------x- - 1 = received a byte/receive buffer full?
- // -------x - 1 = ready to send next byte/send buffer empty?
+ // ------x- - 1 = received a byte/receive buffer full?
+ // -------x - 1 = ready to send next byte/send buffer empty?
return m_ym2148->read(space, offset & 7);
}
@@ -186,13 +186,13 @@ WRITE8_MEMBER(msx_cart_sfg::write_cart)
case 0x3ff4: // YM-2148 External IRQ vector
case 0x3ff5: // YM-2148 MIDI UART data write register
case 0x3ff6: // YM-2148 MIDI UART command register
- // On startup the sfg01 writes 0x80
- // followed by 0x05.
- // Other write seen in the code: 0x15
- //
- // x------- - 1 = reset
- // -----x-- - 1 = enable receiving / sending midi data
- // -------x - 1 = enable receiving / sending midi data
+ // On startup the sfg01 writes 0x80
+ // followed by 0x05.
+ // Other write seen in the code: 0x15
+ //
+ // x------- - 1 = reset
+ // -----x-- - 1 = enable receiving / sending midi data
+ // -------x - 1 = enable receiving / sending midi data
m_ym2148->write(space, offset & 7, data);
break;
@@ -201,4 +201,3 @@ WRITE8_MEMBER(msx_cart_sfg::write_cart)
break;
}
}
-
diff --git a/src/emu/bus/msx_slot/bunsetsu.c b/src/emu/bus/msx_slot/bunsetsu.c
index 49d529bc003..ef5995ba7a3 100644
--- a/src/emu/bus/msx_slot/bunsetsu.c
+++ b/src/emu/bus/msx_slot/bunsetsu.c
@@ -74,4 +74,3 @@ WRITE8_MEMBER(msx_slot_bunsetsu_device::write)
break;
}
}
-
diff --git a/src/emu/bus/msx_slot/cartridge.c b/src/emu/bus/msx_slot/cartridge.c
index aa18ec651f6..e74f272145e 100644
--- a/src/emu/bus/msx_slot/cartridge.c
+++ b/src/emu/bus/msx_slot/cartridge.c
@@ -137,10 +137,10 @@ bool msx_slot_cartridge_device::call_load()
else
{
UINT32 length = this->length();
-
+
// determine how much space to allocate
UINT32 length_aligned = 0x10000;
-
+
if (length <= 0x2000)
length_aligned = 0x2000;
else if (length <= 0x4000)
@@ -165,7 +165,7 @@ bool msx_slot_cartridge_device::call_load()
return IMAGE_INIT_FAIL;
}
- // Check if there's some mapper related
+ // Check if there's some mapper related
astring extrainfo;
if (hashfile_extrainfo(*this, extrainfo))
{
@@ -349,7 +349,7 @@ READ8_MEMBER(msx_slot_cartridge_device::read)
{
return m_cartridge->read_cart(space, offset);
}
- return 0xFF;
+ return 0xFF;
}
@@ -365,7 +365,7 @@ WRITE8_MEMBER(msx_slot_cartridge_device::write)
msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : msx_slot_cartridge_device(mconfig, MSX_SLOT_YAMAHA_EXPANSION, "MSX Yamaha Expansion slot", tag, owner, clock, "msx_slot_yamaha_expansion", __FILE__)
+ : msx_slot_cartridge_device(mconfig, MSX_SLOT_YAMAHA_EXPANSION, "MSX Yamaha Expansion slot", tag, owner, clock, "msx_slot_yamaha_expansion", __FILE__)
{
}
@@ -379,5 +379,3 @@ void msx_slot_yamaha_expansion_device::device_start()
m_cartridge->set_out_irq_cb(DEVCB_WRITELINE(msx_slot_cartridge_device, irq_out));
}
}
-
-
diff --git a/src/emu/bus/msx_slot/disk.c b/src/emu/bus/msx_slot/disk.c
index c132a651cb9..5dcc137e880 100644
--- a/src/emu/bus/msx_slot/disk.c
+++ b/src/emu/bus/msx_slot/disk.c
@@ -421,7 +421,7 @@ WRITE8_MEMBER(msx_slot_disk2_device::write)
msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK3, "MSX Internal floppy type 3", tag, owner, clock, "msx_slot_disk3", __FILE__)
+ : msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK3, "MSX Internal floppy type 3", tag, owner, clock, "msx_slot_disk3", __FILE__)
{
}
@@ -459,7 +459,7 @@ READ8_MEMBER(msx_slot_disk3_device::read)
return m_fdc->fifo_r(space, 5);
}
- return msx_slot_rom_device::read(space, offset);
+ return msx_slot_rom_device::read(space, offset);
}
@@ -638,5 +638,3 @@ WRITE8_MEMBER(msx_slot_disk5_device::io_write)
break;
}
}
-
-
diff --git a/src/emu/bus/msx_slot/fs4600.c b/src/emu/bus/msx_slot/fs4600.c
index ee207c242e1..91c6db51fc4 100644
--- a/src/emu/bus/msx_slot/fs4600.c
+++ b/src/emu/bus/msx_slot/fs4600.c
@@ -159,4 +159,3 @@ WRITE8_MEMBER(msx_slot_fs4600_device::write)
}
}
}
-
diff --git a/src/emu/bus/msx_slot/music.c b/src/emu/bus/msx_slot/music.c
index 27ac4cf60a5..8cf61743850 100644
--- a/src/emu/bus/msx_slot/music.c
+++ b/src/emu/bus/msx_slot/music.c
@@ -45,4 +45,3 @@ WRITE8_MEMBER(msx_slot_music_device::write_ym2413)
{
m_ym2413->write(space, offset & 1, data);
}
-
diff --git a/src/emu/bus/msx_slot/panasonic08.c b/src/emu/bus/msx_slot/panasonic08.c
index 38f255d9978..67df2832734 100644
--- a/src/emu/bus/msx_slot/panasonic08.c
+++ b/src/emu/bus/msx_slot/panasonic08.c
@@ -178,4 +178,3 @@ WRITE8_MEMBER(msx_slot_panasonic08_device::write)
break;
}
}
-
diff --git a/src/emu/bus/msx_slot/ram.c b/src/emu/bus/msx_slot/ram.c
index f3a46daf8dc..57c8c7c15d0 100644
--- a/src/emu/bus/msx_slot/ram.c
+++ b/src/emu/bus/msx_slot/ram.c
@@ -33,4 +33,3 @@ WRITE8_MEMBER(msx_slot_ram_device::write)
m_ram[offset - m_start_address] = data;
}
}
-
diff --git a/src/emu/bus/msx_slot/ram_mm.c b/src/emu/bus/msx_slot/ram_mm.c
index 3c5bc7b47a1..2dc9c4c8e65 100644
--- a/src/emu/bus/msx_slot/ram_mm.c
+++ b/src/emu/bus/msx_slot/ram_mm.c
@@ -76,4 +76,3 @@ WRITE8_MEMBER(msx_slot_ram_mm_device::write_mapper_bank)
m_bank_selected[offset] = data;
m_bank_base[offset] = m_ram + 0x4000 * ( m_bank_selected[offset] & m_bank_mask );
}
-
diff --git a/src/emu/bus/msx_slot/rom.c b/src/emu/bus/msx_slot/rom.c
index fcae656ac41..6d480363c60 100644
--- a/src/emu/bus/msx_slot/rom.c
+++ b/src/emu/bus/msx_slot/rom.c
@@ -62,5 +62,3 @@ READ8_MEMBER(msx_slot_rom_device::read)
}
return 0xFF;
}
-
-
diff --git a/src/emu/bus/msx_slot/slot.c b/src/emu/bus/msx_slot/slot.c
index ad8b08634ec..22ef2bf6290 100644
--- a/src/emu/bus/msx_slot/slot.c
+++ b/src/emu/bus/msx_slot/slot.c
@@ -32,4 +32,3 @@ void msx_internal_slot_interface::set_size(device_t &device, UINT32 size)
dev.m_size = size;
dev.m_end_address = dev.m_start_address + dev.m_size;
}
-
diff --git a/src/emu/bus/msx_slot/sony08.c b/src/emu/bus/msx_slot/sony08.c
index 8a197e3d17f..f578263f762 100644
--- a/src/emu/bus/msx_slot/sony08.c
+++ b/src/emu/bus/msx_slot/sony08.c
@@ -186,4 +186,3 @@ WRITE8_MEMBER(msx_slot_sony08_device::write)
break;
}
}
-
diff --git a/src/emu/bus/neogeo/banked_cart.c b/src/emu/bus/neogeo/banked_cart.c
index 4728b7352e9..7908a2df418 100644
--- a/src/emu/bus/neogeo/banked_cart.c
+++ b/src/emu/bus/neogeo/banked_cart.c
@@ -47,14 +47,14 @@ void neogeo_banked_cart_device::_set_main_cpu_bank_address(void)
if (!m_bank_cartridge)
printf("bank_cartridge is null\n");
-
+
if (m_region && m_bank_cartridge) m_bank_cartridge->set_base(m_region + m_main_cpu_bank_address);
}
void neogeo_banked_cart_device::neogeo_set_main_cpu_bank_address( UINT32 bank_address )
{
-// if (LOG_MAIN_CPU_BANKING) logerror("MAIN CPU PC %06x: neogeo_set_main_cpu_bank_address %06x\n", m_maincpu->pc(), bank_address);
+// if (LOG_MAIN_CPU_BANKING) logerror("MAIN CPU PC %06x: neogeo_set_main_cpu_bank_address %06x\n", m_maincpu->pc(), bank_address);
m_main_cpu_bank_address = bank_address;
@@ -96,11 +96,10 @@ void neogeo_banked_cart_device::install_banks(running_machine& machine, cpu_devi
{
maincpu->space(AS_PROGRAM).install_read_bank(0x200000, 0x2fffff, 0, 0, "cartridge");
maincpu->space(AS_PROGRAM).install_write_handler(0x2ffff0, 0x2fffff, write16_delegate(FUNC(neogeo_banked_cart_device::main_cpu_bank_select_w),this));
-
+
m_bank_cartridge = machine.root_device().membank("cartridge");
m_region = region;
m_region_size = region_size;
init_banks();
}
-
diff --git a/src/emu/bus/neogeo/bootleg_cart.c b/src/emu/bus/neogeo/bootleg_cart.c
index 1481bee5a9f..c1bdb055543 100644
--- a/src/emu/bus/neogeo/bootleg_cart.c
+++ b/src/emu/bus/neogeo/bootleg_cart.c
@@ -361,5 +361,3 @@ void neogeo_bootleg_kog_cart::decrypt_all(DECRYPT_ALL_PARAMS)
m_bootleg_prot->neogeo_bootleg_sx_decrypt(fix_region, fix_region_size,1);
m_bootleg_prot->neogeo_bootleg_cx_decrypt(spr_region, spr_region_size);
}
-
-
diff --git a/src/emu/bus/neogeo/bootleg_prot.c b/src/emu/bus/neogeo/bootleg_prot.c
index 2650e74d153..648d0f9acbc 100644
--- a/src/emu/bus/neogeo/bootleg_prot.c
+++ b/src/emu/bus/neogeo/bootleg_prot.c
@@ -192,7 +192,7 @@ READ16_MEMBER( ngbootleg_prot_device::kof10th_RAMB_r )
READ16_MEMBER(ngbootleg_prot_device::kof10th_RAM2_r)
{
-// printf("kof10th_RAM2_r\n");
+// printf("kof10th_RAM2_r\n");
return m_cartridge_ram2[offset];
}
@@ -1128,4 +1128,3 @@ void ngbootleg_prot_device::matrimbl_decrypt(UINT8* sprrom, UINT32 sprrom_size,
/* decrypt gfx */
cthd2003_c(sprrom,sprrom_size, 0 );
}
-
diff --git a/src/emu/bus/neogeo/cmc_cart.c b/src/emu/bus/neogeo/cmc_cart.c
index 4d152550f90..43042474546 100644
--- a/src/emu/bus/neogeo/cmc_cart.c
+++ b/src/emu/bus/neogeo/cmc_cart.c
@@ -219,4 +219,3 @@ void neogeo_cmc_kof2000n_cart::decrypt_all(DECRYPT_ALL_PARAMS)
m_cmc_prot->neogeo_cmc50_m1_decrypt(audiocrypt_region, audiocrypt_region_size, audiocpu_region, audio_region_size);
m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, KOF2000_GFX_KEY);
}
-
diff --git a/src/emu/bus/neogeo/cmc_prot.c b/src/emu/bus/neogeo/cmc_prot.c
index 6b4491954a1..e07c894e983 100644
--- a/src/emu/bus/neogeo/cmc_prot.c
+++ b/src/emu/bus/neogeo/cmc_prot.c
@@ -15,7 +15,6 @@ cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag,
void cmc_prot_device::device_start()
{
-
}
void cmc_prot_device::device_reset()
@@ -786,4 +785,3 @@ void cmc_prot_device::neogeo_cmc50_m1_decrypt(UINT8* romcrypt, UINT32 romcrypt_s
}
#endif
}
-
diff --git a/src/emu/bus/neogeo/fatfury2_cart.c b/src/emu/bus/neogeo/fatfury2_cart.c
index 8fe63a05c90..4bb865281c4 100644
--- a/src/emu/bus/neogeo/fatfury2_cart.c
+++ b/src/emu/bus/neogeo/fatfury2_cart.c
@@ -70,4 +70,4 @@ void neogeo_fatfury2_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size);
m_fatfury2_prot->fatfury2_install_protection(maincpu, m_banked_cart);
-} \ No newline at end of file
+}
diff --git a/src/emu/bus/neogeo/fatfury2_prot.c b/src/emu/bus/neogeo/fatfury2_prot.c
index ce00e1d27e3..83ddf17aa43 100644
--- a/src/emu/bus/neogeo/fatfury2_prot.c
+++ b/src/emu/bus/neogeo/fatfury2_prot.c
@@ -106,4 +106,3 @@ void fatfury2_prot_device::fatfury2_install_protection(cpu_device* maincpu, neog
m_fatfury2_prot_data = 0;
}
-
diff --git a/src/emu/bus/neogeo/kof2002_cart.c b/src/emu/bus/neogeo/kof2002_cart.c
index 896bad5e45c..cb19f938ef8 100644
--- a/src/emu/bus/neogeo/kof2002_cart.c
+++ b/src/emu/bus/neogeo/kof2002_cart.c
@@ -153,4 +153,3 @@ void neogeo_kof2002_samsho5sp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, SAMSHO5SP_GFX_KEY);
m_pcm2_prot->neo_pcm2_swap(ym_region, ym_region_size, 6);
}
-
diff --git a/src/emu/bus/neogeo/kof2002_prot.c b/src/emu/bus/neogeo/kof2002_prot.c
index 2e3b0e314c7..6e4b05eb834 100644
--- a/src/emu/bus/neogeo/kof2002_prot.c
+++ b/src/emu/bus/neogeo/kof2002_prot.c
@@ -15,7 +15,6 @@ kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const ch
void kof2002_prot_device::device_start()
{
-
}
void kof2002_prot_device::device_reset()
@@ -80,5 +79,3 @@ void kof2002_prot_device::samsh5sp_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size
memcpy( src+i*0x80000, dst+sec[i], 0x80000 );
}
}
-
-
diff --git a/src/emu/bus/neogeo/kof98_cart.c b/src/emu/bus/neogeo/kof98_cart.c
index 9c37fc3e64e..5af4977a000 100644
--- a/src/emu/bus/neogeo/kof98_cart.c
+++ b/src/emu/bus/neogeo/kof98_cart.c
@@ -75,4 +75,4 @@ void neogeo_kof98_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size);
m_kof98_prot->install_kof98_protection(maincpu);
-} \ No newline at end of file
+}
diff --git a/src/emu/bus/neogeo/kof98_prot.c b/src/emu/bus/neogeo/kof98_prot.c
index 453abeadb07..8ccabc75721 100644
--- a/src/emu/bus/neogeo/kof98_prot.c
+++ b/src/emu/bus/neogeo/kof98_prot.c
@@ -16,7 +16,6 @@ kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *
void kof98_prot_device::device_start()
{
-
}
void kof98_prot_device::device_reset()
@@ -137,5 +136,3 @@ void kof98_prot_device::install_kof98_protection(cpu_device* maincpu)
maincpu->space(AS_PROGRAM).install_write_handler(0x20aaaa, 0x20aaab, write16_delegate(FUNC(kof98_prot_device::kof98_prot_w),this));
}
-
-
diff --git a/src/emu/bus/neogeo/mslugx_cart.c b/src/emu/bus/neogeo/mslugx_cart.c
index 99467ca0d9c..bd9d7a2a9d1 100644
--- a/src/emu/bus/neogeo/mslugx_cart.c
+++ b/src/emu/bus/neogeo/mslugx_cart.c
@@ -70,4 +70,4 @@ void neogeo_mslugx_cart::activate_cart(ACTIVATE_CART_PARAMS)
{
m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size);
m_mslugx_prot->mslugx_install_protection(maincpu);
-} \ No newline at end of file
+}
diff --git a/src/emu/bus/neogeo/mslugx_prot.c b/src/emu/bus/neogeo/mslugx_prot.c
index 3db2f85e2c4..7263c8f988e 100644
--- a/src/emu/bus/neogeo/mslugx_prot.c
+++ b/src/emu/bus/neogeo/mslugx_prot.c
@@ -91,8 +91,3 @@ void mslugx_prot_device::mslugx_install_protection(cpu_device* maincpu)
maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2fffe0, 0x2fffef, read16_delegate(FUNC(mslugx_prot_device::mslugx_protection_16_r),this), write16_delegate(FUNC(mslugx_prot_device::mslugx_protection_16_w),this));
}
-
-
-
-
-
diff --git a/src/emu/bus/neogeo/neogeo_carts.c b/src/emu/bus/neogeo/neogeo_carts.c
index 3d75a6eb55e..1a9cdbb402f 100644
--- a/src/emu/bus/neogeo/neogeo_carts.c
+++ b/src/emu/bus/neogeo/neogeo_carts.c
@@ -36,25 +36,25 @@ SLOT_INTERFACE_START(neogeo_cart)
/* only CMC50 for gfx (& audiocpu) */
SLOT_INTERFACE_INTERNAL("r_cmc_kof2001", NEOGEO_CMC_KOF2001_CART)
SLOT_INTERFACE_INTERNAL("r_cmc_kof2000n", NEOGEO_CMC_KOF2000N_CART)
- /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble */
+ /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble */
SLOT_INTERFACE_INTERNAL("r_pc2_mslug4", NEOGEO_PCM2_MSLUG4_CART)
SLOT_INTERFACE_INTERNAL("r_pc2_rotd", NEOGEO_PCM2_ROTD_CART)
SLOT_INTERFACE_INTERNAL("r_pc2_pnyaa", NEOGEO_PCM2_PNYAA_CART)
SLOT_INTERFACE_INTERNAL("r_ms4plus", NEOGEO_PCM2_MS4PLUS_CART) // regular encryption but external S1 rom
- /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + additonal prg scramble */
+ /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + additonal prg scramble */
SLOT_INTERFACE_INTERNAL("r_k2_kof2002", NEOGEO_KOF2002_KOF2002_CART)
SLOT_INTERFACE_INTERNAL("r_k2_matrim", NEOGEO_KOF2002_MATRIM_CART)
SLOT_INTERFACE_INTERNAL("r_k2_samsh5", NEOGEO_KOF2002_SAMSHO5_CART)
SLOT_INTERFACE_INTERNAL("r_k2_sams5s", NEOGEO_KOF2002_SAMSHO5SP_CART)
SLOT_INTERFACE_INTERNAL("r_kf2k2pls", NEOGEO_KOF2002_KF2K2PLS_CART) // regular encryption but external S1 rom
- /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + PVC protection/encryption */
+ /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + PVC protection/encryption */
SLOT_INTERFACE_INTERNAL("r_pv_mslug5", NEOGEO_PVC_MSLUG5_CART)
SLOT_INTERFACE_INTERNAL("r_pv_svc", NEOGEO_PVC_SVC_CART)
SLOT_INTERFACE_INTERNAL("r_pv_kf2k3", NEOGEO_PVC_KOF2003_CART)
SLOT_INTERFACE_INTERNAL("r_pv_kf2k3h", NEOGEO_PVC_KOF2003H_CART)
-
+
/* 100% bootleg logic */
SLOT_INTERFACE_INTERNAL("r_garoubl", NEOGEO_BOOTLEG_GAROUBL_CART)
SLOT_INTERFACE_INTERNAL("r_cthd2003", NEOGEO_BOOTLEG_CTHD2003_CART)
@@ -85,11 +85,11 @@ SLOT_INTERFACE_START(neogeo_cart)
SLOT_INTERFACE_INTERNAL("r_kf2k3bl", NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART)
SLOT_INTERFACE_INTERNAL("r_kf2k3pl", NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART)
SLOT_INTERFACE_INTERNAL("r_kf2k3upl", NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART)
-
-
-
-
-
-
+
+
+
+
+
+
SLOT_INTERFACE_END
diff --git a/src/emu/bus/neogeo/neogeo_intf.c b/src/emu/bus/neogeo/neogeo_intf.c
index cd8e0a29c88..223158242d0 100644
--- a/src/emu/bus/neogeo/neogeo_intf.c
+++ b/src/emu/bus/neogeo/neogeo_intf.c
@@ -29,4 +29,3 @@ device_neogeo_cart_interface::device_neogeo_cart_interface(const machine_config
device_neogeo_cart_interface::~device_neogeo_cart_interface()
{
}
-
diff --git a/src/emu/bus/neogeo/neogeo_slot.c b/src/emu/bus/neogeo/neogeo_slot.c
index 6b6624b750c..9b771b68205 100644
--- a/src/emu/bus/neogeo/neogeo_slot.c
+++ b/src/emu/bus/neogeo/neogeo_slot.c
@@ -78,29 +78,29 @@ bool neogeo_cart_slot_device::call_load()
{
// create memory regions
len = get_software_region_length("maincpu");
- m_cart->rom_alloc(len); ROM = m_cart->get_rom_base();
+ m_cart->rom_alloc(len); ROM = m_cart->get_rom_base();
memcpy(ROM, get_software_region("maincpu"), len);
len = get_software_region_length("fixed");
- m_cart->fixed_alloc(len); ROM8 = m_cart->get_fixed_base();
+ m_cart->fixed_alloc(len); ROM8 = m_cart->get_fixed_base();
memcpy(ROM8, get_software_region("fixed"), len);
if (get_software_region("audiocpu") != NULL)
{
len = get_software_region_length("audiocpu");
- m_cart->audio_alloc(len + 0x10000); ROM8 = m_cart->get_audio_base();
+ m_cart->audio_alloc(len + 0x10000); ROM8 = m_cart->get_audio_base();
memcpy(ROM8, get_software_region("audiocpu"), len);
memcpy(ROM8 + 0x10000, get_software_region("audiocpu"), len); // avoid reloading in XML, should just improve banking instead tho?
}
len = get_software_region_length("ymsnd");
- m_cart->ym_alloc(len); ROM8 = m_cart->get_ym_base();
+ m_cart->ym_alloc(len); ROM8 = m_cart->get_ym_base();
memcpy(ROM8, get_software_region("ymsnd"), len);
if (get_software_region("ymsnd.deltat") != NULL)
{
len = get_software_region_length("ymsnd.deltat");
- m_cart->ymdelta_alloc(len); ROM8 = m_cart->get_ymdelta_base();
+ m_cart->ymdelta_alloc(len); ROM8 = m_cart->get_ymdelta_base();
memcpy(ROM8, get_software_region("ymsnd.deltat"), len);
}
else
@@ -110,13 +110,13 @@ bool neogeo_cart_slot_device::call_load()
len = get_software_region_length("sprites");
- m_cart->sprites_alloc(len); ROM8 = m_cart->get_sprites_base();
+ m_cart->sprites_alloc(len); ROM8 = m_cart->get_sprites_base();
memcpy(ROM8, get_software_region("sprites"), len);
if (get_software_region("audiocrypt") != NULL) // encrypted Z80 code
{
len = get_software_region_length("audiocrypt");
- m_cart->audiocrypt_alloc(len); ROM8 = m_cart->get_audiocrypt_base();
+ m_cart->audiocrypt_alloc(len); ROM8 = m_cart->get_audiocrypt_base();
memcpy(ROM8, get_software_region("audiocrypt"), len);
// allocate the audiocpu region to decrypt data into
m_cart->audio_alloc(len + 0x10000);
diff --git a/src/emu/bus/neogeo/pcm2_cart.c b/src/emu/bus/neogeo/pcm2_cart.c
index fc5e8ae84c7..cb24de2ce71 100644
--- a/src/emu/bus/neogeo/pcm2_cart.c
+++ b/src/emu/bus/neogeo/pcm2_cart.c
@@ -131,5 +131,3 @@ void neogeo_pcm2_pnyaa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, PNYAA_GFX_KEY);
m_pcm2_prot->neo_pcm2_snk_1999(ym_region, ym_region_size, 4);
}
-
-
diff --git a/src/emu/bus/neogeo/pcm2_prot.c b/src/emu/bus/neogeo/pcm2_prot.c
index 6528102d630..bcf8a853e41 100644
--- a/src/emu/bus/neogeo/pcm2_prot.c
+++ b/src/emu/bus/neogeo/pcm2_prot.c
@@ -84,4 +84,3 @@ void pcm2_prot_device::neo_pcm2_swap(UINT8* ymrom, UINT32 ymsize, int value)
src[j]=buf[d]^xordata[value][j&0x7];
}
}
-
diff --git a/src/emu/bus/neogeo/pvc_cart.c b/src/emu/bus/neogeo/pvc_cart.c
index 7b119989fec..9ff5b8f2874 100644
--- a/src/emu/bus/neogeo/pvc_cart.c
+++ b/src/emu/bus/neogeo/pvc_cart.c
@@ -135,10 +135,3 @@ void neogeo_pvc_kof2003h_cart::decrypt_all(DECRYPT_ALL_PARAMS)
m_cmc_prot->neogeo_cmc50_m1_decrypt(audiocrypt_region, audiocrypt_region_size, audiocpu_region, audio_region_size);
m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, KOF2003_GFX_KEY);
}
-
-
-
-
-
-
-
diff --git a/src/emu/bus/neogeo/pvc_prot.c b/src/emu/bus/neogeo/pvc_prot.c
index 674a74c7633..fdeb4316e86 100644
--- a/src/emu/bus/neogeo/pvc_prot.c
+++ b/src/emu/bus/neogeo/pvc_prot.c
@@ -312,6 +312,3 @@ void pvc_prot_device::kof2003h_decrypt_68k(UINT8* rom, UINT32 size)
memcpy (&rom[0x100000], &buf[0x800000], 0x100000);
memcpy (&rom[0x200000], &buf[0x100000], 0x700000);
}
-
-
-
diff --git a/src/emu/bus/neogeo/rom.c b/src/emu/bus/neogeo/rom.c
index 58989b8cb26..c63686c8a50 100644
--- a/src/emu/bus/neogeo/rom.c
+++ b/src/emu/bus/neogeo/rom.c
@@ -65,4 +65,4 @@ machine_config_constructor neogeo_rom_device::device_mconfig_additions() const
void neogeo_rom_device::activate_cart(ACTIVATE_CART_PARAMS)
{
m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size);
-} \ No newline at end of file
+}
diff --git a/src/emu/bus/neogeo/sbp_prot.c b/src/emu/bus/neogeo/sbp_prot.c
index 4777fdf057a..a5479f761e6 100644
--- a/src/emu/bus/neogeo/sbp_prot.c
+++ b/src/emu/bus/neogeo/sbp_prot.c
@@ -16,7 +16,6 @@ sbp_prot_device::sbp_prot_device(const machine_config &mconfig, const char *tag,
void sbp_prot_device::device_start()
{
-
}
void sbp_prot_device::device_reset()
@@ -82,4 +81,4 @@ void sbp_prot_device::sbp_install_protection(cpu_device* maincpu, UINT8* cpurom,
rom[0x2a6fa / 2] = 0x4e71;
rom[0x2a6fc / 2] = 0x4e71;
}
-} \ No newline at end of file
+}
diff --git a/src/emu/bus/neogeo/sma_cart.c b/src/emu/bus/neogeo/sma_cart.c
index 3a61124463f..a8b46c2994d 100644
--- a/src/emu/bus/neogeo/sma_cart.c
+++ b/src/emu/bus/neogeo/sma_cart.c
@@ -173,5 +173,3 @@ void neogeo_sma_kof2000_cart::activate_cart(ACTIVATE_CART_PARAMS)
m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size);
m_sma_prot->kof2000_install_protection(maincpu, m_banked_cart);
}
-
-
diff --git a/src/emu/bus/neogeo/sma_prot.c b/src/emu/bus/neogeo/sma_prot.c
index 5780bd8f2b8..8a6c5beef1f 100644
--- a/src/emu/bus/neogeo/sma_prot.c
+++ b/src/emu/bus/neogeo/sma_prot.c
@@ -236,7 +236,6 @@ void sma_prot_device::reset_sma_rng()
void sma_prot_device::sma_install_random_read_handler(cpu_device* maincpu, int addr1, int addr2 )
{
-
maincpu->space(AS_PROGRAM).install_read_handler(addr1, addr1 + 1, read16_delegate(FUNC(sma_prot_device::sma_random_r),this));
maincpu->space(AS_PROGRAM).install_read_handler(addr2, addr2 + 1, read16_delegate(FUNC(sma_prot_device::sma_random_r),this));
}
@@ -459,5 +458,3 @@ void sma_prot_device::kof2000_decrypt_68k(UINT8* base)
rom[i] = rom[0x73a000/2 + BITSWAP24(i,23,22,21,20,19,18,8,4,15,13,3,14,16,2,6,17,7,12,10,0,5,11,1,9)];
}
}
-
-
diff --git a/src/emu/bus/nes/2a03pur.c b/src/emu/bus/nes/2a03pur.c
index 70627962caa..aaca3cf51e6 100644
--- a/src/emu/bus/nes/2a03pur.c
+++ b/src/emu/bus/nes/2a03pur.c
@@ -68,29 +68,29 @@ void nes_2a03pur_device::pcb_reset()
In MESS: supported.
- This mapper supports up to 1MB of PRG-ROM, in 4k
- banks located at $8000, $9000, $A000, $B000, $C000,
- $D000, $E000, and $F000. Each bank is selected by n
- 8-bit register at $5FF8, $5FF9, $5FFA, $5FFB, $5FFC,
- $5FFD, $5FFE, and $5FFF, respectively, just like NSF
- banking. These registers are mirrored across the
- entire $5000-$5FFF region (the register is selected
- by the low 3 bits), but it is recommended to use the
- original addresses. The mirroring is merely a
+ This mapper supports up to 1MB of PRG-ROM, in 4k
+ banks located at $8000, $9000, $A000, $B000, $C000,
+ $D000, $E000, and $F000. Each bank is selected by n
+ 8-bit register at $5FF8, $5FF9, $5FFA, $5FFB, $5FFC,
+ $5FFD, $5FFE, and $5FFF, respectively, just like NSF
+ banking. These registers are mirrored across the
+ entire $5000-$5FFF region (the register is selected
+ by the low 3 bits), but it is recommended to use the
+ original addresses. The mirroring is merely a
convenience for the hardware implementation.
-
- The 8kb CHR region may be RAM or ROM. This project
- uses CHR-RAM, and the board used by infiniteneslives
+
+ The 8kb CHR region may be RAM or ROM. This project
+ uses CHR-RAM, and the board used by infiniteneslives
for this project may only support CHR-RAM.
-
- At power-on, the mapper automatically sets all bits
- in the $5FFF bank register, placing the highest bank
- in $F000. This occurs on power-on but not on reset,
- so any bank that is mapped to $F000 after power-on
+
+ At power-on, the mapper automatically sets all bits
+ in the $5FFF bank register, placing the highest bank
+ in $F000. This occurs on power-on but not on reset,
+ so any bank that is mapped to $F000 after power-on
should contain a valid reset vector.
-
- At present, the project uses iNES mapper 30 to
- designate this mapper. No mapper number has been
+
+ At present, the project uses iNES mapper 30 to
+ designate this mapper. No mapper number has been
officially reserved yet.
-------------------------------------------------*/
diff --git a/src/emu/bus/plus4/c1551.c b/src/emu/bus/plus4/c1551.c
index 9ddea25d209..5f3edbff910 100644
--- a/src/emu/bus/plus4/c1551.c
+++ b/src/emu/bus/plus4/c1551.c
@@ -365,7 +365,7 @@ static MACHINE_CONFIG_FRAGMENT( c1551 )
MCFG_TPI6525_IN_PB_CB(READ8(c1551_device, tpi1_pb_r))
MCFG_TPI6525_IN_PC_CB(READ8(c1551_device, tpi1_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_device, tpi1_pc_w))
-
+
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_BYTE_CALLBACK(DEVWRITELINE(C64H156_TAG, c64h156_device, atni_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1551_floppies, "525ssqd", c1551_device::floppy_formats)
diff --git a/src/emu/bus/ql/cst_qdisc.c b/src/emu/bus/ql/cst_qdisc.c
index 90b95b8125d..29e6e960604 100644
--- a/src/emu/bus/ql/cst_qdisc.c
+++ b/src/emu/bus/ql/cst_qdisc.c
@@ -3,7 +3,7 @@
/**********************************************************************
CST QL Disc Interface emulation
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
diff --git a/src/emu/bus/ql/cumana_fdi.c b/src/emu/bus/ql/cumana_fdi.c
index 1e62f98010b..bc8a12c7d47 100644
--- a/src/emu/bus/ql/cumana_fdi.c
+++ b/src/emu/bus/ql/cumana_fdi.c
@@ -2,7 +2,7 @@
// copyright-holders:Curt Coder
/**********************************************************************
- Cumana Floppy Disk Interface emulation
+ Cumana Floppy Disk Interface emulation
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
diff --git a/src/emu/bus/ql/qubide.c b/src/emu/bus/ql/qubide.c
index 58a9e182a93..0437d7bfa07 100644
--- a/src/emu/bus/ql/qubide.c
+++ b/src/emu/bus/ql/qubide.c
@@ -269,7 +269,7 @@ void qubide_t::write(address_space &space, offs_t offset, UINT8 data)
case 0: case 0x0e: case 0x0f:
m_ata->write_cs1(space, 0x05, data, 0xff);
break;
-
+
case 0x08: case 0x0a: case 0x0c:
m_ata_data = (data << 8) | (m_ata_data & 0xff);
break;
diff --git a/src/emu/bus/ql/rom.c b/src/emu/bus/ql/rom.c
index 690f2a7a6c6..f3d6b6673e9 100644
--- a/src/emu/bus/ql/rom.c
+++ b/src/emu/bus/ql/rom.c
@@ -133,7 +133,7 @@ void ql_rom_cartridge_slot_t::get_default_card_software(astring &result)
SLOT_INTERFACE_START( ql_rom_cartridge_cards )
SLOT_INTERFACE("mhd", MIRACLE_HARD_DISK)
-
+
// the following need ROMs from the software list
SLOT_INTERFACE_INTERNAL("standard", QL_STANDARD_ROM_CARTRIDGE)
SLOT_INTERFACE_END
diff --git a/src/emu/bus/ql/sandy_superdisk.c b/src/emu/bus/ql/sandy_superdisk.c
index 128a4277e49..0bc2a426dbd 100644
--- a/src/emu/bus/ql/sandy_superdisk.c
+++ b/src/emu/bus/ql/sandy_superdisk.c
@@ -17,9 +17,9 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define WD1772_TAG "wd1772"
-#define TTL74273_TAG "ttl74273"
-#define CENTRONICS_TAG "centronics"
+#define WD1772_TAG "wd1772"
+#define TTL74273_TAG "ttl74273"
+#define CENTRONICS_TAG "centronics"
@@ -170,20 +170,20 @@ UINT8 sandy_super_disk_t::read(address_space &space, offs_t offset, UINT8 data)
case 0:
data = m_fdc->read(space, offset & 0x03);
break;
-
+
case 3:
/*
- bit description
+ bit description
- 0 BUSY
- 1
- 2
- 3
- 4
- 5
- 6
- 7
+ 0 BUSY
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
*/
@@ -221,22 +221,22 @@ void sandy_super_disk_t::write(address_space &space, offs_t offset, UINT8 data)
{
/*
- bit description
+ bit description
- 0 SIDE ONE
- 1 DSEL0
- 2 DSEL1
- 3 M ON0
- 4 /DDEN
- 5 STROBE inverted
- 6 enable printer interrupt
- 7
+ 0 SIDE ONE
+ 1 DSEL0
+ 2 DSEL1
+ 3 M ON0
+ 4 /DDEN
+ 5 STROBE inverted
+ 6 enable printer interrupt
+ 7
*/
floppy_image_device *floppy = NULL;
- if (BIT(data, 1))
+ if (BIT(data, 1))
{
floppy = m_floppy0->get_device();
}
diff --git a/src/emu/bus/ql/sandy_superqboard.c b/src/emu/bus/ql/sandy_superqboard.c
index 0536563d392..f3e3464e551 100644
--- a/src/emu/bus/ql/sandy_superqboard.c
+++ b/src/emu/bus/ql/sandy_superqboard.c
@@ -17,9 +17,9 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define WD1772_TAG "ic3"
-#define TTL74273_TAG "ic10"
-#define CENTRONICS_TAG "j2"
+#define WD1772_TAG "ic3"
+#define TTL74273_TAG "ic10"
+#define CENTRONICS_TAG "j2"
@@ -289,7 +289,7 @@ void sandy_superqboard_t::device_reset()
m_latch->write(0);
m_centronics->write_strobe(1);
-
+
m_fd6 = 0;
m_fd7 = 0;
m_status = 0;
@@ -313,20 +313,20 @@ UINT8 sandy_superqboard_t::read(address_space &space, offs_t offset, UINT8 data)
case 0:
data = m_fdc->read(space, offset & 0x03);
break;
-
+
case 3:
/*
- bit description
+ bit description
- 0 BUSY
- 1 mouse pin 8 (middle button)
- 2 mouse pin 1 (right button)
- 3 mouse pin 2 (left button)
- 4 mouse pin 4 flip-flop Q (Y direction)
- 5 mouse pin 3 flip-flop Q (X direction)
- 6 INT3 (Y interrupt)
- 7 INT2 (X interrupt)
+ 0 BUSY
+ 1 mouse pin 8 (middle button)
+ 2 mouse pin 1 (right button)
+ 3 mouse pin 2 (left button)
+ 4 mouse pin 4 flip-flop Q (Y direction)
+ 5 mouse pin 3 flip-flop Q (X direction)
+ 6 INT3 (Y interrupt)
+ 7 INT2 (X interrupt)
*/
@@ -378,22 +378,22 @@ void sandy_superqboard_t::write(address_space &space, offs_t offset, UINT8 data)
{
/*
- bit description
+ bit description
- 0 SIDE ONE
- 1 DSEL0
- 2 DSEL1
- 3 M ON0
- 4 /DDEN
- 5 STROBE inverted
- 6 enable printer interrupt (GAL pin 11)
- 7 enable mouse interrupt (GAL pin 9)
+ 0 SIDE ONE
+ 1 DSEL0
+ 2 DSEL1
+ 3 M ON0
+ 4 /DDEN
+ 5 STROBE inverted
+ 6 enable printer interrupt (GAL pin 11)
+ 7 enable mouse interrupt (GAL pin 9)
*/
floppy_image_device *floppy = NULL;
- if (BIT(data, 1))
+ if (BIT(data, 1))
{
floppy = m_floppy0->get_device();
}
diff --git a/src/emu/bus/ql/trumpcard.c b/src/emu/bus/ql/trumpcard.c
index 2b483cefda4..d31597d7710 100644
--- a/src/emu/bus/ql/trumpcard.c
+++ b/src/emu/bus/ql/trumpcard.c
@@ -17,7 +17,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define WD1772_TAG "wd1772"
+#define WD1772_TAG "wd1772"
@@ -238,27 +238,27 @@ void ql_trump_card_t::write(address_space &space, offs_t offset, UINT8 data)
{
m_fdc->write(space, offset & 0x03, data);
}
-
+
if (offset == 0x1e000)
{
/*
- bit description
+ bit description
- 0 DRIVE1
- 1 DRIVE0
- 2 MOTOR
- 3 SIDE
- 4
- 5
- 6
- 7
+ 0 DRIVE1
+ 1 DRIVE0
+ 2 MOTOR
+ 3 SIDE
+ 4
+ 5
+ 6
+ 7
*/
floppy_image_device *floppy = NULL;
- if (BIT(data, 1))
+ if (BIT(data, 1))
{
floppy = m_floppy0->get_device();
}
diff --git a/src/emu/bus/scsi/scsi.c b/src/emu/bus/scsi/scsi.c
index 06c11c72712..1aa25104ac3 100644
--- a/src/emu/bus/scsi/scsi.c
+++ b/src/emu/bus/scsi/scsi.c
@@ -74,7 +74,7 @@ machine_config_constructor SCSI_PORT_DEVICE::device_mconfig_additions() const
void SCSI_PORT_DEVICE::device_start()
{
- const char *deviceName[] =
+ const char *deviceName[] =
{
SCSI_PORT_DEVICE1,
SCSI_PORT_DEVICE2,
diff --git a/src/emu/bus/scsi/scsihle.c b/src/emu/bus/scsi/scsihle.c
index 74a62ce62d5..a5489c0170a 100644
--- a/src/emu/bus/scsi/scsihle.c
+++ b/src/emu/bus/scsi/scsihle.c
@@ -124,7 +124,7 @@ static const char *const phasenames[] =
void scsihle_device::data_out(UINT8 data)
{
-// printf( "%s data out %02x\n", tag(), data );
+// printf( "%s data out %02x\n", tag(), data );
output_data0(BIT(data, 0));
output_data1(BIT(data, 1));
output_data2(BIT(data, 2));
@@ -396,7 +396,7 @@ void scsihle_device::scsi_change_phase(UINT8 newphase)
WRITE_LINE_MEMBER( scsihle_device::input_sel )
{
-// printf( "sel %d %d %02x\n", state, m_phase, m_input_data );
+// printf( "sel %d %d %02x\n", state, m_phase, m_input_data );
switch (m_phase)
{
case SCSI_PHASE_BUS_FREE:
diff --git a/src/emu/bus/vtech/ioexp/carts.c b/src/emu/bus/vtech/ioexp/carts.c
index 90260b722b1..bf9a44ed467 100644
--- a/src/emu/bus/vtech/ioexp/carts.c
+++ b/src/emu/bus/vtech/ioexp/carts.c
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ I/O Expansion Slot Devices
+ VTech Laser/VZ I/O Expansion Slot Devices
***************************************************************************/
diff --git a/src/emu/bus/vtech/ioexp/ioexp.c b/src/emu/bus/vtech/ioexp/ioexp.c
index b9706c1812d..cf1106a511a 100644
--- a/src/emu/bus/vtech/ioexp/ioexp.c
+++ b/src/emu/bus/vtech/ioexp/ioexp.c
@@ -1,11 +1,11 @@
/***************************************************************************
- VTech Laser/VZ I/O Expansion Slot
+ VTech Laser/VZ I/O Expansion Slot
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- 30-pin slot
+ 30-pin slot
***************************************************************************/
diff --git a/src/emu/bus/vtech/ioexp/joystick.c b/src/emu/bus/vtech/ioexp/joystick.c
index 9169c420e06..1b3437436f0 100644
--- a/src/emu/bus/vtech/ioexp/joystick.c
+++ b/src/emu/bus/vtech/ioexp/joystick.c
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ Joystick Interface
+ VTech Laser/VZ Joystick Interface
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/vtech/ioexp/printer.c b/src/emu/bus/vtech/ioexp/printer.c
index bb659bdfd66..c4b5c7735f4 100644
--- a/src/emu/bus/vtech/ioexp/printer.c
+++ b/src/emu/bus/vtech/ioexp/printer.c
@@ -1,12 +1,12 @@
/***************************************************************************
- VTech Laser/VZ Printer Interface
+ VTech Laser/VZ Printer Interface
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- VTech PI 20
- Dick Smith Electronics X-7320
+ VTech PI 20
+ Dick Smith Electronics X-7320
***************************************************************************/
diff --git a/src/emu/bus/vtech/memexp/carts.c b/src/emu/bus/vtech/memexp/carts.c
index 101f726ce42..b166e30ff07 100644
--- a/src/emu/bus/vtech/memexp/carts.c
+++ b/src/emu/bus/vtech/memexp/carts.c
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ Memory Expansion Slot Devices
+ VTech Laser/VZ Memory Expansion Slot Devices
***************************************************************************/
diff --git a/src/emu/bus/vtech/memexp/floppy.c b/src/emu/bus/vtech/memexp/floppy.c
index a4f7bad19f5..a773fc0a244 100644
--- a/src/emu/bus/vtech/memexp/floppy.c
+++ b/src/emu/bus/vtech/memexp/floppy.c
@@ -1,11 +1,11 @@
/***************************************************************************
- VTech Laser/VZ Floppy Controller Cartridge
+ VTech Laser/VZ Floppy Controller Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Laser DD 20
+ Laser DD 20
Dick Smith Electronics X-7304
***************************************************************************/
diff --git a/src/emu/bus/vtech/memexp/memexp.c b/src/emu/bus/vtech/memexp/memexp.c
index f05bb52e3fb..55207612c51 100644
--- a/src/emu/bus/vtech/memexp/memexp.c
+++ b/src/emu/bus/vtech/memexp/memexp.c
@@ -1,11 +1,11 @@
/***************************************************************************
- VTech Laser/VZ Memory Expansion Slot
+ VTech Laser/VZ Memory Expansion Slot
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- 44-pin slot
+ 44-pin slot
***************************************************************************/
diff --git a/src/emu/bus/vtech/memexp/memory.c b/src/emu/bus/vtech/memexp/memory.c
index f36bb5f0937..0d52e18ab0d 100644
--- a/src/emu/bus/vtech/memexp/memory.c
+++ b/src/emu/bus/vtech/memexp/memory.c
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ Laser Memory Expansions
+ VTech Laser/VZ Laser Memory Expansions
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/vtech/memexp/rs232.c b/src/emu/bus/vtech/memexp/rs232.c
index 370879887d1..5951b541707 100644
--- a/src/emu/bus/vtech/memexp/rs232.c
+++ b/src/emu/bus/vtech/memexp/rs232.c
@@ -1,6 +1,6 @@
/***************************************************************************
- Dick Smith VZ-200/300 RS-232 Cartridge
+ Dick Smith VZ-200/300 RS-232 Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/vtech/memexp/wordpro.c b/src/emu/bus/vtech/memexp/wordpro.c
index f1f3d1c2bed..1e5a51fd9d7 100644
--- a/src/emu/bus/vtech/memexp/wordpro.c
+++ b/src/emu/bus/vtech/memexp/wordpro.c
@@ -1,6 +1,6 @@
/***************************************************************************
- Dick Smith VZ-300 WordPro Cartridge
+ Dick Smith VZ-300 WordPro Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/wangpc/lvc.c b/src/emu/bus/wangpc/lvc.c
index e3505180a39..329d225fc4e 100644
--- a/src/emu/bus/wangpc/lvc.c
+++ b/src/emu/bus/wangpc/lvc.c
@@ -57,23 +57,23 @@ const device_type WANGPC_LVC = &device_creator<wangpc_lvc_device>;
MC6845_UPDATE_ROW( wangpc_lvc_device::crtc_update_row )
{
offs_t scroll_y = (((m_scroll >> 8) + 0x15) & 0xff) * 0x80;
-
+
if (OPTION_80_COL)
{
for (int column = 0; column < x_count; column++)
{
offs_t addr = scroll_y + (m_scroll & 0x3f) + ((ma / 80) * 0x480) + (((ra & 0x0f) << 7) | (column & 0x7f));
UINT16 data = m_video_ram[addr & 0x7fff];
-
+
for (int bit = 0; bit < 8; bit++)
{
int x = (column * 8) + bit;
int color = (BIT(data, 15) << 1) | BIT(data, 7);
-
+
if (column == cursor_x) color = 0x03;
-
+
bitmap.pix32(vbp + y, hbp + x) = de ? m_palette[color] : rgb_t::black;
-
+
data <<= 1;
}
}
@@ -82,23 +82,23 @@ MC6845_UPDATE_ROW( wangpc_lvc_device::crtc_update_row )
{
//offs_t addr = scroll_y + ((m_scroll & 0x3f) << 1) + ((ma / 40) * 0x480) + (((ra & 0x0f) << 7));
offs_t addr = scroll_y + ((m_scroll & 0x3f) << 1) + (y * 0x80);
-
+
for (int column = 0; column < x_count; column++)
{
UINT32 data = (m_video_ram[(addr + 1) & 0x7fff] << 16) | m_video_ram[addr & 0x7fff];
-
+
for (int bit = 0; bit < 8; bit++)
{
int x = (column * 8) + bit;
int color = (BIT(data, 31) << 3) | (BIT(data, 23) << 2) | (BIT(data, 15) << 1) | BIT(data, 7);
-
+
if (column == cursor_x) color = 0x03;
-
+
bitmap.pix32(vbp + y, hbp + x) = de ? m_palette[color] : rgb_t::black;
-
+
data <<= 1;
}
-
+
addr += 2;
}
}
diff --git a/src/emu/bus/wangpc/mvc.c b/src/emu/bus/wangpc/mvc.c
index 2ee7b8c458e..b3549e0dc29 100644
--- a/src/emu/bus/wangpc/mvc.c
+++ b/src/emu/bus/wangpc/mvc.c
@@ -75,25 +75,25 @@ MC6845_UPDATE_ROW( wangpc_mvc_device::crtc_update_row )
{
offs_t addr = (y * 50) + sx;
UINT16 data = m_bitmap_ram[addr];
-
+
for (int bit = 0; bit < 16; bit++)
{
int x = (sx * 16) + bit;
int color = BIT(data, 15) && de;
-
+
bitmap.pix32(vbp + y, hbp + x) = PALETTE_MVC[color];
-
+
data <<= 1;
}
}
-
+
for (int column = 0; column < x_count; column++)
{
UINT16 code = m_video_ram[((ma + column) & 0x7ff)];
UINT8 attr = code & 0xff;
-
+
UINT8 new_ra = ra + 1;
-
+
if (ATTR_SUPERSCRIPT)
{
new_ra = ra + 3;
@@ -102,23 +102,23 @@ MC6845_UPDATE_ROW( wangpc_mvc_device::crtc_update_row )
{
new_ra = ra;
}
-
+
offs_t addr = ((code >> 8) << 4) | (new_ra & 0x0f);
UINT16 data = m_char_ram[addr & 0xfff];
-
+
if ((column == cursor_x) || (!ra && ATTR_OVERSCORE) || ((ra == 9) && ATTR_UNDERSCORE))
{
data = 0xffff;
}
-
+
for (int bit = 0; bit < 10; bit++)
{
int x = (column * 10) + bit;
int color = ((BIT(data, 9) & !ATTR_BLANK) ^ ATTR_REVERSE);
-
+
if ((color | bitmap.pix32(vbp + y, hbp + x)) & ATTR_BOLD) color = 2;
if (color) bitmap.pix32(vbp + y, hbp + x) = de ? PALETTE_MVC[color] : rgb_t::black;
-
+
data <<= 1;
}
}
diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index 82df1743cbe..cf687872272 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -197,7 +197,7 @@ int cli_frontend::execute(int argc, char **argv)
throw emu_fatalerror(MAMERR_FATALERROR, NULL);
}
}
-
+
m_options.parse_standard_inis(option_errors);
// parse the command line, adding any system-specific options
if (!m_options.parse_command_line(argc, argv, option_errors))
@@ -232,7 +232,7 @@ int cli_frontend::execute(int argc, char **argv)
}
if (option_errors)
osd_printf_error("Error in command line:\n%s\n", option_errors.trimspace().cstr());
-
+
// if we can't find it, give an appropriate error
const game_driver *system = m_options.system();
if (system == NULL && *(m_options.system_name()) != 0)
diff --git a/src/emu/cpu/alto2/alto2cpu.c b/src/emu/cpu/alto2/alto2cpu.c
index a2efeff0905..ec1d3d6eebd 100644
--- a/src/emu/cpu/alto2/alto2cpu.c
+++ b/src/emu/cpu/alto2/alto2cpu.c
@@ -2237,7 +2237,7 @@ UINT32 alto2_cpu_device::alu_74181(UINT32 a, UINT32 b, UINT8 smc)
case SMC(1,1,1,1, 1, 1):
f = (a) | cout;
break;
-
+
default:
f = 0;
break;
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c
index 494e35d412f..5d48b8a0bdb 100644
--- a/src/emu/cpu/g65816/g65816.c
+++ b/src/emu/cpu/g65816/g65816.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
_5a22_device::_5a22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : g65816_device(mconfig, _5A22, "5A22", tag, owner, clock, "5a22", __FILE__, CPU_TYPE_5A22, ADDRESS_MAP_NAME(_5a22_map))
+ : g65816_device(mconfig, _5A22, "5A22", tag, owner, clock, "5a22", __FILE__, CPU_TYPE_5A22, ADDRESS_MAP_NAME(_5a22_map))
{
}
@@ -149,10 +149,10 @@ void g65816_device::g65816i_set_execution_mode(uint mode)
case 3: FTABLE_OPCODES = g65816i_opcodes_M1X1; break;
case 4: FTABLE_OPCODES = g65816i_opcodes_E; break;
}
- FTABLE_GET_REG = s_g65816_get_reg[mode];
- FTABLE_SET_REG = s_g65816_set_reg[mode];
- FTABLE_SET_LINE = s_g65816_set_line[mode];
- FTABLE_EXECUTE = s_g65816_execute[mode];
+ FTABLE_GET_REG = s_g65816_get_reg[mode];
+ FTABLE_SET_REG = s_g65816_set_reg[mode];
+ FTABLE_SET_LINE = s_g65816_set_line[mode];
+ FTABLE_EXECUTE = s_g65816_execute[mode];
}
@@ -941,13 +941,13 @@ void g65816_device::state_export(const device_state_entry &entry)
break;
case G65816_P:
m_debugger_temp = (m_flag_n&0x80) |
- ((m_flag_v>>1)&0x40) |
- m_flag_m |
- m_flag_x |
- m_flag_d |
- m_flag_i |
- ((!m_flag_z)<<1) |
- ((m_flag_c>>8)&1);
+ ((m_flag_v>>1)&0x40) |
+ m_flag_m |
+ m_flag_x |
+ m_flag_d |
+ m_flag_i |
+ ((!m_flag_z)<<1) |
+ ((m_flag_c>>8)&1);
break;
case G65816_A:
m_debugger_temp = m_a | m_b;
@@ -1028,11 +1028,11 @@ void _5a22_device::state_import(const device_state_entry &entry)
void _5a22_device::state_export(const device_state_entry &entry)
{
- switch (entry.index())
- {
- case _5A22_FASTROM:
- m_debugger_temp = g65816_get_reg(_5A22_FASTROM);
- break;
+ switch (entry.index())
+ {
+ case _5A22_FASTROM:
+ m_debugger_temp = g65816_get_reg(_5A22_FASTROM);
+ break;
default:
g65816_device::state_export(entry);
break;
diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c
index 05413a61b70..f62c538f44d 100644
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@@ -1141,8 +1141,8 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
// - 0x60 - 0x6f are an alias to 0x70 - 0x7f.
// - 0xc0, 0xc1, 0xc8, 0xc9 are also aliases where the CPU ignores BIT 1 (*).
//
-// Instructions are used in the boot sector for some versions of
-// MS-DOS (e.g. the DEC Rainbow-100 version of DOS 2.x)
+// Instructions are used in the boot sector for some versions of
+// MS-DOS (e.g. the DEC Rainbow-100 version of DOS 2.x)
case 0x60:
case 0x70: // i_jo
JMP( OF);
@@ -1672,7 +1672,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
CLK(MOV_RI16);
break;
- case 0xc0: // 0xc0 is 0xc2 - see (*)
+ case 0xc0: // 0xc0 is 0xc2 - see (*)
case 0xc2: // i_ret_d16
{
UINT32 count = fetch_word();
@@ -1725,7 +1725,7 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
}
break;
- case 0xc9: // 0xc9 = 0xcb - see (*)
+ case 0xc9: // 0xc9 = 0xcb - see (*)
case 0xcb: // i_retf
m_ip = POP();
m_sregs[CS] = POP();
diff --git a/src/emu/cpu/m6809/hd6309.c b/src/emu/cpu/m6809/hd6309.c
index 480b7e90062..68a1fc0a772 100644
--- a/src/emu/cpu/m6809/hd6309.c
+++ b/src/emu/cpu/m6809/hd6309.c
@@ -180,24 +180,24 @@ void hd6309_device::device_reset()
void hd6309_device::device_pre_save()
{
- if (m_reg8 == &m_d.b.h) m_reg = HD6309_A;
- else if (m_reg8 == &m_d.b.l) m_reg = HD6309_B;
- else if (m_reg8 == &m_w.b.h) m_reg = HD6309_E;
- else if (m_reg8 == &m_w.b.l) m_reg = HD6309_F;
- else if (m_reg8 == &m_cc) m_reg = HD6309_CC;
- else if (m_reg8 == &m_dp) m_reg = HD6309_DP;
- else if (m_reg8 == &m_md) m_reg = HD6309_MD;
- else if (m_reg8 == &m_temp.b.l) m_reg = HD6309_ZERO_BYTE;
-
- else if (m_reg16 == &m_d) m_reg = HD6309_D;
- else if (m_reg16 == &m_x) m_reg = HD6309_X;
- else if (m_reg16 == &m_y) m_reg = HD6309_Y;
- else if (m_reg16 == &m_u) m_reg = HD6309_U;
- else if (m_reg16 == &m_s) m_reg = HD6309_S;
- else if (m_reg16 == &m_pc) m_reg = HD6309_PC;
- else if (m_reg16 == &m_w) m_reg = HD6309_W;
- else if (m_reg16 == &m_v) m_reg = HD6309_V;
- else if (m_reg16 == &m_temp) m_reg = HD6309_ZERO_WORD;
+ if (m_reg8 == &m_d.b.h) m_reg = HD6309_A;
+ else if (m_reg8 == &m_d.b.l) m_reg = HD6309_B;
+ else if (m_reg8 == &m_w.b.h) m_reg = HD6309_E;
+ else if (m_reg8 == &m_w.b.l) m_reg = HD6309_F;
+ else if (m_reg8 == &m_cc) m_reg = HD6309_CC;
+ else if (m_reg8 == &m_dp) m_reg = HD6309_DP;
+ else if (m_reg8 == &m_md) m_reg = HD6309_MD;
+ else if (m_reg8 == &m_temp.b.l) m_reg = HD6309_ZERO_BYTE;
+
+ else if (m_reg16 == &m_d) m_reg = HD6309_D;
+ else if (m_reg16 == &m_x) m_reg = HD6309_X;
+ else if (m_reg16 == &m_y) m_reg = HD6309_Y;
+ else if (m_reg16 == &m_u) m_reg = HD6309_U;
+ else if (m_reg16 == &m_s) m_reg = HD6309_S;
+ else if (m_reg16 == &m_pc) m_reg = HD6309_PC;
+ else if (m_reg16 == &m_w) m_reg = HD6309_W;
+ else if (m_reg16 == &m_v) m_reg = HD6309_V;
+ else if (m_reg16 == &m_temp) m_reg = HD6309_ZERO_WORD;
else
m_reg = 0;
}
diff --git a/src/emu/cpu/m6809/konami.c b/src/emu/cpu/m6809/konami.c
index 634467d1715..20e19885eba 100644
--- a/src/emu/cpu/m6809/konami.c
+++ b/src/emu/cpu/m6809/konami.c
@@ -98,7 +98,7 @@ konami_cpu_device::konami_cpu_device(const machine_config &mconfig, const char *
void konami_cpu_device::device_start()
{
super::device_start();
-
+
// resolve callbacks
m_set_lines.resolve();
}
@@ -377,4 +377,3 @@ void konami_cpu_device::execute_run()
execute_one();
} while(m_icount > 0);
}
-
diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c
index a9a0c95cc4e..81c48ac189c 100644
--- a/src/emu/cpu/mb86233/mb86233.c
+++ b/src/emu/cpu/mb86233/mb86233.c
@@ -360,7 +360,7 @@ void mb86233_cpu_device::ALU( UINT32 alu)
break;
case 0x0F: /* D = int(D) */
- switch((m_fpucontrol>>1)&3)
+ switch((m_fpucontrol>>1)&3)
{
//case 0: GETD().i = floor(GETD().f+0.5f); break;
//case 1: GETD().i = ceil(GETD().f); break;
diff --git a/src/emu/cpu/mb86235/mb86235.c b/src/emu/cpu/mb86235/mb86235.c
index 7844e25b967..e029701c81e 100644
--- a/src/emu/cpu/mb86235/mb86235.c
+++ b/src/emu/cpu/mb86235/mb86235.c
@@ -76,7 +76,6 @@ void mb86235_cpu_device::device_start()
void mb86235_cpu_device::device_reset()
{
-
}
#if 0
diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c
index 5f970586643..24ac1ed3b08 100644
--- a/src/emu/cpu/minx/minx.c
+++ b/src/emu/cpu/minx/minx.c
@@ -177,7 +177,6 @@ UINT16 minx_cpu_device::rdop16()
void minx_cpu_device::execute_run()
{
-
do
{
m_curpc = GET_MINX_PC;
diff --git a/src/emu/cpu/mips/mips3.c b/src/emu/cpu/mips/mips3.c
index ccd1427f957..58af283ad93 100644
--- a/src/emu/cpu/mips/mips3.c
+++ b/src/emu/cpu/mips/mips3.c
@@ -2988,4 +2988,3 @@ void mips3_device::sdr_le(UINT32 op)
UINT64 mask = U64(0xffffffffffffffff) << shift;
WDOUBLE_MASKED(offs & ~7, RTVAL64 << shift, mask);
}
-
diff --git a/src/emu/cpu/mips/mips3drc.c b/src/emu/cpu/mips/mips3drc.c
index 6fadf3698f1..fa05e149f35 100644
--- a/src/emu/cpu/mips/mips3drc.c
+++ b/src/emu/cpu/mips/mips3drc.c
@@ -3246,4 +3246,3 @@ void mips3_device::log_opcode_desc(drcuml_state *drcuml, const opcode_desc *desc
drcuml->log_printf("-----\n");
}
}
-
diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c
index 263b9618ad2..595a56e39f9 100644
--- a/src/emu/cpu/powerpc/ppccom.c
+++ b/src/emu/cpu/powerpc/ppccom.c
@@ -230,12 +230,12 @@ ppc_device::ppc_device(const machine_config &mconfig, device_type type, const ch
}
//ppc403_device::ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-// : ppc_device(mconfig, PPC403, "PPC403", tag, owner, clock, "ppc403", 32?, 64?)
+// : ppc_device(mconfig, PPC403, "PPC403", tag, owner, clock, "ppc403", 32?, 64?)
//{
//}
//
//ppc405_device::ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-// : ppc_device(mconfig, PPC405, "PPC405", tag, owner, clock, "ppc405", 32?, 64?)
+// : ppc_device(mconfig, PPC405, "PPC405", tag, owner, clock, "ppc405", 32?, 64?)
//{
//}
@@ -2886,4 +2886,3 @@ void ppc4xx_device::ppc4xx_set_dcr_write_handler(write32_delegate dcr_write_func
{
m_dcr_write_func = dcr_write_func;
}
-
diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c
index fb1fc0ca7f8..3f1aad92c34 100644
--- a/src/emu/cpu/powerpc/ppcdrc.c
+++ b/src/emu/cpu/powerpc/ppcdrc.c
@@ -3919,4 +3919,3 @@ void ppc_device::log_opcode_desc(drcuml_state *drcuml, const opcode_desc *descli
drcuml->log_printf("-----\n");
}
}
-
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index 1c370d401b4..700fb17fb2a 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -288,13 +288,13 @@ void rsp_cpu_device::resolve_cb()
sp_reg_w_func.resolve();
sp_set_status_func.resolve();
}
-
+
static CPU_INIT( rsp )
{
rsp_state *rsp = get_safe_token(device);
int regIdx;
- int accumIdx;
-
+ int accumIdx;
+
if (LOG_INSTRUCTION_EXECUTION)
rsp->exec_output = fopen("rsp_execute.txt", "wt");
@@ -3259,11 +3259,11 @@ CPU_GET_INFO( rsp_int )
rsp_cpu_device::rsp_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, cpu_get_info_func get_info)
: legacy_cpu_device(mconfig, type, tag, owner, clock, get_info),
- dp_reg_r_func(*this),
- dp_reg_w_func(*this),
- sp_reg_r_func(*this),
- sp_reg_w_func(*this),
- sp_set_status_func(*this)
+ dp_reg_r_func(*this),
+ dp_reg_w_func(*this),
+ sp_reg_r_func(*this),
+ sp_reg_w_func(*this),
+ sp_set_status_func(*this)
{
}
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index 0a5529a1d16..73db9487d79 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -149,7 +149,7 @@ const device_type SH2 = &device_creator<sh2_device>;
READ32_MEMBER(sh2_device::sh2_internal_a5)
{
- return 0xa5a5a5a5;
+ return 0xa5a5a5a5;
}
@@ -158,8 +158,8 @@ READ32_MEMBER(sh2_device::sh2_internal_a5)
-------------------------------------------------*/
static ADDRESS_MAP_START( sh2_internal_map, AS_PROGRAM, 32, sh2_device )
- AM_RANGE(0x40000000, 0xbfffffff) AM_READ(sh2_internal_a5)
- AM_RANGE(0xe0000000, 0xffffffff) AM_READWRITE(sh2_internal_r, sh2_internal_w)
+ AM_RANGE(0x40000000, 0xbfffffff) AM_READ(sh2_internal_a5)
+ AM_RANGE(0xe0000000, 0xffffffff) AM_READWRITE(sh2_internal_r, sh2_internal_w)
ADDRESS_MAP_END
@@ -170,7 +170,7 @@ sh2_device::sh2_device(const machine_config &mconfig, const char *tag, device_t
, m_cpu_type(CPU_TYPE_SH2)
, m_cache(CACHE_SIZE + sizeof(internal_sh2_state))
, m_drcuml(NULL)
-// , m_drcuml(*this, m_cache, ( LOG_UML ? DRCUML_OPTION_LOG_UML : 0 ) | ( LOG_NATIVE ? DRCUML_OPTION_LOG_NATIVE : 0 ), 1, 32, 1)
+// , m_drcuml(*this, m_cache, ( LOG_UML ? DRCUML_OPTION_LOG_UML : 0 ) | ( LOG_NATIVE ? DRCUML_OPTION_LOG_NATIVE : 0 ), 1, 32, 1)
, m_drcfe(NULL)
, m_drcoptions(0)
, m_sh2_state(NULL)
@@ -207,7 +207,7 @@ sh2_device::sh2_device(const machine_config &mconfig, device_type type, const ch
, m_cpu_type(cpu_type)
, m_cache(CACHE_SIZE + sizeof(internal_sh2_state))
, m_drcuml(NULL)
-// , m_drcuml(*this, m_cache, ( LOG_UML ? DRCUML_OPTION_LOG_UML : 0 ) | ( LOG_NATIVE ? DRCUML_OPTION_LOG_NATIVE : 0 ), 1, 32, 1)
+// , m_drcuml(*this, m_cache, ( LOG_UML ? DRCUML_OPTION_LOG_UML : 0 ) | ( LOG_NATIVE ? DRCUML_OPTION_LOG_NATIVE : 0 ), 1, 32, 1)
, m_drcfe(NULL)
, m_drcoptions(0)
, m_sh2_state(NULL)
@@ -2586,11 +2586,11 @@ void sh2_device::device_start()
/* initialize the front-end helper */
m_drcfe = auto_alloc(machine(), sh2_frontend(this, COMPILE_BACKWARDS_BYTES, COMPILE_FORWARDS_BYTES, SINGLE_INSTRUCTION_MODE ? 1 : COMPILE_MAX_SEQUENCE));
- /* compute the register parameters */
- for (int regnum = 0; regnum < 16; regnum++)
- {
- m_regmap[regnum] = uml::mem(&m_sh2_state->r[regnum]);
- }
+ /* compute the register parameters */
+ for (int regnum = 0; regnum < 16; regnum++)
+ {
+ m_regmap[regnum] = uml::mem(&m_sh2_state->r[regnum]);
+ }
/* if we have registers to spare, assign r0, r1, r2 to leftovers */
/* WARNING: do not use synthetic registers that are mapped here! */
@@ -2712,4 +2712,3 @@ void sh2_device::execute_set_input(int irqline, int state)
#include "sh2comn.c"
#include "sh2drc.c"
-
diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c
index 6894780c19d..27f5920b3a2 100644
--- a/src/emu/cpu/sh2/sh2comn.c
+++ b/src/emu/cpu/sh2/sh2comn.c
@@ -887,4 +887,3 @@ void sh2_device::sh2_exception(const char *message, int irqline)
if(m_sh2_state->sleep_mode == 1) { m_sh2_state->sleep_mode = 2; }
}
-
diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c
index 30725c773a3..89e73702d92 100644
--- a/src/emu/cpu/sh2/sh2drc.c
+++ b/src/emu/cpu/sh2/sh2drc.c
@@ -2978,4 +2978,3 @@ void sh2_device::sh2drc_add_fastram(offs_t start, offs_t end, UINT8 readonly, vo
m_fastram_select++;
}
}
-
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index c2ea1c98229..1aed47f5a08 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -3193,7 +3193,7 @@ const sh34_base_device::sh4ophandler sh34_base_device::s_upper4bits[256] =
/* j = 0x9000 */
SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI),
SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI), SH4OP(MOVWI),
- /* j = 0xa000 */
+ /* j = 0xa000 */
SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA),
SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA), SH4OP(BRA),
/* j = 0xb000 */
@@ -3968,4 +3968,3 @@ void sh34_base_device::sh4_set_ftcsr_callback(sh4_ftcsr_callback callback)
{
m_ftcsr_read_callback = callback;
}
-
diff --git a/src/emu/cpu/sh4/sh4dmac.c b/src/emu/cpu/sh4/sh4dmac.c
index af285d88e52..3c1edf91493 100644
--- a/src/emu/cpu/sh4/sh4dmac.c
+++ b/src/emu/cpu/sh4/sh4dmac.c
@@ -662,4 +662,3 @@ void sh34_base_device::sh4_dma_ddt(struct sh4_ddt_dma *s)
sh4_dmac_check(2);
sh4_dmac_check(3);
}
-
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index b1f16323757..e16b943ac34 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -1638,4 +1638,3 @@ offs_t tms34020_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8
return CPU_DISASSEMBLE_NAME(tms34020)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/emu/cpu/tms57002/tms57002.c
index c2393938406..bb8698f9661 100644
--- a/src/emu/cpu/tms57002/tms57002.c
+++ b/src/emu/cpu/tms57002/tms57002.c
@@ -22,9 +22,9 @@ ADDRESS_MAP_END
tms57002_device::tms57002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, TMS57002, "TMS57002", tag, owner, clock, "tms57002", __FILE__),
- device_sound_interface(mconfig, *this),
- program_config("program", ENDIANNESS_LITTLE, 32, 8, -2, ADDRESS_MAP_NAME(internal_pgm)),
- data_config("data", ENDIANNESS_LITTLE, 8, 20)
+ device_sound_interface(mconfig, *this),
+ program_config("program", ENDIANNESS_LITTLE, 32, 8, -2, ADDRESS_MAP_NAME(internal_pgm)),
+ data_config("data", ENDIANNESS_LITTLE, 8, 20)
{
}
diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c
index 4c4f189d16c..7d84f90425d 100644
--- a/src/emu/cpu/tms7000/tms7000.c
+++ b/src/emu/cpu/tms7000/tms7000.c
@@ -223,14 +223,14 @@ void tms7000_device::device_start()
{
m_timer_handle[tmr] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(tms7000_device::simple_timer_cb), this));
m_timer_handle[tmr]->adjust(attotime::never, tmr);
-
+
m_timer_data[tmr] = 0;
m_timer_control[tmr] = 0;
m_timer_decrementer[tmr] = 0;
m_timer_prescaler[tmr] = 0;
m_timer_capture_latch[tmr] = 0;
}
-
+
// register for savestates
save_item(NAME(m_irq_state));
save_item(NAME(m_idle_state));
@@ -274,7 +274,7 @@ void tms7000_device::state_string_export(const device_state_entry &entry, astrin
m_sr & 0x01 ? '?':'.'
);
break;
-
+
default: break;
}
}
@@ -306,13 +306,13 @@ void tms7000_device::device_reset()
write_p(0x05, 0x00); // ddr a
write_p(0x09, 0x00); // ddr c
write_p(0x0b, 0x00); // ddr d
-
+
if (!chip_is_cmos())
{
write_p(0x08, 0xff); // port c
write_p(0x0a, 0xff); // port d
}
-
+
// when _RESET goes inactive (0 to 1)
m_sr = 0;
@@ -345,10 +345,10 @@ void tms7000_device::execute_set_input(int extline, int state)
if (m_irq_state[extline] != irqstate)
{
m_irq_state[extline] = irqstate;
-
+
// set/clear internal irq flag
flag_ext_interrupt(extline);
-
+
if (m_irq_state[extline])
{
// latch timer 1 on INT3
@@ -358,7 +358,7 @@ void tms7000_device::execute_set_input(int extline, int state)
// on 70cx2, latch timer 2 on INT1
if (extline == TMS7000_INT1_LINE && chip_is_family_70cx2())
m_timer_capture_latch[1] = m_timer_decrementer[1];
-
+
// clear external if it's edge-triggered (70cx2-only)
if (m_io_control[2] & (0x02 << (4 * extline)))
m_irq_state[extline] = false;
@@ -385,7 +385,7 @@ void tms7000_device::check_interrupts()
// global interrupt bit
if (!(m_sr & SR_I))
return;
-
+
// check for and handle interrupt
for (int irqline = 0; irqline < 5; irqline++)
{
@@ -445,7 +445,7 @@ void tms7000_device::timer_reload(int tmr)
{
// stop possible running timer
m_timer_handle[tmr]->adjust(attotime::never, tmr);
-
+
if (m_timer_control[tmr] & 0x80)
{
m_timer_decrementer[tmr] = m_timer_data[tmr];
@@ -472,7 +472,7 @@ void tms7000_device::timer_tick_low(int tmr)
// set INT2/INT5
m_io_control[tmr] |= 0x08;
-
+
// cascaded timer
if (tmr == 0 && (m_timer_control[1] & 0xa0) == 0xa0)
timer_tick_pre(tmr + 1);
@@ -482,7 +482,7 @@ void tms7000_device::timer_tick_low(int tmr)
TIMER_CALLBACK_MEMBER(tms7000_device::simple_timer_cb)
{
int tmr = param;
-
+
// tick and restart timer
timer_tick_low(tmr);
timer_run(tmr);
@@ -521,7 +521,7 @@ READ8_MEMBER(tms7000_device::tms7000_pf_r)
return (m_io->read_byte(port) & ~m_port_ddr[port]) | (m_port_latch[port] & m_port_ddr[port]);
break;
}
-
+
// port direction (note: 7000 doesn't support it for port A)
case 0x05: case 0x09: case 0x0b:
return m_port_ddr[offset / 2 - 2];
@@ -545,16 +545,16 @@ WRITE8_MEMBER(tms7000_device::tms7000_pf_w)
// d1,d3,d5: INT1,2,3 flag (write 1 to clear flag)
// d6-d7: memory mode (currently not implemented)
m_io_control[0] = (m_io_control[0] & (~data & 0x2a)) | (data & 0xd5);
-
+
// possibly need to reactivate flags
if (data & 0x02)
flag_ext_interrupt(TMS7000_INT1_LINE);
if (data & 0x20)
flag_ext_interrupt(TMS7000_INT3_LINE);
-
+
check_interrupts();
break;
-
+
// i/o control (IOCNT1)
case 0x10:
// d0,d2: INT4,5 enable
@@ -568,7 +568,7 @@ WRITE8_MEMBER(tms7000_device::tms7000_pf_w)
// decrementer reload value
m_timer_data[offset >> 4] = data;
break;
-
+
// timer 1/2 control
case 0x03:
// d5: t1: cmos low-power mode when IDLE opcode is used (not emulated)
@@ -587,11 +587,11 @@ WRITE8_MEMBER(tms7000_device::tms7000_pf_w)
// d7: stop/start timer
m_timer_control[offset >> 4] = data;
timer_reload(offset >> 4);
-
+
// on cmos chip, clear INT2/INT5 as well
if (~data & 0x80 && chip_is_cmos())
m_io_control[offset >> 4] &= ~0x08;
-
+
break;
// port data (note: 7000 doesn't support it for port A)
@@ -604,7 +604,7 @@ WRITE8_MEMBER(tms7000_device::tms7000_pf_w)
m_port_latch[port] = data;
break;
}
-
+
// port direction (note: 7000 doesn't support it for port A)
case 0x05: case 0x09: case 0x0b:
// note: changing port direction does not change(refresh) the output pins
@@ -652,7 +652,7 @@ void tms7000_device::execute_one(UINT8 op)
case 0x0b: reti(); break;
case 0x0d: ldsp(); break;
case 0x0e: push_st(); break;
-
+
case 0x12: am_r2a(&tms7000_device::op_mov); break;
case 0x13: am_r2a(&tms7000_device::op_and); break;
case 0x14: am_r2a(&tms7000_device::op_or); break;
@@ -757,7 +757,7 @@ void tms7000_device::execute_one(UINT8 op)
case 0x7d: am_i2r(&tms7000_device::op_cmp); break;
case 0x7e: am_i2r(&tms7000_device::op_dac); break;
case 0x7f: am_i2r(&tms7000_device::op_dsb); break;
-
+
case 0x80: am_p2a(&tms7000_device::op_mov); break;
case 0x82: am_a2p(&tms7000_device::op_mov); break;
case 0x83: am_a2p(&tms7000_device::op_and); break;
@@ -798,7 +798,7 @@ void tms7000_device::execute_one(UINT8 op)
case 0xac: br_inx(); break;
case 0xad: cmpa_inx(); break;
case 0xae: call_inx(); break;
-
+
case 0xb0: am_a2a(&tms7000_device::op_mov); break; // aka clrc/tsta
case 0xb1: am_b2a(&tms7000_device::op_mov); break; // undocumented
case 0xb2: am_a(&tms7000_device::op_dec); break;
@@ -849,7 +849,7 @@ void tms7000_device::execute_one(UINT8 op)
case 0xdd: am_r(&tms7000_device::op_rrc); break;
case 0xde: am_r(&tms7000_device::op_rl); break;
case 0xdf: am_r(&tms7000_device::op_rlc); break;
-
+
case 0xe0: jmp(true); break;
case 0xe1: jmp(m_sr & SR_N); break; // jn/jlt
case 0xe2: jmp(m_sr & SR_Z); break; // jz/jeq
@@ -863,7 +863,7 @@ void tms7000_device::execute_one(UINT8 op)
case 0xf0: case 0xf1: case 0xf2: case 0xf3: case 0xf4: case 0xf5: case 0xf6: case 0xf7:
case 0xf8: case 0xf9: case 0xfa: case 0xfb: case 0xfc: case 0xfd: case 0xfe: case 0xff:
trap(op << 1); break;
-
+
default: illegal(op); break;
}
}
diff --git a/src/emu/cpu/z80/tmpz84c011.c b/src/emu/cpu/z80/tmpz84c011.c
index d513174fa8b..1d8a636e851 100644
--- a/src/emu/cpu/z80/tmpz84c011.c
+++ b/src/emu/cpu/z80/tmpz84c011.c
@@ -2,7 +2,7 @@
Toshiba TMPZ84C011, MPUZ80/TLCS-Z80 ASSP Family
Z80 CPU, CTC, CGC, I/O8x5
-
+
TODO:
- CGC (clock generator/controller)
diff --git a/src/emu/cpu/z80/tmpz84c015.c b/src/emu/cpu/z80/tmpz84c015.c
index f1d7856988b..40970912d14 100644
--- a/src/emu/cpu/z80/tmpz84c015.c
+++ b/src/emu/cpu/z80/tmpz84c015.c
@@ -2,7 +2,7 @@
Toshiba TMPZ84C015, MPUZ80/TLCS-Z80 ASSP Family
Z80 CPU, SIO, CTC, CGC, PIO, WDT
-
+
TODO:
- SIO configuration, or should that be up to the driver?
- CGC (clock generator/controller)
@@ -133,13 +133,13 @@ void tmpz84c015_device::device_post_load()
WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
{
data &= 7;
-
+
if (data > 5)
{
logerror("tmpz84c015: irq_priority_w undefined state %X\n", data);
data &= 3; // guess
}
-
+
if (m_irq_priority != data)
{
static const char *dev[3] = { "tmpz84c015_ctc", "tmpz84c015_sio", "tmpz84c015_pio" };
@@ -152,7 +152,7 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
{ 2, 0, 1 }, // 4: pio -> ctc -> sio -> ext
{ 1, 2, 0 } // 5: sio -> pio -> ctc -> ext
};
-
+
// reconfigure first 3 entries in daisy chain
const z80_daisy_config daisy_chain[] =
{
@@ -162,13 +162,13 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
{ NULL }
};
m_daisy.init(this, daisy_chain);
-
+
m_irq_priority = data;
}
}
static MACHINE_CONFIG_FRAGMENT( tmpz84c015 )
-
+
/* basic machine hardware */
MCFG_Z80SIO0_ADD("tmpz84c015_sio", DERIVED_CLOCK(1,1), 0, 0, 0, 0)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(DEVICE_SELF, INPUT_LINE_IRQ0))
diff --git a/src/emu/emupal.c b/src/emu/emupal.c
index c81f5772f51..bc902e78ad7 100644
--- a/src/emu/emupal.c
+++ b/src/emu/emupal.c
@@ -433,7 +433,7 @@ void palette_device::device_start()
if (share_ext != NULL)
m_paletteram_ext.set_membits(m_membits);
}
-
+
// override endianness if provided
if (m_endianness_supplied)
{
diff --git a/src/emu/image.c b/src/emu/image.c
index fca762dcb2d..31f3e10178e 100644
--- a/src/emu/image.c
+++ b/src/emu/image.c
@@ -310,11 +310,11 @@ void image_init(running_machine &machine)
image_battery_load_by_name - retrieves the battery
backed RAM for an image. A filename may be supplied
to the function.
-
+
The function comes in two flavors, depending on
- what should happen when no battery is available:
+ what should happen when no battery is available:
we could fill the memory with a given value, or
- pass a default battery (for a pre-initialized
+ pass a default battery (for a pre-initialized
battery from factory)
-------------------------------------------------*/
@@ -339,9 +339,9 @@ void image_battery_load_by_name(emu_options &options, const char *filename, void
{
file_error filerr;
int bytes_read = 0;
-
+
assert_always(buffer && (length > 0), "Must specify sensical buffer/length");
-
+
/* try to open the battery file and read it in, if possible */
emu_file file(options.nvram_directory(), OPEN_FLAG_READ);
filerr = file.open(filename);
diff --git a/src/emu/imagedev/cassette.c b/src/emu/imagedev/cassette.c
index d00089b20f2..4c6cbfe3520 100644
--- a/src/emu/imagedev/cassette.c
+++ b/src/emu/imagedev/cassette.c
@@ -32,7 +32,7 @@ cassette_image_device::cassette_image_device(const machine_config &mconfig, cons
m_formats(cassette_default_formats),
m_create_opts(NULL),
m_default_state(CASSETTE_PLAY),
- m_interface(NULL)
+ m_interface(NULL)
{
}
diff --git a/src/emu/luaengine.c b/src/emu/luaengine.c
index 29dde75a1ea..510f29eb8bb 100644
--- a/src/emu/luaengine.c
+++ b/src/emu/luaengine.c
@@ -44,7 +44,7 @@ const char *const lua_engine::tname_ioport = "lua.ioport";
lua_engine* lua_engine::luaThis = NULL;
-static void lstop(lua_State *L, lua_Debug *ar)
+static void lstop(lua_State *L, lua_Debug *ar)
{
(void)ar; /* unused arg. */
lua_sethook(L, NULL, 0, 0);
@@ -52,15 +52,15 @@ static void lstop(lua_State *L, lua_Debug *ar)
}
-static void laction(int i)
+static void laction(int i)
{
signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
- terminate process (default action) */
+ terminate process (default action) */
lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
}
int lua_engine::report(int status) {
- if (status != LUA_OK && !lua_isnil(m_lua_state, -1))
+ if (status != LUA_OK && !lua_isnil(m_lua_state, -1))
{
const char *msg = lua_tostring(m_lua_state, -1);
if (msg == NULL) msg = "(error object is not a string)";
@@ -73,21 +73,21 @@ int lua_engine::report(int status) {
}
-static int traceback (lua_State *L)
+static int traceback (lua_State *L)
{
- const char *msg = lua_tostring(L, 1);
- if (msg)
- luaL_traceback(L, L, msg, 1);
- else if (!lua_isnoneornil(L, 1))
- { /* is there an error object? */
- if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */
- lua_pushliteral(L, "(no error message)");
- }
- return 1;
+ const char *msg = lua_tostring(L, 1);
+ if (msg)
+ luaL_traceback(L, L, msg, 1);
+ else if (!lua_isnoneornil(L, 1))
+ { /* is there an error object? */
+ if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */
+ lua_pushliteral(L, "(no error message)");
+ }
+ return 1;
}
-int lua_engine::docall(int narg, int nres)
+int lua_engine::docall(int narg, int nres)
{
int status;
int base = lua_gettop(m_lua_state) - narg; /* function index */
@@ -105,13 +105,13 @@ int lua_engine::docall(int narg, int nres)
#define EOFMARK "<eof>"
#define marklen (sizeof(EOFMARK)/sizeof(char) - 1)
-int lua_engine::incomplete(int status)
+int lua_engine::incomplete(int status)
{
- if (status == LUA_ERRSYNTAX)
+ if (status == LUA_ERRSYNTAX)
{
size_t lmsg;
const char *msg = lua_tolstring(m_lua_state, -1, &lmsg);
- if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0)
+ if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0)
{
lua_pop(m_lua_state, 1);
return 1;
@@ -192,7 +192,7 @@ int lua_engine::l_ioport_write(lua_State *L)
{
ioport_field *field = static_cast<ioport_field *>(getparam(L, 1, tname_ioport));
luaL_argcheck(L, lua_isnumber(L, 2), 2, "value expected");
- field->set_value(lua_tointeger(L, 2));
+ field->set_value(lua_tointeger(L, 2));
return 0;
}
@@ -225,16 +225,16 @@ int lua_engine::l_emu_time(lua_State *L)
void lua_engine::emu_after_done(void *_h, INT32 param)
{
- hook *h = static_cast<hook *>(_h);
- h->call(this, h->precall(), 0);
- delete h;
+ hook *h = static_cast<hook *>(_h);
+ h->call(this, h->precall(), 0);
+ delete h;
}
int lua_engine::emu_after(lua_State *L)
{
luaL_argcheck(L, lua_isnumber(L, 1), 1, "waiting duration expected");
- struct hook *h = new hook;
- h->set(L, 2);
+ struct hook *h = new hook;
+ h->set(L, 2);
machine().scheduler().timer_set(attotime::from_double(lua_tonumber(L, 1)), timer_expired_delegate(FUNC(lua_engine::emu_after_done), this), 0, h);
return 0;
}
@@ -291,37 +291,37 @@ int lua_engine::l_emu_hook_output(lua_State *L)
void *lua_engine::checkparam(lua_State *L, int idx, const char *tname)
{
- const char *name;
+ const char *name;
- if(!lua_getmetatable(L, idx))
- return 0;
+ if(!lua_getmetatable(L, idx))
+ return 0;
- lua_rawget(L, LUA_REGISTRYINDEX);
- name = lua_tostring(L, -1);
- if(!name || strcmp(name, tname)) {
- lua_pop(L, 1);
- return 0;
- }
- lua_pop(L, 1);
+ lua_rawget(L, LUA_REGISTRYINDEX);
+ name = lua_tostring(L, -1);
+ if(!name || strcmp(name, tname)) {
+ lua_pop(L, 1);
+ return 0;
+ }
+ lua_pop(L, 1);
- return *static_cast<void **>(lua_touserdata(L, idx));
+ return *static_cast<void **>(lua_touserdata(L, idx));
}
void *lua_engine::getparam(lua_State *L, int idx, const char *tname)
{
void *p = checkparam(L, idx, tname);
- char msg[256];
- sprintf(msg, "%s expected", tname);
- luaL_argcheck(L, p, idx, msg);
- return p;
+ char msg[256];
+ sprintf(msg, "%s expected", tname);
+ luaL_argcheck(L, p, idx, msg);
+ return p;
}
void lua_engine::push(lua_State *L, void *p, const char *tname)
{
- void **pp = static_cast<void **>(lua_newuserdata(L, sizeof(void *)));
- *pp = p;
- luaL_getmetatable(L, tname);
- lua_setmetatable(L, -2);
+ void **pp = static_cast<void **>(lua_newuserdata(L, sizeof(void *)));
+ *pp = p;
+ luaL_getmetatable(L, tname);
+ lua_setmetatable(L, -2);
}
int lua_engine::l_emu_exit(lua_State *L)
@@ -333,10 +333,10 @@ int lua_engine::l_emu_exit(lua_State *L)
int lua_engine::l_emu_start(lua_State *L)
{
const char *system_name = luaL_checkstring(L,1);
-
+
int index = driver_list::find(system_name);
if (index != -1) {
- machine_manager::instance()->schedule_new_driver(driver_list::driver(index));
+ machine_manager::instance()->schedule_new_driver(driver_list::driver(index));
luaThis->machine().schedule_hard_reset();
}
return 1;
@@ -377,14 +377,14 @@ void lua_engine::serve_lua()
fflush(stdout);
char buff[LUA_MAXINPUT];
astring oldbuff;
-
+
const char *b = LUA_PROMPT;
-
+
do {
// Wait for input
- fputs(b, stdout); fflush(stdout); /* show prompt */
+ fputs(b, stdout); fflush(stdout); /* show prompt */
fgets(buff, LUA_MAXINPUT, stdin);
-
+
// Create message
osd_lock_acquire(lock);
if (msg.ready == 0) {
@@ -395,7 +395,7 @@ void lua_engine::serve_lua()
msg.done = 0;
}
osd_lock_release(lock);
-
+
// Wait for response
int done = 0;
do {
@@ -417,7 +417,7 @@ void lua_engine::serve_lua()
}
msg.done = 0;
osd_lock_release(lock);
-
+
} while (1);
}
@@ -439,16 +439,16 @@ lua_engine::lua_engine()
luaThis = this;
m_lua_state = luaL_newstate(); /* create state */
output_notifier_set = false;
-
+
luaL_checkversion(m_lua_state);
lua_gc(m_lua_state, LUA_GCSTOP, 0); /* stop collector during initialization */
luaL_openlibs(m_lua_state); /* open libraries */
-
+
luaopen_lsqlite3(m_lua_state);
-
+
luaopen_ioport(m_lua_state);
- lua_gc(m_lua_state, LUA_GCRESTART, 0);
+ lua_gc(m_lua_state, LUA_GCRESTART, 0);
msg.ready = 0;
msg.status = 0;
msg.done = 0;
@@ -466,9 +466,9 @@ lua_engine::~lua_engine()
void lua_engine::update_machine()
-{
+{
lua_newtable(m_lua_state);
- if (m_machine!=NULL)
+ if (m_machine!=NULL)
{
// Create the ioport array
ioport_port *port = machine().ioport().first_port();
@@ -501,8 +501,8 @@ void lua_engine::initialize()
.addCFunction ("time", l_emu_time )
.addCFunction ("wait", l_emu_wait )
.addCFunction ("after", l_emu_after )
- .addCFunction ("exit", l_emu_exit )
- .addCFunction ("start", l_emu_start )
+ .addCFunction ("exit", l_emu_exit )
+ .addCFunction ("start", l_emu_start )
.beginClass <machine_manager> ("manager")
.addFunction ("machine", &machine_manager::machine)
.addFunction ("options", &machine_manager::options)
@@ -531,8 +531,8 @@ void lua_engine::start_console()
void lua_engine::periodic_check()
{
- osd_lock_acquire(lock);
- if (msg.ready == 1) {
+ osd_lock_acquire(lock);
+ if (msg.ready == 1) {
lua_settop(m_lua_state, 0);
int status = luaL_loadbuffer(m_lua_state, msg.text.cstr(), strlen(msg.text.cstr()), "=stdin");
if (incomplete(status)==0) /* cannot try to add lines? */
@@ -548,19 +548,19 @@ void lua_engine::periodic_check()
luai_writestringerror("%s\n", lua_pushfstring(m_lua_state,
"error calling " LUA_QL("print") " (%s)",
lua_tostring(m_lua_state, -1)));
- }
+ }
}
- else
+ else
{
- status = -1;
+ status = -1;
}
msg.status = status;
msg.response = msg.text;
msg.text = "";
msg.ready = 0;
msg.done = 1;
- }
- osd_lock_release(lock);
+ }
+ osd_lock_release(lock);
}
//-------------------------------------------------
@@ -570,7 +570,7 @@ void lua_engine::periodic_check()
void lua_engine::close()
{
lua_settop(m_lua_state, 0); /* clear stack */
- lua_close(m_lua_state);
+ lua_close(m_lua_state);
}
//-------------------------------------------------
@@ -580,7 +580,7 @@ void lua_engine::close()
void lua_engine::load_script(const char *filename)
{
int s = luaL_loadfile(m_lua_state, filename);
- report(s);
+ report(s);
update_machine();
start();
}
@@ -592,7 +592,7 @@ void lua_engine::load_script(const char *filename)
void lua_engine::load_string(const char *value)
{
int s = luaL_loadstring(m_lua_state, value);
- report(s);
+ report(s);
update_machine();
start();
}
@@ -605,4 +605,3 @@ void lua_engine::start()
{
resume(m_lua_state);
}
-
diff --git a/src/emu/machine.c b/src/emu/machine.c
index 3ebf4678043..9120cb9c1bd 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -292,7 +292,7 @@ void running_machine::start()
// allocate autoboot timer
m_autoboot_timer = scheduler().timer_alloc(timer_expired_delegate(FUNC(running_machine::autoboot_callback), this));
-
+
manager().update_machine();
}
diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c
index 9bdc38a7b2e..82e54b70359 100644
--- a/src/emu/machine/53c810.c
+++ b/src/emu/machine/53c810.c
@@ -608,9 +608,9 @@ void lsi53c810_device::lsi53c810_reg_w(int offset, UINT8 data)
void lsi53c810_device::add_opcode(UINT8 op, UINT8 mask, opcode_handler_delegate handler)
{
- for (int i = 0; i < 256; i++)
+ for (int i = 0; i < 256; i++)
{
- if ((i & mask) == op)
+ if ((i & mask) == op)
{
dma_opcode[i] = handler;
}
@@ -629,7 +629,7 @@ void lsi53c810_device::device_start()
m_irq_cb.bind_relative_to(*owner());
m_dma_cb.bind_relative_to(*owner());
m_fetch_cb.bind_relative_to(*owner());
-
+
for (int i = 0; i < 256; i++)
{
dma_opcode[i] = opcode_handler_delegate(FUNC(lsi53c810_device::dmaop_invalid), this);
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index eb72e4b7723..745a2722ca9 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -307,7 +307,7 @@ UINT8 riot6532_device::reg_r(UINT8 offset, bool debugger_access)
if (!(*port->m_in_cb).isnull())
{
port->m_in = (*port->m_in_cb)(0);
-
+
/* changes to port A need to update the PA7 state */
if (port == &m_port[0])
{
diff --git a/src/emu/machine/68307.c b/src/emu/machine/68307.c
index 515b07d248d..1f65b7cccde 100644
--- a/src/emu/machine/68307.c
+++ b/src/emu/machine/68307.c
@@ -15,7 +15,7 @@
READ8_MEMBER( m68307cpu_device::m68307_internal_serial_r )
{
m68307cpu_device *m68k = this;
-
+
if (offset&1) return m_duart->read(*m68k->program, offset>>1);
return 0x0000;
}
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index 8e750637ed7..2abb6615997 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -89,13 +89,13 @@ void ptm6840_device::device_start()
m_out1_cb.resolve_safe();
m_out2_cb.resolve_safe();
m_irq_cb.resolve_safe();
-
+
for (int i = 0; i < 3; i++)
{
if ( m_external_clock[i] == 0 )
m_external_clock[i] = 1;
}
-
+
m_timer[0] = timer_alloc(0);
m_timer[1] = timer_alloc(1);
m_timer[2] = timer_alloc(2);
diff --git a/src/emu/machine/aakart.c b/src/emu/machine/aakart.c
index 3cbbb888514..f858f48f182 100644
--- a/src/emu/machine/aakart.c
+++ b/src/emu/machine/aakart.c
@@ -91,66 +91,66 @@ void aakart_device::device_reset()
void aakart_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- if(id == TX_TIMER && m_new_command & 1)
- {
- switch(m_tx_latch)
- {
- case 0x00:
- case 0x02:
- case 0x03:
- case 0x07:
- // ---- -x-- scroll lock
- // ---- --x- num lock
- // ---- ---x caps lock
- break;
- case 0x20:
- m_rx = 0x81;
- m_out_tx_cb(ASSERT_LINE);
- break;
- case 0x30:
- case 0x31:
- case 0x32:
- case 0x33:
- m_keyb_enable = m_tx_latch & 1;
- m_mouse_enable = (m_tx_latch & 2) >> 1;
- if(m_keyb_enable & 1 && m_keyb_state & 1)
- {
- //printf("Got row\n");
- m_rx = m_keyb_row;
- m_out_tx_cb(ASSERT_LINE);
- }
-
- break;
- case 0x3f:
- if(m_keyb_enable & 1 && m_keyb_state & 1)
- {
- //printf("Got col\n");
- m_rx = m_keyb_col;
- m_out_tx_cb(ASSERT_LINE);
- m_keyb_state = 0;
- }
-
- break;
- case 0xfd:
- m_rx = 0xfd;
- m_out_tx_cb(ASSERT_LINE);
- break;
- case 0xfe:
- m_rx = 0xfe;
- m_out_tx_cb(ASSERT_LINE);
- break;
- case 0xff:
- m_rx = 0xff;
- m_out_tx_cb(ASSERT_LINE);
- break;
- default:
- //printf("%02x %02x %02x\n",m_tx_latch,m_rx_latch,m_keyb_enable);
- break;
- }
-
- //m_new_command &= ~1;
- m_out_rx_cb(ASSERT_LINE);
- }
+ if(id == TX_TIMER && m_new_command & 1)
+ {
+ switch(m_tx_latch)
+ {
+ case 0x00:
+ case 0x02:
+ case 0x03:
+ case 0x07:
+ // ---- -x-- scroll lock
+ // ---- --x- num lock
+ // ---- ---x caps lock
+ break;
+ case 0x20:
+ m_rx = 0x81;
+ m_out_tx_cb(ASSERT_LINE);
+ break;
+ case 0x30:
+ case 0x31:
+ case 0x32:
+ case 0x33:
+ m_keyb_enable = m_tx_latch & 1;
+ m_mouse_enable = (m_tx_latch & 2) >> 1;
+ if(m_keyb_enable & 1 && m_keyb_state & 1)
+ {
+ //printf("Got row\n");
+ m_rx = m_keyb_row;
+ m_out_tx_cb(ASSERT_LINE);
+ }
+
+ break;
+ case 0x3f:
+ if(m_keyb_enable & 1 && m_keyb_state & 1)
+ {
+ //printf("Got col\n");
+ m_rx = m_keyb_col;
+ m_out_tx_cb(ASSERT_LINE);
+ m_keyb_state = 0;
+ }
+
+ break;
+ case 0xfd:
+ m_rx = 0xfd;
+ m_out_tx_cb(ASSERT_LINE);
+ break;
+ case 0xfe:
+ m_rx = 0xfe;
+ m_out_tx_cb(ASSERT_LINE);
+ break;
+ case 0xff:
+ m_rx = 0xff;
+ m_out_tx_cb(ASSERT_LINE);
+ break;
+ default:
+ //printf("%02x %02x %02x\n",m_tx_latch,m_rx_latch,m_keyb_enable);
+ break;
+ }
+
+ //m_new_command &= ~1;
+ m_out_rx_cb(ASSERT_LINE);
+ }
}
@@ -162,8 +162,8 @@ void aakart_device::device_timer(emu_timer &timer, device_timer_id id, int param
READ8_MEMBER( aakart_device::read )
{
- m_out_tx_cb(CLEAR_LINE);
- //debugger_break(machine());
+ m_out_tx_cb(CLEAR_LINE);
+ //debugger_break(machine());
return m_rx;
}
@@ -172,22 +172,22 @@ WRITE8_MEMBER( aakart_device::write )
// if(m_new_command) printf("skip cmd %02x\n",data);
m_tx_latch = data;
- m_out_rx_cb(CLEAR_LINE);
- m_new_command |= 1;
+ m_out_rx_cb(CLEAR_LINE);
+ m_new_command |= 1;
}
void aakart_device::send_keycode_down(UINT8 row, UINT8 col)
{
- //printf("keycode down\n");
- m_keyb_row = row | 0xc0;
- m_keyb_col = col | 0xc0;
- m_keyb_state = 1;
+ //printf("keycode down\n");
+ m_keyb_row = row | 0xc0;
+ m_keyb_col = col | 0xc0;
+ m_keyb_state = 1;
}
void aakart_device::send_keycode_up(UINT8 row, UINT8 col)
{
- //printf("keycode up\n");
- m_keyb_row = row | 0xd0;
- m_keyb_col = col | 0xd0;
- m_keyb_state = 1;
+ //printf("keycode up\n");
+ m_keyb_row = row | 0xd0;
+ m_keyb_col = col | 0xd0;
+ m_keyb_state = 1;
}
diff --git a/src/emu/machine/adc0808.c b/src/emu/machine/adc0808.c
index 7deda583b54..30db128e148 100644
--- a/src/emu/machine/adc0808.c
+++ b/src/emu/machine/adc0808.c
@@ -89,9 +89,9 @@ void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int para
/* sample input */
double vref_pos = m_in_vref_pos_cb();
double vref_neg = m_in_vref_neg_cb();
-
+
double input = 0;
-
+
switch (m_address)
{
case 0:
@@ -117,7 +117,7 @@ void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int para
break;
case 7:
input = m_in_in_7_cb();
- break;
+ break;
break;
}
m_sar = (255 * (input - vref_neg)) / (vref_pos - vref_neg);
diff --git a/src/emu/machine/akiko.c b/src/emu/machine/akiko.c
index c9eb0a30114..a109f87f755 100644
--- a/src/emu/machine/akiko.c
+++ b/src/emu/machine/akiko.c
@@ -1,13 +1,13 @@
/***************************************************************************
- Akiko
+ Akiko
- ASIC used in the Amiga CD32. Commodore Part number 391563-01.
+ ASIC used in the Amiga CD32. Commodore Part number 391563-01.
- - CD-ROM controller
- - Builtin 1KB NVRAM
- - Chunky to planar converter
- - 2x CIA chips
+ - CD-ROM controller
+ - Builtin 1KB NVRAM
+ - Chunky to planar converter
+ - 2x CIA chips
***************************************************************************/
diff --git a/src/emu/machine/amigafdc.c b/src/emu/machine/amigafdc.c
index ac4ddaae66d..e8d556af84c 100644
--- a/src/emu/machine/amigafdc.c
+++ b/src/emu/machine/amigafdc.c
@@ -238,7 +238,7 @@ void amiga_fdc::live_run(const attotime &limit)
if(adkcon & 0x0400) {
if(dma_state == DMA_WAIT_START) {
cur_live.bit_counter = 0;
-
+
if(!(dsklen & 0x3fff))
dma_done();
else if(dsklen & 0x4000) {
@@ -286,23 +286,23 @@ void amiga_fdc::live_run(const attotime &limit)
if(cur_live.bit_counter != 8)
fatalerror("amiga_fdc::live_run - cur_live.bit_counter != 8\n");
cur_live.bit_counter = 0;
-
+
switch(dma_state) {
case DMA_IDLE:
case DMA_WAIT_START:
break;
-
+
case DMA_RUNNING_BYTE_0:
dma_state = DMA_RUNNING_BYTE_1;
break;
-
+
case DMA_RUNNING_BYTE_1: {
dma_value = dma_read();
break;
}
}
}
-
+
cur_live.state = RUNNING;
checkpoint();
break;
@@ -331,7 +331,7 @@ void amiga_fdc::dma_check()
cur_live.bit_counter = 0;
dma_value = dma_read();
}
- }
+ }
} else {
dskbyt |= 0x4000;
if(dsklen & 0x4000)
diff --git a/src/emu/machine/atahle.c b/src/emu/machine/atahle.c
index ee1c5756e9f..ca41368ae0c 100644
--- a/src/emu/machine/atahle.c
+++ b/src/emu/machine/atahle.c
@@ -708,16 +708,16 @@ READ16_MEMBER( ata_hle_device::read_cs1 )
case IDE_CS1_ACTIVE_STATUS:
/*
- bit description
-
- 0 master active
- 1 slave active
- 2 complement of active disk head bit 0
- 3 complement of active disk head bit 1
- 4 complement of active disk head bit 2
- 5 complement of active disk head bit 3
- 6 write in progress
- 7 floppy present (unused)
+ bit description
+
+ 0 master active
+ 1 slave active
+ 2 complement of active disk head bit 0
+ 3 complement of active disk head bit 1
+ 4 complement of active disk head bit 2
+ 5 complement of active disk head bit 3
+ 6 write in progress
+ 7 floppy present (unused)
*/
if (device_selected())
diff --git a/src/emu/machine/autoconfig.c b/src/emu/machine/autoconfig.c
index 3c93efa6cff..15ddfcb64d9 100644
--- a/src/emu/machine/autoconfig.c
+++ b/src/emu/machine/autoconfig.c
@@ -1,6 +1,6 @@
/***************************************************************************
- Amiga Autoconfig
+ Amiga Autoconfig
***************************************************************************/
diff --git a/src/emu/machine/corvushd.c b/src/emu/machine/corvushd.c
index 6dc169bd773..7d450e3fcaf 100644
--- a/src/emu/machine/corvushd.c
+++ b/src/emu/machine/corvushd.c
@@ -224,7 +224,7 @@ bool corvus_hdc_t::parse_hdc_command(UINT8 data) {
//
// Prep Commands
//
- case PREP_MODE_SELECT:
+ case PREP_MODE_SELECT:
case PREP_RESET_DRIVE:
case PREP_FORMAT_DRIVE:
case PREP_FILL_DRIVE_OMNI:
@@ -692,14 +692,14 @@ UINT8 corvus_hdc_t::corvus_get_drive_parameters(UINT8 drv) {
// This firmware string and revision were taken from the Corvus firmware
// file CORVB184.CLR found on the SSE SoftBox distribution disk.
- strcpy((char *) m_buffer.drive_param_response.firmware_desc, "V18.4 -- CONST II - 11/82 ");
+ strcpy((char *) m_buffer.drive_param_response.firmware_desc, "V18.4 -- CONST II - 11/82 ");
m_buffer.drive_param_response.firmware_rev = 37;
// Controller ROM version
m_buffer.drive_param_response.rom_version = ROM_VERSION;
//
- // Track information
+ // Track information
//
m_buffer.drive_param_response.track_info.sectors_per_track = m_sectors_per_track;
m_buffer.drive_param_response.track_info.tracks_per_cylinder = m_tracks_per_cylinder;
@@ -766,10 +766,10 @@ UINT8 corvus_hdc_t::corvus_read_boot_block(UINT8 block) {
//
// Enter prep mode. In prep mode, only prep mode commands may be executed.
//
-// A "prep block" is 512 bytes of machine code that the host sends to the
+// A "prep block" is 512 bytes of machine code that the host sends to the
// controller. The controller will jump to this code after receiving it,
// and it is what actually implements prep mode commands. This HLE ignores
-// the prep block from the host.
+// the prep block from the host.
//
// On the Rev B/H drives (which we emulate), a prep block is Z80 machine
// code and only one prep block can be sent. Sending the "put drive into
@@ -778,9 +778,9 @@ UINT8 corvus_hdc_t::corvus_read_boot_block(UINT8 block) {
// distribution disk returns error 0x8f (unrecognized command) for this case.
//
// On the OmniDrive and Bank, a prep block is 6801 machine code. These
-// controllers allow multiple prep blocks to be sent. The first time the
+// controllers allow multiple prep blocks to be sent. The first time the
// "put drive into prep mode" command is sent puts the drive into prep mode.
-// The command can then be sent again up to 3 times with more prep blocks.
+// The command can then be sent again up to 3 times with more prep blocks.
// (Mass Storage GTI, pages 50-51)
//
// Pass:
@@ -791,7 +791,7 @@ UINT8 corvus_hdc_t::corvus_read_boot_block(UINT8 block) {
// Status of command
//
UINT8 corvus_hdc_t::corvus_enter_prep_mode(UINT8 drv, UINT8 *prep_block) {
- // on rev b/h drives, sending the "put drive into prep mode"
+ // on rev b/h drives, sending the "put drive into prep mode"
// command when already in prep mode is an error.
if (m_prep_mode) {
logerror("corvus_enter_prep_mode: Attempt to enter prep mode while in prep mode\n");
@@ -809,7 +809,7 @@ UINT8 corvus_hdc_t::corvus_enter_prep_mode(UINT8 drv, UINT8 *prep_block) {
m_prep_mode = true;
m_prep_drv = drv;
- return STAT_SUCCESS;
+ return STAT_SUCCESS;
}
@@ -826,7 +826,7 @@ UINT8 corvus_hdc_t::corvus_exit_prep_mode() {
LOG(("corvus_exit_prep_mode: Prep mode exited\n"));
m_prep_mode = false;
m_prep_drv = 0;
- return STAT_SUCCESS;
+ return STAT_SUCCESS;
}
@@ -852,7 +852,7 @@ UINT8 corvus_hdc_t::corvus_read_firmware_block(UINT8 head, UINT8 sector) {
LOG(("corvus_read_firmware_block: Reading firmware head: 0x%2.2x, sector: 0x%2.2x, relative_sector: 0x%2.2x\n",
head, sector, relative_sector));
- status = corvus_read_sector(m_prep_drv, relative_sector, m_buffer.read_512_response.data, 512);
+ status = corvus_read_sector(m_prep_drv, relative_sector, m_buffer.read_512_response.data, 512);
return status;
}
@@ -880,7 +880,7 @@ UINT8 corvus_hdc_t::corvus_write_firmware_block(UINT8 head, UINT8 sector, UINT8
LOG(("corvus_write_firmware_block: Writing firmware head: 0x%2.2x, sector: 0x%2.2x, relative_sector: 0x%2.2x\n",
head, sector, relative_sector));
- status = corvus_write_sector(m_prep_drv, relative_sector, buffer, 512);
+ status = corvus_write_sector(m_prep_drv, relative_sector, buffer, 512);
return status;
}
@@ -1067,7 +1067,7 @@ void corvus_hdc_t::corvus_process_command_packet(bool invalid_command_flag) {
break;
case PREP_MODE_SELECT:
m_buffer.single_byte_response.status =
- corvus_enter_prep_mode(m_buffer.prep_mode_command.drive,
+ corvus_enter_prep_mode(m_buffer.prep_mode_command.drive,
m_buffer.prep_mode_command.prep_block);
break;
default:
@@ -1082,11 +1082,11 @@ void corvus_hdc_t::corvus_process_command_packet(bool invalid_command_flag) {
// when already in prep mode, some drives allow this command to
// be sent again. see corvus_enter_prep_mode() for details.
m_buffer.single_byte_response.status =
- corvus_enter_prep_mode(m_buffer.prep_mode_command.drive,
+ corvus_enter_prep_mode(m_buffer.prep_mode_command.drive,
m_buffer.prep_mode_command.prep_block);
break;
case PREP_RESET_DRIVE:
- m_buffer.single_byte_response.status =
+ m_buffer.single_byte_response.status =
corvus_exit_prep_mode();
break;
case PREP_READ_FIRMWARE:
@@ -1105,7 +1105,7 @@ void corvus_hdc_t::corvus_process_command_packet(bool invalid_command_flag) {
break;
case PREP_VERIFY:
m_buffer.verify_drive_response.status = STAT_SUCCESS;
- m_buffer.verify_drive_response.bad_sectors = 0;
+ m_buffer.verify_drive_response.bad_sectors = 0;
break;
default:
m_xmit_bytes = 1;
diff --git a/src/emu/machine/cr511b.c b/src/emu/machine/cr511b.c
index 20968e1760b..83d393825db 100644
--- a/src/emu/machine/cr511b.c
+++ b/src/emu/machine/cr511b.c
@@ -1,12 +1,12 @@
/***************************************************************************
- CR-511-B CD-ROM drive
+ CR-511-B CD-ROM drive
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- CD-ROM drive with a custom MKE/Panasonic interface as used in the
- Commodore CDTV and early SoundBlaster cards.
+ CD-ROM drive with a custom MKE/Panasonic interface as used in the
+ Commodore CDTV and early SoundBlaster cards.
***************************************************************************/
@@ -109,7 +109,6 @@ READ8_MEMBER( cr511b_device::read )
WRITE8_MEMBER ( cr511b_device::write )
{
-
}
WRITE_LINE_MEMBER( cr511b_device::enable_w )
diff --git a/src/emu/machine/dmac.c b/src/emu/machine/dmac.c
index 7f2f674a793..96f7782def4 100644
--- a/src/emu/machine/dmac.c
+++ b/src/emu/machine/dmac.c
@@ -462,6 +462,5 @@ WRITE_LINE_MEMBER( dmac_device::xdreq_w )
if (m_dma_active)
{
-
}
}
diff --git a/src/emu/machine/eepromser.c b/src/emu/machine/eepromser.c
index 25661f88a67..5b5d8a5b70a 100644
--- a/src/emu/machine/eepromser.c
+++ b/src/emu/machine/eepromser.c
@@ -763,7 +763,6 @@ WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state);
eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
-
}
@@ -785,7 +784,7 @@ void eeprom_serial_x24c44_device::device_start()
m_ram_length=0xf;
for (i=0;i<16;i++){
- m_ram_data[i]=read(i); //autoreload at power up
+ m_ram_data[i]=read(i); //autoreload at power up
}
m_reading=0;
m_store_latch=0;
@@ -828,7 +827,7 @@ void eeprom_serial_x24c44_device::copy_ram_to_eeprom(){
}else{
LOG0(("Store command with store latch not set!\n"));
}
-
+
}
//-------------------------------------------------
@@ -902,7 +901,7 @@ void eeprom_serial_x24c44_device::execute_command()
copy_ram_to_eeprom();
set_state(STATE_IN_RESET);
break;
-
+
default:
throw emu_fatalerror("execute_command called with invalid command %d\n", m_command);
}
@@ -959,16 +958,16 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event)
{
// if we have enough bits for a command + address, check it out
m_command_address_accum = (m_command_address_accum << 1) | m_di_state;
-
+
m_bits_accum=m_bits_accum+1;
-
+
if (m_bits_accum == 2 + m_command_address_bits){
//read command is only 2 bits all other are 3 bits!!!
parse_command_and_address_2_bit();
}
-
+
if (!m_reading){
if (m_bits_accum == 3 + m_command_address_bits){
execute_command();
@@ -983,23 +982,20 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event)
case STATE_READING_DATA:
if (event == EVENT_CLK_RISING_EDGE)
{
-
int bit_index = m_bits_accum++;
if (bit_index % m_data_bits == 0 && (bit_index == 0 || m_streaming_enabled)){
-
m_shift_register=m_ram_data[m_address];
-
+
//m_shift_register=BITSWAP16(m_shift_register,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
//m_shift_register=BITSWAP16(m_shift_register,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8);
m_shift_register= BITSWAP16(m_shift_register,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
m_shift_register=m_shift_register<<16;
-
+
LOG1(("read from RAM addr %02X data(from ram) %04X ,m_shift_register vale %04X \n",m_address,m_ram_data[m_address],m_shift_register));
}
else{
-
m_shift_register = (m_shift_register << 1) | 1;
}
@@ -1023,10 +1019,8 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event)
case STATE_WAIT_FOR_DATA:
if (event == EVENT_CLK_RISING_EDGE)
{
-
m_shift_register = (m_shift_register << 1) | m_di_state;
if (++m_bits_accum == m_data_bits){
-
//m_shift_register=BITSWAP16(m_shift_register, 0, 1, 2, 3, 4, 5,6,7, 8, 9,10,11,12,13,14,15);
//m_shift_register=BITSWAP16(m_shift_register, 7, 6, 5, 4, 3, 2,1,0,15,14,13,12,11,10, 9, 8);
m_shift_register=BITSWAP16(m_shift_register,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
@@ -1042,7 +1036,7 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event)
}
break;
-
+
// CS is asserted; waiting for completion; watch for CS falling
case STATE_WAIT_FOR_COMPLETION:
if (event == EVENT_CS_FALLING_EDGE)
@@ -1059,7 +1053,6 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event)
void eeprom_serial_x24c44_device::parse_command_and_address()
{
-
//command is start_bit - 4bit_address - 3bit_command
// set the defaults
@@ -1068,27 +1061,27 @@ void eeprom_serial_x24c44_device::parse_command_and_address()
m_address = (m_command_address_accum >> 3) & 0x0f;
LOG1(("EEPROM: command= %04X, address %02X\n", m_command_address_accum& 0x07, m_address));
-
+
switch (m_command_address_accum & 0x07)
{
- case 0: //reset write enable latch
+ case 0: //reset write enable latch
LOG0(("Lock eeprom\n"));
- m_command = COMMAND_LOCK; break;
+ m_command = COMMAND_LOCK; break;
case 3: //write data into ram
LOG0(("Write to ram\n"));
- m_command = COMMAND_WRITE; break;
+ m_command = COMMAND_WRITE; break;
case 4: //set write enable latch
LOG0(("Unlock eeprom\n"));
- m_command = COMMAND_UNLOCK; break;
+ m_command = COMMAND_UNLOCK; break;
case 1: //store ram data in eeprom
LOG0(("copy ram to eeprom\n"));
m_command = COMMAND_COPY_RAM_TO_EEPROM; break;
case 5: //reload eeprom data into ram
LOG0(("copy eeprom to ram\n"));
- m_command = COMMAND_COPY_EEPROM_TO_RAM; break;
+ m_command = COMMAND_COPY_EEPROM_TO_RAM; break;
case 2: //reserved (Sleep on x2444)
m_command = COMMAND_INVALID;
- break;
+ break;
}
@@ -1096,10 +1089,7 @@ void eeprom_serial_x24c44_device::parse_command_and_address()
void eeprom_serial_x24c44_device::parse_command_and_address_2_bit()
{
-
-
if ((m_command_address_accum & 0x03) == 0x03){
-
m_command = COMMAND_READ;
m_address = ((m_command_address_accum >> 2) & 0x0f);
m_shift_register = 0;
@@ -1108,7 +1098,7 @@ void eeprom_serial_x24c44_device::parse_command_and_address_2_bit()
m_reading=1;
m_bits_accum=0;
}
-
+
// warn about out-of-range addresses
if (m_address >= (1 << m_address_bits))
LOG1(("EEPROM: out-of-range address 0x%X provided (maximum should be 0x%X)\n", m_address, (1 << m_address_bits) - 1));
diff --git a/src/emu/machine/gayle.c b/src/emu/machine/gayle.c
index 2fcff8d6d5b..9328fff22e2 100644
--- a/src/emu/machine/gayle.c
+++ b/src/emu/machine/gayle.c
@@ -1,11 +1,11 @@
/***************************************************************************
- GAYLE
+ GAYLE
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Gate array used in the Amiga 600 and Amiga 1200 computers.
+ Gate array used in the Amiga 600 and Amiga 1200 computers.
***************************************************************************/
diff --git a/src/emu/machine/hd63450.c b/src/emu/machine/hd63450.c
index 061f574a069..18fbd7f462a 100644
--- a/src/emu/machine/hd63450.c
+++ b/src/emu/machine/hd63450.c
@@ -489,7 +489,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq0_w)
{
bool ostate = m_drq_state[0];
m_drq_state[0] = state;
-
+
if((m_reg[0].ocr & 2) && (state && !ostate))
{
// in cycle steal mode drq is supposed to be edge triggered
@@ -518,7 +518,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq2_w)
{
bool ostate = m_drq_state[2];
m_drq_state[2] = state;
-
+
if((m_reg[2].ocr & 2) && (state && !ostate))
{
single_transfer(2);
@@ -532,7 +532,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq3_w)
{
bool ostate = m_drq_state[3];
m_drq_state[3] = state;
-
+
if((m_reg[3].ocr & 2) && (state && !ostate))
{
single_transfer(3);
diff --git a/src/emu/machine/i8255.c b/src/emu/machine/i8255.c
index a3f0812bc80..0bea38d4969 100644
--- a/src/emu/machine/i8255.c
+++ b/src/emu/machine/i8255.c
@@ -286,7 +286,7 @@ void i8255_device::device_start()
m_out_pa_cb.resolve_safe();
m_out_pb_cb.resolve_safe();
m_out_pc_cb.resolve_safe();
-
+
// register for state saving
save_item(NAME(m_control));
save_item(NAME(m_output));
@@ -522,7 +522,7 @@ void i8255_device::write_mode1(int port, UINT8 data)
m_out_pb_cb((offs_t)0, m_output[port]);
else
m_out_pc_cb((offs_t)0, m_output[port]);
-
+
// set output buffer full flag
set_obf(port, 0);
diff --git a/src/emu/machine/i8271.c b/src/emu/machine/i8271.c
index 72ab86d3acd..24282df971e 100644
--- a/src/emu/machine/i8271.c
+++ b/src/emu/machine/i8271.c
@@ -1046,7 +1046,7 @@ void i8271_device::command_execute()
/* these two do not appear to be set at all! ?? */
- if (m_floppy[0])
+ if (m_floppy[0])
{
if (m_floppy[0]->floppy_drive_get_flag_state(FLOPPY_DRIVE_READY))
{
@@ -1054,7 +1054,7 @@ void i8271_device::command_execute()
}
}
- if (m_floppy[1])
+ if (m_floppy[1])
{
if (m_floppy[1]->floppy_drive_get_flag_state(FLOPPY_DRIVE_READY))
{
diff --git a/src/emu/machine/keyboard.c b/src/emu/machine/keyboard.c
index 29271e817b7..dc64116d377 100644
--- a/src/emu/machine/keyboard.c
+++ b/src/emu/machine/keyboard.c
@@ -8,9 +8,9 @@ or for the case of a computer with an inbuilt (not serial) ascii keyboard.
Example of usage in a driver.
In MACHINE_CONFIG
-
- MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(xxx_state, kbd_put))
+
+ MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+ MCFG_GENERIC_KEYBOARD_CB(WRITE8(xxx_state, kbd_put))
In the code:
diff --git a/src/emu/machine/mb89363b.c b/src/emu/machine/mb89363b.c
index d8094ef935d..83119fb7354 100644
--- a/src/emu/machine/mb89363b.c
+++ b/src/emu/machine/mb89363b.c
@@ -1,4 +1,4 @@
-/*
+/*
(this acts as a trampoline to 2x i8255 chips)
@@ -12,47 +12,47 @@
Note: MB89363B is compatible with 8255
Pin Assignment:
- +5v
- P P P P P P P P P V P P P P P P P P P
- N N 5 4 4 4 4 4 4 4 4 C N 1 1 1 1 1 1 1 1 2 N N
- C C 3 0 1 2 3 4 5 6 7 C C 7 6 5 4 3 2 1 0 3 C C
-
- | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | |
- | | | | | | | | | | | | | | | | | | | | | | | |
- | | v v v v v v v v v | | v v v v v v v v v | |
- .-------------------------------------------------------.
- | 6 6 6 6 6 5 5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 |
- | 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 |
- P52 <-> | 65 40 | <-> P22
- P51 <-> | 66 39 | <-> P21
- P50 <-> | 67 38 | <-> P20
- P54 <-> | 68 37 | <-> P24
- P55 <-> | 69 36 | <-> P25
- P56 <-> | 70 35 | <-> P26
- P57 <-> | 71 34 | <-> P27
- NC --- | 72 MB89363B 33 | --- NC
+ +5v
+ P P P P P P P P P V P P P P P P P P P
+ N N 5 4 4 4 4 4 4 4 4 C N 1 1 1 1 1 1 1 1 2 N N
+ C C 3 0 1 2 3 4 5 6 7 C C 7 6 5 4 3 2 1 0 3 C C
+
+ | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | |
+ | | | | | | | | | | | | | | | | | | | | | | | |
+ | | v v v v v v v v v | | v v v v v v v v v | |
+ .-------------------------------------------------------.
+ | 6 6 6 6 6 5 5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 |
+ | 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 |
+ P52 <-> | 65 40 | <-> P22
+ P51 <-> | 66 39 | <-> P21
+ P50 <-> | 67 38 | <-> P20
+ P54 <-> | 68 37 | <-> P24
+ P55 <-> | 69 36 | <-> P25
+ P56 <-> | 70 35 | <-> P26
+ P57 <-> | 71 34 | <-> P27
+ NC --- | 72 MB89363B 33 | --- NC
NC --- | 73 32 | <-- RSLCT1
GND --> | 74 31 | <-- RSLCT0
- CS2 --> | 75 30 | <-- GND
- R --> | 76 29 | <-- CS1
- P30 <-> | 77 28 | <-> P00
- P31 <-> | 78 27 | <-> P01
- P32 <-> | 79 26 | <-> P02
- P33 <-> | 80 25 | <-> P03
- \ 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 |
- \ 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 |
- -----------------------------------------------------'
- ^ ^ ^ ^ ^ ^ | | ^ | ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ |
- | | | | | | | | | | | | | | | | | | | | | | | |
- v v v v | | | | | | | v v v v v v v v v v v v |
-
- P P P P W R N N R N O D D D D D D D D P P P P N
- 3 3 3 3 S C C H C U B B B B B B B B 0 0 0 0 C
- 4 5 6 7 T / S 0 1 2 3 4 5 6 7 7 6 5 4
- R /
- L I
- N
- S
+ CS2 --> | 75 30 | <-- GND
+ R --> | 76 29 | <-- CS1
+ P30 <-> | 77 28 | <-> P00
+ P31 <-> | 78 27 | <-> P01
+ P32 <-> | 79 26 | <-> P02
+ P33 <-> | 80 25 | <-> P03
+ \ 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 |
+ \ 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 |
+ -----------------------------------------------------'
+ ^ ^ ^ ^ ^ ^ | | ^ | ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ |
+ | | | | | | | | | | | | | | | | | | | | | | | |
+ v v v v | | | | | | | v v v v v v v v v v v v |
+
+ P P P P W R N N R N O D D D D D D D D P P P P N
+ 3 3 3 3 S C C H C U B B B B B B B B 0 0 0 0 C
+ 4 5 6 7 T / S 0 1 2 3 4 5 6 7 7 6 5 4
+ R /
+ L I
+ N
+ S
Block Diagram / Pin Descriptions:
http://www.mess.org/_media/datasheets/fujitsu/mb89363b_partial.pdf
diff --git a/src/emu/machine/mc68681.c b/src/emu/machine/mc68681.c
index 4ac15448f5e..c6fd20968a6 100644
--- a/src/emu/machine/mc68681.c
+++ b/src/emu/machine/mc68681.c
@@ -246,21 +246,21 @@ TIMER_CALLBACK_MEMBER( mc68681_device::duart_timer_callback )
{
UINT8 csr = m_chanA->get_chan_CSR();
- if ((csr & 0xf0) == 0xd0) // tx is timer driven
+ if ((csr & 0xf0) == 0xd0) // tx is timer driven
{
m_chanA->tx_clock_w(half_period);
}
- if ((csr & 0x0f) == 0x0d) // rx is timer driven
+ if ((csr & 0x0f) == 0x0d) // rx is timer driven
{
m_chanA->rx_clock_w(half_period);
}
- csr = m_chanB->get_chan_CSR();
- if ((csr & 0xf0) == 0xd0) // tx is timer driven
+ csr = m_chanB->get_chan_CSR();
+ if ((csr & 0xf0) == 0xd0) // tx is timer driven
{
m_chanB->tx_clock_w(half_period);
}
- if ((csr & 0x0f) == 0x0d) // rx is timer driven
+ if ((csr & 0x0f) == 0x0d) // rx is timer driven
{
m_chanB->rx_clock_w(half_period);
}
@@ -721,7 +721,7 @@ void mc68681_channel::rcv_complete()
void mc68681_channel::tra_complete()
{
-// printf("%s ch %d Tx complete\n", tag(), m_ch);
+// printf("%s ch %d Tx complete\n", tag(), m_ch);
tx_ready = 1;
SR |= STATUS_TRANSMITTER_READY;
@@ -1147,4 +1147,3 @@ UINT8 mc68681_channel::get_chan_CSR()
{
return CSR;
}
-
diff --git a/src/emu/machine/ncr539x.c b/src/emu/machine/ncr539x.c
index 7b53fc345db..577578be1c7 100644
--- a/src/emu/machine/ncr539x.c
+++ b/src/emu/machine/ncr539x.c
@@ -57,9 +57,9 @@ static const char *rdregs[16] = {
"Command", // 3
"Status", // 4
"Interrupt Status", // 5
- "Internal State", // 6
- "Current FIFO/Internal State", // 7
- "Control Register 1", // 8
+ "Internal State", // 6
+ "Current FIFO/Internal State", // 7
+ "Control Register 1", // 8
"0x9",
"0xA",
"Control Register 2",
@@ -434,7 +434,7 @@ READ8_MEMBER( ncr539x_device::read )
WRITE8_MEMBER( ncr539x_device::write )
{
#if VERBOSE
- //if (offset != 2)
+ //if (offset != 2)
printf("539x: Write %02x @ %s (%02x) (PC=%x)\n", data, wrregs[offset], offset, space.device().safe_pc());
#endif
diff --git a/src/emu/machine/netlist.c b/src/emu/machine/netlist.c
index 55ef624f35e..eec6e947b31 100644
--- a/src/emu/machine/netlist.c
+++ b/src/emu/machine/netlist.c
@@ -439,10 +439,10 @@ ATTR_COLD void netlist_mame_device_t::save_state()
switch (s->m_dt)
{
case DT_DOUBLE:
- {
- double *td = s->resolved<double>();
- if (td != NULL) save_pointer(td, s->m_name, s->m_count);
- }
+ {
+ double *td = s->resolved<double>();
+ if (td != NULL) save_pointer(td, s->m_name, s->m_count);
+ }
break;
case DT_INT64:
save_pointer((INT64 *) s->m_ptr, s->m_name, s->m_count);
diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c
index 2c4ad64fc0e..c13c0375e38 100644
--- a/src/emu/machine/roc10937.c
+++ b/src/emu/machine/roc10937.c
@@ -199,17 +199,17 @@ void rocvfd_t::update_display()
}
}
-WRITE_LINE_MEMBER( rocvfd_t::sclk )
-{
- shift_clock(state);
+WRITE_LINE_MEMBER( rocvfd_t::sclk )
+{
+ shift_clock(state);
}
-WRITE_LINE_MEMBER( rocvfd_t::data )
-{
+WRITE_LINE_MEMBER( rocvfd_t::data )
+{
m_data = state;
}
-WRITE_LINE_MEMBER( rocvfd_t::por )
+WRITE_LINE_MEMBER( rocvfd_t::por )
{
//If line goes low, reset mode is engaged, until such a time as it goes high again.
if (!state)
diff --git a/src/emu/machine/upd765.c b/src/emu/machine/upd765.c
index d01a1563a38..3a77ca2021b 100644
--- a/src/emu/machine/upd765.c
+++ b/src/emu/machine/upd765.c
@@ -2523,5 +2523,3 @@ WRITE8_MEMBER(tc8566af_device::cr1_w)
tc_w((m_cr1 & 0x01) ? true : false);
}
}
-
-
diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c
index a5b836db3bd..0d149af3598 100644
--- a/src/emu/machine/wd17xx.c
+++ b/src/emu/machine/wd17xx.c
@@ -1,6 +1,6 @@
/***************************************************************************
- !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!!
+ !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!!
wd17xx.c
@@ -2024,11 +2024,11 @@ void wd1770_device::device_reset()
for (int i = 0; i < 4; i++)
{
- if (m_floppy_drive_tags[i])
+ if (m_floppy_drive_tags[i])
{
legacy_floppy_image_device *img = siblingdevice<legacy_floppy_image_device>(m_floppy_drive_tags[i]);
- if (img)
+ if (img)
{
img->floppy_drive_set_controller(this);
img->floppy_drive_set_index_pulse_callback(wd17xx_index_pulse_callback);
diff --git a/src/emu/machine/wd7600.c b/src/emu/machine/wd7600.c
index 9a97733f5a5..5d1821471aa 100644
--- a/src/emu/machine/wd7600.c
+++ b/src/emu/machine/wd7600.c
@@ -284,20 +284,20 @@ WRITE_LINE_MEMBER( wd7600_device::ctc_out2_w )
// Keyboard
WRITE8_MEMBER( wd7600_device::keyb_data_w )
{
-// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag(), data);
+// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag(), data);
m_keybc->data_w(space,0,data);
}
READ8_MEMBER( wd7600_device::keyb_data_r )
{
UINT8 ret = m_keybc->data_r(space,0);
-// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag(), ret);
+// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag(), ret);
return ret;
}
WRITE8_MEMBER( wd7600_device::keyb_cmd_w )
{
-// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag(), data);
+// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag(), data);
m_keybc->command_w(space,0,data);
}
diff --git a/src/emu/machine/wozfdc.c b/src/emu/machine/wozfdc.c
index 3bc64af44a2..c479aa3f370 100644
--- a/src/emu/machine/wozfdc.c
+++ b/src/emu/machine/wozfdc.c
@@ -42,7 +42,7 @@ const rom_entry *wozfdc_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -99,7 +99,7 @@ void wozfdc_device::a3_update_drive_sel()
}
else
{
- switch (drvsel & 3)
+ switch (drvsel & 3)
{
case 0:
newflop = floppy0->get_device();
@@ -213,7 +213,7 @@ void wozfdc_device::phase(int ph, bool on)
floppy->stp_w(false);
floppy->stp_w(true);
}
- }
+ }
}
}
@@ -396,7 +396,7 @@ void wozfdc_device::commit_predicted()
cur_lss.write_start_time = cur_lss.tm;
cur_lss.write_position = 0;
}
-
+
predicted_lss.tm = attotime::never;
}
@@ -409,7 +409,7 @@ void wozfdc_device::lss_sync()
while(cur_lss.tm < tm) {
lss_predict(tm);
commit_predicted();
- }
+ }
}
void wozfdc_device::lss_predict(attotime limit)
@@ -450,7 +450,7 @@ void wozfdc_device::lss_predict(attotime limit)
if(mode_write) {
if((write_line_active && !(address & 0x80)) ||
- (!write_line_active && (address & 0x80))) {
+ (!write_line_active && (address & 0x80))) {
write_line_active = !write_line_active;
assert(predicted_lss.write_position != 32);
predicted_lss.write_buffer[predicted_lss.write_position++] = cycles_to_time(cycles);
@@ -538,36 +538,35 @@ void appleiii_fdc::control_dx(int offset)
{
switch (offset)
{
- case 0: // clear drive select bit 0
+ case 0: // clear drive select bit 0
drvsel &= ~1;
break;
- case 1: // set drive select bit 0
+ case 1: // set drive select bit 0
drvsel |= 1;
break;
- case 2: // clear drive select bit 1
+ case 2: // clear drive select bit 1
drvsel &= ~2;
break;
- case 3: // set drive select bit 1
+ case 3: // set drive select bit 1
drvsel |= 2;
break;
- case 4: // clear enable 1
+ case 4: // clear enable 1
enable1 = 0;
break;
- case 5: // set enable 1
+ case 5: // set enable 1
enable1 = 1;
break;
- case 6: // clear side 2
+ case 6: // clear side 2
case 7: // set side 2
break;
- default: // cod8-c0df are not FDC related
+ default: // cod8-c0df are not FDC related
break;
}
}
-
diff --git a/src/emu/machine/ym2148.c b/src/emu/machine/ym2148.c
index 5332377eb5e..d61be4bed96 100644
--- a/src/emu/machine/ym2148.c
+++ b/src/emu/machine/ym2148.c
@@ -124,7 +124,7 @@ void ym2148_device::update_irq()
}
if ((m_status & STATUS_TRANSMIT_READY) && (m_control & CONTROL_TRANSMIT_IRQ_ENABLE))
{
-// m_irq_state = ASSERT_LINE;
+// m_irq_state = ASSERT_LINE;
}
m_irq_handler(m_irq_state);
@@ -205,4 +205,3 @@ WRITE_LINE_MEMBER(ym2148_device::write_rxd)
{
m_rxd = state;
}
-
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index d0b9a9b7a18..1ca2ce556a5 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -137,7 +137,7 @@ void z80ctc_device::device_start()
m_zc1_cb.resolve_safe();
m_zc2_cb.resolve_safe();
m_zc3_cb.resolve_safe();
-
+
// start each channel
m_channel[0].start(this, 0);
m_channel[1].start(this, 1);
@@ -520,7 +520,7 @@ void z80ctc_device::ctc_channel::timer_callback()
m_device->m_zc3_cb(0);
break;
}
-
+
// reset the down counter
m_down = m_tconst;
}
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 920c875079b..0807755a7bf 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -94,16 +94,16 @@ machine_manager* machine_manager::m_manager = NULL;
machine_manager* machine_manager::instance(emu_options &options,osd_interface &osd)
{
- if(!m_manager)
+ if(!m_manager)
{
- m_manager = global_alloc(machine_manager(options,osd));
- }
- return m_manager;
+ m_manager = global_alloc(machine_manager(options,osd));
+ }
+ return m_manager;
}
machine_manager* machine_manager::instance()
{
- return m_manager;
+ return m_manager;
}
//-------------------------------------------------
@@ -111,11 +111,11 @@ machine_manager* machine_manager::instance()
//-------------------------------------------------
machine_manager::machine_manager(emu_options &options,osd_interface &osd)
- : m_osd(osd),
- m_options(options),
- m_web(options),
- m_new_driver_pending(NULL),
- m_machine(NULL)
+ : m_osd(osd),
+ m_options(options),
+ m_web(options),
+ m_new_driver_pending(NULL),
+ m_machine(NULL)
{
}
@@ -148,8 +148,8 @@ void machine_manager::schedule_new_driver(const game_driver &driver)
/***************************************************************************
CORE IMPLEMENTATION
***************************************************************************/
-void machine_manager::update_machine()
-{
+void machine_manager::update_machine()
+{
m_lua.set_machine(m_machine);
m_web.set_machine(m_machine);
if (m_machine!=NULL) m_web.push_message("update_machine");
@@ -227,12 +227,12 @@ int machine_manager::execute()
m_options.set_value(OPTION_RAMSIZE, "", OPTION_PRIORITY_CMDLINE, error_string);
}
firstrun = true;
- }
- else
+ }
+ else
{
if (machine.exit_pending()) m_options.set_system_name("");
}
-
+
if (machine.exit_pending() && (!started_empty || (system == &GAME_NAME(___empty))))
exit_pending = true;
@@ -297,8 +297,7 @@ void CLIB_DECL logerror(const char *format, ...)
-------------------------------------------------*/
void CLIB_DECL vlogerror(const char *format, va_list arg)
-{
+{
if (machine_manager::instance()!=NULL && machine_manager::instance()->machine() != NULL)
machine_manager::instance()->machine()->vlogerror(format, arg);
}
-
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 6e9d5445baa..aa2f1636999 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -4976,4 +4976,3 @@ void handler_entry_write::write_stub_64(address_space &space, offs_t offset, UIN
}
}
}
-
diff --git a/src/emu/netlist/analog/nld_bjt.c b/src/emu/netlist/analog/nld_bjt.c
index 3238f407ae7..2f606fad0ae 100644
--- a/src/emu/netlist/analog/nld_bjt.c
+++ b/src/emu/netlist/analog/nld_bjt.c
@@ -115,12 +115,12 @@ NETLIB_START(QBJT_switch)
NETLIB_UPDATE(QBJT_switch)
{
- if (!m_RB.m_P.net().isRailNet())
- m_RB.m_P.schedule_solve(); // Basis
- else if (!m_RB.m_N.net().isRailNet())
- m_RB.m_N.schedule_solve(); // Emitter
- else if (!m_RC.m_P.net().isRailNet())
- m_RC.m_P.schedule_solve(); // Collector
+ if (!m_RB.m_P.net().isRailNet())
+ m_RB.m_P.schedule_solve(); // Basis
+ else if (!m_RB.m_N.net().isRailNet())
+ m_RB.m_N.schedule_solve(); // Emitter
+ else if (!m_RC.m_P.net().isRailNet())
+ m_RC.m_P.schedule_solve(); // Collector
}
diff --git a/src/emu/netlist/analog/nld_fourterm.c b/src/emu/netlist/analog/nld_fourterm.c
index 041b4f479a5..b8accb5c66d 100644
--- a/src/emu/netlist/analog/nld_fourterm.c
+++ b/src/emu/netlist/analog/nld_fourterm.c
@@ -13,34 +13,34 @@
NETLIB_START(VCCS)
{
- start_internal(1.0 / netlist().gmin());
+ start_internal(1.0 / netlist().gmin());
m_gfac = 1.0;
}
void NETLIB_NAME(VCCS)::start_internal(const double def_RI)
{
- register_param("G", m_G, 1.0);
- register_param("RI", m_RI, def_RI);
+ register_param("G", m_G, 1.0);
+ register_param("RI", m_RI, def_RI);
- register_terminal("IP", m_IP);
- register_terminal("IN", m_IN);
- register_terminal("OP", m_OP);
- register_terminal("ON", m_ON);
+ register_terminal("IP", m_IP);
+ register_terminal("IN", m_IN);
+ register_terminal("OP", m_OP);
+ register_terminal("ON", m_ON);
- register_terminal("_OP1", m_OP1);
- register_terminal("_ON1", m_ON1);
+ register_terminal("_OP1", m_OP1);
+ register_terminal("_ON1", m_ON1);
- m_IP.m_otherterm = &m_IN; // <= this should be NULL and terminal be filtered out prior to solving...
- m_IN.m_otherterm = &m_IP; // <= this should be NULL and terminal be filtered out prior to solving...
+ m_IP.m_otherterm = &m_IN; // <= this should be NULL and terminal be filtered out prior to solving...
+ m_IN.m_otherterm = &m_IP; // <= this should be NULL and terminal be filtered out prior to solving...
- m_OP.m_otherterm = &m_IP;
- m_OP1.m_otherterm = &m_IN;
+ m_OP.m_otherterm = &m_IP;
+ m_OP1.m_otherterm = &m_IN;
- m_ON.m_otherterm = &m_IP;
- m_ON1.m_otherterm = &m_IN;
+ m_ON.m_otherterm = &m_IP;
+ m_ON1.m_otherterm = &m_IN;
- connect(m_OP, m_OP1);
- connect(m_ON, m_ON1);
+ connect(m_OP, m_OP1);
+ connect(m_ON, m_ON1);
}
NETLIB_RESET(VCCS)
@@ -82,23 +82,23 @@ NETLIB_UPDATE(VCCS)
NETLIB_START(CCCS)
{
- start_internal(1.0);
- m_gfac = 1.0 / m_RI.Value();
+ start_internal(1.0);
+ m_gfac = 1.0 / m_RI.Value();
}
NETLIB_RESET(CCCS)
{
- NETLIB_NAME(VCCS)::reset();
+ NETLIB_NAME(VCCS)::reset();
}
NETLIB_UPDATE_PARAM(CCCS)
{
- NETLIB_NAME(VCCS)::update_param();
+ NETLIB_NAME(VCCS)::update_param();
}
NETLIB_UPDATE(CCCS)
{
- NETLIB_NAME(VCCS)::update();
+ NETLIB_NAME(VCCS)::update();
}
// ----------------------------------------------------------------------------------------
diff --git a/src/emu/netlist/analog/nld_opamps.c b/src/emu/netlist/analog/nld_opamps.c
index 6143a7ce00b..6ee4f8e3640 100644
--- a/src/emu/netlist/analog/nld_opamps.c
+++ b/src/emu/netlist/analog/nld_opamps.c
@@ -8,31 +8,30 @@
NETLIST_START(opamp_lm3900)
- /*
- * Fast norton opamp model without bandwidth
- */
+ /*
+ * Fast norton opamp model without bandwidth
+ */
- /* Terminal definitions for calling netlists */
+ /* Terminal definitions for calling netlists */
- ALIAS(PLUS, R1.1) // Positive input
- ALIAS(MINUS, R2.1) // Negative input
- ALIAS(OUT, G1.OP) // Opamp output ...
- ALIAS(VM, G1.ON) // V- terminal
- ALIAS(VP, DUMMY.I) // V+ terminal
+ ALIAS(PLUS, R1.1) // Positive input
+ ALIAS(MINUS, R2.1) // Negative input
+ ALIAS(OUT, G1.OP) // Opamp output ...
+ ALIAS(VM, G1.ON) // V- terminal
+ ALIAS(VP, DUMMY.I) // V+ terminal
- DUMMY_INPUT(DUMMY)
+ DUMMY_INPUT(DUMMY)
- /* The opamp model */
+ /* The opamp model */
- RES(R1, 1)
- RES(R2, 1)
- NET_C(R1.1, G1.IP)
- NET_C(R2.1, G1.IN)
- NET_C(R1.2, R2.2, G1.ON)
- VCVS(G1)
- PARAM(G1.G, 10000000)
- //PARAM(G1.RI, 100)
- PARAM(G1.RO, RES_K(8))
+ RES(R1, 1)
+ RES(R2, 1)
+ NET_C(R1.1, G1.IP)
+ NET_C(R2.1, G1.IN)
+ NET_C(R1.2, R2.2, G1.ON)
+ VCVS(G1)
+ PARAM(G1.G, 10000000)
+ //PARAM(G1.RI, 100)
+ PARAM(G1.RO, RES_K(8))
NETLIST_END()
-
diff --git a/src/emu/netlist/analog/nld_solver.c b/src/emu/netlist/analog/nld_solver.c
index c0bfe9de5f2..16d533ec55b 100644
--- a/src/emu/netlist/analog/nld_solver.c
+++ b/src/emu/netlist/analog/nld_solver.c
@@ -41,58 +41,58 @@
vector_ops_t *vector_ops_t::create_ops(const int size)
{
- switch (size)
- {
- case 1:
- return new vector_ops_impl_t<1>();
- case 2:
- return new vector_ops_impl_t<2>();
- case 3:
- return new vector_ops_impl_t<3>();
- case 4:
- return new vector_ops_impl_t<4>();
- case 5:
- return new vector_ops_impl_t<5>();
- case 6:
- return new vector_ops_impl_t<6>();
- case 7:
- return new vector_ops_impl_t<7>();
- case 8:
- return new vector_ops_impl_t<8>();
- case 9:
- return new vector_ops_impl_t<9>();
- case 10:
- return new vector_ops_impl_t<10>();
- case 11:
- return new vector_ops_impl_t<11>();
- case 12:
- return new vector_ops_impl_t<12>();
- default:
- return new vector_ops_impl_t<0>(size);
- }
+ switch (size)
+ {
+ case 1:
+ return new vector_ops_impl_t<1>();
+ case 2:
+ return new vector_ops_impl_t<2>();
+ case 3:
+ return new vector_ops_impl_t<3>();
+ case 4:
+ return new vector_ops_impl_t<4>();
+ case 5:
+ return new vector_ops_impl_t<5>();
+ case 6:
+ return new vector_ops_impl_t<6>();
+ case 7:
+ return new vector_ops_impl_t<7>();
+ case 8:
+ return new vector_ops_impl_t<8>();
+ case 9:
+ return new vector_ops_impl_t<9>();
+ case 10:
+ return new vector_ops_impl_t<10>();
+ case 11:
+ return new vector_ops_impl_t<11>();
+ case 12:
+ return new vector_ops_impl_t<12>();
+ default:
+ return new vector_ops_impl_t<0>(size);
+ }
}
ATTR_COLD void terms_t::add(netlist_terminal_t *term, int net_other)
{
- m_term.add(term);
- m_net_other.add(net_other);
- m_gt.add(0.0);
- m_go.add(0.0);
- m_Idr.add(0.0);
- m_other_curanalog.add(NULL);
+ m_term.add(term);
+ m_net_other.add(net_other);
+ m_gt.add(0.0);
+ m_go.add(0.0);
+ m_Idr.add(0.0);
+ m_other_curanalog.add(NULL);
}
ATTR_COLD void terms_t::set_pointers()
{
- for (int i = 0; i < count(); i++)
- {
- m_term[i]->m_gt1 = &m_gt[i];
- m_term[i]->m_go1 = &m_go[i];
- m_term[i]->m_Idr1 = &m_Idr[i];
- m_other_curanalog[i] = &m_term[i]->m_otherterm->net().as_analog().m_cur_Analog;
- }
-
- m_ops = vector_ops_t::create_ops(m_gt.count());
+ for (int i = 0; i < count(); i++)
+ {
+ m_term[i]->m_gt1 = &m_gt[i];
+ m_term[i]->m_go1 = &m_go[i];
+ m_term[i]->m_Idr1 = &m_Idr[i];
+ m_other_curanalog[i] = &m_term[i]->m_otherterm->net().as_analog().m_cur_Analog;
+ }
+
+ m_ops = vector_ops_t::create_ops(m_gt.count());
}
// ----------------------------------------------------------------------------------------
@@ -106,8 +106,8 @@ ATTR_COLD netlist_matrix_solver_t::netlist_matrix_solver_t(const netlist_solver_
ATTR_COLD netlist_matrix_solver_t::~netlist_matrix_solver_t()
{
- for (int i = 0; i < m_inps.count(); i++)
- delete m_inps[i];
+ for (int i = 0; i < m_inps.count(); i++)
+ delete m_inps[i];
}
ATTR_COLD void netlist_matrix_solver_t::setup(netlist_analog_net_t::list_t &nets)
@@ -118,8 +118,8 @@ ATTR_COLD void netlist_matrix_solver_t::setup(netlist_analog_net_t::list_t &nets
for (int k = 0; k < nets.count(); k++)
{
- m_nets.add(nets[k]);
- }
+ m_nets.add(nets[k]);
+ }
for (int k = 0; k < nets.count(); k++)
{
@@ -129,9 +129,9 @@ ATTR_COLD void netlist_matrix_solver_t::setup(netlist_analog_net_t::list_t &nets
net->m_solver = this;
- for (int i = 0; i < net->m_core_terms.count(); i++)
+ for (int i = 0; i < net->m_core_terms.count(); i++)
{
- netlist_core_terminal_t *p = net->m_core_terms[i];
+ netlist_core_terminal_t *p = net->m_core_terms[i];
NL_VERBOSE_OUT(("%s %s %d\n", p->name().cstr(), net->name().cstr(), (int) net->isRailNet()));
switch (p->type())
{
@@ -160,28 +160,28 @@ ATTR_COLD void netlist_matrix_solver_t::setup(netlist_analog_net_t::list_t &nets
NL_VERBOSE_OUT(("Added terminal\n"));
break;
case netlist_terminal_t::INPUT:
- {
- netlist_analog_output_t *net_proxy_output = NULL;
- for (int i = 0; i < m_inps.count(); i++)
- if (m_inps[i]->m_proxied_net == &p->net().as_analog())
- {
- net_proxy_output = m_inps[i];
- break;
- }
-
- if (net_proxy_output == NULL)
- {
- net_proxy_output = new netlist_analog_output_t();
- net_proxy_output->init_object(*this, this->name() + "." + pstring::sprintf("m%d", m_inps.count()));
- m_inps.add(net_proxy_output);
- net_proxy_output->m_proxied_net = &p->net().as_analog();
- }
- net_proxy_output->net().register_con(*p);
- // FIXME: repeated
- net_proxy_output->net().rebuild_list();
- NL_VERBOSE_OUT(("Added input\n"));
- }
- break;
+ {
+ netlist_analog_output_t *net_proxy_output = NULL;
+ for (int i = 0; i < m_inps.count(); i++)
+ if (m_inps[i]->m_proxied_net == &p->net().as_analog())
+ {
+ net_proxy_output = m_inps[i];
+ break;
+ }
+
+ if (net_proxy_output == NULL)
+ {
+ net_proxy_output = new netlist_analog_output_t();
+ net_proxy_output->init_object(*this, this->name() + "." + pstring::sprintf("m%d", m_inps.count()));
+ m_inps.add(net_proxy_output);
+ net_proxy_output->m_proxied_net = &p->net().as_analog();
+ }
+ net_proxy_output->net().register_con(*p);
+ // FIXME: repeated
+ net_proxy_output->net().rebuild_list();
+ NL_VERBOSE_OUT(("Added input\n"));
+ }
+ break;
default:
netlist().error("unhandled element found\n");
break;
@@ -194,9 +194,9 @@ ATTR_COLD void netlist_matrix_solver_t::setup(netlist_analog_net_t::list_t &nets
ATTR_HOT void netlist_matrix_solver_t::update_inputs()
{
- // avoid recursive calls. Inputs are updated outside this call
- for (netlist_analog_output_t * const *p = m_inps.first(); p != NULL; p = m_inps.next(p))
- (*p)->set_Q((*p)->m_proxied_net->m_cur_Analog);
+ // avoid recursive calls. Inputs are updated outside this call
+ for (netlist_analog_output_t * const *p = m_inps.first(); p != NULL; p = m_inps.next(p))
+ (*p)->set_Q((*p)->m_proxied_net->m_cur_Analog);
}
@@ -218,9 +218,9 @@ ATTR_HOT void netlist_matrix_solver_t::update_dynamic()
ATTR_COLD void netlist_matrix_solver_t::start()
{
- register_output("Q_sync", m_Q_sync);
- register_input("FB_sync", m_fb_sync);
- connect(m_fb_sync, m_Q_sync);
+ register_output("Q_sync", m_Q_sync);
+ register_input("FB_sync", m_fb_sync);
+ connect(m_fb_sync, m_Q_sync);
}
ATTR_COLD void netlist_matrix_solver_t::reset()
@@ -230,18 +230,18 @@ ATTR_COLD void netlist_matrix_solver_t::reset()
ATTR_COLD void netlist_matrix_solver_t::update()
{
- const double new_timestep = solve();
+ const double new_timestep = solve();
- if (m_params.m_dynamic && is_timestep() && new_timestep > 0)
- m_Q_sync.net().reschedule_in_queue(netlist_time::from_double(new_timestep));
+ if (m_params.m_dynamic && is_timestep() && new_timestep > 0)
+ m_Q_sync.net().reschedule_in_queue(netlist_time::from_double(new_timestep));
}
ATTR_COLD void netlist_matrix_solver_t::update_forced()
{
- ATTR_UNUSED const double new_timestep = solve();
+ ATTR_UNUSED const double new_timestep = solve();
- if (m_params.m_dynamic && is_timestep())
- m_Q_sync.net().reschedule_in_queue(netlist_time::from_double(m_params.m_min_timestep));
+ if (m_params.m_dynamic && is_timestep())
+ m_Q_sync.net().reschedule_in_queue(netlist_time::from_double(m_params.m_min_timestep));
}
ATTR_HOT void netlist_matrix_solver_t::step(const netlist_time delta)
@@ -254,40 +254,39 @@ ATTR_HOT void netlist_matrix_solver_t::step(const netlist_time delta)
template<class C >
void netlist_matrix_solver_t::solve_base(C *p)
{
- if (is_dynamic())
- {
- int this_resched;
- int newton_loops = 0;
- do
- {
- update_dynamic();
- // Gauss-Seidel will revert to Gaussian elemination if steps exceeded.
- this_resched = p->vsolve_non_dynamic();
- newton_loops++;
- } while (this_resched > 1 && newton_loops < m_params.m_nr_loops);
-
- // reschedule ....
- if (this_resched > 1 && !m_Q_sync.net().is_queued())
- {
- netlist().warning("NEWTON_LOOPS exceeded ... reschedule");
- m_Q_sync.net().reschedule_in_queue(m_params.m_nt_sync_delay);
- }
- }
- else
- {
- p->vsolve_non_dynamic();
- }
+ if (is_dynamic())
+ {
+ int this_resched;
+ int newton_loops = 0;
+ do
+ {
+ update_dynamic();
+ // Gauss-Seidel will revert to Gaussian elemination if steps exceeded.
+ this_resched = p->vsolve_non_dynamic();
+ newton_loops++;
+ } while (this_resched > 1 && newton_loops < m_params.m_nr_loops);
+
+ // reschedule ....
+ if (this_resched > 1 && !m_Q_sync.net().is_queued())
+ {
+ netlist().warning("NEWTON_LOOPS exceeded ... reschedule");
+ m_Q_sync.net().reschedule_in_queue(m_params.m_nt_sync_delay);
+ }
+ }
+ else
+ {
+ p->vsolve_non_dynamic();
+ }
}
ATTR_HOT double netlist_matrix_solver_t::solve()
{
-
netlist_time now = netlist().time();
netlist_time delta = now - m_last_step;
// We are already up to date. Avoid oscillations.
if (delta < netlist_time::from_nsec(1))
- return -1.0;
+ return -1.0;
/* update all terminals for new time step */
m_last_step = now;
@@ -297,7 +296,7 @@ ATTR_HOT double netlist_matrix_solver_t::solve()
const double next_time_step = vsolve();
- update_inputs();
+ update_inputs();
return next_time_step;
}
@@ -330,19 +329,19 @@ NETLIB_START(solver)
{
register_output("Q_step", m_Q_step);
- register_param("SYNC_DELAY", m_sync_delay, NLTIME_FROM_NS(10).as_double());
+ register_param("SYNC_DELAY", m_sync_delay, NLTIME_FROM_NS(10).as_double());
register_param("FREQ", m_freq, 48000.0);
register_param("ACCURACY", m_accuracy, 1e-7);
- register_param("GS_LOOPS", m_gs_loops, 9); // Gauss-Seidel loops
- register_param("GS_THRESHOLD", m_gs_threshold, 5); // below this value, gaussian elimination is used
- register_param("NR_LOOPS", m_nr_loops, 25); // Newton-Raphson loops
+ register_param("GS_LOOPS", m_gs_loops, 9); // Gauss-Seidel loops
+ register_param("GS_THRESHOLD", m_gs_threshold, 5); // below this value, gaussian elimination is used
+ register_param("NR_LOOPS", m_nr_loops, 25); // Newton-Raphson loops
register_param("PARALLEL", m_parallel, 0);
- register_param("SOR_FACTOR", m_sor, 1.059);
- register_param("GMIN", m_gmin, NETLIST_GMIN_DEFAULT);
- register_param("DYNAMIC_TS", m_dynamic, 0);
- register_param("LTE", m_lte, 5e-5); // diff/timestep
+ register_param("SOR_FACTOR", m_sor, 1.059);
+ register_param("GMIN", m_gmin, NETLIST_GMIN_DEFAULT);
+ register_param("DYNAMIC_TS", m_dynamic, 0);
+ register_param("LTE", m_lte, 5e-5); // diff/timestep
register_param("MIN_TIMESTEP", m_min_timestep, 1e-6); // double timestep resolution
// internal staff
@@ -366,8 +365,8 @@ NETLIB_UPDATE_PARAM(solver)
NETLIB_NAME(solver)::~NETLIB_NAME(solver)()
{
- for (int i = 0; i < m_mat_solvers.count(); i++)
- m_mat_solvers[i]->log_stats();
+ for (int i = 0; i < m_mat_solvers.count(); i++)
+ m_mat_solvers[i]->log_stats();
netlist_matrix_solver_t * const *e = m_mat_solvers.first();
while (e != NULL)
@@ -382,9 +381,9 @@ NETLIB_NAME(solver)::~NETLIB_NAME(solver)()
NETLIB_UPDATE(solver)
{
if (m_params.m_dynamic)
- return;
+ return;
- const int t_cnt = m_mat_solvers.count();
+ const int t_cnt = m_mat_solvers.count();
#if HAS_OPENMP && USE_OPENMP
if (m_parallel.Value())
@@ -407,37 +406,37 @@ NETLIB_UPDATE(solver)
this_resched[i] = m_mat_solvers[i]->solve();
}
#else
- for (int i = 0; i < t_cnt; i++)
- {
- if (m_mat_solvers[i]->is_timestep())
- {
- // Ignore return value
- ATTR_UNUSED const double ts = m_mat_solvers[i]->solve();
- }
- }
+ for (int i = 0; i < t_cnt; i++)
+ {
+ if (m_mat_solvers[i]->is_timestep())
+ {
+ // Ignore return value
+ ATTR_UNUSED const double ts = m_mat_solvers[i]->solve();
+ }
+ }
#endif
- /* step circuit */
- if (!m_Q_step.net().is_queued())
- {
- m_Q_step.net().push_to_queue(netlist_time::from_double(m_params.m_max_timestep));
- }
+ /* step circuit */
+ if (!m_Q_step.net().is_queued())
+ {
+ m_Q_step.net().push_to_queue(netlist_time::from_double(m_params.m_max_timestep));
+ }
}
template <int m_N, int _storage_N>
netlist_matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const int gs_threshold, const bool use_specific)
{
- if (use_specific && m_N == 1)
- return new netlist_matrix_solver_direct1_t(m_params);
- else if (use_specific && m_N == 2)
- return new netlist_matrix_solver_direct2_t(m_params);
- else
- {
- if (size >= gs_threshold)
- return new netlist_matrix_solver_gauss_seidel_t<m_N,_storage_N>(m_params, size);
- else
- return new netlist_matrix_solver_direct_t<m_N, _storage_N>(m_params, size);
- }
+ if (use_specific && m_N == 1)
+ return new netlist_matrix_solver_direct1_t(m_params);
+ else if (use_specific && m_N == 2)
+ return new netlist_matrix_solver_direct2_t(m_params);
+ else
+ {
+ if (size >= gs_threshold)
+ return new netlist_matrix_solver_gauss_seidel_t<m_N,_storage_N>(m_params, size);
+ else
+ return new netlist_matrix_solver_direct_t<m_N, _storage_N>(m_params, size);
+ }
}
ATTR_COLD void NETLIB_NAME(solver)::post_start()
@@ -447,41 +446,41 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start()
const int gs_threshold = m_gs_threshold.Value();
const bool use_specific = true;
- m_params.m_accuracy = m_accuracy.Value();
- m_params.m_gs_loops = m_gs_loops.Value();
- m_params.m_nr_loops = m_nr_loops.Value();
- m_params.m_nt_sync_delay = m_sync_delay.Value();
- m_params.m_lte = m_lte.Value();
- m_params.m_sor = m_sor.Value();
-
- m_params.m_min_timestep = m_min_timestep.Value();
- m_params.m_dynamic = (m_dynamic.Value() == 1 ? true : false);
- m_params.m_max_timestep = netlist_time::from_hz(m_freq.Value()).as_double();
-
- if (m_params.m_dynamic)
- {
- m_params.m_max_timestep *= 1000.0;
- }
- else
- {
- m_params.m_min_timestep = m_params.m_max_timestep;
- }
+ m_params.m_accuracy = m_accuracy.Value();
+ m_params.m_gs_loops = m_gs_loops.Value();
+ m_params.m_nr_loops = m_nr_loops.Value();
+ m_params.m_nt_sync_delay = m_sync_delay.Value();
+ m_params.m_lte = m_lte.Value();
+ m_params.m_sor = m_sor.Value();
+
+ m_params.m_min_timestep = m_min_timestep.Value();
+ m_params.m_dynamic = (m_dynamic.Value() == 1 ? true : false);
+ m_params.m_max_timestep = netlist_time::from_hz(m_freq.Value()).as_double();
+
+ if (m_params.m_dynamic)
+ {
+ m_params.m_max_timestep *= 1000.0;
+ }
+ else
+ {
+ m_params.m_min_timestep = m_params.m_max_timestep;
+ }
netlist().log("Scanning net groups ...");
// determine net groups
for (netlist_net_t * const *pn = netlist().m_nets.first(); pn != NULL; pn = netlist().m_nets.next(pn))
{
- SOLVER_VERBOSE_OUT(("processing %s\n", (*pn)->name().cstr()));
- if (!(*pn)->isRailNet())
- {
- SOLVER_VERBOSE_OUT((" ==> not a rail net\n"));
- netlist_analog_net_t *n = &(*pn)->as_analog();
- if (!n->already_processed(groups, cur_group))
- {
- cur_group++;
- n->process_net(groups, cur_group);
- }
- }
+ SOLVER_VERBOSE_OUT(("processing %s\n", (*pn)->name().cstr()));
+ if (!(*pn)->isRailNet())
+ {
+ SOLVER_VERBOSE_OUT((" ==> not a rail net\n"));
+ netlist_analog_net_t *n = &(*pn)->as_analog();
+ if (!n->already_processed(groups, cur_group))
+ {
+ cur_group++;
+ n->process_net(groups, cur_group);
+ }
+ }
}
// setup the solvers
@@ -497,41 +496,41 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start()
ms = create_solver<1,1>(1, gs_threshold, use_specific);
break;
case 2:
- ms = create_solver<2,2>(2, gs_threshold, use_specific);
+ ms = create_solver<2,2>(2, gs_threshold, use_specific);
break;
case 3:
- ms = create_solver<3,3>(3, gs_threshold, use_specific);
+ ms = create_solver<3,3>(3, gs_threshold, use_specific);
break;
case 4:
- ms = create_solver<4,4>(4, gs_threshold, use_specific);
+ ms = create_solver<4,4>(4, gs_threshold, use_specific);
break;
case 5:
- ms = create_solver<5,5>(5, gs_threshold, use_specific);
+ ms = create_solver<5,5>(5, gs_threshold, use_specific);
break;
case 6:
- ms = create_solver<6,6>(6, gs_threshold, use_specific);
+ ms = create_solver<6,6>(6, gs_threshold, use_specific);
break;
- case 7:
- ms = create_solver<7,7>(7, gs_threshold, use_specific);
- break;
- case 8:
- ms = create_solver<8,8>(8, gs_threshold, use_specific);
- break;
- case 12:
- ms = create_solver<12,12>(12, gs_threshold, use_specific);
- break;
- default:
+ case 7:
+ ms = create_solver<7,7>(7, gs_threshold, use_specific);
+ break;
+ case 8:
+ ms = create_solver<8,8>(8, gs_threshold, use_specific);
+ break;
+ case 12:
+ ms = create_solver<12,12>(12, gs_threshold, use_specific);
+ break;
+ default:
if (net_count <= 16)
{
- ms = create_solver<0,16>(net_count, gs_threshold, use_specific);
+ ms = create_solver<0,16>(net_count, gs_threshold, use_specific);
}
else if (net_count <= 32)
{
- ms = create_solver<0,32>(net_count, gs_threshold, use_specific);
+ ms = create_solver<0,32>(net_count, gs_threshold, use_specific);
}
else if (net_count <= 64)
{
- ms = create_solver<0,64>(net_count, gs_threshold, use_specific);
+ ms = create_solver<0,64>(net_count, gs_threshold, use_specific);
}
else
{
@@ -544,24 +543,23 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start()
register_sub(*ms, pstring::sprintf("Solver %d",m_mat_solvers.count()));
- ms->vsetup(groups[i]);
+ ms->vsetup(groups[i]);
- m_mat_solvers.add(ms);
+ m_mat_solvers.add(ms);
- netlist().log("Solver %s", ms->name().cstr());
- netlist().log(" # %d ==> %d nets", i, groups[i].count()); //, (*(*groups[i].first())->m_core_terms.first())->name().cstr());
+ netlist().log("Solver %s", ms->name().cstr());
+ netlist().log(" # %d ==> %d nets", i, groups[i].count()); //, (*(*groups[i].first())->m_core_terms.first())->name().cstr());
netlist().log(" has %s elements", ms->is_dynamic() ? "dynamic" : "no dynamic");
netlist().log(" has %s elements", ms->is_timestep() ? "timestep" : "no timestep");
for (int j=0; j<groups[i].count(); j++)
{
- netlist().log("Net %d: %s", j, groups[i][j]->name().cstr());
+ netlist().log("Net %d: %s", j, groups[i][j]->name().cstr());
netlist_net_t *n = groups[i][j];
for (int k = 0; k < n->m_core_terms.count(); k++)
{
- const netlist_core_terminal_t *p = n->m_core_terms[k];
- netlist().log(" %s", p->name().cstr());
+ const netlist_core_terminal_t *p = n->m_core_terms[k];
+ netlist().log(" %s", p->name().cstr());
}
}
}
}
-
diff --git a/src/emu/netlist/analog/nld_twoterm.c b/src/emu/netlist/analog/nld_twoterm.c
index 23e82b1e14c..d2f803a9af3 100644
--- a/src/emu/netlist/analog/nld_twoterm.c
+++ b/src/emu/netlist/analog/nld_twoterm.c
@@ -40,17 +40,17 @@ ATTR_COLD void netlist_generic_diode::save(pstring name, netlist_object_t &paren
// ----------------------------------------------------------------------------------------
ATTR_COLD NETLIB_NAME(twoterm)::NETLIB_NAME(twoterm)(const family_t afamily)
- : netlist_device_t(afamily)
+ : netlist_device_t(afamily)
{
m_P.m_otherterm = &m_N;
m_N.m_otherterm = &m_P;
}
ATTR_COLD NETLIB_NAME(twoterm)::NETLIB_NAME(twoterm)()
- : netlist_device_t(TWOTERM)
+ : netlist_device_t(TWOTERM)
{
- m_P.m_otherterm = &m_N;
- m_N.m_otherterm = &m_P;
+ m_P.m_otherterm = &m_N;
+ m_N.m_otherterm = &m_P;
}
NETLIB_START(twoterm)
@@ -113,9 +113,9 @@ NETLIB_UPDATE_PARAM(R)
{
//printf("updating %s to %f\n", name().cstr(), m_R.Value());
- // FIXME: Only attached nets should be brought up to current time
- //netlist().solver()->update_to_current_time(); // bring up current time
- update_dev();
+ // FIXME: Only attached nets should be brought up to current time
+ //netlist().solver()->update_to_current_time(); // bring up current time
+ update_dev();
if (m_R.Value() > 1e-9)
set_R(m_R.Value());
else
@@ -162,12 +162,12 @@ NETLIB_UPDATE_PARAM(POT)
v = (exp(v) - 1.0) / (exp(1.0) - 1.0);
// FIXME: Only attached nets should be brought up to current time
- //netlist().solver()->update_to_current_time(); // bring up current time
+ //netlist().solver()->update_to_current_time(); // bring up current time
- m_R1.update_dev();
- m_R2.update_dev();
+ m_R1.update_dev();
+ m_R2.update_dev();
- m_R1.set_R(MAX(m_R.Value() * v, netlist().gmin()));
+ m_R1.set_R(MAX(m_R.Value() * v, netlist().gmin()));
m_R2.set_R(MAX(m_R.Value() * (1.0 - v), netlist().gmin()));
}
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index 722b629bf5f..28e2809f777 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -89,8 +89,8 @@ void netlist_factory_t::initialize()
ENTRY(D, DIODE, "model")
ENTRY(VCVS, VCVS, "-") // FIXME: STD parameters ?
ENTRY(VCCS, VCCS, "-")
- ENTRY(CCCS, CCCS, "-")
- ENTRY(dummy_input, DUMMY_INPUT, "-")
+ ENTRY(CCCS, CCCS, "-")
+ ENTRY(dummy_input, DUMMY_INPUT, "-")
ENTRY(QBJT_EB, QBJT_EB, "model")
ENTRY(QBJT_switch, QBJT_SW, "model")
ENTRY(ttl_input, TTL_INPUT, "IN")
@@ -103,20 +103,20 @@ void netlist_factory_t::initialize()
ENTRY(gnd, GND, "-")
ENTRY(switch2, SWITCH2, "-")
ENTRY(nicRSFF, NETDEV_RSFF, "+S,R")
- ENTRY(4020, CD_4020, "+IP,RESET,VDD,VSS")
- //ENTRY(4066, CD_4066, "+A,B")
+ ENTRY(4020, CD_4020, "+IP,RESET,VDD,VSS")
+ //ENTRY(4066, CD_4066, "+A,B")
ENTRY(7400, TTL_7400_NAND, "+A,B")
ENTRY(7402, TTL_7402_NOR, "+A,B")
ENTRY(7404, TTL_7404_INVERT, "+A")
- ENTRY(7408, TTL_7408_AND, "+A,B")
+ ENTRY(7408, TTL_7408_AND, "+A,B")
ENTRY(7410, TTL_7410_NAND, "+A,B,C")
- ENTRY(7411, TTL_7411_AND, "+A,B,C")
+ ENTRY(7411, TTL_7411_AND, "+A,B,C")
ENTRY(7420, TTL_7420_NAND, "+A,B,C,D")
ENTRY(7425, TTL_7425_NOR, "+A,B,C,D")
ENTRY(7427, TTL_7427_NOR, "+A,B,C")
ENTRY(7430, TTL_7430_NAND, "+A,B,C,D,E,F,G,H")
- ENTRY(7432, TTL_7432_OR, "+A,B")
- ENTRY(7437, TTL_7437_NAND, "+A,B")
+ ENTRY(7432, TTL_7432_OR, "+A,B")
+ ENTRY(7437, TTL_7437_NAND, "+A,B")
ENTRY(7450, TTL_7450_ANDORINVERT, "+A,B,C,D")
ENTRY(7486, TTL_7486_XOR, "+A,B")
ENTRY(7448, TTL_7448, "+A,B,C,D,LTQ,BIQ,RBIQ")
@@ -126,26 +126,26 @@ void netlist_factory_t::initialize()
ENTRY(7493, TTL_7493, "+CLKA,CLKB,R1,R2")
ENTRY(74107, TTL_74107, "+CLK,J,K,CLRQ")
ENTRY(74107A, TTL_74107A, "+CLK,J,K,CLRQ")
- ENTRY(74123, TTL_74123, "-")
+ ENTRY(74123, TTL_74123, "-")
ENTRY(74153, TTL_74153, "+C0,C1,C2,C3,A,B,G")
ENTRY(SN74LS629, SN74LS629, "CAP")
ENTRY(9316, TTL_9316, "+CLK,ENP,ENT,CLRQ,LOADQ,A,B,C,D")
ENTRY(NE555, NE555, "-")
- ENTRY(r2r_dac, R2R_DAC, "+VIN,R,N")
+ ENTRY(r2r_dac, R2R_DAC, "+VIN,R,N")
ENTRY(4020_dip, CD_4020_DIP, "-")
- ENTRY(4066_dip, CD_4066_DIP, "-")
+ ENTRY(4066_dip, CD_4066_DIP, "-")
ENTRY(7400_dip, TTL_7400_DIP, "-")
ENTRY(7402_dip, TTL_7402_DIP, "-")
ENTRY(7404_dip, TTL_7404_DIP, "-")
- ENTRY(7408_dip, TTL_7408_DIP, "-")
+ ENTRY(7408_dip, TTL_7408_DIP, "-")
ENTRY(7410_dip, TTL_7410_DIP, "-")
- ENTRY(7411_dip, TTL_7411_DIP, "-")
+ ENTRY(7411_dip, TTL_7411_DIP, "-")
ENTRY(7420_dip, TTL_7420_DIP, "-")
ENTRY(7425_dip, TTL_7425_DIP, "-")
ENTRY(7427_dip, TTL_7427_DIP, "-")
ENTRY(7430_dip, TTL_7430_DIP, "-")
- ENTRY(7432_dip, TTL_7432_DIP, "-")
- ENTRY(7437_dip, TTL_7437_DIP, "-")
+ ENTRY(7432_dip, TTL_7432_DIP, "-")
+ ENTRY(7437_dip, TTL_7437_DIP, "-")
ENTRY(7448_dip, TTL_7448_DIP, "-")
ENTRY(7450_dip, TTL_7450_DIP, "-")
ENTRY(7474_dip, TTL_7474_DIP, "-")
@@ -154,7 +154,7 @@ void netlist_factory_t::initialize()
ENTRY(7490_dip, TTL_7490_DIP, "-")
ENTRY(7493_dip, TTL_7493_DIP, "-")
ENTRY(74107_dip, TTL_74107_DIP, "-")
- ENTRY(74123_dip, TTL_74123_DIP, "-")
+ ENTRY(74123_dip, TTL_74123_DIP, "-")
ENTRY(74153_dip, TTL_74153_DIP, "-")
ENTRY(9316_dip, TTL_9316_DIP, "-")
ENTRY(SN74LS629_dip, SN74LS629_DIP, "1.CAP1,2.CAP2")
diff --git a/src/emu/netlist/devices/nld_4020.c b/src/emu/netlist/devices/nld_4020.c
index f2170e326e3..b9b5eb2f0c0 100644
--- a/src/emu/netlist/devices/nld_4020.c
+++ b/src/emu/netlist/devices/nld_4020.c
@@ -10,21 +10,21 @@ NETLIB_START(4020)
register_sub(sub, "sub");
register_input("RESET", m_RESET);
- register_subalias("IP", sub.m_IP);
- register_subalias("Q1", sub.m_Q[0]);
- register_subalias("Q4", sub.m_Q[3]);
- register_subalias("Q5", sub.m_Q[4]);
- register_subalias("Q6", sub.m_Q[5]);
- register_subalias("Q7", sub.m_Q[6]);
- register_subalias("Q8", sub.m_Q[7]);
- register_subalias("Q9", sub.m_Q[8]);
- register_subalias("Q10", sub.m_Q[9]);
- register_subalias("Q11", sub.m_Q[10]);
- register_subalias("Q12", sub.m_Q[11]);
- register_subalias("Q13", sub.m_Q[12]);
- register_subalias("Q14", sub.m_Q[13]);
- register_subalias("VDD", m_supply.m_vdd);
- register_subalias("VSS", m_supply.m_vss);
+ register_subalias("IP", sub.m_IP);
+ register_subalias("Q1", sub.m_Q[0]);
+ register_subalias("Q4", sub.m_Q[3]);
+ register_subalias("Q5", sub.m_Q[4]);
+ register_subalias("Q6", sub.m_Q[5]);
+ register_subalias("Q7", sub.m_Q[6]);
+ register_subalias("Q8", sub.m_Q[7]);
+ register_subalias("Q9", sub.m_Q[8]);
+ register_subalias("Q10", sub.m_Q[9]);
+ register_subalias("Q11", sub.m_Q[10]);
+ register_subalias("Q12", sub.m_Q[11]);
+ register_subalias("Q13", sub.m_Q[12]);
+ register_subalias("Q14", sub.m_Q[13]);
+ register_subalias("VDD", m_supply.m_vdd);
+ register_subalias("VSS", m_supply.m_vss);
}
NETLIB_RESET(4020)
@@ -38,16 +38,16 @@ NETLIB_START(4020_sub)
register_input("IP", m_IP);
register_output("Q1", m_Q[0]);
- register_output("Q4", m_Q[3]);
- register_output("Q5", m_Q[4]);
- register_output("Q6", m_Q[5]);
- register_output("Q7", m_Q[6]);
- register_output("Q8", m_Q[8]);
- register_output("Q9", m_Q[8]);
- register_output("Q10", m_Q[9]);
- register_output("Q11", m_Q[10]);
- register_output("Q12", m_Q[11]);
- register_output("Q13", m_Q[12]);
+ register_output("Q4", m_Q[3]);
+ register_output("Q5", m_Q[4]);
+ register_output("Q6", m_Q[5]);
+ register_output("Q7", m_Q[6]);
+ register_output("Q8", m_Q[8]);
+ register_output("Q9", m_Q[8]);
+ register_output("Q10", m_Q[9]);
+ register_output("Q11", m_Q[10]);
+ register_output("Q12", m_Q[11]);
+ register_output("Q13", m_Q[12]);
register_output("Q14", m_Q[13]);
save(NAME(m_cnt));
@@ -62,59 +62,58 @@ NETLIB_RESET(4020_sub)
NETLIB_UPDATE(4020_sub)
{
UINT8 cnt = m_cnt;
- cnt = ( cnt + 1) & 0x3fff;
- update_outputs(cnt);
+ cnt = ( cnt + 1) & 0x3fff;
+ update_outputs(cnt);
m_cnt = cnt;
}
NETLIB_UPDATE(4020)
{
-
- if (INPLOGIC(m_RESET))
- {
- sub.m_cnt = 0;
- sub.m_IP.inactivate();
- static const netlist_time reset_time = netlist_time::from_nsec(140);
- OUTLOGIC(sub.m_Q[0], 0, reset_time);
- for (int i=3; i<14; i++)
- OUTLOGIC(sub.m_Q[i], 0, reset_time);
- }
- else
- sub.m_IP.activate_hl();
+ if (INPLOGIC(m_RESET))
+ {
+ sub.m_cnt = 0;
+ sub.m_IP.inactivate();
+ static const netlist_time reset_time = netlist_time::from_nsec(140);
+ OUTLOGIC(sub.m_Q[0], 0, reset_time);
+ for (int i=3; i<14; i++)
+ OUTLOGIC(sub.m_Q[i], 0, reset_time);
+ }
+ else
+ sub.m_IP.activate_hl();
}
inline NETLIB_FUNC_VOID(4020_sub, update_outputs, (const UINT16 cnt))
{
- static const netlist_time out_delayQn[14] = {
- NLTIME_FROM_NS(180), NLTIME_FROM_NS(280),
- NLTIME_FROM_NS(380), NLTIME_FROM_NS(480),
- NLTIME_FROM_NS(580), NLTIME_FROM_NS(680),
- NLTIME_FROM_NS(780), NLTIME_FROM_NS(880),
- NLTIME_FROM_NS(980), NLTIME_FROM_NS(1080),
- NLTIME_FROM_NS(1180), NLTIME_FROM_NS(1280),
- NLTIME_FROM_NS(1380), NLTIME_FROM_NS(1480),
- };
-
- OUTLOGIC(m_Q[0], 0, out_delayQn[0]);
- for (int i=3; i<14; i++)
- OUTLOGIC(m_Q[i], (cnt >> i) & 1, out_delayQn[i]);
+ static const netlist_time out_delayQn[14] = {
+ NLTIME_FROM_NS(180), NLTIME_FROM_NS(280),
+ NLTIME_FROM_NS(380), NLTIME_FROM_NS(480),
+ NLTIME_FROM_NS(580), NLTIME_FROM_NS(680),
+ NLTIME_FROM_NS(780), NLTIME_FROM_NS(880),
+ NLTIME_FROM_NS(980), NLTIME_FROM_NS(1080),
+ NLTIME_FROM_NS(1180), NLTIME_FROM_NS(1280),
+ NLTIME_FROM_NS(1380), NLTIME_FROM_NS(1480),
+ };
+
+ OUTLOGIC(m_Q[0], 0, out_delayQn[0]);
+ for (int i=3; i<14; i++)
+ OUTLOGIC(m_Q[i], (cnt >> i) & 1, out_delayQn[i]);
}
NETLIB_START(4020_dip)
{
NETLIB_NAME(4020)::start();
- /* +--------------+
- * Q12 |1 ++ 16| VDD
- * Q13 |2 15| Q11
- * Q14 |3 14| Q10
- * Q6 |4 4020 13| Q8
- * Q5 |5 12| Q9
- * Q7 |6 11| RESET
- * Q4 |7 10| IP (Input pulses)
- * VSS |8 9| Q1
- * +--------------+
- */
+ /* +--------------+
+ * Q12 |1 ++ 16| VDD
+ * Q13 |2 15| Q11
+ * Q14 |3 14| Q10
+ * Q6 |4 4020 13| Q8
+ * Q5 |5 12| Q9
+ * Q7 |6 11| RESET
+ * Q4 |7 10| IP (Input pulses)
+ * VSS |8 9| Q1
+ * +--------------+
+ */
register_subalias("1", sub.m_Q[11]);
register_subalias("2", sub.m_Q[12]);
@@ -123,7 +122,7 @@ NETLIB_START(4020_dip)
register_subalias("5", sub.m_Q[4]);
register_subalias("6", sub.m_Q[6]);
register_subalias("7", sub.m_Q[3]);
- register_subalias("8", m_supply.m_vss);
+ register_subalias("8", m_supply.m_vss);
register_subalias("9", sub.m_Q[1]);
register_subalias("10", sub.m_IP);
@@ -132,7 +131,7 @@ NETLIB_START(4020_dip)
register_subalias("13", sub.m_Q[7]);
register_subalias("14", sub.m_Q[9]);
register_subalias("15", sub.m_Q[10]);
- register_subalias("16", m_supply.m_vdd);
+ register_subalias("16", m_supply.m_vdd);
}
NETLIB_UPDATE(4020_dip)
diff --git a/src/emu/netlist/devices/nld_7400.c b/src/emu/netlist/devices/nld_7400.c
index fb97746d448..bf0952a6a9f 100644
--- a/src/emu/netlist/devices/nld_7400.c
+++ b/src/emu/netlist/devices/nld_7400.c
@@ -9,11 +9,11 @@
nld_7400::truthtable_t nld_7400::m_ttbl;
const char *nld_7400::m_desc[] = {
- "A,B,PQ,PA,PB|Q",
- "0,X,X,X,X|1|22",
- "X,0,X,X,X|1|22",
- "1,1,X,X,X|0|15",
- ""
+ "A,B,PQ,PA,PB|Q",
+ "0,X,X,X,X|1|22",
+ "X,0,X,X,X|1|22",
+ "1,1,X,X,X|0|15",
+ ""
};
#endif
diff --git a/src/emu/netlist/devices/nld_74123.c b/src/emu/netlist/devices/nld_74123.c
index aef93f6ab06..2218c06c9b4 100644
--- a/src/emu/netlist/devices/nld_74123.c
+++ b/src/emu/netlist/devices/nld_74123.c
@@ -10,97 +10,96 @@
NETLIB_START(74123)
{
+ register_sub(m_RP, "RP");
+ register_sub(m_RN, "RN");
- register_sub(m_RP, "RP");
- register_sub(m_RN, "RN");
+ register_input("A", m_A);
+ register_input("B", m_B);
+ register_input("CLRQ", m_CLRQ);
+ register_output("Q", m_Q);
+ register_output("QQ", m_QQ);
- register_input("A", m_A);
- register_input("B", m_B);
- register_input("CLRQ", m_CLRQ);
- register_output("Q", m_Q);
- register_output("QQ", m_QQ);
+ register_input("_CV", m_CV); // internal
- register_input("_CV", m_CV); // internal
+ register_subalias("GND", m_RN.m_N);
+ register_subalias("VCC", m_RP.m_P);
+ register_subalias("C", m_RN.m_N);
+ register_subalias("RC", m_RN.m_P);
- register_subalias("GND", m_RN.m_N);
- register_subalias("VCC", m_RP.m_P);
- register_subalias("C", m_RN.m_N);
- register_subalias("RC", m_RN.m_P);
+ register_param("K", m_K, 0.4);
+ register_param("RI", m_RI, 400.0); // around 250 for HC series, 400 on LS/TTL, estimated from datasheets
- register_param("K", m_K, 0.4);
- register_param("RI", m_RI, 400.0); // around 250 for HC series, 400 on LS/TTL, estimated from datasheets
+ connect(m_RN.m_P, m_RP.m_N);
+ connect(m_CV, m_RN.m_P);
- connect(m_RN.m_P, m_RP.m_N);
- connect(m_CV, m_RN.m_P);
+ save(NAME(m_last_trig));
+ save(NAME(m_state));
+ save(NAME(m_KP));
- save(NAME(m_last_trig));
- save(NAME(m_state));
- save(NAME(m_KP));
-
- m_KP = 1.0 / (1.0 + exp(m_K.Value()));
+ m_KP = 1.0 / (1.0 + exp(m_K.Value()));
}
NETLIB_UPDATE(74123)
{
- const netlist_sig_t m_trig = (INPLOGIC(m_A) ^ 1) & INPLOGIC(m_B) & INPLOGIC(m_CLRQ);
-
- if (!INPLOGIC(m_CLRQ))
- {
- OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(10));
- OUTLOGIC(m_QQ, 1, NLTIME_FROM_NS(10));
- /* quick charge until trigger */
- /* FIXME: SGS datasheet shows quick charge to 5V,
- * though schematics indicate quick charge to Vhigh only.
- */
- m_RP.set_R(R_ON);
- m_RN.set_R(R_OFF);
- m_state = 2; //charging (quick)
- }
- else if (!m_last_trig && m_trig)
- {
- // FIXME: Timing!
- OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(10));
- OUTLOGIC(m_QQ, 0, NLTIME_FROM_NS(10));
- m_RN.set_R(R_ON);
- m_RP.set_R(R_OFF);
- m_state = 1; // discharging
- }
-
- m_last_trig = m_trig;
-
- if (m_state == 1)
- {
- const double vLow = m_KP * TERMANALOG(m_RP.m_P);
- if (INPANALOG(m_CV) < vLow)
- {
- m_RN.set_R(R_OFF);
- m_state = 2; // charging
- }
- }
- else if (m_state == 2)
- {
- const double vHigh = TERMANALOG(m_RP.m_P) * (1.0 - m_KP);
- if (INPANALOG(m_CV) > vHigh)
- {
- m_RP.set_R(R_OFF);
- OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(10));
- OUTLOGIC(m_QQ, 1, NLTIME_FROM_NS(10));
- m_state = 0; // waiting
- }
- }
+ const netlist_sig_t m_trig = (INPLOGIC(m_A) ^ 1) & INPLOGIC(m_B) & INPLOGIC(m_CLRQ);
+
+ if (!INPLOGIC(m_CLRQ))
+ {
+ OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(10));
+ OUTLOGIC(m_QQ, 1, NLTIME_FROM_NS(10));
+ /* quick charge until trigger */
+ /* FIXME: SGS datasheet shows quick charge to 5V,
+ * though schematics indicate quick charge to Vhigh only.
+ */
+ m_RP.set_R(R_ON);
+ m_RN.set_R(R_OFF);
+ m_state = 2; //charging (quick)
+ }
+ else if (!m_last_trig && m_trig)
+ {
+ // FIXME: Timing!
+ OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(10));
+ OUTLOGIC(m_QQ, 0, NLTIME_FROM_NS(10));
+ m_RN.set_R(R_ON);
+ m_RP.set_R(R_OFF);
+ m_state = 1; // discharging
+ }
+
+ m_last_trig = m_trig;
+
+ if (m_state == 1)
+ {
+ const double vLow = m_KP * TERMANALOG(m_RP.m_P);
+ if (INPANALOG(m_CV) < vLow)
+ {
+ m_RN.set_R(R_OFF);
+ m_state = 2; // charging
+ }
+ }
+ else if (m_state == 2)
+ {
+ const double vHigh = TERMANALOG(m_RP.m_P) * (1.0 - m_KP);
+ if (INPANALOG(m_CV) > vHigh)
+ {
+ m_RP.set_R(R_OFF);
+ OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(10));
+ OUTLOGIC(m_QQ, 1, NLTIME_FROM_NS(10));
+ m_state = 0; // waiting
+ }
+ }
}
NETLIB_RESET(74123)
{
- m_RP.do_reset();
- m_RN.do_reset();
+ m_RP.do_reset();
+ m_RN.do_reset();
- m_RP.set_R(R_OFF);
- m_RN.set_R(R_OFF);
+ m_RP.set_R(R_OFF);
+ m_RN.set_R(R_OFF);
- m_last_trig = 0;
- m_state = 0;
- m_QQ.initial(1);
+ m_last_trig = 0;
+ m_state = 0;
+ m_QQ.initial(1);
}
NETLIB_START(74123_dip)
diff --git a/src/emu/netlist/devices/nld_7474.c b/src/emu/netlist/devices/nld_7474.c
index 03892d23875..23e871fbbfc 100644
--- a/src/emu/netlist/devices/nld_7474.c
+++ b/src/emu/netlist/devices/nld_7474.c
@@ -7,7 +7,7 @@
ATTR_HOT inline void NETLIB_NAME(7474sub)::newstate(const UINT8 stateQ, const UINT8 stateQQ)
{
- // 0: High-to-low 40 ns, 1: Low-to-high 25 ns
+ // 0: High-to-low 40 ns, 1: Low-to-high 25 ns
static const netlist_time delay[2] = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
OUTLOGIC(m_Q, stateQ, delay[stateQ]);
OUTLOGIC(m_QQ, stateQQ, delay[stateQQ]);
@@ -25,11 +25,11 @@ NETLIB_UPDATE(7474sub)
NETLIB_UPDATE(7474)
{
if (INPLOGIC(m_PREQ) && INPLOGIC(m_CLRQ))
- {
- m_D.activate();
- sub.m_nextD = INPLOGIC(m_D);
- sub.m_CLK.activate_lh();
- }
+ {
+ m_D.activate();
+ sub.m_nextD = INPLOGIC(m_D);
+ sub.m_CLK.activate_lh();
+ }
else if (!INPLOGIC(m_PREQ))
{
sub.newstate(1, 0);
@@ -43,11 +43,11 @@ NETLIB_UPDATE(7474)
m_D.inactivate();
}
else
- {
- sub.newstate(1, 1);
- sub.m_CLK.inactivate();
- m_D.inactivate();
- }
+ {
+ sub.newstate(1, 1);
+ sub.m_CLK.inactivate();
+ m_D.inactivate();
+ }
}
NETLIB_START(7474)
diff --git a/src/emu/netlist/devices/nld_7490.c b/src/emu/netlist/devices/nld_7490.c
index 16cb7d2d7b1..ab66fd99c8d 100644
--- a/src/emu/netlist/devices/nld_7490.c
+++ b/src/emu/netlist/devices/nld_7490.c
@@ -20,8 +20,8 @@ NETLIB_START(7490)
register_output("QD", m_Q[3]);
save(NAME(m_cnt));
- save(NAME(m_last_A));
- save(NAME(m_last_B));
+ save(NAME(m_last_A));
+ save(NAME(m_last_B));
}
@@ -61,8 +61,8 @@ NETLIB_UPDATE(7490)
m_cnt = 0;
update_outputs();
}
- m_last_A = INPLOGIC(m_A);
- m_last_B = INPLOGIC(m_B);
+ m_last_A = INPLOGIC(m_A);
+ m_last_B = INPLOGIC(m_B);
}
NETLIB_FUNC_VOID(7490, update_outputs, (void))
diff --git a/src/emu/netlist/devices/nld_74ls629.c b/src/emu/netlist/devices/nld_74ls629.c
index a2a571b89db..73b53718a9a 100644
--- a/src/emu/netlist/devices/nld_74ls629.c
+++ b/src/emu/netlist/devices/nld_74ls629.c
@@ -51,7 +51,7 @@ NETLIB_START(SN74LS629clk)
save(NAME(m_enableq));
save(NAME(m_inc));
- save(NAME(m_out));
+ save(NAME(m_out));
}
NETLIB_RESET(SN74LS629clk)
@@ -65,7 +65,7 @@ NETLIB_UPDATE(SN74LS629clk)
{
if (!m_enableq)
{
- m_out = m_out ^ 1;
+ m_out = m_out ^ 1;
OUTLOGIC(m_Y, m_out, m_inc);
}
else
@@ -103,7 +103,7 @@ NETLIB_RESET(SN74LS629)
NETLIB_UPDATE(SN74LS629)
{
{
- // recompute
+ // recompute
double freq;
double v_freq_2, v_freq_3, v_freq_4;
double v_freq = INPANALOG(m_FC);
diff --git a/src/emu/netlist/devices/nld_9316.c b/src/emu/netlist/devices/nld_9316.c
index c4611dd2bb7..4156f80ba4b 100644
--- a/src/emu/netlist/devices/nld_9316.c
+++ b/src/emu/netlist/devices/nld_9316.c
@@ -48,15 +48,15 @@ NETLIB_START(9316_subABCD)
NETLIB_RESET(9316_subABCD)
{
- m_A.inactivate();
- m_B.inactivate();
- m_C.inactivate();
- m_D.inactivate();
+ m_A.inactivate();
+ m_B.inactivate();
+ m_C.inactivate();
+ m_D.inactivate();
}
ATTR_HOT inline UINT8 NETLIB_NAME(9316_subABCD::read_ABCD)()
{
- return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0);
+ return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0);
}
NETLIB_UPDATE(9316_subABCD)
diff --git a/src/emu/netlist/devices/nld_legacy.c b/src/emu/netlist/devices/nld_legacy.c
index a437d886001..e73aff6530b 100644
--- a/src/emu/netlist/devices/nld_legacy.c
+++ b/src/emu/netlist/devices/nld_legacy.c
@@ -22,12 +22,12 @@ NETLIB_RESET(nicRSFF)
NETLIB_UPDATE(nicRSFF)
{
- if (!INPLOGIC(m_S))
- {
- OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(20));
- OUTLOGIC(m_QQ, 0, NLTIME_FROM_NS(20));
- }
- else if (!INPLOGIC(m_R))
+ if (!INPLOGIC(m_S))
+ {
+ OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(20));
+ OUTLOGIC(m_QQ, 0, NLTIME_FROM_NS(20));
+ }
+ else if (!INPLOGIC(m_R))
{
OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(20));
OUTLOGIC(m_QQ, 1, NLTIME_FROM_NS(20));
diff --git a/src/emu/netlist/devices/nld_ne555.c b/src/emu/netlist/devices/nld_ne555.c
index 68f36dc4e45..55712f410f0 100644
--- a/src/emu/netlist/devices/nld_ne555.c
+++ b/src/emu/netlist/devices/nld_ne555.c
@@ -80,14 +80,14 @@ NETLIB_UPDATE(NE555)
if (!m_last_out && out)
{
- m_RDIS.update_dev();
- // FIXME: Should be delayed by 100ns
+ m_RDIS.update_dev();
+ // FIXME: Should be delayed by 100ns
OUTANALOG(m_OUT, TERMANALOG(m_R1.m_P));
m_RDIS.set_R(R_OFF);
}
else if (m_last_out && !out)
{
- m_RDIS.update_dev();
+ m_RDIS.update_dev();
OUTANALOG(m_OUT, TERMANALOG(m_R3.m_N));
m_RDIS.set_R(R_ON);
}
diff --git a/src/emu/netlist/devices/nld_r2r_dac.c b/src/emu/netlist/devices/nld_r2r_dac.c
index 4c35a01e51e..6a7187ca8f0 100644
--- a/src/emu/netlist/devices/nld_r2r_dac.c
+++ b/src/emu/netlist/devices/nld_r2r_dac.c
@@ -7,33 +7,32 @@
NETLIB_START(r2r_dac)
{
- NETLIB_NAME(twoterm)::start();
- register_terminal("VOUT", m_P);
- register_terminal("VGND", m_N);
- register_param("R", m_R, 1.0);
- register_param("VIN", m_VIN, 1.0);
- register_param("N", m_num, 1);
- register_param("VAL", m_val, 1);
+ NETLIB_NAME(twoterm)::start();
+ register_terminal("VOUT", m_P);
+ register_terminal("VGND", m_N);
+ register_param("R", m_R, 1.0);
+ register_param("VIN", m_VIN, 1.0);
+ register_param("N", m_num, 1);
+ register_param("VAL", m_val, 1);
}
NETLIB_RESET(r2r_dac)
{
- NETLIB_NAME(twoterm)::reset();
+ NETLIB_NAME(twoterm)::reset();
}
NETLIB_UPDATE(r2r_dac)
{
- NETLIB_NAME(twoterm)::update();
+ NETLIB_NAME(twoterm)::update();
}
NETLIB_UPDATE_PARAM(r2r_dac)
{
- //printf("updating %s to %f\n", name().cstr(), m_R.Value());
+ //printf("updating %s to %f\n", name().cstr(), m_R.Value());
- update_dev();
+ update_dev();
- double V = m_VIN.Value() / (double) (1 << m_num.Value()) * (double) m_val.Value();
+ double V = m_VIN.Value() / (double) (1 << m_num.Value()) * (double) m_val.Value();
- this->set(1.0 / m_R.Value(), V, 0.0);
+ this->set(1.0 / m_R.Value(), V, 0.0);
}
-
diff --git a/src/emu/netlist/devices/nld_system.c b/src/emu/netlist/devices/nld_system.c
index 27cbad97ba3..b77b855b0dc 100644
--- a/src/emu/netlist/devices/nld_system.c
+++ b/src/emu/netlist/devices/nld_system.c
@@ -89,49 +89,49 @@ NETLIB_UPDATE_PARAM(analog_input)
ATTR_COLD void nld_d_to_a_proxy::start()
{
- nld_base_d_to_a_proxy::start();
+ nld_base_d_to_a_proxy::start();
- register_sub(m_RV, "RV");
- register_terminal("1", m_RV.m_P);
- register_terminal("2", m_RV.m_N);
+ register_sub(m_RV, "RV");
+ register_terminal("1", m_RV.m_P);
+ register_terminal("2", m_RV.m_N);
- register_output("_Q", m_Q);
- register_subalias("Q", m_RV.m_P);
+ register_output("_Q", m_Q);
+ register_subalias("Q", m_RV.m_P);
- connect(m_RV.m_N, m_Q);
- m_Q.initial(0.0);
+ connect(m_RV.m_N, m_Q);
+ m_Q.initial(0.0);
}
ATTR_COLD void nld_d_to_a_proxy::reset()
{
- m_RV.do_reset();
+ m_RV.do_reset();
}
ATTR_COLD netlist_core_terminal_t &nld_d_to_a_proxy::out()
{
- return m_RV.m_P;
+ return m_RV.m_P;
}
ATTR_HOT ATTR_ALIGN void nld_d_to_a_proxy::update()
{
- const int state = INPLOGIC(m_I);
- if (state != m_last_state)
- {
- m_last_state = state;
- const double R = state ? m_logic_family->m_R_high : m_logic_family->m_R_low;
- const double V = state ? m_logic_family->m_high_V : m_logic_family->m_low_V;
-
- // We only need to update the net first if this is a time stepping net
- if (m_RV.m_P.net().as_analog().solver()->is_timestep())
- {
- m_RV.update_dev();
- m_RV.set(1.0 / R, V, 0.0);
- m_RV.m_P.schedule_after(NLTIME_FROM_NS(1));
- }
- else
- {
- m_RV.set(1.0 / R, V, 0.0);
- m_RV.update_dev();
- }
- }
+ const int state = INPLOGIC(m_I);
+ if (state != m_last_state)
+ {
+ m_last_state = state;
+ const double R = state ? m_logic_family->m_R_high : m_logic_family->m_R_low;
+ const double V = state ? m_logic_family->m_high_V : m_logic_family->m_low_V;
+
+ // We only need to update the net first if this is a time stepping net
+ if (m_RV.m_P.net().as_analog().solver()->is_timestep())
+ {
+ m_RV.update_dev();
+ m_RV.set(1.0 / R, V, 0.0);
+ m_RV.m_P.schedule_after(NLTIME_FROM_NS(1));
+ }
+ else
+ {
+ m_RV.set(1.0 / R, V, 0.0);
+ m_RV.update_dev();
+ }
+ }
}
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index 7faeb9a803f..53873fb1fb0 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -24,12 +24,12 @@ netlist_logic_family_desc_t netlist_family_TTL =
//FIXME: set to proper values
netlist_logic_family_desc_t netlist_family_CD4000 =
{
- 0.8, // m_low_thresh_V
- 2.0, // m_high_thresh_V
- 0.3, // m_low_V - these depend on sinked/sourced current. Values should be suitable for typical applications.
- 3.7, // m_high_V
- 1.0, // m_R_low;
- 130.0, // m_R_high;
+ 0.8, // m_low_thresh_V
+ 2.0, // m_high_thresh_V
+ 0.3, // m_low_V - these depend on sinked/sourced current. Values should be suitable for typical applications.
+ 3.7, // m_high_V
+ 1.0, // m_R_low;
+ 130.0, // m_R_high;
};
// ----------------------------------------------------------------------------------------
@@ -42,7 +42,7 @@ netlist_queue_t::netlist_queue_t(netlist_base_t &nl)
, pstate_callback_t()
, m_qsize(0)
{
- this->init_object(nl, "QUEUE");
+ this->init_object(nl, "QUEUE");
}
void netlist_queue_t::register_state(pstate_manager_t &manager, const pstring &module)
@@ -187,8 +187,8 @@ ATTR_COLD void netlist_base_t::start()
m_solver->start_dev();
NL_VERBOSE_OUT(("Initializing devices ...\n"));
- for (netlist_device_t * const * entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
- {
+ for (netlist_device_t * const * entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+ {
netlist_device_t *dev = *entry;
if (dev != m_solver)
dev->start_dev();
@@ -229,20 +229,20 @@ ATTR_COLD void netlist_base_t::reset()
// Reset all devices once !
for (int i = 0; i < m_devices.count(); i++)
{
- m_devices[i]->do_reset();
+ m_devices[i]->do_reset();
}
// Step all devices once !
- for (int i = 0; i < m_devices.count(); i++)
- {
- m_devices[i]->update_dev();
+ for (int i = 0; i < m_devices.count(); i++)
+ {
+ m_devices[i]->update_dev();
}
// FIXME: some const devices rely on this
/* make sure params are set now .. */
- for (int i = 0; i < m_devices.count(); i++)
- {
- m_devices[i]->update_param();
+ for (int i = 0; i < m_devices.count(); i++)
+ {
+ m_devices[i]->update_param();
}
}
@@ -463,20 +463,20 @@ template ATTR_COLD void netlist_device_t::register_param(const pstring &sname, n
ATTR_COLD netlist_net_t::netlist_net_t(const family_t afamily)
: netlist_object_t(NET, afamily)
- , m_new_Q(0)
- , m_cur_Q (0)
- , m_railterminal(NULL)
+ , m_new_Q(0)
+ , m_cur_Q (0)
+ , m_railterminal(NULL)
, m_time(netlist_time::zero)
, m_active(0)
, m_in_queue(2)
- , m_cur_Analog(0.0)
+ , m_cur_Analog(0.0)
{
};
ATTR_COLD netlist_net_t::~netlist_net_t()
{
- if (isInitialized())
- netlist().remove_save_items(this);
+ if (isInitialized())
+ netlist().remove_save_items(this);
}
ATTR_COLD void netlist_net_t::init_object(netlist_base_t &nl, const pstring &aname)
@@ -548,22 +548,22 @@ ATTR_COLD void netlist_net_t::save_register()
save(NAME(m_time));
save(NAME(m_active));
save(NAME(m_in_queue));
- save(NAME(m_cur_Analog));
- save(NAME(m_cur_Q));
- save(NAME(m_new_Q));
+ save(NAME(m_cur_Analog));
+ save(NAME(m_cur_Q));
+ save(NAME(m_new_Q));
netlist_object_t::save_register();
}
ATTR_HOT ATTR_ALIGN static inline void update_dev(const netlist_core_terminal_t *inp, const UINT32 mask)
{
- if ((inp->state() & mask) != 0)
- {
- netlist_core_device_t &netdev = inp->netdev();
- begin_timing(netdev.total_time);
- inc_stat(netdev.stat_count);
- netdev.update_dev();
- end_timing(netdev().total_time);
- }
+ if ((inp->state() & mask) != 0)
+ {
+ netlist_core_device_t &netdev = inp->netdev();
+ begin_timing(netdev.total_time);
+ inc_stat(netdev.stat_count);
+ netdev.update_dev();
+ end_timing(netdev().total_time);
+ }
}
ATTR_HOT ATTR_ALIGN inline void netlist_net_t::update_devs()
@@ -572,29 +572,29 @@ ATTR_HOT ATTR_ALIGN inline void netlist_net_t::update_devs()
assert(this->isRailNet());
const UINT32 masks[4] = { 1, 5, 3, 1 };
- const UINT32 mask = masks[ (m_cur_Q << 1) | m_new_Q ];
+ const UINT32 mask = masks[ (m_cur_Q << 1) | m_new_Q ];
netlist_core_terminal_t *p = m_list_active.first();
m_in_queue = 2; /* mark as taken ... */
m_cur_Q = m_new_Q;
switch (m_active)
- {
- case 2:
- update_dev(p, mask);
- p = m_list_active.next(p);
- if (p == NULL) break;
- case 1:
- update_dev(p, mask);
- break;
- default:
- while (p != NULL)
- {
- update_dev(p, mask);
- p = m_list_active.next(p);
- }
- break;
- }
+ {
+ case 2:
+ update_dev(p, mask);
+ p = m_list_active.next(p);
+ if (p == NULL) break;
+ case 1:
+ update_dev(p, mask);
+ break;
+ default:
+ while (p != NULL)
+ {
+ update_dev(p, mask);
+ p = m_list_active.next(p);
+ }
+ break;
+ }
}
@@ -604,9 +604,9 @@ ATTR_COLD void netlist_net_t::reset()
m_active = 0;
m_in_queue = 2;
- m_new_Q = 0;
- m_cur_Q = 0;
- m_cur_Analog = 0.0;
+ m_new_Q = 0;
+ m_cur_Q = 0;
+ m_cur_Analog = 0.0;
/* rebuild m_list */
@@ -614,12 +614,12 @@ ATTR_COLD void netlist_net_t::reset()
for (int i=0; i < m_core_terms.count(); i++)
m_list_active.add(*m_core_terms[i]);
- for (int i=0; i < m_core_terms.count(); i++)
- m_core_terms[i]->do_reset();
+ for (int i=0; i < m_core_terms.count(); i++)
+ m_core_terms[i]->do_reset();
- for (int i=0; i < m_core_terms.count(); i++)
- if (m_core_terms[i]->state() != netlist_input_t::STATE_INP_PASSIVE)
- m_active++;
+ for (int i=0; i < m_core_terms.count(); i++)
+ if (m_core_terms[i]->state() != netlist_input_t::STATE_INP_PASSIVE)
+ m_active++;
}
ATTR_COLD void netlist_net_t::register_con(netlist_core_terminal_t &terminal)
@@ -634,12 +634,12 @@ ATTR_COLD void netlist_net_t::register_con(netlist_core_terminal_t &terminal)
ATTR_COLD void netlist_net_t::move_connections(netlist_net_t *dest_net)
{
- for (int i = 0; i < m_core_terms.count(); i++)
- {
- netlist_core_terminal_t *p = m_core_terms[i];
- dest_net->register_con(*p);
- }
- m_core_terms.clear(); // FIXME: othernet needs to be free'd from memory
+ for (int i = 0; i < m_core_terms.count(); i++)
+ {
+ netlist_core_terminal_t *p = m_core_terms[i];
+ dest_net->register_con(*p);
+ }
+ m_core_terms.clear(); // FIXME: othernet needs to be free'd from memory
}
ATTR_COLD void netlist_net_t::merge_net(netlist_net_t *othernet)
@@ -648,11 +648,11 @@ ATTR_COLD void netlist_net_t::merge_net(netlist_net_t *othernet)
if (othernet == NULL)
return; // Nothing to do
- if (othernet == this)
- {
- netlist().warning("Connecting %s to itself. This may be right, though\n", this->name().cstr());
- return; // Nothing to do
- }
+ if (othernet == this)
+ {
+ netlist().warning("Connecting %s to itself. This may be right, though\n", this->name().cstr());
+ return; // Nothing to do
+ }
if (this->isRailNet() && othernet->isRailNet())
netlist().error("Trying to merge two rail nets: %s and %s\n", this->name().cstr(), othernet->name().cstr());
@@ -664,7 +664,7 @@ ATTR_COLD void netlist_net_t::merge_net(netlist_net_t *othernet)
}
else
{
- othernet->move_connections(this);
+ othernet->move_connections(this);
}
}
@@ -673,19 +673,19 @@ ATTR_COLD void netlist_net_t::merge_net(netlist_net_t *othernet)
// ----------------------------------------------------------------------------------------
ATTR_COLD netlist_logic_net_t::netlist_logic_net_t()
- : netlist_net_t(LOGIC)
+ : netlist_net_t(LOGIC)
{
};
ATTR_COLD void netlist_logic_net_t::reset()
{
- netlist_net_t::reset();
+ netlist_net_t::reset();
}
ATTR_COLD void netlist_logic_net_t::save_register()
{
- netlist_net_t::save_register();
+ netlist_net_t::save_register();
}
// ----------------------------------------------------------------------------------------
@@ -693,57 +693,57 @@ ATTR_COLD void netlist_logic_net_t::save_register()
// ----------------------------------------------------------------------------------------
ATTR_COLD netlist_analog_net_t::netlist_analog_net_t()
- : netlist_net_t(ANALOG)
- , m_DD_n_m_1(0.0)
- , m_h_n_m_1(1e-6)
- , m_solver(NULL)
+ : netlist_net_t(ANALOG)
+ , m_DD_n_m_1(0.0)
+ , m_h_n_m_1(1e-6)
+ , m_solver(NULL)
{
};
ATTR_COLD void netlist_analog_net_t::reset()
{
- netlist_net_t::reset();
+ netlist_net_t::reset();
}
ATTR_COLD void netlist_analog_net_t::save_register()
{
- save(NAME(m_DD_n_m_1));
- save(NAME(m_h_n_m_1));
- netlist_net_t::save_register();
+ save(NAME(m_DD_n_m_1));
+ save(NAME(m_h_n_m_1));
+ netlist_net_t::save_register();
}
ATTR_COLD bool netlist_analog_net_t::already_processed(list_t *groups, int cur_group)
{
- if (isRailNet())
- return true;
- for (int i = 0; i <= cur_group; i++)
- {
- if (groups[i].contains(this))
- return true;
- }
- return false;
+ if (isRailNet())
+ return true;
+ for (int i = 0; i <= cur_group; i++)
+ {
+ if (groups[i].contains(this))
+ return true;
+ }
+ return false;
}
ATTR_COLD void netlist_analog_net_t::process_net(list_t *groups, int &cur_group)
{
- if (num_cons() == 0)
- return;
- /* add the net */
- //SOLVER_VERBOSE_OUT(("add %d - %s\n", cur_group, name().cstr()));
- groups[cur_group].add(this);
- for (int i = 0; i < m_core_terms.count(); i++)
- {
- netlist_core_terminal_t *p = m_core_terms[i];
- //SOLVER_VERBOSE_OUT(("terminal %s\n", p->name().cstr()));
- if (p->isType(netlist_terminal_t::TERMINAL))
- {
- //SOLVER_VERBOSE_OUT(("isterminal\n"));
- netlist_terminal_t *pt = static_cast<netlist_terminal_t *>(p);
- netlist_analog_net_t *other_net = &pt->m_otherterm->net().as_analog();
- if (!other_net->already_processed(groups, cur_group))
- other_net->process_net(groups, cur_group);
- }
- }
+ if (num_cons() == 0)
+ return;
+ /* add the net */
+ //SOLVER_VERBOSE_OUT(("add %d - %s\n", cur_group, name().cstr()));
+ groups[cur_group].add(this);
+ for (int i = 0; i < m_core_terms.count(); i++)
+ {
+ netlist_core_terminal_t *p = m_core_terms[i];
+ //SOLVER_VERBOSE_OUT(("terminal %s\n", p->name().cstr()));
+ if (p->isType(netlist_terminal_t::TERMINAL))
+ {
+ //SOLVER_VERBOSE_OUT(("isterminal\n"));
+ netlist_terminal_t *pt = static_cast<netlist_terminal_t *>(p);
+ netlist_analog_net_t *other_net = &pt->m_otherterm->net().as_analog();
+ if (!other_net->already_processed(groups, cur_group))
+ other_net->process_net(groups, cur_group);
+ }
+ }
}
@@ -780,16 +780,16 @@ ATTR_COLD netlist_terminal_t::netlist_terminal_t()
ATTR_HOT void netlist_terminal_t::schedule_solve()
{
- // FIXME: Remove this after we found a way to remove *ALL* twoterms connected to railnets only.
- if (net().as_analog().solver() != NULL)
- net().as_analog().solver()->update_forced();
+ // FIXME: Remove this after we found a way to remove *ALL* twoterms connected to railnets only.
+ if (net().as_analog().solver() != NULL)
+ net().as_analog().solver()->update_forced();
}
ATTR_HOT void netlist_terminal_t::schedule_after(const netlist_time &after)
{
- // FIXME: Remove this after we found a way to remove *ALL* twoterms connected to railnets only.
- if (net().as_analog().solver() != NULL)
- net().as_analog().solver()->update_after(after);
+ // FIXME: Remove this after we found a way to remove *ALL* twoterms connected to railnets only.
+ if (net().as_analog().solver() != NULL)
+ net().as_analog().solver()->update_after(after);
}
ATTR_COLD void netlist_terminal_t::reset()
@@ -843,7 +843,7 @@ ATTR_COLD void netlist_output_t::init_object(netlist_core_device_t &dev, const p
ATTR_COLD netlist_logic_output_t::netlist_logic_output_t()
: netlist_output_t(OUTPUT, LOGIC), m_proxy(NULL)
{
- this->set_net(m_my_net);
+ this->set_net(m_my_net);
}
ATTR_COLD void netlist_logic_output_t::initial(const netlist_sig_t val)
@@ -867,7 +867,7 @@ ATTR_COLD netlist_ttl_output_t::netlist_ttl_output_t()
ATTR_COLD netlist_analog_output_t::netlist_analog_output_t()
: netlist_output_t(OUTPUT, ANALOG), m_proxied_net(NULL)
{
- this->set_net(m_my_net);
+ this->set_net(m_my_net);
net().as_analog().m_cur_Analog = 0.98;
}
@@ -995,7 +995,7 @@ NETLIB_UPDATE(mainclock)
{
netlist_logic_net_t &net = m_Q.net().as_logic();
// this is only called during setup ...
- net.toggle_new_Q();
+ net.toggle_new_Q();
net.set_time(netlist().time() + m_inc);
}
diff --git a/src/emu/netlist/nl_parser.c b/src/emu/netlist/nl_parser.c
index 56238ee072b..50741b90e94 100644
--- a/src/emu/netlist/nl_parser.c
+++ b/src/emu/netlist/nl_parser.c
@@ -385,7 +385,7 @@ void netlist_parser::net_c()
{
pstring t1 = get_identifier();
m_setup.register_link(last , t1);
- NL_VERBOSE_OUT(("Parser: Connect: %s %s\n", last.cstr(), t1.cstr()));
+ NL_VERBOSE_OUT(("Parser: Connect: %s %s\n", last.cstr(), t1.cstr()));
token_t n = get_token();
if (n.is(m_tok_param_right))
break;
diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c
index 294c078f6f8..903828e41d5 100644
--- a/src/emu/netlist/nl_setup.c
+++ b/src/emu/netlist/nl_setup.c
@@ -92,9 +92,9 @@ netlist_device_t *netlist_setup_t::register_dev(netlist_device_t *dev, const pst
template <class T>
static void remove_start_with(T &hm, pstring &sw)
{
- for (int i = hm.count() - 1; i >= 0; i++)
- {
- pstring x = hm[i]->name();
+ for (int i = hm.count() - 1; i >= 0; i++)
+ {
+ pstring x = hm[i]->name();
if (sw.equals(x.substr(0, sw.len())))
{
NL_VERBOSE_OUT(("removing %s\n", hm[i]->name().cstr()));
@@ -167,8 +167,8 @@ pstring netlist_setup_t::objtype_as_astr(netlist_object_t &in) const
case netlist_terminal_t::NETLIST:
return "NETLIST";
break;
- case netlist_terminal_t::QUEUE:
- return "QUEUE";
+ case netlist_terminal_t::QUEUE:
+ return "QUEUE";
break;
}
// FIXME: noreturn
@@ -264,9 +264,9 @@ void netlist_setup_t::register_object(netlist_device_t &dev, const pstring &name
case netlist_terminal_t::NETLIST:
netlist().error("Netlist registration not yet supported - %s\n", name.cstr());
break;
- case netlist_terminal_t::QUEUE:
- netlist().error("QUEUE registration not yet supported - %s\n", name.cstr());
- break;
+ case netlist_terminal_t::QUEUE:
+ netlist().error("QUEUE registration not yet supported - %s\n", name.cstr());
+ break;
}
}
@@ -407,7 +407,7 @@ nld_base_d_to_a_proxy *netlist_setup_t::get_d_a_proxy(netlist_output_t &out)
for (int i = 0; i < out.net().m_core_terms.count(); i++)
{
- netlist_core_terminal_t *p = out.net().m_core_terms[i];
+ netlist_core_terminal_t *p = out.net().m_core_terms[i];
p->clear_net(); // de-link from all nets ...
connect(proxy->out(), *p);
}
@@ -444,10 +444,10 @@ void netlist_setup_t::connect_input_output(netlist_input_t &in, netlist_output_t
}
else
{
- if (in.has_net())
- out.net().merge_net(&in.net());
- else
- out.net().register_con(in);
+ if (in.has_net())
+ out.net().merge_net(&in.net());
+ else
+ out.net().register_con(in);
}
}
@@ -485,7 +485,7 @@ void netlist_setup_t::connect_terminal_output(netlist_terminal_t &in, netlist_ou
{
if (out.isFamily(netlist_terminal_t::ANALOG))
{
- NL_VERBOSE_OUT(("connect_terminal_output: %s %s\n", in.name().cstr(), out.name().cstr()));
+ NL_VERBOSE_OUT(("connect_terminal_output: %s %s\n", in.name().cstr(), out.name().cstr()));
/* no proxy needed, just merge existing terminal net */
if (in.has_net())
out.net().merge_net(&in.net());
@@ -650,14 +650,14 @@ void netlist_setup_t::resolve_inputs()
pstring errstr("");
netlist().log("looking for terminals not connected ...");
- for (int i = 0; i < m_terminals.count(); i++)
- {
+ for (int i = 0; i < m_terminals.count(); i++)
+ {
if (!m_terminals[i]->has_net())
errstr += pstring::sprintf("Found terminal %s without a net\n",
- m_terminals[i]->name().cstr());
+ m_terminals[i]->name().cstr());
else if (m_terminals[i]->net().num_cons() == 0)
netlist().warning("Found terminal %s without connections",
- m_terminals[i]->name().cstr());
+ m_terminals[i]->name().cstr());
}
if (errstr != "")
netlist().error("%s", errstr.cstr());
diff --git a/src/emu/softlist.c b/src/emu/softlist.c
index a0a8bc854f3..ef80e2dd2bd 100644
--- a/src/emu/softlist.c
+++ b/src/emu/softlist.c
@@ -1145,7 +1145,7 @@ void softlist_parser::parse_part_start(const char *tagname, const char **attribu
else
parse_error("Invalid dataarea endianness");
}
-
+
add_rom_entry(attrvalues[0], NULL, 0, strtol(attrvalues[1], NULL, 0), regionflags);
}
else
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index df90c8402c2..ca4373f4222 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -118,7 +118,7 @@ void ym2203_device::device_post_load()
void ym2203_device::device_start()
{
ay8910_device::device_start();
-
+
int rate = clock()/72; /* ??? */
m_irq_handler.resolve();
diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c
index 28625c9fa31..9a92224a565 100644
--- a/src/emu/sound/2608intf.c
+++ b/src/emu/sound/2608intf.c
@@ -128,7 +128,7 @@ void ym2608_device::device_post_load()
void ym2608_device::device_start()
{
ay8910_device::device_start();
-
+
int rate = clock()/72;
void *pcmbufa;
int pcmsizea;
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index 94c7ecf6594..e9ba4fe0b21 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -139,7 +139,7 @@ void ym2610_device::device_post_load()
void ym2610_device::device_start()
{
ay8910_device::device_start();
-
+
int rate = clock()/72;
void *pcmbufa,*pcmbufb;
int pcmsizea,pcmsizeb;
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 4804c731457..4dc95182a1d 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -389,35 +389,35 @@ static const ay8910_device::ay_ym_param ay8910_param =
static const ay8910_device::ay_ym_param ay8910_param =
{
- 800000, 8000000,
- 16,
- { 15950, 15350, 15090, 14760, 14275, 13620, 12890, 11370,
- 10600, 8590, 7190, 5985, 4820, 3945, 3017, 2345 }
+ 800000, 8000000,
+ 16,
+ { 15950, 15350, 15090, 14760, 14275, 13620, 12890, 11370,
+ 10600, 8590, 7190, 5985, 4820, 3945, 3017, 2345 }
};
static const ay8910_device::mosfet_param ay8910_mosfet_param =
{
- 1.465385778,
- 4.9,
- 16,
- {
- 0.00076,
- 0.80536,
- 1.13106,
- 1.65952,
- 2.42261,
- 3.60536,
- 5.34893,
- 8.96871,
- 10.97202,
- 19.32370,
- 29.01935,
- 38.82026,
- 55.50539,
- 78.44395,
- 109.49257,
- 153.72985,
- }
+ 1.465385778,
+ 4.9,
+ 16,
+ {
+ 0.00076,
+ 0.80536,
+ 1.13106,
+ 1.65952,
+ 2.42261,
+ 3.60536,
+ 5.34893,
+ 8.96871,
+ 10.97202,
+ 19.32370,
+ 29.01935,
+ 38.82026,
+ 55.50539,
+ 78.44395,
+ 109.49257,
+ 153.72985,
+ }
};
@@ -523,25 +523,25 @@ INLINE void build_single_table(double rl, const ay8910_device::ay_ym_param *par,
INLINE void build_mosfet_resistor_table(const ay8910_device::mosfet_param &par, const double rd, INT32 *tab)
{
- int j;
-
- for (j=0; j < par.m_count; j++)
- {
- const double Vd = 5.0;
- const double Vg = par.m_Vg - par.m_Vth;
- const double kn = par.m_Kn[j] / 1.0e6;
- const double p2 = 1.0 / (2.0 * kn * rd) + Vg;
- const double Vs = p2 - sqrt(p2 * p2 - Vg * Vg);
-
- const double res = rd * ( Vd / Vs - 1.0);
- /* That's the biggest value we can stream on to netlist. */
-
- if (res > (1 << 28))
- tab[j] = (1 << 28);
- else
- tab[j] = res;
- //printf("%d %f %10d\n", j, rd / (res + rd) * 5.0, tab[j]);
- }
+ int j;
+
+ for (j=0; j < par.m_count; j++)
+ {
+ const double Vd = 5.0;
+ const double Vg = par.m_Vg - par.m_Vth;
+ const double kn = par.m_Kn[j] / 1.0e6;
+ const double p2 = 1.0 / (2.0 * kn * rd) + Vg;
+ const double Vs = p2 - sqrt(p2 * p2 - Vg * Vg);
+
+ const double res = rd * ( Vd / Vs - 1.0);
+ /* That's the biggest value we can stream on to netlist. */
+
+ if (res > (1 << 28))
+ tab[j] = (1 << 28);
+ else
+ tab[j] = res;
+ //printf("%d %f %10d\n", j, rd / (res + rd) * 5.0, tab[j]);
+ }
}
@@ -814,10 +814,10 @@ void ay8910_device::build_mixer_table()
if ((m_flags & AY8910_RESISTOR_OUTPUT) != 0)
{
- if (m_type != PSG_TYPE_AY)
- fatalerror("AY8910_RESISTOR_OUTPUT currently only supported for AY8910 devices.");
+ if (m_type != PSG_TYPE_AY)
+ fatalerror("AY8910_RESISTOR_OUTPUT currently only supported for AY8910 devices.");
- for (chan=0; chan < AY8910_NUM_CHANNELS; chan++)
+ for (chan=0; chan < AY8910_NUM_CHANNELS; chan++)
{
build_mosfet_resistor_table(ay8910_mosfet_param, m_res_load[chan], m_vol_table[chan]);
build_mosfet_resistor_table(ay8910_mosfet_param, m_res_load[chan], m_env_table[chan]);
@@ -1110,7 +1110,7 @@ const device_type AY8910 = &device_creator<ay8910_device>;
ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY8910, "AY-3-8910A", tag, owner, clock, "ay8910", __FILE__),
device_sound_interface(mconfig, *this),
- m_type(PSG_TYPE_AY),
+ m_type(PSG_TYPE_AY),
m_streams(3),
m_ioports(2),
m_ready(0),
@@ -1149,10 +1149,10 @@ ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, dev
}
ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
- psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source)
+ psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
- m_type(psg_type),
+ m_type(psg_type),
m_streams(streams),
m_ioports(ioports),
m_ready(0),
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index 0510036d476..2c46b7560d6 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -155,7 +155,7 @@ es550x_device::es550x_device(const machine_config &mconfig, device_type type, co
m_region3(NULL),
m_channels(0),
m_irq_cb(*this),
- m_read_port_cb(*this)
+ m_read_port_cb(*this)
{
for (int i = 0; i < 4; i++)
{
diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c
index 51eb05e600d..d0b3762b5c5 100644
--- a/src/emu/sound/k053260.c
+++ b/src/emu/sound/k053260.c
@@ -92,8 +92,7 @@ void k053260_device::device_start()
void k053260_device::device_reset()
{
-
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
{
m_channels[i].rate = 0;
m_channels[i].size = 0;
diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c
index ee4e20b6357..db57af4b0bc 100644
--- a/src/emu/sound/k054539.c
+++ b/src/emu/sound/k054539.c
@@ -491,11 +491,11 @@ READ8_MEMBER(k054539_device::read)
void k054539_device::device_start()
{
m_timer = timer_alloc(0);
-
+
// resolve / bind callbacks
m_timer_handler.resolve_safe();
m_apan_cb.bind_relative_to(*owner());
-
+
for (int i = 0; i < 8; i++)
gain[i] = 1.0;
diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c
index 623ea4b7a1d..ad913283253 100644
--- a/src/emu/sound/pokey.c
+++ b/src/emu/sound/pokey.c
@@ -274,7 +274,7 @@ void pokey_device::device_start()
{
m_POTx[i] = 0;
}
-
+
m_pot0_r_cb.resolve();
m_pot1_r_cb.resolve();
m_pot2_r_cb.resolve();
diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c
index 372f1bf65f0..094760211d2 100644
--- a/src/emu/sound/rf5c68.c
+++ b/src/emu/sound/rf5c68.c
@@ -37,7 +37,7 @@ rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *tag, dev
void rf5c68_device::device_start()
{
m_sample_end_cb.bind_relative_to(*owner());
-
+
/* allocate memory for the chip */
memset(m_data, 0xff, sizeof(m_data));
diff --git a/src/emu/video.c b/src/emu/video.c
index c4830935864..8d19ce42309 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -372,7 +372,7 @@ void video_manager::begin_recording(const char *name, movie_format format)
// reset the state
m_avi_frame = 0;
m_avi_next_frame_time = machine().time();
-
+
// build up information about this new movie
avi_movie_info info;
info.video_format = 0;
@@ -410,7 +410,7 @@ void video_manager::begin_recording(const char *name, movie_format format)
{
// compute the frame time
m_avi_frame_period = attotime::from_seconds(1000) / info.video_timescale;
-
+
// create the file and free the string
avi_error avierr = avi_create(fullpath, &info, &m_avi_file);
if (avierr != AVIERR_NONE)
@@ -426,11 +426,11 @@ void video_manager::begin_recording(const char *name, movie_format format)
{
// stop any existing recording
end_recording(format);
-
+
// reset the state
m_mng_frame = 0;
- m_mng_next_frame_time = machine().time();
-
+ m_mng_next_frame_time = machine().time();
+
// create a new movie file and start recording
m_mng_file.reset(global_alloc(emu_file(machine().options().snapshot_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS)));
file_error filerr;
@@ -475,7 +475,7 @@ void video_manager::end_recording(movie_format format)
{
avi_close(m_avi_file);
m_avi_file = NULL;
-
+
// reset the state
m_avi_frame = 0;
}
@@ -1238,13 +1238,13 @@ void video_manager::record_frame()
end_recording(MF_AVI);
break;
}
-
+
// advance time
m_avi_next_frame_time += m_avi_frame_period;
m_avi_frame++;
}
}
-
+
// handle a MNG recording
if (m_mng_file != NULL)
{
@@ -1272,13 +1272,13 @@ void video_manager::record_frame()
end_recording(MF_MNG);
break;
}
-
+
// advance time
m_mng_next_frame_time += m_mng_frame_period;
m_mng_frame++;
}
}
-
+
g_profiler.stop();
}
diff --git a/src/emu/video/crt9007.c b/src/emu/video/crt9007.c
index c4560ce74a8..ab3fcbbb51c 100644
--- a/src/emu/video/crt9007.c
+++ b/src/emu/video/crt9007.c
@@ -431,8 +431,8 @@ inline void crt9007_t::recompute_parameters()
//if (LOG)
//{
- // logerror("CRT9007 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
- // logerror("CRT9007 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
+ // logerror("CRT9007 '%s' Screen: %u x %u @ %f Hz\n", tag(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
+ // logerror("CRT9007 '%s' Visible Area: (%u, %u) - (%u, %u)\n", tag(), visarea.min_x, visarea.min_y, visarea.max_x, visarea.max_y);
//}
//m_screen->configure(horiz_pix_total, vert_pix_total, visarea, refresh);
diff --git a/src/emu/video/hd44780.c b/src/emu/video/hd44780.c
index 95056e2c4a1..f9827f9afe8 100644
--- a/src/emu/video/hd44780.c
+++ b/src/emu/video/hd44780.c
@@ -189,7 +189,7 @@ void hd44780_device::correct_ac()
if (m_active_ram == DDRAM)
{
int max_ac = (m_num_line == 1) ? 0x4f : 0x67;
-
+
if (m_ac > max_ac)
m_ac -= max_ac + 1;
else if (m_ac < 0)
@@ -214,7 +214,7 @@ void hd44780_device::update_ac(int direction)
void hd44780_device::shift_display(int direction)
{
m_disp_shift += direction;
-
+
if (m_disp_shift == 0x50)
m_disp_shift = 0;
else if (m_disp_shift == -1)
diff --git a/src/emu/video/i8275.c b/src/emu/video/i8275.c
index a953da1f04c..e560bc78a36 100644
--- a/src/emu/video/i8275.c
+++ b/src/emu/video/i8275.c
@@ -224,7 +224,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
//if (LOG) logerror("I8275 '%s' y %u x %u VRTC 0\n", tag(), y, x);
m_write_vrtc(0);
}
-
+
if (m_scanline <= (m_vrtc_scanline - SCANLINES_PER_ROW))
{
if (lc == 0)
@@ -233,9 +233,9 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
{
m_status |= ST_DU;
m_du = true;
-
+
//if (LOG) logerror("I8275 '%s' y %u x %u DMA Underrun\n", tag(), y, x);
-
+
m_write_drq(0);
}
@@ -254,7 +254,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
}
}
}
-
+
if (m_scanline == m_irq_scanline)
{
if (m_status & ST_IE)
@@ -264,7 +264,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
m_write_irq(ASSERT_LINE);
}
}
-
+
if (m_scanline == m_vrtc_scanline)
{
//if (LOG) logerror("I8275 '%s' y %u x %u VRTC 1\n", tag(), y, x);
@@ -288,7 +288,7 @@ void i8275_device::device_timer(emu_timer &timer, device_timer_id id, int param,
m_char_blink &= 0x3f;
m_stored_attr = 0;
}
-
+
if (m_scanline == m_vrtc_drq_scanline)
{
// swap line buffers
@@ -614,7 +614,7 @@ WRITE8_MEMBER( i8275_device::dack_w )
}
else
{
- m_drq_on_timer->adjust(attotime::zero);
+ m_drq_on_timer->adjust(attotime::zero);
}
}
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index a0ec77103fa..095ee394199 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -1517,28 +1517,28 @@ UINT8 mos8563_device::draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle
MC6845_UPDATE_ROW( mos8563_device::vdc_update_row )
{
const pen_t *pen = m_palette->pens();
-
+
ra += (m_vert_scroll & 0x0f);
ra &= 0x0f;
-
+
UINT8 cth = (m_horiz_char >> 4) + (HSS_DBL ? 0 : 1);
UINT8 cdh = (m_horiz_char & 0x0f) + (HSS_DBL ? 0 : 1);
UINT8 cdv = m_vert_char_disp;
-
+
for (int column = 0; column < x_count; column++)
{
UINT8 code = read_videoram(ma + column);
UINT8 attr = 0;
-
+
int fg = m_color >> 4;
int bg = m_color & 0x0f;
-
+
if (HSS_ATTR)
{
offs_t attr_addr = m_attribute_addr + ma + column;
attr = read_videoram(attr_addr);
}
-
+
if (HSS_TEXT)
{
if (HSS_ATTR)
@@ -1546,15 +1546,15 @@ MC6845_UPDATE_ROW( mos8563_device::vdc_update_row )
fg = ATTR_FOREGROUND;
bg = ATTR_BACKGROUND;
}
-
+
if (VSS_RVS) code ^= 0xff;
-
+
for (int bit = 0; bit < cdh; bit++)
{
int x = (m_horiz_scroll & 0x0f) - cth + (column * cth) + bit;
if (x < 0) x = 0;
int color = BIT(code, 7) ? fg : bg;
-
+
bitmap.pix32(vbp + y, hbp + x) = pen[de ? color : 0];
}
}
@@ -1564,9 +1564,9 @@ MC6845_UPDATE_ROW( mos8563_device::vdc_update_row )
{
fg = ATTR_COLOR;
}
-
+
offs_t font_addr;
-
+
if (m_max_ras_addr < 16)
{
font_addr = ((m_char_base_addr & 0xe0) << 8) | (ATTR_ALTERNATE_CHARSET << 12) | (code << 4) | (ra & 0x0f);
@@ -1575,24 +1575,24 @@ MC6845_UPDATE_ROW( mos8563_device::vdc_update_row )
{
font_addr = ((m_char_base_addr & 0xc0) << 8) | (ATTR_ALTERNATE_CHARSET << 13) | (code << 5) | (ra & 0x1f);
}
-
+
UINT8 data = read_videoram(font_addr);
-
+
if (ra >= cdv) data = 0;
if (ATTR_UNDERLINE && (ra == m_underline_ras)) data = 0xff;
if (ATTR_BLINK && !m_char_blink_state) data = 0;
if (ATTR_REVERSE) data ^= 0xff;
if (column == cursor_x) data ^= 0xff;
if (VSS_RVS) data ^= 0xff;
-
+
for (int bit = 0; bit < cdh; bit++)
{
int x = (m_horiz_scroll & 0x0f) - cth + (column * cth) + bit;
if (x < 0) x = 0;
int color = BIT(data, 7) ? fg : bg;
-
+
bitmap.pix32(vbp + y, hbp + x) = pen[de ? color : 0];
-
+
if ((bit < 8) || !HSS_SEMI) data <<= 1;
}
}
diff --git a/src/emu/video/resnet.c b/src/emu/video/resnet.c
index e82a38c13e3..59e2b3b9420 100644
--- a/src/emu/video/resnet.c
+++ b/src/emu/video/resnet.c
@@ -612,10 +612,10 @@ int compute_res_net(int inputs, int channel, const res_net_info &di)
int level = ((inputs >> i) & 1);
if (di.rgb[channel].R[i] != 0.0 && !level)
{
- // There is no difference in the calculation of the "low" input
- // (transistor conducting to ground) between TTL output and
- // open collector output. This is documented explicitly in the
- // code below (no difference if / else.
+ // There is no difference in the calculation of the "low" input
+ // (transistor conducting to ground) between TTL output and
+ // open collector output. This is documented explicitly in the
+ // code below (no difference if / else.
if (OpenCol)
{
rTotal += 1.0 / di.rgb[channel].R[i];
diff --git a/src/emu/video/snes_ppu.c b/src/emu/video/snes_ppu.c
index c65cc5a85cb..e7ddd60246d 100644
--- a/src/emu/video/snes_ppu.c
+++ b/src/emu/video/snes_ppu.c
@@ -217,11 +217,11 @@ void snes_ppu_device::device_start()
#if SNES_LAYER_DEBUG
memset(&m_debug_options, 0, sizeof(m_debug_options));
#endif
-
+
m_vram = auto_alloc_array(machine(), UINT8, SNES_VRAM_SIZE);
m_cgram = auto_alloc_array(machine(), UINT16, SNES_CGRAM_SIZE/2);
m_oam_ram = auto_alloc_array(machine(), UINT16, SNES_OAM_SIZE/2);
-
+
/* Inititialize registers/variables */
m_update_windows = 1;
m_beam.latch_vert = 0;
@@ -232,27 +232,27 @@ void snes_ppu_device::device_start()
m_mode = 0;
m_ppu1_version = 1; // 5C77 chip version number, read by STAT77, only '1' is known
m_ppu2_version = 3; // 5C78 chip version number, read by STAT78, only '2' & '3' encountered so far.
-
+
m_cgram_address = 0;
m_read_ophct = 0;
m_read_opvct = 0;
-
+
PPU_REG(VMAIN) = 0x80;
// what about other regs?
-
+
/* Inititialize mosaic table */
for (int j = 0; j < 16; j++)
{
for (int i = 0; i < 4096; i++)
m_mosaic_table[j][i] = (i / (j + 1)) * (j + 1);
}
-
+
/* Init VRAM */
memset(m_vram, 0, SNES_VRAM_SIZE);
-
+
/* Init Palette RAM */
memset((UINT8 *)m_cgram, 0, SNES_CGRAM_SIZE);
-
+
/* Init oam RAM */
memset((UINT8 *)m_oam_ram, 0xff, SNES_OAM_SIZE);
@@ -268,7 +268,7 @@ void snes_ppu_device::device_start()
save_item(NAME(m_scanlines[i].layer), i);
save_item(NAME(m_scanlines[i].blend_exception), i);
}
-
+
for (int i = 0; i < 6; i++)
{
save_item(NAME(m_layer[i].window1_enabled), i);
@@ -288,10 +288,10 @@ void snes_ppu_device::device_start()
save_item(NAME(m_layer[i].sub_bg_enabled), i);
save_item(NAME(m_layer[i].hoffs), i);
save_item(NAME(m_layer[i].voffs), i);
-
+
save_item(NAME(m_clipmasks[i]), i);
}
-
+
save_item(NAME(m_oam.address_low));
save_item(NAME(m_oam.address_high));
save_item(NAME(m_oam.saved_address_low));
@@ -306,14 +306,14 @@ void snes_ppu_device::device_start()
save_item(NAME(m_oam.first_sprite));
save_item(NAME(m_oam.flip));
save_item(NAME(m_oam.write_latch));
-
+
save_item(NAME(m_beam.latch_horz));
save_item(NAME(m_beam.latch_vert));
save_item(NAME(m_beam.current_horz));
save_item(NAME(m_beam.current_vert));
save_item(NAME(m_beam.last_visible_line));
save_item(NAME(m_beam.interlace_count));
-
+
save_item(NAME(m_mode7.repeat));
save_item(NAME(m_mode7.hflip));
save_item(NAME(m_mode7.vflip));
@@ -326,7 +326,7 @@ void snes_ppu_device::device_start()
save_item(NAME(m_mode7.hor_offset));
save_item(NAME(m_mode7.ver_offset));
save_item(NAME(m_mode7.extbg));
-
+
save_item(NAME(m_mosaic_size));
save_item(NAME(m_clip_to_black));
save_item(NAME(m_prevent_color_math));
@@ -335,7 +335,7 @@ void snes_ppu_device::device_start()
save_item(NAME(m_direct_color));
save_item(NAME(m_ppu_last_scroll));
save_item(NAME(m_mode7_last_scroll));
-
+
save_item(NAME(m_ppu1_open_bus));
save_item(NAME(m_ppu2_open_bus));
save_item(NAME(m_ppu1_version));
@@ -344,7 +344,7 @@ void snes_ppu_device::device_start()
save_item(NAME(m_window1_right));
save_item(NAME(m_window2_left));
save_item(NAME(m_window2_right));
-
+
save_item(NAME(m_update_windows));
save_item(NAME(m_update_offsets));
save_item(NAME(m_update_oam_list));
@@ -357,7 +357,7 @@ void snes_ppu_device::device_start()
save_item(NAME(m_color_modes));
save_item(NAME(m_stat77));
save_item(NAME(m_stat78));
-
+
save_item(NAME(m_htmult));
save_item(NAME(m_cgram_address));
save_item(NAME(m_read_ophct));
@@ -369,9 +369,9 @@ void snes_ppu_device::device_start()
save_item(NAME(m_vram_fgr_shift));
save_item(NAME(m_vram_read_buffer));
save_item(NAME(m_vmadd));
-
+
save_item(NAME(m_regs));
-
+
save_pointer(NAME(m_vram), SNES_VRAM_SIZE);
save_pointer(NAME(m_cgram), SNES_CGRAM_SIZE/2);
save_pointer(NAME(m_oam_ram), SNES_OAM_SIZE/2);
diff --git a/src/emu/video/tms3556.c b/src/emu/video/tms3556.c
index eaca59c72a0..38cf1fa5cf7 100644
--- a/src/emu/video/tms3556.c
+++ b/src/emu/video/tms3556.c
@@ -83,13 +83,13 @@ tms3556_device::tms3556_device(const machine_config &mconfig, const char *tag, d
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, NULL, *ADDRESS_MAP_NAME(tms3556)),
m_reg_access_phase(0),
- m_row_col_written(0),
- m_bamp_written(0),
- m_colrow(0),
- m_vdp_acmpxy_mode(dma_write),
- m_vdp_acmpxy(0),
- m_vdp_acmp(0),
- m_init_read(0),
+ m_row_col_written(0),
+ m_bamp_written(0),
+ m_colrow(0),
+ m_vdp_acmpxy_mode(dma_write),
+ m_vdp_acmpxy(0),
+ m_vdp_acmp(0),
+ m_init_read(0),
m_scanline(0),
m_blink(0),
m_blink_count(0),
@@ -113,12 +113,12 @@ void tms3556_device::device_start()
save_item(NAME(m_control_regs));
save_item(NAME(m_address_regs));
save_item(NAME(m_reg_access_phase));
- save_item(NAME(m_row_col_written));
- save_item(NAME(m_bamp_written));
- save_item(NAME(m_colrow));
+ save_item(NAME(m_row_col_written));
+ save_item(NAME(m_bamp_written));
+ save_item(NAME(m_colrow));
// save_item(NAME(m_vdp_acmpxy_mode)); // FIXME : mame cannot save enum
- save_item(NAME(m_vdp_acmpxy));
- save_item(NAME(m_vdp_acmp));
+ save_item(NAME(m_vdp_acmpxy));
+ save_item(NAME(m_vdp_acmp));
save_item(NAME(m_scanline));
save_item(NAME(m_blink));
save_item(NAME(m_blink_count));
@@ -148,36 +148,36 @@ UINT32 tms3556_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap
READ8_MEMBER( tms3556_device::vram_r )
{
- UINT8 ret;
- if (m_bamp_written) {
- m_bamp_written=false;
- m_vdp_acmpxy_mode=dma_write;
- if (m_init_read)
- m_vdp_acmp=VDP_BAMP;
- else
- m_vdp_acmp=(VDP_BAMP-1)&0xFFFF;
- }
-
- if (m_row_col_written) {
- m_row_col_written=0;
- m_vdp_acmpxy_mode=dma_read;
- if (m_init_read)
- m_vdp_acmpxy=m_colrow;
- else
- m_vdp_acmpxy=(m_colrow-1)&0xFFFF;
- }
-
- m_init_read=false;
- if (m_vdp_acmpxy_mode==dma_read) {
- ret=readbyte(m_vdp_acmpxy);
- m_vdp_acmpxy++;
- if (m_vdp_acmpxy==VDP_BAMTF) m_vdp_acmpxy=VDP_BAMP;
- } else {
- ret=readbyte(m_vdp_acmp);
- m_vdp_acmp++;
- if (m_vdp_acmp==VDP_BAMTF) m_vdp_acmp=VDP_BAMP;
- }
- return ret;
+ UINT8 ret;
+ if (m_bamp_written) {
+ m_bamp_written=false;
+ m_vdp_acmpxy_mode=dma_write;
+ if (m_init_read)
+ m_vdp_acmp=VDP_BAMP;
+ else
+ m_vdp_acmp=(VDP_BAMP-1)&0xFFFF;
+ }
+
+ if (m_row_col_written) {
+ m_row_col_written=0;
+ m_vdp_acmpxy_mode=dma_read;
+ if (m_init_read)
+ m_vdp_acmpxy=m_colrow;
+ else
+ m_vdp_acmpxy=(m_colrow-1)&0xFFFF;
+ }
+
+ m_init_read=false;
+ if (m_vdp_acmpxy_mode==dma_read) {
+ ret=readbyte(m_vdp_acmpxy);
+ m_vdp_acmpxy++;
+ if (m_vdp_acmpxy==VDP_BAMTF) m_vdp_acmpxy=VDP_BAMP;
+ } else {
+ ret=readbyte(m_vdp_acmp);
+ m_vdp_acmp++;
+ if (m_vdp_acmp==VDP_BAMTF) m_vdp_acmp=VDP_BAMP;
+ }
+ return ret;
}
//-------------------------------------------------
@@ -186,27 +186,27 @@ READ8_MEMBER( tms3556_device::vram_r )
WRITE8_MEMBER( tms3556_device::vram_w )
{
- if (m_bamp_written) {
- m_bamp_written=false;
- m_vdp_acmpxy_mode=dma_read;
- m_vdp_acmp=VDP_BAMP;
- }
-
- if (m_row_col_written) {
- m_row_col_written=0;
- m_vdp_acmpxy_mode=dma_write;
- m_vdp_acmpxy=m_colrow;
- }
-
- if (m_vdp_acmpxy_mode==dma_write) {
- writebyte(m_vdp_acmpxy,data);
- m_vdp_acmpxy++;
- if (m_vdp_acmpxy==VDP_BAMTF) m_vdp_acmpxy=VDP_BAMP;
- } else {
- writebyte(m_vdp_acmp,data);
- m_vdp_acmp++;
- if (m_vdp_acmp==VDP_BAMTF) m_vdp_acmp=VDP_BAMP;
- }
+ if (m_bamp_written) {
+ m_bamp_written=false;
+ m_vdp_acmpxy_mode=dma_read;
+ m_vdp_acmp=VDP_BAMP;
+ }
+
+ if (m_row_col_written) {
+ m_row_col_written=0;
+ m_vdp_acmpxy_mode=dma_write;
+ m_vdp_acmpxy=m_colrow;
+ }
+
+ if (m_vdp_acmpxy_mode==dma_write) {
+ writebyte(m_vdp_acmpxy,data);
+ m_vdp_acmpxy++;
+ if (m_vdp_acmpxy==VDP_BAMTF) m_vdp_acmpxy=VDP_BAMP;
+ } else {
+ writebyte(m_vdp_acmp,data);
+ m_vdp_acmp++;
+ if (m_vdp_acmp==VDP_BAMTF) m_vdp_acmp=VDP_BAMP;
+ }
}
@@ -220,7 +220,7 @@ READ8_MEMBER( tms3556_device::reg_r )
if (LOG) logerror("TMS3556 Reg Read: %06x\n", offset);
int reply = 0; // FIXME : will send internal status (VBL, HBL...)
- m_reg_access_phase=0;
+ m_reg_access_phase=0;
return reply;
}
@@ -230,75 +230,75 @@ READ8_MEMBER( tms3556_device::reg_r )
WRITE8_MEMBER( tms3556_device::reg_w )
{
- static int reg2=0; // FIXME : this static makes that only one TMS3556 will be present in one system...
- static int reg=0;
+ static int reg2=0; // FIXME : this static makes that only one TMS3556 will be present in one system...
+ static int reg=0;
if (LOG) logerror("TMS3556 Reg Write: %06x = %02x\n", offset, data);
- switch (m_reg_access_phase) {
- case 0:
- reg=data&0x0F;
- reg2=(data&0xF0)>>4;
- if (reg!=0)
- m_reg_access_phase=1;
- return;
-
- case 1:
- if (reg<8) {
- m_control_regs[reg]=data;
- // leve un flag si le dernier registre ecrit est row ou col
- if ((reg==2) || (reg==1)) {
- m_colrow=(m_control_regs[2]<<8)|m_control_regs[1];
- m_row_col_written=true;
- }
-
- if (reg2==0) {
- m_reg_access_phase=0;
- return;
- }
- else {
- m_reg_access_phase=1;
- reg=reg2;
- reg2=0;
- return;
- }
- } else {
- m_address_regs[reg-8]=(m_control_regs[2]<<8)|m_control_regs[1];
- // cas speciaux de decalage pour les generateurs
- if ((reg>=0xB) && (reg<=0xE)) {
- m_address_regs[reg-8]+=2;
- m_address_regs[reg-8]&=0xFFFF;
- } else {
- m_address_regs[reg-8]+=1;
- m_address_regs[reg-8]&=0xFFFF;
- }
- if (reg==9) {
- m_row_col_written=false;
- m_bamp_written=true;
- m_reg_access_phase=0;
- return;
- } else {
- m_row_col_written=0;
- m_bamp_written=false;
- m_reg_access_phase=2;//???
- return;
- }
- logerror("VDP16[%d] = x%x",reg,m_address_regs[reg-8]);
- if (reg2==0) {
- m_reg_access_phase=0;
- return;
- }
- else {
- m_reg_access_phase=1;
- reg=reg2;
- reg2=0;
- return;
- }
- }
- case 2:
- m_reg_access_phase=0;
- return;
- }
+ switch (m_reg_access_phase) {
+ case 0:
+ reg=data&0x0F;
+ reg2=(data&0xF0)>>4;
+ if (reg!=0)
+ m_reg_access_phase=1;
+ return;
+
+ case 1:
+ if (reg<8) {
+ m_control_regs[reg]=data;
+ // leve un flag si le dernier registre ecrit est row ou col
+ if ((reg==2) || (reg==1)) {
+ m_colrow=(m_control_regs[2]<<8)|m_control_regs[1];
+ m_row_col_written=true;
+ }
+
+ if (reg2==0) {
+ m_reg_access_phase=0;
+ return;
+ }
+ else {
+ m_reg_access_phase=1;
+ reg=reg2;
+ reg2=0;
+ return;
+ }
+ } else {
+ m_address_regs[reg-8]=(m_control_regs[2]<<8)|m_control_regs[1];
+ // cas speciaux de decalage pour les generateurs
+ if ((reg>=0xB) && (reg<=0xE)) {
+ m_address_regs[reg-8]+=2;
+ m_address_regs[reg-8]&=0xFFFF;
+ } else {
+ m_address_regs[reg-8]+=1;
+ m_address_regs[reg-8]&=0xFFFF;
+ }
+ if (reg==9) {
+ m_row_col_written=false;
+ m_bamp_written=true;
+ m_reg_access_phase=0;
+ return;
+ } else {
+ m_row_col_written=0;
+ m_bamp_written=false;
+ m_reg_access_phase=2;//???
+ return;
+ }
+ logerror("VDP16[%d] = x%x",reg,m_address_regs[reg-8]);
+ if (reg2==0) {
+ m_reg_access_phase=0;
+ return;
+ }
+ else {
+ m_reg_access_phase=1;
+ reg=reg2;
+ reg2=0;
+ return;
+ }
+ }
+ case 2:
+ m_reg_access_phase=0;
+ return;
+ }
}
//--------------------------------------------------------------------------
@@ -307,8 +307,8 @@ WRITE8_MEMBER( tms3556_device::reg_w )
READ8_MEMBER( tms3556_device::initptr_r )
{
- m_init_read=true;
- return 0xff;
+ m_init_read=true;
+ return 0xff;
}
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index 34f3487ceb1..138a528707a 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -5666,13 +5666,13 @@ static void dump_rasterizer_stats(voodoo_state *v)
voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_fbmem(0),
- m_tmumem0(0),
- m_tmumem1(0),
- m_screen(NULL),
- m_cputag(NULL),
- m_vblank(*this),
- m_stall(*this)
+ m_fbmem(0),
+ m_tmumem0(0),
+ m_tmumem1(0),
+ m_screen(NULL),
+ m_cputag(NULL),
+ m_vblank(*this),
+ m_stall(*this)
{
m_token = global_alloc_clear(voodoo_state);
}
diff --git a/src/emu/webengine.c b/src/emu/webengine.c
index 1cedbed92dd..59b2b7bc8bf 100644
--- a/src/emu/webengine.c
+++ b/src/emu/webengine.c
@@ -103,7 +103,7 @@ int web_engine::json_slider_handler(struct mg_connection *conn)
array.append(data);
}
- // add all sliders
+ // add all sliders
for (curslider = (slider_state*)machine().osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
{
INT32 curval = (*curslider->update)(machine(), curslider->arg, &tempstring, SLIDER_NOCHANGE);
@@ -258,7 +258,7 @@ int web_engine::begin_request_handler(struct mg_connection *conn)
file.close();
mg_send_header(conn, "Cache-Control", "no-cache, no-store, must-revalidate");
mg_send_header(conn, "Pragma", "no-cache");
- mg_send_header(conn, "Expires", "0");
+ mg_send_header(conn, "Expires", "0");
mg_send_file(conn, fullpath.cstr());
return MG_MORE; // It is important to return MG_MORE after mg_send_file!
}
@@ -266,35 +266,35 @@ int web_engine::begin_request_handler(struct mg_connection *conn)
}
static int ev_handler(struct mg_connection *conn, enum mg_event ev) {
- if (ev == MG_REQUEST) {
+ if (ev == MG_REQUEST) {
if (conn->is_websocket) {
// This handler is called for each incoming websocket frame, one or more
// times for connection lifetime.
// Echo websocket data back to the client.
return conn->content_len == 4 && !memcmp(conn->content, "exit", 4) ? MG_FALSE : MG_TRUE;
- } else {
- web_engine *engine = static_cast<web_engine *>(conn->server_param);
+ } else {
+ web_engine *engine = static_cast<web_engine *>(conn->server_param);
return engine->begin_request_handler(conn);
}
- } else if (ev== MG_WS_CONNECT) {
+ } else if (ev== MG_WS_CONNECT) {
// New websocket connection. Send connection ID back to the client.
mg_websocket_printf(conn, WEBSOCKET_OPCODE_TEXT, "update_machine");
return MG_FALSE;
- } else if (ev == MG_AUTH) {
- return MG_TRUE;
- } else {
- return MG_FALSE;
- }
+ } else if (ev == MG_AUTH) {
+ return MG_TRUE;
+ } else {
+ return MG_FALSE;
+ }
}
static int iterate_callback(struct mg_connection *c, enum mg_event ev) {
- if (ev == MG_POLL && c->is_websocket) {
- char buf[20];
- int len = snprintf(buf, sizeof(buf), "%lu",
- (unsigned long) * (time_t *) c->callback_param);
- mg_websocket_write(c, 1, buf, len);
- }
- return MG_TRUE;
+ if (ev == MG_POLL && c->is_websocket) {
+ char buf[20];
+ int len = snprintf(buf, sizeof(buf), "%lu",
+ (unsigned long) * (time_t *) c->callback_param);
+ mg_websocket_write(c, 1, buf, len);
+ }
+ return MG_TRUE;
}
static void *serve(void *server) {
@@ -304,7 +304,7 @@ static void *serve(void *server) {
if (current_timer - last_timer > 0) {
last_timer = current_timer;
mg_iterate_over_connections((struct mg_server *)server, iterate_callback, &current_timer);
- }
+ }
return NULL;
}
@@ -322,10 +322,10 @@ web_engine::web_engine(emu_options &options)
{
if (m_options.http()) {
m_server = mg_create_server(this, ev_handler);
-
+
mg_set_option(m_server, "listening_port", options.http_port());
mg_set_option(m_server, "document_root", options.http_path());
-
+
mg_start_thread(serve, m_server);
}
@@ -349,15 +349,15 @@ void web_engine::close()
{
m_exiting_core = 1;
// Cleanup, and free server instance
- mg_destroy_server(&m_server);
+ mg_destroy_server(&m_server);
}
static int websocket_callback(struct mg_connection *c, enum mg_event ev) {
- if (c->is_websocket) {
- const char *message = (const char *)c->callback_param;
- mg_websocket_write(c, 1, message, strlen(message));
- }
- return MG_TRUE;
+ if (c->is_websocket) {
+ const char *message = (const char *)c->callback_param;
+ mg_websocket_write(c, 1, message, strlen(message));
+ }
+ return MG_TRUE;
}
void web_engine::push_message(const char *message)
diff --git a/src/lib/formats/ap2_dsk.c b/src/lib/formats/ap2_dsk.c
index 07b4c104786..5d3c1e141f8 100644
--- a/src/lib/formats/ap2_dsk.c
+++ b/src/lib/formats/ap2_dsk.c
@@ -520,7 +520,7 @@ LEGACY_FLOPPY_OPTIONS_END
****************************************************************************/
-static const UINT8 dos_skewing[] =
+static const UINT8 dos_skewing[] =
{
0x00, 0x07, 0x0E, 0x06, 0x0D, 0x05, 0x0C, 0x04,
0x0B, 0x03, 0x0A, 0x02, 0x09, 0x01, 0x08, 0x0F
@@ -623,16 +623,16 @@ bool a2_16sect_format::load(io_generic *io, UINT32 form_factor, floppy_image *im
if (!memcmp("PRODOS", &sector_data[0x103], 6))
{
m_prodos_order = true;
- } // check for ProDOS order SOS disk
- else if (!memcmp(sos_block1, &sector_data[0x100], 4))
+ } // check for ProDOS order SOS disk
+ else if (!memcmp(sos_block1, &sector_data[0x100], 4))
{
m_prodos_order = true;
- } // check for Apple III A2 emulator disk in ProDOS order
- else if (!memcmp(a3a2emul_block1, &sector_data[0x100], 6))
+ } // check for Apple III A2 emulator disk in ProDOS order
+ else if (!memcmp(a3a2emul_block1, &sector_data[0x100], 6))
{
m_prodos_order = true;
- } // check for PCPI Applicard software in ProDOS order
- else if (!memcmp("COPYRIGHT (C) 1979, DIGITAL RESEARCH", &sector_data[0x118], 36))
+ } // check for PCPI Applicard software in ProDOS order
+ else if (!memcmp("COPYRIGHT (C) 1979, DIGITAL RESEARCH", &sector_data[0x118], 36))
{
printf("PCPI detected\n");
m_prodos_order = true;
@@ -646,7 +646,7 @@ bool a2_16sect_format::load(io_generic *io, UINT32 form_factor, floppy_image *im
{
m_prodos_order = true;
}
- } // check for DOS 3.3 disks in ProDOS order
+ } // check for DOS 3.3 disks in ProDOS order
else if (!memcmp(dos33_block1, &sector_data[0x100], 4))
{
m_prodos_order = true;
@@ -692,13 +692,13 @@ bool a2_16sect_format::load(io_generic *io, UINT32 form_factor, floppy_image *im
nval = sdata[i - 0x56] >> 2;
else {
nval =
- ((sdata[i+0x00] & 0x01) << 1) |
- ((sdata[i+0x00] & 0x02) >> 1) |
- ((sdata[i+0x56] & 0x01) << 3) |
+ ((sdata[i+0x00] & 0x01) << 1) |
+ ((sdata[i+0x00] & 0x02) >> 1) |
+ ((sdata[i+0x56] & 0x01) << 3) |
((sdata[i+0x56] & 0x02) << 1);
if(i < 256-0xac)
nval |=
- ((sdata[i+0xac] & 0x01) << 5) |
+ ((sdata[i+0xac] & 0x01) << 5) |
((sdata[i+0xac] & 0x02) << 3);
}
raw_w(track_data, offset, 8, translate6[nval ^ pval]);
@@ -711,7 +711,7 @@ bool a2_16sect_format::load(io_generic *io, UINT32 form_factor, floppy_image *im
assert(offset == 51090);
generate_track_from_levels(track, 0, track_data, 51090, 0, image);
- }
+ }
return true;
}
@@ -789,7 +789,7 @@ bool a2_16sect_format::save(io_generic *io, floppy_image *image)
int dosver = 0; // apple dos version; 0 = >=3.3, 1 = <3.3
for(;;) {
UINT8 v = gb(buf, ts, pos, wrap);
- if(v == 0xff) {
+ if(v == 0xff) {
hb = 1;
}
else if(hb == 1 && v == 0xd5){
@@ -852,11 +852,11 @@ bool a2_16sect_format::save(io_generic *io, floppy_image *image)
if (m_prodos_order)
{
- dest = sectdata+(256)*prodos_skewing[se];
+ dest = sectdata+(256)*prodos_skewing[se];
}
else
{
- dest = sectdata+(256)*dos_skewing[se];
+ dest = sectdata+(256)*dos_skewing[se];
}
// first read in sector and decode to 6bit form
diff --git a/src/lib/formats/msx_dsk.c b/src/lib/formats/msx_dsk.c
index 65c3ba6fcac..45982f1ec9c 100644
--- a/src/lib/formats/msx_dsk.c
+++ b/src/lib/formats/msx_dsk.c
@@ -71,4 +71,3 @@ const msx_format::format msx_format::formats[] = {
};
const floppy_format_type FLOPPY_MSX_FORMAT = &floppy_image_format_creator<msx_format>;
-
diff --git a/src/lib/formats/oric_dsk.c b/src/lib/formats/oric_dsk.c
index 95a2c34d427..aaef1928f0a 100644
--- a/src/lib/formats/oric_dsk.c
+++ b/src/lib/formats/oric_dsk.c
@@ -88,7 +88,7 @@ bool oric_dsk_format::load(io_generic *io, UINT32 form_factor, floppy_image *ima
copy = 7;
sector_size = 128 << (t[i+7] & 3);
logerror("%02x %x - %02x %02x %02x %02x\n",
- track, side, t[i+4], t[i+5], t[i+6], t[i+7]);
+ track, side, t[i+4], t[i+5], t[i+6], t[i+7]);
} else if(t[i+3] == 0xfb)
copy = sector_size+3;
else
@@ -102,7 +102,7 @@ bool oric_dsk_format::load(io_generic *io, UINT32 form_factor, floppy_image *ima
}
generate_track_from_levels(track, side, stream, 100000, 0, image);
}
-
+
return true;
}
diff --git a/src/lib/formats/rx50_dsk.c b/src/lib/formats/rx50_dsk.c
index cf70b43a9f5..4ece096fba6 100644
--- a/src/lib/formats/rx50_dsk.c
+++ b/src/lib/formats/rx50_dsk.c
@@ -1,30 +1,30 @@
/**********************************************************************
- formats/rx50_dsk.c
- Floppies used by Rainbow 100 and 190.
+ formats/rx50_dsk.c
+ Floppies used by Rainbow 100 and 190.
- The RX50 drive: 5.25" format; 300 rpm; MFM 250 kbps; 96 - 100 tpi
- - single sided with two disk slots (1 drive motor served both).
+ The RX50 drive: 5.25" format; 300 rpm; MFM 250 kbps; 96 - 100 tpi
+ - single sided with two disk slots (1 drive motor served both).
- DEC used the RX50 in entirely different architectures (Pro / PDP-11).
- Native Rainbow 100 format:
- - SSQD - 80 tracks with 10 sectors per track (512 byte sectors)
- - first two tracks are reserved for loader code (DOS / CPM / custom)
- - FAT and root directory began immediately on track 2.
- - 2:1 sector interleave pattern - except in tracks 0 and 1.
- NOTE: PUTR tends to interleave loader tracks 0 + 1. Not recommended!
+ DEC used the RX50 in entirely different architectures (Pro / PDP-11).
+ Native Rainbow 100 format:
+ - SSQD - 80 tracks with 10 sectors per track (512 byte sectors)
+ - first two tracks are reserved for loader code (DOS / CPM / custom)
+ - FAT and root directory began immediately on track 2.
+ - 2:1 sector interleave pattern - except in tracks 0 and 1.
+ NOTE: PUTR tends to interleave loader tracks 0 + 1. Not recommended!
- Jeff's RBIMG is first choice for preservation, TeleDisk is second.
- Always check the track layout. Both have problems with weak disks.
+ Jeff's RBIMG is first choice for preservation, TeleDisk is second.
+ Always check the track layout. Both have problems with weak disks.
- A container to handle copy protected RX 50 disks is needed. Some info
- can be derived from Mark Hittinger's RBACKUP (CP/M source from Nov-94).
+ A container to handle copy protected RX 50 disks is needed. Some info
+ can be derived from Mark Hittinger's RBACKUP (CP/M source from Nov-94).
- TODO: improve code to accept 40 T / single sided / 9 or 8 sector disks:
- a) disks from VT180 (9 sectors; READ ONLY - enforced by BIOS)
+ TODO: improve code to accept 40 T / single sided / 9 or 8 sector disks:
+ a) disks from VT180 (9 sectors; READ ONLY - enforced by BIOS)
- b) 8 sector 160k MS-DOS disks (READ + WRITE support on DEC)
- FORMAT A: /F:160 on DOS; turn MEDIACHK ON
+ b) 8 sector 160k MS-DOS disks (READ + WRITE support on DEC)
+ FORMAT A: /F:160 on DOS; turn MEDIACHK ON
************************************************************************/
#include "emu.h"
@@ -40,30 +40,30 @@ const floppy_image_format_t::desc_e rx50img_format::rx50_10_desc[] = {
{ MFM, 0x4e, 80 }, // (*) GAP (1)
{ MFM, 0x00, 12 }, // Value from (*). (?? = unverified)
{ RAW, 0x5224, 3 },
- { MFM, 0xfc, 1 },
- { MFM, 0x4e, 50 },
+ { MFM, 0xfc, 1 },
+ { MFM, 0x4e, 50 },
{ MFM, 0x00, 12 },
- { SECTOR_LOOP_START, 0, 9 }, // 0 ... f.sector_count-1
+ { SECTOR_LOOP_START, 0, 9 }, // 0 ... f.sector_count-1
{ CRC_CCITT_START, 1 },
- { RAW, 0x4489, 3 },
- { MFM, 0xfe, 1 },
+ { RAW, 0x4489, 3 },
+ { MFM, 0xfe, 1 },
{ TRACK_ID },
{ HEAD_ID },
{ SECTOR_ID },
{ SIZE_ID },
{ CRC_END, 1 },
{ CRC, 1 },
- { MFM, 0x4e, 22 }, // (*) POST-ID GAP (2)
- { MFM, 0x00, 12 }, // (*)
+ { MFM, 0x4e, 22 }, // (*) POST-ID GAP (2)
+ { MFM, 0x00, 12 }, // (*)
{ CRC_CCITT_START, 2 },
- { RAW, 0x4489, 3 },
- { MFM, 0xfb, 1 },
+ { RAW, 0x4489, 3 },
+ { MFM, 0xfb, 1 },
{ SECTOR_DATA, -1 },
{ CRC_END, 2 },
{ CRC, 2 },
- { MFM, 0x4e, 48 }, // GAP (3) - taken from RBACKUP source.
+ { MFM, 0x4e, 48 }, // GAP (3) - taken from RBACKUP source.
{ MFM, 0x00, 12 },
- { SECTOR_LOOP_END },
+ { SECTOR_LOOP_END },
{ MFM, 0x4e, 1 }, // UNVERIFIED - ('esq_16' has 170 x $4e)
{ END }
};
@@ -78,7 +78,7 @@ const char *rx50img_format::name() const
}
const char *rx50img_format::description() const
-{
+{
return "DEC Rainbow 100 floppy image";
}
@@ -106,17 +106,17 @@ void rx50img_format::find_size(io_generic *io, UINT8 &track_count, UINT8 &head_c
if (size == expected_size) // standard format has 409600 byte
return;
/*
- track_count = 40;
- sector_count = 9; // [VT 180]
- expected_size = 512 * track_count * head_count * sector_count;
- if (size == expected_size)
- return;
-
- track_count = 40;
- sector_count = 8; // [DOS]
- expected_size = 512 * track_count * head_count * sector_count;
- if (size == expected_size)
- return;
+ track_count = 40;
+ sector_count = 9; // [VT 180]
+ expected_size = 512 * track_count * head_count * sector_count;
+ if (size == expected_size)
+ return;
+
+ track_count = 40;
+ sector_count = 8; // [DOS]
+ expected_size = 512 * track_count * head_count * sector_count;
+ if (size == expected_size)
+ return;
*/
track_count = head_count = sector_count = 0;
}
@@ -131,7 +131,7 @@ int rx50img_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
- // /* Sectors are numbered 1 to 10 */
+ // /* Sectors are numbered 1 to 10 */
bool rx50img_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
UINT8 track_count, head_count, sector_count;
@@ -173,20 +173,20 @@ bool rx50img_format::save(io_generic *io, floppy_image *image)
head_count = 1;
if(sector_count == 9) // [VT180] 9 sector format : no save!
- return false;
+ return false;
if(sector_count != 10) // either 8 or 10 sectors
- sector_count = 10; // [STANDARD]
+ sector_count = 10; // [STANDARD]
/*
if(sector_count != 10) // either 8 or 10 sectors
{
- if(sector_count == 8)
+ if(sector_count == 8)
{
- track_count = 40; // [DOS]
+ track_count = 40; // [DOS]
} else
{
- sector_count = 10; // [STANDARD]
+ sector_count = 10; // [STANDARD]
}
}
*/
@@ -213,15 +213,15 @@ const floppy_format_type FLOPPY_RX50IMG_FORMAT = &floppy_image_format_creator<rx
// The BIOS can also * read * VT-180 disks and access MS-DOS 160 k disks (R + W)
// ( 40 tracks; single sided with 9 or 8 sectors per track )
static LEGACY_FLOPPY_OPTIONS_START( dec100_floppy )
- LEGACY_FLOPPY_OPTION( dec100_floppy, "td0", "Teledisk floppy disk image", td0_dsk_identify, td0_dsk_construct, td0_dsk_destruct, NULL )
- LEGACY_FLOPPY_OPTION( dec100_floppy, "img", "DEC Rainbow 100", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS(40/[80])
- SECTORS(8/9/[10])
- SECTOR_LENGTH([512])
- INTERLEAVE([0])
- FIRST_SECTOR_ID([1])
- )
+ LEGACY_FLOPPY_OPTION( dec100_floppy, "td0", "Teledisk floppy disk image", td0_dsk_identify, td0_dsk_construct, td0_dsk_destruct, NULL )
+ LEGACY_FLOPPY_OPTION( dec100_floppy, "img", "DEC Rainbow 100", basicdsk_identify_default, basicdsk_construct_default, NULL,
+ HEADS([1])
+ TRACKS(40/[80])
+ SECTORS(8/9/[10])
+ SECTOR_LENGTH([512])
+ INTERLEAVE([0])
+ FIRST_SECTOR_ID([1])
+ )
LEGACY_FLOPPY_OPTIONS_END
-*/ \ No newline at end of file
+*/
diff --git a/src/lib/lua/lapi.c b/src/lib/lua/lapi.c
index d011431eadf..7e360753845 100644
--- a/src/lib/lua/lapi.c
+++ b/src/lib/lua/lapi.c
@@ -30,21 +30,21 @@
const char lua_ident[] =
- "$LuaVersion: " LUA_COPYRIGHT " $"
- "$LuaAuthors: " LUA_AUTHORS " $";
+ "$LuaVersion: " LUA_COPYRIGHT " $"
+ "$LuaAuthors: " LUA_AUTHORS " $";
/* value at a non-valid index */
-#define NONVALIDVALUE cast(TValue *, luaO_nilobject)
+#define NONVALIDVALUE cast(TValue *, luaO_nilobject)
/* corresponding test */
-#define isvalid(o) ((o) != luaO_nilobject)
+#define isvalid(o) ((o) != luaO_nilobject)
/* test for pseudo index */
-#define ispseudo(i) ((i) <= LUA_REGISTRYINDEX)
+#define ispseudo(i) ((i) <= LUA_REGISTRYINDEX)
/* test for valid but not pseudo index */
-#define isstackindex(i, o) (isvalid(o) && !ispseudo(i))
+#define isstackindex(i, o) (isvalid(o) && !ispseudo(i))
#define api_checkvalidindex(L, o) api_check(L, isvalid(o), "invalid index")
@@ -53,29 +53,29 @@ const char lua_ident[] =
static TValue *index2addr (lua_State *L, int idx) {
- CallInfo *ci = L->ci;
- if (idx > 0) {
- TValue *o = ci->func + idx;
- api_check(L, idx <= ci->top - (ci->func + 1), "unacceptable index");
- if (o >= L->top) return NONVALIDVALUE;
- else return o;
- }
- else if (!ispseudo(idx)) { /* negative index */
- api_check(L, idx != 0 && -idx <= L->top - (ci->func + 1), "invalid index");
- return L->top + idx;
- }
- else if (idx == LUA_REGISTRYINDEX)
- return &G(L)->l_registry;
- else { /* upvalues */
- idx = LUA_REGISTRYINDEX - idx;
- api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large");
- if (ttislcf(ci->func)) /* light C function? */
- return NONVALIDVALUE; /* it has no upvalues */
- else {
- CClosure *func = clCvalue(ci->func);
- return (idx <= func->nupvalues) ? &func->upvalue[idx-1] : NONVALIDVALUE;
- }
- }
+ CallInfo *ci = L->ci;
+ if (idx > 0) {
+ TValue *o = ci->func + idx;
+ api_check(L, idx <= ci->top - (ci->func + 1), "unacceptable index");
+ if (o >= L->top) return NONVALIDVALUE;
+ else return o;
+ }
+ else if (!ispseudo(idx)) { /* negative index */
+ api_check(L, idx != 0 && -idx <= L->top - (ci->func + 1), "invalid index");
+ return L->top + idx;
+ }
+ else if (idx == LUA_REGISTRYINDEX)
+ return &G(L)->l_registry;
+ else { /* upvalues */
+ idx = LUA_REGISTRYINDEX - idx;
+ api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large");
+ if (ttislcf(ci->func)) /* light C function? */
+ return NONVALIDVALUE; /* it has no upvalues */
+ else {
+ CClosure *func = clCvalue(ci->func);
+ return (idx <= func->nupvalues) ? &func->upvalue[idx-1] : NONVALIDVALUE;
+ }
+ }
}
@@ -84,60 +84,60 @@ static TValue *index2addr (lua_State *L, int idx) {
** capturing memory errors
*/
static void growstack (lua_State *L, void *ud) {
- int size = *(int *)ud;
- luaD_growstack(L, size);
+ int size = *(int *)ud;
+ luaD_growstack(L, size);
}
LUA_API int lua_checkstack (lua_State *L, int size) {
- int res;
- CallInfo *ci = L->ci;
- lua_lock(L);
- if (L->stack_last - L->top > size) /* stack large enough? */
- res = 1; /* yes; check is OK */
- else { /* no; need to grow stack */
- int inuse = cast_int(L->top - L->stack) + EXTRA_STACK;
- if (inuse > LUAI_MAXSTACK - size) /* can grow without overflow? */
- res = 0; /* no */
- else /* try to grow stack */
- res = (luaD_rawrunprotected(L, &growstack, &size) == LUA_OK);
- }
- if (res && ci->top < L->top + size)
- ci->top = L->top + size; /* adjust frame top */
- lua_unlock(L);
- return res;
+ int res;
+ CallInfo *ci = L->ci;
+ lua_lock(L);
+ if (L->stack_last - L->top > size) /* stack large enough? */
+ res = 1; /* yes; check is OK */
+ else { /* no; need to grow stack */
+ int inuse = cast_int(L->top - L->stack) + EXTRA_STACK;
+ if (inuse > LUAI_MAXSTACK - size) /* can grow without overflow? */
+ res = 0; /* no */
+ else /* try to grow stack */
+ res = (luaD_rawrunprotected(L, &growstack, &size) == LUA_OK);
+ }
+ if (res && ci->top < L->top + size)
+ ci->top = L->top + size; /* adjust frame top */
+ lua_unlock(L);
+ return res;
}
LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
- int i;
- if (from == to) return;
- lua_lock(to);
- api_checknelems(from, n);
- api_check(from, G(from) == G(to), "moving among independent states");
- api_check(from, to->ci->top - to->top >= n, "not enough elements to move");
- from->top -= n;
- for (i = 0; i < n; i++) {
- setobj2s(to, to->top++, from->top + i);
- }
- lua_unlock(to);
+ int i;
+ if (from == to) return;
+ lua_lock(to);
+ api_checknelems(from, n);
+ api_check(from, G(from) == G(to), "moving among independent states");
+ api_check(from, to->ci->top - to->top >= n, "not enough elements to move");
+ from->top -= n;
+ for (i = 0; i < n; i++) {
+ setobj2s(to, to->top++, from->top + i);
+ }
+ lua_unlock(to);
}
LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
- lua_CFunction old;
- lua_lock(L);
- old = G(L)->panic;
- G(L)->panic = panicf;
- lua_unlock(L);
- return old;
+ lua_CFunction old;
+ lua_lock(L);
+ old = G(L)->panic;
+ G(L)->panic = panicf;
+ lua_unlock(L);
+ return old;
}
LUA_API const lua_Number *lua_version (lua_State *L) {
- static const lua_Number version = LUA_VERSION_NUM;
- if (L == NULL) return &version;
- else return G(L)->version;
+ static const lua_Number version = LUA_VERSION_NUM;
+ if (L == NULL) return &version;
+ else return G(L)->version;
}
@@ -151,92 +151,92 @@ LUA_API const lua_Number *lua_version (lua_State *L) {
** convert an acceptable stack index into an absolute index
*/
LUA_API int lua_absindex (lua_State *L, int idx) {
- return (idx > 0 || ispseudo(idx))
- ? idx
- : cast_int(L->top - L->ci->func + idx);
+ return (idx > 0 || ispseudo(idx))
+ ? idx
+ : cast_int(L->top - L->ci->func + idx);
}
LUA_API int lua_gettop (lua_State *L) {
- return cast_int(L->top - (L->ci->func + 1));
+ return cast_int(L->top - (L->ci->func + 1));
}
LUA_API void lua_settop (lua_State *L, int idx) {
- StkId func = L->ci->func;
- lua_lock(L);
- if (idx >= 0) {
- api_check(L, idx <= L->stack_last - (func + 1), "new top too large");
- while (L->top < (func + 1) + idx)
- setnilvalue(L->top++);
- L->top = (func + 1) + idx;
- }
- else {
- api_check(L, -(idx+1) <= (L->top - (func + 1)), "invalid new top");
- L->top += idx+1; /* `subtract' index (index is negative) */
- }
- lua_unlock(L);
+ StkId func = L->ci->func;
+ lua_lock(L);
+ if (idx >= 0) {
+ api_check(L, idx <= L->stack_last - (func + 1), "new top too large");
+ while (L->top < (func + 1) + idx)
+ setnilvalue(L->top++);
+ L->top = (func + 1) + idx;
+ }
+ else {
+ api_check(L, -(idx+1) <= (L->top - (func + 1)), "invalid new top");
+ L->top += idx+1; /* `subtract' index (index is negative) */
+ }
+ lua_unlock(L);
}
LUA_API void lua_remove (lua_State *L, int idx) {
- StkId p;
- lua_lock(L);
- p = index2addr(L, idx);
- api_checkstackindex(L, idx, p);
- while (++p < L->top) setobjs2s(L, p-1, p);
- L->top--;
- lua_unlock(L);
+ StkId p;
+ lua_lock(L);
+ p = index2addr(L, idx);
+ api_checkstackindex(L, idx, p);
+ while (++p < L->top) setobjs2s(L, p-1, p);
+ L->top--;
+ lua_unlock(L);
}
LUA_API void lua_insert (lua_State *L, int idx) {
- StkId p;
- StkId q;
- lua_lock(L);
- p = index2addr(L, idx);
- api_checkstackindex(L, idx, p);
- for (q = L->top; q > p; q--) /* use L->top as a temporary */
- setobjs2s(L, q, q - 1);
- setobjs2s(L, p, L->top);
- lua_unlock(L);
+ StkId p;
+ StkId q;
+ lua_lock(L);
+ p = index2addr(L, idx);
+ api_checkstackindex(L, idx, p);
+ for (q = L->top; q > p; q--) /* use L->top as a temporary */
+ setobjs2s(L, q, q - 1);
+ setobjs2s(L, p, L->top);
+ lua_unlock(L);
}
static void moveto (lua_State *L, TValue *fr, int idx) {
- TValue *to = index2addr(L, idx);
- api_checkvalidindex(L, to);
- setobj(L, to, fr);
- if (idx < LUA_REGISTRYINDEX) /* function upvalue? */
- luaC_barrier(L, clCvalue(L->ci->func), fr);
- /* LUA_REGISTRYINDEX does not need gc barrier
- (collector revisits it before finishing collection) */
+ TValue *to = index2addr(L, idx);
+ api_checkvalidindex(L, to);
+ setobj(L, to, fr);
+ if (idx < LUA_REGISTRYINDEX) /* function upvalue? */
+ luaC_barrier(L, clCvalue(L->ci->func), fr);
+ /* LUA_REGISTRYINDEX does not need gc barrier
+ (collector revisits it before finishing collection) */
}
LUA_API void lua_replace (lua_State *L, int idx) {
- lua_lock(L);
- api_checknelems(L, 1);
- moveto(L, L->top - 1, idx);
- L->top--;
- lua_unlock(L);
+ lua_lock(L);
+ api_checknelems(L, 1);
+ moveto(L, L->top - 1, idx);
+ L->top--;
+ lua_unlock(L);
}
LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) {
- TValue *fr;
- lua_lock(L);
- fr = index2addr(L, fromidx);
- moveto(L, fr, toidx);
- lua_unlock(L);
+ TValue *fr;
+ lua_lock(L);
+ fr = index2addr(L, fromidx);
+ moveto(L, fr, toidx);
+ lua_unlock(L);
}
LUA_API void lua_pushvalue (lua_State *L, int idx) {
- lua_lock(L);
- setobj2s(L, L->top, index2addr(L, idx));
- api_incr_top(L);
- lua_unlock(L);
+ lua_lock(L);
+ setobj2s(L, L->top, index2addr(L, idx));
+ api_incr_top(L);
+ lua_unlock(L);
}
@@ -247,212 +247,212 @@ LUA_API void lua_pushvalue (lua_State *L, int idx) {
LUA_API int lua_type (lua_State *L, int idx) {
- StkId o = index2addr(L, idx);
- return (isvalid(o) ? ttypenv(o) : LUA_TNONE);
+ StkId o = index2addr(L, idx);
+ return (isvalid(o) ? ttypenv(o) : LUA_TNONE);
}
LUA_API const char *lua_typename (lua_State *L, int t) {
- UNUSED(L);
- return ttypename(t);
+ UNUSED(L);
+ return ttypename(t);
}
LUA_API int lua_iscfunction (lua_State *L, int idx) {
- StkId o = index2addr(L, idx);
- return (ttislcf(o) || (ttisCclosure(o)));
+ StkId o = index2addr(L, idx);
+ return (ttislcf(o) || (ttisCclosure(o)));
}
LUA_API int lua_isnumber (lua_State *L, int idx) {
- TValue n;
- const TValue *o = index2addr(L, idx);
- return tonumber(o, &n);
+ TValue n;
+ const TValue *o = index2addr(L, idx);
+ return tonumber(o, &n);
}
LUA_API int lua_isstring (lua_State *L, int idx) {
- int t = lua_type(L, idx);
- return (t == LUA_TSTRING || t == LUA_TNUMBER);
+ int t = lua_type(L, idx);
+ return (t == LUA_TSTRING || t == LUA_TNUMBER);
}
LUA_API int lua_isuserdata (lua_State *L, int idx) {
- const TValue *o = index2addr(L, idx);
- return (ttisuserdata(o) || ttislightuserdata(o));
+ const TValue *o = index2addr(L, idx);
+ return (ttisuserdata(o) || ttislightuserdata(o));
}
LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
- StkId o1 = index2addr(L, index1);
- StkId o2 = index2addr(L, index2);
- return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0;
+ StkId o1 = index2addr(L, index1);
+ StkId o2 = index2addr(L, index2);
+ return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0;
}
LUA_API void lua_arith (lua_State *L, int op) {
- StkId o1; /* 1st operand */
- StkId o2; /* 2nd operand */
- lua_lock(L);
- if (op != LUA_OPUNM) /* all other operations expect two operands */
- api_checknelems(L, 2);
- else { /* for unary minus, add fake 2nd operand */
- api_checknelems(L, 1);
- setobjs2s(L, L->top, L->top - 1);
- L->top++;
- }
- o1 = L->top - 2;
- o2 = L->top - 1;
- if (ttisnumber(o1) && ttisnumber(o2)) {
- setnvalue(o1, luaO_arith(op, nvalue(o1), nvalue(o2)));
- }
- else
- luaV_arith(L, o1, o1, o2, cast(TMS, op - LUA_OPADD + TM_ADD));
- L->top--;
- lua_unlock(L);
+ StkId o1; /* 1st operand */
+ StkId o2; /* 2nd operand */
+ lua_lock(L);
+ if (op != LUA_OPUNM) /* all other operations expect two operands */
+ api_checknelems(L, 2);
+ else { /* for unary minus, add fake 2nd operand */
+ api_checknelems(L, 1);
+ setobjs2s(L, L->top, L->top - 1);
+ L->top++;
+ }
+ o1 = L->top - 2;
+ o2 = L->top - 1;
+ if (ttisnumber(o1) && ttisnumber(o2)) {
+ setnvalue(o1, luaO_arith(op, nvalue(o1), nvalue(o2)));
+ }
+ else
+ luaV_arith(L, o1, o1, o2, cast(TMS, op - LUA_OPADD + TM_ADD));
+ L->top--;
+ lua_unlock(L);
}
LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
- StkId o1, o2;
- int i = 0;
- lua_lock(L); /* may call tag method */
- o1 = index2addr(L, index1);
- o2 = index2addr(L, index2);
- if (isvalid(o1) && isvalid(o2)) {
- switch (op) {
- case LUA_OPEQ: i = equalobj(L, o1, o2); break;
- case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break;
- case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break;
- default: api_check(L, 0, "invalid option");
- }
- }
- lua_unlock(L);
- return i;
+ StkId o1, o2;
+ int i = 0;
+ lua_lock(L); /* may call tag method */
+ o1 = index2addr(L, index1);
+ o2 = index2addr(L, index2);
+ if (isvalid(o1) && isvalid(o2)) {
+ switch (op) {
+ case LUA_OPEQ: i = equalobj(L, o1, o2); break;
+ case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break;
+ case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break;
+ default: api_check(L, 0, "invalid option");
+ }
+ }
+ lua_unlock(L);
+ return i;
}
LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *isnum) {
- TValue n;
- const TValue *o = index2addr(L, idx);
- if (tonumber(o, &n)) {
- if (isnum) *isnum = 1;
- return nvalue(o);
- }
- else {
- if (isnum) *isnum = 0;
- return 0;
- }
+ TValue n;
+ const TValue *o = index2addr(L, idx);
+ if (tonumber(o, &n)) {
+ if (isnum) *isnum = 1;
+ return nvalue(o);
+ }
+ else {
+ if (isnum) *isnum = 0;
+ return 0;
+ }
}
LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *isnum) {
- TValue n;
- const TValue *o = index2addr(L, idx);
- if (tonumber(o, &n)) {
- lua_Integer res;
- lua_Number num = nvalue(o);
- lua_number2integer(res, num);
- if (isnum) *isnum = 1;
- return res;
- }
- else {
- if (isnum) *isnum = 0;
- return 0;
- }
+ TValue n;
+ const TValue *o = index2addr(L, idx);
+ if (tonumber(o, &n)) {
+ lua_Integer res;
+ lua_Number num = nvalue(o);
+ lua_number2integer(res, num);
+ if (isnum) *isnum = 1;
+ return res;
+ }
+ else {
+ if (isnum) *isnum = 0;
+ return 0;
+ }
}
LUA_API lua_Unsigned lua_tounsignedx (lua_State *L, int idx, int *isnum) {
- TValue n;
- const TValue *o = index2addr(L, idx);
- if (tonumber(o, &n)) {
- lua_Unsigned res;
- lua_Number num = nvalue(o);
- lua_number2unsigned(res, num);
- if (isnum) *isnum = 1;
- return res;
- }
- else {
- if (isnum) *isnum = 0;
- return 0;
- }
+ TValue n;
+ const TValue *o = index2addr(L, idx);
+ if (tonumber(o, &n)) {
+ lua_Unsigned res;
+ lua_Number num = nvalue(o);
+ lua_number2unsigned(res, num);
+ if (isnum) *isnum = 1;
+ return res;
+ }
+ else {
+ if (isnum) *isnum = 0;
+ return 0;
+ }
}
LUA_API int lua_toboolean (lua_State *L, int idx) {
- const TValue *o = index2addr(L, idx);
- return !l_isfalse(o);
+ const TValue *o = index2addr(L, idx);
+ return !l_isfalse(o);
}
LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
- StkId o = index2addr(L, idx);
- if (!ttisstring(o)) {
- lua_lock(L); /* `luaV_tostring' may create a new string */
- if (!luaV_tostring(L, o)) { /* conversion failed? */
- if (len != NULL) *len = 0;
- lua_unlock(L);
- return NULL;
- }
- luaC_checkGC(L);
- o = index2addr(L, idx); /* previous call may reallocate the stack */
- lua_unlock(L);
- }
- if (len != NULL) *len = tsvalue(o)->len;
- return svalue(o);
+ StkId o = index2addr(L, idx);
+ if (!ttisstring(o)) {
+ lua_lock(L); /* `luaV_tostring' may create a new string */
+ if (!luaV_tostring(L, o)) { /* conversion failed? */
+ if (len != NULL) *len = 0;
+ lua_unlock(L);
+ return NULL;
+ }
+ luaC_checkGC(L);
+ o = index2addr(L, idx); /* previous call may reallocate the stack */
+ lua_unlock(L);
+ }
+ if (len != NULL) *len = tsvalue(o)->len;
+ return svalue(o);
}
LUA_API size_t lua_rawlen (lua_State *L, int idx) {
- StkId o = index2addr(L, idx);
- switch (ttypenv(o)) {
- case LUA_TSTRING: return tsvalue(o)->len;
- case LUA_TUSERDATA: return uvalue(o)->len;
- case LUA_TTABLE: return luaH_getn(hvalue(o));
- default: return 0;
- }
+ StkId o = index2addr(L, idx);
+ switch (ttypenv(o)) {
+ case LUA_TSTRING: return tsvalue(o)->len;
+ case LUA_TUSERDATA: return uvalue(o)->len;
+ case LUA_TTABLE: return luaH_getn(hvalue(o));
+ default: return 0;
+ }
}
LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
- StkId o = index2addr(L, idx);
- if (ttislcf(o)) return fvalue(o);
- else if (ttisCclosure(o))
- return clCvalue(o)->f;
- else return NULL; /* not a C function */
+ StkId o = index2addr(L, idx);
+ if (ttislcf(o)) return fvalue(o);
+ else if (ttisCclosure(o))
+ return clCvalue(o)->f;
+ else return NULL; /* not a C function */
}
LUA_API void *lua_touserdata (lua_State *L, int idx) {
- StkId o = index2addr(L, idx);
- switch (ttypenv(o)) {
- case LUA_TUSERDATA: return (rawuvalue(o) + 1);
- case LUA_TLIGHTUSERDATA: return pvalue(o);
- default: return NULL;
- }
+ StkId o = index2addr(L, idx);
+ switch (ttypenv(o)) {
+ case LUA_TUSERDATA: return (rawuvalue(o) + 1);
+ case LUA_TLIGHTUSERDATA: return pvalue(o);
+ default: return NULL;
+ }
}
LUA_API lua_State *lua_tothread (lua_State *L, int idx) {
- StkId o = index2addr(L, idx);
- return (!ttisthread(o)) ? NULL : thvalue(o);
+ StkId o = index2addr(L, idx);
+ return (!ttisthread(o)) ? NULL : thvalue(o);
}
LUA_API const void *lua_topointer (lua_State *L, int idx) {
- StkId o = index2addr(L, idx);
- switch (ttype(o)) {
- case LUA_TTABLE: return hvalue(o);
- case LUA_TLCL: return clLvalue(o);
- case LUA_TCCL: return clCvalue(o);
- case LUA_TLCF: return cast(void *, cast(size_t, fvalue(o)));
- case LUA_TTHREAD: return thvalue(o);
- case LUA_TUSERDATA:
- case LUA_TLIGHTUSERDATA:
- return lua_touserdata(L, idx);
- default: return NULL;
- }
+ StkId o = index2addr(L, idx);
+ switch (ttype(o)) {
+ case LUA_TTABLE: return hvalue(o);
+ case LUA_TLCL: return clLvalue(o);
+ case LUA_TCCL: return clCvalue(o);
+ case LUA_TLCF: return cast(void *, cast(size_t, fvalue(o)));
+ case LUA_TTHREAD: return thvalue(o);
+ case LUA_TUSERDATA:
+ case LUA_TLIGHTUSERDATA:
+ return lua_touserdata(L, idx);
+ default: return NULL;
+ }
}
@@ -463,139 +463,139 @@ LUA_API const void *lua_topointer (lua_State *L, int idx) {
LUA_API void lua_pushnil (lua_State *L) {
- lua_lock(L);
- setnilvalue(L->top);
- api_incr_top(L);
- lua_unlock(L);
+ lua_lock(L);
+ setnilvalue(L->top);
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
- lua_lock(L);
- setnvalue(L->top, n);
- luai_checknum(L, L->top,
- luaG_runerror(L, "C API - attempt to push a signaling NaN"));
- api_incr_top(L);
- lua_unlock(L);
+ lua_lock(L);
+ setnvalue(L->top, n);
+ luai_checknum(L, L->top,
+ luaG_runerror(L, "C API - attempt to push a signaling NaN"));
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
- lua_lock(L);
- setnvalue(L->top, cast_num(n));
- api_incr_top(L);
- lua_unlock(L);
+ lua_lock(L);
+ setnvalue(L->top, cast_num(n));
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API void lua_pushunsigned (lua_State *L, lua_Unsigned u) {
- lua_Number n;
- lua_lock(L);
- n = lua_unsigned2number(u);
- setnvalue(L->top, n);
- api_incr_top(L);
- lua_unlock(L);
+ lua_Number n;
+ lua_lock(L);
+ n = lua_unsigned2number(u);
+ setnvalue(L->top, n);
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API const char *lua_pushlstring (lua_State *L, const char *s, size_t len) {
- TString *ts;
- lua_lock(L);
- luaC_checkGC(L);
- ts = luaS_newlstr(L, s, len);
- setsvalue2s(L, L->top, ts);
- api_incr_top(L);
- lua_unlock(L);
- return getstr(ts);
+ TString *ts;
+ lua_lock(L);
+ luaC_checkGC(L);
+ ts = luaS_newlstr(L, s, len);
+ setsvalue2s(L, L->top, ts);
+ api_incr_top(L);
+ lua_unlock(L);
+ return getstr(ts);
}
LUA_API const char *lua_pushstring (lua_State *L, const char *s) {
- if (s == NULL) {
- lua_pushnil(L);
- return NULL;
- }
- else {
- TString *ts;
- lua_lock(L);
- luaC_checkGC(L);
- ts = luaS_new(L, s);
- setsvalue2s(L, L->top, ts);
- api_incr_top(L);
- lua_unlock(L);
- return getstr(ts);
- }
+ if (s == NULL) {
+ lua_pushnil(L);
+ return NULL;
+ }
+ else {
+ TString *ts;
+ lua_lock(L);
+ luaC_checkGC(L);
+ ts = luaS_new(L, s);
+ setsvalue2s(L, L->top, ts);
+ api_incr_top(L);
+ lua_unlock(L);
+ return getstr(ts);
+ }
}
LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
- va_list argp) {
- const char *ret;
- lua_lock(L);
- luaC_checkGC(L);
- ret = luaO_pushvfstring(L, fmt, argp);
- lua_unlock(L);
- return ret;
+ va_list argp) {
+ const char *ret;
+ lua_lock(L);
+ luaC_checkGC(L);
+ ret = luaO_pushvfstring(L, fmt, argp);
+ lua_unlock(L);
+ return ret;
}
LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
- const char *ret;
- va_list argp;
- lua_lock(L);
- luaC_checkGC(L);
- va_start(argp, fmt);
- ret = luaO_pushvfstring(L, fmt, argp);
- va_end(argp);
- lua_unlock(L);
- return ret;
+ const char *ret;
+ va_list argp;
+ lua_lock(L);
+ luaC_checkGC(L);
+ va_start(argp, fmt);
+ ret = luaO_pushvfstring(L, fmt, argp);
+ va_end(argp);
+ lua_unlock(L);
+ return ret;
}
LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
- lua_lock(L);
- if (n == 0) {
- setfvalue(L->top, fn);
- }
- else {
- Closure *cl;
- api_checknelems(L, n);
- api_check(L, n <= MAXUPVAL, "upvalue index too large");
- luaC_checkGC(L);
- cl = luaF_newCclosure(L, n);
- cl->c.f = fn;
- L->top -= n;
- while (n--)
- setobj2n(L, &cl->c.upvalue[n], L->top + n);
- setclCvalue(L, L->top, cl);
- }
- api_incr_top(L);
- lua_unlock(L);
+ lua_lock(L);
+ if (n == 0) {
+ setfvalue(L->top, fn);
+ }
+ else {
+ Closure *cl;
+ api_checknelems(L, n);
+ api_check(L, n <= MAXUPVAL, "upvalue index too large");
+ luaC_checkGC(L);
+ cl = luaF_newCclosure(L, n);
+ cl->c.f = fn;
+ L->top -= n;
+ while (n--)
+ setobj2n(L, &cl->c.upvalue[n], L->top + n);
+ setclCvalue(L, L->top, cl);
+ }
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API void lua_pushboolean (lua_State *L, int b) {
- lua_lock(L);
- setbvalue(L->top, (b != 0)); /* ensure that true is 1 */
- api_incr_top(L);
- lua_unlock(L);
+ lua_lock(L);
+ setbvalue(L->top, (b != 0)); /* ensure that true is 1 */
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
- lua_lock(L);
- setpvalue(L->top, p);
- api_incr_top(L);
- lua_unlock(L);
+ lua_lock(L);
+ setpvalue(L->top, p);
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API int lua_pushthread (lua_State *L) {
- lua_lock(L);
- setthvalue(L, L->top, L);
- api_incr_top(L);
- lua_unlock(L);
- return (G(L)->mainthread == L);
+ lua_lock(L);
+ setthvalue(L, L->top, L);
+ api_incr_top(L);
+ lua_unlock(L);
+ return (G(L)->mainthread == L);
}
@@ -606,123 +606,123 @@ LUA_API int lua_pushthread (lua_State *L) {
LUA_API void lua_getglobal (lua_State *L, const char *var) {
- Table *reg = hvalue(&G(L)->l_registry);
- const TValue *gt; /* global table */
- lua_lock(L);
- gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
- setsvalue2s(L, L->top++, luaS_new(L, var));
- luaV_gettable(L, gt, L->top - 1, L->top - 1);
- lua_unlock(L);
+ Table *reg = hvalue(&G(L)->l_registry);
+ const TValue *gt; /* global table */
+ lua_lock(L);
+ gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
+ setsvalue2s(L, L->top++, luaS_new(L, var));
+ luaV_gettable(L, gt, L->top - 1, L->top - 1);
+ lua_unlock(L);
}
LUA_API void lua_gettable (lua_State *L, int idx) {
- StkId t;
- lua_lock(L);
- t = index2addr(L, idx);
- luaV_gettable(L, t, L->top - 1, L->top - 1);
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ luaV_gettable(L, t, L->top - 1, L->top - 1);
+ lua_unlock(L);
}
LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
- StkId t;
- lua_lock(L);
- t = index2addr(L, idx);
- setsvalue2s(L, L->top, luaS_new(L, k));
- api_incr_top(L);
- luaV_gettable(L, t, L->top - 1, L->top - 1);
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ setsvalue2s(L, L->top, luaS_new(L, k));
+ api_incr_top(L);
+ luaV_gettable(L, t, L->top - 1, L->top - 1);
+ lua_unlock(L);
}
LUA_API void lua_rawget (lua_State *L, int idx) {
- StkId t;
- lua_lock(L);
- t = index2addr(L, idx);
- api_check(L, ttistable(t), "table expected");
- setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1));
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ api_check(L, ttistable(t), "table expected");
+ setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1));
+ lua_unlock(L);
}
LUA_API void lua_rawgeti (lua_State *L, int idx, int n) {
- StkId t;
- lua_lock(L);
- t = index2addr(L, idx);
- api_check(L, ttistable(t), "table expected");
- setobj2s(L, L->top, luaH_getint(hvalue(t), n));
- api_incr_top(L);
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ api_check(L, ttistable(t), "table expected");
+ setobj2s(L, L->top, luaH_getint(hvalue(t), n));
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API void lua_rawgetp (lua_State *L, int idx, const void *p) {
- StkId t;
- TValue k;
- lua_lock(L);
- t = index2addr(L, idx);
- api_check(L, ttistable(t), "table expected");
- setpvalue(&k, cast(void *, p));
- setobj2s(L, L->top, luaH_get(hvalue(t), &k));
- api_incr_top(L);
- lua_unlock(L);
+ StkId t;
+ TValue k;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ api_check(L, ttistable(t), "table expected");
+ setpvalue(&k, cast(void *, p));
+ setobj2s(L, L->top, luaH_get(hvalue(t), &k));
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API void lua_createtable (lua_State *L, int narray, int nrec) {
- Table *t;
- lua_lock(L);
- luaC_checkGC(L);
- t = luaH_new(L);
- sethvalue(L, L->top, t);
- api_incr_top(L);
- if (narray > 0 || nrec > 0)
- luaH_resize(L, t, narray, nrec);
- lua_unlock(L);
+ Table *t;
+ lua_lock(L);
+ luaC_checkGC(L);
+ t = luaH_new(L);
+ sethvalue(L, L->top, t);
+ api_incr_top(L);
+ if (narray > 0 || nrec > 0)
+ luaH_resize(L, t, narray, nrec);
+ lua_unlock(L);
}
LUA_API int lua_getmetatable (lua_State *L, int objindex) {
- const TValue *obj;
- Table *mt = NULL;
- int res;
- lua_lock(L);
- obj = index2addr(L, objindex);
- switch (ttypenv(obj)) {
- case LUA_TTABLE:
- mt = hvalue(obj)->metatable;
- break;
- case LUA_TUSERDATA:
- mt = uvalue(obj)->metatable;
- break;
- default:
- mt = G(L)->mt[ttypenv(obj)];
- break;
- }
- if (mt == NULL)
- res = 0;
- else {
- sethvalue(L, L->top, mt);
- api_incr_top(L);
- res = 1;
- }
- lua_unlock(L);
- return res;
+ const TValue *obj;
+ Table *mt = NULL;
+ int res;
+ lua_lock(L);
+ obj = index2addr(L, objindex);
+ switch (ttypenv(obj)) {
+ case LUA_TTABLE:
+ mt = hvalue(obj)->metatable;
+ break;
+ case LUA_TUSERDATA:
+ mt = uvalue(obj)->metatable;
+ break;
+ default:
+ mt = G(L)->mt[ttypenv(obj)];
+ break;
+ }
+ if (mt == NULL)
+ res = 0;
+ else {
+ sethvalue(L, L->top, mt);
+ api_incr_top(L);
+ res = 1;
+ }
+ lua_unlock(L);
+ return res;
}
LUA_API void lua_getuservalue (lua_State *L, int idx) {
- StkId o;
- lua_lock(L);
- o = index2addr(L, idx);
- api_check(L, ttisuserdata(o), "userdata expected");
- if (uvalue(o)->env) {
- sethvalue(L, L->top, uvalue(o)->env);
- } else
- setnilvalue(L->top);
- api_incr_top(L);
- lua_unlock(L);
+ StkId o;
+ lua_lock(L);
+ o = index2addr(L, idx);
+ api_check(L, ttisuserdata(o), "userdata expected");
+ if (uvalue(o)->env) {
+ sethvalue(L, L->top, uvalue(o)->env);
+ } else
+ setnilvalue(L->top);
+ api_incr_top(L);
+ lua_unlock(L);
}
@@ -732,138 +732,138 @@ LUA_API void lua_getuservalue (lua_State *L, int idx) {
LUA_API void lua_setglobal (lua_State *L, const char *var) {
- Table *reg = hvalue(&G(L)->l_registry);
- const TValue *gt; /* global table */
- lua_lock(L);
- api_checknelems(L, 1);
- gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
- setsvalue2s(L, L->top++, luaS_new(L, var));
- luaV_settable(L, gt, L->top - 1, L->top - 2);
- L->top -= 2; /* pop value and key */
- lua_unlock(L);
+ Table *reg = hvalue(&G(L)->l_registry);
+ const TValue *gt; /* global table */
+ lua_lock(L);
+ api_checknelems(L, 1);
+ gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
+ setsvalue2s(L, L->top++, luaS_new(L, var));
+ luaV_settable(L, gt, L->top - 1, L->top - 2);
+ L->top -= 2; /* pop value and key */
+ lua_unlock(L);
}
LUA_API void lua_settable (lua_State *L, int idx) {
- StkId t;
- lua_lock(L);
- api_checknelems(L, 2);
- t = index2addr(L, idx);
- luaV_settable(L, t, L->top - 2, L->top - 1);
- L->top -= 2; /* pop index and value */
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ api_checknelems(L, 2);
+ t = index2addr(L, idx);
+ luaV_settable(L, t, L->top - 2, L->top - 1);
+ L->top -= 2; /* pop index and value */
+ lua_unlock(L);
}
LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
- StkId t;
- lua_lock(L);
- api_checknelems(L, 1);
- t = index2addr(L, idx);
- setsvalue2s(L, L->top++, luaS_new(L, k));
- luaV_settable(L, t, L->top - 1, L->top - 2);
- L->top -= 2; /* pop value and key */
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ api_checknelems(L, 1);
+ t = index2addr(L, idx);
+ setsvalue2s(L, L->top++, luaS_new(L, k));
+ luaV_settable(L, t, L->top - 1, L->top - 2);
+ L->top -= 2; /* pop value and key */
+ lua_unlock(L);
}
LUA_API void lua_rawset (lua_State *L, int idx) {
- StkId t;
- lua_lock(L);
- api_checknelems(L, 2);
- t = index2addr(L, idx);
- api_check(L, ttistable(t), "table expected");
- setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1);
- invalidateTMcache(hvalue(t));
- luaC_barrierback(L, gcvalue(t), L->top-1);
- L->top -= 2;
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ api_checknelems(L, 2);
+ t = index2addr(L, idx);
+ api_check(L, ttistable(t), "table expected");
+ setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1);
+ invalidateTMcache(hvalue(t));
+ luaC_barrierback(L, gcvalue(t), L->top-1);
+ L->top -= 2;
+ lua_unlock(L);
}
LUA_API void lua_rawseti (lua_State *L, int idx, int n) {
- StkId t;
- lua_lock(L);
- api_checknelems(L, 1);
- t = index2addr(L, idx);
- api_check(L, ttistable(t), "table expected");
- luaH_setint(L, hvalue(t), n, L->top - 1);
- luaC_barrierback(L, gcvalue(t), L->top-1);
- L->top--;
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ api_checknelems(L, 1);
+ t = index2addr(L, idx);
+ api_check(L, ttistable(t), "table expected");
+ luaH_setint(L, hvalue(t), n, L->top - 1);
+ luaC_barrierback(L, gcvalue(t), L->top-1);
+ L->top--;
+ lua_unlock(L);
}
LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) {
- StkId t;
- TValue k;
- lua_lock(L);
- api_checknelems(L, 1);
- t = index2addr(L, idx);
- api_check(L, ttistable(t), "table expected");
- setpvalue(&k, cast(void *, p));
- setobj2t(L, luaH_set(L, hvalue(t), &k), L->top - 1);
- luaC_barrierback(L, gcvalue(t), L->top - 1);
- L->top--;
- lua_unlock(L);
+ StkId t;
+ TValue k;
+ lua_lock(L);
+ api_checknelems(L, 1);
+ t = index2addr(L, idx);
+ api_check(L, ttistable(t), "table expected");
+ setpvalue(&k, cast(void *, p));
+ setobj2t(L, luaH_set(L, hvalue(t), &k), L->top - 1);
+ luaC_barrierback(L, gcvalue(t), L->top - 1);
+ L->top--;
+ lua_unlock(L);
}
LUA_API int lua_setmetatable (lua_State *L, int objindex) {
- TValue *obj;
- Table *mt;
- lua_lock(L);
- api_checknelems(L, 1);
- obj = index2addr(L, objindex);
- if (ttisnil(L->top - 1))
- mt = NULL;
- else {
- api_check(L, ttistable(L->top - 1), "table expected");
- mt = hvalue(L->top - 1);
- }
- switch (ttypenv(obj)) {
- case LUA_TTABLE: {
- hvalue(obj)->metatable = mt;
- if (mt) {
- luaC_objbarrierback(L, gcvalue(obj), mt);
- luaC_checkfinalizer(L, gcvalue(obj), mt);
- }
- break;
- }
- case LUA_TUSERDATA: {
- uvalue(obj)->metatable = mt;
- if (mt) {
- luaC_objbarrier(L, rawuvalue(obj), mt);
- luaC_checkfinalizer(L, gcvalue(obj), mt);
- }
- break;
- }
- default: {
- G(L)->mt[ttypenv(obj)] = mt;
- break;
- }
- }
- L->top--;
- lua_unlock(L);
- return 1;
+ TValue *obj;
+ Table *mt;
+ lua_lock(L);
+ api_checknelems(L, 1);
+ obj = index2addr(L, objindex);
+ if (ttisnil(L->top - 1))
+ mt = NULL;
+ else {
+ api_check(L, ttistable(L->top - 1), "table expected");
+ mt = hvalue(L->top - 1);
+ }
+ switch (ttypenv(obj)) {
+ case LUA_TTABLE: {
+ hvalue(obj)->metatable = mt;
+ if (mt) {
+ luaC_objbarrierback(L, gcvalue(obj), mt);
+ luaC_checkfinalizer(L, gcvalue(obj), mt);
+ }
+ break;
+ }
+ case LUA_TUSERDATA: {
+ uvalue(obj)->metatable = mt;
+ if (mt) {
+ luaC_objbarrier(L, rawuvalue(obj), mt);
+ luaC_checkfinalizer(L, gcvalue(obj), mt);
+ }
+ break;
+ }
+ default: {
+ G(L)->mt[ttypenv(obj)] = mt;
+ break;
+ }
+ }
+ L->top--;
+ lua_unlock(L);
+ return 1;
}
LUA_API void lua_setuservalue (lua_State *L, int idx) {
- StkId o;
- lua_lock(L);
- api_checknelems(L, 1);
- o = index2addr(L, idx);
- api_check(L, ttisuserdata(o), "userdata expected");
- if (ttisnil(L->top - 1))
- uvalue(o)->env = NULL;
- else {
- api_check(L, ttistable(L->top - 1), "table expected");
- uvalue(o)->env = hvalue(L->top - 1);
- luaC_objbarrier(L, gcvalue(o), hvalue(L->top - 1));
- }
- L->top--;
- lua_unlock(L);
+ StkId o;
+ lua_lock(L);
+ api_checknelems(L, 1);
+ o = index2addr(L, idx);
+ api_check(L, ttisuserdata(o), "userdata expected");
+ if (ttisnil(L->top - 1))
+ uvalue(o)->env = NULL;
+ else {
+ api_check(L, ttistable(L->top - 1), "table expected");
+ uvalue(o)->env = hvalue(L->top - 1);
+ luaC_objbarrier(L, gcvalue(o), hvalue(L->top - 1));
+ }
+ L->top--;
+ lua_unlock(L);
}
@@ -873,38 +873,38 @@ LUA_API void lua_setuservalue (lua_State *L, int idx) {
#define checkresults(L,na,nr) \
- api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \
+ api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \
"results from function overflow current stack size")
LUA_API int lua_getctx (lua_State *L, int *ctx) {
- if (L->ci->callstatus & CIST_YIELDED) {
- if (ctx) *ctx = L->ci->u.c.ctx;
- return L->ci->u.c.status;
- }
- else return LUA_OK;
+ if (L->ci->callstatus & CIST_YIELDED) {
+ if (ctx) *ctx = L->ci->u.c.ctx;
+ return L->ci->u.c.status;
+ }
+ else return LUA_OK;
}
LUA_API void lua_callk (lua_State *L, int nargs, int nresults, int ctx,
- lua_CFunction k) {
- StkId func;
- lua_lock(L);
- api_check(L, k == NULL || !isLua(L->ci),
- "cannot use continuations inside hooks");
- api_checknelems(L, nargs+1);
- api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
- checkresults(L, nargs, nresults);
- func = L->top - (nargs+1);
- if (k != NULL && L->nny == 0) { /* need to prepare continuation? */
- L->ci->u.c.k = k; /* save continuation */
- L->ci->u.c.ctx = ctx; /* save context */
- luaD_call(L, func, nresults, 1); /* do the call */
- }
- else /* no continuation or no yieldable */
- luaD_call(L, func, nresults, 0); /* just do the call */
- adjustresults(L, nresults);
- lua_unlock(L);
+ lua_CFunction k) {
+ StkId func;
+ lua_lock(L);
+ api_check(L, k == NULL || !isLua(L->ci),
+ "cannot use continuations inside hooks");
+ api_checknelems(L, nargs+1);
+ api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+ checkresults(L, nargs, nresults);
+ func = L->top - (nargs+1);
+ if (k != NULL && L->nny == 0) { /* need to prepare continuation? */
+ L->ci->u.c.k = k; /* save continuation */
+ L->ci->u.c.ctx = ctx; /* save context */
+ luaD_call(L, func, nresults, 1); /* do the call */
+ }
+ else /* no continuation or no yieldable */
+ luaD_call(L, func, nresults, 0); /* just do the call */
+ adjustresults(L, nresults);
+ lua_unlock(L);
}
@@ -913,104 +913,104 @@ LUA_API void lua_callk (lua_State *L, int nargs, int nresults, int ctx,
** Execute a protected call.
*/
struct CallS { /* data to `f_call' */
- StkId func;
- int nresults;
+ StkId func;
+ int nresults;
};
static void f_call (lua_State *L, void *ud) {
- struct CallS *c = cast(struct CallS *, ud);
- luaD_call(L, c->func, c->nresults, 0);
+ struct CallS *c = cast(struct CallS *, ud);
+ luaD_call(L, c->func, c->nresults, 0);
}
LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
- int ctx, lua_CFunction k) {
- struct CallS c;
- int status;
- ptrdiff_t func;
- lua_lock(L);
- api_check(L, k == NULL || !isLua(L->ci),
- "cannot use continuations inside hooks");
- api_checknelems(L, nargs+1);
- api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
- checkresults(L, nargs, nresults);
- if (errfunc == 0)
- func = 0;
- else {
- StkId o = index2addr(L, errfunc);
- api_checkstackindex(L, errfunc, o);
- func = savestack(L, o);
- }
- c.func = L->top - (nargs+1); /* function to be called */
- if (k == NULL || L->nny > 0) { /* no continuation or no yieldable? */
- c.nresults = nresults; /* do a 'conventional' protected call */
- status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
- }
- else { /* prepare continuation (call is already protected by 'resume') */
- CallInfo *ci = L->ci;
- ci->u.c.k = k; /* save continuation */
- ci->u.c.ctx = ctx; /* save context */
- /* save information for error recovery */
- ci->extra = savestack(L, c.func);
- ci->u.c.old_allowhook = L->allowhook;
- ci->u.c.old_errfunc = L->errfunc;
- L->errfunc = func;
- /* mark that function may do error recovery */
- ci->callstatus |= CIST_YPCALL;
- luaD_call(L, c.func, nresults, 1); /* do the call */
- ci->callstatus &= ~CIST_YPCALL;
- L->errfunc = ci->u.c.old_errfunc;
- status = LUA_OK; /* if it is here, there were no errors */
- }
- adjustresults(L, nresults);
- lua_unlock(L);
- return status;
+ int ctx, lua_CFunction k) {
+ struct CallS c;
+ int status;
+ ptrdiff_t func;
+ lua_lock(L);
+ api_check(L, k == NULL || !isLua(L->ci),
+ "cannot use continuations inside hooks");
+ api_checknelems(L, nargs+1);
+ api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+ checkresults(L, nargs, nresults);
+ if (errfunc == 0)
+ func = 0;
+ else {
+ StkId o = index2addr(L, errfunc);
+ api_checkstackindex(L, errfunc, o);
+ func = savestack(L, o);
+ }
+ c.func = L->top - (nargs+1); /* function to be called */
+ if (k == NULL || L->nny > 0) { /* no continuation or no yieldable? */
+ c.nresults = nresults; /* do a 'conventional' protected call */
+ status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
+ }
+ else { /* prepare continuation (call is already protected by 'resume') */
+ CallInfo *ci = L->ci;
+ ci->u.c.k = k; /* save continuation */
+ ci->u.c.ctx = ctx; /* save context */
+ /* save information for error recovery */
+ ci->extra = savestack(L, c.func);
+ ci->u.c.old_allowhook = L->allowhook;
+ ci->u.c.old_errfunc = L->errfunc;
+ L->errfunc = func;
+ /* mark that function may do error recovery */
+ ci->callstatus |= CIST_YPCALL;
+ luaD_call(L, c.func, nresults, 1); /* do the call */
+ ci->callstatus &= ~CIST_YPCALL;
+ L->errfunc = ci->u.c.old_errfunc;
+ status = LUA_OK; /* if it is here, there were no errors */
+ }
+ adjustresults(L, nresults);
+ lua_unlock(L);
+ return status;
}
LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
- const char *chunkname, const char *mode) {
- ZIO z;
- int status;
- lua_lock(L);
- if (!chunkname) chunkname = "?";
- luaZ_init(L, &z, reader, data);
- status = luaD_protectedparser(L, &z, chunkname, mode);
- if (status == LUA_OK) { /* no errors? */
- LClosure *f = clLvalue(L->top - 1); /* get newly created function */
- if (f->nupvalues == 1) { /* does it have one upvalue? */
- /* get global table from registry */
- Table *reg = hvalue(&G(L)->l_registry);
- const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
- /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
- setobj(L, f->upvals[0]->v, gt);
- luaC_barrier(L, f->upvals[0], gt);
- }
- }
- lua_unlock(L);
- return status;
+ const char *chunkname, const char *mode) {
+ ZIO z;
+ int status;
+ lua_lock(L);
+ if (!chunkname) chunkname = "?";
+ luaZ_init(L, &z, reader, data);
+ status = luaD_protectedparser(L, &z, chunkname, mode);
+ if (status == LUA_OK) { /* no errors? */
+ LClosure *f = clLvalue(L->top - 1); /* get newly created function */
+ if (f->nupvalues == 1) { /* does it have one upvalue? */
+ /* get global table from registry */
+ Table *reg = hvalue(&G(L)->l_registry);
+ const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
+ /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
+ setobj(L, f->upvals[0]->v, gt);
+ luaC_barrier(L, f->upvals[0], gt);
+ }
+ }
+ lua_unlock(L);
+ return status;
}
LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data) {
- int status;
- TValue *o;
- lua_lock(L);
- api_checknelems(L, 1);
- o = L->top - 1;
- if (isLfunction(o))
- status = luaU_dump(L, getproto(o), writer, data, 0);
- else
- status = 1;
- lua_unlock(L);
- return status;
+ int status;
+ TValue *o;
+ lua_lock(L);
+ api_checknelems(L, 1);
+ o = L->top - 1;
+ if (isLfunction(o))
+ status = luaU_dump(L, getproto(o), writer, data, 0);
+ else
+ status = 1;
+ lua_unlock(L);
+ return status;
}
LUA_API int lua_status (lua_State *L) {
- return L->status;
+ return L->status;
}
@@ -1019,80 +1019,80 @@ LUA_API int lua_status (lua_State *L) {
*/
LUA_API int lua_gc (lua_State *L, int what, int data) {
- int res = 0;
- global_State *g;
- lua_lock(L);
- g = G(L);
- switch (what) {
- case LUA_GCSTOP: {
- g->gcrunning = 0;
- break;
- }
- case LUA_GCRESTART: {
- luaE_setdebt(g, 0);
- g->gcrunning = 1;
- break;
- }
- case LUA_GCCOLLECT: {
- luaC_fullgc(L, 0);
- break;
- }
- case LUA_GCCOUNT: {
- /* GC values are expressed in Kbytes: #bytes/2^10 */
- res = cast_int(gettotalbytes(g) >> 10);
- break;
- }
- case LUA_GCCOUNTB: {
- res = cast_int(gettotalbytes(g) & 0x3ff);
- break;
- }
- case LUA_GCSTEP: {
- if (g->gckind == KGC_GEN) { /* generational mode? */
- res = (g->GCestimate == 0); /* true if it will do major collection */
- luaC_forcestep(L); /* do a single step */
- }
- else {
- lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE;
- if (g->gcrunning)
- debt += g->GCdebt; /* include current debt */
- luaE_setdebt(g, debt);
- luaC_forcestep(L);
- if (g->gcstate == GCSpause) /* end of cycle? */
- res = 1; /* signal it */
- }
- break;
- }
- case LUA_GCSETPAUSE: {
- res = g->gcpause;
- g->gcpause = data;
- break;
- }
- case LUA_GCSETMAJORINC: {
- res = g->gcmajorinc;
- g->gcmajorinc = data;
- break;
- }
- case LUA_GCSETSTEPMUL: {
- res = g->gcstepmul;
- g->gcstepmul = data;
- break;
- }
- case LUA_GCISRUNNING: {
- res = g->gcrunning;
- break;
- }
- case LUA_GCGEN: { /* change collector to generational mode */
- luaC_changemode(L, KGC_GEN);
- break;
- }
- case LUA_GCINC: { /* change collector to incremental mode */
- luaC_changemode(L, KGC_NORMAL);
- break;
- }
- default: res = -1; /* invalid option */
- }
- lua_unlock(L);
- return res;
+ int res = 0;
+ global_State *g;
+ lua_lock(L);
+ g = G(L);
+ switch (what) {
+ case LUA_GCSTOP: {
+ g->gcrunning = 0;
+ break;
+ }
+ case LUA_GCRESTART: {
+ luaE_setdebt(g, 0);
+ g->gcrunning = 1;
+ break;
+ }
+ case LUA_GCCOLLECT: {
+ luaC_fullgc(L, 0);
+ break;
+ }
+ case LUA_GCCOUNT: {
+ /* GC values are expressed in Kbytes: #bytes/2^10 */
+ res = cast_int(gettotalbytes(g) >> 10);
+ break;
+ }
+ case LUA_GCCOUNTB: {
+ res = cast_int(gettotalbytes(g) & 0x3ff);
+ break;
+ }
+ case LUA_GCSTEP: {
+ if (g->gckind == KGC_GEN) { /* generational mode? */
+ res = (g->GCestimate == 0); /* true if it will do major collection */
+ luaC_forcestep(L); /* do a single step */
+ }
+ else {
+ lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE;
+ if (g->gcrunning)
+ debt += g->GCdebt; /* include current debt */
+ luaE_setdebt(g, debt);
+ luaC_forcestep(L);
+ if (g->gcstate == GCSpause) /* end of cycle? */
+ res = 1; /* signal it */
+ }
+ break;
+ }
+ case LUA_GCSETPAUSE: {
+ res = g->gcpause;
+ g->gcpause = data;
+ break;
+ }
+ case LUA_GCSETMAJORINC: {
+ res = g->gcmajorinc;
+ g->gcmajorinc = data;
+ break;
+ }
+ case LUA_GCSETSTEPMUL: {
+ res = g->gcstepmul;
+ g->gcstepmul = data;
+ break;
+ }
+ case LUA_GCISRUNNING: {
+ res = g->gcrunning;
+ break;
+ }
+ case LUA_GCGEN: { /* change collector to generational mode */
+ luaC_changemode(L, KGC_GEN);
+ break;
+ }
+ case LUA_GCINC: { /* change collector to incremental mode */
+ luaC_changemode(L, KGC_NORMAL);
+ break;
+ }
+ default: res = -1; /* invalid option */
+ }
+ lua_unlock(L);
+ return res;
}
@@ -1103,182 +1103,181 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
LUA_API int lua_error (lua_State *L) {
- lua_lock(L);
- api_checknelems(L, 1);
- luaG_errormsg(L);
- /* code unreachable; will unlock when control actually leaves the kernel */
- return 0; /* to avoid warnings */
+ lua_lock(L);
+ api_checknelems(L, 1);
+ luaG_errormsg(L);
+ /* code unreachable; will unlock when control actually leaves the kernel */
+ return 0; /* to avoid warnings */
}
LUA_API int lua_next (lua_State *L, int idx) {
- StkId t;
- int more;
- lua_lock(L);
- t = index2addr(L, idx);
- api_check(L, ttistable(t), "table expected");
- more = luaH_next(L, hvalue(t), L->top - 1);
- if (more) {
- api_incr_top(L);
- }
- else /* no more elements */
- L->top -= 1; /* remove key */
- lua_unlock(L);
- return more;
+ StkId t;
+ int more;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ api_check(L, ttistable(t), "table expected");
+ more = luaH_next(L, hvalue(t), L->top - 1);
+ if (more) {
+ api_incr_top(L);
+ }
+ else /* no more elements */
+ L->top -= 1; /* remove key */
+ lua_unlock(L);
+ return more;
}
LUA_API void lua_concat (lua_State *L, int n) {
- lua_lock(L);
- api_checknelems(L, n);
- if (n >= 2) {
- luaC_checkGC(L);
- luaV_concat(L, n);
- }
- else if (n == 0) { /* push empty string */
- setsvalue2s(L, L->top, luaS_newlstr(L, "", 0));
- api_incr_top(L);
- }
- /* else n == 1; nothing to do */
- lua_unlock(L);
+ lua_lock(L);
+ api_checknelems(L, n);
+ if (n >= 2) {
+ luaC_checkGC(L);
+ luaV_concat(L, n);
+ }
+ else if (n == 0) { /* push empty string */
+ setsvalue2s(L, L->top, luaS_newlstr(L, "", 0));
+ api_incr_top(L);
+ }
+ /* else n == 1; nothing to do */
+ lua_unlock(L);
}
LUA_API void lua_len (lua_State *L, int idx) {
- StkId t;
- lua_lock(L);
- t = index2addr(L, idx);
- luaV_objlen(L, L->top, t);
- api_incr_top(L);
- lua_unlock(L);
+ StkId t;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ luaV_objlen(L, L->top, t);
+ api_incr_top(L);
+ lua_unlock(L);
}
LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) {
- lua_Alloc f;
- lua_lock(L);
- if (ud) *ud = G(L)->ud;
- f = G(L)->frealloc;
- lua_unlock(L);
- return f;
+ lua_Alloc f;
+ lua_lock(L);
+ if (ud) *ud = G(L)->ud;
+ f = G(L)->frealloc;
+ lua_unlock(L);
+ return f;
}
LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) {
- lua_lock(L);
- G(L)->ud = ud;
- G(L)->frealloc = f;
- lua_unlock(L);
+ lua_lock(L);
+ G(L)->ud = ud;
+ G(L)->frealloc = f;
+ lua_unlock(L);
}
LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
- Udata *u;
- lua_lock(L);
- luaC_checkGC(L);
- u = luaS_newudata(L, size, NULL);
- setuvalue(L, L->top, u);
- api_incr_top(L);
- lua_unlock(L);
- return u + 1;
+ Udata *u;
+ lua_lock(L);
+ luaC_checkGC(L);
+ u = luaS_newudata(L, size, NULL);
+ setuvalue(L, L->top, u);
+ api_incr_top(L);
+ lua_unlock(L);
+ return u + 1;
}
static const char *aux_upvalue (StkId fi, int n, TValue **val,
- GCObject **owner) {
- switch (ttype(fi)) {
- case LUA_TCCL: { /* C closure */
- CClosure *f = clCvalue(fi);
- if (!(1 <= n && n <= f->nupvalues)) return NULL;
- *val = &f->upvalue[n-1];
- if (owner) *owner = obj2gco(f);
- return "";
- }
- case LUA_TLCL: { /* Lua closure */
- LClosure *f = clLvalue(fi);
- TString *name;
- Proto *p = f->p;
- if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
- *val = f->upvals[n-1]->v;
- if (owner) *owner = obj2gco(f->upvals[n - 1]);
- name = p->upvalues[n-1].name;
- return (name == NULL) ? "" : getstr(name);
- }
- default: return NULL; /* not a closure */
- }
+ GCObject **owner) {
+ switch (ttype(fi)) {
+ case LUA_TCCL: { /* C closure */
+ CClosure *f = clCvalue(fi);
+ if (!(1 <= n && n <= f->nupvalues)) return NULL;
+ *val = &f->upvalue[n-1];
+ if (owner) *owner = obj2gco(f);
+ return "";
+ }
+ case LUA_TLCL: { /* Lua closure */
+ LClosure *f = clLvalue(fi);
+ TString *name;
+ Proto *p = f->p;
+ if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
+ *val = f->upvals[n-1]->v;
+ if (owner) *owner = obj2gco(f->upvals[n - 1]);
+ name = p->upvalues[n-1].name;
+ return (name == NULL) ? "" : getstr(name);
+ }
+ default: return NULL; /* not a closure */
+ }
}
LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) {
- const char *name;
- TValue *val = NULL; /* to avoid warnings */
- lua_lock(L);
- name = aux_upvalue(index2addr(L, funcindex), n, &val, NULL);
- if (name) {
- setobj2s(L, L->top, val);
- api_incr_top(L);
- }
- lua_unlock(L);
- return name;
+ const char *name;
+ TValue *val = NULL; /* to avoid warnings */
+ lua_lock(L);
+ name = aux_upvalue(index2addr(L, funcindex), n, &val, NULL);
+ if (name) {
+ setobj2s(L, L->top, val);
+ api_incr_top(L);
+ }
+ lua_unlock(L);
+ return name;
}
LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
- const char *name;
- TValue *val = NULL; /* to avoid warnings */
- GCObject *owner = NULL; /* to avoid warnings */
- StkId fi;
- lua_lock(L);
- fi = index2addr(L, funcindex);
- api_checknelems(L, 1);
- name = aux_upvalue(fi, n, &val, &owner);
- if (name) {
- L->top--;
- setobj(L, val, L->top);
- luaC_barrier(L, owner, L->top);
- }
- lua_unlock(L);
- return name;
+ const char *name;
+ TValue *val = NULL; /* to avoid warnings */
+ GCObject *owner = NULL; /* to avoid warnings */
+ StkId fi;
+ lua_lock(L);
+ fi = index2addr(L, funcindex);
+ api_checknelems(L, 1);
+ name = aux_upvalue(fi, n, &val, &owner);
+ if (name) {
+ L->top--;
+ setobj(L, val, L->top);
+ luaC_barrier(L, owner, L->top);
+ }
+ lua_unlock(L);
+ return name;
}
static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) {
- LClosure *f;
- StkId fi = index2addr(L, fidx);
- api_check(L, ttisLclosure(fi), "Lua function expected");
- f = clLvalue(fi);
- api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index");
- if (pf) *pf = f;
- return &f->upvals[n - 1]; /* get its upvalue pointer */
+ LClosure *f;
+ StkId fi = index2addr(L, fidx);
+ api_check(L, ttisLclosure(fi), "Lua function expected");
+ f = clLvalue(fi);
+ api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index");
+ if (pf) *pf = f;
+ return &f->upvals[n - 1]; /* get its upvalue pointer */
}
LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) {
- StkId fi = index2addr(L, fidx);
- switch (ttype(fi)) {
- case LUA_TLCL: { /* lua closure */
- return *getupvalref(L, fidx, n, NULL);
- }
- case LUA_TCCL: { /* C closure */
- CClosure *f = clCvalue(fi);
- api_check(L, 1 <= n && n <= f->nupvalues, "invalid upvalue index");
- return &f->upvalue[n - 1];
- }
- default: {
- api_check(L, 0, "closure expected");
- return NULL;
- }
- }
+ StkId fi = index2addr(L, fidx);
+ switch (ttype(fi)) {
+ case LUA_TLCL: { /* lua closure */
+ return *getupvalref(L, fidx, n, NULL);
+ }
+ case LUA_TCCL: { /* C closure */
+ CClosure *f = clCvalue(fi);
+ api_check(L, 1 <= n && n <= f->nupvalues, "invalid upvalue index");
+ return &f->upvalue[n - 1];
+ }
+ default: {
+ api_check(L, 0, "closure expected");
+ return NULL;
+ }
+ }
}
LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
- int fidx2, int n2) {
- LClosure *f1;
- UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
- UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
- *up1 = *up2;
- luaC_objbarrier(L, f1, *up2);
+ int fidx2, int n2) {
+ LClosure *f1;
+ UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
+ UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+ *up1 = *up2;
+ luaC_objbarrier(L, f1, *up2);
}
-
diff --git a/src/lib/lua/lauxlib.c b/src/lib/lua/lauxlib.c
index b00f8c70968..e4a38522bb6 100644
--- a/src/lib/lua/lauxlib.c
+++ b/src/lib/lua/lauxlib.c
@@ -31,8 +31,8 @@
*/
-#define LEVELS1 12 /* size of the first part of the stack */
-#define LEVELS2 10 /* size of the second part of the stack */
+#define LEVELS1 12 /* size of the first part of the stack */
+#define LEVELS2 10 /* size of the second part of the stack */
@@ -41,104 +41,104 @@
** return 1 + string at top if find a good name.
*/
static int findfield (lua_State *L, int objidx, int level) {
- if (level == 0 || !lua_istable(L, -1))
- return 0; /* not found */
- lua_pushnil(L); /* start 'next' loop */
- while (lua_next(L, -2)) { /* for each pair in table */
- if (lua_type(L, -2) == LUA_TSTRING) { /* ignore non-string keys */
- if (lua_rawequal(L, objidx, -1)) { /* found object? */
- lua_pop(L, 1); /* remove value (but keep name) */
- return 1;
- }
- else if (findfield(L, objidx, level - 1)) { /* try recursively */
- lua_remove(L, -2); /* remove table (but keep name) */
- lua_pushliteral(L, ".");
- lua_insert(L, -2); /* place '.' between the two names */
- lua_concat(L, 3);
- return 1;
- }
- }
- lua_pop(L, 1); /* remove value */
- }
- return 0; /* not found */
+ if (level == 0 || !lua_istable(L, -1))
+ return 0; /* not found */
+ lua_pushnil(L); /* start 'next' loop */
+ while (lua_next(L, -2)) { /* for each pair in table */
+ if (lua_type(L, -2) == LUA_TSTRING) { /* ignore non-string keys */
+ if (lua_rawequal(L, objidx, -1)) { /* found object? */
+ lua_pop(L, 1); /* remove value (but keep name) */
+ return 1;
+ }
+ else if (findfield(L, objidx, level - 1)) { /* try recursively */
+ lua_remove(L, -2); /* remove table (but keep name) */
+ lua_pushliteral(L, ".");
+ lua_insert(L, -2); /* place '.' between the two names */
+ lua_concat(L, 3);
+ return 1;
+ }
+ }
+ lua_pop(L, 1); /* remove value */
+ }
+ return 0; /* not found */
}
static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
- int top = lua_gettop(L);
- lua_getinfo(L, "f", ar); /* push function */
- lua_pushglobaltable(L);
- if (findfield(L, top + 1, 2)) {
- lua_copy(L, -1, top + 1); /* move name to proper place */
- lua_pop(L, 2); /* remove pushed values */
- return 1;
- }
- else {
- lua_settop(L, top); /* remove function and global table */
- return 0;
- }
+ int top = lua_gettop(L);
+ lua_getinfo(L, "f", ar); /* push function */
+ lua_pushglobaltable(L);
+ if (findfield(L, top + 1, 2)) {
+ lua_copy(L, -1, top + 1); /* move name to proper place */
+ lua_pop(L, 2); /* remove pushed values */
+ return 1;
+ }
+ else {
+ lua_settop(L, top); /* remove function and global table */
+ return 0;
+ }
}
static void pushfuncname (lua_State *L, lua_Debug *ar) {
- if (*ar->namewhat != '\0') /* is there a name? */
- lua_pushfstring(L, "function " LUA_QS, ar->name);
- else if (*ar->what == 'm') /* main? */
- lua_pushliteral(L, "main chunk");
- else if (*ar->what == 'C') {
- if (pushglobalfuncname(L, ar)) {
- lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
- lua_remove(L, -2); /* remove name */
- }
- else
- lua_pushliteral(L, "?");
- }
- else
- lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+ if (*ar->namewhat != '\0') /* is there a name? */
+ lua_pushfstring(L, "function " LUA_QS, ar->name);
+ else if (*ar->what == 'm') /* main? */
+ lua_pushliteral(L, "main chunk");
+ else if (*ar->what == 'C') {
+ if (pushglobalfuncname(L, ar)) {
+ lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
+ lua_remove(L, -2); /* remove name */
+ }
+ else
+ lua_pushliteral(L, "?");
+ }
+ else
+ lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
}
static int countlevels (lua_State *L) {
- lua_Debug ar;
- int li = 1, le = 1;
- /* find an upper bound */
- while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
- /* do a binary search */
- while (li < le) {
- int m = (li + le)/2;
- if (lua_getstack(L, m, &ar)) li = m + 1;
- else le = m;
- }
- return le - 1;
+ lua_Debug ar;
+ int li = 1, le = 1;
+ /* find an upper bound */
+ while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
+ /* do a binary search */
+ while (li < le) {
+ int m = (li + le)/2;
+ if (lua_getstack(L, m, &ar)) li = m + 1;
+ else le = m;
+ }
+ return le - 1;
}
LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
- const char *msg, int level) {
- lua_Debug ar;
- int top = lua_gettop(L);
- int numlevels = countlevels(L1);
- int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0;
- if (msg) lua_pushfstring(L, "%s\n", msg);
- lua_pushliteral(L, "stack traceback:");
- while (lua_getstack(L1, level++, &ar)) {
- if (level == mark) { /* too many levels? */
- lua_pushliteral(L, "\n\t..."); /* add a '...' */
- level = numlevels - LEVELS2; /* and skip to last ones */
- }
- else {
- lua_getinfo(L1, "Slnt", &ar);
- lua_pushfstring(L, "\n\t%s:", ar.short_src);
- if (ar.currentline > 0)
- lua_pushfstring(L, "%d:", ar.currentline);
- lua_pushliteral(L, " in ");
- pushfuncname(L, &ar);
- if (ar.istailcall)
- lua_pushliteral(L, "\n\t(...tail calls...)");
- lua_concat(L, lua_gettop(L) - top);
- }
- }
- lua_concat(L, lua_gettop(L) - top);
+ const char *msg, int level) {
+ lua_Debug ar;
+ int top = lua_gettop(L);
+ int numlevels = countlevels(L1);
+ int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0;
+ if (msg) lua_pushfstring(L, "%s\n", msg);
+ lua_pushliteral(L, "stack traceback:");
+ while (lua_getstack(L1, level++, &ar)) {
+ if (level == mark) { /* too many levels? */
+ lua_pushliteral(L, "\n\t..."); /* add a '...' */
+ level = numlevels - LEVELS2; /* and skip to last ones */
+ }
+ else {
+ lua_getinfo(L1, "Slnt", &ar);
+ lua_pushfstring(L, "\n\t%s:", ar.short_src);
+ if (ar.currentline > 0)
+ lua_pushfstring(L, "%d:", ar.currentline);
+ lua_pushliteral(L, " in ");
+ pushfuncname(L, &ar);
+ if (ar.istailcall)
+ lua_pushliteral(L, "\n\t(...tail calls...)");
+ lua_concat(L, lua_gettop(L) - top);
+ }
+ }
+ lua_concat(L, lua_gettop(L) - top);
}
/* }====================================================== */
@@ -151,78 +151,78 @@ LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
*/
LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
- lua_Debug ar;
- if (!lua_getstack(L, 0, &ar)) /* no stack frame? */
- return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
- lua_getinfo(L, "n", &ar);
- if (strcmp(ar.namewhat, "method") == 0) {
- narg--; /* do not count `self' */
- if (narg == 0) /* error is in the self argument itself? */
- return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
- ar.name, extramsg);
- }
- if (ar.name == NULL)
- ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?";
- return luaL_error(L, "bad argument #%d to " LUA_QS " (%s)",
- narg, ar.name, extramsg);
+ lua_Debug ar;
+ if (!lua_getstack(L, 0, &ar)) /* no stack frame? */
+ return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
+ lua_getinfo(L, "n", &ar);
+ if (strcmp(ar.namewhat, "method") == 0) {
+ narg--; /* do not count `self' */
+ if (narg == 0) /* error is in the self argument itself? */
+ return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
+ ar.name, extramsg);
+ }
+ if (ar.name == NULL)
+ ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?";
+ return luaL_error(L, "bad argument #%d to " LUA_QS " (%s)",
+ narg, ar.name, extramsg);
}
static int typeerror (lua_State *L, int narg, const char *tname) {
- const char *msg = lua_pushfstring(L, "%s expected, got %s",
- tname, luaL_typename(L, narg));
- return luaL_argerror(L, narg, msg);
+ const char *msg = lua_pushfstring(L, "%s expected, got %s",
+ tname, luaL_typename(L, narg));
+ return luaL_argerror(L, narg, msg);
}
static void tag_error (lua_State *L, int narg, int tag) {
- typeerror(L, narg, lua_typename(L, tag));
+ typeerror(L, narg, lua_typename(L, tag));
}
LUALIB_API void luaL_where (lua_State *L, int level) {
- lua_Debug ar;
- if (lua_getstack(L, level, &ar)) { /* check function at level */
- lua_getinfo(L, "Sl", &ar); /* get info about it */
- if (ar.currentline > 0) { /* is there info? */
- lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
- return;
- }
- }
- lua_pushliteral(L, ""); /* else, no information available... */
+ lua_Debug ar;
+ if (lua_getstack(L, level, &ar)) { /* check function at level */
+ lua_getinfo(L, "Sl", &ar); /* get info about it */
+ if (ar.currentline > 0) { /* is there info? */
+ lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
+ return;
+ }
+ }
+ lua_pushliteral(L, ""); /* else, no information available... */
}
LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
- va_list argp;
- va_start(argp, fmt);
- luaL_where(L, 1);
- lua_pushvfstring(L, fmt, argp);
- va_end(argp);
- lua_concat(L, 2);
- return lua_error(L);
+ va_list argp;
+ va_start(argp, fmt);
+ luaL_where(L, 1);
+ lua_pushvfstring(L, fmt, argp);
+ va_end(argp);
+ lua_concat(L, 2);
+ return lua_error(L);
}
LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
- int en = errno; /* calls to Lua API may change this value */
- if (stat) {
- lua_pushboolean(L, 1);
- return 1;
- }
- else {
- lua_pushnil(L);
- if (fname)
- lua_pushfstring(L, "%s: %s", fname, strerror(en));
- else
- lua_pushstring(L, strerror(en));
- lua_pushinteger(L, en);
- return 3;
- }
+ int en = errno; /* calls to Lua API may change this value */
+ if (stat) {
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+ else {
+ lua_pushnil(L);
+ if (fname)
+ lua_pushfstring(L, "%s: %s", fname, strerror(en));
+ else
+ lua_pushstring(L, strerror(en));
+ lua_pushinteger(L, en);
+ return 3;
+ }
}
-#if !defined(inspectstat) /* { */
+#if !defined(inspectstat) /* { */
#if defined(LUA_USE_POSIX)
@@ -232,8 +232,8 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
** use appropriate macros to interpret 'pclose' return status
*/
#define inspectstat(stat,what) \
- if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
- else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
+ if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
+ else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
#else
@@ -241,23 +241,23 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
#endif
-#endif /* } */
+#endif /* } */
LUALIB_API int luaL_execresult (lua_State *L, int stat) {
- const char *what = "exit"; /* type of termination */
- if (stat == -1) /* error? */
- return luaL_fileresult(L, 0, NULL);
- else {
- inspectstat(stat, what); /* interpret result */
- if (*what == 'e' && stat == 0) /* successful termination? */
- lua_pushboolean(L, 1);
- else
- lua_pushnil(L);
- lua_pushstring(L, what);
- lua_pushinteger(L, stat);
- return 3; /* return true/nil,what,code */
- }
+ const char *what = "exit"; /* type of termination */
+ if (stat == -1) /* error? */
+ return luaL_fileresult(L, 0, NULL);
+ else {
+ inspectstat(stat, what); /* interpret result */
+ if (*what == 'e' && stat == 0) /* successful termination? */
+ lua_pushboolean(L, 1);
+ else
+ lua_pushnil(L);
+ lua_pushstring(L, what);
+ lua_pushinteger(L, stat);
+ return 3; /* return true/nil,what,code */
+ }
}
/* }====================================================== */
@@ -270,42 +270,42 @@ LUALIB_API int luaL_execresult (lua_State *L, int stat) {
*/
LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
- luaL_getmetatable(L, tname); /* try to get metatable */
- if (!lua_isnil(L, -1)) /* name already in use? */
- return 0; /* leave previous value on top, but return 0 */
- lua_pop(L, 1);
- lua_newtable(L); /* create metatable */
- lua_pushvalue(L, -1);
- lua_setfield(L, LUA_REGISTRYINDEX, tname); /* registry.name = metatable */
- return 1;
+ luaL_getmetatable(L, tname); /* try to get metatable */
+ if (!lua_isnil(L, -1)) /* name already in use? */
+ return 0; /* leave previous value on top, but return 0 */
+ lua_pop(L, 1);
+ lua_newtable(L); /* create metatable */
+ lua_pushvalue(L, -1);
+ lua_setfield(L, LUA_REGISTRYINDEX, tname); /* registry.name = metatable */
+ return 1;
}
LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) {
- luaL_getmetatable(L, tname);
- lua_setmetatable(L, -2);
+ luaL_getmetatable(L, tname);
+ lua_setmetatable(L, -2);
}
LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) {
- void *p = lua_touserdata(L, ud);
- if (p != NULL) { /* value is a userdata? */
- if (lua_getmetatable(L, ud)) { /* does it have a metatable? */
- luaL_getmetatable(L, tname); /* get correct metatable */
- if (!lua_rawequal(L, -1, -2)) /* not the same? */
- p = NULL; /* value is a userdata with wrong metatable */
- lua_pop(L, 2); /* remove both metatables */
- return p;
- }
- }
- return NULL; /* value is not a userdata with a metatable */
+ void *p = lua_touserdata(L, ud);
+ if (p != NULL) { /* value is a userdata? */
+ if (lua_getmetatable(L, ud)) { /* does it have a metatable? */
+ luaL_getmetatable(L, tname); /* get correct metatable */
+ if (!lua_rawequal(L, -1, -2)) /* not the same? */
+ p = NULL; /* value is a userdata with wrong metatable */
+ lua_pop(L, 2); /* remove both metatables */
+ return p;
+ }
+ }
+ return NULL; /* value is not a userdata with a metatable */
}
LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
- void *p = luaL_testudata(L, ud, tname);
- if (p == NULL) typeerror(L, ud, tname);
- return p;
+ void *p = luaL_testudata(L, ud, tname);
+ if (p == NULL) typeerror(L, ud, tname);
+ return p;
}
/* }====================================================== */
@@ -318,101 +318,101 @@ LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
*/
LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
- const char *const lst[]) {
- const char *name = (def) ? luaL_optstring(L, narg, def) :
- luaL_checkstring(L, narg);
- int i;
- for (i=0; lst[i]; i++)
- if (strcmp(lst[i], name) == 0)
- return i;
- return luaL_argerror(L, narg,
- lua_pushfstring(L, "invalid option " LUA_QS, name));
+ const char *const lst[]) {
+ const char *name = (def) ? luaL_optstring(L, narg, def) :
+ luaL_checkstring(L, narg);
+ int i;
+ for (i=0; lst[i]; i++)
+ if (strcmp(lst[i], name) == 0)
+ return i;
+ return luaL_argerror(L, narg,
+ lua_pushfstring(L, "invalid option " LUA_QS, name));
}
LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) {
- /* keep some extra space to run error routines, if needed */
- const int extra = LUA_MINSTACK;
- if (!lua_checkstack(L, space + extra)) {
- if (msg)
- luaL_error(L, "stack overflow (%s)", msg);
- else
- luaL_error(L, "stack overflow");
- }
+ /* keep some extra space to run error routines, if needed */
+ const int extra = LUA_MINSTACK;
+ if (!lua_checkstack(L, space + extra)) {
+ if (msg)
+ luaL_error(L, "stack overflow (%s)", msg);
+ else
+ luaL_error(L, "stack overflow");
+ }
}
LUALIB_API void luaL_checktype (lua_State *L, int narg, int t) {
- if (lua_type(L, narg) != t)
- tag_error(L, narg, t);
+ if (lua_type(L, narg) != t)
+ tag_error(L, narg, t);
}
LUALIB_API void luaL_checkany (lua_State *L, int narg) {
- if (lua_type(L, narg) == LUA_TNONE)
- luaL_argerror(L, narg, "value expected");
+ if (lua_type(L, narg) == LUA_TNONE)
+ luaL_argerror(L, narg, "value expected");
}
LUALIB_API const char *luaL_checklstring (lua_State *L, int narg, size_t *len) {
- const char *s = lua_tolstring(L, narg, len);
- if (!s) tag_error(L, narg, LUA_TSTRING);
- return s;
+ const char *s = lua_tolstring(L, narg, len);
+ if (!s) tag_error(L, narg, LUA_TSTRING);
+ return s;
}
LUALIB_API const char *luaL_optlstring (lua_State *L, int narg,
- const char *def, size_t *len) {
- if (lua_isnoneornil(L, narg)) {
- if (len)
- *len = (def ? strlen(def) : 0);
- return def;
- }
- else return luaL_checklstring(L, narg, len);
+ const char *def, size_t *len) {
+ if (lua_isnoneornil(L, narg)) {
+ if (len)
+ *len = (def ? strlen(def) : 0);
+ return def;
+ }
+ else return luaL_checklstring(L, narg, len);
}
LUALIB_API lua_Number luaL_checknumber (lua_State *L, int narg) {
- int isnum;
- lua_Number d = lua_tonumberx(L, narg, &isnum);
- if (!isnum)
- tag_error(L, narg, LUA_TNUMBER);
- return d;
+ int isnum;
+ lua_Number d = lua_tonumberx(L, narg, &isnum);
+ if (!isnum)
+ tag_error(L, narg, LUA_TNUMBER);
+ return d;
}
LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) {
- return luaL_opt(L, luaL_checknumber, narg, def);
+ return luaL_opt(L, luaL_checknumber, narg, def);
}
LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) {
- int isnum;
- lua_Integer d = lua_tointegerx(L, narg, &isnum);
- if (!isnum)
- tag_error(L, narg, LUA_TNUMBER);
- return d;
+ int isnum;
+ lua_Integer d = lua_tointegerx(L, narg, &isnum);
+ if (!isnum)
+ tag_error(L, narg, LUA_TNUMBER);
+ return d;
}
LUALIB_API lua_Unsigned luaL_checkunsigned (lua_State *L, int narg) {
- int isnum;
- lua_Unsigned d = lua_tounsignedx(L, narg, &isnum);
- if (!isnum)
- tag_error(L, narg, LUA_TNUMBER);
- return d;
+ int isnum;
+ lua_Unsigned d = lua_tounsignedx(L, narg, &isnum);
+ if (!isnum)
+ tag_error(L, narg, LUA_TNUMBER);
+ return d;
}
LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int narg,
- lua_Integer def) {
- return luaL_opt(L, luaL_checkinteger, narg, def);
+ lua_Integer def) {
+ return luaL_opt(L, luaL_checkinteger, narg, def);
}
LUALIB_API lua_Unsigned luaL_optunsigned (lua_State *L, int narg,
- lua_Unsigned def) {
- return luaL_opt(L, luaL_checkunsigned, narg, def);
+ lua_Unsigned def) {
+ return luaL_opt(L, luaL_checkunsigned, narg, def);
}
/* }====================================================== */
@@ -428,82 +428,82 @@ LUALIB_API lua_Unsigned luaL_optunsigned (lua_State *L, int narg,
** check whether buffer is using a userdata on the stack as a temporary
** buffer
*/
-#define buffonstack(B) ((B)->b != (B)->initb)
+#define buffonstack(B) ((B)->b != (B)->initb)
/*
** returns a pointer to a free area with at least 'sz' bytes
*/
LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
- lua_State *L = B->L;
- if (B->size - B->n < sz) { /* not enough space? */
- char *newbuff;
- size_t newsize = B->size * 2; /* double buffer size */
- if (newsize - B->n < sz) /* not big enough? */
- newsize = B->n + sz;
- if (newsize < B->n || newsize - B->n < sz)
- luaL_error(L, "buffer too large");
- /* create larger buffer */
- newbuff = (char *)lua_newuserdata(L, newsize * sizeof(char));
- /* move content to new buffer */
- memcpy(newbuff, B->b, B->n * sizeof(char));
- if (buffonstack(B))
- lua_remove(L, -2); /* remove old buffer */
- B->b = newbuff;
- B->size = newsize;
- }
- return &B->b[B->n];
+ lua_State *L = B->L;
+ if (B->size - B->n < sz) { /* not enough space? */
+ char *newbuff;
+ size_t newsize = B->size * 2; /* double buffer size */
+ if (newsize - B->n < sz) /* not big enough? */
+ newsize = B->n + sz;
+ if (newsize < B->n || newsize - B->n < sz)
+ luaL_error(L, "buffer too large");
+ /* create larger buffer */
+ newbuff = (char *)lua_newuserdata(L, newsize * sizeof(char));
+ /* move content to new buffer */
+ memcpy(newbuff, B->b, B->n * sizeof(char));
+ if (buffonstack(B))
+ lua_remove(L, -2); /* remove old buffer */
+ B->b = newbuff;
+ B->size = newsize;
+ }
+ return &B->b[B->n];
}
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
- char *b = luaL_prepbuffsize(B, l);
- memcpy(b, s, l * sizeof(char));
- luaL_addsize(B, l);
+ char *b = luaL_prepbuffsize(B, l);
+ memcpy(b, s, l * sizeof(char));
+ luaL_addsize(B, l);
}
LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
- luaL_addlstring(B, s, strlen(s));
+ luaL_addlstring(B, s, strlen(s));
}
LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
- lua_State *L = B->L;
- lua_pushlstring(L, B->b, B->n);
- if (buffonstack(B))
- lua_remove(L, -2); /* remove old buffer */
+ lua_State *L = B->L;
+ lua_pushlstring(L, B->b, B->n);
+ if (buffonstack(B))
+ lua_remove(L, -2); /* remove old buffer */
}
LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) {
- luaL_addsize(B, sz);
- luaL_pushresult(B);
+ luaL_addsize(B, sz);
+ luaL_pushresult(B);
}
LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
- lua_State *L = B->L;
- size_t l;
- const char *s = lua_tolstring(L, -1, &l);
- if (buffonstack(B))
- lua_insert(L, -2); /* put value below buffer */
- luaL_addlstring(B, s, l);
- lua_remove(L, (buffonstack(B)) ? -2 : -1); /* remove value */
+ lua_State *L = B->L;
+ size_t l;
+ const char *s = lua_tolstring(L, -1, &l);
+ if (buffonstack(B))
+ lua_insert(L, -2); /* put value below buffer */
+ luaL_addlstring(B, s, l);
+ lua_remove(L, (buffonstack(B)) ? -2 : -1); /* remove value */
}
LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
- B->L = L;
- B->b = B->initb;
- B->n = 0;
- B->size = LUAL_BUFFERSIZE;
+ B->L = L;
+ B->b = B->initb;
+ B->n = 0;
+ B->size = LUAL_BUFFERSIZE;
}
LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
- luaL_buffinit(L, B);
- return luaL_prepbuffsize(B, sz);
+ luaL_buffinit(L, B);
+ return luaL_prepbuffsize(B, sz);
}
/* }====================================================== */
@@ -516,38 +516,38 @@ LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
*/
/* index of free-list header */
-#define freelist 0
+#define freelist 0
LUALIB_API int luaL_ref (lua_State *L, int t) {
- int ref;
- if (lua_isnil(L, -1)) {
- lua_pop(L, 1); /* remove from stack */
- return LUA_REFNIL; /* `nil' has a unique fixed reference */
- }
- t = lua_absindex(L, t);
- lua_rawgeti(L, t, freelist); /* get first free element */
- ref = (int)lua_tointeger(L, -1); /* ref = t[freelist] */
- lua_pop(L, 1); /* remove it from stack */
- if (ref != 0) { /* any free element? */
- lua_rawgeti(L, t, ref); /* remove it from list */
- lua_rawseti(L, t, freelist); /* (t[freelist] = t[ref]) */
- }
- else /* no free elements */
- ref = (int)lua_rawlen(L, t) + 1; /* get a new reference */
- lua_rawseti(L, t, ref);
- return ref;
+ int ref;
+ if (lua_isnil(L, -1)) {
+ lua_pop(L, 1); /* remove from stack */
+ return LUA_REFNIL; /* `nil' has a unique fixed reference */
+ }
+ t = lua_absindex(L, t);
+ lua_rawgeti(L, t, freelist); /* get first free element */
+ ref = (int)lua_tointeger(L, -1); /* ref = t[freelist] */
+ lua_pop(L, 1); /* remove it from stack */
+ if (ref != 0) { /* any free element? */
+ lua_rawgeti(L, t, ref); /* remove it from list */
+ lua_rawseti(L, t, freelist); /* (t[freelist] = t[ref]) */
+ }
+ else /* no free elements */
+ ref = (int)lua_rawlen(L, t) + 1; /* get a new reference */
+ lua_rawseti(L, t, ref);
+ return ref;
}
LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
- if (ref >= 0) {
- t = lua_absindex(L, t);
- lua_rawgeti(L, t, freelist);
- lua_rawseti(L, t, ref); /* t[ref] = t[freelist] */
- lua_pushinteger(L, ref);
- lua_rawseti(L, t, freelist); /* t[freelist] = ref */
- }
+ if (ref >= 0) {
+ t = lua_absindex(L, t);
+ lua_rawgeti(L, t, freelist);
+ lua_rawseti(L, t, ref); /* t[ref] = t[freelist] */
+ lua_pushinteger(L, ref);
+ lua_rawseti(L, t, freelist); /* t[freelist] = ref */
+ }
}
/* }====================================================== */
@@ -560,50 +560,50 @@ LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
*/
typedef struct LoadF {
- int n; /* number of pre-read characters */
- FILE *f; /* file being read */
- char buff[LUAL_BUFFERSIZE]; /* area for reading file */
+ int n; /* number of pre-read characters */
+ FILE *f; /* file being read */
+ char buff[LUAL_BUFFERSIZE]; /* area for reading file */
} LoadF;
static const char *getF (lua_State *L, void *ud, size_t *size) {
- LoadF *lf = (LoadF *)ud;
- (void)L; /* not used */
- if (lf->n > 0) { /* are there pre-read characters to be read? */
- *size = lf->n; /* return them (chars already in buffer) */
- lf->n = 0; /* no more pre-read characters */
- }
- else { /* read a block from file */
- /* 'fread' can return > 0 *and* set the EOF flag. If next call to
- 'getF' called 'fread', it might still wait for user input.
- The next check avoids this problem. */
- if (feof(lf->f)) return NULL;
- *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */
- }
- return lf->buff;
+ LoadF *lf = (LoadF *)ud;
+ (void)L; /* not used */
+ if (lf->n > 0) { /* are there pre-read characters to be read? */
+ *size = lf->n; /* return them (chars already in buffer) */
+ lf->n = 0; /* no more pre-read characters */
+ }
+ else { /* read a block from file */
+ /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+ 'getF' called 'fread', it might still wait for user input.
+ The next check avoids this problem. */
+ if (feof(lf->f)) return NULL;
+ *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */
+ }
+ return lf->buff;
}
static int errfile (lua_State *L, const char *what, int fnameindex) {
- const char *serr = strerror(errno);
- const char *filename = lua_tostring(L, fnameindex) + 1;
- lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
- lua_remove(L, fnameindex);
- return LUA_ERRFILE;
+ const char *serr = strerror(errno);
+ const char *filename = lua_tostring(L, fnameindex) + 1;
+ lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+ lua_remove(L, fnameindex);
+ return LUA_ERRFILE;
}
static int skipBOM (LoadF *lf) {
- const char *p = "\xEF\xBB\xBF"; /* Utf8 BOM mark */
- int c;
- lf->n = 0;
- do {
- c = getc(lf->f);
- if (c == EOF || c != *(const unsigned char *)p++) return c;
- lf->buff[lf->n++] = c; /* to be read by the parser */
- } while (*p != '\0');
- lf->n = 0; /* prefix matched; discard it */
- return getc(lf->f); /* return next character */
+ const char *p = "\xEF\xBB\xBF"; /* Utf8 BOM mark */
+ int c;
+ lf->n = 0;
+ do {
+ c = getc(lf->f);
+ if (c == EOF || c != *(const unsigned char *)p++) return c;
+ lf->buff[lf->n++] = c; /* to be read by the parser */
+ } while (*p != '\0');
+ lf->n = 0; /* prefix matched; discard it */
+ return getc(lf->f); /* return next character */
}
@@ -615,81 +615,81 @@ static int skipBOM (LoadF *lf) {
** a first-line comment).
*/
static int skipcomment (LoadF *lf, int *cp) {
- int c = *cp = skipBOM(lf);
- if (c == '#') { /* first line is a comment (Unix exec. file)? */
- do { /* skip first line */
- c = getc(lf->f);
- } while (c != EOF && c != '\n') ;
- *cp = getc(lf->f); /* skip end-of-line, if present */
- return 1; /* there was a comment */
- }
- else return 0; /* no comment */
+ int c = *cp = skipBOM(lf);
+ if (c == '#') { /* first line is a comment (Unix exec. file)? */
+ do { /* skip first line */
+ c = getc(lf->f);
+ } while (c != EOF && c != '\n') ;
+ *cp = getc(lf->f); /* skip end-of-line, if present */
+ return 1; /* there was a comment */
+ }
+ else return 0; /* no comment */
}
LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
- const char *mode) {
- LoadF lf;
- int status, readstatus;
- int c;
- int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
- if (filename == NULL) {
- lua_pushliteral(L, "=stdin");
- lf.f = stdin;
- }
- else {
- lua_pushfstring(L, "@%s", filename);
- lf.f = fopen(filename, "r");
- if (lf.f == NULL) return errfile(L, "open", fnameindex);
- }
- if (skipcomment(&lf, &c)) /* read initial portion */
- lf.buff[lf.n++] = '\n'; /* add line to correct line numbers */
- if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
- lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
- if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
- skipcomment(&lf, &c); /* re-read initial portion */
- }
- if (c != EOF)
- lf.buff[lf.n++] = c; /* 'c' is the first character of the stream */
- status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
- readstatus = ferror(lf.f);
- if (filename) fclose(lf.f); /* close file (even in case of errors) */
- if (readstatus) {
- lua_settop(L, fnameindex); /* ignore results from `lua_load' */
- return errfile(L, "read", fnameindex);
- }
- lua_remove(L, fnameindex);
- return status;
+ const char *mode) {
+ LoadF lf;
+ int status, readstatus;
+ int c;
+ int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
+ if (filename == NULL) {
+ lua_pushliteral(L, "=stdin");
+ lf.f = stdin;
+ }
+ else {
+ lua_pushfstring(L, "@%s", filename);
+ lf.f = fopen(filename, "r");
+ if (lf.f == NULL) return errfile(L, "open", fnameindex);
+ }
+ if (skipcomment(&lf, &c)) /* read initial portion */
+ lf.buff[lf.n++] = '\n'; /* add line to correct line numbers */
+ if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
+ lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
+ if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
+ skipcomment(&lf, &c); /* re-read initial portion */
+ }
+ if (c != EOF)
+ lf.buff[lf.n++] = c; /* 'c' is the first character of the stream */
+ status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
+ readstatus = ferror(lf.f);
+ if (filename) fclose(lf.f); /* close file (even in case of errors) */
+ if (readstatus) {
+ lua_settop(L, fnameindex); /* ignore results from `lua_load' */
+ return errfile(L, "read", fnameindex);
+ }
+ lua_remove(L, fnameindex);
+ return status;
}
typedef struct LoadS {
- const char *s;
- size_t size;
+ const char *s;
+ size_t size;
} LoadS;
static const char *getS (lua_State *L, void *ud, size_t *size) {
- LoadS *ls = (LoadS *)ud;
- (void)L; /* not used */
- if (ls->size == 0) return NULL;
- *size = ls->size;
- ls->size = 0;
- return ls->s;
+ LoadS *ls = (LoadS *)ud;
+ (void)L; /* not used */
+ if (ls->size == 0) return NULL;
+ *size = ls->size;
+ ls->size = 0;
+ return ls->s;
}
LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size,
- const char *name, const char *mode) {
- LoadS ls;
- ls.s = buff;
- ls.size = size;
- return lua_load(L, getS, &ls, name, mode);
+ const char *name, const char *mode) {
+ LoadS ls;
+ ls.s = buff;
+ ls.size = size;
+ return lua_load(L, getS, &ls, name, mode);
}
LUALIB_API int luaL_loadstring (lua_State *L, const char *s) {
- return luaL_loadbuffer(L, s, strlen(s), s);
+ return luaL_loadbuffer(L, s, strlen(s), s);
}
/* }====================================================== */
@@ -697,63 +697,63 @@ LUALIB_API int luaL_loadstring (lua_State *L, const char *s) {
LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
- if (!lua_getmetatable(L, obj)) /* no metatable? */
- return 0;
- lua_pushstring(L, event);
- lua_rawget(L, -2);
- if (lua_isnil(L, -1)) {
- lua_pop(L, 2); /* remove metatable and metafield */
- return 0;
- }
- else {
- lua_remove(L, -2); /* remove only metatable */
- return 1;
- }
+ if (!lua_getmetatable(L, obj)) /* no metatable? */
+ return 0;
+ lua_pushstring(L, event);
+ lua_rawget(L, -2);
+ if (lua_isnil(L, -1)) {
+ lua_pop(L, 2); /* remove metatable and metafield */
+ return 0;
+ }
+ else {
+ lua_remove(L, -2); /* remove only metatable */
+ return 1;
+ }
}
LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
- obj = lua_absindex(L, obj);
- if (!luaL_getmetafield(L, obj, event)) /* no metafield? */
- return 0;
- lua_pushvalue(L, obj);
- lua_call(L, 1, 1);
- return 1;
+ obj = lua_absindex(L, obj);
+ if (!luaL_getmetafield(L, obj, event)) /* no metafield? */
+ return 0;
+ lua_pushvalue(L, obj);
+ lua_call(L, 1, 1);
+ return 1;
}
LUALIB_API int luaL_len (lua_State *L, int idx) {
- int l;
- int isnum;
- lua_len(L, idx);
- l = (int)lua_tointegerx(L, -1, &isnum);
- if (!isnum)
- luaL_error(L, "object length is not a number");
- lua_pop(L, 1); /* remove object */
- return l;
+ int l;
+ int isnum;
+ lua_len(L, idx);
+ l = (int)lua_tointegerx(L, -1, &isnum);
+ if (!isnum)
+ luaL_error(L, "object length is not a number");
+ lua_pop(L, 1); /* remove object */
+ return l;
}
LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
- if (!luaL_callmeta(L, idx, "__tostring")) { /* no metafield? */
- switch (lua_type(L, idx)) {
- case LUA_TNUMBER:
- case LUA_TSTRING:
- lua_pushvalue(L, idx);
- break;
- case LUA_TBOOLEAN:
- lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false"));
- break;
- case LUA_TNIL:
- lua_pushliteral(L, "nil");
- break;
- default:
- lua_pushfstring(L, "%s: %p", luaL_typename(L, idx),
- lua_topointer(L, idx));
- break;
- }
- }
- return lua_tolstring(L, -1, len);
+ if (!luaL_callmeta(L, idx, "__tostring")) { /* no metafield? */
+ switch (lua_type(L, idx)) {
+ case LUA_TNUMBER:
+ case LUA_TSTRING:
+ lua_pushvalue(L, idx);
+ break;
+ case LUA_TBOOLEAN:
+ lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false"));
+ break;
+ case LUA_TNIL:
+ lua_pushliteral(L, "nil");
+ break;
+ default:
+ lua_pushfstring(L, "%s: %p", luaL_typename(L, idx),
+ lua_topointer(L, idx));
+ break;
+ }
+ }
+ return lua_tolstring(L, -1, len);
}
@@ -765,29 +765,29 @@ LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
#if defined(LUA_COMPAT_MODULE)
static const char *luaL_findtable (lua_State *L, int idx,
- const char *fname, int szhint) {
- const char *e;
- if (idx) lua_pushvalue(L, idx);
- do {
- e = strchr(fname, '.');
- if (e == NULL) e = fname + strlen(fname);
- lua_pushlstring(L, fname, e - fname);
- lua_rawget(L, -2);
- if (lua_isnil(L, -1)) { /* no such field? */
- lua_pop(L, 1); /* remove this nil */
- lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */
- lua_pushlstring(L, fname, e - fname);
- lua_pushvalue(L, -2);
- lua_settable(L, -4); /* set new table into field */
- }
- else if (!lua_istable(L, -1)) { /* field has a non-table value? */
- lua_pop(L, 2); /* remove table and value */
- return fname; /* return problematic part of the name */
- }
- lua_remove(L, -2); /* remove previous table */
- fname = e + 1;
- } while (*e == '.');
- return NULL;
+ const char *fname, int szhint) {
+ const char *e;
+ if (idx) lua_pushvalue(L, idx);
+ do {
+ e = strchr(fname, '.');
+ if (e == NULL) e = fname + strlen(fname);
+ lua_pushlstring(L, fname, e - fname);
+ lua_rawget(L, -2);
+ if (lua_isnil(L, -1)) { /* no such field? */
+ lua_pop(L, 1); /* remove this nil */
+ lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */
+ lua_pushlstring(L, fname, e - fname);
+ lua_pushvalue(L, -2);
+ lua_settable(L, -4); /* set new table into field */
+ }
+ else if (!lua_istable(L, -1)) { /* field has a non-table value? */
+ lua_pop(L, 2); /* remove table and value */
+ return fname; /* return problematic part of the name */
+ }
+ lua_remove(L, -2); /* remove previous table */
+ fname = e + 1;
+ } while (*e == '.');
+ return NULL;
}
@@ -795,9 +795,9 @@ static const char *luaL_findtable (lua_State *L, int idx,
** Count number of elements in a luaL_Reg list.
*/
static int libsize (const luaL_Reg *l) {
- int size = 0;
- for (; l && l->name; l++) size++;
- return size;
+ int size = 0;
+ for (; l && l->name; l++) size++;
+ return size;
}
@@ -808,33 +808,33 @@ static int libsize (const luaL_Reg *l) {
** the module table.
*/
LUALIB_API void luaL_pushmodule (lua_State *L, const char *modname,
- int sizehint) {
- luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1); /* get _LOADED table */
- lua_getfield(L, -1, modname); /* get _LOADED[modname] */
- if (!lua_istable(L, -1)) { /* not found? */
- lua_pop(L, 1); /* remove previous result */
- /* try global variable (and create one if it does not exist) */
- lua_pushglobaltable(L);
- if (luaL_findtable(L, 0, modname, sizehint) != NULL)
- luaL_error(L, "name conflict for module " LUA_QS, modname);
- lua_pushvalue(L, -1);
- lua_setfield(L, -3, modname); /* _LOADED[modname] = new table */
- }
- lua_remove(L, -2); /* remove _LOADED table */
+ int sizehint) {
+ luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1); /* get _LOADED table */
+ lua_getfield(L, -1, modname); /* get _LOADED[modname] */
+ if (!lua_istable(L, -1)) { /* not found? */
+ lua_pop(L, 1); /* remove previous result */
+ /* try global variable (and create one if it does not exist) */
+ lua_pushglobaltable(L);
+ if (luaL_findtable(L, 0, modname, sizehint) != NULL)
+ luaL_error(L, "name conflict for module " LUA_QS, modname);
+ lua_pushvalue(L, -1);
+ lua_setfield(L, -3, modname); /* _LOADED[modname] = new table */
+ }
+ lua_remove(L, -2); /* remove _LOADED table */
}
LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
- const luaL_Reg *l, int nup) {
- luaL_checkversion(L);
- if (libname) {
- luaL_pushmodule(L, libname, libsize(l)); /* get/create library table */
- lua_insert(L, -(nup + 1)); /* move library table to below upvalues */
- }
- if (l)
- luaL_setfuncs(L, l, nup);
- else
- lua_pop(L, nup); /* remove upvalues */
+ const luaL_Reg *l, int nup) {
+ luaL_checkversion(L);
+ if (libname) {
+ luaL_pushmodule(L, libname, libsize(l)); /* get/create library table */
+ lua_insert(L, -(nup + 1)); /* move library table to below upvalues */
+ }
+ if (l)
+ luaL_setfuncs(L, l, nup);
+ else
+ lua_pop(L, nup); /* remove upvalues */
}
#endif
@@ -846,16 +846,16 @@ LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
** Returns with only the table at the stack.
*/
LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
- luaL_checkversion(L);
- luaL_checkstack(L, nup, "too many upvalues");
- for (; l->name != NULL; l++) { /* fill the table with given functions */
- int i;
- for (i = 0; i < nup; i++) /* copy upvalues to the top */
- lua_pushvalue(L, -nup);
- lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
- lua_setfield(L, -(nup + 2), l->name);
- }
- lua_pop(L, nup); /* remove upvalues */
+ luaL_checkversion(L);
+ luaL_checkstack(L, nup, "too many upvalues");
+ for (; l->name != NULL; l++) { /* fill the table with given functions */
+ int i;
+ for (i = 0; i < nup; i++) /* copy upvalues to the top */
+ lua_pushvalue(L, -nup);
+ lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
+ lua_setfield(L, -(nup + 2), l->name);
+ }
+ lua_pop(L, nup); /* remove upvalues */
}
@@ -864,16 +864,16 @@ LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
** into the stack
*/
LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
- lua_getfield(L, idx, fname);
- if (lua_istable(L, -1)) return 1; /* table already there */
- else {
- lua_pop(L, 1); /* remove previous result */
- idx = lua_absindex(L, idx);
- lua_newtable(L);
- lua_pushvalue(L, -1); /* copy to be left at top */
- lua_setfield(L, idx, fname); /* assign new table to field */
- return 0; /* false, because did not find table there */
- }
+ lua_getfield(L, idx, fname);
+ if (lua_istable(L, -1)) return 1; /* table already there */
+ else {
+ lua_pop(L, 1); /* remove previous result */
+ idx = lua_absindex(L, idx);
+ lua_newtable(L);
+ lua_pushvalue(L, -1); /* copy to be left at top */
+ lua_setfield(L, idx, fname); /* assign new table to field */
+ return 0; /* false, because did not find table there */
+ }
}
@@ -884,76 +884,75 @@ LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
** Leaves resulting module on the top.
*/
LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
- lua_CFunction openf, int glb) {
- lua_pushcfunction(L, openf);
- lua_pushstring(L, modname); /* argument to open function */
- lua_call(L, 1, 1); /* open module */
- luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
- lua_pushvalue(L, -2); /* make copy of module (call result) */
- lua_setfield(L, -2, modname); /* _LOADED[modname] = module */
- lua_pop(L, 1); /* remove _LOADED table */
- if (glb) {
- lua_pushvalue(L, -1); /* copy of 'mod' */
- lua_setglobal(L, modname); /* _G[modname] = module */
- }
+ lua_CFunction openf, int glb) {
+ lua_pushcfunction(L, openf);
+ lua_pushstring(L, modname); /* argument to open function */
+ lua_call(L, 1, 1); /* open module */
+ luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+ lua_pushvalue(L, -2); /* make copy of module (call result) */
+ lua_setfield(L, -2, modname); /* _LOADED[modname] = module */
+ lua_pop(L, 1); /* remove _LOADED table */
+ if (glb) {
+ lua_pushvalue(L, -1); /* copy of 'mod' */
+ lua_setglobal(L, modname); /* _G[modname] = module */
+ }
}
LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p,
- const char *r) {
- const char *wild;
- size_t l = strlen(p);
- luaL_Buffer b;
- luaL_buffinit(L, &b);
- while ((wild = strstr(s, p)) != NULL) {
- luaL_addlstring(&b, s, wild - s); /* push prefix */
- luaL_addstring(&b, r); /* push replacement in place of pattern */
- s = wild + l; /* continue after `p' */
- }
- luaL_addstring(&b, s); /* push last suffix */
- luaL_pushresult(&b);
- return lua_tostring(L, -1);
+ const char *r) {
+ const char *wild;
+ size_t l = strlen(p);
+ luaL_Buffer b;
+ luaL_buffinit(L, &b);
+ while ((wild = strstr(s, p)) != NULL) {
+ luaL_addlstring(&b, s, wild - s); /* push prefix */
+ luaL_addstring(&b, r); /* push replacement in place of pattern */
+ s = wild + l; /* continue after `p' */
+ }
+ luaL_addstring(&b, s); /* push last suffix */
+ luaL_pushresult(&b);
+ return lua_tostring(L, -1);
}
static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
- (void)ud; (void)osize; /* not used */
- if (nsize == 0) {
- free(ptr);
- return NULL;
- }
- else
- return realloc(ptr, nsize);
+ (void)ud; (void)osize; /* not used */
+ if (nsize == 0) {
+ free(ptr);
+ return NULL;
+ }
+ else
+ return realloc(ptr, nsize);
}
static int panic (lua_State *L) {
- luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
- lua_tostring(L, -1));
- return 0; /* return to Lua to abort */
+ luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
+ lua_tostring(L, -1));
+ return 0; /* return to Lua to abort */
}
LUALIB_API lua_State *luaL_newstate (void) {
- lua_State *L = lua_newstate(l_alloc, NULL);
- if (L) lua_atpanic(L, &panic);
- return L;
+ lua_State *L = lua_newstate(l_alloc, NULL);
+ if (L) lua_atpanic(L, &panic);
+ return L;
}
LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver) {
- const lua_Number *v = lua_version(L);
- if (v != lua_version(NULL))
- luaL_error(L, "multiple Lua VMs detected");
- else if (*v != ver)
- luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
- ver, *v);
- /* check conversions number -> integer types */
- lua_pushnumber(L, -(lua_Number)0x1234);
- if (lua_tointeger(L, -1) != -0x1234 ||
- lua_tounsigned(L, -1) != (lua_Unsigned)-0x1234)
- luaL_error(L, "bad conversion number->int;"
- " must recompile Lua with proper settings");
- lua_pop(L, 1);
+ const lua_Number *v = lua_version(L);
+ if (v != lua_version(NULL))
+ luaL_error(L, "multiple Lua VMs detected");
+ else if (*v != ver)
+ luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
+ ver, *v);
+ /* check conversions number -> integer types */
+ lua_pushnumber(L, -(lua_Number)0x1234);
+ if (lua_tointeger(L, -1) != -0x1234 ||
+ lua_tounsigned(L, -1) != (lua_Unsigned)-0x1234)
+ luaL_error(L, "bad conversion number->int;"
+ " must recompile Lua with proper settings");
+ lua_pop(L, 1);
}
-
diff --git a/src/lib/lua/lbaselib.c b/src/lib/lua/lbaselib.c
index 5255b3cd9b7..0fb719d00b7 100644
--- a/src/lib/lua/lbaselib.c
+++ b/src/lib/lua/lbaselib.c
@@ -21,250 +21,250 @@
static int luaB_print (lua_State *L) {
- int n = lua_gettop(L); /* number of arguments */
- int i;
- lua_getglobal(L, "tostring");
- for (i=1; i<=n; i++) {
- const char *s;
- size_t l;
- lua_pushvalue(L, -1); /* function to be called */
- lua_pushvalue(L, i); /* value to print */
- lua_call(L, 1, 1);
- s = lua_tolstring(L, -1, &l); /* get result */
- if (s == NULL)
- return luaL_error(L,
- LUA_QL("tostring") " must return a string to " LUA_QL("print"));
- if (i>1) luai_writestring("\t", 1);
- luai_writestring(s, l);
- lua_pop(L, 1); /* pop result */
- }
- luai_writeline();
- return 0;
+ int n = lua_gettop(L); /* number of arguments */
+ int i;
+ lua_getglobal(L, "tostring");
+ for (i=1; i<=n; i++) {
+ const char *s;
+ size_t l;
+ lua_pushvalue(L, -1); /* function to be called */
+ lua_pushvalue(L, i); /* value to print */
+ lua_call(L, 1, 1);
+ s = lua_tolstring(L, -1, &l); /* get result */
+ if (s == NULL)
+ return luaL_error(L,
+ LUA_QL("tostring") " must return a string to " LUA_QL("print"));
+ if (i>1) luai_writestring("\t", 1);
+ luai_writestring(s, l);
+ lua_pop(L, 1); /* pop result */
+ }
+ luai_writeline();
+ return 0;
}
-#define SPACECHARS " \f\n\r\t\v"
+#define SPACECHARS " \f\n\r\t\v"
static int luaB_tonumber (lua_State *L) {
- if (lua_isnoneornil(L, 2)) { /* standard conversion */
- int isnum;
- lua_Number n = lua_tonumberx(L, 1, &isnum);
- if (isnum) {
- lua_pushnumber(L, n);
- return 1;
- } /* else not a number; must be something */
- luaL_checkany(L, 1);
- }
- else {
- size_t l;
- const char *s = luaL_checklstring(L, 1, &l);
- const char *e = s + l; /* end point for 's' */
- int base = luaL_checkint(L, 2);
- int neg = 0;
- luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
- s += strspn(s, SPACECHARS); /* skip initial spaces */
- if (*s == '-') { s++; neg = 1; } /* handle signal */
- else if (*s == '+') s++;
- if (isalnum((unsigned char)*s)) {
- lua_Number n = 0;
- do {
- int digit = (isdigit((unsigned char)*s)) ? *s - '0'
- : toupper((unsigned char)*s) - 'A' + 10;
- if (digit >= base) break; /* invalid numeral; force a fail */
- n = n * (lua_Number)base + (lua_Number)digit;
- s++;
- } while (isalnum((unsigned char)*s));
- s += strspn(s, SPACECHARS); /* skip trailing spaces */
- if (s == e) { /* no invalid trailing characters? */
- lua_pushnumber(L, (neg) ? -n : n);
- return 1;
- } /* else not a number */
- } /* else not a number */
- }
- lua_pushnil(L); /* not a number */
- return 1;
+ if (lua_isnoneornil(L, 2)) { /* standard conversion */
+ int isnum;
+ lua_Number n = lua_tonumberx(L, 1, &isnum);
+ if (isnum) {
+ lua_pushnumber(L, n);
+ return 1;
+ } /* else not a number; must be something */
+ luaL_checkany(L, 1);
+ }
+ else {
+ size_t l;
+ const char *s = luaL_checklstring(L, 1, &l);
+ const char *e = s + l; /* end point for 's' */
+ int base = luaL_checkint(L, 2);
+ int neg = 0;
+ luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+ s += strspn(s, SPACECHARS); /* skip initial spaces */
+ if (*s == '-') { s++; neg = 1; } /* handle signal */
+ else if (*s == '+') s++;
+ if (isalnum((unsigned char)*s)) {
+ lua_Number n = 0;
+ do {
+ int digit = (isdigit((unsigned char)*s)) ? *s - '0'
+ : toupper((unsigned char)*s) - 'A' + 10;
+ if (digit >= base) break; /* invalid numeral; force a fail */
+ n = n * (lua_Number)base + (lua_Number)digit;
+ s++;
+ } while (isalnum((unsigned char)*s));
+ s += strspn(s, SPACECHARS); /* skip trailing spaces */
+ if (s == e) { /* no invalid trailing characters? */
+ lua_pushnumber(L, (neg) ? -n : n);
+ return 1;
+ } /* else not a number */
+ } /* else not a number */
+ }
+ lua_pushnil(L); /* not a number */
+ return 1;
}
static int luaB_error (lua_State *L) {
- int level = luaL_optint(L, 2, 1);
- lua_settop(L, 1);
- if (lua_isstring(L, 1) && level > 0) { /* add extra information? */
- luaL_where(L, level);
- lua_pushvalue(L, 1);
- lua_concat(L, 2);
- }
- return lua_error(L);
+ int level = luaL_optint(L, 2, 1);
+ lua_settop(L, 1);
+ if (lua_isstring(L, 1) && level > 0) { /* add extra information? */
+ luaL_where(L, level);
+ lua_pushvalue(L, 1);
+ lua_concat(L, 2);
+ }
+ return lua_error(L);
}
static int luaB_getmetatable (lua_State *L) {
- luaL_checkany(L, 1);
- if (!lua_getmetatable(L, 1)) {
- lua_pushnil(L);
- return 1; /* no metatable */
- }
- luaL_getmetafield(L, 1, "__metatable");
- return 1; /* returns either __metatable field (if present) or metatable */
+ luaL_checkany(L, 1);
+ if (!lua_getmetatable(L, 1)) {
+ lua_pushnil(L);
+ return 1; /* no metatable */
+ }
+ luaL_getmetafield(L, 1, "__metatable");
+ return 1; /* returns either __metatable field (if present) or metatable */
}
static int luaB_setmetatable (lua_State *L) {
- int t = lua_type(L, 2);
- luaL_checktype(L, 1, LUA_TTABLE);
- luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
- "nil or table expected");
- if (luaL_getmetafield(L, 1, "__metatable"))
- return luaL_error(L, "cannot change a protected metatable");
- lua_settop(L, 2);
- lua_setmetatable(L, 1);
- return 1;
+ int t = lua_type(L, 2);
+ luaL_checktype(L, 1, LUA_TTABLE);
+ luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+ "nil or table expected");
+ if (luaL_getmetafield(L, 1, "__metatable"))
+ return luaL_error(L, "cannot change a protected metatable");
+ lua_settop(L, 2);
+ lua_setmetatable(L, 1);
+ return 1;
}
static int luaB_rawequal (lua_State *L) {
- luaL_checkany(L, 1);
- luaL_checkany(L, 2);
- lua_pushboolean(L, lua_rawequal(L, 1, 2));
- return 1;
+ luaL_checkany(L, 1);
+ luaL_checkany(L, 2);
+ lua_pushboolean(L, lua_rawequal(L, 1, 2));
+ return 1;
}
static int luaB_rawlen (lua_State *L) {
- int t = lua_type(L, 1);
- luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
- "table or string expected");
- lua_pushinteger(L, lua_rawlen(L, 1));
- return 1;
+ int t = lua_type(L, 1);
+ luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
+ "table or string expected");
+ lua_pushinteger(L, lua_rawlen(L, 1));
+ return 1;
}
static int luaB_rawget (lua_State *L) {
- luaL_checktype(L, 1, LUA_TTABLE);
- luaL_checkany(L, 2);
- lua_settop(L, 2);
- lua_rawget(L, 1);
- return 1;
+ luaL_checktype(L, 1, LUA_TTABLE);
+ luaL_checkany(L, 2);
+ lua_settop(L, 2);
+ lua_rawget(L, 1);
+ return 1;
}
static int luaB_rawset (lua_State *L) {
- luaL_checktype(L, 1, LUA_TTABLE);
- luaL_checkany(L, 2);
- luaL_checkany(L, 3);
- lua_settop(L, 3);
- lua_rawset(L, 1);
- return 1;
+ luaL_checktype(L, 1, LUA_TTABLE);
+ luaL_checkany(L, 2);
+ luaL_checkany(L, 3);
+ lua_settop(L, 3);
+ lua_rawset(L, 1);
+ return 1;
}
static int luaB_collectgarbage (lua_State *L) {
- static const char *const opts[] = {"stop", "restart", "collect",
- "count", "step", "setpause", "setstepmul",
- "setmajorinc", "isrunning", "generational", "incremental", NULL};
- static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
- LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
- LUA_GCSETMAJORINC, LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
- int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
- int ex = luaL_optint(L, 2, 0);
- int res = lua_gc(L, o, ex);
- switch (o) {
- case LUA_GCCOUNT: {
- int b = lua_gc(L, LUA_GCCOUNTB, 0);
- lua_pushnumber(L, res + ((lua_Number)b/1024));
- lua_pushinteger(L, b);
- return 2;
- }
- case LUA_GCSTEP: case LUA_GCISRUNNING: {
- lua_pushboolean(L, res);
- return 1;
- }
- default: {
- lua_pushinteger(L, res);
- return 1;
- }
- }
+ static const char *const opts[] = {"stop", "restart", "collect",
+ "count", "step", "setpause", "setstepmul",
+ "setmajorinc", "isrunning", "generational", "incremental", NULL};
+ static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
+ LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
+ LUA_GCSETMAJORINC, LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
+ int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
+ int ex = luaL_optint(L, 2, 0);
+ int res = lua_gc(L, o, ex);
+ switch (o) {
+ case LUA_GCCOUNT: {
+ int b = lua_gc(L, LUA_GCCOUNTB, 0);
+ lua_pushnumber(L, res + ((lua_Number)b/1024));
+ lua_pushinteger(L, b);
+ return 2;
+ }
+ case LUA_GCSTEP: case LUA_GCISRUNNING: {
+ lua_pushboolean(L, res);
+ return 1;
+ }
+ default: {
+ lua_pushinteger(L, res);
+ return 1;
+ }
+ }
}
static int luaB_type (lua_State *L) {
- luaL_checkany(L, 1);
- lua_pushstring(L, luaL_typename(L, 1));
- return 1;
+ luaL_checkany(L, 1);
+ lua_pushstring(L, luaL_typename(L, 1));
+ return 1;
}
static int pairsmeta (lua_State *L, const char *method, int iszero,
- lua_CFunction iter) {
- if (!luaL_getmetafield(L, 1, method)) { /* no metamethod? */
- luaL_checktype(L, 1, LUA_TTABLE); /* argument must be a table */
- lua_pushcfunction(L, iter); /* will return generator, */
- lua_pushvalue(L, 1); /* state, */
- if (iszero) lua_pushinteger(L, 0); /* and initial value */
- else lua_pushnil(L);
- }
- else {
- lua_pushvalue(L, 1); /* argument 'self' to metamethod */
- lua_call(L, 1, 3); /* get 3 values from metamethod */
- }
- return 3;
+ lua_CFunction iter) {
+ if (!luaL_getmetafield(L, 1, method)) { /* no metamethod? */
+ luaL_checktype(L, 1, LUA_TTABLE); /* argument must be a table */
+ lua_pushcfunction(L, iter); /* will return generator, */
+ lua_pushvalue(L, 1); /* state, */
+ if (iszero) lua_pushinteger(L, 0); /* and initial value */
+ else lua_pushnil(L);
+ }
+ else {
+ lua_pushvalue(L, 1); /* argument 'self' to metamethod */
+ lua_call(L, 1, 3); /* get 3 values from metamethod */
+ }
+ return 3;
}
static int luaB_next (lua_State *L) {
- luaL_checktype(L, 1, LUA_TTABLE);
- lua_settop(L, 2); /* create a 2nd argument if there isn't one */
- if (lua_next(L, 1))
- return 2;
- else {
- lua_pushnil(L);
- return 1;
- }
+ luaL_checktype(L, 1, LUA_TTABLE);
+ lua_settop(L, 2); /* create a 2nd argument if there isn't one */
+ if (lua_next(L, 1))
+ return 2;
+ else {
+ lua_pushnil(L);
+ return 1;
+ }
}
static int luaB_pairs (lua_State *L) {
- return pairsmeta(L, "__pairs", 0, luaB_next);
+ return pairsmeta(L, "__pairs", 0, luaB_next);
}
static int ipairsaux (lua_State *L) {
- int i = luaL_checkint(L, 2);
- luaL_checktype(L, 1, LUA_TTABLE);
- i++; /* next value */
- lua_pushinteger(L, i);
- lua_rawgeti(L, 1, i);
- return (lua_isnil(L, -1)) ? 1 : 2;
+ int i = luaL_checkint(L, 2);
+ luaL_checktype(L, 1, LUA_TTABLE);
+ i++; /* next value */
+ lua_pushinteger(L, i);
+ lua_rawgeti(L, 1, i);
+ return (lua_isnil(L, -1)) ? 1 : 2;
}
static int luaB_ipairs (lua_State *L) {
- return pairsmeta(L, "__ipairs", 1, ipairsaux);
+ return pairsmeta(L, "__ipairs", 1, ipairsaux);
}
static int load_aux (lua_State *L, int status, int envidx) {
- if (status == LUA_OK) {
- if (envidx != 0) { /* 'env' parameter? */
- lua_pushvalue(L, envidx); /* environment for loaded function */
- if (!lua_setupvalue(L, -2, 1)) /* set it as 1st upvalue */
- lua_pop(L, 1); /* remove 'env' if not used by previous call */
- }
- return 1;
- }
- else { /* error (message is on top of the stack) */
- lua_pushnil(L);
- lua_insert(L, -2); /* put before error message */
- return 2; /* return nil plus error message */
- }
+ if (status == LUA_OK) {
+ if (envidx != 0) { /* 'env' parameter? */
+ lua_pushvalue(L, envidx); /* environment for loaded function */
+ if (!lua_setupvalue(L, -2, 1)) /* set it as 1st upvalue */
+ lua_pop(L, 1); /* remove 'env' if not used by previous call */
+ }
+ return 1;
+ }
+ else { /* error (message is on top of the stack) */
+ lua_pushnil(L);
+ lua_insert(L, -2); /* put before error message */
+ return 2; /* return nil plus error message */
+ }
}
static int luaB_loadfile (lua_State *L) {
- const char *fname = luaL_optstring(L, 1, NULL);
- const char *mode = luaL_optstring(L, 2, NULL);
- int env = (!lua_isnone(L, 3) ? 3 : 0); /* 'env' index or 0 if no 'env' */
- int status = luaL_loadfilex(L, fname, mode);
- return load_aux(L, status, env);
+ const char *fname = luaL_optstring(L, 1, NULL);
+ const char *mode = luaL_optstring(L, 2, NULL);
+ int env = (!lua_isnone(L, 3) ? 3 : 0); /* 'env' index or 0 if no 'env' */
+ int status = luaL_loadfilex(L, fname, mode);
+ return load_aux(L, status, env);
}
@@ -280,7 +280,7 @@ static int luaB_loadfile (lua_State *L) {
** string to avoid it being collected while parsed. 'load' has four
** optional arguments (chunk, source name, mode, and environment).
*/
-#define RESERVEDSLOT 5
+#define RESERVEDSLOT 5
/*
@@ -290,169 +290,168 @@ static int luaB_loadfile (lua_State *L) {
** reserved slot inside the stack.
*/
static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
- (void)(ud); /* not used */
- luaL_checkstack(L, 2, "too many nested functions");
- lua_pushvalue(L, 1); /* get function */
- lua_call(L, 0, 1); /* call it */
- if (lua_isnil(L, -1)) {
- lua_pop(L, 1); /* pop result */
- *size = 0;
- return NULL;
- }
- else if (!lua_isstring(L, -1))
- luaL_error(L, "reader function must return a string");
- lua_replace(L, RESERVEDSLOT); /* save string in reserved slot */
- return lua_tolstring(L, RESERVEDSLOT, size);
+ (void)(ud); /* not used */
+ luaL_checkstack(L, 2, "too many nested functions");
+ lua_pushvalue(L, 1); /* get function */
+ lua_call(L, 0, 1); /* call it */
+ if (lua_isnil(L, -1)) {
+ lua_pop(L, 1); /* pop result */
+ *size = 0;
+ return NULL;
+ }
+ else if (!lua_isstring(L, -1))
+ luaL_error(L, "reader function must return a string");
+ lua_replace(L, RESERVEDSLOT); /* save string in reserved slot */
+ return lua_tolstring(L, RESERVEDSLOT, size);
}
static int luaB_load (lua_State *L) {
- int status;
- size_t l;
- const char *s = lua_tolstring(L, 1, &l);
- const char *mode = luaL_optstring(L, 3, "bt");
- int env = (!lua_isnone(L, 4) ? 4 : 0); /* 'env' index or 0 if no 'env' */
- if (s != NULL) { /* loading a string? */
- const char *chunkname = luaL_optstring(L, 2, s);
- status = luaL_loadbufferx(L, s, l, chunkname, mode);
- }
- else { /* loading from a reader function */
- const char *chunkname = luaL_optstring(L, 2, "=(load)");
- luaL_checktype(L, 1, LUA_TFUNCTION);
- lua_settop(L, RESERVEDSLOT); /* create reserved slot */
- status = lua_load(L, generic_reader, NULL, chunkname, mode);
- }
- return load_aux(L, status, env);
+ int status;
+ size_t l;
+ const char *s = lua_tolstring(L, 1, &l);
+ const char *mode = luaL_optstring(L, 3, "bt");
+ int env = (!lua_isnone(L, 4) ? 4 : 0); /* 'env' index or 0 if no 'env' */
+ if (s != NULL) { /* loading a string? */
+ const char *chunkname = luaL_optstring(L, 2, s);
+ status = luaL_loadbufferx(L, s, l, chunkname, mode);
+ }
+ else { /* loading from a reader function */
+ const char *chunkname = luaL_optstring(L, 2, "=(load)");
+ luaL_checktype(L, 1, LUA_TFUNCTION);
+ lua_settop(L, RESERVEDSLOT); /* create reserved slot */
+ status = lua_load(L, generic_reader, NULL, chunkname, mode);
+ }
+ return load_aux(L, status, env);
}
/* }====================================================== */
static int dofilecont (lua_State *L) {
- return lua_gettop(L) - 1;
+ return lua_gettop(L) - 1;
}
static int luaB_dofile (lua_State *L) {
- const char *fname = luaL_optstring(L, 1, NULL);
- lua_settop(L, 1);
- if (luaL_loadfile(L, fname) != LUA_OK)
- return lua_error(L);
- lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
- return dofilecont(L);
+ const char *fname = luaL_optstring(L, 1, NULL);
+ lua_settop(L, 1);
+ if (luaL_loadfile(L, fname) != LUA_OK)
+ return lua_error(L);
+ lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
+ return dofilecont(L);
}
static int luaB_assert (lua_State *L) {
- if (!lua_toboolean(L, 1))
- return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
- return lua_gettop(L);
+ if (!lua_toboolean(L, 1))
+ return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
+ return lua_gettop(L);
}
static int luaB_select (lua_State *L) {
- int n = lua_gettop(L);
- if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
- lua_pushinteger(L, n-1);
- return 1;
- }
- else {
- int i = luaL_checkint(L, 1);
- if (i < 0) i = n + i;
- else if (i > n) i = n;
- luaL_argcheck(L, 1 <= i, 1, "index out of range");
- return n - i;
- }
+ int n = lua_gettop(L);
+ if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
+ lua_pushinteger(L, n-1);
+ return 1;
+ }
+ else {
+ int i = luaL_checkint(L, 1);
+ if (i < 0) i = n + i;
+ else if (i > n) i = n;
+ luaL_argcheck(L, 1 <= i, 1, "index out of range");
+ return n - i;
+ }
}
static int finishpcall (lua_State *L, int status) {
- if (!lua_checkstack(L, 1)) { /* no space for extra boolean? */
- lua_settop(L, 0); /* create space for return values */
- lua_pushboolean(L, 0);
- lua_pushstring(L, "stack overflow");
- return 2; /* return false, msg */
- }
- lua_pushboolean(L, status); /* first result (status) */
- lua_replace(L, 1); /* put first result in first slot */
- return lua_gettop(L);
+ if (!lua_checkstack(L, 1)) { /* no space for extra boolean? */
+ lua_settop(L, 0); /* create space for return values */
+ lua_pushboolean(L, 0);
+ lua_pushstring(L, "stack overflow");
+ return 2; /* return false, msg */
+ }
+ lua_pushboolean(L, status); /* first result (status) */
+ lua_replace(L, 1); /* put first result in first slot */
+ return lua_gettop(L);
}
static int pcallcont (lua_State *L) {
- int status = lua_getctx(L, NULL);
- return finishpcall(L, (status == LUA_YIELD));
+ int status = lua_getctx(L, NULL);
+ return finishpcall(L, (status == LUA_YIELD));
}
static int luaB_pcall (lua_State *L) {
- int status;
- luaL_checkany(L, 1);
- lua_pushnil(L);
- lua_insert(L, 1); /* create space for status result */
- status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont);
- return finishpcall(L, (status == LUA_OK));
+ int status;
+ luaL_checkany(L, 1);
+ lua_pushnil(L);
+ lua_insert(L, 1); /* create space for status result */
+ status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont);
+ return finishpcall(L, (status == LUA_OK));
}
static int luaB_xpcall (lua_State *L) {
- int status;
- int n = lua_gettop(L);
- luaL_argcheck(L, n >= 2, 2, "value expected");
- lua_pushvalue(L, 1); /* exchange function... */
- lua_copy(L, 2, 1); /* ...and error handler */
- lua_replace(L, 2);
- status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont);
- return finishpcall(L, (status == LUA_OK));
+ int status;
+ int n = lua_gettop(L);
+ luaL_argcheck(L, n >= 2, 2, "value expected");
+ lua_pushvalue(L, 1); /* exchange function... */
+ lua_copy(L, 2, 1); /* ...and error handler */
+ lua_replace(L, 2);
+ status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont);
+ return finishpcall(L, (status == LUA_OK));
}
static int luaB_tostring (lua_State *L) {
- luaL_checkany(L, 1);
- luaL_tolstring(L, 1, NULL);
- return 1;
+ luaL_checkany(L, 1);
+ luaL_tolstring(L, 1, NULL);
+ return 1;
}
static const luaL_Reg base_funcs[] = {
- {"assert", luaB_assert},
- {"collectgarbage", luaB_collectgarbage},
- {"dofile", luaB_dofile},
- {"error", luaB_error},
- {"getmetatable", luaB_getmetatable},
- {"ipairs", luaB_ipairs},
- {"loadfile", luaB_loadfile},
- {"load", luaB_load},
+ {"assert", luaB_assert},
+ {"collectgarbage", luaB_collectgarbage},
+ {"dofile", luaB_dofile},
+ {"error", luaB_error},
+ {"getmetatable", luaB_getmetatable},
+ {"ipairs", luaB_ipairs},
+ {"loadfile", luaB_loadfile},
+ {"load", luaB_load},
#if defined(LUA_COMPAT_LOADSTRING)
- {"loadstring", luaB_load},
+ {"loadstring", luaB_load},
#endif
- {"next", luaB_next},
- {"pairs", luaB_pairs},
- {"pcall", luaB_pcall},
- {"print", luaB_print},
- {"rawequal", luaB_rawequal},
- {"rawlen", luaB_rawlen},
- {"rawget", luaB_rawget},
- {"rawset", luaB_rawset},
- {"select", luaB_select},
- {"setmetatable", luaB_setmetatable},
- {"tonumber", luaB_tonumber},
- {"tostring", luaB_tostring},
- {"type", luaB_type},
- {"xpcall", luaB_xpcall},
- {NULL, NULL}
+ {"next", luaB_next},
+ {"pairs", luaB_pairs},
+ {"pcall", luaB_pcall},
+ {"print", luaB_print},
+ {"rawequal", luaB_rawequal},
+ {"rawlen", luaB_rawlen},
+ {"rawget", luaB_rawget},
+ {"rawset", luaB_rawset},
+ {"select", luaB_select},
+ {"setmetatable", luaB_setmetatable},
+ {"tonumber", luaB_tonumber},
+ {"tostring", luaB_tostring},
+ {"type", luaB_type},
+ {"xpcall", luaB_xpcall},
+ {NULL, NULL}
};
LUAMOD_API int luaopen_base (lua_State *L) {
- /* set global _G */
- lua_pushglobaltable(L);
- lua_pushglobaltable(L);
- lua_setfield(L, -2, "_G");
- /* open lib into global table */
- luaL_setfuncs(L, base_funcs, 0);
- lua_pushliteral(L, LUA_VERSION);
- lua_setfield(L, -2, "_VERSION"); /* set global _VERSION */
- return 1;
+ /* set global _G */
+ lua_pushglobaltable(L);
+ lua_pushglobaltable(L);
+ lua_setfield(L, -2, "_G");
+ /* open lib into global table */
+ luaL_setfuncs(L, base_funcs, 0);
+ lua_pushliteral(L, LUA_VERSION);
+ lua_setfield(L, -2, "_VERSION"); /* set global _VERSION */
+ return 1;
}
-
diff --git a/src/lib/lua/lbitlib.c b/src/lib/lua/lbitlib.c
index 31c7b66f129..e963ca6c559 100644
--- a/src/lib/lua/lbitlib.c
+++ b/src/lib/lua/lbitlib.c
@@ -15,18 +15,18 @@
/* number of bits to consider in a number */
#if !defined(LUA_NBITS)
-#define LUA_NBITS 32
+#define LUA_NBITS 32
#endif
-#define ALLONES (~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1))
+#define ALLONES (~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1))
/* macro to trim extra bits */
-#define trim(x) ((x) & ALLONES)
+#define trim(x) ((x) & ALLONES)
/* builds a number with 'n' ones (1 <= n <= LUA_NBITS) */
-#define mask(n) (~((ALLONES << 1) << ((n) - 1)))
+#define mask(n) (~((ALLONES << 1) << ((n) - 1)))
typedef lua_Unsigned b_uint;
@@ -34,115 +34,115 @@ typedef lua_Unsigned b_uint;
static b_uint andaux (lua_State *L) {
- int i, n = lua_gettop(L);
- b_uint r = ~(b_uint)0;
- for (i = 1; i <= n; i++)
- r &= luaL_checkunsigned(L, i);
- return trim(r);
+ int i, n = lua_gettop(L);
+ b_uint r = ~(b_uint)0;
+ for (i = 1; i <= n; i++)
+ r &= luaL_checkunsigned(L, i);
+ return trim(r);
}
static int b_and (lua_State *L) {
- b_uint r = andaux(L);
- lua_pushunsigned(L, r);
- return 1;
+ b_uint r = andaux(L);
+ lua_pushunsigned(L, r);
+ return 1;
}
static int b_test (lua_State *L) {
- b_uint r = andaux(L);
- lua_pushboolean(L, r != 0);
- return 1;
+ b_uint r = andaux(L);
+ lua_pushboolean(L, r != 0);
+ return 1;
}
static int b_or (lua_State *L) {
- int i, n = lua_gettop(L);
- b_uint r = 0;
- for (i = 1; i <= n; i++)
- r |= luaL_checkunsigned(L, i);
- lua_pushunsigned(L, trim(r));
- return 1;
+ int i, n = lua_gettop(L);
+ b_uint r = 0;
+ for (i = 1; i <= n; i++)
+ r |= luaL_checkunsigned(L, i);
+ lua_pushunsigned(L, trim(r));
+ return 1;
}
static int b_xor (lua_State *L) {
- int i, n = lua_gettop(L);
- b_uint r = 0;
- for (i = 1; i <= n; i++)
- r ^= luaL_checkunsigned(L, i);
- lua_pushunsigned(L, trim(r));
- return 1;
+ int i, n = lua_gettop(L);
+ b_uint r = 0;
+ for (i = 1; i <= n; i++)
+ r ^= luaL_checkunsigned(L, i);
+ lua_pushunsigned(L, trim(r));
+ return 1;
}
static int b_not (lua_State *L) {
- b_uint r = ~luaL_checkunsigned(L, 1);
- lua_pushunsigned(L, trim(r));
- return 1;
+ b_uint r = ~luaL_checkunsigned(L, 1);
+ lua_pushunsigned(L, trim(r));
+ return 1;
}
static int b_shift (lua_State *L, b_uint r, int i) {
- if (i < 0) { /* shift right? */
- i = -i;
- r = trim(r);
- if (i >= LUA_NBITS) r = 0;
- else r >>= i;
- }
- else { /* shift left */
- if (i >= LUA_NBITS) r = 0;
- else r <<= i;
- r = trim(r);
- }
- lua_pushunsigned(L, r);
- return 1;
+ if (i < 0) { /* shift right? */
+ i = -i;
+ r = trim(r);
+ if (i >= LUA_NBITS) r = 0;
+ else r >>= i;
+ }
+ else { /* shift left */
+ if (i >= LUA_NBITS) r = 0;
+ else r <<= i;
+ r = trim(r);
+ }
+ lua_pushunsigned(L, r);
+ return 1;
}
static int b_lshift (lua_State *L) {
- return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2));
+ return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2));
}
static int b_rshift (lua_State *L) {
- return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2));
+ return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2));
}
static int b_arshift (lua_State *L) {
- b_uint r = luaL_checkunsigned(L, 1);
- int i = luaL_checkint(L, 2);
- if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1))))
- return b_shift(L, r, -i);
- else { /* arithmetic shift for 'negative' number */
- if (i >= LUA_NBITS) r = ALLONES;
- else
- r = trim((r >> i) | ~(~(b_uint)0 >> i)); /* add signal bit */
- lua_pushunsigned(L, r);
- return 1;
- }
+ b_uint r = luaL_checkunsigned(L, 1);
+ int i = luaL_checkint(L, 2);
+ if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1))))
+ return b_shift(L, r, -i);
+ else { /* arithmetic shift for 'negative' number */
+ if (i >= LUA_NBITS) r = ALLONES;
+ else
+ r = trim((r >> i) | ~(~(b_uint)0 >> i)); /* add signal bit */
+ lua_pushunsigned(L, r);
+ return 1;
+ }
}
static int b_rot (lua_State *L, int i) {
- b_uint r = luaL_checkunsigned(L, 1);
- i &= (LUA_NBITS - 1); /* i = i % NBITS */
- r = trim(r);
- if (i != 0) /* avoid undefined shift of LUA_NBITS when i == 0 */
- r = (r << i) | (r >> (LUA_NBITS - i));
- lua_pushunsigned(L, trim(r));
- return 1;
+ b_uint r = luaL_checkunsigned(L, 1);
+ i &= (LUA_NBITS - 1); /* i = i % NBITS */
+ r = trim(r);
+ if (i != 0) /* avoid undefined shift of LUA_NBITS when i == 0 */
+ r = (r << i) | (r >> (LUA_NBITS - i));
+ lua_pushunsigned(L, trim(r));
+ return 1;
}
static int b_lrot (lua_State *L) {
- return b_rot(L, luaL_checkint(L, 2));
+ return b_rot(L, luaL_checkint(L, 2));
}
static int b_rrot (lua_State *L) {
- return b_rot(L, -luaL_checkint(L, 2));
+ return b_rot(L, -luaL_checkint(L, 2));
}
@@ -153,60 +153,59 @@ static int b_rrot (lua_State *L) {
** 'width' being used uninitialized.)
*/
static int fieldargs (lua_State *L, int farg, int *width) {
- int f = luaL_checkint(L, farg);
- int w = luaL_optint(L, farg + 1, 1);
- luaL_argcheck(L, 0 <= f, farg, "field cannot be negative");
- luaL_argcheck(L, 0 < w, farg + 1, "width must be positive");
- if (f + w > LUA_NBITS)
- luaL_error(L, "trying to access non-existent bits");
- *width = w;
- return f;
+ int f = luaL_checkint(L, farg);
+ int w = luaL_optint(L, farg + 1, 1);
+ luaL_argcheck(L, 0 <= f, farg, "field cannot be negative");
+ luaL_argcheck(L, 0 < w, farg + 1, "width must be positive");
+ if (f + w > LUA_NBITS)
+ luaL_error(L, "trying to access non-existent bits");
+ *width = w;
+ return f;
}
static int b_extract (lua_State *L) {
- int w;
- b_uint r = luaL_checkunsigned(L, 1);
- int f = fieldargs(L, 2, &w);
- r = (r >> f) & mask(w);
- lua_pushunsigned(L, r);
- return 1;
+ int w;
+ b_uint r = luaL_checkunsigned(L, 1);
+ int f = fieldargs(L, 2, &w);
+ r = (r >> f) & mask(w);
+ lua_pushunsigned(L, r);
+ return 1;
}
static int b_replace (lua_State *L) {
- int w;
- b_uint r = luaL_checkunsigned(L, 1);
- b_uint v = luaL_checkunsigned(L, 2);
- int f = fieldargs(L, 3, &w);
- int m = mask(w);
- v &= m; /* erase bits outside given width */
- r = (r & ~(m << f)) | (v << f);
- lua_pushunsigned(L, r);
- return 1;
+ int w;
+ b_uint r = luaL_checkunsigned(L, 1);
+ b_uint v = luaL_checkunsigned(L, 2);
+ int f = fieldargs(L, 3, &w);
+ int m = mask(w);
+ v &= m; /* erase bits outside given width */
+ r = (r & ~(m << f)) | (v << f);
+ lua_pushunsigned(L, r);
+ return 1;
}
static const luaL_Reg bitlib[] = {
- {"arshift", b_arshift},
- {"band", b_and},
- {"bnot", b_not},
- {"bor", b_or},
- {"bxor", b_xor},
- {"btest", b_test},
- {"extract", b_extract},
- {"lrotate", b_lrot},
- {"lshift", b_lshift},
- {"replace", b_replace},
- {"rrotate", b_rrot},
- {"rshift", b_rshift},
- {NULL, NULL}
+ {"arshift", b_arshift},
+ {"band", b_and},
+ {"bnot", b_not},
+ {"bor", b_or},
+ {"bxor", b_xor},
+ {"btest", b_test},
+ {"extract", b_extract},
+ {"lrotate", b_lrot},
+ {"lshift", b_lshift},
+ {"replace", b_replace},
+ {"rrotate", b_rrot},
+ {"rshift", b_rshift},
+ {NULL, NULL}
};
LUAMOD_API int luaopen_bit32 (lua_State *L) {
- luaL_newlib(L, bitlib);
- return 1;
+ luaL_newlib(L, bitlib);
+ return 1;
}
-
diff --git a/src/lib/lua/lcode.c b/src/lib/lua/lcode.c
index 820b95c0e18..f6d0fda2c70 100644
--- a/src/lib/lua/lcode.c
+++ b/src/lib/lua/lcode.c
@@ -26,64 +26,64 @@
#include "lvm.h"
-#define hasjumps(e) ((e)->t != (e)->f)
+#define hasjumps(e) ((e)->t != (e)->f)
static int isnumeral(expdesc *e) {
- return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
+ return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
}
void luaK_nil (FuncState *fs, int from, int n) {
- Instruction *previous;
- int l = from + n - 1; /* last register to set nil */
- if (fs->pc > fs->lasttarget) { /* no jumps to current position? */
- previous = &fs->f->code[fs->pc-1];
- if (GET_OPCODE(*previous) == OP_LOADNIL) {
- int pfrom = GETARG_A(*previous);
- int pl = pfrom + GETARG_B(*previous);
- if ((pfrom <= from && from <= pl + 1) ||
- (from <= pfrom && pfrom <= l + 1)) { /* can connect both? */
- if (pfrom < from) from = pfrom; /* from = min(from, pfrom) */
- if (pl > l) l = pl; /* l = max(l, pl) */
- SETARG_A(*previous, from);
- SETARG_B(*previous, l - from);
- return;
- }
- } /* else go through */
- }
- luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0); /* else no optimization */
+ Instruction *previous;
+ int l = from + n - 1; /* last register to set nil */
+ if (fs->pc > fs->lasttarget) { /* no jumps to current position? */
+ previous = &fs->f->code[fs->pc-1];
+ if (GET_OPCODE(*previous) == OP_LOADNIL) {
+ int pfrom = GETARG_A(*previous);
+ int pl = pfrom + GETARG_B(*previous);
+ if ((pfrom <= from && from <= pl + 1) ||
+ (from <= pfrom && pfrom <= l + 1)) { /* can connect both? */
+ if (pfrom < from) from = pfrom; /* from = min(from, pfrom) */
+ if (pl > l) l = pl; /* l = max(l, pl) */
+ SETARG_A(*previous, from);
+ SETARG_B(*previous, l - from);
+ return;
+ }
+ } /* else go through */
+ }
+ luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0); /* else no optimization */
}
int luaK_jump (FuncState *fs) {
- int jpc = fs->jpc; /* save list of jumps to here */
- int j;
- fs->jpc = NO_JUMP;
- j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
- luaK_concat(fs, &j, jpc); /* keep them on hold */
- return j;
+ int jpc = fs->jpc; /* save list of jumps to here */
+ int j;
+ fs->jpc = NO_JUMP;
+ j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
+ luaK_concat(fs, &j, jpc); /* keep them on hold */
+ return j;
}
void luaK_ret (FuncState *fs, int first, int nret) {
- luaK_codeABC(fs, OP_RETURN, first, nret+1, 0);
+ luaK_codeABC(fs, OP_RETURN, first, nret+1, 0);
}
static int condjump (FuncState *fs, OpCode op, int A, int B, int C) {
- luaK_codeABC(fs, op, A, B, C);
- return luaK_jump(fs);
+ luaK_codeABC(fs, op, A, B, C);
+ return luaK_jump(fs);
}
static void fixjump (FuncState *fs, int pc, int dest) {
- Instruction *jmp = &fs->f->code[pc];
- int offset = dest-(pc+1);
- lua_assert(dest != NO_JUMP);
- if (abs(offset) > MAXARG_sBx)
- luaX_syntaxerror(fs->ls, "control structure too long");
- SETARG_sBx(*jmp, offset);
+ Instruction *jmp = &fs->f->code[pc];
+ int offset = dest-(pc+1);
+ lua_assert(dest != NO_JUMP);
+ if (abs(offset) > MAXARG_sBx)
+ luaX_syntaxerror(fs->ls, "control structure too long");
+ SETARG_sBx(*jmp, offset);
}
@@ -92,26 +92,26 @@ static void fixjump (FuncState *fs, int pc, int dest) {
** optimizations with consecutive instructions not in the same basic block).
*/
int luaK_getlabel (FuncState *fs) {
- fs->lasttarget = fs->pc;
- return fs->pc;
+ fs->lasttarget = fs->pc;
+ return fs->pc;
}
static int getjump (FuncState *fs, int pc) {
- int offset = GETARG_sBx(fs->f->code[pc]);
- if (offset == NO_JUMP) /* point to itself represents end of list */
- return NO_JUMP; /* end of list */
- else
- return (pc+1)+offset; /* turn offset into absolute position */
+ int offset = GETARG_sBx(fs->f->code[pc]);
+ if (offset == NO_JUMP) /* point to itself represents end of list */
+ return NO_JUMP; /* end of list */
+ else
+ return (pc+1)+offset; /* turn offset into absolute position */
}
static Instruction *getjumpcontrol (FuncState *fs, int pc) {
- Instruction *pi = &fs->f->code[pc];
- if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1))))
- return pi-1;
- else
- return pi;
+ Instruction *pi = &fs->f->code[pc];
+ if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1))))
+ return pi-1;
+ else
+ return pi;
}
@@ -120,762 +120,761 @@ static Instruction *getjumpcontrol (FuncState *fs, int pc) {
** (or produce an inverted value)
*/
static int need_value (FuncState *fs, int list) {
- for (; list != NO_JUMP; list = getjump(fs, list)) {
- Instruction i = *getjumpcontrol(fs, list);
- if (GET_OPCODE(i) != OP_TESTSET) return 1;
- }
- return 0; /* not found */
+ for (; list != NO_JUMP; list = getjump(fs, list)) {
+ Instruction i = *getjumpcontrol(fs, list);
+ if (GET_OPCODE(i) != OP_TESTSET) return 1;
+ }
+ return 0; /* not found */
}
static int patchtestreg (FuncState *fs, int node, int reg) {
- Instruction *i = getjumpcontrol(fs, node);
- if (GET_OPCODE(*i) != OP_TESTSET)
- return 0; /* cannot patch other instructions */
- if (reg != NO_REG && reg != GETARG_B(*i))
- SETARG_A(*i, reg);
- else /* no register to put value or register already has the value */
- *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i));
+ Instruction *i = getjumpcontrol(fs, node);
+ if (GET_OPCODE(*i) != OP_TESTSET)
+ return 0; /* cannot patch other instructions */
+ if (reg != NO_REG && reg != GETARG_B(*i))
+ SETARG_A(*i, reg);
+ else /* no register to put value or register already has the value */
+ *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i));
- return 1;
+ return 1;
}
static void removevalues (FuncState *fs, int list) {
- for (; list != NO_JUMP; list = getjump(fs, list))
- patchtestreg(fs, list, NO_REG);
+ for (; list != NO_JUMP; list = getjump(fs, list))
+ patchtestreg(fs, list, NO_REG);
}
static void patchlistaux (FuncState *fs, int list, int vtarget, int reg,
- int dtarget) {
- while (list != NO_JUMP) {
- int next = getjump(fs, list);
- if (patchtestreg(fs, list, reg))
- fixjump(fs, list, vtarget);
- else
- fixjump(fs, list, dtarget); /* jump to default target */
- list = next;
- }
+ int dtarget) {
+ while (list != NO_JUMP) {
+ int next = getjump(fs, list);
+ if (patchtestreg(fs, list, reg))
+ fixjump(fs, list, vtarget);
+ else
+ fixjump(fs, list, dtarget); /* jump to default target */
+ list = next;
+ }
}
static void dischargejpc (FuncState *fs) {
- patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc);
- fs->jpc = NO_JUMP;
+ patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc);
+ fs->jpc = NO_JUMP;
}
void luaK_patchlist (FuncState *fs, int list, int target) {
- if (target == fs->pc)
- luaK_patchtohere(fs, list);
- else {
- lua_assert(target < fs->pc);
- patchlistaux(fs, list, target, NO_REG, target);
- }
+ if (target == fs->pc)
+ luaK_patchtohere(fs, list);
+ else {
+ lua_assert(target < fs->pc);
+ patchlistaux(fs, list, target, NO_REG, target);
+ }
}
LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level) {
- level++; /* argument is +1 to reserve 0 as non-op */
- while (list != NO_JUMP) {
- int next = getjump(fs, list);
- lua_assert(GET_OPCODE(fs->f->code[list]) == OP_JMP &&
- (GETARG_A(fs->f->code[list]) == 0 ||
- GETARG_A(fs->f->code[list]) >= level));
- SETARG_A(fs->f->code[list], level);
- list = next;
- }
+ level++; /* argument is +1 to reserve 0 as non-op */
+ while (list != NO_JUMP) {
+ int next = getjump(fs, list);
+ lua_assert(GET_OPCODE(fs->f->code[list]) == OP_JMP &&
+ (GETARG_A(fs->f->code[list]) == 0 ||
+ GETARG_A(fs->f->code[list]) >= level));
+ SETARG_A(fs->f->code[list], level);
+ list = next;
+ }
}
void luaK_patchtohere (FuncState *fs, int list) {
- luaK_getlabel(fs);
- luaK_concat(fs, &fs->jpc, list);
+ luaK_getlabel(fs);
+ luaK_concat(fs, &fs->jpc, list);
}
void luaK_concat (FuncState *fs, int *l1, int l2) {
- if (l2 == NO_JUMP) return;
- else if (*l1 == NO_JUMP)
- *l1 = l2;
- else {
- int list = *l1;
- int next;
- while ((next = getjump(fs, list)) != NO_JUMP) /* find last element */
- list = next;
- fixjump(fs, list, l2);
- }
+ if (l2 == NO_JUMP) return;
+ else if (*l1 == NO_JUMP)
+ *l1 = l2;
+ else {
+ int list = *l1;
+ int next;
+ while ((next = getjump(fs, list)) != NO_JUMP) /* find last element */
+ list = next;
+ fixjump(fs, list, l2);
+ }
}
static int luaK_code (FuncState *fs, Instruction i) {
- Proto *f = fs->f;
- dischargejpc(fs); /* `pc' will change */
- /* put new instruction in code array */
- luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction,
- MAX_INT, "opcodes");
- f->code[fs->pc] = i;
- /* save corresponding line information */
- luaM_growvector(fs->ls->L, f->lineinfo, fs->pc, f->sizelineinfo, int,
- MAX_INT, "opcodes");
- f->lineinfo[fs->pc] = fs->ls->lastline;
- return fs->pc++;
+ Proto *f = fs->f;
+ dischargejpc(fs); /* `pc' will change */
+ /* put new instruction in code array */
+ luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction,
+ MAX_INT, "opcodes");
+ f->code[fs->pc] = i;
+ /* save corresponding line information */
+ luaM_growvector(fs->ls->L, f->lineinfo, fs->pc, f->sizelineinfo, int,
+ MAX_INT, "opcodes");
+ f->lineinfo[fs->pc] = fs->ls->lastline;
+ return fs->pc++;
}
int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) {
- lua_assert(getOpMode(o) == iABC);
- lua_assert(getBMode(o) != OpArgN || b == 0);
- lua_assert(getCMode(o) != OpArgN || c == 0);
- lua_assert(a <= MAXARG_A && b <= MAXARG_B && c <= MAXARG_C);
- return luaK_code(fs, CREATE_ABC(o, a, b, c));
+ lua_assert(getOpMode(o) == iABC);
+ lua_assert(getBMode(o) != OpArgN || b == 0);
+ lua_assert(getCMode(o) != OpArgN || c == 0);
+ lua_assert(a <= MAXARG_A && b <= MAXARG_B && c <= MAXARG_C);
+ return luaK_code(fs, CREATE_ABC(o, a, b, c));
}
int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
- lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
- lua_assert(getCMode(o) == OpArgN);
- lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
- return luaK_code(fs, CREATE_ABx(o, a, bc));
+ lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
+ lua_assert(getCMode(o) == OpArgN);
+ lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
+ return luaK_code(fs, CREATE_ABx(o, a, bc));
}
static int codeextraarg (FuncState *fs, int a) {
- lua_assert(a <= MAXARG_Ax);
- return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
+ lua_assert(a <= MAXARG_Ax);
+ return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
}
int luaK_codek (FuncState *fs, int reg, int k) {
- if (k <= MAXARG_Bx)
- return luaK_codeABx(fs, OP_LOADK, reg, k);
- else {
- int p = luaK_codeABx(fs, OP_LOADKX, reg, 0);
- codeextraarg(fs, k);
- return p;
- }
+ if (k <= MAXARG_Bx)
+ return luaK_codeABx(fs, OP_LOADK, reg, k);
+ else {
+ int p = luaK_codeABx(fs, OP_LOADKX, reg, 0);
+ codeextraarg(fs, k);
+ return p;
+ }
}
void luaK_checkstack (FuncState *fs, int n) {
- int newstack = fs->freereg + n;
- if (newstack > fs->f->maxstacksize) {
- if (newstack >= MAXSTACK)
- luaX_syntaxerror(fs->ls, "function or expression too complex");
- fs->f->maxstacksize = cast_byte(newstack);
- }
+ int newstack = fs->freereg + n;
+ if (newstack > fs->f->maxstacksize) {
+ if (newstack >= MAXSTACK)
+ luaX_syntaxerror(fs->ls, "function or expression too complex");
+ fs->f->maxstacksize = cast_byte(newstack);
+ }
}
void luaK_reserveregs (FuncState *fs, int n) {
- luaK_checkstack(fs, n);
- fs->freereg += n;
+ luaK_checkstack(fs, n);
+ fs->freereg += n;
}
static void freereg (FuncState *fs, int reg) {
- if (!ISK(reg) && reg >= fs->nactvar) {
- fs->freereg--;
- lua_assert(reg == fs->freereg);
- }
+ if (!ISK(reg) && reg >= fs->nactvar) {
+ fs->freereg--;
+ lua_assert(reg == fs->freereg);
+ }
}
static void freeexp (FuncState *fs, expdesc *e) {
- if (e->k == VNONRELOC)
- freereg(fs, e->u.info);
+ if (e->k == VNONRELOC)
+ freereg(fs, e->u.info);
}
static int addk (FuncState *fs, TValue *key, TValue *v) {
- lua_State *L = fs->ls->L;
- TValue *idx = luaH_set(L, fs->h, key);
- Proto *f = fs->f;
- int k, oldsize;
- if (ttisnumber(idx)) {
- lua_Number n = nvalue(idx);
- lua_number2int(k, n);
- if (luaV_rawequalobj(&f->k[k], v))
- return k;
- /* else may be a collision (e.g., between 0.0 and "\0\0\0\0\0\0\0\0");
- go through and create a new entry for this value */
- }
- /* constant not found; create a new entry */
- oldsize = f->sizek;
- k = fs->nk;
- /* numerical value does not need GC barrier;
- table has no metatable, so it does not need to invalidate cache */
- setnvalue(idx, cast_num(k));
- luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants");
- while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
- setobj(L, &f->k[k], v);
- fs->nk++;
- luaC_barrier(L, f, v);
- return k;
+ lua_State *L = fs->ls->L;
+ TValue *idx = luaH_set(L, fs->h, key);
+ Proto *f = fs->f;
+ int k, oldsize;
+ if (ttisnumber(idx)) {
+ lua_Number n = nvalue(idx);
+ lua_number2int(k, n);
+ if (luaV_rawequalobj(&f->k[k], v))
+ return k;
+ /* else may be a collision (e.g., between 0.0 and "\0\0\0\0\0\0\0\0");
+ go through and create a new entry for this value */
+ }
+ /* constant not found; create a new entry */
+ oldsize = f->sizek;
+ k = fs->nk;
+ /* numerical value does not need GC barrier;
+ table has no metatable, so it does not need to invalidate cache */
+ setnvalue(idx, cast_num(k));
+ luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants");
+ while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
+ setobj(L, &f->k[k], v);
+ fs->nk++;
+ luaC_barrier(L, f, v);
+ return k;
}
int luaK_stringK (FuncState *fs, TString *s) {
- TValue o;
- setsvalue(fs->ls->L, &o, s);
- return addk(fs, &o, &o);
+ TValue o;
+ setsvalue(fs->ls->L, &o, s);
+ return addk(fs, &o, &o);
}
int luaK_numberK (FuncState *fs, lua_Number r) {
- int n;
- lua_State *L = fs->ls->L;
- TValue o;
- setnvalue(&o, r);
- if (r == 0 || luai_numisnan(NULL, r)) { /* handle -0 and NaN */
- /* use raw representation as key to avoid numeric problems */
- setsvalue(L, L->top++, luaS_newlstr(L, (char *)&r, sizeof(r)));
- n = addk(fs, L->top - 1, &o);
- L->top--;
- }
- else
- n = addk(fs, &o, &o); /* regular case */
- return n;
+ int n;
+ lua_State *L = fs->ls->L;
+ TValue o;
+ setnvalue(&o, r);
+ if (r == 0 || luai_numisnan(NULL, r)) { /* handle -0 and NaN */
+ /* use raw representation as key to avoid numeric problems */
+ setsvalue(L, L->top++, luaS_newlstr(L, (char *)&r, sizeof(r)));
+ n = addk(fs, L->top - 1, &o);
+ L->top--;
+ }
+ else
+ n = addk(fs, &o, &o); /* regular case */
+ return n;
}
static int boolK (FuncState *fs, int b) {
- TValue o;
- setbvalue(&o, b);
- return addk(fs, &o, &o);
+ TValue o;
+ setbvalue(&o, b);
+ return addk(fs, &o, &o);
}
static int nilK (FuncState *fs) {
- TValue k, v;
- setnilvalue(&v);
- /* cannot use nil as key; instead use table itself to represent nil */
- sethvalue(fs->ls->L, &k, fs->h);
- return addk(fs, &k, &v);
+ TValue k, v;
+ setnilvalue(&v);
+ /* cannot use nil as key; instead use table itself to represent nil */
+ sethvalue(fs->ls->L, &k, fs->h);
+ return addk(fs, &k, &v);
}
void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) {
- if (e->k == VCALL) { /* expression is an open function call? */
- SETARG_C(getcode(fs, e), nresults+1);
- }
- else if (e->k == VVARARG) {
- SETARG_B(getcode(fs, e), nresults+1);
- SETARG_A(getcode(fs, e), fs->freereg);
- luaK_reserveregs(fs, 1);
- }
+ if (e->k == VCALL) { /* expression is an open function call? */
+ SETARG_C(getcode(fs, e), nresults+1);
+ }
+ else if (e->k == VVARARG) {
+ SETARG_B(getcode(fs, e), nresults+1);
+ SETARG_A(getcode(fs, e), fs->freereg);
+ luaK_reserveregs(fs, 1);
+ }
}
void luaK_setoneret (FuncState *fs, expdesc *e) {
- if (e->k == VCALL) { /* expression is an open function call? */
- e->k = VNONRELOC;
- e->u.info = GETARG_A(getcode(fs, e));
- }
- else if (e->k == VVARARG) {
- SETARG_B(getcode(fs, e), 2);
- e->k = VRELOCABLE; /* can relocate its simple result */
- }
+ if (e->k == VCALL) { /* expression is an open function call? */
+ e->k = VNONRELOC;
+ e->u.info = GETARG_A(getcode(fs, e));
+ }
+ else if (e->k == VVARARG) {
+ SETARG_B(getcode(fs, e), 2);
+ e->k = VRELOCABLE; /* can relocate its simple result */
+ }
}
void luaK_dischargevars (FuncState *fs, expdesc *e) {
- switch (e->k) {
- case VLOCAL: {
- e->k = VNONRELOC;
- break;
- }
- case VUPVAL: {
- e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0);
- e->k = VRELOCABLE;
- break;
- }
- case VINDEXED: {
- OpCode op = OP_GETTABUP; /* assume 't' is in an upvalue */
- freereg(fs, e->u.ind.idx);
- if (e->u.ind.vt == VLOCAL) { /* 't' is in a register? */
- freereg(fs, e->u.ind.t);
- op = OP_GETTABLE;
- }
- e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx);
- e->k = VRELOCABLE;
- break;
- }
- case VVARARG:
- case VCALL: {
- luaK_setoneret(fs, e);
- break;
- }
- default: break; /* there is one value available (somewhere) */
- }
+ switch (e->k) {
+ case VLOCAL: {
+ e->k = VNONRELOC;
+ break;
+ }
+ case VUPVAL: {
+ e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0);
+ e->k = VRELOCABLE;
+ break;
+ }
+ case VINDEXED: {
+ OpCode op = OP_GETTABUP; /* assume 't' is in an upvalue */
+ freereg(fs, e->u.ind.idx);
+ if (e->u.ind.vt == VLOCAL) { /* 't' is in a register? */
+ freereg(fs, e->u.ind.t);
+ op = OP_GETTABLE;
+ }
+ e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx);
+ e->k = VRELOCABLE;
+ break;
+ }
+ case VVARARG:
+ case VCALL: {
+ luaK_setoneret(fs, e);
+ break;
+ }
+ default: break; /* there is one value available (somewhere) */
+ }
}
static int code_label (FuncState *fs, int A, int b, int jump) {
- luaK_getlabel(fs); /* those instructions may be jump targets */
- return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
+ luaK_getlabel(fs); /* those instructions may be jump targets */
+ return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
}
static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
- luaK_dischargevars(fs, e);
- switch (e->k) {
- case VNIL: {
- luaK_nil(fs, reg, 1);
- break;
- }
- case VFALSE: case VTRUE: {
- luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
- break;
- }
- case VK: {
- luaK_codek(fs, reg, e->u.info);
- break;
- }
- case VKNUM: {
- luaK_codek(fs, reg, luaK_numberK(fs, e->u.nval));
- break;
- }
- case VRELOCABLE: {
- Instruction *pc = &getcode(fs, e);
- SETARG_A(*pc, reg);
- break;
- }
- case VNONRELOC: {
- if (reg != e->u.info)
- luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0);
- break;
- }
- default: {
- lua_assert(e->k == VVOID || e->k == VJMP);
- return; /* nothing to do... */
- }
- }
- e->u.info = reg;
- e->k = VNONRELOC;
+ luaK_dischargevars(fs, e);
+ switch (e->k) {
+ case VNIL: {
+ luaK_nil(fs, reg, 1);
+ break;
+ }
+ case VFALSE: case VTRUE: {
+ luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
+ break;
+ }
+ case VK: {
+ luaK_codek(fs, reg, e->u.info);
+ break;
+ }
+ case VKNUM: {
+ luaK_codek(fs, reg, luaK_numberK(fs, e->u.nval));
+ break;
+ }
+ case VRELOCABLE: {
+ Instruction *pc = &getcode(fs, e);
+ SETARG_A(*pc, reg);
+ break;
+ }
+ case VNONRELOC: {
+ if (reg != e->u.info)
+ luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0);
+ break;
+ }
+ default: {
+ lua_assert(e->k == VVOID || e->k == VJMP);
+ return; /* nothing to do... */
+ }
+ }
+ e->u.info = reg;
+ e->k = VNONRELOC;
}
static void discharge2anyreg (FuncState *fs, expdesc *e) {
- if (e->k != VNONRELOC) {
- luaK_reserveregs(fs, 1);
- discharge2reg(fs, e, fs->freereg-1);
- }
+ if (e->k != VNONRELOC) {
+ luaK_reserveregs(fs, 1);
+ discharge2reg(fs, e, fs->freereg-1);
+ }
}
static void exp2reg (FuncState *fs, expdesc *e, int reg) {
- discharge2reg(fs, e, reg);
- if (e->k == VJMP)
- luaK_concat(fs, &e->t, e->u.info); /* put this jump in `t' list */
- if (hasjumps(e)) {
- int final; /* position after whole expression */
- int p_f = NO_JUMP; /* position of an eventual LOAD false */
- int p_t = NO_JUMP; /* position of an eventual LOAD true */
- if (need_value(fs, e->t) || need_value(fs, e->f)) {
- int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
- p_f = code_label(fs, reg, 0, 1);
- p_t = code_label(fs, reg, 1, 0);
- luaK_patchtohere(fs, fj);
- }
- final = luaK_getlabel(fs);
- patchlistaux(fs, e->f, final, reg, p_f);
- patchlistaux(fs, e->t, final, reg, p_t);
- }
- e->f = e->t = NO_JUMP;
- e->u.info = reg;
- e->k = VNONRELOC;
+ discharge2reg(fs, e, reg);
+ if (e->k == VJMP)
+ luaK_concat(fs, &e->t, e->u.info); /* put this jump in `t' list */
+ if (hasjumps(e)) {
+ int final; /* position after whole expression */
+ int p_f = NO_JUMP; /* position of an eventual LOAD false */
+ int p_t = NO_JUMP; /* position of an eventual LOAD true */
+ if (need_value(fs, e->t) || need_value(fs, e->f)) {
+ int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
+ p_f = code_label(fs, reg, 0, 1);
+ p_t = code_label(fs, reg, 1, 0);
+ luaK_patchtohere(fs, fj);
+ }
+ final = luaK_getlabel(fs);
+ patchlistaux(fs, e->f, final, reg, p_f);
+ patchlistaux(fs, e->t, final, reg, p_t);
+ }
+ e->f = e->t = NO_JUMP;
+ e->u.info = reg;
+ e->k = VNONRELOC;
}
void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
- luaK_dischargevars(fs, e);
- freeexp(fs, e);
- luaK_reserveregs(fs, 1);
- exp2reg(fs, e, fs->freereg - 1);
+ luaK_dischargevars(fs, e);
+ freeexp(fs, e);
+ luaK_reserveregs(fs, 1);
+ exp2reg(fs, e, fs->freereg - 1);
}
int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
- luaK_dischargevars(fs, e);
- if (e->k == VNONRELOC) {
- if (!hasjumps(e)) return e->u.info; /* exp is already in a register */
- if (e->u.info >= fs->nactvar) { /* reg. is not a local? */
- exp2reg(fs, e, e->u.info); /* put value on it */
- return e->u.info;
- }
- }
- luaK_exp2nextreg(fs, e); /* default */
- return e->u.info;
+ luaK_dischargevars(fs, e);
+ if (e->k == VNONRELOC) {
+ if (!hasjumps(e)) return e->u.info; /* exp is already in a register */
+ if (e->u.info >= fs->nactvar) { /* reg. is not a local? */
+ exp2reg(fs, e, e->u.info); /* put value on it */
+ return e->u.info;
+ }
+ }
+ luaK_exp2nextreg(fs, e); /* default */
+ return e->u.info;
}
void luaK_exp2anyregup (FuncState *fs, expdesc *e) {
- if (e->k != VUPVAL || hasjumps(e))
- luaK_exp2anyreg(fs, e);
+ if (e->k != VUPVAL || hasjumps(e))
+ luaK_exp2anyreg(fs, e);
}
void luaK_exp2val (FuncState *fs, expdesc *e) {
- if (hasjumps(e))
- luaK_exp2anyreg(fs, e);
- else
- luaK_dischargevars(fs, e);
+ if (hasjumps(e))
+ luaK_exp2anyreg(fs, e);
+ else
+ luaK_dischargevars(fs, e);
}
int luaK_exp2RK (FuncState *fs, expdesc *e) {
- luaK_exp2val(fs, e);
- switch (e->k) {
- case VTRUE:
- case VFALSE:
- case VNIL: {
- if (fs->nk <= MAXINDEXRK) { /* constant fits in RK operand? */
- e->u.info = (e->k == VNIL) ? nilK(fs) : boolK(fs, (e->k == VTRUE));
- e->k = VK;
- return RKASK(e->u.info);
- }
- else break;
- }
- case VKNUM: {
- e->u.info = luaK_numberK(fs, e->u.nval);
- e->k = VK;
- /* go through */
- }
- case VK: {
- if (e->u.info <= MAXINDEXRK) /* constant fits in argC? */
- return RKASK(e->u.info);
- else break;
- }
- default: break;
- }
- /* not a constant in the right range: put it in a register */
- return luaK_exp2anyreg(fs, e);
+ luaK_exp2val(fs, e);
+ switch (e->k) {
+ case VTRUE:
+ case VFALSE:
+ case VNIL: {
+ if (fs->nk <= MAXINDEXRK) { /* constant fits in RK operand? */
+ e->u.info = (e->k == VNIL) ? nilK(fs) : boolK(fs, (e->k == VTRUE));
+ e->k = VK;
+ return RKASK(e->u.info);
+ }
+ else break;
+ }
+ case VKNUM: {
+ e->u.info = luaK_numberK(fs, e->u.nval);
+ e->k = VK;
+ /* go through */
+ }
+ case VK: {
+ if (e->u.info <= MAXINDEXRK) /* constant fits in argC? */
+ return RKASK(e->u.info);
+ else break;
+ }
+ default: break;
+ }
+ /* not a constant in the right range: put it in a register */
+ return luaK_exp2anyreg(fs, e);
}
void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) {
- switch (var->k) {
- case VLOCAL: {
- freeexp(fs, ex);
- exp2reg(fs, ex, var->u.info);
- return;
- }
- case VUPVAL: {
- int e = luaK_exp2anyreg(fs, ex);
- luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0);
- break;
- }
- case VINDEXED: {
- OpCode op = (var->u.ind.vt == VLOCAL) ? OP_SETTABLE : OP_SETTABUP;
- int e = luaK_exp2RK(fs, ex);
- luaK_codeABC(fs, op, var->u.ind.t, var->u.ind.idx, e);
- break;
- }
- default: {
- lua_assert(0); /* invalid var kind to store */
- break;
- }
- }
- freeexp(fs, ex);
+ switch (var->k) {
+ case VLOCAL: {
+ freeexp(fs, ex);
+ exp2reg(fs, ex, var->u.info);
+ return;
+ }
+ case VUPVAL: {
+ int e = luaK_exp2anyreg(fs, ex);
+ luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0);
+ break;
+ }
+ case VINDEXED: {
+ OpCode op = (var->u.ind.vt == VLOCAL) ? OP_SETTABLE : OP_SETTABUP;
+ int e = luaK_exp2RK(fs, ex);
+ luaK_codeABC(fs, op, var->u.ind.t, var->u.ind.idx, e);
+ break;
+ }
+ default: {
+ lua_assert(0); /* invalid var kind to store */
+ break;
+ }
+ }
+ freeexp(fs, ex);
}
void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
- int ereg;
- luaK_exp2anyreg(fs, e);
- ereg = e->u.info; /* register where 'e' was placed */
- freeexp(fs, e);
- e->u.info = fs->freereg; /* base register for op_self */
- e->k = VNONRELOC;
- luaK_reserveregs(fs, 2); /* function and 'self' produced by op_self */
- luaK_codeABC(fs, OP_SELF, e->u.info, ereg, luaK_exp2RK(fs, key));
- freeexp(fs, key);
+ int ereg;
+ luaK_exp2anyreg(fs, e);
+ ereg = e->u.info; /* register where 'e' was placed */
+ freeexp(fs, e);
+ e->u.info = fs->freereg; /* base register for op_self */
+ e->k = VNONRELOC;
+ luaK_reserveregs(fs, 2); /* function and 'self' produced by op_self */
+ luaK_codeABC(fs, OP_SELF, e->u.info, ereg, luaK_exp2RK(fs, key));
+ freeexp(fs, key);
}
static void invertjump (FuncState *fs, expdesc *e) {
- Instruction *pc = getjumpcontrol(fs, e->u.info);
- lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
- GET_OPCODE(*pc) != OP_TEST);
- SETARG_A(*pc, !(GETARG_A(*pc)));
+ Instruction *pc = getjumpcontrol(fs, e->u.info);
+ lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
+ GET_OPCODE(*pc) != OP_TEST);
+ SETARG_A(*pc, !(GETARG_A(*pc)));
}
static int jumponcond (FuncState *fs, expdesc *e, int cond) {
- if (e->k == VRELOCABLE) {
- Instruction ie = getcode(fs, e);
- if (GET_OPCODE(ie) == OP_NOT) {
- fs->pc--; /* remove previous OP_NOT */
- return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond);
- }
- /* else go through */
- }
- discharge2anyreg(fs, e);
- freeexp(fs, e);
- return condjump(fs, OP_TESTSET, NO_REG, e->u.info, cond);
+ if (e->k == VRELOCABLE) {
+ Instruction ie = getcode(fs, e);
+ if (GET_OPCODE(ie) == OP_NOT) {
+ fs->pc--; /* remove previous OP_NOT */
+ return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond);
+ }
+ /* else go through */
+ }
+ discharge2anyreg(fs, e);
+ freeexp(fs, e);
+ return condjump(fs, OP_TESTSET, NO_REG, e->u.info, cond);
}
void luaK_goiftrue (FuncState *fs, expdesc *e) {
- int pc; /* pc of last jump */
- luaK_dischargevars(fs, e);
- switch (e->k) {
- case VJMP: {
- invertjump(fs, e);
- pc = e->u.info;
- break;
- }
- case VK: case VKNUM: case VTRUE: {
- pc = NO_JUMP; /* always true; do nothing */
- break;
- }
- default: {
- pc = jumponcond(fs, e, 0);
- break;
- }
- }
- luaK_concat(fs, &e->f, pc); /* insert last jump in `f' list */
- luaK_patchtohere(fs, e->t);
- e->t = NO_JUMP;
+ int pc; /* pc of last jump */
+ luaK_dischargevars(fs, e);
+ switch (e->k) {
+ case VJMP: {
+ invertjump(fs, e);
+ pc = e->u.info;
+ break;
+ }
+ case VK: case VKNUM: case VTRUE: {
+ pc = NO_JUMP; /* always true; do nothing */
+ break;
+ }
+ default: {
+ pc = jumponcond(fs, e, 0);
+ break;
+ }
+ }
+ luaK_concat(fs, &e->f, pc); /* insert last jump in `f' list */
+ luaK_patchtohere(fs, e->t);
+ e->t = NO_JUMP;
}
void luaK_goiffalse (FuncState *fs, expdesc *e) {
- int pc; /* pc of last jump */
- luaK_dischargevars(fs, e);
- switch (e->k) {
- case VJMP: {
- pc = e->u.info;
- break;
- }
- case VNIL: case VFALSE: {
- pc = NO_JUMP; /* always false; do nothing */
- break;
- }
- default: {
- pc = jumponcond(fs, e, 1);
- break;
- }
- }
- luaK_concat(fs, &e->t, pc); /* insert last jump in `t' list */
- luaK_patchtohere(fs, e->f);
- e->f = NO_JUMP;
+ int pc; /* pc of last jump */
+ luaK_dischargevars(fs, e);
+ switch (e->k) {
+ case VJMP: {
+ pc = e->u.info;
+ break;
+ }
+ case VNIL: case VFALSE: {
+ pc = NO_JUMP; /* always false; do nothing */
+ break;
+ }
+ default: {
+ pc = jumponcond(fs, e, 1);
+ break;
+ }
+ }
+ luaK_concat(fs, &e->t, pc); /* insert last jump in `t' list */
+ luaK_patchtohere(fs, e->f);
+ e->f = NO_JUMP;
}
static void codenot (FuncState *fs, expdesc *e) {
- luaK_dischargevars(fs, e);
- switch (e->k) {
- case VNIL: case VFALSE: {
- e->k = VTRUE;
- break;
- }
- case VK: case VKNUM: case VTRUE: {
- e->k = VFALSE;
- break;
- }
- case VJMP: {
- invertjump(fs, e);
- break;
- }
- case VRELOCABLE:
- case VNONRELOC: {
- discharge2anyreg(fs, e);
- freeexp(fs, e);
- e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0);
- e->k = VRELOCABLE;
- break;
- }
- default: {
- lua_assert(0); /* cannot happen */
- break;
- }
- }
- /* interchange true and false lists */
- { int temp = e->f; e->f = e->t; e->t = temp; }
- removevalues(fs, e->f);
- removevalues(fs, e->t);
+ luaK_dischargevars(fs, e);
+ switch (e->k) {
+ case VNIL: case VFALSE: {
+ e->k = VTRUE;
+ break;
+ }
+ case VK: case VKNUM: case VTRUE: {
+ e->k = VFALSE;
+ break;
+ }
+ case VJMP: {
+ invertjump(fs, e);
+ break;
+ }
+ case VRELOCABLE:
+ case VNONRELOC: {
+ discharge2anyreg(fs, e);
+ freeexp(fs, e);
+ e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0);
+ e->k = VRELOCABLE;
+ break;
+ }
+ default: {
+ lua_assert(0); /* cannot happen */
+ break;
+ }
+ }
+ /* interchange true and false lists */
+ { int temp = e->f; e->f = e->t; e->t = temp; }
+ removevalues(fs, e->f);
+ removevalues(fs, e->t);
}
void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
- lua_assert(!hasjumps(t));
- t->u.ind.t = t->u.info;
- t->u.ind.idx = luaK_exp2RK(fs, k);
- t->u.ind.vt = (t->k == VUPVAL) ? VUPVAL
- : check_exp(vkisinreg(t->k), VLOCAL);
- t->k = VINDEXED;
+ lua_assert(!hasjumps(t));
+ t->u.ind.t = t->u.info;
+ t->u.ind.idx = luaK_exp2RK(fs, k);
+ t->u.ind.vt = (t->k == VUPVAL) ? VUPVAL
+ : check_exp(vkisinreg(t->k), VLOCAL);
+ t->k = VINDEXED;
}
static int constfolding (OpCode op, expdesc *e1, expdesc *e2) {
- lua_Number r;
- if (!isnumeral(e1) || !isnumeral(e2)) return 0;
- if ((op == OP_DIV || op == OP_MOD) && e2->u.nval == 0)
- return 0; /* do not attempt to divide by 0 */
- r = luaO_arith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval);
- e1->u.nval = r;
- return 1;
+ lua_Number r;
+ if (!isnumeral(e1) || !isnumeral(e2)) return 0;
+ if ((op == OP_DIV || op == OP_MOD) && e2->u.nval == 0)
+ return 0; /* do not attempt to divide by 0 */
+ r = luaO_arith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval);
+ e1->u.nval = r;
+ return 1;
}
static void codearith (FuncState *fs, OpCode op,
- expdesc *e1, expdesc *e2, int line) {
- if (constfolding(op, e1, e2))
- return;
- else {
- int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0;
- int o1 = luaK_exp2RK(fs, e1);
- if (o1 > o2) {
- freeexp(fs, e1);
- freeexp(fs, e2);
- }
- else {
- freeexp(fs, e2);
- freeexp(fs, e1);
- }
- e1->u.info = luaK_codeABC(fs, op, 0, o1, o2);
- e1->k = VRELOCABLE;
- luaK_fixline(fs, line);
- }
+ expdesc *e1, expdesc *e2, int line) {
+ if (constfolding(op, e1, e2))
+ return;
+ else {
+ int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0;
+ int o1 = luaK_exp2RK(fs, e1);
+ if (o1 > o2) {
+ freeexp(fs, e1);
+ freeexp(fs, e2);
+ }
+ else {
+ freeexp(fs, e2);
+ freeexp(fs, e1);
+ }
+ e1->u.info = luaK_codeABC(fs, op, 0, o1, o2);
+ e1->k = VRELOCABLE;
+ luaK_fixline(fs, line);
+ }
}
static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1,
- expdesc *e2) {
- int o1 = luaK_exp2RK(fs, e1);
- int o2 = luaK_exp2RK(fs, e2);
- freeexp(fs, e2);
- freeexp(fs, e1);
- if (cond == 0 && op != OP_EQ) {
- int temp; /* exchange args to replace by `<' or `<=' */
- temp = o1; o1 = o2; o2 = temp; /* o1 <==> o2 */
- cond = 1;
- }
- e1->u.info = condjump(fs, op, cond, o1, o2);
- e1->k = VJMP;
+ expdesc *e2) {
+ int o1 = luaK_exp2RK(fs, e1);
+ int o2 = luaK_exp2RK(fs, e2);
+ freeexp(fs, e2);
+ freeexp(fs, e1);
+ if (cond == 0 && op != OP_EQ) {
+ int temp; /* exchange args to replace by `<' or `<=' */
+ temp = o1; o1 = o2; o2 = temp; /* o1 <==> o2 */
+ cond = 1;
+ }
+ e1->u.info = condjump(fs, op, cond, o1, o2);
+ e1->k = VJMP;
}
void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e, int line) {
- expdesc e2;
- e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
- switch (op) {
- case OPR_MINUS: {
- if (isnumeral(e)) /* minus constant? */
- e->u.nval = luai_numunm(NULL, e->u.nval); /* fold it */
- else {
- luaK_exp2anyreg(fs, e);
- codearith(fs, OP_UNM, e, &e2, line);
- }
- break;
- }
- case OPR_NOT: codenot(fs, e); break;
- case OPR_LEN: {
- luaK_exp2anyreg(fs, e); /* cannot operate on constants */
- codearith(fs, OP_LEN, e, &e2, line);
- break;
- }
- default: lua_assert(0);
- }
+ expdesc e2;
+ e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
+ switch (op) {
+ case OPR_MINUS: {
+ if (isnumeral(e)) /* minus constant? */
+ e->u.nval = luai_numunm(NULL, e->u.nval); /* fold it */
+ else {
+ luaK_exp2anyreg(fs, e);
+ codearith(fs, OP_UNM, e, &e2, line);
+ }
+ break;
+ }
+ case OPR_NOT: codenot(fs, e); break;
+ case OPR_LEN: {
+ luaK_exp2anyreg(fs, e); /* cannot operate on constants */
+ codearith(fs, OP_LEN, e, &e2, line);
+ break;
+ }
+ default: lua_assert(0);
+ }
}
void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
- switch (op) {
- case OPR_AND: {
- luaK_goiftrue(fs, v);
- break;
- }
- case OPR_OR: {
- luaK_goiffalse(fs, v);
- break;
- }
- case OPR_CONCAT: {
- luaK_exp2nextreg(fs, v); /* operand must be on the `stack' */
- break;
- }
- case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
- case OPR_MOD: case OPR_POW: {
- if (!isnumeral(v)) luaK_exp2RK(fs, v);
- break;
- }
- default: {
- luaK_exp2RK(fs, v);
- break;
- }
- }
+ switch (op) {
+ case OPR_AND: {
+ luaK_goiftrue(fs, v);
+ break;
+ }
+ case OPR_OR: {
+ luaK_goiffalse(fs, v);
+ break;
+ }
+ case OPR_CONCAT: {
+ luaK_exp2nextreg(fs, v); /* operand must be on the `stack' */
+ break;
+ }
+ case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
+ case OPR_MOD: case OPR_POW: {
+ if (!isnumeral(v)) luaK_exp2RK(fs, v);
+ break;
+ }
+ default: {
+ luaK_exp2RK(fs, v);
+ break;
+ }
+ }
}
void luaK_posfix (FuncState *fs, BinOpr op,
- expdesc *e1, expdesc *e2, int line) {
- switch (op) {
- case OPR_AND: {
- lua_assert(e1->t == NO_JUMP); /* list must be closed */
- luaK_dischargevars(fs, e2);
- luaK_concat(fs, &e2->f, e1->f);
- *e1 = *e2;
- break;
- }
- case OPR_OR: {
- lua_assert(e1->f == NO_JUMP); /* list must be closed */
- luaK_dischargevars(fs, e2);
- luaK_concat(fs, &e2->t, e1->t);
- *e1 = *e2;
- break;
- }
- case OPR_CONCAT: {
- luaK_exp2val(fs, e2);
- if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) {
- lua_assert(e1->u.info == GETARG_B(getcode(fs, e2))-1);
- freeexp(fs, e1);
- SETARG_B(getcode(fs, e2), e1->u.info);
- e1->k = VRELOCABLE; e1->u.info = e2->u.info;
- }
- else {
- luaK_exp2nextreg(fs, e2); /* operand must be on the 'stack' */
- codearith(fs, OP_CONCAT, e1, e2, line);
- }
- break;
- }
- case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
- case OPR_MOD: case OPR_POW: {
- codearith(fs, cast(OpCode, op - OPR_ADD + OP_ADD), e1, e2, line);
- break;
- }
- case OPR_EQ: case OPR_LT: case OPR_LE: {
- codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2);
- break;
- }
- case OPR_NE: case OPR_GT: case OPR_GE: {
- codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2);
- break;
- }
- default: lua_assert(0);
- }
+ expdesc *e1, expdesc *e2, int line) {
+ switch (op) {
+ case OPR_AND: {
+ lua_assert(e1->t == NO_JUMP); /* list must be closed */
+ luaK_dischargevars(fs, e2);
+ luaK_concat(fs, &e2->f, e1->f);
+ *e1 = *e2;
+ break;
+ }
+ case OPR_OR: {
+ lua_assert(e1->f == NO_JUMP); /* list must be closed */
+ luaK_dischargevars(fs, e2);
+ luaK_concat(fs, &e2->t, e1->t);
+ *e1 = *e2;
+ break;
+ }
+ case OPR_CONCAT: {
+ luaK_exp2val(fs, e2);
+ if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) {
+ lua_assert(e1->u.info == GETARG_B(getcode(fs, e2))-1);
+ freeexp(fs, e1);
+ SETARG_B(getcode(fs, e2), e1->u.info);
+ e1->k = VRELOCABLE; e1->u.info = e2->u.info;
+ }
+ else {
+ luaK_exp2nextreg(fs, e2); /* operand must be on the 'stack' */
+ codearith(fs, OP_CONCAT, e1, e2, line);
+ }
+ break;
+ }
+ case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
+ case OPR_MOD: case OPR_POW: {
+ codearith(fs, cast(OpCode, op - OPR_ADD + OP_ADD), e1, e2, line);
+ break;
+ }
+ case OPR_EQ: case OPR_LT: case OPR_LE: {
+ codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2);
+ break;
+ }
+ case OPR_NE: case OPR_GT: case OPR_GE: {
+ codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2);
+ break;
+ }
+ default: lua_assert(0);
+ }
}
void luaK_fixline (FuncState *fs, int line) {
- fs->f->lineinfo[fs->pc - 1] = line;
+ fs->f->lineinfo[fs->pc - 1] = line;
}
void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
- int c = (nelems - 1)/LFIELDS_PER_FLUSH + 1;
- int b = (tostore == LUA_MULTRET) ? 0 : tostore;
- lua_assert(tostore != 0);
- if (c <= MAXARG_C)
- luaK_codeABC(fs, OP_SETLIST, base, b, c);
- else if (c <= MAXARG_Ax) {
- luaK_codeABC(fs, OP_SETLIST, base, b, 0);
- codeextraarg(fs, c);
- }
- else
- luaX_syntaxerror(fs->ls, "constructor too long");
- fs->freereg = base + 1; /* free registers with list values */
+ int c = (nelems - 1)/LFIELDS_PER_FLUSH + 1;
+ int b = (tostore == LUA_MULTRET) ? 0 : tostore;
+ lua_assert(tostore != 0);
+ if (c <= MAXARG_C)
+ luaK_codeABC(fs, OP_SETLIST, base, b, c);
+ else if (c <= MAXARG_Ax) {
+ luaK_codeABC(fs, OP_SETLIST, base, b, 0);
+ codeextraarg(fs, c);
+ }
+ else
+ luaX_syntaxerror(fs->ls, "constructor too long");
+ fs->freereg = base + 1; /* free registers with list values */
}
-
diff --git a/src/lib/lua/lcorolib.c b/src/lib/lua/lcorolib.c
index ce4f6ad42c6..e431d760752 100644
--- a/src/lib/lua/lcorolib.c
+++ b/src/lib/lua/lcorolib.c
@@ -18,138 +18,137 @@
static int auxresume (lua_State *L, lua_State *co, int narg) {
- int status;
- if (!lua_checkstack(co, narg)) {
- lua_pushliteral(L, "too many arguments to resume");
- return -1; /* error flag */
- }
- if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) {
- lua_pushliteral(L, "cannot resume dead coroutine");
- return -1; /* error flag */
- }
- lua_xmove(L, co, narg);
- status = lua_resume(co, L, narg);
- if (status == LUA_OK || status == LUA_YIELD) {
- int nres = lua_gettop(co);
- if (!lua_checkstack(L, nres + 1)) {
- lua_pop(co, nres); /* remove results anyway */
- lua_pushliteral(L, "too many results to resume");
- return -1; /* error flag */
- }
- lua_xmove(co, L, nres); /* move yielded values */
- return nres;
- }
- else {
- lua_xmove(co, L, 1); /* move error message */
- return -1; /* error flag */
- }
+ int status;
+ if (!lua_checkstack(co, narg)) {
+ lua_pushliteral(L, "too many arguments to resume");
+ return -1; /* error flag */
+ }
+ if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) {
+ lua_pushliteral(L, "cannot resume dead coroutine");
+ return -1; /* error flag */
+ }
+ lua_xmove(L, co, narg);
+ status = lua_resume(co, L, narg);
+ if (status == LUA_OK || status == LUA_YIELD) {
+ int nres = lua_gettop(co);
+ if (!lua_checkstack(L, nres + 1)) {
+ lua_pop(co, nres); /* remove results anyway */
+ lua_pushliteral(L, "too many results to resume");
+ return -1; /* error flag */
+ }
+ lua_xmove(co, L, nres); /* move yielded values */
+ return nres;
+ }
+ else {
+ lua_xmove(co, L, 1); /* move error message */
+ return -1; /* error flag */
+ }
}
static int luaB_coresume (lua_State *L) {
- lua_State *co = lua_tothread(L, 1);
- int r;
- luaL_argcheck(L, co, 1, "coroutine expected");
- r = auxresume(L, co, lua_gettop(L) - 1);
- if (r < 0) {
- lua_pushboolean(L, 0);
- lua_insert(L, -2);
- return 2; /* return false + error message */
- }
- else {
- lua_pushboolean(L, 1);
- lua_insert(L, -(r + 1));
- return r + 1; /* return true + `resume' returns */
- }
+ lua_State *co = lua_tothread(L, 1);
+ int r;
+ luaL_argcheck(L, co, 1, "coroutine expected");
+ r = auxresume(L, co, lua_gettop(L) - 1);
+ if (r < 0) {
+ lua_pushboolean(L, 0);
+ lua_insert(L, -2);
+ return 2; /* return false + error message */
+ }
+ else {
+ lua_pushboolean(L, 1);
+ lua_insert(L, -(r + 1));
+ return r + 1; /* return true + `resume' returns */
+ }
}
static int luaB_auxwrap (lua_State *L) {
- lua_State *co = lua_tothread(L, lua_upvalueindex(1));
- int r = auxresume(L, co, lua_gettop(L));
- if (r < 0) {
- if (lua_isstring(L, -1)) { /* error object is a string? */
- luaL_where(L, 1); /* add extra info */
- lua_insert(L, -2);
- lua_concat(L, 2);
- }
- return lua_error(L); /* propagate error */
- }
- return r;
+ lua_State *co = lua_tothread(L, lua_upvalueindex(1));
+ int r = auxresume(L, co, lua_gettop(L));
+ if (r < 0) {
+ if (lua_isstring(L, -1)) { /* error object is a string? */
+ luaL_where(L, 1); /* add extra info */
+ lua_insert(L, -2);
+ lua_concat(L, 2);
+ }
+ return lua_error(L); /* propagate error */
+ }
+ return r;
}
static int luaB_cocreate (lua_State *L) {
- lua_State *NL;
- luaL_checktype(L, 1, LUA_TFUNCTION);
- NL = lua_newthread(L);
- lua_pushvalue(L, 1); /* move function to top */
- lua_xmove(L, NL, 1); /* move function from L to NL */
- return 1;
+ lua_State *NL;
+ luaL_checktype(L, 1, LUA_TFUNCTION);
+ NL = lua_newthread(L);
+ lua_pushvalue(L, 1); /* move function to top */
+ lua_xmove(L, NL, 1); /* move function from L to NL */
+ return 1;
}
static int luaB_cowrap (lua_State *L) {
- luaB_cocreate(L);
- lua_pushcclosure(L, luaB_auxwrap, 1);
- return 1;
+ luaB_cocreate(L);
+ lua_pushcclosure(L, luaB_auxwrap, 1);
+ return 1;
}
static int luaB_yield (lua_State *L) {
- return lua_yield(L, lua_gettop(L));
+ return lua_yield(L, lua_gettop(L));
}
static int luaB_costatus (lua_State *L) {
- lua_State *co = lua_tothread(L, 1);
- luaL_argcheck(L, co, 1, "coroutine expected");
- if (L == co) lua_pushliteral(L, "running");
- else {
- switch (lua_status(co)) {
- case LUA_YIELD:
- lua_pushliteral(L, "suspended");
- break;
- case LUA_OK: {
- lua_Debug ar;
- if (lua_getstack(co, 0, &ar) > 0) /* does it have frames? */
- lua_pushliteral(L, "normal"); /* it is running */
- else if (lua_gettop(co) == 0)
- lua_pushliteral(L, "dead");
- else
- lua_pushliteral(L, "suspended"); /* initial state */
- break;
- }
- default: /* some error occurred */
- lua_pushliteral(L, "dead");
- break;
- }
- }
- return 1;
+ lua_State *co = lua_tothread(L, 1);
+ luaL_argcheck(L, co, 1, "coroutine expected");
+ if (L == co) lua_pushliteral(L, "running");
+ else {
+ switch (lua_status(co)) {
+ case LUA_YIELD:
+ lua_pushliteral(L, "suspended");
+ break;
+ case LUA_OK: {
+ lua_Debug ar;
+ if (lua_getstack(co, 0, &ar) > 0) /* does it have frames? */
+ lua_pushliteral(L, "normal"); /* it is running */
+ else if (lua_gettop(co) == 0)
+ lua_pushliteral(L, "dead");
+ else
+ lua_pushliteral(L, "suspended"); /* initial state */
+ break;
+ }
+ default: /* some error occurred */
+ lua_pushliteral(L, "dead");
+ break;
+ }
+ }
+ return 1;
}
static int luaB_corunning (lua_State *L) {
- int ismain = lua_pushthread(L);
- lua_pushboolean(L, ismain);
- return 2;
+ int ismain = lua_pushthread(L);
+ lua_pushboolean(L, ismain);
+ return 2;
}
static const luaL_Reg co_funcs[] = {
- {"create", luaB_cocreate},
- {"resume", luaB_coresume},
- {"running", luaB_corunning},
- {"status", luaB_costatus},
- {"wrap", luaB_cowrap},
- {"yield", luaB_yield},
- {NULL, NULL}
+ {"create", luaB_cocreate},
+ {"resume", luaB_coresume},
+ {"running", luaB_corunning},
+ {"status", luaB_costatus},
+ {"wrap", luaB_cowrap},
+ {"yield", luaB_yield},
+ {NULL, NULL}
};
LUAMOD_API int luaopen_coroutine (lua_State *L) {
- luaL_newlib(L, co_funcs);
- return 1;
+ luaL_newlib(L, co_funcs);
+ return 1;
}
-
diff --git a/src/lib/lua/lctype.c b/src/lib/lua/lctype.c
index 93f8cadc39d..281d4d46db0 100644
--- a/src/lib/lua/lctype.c
+++ b/src/lib/lua/lctype.c
@@ -9,44 +9,44 @@
#include "lctype.h"
-#if !LUA_USE_CTYPE /* { */
+#if !LUA_USE_CTYPE /* { */
#include <limits.h>
LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
- 0x00, /* EOZ */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0. */
- 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 1. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x0c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, /* 2. */
- 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
- 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, /* 3. */
- 0x16, 0x16, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
- 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 4. */
- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 5. */
- 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x05,
- 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 6. */
- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 7. */
- 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 8. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 9. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* b. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* c. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* d. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* e. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* f. */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, /* EOZ */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0. */
+ 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 1. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x0c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, /* 2. */
+ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, /* 3. */
+ 0x16, 0x16, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+ 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 4. */
+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 5. */
+ 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x05,
+ 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 6. */
+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 7. */
+ 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 8. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 9. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* b. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* c. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* d. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* e. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* f. */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-#endif /* } */
+#endif /* } */
diff --git a/src/lib/lua/ldblib.c b/src/lib/lua/ldblib.c
index 84fe3c7d823..a76f1e5e3b3 100644
--- a/src/lib/lua/ldblib.c
+++ b/src/lib/lua/ldblib.c
@@ -18,381 +18,380 @@
#include "lualib.h"
-#define HOOKKEY "_HKEY"
+#define HOOKKEY "_HKEY"
static int db_getregistry (lua_State *L) {
- lua_pushvalue(L, LUA_REGISTRYINDEX);
- return 1;
+ lua_pushvalue(L, LUA_REGISTRYINDEX);
+ return 1;
}
static int db_getmetatable (lua_State *L) {
- luaL_checkany(L, 1);
- if (!lua_getmetatable(L, 1)) {
- lua_pushnil(L); /* no metatable */
- }
- return 1;
+ luaL_checkany(L, 1);
+ if (!lua_getmetatable(L, 1)) {
+ lua_pushnil(L); /* no metatable */
+ }
+ return 1;
}
static int db_setmetatable (lua_State *L) {
- int t = lua_type(L, 2);
- luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
- "nil or table expected");
- lua_settop(L, 2);
- lua_setmetatable(L, 1);
- return 1; /* return 1st argument */
+ int t = lua_type(L, 2);
+ luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+ "nil or table expected");
+ lua_settop(L, 2);
+ lua_setmetatable(L, 1);
+ return 1; /* return 1st argument */
}
static int db_getuservalue (lua_State *L) {
- if (lua_type(L, 1) != LUA_TUSERDATA)
- lua_pushnil(L);
- else
- lua_getuservalue(L, 1);
- return 1;
+ if (lua_type(L, 1) != LUA_TUSERDATA)
+ lua_pushnil(L);
+ else
+ lua_getuservalue(L, 1);
+ return 1;
}
static int db_setuservalue (lua_State *L) {
- if (lua_type(L, 1) == LUA_TLIGHTUSERDATA)
- luaL_argerror(L, 1, "full userdata expected, got light userdata");
- luaL_checktype(L, 1, LUA_TUSERDATA);
- if (!lua_isnoneornil(L, 2))
- luaL_checktype(L, 2, LUA_TTABLE);
- lua_settop(L, 2);
- lua_setuservalue(L, 1);
- return 1;
+ if (lua_type(L, 1) == LUA_TLIGHTUSERDATA)
+ luaL_argerror(L, 1, "full userdata expected, got light userdata");
+ luaL_checktype(L, 1, LUA_TUSERDATA);
+ if (!lua_isnoneornil(L, 2))
+ luaL_checktype(L, 2, LUA_TTABLE);
+ lua_settop(L, 2);
+ lua_setuservalue(L, 1);
+ return 1;
}
static void settabss (lua_State *L, const char *i, const char *v) {
- lua_pushstring(L, v);
- lua_setfield(L, -2, i);
+ lua_pushstring(L, v);
+ lua_setfield(L, -2, i);
}
static void settabsi (lua_State *L, const char *i, int v) {
- lua_pushinteger(L, v);
- lua_setfield(L, -2, i);
+ lua_pushinteger(L, v);
+ lua_setfield(L, -2, i);
}
static void settabsb (lua_State *L, const char *i, int v) {
- lua_pushboolean(L, v);
- lua_setfield(L, -2, i);
+ lua_pushboolean(L, v);
+ lua_setfield(L, -2, i);
}
static lua_State *getthread (lua_State *L, int *arg) {
- if (lua_isthread(L, 1)) {
- *arg = 1;
- return lua_tothread(L, 1);
- }
- else {
- *arg = 0;
- return L;
- }
+ if (lua_isthread(L, 1)) {
+ *arg = 1;
+ return lua_tothread(L, 1);
+ }
+ else {
+ *arg = 0;
+ return L;
+ }
}
static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
- if (L == L1) {
- lua_pushvalue(L, -2);
- lua_remove(L, -3);
- }
- else
- lua_xmove(L1, L, 1);
- lua_setfield(L, -2, fname);
+ if (L == L1) {
+ lua_pushvalue(L, -2);
+ lua_remove(L, -3);
+ }
+ else
+ lua_xmove(L1, L, 1);
+ lua_setfield(L, -2, fname);
}
static int db_getinfo (lua_State *L) {
- lua_Debug ar;
- int arg;
- lua_State *L1 = getthread(L, &arg);
- const char *options = luaL_optstring(L, arg+2, "flnStu");
- if (lua_isnumber(L, arg+1)) {
- if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) {
- lua_pushnil(L); /* level out of range */
- return 1;
- }
- }
- else if (lua_isfunction(L, arg+1)) {
- lua_pushfstring(L, ">%s", options);
- options = lua_tostring(L, -1);
- lua_pushvalue(L, arg+1);
- lua_xmove(L, L1, 1);
- }
- else
- return luaL_argerror(L, arg+1, "function or level expected");
- if (!lua_getinfo(L1, options, &ar))
- return luaL_argerror(L, arg+2, "invalid option");
- lua_createtable(L, 0, 2);
- if (strchr(options, 'S')) {
- settabss(L, "source", ar.source);
- settabss(L, "short_src", ar.short_src);
- settabsi(L, "linedefined", ar.linedefined);
- settabsi(L, "lastlinedefined", ar.lastlinedefined);
- settabss(L, "what", ar.what);
- }
- if (strchr(options, 'l'))
- settabsi(L, "currentline", ar.currentline);
- if (strchr(options, 'u')) {
- settabsi(L, "nups", ar.nups);
- settabsi(L, "nparams", ar.nparams);
- settabsb(L, "isvararg", ar.isvararg);
- }
- if (strchr(options, 'n')) {
- settabss(L, "name", ar.name);
- settabss(L, "namewhat", ar.namewhat);
- }
- if (strchr(options, 't'))
- settabsb(L, "istailcall", ar.istailcall);
- if (strchr(options, 'L'))
- treatstackoption(L, L1, "activelines");
- if (strchr(options, 'f'))
- treatstackoption(L, L1, "func");
- return 1; /* return table */
+ lua_Debug ar;
+ int arg;
+ lua_State *L1 = getthread(L, &arg);
+ const char *options = luaL_optstring(L, arg+2, "flnStu");
+ if (lua_isnumber(L, arg+1)) {
+ if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) {
+ lua_pushnil(L); /* level out of range */
+ return 1;
+ }
+ }
+ else if (lua_isfunction(L, arg+1)) {
+ lua_pushfstring(L, ">%s", options);
+ options = lua_tostring(L, -1);
+ lua_pushvalue(L, arg+1);
+ lua_xmove(L, L1, 1);
+ }
+ else
+ return luaL_argerror(L, arg+1, "function or level expected");
+ if (!lua_getinfo(L1, options, &ar))
+ return luaL_argerror(L, arg+2, "invalid option");
+ lua_createtable(L, 0, 2);
+ if (strchr(options, 'S')) {
+ settabss(L, "source", ar.source);
+ settabss(L, "short_src", ar.short_src);
+ settabsi(L, "linedefined", ar.linedefined);
+ settabsi(L, "lastlinedefined", ar.lastlinedefined);
+ settabss(L, "what", ar.what);
+ }
+ if (strchr(options, 'l'))
+ settabsi(L, "currentline", ar.currentline);
+ if (strchr(options, 'u')) {
+ settabsi(L, "nups", ar.nups);
+ settabsi(L, "nparams", ar.nparams);
+ settabsb(L, "isvararg", ar.isvararg);
+ }
+ if (strchr(options, 'n')) {
+ settabss(L, "name", ar.name);
+ settabss(L, "namewhat", ar.namewhat);
+ }
+ if (strchr(options, 't'))
+ settabsb(L, "istailcall", ar.istailcall);
+ if (strchr(options, 'L'))
+ treatstackoption(L, L1, "activelines");
+ if (strchr(options, 'f'))
+ treatstackoption(L, L1, "func");
+ return 1; /* return table */
}
static int db_getlocal (lua_State *L) {
- int arg;
- lua_State *L1 = getthread(L, &arg);
- lua_Debug ar;
- const char *name;
- int nvar = luaL_checkint(L, arg+2); /* local-variable index */
- if (lua_isfunction(L, arg + 1)) { /* function argument? */
- lua_pushvalue(L, arg + 1); /* push function */
- lua_pushstring(L, lua_getlocal(L, NULL, nvar)); /* push local name */
- return 1;
- }
- else { /* stack-level argument */
- if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */
- return luaL_argerror(L, arg+1, "level out of range");
- name = lua_getlocal(L1, &ar, nvar);
- if (name) {
- lua_xmove(L1, L, 1); /* push local value */
- lua_pushstring(L, name); /* push name */
- lua_pushvalue(L, -2); /* re-order */
- return 2;
- }
- else {
- lua_pushnil(L); /* no name (nor value) */
- return 1;
- }
- }
+ int arg;
+ lua_State *L1 = getthread(L, &arg);
+ lua_Debug ar;
+ const char *name;
+ int nvar = luaL_checkint(L, arg+2); /* local-variable index */
+ if (lua_isfunction(L, arg + 1)) { /* function argument? */
+ lua_pushvalue(L, arg + 1); /* push function */
+ lua_pushstring(L, lua_getlocal(L, NULL, nvar)); /* push local name */
+ return 1;
+ }
+ else { /* stack-level argument */
+ if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */
+ return luaL_argerror(L, arg+1, "level out of range");
+ name = lua_getlocal(L1, &ar, nvar);
+ if (name) {
+ lua_xmove(L1, L, 1); /* push local value */
+ lua_pushstring(L, name); /* push name */
+ lua_pushvalue(L, -2); /* re-order */
+ return 2;
+ }
+ else {
+ lua_pushnil(L); /* no name (nor value) */
+ return 1;
+ }
+ }
}
static int db_setlocal (lua_State *L) {
- int arg;
- lua_State *L1 = getthread(L, &arg);
- lua_Debug ar;
- if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */
- return luaL_argerror(L, arg+1, "level out of range");
- luaL_checkany(L, arg+3);
- lua_settop(L, arg+3);
- lua_xmove(L, L1, 1);
- lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2)));
- return 1;
+ int arg;
+ lua_State *L1 = getthread(L, &arg);
+ lua_Debug ar;
+ if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */
+ return luaL_argerror(L, arg+1, "level out of range");
+ luaL_checkany(L, arg+3);
+ lua_settop(L, arg+3);
+ lua_xmove(L, L1, 1);
+ lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2)));
+ return 1;
}
static int auxupvalue (lua_State *L, int get) {
- const char *name;
- int n = luaL_checkint(L, 2);
- luaL_checktype(L, 1, LUA_TFUNCTION);
- name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
- if (name == NULL) return 0;
- lua_pushstring(L, name);
- lua_insert(L, -(get+1));
- return get + 1;
+ const char *name;
+ int n = luaL_checkint(L, 2);
+ luaL_checktype(L, 1, LUA_TFUNCTION);
+ name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
+ if (name == NULL) return 0;
+ lua_pushstring(L, name);
+ lua_insert(L, -(get+1));
+ return get + 1;
}
static int db_getupvalue (lua_State *L) {
- return auxupvalue(L, 1);
+ return auxupvalue(L, 1);
}
static int db_setupvalue (lua_State *L) {
- luaL_checkany(L, 3);
- return auxupvalue(L, 0);
+ luaL_checkany(L, 3);
+ return auxupvalue(L, 0);
}
static int checkupval (lua_State *L, int argf, int argnup) {
- lua_Debug ar;
- int nup = luaL_checkint(L, argnup);
- luaL_checktype(L, argf, LUA_TFUNCTION);
- lua_pushvalue(L, argf);
- lua_getinfo(L, ">u", &ar);
- luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index");
- return nup;
+ lua_Debug ar;
+ int nup = luaL_checkint(L, argnup);
+ luaL_checktype(L, argf, LUA_TFUNCTION);
+ lua_pushvalue(L, argf);
+ lua_getinfo(L, ">u", &ar);
+ luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index");
+ return nup;
}
static int db_upvalueid (lua_State *L) {
- int n = checkupval(L, 1, 2);
- lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
- return 1;
+ int n = checkupval(L, 1, 2);
+ lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
+ return 1;
}
static int db_upvaluejoin (lua_State *L) {
- int n1 = checkupval(L, 1, 2);
- int n2 = checkupval(L, 3, 4);
- luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
- luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
- lua_upvaluejoin(L, 1, n1, 3, n2);
- return 0;
+ int n1 = checkupval(L, 1, 2);
+ int n2 = checkupval(L, 3, 4);
+ luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
+ luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
+ lua_upvaluejoin(L, 1, n1, 3, n2);
+ return 0;
}
-#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
+#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
static void hookf (lua_State *L, lua_Debug *ar) {
- static const char *const hooknames[] =
- {"call", "return", "line", "count", "tail call"};
- gethooktable(L);
- lua_pushthread(L);
- lua_rawget(L, -2);
- if (lua_isfunction(L, -1)) {
- lua_pushstring(L, hooknames[(int)ar->event]);
- if (ar->currentline >= 0)
- lua_pushinteger(L, ar->currentline);
- else lua_pushnil(L);
- lua_assert(lua_getinfo(L, "lS", ar));
- lua_call(L, 2, 0);
- }
+ static const char *const hooknames[] =
+ {"call", "return", "line", "count", "tail call"};
+ gethooktable(L);
+ lua_pushthread(L);
+ lua_rawget(L, -2);
+ if (lua_isfunction(L, -1)) {
+ lua_pushstring(L, hooknames[(int)ar->event]);
+ if (ar->currentline >= 0)
+ lua_pushinteger(L, ar->currentline);
+ else lua_pushnil(L);
+ lua_assert(lua_getinfo(L, "lS", ar));
+ lua_call(L, 2, 0);
+ }
}
static int makemask (const char *smask, int count) {
- int mask = 0;
- if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
- if (strchr(smask, 'r')) mask |= LUA_MASKRET;
- if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
- if (count > 0) mask |= LUA_MASKCOUNT;
- return mask;
+ int mask = 0;
+ if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
+ if (strchr(smask, 'r')) mask |= LUA_MASKRET;
+ if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+ if (count > 0) mask |= LUA_MASKCOUNT;
+ return mask;
}
static char *unmakemask (int mask, char *smask) {
- int i = 0;
- if (mask & LUA_MASKCALL) smask[i++] = 'c';
- if (mask & LUA_MASKRET) smask[i++] = 'r';
- if (mask & LUA_MASKLINE) smask[i++] = 'l';
- smask[i] = '\0';
- return smask;
+ int i = 0;
+ if (mask & LUA_MASKCALL) smask[i++] = 'c';
+ if (mask & LUA_MASKRET) smask[i++] = 'r';
+ if (mask & LUA_MASKLINE) smask[i++] = 'l';
+ smask[i] = '\0';
+ return smask;
}
static int db_sethook (lua_State *L) {
- int arg, mask, count;
- lua_Hook func;
- lua_State *L1 = getthread(L, &arg);
- if (lua_isnoneornil(L, arg+1)) {
- lua_settop(L, arg+1);
- func = NULL; mask = 0; count = 0; /* turn off hooks */
- }
- else {
- const char *smask = luaL_checkstring(L, arg+2);
- luaL_checktype(L, arg+1, LUA_TFUNCTION);
- count = luaL_optint(L, arg+3, 0);
- func = hookf; mask = makemask(smask, count);
- }
- if (gethooktable(L) == 0) { /* creating hook table? */
- lua_pushstring(L, "k");
- lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */
- lua_pushvalue(L, -1);
- lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */
- }
- lua_pushthread(L1); lua_xmove(L1, L, 1);
- lua_pushvalue(L, arg+1);
- lua_rawset(L, -3); /* set new hook */
- lua_sethook(L1, func, mask, count); /* set hooks */
- return 0;
+ int arg, mask, count;
+ lua_Hook func;
+ lua_State *L1 = getthread(L, &arg);
+ if (lua_isnoneornil(L, arg+1)) {
+ lua_settop(L, arg+1);
+ func = NULL; mask = 0; count = 0; /* turn off hooks */
+ }
+ else {
+ const char *smask = luaL_checkstring(L, arg+2);
+ luaL_checktype(L, arg+1, LUA_TFUNCTION);
+ count = luaL_optint(L, arg+3, 0);
+ func = hookf; mask = makemask(smask, count);
+ }
+ if (gethooktable(L) == 0) { /* creating hook table? */
+ lua_pushstring(L, "k");
+ lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */
+ lua_pushvalue(L, -1);
+ lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */
+ }
+ lua_pushthread(L1); lua_xmove(L1, L, 1);
+ lua_pushvalue(L, arg+1);
+ lua_rawset(L, -3); /* set new hook */
+ lua_sethook(L1, func, mask, count); /* set hooks */
+ return 0;
}
static int db_gethook (lua_State *L) {
- int arg;
- lua_State *L1 = getthread(L, &arg);
- char buff[5];
- int mask = lua_gethookmask(L1);
- lua_Hook hook = lua_gethook(L1);
- if (hook != NULL && hook != hookf) /* external hook? */
- lua_pushliteral(L, "external hook");
- else {
- gethooktable(L);
- lua_pushthread(L1); lua_xmove(L1, L, 1);
- lua_rawget(L, -2); /* get hook */
- lua_remove(L, -2); /* remove hook table */
- }
- lua_pushstring(L, unmakemask(mask, buff));
- lua_pushinteger(L, lua_gethookcount(L1));
- return 3;
+ int arg;
+ lua_State *L1 = getthread(L, &arg);
+ char buff[5];
+ int mask = lua_gethookmask(L1);
+ lua_Hook hook = lua_gethook(L1);
+ if (hook != NULL && hook != hookf) /* external hook? */
+ lua_pushliteral(L, "external hook");
+ else {
+ gethooktable(L);
+ lua_pushthread(L1); lua_xmove(L1, L, 1);
+ lua_rawget(L, -2); /* get hook */
+ lua_remove(L, -2); /* remove hook table */
+ }
+ lua_pushstring(L, unmakemask(mask, buff));
+ lua_pushinteger(L, lua_gethookcount(L1));
+ return 3;
}
static int db_debug (lua_State *L) {
- for (;;) {
- char buffer[250];
- luai_writestringerror("%s", "lua_debug> ");
- if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
- strcmp(buffer, "cont\n") == 0)
- return 0;
- if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
- lua_pcall(L, 0, 0, 0))
- luai_writestringerror("%s\n", lua_tostring(L, -1));
- lua_settop(L, 0); /* remove eventual returns */
- }
+ for (;;) {
+ char buffer[250];
+ luai_writestringerror("%s", "lua_debug> ");
+ if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
+ strcmp(buffer, "cont\n") == 0)
+ return 0;
+ if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
+ lua_pcall(L, 0, 0, 0))
+ luai_writestringerror("%s\n", lua_tostring(L, -1));
+ lua_settop(L, 0); /* remove eventual returns */
+ }
}
static int db_traceback (lua_State *L) {
- int arg;
- lua_State *L1 = getthread(L, &arg);
- const char *msg = lua_tostring(L, arg + 1);
- if (msg == NULL && !lua_isnoneornil(L, arg + 1)) /* non-string 'msg'? */
- lua_pushvalue(L, arg + 1); /* return it untouched */
- else {
- int level = luaL_optint(L, arg + 2, (L == L1) ? 1 : 0);
- luaL_traceback(L, L1, msg, level);
- }
- return 1;
+ int arg;
+ lua_State *L1 = getthread(L, &arg);
+ const char *msg = lua_tostring(L, arg + 1);
+ if (msg == NULL && !lua_isnoneornil(L, arg + 1)) /* non-string 'msg'? */
+ lua_pushvalue(L, arg + 1); /* return it untouched */
+ else {
+ int level = luaL_optint(L, arg + 2, (L == L1) ? 1 : 0);
+ luaL_traceback(L, L1, msg, level);
+ }
+ return 1;
}
static const luaL_Reg dblib[] = {
- {"debug", db_debug},
- {"getuservalue", db_getuservalue},
- {"gethook", db_gethook},
- {"getinfo", db_getinfo},
- {"getlocal", db_getlocal},
- {"getregistry", db_getregistry},
- {"getmetatable", db_getmetatable},
- {"getupvalue", db_getupvalue},
- {"upvaluejoin", db_upvaluejoin},
- {"upvalueid", db_upvalueid},
- {"setuservalue", db_setuservalue},
- {"sethook", db_sethook},
- {"setlocal", db_setlocal},
- {"setmetatable", db_setmetatable},
- {"setupvalue", db_setupvalue},
- {"traceback", db_traceback},
- {NULL, NULL}
+ {"debug", db_debug},
+ {"getuservalue", db_getuservalue},
+ {"gethook", db_gethook},
+ {"getinfo", db_getinfo},
+ {"getlocal", db_getlocal},
+ {"getregistry", db_getregistry},
+ {"getmetatable", db_getmetatable},
+ {"getupvalue", db_getupvalue},
+ {"upvaluejoin", db_upvaluejoin},
+ {"upvalueid", db_upvalueid},
+ {"setuservalue", db_setuservalue},
+ {"sethook", db_sethook},
+ {"setlocal", db_setlocal},
+ {"setmetatable", db_setmetatable},
+ {"setupvalue", db_setupvalue},
+ {"traceback", db_traceback},
+ {NULL, NULL}
};
LUAMOD_API int luaopen_debug (lua_State *L) {
- luaL_newlib(L, dblib);
- return 1;
+ luaL_newlib(L, dblib);
+ return 1;
}
-
diff --git a/src/lib/lua/ldebug.c b/src/lib/lua/ldebug.c
index 20d663efff3..7b8a4e76535 100644
--- a/src/lib/lua/ldebug.c
+++ b/src/lib/lua/ldebug.c
@@ -30,20 +30,20 @@
-#define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL)
+#define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL)
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name);
static int currentpc (CallInfo *ci) {
- lua_assert(isLua(ci));
- return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
+ lua_assert(isLua(ci));
+ return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
}
static int currentline (CallInfo *ci) {
- return getfuncline(ci_func(ci)->p, currentpc(ci));
+ return getfuncline(ci_func(ci)->p, currentpc(ci));
}
@@ -51,246 +51,246 @@ static int currentline (CallInfo *ci) {
** this function can be called asynchronous (e.g. during a signal)
*/
LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
- if (func == NULL || mask == 0) { /* turn off hooks? */
- mask = 0;
- func = NULL;
- }
- if (isLua(L->ci))
- L->oldpc = L->ci->u.l.savedpc;
- L->hook = func;
- L->basehookcount = count;
- resethookcount(L);
- L->hookmask = cast_byte(mask);
- return 1;
+ if (func == NULL || mask == 0) { /* turn off hooks? */
+ mask = 0;
+ func = NULL;
+ }
+ if (isLua(L->ci))
+ L->oldpc = L->ci->u.l.savedpc;
+ L->hook = func;
+ L->basehookcount = count;
+ resethookcount(L);
+ L->hookmask = cast_byte(mask);
+ return 1;
}
LUA_API lua_Hook lua_gethook (lua_State *L) {
- return L->hook;
+ return L->hook;
}
LUA_API int lua_gethookmask (lua_State *L) {
- return L->hookmask;
+ return L->hookmask;
}
LUA_API int lua_gethookcount (lua_State *L) {
- return L->basehookcount;
+ return L->basehookcount;
}
LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
- int status;
- CallInfo *ci;
- if (level < 0) return 0; /* invalid (negative) level */
- lua_lock(L);
- for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
- level--;
- if (level == 0 && ci != &L->base_ci) { /* level found? */
- status = 1;
- ar->i_ci = ci;
- }
- else status = 0; /* no such level */
- lua_unlock(L);
- return status;
+ int status;
+ CallInfo *ci;
+ if (level < 0) return 0; /* invalid (negative) level */
+ lua_lock(L);
+ for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
+ level--;
+ if (level == 0 && ci != &L->base_ci) { /* level found? */
+ status = 1;
+ ar->i_ci = ci;
+ }
+ else status = 0; /* no such level */
+ lua_unlock(L);
+ return status;
}
static const char *upvalname (Proto *p, int uv) {
- TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
- if (s == NULL) return "?";
- else return getstr(s);
+ TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
+ if (s == NULL) return "?";
+ else return getstr(s);
}
static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
- int nparams = clLvalue(ci->func)->p->numparams;
- if (n >= ci->u.l.base - ci->func - nparams)
- return NULL; /* no such vararg */
- else {
- *pos = ci->func + nparams + n;
- return "(*vararg)"; /* generic name for any vararg */
- }
+ int nparams = clLvalue(ci->func)->p->numparams;
+ if (n >= ci->u.l.base - ci->func - nparams)
+ return NULL; /* no such vararg */
+ else {
+ *pos = ci->func + nparams + n;
+ return "(*vararg)"; /* generic name for any vararg */
+ }
}
static const char *findlocal (lua_State *L, CallInfo *ci, int n,
- StkId *pos) {
- const char *name = NULL;
- StkId base;
- if (isLua(ci)) {
- if (n < 0) /* access to vararg values? */
- return findvararg(ci, -n, pos);
- else {
- base = ci->u.l.base;
- name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
- }
- }
- else
- base = ci->func + 1;
- if (name == NULL) { /* no 'standard' name? */
- StkId limit = (ci == L->ci) ? L->top : ci->next->func;
- if (limit - base >= n && n > 0) /* is 'n' inside 'ci' stack? */
- name = "(*temporary)"; /* generic name for any valid slot */
- else
- return NULL; /* no name */
- }
- *pos = base + (n - 1);
- return name;
+ StkId *pos) {
+ const char *name = NULL;
+ StkId base;
+ if (isLua(ci)) {
+ if (n < 0) /* access to vararg values? */
+ return findvararg(ci, -n, pos);
+ else {
+ base = ci->u.l.base;
+ name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
+ }
+ }
+ else
+ base = ci->func + 1;
+ if (name == NULL) { /* no 'standard' name? */
+ StkId limit = (ci == L->ci) ? L->top : ci->next->func;
+ if (limit - base >= n && n > 0) /* is 'n' inside 'ci' stack? */
+ name = "(*temporary)"; /* generic name for any valid slot */
+ else
+ return NULL; /* no name */
+ }
+ *pos = base + (n - 1);
+ return name;
}
LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
- const char *name;
- lua_lock(L);
- if (ar == NULL) { /* information about non-active function? */
- if (!isLfunction(L->top - 1)) /* not a Lua function? */
- name = NULL;
- else /* consider live variables at function start (parameters) */
- name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0);
- }
- else { /* active function; get information through 'ar' */
- StkId pos = 0; /* to avoid warnings */
- name = findlocal(L, ar->i_ci, n, &pos);
- if (name) {
- setobj2s(L, L->top, pos);
- api_incr_top(L);
- }
- }
- lua_unlock(L);
- return name;
+ const char *name;
+ lua_lock(L);
+ if (ar == NULL) { /* information about non-active function? */
+ if (!isLfunction(L->top - 1)) /* not a Lua function? */
+ name = NULL;
+ else /* consider live variables at function start (parameters) */
+ name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0);
+ }
+ else { /* active function; get information through 'ar' */
+ StkId pos = 0; /* to avoid warnings */
+ name = findlocal(L, ar->i_ci, n, &pos);
+ if (name) {
+ setobj2s(L, L->top, pos);
+ api_incr_top(L);
+ }
+ }
+ lua_unlock(L);
+ return name;
}
LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
- StkId pos = 0; /* to avoid warnings */
- const char *name = findlocal(L, ar->i_ci, n, &pos);
- lua_lock(L);
- if (name)
- setobjs2s(L, pos, L->top - 1);
- L->top--; /* pop value */
- lua_unlock(L);
- return name;
+ StkId pos = 0; /* to avoid warnings */
+ const char *name = findlocal(L, ar->i_ci, n, &pos);
+ lua_lock(L);
+ if (name)
+ setobjs2s(L, pos, L->top - 1);
+ L->top--; /* pop value */
+ lua_unlock(L);
+ return name;
}
static void funcinfo (lua_Debug *ar, Closure *cl) {
- if (noLuaClosure(cl)) {
- ar->source = "=[C]";
- ar->linedefined = -1;
- ar->lastlinedefined = -1;
- ar->what = "C";
- }
- else {
- Proto *p = cl->l.p;
- ar->source = p->source ? getstr(p->source) : "=?";
- ar->linedefined = p->linedefined;
- ar->lastlinedefined = p->lastlinedefined;
- ar->what = (ar->linedefined == 0) ? "main" : "Lua";
- }
- luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
+ if (noLuaClosure(cl)) {
+ ar->source = "=[C]";
+ ar->linedefined = -1;
+ ar->lastlinedefined = -1;
+ ar->what = "C";
+ }
+ else {
+ Proto *p = cl->l.p;
+ ar->source = p->source ? getstr(p->source) : "=?";
+ ar->linedefined = p->linedefined;
+ ar->lastlinedefined = p->lastlinedefined;
+ ar->what = (ar->linedefined == 0) ? "main" : "Lua";
+ }
+ luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
}
static void collectvalidlines (lua_State *L, Closure *f) {
- if (noLuaClosure(f)) {
- setnilvalue(L->top);
- api_incr_top(L);
- }
- else {
- int i;
- TValue v;
- int *lineinfo = f->l.p->lineinfo;
- Table *t = luaH_new(L); /* new table to store active lines */
- sethvalue(L, L->top, t); /* push it on stack */
- api_incr_top(L);
- setbvalue(&v, 1); /* boolean 'true' to be the value of all indices */
- for (i = 0; i < f->l.p->sizelineinfo; i++) /* for all lines with code */
- luaH_setint(L, t, lineinfo[i], &v); /* table[line] = true */
- }
+ if (noLuaClosure(f)) {
+ setnilvalue(L->top);
+ api_incr_top(L);
+ }
+ else {
+ int i;
+ TValue v;
+ int *lineinfo = f->l.p->lineinfo;
+ Table *t = luaH_new(L); /* new table to store active lines */
+ sethvalue(L, L->top, t); /* push it on stack */
+ api_incr_top(L);
+ setbvalue(&v, 1); /* boolean 'true' to be the value of all indices */
+ for (i = 0; i < f->l.p->sizelineinfo; i++) /* for all lines with code */
+ luaH_setint(L, t, lineinfo[i], &v); /* table[line] = true */
+ }
}
static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
- Closure *f, CallInfo *ci) {
- int status = 1;
- for (; *what; what++) {
- switch (*what) {
- case 'S': {
- funcinfo(ar, f);
- break;
- }
- case 'l': {
- ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1;
- break;
- }
- case 'u': {
- ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
- if (noLuaClosure(f)) {
- ar->isvararg = 1;
- ar->nparams = 0;
- }
- else {
- ar->isvararg = f->l.p->is_vararg;
- ar->nparams = f->l.p->numparams;
- }
- break;
- }
- case 't': {
- ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
- break;
- }
- case 'n': {
- /* calling function is a known Lua function? */
- if (ci && !(ci->callstatus & CIST_TAIL) && isLua(ci->previous))
- ar->namewhat = getfuncname(L, ci->previous, &ar->name);
- else
- ar->namewhat = NULL;
- if (ar->namewhat == NULL) {
- ar->namewhat = ""; /* not found */
- ar->name = NULL;
- }
- break;
- }
- case 'L':
- case 'f': /* handled by lua_getinfo */
- break;
- default: status = 0; /* invalid option */
- }
- }
- return status;
+ Closure *f, CallInfo *ci) {
+ int status = 1;
+ for (; *what; what++) {
+ switch (*what) {
+ case 'S': {
+ funcinfo(ar, f);
+ break;
+ }
+ case 'l': {
+ ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1;
+ break;
+ }
+ case 'u': {
+ ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
+ if (noLuaClosure(f)) {
+ ar->isvararg = 1;
+ ar->nparams = 0;
+ }
+ else {
+ ar->isvararg = f->l.p->is_vararg;
+ ar->nparams = f->l.p->numparams;
+ }
+ break;
+ }
+ case 't': {
+ ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
+ break;
+ }
+ case 'n': {
+ /* calling function is a known Lua function? */
+ if (ci && !(ci->callstatus & CIST_TAIL) && isLua(ci->previous))
+ ar->namewhat = getfuncname(L, ci->previous, &ar->name);
+ else
+ ar->namewhat = NULL;
+ if (ar->namewhat == NULL) {
+ ar->namewhat = ""; /* not found */
+ ar->name = NULL;
+ }
+ break;
+ }
+ case 'L':
+ case 'f': /* handled by lua_getinfo */
+ break;
+ default: status = 0; /* invalid option */
+ }
+ }
+ return status;
}
LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
- int status;
- Closure *cl;
- CallInfo *ci;
- StkId func;
- lua_lock(L);
- if (*what == '>') {
- ci = NULL;
- func = L->top - 1;
- api_check(L, ttisfunction(func), "function expected");
- what++; /* skip the '>' */
- L->top--; /* pop function */
- }
- else {
- ci = ar->i_ci;
- func = ci->func;
- lua_assert(ttisfunction(ci->func));
- }
- cl = ttisclosure(func) ? clvalue(func) : NULL;
- status = auxgetinfo(L, what, ar, cl, ci);
- if (strchr(what, 'f')) {
- setobjs2s(L, L->top, func);
- api_incr_top(L);
- }
- if (strchr(what, 'L'))
- collectvalidlines(L, cl);
- lua_unlock(L);
- return status;
+ int status;
+ Closure *cl;
+ CallInfo *ci;
+ StkId func;
+ lua_lock(L);
+ if (*what == '>') {
+ ci = NULL;
+ func = L->top - 1;
+ api_check(L, ttisfunction(func), "function expected");
+ what++; /* skip the '>' */
+ L->top--; /* pop function */
+ }
+ else {
+ ci = ar->i_ci;
+ func = ci->func;
+ lua_assert(ttisfunction(ci->func));
+ }
+ cl = ttisclosure(func) ? clvalue(func) : NULL;
+ status = auxgetinfo(L, what, ar, cl, ci);
+ if (strchr(what, 'f')) {
+ setobjs2s(L, L->top, func);
+ api_incr_top(L);
+ }
+ if (strchr(what, 'L'))
+ collectvalidlines(L, cl);
+ lua_unlock(L);
+ return status;
}
@@ -301,36 +301,36 @@ LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
*/
static const char *getobjname (Proto *p, int lastpc, int reg,
- const char **name);
+ const char **name);
/*
** find a "name" for the RK value 'c'
*/
static void kname (Proto *p, int pc, int c, const char **name) {
- if (ISK(c)) { /* is 'c' a constant? */
- TValue *kvalue = &p->k[INDEXK(c)];
- if (ttisstring(kvalue)) { /* literal constant? */
- *name = svalue(kvalue); /* it is its own name */
- return;
- }
- /* else no reasonable name found */
- }
- else { /* 'c' is a register */
- const char *what = getobjname(p, pc, c, name); /* search for 'c' */
- if (what && *what == 'c') { /* found a constant name? */
- return; /* 'name' already filled */
- }
- /* else no reasonable name found */
- }
- *name = "?"; /* no reasonable name found */
+ if (ISK(c)) { /* is 'c' a constant? */
+ TValue *kvalue = &p->k[INDEXK(c)];
+ if (ttisstring(kvalue)) { /* literal constant? */
+ *name = svalue(kvalue); /* it is its own name */
+ return;
+ }
+ /* else no reasonable name found */
+ }
+ else { /* 'c' is a register */
+ const char *what = getobjname(p, pc, c, name); /* search for 'c' */
+ if (what && *what == 'c') { /* found a constant name? */
+ return; /* 'name' already filled */
+ }
+ /* else no reasonable name found */
+ }
+ *name = "?"; /* no reasonable name found */
}
static int filterpc (int pc, int jmptarget) {
- if (pc < jmptarget) /* is code conditional (inside a jump)? */
- return -1; /* cannot know who sets that register */
- else return pc; /* current position sets that register */
+ if (pc < jmptarget) /* is code conditional (inside a jump)? */
+ return -1; /* cannot know who sets that register */
+ else return pc; /* current position sets that register */
}
@@ -338,146 +338,146 @@ static int filterpc (int pc, int jmptarget) {
** try to find last instruction before 'lastpc' that modified register 'reg'
*/
static int findsetreg (Proto *p, int lastpc, int reg) {
- int pc;
- int setreg = -1; /* keep last instruction that changed 'reg' */
- int jmptarget = 0; /* any code before this address is conditional */
- for (pc = 0; pc < lastpc; pc++) {
- Instruction i = p->code[pc];
- OpCode op = GET_OPCODE(i);
- int a = GETARG_A(i);
- switch (op) {
- case OP_LOADNIL: {
- int b = GETARG_B(i);
- if (a <= reg && reg <= a + b) /* set registers from 'a' to 'a+b' */
- setreg = filterpc(pc, jmptarget);
- break;
- }
- case OP_TFORCALL: {
- if (reg >= a + 2) /* affect all regs above its base */
- setreg = filterpc(pc, jmptarget);
- break;
- }
- case OP_CALL:
- case OP_TAILCALL: {
- if (reg >= a) /* affect all registers above base */
- setreg = filterpc(pc, jmptarget);
- break;
- }
- case OP_JMP: {
- int b = GETARG_sBx(i);
- int dest = pc + 1 + b;
- /* jump is forward and do not skip `lastpc'? */
- if (pc < dest && dest <= lastpc) {
- if (dest > jmptarget)
- jmptarget = dest; /* update 'jmptarget' */
- }
- break;
- }
- case OP_TEST: {
- if (reg == a) /* jumped code can change 'a' */
- setreg = filterpc(pc, jmptarget);
- break;
- }
- default:
- if (testAMode(op) && reg == a) /* any instruction that set A */
- setreg = filterpc(pc, jmptarget);
- break;
- }
- }
- return setreg;
+ int pc;
+ int setreg = -1; /* keep last instruction that changed 'reg' */
+ int jmptarget = 0; /* any code before this address is conditional */
+ for (pc = 0; pc < lastpc; pc++) {
+ Instruction i = p->code[pc];
+ OpCode op = GET_OPCODE(i);
+ int a = GETARG_A(i);
+ switch (op) {
+ case OP_LOADNIL: {
+ int b = GETARG_B(i);
+ if (a <= reg && reg <= a + b) /* set registers from 'a' to 'a+b' */
+ setreg = filterpc(pc, jmptarget);
+ break;
+ }
+ case OP_TFORCALL: {
+ if (reg >= a + 2) /* affect all regs above its base */
+ setreg = filterpc(pc, jmptarget);
+ break;
+ }
+ case OP_CALL:
+ case OP_TAILCALL: {
+ if (reg >= a) /* affect all registers above base */
+ setreg = filterpc(pc, jmptarget);
+ break;
+ }
+ case OP_JMP: {
+ int b = GETARG_sBx(i);
+ int dest = pc + 1 + b;
+ /* jump is forward and do not skip `lastpc'? */
+ if (pc < dest && dest <= lastpc) {
+ if (dest > jmptarget)
+ jmptarget = dest; /* update 'jmptarget' */
+ }
+ break;
+ }
+ case OP_TEST: {
+ if (reg == a) /* jumped code can change 'a' */
+ setreg = filterpc(pc, jmptarget);
+ break;
+ }
+ default:
+ if (testAMode(op) && reg == a) /* any instruction that set A */
+ setreg = filterpc(pc, jmptarget);
+ break;
+ }
+ }
+ return setreg;
}
static const char *getobjname (Proto *p, int lastpc, int reg,
- const char **name) {
- int pc;
- *name = luaF_getlocalname(p, reg + 1, lastpc);
- if (*name) /* is a local? */
- return "local";
- /* else try symbolic execution */
- pc = findsetreg(p, lastpc, reg);
- if (pc != -1) { /* could find instruction? */
- Instruction i = p->code[pc];
- OpCode op = GET_OPCODE(i);
- switch (op) {
- case OP_MOVE: {
- int b = GETARG_B(i); /* move from 'b' to 'a' */
- if (b < GETARG_A(i))
- return getobjname(p, pc, b, name); /* get name for 'b' */
- break;
- }
- case OP_GETTABUP:
- case OP_GETTABLE: {
- int k = GETARG_C(i); /* key index */
- int t = GETARG_B(i); /* table index */
- const char *vn = (op == OP_GETTABLE) /* name of indexed variable */
- ? luaF_getlocalname(p, t + 1, pc)
- : upvalname(p, t);
- kname(p, pc, k, name);
- return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field";
- }
- case OP_GETUPVAL: {
- *name = upvalname(p, GETARG_B(i));
- return "upvalue";
- }
- case OP_LOADK:
- case OP_LOADKX: {
- int b = (op == OP_LOADK) ? GETARG_Bx(i)
- : GETARG_Ax(p->code[pc + 1]);
- if (ttisstring(&p->k[b])) {
- *name = svalue(&p->k[b]);
- return "constant";
- }
- break;
- }
- case OP_SELF: {
- int k = GETARG_C(i); /* key index */
- kname(p, pc, k, name);
- return "method";
- }
- default: break; /* go through to return NULL */
- }
- }
- return NULL; /* could not find reasonable name */
+ const char **name) {
+ int pc;
+ *name = luaF_getlocalname(p, reg + 1, lastpc);
+ if (*name) /* is a local? */
+ return "local";
+ /* else try symbolic execution */
+ pc = findsetreg(p, lastpc, reg);
+ if (pc != -1) { /* could find instruction? */
+ Instruction i = p->code[pc];
+ OpCode op = GET_OPCODE(i);
+ switch (op) {
+ case OP_MOVE: {
+ int b = GETARG_B(i); /* move from 'b' to 'a' */
+ if (b < GETARG_A(i))
+ return getobjname(p, pc, b, name); /* get name for 'b' */
+ break;
+ }
+ case OP_GETTABUP:
+ case OP_GETTABLE: {
+ int k = GETARG_C(i); /* key index */
+ int t = GETARG_B(i); /* table index */
+ const char *vn = (op == OP_GETTABLE) /* name of indexed variable */
+ ? luaF_getlocalname(p, t + 1, pc)
+ : upvalname(p, t);
+ kname(p, pc, k, name);
+ return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field";
+ }
+ case OP_GETUPVAL: {
+ *name = upvalname(p, GETARG_B(i));
+ return "upvalue";
+ }
+ case OP_LOADK:
+ case OP_LOADKX: {
+ int b = (op == OP_LOADK) ? GETARG_Bx(i)
+ : GETARG_Ax(p->code[pc + 1]);
+ if (ttisstring(&p->k[b])) {
+ *name = svalue(&p->k[b]);
+ return "constant";
+ }
+ break;
+ }
+ case OP_SELF: {
+ int k = GETARG_C(i); /* key index */
+ kname(p, pc, k, name);
+ return "method";
+ }
+ default: break; /* go through to return NULL */
+ }
+ }
+ return NULL; /* could not find reasonable name */
}
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
- TMS tm;
- Proto *p = ci_func(ci)->p; /* calling function */
- int pc = currentpc(ci); /* calling instruction index */
- Instruction i = p->code[pc]; /* calling instruction */
- switch (GET_OPCODE(i)) {
- case OP_CALL:
- case OP_TAILCALL: /* get function name */
- return getobjname(p, pc, GETARG_A(i), name);
- case OP_TFORCALL: { /* for iterator */
- *name = "for iterator";
- return "for iterator";
- }
- /* all other instructions can call only through metamethods */
- case OP_SELF:
- case OP_GETTABUP:
- case OP_GETTABLE: tm = TM_INDEX; break;
- case OP_SETTABUP:
- case OP_SETTABLE: tm = TM_NEWINDEX; break;
- case OP_EQ: tm = TM_EQ; break;
- case OP_ADD: tm = TM_ADD; break;
- case OP_SUB: tm = TM_SUB; break;
- case OP_MUL: tm = TM_MUL; break;
- case OP_DIV: tm = TM_DIV; break;
- case OP_MOD: tm = TM_MOD; break;
- case OP_POW: tm = TM_POW; break;
- case OP_UNM: tm = TM_UNM; break;
- case OP_LEN: tm = TM_LEN; break;
- case OP_LT: tm = TM_LT; break;
- case OP_LE: tm = TM_LE; break;
- case OP_CONCAT: tm = TM_CONCAT; break;
- default:
- return NULL; /* else no useful name can be found */
- }
- *name = getstr(G(L)->tmname[tm]);
- return "metamethod";
+ TMS tm;
+ Proto *p = ci_func(ci)->p; /* calling function */
+ int pc = currentpc(ci); /* calling instruction index */
+ Instruction i = p->code[pc]; /* calling instruction */
+ switch (GET_OPCODE(i)) {
+ case OP_CALL:
+ case OP_TAILCALL: /* get function name */
+ return getobjname(p, pc, GETARG_A(i), name);
+ case OP_TFORCALL: { /* for iterator */
+ *name = "for iterator";
+ return "for iterator";
+ }
+ /* all other instructions can call only through metamethods */
+ case OP_SELF:
+ case OP_GETTABUP:
+ case OP_GETTABLE: tm = TM_INDEX; break;
+ case OP_SETTABUP:
+ case OP_SETTABLE: tm = TM_NEWINDEX; break;
+ case OP_EQ: tm = TM_EQ; break;
+ case OP_ADD: tm = TM_ADD; break;
+ case OP_SUB: tm = TM_SUB; break;
+ case OP_MUL: tm = TM_MUL; break;
+ case OP_DIV: tm = TM_DIV; break;
+ case OP_MOD: tm = TM_MOD; break;
+ case OP_POW: tm = TM_POW; break;
+ case OP_UNM: tm = TM_UNM; break;
+ case OP_LEN: tm = TM_LEN; break;
+ case OP_LT: tm = TM_LT; break;
+ case OP_LE: tm = TM_LE; break;
+ case OP_CONCAT: tm = TM_CONCAT; break;
+ default:
+ return NULL; /* else no useful name can be found */
+ }
+ *name = getstr(G(L)->tmname[tm]);
+ return "metamethod";
}
/* }====================================================== */
@@ -489,105 +489,104 @@ static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
** (used only for error messages, so efficiency is not a big concern)
*/
static int isinstack (CallInfo *ci, const TValue *o) {
- StkId p;
- for (p = ci->u.l.base; p < ci->top; p++)
- if (o == p) return 1;
- return 0;
+ StkId p;
+ for (p = ci->u.l.base; p < ci->top; p++)
+ if (o == p) return 1;
+ return 0;
}
static const char *getupvalname (CallInfo *ci, const TValue *o,
- const char **name) {
- LClosure *c = ci_func(ci);
- int i;
- for (i = 0; i < c->nupvalues; i++) {
- if (c->upvals[i]->v == o) {
- *name = upvalname(c->p, i);
- return "upvalue";
- }
- }
- return NULL;
+ const char **name) {
+ LClosure *c = ci_func(ci);
+ int i;
+ for (i = 0; i < c->nupvalues; i++) {
+ if (c->upvals[i]->v == o) {
+ *name = upvalname(c->p, i);
+ return "upvalue";
+ }
+ }
+ return NULL;
}
l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
- CallInfo *ci = L->ci;
- const char *name = NULL;
- const char *t = objtypename(o);
- const char *kind = NULL;
- if (isLua(ci)) {
- kind = getupvalname(ci, o, &name); /* check whether 'o' is an upvalue */
- if (!kind && isinstack(ci, o)) /* no? try a register */
- kind = getobjname(ci_func(ci)->p, currentpc(ci),
- cast_int(o - ci->u.l.base), &name);
- }
- if (kind)
- luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)",
- op, kind, name, t);
- else
- luaG_runerror(L, "attempt to %s a %s value", op, t);
+ CallInfo *ci = L->ci;
+ const char *name = NULL;
+ const char *t = objtypename(o);
+ const char *kind = NULL;
+ if (isLua(ci)) {
+ kind = getupvalname(ci, o, &name); /* check whether 'o' is an upvalue */
+ if (!kind && isinstack(ci, o)) /* no? try a register */
+ kind = getobjname(ci_func(ci)->p, currentpc(ci),
+ cast_int(o - ci->u.l.base), &name);
+ }
+ if (kind)
+ luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)",
+ op, kind, name, t);
+ else
+ luaG_runerror(L, "attempt to %s a %s value", op, t);
}
l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) {
- if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
- lua_assert(!ttisstring(p1) && !ttisnumber(p1));
- luaG_typeerror(L, p1, "concatenate");
+ if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
+ lua_assert(!ttisstring(p1) && !ttisnumber(p1));
+ luaG_typeerror(L, p1, "concatenate");
}
l_noret luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) {
- TValue temp;
- if (luaV_tonumber(p1, &temp) == NULL)
- p2 = p1; /* first operand is wrong */
- luaG_typeerror(L, p2, "perform arithmetic on");
+ TValue temp;
+ if (luaV_tonumber(p1, &temp) == NULL)
+ p2 = p1; /* first operand is wrong */
+ luaG_typeerror(L, p2, "perform arithmetic on");
}
l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
- const char *t1 = objtypename(p1);
- const char *t2 = objtypename(p2);
- if (t1 == t2)
- luaG_runerror(L, "attempt to compare two %s values", t1);
- else
- luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
+ const char *t1 = objtypename(p1);
+ const char *t2 = objtypename(p2);
+ if (t1 == t2)
+ luaG_runerror(L, "attempt to compare two %s values", t1);
+ else
+ luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
}
static void addinfo (lua_State *L, const char *msg) {
- CallInfo *ci = L->ci;
- if (isLua(ci)) { /* is Lua code? */
- char buff[LUA_IDSIZE]; /* add file:line information */
- int line = currentline(ci);
- TString *src = ci_func(ci)->p->source;
- if (src)
- luaO_chunkid(buff, getstr(src), LUA_IDSIZE);
- else { /* no source available; use "?" instead */
- buff[0] = '?'; buff[1] = '\0';
- }
- luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
- }
+ CallInfo *ci = L->ci;
+ if (isLua(ci)) { /* is Lua code? */
+ char buff[LUA_IDSIZE]; /* add file:line information */
+ int line = currentline(ci);
+ TString *src = ci_func(ci)->p->source;
+ if (src)
+ luaO_chunkid(buff, getstr(src), LUA_IDSIZE);
+ else { /* no source available; use "?" instead */
+ buff[0] = '?'; buff[1] = '\0';
+ }
+ luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
+ }
}
l_noret luaG_errormsg (lua_State *L) {
- if (L->errfunc != 0) { /* is there an error handling function? */
- StkId errfunc = restorestack(L, L->errfunc);
- if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
- setobjs2s(L, L->top, L->top - 1); /* move argument */
- setobjs2s(L, L->top - 1, errfunc); /* push function */
- L->top++;
- luaD_call(L, L->top - 2, 1, 0); /* call it */
- }
- luaD_throw(L, LUA_ERRRUN);
+ if (L->errfunc != 0) { /* is there an error handling function? */
+ StkId errfunc = restorestack(L, L->errfunc);
+ if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
+ setobjs2s(L, L->top, L->top - 1); /* move argument */
+ setobjs2s(L, L->top - 1, errfunc); /* push function */
+ L->top++;
+ luaD_call(L, L->top - 2, 1, 0); /* call it */
+ }
+ luaD_throw(L, LUA_ERRRUN);
}
l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
- va_list argp;
- va_start(argp, fmt);
- addinfo(L, luaO_pushvfstring(L, fmt, argp));
- va_end(argp);
- luaG_errormsg(L);
+ va_list argp;
+ va_start(argp, fmt);
+ addinfo(L, luaO_pushvfstring(L, fmt, argp));
+ va_end(argp);
+ luaG_errormsg(L);
}
-
diff --git a/src/lib/lua/ldo.c b/src/lib/lua/ldo.c
index e9dd5fa9519..9d9ab119311 100644
--- a/src/lib/lua/ldo.c
+++ b/src/lib/lua/ldo.c
@@ -50,22 +50,22 @@
#if defined(__cplusplus) && !defined(LUA_USE_LONGJMP)
/* C++ exceptions */
-#define LUAI_THROW(L,c) throw(c)
+#define LUAI_THROW(L,c) throw(c)
#define LUAI_TRY(L,c,a) \
try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
-#define luai_jmpbuf int /* dummy variable */
+#define luai_jmpbuf int /* dummy variable */
#elif defined(LUA_USE_ULONGJMP)
/* in Unix, try _longjmp/_setjmp (more efficient) */
-#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
-#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
-#define luai_jmpbuf jmp_buf
+#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf jmp_buf
#else
/* default handling with long jumps */
-#define LUAI_THROW(L,c) longjmp((c)->b, 1)
-#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
-#define luai_jmpbuf jmp_buf
+#define LUAI_THROW(L,c) longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf jmp_buf
#endif
@@ -75,214 +75,214 @@
/* chain list of long jump buffers */
struct lua_longjmp {
- struct lua_longjmp *previous;
- luai_jmpbuf b;
- volatile int status; /* error code */
+ struct lua_longjmp *previous;
+ luai_jmpbuf b;
+ volatile int status; /* error code */
};
static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
- switch (errcode) {
- case LUA_ERRMEM: { /* memory error? */
- setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
- break;
- }
- case LUA_ERRERR: {
- setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
- break;
- }
- default: {
- setobjs2s(L, oldtop, L->top - 1); /* error message on current top */
- break;
- }
- }
- L->top = oldtop + 1;
+ switch (errcode) {
+ case LUA_ERRMEM: { /* memory error? */
+ setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
+ break;
+ }
+ case LUA_ERRERR: {
+ setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
+ break;
+ }
+ default: {
+ setobjs2s(L, oldtop, L->top - 1); /* error message on current top */
+ break;
+ }
+ }
+ L->top = oldtop + 1;
}
l_noret luaD_throw (lua_State *L, int errcode) {
- if (L->errorJmp) { /* thread has an error handler? */
- L->errorJmp->status = errcode; /* set status */
- LUAI_THROW(L, L->errorJmp); /* jump to it */
- }
- else { /* thread has no error handler */
- L->status = cast_byte(errcode); /* mark it as dead */
- if (G(L)->mainthread->errorJmp) { /* main thread has a handler? */
- setobjs2s(L, G(L)->mainthread->top++, L->top - 1); /* copy error obj. */
- luaD_throw(G(L)->mainthread, errcode); /* re-throw in main thread */
- }
- else { /* no handler at all; abort */
- if (G(L)->panic) { /* panic function? */
- lua_unlock(L);
- G(L)->panic(L); /* call it (last chance to jump out) */
- }
- abort();
- }
- }
+ if (L->errorJmp) { /* thread has an error handler? */
+ L->errorJmp->status = errcode; /* set status */
+ LUAI_THROW(L, L->errorJmp); /* jump to it */
+ }
+ else { /* thread has no error handler */
+ L->status = cast_byte(errcode); /* mark it as dead */
+ if (G(L)->mainthread->errorJmp) { /* main thread has a handler? */
+ setobjs2s(L, G(L)->mainthread->top++, L->top - 1); /* copy error obj. */
+ luaD_throw(G(L)->mainthread, errcode); /* re-throw in main thread */
+ }
+ else { /* no handler at all; abort */
+ if (G(L)->panic) { /* panic function? */
+ lua_unlock(L);
+ G(L)->panic(L); /* call it (last chance to jump out) */
+ }
+ abort();
+ }
+ }
}
int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
- unsigned short oldnCcalls = L->nCcalls;
- struct lua_longjmp lj;
- lj.status = LUA_OK;
- lj.previous = L->errorJmp; /* chain new error handler */
- L->errorJmp = &lj;
- LUAI_TRY(L, &lj,
- (*f)(L, ud);
- );
- L->errorJmp = lj.previous; /* restore old error handler */
- L->nCcalls = oldnCcalls;
- return lj.status;
+ unsigned short oldnCcalls = L->nCcalls;
+ struct lua_longjmp lj;
+ lj.status = LUA_OK;
+ lj.previous = L->errorJmp; /* chain new error handler */
+ L->errorJmp = &lj;
+ LUAI_TRY(L, &lj,
+ (*f)(L, ud);
+ );
+ L->errorJmp = lj.previous; /* restore old error handler */
+ L->nCcalls = oldnCcalls;
+ return lj.status;
}
/* }====================================================== */
static void correctstack (lua_State *L, TValue *oldstack) {
- CallInfo *ci;
- GCObject *up;
- L->top = (L->top - oldstack) + L->stack;
- for (up = L->openupval; up != NULL; up = up->gch.next)
- gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
- for (ci = L->ci; ci != NULL; ci = ci->previous) {
- ci->top = (ci->top - oldstack) + L->stack;
- ci->func = (ci->func - oldstack) + L->stack;
- if (isLua(ci))
- ci->u.l.base = (ci->u.l.base - oldstack) + L->stack;
- }
+ CallInfo *ci;
+ GCObject *up;
+ L->top = (L->top - oldstack) + L->stack;
+ for (up = L->openupval; up != NULL; up = up->gch.next)
+ gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
+ for (ci = L->ci; ci != NULL; ci = ci->previous) {
+ ci->top = (ci->top - oldstack) + L->stack;
+ ci->func = (ci->func - oldstack) + L->stack;
+ if (isLua(ci))
+ ci->u.l.base = (ci->u.l.base - oldstack) + L->stack;
+ }
}
/* some space for error handling */
-#define ERRORSTACKSIZE (LUAI_MAXSTACK + 200)
+#define ERRORSTACKSIZE (LUAI_MAXSTACK + 200)
void luaD_reallocstack (lua_State *L, int newsize) {
- TValue *oldstack = L->stack;
- int lim = L->stacksize;
- lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
- lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK);
- luaM_reallocvector(L, L->stack, L->stacksize, newsize, TValue);
- for (; lim < newsize; lim++)
- setnilvalue(L->stack + lim); /* erase new segment */
- L->stacksize = newsize;
- L->stack_last = L->stack + newsize - EXTRA_STACK;
- correctstack(L, oldstack);
+ TValue *oldstack = L->stack;
+ int lim = L->stacksize;
+ lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
+ lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK);
+ luaM_reallocvector(L, L->stack, L->stacksize, newsize, TValue);
+ for (; lim < newsize; lim++)
+ setnilvalue(L->stack + lim); /* erase new segment */
+ L->stacksize = newsize;
+ L->stack_last = L->stack + newsize - EXTRA_STACK;
+ correctstack(L, oldstack);
}
void luaD_growstack (lua_State *L, int n) {
- int size = L->stacksize;
- if (size > LUAI_MAXSTACK) /* error after extra size? */
- luaD_throw(L, LUA_ERRERR);
- else {
- int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK;
- int newsize = 2 * size;
- if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK;
- if (newsize < needed) newsize = needed;
- if (newsize > LUAI_MAXSTACK) { /* stack overflow? */
- luaD_reallocstack(L, ERRORSTACKSIZE);
- luaG_runerror(L, "stack overflow");
- }
- else
- luaD_reallocstack(L, newsize);
- }
+ int size = L->stacksize;
+ if (size > LUAI_MAXSTACK) /* error after extra size? */
+ luaD_throw(L, LUA_ERRERR);
+ else {
+ int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK;
+ int newsize = 2 * size;
+ if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK;
+ if (newsize < needed) newsize = needed;
+ if (newsize > LUAI_MAXSTACK) { /* stack overflow? */
+ luaD_reallocstack(L, ERRORSTACKSIZE);
+ luaG_runerror(L, "stack overflow");
+ }
+ else
+ luaD_reallocstack(L, newsize);
+ }
}
static int stackinuse (lua_State *L) {
- CallInfo *ci;
- StkId lim = L->top;
- for (ci = L->ci; ci != NULL; ci = ci->previous) {
- lua_assert(ci->top <= L->stack_last);
- if (lim < ci->top) lim = ci->top;
- }
- return cast_int(lim - L->stack) + 1; /* part of stack in use */
+ CallInfo *ci;
+ StkId lim = L->top;
+ for (ci = L->ci; ci != NULL; ci = ci->previous) {
+ lua_assert(ci->top <= L->stack_last);
+ if (lim < ci->top) lim = ci->top;
+ }
+ return cast_int(lim - L->stack) + 1; /* part of stack in use */
}
void luaD_shrinkstack (lua_State *L) {
- int inuse = stackinuse(L);
- int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK;
- if (goodsize > LUAI_MAXSTACK) goodsize = LUAI_MAXSTACK;
- if (inuse > LUAI_MAXSTACK || /* handling stack overflow? */
- goodsize >= L->stacksize) /* would grow instead of shrink? */
- condmovestack(L); /* don't change stack (change only for debugging) */
- else
- luaD_reallocstack(L, goodsize); /* shrink it */
+ int inuse = stackinuse(L);
+ int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK;
+ if (goodsize > LUAI_MAXSTACK) goodsize = LUAI_MAXSTACK;
+ if (inuse > LUAI_MAXSTACK || /* handling stack overflow? */
+ goodsize >= L->stacksize) /* would grow instead of shrink? */
+ condmovestack(L); /* don't change stack (change only for debugging) */
+ else
+ luaD_reallocstack(L, goodsize); /* shrink it */
}
void luaD_hook (lua_State *L, int event, int line) {
- lua_Hook hook = L->hook;
- if (hook && L->allowhook) {
- CallInfo *ci = L->ci;
- ptrdiff_t top = savestack(L, L->top);
- ptrdiff_t ci_top = savestack(L, ci->top);
- lua_Debug ar;
- ar.event = event;
- ar.currentline = line;
- ar.i_ci = ci;
- luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */
- ci->top = L->top + LUA_MINSTACK;
- lua_assert(ci->top <= L->stack_last);
- L->allowhook = 0; /* cannot call hooks inside a hook */
- ci->callstatus |= CIST_HOOKED;
- lua_unlock(L);
- (*hook)(L, &ar);
- lua_lock(L);
- lua_assert(!L->allowhook);
- L->allowhook = 1;
- ci->top = restorestack(L, ci_top);
- L->top = restorestack(L, top);
- ci->callstatus &= ~CIST_HOOKED;
- }
+ lua_Hook hook = L->hook;
+ if (hook && L->allowhook) {
+ CallInfo *ci = L->ci;
+ ptrdiff_t top = savestack(L, L->top);
+ ptrdiff_t ci_top = savestack(L, ci->top);
+ lua_Debug ar;
+ ar.event = event;
+ ar.currentline = line;
+ ar.i_ci = ci;
+ luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */
+ ci->top = L->top + LUA_MINSTACK;
+ lua_assert(ci->top <= L->stack_last);
+ L->allowhook = 0; /* cannot call hooks inside a hook */
+ ci->callstatus |= CIST_HOOKED;
+ lua_unlock(L);
+ (*hook)(L, &ar);
+ lua_lock(L);
+ lua_assert(!L->allowhook);
+ L->allowhook = 1;
+ ci->top = restorestack(L, ci_top);
+ L->top = restorestack(L, top);
+ ci->callstatus &= ~CIST_HOOKED;
+ }
}
static void callhook (lua_State *L, CallInfo *ci) {
- int hook = LUA_HOOKCALL;
- ci->u.l.savedpc++; /* hooks assume 'pc' is already incremented */
- if (isLua(ci->previous) &&
- GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
- ci->callstatus |= CIST_TAIL;
- hook = LUA_HOOKTAILCALL;
- }
- luaD_hook(L, hook, -1);
- ci->u.l.savedpc--; /* correct 'pc' */
+ int hook = LUA_HOOKCALL;
+ ci->u.l.savedpc++; /* hooks assume 'pc' is already incremented */
+ if (isLua(ci->previous) &&
+ GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
+ ci->callstatus |= CIST_TAIL;
+ hook = LUA_HOOKTAILCALL;
+ }
+ luaD_hook(L, hook, -1);
+ ci->u.l.savedpc--; /* correct 'pc' */
}
static StkId adjust_varargs (lua_State *L, Proto *p, int actual) {
- int i;
- int nfixargs = p->numparams;
- StkId base, fixed;
- lua_assert(actual >= nfixargs);
- /* move fixed parameters to final position */
- luaD_checkstack(L, p->maxstacksize); /* check again for new 'base' */
- fixed = L->top - actual; /* first fixed argument */
- base = L->top; /* final position of first argument */
- for (i=0; i<nfixargs; i++) {
- setobjs2s(L, L->top++, fixed + i);
- setnilvalue(fixed + i);
- }
- return base;
+ int i;
+ int nfixargs = p->numparams;
+ StkId base, fixed;
+ lua_assert(actual >= nfixargs);
+ /* move fixed parameters to final position */
+ luaD_checkstack(L, p->maxstacksize); /* check again for new 'base' */
+ fixed = L->top - actual; /* first fixed argument */
+ base = L->top; /* final position of first argument */
+ for (i=0; i<nfixargs; i++) {
+ setobjs2s(L, L->top++, fixed + i);
+ setnilvalue(fixed + i);
+ }
+ return base;
}
static StkId tryfuncTM (lua_State *L, StkId func) {
- const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
- StkId p;
- ptrdiff_t funcr = savestack(L, func);
- if (!ttisfunction(tm))
- luaG_typeerror(L, func, "call");
- /* Open a hole inside the stack at `func' */
- for (p = L->top; p > func; p--) setobjs2s(L, p, p-1);
- incr_top(L);
- func = restorestack(L, funcr); /* previous call may change stack */
- setobj2s(L, func, tm); /* tag method is the new function to be called */
- return func;
+ const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
+ StkId p;
+ ptrdiff_t funcr = savestack(L, func);
+ if (!ttisfunction(tm))
+ luaG_typeerror(L, func, "call");
+ /* Open a hole inside the stack at `func' */
+ for (p = L->top; p > func; p--) setobjs2s(L, p, p-1);
+ incr_top(L);
+ func = restorestack(L, funcr); /* previous call may change stack */
+ setobj2s(L, func, tm); /* tag method is the new function to be called */
+ return func;
}
@@ -294,93 +294,93 @@ static StkId tryfuncTM (lua_State *L, StkId func) {
** returns true if function has been executed (C function)
*/
int luaD_precall (lua_State *L, StkId func, int nresults) {
- lua_CFunction f;
- CallInfo *ci;
- int n; /* number of arguments (Lua) or returns (C) */
- ptrdiff_t funcr = savestack(L, func);
- switch (ttype(func)) {
- case LUA_TLCF: /* light C function */
- f = fvalue(func);
- goto Cfunc;
- case LUA_TCCL: { /* C closure */
- f = clCvalue(func)->f;
- Cfunc:
- luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */
- ci = next_ci(L); /* now 'enter' new function */
- ci->nresults = nresults;
- ci->func = restorestack(L, funcr);
- ci->top = L->top + LUA_MINSTACK;
- lua_assert(ci->top <= L->stack_last);
- ci->callstatus = 0;
- luaC_checkGC(L); /* stack grow uses memory */
- if (L->hookmask & LUA_MASKCALL)
- luaD_hook(L, LUA_HOOKCALL, -1);
- lua_unlock(L);
- n = (*f)(L); /* do the actual call */
- lua_lock(L);
- api_checknelems(L, n);
- luaD_poscall(L, L->top - n);
- return 1;
- }
- case LUA_TLCL: { /* Lua function: prepare its call */
- StkId base;
- Proto *p = clLvalue(func)->p;
- n = cast_int(L->top - func) - 1; /* number of real arguments */
- luaD_checkstack(L, p->maxstacksize);
- for (; n < p->numparams; n++)
- setnilvalue(L->top++); /* complete missing arguments */
- if (!p->is_vararg) {
- func = restorestack(L, funcr);
- base = func + 1;
- }
- else {
- base = adjust_varargs(L, p, n);
- func = restorestack(L, funcr); /* previous call can change stack */
- }
- ci = next_ci(L); /* now 'enter' new function */
- ci->nresults = nresults;
- ci->func = func;
- ci->u.l.base = base;
- ci->top = base + p->maxstacksize;
- lua_assert(ci->top <= L->stack_last);
- ci->u.l.savedpc = p->code; /* starting point */
- ci->callstatus = CIST_LUA;
- L->top = ci->top;
- luaC_checkGC(L); /* stack grow uses memory */
- if (L->hookmask & LUA_MASKCALL)
- callhook(L, ci);
- return 0;
- }
- default: { /* not a function */
- func = tryfuncTM(L, func); /* retry with 'function' tag method */
- return luaD_precall(L, func, nresults); /* now it must be a function */
- }
- }
+ lua_CFunction f;
+ CallInfo *ci;
+ int n; /* number of arguments (Lua) or returns (C) */
+ ptrdiff_t funcr = savestack(L, func);
+ switch (ttype(func)) {
+ case LUA_TLCF: /* light C function */
+ f = fvalue(func);
+ goto Cfunc;
+ case LUA_TCCL: { /* C closure */
+ f = clCvalue(func)->f;
+ Cfunc:
+ luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */
+ ci = next_ci(L); /* now 'enter' new function */
+ ci->nresults = nresults;
+ ci->func = restorestack(L, funcr);
+ ci->top = L->top + LUA_MINSTACK;
+ lua_assert(ci->top <= L->stack_last);
+ ci->callstatus = 0;
+ luaC_checkGC(L); /* stack grow uses memory */
+ if (L->hookmask & LUA_MASKCALL)
+ luaD_hook(L, LUA_HOOKCALL, -1);
+ lua_unlock(L);
+ n = (*f)(L); /* do the actual call */
+ lua_lock(L);
+ api_checknelems(L, n);
+ luaD_poscall(L, L->top - n);
+ return 1;
+ }
+ case LUA_TLCL: { /* Lua function: prepare its call */
+ StkId base;
+ Proto *p = clLvalue(func)->p;
+ n = cast_int(L->top - func) - 1; /* number of real arguments */
+ luaD_checkstack(L, p->maxstacksize);
+ for (; n < p->numparams; n++)
+ setnilvalue(L->top++); /* complete missing arguments */
+ if (!p->is_vararg) {
+ func = restorestack(L, funcr);
+ base = func + 1;
+ }
+ else {
+ base = adjust_varargs(L, p, n);
+ func = restorestack(L, funcr); /* previous call can change stack */
+ }
+ ci = next_ci(L); /* now 'enter' new function */
+ ci->nresults = nresults;
+ ci->func = func;
+ ci->u.l.base = base;
+ ci->top = base + p->maxstacksize;
+ lua_assert(ci->top <= L->stack_last);
+ ci->u.l.savedpc = p->code; /* starting point */
+ ci->callstatus = CIST_LUA;
+ L->top = ci->top;
+ luaC_checkGC(L); /* stack grow uses memory */
+ if (L->hookmask & LUA_MASKCALL)
+ callhook(L, ci);
+ return 0;
+ }
+ default: { /* not a function */
+ func = tryfuncTM(L, func); /* retry with 'function' tag method */
+ return luaD_precall(L, func, nresults); /* now it must be a function */
+ }
+ }
}
int luaD_poscall (lua_State *L, StkId firstResult) {
- StkId res;
- int wanted, i;
- CallInfo *ci = L->ci;
- if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) {
- if (L->hookmask & LUA_MASKRET) {
- ptrdiff_t fr = savestack(L, firstResult); /* hook may change stack */
- luaD_hook(L, LUA_HOOKRET, -1);
- firstResult = restorestack(L, fr);
- }
- L->oldpc = ci->previous->u.l.savedpc; /* 'oldpc' for caller function */
- }
- res = ci->func; /* res == final position of 1st result */
- wanted = ci->nresults;
- L->ci = ci = ci->previous; /* back to caller */
- /* move results to correct place */
- for (i = wanted; i != 0 && firstResult < L->top; i--)
- setobjs2s(L, res++, firstResult++);
- while (i-- > 0)
- setnilvalue(res++);
- L->top = res;
- return (wanted - LUA_MULTRET); /* 0 iff wanted == LUA_MULTRET */
+ StkId res;
+ int wanted, i;
+ CallInfo *ci = L->ci;
+ if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) {
+ if (L->hookmask & LUA_MASKRET) {
+ ptrdiff_t fr = savestack(L, firstResult); /* hook may change stack */
+ luaD_hook(L, LUA_HOOKRET, -1);
+ firstResult = restorestack(L, fr);
+ }
+ L->oldpc = ci->previous->u.l.savedpc; /* 'oldpc' for caller function */
+ }
+ res = ci->func; /* res == final position of 1st result */
+ wanted = ci->nresults;
+ L->ci = ci = ci->previous; /* back to caller */
+ /* move results to correct place */
+ for (i = wanted; i != 0 && firstResult < L->top; i--)
+ setobjs2s(L, res++, firstResult++);
+ while (i-- > 0)
+ setnilvalue(res++);
+ L->top = res;
+ return (wanted - LUA_MULTRET); /* 0 iff wanted == LUA_MULTRET */
}
@@ -391,57 +391,57 @@ int luaD_poscall (lua_State *L, StkId firstResult) {
** function position.
*/
void luaD_call (lua_State *L, StkId func, int nResults, int allowyield) {
- if (++L->nCcalls >= LUAI_MAXCCALLS) {
- if (L->nCcalls == LUAI_MAXCCALLS)
- luaG_runerror(L, "C stack overflow");
- else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3)))
- luaD_throw(L, LUA_ERRERR); /* error while handing stack error */
- }
- if (!allowyield) L->nny++;
- if (!luaD_precall(L, func, nResults)) /* is a Lua function? */
- luaV_execute(L); /* call it */
- if (!allowyield) L->nny--;
- L->nCcalls--;
+ if (++L->nCcalls >= LUAI_MAXCCALLS) {
+ if (L->nCcalls == LUAI_MAXCCALLS)
+ luaG_runerror(L, "C stack overflow");
+ else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3)))
+ luaD_throw(L, LUA_ERRERR); /* error while handing stack error */
+ }
+ if (!allowyield) L->nny++;
+ if (!luaD_precall(L, func, nResults)) /* is a Lua function? */
+ luaV_execute(L); /* call it */
+ if (!allowyield) L->nny--;
+ L->nCcalls--;
}
static void finishCcall (lua_State *L) {
- CallInfo *ci = L->ci;
- int n;
- lua_assert(ci->u.c.k != NULL); /* must have a continuation */
- lua_assert(L->nny == 0);
- if (ci->callstatus & CIST_YPCALL) { /* was inside a pcall? */
- ci->callstatus &= ~CIST_YPCALL; /* finish 'lua_pcall' */
- L->errfunc = ci->u.c.old_errfunc;
- }
- /* finish 'lua_callk'/'lua_pcall' */
- adjustresults(L, ci->nresults);
- /* call continuation function */
- if (!(ci->callstatus & CIST_STAT)) /* no call status? */
- ci->u.c.status = LUA_YIELD; /* 'default' status */
- lua_assert(ci->u.c.status != LUA_OK);
- ci->callstatus = (ci->callstatus & ~(CIST_YPCALL | CIST_STAT)) | CIST_YIELDED;
- lua_unlock(L);
- n = (*ci->u.c.k)(L);
- lua_lock(L);
- api_checknelems(L, n);
- /* finish 'luaD_precall' */
- luaD_poscall(L, L->top - n);
+ CallInfo *ci = L->ci;
+ int n;
+ lua_assert(ci->u.c.k != NULL); /* must have a continuation */
+ lua_assert(L->nny == 0);
+ if (ci->callstatus & CIST_YPCALL) { /* was inside a pcall? */
+ ci->callstatus &= ~CIST_YPCALL; /* finish 'lua_pcall' */
+ L->errfunc = ci->u.c.old_errfunc;
+ }
+ /* finish 'lua_callk'/'lua_pcall' */
+ adjustresults(L, ci->nresults);
+ /* call continuation function */
+ if (!(ci->callstatus & CIST_STAT)) /* no call status? */
+ ci->u.c.status = LUA_YIELD; /* 'default' status */
+ lua_assert(ci->u.c.status != LUA_OK);
+ ci->callstatus = (ci->callstatus & ~(CIST_YPCALL | CIST_STAT)) | CIST_YIELDED;
+ lua_unlock(L);
+ n = (*ci->u.c.k)(L);
+ lua_lock(L);
+ api_checknelems(L, n);
+ /* finish 'luaD_precall' */
+ luaD_poscall(L, L->top - n);
}
static void unroll (lua_State *L, void *ud) {
- UNUSED(ud);
- for (;;) {
- if (L->ci == &L->base_ci) /* stack is empty? */
- return; /* coroutine finished normally */
- if (!isLua(L->ci)) /* C function? */
- finishCcall(L);
- else { /* Lua function */
- luaV_finishOp(L); /* finish interrupted instruction */
- luaV_execute(L); /* execute down to higher C 'boundary' */
- }
- }
+ UNUSED(ud);
+ for (;;) {
+ if (L->ci == &L->base_ci) /* stack is empty? */
+ return; /* coroutine finished normally */
+ if (!isLua(L->ci)) /* C function? */
+ finishCcall(L);
+ else { /* Lua function */
+ luaV_finishOp(L); /* finish interrupted instruction */
+ luaV_execute(L); /* execute down to higher C 'boundary' */
+ }
+ }
}
@@ -449,31 +449,31 @@ static void unroll (lua_State *L, void *ud) {
** check whether thread has a suspended protected call
*/
static CallInfo *findpcall (lua_State *L) {
- CallInfo *ci;
- for (ci = L->ci; ci != NULL; ci = ci->previous) { /* search for a pcall */
- if (ci->callstatus & CIST_YPCALL)
- return ci;
- }
- return NULL; /* no pending pcall */
+ CallInfo *ci;
+ for (ci = L->ci; ci != NULL; ci = ci->previous) { /* search for a pcall */
+ if (ci->callstatus & CIST_YPCALL)
+ return ci;
+ }
+ return NULL; /* no pending pcall */
}
static int recover (lua_State *L, int status) {
- StkId oldtop;
- CallInfo *ci = findpcall(L);
- if (ci == NULL) return 0; /* no recovery point */
- /* "finish" luaD_pcall */
- oldtop = restorestack(L, ci->extra);
- luaF_close(L, oldtop);
- seterrorobj(L, status, oldtop);
- L->ci = ci;
- L->allowhook = ci->u.c.old_allowhook;
- L->nny = 0; /* should be zero to be yieldable */
- luaD_shrinkstack(L);
- L->errfunc = ci->u.c.old_errfunc;
- ci->callstatus |= CIST_STAT; /* call has error status */
- ci->u.c.status = status; /* (here it is) */
- return 1; /* continue running the coroutine */
+ StkId oldtop;
+ CallInfo *ci = findpcall(L);
+ if (ci == NULL) return 0; /* no recovery point */
+ /* "finish" luaD_pcall */
+ oldtop = restorestack(L, ci->extra);
+ luaF_close(L, oldtop);
+ seterrorobj(L, status, oldtop);
+ L->ci = ci;
+ L->allowhook = ci->u.c.old_allowhook;
+ L->nny = 0; /* should be zero to be yieldable */
+ luaD_shrinkstack(L);
+ L->errfunc = ci->u.c.old_errfunc;
+ ci->callstatus |= CIST_STAT; /* call has error status */
+ ci->u.c.status = status; /* (here it is) */
+ return 1; /* continue running the coroutine */
}
@@ -483,10 +483,10 @@ static int recover (lua_State *L, int status) {
** error handler and should not kill the coroutine.)
*/
static l_noret resume_error (lua_State *L, const char *msg, StkId firstArg) {
- L->top = firstArg; /* remove args from the stack */
- setsvalue2s(L, L->top, luaS_new(L, msg)); /* push error message */
- api_incr_top(L);
- luaD_throw(L, -1); /* jump back to 'lua_resume' */
+ L->top = firstArg; /* remove args from the stack */
+ setsvalue2s(L, L->top, luaS_new(L, msg)); /* push error message */
+ api_incr_top(L);
+ luaD_throw(L, -1); /* jump back to 'lua_resume' */
}
@@ -494,124 +494,124 @@ static l_noret resume_error (lua_State *L, const char *msg, StkId firstArg) {
** do the work for 'lua_resume' in protected mode
*/
static void resume (lua_State *L, void *ud) {
- int nCcalls = L->nCcalls;
- StkId firstArg = cast(StkId, ud);
- CallInfo *ci = L->ci;
- if (nCcalls >= LUAI_MAXCCALLS)
- resume_error(L, "C stack overflow", firstArg);
- if (L->status == LUA_OK) { /* may be starting a coroutine */
- if (ci != &L->base_ci) /* not in base level? */
- resume_error(L, "cannot resume non-suspended coroutine", firstArg);
- /* coroutine is in base level; start running it */
- if (!luaD_precall(L, firstArg - 1, LUA_MULTRET)) /* Lua function? */
- luaV_execute(L); /* call it */
- }
- else if (L->status != LUA_YIELD)
- resume_error(L, "cannot resume dead coroutine", firstArg);
- else { /* resuming from previous yield */
- L->status = LUA_OK;
- ci->func = restorestack(L, ci->extra);
- if (isLua(ci)) /* yielded inside a hook? */
- luaV_execute(L); /* just continue running Lua code */
- else { /* 'common' yield */
- if (ci->u.c.k != NULL) { /* does it have a continuation? */
- int n;
- ci->u.c.status = LUA_YIELD; /* 'default' status */
- ci->callstatus |= CIST_YIELDED;
- lua_unlock(L);
- n = (*ci->u.c.k)(L); /* call continuation */
- lua_lock(L);
- api_checknelems(L, n);
- firstArg = L->top - n; /* yield results come from continuation */
- }
- luaD_poscall(L, firstArg); /* finish 'luaD_precall' */
- }
- unroll(L, NULL);
- }
- lua_assert(nCcalls == L->nCcalls);
+ int nCcalls = L->nCcalls;
+ StkId firstArg = cast(StkId, ud);
+ CallInfo *ci = L->ci;
+ if (nCcalls >= LUAI_MAXCCALLS)
+ resume_error(L, "C stack overflow", firstArg);
+ if (L->status == LUA_OK) { /* may be starting a coroutine */
+ if (ci != &L->base_ci) /* not in base level? */
+ resume_error(L, "cannot resume non-suspended coroutine", firstArg);
+ /* coroutine is in base level; start running it */
+ if (!luaD_precall(L, firstArg - 1, LUA_MULTRET)) /* Lua function? */
+ luaV_execute(L); /* call it */
+ }
+ else if (L->status != LUA_YIELD)
+ resume_error(L, "cannot resume dead coroutine", firstArg);
+ else { /* resuming from previous yield */
+ L->status = LUA_OK;
+ ci->func = restorestack(L, ci->extra);
+ if (isLua(ci)) /* yielded inside a hook? */
+ luaV_execute(L); /* just continue running Lua code */
+ else { /* 'common' yield */
+ if (ci->u.c.k != NULL) { /* does it have a continuation? */
+ int n;
+ ci->u.c.status = LUA_YIELD; /* 'default' status */
+ ci->callstatus |= CIST_YIELDED;
+ lua_unlock(L);
+ n = (*ci->u.c.k)(L); /* call continuation */
+ lua_lock(L);
+ api_checknelems(L, n);
+ firstArg = L->top - n; /* yield results come from continuation */
+ }
+ luaD_poscall(L, firstArg); /* finish 'luaD_precall' */
+ }
+ unroll(L, NULL);
+ }
+ lua_assert(nCcalls == L->nCcalls);
}
LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
- int status;
- int oldnny = L->nny; /* save 'nny' */
- lua_lock(L);
- luai_userstateresume(L, nargs);
- L->nCcalls = (from) ? from->nCcalls + 1 : 1;
- L->nny = 0; /* allow yields */
- api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
- status = luaD_rawrunprotected(L, resume, L->top - nargs);
- if (status == -1) /* error calling 'lua_resume'? */
- status = LUA_ERRRUN;
- else { /* yield or regular error */
- while (status != LUA_OK && status != LUA_YIELD) { /* error? */
- if (recover(L, status)) /* recover point? */
- status = luaD_rawrunprotected(L, unroll, NULL); /* run continuation */
- else { /* unrecoverable error */
- L->status = cast_byte(status); /* mark thread as `dead' */
- seterrorobj(L, status, L->top);
- L->ci->top = L->top;
- break;
- }
- }
- lua_assert(status == L->status);
- }
- L->nny = oldnny; /* restore 'nny' */
- L->nCcalls--;
- lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0));
- lua_unlock(L);
- return status;
+ int status;
+ int oldnny = L->nny; /* save 'nny' */
+ lua_lock(L);
+ luai_userstateresume(L, nargs);
+ L->nCcalls = (from) ? from->nCcalls + 1 : 1;
+ L->nny = 0; /* allow yields */
+ api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
+ status = luaD_rawrunprotected(L, resume, L->top - nargs);
+ if (status == -1) /* error calling 'lua_resume'? */
+ status = LUA_ERRRUN;
+ else { /* yield or regular error */
+ while (status != LUA_OK && status != LUA_YIELD) { /* error? */
+ if (recover(L, status)) /* recover point? */
+ status = luaD_rawrunprotected(L, unroll, NULL); /* run continuation */
+ else { /* unrecoverable error */
+ L->status = cast_byte(status); /* mark thread as `dead' */
+ seterrorobj(L, status, L->top);
+ L->ci->top = L->top;
+ break;
+ }
+ }
+ lua_assert(status == L->status);
+ }
+ L->nny = oldnny; /* restore 'nny' */
+ L->nCcalls--;
+ lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0));
+ lua_unlock(L);
+ return status;
}
LUA_API int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k) {
- CallInfo *ci = L->ci;
- luai_userstateyield(L, nresults);
- lua_lock(L);
- api_checknelems(L, nresults);
- if (L->nny > 0) {
- if (L != G(L)->mainthread)
- luaG_runerror(L, "attempt to yield across a C-call boundary");
- else
- luaG_runerror(L, "attempt to yield from outside a coroutine");
- }
- L->status = LUA_YIELD;
- ci->extra = savestack(L, ci->func); /* save current 'func' */
- if (isLua(ci)) { /* inside a hook? */
- api_check(L, k == NULL, "hooks cannot continue after yielding");
- }
- else {
- if ((ci->u.c.k = k) != NULL) /* is there a continuation? */
- ci->u.c.ctx = ctx; /* save context */
- ci->func = L->top - nresults - 1; /* protect stack below results */
- luaD_throw(L, LUA_YIELD);
- }
- lua_assert(ci->callstatus & CIST_HOOKED); /* must be inside a hook */
- lua_unlock(L);
- return 0; /* return to 'luaD_hook' */
+ CallInfo *ci = L->ci;
+ luai_userstateyield(L, nresults);
+ lua_lock(L);
+ api_checknelems(L, nresults);
+ if (L->nny > 0) {
+ if (L != G(L)->mainthread)
+ luaG_runerror(L, "attempt to yield across a C-call boundary");
+ else
+ luaG_runerror(L, "attempt to yield from outside a coroutine");
+ }
+ L->status = LUA_YIELD;
+ ci->extra = savestack(L, ci->func); /* save current 'func' */
+ if (isLua(ci)) { /* inside a hook? */
+ api_check(L, k == NULL, "hooks cannot continue after yielding");
+ }
+ else {
+ if ((ci->u.c.k = k) != NULL) /* is there a continuation? */
+ ci->u.c.ctx = ctx; /* save context */
+ ci->func = L->top - nresults - 1; /* protect stack below results */
+ luaD_throw(L, LUA_YIELD);
+ }
+ lua_assert(ci->callstatus & CIST_HOOKED); /* must be inside a hook */
+ lua_unlock(L);
+ return 0; /* return to 'luaD_hook' */
}
int luaD_pcall (lua_State *L, Pfunc func, void *u,
- ptrdiff_t old_top, ptrdiff_t ef) {
- int status;
- CallInfo *old_ci = L->ci;
- lu_byte old_allowhooks = L->allowhook;
- unsigned short old_nny = L->nny;
- ptrdiff_t old_errfunc = L->errfunc;
- L->errfunc = ef;
- status = luaD_rawrunprotected(L, func, u);
- if (status != LUA_OK) { /* an error occurred? */
- StkId oldtop = restorestack(L, old_top);
- luaF_close(L, oldtop); /* close possible pending closures */
- seterrorobj(L, status, oldtop);
- L->ci = old_ci;
- L->allowhook = old_allowhooks;
- L->nny = old_nny;
- luaD_shrinkstack(L);
- }
- L->errfunc = old_errfunc;
- return status;
+ ptrdiff_t old_top, ptrdiff_t ef) {
+ int status;
+ CallInfo *old_ci = L->ci;
+ lu_byte old_allowhooks = L->allowhook;
+ unsigned short old_nny = L->nny;
+ ptrdiff_t old_errfunc = L->errfunc;
+ L->errfunc = ef;
+ status = luaD_rawrunprotected(L, func, u);
+ if (status != LUA_OK) { /* an error occurred? */
+ StkId oldtop = restorestack(L, old_top);
+ luaF_close(L, oldtop); /* close possible pending closures */
+ seterrorobj(L, status, oldtop);
+ L->ci = old_ci;
+ L->allowhook = old_allowhooks;
+ L->nny = old_nny;
+ luaD_shrinkstack(L);
+ }
+ L->errfunc = old_errfunc;
+ return status;
}
@@ -620,62 +620,60 @@ int luaD_pcall (lua_State *L, Pfunc func, void *u,
** Execute a protected parser.
*/
struct SParser { /* data to `f_parser' */
- ZIO *z;
- Mbuffer buff; /* dynamic structure used by the scanner */
- Dyndata dyd; /* dynamic structures used by the parser */
- const char *mode;
- const char *name;
+ ZIO *z;
+ Mbuffer buff; /* dynamic structure used by the scanner */
+ Dyndata dyd; /* dynamic structures used by the parser */
+ const char *mode;
+ const char *name;
};
static void checkmode (lua_State *L, const char *mode, const char *x) {
- if (mode && strchr(mode, x[0]) == NULL) {
- luaO_pushfstring(L,
- "attempt to load a %s chunk (mode is " LUA_QS ")", x, mode);
- luaD_throw(L, LUA_ERRSYNTAX);
- }
+ if (mode && strchr(mode, x[0]) == NULL) {
+ luaO_pushfstring(L,
+ "attempt to load a %s chunk (mode is " LUA_QS ")", x, mode);
+ luaD_throw(L, LUA_ERRSYNTAX);
+ }
}
static void f_parser (lua_State *L, void *ud) {
- int i;
- Closure *cl;
- struct SParser *p = cast(struct SParser *, ud);
- int c = zgetc(p->z); /* read first character */
- if (c == LUA_SIGNATURE[0]) {
- checkmode(L, p->mode, "binary");
- cl = luaU_undump(L, p->z, &p->buff, p->name);
- }
- else {
- checkmode(L, p->mode, "text");
- cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
- }
- lua_assert(cl->l.nupvalues == cl->l.p->sizeupvalues);
- for (i = 0; i < cl->l.nupvalues; i++) { /* initialize upvalues */
- UpVal *up = luaF_newupval(L);
- cl->l.upvals[i] = up;
- luaC_objbarrier(L, cl, up);
- }
+ int i;
+ Closure *cl;
+ struct SParser *p = cast(struct SParser *, ud);
+ int c = zgetc(p->z); /* read first character */
+ if (c == LUA_SIGNATURE[0]) {
+ checkmode(L, p->mode, "binary");
+ cl = luaU_undump(L, p->z, &p->buff, p->name);
+ }
+ else {
+ checkmode(L, p->mode, "text");
+ cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
+ }
+ lua_assert(cl->l.nupvalues == cl->l.p->sizeupvalues);
+ for (i = 0; i < cl->l.nupvalues; i++) { /* initialize upvalues */
+ UpVal *up = luaF_newupval(L);
+ cl->l.upvals[i] = up;
+ luaC_objbarrier(L, cl, up);
+ }
}
int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
- const char *mode) {
- struct SParser p;
- int status;
- L->nny++; /* cannot yield during parsing */
- p.z = z; p.name = name; p.mode = mode;
- p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
- p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
- p.dyd.label.arr = NULL; p.dyd.label.size = 0;
- luaZ_initbuffer(L, &p.buff);
- status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc);
- luaZ_freebuffer(L, &p.buff);
- luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size);
- luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
- luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
- L->nny--;
- return status;
+ const char *mode) {
+ struct SParser p;
+ int status;
+ L->nny++; /* cannot yield during parsing */
+ p.z = z; p.name = name; p.mode = mode;
+ p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
+ p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
+ p.dyd.label.arr = NULL; p.dyd.label.size = 0;
+ luaZ_initbuffer(L, &p.buff);
+ status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc);
+ luaZ_freebuffer(L, &p.buff);
+ luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size);
+ luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
+ luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
+ L->nny--;
+ return status;
}
-
-
diff --git a/src/lib/lua/ldump.c b/src/lib/lua/ldump.c
index 61fa2cd892d..67e02ddaf3b 100644
--- a/src/lib/lua/ldump.c
+++ b/src/lib/lua/ldump.c
@@ -16,144 +16,144 @@
#include "lundump.h"
typedef struct {
- lua_State* L;
- lua_Writer writer;
- void* data;
- int strip;
- int status;
+ lua_State* L;
+ lua_Writer writer;
+ void* data;
+ int strip;
+ int status;
} DumpState;
-#define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D)
-#define DumpVar(x,D) DumpMem(&x,1,sizeof(x),D)
+#define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D)
+#define DumpVar(x,D) DumpMem(&x,1,sizeof(x),D)
static void DumpBlock(const void* b, size_t size, DumpState* D)
{
- if (D->status==0)
- {
- lua_unlock(D->L);
- D->status=(*D->writer)(D->L,b,size,D->data);
- lua_lock(D->L);
- }
+ if (D->status==0)
+ {
+ lua_unlock(D->L);
+ D->status=(*D->writer)(D->L,b,size,D->data);
+ lua_lock(D->L);
+ }
}
static void DumpChar(int y, DumpState* D)
{
- char x=(char)y;
- DumpVar(x,D);
+ char x=(char)y;
+ DumpVar(x,D);
}
static void DumpInt(int x, DumpState* D)
{
- DumpVar(x,D);
+ DumpVar(x,D);
}
static void DumpNumber(lua_Number x, DumpState* D)
{
- DumpVar(x,D);
+ DumpVar(x,D);
}
static void DumpVector(const void* b, int n, size_t size, DumpState* D)
{
- DumpInt(n,D);
- DumpMem(b,n,size,D);
+ DumpInt(n,D);
+ DumpMem(b,n,size,D);
}
static void DumpString(const TString* s, DumpState* D)
{
- if (s==NULL)
- {
- size_t size=0;
- DumpVar(size,D);
- }
- else
- {
- size_t size=s->tsv.len+1; /* include trailing '\0' */
- DumpVar(size,D);
- DumpBlock(getstr(s),size*sizeof(char),D);
- }
+ if (s==NULL)
+ {
+ size_t size=0;
+ DumpVar(size,D);
+ }
+ else
+ {
+ size_t size=s->tsv.len+1; /* include trailing '\0' */
+ DumpVar(size,D);
+ DumpBlock(getstr(s),size*sizeof(char),D);
+ }
}
-#define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
+#define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
static void DumpFunction(const Proto* f, DumpState* D);
static void DumpConstants(const Proto* f, DumpState* D)
{
- int i,n=f->sizek;
- DumpInt(n,D);
- for (i=0; i<n; i++)
- {
- const TValue* o=&f->k[i];
- DumpChar(ttypenv(o),D);
- switch (ttypenv(o))
- {
- case LUA_TNIL:
+ int i,n=f->sizek;
+ DumpInt(n,D);
+ for (i=0; i<n; i++)
+ {
+ const TValue* o=&f->k[i];
+ DumpChar(ttypenv(o),D);
+ switch (ttypenv(o))
+ {
+ case LUA_TNIL:
break;
- case LUA_TBOOLEAN:
+ case LUA_TBOOLEAN:
DumpChar(bvalue(o),D);
break;
- case LUA_TNUMBER:
+ case LUA_TNUMBER:
DumpNumber(nvalue(o),D);
break;
- case LUA_TSTRING:
+ case LUA_TSTRING:
DumpString(rawtsvalue(o),D);
break;
- default: lua_assert(0);
- }
- }
- n=f->sizep;
- DumpInt(n,D);
- for (i=0; i<n; i++) DumpFunction(f->p[i],D);
+ default: lua_assert(0);
+ }
+ }
+ n=f->sizep;
+ DumpInt(n,D);
+ for (i=0; i<n; i++) DumpFunction(f->p[i],D);
}
static void DumpUpvalues(const Proto* f, DumpState* D)
{
- int i,n=f->sizeupvalues;
- DumpInt(n,D);
- for (i=0; i<n; i++)
- {
- DumpChar(f->upvalues[i].instack,D);
- DumpChar(f->upvalues[i].idx,D);
- }
+ int i,n=f->sizeupvalues;
+ DumpInt(n,D);
+ for (i=0; i<n; i++)
+ {
+ DumpChar(f->upvalues[i].instack,D);
+ DumpChar(f->upvalues[i].idx,D);
+ }
}
static void DumpDebug(const Proto* f, DumpState* D)
{
- int i,n;
- DumpString((D->strip) ? NULL : f->source,D);
- n= (D->strip) ? 0 : f->sizelineinfo;
- DumpVector(f->lineinfo,n,sizeof(int),D);
- n= (D->strip) ? 0 : f->sizelocvars;
- DumpInt(n,D);
- for (i=0; i<n; i++)
- {
- DumpString(f->locvars[i].varname,D);
- DumpInt(f->locvars[i].startpc,D);
- DumpInt(f->locvars[i].endpc,D);
- }
- n= (D->strip) ? 0 : f->sizeupvalues;
- DumpInt(n,D);
- for (i=0; i<n; i++) DumpString(f->upvalues[i].name,D);
+ int i,n;
+ DumpString((D->strip) ? NULL : f->source,D);
+ n= (D->strip) ? 0 : f->sizelineinfo;
+ DumpVector(f->lineinfo,n,sizeof(int),D);
+ n= (D->strip) ? 0 : f->sizelocvars;
+ DumpInt(n,D);
+ for (i=0; i<n; i++)
+ {
+ DumpString(f->locvars[i].varname,D);
+ DumpInt(f->locvars[i].startpc,D);
+ DumpInt(f->locvars[i].endpc,D);
+ }
+ n= (D->strip) ? 0 : f->sizeupvalues;
+ DumpInt(n,D);
+ for (i=0; i<n; i++) DumpString(f->upvalues[i].name,D);
}
static void DumpFunction(const Proto* f, DumpState* D)
{
- DumpInt(f->linedefined,D);
- DumpInt(f->lastlinedefined,D);
- DumpChar(f->numparams,D);
- DumpChar(f->is_vararg,D);
- DumpChar(f->maxstacksize,D);
- DumpCode(f,D);
- DumpConstants(f,D);
- DumpUpvalues(f,D);
- DumpDebug(f,D);
+ DumpInt(f->linedefined,D);
+ DumpInt(f->lastlinedefined,D);
+ DumpChar(f->numparams,D);
+ DumpChar(f->is_vararg,D);
+ DumpChar(f->maxstacksize,D);
+ DumpCode(f,D);
+ DumpConstants(f,D);
+ DumpUpvalues(f,D);
+ DumpDebug(f,D);
}
static void DumpHeader(DumpState* D)
{
- lu_byte h[LUAC_HEADERSIZE];
- luaU_header(h);
- DumpBlock(h,LUAC_HEADERSIZE,D);
+ lu_byte h[LUAC_HEADERSIZE];
+ luaU_header(h);
+ DumpBlock(h,LUAC_HEADERSIZE,D);
}
/*
@@ -161,13 +161,13 @@ static void DumpHeader(DumpState* D)
*/
int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip)
{
- DumpState D;
- D.L=L;
- D.writer=w;
- D.data=data;
- D.strip=strip;
- D.status=0;
- DumpHeader(&D);
- DumpFunction(f,&D);
- return D.status;
+ DumpState D;
+ D.L=L;
+ D.writer=w;
+ D.data=data;
+ D.strip=strip;
+ D.status=0;
+ DumpHeader(&D);
+ DumpFunction(f,&D);
+ return D.status;
}
diff --git a/src/lib/lua/lfunc.c b/src/lib/lua/lfunc.c
index e90e1520ce9..ef96b0c79df 100644
--- a/src/lib/lua/lfunc.c
+++ b/src/lib/lua/lfunc.c
@@ -21,125 +21,125 @@
Closure *luaF_newCclosure (lua_State *L, int n) {
- Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl;
- c->c.nupvalues = cast_byte(n);
- return c;
+ Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl;
+ c->c.nupvalues = cast_byte(n);
+ return c;
}
Closure *luaF_newLclosure (lua_State *L, int n) {
- Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl;
- c->l.p = NULL;
- c->l.nupvalues = cast_byte(n);
- while (n--) c->l.upvals[n] = NULL;
- return c;
+ Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl;
+ c->l.p = NULL;
+ c->l.nupvalues = cast_byte(n);
+ while (n--) c->l.upvals[n] = NULL;
+ return c;
}
UpVal *luaF_newupval (lua_State *L) {
- UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv;
- uv->v = &uv->u.value;
- setnilvalue(uv->v);
- return uv;
+ UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv;
+ uv->v = &uv->u.value;
+ setnilvalue(uv->v);
+ return uv;
}
UpVal *luaF_findupval (lua_State *L, StkId level) {
- global_State *g = G(L);
- GCObject **pp = &L->openupval;
- UpVal *p;
- UpVal *uv;
- while (*pp != NULL && (p = gco2uv(*pp))->v >= level) {
- GCObject *o = obj2gco(p);
- lua_assert(p->v != &p->u.value);
- lua_assert(!isold(o) || isold(obj2gco(L)));
- if (p->v == level) { /* found a corresponding upvalue? */
- if (isdead(g, o)) /* is it dead? */
- changewhite(o); /* resurrect it */
- return p;
- }
- pp = &p->next;
- }
- /* not found: create a new one */
- uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv;
- uv->v = level; /* current value lives in the stack */
- uv->u.l.prev = &g->uvhead; /* double link it in `uvhead' list */
- uv->u.l.next = g->uvhead.u.l.next;
- uv->u.l.next->u.l.prev = uv;
- g->uvhead.u.l.next = uv;
- lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
- return uv;
+ global_State *g = G(L);
+ GCObject **pp = &L->openupval;
+ UpVal *p;
+ UpVal *uv;
+ while (*pp != NULL && (p = gco2uv(*pp))->v >= level) {
+ GCObject *o = obj2gco(p);
+ lua_assert(p->v != &p->u.value);
+ lua_assert(!isold(o) || isold(obj2gco(L)));
+ if (p->v == level) { /* found a corresponding upvalue? */
+ if (isdead(g, o)) /* is it dead? */
+ changewhite(o); /* resurrect it */
+ return p;
+ }
+ pp = &p->next;
+ }
+ /* not found: create a new one */
+ uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv;
+ uv->v = level; /* current value lives in the stack */
+ uv->u.l.prev = &g->uvhead; /* double link it in `uvhead' list */
+ uv->u.l.next = g->uvhead.u.l.next;
+ uv->u.l.next->u.l.prev = uv;
+ g->uvhead.u.l.next = uv;
+ lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+ return uv;
}
static void unlinkupval (UpVal *uv) {
- lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
- uv->u.l.next->u.l.prev = uv->u.l.prev; /* remove from `uvhead' list */
- uv->u.l.prev->u.l.next = uv->u.l.next;
+ lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+ uv->u.l.next->u.l.prev = uv->u.l.prev; /* remove from `uvhead' list */
+ uv->u.l.prev->u.l.next = uv->u.l.next;
}
void luaF_freeupval (lua_State *L, UpVal *uv) {
- if (uv->v != &uv->u.value) /* is it open? */
- unlinkupval(uv); /* remove from open list */
- luaM_free(L, uv); /* free upvalue */
+ if (uv->v != &uv->u.value) /* is it open? */
+ unlinkupval(uv); /* remove from open list */
+ luaM_free(L, uv); /* free upvalue */
}
void luaF_close (lua_State *L, StkId level) {
- UpVal *uv;
- global_State *g = G(L);
- while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) {
- GCObject *o = obj2gco(uv);
- lua_assert(!isblack(o) && uv->v != &uv->u.value);
- L->openupval = uv->next; /* remove from `open' list */
- if (isdead(g, o))
- luaF_freeupval(L, uv); /* free upvalue */
- else {
- unlinkupval(uv); /* remove upvalue from 'uvhead' list */
- setobj(L, &uv->u.value, uv->v); /* move value to upvalue slot */
- uv->v = &uv->u.value; /* now current value lives here */
- gch(o)->next = g->allgc; /* link upvalue into 'allgc' list */
- g->allgc = o;
- luaC_checkupvalcolor(g, uv);
- }
- }
+ UpVal *uv;
+ global_State *g = G(L);
+ while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) {
+ GCObject *o = obj2gco(uv);
+ lua_assert(!isblack(o) && uv->v != &uv->u.value);
+ L->openupval = uv->next; /* remove from `open' list */
+ if (isdead(g, o))
+ luaF_freeupval(L, uv); /* free upvalue */
+ else {
+ unlinkupval(uv); /* remove upvalue from 'uvhead' list */
+ setobj(L, &uv->u.value, uv->v); /* move value to upvalue slot */
+ uv->v = &uv->u.value; /* now current value lives here */
+ gch(o)->next = g->allgc; /* link upvalue into 'allgc' list */
+ g->allgc = o;
+ luaC_checkupvalcolor(g, uv);
+ }
+ }
}
Proto *luaF_newproto (lua_State *L) {
- Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p;
- f->k = NULL;
- f->sizek = 0;
- f->p = NULL;
- f->sizep = 0;
- f->code = NULL;
- f->cache = NULL;
- f->sizecode = 0;
- f->lineinfo = NULL;
- f->sizelineinfo = 0;
- f->upvalues = NULL;
- f->sizeupvalues = 0;
- f->numparams = 0;
- f->is_vararg = 0;
- f->maxstacksize = 0;
- f->locvars = NULL;
- f->sizelocvars = 0;
- f->linedefined = 0;
- f->lastlinedefined = 0;
- f->source = NULL;
- return f;
+ Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p;
+ f->k = NULL;
+ f->sizek = 0;
+ f->p = NULL;
+ f->sizep = 0;
+ f->code = NULL;
+ f->cache = NULL;
+ f->sizecode = 0;
+ f->lineinfo = NULL;
+ f->sizelineinfo = 0;
+ f->upvalues = NULL;
+ f->sizeupvalues = 0;
+ f->numparams = 0;
+ f->is_vararg = 0;
+ f->maxstacksize = 0;
+ f->locvars = NULL;
+ f->sizelocvars = 0;
+ f->linedefined = 0;
+ f->lastlinedefined = 0;
+ f->source = NULL;
+ return f;
}
void luaF_freeproto (lua_State *L, Proto *f) {
- luaM_freearray(L, f->code, f->sizecode);
- luaM_freearray(L, f->p, f->sizep);
- luaM_freearray(L, f->k, f->sizek);
- luaM_freearray(L, f->lineinfo, f->sizelineinfo);
- luaM_freearray(L, f->locvars, f->sizelocvars);
- luaM_freearray(L, f->upvalues, f->sizeupvalues);
- luaM_free(L, f);
+ luaM_freearray(L, f->code, f->sizecode);
+ luaM_freearray(L, f->p, f->sizep);
+ luaM_freearray(L, f->k, f->sizek);
+ luaM_freearray(L, f->lineinfo, f->sizelineinfo);
+ luaM_freearray(L, f->locvars, f->sizelocvars);
+ luaM_freearray(L, f->upvalues, f->sizeupvalues);
+ luaM_free(L, f);
}
@@ -148,14 +148,13 @@ void luaF_freeproto (lua_State *L, Proto *f) {
** Returns NULL if not found.
*/
const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
- int i;
- for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
- if (pc < f->locvars[i].endpc) { /* is variable active? */
- local_number--;
- if (local_number == 0)
- return getstr(f->locvars[i].varname);
- }
- }
- return NULL; /* not found */
+ int i;
+ for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
+ if (pc < f->locvars[i].endpc) { /* is variable active? */
+ local_number--;
+ if (local_number == 0)
+ return getstr(f->locvars[i].varname);
+ }
+ }
+ return NULL; /* not found */
}
-
diff --git a/src/lib/lua/lgc.c b/src/lib/lua/lgc.c
index 52460dcdd5a..8a66edef768 100644
--- a/src/lib/lua/lgc.c
+++ b/src/lib/lua/lgc.c
@@ -28,52 +28,52 @@
** cost of sweeping one element (the size of a small object divided
** by some adjust for the sweep speed)
*/
-#define GCSWEEPCOST ((sizeof(TString) + 4) / 4)
+#define GCSWEEPCOST ((sizeof(TString) + 4) / 4)
/* maximum number of elements to sweep in each single step */
-#define GCSWEEPMAX (cast_int((GCSTEPSIZE / GCSWEEPCOST) / 4))
+#define GCSWEEPMAX (cast_int((GCSTEPSIZE / GCSWEEPCOST) / 4))
/* maximum number of finalizers to call in each GC step */
-#define GCFINALIZENUM 4
+#define GCFINALIZENUM 4
/*
** macro to adjust 'stepmul': 'stepmul' is actually used like
** 'stepmul / STEPMULADJ' (value chosen by tests)
*/
-#define STEPMULADJ 200
+#define STEPMULADJ 200
/*
** macro to adjust 'pause': 'pause' is actually used like
** 'pause / PAUSEADJ' (value chosen by tests)
*/
-#define PAUSEADJ 100
+#define PAUSEADJ 100
/*
** 'makewhite' erases all color bits plus the old bit and then
** sets only the current white bit
*/
-#define maskcolors (~(bit2mask(BLACKBIT, OLDBIT) | WHITEBITS))
-#define makewhite(g,x) \
- (gch(x)->marked = cast_byte((gch(x)->marked & maskcolors) | luaC_white(g)))
+#define maskcolors (~(bit2mask(BLACKBIT, OLDBIT) | WHITEBITS))
+#define makewhite(g,x) \
+ (gch(x)->marked = cast_byte((gch(x)->marked & maskcolors) | luaC_white(g)))
-#define white2gray(x) resetbits(gch(x)->marked, WHITEBITS)
-#define black2gray(x) resetbit(gch(x)->marked, BLACKBIT)
+#define white2gray(x) resetbits(gch(x)->marked, WHITEBITS)
+#define black2gray(x) resetbit(gch(x)->marked, BLACKBIT)
-#define isfinalized(x) testbit(gch(x)->marked, FINALIZEDBIT)
+#define isfinalized(x) testbit(gch(x)->marked, FINALIZEDBIT)
-#define checkdeadkey(n) lua_assert(!ttisdeadkey(gkey(n)) || ttisnil(gval(n)))
+#define checkdeadkey(n) lua_assert(!ttisdeadkey(gkey(n)) || ttisnil(gval(n)))
#define checkconsistency(obj) \
- lua_longassert(!iscollectable(obj) || righttt(obj))
+ lua_longassert(!iscollectable(obj) || righttt(obj))
#define markvalue(g,o) { checkconsistency(o); \
- if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
+ if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
#define markobject(g,t) { if ((t) && iswhite(obj2gco(t))) \
reallymarkobject(g, obj2gco(t)); }
@@ -91,13 +91,13 @@ static void reallymarkobject (global_State *g, GCObject *o);
/*
** one after last element in a hash array
*/
-#define gnodelast(h) gnode(h, cast(size_t, sizenode(h)))
+#define gnodelast(h) gnode(h, cast(size_t, sizenode(h)))
/*
** link table 'h' into list pointed by 'p'
*/
-#define linktable(h,p) ((h)->gclist = *(p), *(p) = obj2gco(h))
+#define linktable(h,p) ((h)->gclist = *(p), *(p) = obj2gco(h))
/*
@@ -105,9 +105,9 @@ static void reallymarkobject (global_State *g, GCObject *o);
** from the table)
*/
static void removeentry (Node *n) {
- lua_assert(ttisnil(gval(n)));
- if (valiswhite(gkey(n)))
- setdeadvalue(gkey(n)); /* unused and unmarked key; remove it */
+ lua_assert(ttisnil(gval(n)));
+ if (valiswhite(gkey(n)))
+ setdeadvalue(gkey(n)); /* unused and unmarked key; remove it */
}
@@ -119,12 +119,12 @@ static void removeentry (Node *n) {
** being finalized, keep them in keys, but not in values
*/
static int iscleared (global_State *g, const TValue *o) {
- if (!iscollectable(o)) return 0;
- else if (ttisstring(o)) {
- markobject(g, rawtsvalue(o)); /* strings are `values', so are never weak */
- return 0;
- }
- else return iswhite(gcvalue(o));
+ if (!iscollectable(o)) return 0;
+ else if (ttisstring(o)) {
+ markobject(g, rawtsvalue(o)); /* strings are `values', so are never weak */
+ return 0;
+ }
+ else return iswhite(gcvalue(o));
}
@@ -133,16 +133,16 @@ static int iscleared (global_State *g, const TValue *o) {
** being pointed by a black object.
*/
void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) {
- global_State *g = G(L);
- lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
- lua_assert(g->gcstate != GCSpause);
- lua_assert(gch(o)->tt != LUA_TTABLE);
- if (keepinvariantout(g)) /* must keep invariant? */
- reallymarkobject(g, v); /* restore invariant */
- else { /* sweep phase */
- lua_assert(issweepphase(g));
- makewhite(g, o); /* mark main obj. as white to avoid other barriers */
- }
+ global_State *g = G(L);
+ lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
+ lua_assert(g->gcstate != GCSpause);
+ lua_assert(gch(o)->tt != LUA_TTABLE);
+ if (keepinvariantout(g)) /* must keep invariant? */
+ reallymarkobject(g, v); /* restore invariant */
+ else { /* sweep phase */
+ lua_assert(issweepphase(g));
+ makewhite(g, o); /* mark main obj. as white to avoid other barriers */
+ }
}
@@ -153,11 +153,11 @@ void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) {
** different types.)
*/
void luaC_barrierback_ (lua_State *L, GCObject *o) {
- global_State *g = G(L);
- lua_assert(isblack(o) && !isdead(g, o) && gch(o)->tt == LUA_TTABLE);
- black2gray(o); /* make object gray (again) */
- gco2t(o)->gclist = g->grayagain;
- g->grayagain = o;
+ global_State *g = G(L);
+ lua_assert(isblack(o) && !isdead(g, o) && gch(o)->tt == LUA_TTABLE);
+ black2gray(o); /* make object gray (again) */
+ gco2t(o)->gclist = g->grayagain;
+ g->grayagain = o;
}
@@ -170,16 +170,16 @@ void luaC_barrierback_ (lua_State *L, GCObject *o) {
** possible instances.
*/
LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c) {
- global_State *g = G(L);
- lua_assert(isblack(obj2gco(p)));
- if (p->cache == NULL) { /* first time? */
- luaC_objbarrier(L, p, c);
- }
- else { /* use a backward barrier */
- black2gray(obj2gco(p)); /* make prototype gray (again) */
- p->gclist = g->grayagain;
- g->grayagain = obj2gco(p);
- }
+ global_State *g = G(L);
+ lua_assert(isblack(obj2gco(p)));
+ if (p->cache == NULL) { /* first time? */
+ luaC_objbarrier(L, p, c);
+ }
+ else { /* use a backward barrier */
+ black2gray(obj2gco(p)); /* make prototype gray (again) */
+ p->gclist = g->grayagain;
+ g->grayagain = obj2gco(p);
+ }
}
@@ -188,19 +188,19 @@ LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c) {
** i.e., moved into the 'allgc' list
*/
void luaC_checkupvalcolor (global_State *g, UpVal *uv) {
- GCObject *o = obj2gco(uv);
- lua_assert(!isblack(o)); /* open upvalues are never black */
- if (isgray(o)) {
- if (keepinvariant(g)) {
- resetoldbit(o); /* see MOVE OLD rule */
- gray2black(o); /* it is being visited now */
- markvalue(g, uv->v);
- }
- else {
- lua_assert(issweepphase(g));
- makewhite(g, o);
- }
- }
+ GCObject *o = obj2gco(uv);
+ lua_assert(!isblack(o)); /* open upvalues are never black */
+ if (isgray(o)) {
+ if (keepinvariant(g)) {
+ resetoldbit(o); /* see MOVE OLD rule */
+ gray2black(o); /* it is being visited now */
+ markvalue(g, uv->v);
+ }
+ else {
+ lua_assert(issweepphase(g));
+ makewhite(g, o);
+ }
+ }
}
@@ -210,17 +210,17 @@ void luaC_checkupvalcolor (global_State *g, UpVal *uv) {
** object itself (used only by states).
*/
GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, GCObject **list,
- int offset) {
- global_State *g = G(L);
- char *raw = cast(char *, luaM_newobject(L, novariant(tt), sz));
- GCObject *o = obj2gco(raw + offset);
- if (list == NULL)
- list = &g->allgc; /* standard list for collectable objects */
- gch(o)->marked = luaC_white(g);
- gch(o)->tt = tt;
- gch(o)->next = *list;
- *list = o;
- return o;
+ int offset) {
+ global_State *g = G(L);
+ char *raw = cast(char *, luaM_newobject(L, novariant(tt), sz));
+ GCObject *o = obj2gco(raw + offset);
+ if (list == NULL)
+ list = &g->allgc; /* standard list for collectable objects */
+ gch(o)->marked = luaC_white(g);
+ gch(o)->tt = tt;
+ gch(o)->next = *list;
+ *list = o;
+ return o;
}
/* }====================================================== */
@@ -241,57 +241,57 @@ GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, GCObject **list,
** upvalues are already linked in 'headuv' list.)
*/
static void reallymarkobject (global_State *g, GCObject *o) {
- lu_mem size;
- white2gray(o);
- switch (gch(o)->tt) {
- case LUA_TSHRSTR:
- case LUA_TLNGSTR: {
- size = sizestring(gco2ts(o));
- break; /* nothing else to mark; make it black */
- }
- case LUA_TUSERDATA: {
- Table *mt = gco2u(o)->metatable;
- markobject(g, mt);
- markobject(g, gco2u(o)->env);
- size = sizeudata(gco2u(o));
- break;
- }
- case LUA_TUPVAL: {
- UpVal *uv = gco2uv(o);
- markvalue(g, uv->v);
- if (uv->v != &uv->u.value) /* open? */
- return; /* open upvalues remain gray */
- size = sizeof(UpVal);
- break;
- }
- case LUA_TLCL: {
- gco2lcl(o)->gclist = g->gray;
- g->gray = o;
- return;
- }
- case LUA_TCCL: {
- gco2ccl(o)->gclist = g->gray;
- g->gray = o;
- return;
- }
- case LUA_TTABLE: {
- linktable(gco2t(o), &g->gray);
- return;
- }
- case LUA_TTHREAD: {
- gco2th(o)->gclist = g->gray;
- g->gray = o;
- return;
- }
- case LUA_TPROTO: {
- gco2p(o)->gclist = g->gray;
- g->gray = o;
- return;
- }
- default: lua_assert(0); return;
- }
- gray2black(o);
- g->GCmemtrav += size;
+ lu_mem size;
+ white2gray(o);
+ switch (gch(o)->tt) {
+ case LUA_TSHRSTR:
+ case LUA_TLNGSTR: {
+ size = sizestring(gco2ts(o));
+ break; /* nothing else to mark; make it black */
+ }
+ case LUA_TUSERDATA: {
+ Table *mt = gco2u(o)->metatable;
+ markobject(g, mt);
+ markobject(g, gco2u(o)->env);
+ size = sizeudata(gco2u(o));
+ break;
+ }
+ case LUA_TUPVAL: {
+ UpVal *uv = gco2uv(o);
+ markvalue(g, uv->v);
+ if (uv->v != &uv->u.value) /* open? */
+ return; /* open upvalues remain gray */
+ size = sizeof(UpVal);
+ break;
+ }
+ case LUA_TLCL: {
+ gco2lcl(o)->gclist = g->gray;
+ g->gray = o;
+ return;
+ }
+ case LUA_TCCL: {
+ gco2ccl(o)->gclist = g->gray;
+ g->gray = o;
+ return;
+ }
+ case LUA_TTABLE: {
+ linktable(gco2t(o), &g->gray);
+ return;
+ }
+ case LUA_TTHREAD: {
+ gco2th(o)->gclist = g->gray;
+ g->gray = o;
+ return;
+ }
+ case LUA_TPROTO: {
+ gco2p(o)->gclist = g->gray;
+ g->gray = o;
+ return;
+ }
+ default: lua_assert(0); return;
+ }
+ gray2black(o);
+ g->GCmemtrav += size;
}
@@ -299,9 +299,9 @@ static void reallymarkobject (global_State *g, GCObject *o) {
** mark metamethods for basic types
*/
static void markmt (global_State *g) {
- int i;
- for (i=0; i < LUA_NUMTAGS; i++)
- markobject(g, g->mt[i]);
+ int i;
+ for (i=0; i < LUA_NUMTAGS; i++)
+ markobject(g, g->mt[i]);
}
@@ -309,11 +309,11 @@ static void markmt (global_State *g) {
** mark all objects in list of being-finalized
*/
static void markbeingfnz (global_State *g) {
- GCObject *o;
- for (o = g->tobefnz; o != NULL; o = gch(o)->next) {
- makewhite(g, o);
- reallymarkobject(g, o);
- }
+ GCObject *o;
+ for (o = g->tobefnz; o != NULL; o = gch(o)->next) {
+ makewhite(g, o);
+ reallymarkobject(g, o);
+ }
}
@@ -322,11 +322,11 @@ static void markbeingfnz (global_State *g) {
** 'lstate.h'.)
*/
static void remarkupvals (global_State *g) {
- UpVal *uv;
- for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) {
- if (isgray(obj2gco(uv)))
- markvalue(g, uv->v);
- }
+ UpVal *uv;
+ for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) {
+ if (isgray(obj2gco(uv)))
+ markvalue(g, uv->v);
+ }
}
@@ -335,12 +335,12 @@ static void remarkupvals (global_State *g) {
** incremental (or full) collection
*/
static void restartcollection (global_State *g) {
- g->gray = g->grayagain = NULL;
- g->weak = g->allweak = g->ephemeron = NULL;
- markobject(g, g->mainthread);
- markvalue(g, &g->l_registry);
- markmt(g);
- markbeingfnz(g); /* mark any finalizing object left from previous cycle */
+ g->gray = g->grayagain = NULL;
+ g->weak = g->allweak = g->ephemeron = NULL;
+ markobject(g, g->mainthread);
+ markvalue(g, &g->l_registry);
+ markmt(g);
+ markbeingfnz(g); /* mark any finalizing object left from previous cycle */
}
/* }====================================================== */
@@ -353,164 +353,164 @@ static void restartcollection (global_State *g) {
*/
static void traverseweakvalue (global_State *g, Table *h) {
- Node *n, *limit = gnodelast(h);
- /* if there is array part, assume it may have white values (do not
- traverse it just to check) */
- int hasclears = (h->sizearray > 0);
- for (n = gnode(h, 0); n < limit; n++) {
- checkdeadkey(n);
- if (ttisnil(gval(n))) /* entry is empty? */
- removeentry(n); /* remove it */
- else {
- lua_assert(!ttisnil(gkey(n)));
- markvalue(g, gkey(n)); /* mark key */
- if (!hasclears && iscleared(g, gval(n))) /* is there a white value? */
- hasclears = 1; /* table will have to be cleared */
- }
- }
- if (hasclears)
- linktable(h, &g->weak); /* has to be cleared later */
- else /* no white values */
- linktable(h, &g->grayagain); /* no need to clean */
+ Node *n, *limit = gnodelast(h);
+ /* if there is array part, assume it may have white values (do not
+ traverse it just to check) */
+ int hasclears = (h->sizearray > 0);
+ for (n = gnode(h, 0); n < limit; n++) {
+ checkdeadkey(n);
+ if (ttisnil(gval(n))) /* entry is empty? */
+ removeentry(n); /* remove it */
+ else {
+ lua_assert(!ttisnil(gkey(n)));
+ markvalue(g, gkey(n)); /* mark key */
+ if (!hasclears && iscleared(g, gval(n))) /* is there a white value? */
+ hasclears = 1; /* table will have to be cleared */
+ }
+ }
+ if (hasclears)
+ linktable(h, &g->weak); /* has to be cleared later */
+ else /* no white values */
+ linktable(h, &g->grayagain); /* no need to clean */
}
static int traverseephemeron (global_State *g, Table *h) {
- int marked = 0; /* true if an object is marked in this traversal */
- int hasclears = 0; /* true if table has white keys */
- int prop = 0; /* true if table has entry "white-key -> white-value" */
- Node *n, *limit = gnodelast(h);
- int i;
- /* traverse array part (numeric keys are 'strong') */
- for (i = 0; i < h->sizearray; i++) {
- if (valiswhite(&h->array[i])) {
- marked = 1;
- reallymarkobject(g, gcvalue(&h->array[i]));
- }
- }
- /* traverse hash part */
- for (n = gnode(h, 0); n < limit; n++) {
- checkdeadkey(n);
- if (ttisnil(gval(n))) /* entry is empty? */
- removeentry(n); /* remove it */
- else if (iscleared(g, gkey(n))) { /* key is not marked (yet)? */
- hasclears = 1; /* table must be cleared */
- if (valiswhite(gval(n))) /* value not marked yet? */
- prop = 1; /* must propagate again */
- }
- else if (valiswhite(gval(n))) { /* value not marked yet? */
- marked = 1;
- reallymarkobject(g, gcvalue(gval(n))); /* mark it now */
- }
- }
- if (prop)
- linktable(h, &g->ephemeron); /* have to propagate again */
- else if (hasclears) /* does table have white keys? */
- linktable(h, &g->allweak); /* may have to clean white keys */
- else /* no white keys */
- linktable(h, &g->grayagain); /* no need to clean */
- return marked;
+ int marked = 0; /* true if an object is marked in this traversal */
+ int hasclears = 0; /* true if table has white keys */
+ int prop = 0; /* true if table has entry "white-key -> white-value" */
+ Node *n, *limit = gnodelast(h);
+ int i;
+ /* traverse array part (numeric keys are 'strong') */
+ for (i = 0; i < h->sizearray; i++) {
+ if (valiswhite(&h->array[i])) {
+ marked = 1;
+ reallymarkobject(g, gcvalue(&h->array[i]));
+ }
+ }
+ /* traverse hash part */
+ for (n = gnode(h, 0); n < limit; n++) {
+ checkdeadkey(n);
+ if (ttisnil(gval(n))) /* entry is empty? */
+ removeentry(n); /* remove it */
+ else if (iscleared(g, gkey(n))) { /* key is not marked (yet)? */
+ hasclears = 1; /* table must be cleared */
+ if (valiswhite(gval(n))) /* value not marked yet? */
+ prop = 1; /* must propagate again */
+ }
+ else if (valiswhite(gval(n))) { /* value not marked yet? */
+ marked = 1;
+ reallymarkobject(g, gcvalue(gval(n))); /* mark it now */
+ }
+ }
+ if (prop)
+ linktable(h, &g->ephemeron); /* have to propagate again */
+ else if (hasclears) /* does table have white keys? */
+ linktable(h, &g->allweak); /* may have to clean white keys */
+ else /* no white keys */
+ linktable(h, &g->grayagain); /* no need to clean */
+ return marked;
}
static void traversestrongtable (global_State *g, Table *h) {
- Node *n, *limit = gnodelast(h);
- int i;
- for (i = 0; i < h->sizearray; i++) /* traverse array part */
- markvalue(g, &h->array[i]);
- for (n = gnode(h, 0); n < limit; n++) { /* traverse hash part */
- checkdeadkey(n);
- if (ttisnil(gval(n))) /* entry is empty? */
- removeentry(n); /* remove it */
- else {
- lua_assert(!ttisnil(gkey(n)));
- markvalue(g, gkey(n)); /* mark key */
- markvalue(g, gval(n)); /* mark value */
- }
- }
+ Node *n, *limit = gnodelast(h);
+ int i;
+ for (i = 0; i < h->sizearray; i++) /* traverse array part */
+ markvalue(g, &h->array[i]);
+ for (n = gnode(h, 0); n < limit; n++) { /* traverse hash part */
+ checkdeadkey(n);
+ if (ttisnil(gval(n))) /* entry is empty? */
+ removeentry(n); /* remove it */
+ else {
+ lua_assert(!ttisnil(gkey(n)));
+ markvalue(g, gkey(n)); /* mark key */
+ markvalue(g, gval(n)); /* mark value */
+ }
+ }
}
static lu_mem traversetable (global_State *g, Table *h) {
- const char *weakkey, *weakvalue;
- const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
- markobject(g, h->metatable);
- if (mode && ttisstring(mode) && /* is there a weak mode? */
- ((weakkey = strchr(svalue(mode), 'k')),
- (weakvalue = strchr(svalue(mode), 'v')),
- (weakkey || weakvalue))) { /* is really weak? */
- black2gray(obj2gco(h)); /* keep table gray */
- if (!weakkey) /* strong keys? */
- traverseweakvalue(g, h);
- else if (!weakvalue) /* strong values? */
- traverseephemeron(g, h);
- else /* all weak */
- linktable(h, &g->allweak); /* nothing to traverse now */
- }
- else /* not weak */
- traversestrongtable(g, h);
- return sizeof(Table) + sizeof(TValue) * h->sizearray +
- sizeof(Node) * cast(size_t, sizenode(h));
+ const char *weakkey, *weakvalue;
+ const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
+ markobject(g, h->metatable);
+ if (mode && ttisstring(mode) && /* is there a weak mode? */
+ ((weakkey = strchr(svalue(mode), 'k')),
+ (weakvalue = strchr(svalue(mode), 'v')),
+ (weakkey || weakvalue))) { /* is really weak? */
+ black2gray(obj2gco(h)); /* keep table gray */
+ if (!weakkey) /* strong keys? */
+ traverseweakvalue(g, h);
+ else if (!weakvalue) /* strong values? */
+ traverseephemeron(g, h);
+ else /* all weak */
+ linktable(h, &g->allweak); /* nothing to traverse now */
+ }
+ else /* not weak */
+ traversestrongtable(g, h);
+ return sizeof(Table) + sizeof(TValue) * h->sizearray +
+ sizeof(Node) * cast(size_t, sizenode(h));
}
static int traverseproto (global_State *g, Proto *f) {
- int i;
- if (f->cache && iswhite(obj2gco(f->cache)))
- f->cache = NULL; /* allow cache to be collected */
- markobject(g, f->source);
- for (i = 0; i < f->sizek; i++) /* mark literals */
- markvalue(g, &f->k[i]);
- for (i = 0; i < f->sizeupvalues; i++) /* mark upvalue names */
- markobject(g, f->upvalues[i].name);
- for (i = 0; i < f->sizep; i++) /* mark nested protos */
- markobject(g, f->p[i]);
- for (i = 0; i < f->sizelocvars; i++) /* mark local-variable names */
- markobject(g, f->locvars[i].varname);
- return sizeof(Proto) + sizeof(Instruction) * f->sizecode +
- sizeof(Proto *) * f->sizep +
- sizeof(TValue) * f->sizek +
- sizeof(int) * f->sizelineinfo +
- sizeof(LocVar) * f->sizelocvars +
- sizeof(Upvaldesc) * f->sizeupvalues;
+ int i;
+ if (f->cache && iswhite(obj2gco(f->cache)))
+ f->cache = NULL; /* allow cache to be collected */
+ markobject(g, f->source);
+ for (i = 0; i < f->sizek; i++) /* mark literals */
+ markvalue(g, &f->k[i]);
+ for (i = 0; i < f->sizeupvalues; i++) /* mark upvalue names */
+ markobject(g, f->upvalues[i].name);
+ for (i = 0; i < f->sizep; i++) /* mark nested protos */
+ markobject(g, f->p[i]);
+ for (i = 0; i < f->sizelocvars; i++) /* mark local-variable names */
+ markobject(g, f->locvars[i].varname);
+ return sizeof(Proto) + sizeof(Instruction) * f->sizecode +
+ sizeof(Proto *) * f->sizep +
+ sizeof(TValue) * f->sizek +
+ sizeof(int) * f->sizelineinfo +
+ sizeof(LocVar) * f->sizelocvars +
+ sizeof(Upvaldesc) * f->sizeupvalues;
}
static lu_mem traverseCclosure (global_State *g, CClosure *cl) {
- int i;
- for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */
- markvalue(g, &cl->upvalue[i]);
- return sizeCclosure(cl->nupvalues);
+ int i;
+ for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */
+ markvalue(g, &cl->upvalue[i]);
+ return sizeCclosure(cl->nupvalues);
}
static lu_mem traverseLclosure (global_State *g, LClosure *cl) {
- int i;
- markobject(g, cl->p); /* mark its prototype */
- for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */
- markobject(g, cl->upvals[i]);
- return sizeLclosure(cl->nupvalues);
+ int i;
+ markobject(g, cl->p); /* mark its prototype */
+ for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */
+ markobject(g, cl->upvals[i]);
+ return sizeLclosure(cl->nupvalues);
}
static lu_mem traversestack (global_State *g, lua_State *th) {
- int n = 0;
- StkId o = th->stack;
- if (o == NULL)
- return 1; /* stack not completely built yet */
- for (; o < th->top; o++) /* mark live elements in the stack */
- markvalue(g, o);
- if (g->gcstate == GCSatomic) { /* final traversal? */
- StkId lim = th->stack + th->stacksize; /* real end of stack */
- for (; o < lim; o++) /* clear not-marked stack slice */
- setnilvalue(o);
- }
- else { /* count call infos to compute size */
- CallInfo *ci;
- for (ci = &th->base_ci; ci != th->ci; ci = ci->next)
- n++;
- }
- return sizeof(lua_State) + sizeof(TValue) * th->stacksize +
- sizeof(CallInfo) * n;
+ int n = 0;
+ StkId o = th->stack;
+ if (o == NULL)
+ return 1; /* stack not completely built yet */
+ for (; o < th->top; o++) /* mark live elements in the stack */
+ markvalue(g, o);
+ if (g->gcstate == GCSatomic) { /* final traversal? */
+ StkId lim = th->stack + th->stacksize; /* real end of stack */
+ for (; o < lim; o++) /* clear not-marked stack slice */
+ setnilvalue(o);
+ }
+ else { /* count call infos to compute size */
+ CallInfo *ci;
+ for (ci = &th->base_ci; ci != th->ci; ci = ci->next)
+ n++;
+ }
+ return sizeof(lua_State) + sizeof(TValue) * th->stacksize +
+ sizeof(CallInfo) * n;
}
@@ -519,59 +519,59 @@ static lu_mem traversestack (global_State *g, lua_State *th) {
** which are always gray).
*/
static void propagatemark (global_State *g) {
- lu_mem size;
- GCObject *o = g->gray;
- lua_assert(isgray(o));
- gray2black(o);
- switch (gch(o)->tt) {
- case LUA_TTABLE: {
- Table *h = gco2t(o);
- g->gray = h->gclist; /* remove from 'gray' list */
- size = traversetable(g, h);
- break;
- }
- case LUA_TLCL: {
- LClosure *cl = gco2lcl(o);
- g->gray = cl->gclist; /* remove from 'gray' list */
- size = traverseLclosure(g, cl);
- break;
- }
- case LUA_TCCL: {
- CClosure *cl = gco2ccl(o);
- g->gray = cl->gclist; /* remove from 'gray' list */
- size = traverseCclosure(g, cl);
- break;
- }
- case LUA_TTHREAD: {
- lua_State *th = gco2th(o);
- g->gray = th->gclist; /* remove from 'gray' list */
- th->gclist = g->grayagain;
- g->grayagain = o; /* insert into 'grayagain' list */
- black2gray(o);
- size = traversestack(g, th);
- break;
- }
- case LUA_TPROTO: {
- Proto *p = gco2p(o);
- g->gray = p->gclist; /* remove from 'gray' list */
- size = traverseproto(g, p);
- break;
- }
- default: lua_assert(0); return;
- }
- g->GCmemtrav += size;
+ lu_mem size;
+ GCObject *o = g->gray;
+ lua_assert(isgray(o));
+ gray2black(o);
+ switch (gch(o)->tt) {
+ case LUA_TTABLE: {
+ Table *h = gco2t(o);
+ g->gray = h->gclist; /* remove from 'gray' list */
+ size = traversetable(g, h);
+ break;
+ }
+ case LUA_TLCL: {
+ LClosure *cl = gco2lcl(o);
+ g->gray = cl->gclist; /* remove from 'gray' list */
+ size = traverseLclosure(g, cl);
+ break;
+ }
+ case LUA_TCCL: {
+ CClosure *cl = gco2ccl(o);
+ g->gray = cl->gclist; /* remove from 'gray' list */
+ size = traverseCclosure(g, cl);
+ break;
+ }
+ case LUA_TTHREAD: {
+ lua_State *th = gco2th(o);
+ g->gray = th->gclist; /* remove from 'gray' list */
+ th->gclist = g->grayagain;
+ g->grayagain = o; /* insert into 'grayagain' list */
+ black2gray(o);
+ size = traversestack(g, th);
+ break;
+ }
+ case LUA_TPROTO: {
+ Proto *p = gco2p(o);
+ g->gray = p->gclist; /* remove from 'gray' list */
+ size = traverseproto(g, p);
+ break;
+ }
+ default: lua_assert(0); return;
+ }
+ g->GCmemtrav += size;
}
static void propagateall (global_State *g) {
- while (g->gray) propagatemark(g);
+ while (g->gray) propagatemark(g);
}
static void propagatelist (global_State *g, GCObject *l) {
- lua_assert(g->gray == NULL); /* no grays left */
- g->gray = l;
- propagateall(g); /* traverse all elements from 'l' */
+ lua_assert(g->gray == NULL); /* no grays left */
+ g->gray = l;
+ propagateall(g); /* traverse all elements from 'l' */
}
/*
@@ -580,32 +580,32 @@ static void propagatelist (global_State *g, GCObject *l) {
** twice the same table (which is not wrong, but inefficient)
*/
static void retraversegrays (global_State *g) {
- GCObject *weak = g->weak; /* save original lists */
- GCObject *grayagain = g->grayagain;
- GCObject *ephemeron = g->ephemeron;
- g->weak = g->grayagain = g->ephemeron = NULL;
- propagateall(g); /* traverse main gray list */
- propagatelist(g, grayagain);
- propagatelist(g, weak);
- propagatelist(g, ephemeron);
+ GCObject *weak = g->weak; /* save original lists */
+ GCObject *grayagain = g->grayagain;
+ GCObject *ephemeron = g->ephemeron;
+ g->weak = g->grayagain = g->ephemeron = NULL;
+ propagateall(g); /* traverse main gray list */
+ propagatelist(g, grayagain);
+ propagatelist(g, weak);
+ propagatelist(g, ephemeron);
}
static void convergeephemerons (global_State *g) {
- int changed;
- do {
- GCObject *w;
- GCObject *next = g->ephemeron; /* get ephemeron list */
- g->ephemeron = NULL; /* tables will return to this list when traversed */
- changed = 0;
- while ((w = next) != NULL) {
- next = gco2t(w)->gclist;
- if (traverseephemeron(g, gco2t(w))) { /* traverse marked some value? */
- propagateall(g); /* propagate changes */
- changed = 1; /* will have to revisit all ephemeron tables */
- }
- }
- } while (changed);
+ int changed;
+ do {
+ GCObject *w;
+ GCObject *next = g->ephemeron; /* get ephemeron list */
+ g->ephemeron = NULL; /* tables will return to this list when traversed */
+ changed = 0;
+ while ((w = next) != NULL) {
+ next = gco2t(w)->gclist;
+ if (traverseephemeron(g, gco2t(w))) { /* traverse marked some value? */
+ propagateall(g); /* propagate changes */
+ changed = 1; /* will have to revisit all ephemeron tables */
+ }
+ }
+ } while (changed);
}
/* }====================================================== */
@@ -623,16 +623,16 @@ static void convergeephemerons (global_State *g) {
** to element 'f'
*/
static void clearkeys (global_State *g, GCObject *l, GCObject *f) {
- for (; l != f; l = gco2t(l)->gclist) {
- Table *h = gco2t(l);
- Node *n, *limit = gnodelast(h);
- for (n = gnode(h, 0); n < limit; n++) {
- if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) {
- setnilvalue(gval(n)); /* remove value ... */
- removeentry(n); /* and remove entry from table */
- }
- }
- }
+ for (; l != f; l = gco2t(l)->gclist) {
+ Table *h = gco2t(l);
+ Node *n, *limit = gnodelast(h);
+ for (n = gnode(h, 0); n < limit; n++) {
+ if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) {
+ setnilvalue(gval(n)); /* remove value ... */
+ removeentry(n); /* and remove entry from table */
+ }
+ }
+ }
}
@@ -641,53 +641,53 @@ static void clearkeys (global_State *g, GCObject *l, GCObject *f) {
** to element 'f'
*/
static void clearvalues (global_State *g, GCObject *l, GCObject *f) {
- for (; l != f; l = gco2t(l)->gclist) {
- Table *h = gco2t(l);
- Node *n, *limit = gnodelast(h);
- int i;
- for (i = 0; i < h->sizearray; i++) {
- TValue *o = &h->array[i];
- if (iscleared(g, o)) /* value was collected? */
- setnilvalue(o); /* remove value */
- }
- for (n = gnode(h, 0); n < limit; n++) {
- if (!ttisnil(gval(n)) && iscleared(g, gval(n))) {
- setnilvalue(gval(n)); /* remove value ... */
- removeentry(n); /* and remove entry from table */
- }
- }
- }
+ for (; l != f; l = gco2t(l)->gclist) {
+ Table *h = gco2t(l);
+ Node *n, *limit = gnodelast(h);
+ int i;
+ for (i = 0; i < h->sizearray; i++) {
+ TValue *o = &h->array[i];
+ if (iscleared(g, o)) /* value was collected? */
+ setnilvalue(o); /* remove value */
+ }
+ for (n = gnode(h, 0); n < limit; n++) {
+ if (!ttisnil(gval(n)) && iscleared(g, gval(n))) {
+ setnilvalue(gval(n)); /* remove value ... */
+ removeentry(n); /* and remove entry from table */
+ }
+ }
+ }
}
static void freeobj (lua_State *L, GCObject *o) {
- switch (gch(o)->tt) {
- case LUA_TPROTO: luaF_freeproto(L, gco2p(o)); break;
- case LUA_TLCL: {
- luaM_freemem(L, o, sizeLclosure(gco2lcl(o)->nupvalues));
- break;
- }
- case LUA_TCCL: {
- luaM_freemem(L, o, sizeCclosure(gco2ccl(o)->nupvalues));
- break;
- }
- case LUA_TUPVAL: luaF_freeupval(L, gco2uv(o)); break;
- case LUA_TTABLE: luaH_free(L, gco2t(o)); break;
- case LUA_TTHREAD: luaE_freethread(L, gco2th(o)); break;
- case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break;
- case LUA_TSHRSTR:
- G(L)->strt.nuse--;
- /* go through */
- case LUA_TLNGSTR: {
- luaM_freemem(L, o, sizestring(gco2ts(o)));
- break;
- }
- default: lua_assert(0);
- }
+ switch (gch(o)->tt) {
+ case LUA_TPROTO: luaF_freeproto(L, gco2p(o)); break;
+ case LUA_TLCL: {
+ luaM_freemem(L, o, sizeLclosure(gco2lcl(o)->nupvalues));
+ break;
+ }
+ case LUA_TCCL: {
+ luaM_freemem(L, o, sizeCclosure(gco2ccl(o)->nupvalues));
+ break;
+ }
+ case LUA_TUPVAL: luaF_freeupval(L, gco2uv(o)); break;
+ case LUA_TTABLE: luaH_free(L, gco2t(o)); break;
+ case LUA_TTHREAD: luaE_freethread(L, gco2th(o)); break;
+ case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break;
+ case LUA_TSHRSTR:
+ G(L)->strt.nuse--;
+ /* go through */
+ case LUA_TLNGSTR: {
+ luaM_freemem(L, o, sizestring(gco2ts(o)));
+ break;
+ }
+ default: lua_assert(0);
+ }
}
-#define sweepwholelist(L,p) sweeplist(L,p,MAX_LUMEM)
+#define sweepwholelist(L,p) sweeplist(L,p,MAX_LUMEM)
static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count);
@@ -696,12 +696,12 @@ static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count);
** list of call-info structures.
*/
static void sweepthread (lua_State *L, lua_State *L1) {
- if (L1->stack == NULL) return; /* stack not completely built yet */
- sweepwholelist(L, &L1->openupval); /* sweep open upvalues */
- luaE_freeCI(L1); /* free extra CallInfo slots */
- /* should not change the stack during an emergency gc cycle */
- if (G(L)->gckind != KGC_EMERGENCY)
- luaD_shrinkstack(L1);
+ if (L1->stack == NULL) return; /* stack not completely built yet */
+ sweepwholelist(L, &L1->openupval); /* sweep open upvalues */
+ luaE_freeCI(L1); /* free extra CallInfo slots */
+ /* should not change the stack during an emergency gc cycle */
+ if (G(L)->gckind != KGC_EMERGENCY)
+ luaD_shrinkstack(L1);
}
@@ -717,38 +717,38 @@ static void sweepthread (lua_State *L, lua_State *L1) {
** When object is a thread, sweep its list of open upvalues too.
*/
static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count) {
- global_State *g = G(L);
- int ow = otherwhite(g);
- int toclear, toset; /* bits to clear and to set in all live objects */
- int tostop; /* stop sweep when this is true */
- if (isgenerational(g)) { /* generational mode? */
- toclear = ~0; /* clear nothing */
- toset = bitmask(OLDBIT); /* set the old bit of all surviving objects */
- tostop = bitmask(OLDBIT); /* do not sweep old generation */
- }
- else { /* normal mode */
- toclear = maskcolors; /* clear all color bits + old bit */
- toset = luaC_white(g); /* make object white */
- tostop = 0; /* do not stop */
- }
- while (*p != NULL && count-- > 0) {
- GCObject *curr = *p;
- int marked = gch(curr)->marked;
- if (isdeadm(ow, marked)) { /* is 'curr' dead? */
- *p = gch(curr)->next; /* remove 'curr' from list */
- freeobj(L, curr); /* erase 'curr' */
- }
- else {
- if (testbits(marked, tostop))
- return NULL; /* stop sweeping this list */
- if (gch(curr)->tt == LUA_TTHREAD)
- sweepthread(L, gco2th(curr)); /* sweep thread's upvalues */
- /* update marks */
- gch(curr)->marked = cast_byte((marked & toclear) | toset);
- p = &gch(curr)->next; /* go to next element */
- }
- }
- return (*p == NULL) ? NULL : p;
+ global_State *g = G(L);
+ int ow = otherwhite(g);
+ int toclear, toset; /* bits to clear and to set in all live objects */
+ int tostop; /* stop sweep when this is true */
+ if (isgenerational(g)) { /* generational mode? */
+ toclear = ~0; /* clear nothing */
+ toset = bitmask(OLDBIT); /* set the old bit of all surviving objects */
+ tostop = bitmask(OLDBIT); /* do not sweep old generation */
+ }
+ else { /* normal mode */
+ toclear = maskcolors; /* clear all color bits + old bit */
+ toset = luaC_white(g); /* make object white */
+ tostop = 0; /* do not stop */
+ }
+ while (*p != NULL && count-- > 0) {
+ GCObject *curr = *p;
+ int marked = gch(curr)->marked;
+ if (isdeadm(ow, marked)) { /* is 'curr' dead? */
+ *p = gch(curr)->next; /* remove 'curr' from list */
+ freeobj(L, curr); /* erase 'curr' */
+ }
+ else {
+ if (testbits(marked, tostop))
+ return NULL; /* stop sweeping this list */
+ if (gch(curr)->tt == LUA_TTHREAD)
+ sweepthread(L, gco2th(curr)); /* sweep thread's upvalues */
+ /* update marks */
+ gch(curr)->marked = cast_byte((marked & toclear) | toset);
+ p = &gch(curr)->next; /* go to next element */
+ }
+ }
+ return (*p == NULL) ? NULL : p;
}
@@ -756,14 +756,14 @@ static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count) {
** sweep a list until a live object (or end of list)
*/
static GCObject **sweeptolive (lua_State *L, GCObject **p, int *n) {
- GCObject ** old = p;
- int i = 0;
- do {
- i++;
- p = sweeplist(L, p, 1);
- } while (p == old);
- if (n) *n += i;
- return p;
+ GCObject ** old = p;
+ int i = 0;
+ do {
+ i++;
+ p = sweeplist(L, p, 1);
+ } while (p == old);
+ if (n) *n += i;
+ return p;
}
/* }====================================================== */
@@ -776,65 +776,65 @@ static GCObject **sweeptolive (lua_State *L, GCObject **p, int *n) {
*/
static void checkSizes (lua_State *L) {
- global_State *g = G(L);
- if (g->gckind != KGC_EMERGENCY) { /* do not change sizes in emergency */
- int hs = g->strt.size / 2; /* half the size of the string table */
- if (g->strt.nuse < cast(lu_int32, hs)) /* using less than that half? */
- luaS_resize(L, hs); /* halve its size */
- luaZ_freebuffer(L, &g->buff); /* free concatenation buffer */
- }
+ global_State *g = G(L);
+ if (g->gckind != KGC_EMERGENCY) { /* do not change sizes in emergency */
+ int hs = g->strt.size / 2; /* half the size of the string table */
+ if (g->strt.nuse < cast(lu_int32, hs)) /* using less than that half? */
+ luaS_resize(L, hs); /* halve its size */
+ luaZ_freebuffer(L, &g->buff); /* free concatenation buffer */
+ }
}
static GCObject *udata2finalize (global_State *g) {
- GCObject *o = g->tobefnz; /* get first element */
- lua_assert(isfinalized(o));
- g->tobefnz = gch(o)->next; /* remove it from 'tobefnz' list */
- gch(o)->next = g->allgc; /* return it to 'allgc' list */
- g->allgc = o;
- resetbit(gch(o)->marked, SEPARATED); /* mark that it is not in 'tobefnz' */
- lua_assert(!isold(o)); /* see MOVE OLD rule */
- if (!keepinvariantout(g)) /* not keeping invariant? */
- makewhite(g, o); /* "sweep" object */
- return o;
+ GCObject *o = g->tobefnz; /* get first element */
+ lua_assert(isfinalized(o));
+ g->tobefnz = gch(o)->next; /* remove it from 'tobefnz' list */
+ gch(o)->next = g->allgc; /* return it to 'allgc' list */
+ g->allgc = o;
+ resetbit(gch(o)->marked, SEPARATED); /* mark that it is not in 'tobefnz' */
+ lua_assert(!isold(o)); /* see MOVE OLD rule */
+ if (!keepinvariantout(g)) /* not keeping invariant? */
+ makewhite(g, o); /* "sweep" object */
+ return o;
}
static void dothecall (lua_State *L, void *ud) {
- UNUSED(ud);
- luaD_call(L, L->top - 2, 0, 0);
+ UNUSED(ud);
+ luaD_call(L, L->top - 2, 0, 0);
}
static void GCTM (lua_State *L, int propagateerrors) {
- global_State *g = G(L);
- const TValue *tm;
- TValue v;
- setgcovalue(L, &v, udata2finalize(g));
- tm = luaT_gettmbyobj(L, &v, TM_GC);
- if (tm != NULL && ttisfunction(tm)) { /* is there a finalizer? */
- int status;
- lu_byte oldah = L->allowhook;
- int running = g->gcrunning;
- L->allowhook = 0; /* stop debug hooks during GC metamethod */
- g->gcrunning = 0; /* avoid GC steps */
- setobj2s(L, L->top, tm); /* push finalizer... */
- setobj2s(L, L->top + 1, &v); /* ... and its argument */
- L->top += 2; /* and (next line) call the finalizer */
- status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0);
- L->allowhook = oldah; /* restore hooks */
- g->gcrunning = running; /* restore state */
- if (status != LUA_OK && propagateerrors) { /* error while running __gc? */
- if (status == LUA_ERRRUN) { /* is there an error object? */
- const char *msg = (ttisstring(L->top - 1))
- ? svalue(L->top - 1)
- : "no message";
- luaO_pushfstring(L, "error in __gc metamethod (%s)", msg);
- status = LUA_ERRGCMM; /* error in __gc metamethod */
- }
- luaD_throw(L, status); /* re-throw error */
- }
- }
+ global_State *g = G(L);
+ const TValue *tm;
+ TValue v;
+ setgcovalue(L, &v, udata2finalize(g));
+ tm = luaT_gettmbyobj(L, &v, TM_GC);
+ if (tm != NULL && ttisfunction(tm)) { /* is there a finalizer? */
+ int status;
+ lu_byte oldah = L->allowhook;
+ int running = g->gcrunning;
+ L->allowhook = 0; /* stop debug hooks during GC metamethod */
+ g->gcrunning = 0; /* avoid GC steps */
+ setobj2s(L, L->top, tm); /* push finalizer... */
+ setobj2s(L, L->top + 1, &v); /* ... and its argument */
+ L->top += 2; /* and (next line) call the finalizer */
+ status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0);
+ L->allowhook = oldah; /* restore hooks */
+ g->gcrunning = running; /* restore state */
+ if (status != LUA_OK && propagateerrors) { /* error while running __gc? */
+ if (status == LUA_ERRRUN) { /* is there an error object? */
+ const char *msg = (ttisstring(L->top - 1))
+ ? svalue(L->top - 1)
+ : "no message";
+ luaO_pushfstring(L, "error in __gc metamethod (%s)", msg);
+ status = LUA_ERRGCMM; /* error in __gc metamethod */
+ }
+ luaD_throw(L, status); /* re-throw error */
+ }
+ }
}
@@ -843,26 +843,26 @@ static void GCTM (lua_State *L, int propagateerrors) {
** finalization from list 'finobj' to list 'tobefnz' (to be finalized)
*/
static void separatetobefnz (lua_State *L, int all) {
- global_State *g = G(L);
- GCObject **p = &g->finobj;
- GCObject *curr;
- GCObject **lastnext = &g->tobefnz;
- /* find last 'next' field in 'tobefnz' list (to add elements in its end) */
- while (*lastnext != NULL)
- lastnext = &gch(*lastnext)->next;
- while ((curr = *p) != NULL) { /* traverse all finalizable objects */
- lua_assert(!isfinalized(curr));
- lua_assert(testbit(gch(curr)->marked, SEPARATED));
- if (!(iswhite(curr) || all)) /* not being collected? */
- p = &gch(curr)->next; /* don't bother with it */
- else {
- l_setbit(gch(curr)->marked, FINALIZEDBIT); /* won't be finalized again */
- *p = gch(curr)->next; /* remove 'curr' from 'finobj' list */
- gch(curr)->next = *lastnext; /* link at the end of 'tobefnz' list */
- *lastnext = curr;
- lastnext = &gch(curr)->next;
- }
- }
+ global_State *g = G(L);
+ GCObject **p = &g->finobj;
+ GCObject *curr;
+ GCObject **lastnext = &g->tobefnz;
+ /* find last 'next' field in 'tobefnz' list (to add elements in its end) */
+ while (*lastnext != NULL)
+ lastnext = &gch(*lastnext)->next;
+ while ((curr = *p) != NULL) { /* traverse all finalizable objects */
+ lua_assert(!isfinalized(curr));
+ lua_assert(testbit(gch(curr)->marked, SEPARATED));
+ if (!(iswhite(curr) || all)) /* not being collected? */
+ p = &gch(curr)->next; /* don't bother with it */
+ else {
+ l_setbit(gch(curr)->marked, FINALIZEDBIT); /* won't be finalized again */
+ *p = gch(curr)->next; /* remove 'curr' from 'finobj' list */
+ gch(curr)->next = *lastnext; /* link at the end of 'tobefnz' list */
+ *lastnext = curr;
+ lastnext = &gch(curr)->next;
+ }
+ }
}
@@ -871,29 +871,29 @@ static void separatetobefnz (lua_State *L, int all) {
** search the list to find it) and link it in 'finobj' list.
*/
void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
- global_State *g = G(L);
- if (testbit(gch(o)->marked, SEPARATED) || /* obj. is already separated... */
- isfinalized(o) || /* ... or is finalized... */
- gfasttm(g, mt, TM_GC) == NULL) /* or has no finalizer? */
- return; /* nothing to be done */
- else { /* move 'o' to 'finobj' list */
- GCObject **p;
- GCheader *ho = gch(o);
- if (g->sweepgc == &ho->next) { /* avoid removing current sweep object */
- lua_assert(issweepphase(g));
- g->sweepgc = sweeptolive(L, g->sweepgc, NULL);
- }
- /* search for pointer pointing to 'o' */
- for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ }
- *p = ho->next; /* remove 'o' from root list */
- ho->next = g->finobj; /* link it in list 'finobj' */
- g->finobj = o;
- l_setbit(ho->marked, SEPARATED); /* mark it as such */
- if (!keepinvariantout(g)) /* not keeping invariant? */
- makewhite(g, o); /* "sweep" object */
- else
- resetoldbit(o); /* see MOVE OLD rule */
- }
+ global_State *g = G(L);
+ if (testbit(gch(o)->marked, SEPARATED) || /* obj. is already separated... */
+ isfinalized(o) || /* ... or is finalized... */
+ gfasttm(g, mt, TM_GC) == NULL) /* or has no finalizer? */
+ return; /* nothing to be done */
+ else { /* move 'o' to 'finobj' list */
+ GCObject **p;
+ GCheader *ho = gch(o);
+ if (g->sweepgc == &ho->next) { /* avoid removing current sweep object */
+ lua_assert(issweepphase(g));
+ g->sweepgc = sweeptolive(L, g->sweepgc, NULL);
+ }
+ /* search for pointer pointing to 'o' */
+ for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ }
+ *p = ho->next; /* remove 'o' from root list */
+ ho->next = g->finobj; /* link it in list 'finobj' */
+ g->finobj = o;
+ l_setbit(ho->marked, SEPARATED); /* mark it as such */
+ if (!keepinvariantout(g)) /* not keeping invariant? */
+ makewhite(g, o); /* "sweep" object */
+ else
+ resetoldbit(o); /* see MOVE OLD rule */
+ }
}
/* }====================================================== */
@@ -911,13 +911,13 @@ void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
** cycle will start when memory use hits threshold
*/
static void setpause (global_State *g, l_mem estimate) {
- l_mem debt, threshold;
- estimate = estimate / PAUSEADJ; /* adjust 'estimate' */
- threshold = (g->gcpause < MAX_LMEM / estimate) /* overflow? */
- ? estimate * g->gcpause /* no overflow */
- : MAX_LMEM; /* overflow; truncate to maximum */
- debt = -cast(l_mem, threshold - gettotalbytes(g));
- luaE_setdebt(g, debt);
+ l_mem debt, threshold;
+ estimate = estimate / PAUSEADJ; /* adjust 'estimate' */
+ threshold = (g->gcpause < MAX_LMEM / estimate) /* overflow? */
+ ? estimate * g->gcpause /* no overflow */
+ : MAX_LMEM; /* overflow; truncate to maximum */
+ debt = -cast(l_mem, threshold - gettotalbytes(g));
+ luaE_setdebt(g, debt);
}
@@ -934,15 +934,15 @@ static void setpause (global_State *g, l_mem estimate) {
** Returns how many objects it swept.
*/
static int entersweep (lua_State *L) {
- global_State *g = G(L);
- int n = 0;
- g->gcstate = GCSsweepstring;
- lua_assert(g->sweepgc == NULL && g->sweepfin == NULL);
- /* prepare to sweep strings, finalizable objects, and regular objects */
- g->sweepstrgc = 0;
- g->sweepfin = sweeptolive(L, &g->finobj, &n);
- g->sweepgc = sweeptolive(L, &g->allgc, &n);
- return n;
+ global_State *g = G(L);
+ int n = 0;
+ g->gcstate = GCSsweepstring;
+ lua_assert(g->sweepgc == NULL && g->sweepfin == NULL);
+ /* prepare to sweep strings, finalizable objects, and regular objects */
+ g->sweepstrgc = 0;
+ g->sweepfin = sweeptolive(L, &g->finobj, &n);
+ g->sweepgc = sweeptolive(L, &g->allgc, &n);
+ return n;
}
@@ -950,21 +950,21 @@ static int entersweep (lua_State *L) {
** change GC mode
*/
void luaC_changemode (lua_State *L, int mode) {
- global_State *g = G(L);
- if (mode == g->gckind) return; /* nothing to change */
- if (mode == KGC_GEN) { /* change to generational mode */
- /* make sure gray lists are consistent */
- luaC_runtilstate(L, bitmask(GCSpropagate));
- g->GCestimate = gettotalbytes(g);
- g->gckind = KGC_GEN;
- }
- else { /* change to incremental mode */
- /* sweep all objects to turn them back to white
- (as white has not changed, nothing extra will be collected) */
- g->gckind = KGC_NORMAL;
- entersweep(L);
- luaC_runtilstate(L, ~sweepphases);
- }
+ global_State *g = G(L);
+ if (mode == g->gckind) return; /* nothing to change */
+ if (mode == KGC_GEN) { /* change to generational mode */
+ /* make sure gray lists are consistent */
+ luaC_runtilstate(L, bitmask(GCSpropagate));
+ g->GCestimate = gettotalbytes(g);
+ g->gckind = KGC_GEN;
+ }
+ else { /* change to incremental mode */
+ /* sweep all objects to turn them back to white
+ (as white has not changed, nothing extra will be collected) */
+ g->gckind = KGC_NORMAL;
+ entersweep(L);
+ luaC_runtilstate(L, ~sweepphases);
+ }
}
@@ -972,134 +972,134 @@ void luaC_changemode (lua_State *L, int mode) {
** call all pending finalizers
*/
static void callallpendingfinalizers (lua_State *L, int propagateerrors) {
- global_State *g = G(L);
- while (g->tobefnz) {
- resetoldbit(g->tobefnz);
- GCTM(L, propagateerrors);
- }
+ global_State *g = G(L);
+ while (g->tobefnz) {
+ resetoldbit(g->tobefnz);
+ GCTM(L, propagateerrors);
+ }
}
void luaC_freeallobjects (lua_State *L) {
- global_State *g = G(L);
- int i;
- separatetobefnz(L, 1); /* separate all objects with finalizers */
- lua_assert(g->finobj == NULL);
- callallpendingfinalizers(L, 0);
- g->currentwhite = WHITEBITS; /* this "white" makes all objects look dead */
- g->gckind = KGC_NORMAL;
- sweepwholelist(L, &g->finobj); /* finalizers can create objs. in 'finobj' */
- sweepwholelist(L, &g->allgc);
- for (i = 0; i < g->strt.size; i++) /* free all string lists */
- sweepwholelist(L, &g->strt.hash[i]);
- lua_assert(g->strt.nuse == 0);
+ global_State *g = G(L);
+ int i;
+ separatetobefnz(L, 1); /* separate all objects with finalizers */
+ lua_assert(g->finobj == NULL);
+ callallpendingfinalizers(L, 0);
+ g->currentwhite = WHITEBITS; /* this "white" makes all objects look dead */
+ g->gckind = KGC_NORMAL;
+ sweepwholelist(L, &g->finobj); /* finalizers can create objs. in 'finobj' */
+ sweepwholelist(L, &g->allgc);
+ for (i = 0; i < g->strt.size; i++) /* free all string lists */
+ sweepwholelist(L, &g->strt.hash[i]);
+ lua_assert(g->strt.nuse == 0);
}
static l_mem atomic (lua_State *L) {
- global_State *g = G(L);
- l_mem work = -cast(l_mem, g->GCmemtrav); /* start counting work */
- GCObject *origweak, *origall;
- lua_assert(!iswhite(obj2gco(g->mainthread)));
- markobject(g, L); /* mark running thread */
- /* registry and global metatables may be changed by API */
- markvalue(g, &g->l_registry);
- markmt(g); /* mark basic metatables */
- /* remark occasional upvalues of (maybe) dead threads */
- remarkupvals(g);
- propagateall(g); /* propagate changes */
- work += g->GCmemtrav; /* stop counting (do not (re)count grays) */
- /* traverse objects caught by write barrier and by 'remarkupvals' */
- retraversegrays(g);
- work -= g->GCmemtrav; /* restart counting */
- convergeephemerons(g);
- /* at this point, all strongly accessible objects are marked. */
- /* clear values from weak tables, before checking finalizers */
- clearvalues(g, g->weak, NULL);
- clearvalues(g, g->allweak, NULL);
- origweak = g->weak; origall = g->allweak;
- work += g->GCmemtrav; /* stop counting (objects being finalized) */
- separatetobefnz(L, 0); /* separate objects to be finalized */
- markbeingfnz(g); /* mark objects that will be finalized */
- propagateall(g); /* remark, to propagate `preserveness' */
- work -= g->GCmemtrav; /* restart counting */
- convergeephemerons(g);
- /* at this point, all resurrected objects are marked. */
- /* remove dead objects from weak tables */
- clearkeys(g, g->ephemeron, NULL); /* clear keys from all ephemeron tables */
- clearkeys(g, g->allweak, NULL); /* clear keys from all allweak tables */
- /* clear values from resurrected weak tables */
- clearvalues(g, g->weak, origweak);
- clearvalues(g, g->allweak, origall);
- g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */
- work += g->GCmemtrav; /* complete counting */
- return work; /* estimate of memory marked by 'atomic' */
+ global_State *g = G(L);
+ l_mem work = -cast(l_mem, g->GCmemtrav); /* start counting work */
+ GCObject *origweak, *origall;
+ lua_assert(!iswhite(obj2gco(g->mainthread)));
+ markobject(g, L); /* mark running thread */
+ /* registry and global metatables may be changed by API */
+ markvalue(g, &g->l_registry);
+ markmt(g); /* mark basic metatables */
+ /* remark occasional upvalues of (maybe) dead threads */
+ remarkupvals(g);
+ propagateall(g); /* propagate changes */
+ work += g->GCmemtrav; /* stop counting (do not (re)count grays) */
+ /* traverse objects caught by write barrier and by 'remarkupvals' */
+ retraversegrays(g);
+ work -= g->GCmemtrav; /* restart counting */
+ convergeephemerons(g);
+ /* at this point, all strongly accessible objects are marked. */
+ /* clear values from weak tables, before checking finalizers */
+ clearvalues(g, g->weak, NULL);
+ clearvalues(g, g->allweak, NULL);
+ origweak = g->weak; origall = g->allweak;
+ work += g->GCmemtrav; /* stop counting (objects being finalized) */
+ separatetobefnz(L, 0); /* separate objects to be finalized */
+ markbeingfnz(g); /* mark objects that will be finalized */
+ propagateall(g); /* remark, to propagate `preserveness' */
+ work -= g->GCmemtrav; /* restart counting */
+ convergeephemerons(g);
+ /* at this point, all resurrected objects are marked. */
+ /* remove dead objects from weak tables */
+ clearkeys(g, g->ephemeron, NULL); /* clear keys from all ephemeron tables */
+ clearkeys(g, g->allweak, NULL); /* clear keys from all allweak tables */
+ /* clear values from resurrected weak tables */
+ clearvalues(g, g->weak, origweak);
+ clearvalues(g, g->allweak, origall);
+ g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */
+ work += g->GCmemtrav; /* complete counting */
+ return work; /* estimate of memory marked by 'atomic' */
}
static lu_mem singlestep (lua_State *L) {
- global_State *g = G(L);
- switch (g->gcstate) {
- case GCSpause: {
- /* start to count memory traversed */
- g->GCmemtrav = g->strt.size * sizeof(GCObject*);
- lua_assert(!isgenerational(g));
- restartcollection(g);
- g->gcstate = GCSpropagate;
- return g->GCmemtrav;
- }
- case GCSpropagate: {
- if (g->gray) {
- lu_mem oldtrav = g->GCmemtrav;
- propagatemark(g);
- return g->GCmemtrav - oldtrav; /* memory traversed in this step */
- }
- else { /* no more `gray' objects */
- lu_mem work;
- int sw;
- g->gcstate = GCSatomic; /* finish mark phase */
- g->GCestimate = g->GCmemtrav; /* save what was counted */;
- work = atomic(L); /* add what was traversed by 'atomic' */
- g->GCestimate += work; /* estimate of total memory traversed */
- sw = entersweep(L);
- return work + sw * GCSWEEPCOST;
- }
- }
- case GCSsweepstring: {
- int i;
- for (i = 0; i < GCSWEEPMAX && g->sweepstrgc + i < g->strt.size; i++)
- sweepwholelist(L, &g->strt.hash[g->sweepstrgc + i]);
- g->sweepstrgc += i;
- if (g->sweepstrgc >= g->strt.size) /* no more strings to sweep? */
- g->gcstate = GCSsweepudata;
- return i * GCSWEEPCOST;
- }
- case GCSsweepudata: {
- if (g->sweepfin) {
- g->sweepfin = sweeplist(L, g->sweepfin, GCSWEEPMAX);
- return GCSWEEPMAX*GCSWEEPCOST;
- }
- else {
- g->gcstate = GCSsweep;
- return 0;
- }
- }
- case GCSsweep: {
- if (g->sweepgc) {
- g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX);
- return GCSWEEPMAX*GCSWEEPCOST;
- }
- else {
- /* sweep main thread */
- GCObject *mt = obj2gco(g->mainthread);
- sweeplist(L, &mt, 1);
- checkSizes(L);
- g->gcstate = GCSpause; /* finish collection */
- return GCSWEEPCOST;
- }
- }
- default: lua_assert(0); return 0;
- }
+ global_State *g = G(L);
+ switch (g->gcstate) {
+ case GCSpause: {
+ /* start to count memory traversed */
+ g->GCmemtrav = g->strt.size * sizeof(GCObject*);
+ lua_assert(!isgenerational(g));
+ restartcollection(g);
+ g->gcstate = GCSpropagate;
+ return g->GCmemtrav;
+ }
+ case GCSpropagate: {
+ if (g->gray) {
+ lu_mem oldtrav = g->GCmemtrav;
+ propagatemark(g);
+ return g->GCmemtrav - oldtrav; /* memory traversed in this step */
+ }
+ else { /* no more `gray' objects */
+ lu_mem work;
+ int sw;
+ g->gcstate = GCSatomic; /* finish mark phase */
+ g->GCestimate = g->GCmemtrav; /* save what was counted */;
+ work = atomic(L); /* add what was traversed by 'atomic' */
+ g->GCestimate += work; /* estimate of total memory traversed */
+ sw = entersweep(L);
+ return work + sw * GCSWEEPCOST;
+ }
+ }
+ case GCSsweepstring: {
+ int i;
+ for (i = 0; i < GCSWEEPMAX && g->sweepstrgc + i < g->strt.size; i++)
+ sweepwholelist(L, &g->strt.hash[g->sweepstrgc + i]);
+ g->sweepstrgc += i;
+ if (g->sweepstrgc >= g->strt.size) /* no more strings to sweep? */
+ g->gcstate = GCSsweepudata;
+ return i * GCSWEEPCOST;
+ }
+ case GCSsweepudata: {
+ if (g->sweepfin) {
+ g->sweepfin = sweeplist(L, g->sweepfin, GCSWEEPMAX);
+ return GCSWEEPMAX*GCSWEEPCOST;
+ }
+ else {
+ g->gcstate = GCSsweep;
+ return 0;
+ }
+ }
+ case GCSsweep: {
+ if (g->sweepgc) {
+ g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX);
+ return GCSWEEPMAX*GCSWEEPCOST;
+ }
+ else {
+ /* sweep main thread */
+ GCObject *mt = obj2gco(g->mainthread);
+ sweeplist(L, &mt, 1);
+ checkSizes(L);
+ g->gcstate = GCSpause; /* finish collection */
+ return GCSWEEPCOST;
+ }
+ }
+ default: lua_assert(0); return 0;
+ }
}
@@ -1108,52 +1108,52 @@ static lu_mem singlestep (lua_State *L) {
** by 'statemask'
*/
void luaC_runtilstate (lua_State *L, int statesmask) {
- global_State *g = G(L);
- while (!testbit(statesmask, g->gcstate))
- singlestep(L);
+ global_State *g = G(L);
+ while (!testbit(statesmask, g->gcstate))
+ singlestep(L);
}
static void generationalcollection (lua_State *L) {
- global_State *g = G(L);
- lua_assert(g->gcstate == GCSpropagate);
- if (g->GCestimate == 0) { /* signal for another major collection? */
- luaC_fullgc(L, 0); /* perform a full regular collection */
- g->GCestimate = gettotalbytes(g); /* update control */
- }
- else {
- lu_mem estimate = g->GCestimate;
- luaC_runtilstate(L, bitmask(GCSpause)); /* run complete (minor) cycle */
- g->gcstate = GCSpropagate; /* skip restart */
- if (gettotalbytes(g) > (estimate / 100) * g->gcmajorinc)
- g->GCestimate = 0; /* signal for a major collection */
- else
- g->GCestimate = estimate; /* keep estimate from last major coll. */
-
- }
- setpause(g, gettotalbytes(g));
- lua_assert(g->gcstate == GCSpropagate);
+ global_State *g = G(L);
+ lua_assert(g->gcstate == GCSpropagate);
+ if (g->GCestimate == 0) { /* signal for another major collection? */
+ luaC_fullgc(L, 0); /* perform a full regular collection */
+ g->GCestimate = gettotalbytes(g); /* update control */
+ }
+ else {
+ lu_mem estimate = g->GCestimate;
+ luaC_runtilstate(L, bitmask(GCSpause)); /* run complete (minor) cycle */
+ g->gcstate = GCSpropagate; /* skip restart */
+ if (gettotalbytes(g) > (estimate / 100) * g->gcmajorinc)
+ g->GCestimate = 0; /* signal for a major collection */
+ else
+ g->GCestimate = estimate; /* keep estimate from last major coll. */
+
+ }
+ setpause(g, gettotalbytes(g));
+ lua_assert(g->gcstate == GCSpropagate);
}
static void incstep (lua_State *L) {
- global_State *g = G(L);
- l_mem debt = g->GCdebt;
- int stepmul = g->gcstepmul;
- if (stepmul < 40) stepmul = 40; /* avoid ridiculous low values (and 0) */
- /* convert debt from Kb to 'work units' (avoid zero debt and overflows) */
- debt = (debt / STEPMULADJ) + 1;
- debt = (debt < MAX_LMEM / stepmul) ? debt * stepmul : MAX_LMEM;
- do { /* always perform at least one single step */
- lu_mem work = singlestep(L); /* do some work */
- debt -= work;
- } while (debt > -GCSTEPSIZE && g->gcstate != GCSpause);
- if (g->gcstate == GCSpause)
- setpause(g, g->GCestimate); /* pause until next cycle */
- else {
- debt = (debt / stepmul) * STEPMULADJ; /* convert 'work units' to Kb */
- luaE_setdebt(g, debt);
- }
+ global_State *g = G(L);
+ l_mem debt = g->GCdebt;
+ int stepmul = g->gcstepmul;
+ if (stepmul < 40) stepmul = 40; /* avoid ridiculous low values (and 0) */
+ /* convert debt from Kb to 'work units' (avoid zero debt and overflows) */
+ debt = (debt / STEPMULADJ) + 1;
+ debt = (debt < MAX_LMEM / stepmul) ? debt * stepmul : MAX_LMEM;
+ do { /* always perform at least one single step */
+ lu_mem work = singlestep(L); /* do some work */
+ debt -= work;
+ } while (debt > -GCSTEPSIZE && g->gcstate != GCSpause);
+ if (g->gcstate == GCSpause)
+ setpause(g, g->GCestimate); /* pause until next cycle */
+ else {
+ debt = (debt / stepmul) * STEPMULADJ; /* convert 'work units' to Kb */
+ luaE_setdebt(g, debt);
+ }
}
@@ -1161,13 +1161,13 @@ static void incstep (lua_State *L) {
** performs a basic GC step
*/
void luaC_forcestep (lua_State *L) {
- global_State *g = G(L);
- int i;
- if (isgenerational(g)) generationalcollection(L);
- else incstep(L);
- /* run a few finalizers (or all of them at the end of a collect cycle) */
- for (i = 0; g->tobefnz && (i < GCFINALIZENUM || g->gcstate == GCSpause); i++)
- GCTM(L, 1); /* call one finalizer */
+ global_State *g = G(L);
+ int i;
+ if (isgenerational(g)) generationalcollection(L);
+ else incstep(L);
+ /* run a few finalizers (or all of them at the end of a collect cycle) */
+ for (i = 0; g->tobefnz && (i < GCFINALIZENUM || g->gcstate == GCSpause); i++)
+ GCTM(L, 1); /* call one finalizer */
}
@@ -1175,9 +1175,9 @@ void luaC_forcestep (lua_State *L) {
** performs a basic GC step only if collector is running
*/
void luaC_step (lua_State *L) {
- global_State *g = G(L);
- if (g->gcrunning) luaC_forcestep(L);
- else luaE_setdebt(g, -GCSTEPSIZE); /* avoid being called too often */
+ global_State *g = G(L);
+ if (g->gcrunning) luaC_forcestep(L);
+ else luaE_setdebt(g, -GCSTEPSIZE); /* avoid being called too often */
}
@@ -1187,34 +1187,32 @@ void luaC_step (lua_State *L) {
** finalizers (which could change stack positions)
*/
void luaC_fullgc (lua_State *L, int isemergency) {
- global_State *g = G(L);
- int origkind = g->gckind;
- lua_assert(origkind != KGC_EMERGENCY);
- if (isemergency) /* do not run finalizers during emergency GC */
- g->gckind = KGC_EMERGENCY;
- else {
- g->gckind = KGC_NORMAL;
- callallpendingfinalizers(L, 1);
- }
- if (keepinvariant(g)) { /* may there be some black objects? */
- /* must sweep all objects to turn them back to white
- (as white has not changed, nothing will be collected) */
- entersweep(L);
- }
- /* finish any pending sweep phase to start a new cycle */
- luaC_runtilstate(L, bitmask(GCSpause));
- luaC_runtilstate(L, ~bitmask(GCSpause)); /* start new collection */
- luaC_runtilstate(L, bitmask(GCSpause)); /* run entire collection */
- if (origkind == KGC_GEN) { /* generational mode? */
- /* generational mode must be kept in propagate phase */
- luaC_runtilstate(L, bitmask(GCSpropagate));
- }
- g->gckind = origkind;
- setpause(g, gettotalbytes(g));
- if (!isemergency) /* do not run finalizers during emergency GC */
- callallpendingfinalizers(L, 1);
+ global_State *g = G(L);
+ int origkind = g->gckind;
+ lua_assert(origkind != KGC_EMERGENCY);
+ if (isemergency) /* do not run finalizers during emergency GC */
+ g->gckind = KGC_EMERGENCY;
+ else {
+ g->gckind = KGC_NORMAL;
+ callallpendingfinalizers(L, 1);
+ }
+ if (keepinvariant(g)) { /* may there be some black objects? */
+ /* must sweep all objects to turn them back to white
+ (as white has not changed, nothing will be collected) */
+ entersweep(L);
+ }
+ /* finish any pending sweep phase to start a new cycle */
+ luaC_runtilstate(L, bitmask(GCSpause));
+ luaC_runtilstate(L, ~bitmask(GCSpause)); /* start new collection */
+ luaC_runtilstate(L, bitmask(GCSpause)); /* run entire collection */
+ if (origkind == KGC_GEN) { /* generational mode? */
+ /* generational mode must be kept in propagate phase */
+ luaC_runtilstate(L, bitmask(GCSpropagate));
+ }
+ g->gckind = origkind;
+ setpause(g, gettotalbytes(g));
+ if (!isemergency) /* do not run finalizers during emergency GC */
+ callallpendingfinalizers(L, 1);
}
/* }====================================================== */
-
-
diff --git a/src/lib/lua/lib/lsqlite3.c b/src/lib/lua/lib/lsqlite3.c
index 047b15583bf..34f4ca573f0 100644
--- a/src/lib/lua/lib/lsqlite3.c
+++ b/src/lib/lua/lib/lsqlite3.c
@@ -51,10 +51,10 @@
/* compile time features */
#if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)
- #define SQLITE_OMIT_PROGRESS_CALLBACK 0
+ #define SQLITE_OMIT_PROGRESS_CALLBACK 0
#endif
#if !defined(LSQLITE_OMIT_UPDATE_HOOK)
- #define LSQLITE_OMIT_UPDATE_HOOK 0
+ #define LSQLITE_OMIT_UPDATE_HOOK 0
#endif
typedef struct sdb sdb;
@@ -63,47 +63,47 @@ typedef struct sdb_func sdb_func;
/* to use as C user data so i know what function sqlite is calling */
struct sdb_func {
- /* references to associated lua values */
- int fn_step;
- int fn_finalize;
- int udata;
+ /* references to associated lua values */
+ int fn_step;
+ int fn_finalize;
+ int udata;
- sdb *db;
- char aggregate;
+ sdb *db;
+ char aggregate;
- sdb_func *next;
+ sdb_func *next;
};
/* information about database */
struct sdb {
- /* associated lua state */
- lua_State *L;
- /* sqlite database handle */
- sqlite3 *db;
+ /* associated lua state */
+ lua_State *L;
+ /* sqlite database handle */
+ sqlite3 *db;
- /* sql functions stack usage */
- sdb_func *func; /* top SQL function being called */
+ /* sql functions stack usage */
+ sdb_func *func; /* top SQL function being called */
- /* references */
- int busy_cb; /* busy callback */
- int busy_udata;
+ /* references */
+ int busy_cb; /* busy callback */
+ int busy_udata;
- int progress_cb; /* progress handler */
- int progress_udata;
+ int progress_cb; /* progress handler */
+ int progress_udata;
- int trace_cb; /* trace callback */
- int trace_udata;
+ int trace_cb; /* trace callback */
+ int trace_udata;
#if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
- int update_hook_cb; /* update_hook callback */
- int update_hook_udata;
+ int update_hook_cb; /* update_hook callback */
+ int update_hook_udata;
- int commit_hook_cb; /* commit_hook callback */
- int commit_hook_udata;
+ int commit_hook_cb; /* commit_hook callback */
+ int commit_hook_udata;
- int rollback_hook_cb; /* rollback_hook callback */
- int rollback_hook_udata;
+ int rollback_hook_cb; /* rollback_hook callback */
+ int rollback_hook_udata;
#endif
};
@@ -120,198 +120,198 @@ static int sqlite_ctx_meta_ref;
*/
static void vm_push_column(lua_State *L, sqlite3_stmt *vm, int idx) {
- switch (sqlite3_column_type(vm, idx)) {
- case SQLITE_INTEGER:
- {
- sqlite_int64 i64 = sqlite3_column_int64(vm, idx);
- lua_Number n = (lua_Number)i64;
- if (n == i64)
- lua_pushnumber(L, n);
- else
- lua_pushlstring(L, (const char*)sqlite3_column_text(vm, idx), sqlite3_column_bytes(vm, idx));
- }
- break;
- case SQLITE_FLOAT:
- lua_pushnumber(L, sqlite3_column_double(vm, idx));
- break;
- case SQLITE_TEXT:
- lua_pushlstring(L, (const char*)sqlite3_column_text(vm, idx), sqlite3_column_bytes(vm, idx));
- break;
- case SQLITE_BLOB:
- lua_pushlstring(L, (const char*)sqlite3_column_blob(vm, idx), sqlite3_column_bytes(vm, idx));
- break;
- case SQLITE_NULL:
- lua_pushnil(L);
- break;
- default:
- lua_pushnil(L);
- break;
- }
+ switch (sqlite3_column_type(vm, idx)) {
+ case SQLITE_INTEGER:
+ {
+ sqlite_int64 i64 = sqlite3_column_int64(vm, idx);
+ lua_Number n = (lua_Number)i64;
+ if (n == i64)
+ lua_pushnumber(L, n);
+ else
+ lua_pushlstring(L, (const char*)sqlite3_column_text(vm, idx), sqlite3_column_bytes(vm, idx));
+ }
+ break;
+ case SQLITE_FLOAT:
+ lua_pushnumber(L, sqlite3_column_double(vm, idx));
+ break;
+ case SQLITE_TEXT:
+ lua_pushlstring(L, (const char*)sqlite3_column_text(vm, idx), sqlite3_column_bytes(vm, idx));
+ break;
+ case SQLITE_BLOB:
+ lua_pushlstring(L, (const char*)sqlite3_column_blob(vm, idx), sqlite3_column_bytes(vm, idx));
+ break;
+ case SQLITE_NULL:
+ lua_pushnil(L);
+ break;
+ default:
+ lua_pushnil(L);
+ break;
+ }
}
/* virtual machine information */
struct sdb_vm {
- sdb *db; /* associated database handle */
- sqlite3_stmt *vm; /* virtual machine */
+ sdb *db; /* associated database handle */
+ sqlite3_stmt *vm; /* virtual machine */
- /* sqlite3_step info */
- int columns; /* number of columns in result */
- char has_values; /* true when step succeeds */
+ /* sqlite3_step info */
+ int columns; /* number of columns in result */
+ char has_values; /* true when step succeeds */
- char temp; /* temporary vm used in db:rows */
+ char temp; /* temporary vm used in db:rows */
};
/* called with sql text on the lua stack */
static sdb_vm *newvm(lua_State *L, sdb *db) {
- sdb_vm *svm = (sdb_vm*)lua_newuserdata(L, sizeof(sdb_vm));
+ sdb_vm *svm = (sdb_vm*)lua_newuserdata(L, sizeof(sdb_vm));
- luaL_getmetatable(L, sqlite_vm_meta);
- lua_setmetatable(L, -2); /* set metatable */
+ luaL_getmetatable(L, sqlite_vm_meta);
+ lua_setmetatable(L, -2); /* set metatable */
- svm->db = db;
- svm->columns = 0;
- svm->has_values = 0;
- svm->vm = NULL;
- svm->temp = 0;
+ svm->db = db;
+ svm->columns = 0;
+ svm->has_values = 0;
+ svm->vm = NULL;
+ svm->temp = 0;
- /* add an entry on the database table: svm -> sql text */
- lua_pushlightuserdata(L, db);
- lua_rawget(L, LUA_REGISTRYINDEX);
- lua_pushlightuserdata(L, svm);
- lua_pushvalue(L, -4); /* the sql text */
- lua_rawset(L, -3);
- lua_pop(L, 1);
+ /* add an entry on the database table: svm -> sql text */
+ lua_pushlightuserdata(L, db);
+ lua_rawget(L, LUA_REGISTRYINDEX);
+ lua_pushlightuserdata(L, svm);
+ lua_pushvalue(L, -4); /* the sql text */
+ lua_rawset(L, -3);
+ lua_pop(L, 1);
- return svm;
+ return svm;
}
static int cleanupvm(lua_State *L, sdb_vm *svm) {
- /* remove entry in database table - no harm if not present in the table */
- lua_pushlightuserdata(L, svm->db);
- lua_rawget(L, LUA_REGISTRYINDEX);
- lua_pushlightuserdata(L, svm);
- lua_pushnil(L);
- lua_rawset(L, -3);
- lua_pop(L, 1);
+ /* remove entry in database table - no harm if not present in the table */
+ lua_pushlightuserdata(L, svm->db);
+ lua_rawget(L, LUA_REGISTRYINDEX);
+ lua_pushlightuserdata(L, svm);
+ lua_pushnil(L);
+ lua_rawset(L, -3);
+ lua_pop(L, 1);
- svm->columns = 0;
- svm->has_values = 0;
+ svm->columns = 0;
+ svm->has_values = 0;
- if (!svm->vm) return 0;
+ if (!svm->vm) return 0;
- lua_pushnumber(L, sqlite3_finalize(svm->vm));
- svm->vm = NULL;
- return 1;
+ lua_pushnumber(L, sqlite3_finalize(svm->vm));
+ svm->vm = NULL;
+ return 1;
}
static int stepvm(lua_State *L, sdb_vm *svm) {
// MAME: fixed Visual Studio compiler warning lsqlite3.c(235) : warning C4701: potentially uninitialized local variable 'result' used
- int result = 0;
- int loop_limit = 3;
- while ( loop_limit-- ) {
- result = sqlite3_step(svm->vm);
- if ( result==SQLITE_ERROR ) {
- result = sqlite3_reset (svm->vm);
- }
- if ( result==SQLITE_SCHEMA ) {
- sqlite3_stmt *vn;
- const char *sql;
- /* recover sql text */
- lua_pushlightuserdata(L, svm->db);
- lua_rawget(L, LUA_REGISTRYINDEX);
- lua_pushlightuserdata(L, svm);
- lua_rawget(L, -2); /* sql text */
- sql = luaL_checkstring(L, -1);
- /* re-prepare */
- result = sqlite3_prepare(svm->db->db, sql, -1, &vn, NULL);
- if (result != SQLITE_OK) break;
- sqlite3_transfer_bindings(svm->vm, vn);
- sqlite3_finalize(svm->vm);
- svm->vm = vn;
- lua_pop(L,2);
- } else {
- break;
- }
- }
- return result;
+ int result = 0;
+ int loop_limit = 3;
+ while ( loop_limit-- ) {
+ result = sqlite3_step(svm->vm);
+ if ( result==SQLITE_ERROR ) {
+ result = sqlite3_reset (svm->vm);
+ }
+ if ( result==SQLITE_SCHEMA ) {
+ sqlite3_stmt *vn;
+ const char *sql;
+ /* recover sql text */
+ lua_pushlightuserdata(L, svm->db);
+ lua_rawget(L, LUA_REGISTRYINDEX);
+ lua_pushlightuserdata(L, svm);
+ lua_rawget(L, -2); /* sql text */
+ sql = luaL_checkstring(L, -1);
+ /* re-prepare */
+ result = sqlite3_prepare(svm->db->db, sql, -1, &vn, NULL);
+ if (result != SQLITE_OK) break;
+ sqlite3_transfer_bindings(svm->vm, vn);
+ sqlite3_finalize(svm->vm);
+ svm->vm = vn;
+ lua_pop(L,2);
+ } else {
+ break;
+ }
+ }
+ return result;
}
static sdb_vm *lsqlite_getvm(lua_State *L, int index) {
- sdb_vm *svm = (sdb_vm*)luaL_checkudata(L, index, sqlite_vm_meta);
- if (svm == NULL) luaL_argerror(L, index, "bad sqlite virtual machine");
- return svm;
+ sdb_vm *svm = (sdb_vm*)luaL_checkudata(L, index, sqlite_vm_meta);
+ if (svm == NULL) luaL_argerror(L, index, "bad sqlite virtual machine");
+ return svm;
}
static sdb_vm *lsqlite_checkvm(lua_State *L, int index) {
- sdb_vm *svm = lsqlite_getvm(L, index);
- if (svm->vm == NULL) luaL_argerror(L, index, "attempt to use closed sqlite virtual machine");
- return svm;
+ sdb_vm *svm = lsqlite_getvm(L, index);
+ if (svm->vm == NULL) luaL_argerror(L, index, "attempt to use closed sqlite virtual machine");
+ return svm;
}
static int dbvm_isopen(lua_State *L) {
- sdb_vm *svm = lsqlite_getvm(L, 1);
- lua_pushboolean(L, svm->vm != NULL ? 1 : 0);
- return 1;
+ sdb_vm *svm = lsqlite_getvm(L, 1);
+ lua_pushboolean(L, svm->vm != NULL ? 1 : 0);
+ return 1;
}
static int dbvm_tostring(lua_State *L) {
- char buff[39];
- sdb_vm *svm = lsqlite_getvm(L, 1);
- if (svm->vm == NULL)
- strcpy(buff, "closed");
- else
- sprintf(buff, "%p", svm);
- lua_pushfstring(L, "sqlite virtual machine (%s)", buff);
- return 1;
+ char buff[39];
+ sdb_vm *svm = lsqlite_getvm(L, 1);
+ if (svm->vm == NULL)
+ strcpy(buff, "closed");
+ else
+ sprintf(buff, "%p", svm);
+ lua_pushfstring(L, "sqlite virtual machine (%s)", buff);
+ return 1;
}
static int dbvm_gc(lua_State *L) {
- sdb_vm *svm = lsqlite_getvm(L, 1);
- if (svm->vm != NULL) /* ignore closed vms */
- cleanupvm(L, svm);
- return 0;
+ sdb_vm *svm = lsqlite_getvm(L, 1);
+ if (svm->vm != NULL) /* ignore closed vms */
+ cleanupvm(L, svm);
+ return 0;
}
static int dbvm_step(lua_State *L) {
- int result;
- sdb_vm *svm = lsqlite_checkvm(L, 1);
+ int result;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
- result = stepvm(L, svm);
- svm->has_values = result == SQLITE_ROW ? 1 : 0;
- svm->columns = sqlite3_data_count(svm->vm);
+ result = stepvm(L, svm);
+ svm->has_values = result == SQLITE_ROW ? 1 : 0;
+ svm->columns = sqlite3_data_count(svm->vm);
- lua_pushnumber(L, result);
- return 1;
+ lua_pushnumber(L, result);
+ return 1;
}
static int dbvm_finalize(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- return cleanupvm(L, svm);
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ return cleanupvm(L, svm);
}
static int dbvm_reset(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_reset(svm->vm);
- lua_pushnumber(L, sqlite3_errcode(svm->db->db));
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_reset(svm->vm);
+ lua_pushnumber(L, sqlite3_errcode(svm->db->db));
+ return 1;
}
static void dbvm_check_contents(lua_State *L, sdb_vm *svm) {
- if (!svm->has_values) {
- luaL_error(L, "misuse of function");
- }
+ if (!svm->has_values) {
+ luaL_error(L, "misuse of function");
+ }
}
static void dbvm_check_index(lua_State *L, sdb_vm *svm, int index) {
- if (index < 0 || index >= svm->columns) {
- luaL_error(L, "index out of range [0..%d]", svm->columns - 1);
- }
+ if (index < 0 || index >= svm->columns) {
+ luaL_error(L, "index out of range [0..%d]", svm->columns - 1);
+ }
}
static void dbvm_check_bind_index(lua_State *L, sdb_vm *svm, int index) {
- if (index < 1 || index > sqlite3_bind_parameter_count(svm->vm)) {
- luaL_error(L, "bind index out of range [1..%d]", sqlite3_bind_parameter_count(svm->vm));
- }
+ if (index < 1 || index > sqlite3_bind_parameter_count(svm->vm)) {
+ luaL_error(L, "bind index out of range [1..%d]", sqlite3_bind_parameter_count(svm->vm));
+ }
}
/*
@@ -320,9 +320,9 @@ static void dbvm_check_bind_index(lua_State *L, sdb_vm *svm, int index) {
** =======================================================
*/
static int dbvm_columns(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- lua_pushnumber(L, sqlite3_column_count(svm->vm));
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ lua_pushnumber(L, sqlite3_column_count(svm->vm));
+ return 1;
}
/*
@@ -332,139 +332,139 @@ static int dbvm_columns(lua_State *L) {
*/
static int dbvm_get_value(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- int index = luaL_checkint(L, 2);
- dbvm_check_contents(L, svm);
- dbvm_check_index(L, svm, index);
- vm_push_column(L, svm->vm, index);
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ int index = luaL_checkint(L, 2);
+ dbvm_check_contents(L, svm);
+ dbvm_check_index(L, svm, index);
+ vm_push_column(L, svm->vm, index);
+ return 1;
}
static int dbvm_get_name(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- int index = luaL_checknumber(L, 2);
- dbvm_check_index(L, svm, index);
- lua_pushstring(L, sqlite3_column_name(svm->vm, index));
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ int index = luaL_checknumber(L, 2);
+ dbvm_check_index(L, svm, index);
+ lua_pushstring(L, sqlite3_column_name(svm->vm, index));
+ return 1;
}
static int dbvm_get_type(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- int index = luaL_checknumber(L, 2);
- dbvm_check_index(L, svm, index);
- lua_pushstring(L, sqlite3_column_decltype(svm->vm, index));
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ int index = luaL_checknumber(L, 2);
+ dbvm_check_index(L, svm, index);
+ lua_pushstring(L, sqlite3_column_decltype(svm->vm, index));
+ return 1;
}
static int dbvm_get_values(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = svm->columns;
- int n;
- dbvm_check_contents(L, svm);
-
- lua_newtable(L);
- for (n = 0; n < columns;) {
- vm_push_column(L, vm, n++);
- lua_rawseti(L, -2, n);
- }
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = svm->columns;
+ int n;
+ dbvm_check_contents(L, svm);
+
+ lua_newtable(L);
+ for (n = 0; n < columns;) {
+ vm_push_column(L, vm, n++);
+ lua_rawseti(L, -2, n);
+ }
+ return 1;
}
static int dbvm_get_names(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
- int n;
-
- lua_newtable(L);
- for (n = 0; n < columns;) {
- lua_pushstring(L, sqlite3_column_name(vm, n++));
- lua_rawseti(L, -2, n);
- }
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
+ int n;
+
+ lua_newtable(L);
+ for (n = 0; n < columns;) {
+ lua_pushstring(L, sqlite3_column_name(vm, n++));
+ lua_rawseti(L, -2, n);
+ }
+ return 1;
}
static int dbvm_get_types(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
- int n;
-
- lua_newtable(L);
- for (n = 0; n < columns;) {
- lua_pushstring(L, sqlite3_column_decltype(vm, n++));
- lua_rawseti(L, -2, n);
- }
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
+ int n;
+
+ lua_newtable(L);
+ for (n = 0; n < columns;) {
+ lua_pushstring(L, sqlite3_column_decltype(vm, n++));
+ lua_rawseti(L, -2, n);
+ }
+ return 1;
}
static int dbvm_get_uvalues(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = svm->columns;
- int n;
- dbvm_check_contents(L, svm);
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = svm->columns;
+ int n;
+ dbvm_check_contents(L, svm);
- lua_checkstack(L, columns);
- for (n = 0; n < columns; ++n)
- vm_push_column(L, vm, n);
- return columns;
+ lua_checkstack(L, columns);
+ for (n = 0; n < columns; ++n)
+ vm_push_column(L, vm, n);
+ return columns;
}
static int dbvm_get_unames(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
- int n;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
+ int n;
- lua_checkstack(L, columns);
- for (n = 0; n < columns; ++n)
- lua_pushstring(L, sqlite3_column_name(vm, n));
- return columns;
+ lua_checkstack(L, columns);
+ for (n = 0; n < columns; ++n)
+ lua_pushstring(L, sqlite3_column_name(vm, n));
+ return columns;
}
static int dbvm_get_utypes(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
- int n;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = sqlite3_column_count(vm); /* valid as soon as statement prepared */
+ int n;
- lua_checkstack(L, columns);
- for (n = 0; n < columns; ++n)
- lua_pushstring(L, sqlite3_column_decltype(vm, n));
- return columns;
+ lua_checkstack(L, columns);
+ for (n = 0; n < columns; ++n)
+ lua_pushstring(L, sqlite3_column_decltype(vm, n));
+ return columns;
}
static int dbvm_get_named_values(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = svm->columns;
- int n;
- dbvm_check_contents(L, svm);
-
- lua_newtable(L);
- for (n = 0; n < columns; ++n) {
- lua_pushstring(L, sqlite3_column_name(vm, n));
- vm_push_column(L, vm, n);
- lua_rawset(L, -3);
- }
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = svm->columns;
+ int n;
+ dbvm_check_contents(L, svm);
+
+ lua_newtable(L);
+ for (n = 0; n < columns; ++n) {
+ lua_pushstring(L, sqlite3_column_name(vm, n));
+ vm_push_column(L, vm, n);
+ lua_rawset(L, -3);
+ }
+ return 1;
}
static int dbvm_get_named_types(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int columns = sqlite3_column_count(vm);
- int n;
-
- lua_newtable(L);
- for (n = 0; n < columns; ++n) {
- lua_pushstring(L, sqlite3_column_name(vm, n));
- lua_pushstring(L, sqlite3_column_decltype(vm, n));
- lua_rawset(L, -3);
- }
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int columns = sqlite3_column_count(vm);
+ int n;
+
+ lua_newtable(L);
+ for (n = 0; n < columns; ++n) {
+ lua_pushstring(L, sqlite3_column_name(vm, n));
+ lua_pushstring(L, sqlite3_column_decltype(vm, n));
+ lua_rawset(L, -3);
+ }
+ return 1;
}
/*
@@ -474,115 +474,115 @@ static int dbvm_get_named_types(lua_State *L) {
*/
static int dbvm_bind_index(lua_State *L, sqlite3_stmt *vm, int index, int lindex) {
- switch (lua_type(L, lindex)) {
- case LUA_TSTRING:
- return sqlite3_bind_text(vm, index, lua_tostring(L, lindex), lua_strlen(L, lindex), SQLITE_TRANSIENT);
- case LUA_TNUMBER:
- return sqlite3_bind_double(vm, index, lua_tonumber(L, lindex));
- case LUA_TBOOLEAN:
- return sqlite3_bind_int(vm, index, lua_toboolean(L, lindex) ? 1 : 0);
- case LUA_TNONE:
- case LUA_TNIL:
- return sqlite3_bind_null(vm, index);
- default:
- luaL_error(L, "index (%d) - invalid data type for bind (%s)", index, lua_typename(L, lua_type(L, lindex)));
- return SQLITE_MISUSE; /*!*/
- }
+ switch (lua_type(L, lindex)) {
+ case LUA_TSTRING:
+ return sqlite3_bind_text(vm, index, lua_tostring(L, lindex), lua_strlen(L, lindex), SQLITE_TRANSIENT);
+ case LUA_TNUMBER:
+ return sqlite3_bind_double(vm, index, lua_tonumber(L, lindex));
+ case LUA_TBOOLEAN:
+ return sqlite3_bind_int(vm, index, lua_toboolean(L, lindex) ? 1 : 0);
+ case LUA_TNONE:
+ case LUA_TNIL:
+ return sqlite3_bind_null(vm, index);
+ default:
+ luaL_error(L, "index (%d) - invalid data type for bind (%s)", index, lua_typename(L, lua_type(L, lindex)));
+ return SQLITE_MISUSE; /*!*/
+ }
}
static int dbvm_bind_parameter_count(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- lua_pushnumber(L, sqlite3_bind_parameter_count(svm->vm));
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ lua_pushnumber(L, sqlite3_bind_parameter_count(svm->vm));
+ return 1;
}
static int dbvm_bind_parameter_name(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- int index = luaL_checknumber(L, 2);
- dbvm_check_bind_index(L, svm, index);
- lua_pushstring(L, sqlite3_bind_parameter_name(svm->vm, index));
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ int index = luaL_checknumber(L, 2);
+ dbvm_check_bind_index(L, svm, index);
+ lua_pushstring(L, sqlite3_bind_parameter_name(svm->vm, index));
+ return 1;
}
static int dbvm_bind(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int index = luaL_checkint(L, 2);
- int result;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int index = luaL_checkint(L, 2);
+ int result;
- dbvm_check_bind_index(L, svm, index);
- result = dbvm_bind_index(L, vm, index, 3);
+ dbvm_check_bind_index(L, svm, index);
+ result = dbvm_bind_index(L, vm, index, 3);
- lua_pushnumber(L, result);
- return 1;
+ lua_pushnumber(L, result);
+ return 1;
}
static int dbvm_bind_blob(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- int index = luaL_checkint(L, 2);
- const char *value = luaL_checkstring(L, 3);
- int len = lua_strlen(L, 3);
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ int index = luaL_checkint(L, 2);
+ const char *value = luaL_checkstring(L, 3);
+ int len = lua_strlen(L, 3);
- lua_pushnumber(L, sqlite3_bind_blob(svm->vm, index, value, len, SQLITE_TRANSIENT));
- return 1;
+ lua_pushnumber(L, sqlite3_bind_blob(svm->vm, index, value, len, SQLITE_TRANSIENT));
+ return 1;
}
static int dbvm_bind_values(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int top = lua_gettop(L);
- int result, n;
-
- if (top - 1 != sqlite3_bind_parameter_count(vm))
- luaL_error(L,
- "incorrect number of parameters to bind (%d given, %d to bind)",
- top - 1,
- sqlite3_bind_parameter_count(vm)
- );
-
- for (n = 2; n <= top; ++n) {
- if ((result = dbvm_bind_index(L, vm, n - 1, n)) != SQLITE_OK) {
- lua_pushnumber(L, result);
- return 1;
- }
- }
-
- lua_pushnumber(L, SQLITE_OK);
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int top = lua_gettop(L);
+ int result, n;
+
+ if (top - 1 != sqlite3_bind_parameter_count(vm))
+ luaL_error(L,
+ "incorrect number of parameters to bind (%d given, %d to bind)",
+ top - 1,
+ sqlite3_bind_parameter_count(vm)
+ );
+
+ for (n = 2; n <= top; ++n) {
+ if ((result = dbvm_bind_index(L, vm, n - 1, n)) != SQLITE_OK) {
+ lua_pushnumber(L, result);
+ return 1;
+ }
+ }
+
+ lua_pushnumber(L, SQLITE_OK);
+ return 1;
}
static int dbvm_bind_names(lua_State *L) {
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm = svm->vm;
- int count = sqlite3_bind_parameter_count(vm);
- const char *name;
- int result, n;
- luaL_checktype(L, 2, LUA_TTABLE);
-
- for (n = 1; n <= count; ++n) {
- name = sqlite3_bind_parameter_name(vm, n);
- if (name && (name[0] == ':' || name[0] == '$')) {
- lua_pushstring(L, ++name);
- lua_gettable(L, 2);
- result = dbvm_bind_index(L, vm, n, -1);
- lua_pop(L, 1);
- }
- else {
- lua_pushnumber(L, n);
- lua_gettable(L, 2);
- result = dbvm_bind_index(L, vm, n, -1);
- lua_pop(L, 1);
- }
-
- if (result != SQLITE_OK) {
- lua_pushnumber(L, result);
- return 1;
- }
- }
-
- lua_pushnumber(L, SQLITE_OK);
- return 1;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm = svm->vm;
+ int count = sqlite3_bind_parameter_count(vm);
+ const char *name;
+ int result, n;
+ luaL_checktype(L, 2, LUA_TTABLE);
+
+ for (n = 1; n <= count; ++n) {
+ name = sqlite3_bind_parameter_name(vm, n);
+ if (name && (name[0] == ':' || name[0] == '$')) {
+ lua_pushstring(L, ++name);
+ lua_gettable(L, 2);
+ result = dbvm_bind_index(L, vm, n, -1);
+ lua_pop(L, 1);
+ }
+ else {
+ lua_pushnumber(L, n);
+ lua_gettable(L, 2);
+ result = dbvm_bind_index(L, vm, n, -1);
+ lua_pop(L, 1);
+ }
+
+ if (result != SQLITE_OK) {
+ lua_pushnumber(L, result);
+ return 1;
+ }
+ }
+
+ lua_pushnumber(L, SQLITE_OK);
+ return 1;
}
/*
@@ -599,110 +599,110 @@ static int dbvm_bind_names(lua_State *L) {
** Creates a new 'table' and leaves it in the stack
*/
static sdb *newdb (lua_State *L) {
- sdb *db = (sdb*)lua_newuserdata(L, sizeof(sdb));
- db->L = L;
- db->db = NULL; /* database handle is currently `closed' */
- db->func = NULL;
-
- db->busy_cb =
- db->busy_udata =
- db->progress_cb =
- db->progress_udata =
- db->trace_cb =
- db->trace_udata =
+ sdb *db = (sdb*)lua_newuserdata(L, sizeof(sdb));
+ db->L = L;
+ db->db = NULL; /* database handle is currently `closed' */
+ db->func = NULL;
+
+ db->busy_cb =
+ db->busy_udata =
+ db->progress_cb =
+ db->progress_udata =
+ db->trace_cb =
+ db->trace_udata =
#if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
- db->update_hook_cb =
- db->update_hook_udata =
- db->commit_hook_cb =
- db->commit_hook_udata =
- db->rollback_hook_cb =
- db->rollback_hook_udata =
+ db->update_hook_cb =
+ db->update_hook_udata =
+ db->commit_hook_cb =
+ db->commit_hook_udata =
+ db->rollback_hook_cb =
+ db->rollback_hook_udata =
#endif
- LUA_NOREF;
+ LUA_NOREF;
- luaL_getmetatable(L, sqlite_meta);
- lua_setmetatable(L, -2); /* set metatable */
+ luaL_getmetatable(L, sqlite_meta);
+ lua_setmetatable(L, -2); /* set metatable */
- /* to keep track of 'open' virtual machines */
- lua_pushlightuserdata(L, db);
- lua_newtable(L);
- lua_rawset(L, LUA_REGISTRYINDEX);
+ /* to keep track of 'open' virtual machines */
+ lua_pushlightuserdata(L, db);
+ lua_newtable(L);
+ lua_rawset(L, LUA_REGISTRYINDEX);
- return db;
+ return db;
}
static int cleanupdb(lua_State *L, sdb *db) {
- sdb_func *func;
- sdb_func *func_next;
- int top;
- int result;
-
- /* free associated virtual machines */
- lua_pushlightuserdata(L, db);
- lua_rawget(L, LUA_REGISTRYINDEX);
-
- /* close all used handles */
- top = lua_gettop(L);
- lua_pushnil(L);
- while (lua_next(L, -2)) {
- sdb_vm *svm = (sdb_vm *)lua_touserdata(L, -2); /* key: vm; val: sql text */
- cleanupvm(L, svm);
-
- lua_settop(L, top);
- lua_pushnil(L);
- }
-
- lua_pop(L, 1); /* pop vm table */
-
- /* remove entry in lua registry table */
- lua_pushlightuserdata(L, db);
- lua_pushnil(L);
- lua_rawset(L, LUA_REGISTRYINDEX);
-
- /* 'free' all references */
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
- luaL_unref(L, LUA_REGISTRYINDEX, db->progress_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->progress_udata);
- luaL_unref(L, LUA_REGISTRYINDEX, db->trace_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->trace_udata);
+ sdb_func *func;
+ sdb_func *func_next;
+ int top;
+ int result;
+
+ /* free associated virtual machines */
+ lua_pushlightuserdata(L, db);
+ lua_rawget(L, LUA_REGISTRYINDEX);
+
+ /* close all used handles */
+ top = lua_gettop(L);
+ lua_pushnil(L);
+ while (lua_next(L, -2)) {
+ sdb_vm *svm = (sdb_vm *)lua_touserdata(L, -2); /* key: vm; val: sql text */
+ cleanupvm(L, svm);
+
+ lua_settop(L, top);
+ lua_pushnil(L);
+ }
+
+ lua_pop(L, 1); /* pop vm table */
+
+ /* remove entry in lua registry table */
+ lua_pushlightuserdata(L, db);
+ lua_pushnil(L);
+ lua_rawset(L, LUA_REGISTRYINDEX);
+
+ /* 'free' all references */
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->progress_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->progress_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->trace_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->trace_udata);
#if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
- luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_udata);
- luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_udata);
- luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_udata);
#endif
- /* close database */
- result = sqlite3_close(db->db);
- db->db = NULL;
+ /* close database */
+ result = sqlite3_close(db->db);
+ db->db = NULL;
- /* free associated memory with created functions */
- func = db->func;
- while (func) {
- func_next = func->next;
- luaL_unref(L, LUA_REGISTRYINDEX, func->fn_step);
- luaL_unref(L, LUA_REGISTRYINDEX, func->fn_finalize);
- luaL_unref(L, LUA_REGISTRYINDEX, func->udata);
- free(func);
- func = func_next;
- }
- db->func = NULL;
- return result;
+ /* free associated memory with created functions */
+ func = db->func;
+ while (func) {
+ func_next = func->next;
+ luaL_unref(L, LUA_REGISTRYINDEX, func->fn_step);
+ luaL_unref(L, LUA_REGISTRYINDEX, func->fn_finalize);
+ luaL_unref(L, LUA_REGISTRYINDEX, func->udata);
+ free(func);
+ func = func_next;
+ }
+ db->func = NULL;
+ return result;
}
static sdb *lsqlite_getdb(lua_State *L, int index) {
- sdb *db = (sdb*)luaL_checkudata(L, index, sqlite_meta);
- if (db == NULL) luaL_typerror(L, index, "sqlite database");
- return db;
+ sdb *db = (sdb*)luaL_checkudata(L, index, sqlite_meta);
+ if (db == NULL) luaL_typerror(L, index, "sqlite database");
+ return db;
}
static sdb *lsqlite_checkdb(lua_State *L, int index) {
- sdb *db = lsqlite_getdb(L, index);
- if (db->db == NULL) luaL_argerror(L, index, "attempt to use closed sqlite database");
- return db;
+ sdb *db = lsqlite_getdb(L, index);
+ if (db->db == NULL) luaL_argerror(L, index, "attempt to use closed sqlite database");
+ return db;
}
@@ -712,77 +712,77 @@ static sdb *lsqlite_checkdb(lua_State *L, int index) {
** =======================================================
*/
typedef struct {
- sqlite3_context *ctx;
- int ud;
+ sqlite3_context *ctx;
+ int ud;
} lcontext;
static lcontext *lsqlite_make_context(lua_State *L) {
- lcontext *ctx = (lcontext*)lua_newuserdata(L, sizeof(lcontext));
- lua_rawgeti(L, LUA_REGISTRYINDEX, sqlite_ctx_meta_ref);
- lua_setmetatable(L, -2);
- ctx->ctx = NULL;
- ctx->ud = LUA_NOREF;
- return ctx;
+ lcontext *ctx = (lcontext*)lua_newuserdata(L, sizeof(lcontext));
+ lua_rawgeti(L, LUA_REGISTRYINDEX, sqlite_ctx_meta_ref);
+ lua_setmetatable(L, -2);
+ ctx->ctx = NULL;
+ ctx->ud = LUA_NOREF;
+ return ctx;
}
static lcontext *lsqlite_getcontext(lua_State *L, int index) {
- lcontext *ctx = (lcontext*)luaL_checkudata(L, index, sqlite_ctx_meta);
- if (ctx == NULL) luaL_typerror(L, index, "sqlite context");
- return ctx;
+ lcontext *ctx = (lcontext*)luaL_checkudata(L, index, sqlite_ctx_meta);
+ if (ctx == NULL) luaL_typerror(L, index, "sqlite context");
+ return ctx;
}
static lcontext *lsqlite_checkcontext(lua_State *L, int index) {
- lcontext *ctx = lsqlite_getcontext(L, index);
- if (ctx->ctx == NULL) luaL_argerror(L, index, "invalid sqlite context");
- return ctx;
+ lcontext *ctx = lsqlite_getcontext(L, index);
+ if (ctx->ctx == NULL) luaL_argerror(L, index, "invalid sqlite context");
+ return ctx;
}
static int lcontext_tostring(lua_State *L) {
- char buff[39];
- lcontext *ctx = lsqlite_getcontext(L, 1);
- if (ctx->ctx == NULL)
- strcpy(buff, "closed");
- else
- sprintf(buff, "%p", ctx->ctx);
- lua_pushfstring(L, "sqlite function context (%s)", buff);
- return 1;
+ char buff[39];
+ lcontext *ctx = lsqlite_getcontext(L, 1);
+ if (ctx->ctx == NULL)
+ strcpy(buff, "closed");
+ else
+ sprintf(buff, "%p", ctx->ctx);
+ lua_pushfstring(L, "sqlite function context (%s)", buff);
+ return 1;
}
static void lcontext_check_aggregate(lua_State *L, lcontext *ctx) {
- sdb_func *func = (sdb_func*)sqlite3_user_data(ctx->ctx);
- if (!func->aggregate) {
- luaL_error(L, "attempt to call aggregate method from scalar function");
- }
+ sdb_func *func = (sdb_func*)sqlite3_user_data(ctx->ctx);
+ if (!func->aggregate) {
+ luaL_error(L, "attempt to call aggregate method from scalar function");
+ }
}
static int lcontext_user_data(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- sdb_func *func = (sdb_func*)sqlite3_user_data(ctx->ctx);
- lua_rawgeti(L, LUA_REGISTRYINDEX, func->udata);
- return 1;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ sdb_func *func = (sdb_func*)sqlite3_user_data(ctx->ctx);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, func->udata);
+ return 1;
}
static int lcontext_get_aggregate_context(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- lcontext_check_aggregate(L, ctx);
- lua_rawgeti(L, LUA_REGISTRYINDEX, ctx->ud);
- return 1;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ lcontext_check_aggregate(L, ctx);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, ctx->ud);
+ return 1;
}
static int lcontext_set_aggregate_context(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- lcontext_check_aggregate(L, ctx);
- lua_settop(L, 2);
- luaL_unref(L, LUA_REGISTRYINDEX, ctx->ud);
- ctx->ud = luaL_ref(L, LUA_REGISTRYINDEX);
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ lcontext_check_aggregate(L, ctx);
+ lua_settop(L, 2);
+ luaL_unref(L, LUA_REGISTRYINDEX, ctx->ud);
+ ctx->ud = luaL_ref(L, LUA_REGISTRYINDEX);
+ return 0;
}
static int lcontext_aggregate_count(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- lcontext_check_aggregate(L, ctx);
- lua_pushnumber(L, sqlite3_aggregate_count(ctx->ctx));
- return 1;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ lcontext_check_aggregate(L, ctx);
+ lua_pushnumber(L, sqlite3_aggregate_count(ctx->ctx));
+ return 1;
}
#if 0
@@ -791,68 +791,68 @@ void sqlite3_set_auxdata(sqlite3_context*, int, void*, void (*)(void*));
#endif
static int lcontext_result(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- switch (lua_type(L, 2)) {
- case LUA_TNUMBER:
- sqlite3_result_double(ctx->ctx, luaL_checknumber(L, 2));
- break;
- case LUA_TSTRING:
- sqlite3_result_text(ctx->ctx, luaL_checkstring(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
- break;
- case LUA_TNIL:
- case LUA_TNONE:
- sqlite3_result_null(ctx->ctx);
- break;
- default:
- luaL_error(L, "invalid result type %s", lua_typename(L, 2));
- break;
- }
-
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ switch (lua_type(L, 2)) {
+ case LUA_TNUMBER:
+ sqlite3_result_double(ctx->ctx, luaL_checknumber(L, 2));
+ break;
+ case LUA_TSTRING:
+ sqlite3_result_text(ctx->ctx, luaL_checkstring(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
+ break;
+ case LUA_TNIL:
+ case LUA_TNONE:
+ sqlite3_result_null(ctx->ctx);
+ break;
+ default:
+ luaL_error(L, "invalid result type %s", lua_typename(L, 2));
+ break;
+ }
+
+ return 0;
}
static int lcontext_result_blob(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- const char *blob = luaL_checkstring(L, 2);
- int size = lua_strlen(L, 2);
- sqlite3_result_blob(ctx->ctx, (const void*)blob, size, SQLITE_TRANSIENT);
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ const char *blob = luaL_checkstring(L, 2);
+ int size = lua_strlen(L, 2);
+ sqlite3_result_blob(ctx->ctx, (const void*)blob, size, SQLITE_TRANSIENT);
+ return 0;
}
static int lcontext_result_double(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- double d = luaL_checknumber(L, 2);
- sqlite3_result_double(ctx->ctx, d);
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ double d = luaL_checknumber(L, 2);
+ sqlite3_result_double(ctx->ctx, d);
+ return 0;
}
static int lcontext_result_error(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- const char *err = luaL_checkstring(L, 2);
- int size = lua_strlen(L, 2);
- sqlite3_result_error(ctx->ctx, err, size);
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ const char *err = luaL_checkstring(L, 2);
+ int size = lua_strlen(L, 2);
+ sqlite3_result_error(ctx->ctx, err, size);
+ return 0;
}
static int lcontext_result_int(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- int i = luaL_checkint(L, 2);
- sqlite3_result_int(ctx->ctx, i);
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ int i = luaL_checkint(L, 2);
+ sqlite3_result_int(ctx->ctx, i);
+ return 0;
}
static int lcontext_result_null(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- sqlite3_result_null(ctx->ctx);
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ sqlite3_result_null(ctx->ctx);
+ return 0;
}
static int lcontext_result_text(lua_State *L) {
- lcontext *ctx = lsqlite_checkcontext(L, 1);
- const char *text = luaL_checkstring(L, 2);
- int size = lua_strlen(L, 2);
- sqlite3_result_text(ctx->ctx, text, size, SQLITE_TRANSIENT);
- return 0;
+ lcontext *ctx = lsqlite_checkcontext(L, 1);
+ const char *text = luaL_checkstring(L, 2);
+ int size = lua_strlen(L, 2);
+ sqlite3_result_text(ctx->ctx, text, size, SQLITE_TRANSIENT);
+ return 0;
}
/*
@@ -862,51 +862,51 @@ static int lcontext_result_text(lua_State *L) {
*/
static int db_isopen(lua_State *L) {
- sdb *db = lsqlite_getdb(L, 1);
- lua_pushboolean(L, db->db != NULL ? 1 : 0);
- return 1;
+ sdb *db = lsqlite_getdb(L, 1);
+ lua_pushboolean(L, db->db != NULL ? 1 : 0);
+ return 1;
}
static int db_last_insert_rowid(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- /* conversion warning: int64 -> luaNumber */
- sqlite_int64 rowid = sqlite3_last_insert_rowid(db->db);
- lua_Number n = (lua_Number)rowid;
- if (n == rowid)
- lua_pushnumber(L, n);
- else
- lua_pushfstring(L, "%ll", rowid);
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ /* conversion warning: int64 -> luaNumber */
+ sqlite_int64 rowid = sqlite3_last_insert_rowid(db->db);
+ lua_Number n = (lua_Number)rowid;
+ if (n == rowid)
+ lua_pushnumber(L, n);
+ else
+ lua_pushfstring(L, "%ll", rowid);
+ return 1;
}
static int db_changes(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- lua_pushnumber(L, sqlite3_changes(db->db));
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ lua_pushnumber(L, sqlite3_changes(db->db));
+ return 1;
}
static int db_total_changes(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- lua_pushnumber(L, sqlite3_total_changes(db->db));
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ lua_pushnumber(L, sqlite3_total_changes(db->db));
+ return 1;
}
static int db_errcode(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- lua_pushnumber(L, sqlite3_errcode(db->db));
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ lua_pushnumber(L, sqlite3_errcode(db->db));
+ return 1;
}
static int db_errmsg(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- lua_pushstring(L, sqlite3_errmsg(db->db));
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ lua_pushstring(L, sqlite3_errmsg(db->db));
+ return 1;
}
static int db_interrupt(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- sqlite3_interrupt(db->db);
- return 0;
+ sdb *db = lsqlite_checkdb(L, 1);
+ sqlite3_interrupt(db->db);
+ return 0;
}
/*
@@ -914,40 +914,40 @@ static int db_interrupt(lua_State *L) {
*/
static void db_push_value(lua_State *L, sqlite3_value *value) {
- switch (sqlite3_value_type(value)) {
- case SQLITE_TEXT:
- lua_pushlstring(L, (const char*)sqlite3_value_text(value), sqlite3_value_bytes(value));
- break;
-
- case SQLITE_INTEGER:
- {
- sqlite_int64 i64 = sqlite3_value_int64(value);
- lua_Number n = (lua_Number)i64;
- if (n == i64)
- lua_pushnumber(L, n);
- else
- lua_pushlstring(L, (const char*)sqlite3_value_text(value), sqlite3_value_bytes(value));
- }
- break;
-
- case SQLITE_FLOAT:
- lua_pushnumber(L, sqlite3_value_double(value));
- break;
-
- case SQLITE_BLOB:
- lua_pushlstring(L, (const char*)sqlite3_value_blob(value), sqlite3_value_bytes(value));
- break;
-
- case SQLITE_NULL:
- lua_pushnil(L);
- break;
-
- default:
- /* things done properly (SQLite + Lua SQLite)
- ** this should never happen */
- lua_pushnil(L);
- break;
- }
+ switch (sqlite3_value_type(value)) {
+ case SQLITE_TEXT:
+ lua_pushlstring(L, (const char*)sqlite3_value_text(value), sqlite3_value_bytes(value));
+ break;
+
+ case SQLITE_INTEGER:
+ {
+ sqlite_int64 i64 = sqlite3_value_int64(value);
+ lua_Number n = (lua_Number)i64;
+ if (n == i64)
+ lua_pushnumber(L, n);
+ else
+ lua_pushlstring(L, (const char*)sqlite3_value_text(value), sqlite3_value_bytes(value));
+ }
+ break;
+
+ case SQLITE_FLOAT:
+ lua_pushnumber(L, sqlite3_value_double(value));
+ break;
+
+ case SQLITE_BLOB:
+ lua_pushlstring(L, (const char*)sqlite3_value_blob(value), sqlite3_value_bytes(value));
+ break;
+
+ case SQLITE_NULL:
+ lua_pushnil(L);
+ break;
+
+ default:
+ /* things done properly (SQLite + Lua SQLite)
+ ** this should never happen */
+ lua_pushnil(L);
+ break;
+ }
}
/*
@@ -957,106 +957,106 @@ static void db_push_value(lua_State *L, sqlite3_value *value) {
/* scalar function to be called
** callback params: context, values... */
static void db_sql_normal_function(sqlite3_context *context, int argc, sqlite3_value **argv) {
- sdb_func *func = (sdb_func*)sqlite3_user_data(context);
- lua_State *L = func->db->L;
- int n;
- lcontext *ctx;
-
- int top = lua_gettop(L);
-
- /* ensure there is enough space in the stack */
- lua_checkstack(L, argc + 3);
-
- lua_rawgeti(L, LUA_REGISTRYINDEX, func->fn_step); /* function to call */
-
- if (!func->aggregate) {
- ctx = lsqlite_make_context(L); /* push context - used to set results */
- }
- else {
- /* reuse context userdata value */
- void *p = sqlite3_aggregate_context(context, 1);
- /* i think it is OK to use assume that using a light user data
- ** as an entry on LUA REGISTRY table will be unique */
- lua_pushlightuserdata(L, p);
- lua_rawget(L, LUA_REGISTRYINDEX); /* context table */
-
- if (lua_isnil(L, -1)) { /* not yet created? */
- lua_pop(L, 1);
- ctx = lsqlite_make_context(L);
- lua_pushlightuserdata(L, p);
- lua_pushvalue(L, -2);
- lua_rawset(L, LUA_REGISTRYINDEX);
- }
- else
- ctx = lsqlite_getcontext(L, -1);
- }
-
- /* push params */
- for (n = 0; n < argc; ++n) {
- db_push_value(L, argv[n]);
- }
-
- /* set context */
- ctx->ctx = context;
-
- if (lua_pcall(L, argc + 1, 0, 0)) {
- const char *errmsg = lua_tostring(L, -1);
- int size = lua_strlen(L, -1);
- sqlite3_result_error(context, errmsg, size);
- }
-
- /* invalidate context */
- ctx->ctx = NULL;
-
- if (!func->aggregate) {
- luaL_unref(L, LUA_REGISTRYINDEX, ctx->ud);
- }
-
- lua_settop(L, top);
+ sdb_func *func = (sdb_func*)sqlite3_user_data(context);
+ lua_State *L = func->db->L;
+ int n;
+ lcontext *ctx;
+
+ int top = lua_gettop(L);
+
+ /* ensure there is enough space in the stack */
+ lua_checkstack(L, argc + 3);
+
+ lua_rawgeti(L, LUA_REGISTRYINDEX, func->fn_step); /* function to call */
+
+ if (!func->aggregate) {
+ ctx = lsqlite_make_context(L); /* push context - used to set results */
+ }
+ else {
+ /* reuse context userdata value */
+ void *p = sqlite3_aggregate_context(context, 1);
+ /* i think it is OK to use assume that using a light user data
+ ** as an entry on LUA REGISTRY table will be unique */
+ lua_pushlightuserdata(L, p);
+ lua_rawget(L, LUA_REGISTRYINDEX); /* context table */
+
+ if (lua_isnil(L, -1)) { /* not yet created? */
+ lua_pop(L, 1);
+ ctx = lsqlite_make_context(L);
+ lua_pushlightuserdata(L, p);
+ lua_pushvalue(L, -2);
+ lua_rawset(L, LUA_REGISTRYINDEX);
+ }
+ else
+ ctx = lsqlite_getcontext(L, -1);
+ }
+
+ /* push params */
+ for (n = 0; n < argc; ++n) {
+ db_push_value(L, argv[n]);
+ }
+
+ /* set context */
+ ctx->ctx = context;
+
+ if (lua_pcall(L, argc + 1, 0, 0)) {
+ const char *errmsg = lua_tostring(L, -1);
+ int size = lua_strlen(L, -1);
+ sqlite3_result_error(context, errmsg, size);
+ }
+
+ /* invalidate context */
+ ctx->ctx = NULL;
+
+ if (!func->aggregate) {
+ luaL_unref(L, LUA_REGISTRYINDEX, ctx->ud);
+ }
+
+ lua_settop(L, top);
}
static void db_sql_finalize_function(sqlite3_context *context) {
- sdb_func *func = (sdb_func*)sqlite3_user_data(context);
- lua_State *L = func->db->L;
- void *p = sqlite3_aggregate_context(context, 1); /* minimal mem usage */
- lcontext *ctx;
- int top = lua_gettop(L);
+ sdb_func *func = (sdb_func*)sqlite3_user_data(context);
+ lua_State *L = func->db->L;
+ void *p = sqlite3_aggregate_context(context, 1); /* minimal mem usage */
+ lcontext *ctx;
+ int top = lua_gettop(L);
- lua_rawgeti(L, LUA_REGISTRYINDEX, func->fn_finalize); /* function to call */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, func->fn_finalize); /* function to call */
- /* i think it is OK to use assume that using a light user data
- ** as an entry on LUA REGISTRY table will be unique */
- lua_pushlightuserdata(L, p);
- lua_rawget(L, LUA_REGISTRYINDEX); /* context table */
+ /* i think it is OK to use assume that using a light user data
+ ** as an entry on LUA REGISTRY table will be unique */
+ lua_pushlightuserdata(L, p);
+ lua_rawget(L, LUA_REGISTRYINDEX); /* context table */
- if (lua_isnil(L, -1)) { /* not yet created? - shouldn't happen in finalize function */
- lua_pop(L, 1);
- ctx = lsqlite_make_context(L);
- lua_pushlightuserdata(L, p);
- lua_pushvalue(L, -2);
- lua_rawset(L, LUA_REGISTRYINDEX);
- }
- else
- ctx = lsqlite_getcontext(L, -1);
+ if (lua_isnil(L, -1)) { /* not yet created? - shouldn't happen in finalize function */
+ lua_pop(L, 1);
+ ctx = lsqlite_make_context(L);
+ lua_pushlightuserdata(L, p);
+ lua_pushvalue(L, -2);
+ lua_rawset(L, LUA_REGISTRYINDEX);
+ }
+ else
+ ctx = lsqlite_getcontext(L, -1);
- /* set context */
- ctx->ctx = context;
+ /* set context */
+ ctx->ctx = context;
- if (lua_pcall(L, 1, 0, 0)) {
- sqlite3_result_error(context, lua_tostring(L, -1), -1);
- }
+ if (lua_pcall(L, 1, 0, 0)) {
+ sqlite3_result_error(context, lua_tostring(L, -1), -1);
+ }
- /* invalidate context */
- ctx->ctx = NULL;
+ /* invalidate context */
+ ctx->ctx = NULL;
- /* cleanup context */
- luaL_unref(L, LUA_REGISTRYINDEX, ctx->ud);
- /* remove it from registry */
- lua_pushlightuserdata(L, p);
- lua_pushnil(L);
- lua_rawset(L, LUA_REGISTRYINDEX);
+ /* cleanup context */
+ luaL_unref(L, LUA_REGISTRYINDEX, ctx->ud);
+ /* remove it from registry */
+ lua_pushlightuserdata(L, p);
+ lua_pushnil(L);
+ lua_rawset(L, LUA_REGISTRYINDEX);
- lua_settop(L, top);
+ lua_settop(L, top);
}
/*
@@ -1072,125 +1072,125 @@ static void db_sql_finalize_function(sqlite3_context *context) {
** Params of finalize: context
*/
static int db_register_function(lua_State *L, int aggregate) {
- sdb *db = lsqlite_checkdb(L, 1);
- const char *name;
- int args;
- int result;
- sdb_func *func;
-
- /* safety measure */
- if (aggregate) aggregate = 1;
-
- name = luaL_checkstring(L, 2);
- args = luaL_checkint(L, 3);
- luaL_checktype(L, 4, LUA_TFUNCTION);
- if (aggregate) luaL_checktype(L, 5, LUA_TFUNCTION);
-
- /* maybe an alternative way to allocate memory should be used/avoided */
- func = (sdb_func*)malloc(sizeof(sdb_func));
- if (func == NULL) {
- luaL_error(L, "out of memory");
- }
-
- result = sqlite3_create_function(
- db->db, name, args, SQLITE_UTF8, func,
- aggregate ? NULL : db_sql_normal_function,
- aggregate ? db_sql_normal_function : NULL,
- aggregate ? db_sql_finalize_function : NULL
- );
-
- if (result == SQLITE_OK) {
- /* safety measures for userdata field to be present in the stack */
- lua_settop(L, 5 + aggregate);
-
- /* save registered function in db function list */
- func->db = db;
- func->aggregate = aggregate;
- func->next = db->func;
- db->func = func;
-
- /* save the setp/normal function callback */
- lua_pushvalue(L, 4);
- func->fn_step = luaL_ref(L, LUA_REGISTRYINDEX);
- /* save user data */
- lua_pushvalue(L, 5+aggregate);
- func->udata = luaL_ref(L, LUA_REGISTRYINDEX);
-
- if (aggregate) {
- lua_pushvalue(L, 5);
- func->fn_finalize = luaL_ref(L, LUA_REGISTRYINDEX);
- }
- else
- func->fn_finalize = LUA_NOREF;
- }
- else {
- /* free allocated memory */
- free(func);
- }
-
- lua_pushboolean(L, result == SQLITE_OK ? 1 : 0);
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ const char *name;
+ int args;
+ int result;
+ sdb_func *func;
+
+ /* safety measure */
+ if (aggregate) aggregate = 1;
+
+ name = luaL_checkstring(L, 2);
+ args = luaL_checkint(L, 3);
+ luaL_checktype(L, 4, LUA_TFUNCTION);
+ if (aggregate) luaL_checktype(L, 5, LUA_TFUNCTION);
+
+ /* maybe an alternative way to allocate memory should be used/avoided */
+ func = (sdb_func*)malloc(sizeof(sdb_func));
+ if (func == NULL) {
+ luaL_error(L, "out of memory");
+ }
+
+ result = sqlite3_create_function(
+ db->db, name, args, SQLITE_UTF8, func,
+ aggregate ? NULL : db_sql_normal_function,
+ aggregate ? db_sql_normal_function : NULL,
+ aggregate ? db_sql_finalize_function : NULL
+ );
+
+ if (result == SQLITE_OK) {
+ /* safety measures for userdata field to be present in the stack */
+ lua_settop(L, 5 + aggregate);
+
+ /* save registered function in db function list */
+ func->db = db;
+ func->aggregate = aggregate;
+ func->next = db->func;
+ db->func = func;
+
+ /* save the setp/normal function callback */
+ lua_pushvalue(L, 4);
+ func->fn_step = luaL_ref(L, LUA_REGISTRYINDEX);
+ /* save user data */
+ lua_pushvalue(L, 5+aggregate);
+ func->udata = luaL_ref(L, LUA_REGISTRYINDEX);
+
+ if (aggregate) {
+ lua_pushvalue(L, 5);
+ func->fn_finalize = luaL_ref(L, LUA_REGISTRYINDEX);
+ }
+ else
+ func->fn_finalize = LUA_NOREF;
+ }
+ else {
+ /* free allocated memory */
+ free(func);
+ }
+
+ lua_pushboolean(L, result == SQLITE_OK ? 1 : 0);
+ return 1;
}
static int db_create_function(lua_State *L) {
- return db_register_function(L, 0);
+ return db_register_function(L, 0);
}
static int db_create_aggregate(lua_State *L) {
- return db_register_function(L, 1);
+ return db_register_function(L, 1);
}
/* create_collation; contributed by Thomas Lauer
*/
typedef struct {
- lua_State *L;
- int ref;
+ lua_State *L;
+ int ref;
} scc;
static int collwrapper(scc *co,int l1,const void *p1,
- int l2,const void *p2) {
- int res=0;
- lua_State *L=co->L;
- lua_rawgeti(L,LUA_REGISTRYINDEX,co->ref);
- lua_pushlstring(L,(const char*)p1,l1);
- lua_pushlstring(L,(const char*)p2,l2);
- if (lua_pcall(L,2,1,0)==0) res=lua_tonumber(L,-1);
- lua_pop(L,1);
- return res;
+ int l2,const void *p2) {
+ int res=0;
+ lua_State *L=co->L;
+ lua_rawgeti(L,LUA_REGISTRYINDEX,co->ref);
+ lua_pushlstring(L,(const char*)p1,l1);
+ lua_pushlstring(L,(const char*)p2,l2);
+ if (lua_pcall(L,2,1,0)==0) res=lua_tonumber(L,-1);
+ lua_pop(L,1);
+ return res;
}
static void collfree(scc *co) {
- if (co) {
- luaL_unref(co->L,LUA_REGISTRYINDEX,co->ref);
- free(co);
- }
+ if (co) {
+ luaL_unref(co->L,LUA_REGISTRYINDEX,co->ref);
+ free(co);
+ }
}
static int db_create_collation(lua_State *L) {
- sdb *db=lsqlite_checkdb(L,1);
- const char *collname=luaL_checkstring(L,2);
- scc *co=NULL;
- int (*collfunc)(scc *,int,const void *,int,const void *)=NULL;
- lua_settop(L,3); /* default args to nil, and exclude extras */
- if (lua_isfunction(L,3)) collfunc=collwrapper;
- else if (!lua_isnil(L,3))
- luaL_error(L,"create_collation: function or nil expected");
- if (collfunc != NULL) {
- co=(scc *)malloc(sizeof(scc)); /* userdata is a no-no as it
+ sdb *db=lsqlite_checkdb(L,1);
+ const char *collname=luaL_checkstring(L,2);
+ scc *co=NULL;
+ int (*collfunc)(scc *,int,const void *,int,const void *)=NULL;
+ lua_settop(L,3); /* default args to nil, and exclude extras */
+ if (lua_isfunction(L,3)) collfunc=collwrapper;
+ else if (!lua_isnil(L,3))
+ luaL_error(L,"create_collation: function or nil expected");
+ if (collfunc != NULL) {
+ co=(scc *)malloc(sizeof(scc)); /* userdata is a no-no as it
will be garbage-collected */
- if (co) {
- co->L=L;
- /* lua_settop(L,3) above means we don't need: lua_pushvalue(L,3); */
- co->ref=luaL_ref(L,LUA_REGISTRYINDEX);
- }
- else luaL_error(L,"create_collation: could not allocate callback");
- }
- sqlite3_create_collation_v2(db->db, collname, SQLITE_UTF8,
- (void *)co,
- (int(*)(void*,int,const void*,int,const void*))collfunc,
- (void(*)(void*))collfree);
- return 0;
+ if (co) {
+ co->L=L;
+ /* lua_settop(L,3) above means we don't need: lua_pushvalue(L,3); */
+ co->ref=luaL_ref(L,LUA_REGISTRYINDEX);
+ }
+ else luaL_error(L,"create_collation: could not allocate callback");
+ }
+ sqlite3_create_collation_v2(db->db, collname, SQLITE_UTF8,
+ (void *)co,
+ (int(*)(void*,int,const void*,int,const void*))collfunc,
+ (void(*)(void*))collfree);
+ return 0;
}
/*
@@ -1201,52 +1201,52 @@ static int db_create_collation(lua_State *L) {
** Params: userdata, sql
*/
static void db_trace_callback(void *user, const char *sql) {
- sdb *db = (sdb*)user;
- lua_State *L = db->L;
- int top = lua_gettop(L);
+ sdb *db = (sdb*)user;
+ lua_State *L = db->L;
+ int top = lua_gettop(L);
- /* setup lua callback call */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->trace_cb); /* get callback */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->trace_udata); /* get callback user data */
- lua_pushstring(L, sql); /* traced sql statement */
+ /* setup lua callback call */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->trace_cb); /* get callback */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->trace_udata); /* get callback user data */
+ lua_pushstring(L, sql); /* traced sql statement */
- /* call lua function */
- lua_pcall(L, 2, 0, 0);
- /* ignore any error generated by this function */
+ /* call lua function */
+ lua_pcall(L, 2, 0, 0);
+ /* ignore any error generated by this function */
- lua_settop(L, top);
+ lua_settop(L, top);
}
static int db_trace(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
+ sdb *db = lsqlite_checkdb(L, 1);
- if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
- luaL_unref(L, LUA_REGISTRYINDEX, db->trace_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->trace_udata);
+ if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
+ luaL_unref(L, LUA_REGISTRYINDEX, db->trace_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->trace_udata);
- db->trace_cb =
- db->trace_udata = LUA_NOREF;
+ db->trace_cb =
+ db->trace_udata = LUA_NOREF;
- /* clear trace handler */
- sqlite3_trace(db->db, NULL, NULL);
- }
- else {
- luaL_checktype(L, 2, LUA_TFUNCTION);
+ /* clear trace handler */
+ sqlite3_trace(db->db, NULL, NULL);
+ }
+ else {
+ luaL_checktype(L, 2, LUA_TFUNCTION);
- /* make sure we have an userdata field (even if nil) */
- lua_settop(L, 3);
+ /* make sure we have an userdata field (even if nil) */
+ lua_settop(L, 3);
- luaL_unref(L, LUA_REGISTRYINDEX, db->trace_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->trace_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->trace_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->trace_udata);
- db->trace_udata = luaL_ref(L, LUA_REGISTRYINDEX);
- db->trace_cb = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->trace_udata = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->trace_cb = luaL_ref(L, LUA_REGISTRYINDEX);
- /* set trace handler */
- sqlite3_trace(db->db, db_trace_callback, db);
- }
+ /* set trace handler */
+ sqlite3_trace(db->db, db_trace_callback, db);
+ }
- return 0;
+ return 0;
}
#if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
@@ -1256,64 +1256,64 @@ static int db_trace(lua_State *L) {
** Params: database, callback function, userdata
**
** callback function:
-** Params: userdata, {one of SQLITE_INSERT, SQLITE_DELETE, or SQLITE_UPDATE},
+** Params: userdata, {one of SQLITE_INSERT, SQLITE_DELETE, or SQLITE_UPDATE},
** database name, table name (containing the affected row), rowid of the row
*/
static void db_update_hook_callback(void *user, int op, char const *dbname, char const *tblname, sqlite3_int64 rowid) {
- sdb *db = (sdb*)user;
- lua_State *L = db->L;
- int top = lua_gettop(L);
- lua_Number n;
-
- /* setup lua callback call */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->update_hook_cb); /* get callback */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->update_hook_udata); /* get callback user data */
- lua_pushnumber(L, (lua_Number )op);
- lua_pushstring(L, dbname); /* update_hook database name */
- lua_pushstring(L, tblname); /* update_hook database name */
- n = (lua_Number)rowid;
- if (n == rowid)
- lua_pushnumber(L, n);
- else
- lua_pushfstring(L, "%ll", rowid);
-
- /* call lua function */
- lua_pcall(L, 5, 0, 0);
- /* ignore any error generated by this function */
-
- lua_settop(L, top);
+ sdb *db = (sdb*)user;
+ lua_State *L = db->L;
+ int top = lua_gettop(L);
+ lua_Number n;
+
+ /* setup lua callback call */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->update_hook_cb); /* get callback */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->update_hook_udata); /* get callback user data */
+ lua_pushnumber(L, (lua_Number )op);
+ lua_pushstring(L, dbname); /* update_hook database name */
+ lua_pushstring(L, tblname); /* update_hook database name */
+ n = (lua_Number)rowid;
+ if (n == rowid)
+ lua_pushnumber(L, n);
+ else
+ lua_pushfstring(L, "%ll", rowid);
+
+ /* call lua function */
+ lua_pcall(L, 5, 0, 0);
+ /* ignore any error generated by this function */
+
+ lua_settop(L, top);
}
static int db_update_hook(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
+ sdb *db = lsqlite_checkdb(L, 1);
- if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
- luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_udata);
+ if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
+ luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_udata);
- db->update_hook_cb =
- db->update_hook_udata = LUA_NOREF;
+ db->update_hook_cb =
+ db->update_hook_udata = LUA_NOREF;
- /* clear update_hook handler */
- sqlite3_update_hook(db->db, NULL, NULL);
- }
- else {
- luaL_checktype(L, 2, LUA_TFUNCTION);
+ /* clear update_hook handler */
+ sqlite3_update_hook(db->db, NULL, NULL);
+ }
+ else {
+ luaL_checktype(L, 2, LUA_TFUNCTION);
- /* make sure we have an userdata field (even if nil) */
- lua_settop(L, 3);
+ /* make sure we have an userdata field (even if nil) */
+ lua_settop(L, 3);
- luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_udata);
- db->update_hook_udata = luaL_ref(L, LUA_REGISTRYINDEX);
- db->update_hook_cb = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->update_hook_udata = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->update_hook_cb = luaL_ref(L, LUA_REGISTRYINDEX);
- /* set update_hook handler */
- sqlite3_update_hook(db->db, db_update_hook_callback, db);
- }
+ /* set update_hook handler */
+ sqlite3_update_hook(db->db, db_update_hook_callback, db);
+ }
- return 0;
+ return 0;
}
/*
@@ -1323,56 +1323,56 @@ static int db_update_hook(lua_State *L) {
** callback function:
** Params: userdata
** Returned value: Return false or nil to continue the COMMIT operation normally.
-** return true (non false, non nil), then the COMMIT is converted into a ROLLBACK.
+** return true (non false, non nil), then the COMMIT is converted into a ROLLBACK.
*/
static int db_commit_hook_callback(void *user) {
- sdb *db = (sdb*)user;
- lua_State *L = db->L;
- int top = lua_gettop(L);
- int rollback = 0;
+ sdb *db = (sdb*)user;
+ lua_State *L = db->L;
+ int top = lua_gettop(L);
+ int rollback = 0;
- /* setup lua callback call */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->commit_hook_cb); /* get callback */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->commit_hook_udata); /* get callback user data */
+ /* setup lua callback call */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->commit_hook_cb); /* get callback */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->commit_hook_udata); /* get callback user data */
- /* call lua function */
- if (!lua_pcall(L, 1, 1, 0))
- rollback = lua_toboolean(L, -1); /* use result if there was no error */
+ /* call lua function */
+ if (!lua_pcall(L, 1, 1, 0))
+ rollback = lua_toboolean(L, -1); /* use result if there was no error */
- lua_settop(L, top);
- return rollback;
+ lua_settop(L, top);
+ return rollback;
}
static int db_commit_hook(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
+ sdb *db = lsqlite_checkdb(L, 1);
- if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
- luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_udata);
+ if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
+ luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_udata);
- db->commit_hook_cb =
- db->commit_hook_udata = LUA_NOREF;
+ db->commit_hook_cb =
+ db->commit_hook_udata = LUA_NOREF;
- /* clear commit_hook handler */
- sqlite3_commit_hook(db->db, NULL, NULL);
- }
- else {
- luaL_checktype(L, 2, LUA_TFUNCTION);
+ /* clear commit_hook handler */
+ sqlite3_commit_hook(db->db, NULL, NULL);
+ }
+ else {
+ luaL_checktype(L, 2, LUA_TFUNCTION);
- /* make sure we have an userdata field (even if nil) */
- lua_settop(L, 3);
+ /* make sure we have an userdata field (even if nil) */
+ lua_settop(L, 3);
- luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->commit_hook_udata);
- db->commit_hook_udata = luaL_ref(L, LUA_REGISTRYINDEX);
- db->commit_hook_cb = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->commit_hook_udata = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->commit_hook_cb = luaL_ref(L, LUA_REGISTRYINDEX);
- /* set commit_hook handler */
- sqlite3_commit_hook(db->db, db_commit_hook_callback, db);
- }
+ /* set commit_hook handler */
+ sqlite3_commit_hook(db->db, db_commit_hook_callback, db);
+ }
- return 0;
+ return 0;
}
/*
@@ -1383,51 +1383,51 @@ static int db_commit_hook(lua_State *L) {
** Params: userdata
*/
static void db_rollback_hook_callback(void *user) {
- sdb *db = (sdb*)user;
- lua_State *L = db->L;
- int top = lua_gettop(L);
+ sdb *db = (sdb*)user;
+ lua_State *L = db->L;
+ int top = lua_gettop(L);
- /* setup lua callback call */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->rollback_hook_cb); /* get callback */
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->rollback_hook_udata); /* get callback user data */
+ /* setup lua callback call */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->rollback_hook_cb); /* get callback */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->rollback_hook_udata); /* get callback user data */
- /* call lua function */
- lua_pcall(L, 1, 0, 0);
- /* ignore any error generated by this function */
+ /* call lua function */
+ lua_pcall(L, 1, 0, 0);
+ /* ignore any error generated by this function */
- lua_settop(L, top);
+ lua_settop(L, top);
}
static int db_rollback_hook(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
+ sdb *db = lsqlite_checkdb(L, 1);
- if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
- luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_udata);
+ if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
+ luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_udata);
- db->rollback_hook_cb =
- db->rollback_hook_udata = LUA_NOREF;
+ db->rollback_hook_cb =
+ db->rollback_hook_udata = LUA_NOREF;
- /* clear rollback_hook handler */
- sqlite3_rollback_hook(db->db, NULL, NULL);
- }
- else {
- luaL_checktype(L, 2, LUA_TFUNCTION);
+ /* clear rollback_hook handler */
+ sqlite3_rollback_hook(db->db, NULL, NULL);
+ }
+ else {
+ luaL_checktype(L, 2, LUA_TFUNCTION);
- /* make sure we have an userdata field (even if nil) */
- lua_settop(L, 3);
+ /* make sure we have an userdata field (even if nil) */
+ lua_settop(L, 3);
- luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_udata);
- db->rollback_hook_udata = luaL_ref(L, LUA_REGISTRYINDEX);
- db->rollback_hook_cb = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->rollback_hook_udata = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->rollback_hook_cb = luaL_ref(L, LUA_REGISTRYINDEX);
- /* set rollback_hook handler */
- sqlite3_rollback_hook(db->db, db_rollback_hook_callback, db);
- }
+ /* set rollback_hook handler */
+ sqlite3_rollback_hook(db->db, db_rollback_hook_callback, db);
+ }
- return 0;
+ return 0;
}
#endif /* #if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK */
@@ -1443,61 +1443,61 @@ static int db_rollback_hook(lua_State *L) {
** returns: 0 to return immediatly and return SQLITE_ABORT, non-zero to continue
*/
static int db_progress_callback(void *user) {
- int result = 1; /* abort by default */
- sdb *db = (sdb*)user;
- lua_State *L = db->L;
- int top = lua_gettop(L);
+ int result = 1; /* abort by default */
+ sdb *db = (sdb*)user;
+ lua_State *L = db->L;
+ int top = lua_gettop(L);
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->progress_cb);
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->progress_udata);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->progress_cb);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->progress_udata);
- /* call lua function */
- if (!lua_pcall(L, 1, 1, 0))
- result = lua_toboolean(L, -1);
+ /* call lua function */
+ if (!lua_pcall(L, 1, 1, 0))
+ result = lua_toboolean(L, -1);
- lua_settop(L, top);
- return result;
+ lua_settop(L, top);
+ return result;
}
static int db_progress_handler(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
+ sdb *db = lsqlite_checkdb(L, 1);
- if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
- luaL_unref(L, LUA_REGISTRYINDEX, db->progress_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->progress_udata);
+ if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
+ luaL_unref(L, LUA_REGISTRYINDEX, db->progress_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->progress_udata);
- db->progress_cb =
- db->progress_udata = LUA_NOREF;
+ db->progress_cb =
+ db->progress_udata = LUA_NOREF;
- /* clear busy handler */
- sqlite3_progress_handler(db->db, 0, NULL, NULL);
- }
- else {
- int nop = luaL_checkint(L, 2); /* number of opcodes */
- luaL_checktype(L, 3, LUA_TFUNCTION);
+ /* clear busy handler */
+ sqlite3_progress_handler(db->db, 0, NULL, NULL);
+ }
+ else {
+ int nop = luaL_checkint(L, 2); /* number of opcodes */
+ luaL_checktype(L, 3, LUA_TFUNCTION);
- /* make sure we have an userdata field (even if nil) */
- lua_settop(L, 4);
+ /* make sure we have an userdata field (even if nil) */
+ lua_settop(L, 4);
- luaL_unref(L, LUA_REGISTRYINDEX, db->progress_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->progress_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->progress_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->progress_udata);
- db->progress_udata = luaL_ref(L, LUA_REGISTRYINDEX);
- db->progress_cb = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->progress_udata = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->progress_cb = luaL_ref(L, LUA_REGISTRYINDEX);
- /* set progress callback */
- sqlite3_progress_handler(db->db, nop, db_progress_callback, db);
- }
+ /* set progress callback */
+ sqlite3_progress_handler(db->db, nop, db_progress_callback, db);
+ }
- return 0;
+ return 0;
}
#else /* #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK) || !SQLITE_OMIT_PROGRESS_CALLBACK */
static int db_progress_handler(lua_State *L) {
- lua_pushliteral(L, "progress callback support disabled at compile time");
- lua_error(L);
- return 0;
+ lua_pushliteral(L, "progress callback support disabled at compile time");
+ lua_error(L);
+ return 0;
}
#endif /* #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK) || !SQLITE_OMIT_PROGRESS_CALLBACK */
@@ -1511,67 +1511,67 @@ static int db_progress_handler(lua_State *L) {
** returns: 0 to return immediatly and return SQLITE_BUSY, non-zero to try again
*/
static int db_busy_callback(void *user, int tries) {
- int retry = 0; /* abort by default */
- sdb *db = (sdb*)user;
- lua_State *L = db->L;
- int top = lua_gettop(L);
+ int retry = 0; /* abort by default */
+ sdb *db = (sdb*)user;
+ lua_State *L = db->L;
+ int top = lua_gettop(L);
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->busy_cb);
- lua_rawgeti(L, LUA_REGISTRYINDEX, db->busy_udata);
- lua_pushnumber(L, tries);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->busy_cb);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, db->busy_udata);
+ lua_pushnumber(L, tries);
- /* call lua function */
- if (!lua_pcall(L, 2, 1, 0))
- retry = lua_toboolean(L, -1);
+ /* call lua function */
+ if (!lua_pcall(L, 2, 1, 0))
+ retry = lua_toboolean(L, -1);
- lua_settop(L, top);
- return retry;
+ lua_settop(L, top);
+ return retry;
}
static int db_busy_handler(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
+ sdb *db = lsqlite_checkdb(L, 1);
- if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
+ if (lua_gettop(L) < 2 || lua_isnil(L, 2)) {
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
- db->busy_cb =
- db->busy_udata = LUA_NOREF;
+ db->busy_cb =
+ db->busy_udata = LUA_NOREF;
- /* clear busy handler */
- sqlite3_busy_handler(db->db, NULL, NULL);
- }
- else {
- luaL_checktype(L, 2, LUA_TFUNCTION);
- /* make sure we have an userdata field (even if nil) */
- lua_settop(L, 3);
+ /* clear busy handler */
+ sqlite3_busy_handler(db->db, NULL, NULL);
+ }
+ else {
+ luaL_checktype(L, 2, LUA_TFUNCTION);
+ /* make sure we have an userdata field (even if nil) */
+ lua_settop(L, 3);
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
- db->busy_udata = luaL_ref(L, LUA_REGISTRYINDEX);
- db->busy_cb = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->busy_udata = luaL_ref(L, LUA_REGISTRYINDEX);
+ db->busy_cb = luaL_ref(L, LUA_REGISTRYINDEX);
- /* set busy handler */
- sqlite3_busy_handler(db->db, db_busy_callback, db);
- }
+ /* set busy handler */
+ sqlite3_busy_handler(db->db, db_busy_callback, db);
+ }
- return 0;
+ return 0;
}
static int db_busy_timeout(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- int timeout = luaL_checkint(L, 2);
- sqlite3_busy_timeout(db->db, timeout);
+ sdb *db = lsqlite_checkdb(L, 1);
+ int timeout = luaL_checkint(L, 2);
+ sqlite3_busy_timeout(db->db, timeout);
- /* if there was a timeout callback registered, it is now
- ** invalid/useless. free any references we may have */
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
- luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
- db->busy_cb =
- db->busy_udata = LUA_NOREF;
+ /* if there was a timeout callback registered, it is now
+ ** invalid/useless. free any references we may have */
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_cb);
+ luaL_unref(L, LUA_REGISTRYINDEX, db->busy_udata);
+ db->busy_cb =
+ db->busy_udata = LUA_NOREF;
- return 0;
+ return 0;
}
/*
@@ -1583,72 +1583,72 @@ static int db_busy_timeout(lua_State *L) {
** Returns: 0 to continue, other value will cause abort
*/
static int db_exec_callback(void* user, int columns, char **data, char **names) {
- int result = SQLITE_ABORT; /* abort by default */
- lua_State *L = (lua_State*)user;
- int n;
-
- int top = lua_gettop(L);
-
- lua_pushvalue(L, 3); /* function to call */
- lua_pushvalue(L, 4); /* user data */
- lua_pushnumber(L, columns); /* total number of rows in result */
-
- /* column values */
- lua_pushvalue(L, 6);
- for (n = 0; n < columns;) {
- lua_pushstring(L, data[n++]);
- lua_rawseti(L, -2, n);
- }
-
- /* columns names */
- lua_pushvalue(L, 5);
- if (lua_isnil(L, -1)) {
- lua_pop(L, 1);
- lua_newtable(L);
- lua_pushvalue(L, -1);
- lua_replace(L, 5);
- for (n = 0; n < columns;) {
- lua_pushstring(L, names[n++]);
- lua_rawseti(L, -2, n);
- }
- }
-
- /* call lua function */
- if (!lua_pcall(L, 4, 1, 0)) {
- if (lua_isnumber(L, -1))
- result = lua_tonumber(L, -1);
- }
-
- lua_settop(L, top);
- return result;
+ int result = SQLITE_ABORT; /* abort by default */
+ lua_State *L = (lua_State*)user;
+ int n;
+
+ int top = lua_gettop(L);
+
+ lua_pushvalue(L, 3); /* function to call */
+ lua_pushvalue(L, 4); /* user data */
+ lua_pushnumber(L, columns); /* total number of rows in result */
+
+ /* column values */
+ lua_pushvalue(L, 6);
+ for (n = 0; n < columns;) {
+ lua_pushstring(L, data[n++]);
+ lua_rawseti(L, -2, n);
+ }
+
+ /* columns names */
+ lua_pushvalue(L, 5);
+ if (lua_isnil(L, -1)) {
+ lua_pop(L, 1);
+ lua_newtable(L);
+ lua_pushvalue(L, -1);
+ lua_replace(L, 5);
+ for (n = 0; n < columns;) {
+ lua_pushstring(L, names[n++]);
+ lua_rawseti(L, -2, n);
+ }
+ }
+
+ /* call lua function */
+ if (!lua_pcall(L, 4, 1, 0)) {
+ if (lua_isnumber(L, -1))
+ result = lua_tonumber(L, -1);
+ }
+
+ lua_settop(L, top);
+ return result;
}
static int db_exec(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- const char *sql = luaL_checkstring(L, 2);
- int result;
-
- if (!lua_isnoneornil(L, 3)) {
- /* stack:
- ** 3: callback function
- ** 4: userdata
- ** 5: column names
- ** 6: reusable column values
- */
- luaL_checktype(L, 3, LUA_TFUNCTION);
- lua_settop(L, 4); /* 'trap' userdata - nil extra parameters */
- lua_pushnil(L); /* column names not known at this point */
- lua_newtable(L); /* column values table */
-
- result = sqlite3_exec(db->db, sql, db_exec_callback, L, NULL);
- }
- else {
- /* no callbacks */
- result = sqlite3_exec(db->db, sql, NULL, NULL, NULL);
- }
-
- lua_pushnumber(L, result);
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ const char *sql = luaL_checkstring(L, 2);
+ int result;
+
+ if (!lua_isnoneornil(L, 3)) {
+ /* stack:
+ ** 3: callback function
+ ** 4: userdata
+ ** 5: column names
+ ** 6: reusable column values
+ */
+ luaL_checktype(L, 3, LUA_TFUNCTION);
+ lua_settop(L, 4); /* 'trap' userdata - nil extra parameters */
+ lua_pushnil(L); /* column names not known at this point */
+ lua_newtable(L); /* column values table */
+
+ result = sqlite3_exec(db->db, sql, db_exec_callback, L, NULL);
+ }
+ else {
+ /* no callbacks */
+ result = sqlite3_exec(db->db, sql, NULL, NULL, NULL);
+ }
+
+ lua_pushnumber(L, result);
+ return 1;
}
/*
@@ -1656,196 +1656,196 @@ static int db_exec(lua_State *L) {
** returns: code, compiled length or error message
*/
static int db_prepare(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- const char *sql = luaL_checkstring(L, 2);
- int sql_len = lua_strlen(L, 2);
- const char *sqltail;
- sdb_vm *svm;
- lua_settop(L,2); /* sql is on top of stack for call to newvm */
- svm = newvm(L, db);
+ sdb *db = lsqlite_checkdb(L, 1);
+ const char *sql = luaL_checkstring(L, 2);
+ int sql_len = lua_strlen(L, 2);
+ const char *sqltail;
+ sdb_vm *svm;
+ lua_settop(L,2); /* sql is on top of stack for call to newvm */
+ svm = newvm(L, db);
- if (sqlite3_prepare(db->db, sql, sql_len, &svm->vm, &sqltail) != SQLITE_OK) {
- cleanupvm(L, svm);
+ if (sqlite3_prepare(db->db, sql, sql_len, &svm->vm, &sqltail) != SQLITE_OK) {
+ cleanupvm(L, svm);
- lua_pushnil(L);
- lua_pushnumber(L, sqlite3_errcode(db->db));
- return 2;
- }
+ lua_pushnil(L);
+ lua_pushnumber(L, sqlite3_errcode(db->db));
+ return 2;
+ }
- /* vm already in the stack */
- lua_pushstring(L, sqltail);
- return 2;
+ /* vm already in the stack */
+ lua_pushstring(L, sqltail);
+ return 2;
}
static int db_do_next_row(lua_State *L, int packed) {
- int result;
- sdb_vm *svm = lsqlite_checkvm(L, 1);
- sqlite3_stmt *vm;
- int columns;
- int i;
-
- result = stepvm(L, svm);
- vm = svm->vm; /* stepvm may change svm->vm if re-prepare is needed */
- svm->has_values = result == SQLITE_ROW ? 1 : 0;
- svm->columns = columns = sqlite3_data_count(vm);
-
- if (result == SQLITE_ROW) {
- if (packed) {
- lua_newtable(L);
- if (packed == 1) {
- for (i = 0; i < columns;) {
- vm_push_column(L, vm, i);
- lua_rawseti(L, -2, ++i);
- }
- }
- else {
- for (i = 0; i < columns; ++i) {
- lua_pushstring(L, sqlite3_column_name(vm, i));
- vm_push_column(L, vm, i);
- lua_rawset(L, -3);
- }
- }
- return 1;
- }
- else {
- lua_checkstack(L, columns);
- for (i = 0; i < columns; ++i)
- vm_push_column(L, vm, i);
- return svm->columns;
- }
- }
-
- if (svm->temp) {
- /* finalize and check for errors */
- result = sqlite3_finalize(vm);
- svm->vm = NULL;
- cleanupvm(L, svm);
- }
- else if (result == SQLITE_DONE) {
- result = sqlite3_reset(vm);
- }
-
- if (result != SQLITE_OK) {
- lua_pushstring(L, sqlite3_errmsg(svm->db->db));
- lua_error(L);
- }
- return 0;
+ int result;
+ sdb_vm *svm = lsqlite_checkvm(L, 1);
+ sqlite3_stmt *vm;
+ int columns;
+ int i;
+
+ result = stepvm(L, svm);
+ vm = svm->vm; /* stepvm may change svm->vm if re-prepare is needed */
+ svm->has_values = result == SQLITE_ROW ? 1 : 0;
+ svm->columns = columns = sqlite3_data_count(vm);
+
+ if (result == SQLITE_ROW) {
+ if (packed) {
+ lua_newtable(L);
+ if (packed == 1) {
+ for (i = 0; i < columns;) {
+ vm_push_column(L, vm, i);
+ lua_rawseti(L, -2, ++i);
+ }
+ }
+ else {
+ for (i = 0; i < columns; ++i) {
+ lua_pushstring(L, sqlite3_column_name(vm, i));
+ vm_push_column(L, vm, i);
+ lua_rawset(L, -3);
+ }
+ }
+ return 1;
+ }
+ else {
+ lua_checkstack(L, columns);
+ for (i = 0; i < columns; ++i)
+ vm_push_column(L, vm, i);
+ return svm->columns;
+ }
+ }
+
+ if (svm->temp) {
+ /* finalize and check for errors */
+ result = sqlite3_finalize(vm);
+ svm->vm = NULL;
+ cleanupvm(L, svm);
+ }
+ else if (result == SQLITE_DONE) {
+ result = sqlite3_reset(vm);
+ }
+
+ if (result != SQLITE_OK) {
+ lua_pushstring(L, sqlite3_errmsg(svm->db->db));
+ lua_error(L);
+ }
+ return 0;
}
static int db_next_row(lua_State *L) {
- return db_do_next_row(L, 0);
+ return db_do_next_row(L, 0);
}
static int db_next_packed_row(lua_State *L) {
- return db_do_next_row(L, 1);
+ return db_do_next_row(L, 1);
}
static int db_next_named_row(lua_State *L) {
- return db_do_next_row(L, 2);
+ return db_do_next_row(L, 2);
}
static int dbvm_do_rows(lua_State *L, int(*f)(lua_State *)) {
- /* sdb_vm *svm = */
- lsqlite_checkvm(L, 1);
- lua_pushvalue(L,1);
- lua_pushcfunction(L, f);
- lua_insert(L, -2);
- return 2;
+ /* sdb_vm *svm = */
+ lsqlite_checkvm(L, 1);
+ lua_pushvalue(L,1);
+ lua_pushcfunction(L, f);
+ lua_insert(L, -2);
+ return 2;
}
static int dbvm_rows(lua_State *L) {
- return dbvm_do_rows(L, db_next_packed_row);
+ return dbvm_do_rows(L, db_next_packed_row);
}
static int dbvm_nrows(lua_State *L) {
- return dbvm_do_rows(L, db_next_named_row);
+ return dbvm_do_rows(L, db_next_named_row);
}
static int dbvm_urows(lua_State *L) {
- return dbvm_do_rows(L, db_next_row);
+ return dbvm_do_rows(L, db_next_row);
}
static int db_do_rows(lua_State *L, int(*f)(lua_State *)) {
- sdb *db = lsqlite_checkdb(L, 1);
- const char *sql = luaL_checkstring(L, 2);
- sdb_vm *svm;
- lua_settop(L,2); /* sql is on top of stack for call to newvm */
- svm = newvm(L, db);
- svm->temp = 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ const char *sql = luaL_checkstring(L, 2);
+ sdb_vm *svm;
+ lua_settop(L,2); /* sql is on top of stack for call to newvm */
+ svm = newvm(L, db);
+ svm->temp = 1;
- if (sqlite3_prepare(db->db, sql, -1, &svm->vm, NULL) != SQLITE_OK) {
- cleanupvm(L, svm);
+ if (sqlite3_prepare(db->db, sql, -1, &svm->vm, NULL) != SQLITE_OK) {
+ cleanupvm(L, svm);
- lua_pushstring(L, sqlite3_errmsg(svm->db->db));
- lua_error(L);
- }
+ lua_pushstring(L, sqlite3_errmsg(svm->db->db));
+ lua_error(L);
+ }
- lua_pushcfunction(L, f);
- lua_insert(L, -2);
- return 2;
+ lua_pushcfunction(L, f);
+ lua_insert(L, -2);
+ return 2;
}
static int db_rows(lua_State *L) {
- return db_do_rows(L, db_next_packed_row);
+ return db_do_rows(L, db_next_packed_row);
}
static int db_nrows(lua_State *L) {
- return db_do_rows(L, db_next_named_row);
+ return db_do_rows(L, db_next_named_row);
}
/* unpacked version of db:rows */
static int db_urows(lua_State *L) {
- return db_do_rows(L, db_next_row);
+ return db_do_rows(L, db_next_row);
}
static int db_tostring(lua_State *L) {
- char buff[32];
- sdb *db = lsqlite_getdb(L, 1);
- if (db->db == NULL)
- strcpy(buff, "closed");
- else
- sprintf(buff, "%p", lua_touserdata(L, 1));
- lua_pushfstring(L, "sqlite database (%s)", buff);
- return 1;
+ char buff[32];
+ sdb *db = lsqlite_getdb(L, 1);
+ if (db->db == NULL)
+ strcpy(buff, "closed");
+ else
+ sprintf(buff, "%p", lua_touserdata(L, 1));
+ lua_pushfstring(L, "sqlite database (%s)", buff);
+ return 1;
}
static int db_close(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- lua_pushnumber(L, cleanupdb(L, db));
- return 1;
+ sdb *db = lsqlite_checkdb(L, 1);
+ lua_pushnumber(L, cleanupdb(L, db));
+ return 1;
}
static int db_close_vm(lua_State *L) {
- sdb *db = lsqlite_checkdb(L, 1);
- /* cleanup temporary only tables? */
- int temp = lua_toboolean(L, 2);
+ sdb *db = lsqlite_checkdb(L, 1);
+ /* cleanup temporary only tables? */
+ int temp = lua_toboolean(L, 2);
- /* free associated virtual machines */
- lua_pushlightuserdata(L, db);
- lua_rawget(L, LUA_REGISTRYINDEX);
+ /* free associated virtual machines */
+ lua_pushlightuserdata(L, db);
+ lua_rawget(L, LUA_REGISTRYINDEX);
- /* close all used handles */
- lua_pushnil(L);
- while (lua_next(L, -2)) {
- sdb_vm *svm = (sdb_vm *)lua_touserdata(L, -2); /* key: vm; val: sql text */
+ /* close all used handles */
+ lua_pushnil(L);
+ while (lua_next(L, -2)) {
+ sdb_vm *svm = (sdb_vm *)lua_touserdata(L, -2); /* key: vm; val: sql text */
- if ((!temp || svm->temp) && svm->vm)
- {
- sqlite3_finalize(svm->vm);
- svm->vm = NULL;
- }
+ if ((!temp || svm->temp) && svm->vm)
+ {
+ sqlite3_finalize(svm->vm);
+ svm->vm = NULL;
+ }
- /* leave key in the stack */
- lua_pop(L, 1);
- }
- return 0;
+ /* leave key in the stack */
+ lua_pop(L, 1);
+ }
+ return 0;
}
static int db_gc(lua_State *L) {
- sdb *db = lsqlite_getdb(L, 1);
- if (db->db != NULL) /* ignore closed databases */
- cleanupdb(L, db);
- return 0;
+ sdb *db = lsqlite_getdb(L, 1);
+ if (db->db != NULL) /* ignore closed databases */
+ cleanupdb(L, db);
+ return 0;
}
/*
@@ -1855,70 +1855,70 @@ static int db_gc(lua_State *L) {
*/
static int lsqlite_version(lua_State *L) {
- lua_pushstring(L, sqlite3_libversion());
- return 1;
+ lua_pushstring(L, sqlite3_libversion());
+ return 1;
}
static int lsqlite_complete(lua_State *L) {
- const char *sql = luaL_checkstring(L, 1);
- lua_pushboolean(L, sqlite3_complete(sql));
- return 1;
+ const char *sql = luaL_checkstring(L, 1);
+ lua_pushboolean(L, sqlite3_complete(sql));
+ return 1;
}
#ifndef WIN32
static int lsqlite_temp_directory(lua_State *L) {
- const char *oldtemp = sqlite3_temp_directory;
-
- if (!lua_isnone(L, 1)) {
- const char *temp = luaL_optstring(L, 1, NULL);
- if (sqlite3_temp_directory) {
- sqlite3_free((char*)sqlite3_temp_directory);
- }
- if (temp) {
- sqlite3_temp_directory = sqlite3_mprintf("%s", temp);
- }
- else {
- sqlite3_temp_directory = NULL;
- }
- }
- lua_pushstring(L, oldtemp);
- return 1;
+ const char *oldtemp = sqlite3_temp_directory;
+
+ if (!lua_isnone(L, 1)) {
+ const char *temp = luaL_optstring(L, 1, NULL);
+ if (sqlite3_temp_directory) {
+ sqlite3_free((char*)sqlite3_temp_directory);
+ }
+ if (temp) {
+ sqlite3_temp_directory = sqlite3_mprintf("%s", temp);
+ }
+ else {
+ sqlite3_temp_directory = NULL;
+ }
+ }
+ lua_pushstring(L, oldtemp);
+ return 1;
}
#endif
static int lsqlite_do_open(lua_State *L, const char *filename) {
- sdb *db = newdb(L); /* create and leave in stack */
+ sdb *db = newdb(L); /* create and leave in stack */
- if (sqlite3_open(filename, &db->db) == SQLITE_OK) {
- /* database handle already in the stack - return it */
- return 1;
- }
+ if (sqlite3_open(filename, &db->db) == SQLITE_OK) {
+ /* database handle already in the stack - return it */
+ return 1;
+ }
- /* failed to open database */
- lua_pushnil(L); /* push nil */
- lua_pushnumber(L, sqlite3_errcode(db->db));
- lua_pushstring(L, sqlite3_errmsg(db->db)); /* push error message */
+ /* failed to open database */
+ lua_pushnil(L); /* push nil */
+ lua_pushnumber(L, sqlite3_errcode(db->db));
+ lua_pushstring(L, sqlite3_errmsg(db->db)); /* push error message */
- /* clean things up */
- cleanupdb(L, db);
+ /* clean things up */
+ cleanupdb(L, db);
- /* return */
- return 3;
+ /* return */
+ return 3;
}
static int lsqlite_open(lua_State *L) {
- const char *filename = luaL_checkstring(L, 1);
- return lsqlite_do_open(L, filename);
+ const char *filename = luaL_checkstring(L, 1);
+ return lsqlite_do_open(L, filename);
}
static int lsqlite_open_memory(lua_State *L) {
- return lsqlite_do_open(L, ":memory:");
+ return lsqlite_do_open(L, ":memory:");
}
static int lsqlite_newindex(lua_State *L) {
- lua_pushliteral(L, "attempt to change readonly table");
- lua_error(L);
- return 0;
+ lua_pushliteral(L, "attempt to change readonly table");
+ lua_error(L);
+ return 0;
}
/*
@@ -1931,196 +1931,196 @@ static int lsqlite_newindex(lua_State *L) {
#define LSC(s) { #s, LSQLITE_ ## s },
static const struct {
- const char* name;
- int value;
+ const char* name;
+ int value;
} sqlite_constants[] = {
- /* error codes */
- SC(OK) SC(ERROR) SC(INTERNAL) SC(PERM)
- SC(ABORT) SC(BUSY) SC(LOCKED) SC(NOMEM)
- SC(READONLY) SC(INTERRUPT) SC(IOERR) SC(CORRUPT)
- SC(NOTFOUND) SC(FULL) SC(CANTOPEN) SC(PROTOCOL)
- SC(EMPTY) SC(SCHEMA) SC(TOOBIG) SC(CONSTRAINT)
- SC(MISMATCH) SC(MISUSE) SC(NOLFS)
- SC(FORMAT) SC(NOTADB)
-
- /* sqlite_step specific return values */
- SC(RANGE) SC(ROW) SC(DONE)
-
- /* column types */
- SC(INTEGER) SC(FLOAT) SC(TEXT) SC(BLOB)
- SC(NULL)
-
- /* Authorizer Action Codes */
- SC(CREATE_INDEX )
- SC(CREATE_TABLE )
- SC(CREATE_TEMP_INDEX )
- SC(CREATE_TEMP_TABLE )
- SC(CREATE_TEMP_TRIGGER)
- SC(CREATE_TEMP_VIEW )
- SC(CREATE_TRIGGER )
- SC(CREATE_VIEW )
- SC(DELETE )
- SC(DROP_INDEX )
- SC(DROP_TABLE )
- SC(DROP_TEMP_INDEX )
- SC(DROP_TEMP_TABLE )
- SC(DROP_TEMP_TRIGGER )
- SC(DROP_TEMP_VIEW )
- SC(DROP_TRIGGER )
- SC(DROP_VIEW )
- SC(INSERT )
- SC(PRAGMA )
- SC(READ )
- SC(SELECT )
- SC(TRANSACTION )
- SC(UPDATE )
- SC(ATTACH )
- SC(DETACH )
- SC(ALTER_TABLE )
- SC(REINDEX )
- SC(ANALYZE )
- SC(CREATE_VTABLE )
- SC(DROP_VTABLE )
- SC(FUNCTION )
- SC(SAVEPOINT )
-
- /* terminator */
- { NULL, 0 }
+ /* error codes */
+ SC(OK) SC(ERROR) SC(INTERNAL) SC(PERM)
+ SC(ABORT) SC(BUSY) SC(LOCKED) SC(NOMEM)
+ SC(READONLY) SC(INTERRUPT) SC(IOERR) SC(CORRUPT)
+ SC(NOTFOUND) SC(FULL) SC(CANTOPEN) SC(PROTOCOL)
+ SC(EMPTY) SC(SCHEMA) SC(TOOBIG) SC(CONSTRAINT)
+ SC(MISMATCH) SC(MISUSE) SC(NOLFS)
+ SC(FORMAT) SC(NOTADB)
+
+ /* sqlite_step specific return values */
+ SC(RANGE) SC(ROW) SC(DONE)
+
+ /* column types */
+ SC(INTEGER) SC(FLOAT) SC(TEXT) SC(BLOB)
+ SC(NULL)
+
+ /* Authorizer Action Codes */
+ SC(CREATE_INDEX )
+ SC(CREATE_TABLE )
+ SC(CREATE_TEMP_INDEX )
+ SC(CREATE_TEMP_TABLE )
+ SC(CREATE_TEMP_TRIGGER)
+ SC(CREATE_TEMP_VIEW )
+ SC(CREATE_TRIGGER )
+ SC(CREATE_VIEW )
+ SC(DELETE )
+ SC(DROP_INDEX )
+ SC(DROP_TABLE )
+ SC(DROP_TEMP_INDEX )
+ SC(DROP_TEMP_TABLE )
+ SC(DROP_TEMP_TRIGGER )
+ SC(DROP_TEMP_VIEW )
+ SC(DROP_TRIGGER )
+ SC(DROP_VIEW )
+ SC(INSERT )
+ SC(PRAGMA )
+ SC(READ )
+ SC(SELECT )
+ SC(TRANSACTION )
+ SC(UPDATE )
+ SC(ATTACH )
+ SC(DETACH )
+ SC(ALTER_TABLE )
+ SC(REINDEX )
+ SC(ANALYZE )
+ SC(CREATE_VTABLE )
+ SC(DROP_VTABLE )
+ SC(FUNCTION )
+ SC(SAVEPOINT )
+
+ /* terminator */
+ { NULL, 0 }
};
/* ======================================================= */
static const luaL_Reg dblib[] = {
- {"isopen", db_isopen },
- {"last_insert_rowid", db_last_insert_rowid },
- {"changes", db_changes },
- {"total_changes", db_total_changes },
- {"errcode", db_errcode },
- {"error_code", db_errcode },
- {"errmsg", db_errmsg },
- {"error_message", db_errmsg },
- {"interrupt", db_interrupt },
-
- {"create_function", db_create_function },
- {"create_aggregate", db_create_aggregate },
- {"create_collation", db_create_collation },
-
- {"trace", db_trace },
- {"progress_handler", db_progress_handler },
- {"busy_timeout", db_busy_timeout },
- {"busy_handler", db_busy_handler },
+ {"isopen", db_isopen },
+ {"last_insert_rowid", db_last_insert_rowid },
+ {"changes", db_changes },
+ {"total_changes", db_total_changes },
+ {"errcode", db_errcode },
+ {"error_code", db_errcode },
+ {"errmsg", db_errmsg },
+ {"error_message", db_errmsg },
+ {"interrupt", db_interrupt },
+
+ {"create_function", db_create_function },
+ {"create_aggregate", db_create_aggregate },
+ {"create_collation", db_create_collation },
+
+ {"trace", db_trace },
+ {"progress_handler", db_progress_handler },
+ {"busy_timeout", db_busy_timeout },
+ {"busy_handler", db_busy_handler },
#if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
- {"update_hook", db_update_hook },
- {"commit_hook", db_commit_hook },
- {"rollback_hook", db_rollback_hook },
+ {"update_hook", db_update_hook },
+ {"commit_hook", db_commit_hook },
+ {"rollback_hook", db_rollback_hook },
#endif
- {"prepare", db_prepare },
- {"rows", db_rows },
- {"urows", db_urows },
- {"nrows", db_nrows },
+ {"prepare", db_prepare },
+ {"rows", db_rows },
+ {"urows", db_urows },
+ {"nrows", db_nrows },
- {"exec", db_exec },
- {"execute", db_exec },
- {"close", db_close },
- {"close_vm", db_close_vm },
+ {"exec", db_exec },
+ {"execute", db_exec },
+ {"close", db_close },
+ {"close_vm", db_close_vm },
- {"__tostring", db_tostring },
- {"__gc", db_gc },
+ {"__tostring", db_tostring },
+ {"__gc", db_gc },
- {NULL, NULL}
+ {NULL, NULL}
};
static const luaL_Reg vmlib[] = {
- {"isopen", dbvm_isopen },
-
- {"step", dbvm_step },
- {"reset", dbvm_reset },
- {"finalize", dbvm_finalize },
-
- {"columns", dbvm_columns },
-
- {"bind", dbvm_bind },
- {"bind_values", dbvm_bind_values },
- {"bind_names", dbvm_bind_names },
- {"bind_blob", dbvm_bind_blob },
- {"bind_parameter_count",dbvm_bind_parameter_count},
- {"bind_parameter_name", dbvm_bind_parameter_name},
-
- {"get_value", dbvm_get_value },
- {"get_values", dbvm_get_values },
- {"get_name", dbvm_get_name },
- {"get_names", dbvm_get_names },
- {"get_type", dbvm_get_type },
- {"get_types", dbvm_get_types },
- {"get_uvalues", dbvm_get_uvalues },
- {"get_unames", dbvm_get_unames },
- {"get_utypes", dbvm_get_utypes },
-
- {"get_named_values", dbvm_get_named_values },
- {"get_named_types", dbvm_get_named_types },
-
- {"rows", dbvm_rows },
- {"urows", dbvm_urows },
- {"nrows", dbvm_nrows },
-
- /* compatibility names (added by request) */
- {"idata", dbvm_get_values },
- {"inames", dbvm_get_names },
- {"itypes", dbvm_get_types },
- {"data", dbvm_get_named_values },
- {"type", dbvm_get_named_types },
-
- {"__tostring", dbvm_tostring },
- {"__gc", dbvm_gc },
-
- { NULL, NULL }
+ {"isopen", dbvm_isopen },
+
+ {"step", dbvm_step },
+ {"reset", dbvm_reset },
+ {"finalize", dbvm_finalize },
+
+ {"columns", dbvm_columns },
+
+ {"bind", dbvm_bind },
+ {"bind_values", dbvm_bind_values },
+ {"bind_names", dbvm_bind_names },
+ {"bind_blob", dbvm_bind_blob },
+ {"bind_parameter_count",dbvm_bind_parameter_count},
+ {"bind_parameter_name", dbvm_bind_parameter_name},
+
+ {"get_value", dbvm_get_value },
+ {"get_values", dbvm_get_values },
+ {"get_name", dbvm_get_name },
+ {"get_names", dbvm_get_names },
+ {"get_type", dbvm_get_type },
+ {"get_types", dbvm_get_types },
+ {"get_uvalues", dbvm_get_uvalues },
+ {"get_unames", dbvm_get_unames },
+ {"get_utypes", dbvm_get_utypes },
+
+ {"get_named_values", dbvm_get_named_values },
+ {"get_named_types", dbvm_get_named_types },
+
+ {"rows", dbvm_rows },
+ {"urows", dbvm_urows },
+ {"nrows", dbvm_nrows },
+
+ /* compatibility names (added by request) */
+ {"idata", dbvm_get_values },
+ {"inames", dbvm_get_names },
+ {"itypes", dbvm_get_types },
+ {"data", dbvm_get_named_values },
+ {"type", dbvm_get_named_types },
+
+ {"__tostring", dbvm_tostring },
+ {"__gc", dbvm_gc },
+
+ { NULL, NULL }
};
static const luaL_Reg ctxlib[] = {
- {"user_data", lcontext_user_data },
-
- {"get_aggregate_data", lcontext_get_aggregate_context },
- {"set_aggregate_data", lcontext_set_aggregate_context },
- {"aggregate_count", lcontext_aggregate_count },
-
- {"result", lcontext_result },
- {"result_null", lcontext_result_null },
- {"result_number", lcontext_result_double },
- {"result_double", lcontext_result_double },
- {"result_int", lcontext_result_int },
- {"result_text", lcontext_result_text },
- {"result_blob", lcontext_result_blob },
- {"result_error", lcontext_result_error },
-
- {"__tostring", lcontext_tostring },
- {NULL, NULL}
+ {"user_data", lcontext_user_data },
+
+ {"get_aggregate_data", lcontext_get_aggregate_context },
+ {"set_aggregate_data", lcontext_set_aggregate_context },
+ {"aggregate_count", lcontext_aggregate_count },
+
+ {"result", lcontext_result },
+ {"result_null", lcontext_result_null },
+ {"result_number", lcontext_result_double },
+ {"result_double", lcontext_result_double },
+ {"result_int", lcontext_result_int },
+ {"result_text", lcontext_result_text },
+ {"result_blob", lcontext_result_blob },
+ {"result_error", lcontext_result_error },
+
+ {"__tostring", lcontext_tostring },
+ {NULL, NULL}
};
static const luaL_Reg sqlitelib[] = {
- {"version", lsqlite_version },
- {"complete", lsqlite_complete },
+ {"version", lsqlite_version },
+ {"complete", lsqlite_complete },
#ifndef WIN32
- {"temp_directory", lsqlite_temp_directory },
+ {"temp_directory", lsqlite_temp_directory },
#endif
- {"open", lsqlite_open },
- {"open_memory", lsqlite_open_memory },
+ {"open", lsqlite_open },
+ {"open_memory", lsqlite_open_memory },
- {"__newindex", lsqlite_newindex },
- {NULL, NULL}
+ {"__newindex", lsqlite_newindex },
+ {NULL, NULL}
};
static void create_meta(lua_State *L, const char *name, const luaL_Reg *lib) {
- luaL_newmetatable(L, name);
- lua_pushstring(L, "__index");
- lua_pushvalue(L, -2); /* push metatable */
- lua_rawset(L, -3); /* metatable.__index = metatable */
+ luaL_newmetatable(L, name);
+ lua_pushstring(L, "__index");
+ lua_pushvalue(L, -2); /* push metatable */
+ lua_rawset(L, -3); /* metatable.__index = metatable */
- /* register metatable functions */
- luaL_openlib(L, NULL, lib, 0);
+ /* register metatable functions */
+ luaL_openlib(L, NULL, lib, 0);
- /* remove metatable from stack */
- lua_pop(L, 1);
+ /* remove metatable from stack */
+ lua_pop(L, 1);
}
static int luaopen_sqlite3 ( lua_State * L )
@@ -2130,28 +2130,28 @@ static int luaopen_sqlite3 ( lua_State * L )
}
LUALIB_API int luaopen_lsqlite3(lua_State *L) {
- create_meta(L, sqlite_meta, dblib);
- create_meta(L, sqlite_vm_meta, vmlib);
- create_meta(L, sqlite_ctx_meta, ctxlib);
-
- luaL_getmetatable(L, sqlite_ctx_meta);
- sqlite_ctx_meta_ref = luaL_ref(L, LUA_REGISTRYINDEX);
- /* register (local) sqlite metatable */
- //luaL_register(L, "sqlite3", sqlitelib);
+ create_meta(L, sqlite_meta, dblib);
+ create_meta(L, sqlite_vm_meta, vmlib);
+ create_meta(L, sqlite_ctx_meta, ctxlib);
+
+ luaL_getmetatable(L, sqlite_ctx_meta);
+ sqlite_ctx_meta_ref = luaL_ref(L, LUA_REGISTRYINDEX);
+ /* register (local) sqlite metatable */
+ //luaL_register(L, "sqlite3", sqlitelib);
luaL_requiref(L, "sqlite3", luaopen_sqlite3, 1);
- {
- int i = 0;
- /* add constants to global table */
- while (sqlite_constants[i].name) {
- lua_pushstring(L, sqlite_constants[i].name);
- lua_pushnumber(L, sqlite_constants[i].value);
- lua_rawset(L, -3);
- ++i;
- }
- }
- /* set sqlite's metatable to itself - set as readonly (__newindex) */
- lua_pushvalue(L, -1);
- lua_setmetatable(L, -2);
-
- return 1;
+ {
+ int i = 0;
+ /* add constants to global table */
+ while (sqlite_constants[i].name) {
+ lua_pushstring(L, sqlite_constants[i].name);
+ lua_pushnumber(L, sqlite_constants[i].value);
+ lua_rawset(L, -3);
+ ++i;
+ }
+ }
+ /* set sqlite's metatable to itself - set as readonly (__newindex) */
+ lua_pushvalue(L, -1);
+ lua_setmetatable(L, -2);
+
+ return 1;
}
diff --git a/src/lib/lua/linit.c b/src/lib/lua/linit.c
index c1a38304711..7ae63b8bc14 100644
--- a/src/lib/lua/linit.c
+++ b/src/lib/lua/linit.c
@@ -27,17 +27,17 @@
** program
*/
static const luaL_Reg loadedlibs[] = {
- {"_G", luaopen_base},
- {LUA_LOADLIBNAME, luaopen_package},
- {LUA_COLIBNAME, luaopen_coroutine},
- {LUA_TABLIBNAME, luaopen_table},
- {LUA_IOLIBNAME, luaopen_io},
- {LUA_OSLIBNAME, luaopen_os},
- {LUA_STRLIBNAME, luaopen_string},
- {LUA_BITLIBNAME, luaopen_bit32},
- {LUA_MATHLIBNAME, luaopen_math},
- {LUA_DBLIBNAME, luaopen_debug},
- {NULL, NULL}
+ {"_G", luaopen_base},
+ {LUA_LOADLIBNAME, luaopen_package},
+ {LUA_COLIBNAME, luaopen_coroutine},
+ {LUA_TABLIBNAME, luaopen_table},
+ {LUA_IOLIBNAME, luaopen_io},
+ {LUA_OSLIBNAME, luaopen_os},
+ {LUA_STRLIBNAME, luaopen_string},
+ {LUA_BITLIBNAME, luaopen_bit32},
+ {LUA_MATHLIBNAME, luaopen_math},
+ {LUA_DBLIBNAME, luaopen_debug},
+ {NULL, NULL}
};
@@ -45,23 +45,22 @@ static const luaL_Reg loadedlibs[] = {
** these libs are preloaded and must be required before used
*/
static const luaL_Reg preloadedlibs[] = {
- {NULL, NULL}
+ {NULL, NULL}
};
LUALIB_API void luaL_openlibs (lua_State *L) {
- const luaL_Reg *lib;
- /* call open functions from 'loadedlibs' and set results to global table */
- for (lib = loadedlibs; lib->func; lib++) {
- luaL_requiref(L, lib->name, lib->func, 1);
- lua_pop(L, 1); /* remove lib */
- }
- /* add open functions from 'preloadedlibs' into 'package.preload' table */
- luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
- for (lib = preloadedlibs; lib->func; lib++) {
- lua_pushcfunction(L, lib->func);
- lua_setfield(L, -2, lib->name);
- }
- lua_pop(L, 1); /* remove _PRELOAD table */
+ const luaL_Reg *lib;
+ /* call open functions from 'loadedlibs' and set results to global table */
+ for (lib = loadedlibs; lib->func; lib++) {
+ luaL_requiref(L, lib->name, lib->func, 1);
+ lua_pop(L, 1); /* remove lib */
+ }
+ /* add open functions from 'preloadedlibs' into 'package.preload' table */
+ luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+ for (lib = preloadedlibs; lib->func; lib++) {
+ lua_pushcfunction(L, lib->func);
+ lua_setfield(L, -2, lib->name);
+ }
+ lua_pop(L, 1); /* remove _PRELOAD table */
}
-
diff --git a/src/lib/lua/liolib.c b/src/lib/lua/liolib.c
index ab89e3508f4..69c389151a2 100644
--- a/src/lib/lua/liolib.c
+++ b/src/lib/lua/liolib.c
@@ -10,8 +10,8 @@
** should not affect non-POSIX systems
*/
#if !defined(_FILE_OFFSET_BITS)
-#define _LARGEFILE_SOURCE 1
-#define _FILE_OFFSET_BITS 64
+#define _LARGEFILE_SOURCE 1
+#define _FILE_OFFSET_BITS 64
#endif
@@ -37,9 +37,9 @@
** the standard ones.
*/
#define lua_checkmode(mode) \
- (*mode != '\0' && strchr("rwa", *(mode++)) != NULL && \
- (*mode != '+' || ++mode) && /* skip if char is '+' */ \
- (*mode != 'b' || ++mode) && /* skip if char is 'b' */ \
+ (*mode != '\0' && strchr("rwa", *(mode++)) != NULL && \
+ (*mode != '+' || ++mode) && /* skip if char is '+' */ \
+ (*mode != 'b' || ++mode) && /* skip if char is 'b' */ \
(*mode == '\0'))
#endif
@@ -51,29 +51,29 @@
** =======================================================
*/
-#if !defined(lua_popen) /* { */
+#if !defined(lua_popen) /* { */
-#if defined(LUA_USE_POPEN) /* { */
+#if defined(LUA_USE_POPEN) /* { */
-#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m))
-#define lua_pclose(L,file) ((void)L, pclose(file))
+#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m))
+#define lua_pclose(L,file) ((void)L, pclose(file))
-#elif defined(LUA_WIN) /* }{ */
+#elif defined(LUA_WIN) /* }{ */
-#define lua_popen(L,c,m) ((void)L, _popen(c,m))
-#define lua_pclose(L,file) ((void)L, _pclose(file))
+#define lua_popen(L,c,m) ((void)L, _popen(c,m))
+#define lua_pclose(L,file) ((void)L, _pclose(file))
-#else /* }{ */
+#else /* }{ */
-#define lua_popen(L,c,m) ((void)((void)c, m), \
+#define lua_popen(L,c,m) ((void)((void)c, m), \
luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
-#define lua_pclose(L,file) ((void)((void)L, file), -1)
+#define lua_pclose(L,file) ((void)((void)L, file), -1)
-#endif /* } */
+#endif /* } */
-#endif /* } */
+#endif /* } */
/* }====================================================== */
@@ -84,79 +84,79 @@
** =======================================================
*/
-#if !defined(lua_fseek) && !defined(LUA_ANSI) /* { */
+#if !defined(lua_fseek) && !defined(LUA_ANSI) /* { */
-#if defined(LUA_USE_POSIX) /* { */
+#if defined(LUA_USE_POSIX) /* { */
-#define l_fseek(f,o,w) fseeko(f,o,w)
-#define l_ftell(f) ftello(f)
-#define l_seeknum off_t
+#define l_fseek(f,o,w) fseeko(f,o,w)
+#define l_ftell(f) ftello(f)
+#define l_seeknum off_t
#elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \
- && defined(_MSC_VER) && (_MSC_VER >= 1400) /* }{ */
+ && defined(_MSC_VER) && (_MSC_VER >= 1400) /* }{ */
/* Windows (but not DDK) and Visual C++ 2005 or higher */
-#define l_fseek(f,o,w) _fseeki64(f,o,w)
-#define l_ftell(f) _ftelli64(f)
-#define l_seeknum __int64
+#define l_fseek(f,o,w) _fseeki64(f,o,w)
+#define l_ftell(f) _ftelli64(f)
+#define l_seeknum __int64
-#endif /* } */
+#endif /* } */
-#endif /* } */
+#endif /* } */
-#if !defined(l_fseek) /* default definitions */
-#define l_fseek(f,o,w) fseek(f,o,w)
-#define l_ftell(f) ftell(f)
-#define l_seeknum long
+#if !defined(l_fseek) /* default definitions */
+#define l_fseek(f,o,w) fseek(f,o,w)
+#define l_ftell(f) ftell(f)
+#define l_seeknum long
#endif
/* }====================================================== */
-#define IO_PREFIX "_IO_"
-#define IO_INPUT (IO_PREFIX "input")
-#define IO_OUTPUT (IO_PREFIX "output")
+#define IO_PREFIX "_IO_"
+#define IO_INPUT (IO_PREFIX "input")
+#define IO_OUTPUT (IO_PREFIX "output")
typedef luaL_Stream LStream;
-#define tolstream(L) ((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+#define tolstream(L) ((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
-#define isclosed(p) ((p)->closef == NULL)
+#define isclosed(p) ((p)->closef == NULL)
static int io_type (lua_State *L) {
- LStream *p;
- luaL_checkany(L, 1);
- p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
- if (p == NULL)
- lua_pushnil(L); /* not a file */
- else if (isclosed(p))
- lua_pushliteral(L, "closed file");
- else
- lua_pushliteral(L, "file");
- return 1;
+ LStream *p;
+ luaL_checkany(L, 1);
+ p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
+ if (p == NULL)
+ lua_pushnil(L); /* not a file */
+ else if (isclosed(p))
+ lua_pushliteral(L, "closed file");
+ else
+ lua_pushliteral(L, "file");
+ return 1;
}
static int f_tostring (lua_State *L) {
- LStream *p = tolstream(L);
- if (isclosed(p))
- lua_pushliteral(L, "file (closed)");
- else
- lua_pushfstring(L, "file (%p)", p->f);
- return 1;
+ LStream *p = tolstream(L);
+ if (isclosed(p))
+ lua_pushliteral(L, "file (closed)");
+ else
+ lua_pushfstring(L, "file (%p)", p->f);
+ return 1;
}
static FILE *tofile (lua_State *L) {
- LStream *p = tolstream(L);
- if (isclosed(p))
- luaL_error(L, "attempt to use a closed file");
- lua_assert(p->f);
- return p->f;
+ LStream *p = tolstream(L);
+ if (isclosed(p))
+ luaL_error(L, "attempt to use a closed file");
+ lua_assert(p->f);
+ return p->f;
}
@@ -166,34 +166,34 @@ static FILE *tofile (lua_State *L) {
** file is not left opened.
*/
static LStream *newprefile (lua_State *L) {
- LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
- p->closef = NULL; /* mark file handle as 'closed' */
- luaL_setmetatable(L, LUA_FILEHANDLE);
- return p;
+ LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
+ p->closef = NULL; /* mark file handle as 'closed' */
+ luaL_setmetatable(L, LUA_FILEHANDLE);
+ return p;
}
static int aux_close (lua_State *L) {
- LStream *p = tolstream(L);
- lua_CFunction cf = p->closef;
- p->closef = NULL; /* mark stream as closed */
- return (*cf)(L); /* close it */
+ LStream *p = tolstream(L);
+ lua_CFunction cf = p->closef;
+ p->closef = NULL; /* mark stream as closed */
+ return (*cf)(L); /* close it */
}
static int io_close (lua_State *L) {
- if (lua_isnone(L, 1)) /* no argument? */
- lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT); /* use standard output */
- tofile(L); /* make sure argument is an open stream */
- return aux_close(L);
+ if (lua_isnone(L, 1)) /* no argument? */
+ lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT); /* use standard output */
+ tofile(L); /* make sure argument is an open stream */
+ return aux_close(L);
}
static int f_gc (lua_State *L) {
- LStream *p = tolstream(L);
- if (!isclosed(p) && p->f != NULL)
- aux_close(L); /* ignore closed and incompletely open files */
- return 0;
+ LStream *p = tolstream(L);
+ if (!isclosed(p) && p->f != NULL)
+ aux_close(L); /* ignore closed and incompletely open files */
+ return 0;
}
@@ -201,36 +201,36 @@ static int f_gc (lua_State *L) {
** function to close regular files
*/
static int io_fclose (lua_State *L) {
- LStream *p = tolstream(L);
- int res = fclose(p->f);
- return luaL_fileresult(L, (res == 0), NULL);
+ LStream *p = tolstream(L);
+ int res = fclose(p->f);
+ return luaL_fileresult(L, (res == 0), NULL);
}
static LStream *newfile (lua_State *L) {
- LStream *p = newprefile(L);
- p->f = NULL;
- p->closef = &io_fclose;
- return p;
+ LStream *p = newprefile(L);
+ p->f = NULL;
+ p->closef = &io_fclose;
+ return p;
}
static void opencheck (lua_State *L, const char *fname, const char *mode) {
- LStream *p = newfile(L);
- p->f = fopen(fname, mode);
- if (p->f == NULL)
- luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno));
+ LStream *p = newfile(L);
+ p->f = fopen(fname, mode);
+ if (p->f == NULL)
+ luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno));
}
static int io_open (lua_State *L) {
- const char *filename = luaL_checkstring(L, 1);
- const char *mode = luaL_optstring(L, 2, "r");
- LStream *p = newfile(L);
- const char *md = mode; /* to traverse/check mode */
- luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode");
- p->f = fopen(filename, mode);
- return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+ const char *filename = luaL_checkstring(L, 1);
+ const char *mode = luaL_optstring(L, 2, "r");
+ LStream *p = newfile(L);
+ const char *md = mode; /* to traverse/check mode */
+ luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode");
+ p->f = fopen(filename, mode);
+ return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
}
@@ -238,62 +238,62 @@ static int io_open (lua_State *L) {
** function to close 'popen' files
*/
static int io_pclose (lua_State *L) {
- LStream *p = tolstream(L);
- return luaL_execresult(L, lua_pclose(L, p->f));
+ LStream *p = tolstream(L);
+ return luaL_execresult(L, lua_pclose(L, p->f));
}
static int io_popen (lua_State *L) {
- const char *filename = luaL_checkstring(L, 1);
- const char *mode = luaL_optstring(L, 2, "r");
- LStream *p = newprefile(L);
- p->f = lua_popen(L, filename, mode);
- p->closef = &io_pclose;
- return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+ const char *filename = luaL_checkstring(L, 1);
+ const char *mode = luaL_optstring(L, 2, "r");
+ LStream *p = newprefile(L);
+ p->f = lua_popen(L, filename, mode);
+ p->closef = &io_pclose;
+ return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
}
static int io_tmpfile (lua_State *L) {
- LStream *p = newfile(L);
- p->f = tmpfile();
- return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
+ LStream *p = newfile(L);
+ p->f = tmpfile();
+ return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
}
static FILE *getiofile (lua_State *L, const char *findex) {
- LStream *p;
- lua_getfield(L, LUA_REGISTRYINDEX, findex);
- p = (LStream *)lua_touserdata(L, -1);
- if (isclosed(p))
- luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX));
- return p->f;
+ LStream *p;
+ lua_getfield(L, LUA_REGISTRYINDEX, findex);
+ p = (LStream *)lua_touserdata(L, -1);
+ if (isclosed(p))
+ luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX));
+ return p->f;
}
static int g_iofile (lua_State *L, const char *f, const char *mode) {
- if (!lua_isnoneornil(L, 1)) {
- const char *filename = lua_tostring(L, 1);
- if (filename)
- opencheck(L, filename, mode);
- else {
- tofile(L); /* check that it's a valid file handle */
- lua_pushvalue(L, 1);
- }
- lua_setfield(L, LUA_REGISTRYINDEX, f);
- }
- /* return current value */
- lua_getfield(L, LUA_REGISTRYINDEX, f);
- return 1;
+ if (!lua_isnoneornil(L, 1)) {
+ const char *filename = lua_tostring(L, 1);
+ if (filename)
+ opencheck(L, filename, mode);
+ else {
+ tofile(L); /* check that it's a valid file handle */
+ lua_pushvalue(L, 1);
+ }
+ lua_setfield(L, LUA_REGISTRYINDEX, f);
+ }
+ /* return current value */
+ lua_getfield(L, LUA_REGISTRYINDEX, f);
+ return 1;
}
static int io_input (lua_State *L) {
- return g_iofile(L, IO_INPUT, "r");
+ return g_iofile(L, IO_INPUT, "r");
}
static int io_output (lua_State *L) {
- return g_iofile(L, IO_OUTPUT, "w");
+ return g_iofile(L, IO_OUTPUT, "w");
}
@@ -301,42 +301,42 @@ static int io_readline (lua_State *L);
static void aux_lines (lua_State *L, int toclose) {
- int i;
- int n = lua_gettop(L) - 1; /* number of arguments to read */
- /* ensure that arguments will fit here and into 'io_readline' stack */
- luaL_argcheck(L, n <= LUA_MINSTACK - 3, LUA_MINSTACK - 3, "too many options");
- lua_pushvalue(L, 1); /* file handle */
- lua_pushinteger(L, n); /* number of arguments to read */
- lua_pushboolean(L, toclose); /* close/not close file when finished */
- for (i = 1; i <= n; i++) lua_pushvalue(L, i + 1); /* copy arguments */
- lua_pushcclosure(L, io_readline, 3 + n);
+ int i;
+ int n = lua_gettop(L) - 1; /* number of arguments to read */
+ /* ensure that arguments will fit here and into 'io_readline' stack */
+ luaL_argcheck(L, n <= LUA_MINSTACK - 3, LUA_MINSTACK - 3, "too many options");
+ lua_pushvalue(L, 1); /* file handle */
+ lua_pushinteger(L, n); /* number of arguments to read */
+ lua_pushboolean(L, toclose); /* close/not close file when finished */
+ for (i = 1; i <= n; i++) lua_pushvalue(L, i + 1); /* copy arguments */
+ lua_pushcclosure(L, io_readline, 3 + n);
}
static int f_lines (lua_State *L) {
- tofile(L); /* check that it's a valid file handle */
- aux_lines(L, 0);
- return 1;
+ tofile(L); /* check that it's a valid file handle */
+ aux_lines(L, 0);
+ return 1;
}
static int io_lines (lua_State *L) {
- int toclose;
- if (lua_isnone(L, 1)) lua_pushnil(L); /* at least one argument */
- if (lua_isnil(L, 1)) { /* no file name? */
- lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT); /* get default input */
- lua_replace(L, 1); /* put it at index 1 */
- tofile(L); /* check that it's a valid file handle */
- toclose = 0; /* do not close it after iteration */
- }
- else { /* open a new file */
- const char *filename = luaL_checkstring(L, 1);
- opencheck(L, filename, "r");
- lua_replace(L, 1); /* put file at index 1 */
- toclose = 1; /* close it after iteration */
- }
- aux_lines(L, toclose);
- return 1;
+ int toclose;
+ if (lua_isnone(L, 1)) lua_pushnil(L); /* at least one argument */
+ if (lua_isnil(L, 1)) { /* no file name? */
+ lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT); /* get default input */
+ lua_replace(L, 1); /* put it at index 1 */
+ tofile(L); /* check that it's a valid file handle */
+ toclose = 0; /* do not close it after iteration */
+ }
+ else { /* open a new file */
+ const char *filename = luaL_checkstring(L, 1);
+ opencheck(L, filename, "r");
+ lua_replace(L, 1); /* put file at index 1 */
+ toclose = 1; /* close it after iteration */
+ }
+ aux_lines(L, toclose);
+ return 1;
}
@@ -348,239 +348,239 @@ static int io_lines (lua_State *L) {
static int read_number (lua_State *L, FILE *f) {
- lua_Number d;
- if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
- lua_pushnumber(L, d);
- return 1;
- }
- else {
- lua_pushnil(L); /* "result" to be removed */
- return 0; /* read fails */
- }
+ lua_Number d;
+ if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
+ lua_pushnumber(L, d);
+ return 1;
+ }
+ else {
+ lua_pushnil(L); /* "result" to be removed */
+ return 0; /* read fails */
+ }
}
static int test_eof (lua_State *L, FILE *f) {
- int c = getc(f);
- ungetc(c, f);
- lua_pushlstring(L, NULL, 0);
- return (c != EOF);
+ int c = getc(f);
+ ungetc(c, f);
+ lua_pushlstring(L, NULL, 0);
+ return (c != EOF);
}
static int read_line (lua_State *L, FILE *f, int chop) {
- luaL_Buffer b;
- luaL_buffinit(L, &b);
- for (;;) {
- size_t l;
- char *p = luaL_prepbuffer(&b);
- if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) { /* eof? */
- luaL_pushresult(&b); /* close buffer */
- return (lua_rawlen(L, -1) > 0); /* check whether read something */
- }
- l = strlen(p);
- if (l == 0 || p[l-1] != '\n')
- luaL_addsize(&b, l);
- else {
- luaL_addsize(&b, l - chop); /* chop 'eol' if needed */
- luaL_pushresult(&b); /* close buffer */
- return 1; /* read at least an `eol' */
- }
- }
-}
-
-
-#define MAX_SIZE_T (~(size_t)0)
+ luaL_Buffer b;
+ luaL_buffinit(L, &b);
+ for (;;) {
+ size_t l;
+ char *p = luaL_prepbuffer(&b);
+ if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) { /* eof? */
+ luaL_pushresult(&b); /* close buffer */
+ return (lua_rawlen(L, -1) > 0); /* check whether read something */
+ }
+ l = strlen(p);
+ if (l == 0 || p[l-1] != '\n')
+ luaL_addsize(&b, l);
+ else {
+ luaL_addsize(&b, l - chop); /* chop 'eol' if needed */
+ luaL_pushresult(&b); /* close buffer */
+ return 1; /* read at least an `eol' */
+ }
+ }
+}
+
+
+#define MAX_SIZE_T (~(size_t)0)
static void read_all (lua_State *L, FILE *f) {
- size_t rlen = LUAL_BUFFERSIZE; /* how much to read in each cycle */
- luaL_Buffer b;
- luaL_buffinit(L, &b);
- for (;;) {
- char *p = luaL_prepbuffsize(&b, rlen);
- size_t nr = fread(p, sizeof(char), rlen, f);
- luaL_addsize(&b, nr);
- if (nr < rlen) break; /* eof? */
- else if (rlen <= (MAX_SIZE_T / 4)) /* avoid buffers too large */
- rlen *= 2; /* double buffer size at each iteration */
- }
- luaL_pushresult(&b); /* close buffer */
+ size_t rlen = LUAL_BUFFERSIZE; /* how much to read in each cycle */
+ luaL_Buffer b;
+ luaL_buffinit(L, &b);
+ for (;;) {
+ char *p = luaL_prepbuffsize(&b, rlen);
+ size_t nr = fread(p, sizeof(char), rlen, f);
+ luaL_addsize(&b, nr);
+ if (nr < rlen) break; /* eof? */
+ else if (rlen <= (MAX_SIZE_T / 4)) /* avoid buffers too large */
+ rlen *= 2; /* double buffer size at each iteration */
+ }
+ luaL_pushresult(&b); /* close buffer */
}
static int read_chars (lua_State *L, FILE *f, size_t n) {
- size_t nr; /* number of chars actually read */
- char *p;
- luaL_Buffer b;
- luaL_buffinit(L, &b);
- p = luaL_prepbuffsize(&b, n); /* prepare buffer to read whole block */
- nr = fread(p, sizeof(char), n, f); /* try to read 'n' chars */
- luaL_addsize(&b, nr);
- luaL_pushresult(&b); /* close buffer */
- return (nr > 0); /* true iff read something */
+ size_t nr; /* number of chars actually read */
+ char *p;
+ luaL_Buffer b;
+ luaL_buffinit(L, &b);
+ p = luaL_prepbuffsize(&b, n); /* prepare buffer to read whole block */
+ nr = fread(p, sizeof(char), n, f); /* try to read 'n' chars */
+ luaL_addsize(&b, nr);
+ luaL_pushresult(&b); /* close buffer */
+ return (nr > 0); /* true iff read something */
}
static int g_read (lua_State *L, FILE *f, int first) {
- int nargs = lua_gettop(L) - 1;
- int success;
- int n;
- clearerr(f);
- if (nargs == 0) { /* no arguments? */
- success = read_line(L, f, 1);
- n = first+1; /* to return 1 result */
- }
- else { /* ensure stack space for all results and for auxlib's buffer */
- luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
- success = 1;
- for (n = first; nargs-- && success; n++) {
- if (lua_type(L, n) == LUA_TNUMBER) {
- size_t l = (size_t)lua_tointeger(L, n);
- success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
- }
- else {
- const char *p = lua_tostring(L, n);
- luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
- switch (p[1]) {
- case 'n': /* number */
- success = read_number(L, f);
- break;
- case 'l': /* line */
- success = read_line(L, f, 1);
- break;
- case 'L': /* line with end-of-line */
- success = read_line(L, f, 0);
- break;
- case 'a': /* file */
- read_all(L, f); /* read entire file */
- success = 1; /* always success */
- break;
- default:
- return luaL_argerror(L, n, "invalid format");
- }
- }
- }
- }
- if (ferror(f))
- return luaL_fileresult(L, 0, NULL);
- if (!success) {
- lua_pop(L, 1); /* remove last result */
- lua_pushnil(L); /* push nil instead */
- }
- return n - first;
+ int nargs = lua_gettop(L) - 1;
+ int success;
+ int n;
+ clearerr(f);
+ if (nargs == 0) { /* no arguments? */
+ success = read_line(L, f, 1);
+ n = first+1; /* to return 1 result */
+ }
+ else { /* ensure stack space for all results and for auxlib's buffer */
+ luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
+ success = 1;
+ for (n = first; nargs-- && success; n++) {
+ if (lua_type(L, n) == LUA_TNUMBER) {
+ size_t l = (size_t)lua_tointeger(L, n);
+ success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
+ }
+ else {
+ const char *p = lua_tostring(L, n);
+ luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
+ switch (p[1]) {
+ case 'n': /* number */
+ success = read_number(L, f);
+ break;
+ case 'l': /* line */
+ success = read_line(L, f, 1);
+ break;
+ case 'L': /* line with end-of-line */
+ success = read_line(L, f, 0);
+ break;
+ case 'a': /* file */
+ read_all(L, f); /* read entire file */
+ success = 1; /* always success */
+ break;
+ default:
+ return luaL_argerror(L, n, "invalid format");
+ }
+ }
+ }
+ }
+ if (ferror(f))
+ return luaL_fileresult(L, 0, NULL);
+ if (!success) {
+ lua_pop(L, 1); /* remove last result */
+ lua_pushnil(L); /* push nil instead */
+ }
+ return n - first;
}
static int io_read (lua_State *L) {
- return g_read(L, getiofile(L, IO_INPUT), 1);
+ return g_read(L, getiofile(L, IO_INPUT), 1);
}
static int f_read (lua_State *L) {
- return g_read(L, tofile(L), 2);
+ return g_read(L, tofile(L), 2);
}
static int io_readline (lua_State *L) {
- LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
- int i;
- int n = (int)lua_tointeger(L, lua_upvalueindex(2));
- if (isclosed(p)) /* file is already closed? */
- return luaL_error(L, "file is already closed");
- lua_settop(L , 1);
- for (i = 1; i <= n; i++) /* push arguments to 'g_read' */
- lua_pushvalue(L, lua_upvalueindex(3 + i));
- n = g_read(L, p->f, 2); /* 'n' is number of results */
- lua_assert(n > 0); /* should return at least a nil */
- if (!lua_isnil(L, -n)) /* read at least one value? */
- return n; /* return them */
- else { /* first result is nil: EOF or error */
- if (n > 1) { /* is there error information? */
- /* 2nd result is error message */
- return luaL_error(L, "%s", lua_tostring(L, -n + 1));
- }
- if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */
- lua_settop(L, 0);
- lua_pushvalue(L, lua_upvalueindex(1));
- aux_close(L); /* close it */
- }
- return 0;
- }
+ LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
+ int i;
+ int n = (int)lua_tointeger(L, lua_upvalueindex(2));
+ if (isclosed(p)) /* file is already closed? */
+ return luaL_error(L, "file is already closed");
+ lua_settop(L , 1);
+ for (i = 1; i <= n; i++) /* push arguments to 'g_read' */
+ lua_pushvalue(L, lua_upvalueindex(3 + i));
+ n = g_read(L, p->f, 2); /* 'n' is number of results */
+ lua_assert(n > 0); /* should return at least a nil */
+ if (!lua_isnil(L, -n)) /* read at least one value? */
+ return n; /* return them */
+ else { /* first result is nil: EOF or error */
+ if (n > 1) { /* is there error information? */
+ /* 2nd result is error message */
+ return luaL_error(L, "%s", lua_tostring(L, -n + 1));
+ }
+ if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */
+ lua_settop(L, 0);
+ lua_pushvalue(L, lua_upvalueindex(1));
+ aux_close(L); /* close it */
+ }
+ return 0;
+ }
}
/* }====================================================== */
static int g_write (lua_State *L, FILE *f, int arg) {
- int nargs = lua_gettop(L) - arg;
- int status = 1;
- for (; nargs--; arg++) {
- if (lua_type(L, arg) == LUA_TNUMBER) {
- /* optimization: could be done exactly as for strings */
- status = status &&
- fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
- }
- else {
- size_t l;
- const char *s = luaL_checklstring(L, arg, &l);
- status = status && (fwrite(s, sizeof(char), l, f) == l);
- }
- }
- if (status) return 1; /* file handle already on stack top */
- else return luaL_fileresult(L, status, NULL);
+ int nargs = lua_gettop(L) - arg;
+ int status = 1;
+ for (; nargs--; arg++) {
+ if (lua_type(L, arg) == LUA_TNUMBER) {
+ /* optimization: could be done exactly as for strings */
+ status = status &&
+ fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
+ }
+ else {
+ size_t l;
+ const char *s = luaL_checklstring(L, arg, &l);
+ status = status && (fwrite(s, sizeof(char), l, f) == l);
+ }
+ }
+ if (status) return 1; /* file handle already on stack top */
+ else return luaL_fileresult(L, status, NULL);
}
static int io_write (lua_State *L) {
- return g_write(L, getiofile(L, IO_OUTPUT), 1);
+ return g_write(L, getiofile(L, IO_OUTPUT), 1);
}
static int f_write (lua_State *L) {
- FILE *f = tofile(L);
- lua_pushvalue(L, 1); /* push file at the stack top (to be returned) */
- return g_write(L, f, 2);
+ FILE *f = tofile(L);
+ lua_pushvalue(L, 1); /* push file at the stack top (to be returned) */
+ return g_write(L, f, 2);
}
static int f_seek (lua_State *L) {
- static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
- static const char *const modenames[] = {"set", "cur", "end", NULL};
- FILE *f = tofile(L);
- int op = luaL_checkoption(L, 2, "cur", modenames);
- lua_Number p3 = luaL_optnumber(L, 3, 0);
- l_seeknum offset = (l_seeknum)p3;
- luaL_argcheck(L, (lua_Number)offset == p3, 3,
- "not an integer in proper range");
- op = l_fseek(f, offset, mode[op]);
- if (op)
- return luaL_fileresult(L, 0, NULL); /* error */
- else {
- lua_pushnumber(L, (lua_Number)(1.0 * l_ftell(f)));
- return 1;
- }
+ static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
+ static const char *const modenames[] = {"set", "cur", "end", NULL};
+ FILE *f = tofile(L);
+ int op = luaL_checkoption(L, 2, "cur", modenames);
+ lua_Number p3 = luaL_optnumber(L, 3, 0);
+ l_seeknum offset = (l_seeknum)p3;
+ luaL_argcheck(L, (lua_Number)offset == p3, 3,
+ "not an integer in proper range");
+ op = l_fseek(f, offset, mode[op]);
+ if (op)
+ return luaL_fileresult(L, 0, NULL); /* error */
+ else {
+ lua_pushnumber(L, (lua_Number)(1.0 * l_ftell(f)));
+ return 1;
+ }
}
static int f_setvbuf (lua_State *L) {
- static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
- static const char *const modenames[] = {"no", "full", "line", NULL};
- FILE *f = tofile(L);
- int op = luaL_checkoption(L, 2, NULL, modenames);
- lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
- int res = setvbuf(f, NULL, mode[op], sz);
- return luaL_fileresult(L, res == 0, NULL);
+ static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
+ static const char *const modenames[] = {"no", "full", "line", NULL};
+ FILE *f = tofile(L);
+ int op = luaL_checkoption(L, 2, NULL, modenames);
+ lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
+ int res = setvbuf(f, NULL, mode[op], sz);
+ return luaL_fileresult(L, res == 0, NULL);
}
static int io_flush (lua_State *L) {
- return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
+ return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
}
static int f_flush (lua_State *L) {
- return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
+ return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
}
@@ -588,18 +588,18 @@ static int f_flush (lua_State *L) {
** functions for 'io' library
*/
static const luaL_Reg iolib[] = {
- {"close", io_close},
- {"flush", io_flush},
- {"input", io_input},
- {"lines", io_lines},
- {"open", io_open},
- {"output", io_output},
- {"popen", io_popen},
- {"read", io_read},
- {"tmpfile", io_tmpfile},
- {"type", io_type},
- {"write", io_write},
- {NULL, NULL}
+ {"close", io_close},
+ {"flush", io_flush},
+ {"input", io_input},
+ {"lines", io_lines},
+ {"open", io_open},
+ {"output", io_output},
+ {"popen", io_popen},
+ {"read", io_read},
+ {"tmpfile", io_tmpfile},
+ {"type", io_type},
+ {"write", io_write},
+ {NULL, NULL}
};
@@ -607,25 +607,25 @@ static const luaL_Reg iolib[] = {
** methods for file handles
*/
static const luaL_Reg flib[] = {
- {"close", io_close},
- {"flush", f_flush},
- {"lines", f_lines},
- {"read", f_read},
- {"seek", f_seek},
- {"setvbuf", f_setvbuf},
- {"write", f_write},
- {"__gc", f_gc},
- {"__tostring", f_tostring},
- {NULL, NULL}
+ {"close", io_close},
+ {"flush", f_flush},
+ {"lines", f_lines},
+ {"read", f_read},
+ {"seek", f_seek},
+ {"setvbuf", f_setvbuf},
+ {"write", f_write},
+ {"__gc", f_gc},
+ {"__tostring", f_tostring},
+ {NULL, NULL}
};
static void createmeta (lua_State *L) {
- luaL_newmetatable(L, LUA_FILEHANDLE); /* create metatable for file handles */
- lua_pushvalue(L, -1); /* push metatable */
- lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
- luaL_setfuncs(L, flib, 0); /* add file methods to new metatable */
- lua_pop(L, 1); /* pop new metatable */
+ luaL_newmetatable(L, LUA_FILEHANDLE); /* create metatable for file handles */
+ lua_pushvalue(L, -1); /* push metatable */
+ lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
+ luaL_setfuncs(L, flib, 0); /* add file methods to new metatable */
+ lua_pop(L, 1); /* pop new metatable */
}
@@ -633,34 +633,33 @@ static void createmeta (lua_State *L) {
** function to (not) close the standard files stdin, stdout, and stderr
*/
static int io_noclose (lua_State *L) {
- LStream *p = tolstream(L);
- p->closef = &io_noclose; /* keep file opened */
- lua_pushnil(L);
- lua_pushliteral(L, "cannot close standard file");
- return 2;
+ LStream *p = tolstream(L);
+ p->closef = &io_noclose; /* keep file opened */
+ lua_pushnil(L);
+ lua_pushliteral(L, "cannot close standard file");
+ return 2;
}
static void createstdfile (lua_State *L, FILE *f, const char *k,
- const char *fname) {
- LStream *p = newprefile(L);
- p->f = f;
- p->closef = &io_noclose;
- if (k != NULL) {
- lua_pushvalue(L, -1);
- lua_setfield(L, LUA_REGISTRYINDEX, k); /* add file to registry */
- }
- lua_setfield(L, -2, fname); /* add file to module */
+ const char *fname) {
+ LStream *p = newprefile(L);
+ p->f = f;
+ p->closef = &io_noclose;
+ if (k != NULL) {
+ lua_pushvalue(L, -1);
+ lua_setfield(L, LUA_REGISTRYINDEX, k); /* add file to registry */
+ }
+ lua_setfield(L, -2, fname); /* add file to module */
}
LUAMOD_API int luaopen_io (lua_State *L) {
- luaL_newlib(L, iolib); /* new module */
- createmeta(L);
- /* create (and set) default files */
- createstdfile(L, stdin, IO_INPUT, "stdin");
- createstdfile(L, stdout, IO_OUTPUT, "stdout");
- createstdfile(L, stderr, NULL, "stderr");
- return 1;
+ luaL_newlib(L, iolib); /* new module */
+ createmeta(L);
+ /* create (and set) default files */
+ createstdfile(L, stdin, IO_INPUT, "stdin");
+ createstdfile(L, stdout, IO_OUTPUT, "stdout");
+ createstdfile(L, stderr, NULL, "stderr");
+ return 1;
}
-
diff --git a/src/lib/lua/llex.c b/src/lib/lua/llex.c
index c4b820e8332..449051de681 100644
--- a/src/lib/lua/llex.c
+++ b/src/lib/lua/llex.c
@@ -29,17 +29,17 @@
-#define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r')
+#define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r')
/* ORDER RESERVED */
static const char *const luaX_tokens [] = {
- "and", "break", "do", "else", "elseif",
- "end", "false", "for", "function", "goto", "if",
- "in", "local", "nil", "not", "or", "repeat",
- "return", "then", "true", "until", "while",
- "..", "...", "==", ">=", "<=", "~=", "::", "<eof>",
- "<number>", "<name>", "<string>"
+ "and", "break", "do", "else", "elseif",
+ "end", "false", "for", "function", "goto", "if",
+ "in", "local", "nil", "not", "or", "repeat",
+ "return", "then", "true", "until", "while",
+ "..", "...", "==", ">=", "<=", "~=", "::", "<eof>",
+ "<number>", "<name>", "<string>"
};
@@ -50,69 +50,69 @@ static l_noret lexerror (LexState *ls, const char *msg, int token);
static void save (LexState *ls, int c) {
- Mbuffer *b = ls->buff;
- if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
- size_t newsize;
- if (luaZ_sizebuffer(b) >= MAX_SIZET/2)
- lexerror(ls, "lexical element too long", 0);
- newsize = luaZ_sizebuffer(b) * 2;
- luaZ_resizebuffer(ls->L, b, newsize);
- }
- b->buffer[luaZ_bufflen(b)++] = cast(char, c);
+ Mbuffer *b = ls->buff;
+ if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
+ size_t newsize;
+ if (luaZ_sizebuffer(b) >= MAX_SIZET/2)
+ lexerror(ls, "lexical element too long", 0);
+ newsize = luaZ_sizebuffer(b) * 2;
+ luaZ_resizebuffer(ls->L, b, newsize);
+ }
+ b->buffer[luaZ_bufflen(b)++] = cast(char, c);
}
void luaX_init (lua_State *L) {
- int i;
- for (i=0; i<NUM_RESERVED; i++) {
- TString *ts = luaS_new(L, luaX_tokens[i]);
- luaS_fix(ts); /* reserved words are never collected */
- ts->tsv.extra = cast_byte(i+1); /* reserved word */
- }
+ int i;
+ for (i=0; i<NUM_RESERVED; i++) {
+ TString *ts = luaS_new(L, luaX_tokens[i]);
+ luaS_fix(ts); /* reserved words are never collected */
+ ts->tsv.extra = cast_byte(i+1); /* reserved word */
+ }
}
const char *luaX_token2str (LexState *ls, int token) {
- if (token < FIRST_RESERVED) { /* single-byte symbols? */
- lua_assert(token == cast(unsigned char, token));
- return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) :
- luaO_pushfstring(ls->L, "char(%d)", token);
- }
- else {
- const char *s = luaX_tokens[token - FIRST_RESERVED];
- if (token < TK_EOS) /* fixed format (symbols and reserved words)? */
- return luaO_pushfstring(ls->L, LUA_QS, s);
- else /* names, strings, and numerals */
- return s;
- }
+ if (token < FIRST_RESERVED) { /* single-byte symbols? */
+ lua_assert(token == cast(unsigned char, token));
+ return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) :
+ luaO_pushfstring(ls->L, "char(%d)", token);
+ }
+ else {
+ const char *s = luaX_tokens[token - FIRST_RESERVED];
+ if (token < TK_EOS) /* fixed format (symbols and reserved words)? */
+ return luaO_pushfstring(ls->L, LUA_QS, s);
+ else /* names, strings, and numerals */
+ return s;
+ }
}
static const char *txtToken (LexState *ls, int token) {
- switch (token) {
- case TK_NAME:
- case TK_STRING:
- case TK_NUMBER:
- save(ls, '\0');
- return luaO_pushfstring(ls->L, LUA_QS, luaZ_buffer(ls->buff));
- default:
- return luaX_token2str(ls, token);
- }
+ switch (token) {
+ case TK_NAME:
+ case TK_STRING:
+ case TK_NUMBER:
+ save(ls, '\0');
+ return luaO_pushfstring(ls->L, LUA_QS, luaZ_buffer(ls->buff));
+ default:
+ return luaX_token2str(ls, token);
+ }
}
static l_noret lexerror (LexState *ls, const char *msg, int token) {
- char buff[LUA_IDSIZE];
- luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE);
- msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg);
- if (token)
- luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
- luaD_throw(ls->L, LUA_ERRSYNTAX);
+ char buff[LUA_IDSIZE];
+ luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE);
+ msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg);
+ if (token)
+ luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
+ luaD_throw(ls->L, LUA_ERRSYNTAX);
}
l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
- lexerror(ls, msg, ls->t.token);
+ lexerror(ls, msg, ls->t.token);
}
@@ -122,22 +122,22 @@ l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
** (by that time it should be anchored in function's prototype)
*/
TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
- lua_State *L = ls->L;
- TValue *o; /* entry for `str' */
- TString *ts = luaS_newlstr(L, str, l); /* create new string */
- setsvalue2s(L, L->top++, ts); /* temporarily anchor it in stack */
- o = luaH_set(L, ls->fs->h, L->top - 1);
- if (ttisnil(o)) { /* not in use yet? (see 'addK') */
- /* boolean value does not need GC barrier;
- table has no metatable, so it does not need to invalidate cache */
- setbvalue(o, 1); /* t[string] = true */
- luaC_checkGC(L);
- }
- else { /* string already present */
- ts = rawtsvalue(keyfromval(o)); /* re-use value previously stored */
- }
- L->top--; /* remove string from stack */
- return ts;
+ lua_State *L = ls->L;
+ TValue *o; /* entry for `str' */
+ TString *ts = luaS_newlstr(L, str, l); /* create new string */
+ setsvalue2s(L, L->top++, ts); /* temporarily anchor it in stack */
+ o = luaH_set(L, ls->fs->h, L->top - 1);
+ if (ttisnil(o)) { /* not in use yet? (see 'addK') */
+ /* boolean value does not need GC barrier;
+ table has no metatable, so it does not need to invalidate cache */
+ setbvalue(o, 1); /* t[string] = true */
+ luaC_checkGC(L);
+ }
+ else { /* string already present */
+ ts = rawtsvalue(keyfromval(o)); /* re-use value previously stored */
+ }
+ L->top--; /* remove string from stack */
+ return ts;
}
@@ -146,30 +146,30 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
** \n, \r, \n\r, or \r\n)
*/
static void inclinenumber (LexState *ls) {
- int old = ls->current;
- lua_assert(currIsNewline(ls));
- next(ls); /* skip `\n' or `\r' */
- if (currIsNewline(ls) && ls->current != old)
- next(ls); /* skip `\n\r' or `\r\n' */
- if (++ls->linenumber >= MAX_INT)
- luaX_syntaxerror(ls, "chunk has too many lines");
+ int old = ls->current;
+ lua_assert(currIsNewline(ls));
+ next(ls); /* skip `\n' or `\r' */
+ if (currIsNewline(ls) && ls->current != old)
+ next(ls); /* skip `\n\r' or `\r\n' */
+ if (++ls->linenumber >= MAX_INT)
+ luaX_syntaxerror(ls, "chunk has too many lines");
}
void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
- int firstchar) {
- ls->decpoint = '.';
- ls->L = L;
- ls->current = firstchar;
- ls->lookahead.token = TK_EOS; /* no look-ahead token */
- ls->z = z;
- ls->fs = NULL;
- ls->linenumber = 1;
- ls->lastline = 1;
- ls->source = source;
- ls->envn = luaS_new(L, LUA_ENV); /* create env name */
- luaS_fix(ls->envn); /* never collect this name */
- luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER); /* initialize buffer */
+ int firstchar) {
+ ls->decpoint = '.';
+ ls->L = L;
+ ls->current = firstchar;
+ ls->lookahead.token = TK_EOS; /* no look-ahead token */
+ ls->z = z;
+ ls->fs = NULL;
+ ls->linenumber = 1;
+ ls->lastline = 1;
+ ls->source = source;
+ ls->envn = luaS_new(L, LUA_ENV); /* create env name */
+ luaS_fix(ls->envn); /* never collect this name */
+ luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER); /* initialize buffer */
}
@@ -183,10 +183,10 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
static int check_next (LexState *ls, const char *set) {
- if (ls->current == '\0' || !strchr(set, ls->current))
- return 0;
- save_and_next(ls);
- return 1;
+ if (ls->current == '\0' || !strchr(set, ls->current))
+ return 0;
+ save_and_next(ls);
+ return 1;
}
@@ -194,33 +194,33 @@ static int check_next (LexState *ls, const char *set) {
** change all characters 'from' in buffer to 'to'
*/
static void buffreplace (LexState *ls, char from, char to) {
- size_t n = luaZ_bufflen(ls->buff);
- char *p = luaZ_buffer(ls->buff);
- while (n--)
- if (p[n] == from) p[n] = to;
+ size_t n = luaZ_bufflen(ls->buff);
+ char *p = luaZ_buffer(ls->buff);
+ while (n--)
+ if (p[n] == from) p[n] = to;
}
#if !defined(getlocaledecpoint)
-#define getlocaledecpoint() (localeconv()->decimal_point[0])
+#define getlocaledecpoint() (localeconv()->decimal_point[0])
#endif
-#define buff2d(b,e) luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e)
+#define buff2d(b,e) luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e)
/*
** in case of format error, try to change decimal point separator to
** the one defined in the current locale and check again
*/
static void trydecpoint (LexState *ls, SemInfo *seminfo) {
- char old = ls->decpoint;
- ls->decpoint = getlocaledecpoint();
- buffreplace(ls, old, ls->decpoint); /* try new decimal separator */
- if (!buff2d(ls->buff, &seminfo->r)) {
- /* format error with correct decimal point: no more options */
- buffreplace(ls, ls->decpoint, '.'); /* undo change (for error message) */
- lexerror(ls, "malformed number", TK_NUMBER);
- }
+ char old = ls->decpoint;
+ ls->decpoint = getlocaledecpoint();
+ buffreplace(ls, old, ls->decpoint); /* try new decimal separator */
+ if (!buff2d(ls->buff, &seminfo->r)) {
+ /* format error with correct decimal point: no more options */
+ buffreplace(ls, ls->decpoint, '.'); /* undo change (for error message) */
+ lexerror(ls, "malformed number", TK_NUMBER);
+ }
}
@@ -230,23 +230,23 @@ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
** will reject ill-formed numerals.
*/
static void read_numeral (LexState *ls, SemInfo *seminfo) {
- const char *expo = "Ee";
- int first = ls->current;
- lua_assert(lisdigit(ls->current));
- save_and_next(ls);
- if (first == '0' && check_next(ls, "Xx")) /* hexadecimal? */
- expo = "Pp";
- for (;;) {
- if (check_next(ls, expo)) /* exponent part? */
- check_next(ls, "+-"); /* optional exponent sign */
- if (lisxdigit(ls->current) || ls->current == '.')
- save_and_next(ls);
- else break;
- }
- save(ls, '\0');
- buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */
- if (!buff2d(ls->buff, &seminfo->r)) /* format error? */
- trydecpoint(ls, seminfo); /* try to update decimal point separator */
+ const char *expo = "Ee";
+ int first = ls->current;
+ lua_assert(lisdigit(ls->current));
+ save_and_next(ls);
+ if (first == '0' && check_next(ls, "Xx")) /* hexadecimal? */
+ expo = "Pp";
+ for (;;) {
+ if (check_next(ls, expo)) /* exponent part? */
+ check_next(ls, "+-"); /* optional exponent sign */
+ if (lisxdigit(ls->current) || ls->current == '.')
+ save_and_next(ls);
+ else break;
+ }
+ save(ls, '\0');
+ buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */
+ if (!buff2d(ls->buff, &seminfo->r)) /* format error? */
+ trydecpoint(ls, seminfo); /* try to update decimal point separator */
}
@@ -255,276 +255,275 @@ static void read_numeral (LexState *ls, SemInfo *seminfo) {
** -1 if sequence is malformed
*/
static int skip_sep (LexState *ls) {
- int count = 0;
- int s = ls->current;
- lua_assert(s == '[' || s == ']');
- save_and_next(ls);
- while (ls->current == '=') {
- save_and_next(ls);
- count++;
- }
- return (ls->current == s) ? count : (-count) - 1;
+ int count = 0;
+ int s = ls->current;
+ lua_assert(s == '[' || s == ']');
+ save_and_next(ls);
+ while (ls->current == '=') {
+ save_and_next(ls);
+ count++;
+ }
+ return (ls->current == s) ? count : (-count) - 1;
}
static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
- save_and_next(ls); /* skip 2nd `[' */
- if (currIsNewline(ls)) /* string starts with a newline? */
- inclinenumber(ls); /* skip it */
- for (;;) {
- switch (ls->current) {
- case EOZ:
- lexerror(ls, (seminfo) ? "unfinished long string" :
- "unfinished long comment", TK_EOS);
- break; /* to avoid warnings */
- case ']': {
- if (skip_sep(ls) == sep) {
- save_and_next(ls); /* skip 2nd `]' */
- goto endloop;
- }
- break;
- }
- case '\n': case '\r': {
- save(ls, '\n');
- inclinenumber(ls);
- if (!seminfo) luaZ_resetbuffer(ls->buff); /* avoid wasting space */
- break;
- }
- default: {
- if (seminfo) save_and_next(ls);
- else next(ls);
- }
- }
- } endloop:
- if (seminfo)
- seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
- luaZ_bufflen(ls->buff) - 2*(2 + sep));
+ save_and_next(ls); /* skip 2nd `[' */
+ if (currIsNewline(ls)) /* string starts with a newline? */
+ inclinenumber(ls); /* skip it */
+ for (;;) {
+ switch (ls->current) {
+ case EOZ:
+ lexerror(ls, (seminfo) ? "unfinished long string" :
+ "unfinished long comment", TK_EOS);
+ break; /* to avoid warnings */
+ case ']': {
+ if (skip_sep(ls) == sep) {
+ save_and_next(ls); /* skip 2nd `]' */
+ goto endloop;
+ }
+ break;
+ }
+ case '\n': case '\r': {
+ save(ls, '\n');
+ inclinenumber(ls);
+ if (!seminfo) luaZ_resetbuffer(ls->buff); /* avoid wasting space */
+ break;
+ }
+ default: {
+ if (seminfo) save_and_next(ls);
+ else next(ls);
+ }
+ }
+ } endloop:
+ if (seminfo)
+ seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
+ luaZ_bufflen(ls->buff) - 2*(2 + sep));
}
static void escerror (LexState *ls, int *c, int n, const char *msg) {
- int i;
- luaZ_resetbuffer(ls->buff); /* prepare error message */
- save(ls, '\\');
- for (i = 0; i < n && c[i] != EOZ; i++)
- save(ls, c[i]);
- lexerror(ls, msg, TK_STRING);
+ int i;
+ luaZ_resetbuffer(ls->buff); /* prepare error message */
+ save(ls, '\\');
+ for (i = 0; i < n && c[i] != EOZ; i++)
+ save(ls, c[i]);
+ lexerror(ls, msg, TK_STRING);
}
static int readhexaesc (LexState *ls) {
- int c[3], i; /* keep input for error message */
- int r = 0; /* result accumulator */
- c[0] = 'x'; /* for error message */
- for (i = 1; i < 3; i++) { /* read two hexadecimal digits */
- c[i] = next(ls);
- if (!lisxdigit(c[i]))
- escerror(ls, c, i + 1, "hexadecimal digit expected");
- r = (r << 4) + luaO_hexavalue(c[i]);
- }
- return r;
+ int c[3], i; /* keep input for error message */
+ int r = 0; /* result accumulator */
+ c[0] = 'x'; /* for error message */
+ for (i = 1; i < 3; i++) { /* read two hexadecimal digits */
+ c[i] = next(ls);
+ if (!lisxdigit(c[i]))
+ escerror(ls, c, i + 1, "hexadecimal digit expected");
+ r = (r << 4) + luaO_hexavalue(c[i]);
+ }
+ return r;
}
static int readdecesc (LexState *ls) {
- int c[3], i;
- int r = 0; /* result accumulator */
- for (i = 0; i < 3 && lisdigit(ls->current); i++) { /* read up to 3 digits */
- c[i] = ls->current;
- r = 10*r + c[i] - '0';
- next(ls);
- }
- if (r > UCHAR_MAX)
- escerror(ls, c, i, "decimal escape too large");
- return r;
+ int c[3], i;
+ int r = 0; /* result accumulator */
+ for (i = 0; i < 3 && lisdigit(ls->current); i++) { /* read up to 3 digits */
+ c[i] = ls->current;
+ r = 10*r + c[i] - '0';
+ next(ls);
+ }
+ if (r > UCHAR_MAX)
+ escerror(ls, c, i, "decimal escape too large");
+ return r;
}
static void read_string (LexState *ls, int del, SemInfo *seminfo) {
- save_and_next(ls); /* keep delimiter (for error messages) */
- while (ls->current != del) {
- switch (ls->current) {
- case EOZ:
- lexerror(ls, "unfinished string", TK_EOS);
- break; /* to avoid warnings */
- case '\n':
- case '\r':
- lexerror(ls, "unfinished string", TK_STRING);
- break; /* to avoid warnings */
- case '\\': { /* escape sequences */
- int c; /* final character to be saved */
- next(ls); /* do not save the `\' */
- switch (ls->current) {
- case 'a': c = '\a'; goto read_save;
- case 'b': c = '\b'; goto read_save;
- case 'f': c = '\f'; goto read_save;
- case 'n': c = '\n'; goto read_save;
- case 'r': c = '\r'; goto read_save;
- case 't': c = '\t'; goto read_save;
- case 'v': c = '\v'; goto read_save;
- case 'x': c = readhexaesc(ls); goto read_save;
- case '\n': case '\r':
- inclinenumber(ls); c = '\n'; goto only_save;
- case '\\': case '\"': case '\'':
- c = ls->current; goto read_save;
- case EOZ: goto no_save; /* will raise an error next loop */
- case 'z': { /* zap following span of spaces */
- next(ls); /* skip the 'z' */
- while (lisspace(ls->current)) {
- if (currIsNewline(ls)) inclinenumber(ls);
- else next(ls);
- }
- goto no_save;
- }
- default: {
- if (!lisdigit(ls->current))
- escerror(ls, &ls->current, 1, "invalid escape sequence");
- /* digital escape \ddd */
- c = readdecesc(ls);
- goto only_save;
- }
- }
- read_save: next(ls); /* read next character */
- only_save: save(ls, c); /* save 'c' */
- no_save: break;
- }
- default:
- save_and_next(ls);
- }
- }
- save_and_next(ls); /* skip delimiter */
- seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
- luaZ_bufflen(ls->buff) - 2);
+ save_and_next(ls); /* keep delimiter (for error messages) */
+ while (ls->current != del) {
+ switch (ls->current) {
+ case EOZ:
+ lexerror(ls, "unfinished string", TK_EOS);
+ break; /* to avoid warnings */
+ case '\n':
+ case '\r':
+ lexerror(ls, "unfinished string", TK_STRING);
+ break; /* to avoid warnings */
+ case '\\': { /* escape sequences */
+ int c; /* final character to be saved */
+ next(ls); /* do not save the `\' */
+ switch (ls->current) {
+ case 'a': c = '\a'; goto read_save;
+ case 'b': c = '\b'; goto read_save;
+ case 'f': c = '\f'; goto read_save;
+ case 'n': c = '\n'; goto read_save;
+ case 'r': c = '\r'; goto read_save;
+ case 't': c = '\t'; goto read_save;
+ case 'v': c = '\v'; goto read_save;
+ case 'x': c = readhexaesc(ls); goto read_save;
+ case '\n': case '\r':
+ inclinenumber(ls); c = '\n'; goto only_save;
+ case '\\': case '\"': case '\'':
+ c = ls->current; goto read_save;
+ case EOZ: goto no_save; /* will raise an error next loop */
+ case 'z': { /* zap following span of spaces */
+ next(ls); /* skip the 'z' */
+ while (lisspace(ls->current)) {
+ if (currIsNewline(ls)) inclinenumber(ls);
+ else next(ls);
+ }
+ goto no_save;
+ }
+ default: {
+ if (!lisdigit(ls->current))
+ escerror(ls, &ls->current, 1, "invalid escape sequence");
+ /* digital escape \ddd */
+ c = readdecesc(ls);
+ goto only_save;
+ }
+ }
+ read_save: next(ls); /* read next character */
+ only_save: save(ls, c); /* save 'c' */
+ no_save: break;
+ }
+ default:
+ save_and_next(ls);
+ }
+ }
+ save_and_next(ls); /* skip delimiter */
+ seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
+ luaZ_bufflen(ls->buff) - 2);
}
static int llex (LexState *ls, SemInfo *seminfo) {
- luaZ_resetbuffer(ls->buff);
- for (;;) {
- switch (ls->current) {
- case '\n': case '\r': { /* line breaks */
- inclinenumber(ls);
- break;
- }
- case ' ': case '\f': case '\t': case '\v': { /* spaces */
- next(ls);
- break;
- }
- case '-': { /* '-' or '--' (comment) */
- next(ls);
- if (ls->current != '-') return '-';
- /* else is a comment */
- next(ls);
- if (ls->current == '[') { /* long comment? */
- int sep = skip_sep(ls);
- luaZ_resetbuffer(ls->buff); /* `skip_sep' may dirty the buffer */
- if (sep >= 0) {
- read_long_string(ls, NULL, sep); /* skip long comment */
- luaZ_resetbuffer(ls->buff); /* previous call may dirty the buff. */
- break;
- }
- }
- /* else short comment */
- while (!currIsNewline(ls) && ls->current != EOZ)
- next(ls); /* skip until end of line (or end of file) */
- break;
- }
- case '[': { /* long string or simply '[' */
- int sep = skip_sep(ls);
- if (sep >= 0) {
- read_long_string(ls, seminfo, sep);
- return TK_STRING;
- }
- else if (sep == -1) return '[';
- else lexerror(ls, "invalid long string delimiter", TK_STRING);
- }
- case '=': {
- next(ls);
- if (ls->current != '=') return '=';
- else { next(ls); return TK_EQ; }
- }
- case '<': {
- next(ls);
- if (ls->current != '=') return '<';
- else { next(ls); return TK_LE; }
- }
- case '>': {
- next(ls);
- if (ls->current != '=') return '>';
- else { next(ls); return TK_GE; }
- }
- case '~': {
- next(ls);
- if (ls->current != '=') return '~';
- else { next(ls); return TK_NE; }
- }
- case ':': {
- next(ls);
- if (ls->current != ':') return ':';
- else { next(ls); return TK_DBCOLON; }
- }
- case '"': case '\'': { /* short literal strings */
- read_string(ls, ls->current, seminfo);
- return TK_STRING;
- }
- case '.': { /* '.', '..', '...', or number */
- save_and_next(ls);
- if (check_next(ls, ".")) {
- if (check_next(ls, "."))
- return TK_DOTS; /* '...' */
- else return TK_CONCAT; /* '..' */
- }
- else if (!lisdigit(ls->current)) return '.';
- /* else go through */
- }
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9': {
- read_numeral(ls, seminfo);
- return TK_NUMBER;
- }
- case EOZ: {
- return TK_EOS;
- }
- default: {
- if (lislalpha(ls->current)) { /* identifier or reserved word? */
- TString *ts;
- do {
- save_and_next(ls);
- } while (lislalnum(ls->current));
- ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
- luaZ_bufflen(ls->buff));
- seminfo->ts = ts;
- if (isreserved(ts)) /* reserved word? */
- return ts->tsv.extra - 1 + FIRST_RESERVED;
- else {
- return TK_NAME;
- }
- }
- else { /* single-char tokens (+ - / ...) */
- int c = ls->current;
- next(ls);
- return c;
- }
- }
- }
- }
+ luaZ_resetbuffer(ls->buff);
+ for (;;) {
+ switch (ls->current) {
+ case '\n': case '\r': { /* line breaks */
+ inclinenumber(ls);
+ break;
+ }
+ case ' ': case '\f': case '\t': case '\v': { /* spaces */
+ next(ls);
+ break;
+ }
+ case '-': { /* '-' or '--' (comment) */
+ next(ls);
+ if (ls->current != '-') return '-';
+ /* else is a comment */
+ next(ls);
+ if (ls->current == '[') { /* long comment? */
+ int sep = skip_sep(ls);
+ luaZ_resetbuffer(ls->buff); /* `skip_sep' may dirty the buffer */
+ if (sep >= 0) {
+ read_long_string(ls, NULL, sep); /* skip long comment */
+ luaZ_resetbuffer(ls->buff); /* previous call may dirty the buff. */
+ break;
+ }
+ }
+ /* else short comment */
+ while (!currIsNewline(ls) && ls->current != EOZ)
+ next(ls); /* skip until end of line (or end of file) */
+ break;
+ }
+ case '[': { /* long string or simply '[' */
+ int sep = skip_sep(ls);
+ if (sep >= 0) {
+ read_long_string(ls, seminfo, sep);
+ return TK_STRING;
+ }
+ else if (sep == -1) return '[';
+ else lexerror(ls, "invalid long string delimiter", TK_STRING);
+ }
+ case '=': {
+ next(ls);
+ if (ls->current != '=') return '=';
+ else { next(ls); return TK_EQ; }
+ }
+ case '<': {
+ next(ls);
+ if (ls->current != '=') return '<';
+ else { next(ls); return TK_LE; }
+ }
+ case '>': {
+ next(ls);
+ if (ls->current != '=') return '>';
+ else { next(ls); return TK_GE; }
+ }
+ case '~': {
+ next(ls);
+ if (ls->current != '=') return '~';
+ else { next(ls); return TK_NE; }
+ }
+ case ':': {
+ next(ls);
+ if (ls->current != ':') return ':';
+ else { next(ls); return TK_DBCOLON; }
+ }
+ case '"': case '\'': { /* short literal strings */
+ read_string(ls, ls->current, seminfo);
+ return TK_STRING;
+ }
+ case '.': { /* '.', '..', '...', or number */
+ save_and_next(ls);
+ if (check_next(ls, ".")) {
+ if (check_next(ls, "."))
+ return TK_DOTS; /* '...' */
+ else return TK_CONCAT; /* '..' */
+ }
+ else if (!lisdigit(ls->current)) return '.';
+ /* else go through */
+ }
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9': {
+ read_numeral(ls, seminfo);
+ return TK_NUMBER;
+ }
+ case EOZ: {
+ return TK_EOS;
+ }
+ default: {
+ if (lislalpha(ls->current)) { /* identifier or reserved word? */
+ TString *ts;
+ do {
+ save_and_next(ls);
+ } while (lislalnum(ls->current));
+ ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
+ luaZ_bufflen(ls->buff));
+ seminfo->ts = ts;
+ if (isreserved(ts)) /* reserved word? */
+ return ts->tsv.extra - 1 + FIRST_RESERVED;
+ else {
+ return TK_NAME;
+ }
+ }
+ else { /* single-char tokens (+ - / ...) */
+ int c = ls->current;
+ next(ls);
+ return c;
+ }
+ }
+ }
+ }
}
void luaX_next (LexState *ls) {
- ls->lastline = ls->linenumber;
- if (ls->lookahead.token != TK_EOS) { /* is there a look-ahead token? */
- ls->t = ls->lookahead; /* use this one */
- ls->lookahead.token = TK_EOS; /* and discharge it */
- }
- else
- ls->t.token = llex(ls, &ls->t.seminfo); /* read next token */
+ ls->lastline = ls->linenumber;
+ if (ls->lookahead.token != TK_EOS) { /* is there a look-ahead token? */
+ ls->t = ls->lookahead; /* use this one */
+ ls->lookahead.token = TK_EOS; /* and discharge it */
+ }
+ else
+ ls->t.token = llex(ls, &ls->t.seminfo); /* read next token */
}
int luaX_lookahead (LexState *ls) {
- lua_assert(ls->lookahead.token == TK_EOS);
- ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
- return ls->lookahead.token;
+ lua_assert(ls->lookahead.token == TK_EOS);
+ ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
+ return ls->lookahead.token;
}
-
diff --git a/src/lib/lua/lmathlib.c b/src/lib/lua/lmathlib.c
index fe9fc5423d1..b672bdfc106 100644
--- a/src/lib/lua/lmathlib.c
+++ b/src/lib/lua/lmathlib.c
@@ -18,250 +18,250 @@
#undef PI
-#define PI ((lua_Number)(3.1415926535897932384626433832795))
-#define RADIANS_PER_DEGREE ((lua_Number)(PI/180.0))
+#define PI ((lua_Number)(3.1415926535897932384626433832795))
+#define RADIANS_PER_DEGREE ((lua_Number)(PI/180.0))
static int math_abs (lua_State *L) {
- lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_sin (lua_State *L) {
- lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_sinh (lua_State *L) {
- lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_cos (lua_State *L) {
- lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_cosh (lua_State *L) {
- lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_tan (lua_State *L) {
- lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_tanh (lua_State *L) {
- lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_asin (lua_State *L) {
- lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_acos (lua_State *L) {
- lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_atan (lua_State *L) {
- lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_atan2 (lua_State *L) {
- lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1),
- luaL_checknumber(L, 2)));
- return 1;
+ lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1),
+ luaL_checknumber(L, 2)));
+ return 1;
}
static int math_ceil (lua_State *L) {
- lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_floor (lua_State *L) {
- lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_fmod (lua_State *L) {
- lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
- luaL_checknumber(L, 2)));
- return 1;
+ lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
+ luaL_checknumber(L, 2)));
+ return 1;
}
static int math_modf (lua_State *L) {
- lua_Number ip;
- lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip);
- lua_pushnumber(L, ip);
- lua_pushnumber(L, fp);
- return 2;
+ lua_Number ip;
+ lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip);
+ lua_pushnumber(L, ip);
+ lua_pushnumber(L, fp);
+ return 2;
}
static int math_sqrt (lua_State *L) {
- lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_pow (lua_State *L) {
- lua_Number x = luaL_checknumber(L, 1);
- lua_Number y = luaL_checknumber(L, 2);
- lua_pushnumber(L, l_mathop(pow)(x, y));
- return 1;
+ lua_Number x = luaL_checknumber(L, 1);
+ lua_Number y = luaL_checknumber(L, 2);
+ lua_pushnumber(L, l_mathop(pow)(x, y));
+ return 1;
}
static int math_log (lua_State *L) {
- lua_Number x = luaL_checknumber(L, 1);
- lua_Number res;
- if (lua_isnoneornil(L, 2))
- res = l_mathop(log)(x);
- else {
- lua_Number base = luaL_checknumber(L, 2);
- if (base == (lua_Number)10.0) res = l_mathop(log10)(x);
- else res = l_mathop(log)(x)/l_mathop(log)(base);
- }
- lua_pushnumber(L, res);
- return 1;
+ lua_Number x = luaL_checknumber(L, 1);
+ lua_Number res;
+ if (lua_isnoneornil(L, 2))
+ res = l_mathop(log)(x);
+ else {
+ lua_Number base = luaL_checknumber(L, 2);
+ if (base == (lua_Number)10.0) res = l_mathop(log10)(x);
+ else res = l_mathop(log)(x)/l_mathop(log)(base);
+ }
+ lua_pushnumber(L, res);
+ return 1;
}
#if defined(LUA_COMPAT_LOG10)
static int math_log10 (lua_State *L) {
- lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
+ return 1;
}
#endif
static int math_exp (lua_State *L) {
- lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
- return 1;
+ lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
+ return 1;
}
static int math_deg (lua_State *L) {
- lua_pushnumber(L, luaL_checknumber(L, 1)/RADIANS_PER_DEGREE);
- return 1;
+ lua_pushnumber(L, luaL_checknumber(L, 1)/RADIANS_PER_DEGREE);
+ return 1;
}
static int math_rad (lua_State *L) {
- lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
- return 1;
+ lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
+ return 1;
}
static int math_frexp (lua_State *L) {
- int e;
- lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
- lua_pushinteger(L, e);
- return 2;
+ int e;
+ lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
+ lua_pushinteger(L, e);
+ return 2;
}
static int math_ldexp (lua_State *L) {
- lua_Number x = luaL_checknumber(L, 1);
- int ep = luaL_checkint(L, 2);
- lua_pushnumber(L, l_mathop(ldexp)(x, ep));
- return 1;
+ lua_Number x = luaL_checknumber(L, 1);
+ int ep = luaL_checkint(L, 2);
+ lua_pushnumber(L, l_mathop(ldexp)(x, ep));
+ return 1;
}
static int math_min (lua_State *L) {
- int n = lua_gettop(L); /* number of arguments */
- lua_Number dmin = luaL_checknumber(L, 1);
- int i;
- for (i=2; i<=n; i++) {
- lua_Number d = luaL_checknumber(L, i);
- if (d < dmin)
- dmin = d;
- }
- lua_pushnumber(L, dmin);
- return 1;
+ int n = lua_gettop(L); /* number of arguments */
+ lua_Number dmin = luaL_checknumber(L, 1);
+ int i;
+ for (i=2; i<=n; i++) {
+ lua_Number d = luaL_checknumber(L, i);
+ if (d < dmin)
+ dmin = d;
+ }
+ lua_pushnumber(L, dmin);
+ return 1;
}
static int math_max (lua_State *L) {
- int n = lua_gettop(L); /* number of arguments */
- lua_Number dmax = luaL_checknumber(L, 1);
- int i;
- for (i=2; i<=n; i++) {
- lua_Number d = luaL_checknumber(L, i);
- if (d > dmax)
- dmax = d;
- }
- lua_pushnumber(L, dmax);
- return 1;
+ int n = lua_gettop(L); /* number of arguments */
+ lua_Number dmax = luaL_checknumber(L, 1);
+ int i;
+ for (i=2; i<=n; i++) {
+ lua_Number d = luaL_checknumber(L, i);
+ if (d > dmax)
+ dmax = d;
+ }
+ lua_pushnumber(L, dmax);
+ return 1;
}
static int math_random (lua_State *L) {
- /* the `%' avoids the (rare) case of r==1, and is needed also because on
- some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
- lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
- switch (lua_gettop(L)) { /* check number of arguments */
- case 0: { /* no arguments */
- lua_pushnumber(L, r); /* Number between 0 and 1 */
- break;
- }
- case 1: { /* only upper limit */
- lua_Number u = luaL_checknumber(L, 1);
- luaL_argcheck(L, (lua_Number)1.0 <= u, 1, "interval is empty");
- lua_pushnumber(L, l_mathop(floor)(r*u) + (lua_Number)(1.0)); /* [1, u] */
- break;
- }
- case 2: { /* lower and upper limits */
- lua_Number l = luaL_checknumber(L, 1);
- lua_Number u = luaL_checknumber(L, 2);
- luaL_argcheck(L, l <= u, 2, "interval is empty");
- lua_pushnumber(L, l_mathop(floor)(r*(u-l+1)) + l); /* [l, u] */
- break;
- }
- default: return luaL_error(L, "wrong number of arguments");
- }
- return 1;
+ /* the `%' avoids the (rare) case of r==1, and is needed also because on
+ some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
+ lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
+ switch (lua_gettop(L)) { /* check number of arguments */
+ case 0: { /* no arguments */
+ lua_pushnumber(L, r); /* Number between 0 and 1 */
+ break;
+ }
+ case 1: { /* only upper limit */
+ lua_Number u = luaL_checknumber(L, 1);
+ luaL_argcheck(L, (lua_Number)1.0 <= u, 1, "interval is empty");
+ lua_pushnumber(L, l_mathop(floor)(r*u) + (lua_Number)(1.0)); /* [1, u] */
+ break;
+ }
+ case 2: { /* lower and upper limits */
+ lua_Number l = luaL_checknumber(L, 1);
+ lua_Number u = luaL_checknumber(L, 2);
+ luaL_argcheck(L, l <= u, 2, "interval is empty");
+ lua_pushnumber(L, l_mathop(floor)(r*(u-l+1)) + l); /* [l, u] */
+ break;
+ }
+ default: return luaL_error(L, "wrong number of arguments");
+ }
+ return 1;
}
static int math_randomseed (lua_State *L) {
- srand(luaL_checkunsigned(L, 1));
- (void)rand(); /* discard first value to avoid undesirable correlations */
- return 0;
+ srand(luaL_checkunsigned(L, 1));
+ (void)rand(); /* discard first value to avoid undesirable correlations */
+ return 0;
}
static const luaL_Reg mathlib[] = {
- {"abs", math_abs},
- {"acos", math_acos},
- {"asin", math_asin},
- {"atan2", math_atan2},
- {"atan", math_atan},
- {"ceil", math_ceil},
- {"cosh", math_cosh},
- {"cos", math_cos},
- {"deg", math_deg},
- {"exp", math_exp},
- {"floor", math_floor},
- {"fmod", math_fmod},
- {"frexp", math_frexp},
- {"ldexp", math_ldexp},
+ {"abs", math_abs},
+ {"acos", math_acos},
+ {"asin", math_asin},
+ {"atan2", math_atan2},
+ {"atan", math_atan},
+ {"ceil", math_ceil},
+ {"cosh", math_cosh},
+ {"cos", math_cos},
+ {"deg", math_deg},
+ {"exp", math_exp},
+ {"floor", math_floor},
+ {"fmod", math_fmod},
+ {"frexp", math_frexp},
+ {"ldexp", math_ldexp},
#if defined(LUA_COMPAT_LOG10)
- {"log10", math_log10},
+ {"log10", math_log10},
#endif
- {"log", math_log},
- {"max", math_max},
- {"min", math_min},
- {"modf", math_modf},
- {"pow", math_pow},
- {"rad", math_rad},
- {"random", math_random},
- {"randomseed", math_randomseed},
- {"sinh", math_sinh},
- {"sin", math_sin},
- {"sqrt", math_sqrt},
- {"tanh", math_tanh},
- {"tan", math_tan},
- {NULL, NULL}
+ {"log", math_log},
+ {"max", math_max},
+ {"min", math_min},
+ {"modf", math_modf},
+ {"pow", math_pow},
+ {"rad", math_rad},
+ {"random", math_random},
+ {"randomseed", math_randomseed},
+ {"sinh", math_sinh},
+ {"sin", math_sin},
+ {"sqrt", math_sqrt},
+ {"tanh", math_tanh},
+ {"tan", math_tan},
+ {NULL, NULL}
};
@@ -269,11 +269,10 @@ static const luaL_Reg mathlib[] = {
** Open math library
*/
LUAMOD_API int luaopen_math (lua_State *L) {
- luaL_newlib(L, mathlib);
- lua_pushnumber(L, PI);
- lua_setfield(L, -2, "pi");
- lua_pushnumber(L, HUGE_VAL);
- lua_setfield(L, -2, "huge");
- return 1;
+ luaL_newlib(L, mathlib);
+ lua_pushnumber(L, PI);
+ lua_setfield(L, -2, "pi");
+ lua_pushnumber(L, HUGE_VAL);
+ lua_setfield(L, -2, "huge");
+ return 1;
}
-
diff --git a/src/lib/lua/lmem.c b/src/lib/lua/lmem.c
index ee343e3e037..6e8ab77384c 100644
--- a/src/lib/lua/lmem.c
+++ b/src/lib/lua/lmem.c
@@ -40,31 +40,31 @@
-#define MINSIZEARRAY 4
+#define MINSIZEARRAY 4
void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
- int limit, const char *what) {
- void *newblock;
- int newsize;
- if (*size >= limit/2) { /* cannot double it? */
- if (*size >= limit) /* cannot grow even a little? */
- luaG_runerror(L, "too many %s (limit is %d)", what, limit);
- newsize = limit; /* still have at least one free place */
- }
- else {
- newsize = (*size)*2;
- if (newsize < MINSIZEARRAY)
- newsize = MINSIZEARRAY; /* minimum size */
- }
- newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
- *size = newsize; /* update only when everything else is OK */
- return newblock;
+ int limit, const char *what) {
+ void *newblock;
+ int newsize;
+ if (*size >= limit/2) { /* cannot double it? */
+ if (*size >= limit) /* cannot grow even a little? */
+ luaG_runerror(L, "too many %s (limit is %d)", what, limit);
+ newsize = limit; /* still have at least one free place */
+ }
+ else {
+ newsize = (*size)*2;
+ if (newsize < MINSIZEARRAY)
+ newsize = MINSIZEARRAY; /* minimum size */
+ }
+ newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
+ *size = newsize; /* update only when everything else is OK */
+ return newblock;
}
l_noret luaM_toobig (lua_State *L) {
- luaG_runerror(L, "memory allocation error: block too big");
+ luaG_runerror(L, "memory allocation error: block too big");
}
@@ -73,27 +73,26 @@ l_noret luaM_toobig (lua_State *L) {
** generic allocation routine.
*/
void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
- void *newblock;
- global_State *g = G(L);
- size_t realosize = (block) ? osize : 0;
- lua_assert((realosize == 0) == (block == NULL));
+ void *newblock;
+ global_State *g = G(L);
+ size_t realosize = (block) ? osize : 0;
+ lua_assert((realosize == 0) == (block == NULL));
#if defined(HARDMEMTESTS)
- if (nsize > realosize && g->gcrunning)
- luaC_fullgc(L, 1); /* force a GC whenever possible */
+ if (nsize > realosize && g->gcrunning)
+ luaC_fullgc(L, 1); /* force a GC whenever possible */
#endif
- newblock = (*g->frealloc)(g->ud, block, osize, nsize);
- if (newblock == NULL && nsize > 0) {
- api_check(L, nsize > realosize,
- "realloc cannot fail when shrinking a block");
- if (g->gcrunning) {
- luaC_fullgc(L, 1); /* try to free some memory... */
- newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */
- }
- if (newblock == NULL)
- luaD_throw(L, LUA_ERRMEM);
- }
- lua_assert((nsize == 0) == (newblock == NULL));
- g->GCdebt = (g->GCdebt + nsize) - realosize;
- return newblock;
+ newblock = (*g->frealloc)(g->ud, block, osize, nsize);
+ if (newblock == NULL && nsize > 0) {
+ api_check(L, nsize > realosize,
+ "realloc cannot fail when shrinking a block");
+ if (g->gcrunning) {
+ luaC_fullgc(L, 1); /* try to free some memory... */
+ newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */
+ }
+ if (newblock == NULL)
+ luaD_throw(L, LUA_ERRMEM);
+ }
+ lua_assert((nsize == 0) == (newblock == NULL));
+ g->GCdebt = (g->GCdebt + nsize) - realosize;
+ return newblock;
}
-
diff --git a/src/lib/lua/loadlib.c b/src/lib/lua/loadlib.c
index bedbea3e9a7..e793893eb2e 100644
--- a/src/lib/lua/loadlib.c
+++ b/src/lib/lua/loadlib.c
@@ -35,17 +35,17 @@
** variables that Lua check to set its paths.
*/
#if !defined(LUA_PATH)
-#define LUA_PATH "LUA_PATH"
+#define LUA_PATH "LUA_PATH"
#endif
#if !defined(LUA_CPATH)
-#define LUA_CPATH "LUA_CPATH"
+#define LUA_CPATH "LUA_CPATH"
#endif
-#define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+#define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
-#define LUA_PATHVERSION LUA_PATH LUA_PATHSUFFIX
-#define LUA_CPATHVERSION LUA_CPATH LUA_PATHSUFFIX
+#define LUA_PATHVERSION LUA_PATH LUA_PATHSUFFIX
+#define LUA_CPATHVERSION LUA_CPATH LUA_PATHSUFFIX
/*
** LUA_PATH_SEP is the character that separates templates in a path.
@@ -57,16 +57,16 @@
** luaopen_ function name.
*/
#if !defined (LUA_PATH_SEP)
-#define LUA_PATH_SEP ";"
+#define LUA_PATH_SEP ";"
#endif
#if !defined (LUA_PATH_MARK)
-#define LUA_PATH_MARK "?"
+#define LUA_PATH_MARK "?"
#endif
#if !defined (LUA_EXEC_DIR)
-#define LUA_EXEC_DIR "!"
+#define LUA_EXEC_DIR "!"
#endif
#if !defined (LUA_IGMARK)
-#define LUA_IGMARK "-"
+#define LUA_IGMARK "-"
#endif
@@ -77,32 +77,32 @@
** when searching for a Lua loader.
*/
#if !defined(LUA_CSUBSEP)
-#define LUA_CSUBSEP LUA_DIRSEP
+#define LUA_CSUBSEP LUA_DIRSEP
#endif
#if !defined(LUA_LSUBSEP)
-#define LUA_LSUBSEP LUA_DIRSEP
+#define LUA_LSUBSEP LUA_DIRSEP
#endif
/* prefix for open functions in C libraries */
-#define LUA_POF "luaopen_"
+#define LUA_POF "luaopen_"
/* separator for open functions in C libraries */
-#define LUA_OFSEP "_"
+#define LUA_OFSEP "_"
/* table (in the registry) that keeps handles for all loaded C libraries */
-#define CLIBS "_CLIBS"
+#define CLIBS "_CLIBS"
-#define LIB_FAIL "open"
+#define LIB_FAIL "open"
/* error codes for ll_loadfunc */
-#define ERRLIB 1
-#define ERRFUNC 2
+#define ERRLIB 1
+#define ERRFUNC 2
-#define setprogdir(L) ((void)0)
+#define setprogdir(L) ((void)0)
/*
@@ -127,21 +127,21 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym);
#include <dlfcn.h>
static void ll_unloadlib (void *lib) {
- dlclose(lib);
+ dlclose(lib);
}
static void *ll_load (lua_State *L, const char *path, int seeglb) {
- void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
- if (lib == NULL) lua_pushstring(L, dlerror());
- return lib;
+ void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
+ if (lib == NULL) lua_pushstring(L, dlerror());
+ return lib;
}
static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
- lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
- if (f == NULL) lua_pushstring(L, dlerror());
- return f;
+ lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
+ if (f == NULL) lua_pushstring(L, dlerror());
+ return f;
}
/* }====================================================== */
@@ -161,52 +161,52 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
** optional flags for LoadLibraryEx
*/
#if !defined(LUA_LLE_FLAGS)
-#define LUA_LLE_FLAGS 0
+#define LUA_LLE_FLAGS 0
#endif
static void setprogdir (lua_State *L) {
- char buff[MAX_PATH + 1];
- char *lb;
- DWORD nsize = sizeof(buff)/sizeof(char);
- DWORD n = GetModuleFileNameA(NULL, buff, nsize);
- if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
- luaL_error(L, "unable to get ModuleFileName");
- else {
- *lb = '\0';
- luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
- lua_remove(L, -2); /* remove original string */
- }
+ char buff[MAX_PATH + 1];
+ char *lb;
+ DWORD nsize = sizeof(buff)/sizeof(char);
+ DWORD n = GetModuleFileNameA(NULL, buff, nsize);
+ if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
+ luaL_error(L, "unable to get ModuleFileName");
+ else {
+ *lb = '\0';
+ luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
+ lua_remove(L, -2); /* remove original string */
+ }
}
static void pusherror (lua_State *L) {
- int error = GetLastError();
- char buffer[128];
- if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
- NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
- lua_pushstring(L, buffer);
- else
- lua_pushfstring(L, "system error %d\n", error);
+ int error = GetLastError();
+ char buffer[128];
+ if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
+ lua_pushstring(L, buffer);
+ else
+ lua_pushfstring(L, "system error %d\n", error);
}
static void ll_unloadlib (void *lib) {
- FreeLibrary((HMODULE)lib);
+ FreeLibrary((HMODULE)lib);
}
static void *ll_load (lua_State *L, const char *path, int seeglb) {
- HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
- (void)(seeglb); /* not used: symbols are 'global' by default */
- if (lib == NULL) pusherror(L);
- return lib;
+ HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
+ (void)(seeglb); /* not used: symbols are 'global' by default */
+ if (lib == NULL) pusherror(L);
+ return lib;
}
static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
- lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
- if (f == NULL) pusherror(L);
- return f;
+ lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
+ if (f == NULL) pusherror(L);
+ return f;
}
/* }====================================================== */
@@ -220,28 +220,28 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
*/
#undef LIB_FAIL
-#define LIB_FAIL "absent"
+#define LIB_FAIL "absent"
-#define DLMSG "dynamic libraries not enabled; check your Lua installation"
+#define DLMSG "dynamic libraries not enabled; check your Lua installation"
static void ll_unloadlib (void *lib) {
- (void)(lib); /* not used */
+ (void)(lib); /* not used */
}
static void *ll_load (lua_State *L, const char *path, int seeglb) {
- (void)(path); (void)(seeglb); /* not used */
- lua_pushliteral(L, DLMSG);
- return NULL;
+ (void)(path); (void)(seeglb); /* not used */
+ lua_pushliteral(L, DLMSG);
+ return NULL;
}
static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
- (void)(lib); (void)(sym); /* not used */
- lua_pushliteral(L, DLMSG);
- return NULL;
+ (void)(lib); (void)(sym); /* not used */
+ lua_pushliteral(L, DLMSG);
+ return NULL;
}
/* }====================================================== */
@@ -249,22 +249,22 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
static void *ll_checkclib (lua_State *L, const char *path) {
- void *plib;
- lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
- lua_getfield(L, -1, path);
- plib = lua_touserdata(L, -1); /* plib = CLIBS[path] */
- lua_pop(L, 2); /* pop CLIBS table and 'plib' */
- return plib;
+ void *plib;
+ lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+ lua_getfield(L, -1, path);
+ plib = lua_touserdata(L, -1); /* plib = CLIBS[path] */
+ lua_pop(L, 2); /* pop CLIBS table and 'plib' */
+ return plib;
}
static void ll_addtoclib (lua_State *L, const char *path, void *plib) {
- lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
- lua_pushlightuserdata(L, plib);
- lua_pushvalue(L, -1);
- lua_setfield(L, -3, path); /* CLIBS[path] = plib */
- lua_rawseti(L, -2, luaL_len(L, -2) + 1); /* CLIBS[#CLIBS + 1] = plib */
- lua_pop(L, 1); /* pop CLIBS table */
+ lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+ lua_pushlightuserdata(L, plib);
+ lua_pushvalue(L, -1);
+ lua_setfield(L, -3, path); /* CLIBS[path] = plib */
+ lua_rawseti(L, -2, luaL_len(L, -2) + 1); /* CLIBS[#CLIBS + 1] = plib */
+ lua_pop(L, 1); /* pop CLIBS table */
}
@@ -273,49 +273,49 @@ static void ll_addtoclib (lua_State *L, const char *path, void *plib) {
** handles in list CLIBS
*/
static int gctm (lua_State *L) {
- int n = luaL_len(L, 1);
- for (; n >= 1; n--) { /* for each handle, in reverse order */
- lua_rawgeti(L, 1, n); /* get handle CLIBS[n] */
- ll_unloadlib(lua_touserdata(L, -1));
- lua_pop(L, 1); /* pop handle */
- }
- return 0;
+ int n = luaL_len(L, 1);
+ for (; n >= 1; n--) { /* for each handle, in reverse order */
+ lua_rawgeti(L, 1, n); /* get handle CLIBS[n] */
+ ll_unloadlib(lua_touserdata(L, -1));
+ lua_pop(L, 1); /* pop handle */
+ }
+ return 0;
}
static int ll_loadfunc (lua_State *L, const char *path, const char *sym) {
- void *reg = ll_checkclib(L, path); /* check loaded C libraries */
- if (reg == NULL) { /* must load library? */
- reg = ll_load(L, path, *sym == '*');
- if (reg == NULL) return ERRLIB; /* unable to load library */
- ll_addtoclib(L, path, reg);
- }
- if (*sym == '*') { /* loading only library (no function)? */
- lua_pushboolean(L, 1); /* return 'true' */
- return 0; /* no errors */
- }
- else {
- lua_CFunction f = ll_sym(L, reg, sym);
- if (f == NULL)
- return ERRFUNC; /* unable to find function */
- lua_pushcfunction(L, f); /* else create new function */
- return 0; /* no errors */
- }
+ void *reg = ll_checkclib(L, path); /* check loaded C libraries */
+ if (reg == NULL) { /* must load library? */
+ reg = ll_load(L, path, *sym == '*');
+ if (reg == NULL) return ERRLIB; /* unable to load library */
+ ll_addtoclib(L, path, reg);
+ }
+ if (*sym == '*') { /* loading only library (no function)? */
+ lua_pushboolean(L, 1); /* return 'true' */
+ return 0; /* no errors */
+ }
+ else {
+ lua_CFunction f = ll_sym(L, reg, sym);
+ if (f == NULL)
+ return ERRFUNC; /* unable to find function */
+ lua_pushcfunction(L, f); /* else create new function */
+ return 0; /* no errors */
+ }
}
static int ll_loadlib (lua_State *L) {
- const char *path = luaL_checkstring(L, 1);
- const char *init = luaL_checkstring(L, 2);
- int stat = ll_loadfunc(L, path, init);
- if (stat == 0) /* no errors? */
- return 1; /* return the loaded function */
- else { /* error; error message is on stack top */
- lua_pushnil(L);
- lua_insert(L, -2);
- lua_pushstring(L, (stat == ERRLIB) ? LIB_FAIL : "init");
- return 3; /* return nil, error message, and where */
- }
+ const char *path = luaL_checkstring(L, 1);
+ const char *init = luaL_checkstring(L, 2);
+ int stat = ll_loadfunc(L, path, init);
+ if (stat == 0) /* no errors? */
+ return 1; /* return the loaded function */
+ else { /* error; error message is on stack top */
+ lua_pushnil(L);
+ lua_insert(L, -2);
+ lua_pushstring(L, (stat == ERRLIB) ? LIB_FAIL : "init");
+ return 3; /* return nil, error message, and where */
+ }
}
@@ -328,205 +328,205 @@ static int ll_loadlib (lua_State *L) {
static int readable (const char *filename) {
- FILE *f = fopen(filename, "r"); /* try to open file */
- if (f == NULL) return 0; /* open failed */
- fclose(f);
- return 1;
+ FILE *f = fopen(filename, "r"); /* try to open file */
+ if (f == NULL) return 0; /* open failed */
+ fclose(f);
+ return 1;
}
static const char *pushnexttemplate (lua_State *L, const char *path) {
- const char *l;
- while (*path == *LUA_PATH_SEP) path++; /* skip separators */
- if (*path == '\0') return NULL; /* no more templates */
- l = strchr(path, *LUA_PATH_SEP); /* find next separator */
- if (l == NULL) l = path + strlen(path);
- lua_pushlstring(L, path, l - path); /* template */
- return l;
+ const char *l;
+ while (*path == *LUA_PATH_SEP) path++; /* skip separators */
+ if (*path == '\0') return NULL; /* no more templates */
+ l = strchr(path, *LUA_PATH_SEP); /* find next separator */
+ if (l == NULL) l = path + strlen(path);
+ lua_pushlstring(L, path, l - path); /* template */
+ return l;
}
static const char *searchpath (lua_State *L, const char *name,
- const char *path,
- const char *sep,
- const char *dirsep) {
- luaL_Buffer msg; /* to build error message */
- luaL_buffinit(L, &msg);
- if (*sep != '\0') /* non-empty separator? */
- name = luaL_gsub(L, name, sep, dirsep); /* replace it by 'dirsep' */
- while ((path = pushnexttemplate(L, path)) != NULL) {
- const char *filename = luaL_gsub(L, lua_tostring(L, -1),
- LUA_PATH_MARK, name);
- lua_remove(L, -2); /* remove path template */
- if (readable(filename)) /* does file exist and is readable? */
- return filename; /* return that file name */
- lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
- lua_remove(L, -2); /* remove file name */
- luaL_addvalue(&msg); /* concatenate error msg. entry */
- }
- luaL_pushresult(&msg); /* create error message */
- return NULL; /* not found */
+ const char *path,
+ const char *sep,
+ const char *dirsep) {
+ luaL_Buffer msg; /* to build error message */
+ luaL_buffinit(L, &msg);
+ if (*sep != '\0') /* non-empty separator? */
+ name = luaL_gsub(L, name, sep, dirsep); /* replace it by 'dirsep' */
+ while ((path = pushnexttemplate(L, path)) != NULL) {
+ const char *filename = luaL_gsub(L, lua_tostring(L, -1),
+ LUA_PATH_MARK, name);
+ lua_remove(L, -2); /* remove path template */
+ if (readable(filename)) /* does file exist and is readable? */
+ return filename; /* return that file name */
+ lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
+ lua_remove(L, -2); /* remove file name */
+ luaL_addvalue(&msg); /* concatenate error msg. entry */
+ }
+ luaL_pushresult(&msg); /* create error message */
+ return NULL; /* not found */
}
static int ll_searchpath (lua_State *L) {
- const char *f = searchpath(L, luaL_checkstring(L, 1),
- luaL_checkstring(L, 2),
- luaL_optstring(L, 3, "."),
- luaL_optstring(L, 4, LUA_DIRSEP));
- if (f != NULL) return 1;
- else { /* error message is on top of the stack */
- lua_pushnil(L);
- lua_insert(L, -2);
- return 2; /* return nil + error message */
- }
+ const char *f = searchpath(L, luaL_checkstring(L, 1),
+ luaL_checkstring(L, 2),
+ luaL_optstring(L, 3, "."),
+ luaL_optstring(L, 4, LUA_DIRSEP));
+ if (f != NULL) return 1;
+ else { /* error message is on top of the stack */
+ lua_pushnil(L);
+ lua_insert(L, -2);
+ return 2; /* return nil + error message */
+ }
}
static const char *findfile (lua_State *L, const char *name,
- const char *pname,
- const char *dirsep) {
- const char *path;
- lua_getfield(L, lua_upvalueindex(1), pname);
- path = lua_tostring(L, -1);
- if (path == NULL)
- luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
- return searchpath(L, name, path, ".", dirsep);
+ const char *pname,
+ const char *dirsep) {
+ const char *path;
+ lua_getfield(L, lua_upvalueindex(1), pname);
+ path = lua_tostring(L, -1);
+ if (path == NULL)
+ luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
+ return searchpath(L, name, path, ".", dirsep);
}
static int checkload (lua_State *L, int stat, const char *filename) {
- if (stat) { /* module loaded successfully? */
- lua_pushstring(L, filename); /* will be 2nd argument to module */
- return 2; /* return open function and file name */
- }
- else
- return luaL_error(L, "error loading module " LUA_QS
- " from file " LUA_QS ":\n\t%s",
- lua_tostring(L, 1), filename, lua_tostring(L, -1));
+ if (stat) { /* module loaded successfully? */
+ lua_pushstring(L, filename); /* will be 2nd argument to module */
+ return 2; /* return open function and file name */
+ }
+ else
+ return luaL_error(L, "error loading module " LUA_QS
+ " from file " LUA_QS ":\n\t%s",
+ lua_tostring(L, 1), filename, lua_tostring(L, -1));
}
static int searcher_Lua (lua_State *L) {
- const char *filename;
- const char *name = luaL_checkstring(L, 1);
- filename = findfile(L, name, "path", LUA_LSUBSEP);
- if (filename == NULL) return 1; /* module not found in this path */
- return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
+ const char *filename;
+ const char *name = luaL_checkstring(L, 1);
+ filename = findfile(L, name, "path", LUA_LSUBSEP);
+ if (filename == NULL) return 1; /* module not found in this path */
+ return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
}
static int loadfunc (lua_State *L, const char *filename, const char *modname) {
- const char *funcname;
- const char *mark;
- modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
- mark = strchr(modname, *LUA_IGMARK);
- if (mark) {
- int stat;
- funcname = lua_pushlstring(L, modname, mark - modname);
- funcname = lua_pushfstring(L, LUA_POF"%s", funcname);
- stat = ll_loadfunc(L, filename, funcname);
- if (stat != ERRFUNC) return stat;
- modname = mark + 1; /* else go ahead and try old-style name */
- }
- funcname = lua_pushfstring(L, LUA_POF"%s", modname);
- return ll_loadfunc(L, filename, funcname);
+ const char *funcname;
+ const char *mark;
+ modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
+ mark = strchr(modname, *LUA_IGMARK);
+ if (mark) {
+ int stat;
+ funcname = lua_pushlstring(L, modname, mark - modname);
+ funcname = lua_pushfstring(L, LUA_POF"%s", funcname);
+ stat = ll_loadfunc(L, filename, funcname);
+ if (stat != ERRFUNC) return stat;
+ modname = mark + 1; /* else go ahead and try old-style name */
+ }
+ funcname = lua_pushfstring(L, LUA_POF"%s", modname);
+ return ll_loadfunc(L, filename, funcname);
}
static int searcher_C (lua_State *L) {
- const char *name = luaL_checkstring(L, 1);
- const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
- if (filename == NULL) return 1; /* module not found in this path */
- return checkload(L, (loadfunc(L, filename, name) == 0), filename);
+ const char *name = luaL_checkstring(L, 1);
+ const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
+ if (filename == NULL) return 1; /* module not found in this path */
+ return checkload(L, (loadfunc(L, filename, name) == 0), filename);
}
static int searcher_Croot (lua_State *L) {
- const char *filename;
- const char *name = luaL_checkstring(L, 1);
- const char *p = strchr(name, '.');
- int stat;
- if (p == NULL) return 0; /* is root */
- lua_pushlstring(L, name, p - name);
- filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
- if (filename == NULL) return 1; /* root not found */
- if ((stat = loadfunc(L, filename, name)) != 0) {
- if (stat != ERRFUNC)
- return checkload(L, 0, filename); /* real error */
- else { /* open function not found */
- lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
- name, filename);
- return 1;
- }
- }
- lua_pushstring(L, filename); /* will be 2nd argument to module */
- return 2;
+ const char *filename;
+ const char *name = luaL_checkstring(L, 1);
+ const char *p = strchr(name, '.');
+ int stat;
+ if (p == NULL) return 0; /* is root */
+ lua_pushlstring(L, name, p - name);
+ filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
+ if (filename == NULL) return 1; /* root not found */
+ if ((stat = loadfunc(L, filename, name)) != 0) {
+ if (stat != ERRFUNC)
+ return checkload(L, 0, filename); /* real error */
+ else { /* open function not found */
+ lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
+ name, filename);
+ return 1;
+ }
+ }
+ lua_pushstring(L, filename); /* will be 2nd argument to module */
+ return 2;
}
static int searcher_preload (lua_State *L) {
- const char *name = luaL_checkstring(L, 1);
- lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD");
- lua_getfield(L, -1, name);
- if (lua_isnil(L, -1)) /* not found? */
- lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
- return 1;
+ const char *name = luaL_checkstring(L, 1);
+ lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD");
+ lua_getfield(L, -1, name);
+ if (lua_isnil(L, -1)) /* not found? */
+ lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
+ return 1;
}
static void findloader (lua_State *L, const char *name) {
- int i;
- luaL_Buffer msg; /* to build error message */
- luaL_buffinit(L, &msg);
- lua_getfield(L, lua_upvalueindex(1), "searchers"); /* will be at index 3 */
- if (!lua_istable(L, 3))
- luaL_error(L, LUA_QL("package.searchers") " must be a table");
- /* iterate over available searchers to find a loader */
- for (i = 1; ; i++) {
- lua_rawgeti(L, 3, i); /* get a searcher */
- if (lua_isnil(L, -1)) { /* no more searchers? */
- lua_pop(L, 1); /* remove nil */
- luaL_pushresult(&msg); /* create error message */
- luaL_error(L, "module " LUA_QS " not found:%s",
- name, lua_tostring(L, -1));
- }
- lua_pushstring(L, name);
- lua_call(L, 1, 2); /* call it */
- if (lua_isfunction(L, -2)) /* did it find a loader? */
- return; /* module loader found */
- else if (lua_isstring(L, -2)) { /* searcher returned error message? */
- lua_pop(L, 1); /* remove extra return */
- luaL_addvalue(&msg); /* concatenate error message */
- }
- else
- lua_pop(L, 2); /* remove both returns */
- }
+ int i;
+ luaL_Buffer msg; /* to build error message */
+ luaL_buffinit(L, &msg);
+ lua_getfield(L, lua_upvalueindex(1), "searchers"); /* will be at index 3 */
+ if (!lua_istable(L, 3))
+ luaL_error(L, LUA_QL("package.searchers") " must be a table");
+ /* iterate over available searchers to find a loader */
+ for (i = 1; ; i++) {
+ lua_rawgeti(L, 3, i); /* get a searcher */
+ if (lua_isnil(L, -1)) { /* no more searchers? */
+ lua_pop(L, 1); /* remove nil */
+ luaL_pushresult(&msg); /* create error message */
+ luaL_error(L, "module " LUA_QS " not found:%s",
+ name, lua_tostring(L, -1));
+ }
+ lua_pushstring(L, name);
+ lua_call(L, 1, 2); /* call it */
+ if (lua_isfunction(L, -2)) /* did it find a loader? */
+ return; /* module loader found */
+ else if (lua_isstring(L, -2)) { /* searcher returned error message? */
+ lua_pop(L, 1); /* remove extra return */
+ luaL_addvalue(&msg); /* concatenate error message */
+ }
+ else
+ lua_pop(L, 2); /* remove both returns */
+ }
}
static int ll_require (lua_State *L) {
- const char *name = luaL_checkstring(L, 1);
- lua_settop(L, 1); /* _LOADED table will be at index 2 */
- lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
- lua_getfield(L, 2, name); /* _LOADED[name] */
- if (lua_toboolean(L, -1)) /* is it there? */
- return 1; /* package is already loaded */
- /* else must load package */
- lua_pop(L, 1); /* remove 'getfield' result */
- findloader(L, name);
- lua_pushstring(L, name); /* pass name as argument to module loader */
- lua_insert(L, -2); /* name is 1st argument (before search data) */
- lua_call(L, 2, 1); /* run loader to load module */
- if (!lua_isnil(L, -1)) /* non-nil return? */
- lua_setfield(L, 2, name); /* _LOADED[name] = returned value */
- lua_getfield(L, 2, name);
- if (lua_isnil(L, -1)) { /* module did not set a value? */
- lua_pushboolean(L, 1); /* use true as result */
- lua_pushvalue(L, -1); /* extra copy to be returned */
- lua_setfield(L, 2, name); /* _LOADED[name] = true */
- }
- return 1;
+ const char *name = luaL_checkstring(L, 1);
+ lua_settop(L, 1); /* _LOADED table will be at index 2 */
+ lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
+ lua_getfield(L, 2, name); /* _LOADED[name] */
+ if (lua_toboolean(L, -1)) /* is it there? */
+ return 1; /* package is already loaded */
+ /* else must load package */
+ lua_pop(L, 1); /* remove 'getfield' result */
+ findloader(L, name);
+ lua_pushstring(L, name); /* pass name as argument to module loader */
+ lua_insert(L, -2); /* name is 1st argument (before search data) */
+ lua_call(L, 2, 1); /* run loader to load module */
+ if (!lua_isnil(L, -1)) /* non-nil return? */
+ lua_setfield(L, 2, name); /* _LOADED[name] = returned value */
+ lua_getfield(L, 2, name);
+ if (lua_isnil(L, -1)) { /* module did not set a value? */
+ lua_pushboolean(L, 1); /* use true as result */
+ lua_pushvalue(L, -1); /* extra copy to be returned */
+ lua_setfield(L, 2, name); /* _LOADED[name] = true */
+ }
+ return 1;
}
/* }====================================================== */
@@ -544,73 +544,73 @@ static int ll_require (lua_State *L) {
** changes the environment variable of calling function
*/
static void set_env (lua_State *L) {
- lua_Debug ar;
- if (lua_getstack(L, 1, &ar) == 0 ||
- lua_getinfo(L, "f", &ar) == 0 || /* get calling function */
- lua_iscfunction(L, -1))
- luaL_error(L, LUA_QL("module") " not called from a Lua function");
- lua_pushvalue(L, -2); /* copy new environment table to top */
- lua_setupvalue(L, -2, 1);
- lua_pop(L, 1); /* remove function */
+ lua_Debug ar;
+ if (lua_getstack(L, 1, &ar) == 0 ||
+ lua_getinfo(L, "f", &ar) == 0 || /* get calling function */
+ lua_iscfunction(L, -1))
+ luaL_error(L, LUA_QL("module") " not called from a Lua function");
+ lua_pushvalue(L, -2); /* copy new environment table to top */
+ lua_setupvalue(L, -2, 1);
+ lua_pop(L, 1); /* remove function */
}
static void dooptions (lua_State *L, int n) {
- int i;
- for (i = 2; i <= n; i++) {
- if (lua_isfunction(L, i)) { /* avoid 'calling' extra info. */
- lua_pushvalue(L, i); /* get option (a function) */
- lua_pushvalue(L, -2); /* module */
- lua_call(L, 1, 0);
- }
- }
+ int i;
+ for (i = 2; i <= n; i++) {
+ if (lua_isfunction(L, i)) { /* avoid 'calling' extra info. */
+ lua_pushvalue(L, i); /* get option (a function) */
+ lua_pushvalue(L, -2); /* module */
+ lua_call(L, 1, 0);
+ }
+ }
}
static void modinit (lua_State *L, const char *modname) {
- const char *dot;
- lua_pushvalue(L, -1);
- lua_setfield(L, -2, "_M"); /* module._M = module */
- lua_pushstring(L, modname);
- lua_setfield(L, -2, "_NAME");
- dot = strrchr(modname, '.'); /* look for last dot in module name */
- if (dot == NULL) dot = modname;
- else dot++;
- /* set _PACKAGE as package name (full module name minus last part) */
- lua_pushlstring(L, modname, dot - modname);
- lua_setfield(L, -2, "_PACKAGE");
+ const char *dot;
+ lua_pushvalue(L, -1);
+ lua_setfield(L, -2, "_M"); /* module._M = module */
+ lua_pushstring(L, modname);
+ lua_setfield(L, -2, "_NAME");
+ dot = strrchr(modname, '.'); /* look for last dot in module name */
+ if (dot == NULL) dot = modname;
+ else dot++;
+ /* set _PACKAGE as package name (full module name minus last part) */
+ lua_pushlstring(L, modname, dot - modname);
+ lua_setfield(L, -2, "_PACKAGE");
}
static int ll_module (lua_State *L) {
- const char *modname = luaL_checkstring(L, 1);
- int lastarg = lua_gettop(L); /* last parameter */
- luaL_pushmodule(L, modname, 1); /* get/create module table */
- /* check whether table already has a _NAME field */
- lua_getfield(L, -1, "_NAME");
- if (!lua_isnil(L, -1)) /* is table an initialized module? */
- lua_pop(L, 1);
- else { /* no; initialize it */
- lua_pop(L, 1);
- modinit(L, modname);
- }
- lua_pushvalue(L, -1);
- set_env(L);
- dooptions(L, lastarg);
- return 1;
+ const char *modname = luaL_checkstring(L, 1);
+ int lastarg = lua_gettop(L); /* last parameter */
+ luaL_pushmodule(L, modname, 1); /* get/create module table */
+ /* check whether table already has a _NAME field */
+ lua_getfield(L, -1, "_NAME");
+ if (!lua_isnil(L, -1)) /* is table an initialized module? */
+ lua_pop(L, 1);
+ else { /* no; initialize it */
+ lua_pop(L, 1);
+ modinit(L, modname);
+ }
+ lua_pushvalue(L, -1);
+ set_env(L);
+ dooptions(L, lastarg);
+ return 1;
}
static int ll_seeall (lua_State *L) {
- luaL_checktype(L, 1, LUA_TTABLE);
- if (!lua_getmetatable(L, 1)) {
- lua_createtable(L, 0, 1); /* create new metatable */
- lua_pushvalue(L, -1);
- lua_setmetatable(L, 1);
- }
- lua_pushglobaltable(L);
- lua_setfield(L, -2, "__index"); /* mt.__index = _G */
- return 0;
+ luaL_checktype(L, 1, LUA_TTABLE);
+ if (!lua_getmetatable(L, 1)) {
+ lua_createtable(L, 0, 1); /* create new metatable */
+ lua_pushvalue(L, -1);
+ lua_setmetatable(L, 1);
+ }
+ lua_pushglobaltable(L);
+ lua_setfield(L, -2, "__index"); /* mt.__index = _G */
+ return 0;
}
#endif
@@ -619,107 +619,106 @@ static int ll_seeall (lua_State *L) {
/* auxiliary mark (for internal use) */
-#define AUXMARK "\1"
+#define AUXMARK "\1"
/*
** return registry.LUA_NOENV as a boolean
*/
static int noenv (lua_State *L) {
- int b;
- lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
- b = lua_toboolean(L, -1);
- lua_pop(L, 1); /* remove value */
- return b;
+ int b;
+ lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+ b = lua_toboolean(L, -1);
+ lua_pop(L, 1); /* remove value */
+ return b;
}
static void setpath (lua_State *L, const char *fieldname, const char *envname1,
- const char *envname2, const char *def) {
- const char *path = getenv(envname1);
- if (path == NULL) /* no environment variable? */
- path = getenv(envname2); /* try alternative name */
- if (path == NULL || noenv(L)) /* no environment variable? */
- lua_pushstring(L, def); /* use default */
- else {
- /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */
- path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
- LUA_PATH_SEP AUXMARK LUA_PATH_SEP);
- luaL_gsub(L, path, AUXMARK, def);
- lua_remove(L, -2);
- }
- setprogdir(L);
- lua_setfield(L, -2, fieldname);
+ const char *envname2, const char *def) {
+ const char *path = getenv(envname1);
+ if (path == NULL) /* no environment variable? */
+ path = getenv(envname2); /* try alternative name */
+ if (path == NULL || noenv(L)) /* no environment variable? */
+ lua_pushstring(L, def); /* use default */
+ else {
+ /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */
+ path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
+ LUA_PATH_SEP AUXMARK LUA_PATH_SEP);
+ luaL_gsub(L, path, AUXMARK, def);
+ lua_remove(L, -2);
+ }
+ setprogdir(L);
+ lua_setfield(L, -2, fieldname);
}
static const luaL_Reg pk_funcs[] = {
- {"loadlib", ll_loadlib},
- {"searchpath", ll_searchpath},
+ {"loadlib", ll_loadlib},
+ {"searchpath", ll_searchpath},
#if defined(LUA_COMPAT_MODULE)
- {"seeall", ll_seeall},
+ {"seeall", ll_seeall},
#endif
- {NULL, NULL}
+ {NULL, NULL}
};
static const luaL_Reg ll_funcs[] = {
#if defined(LUA_COMPAT_MODULE)
- {"module", ll_module},
+ {"module", ll_module},
#endif
- {"require", ll_require},
- {NULL, NULL}
+ {"require", ll_require},
+ {NULL, NULL}
};
static void createsearcherstable (lua_State *L) {
- static const lua_CFunction searchers[] =
- {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
- int i;
- /* create 'searchers' table */
- lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
- /* fill it with pre-defined searchers */
- for (i=0; searchers[i] != NULL; i++) {
- lua_pushvalue(L, -2); /* set 'package' as upvalue for all searchers */
- lua_pushcclosure(L, searchers[i], 1);
- lua_rawseti(L, -2, i+1);
- }
+ static const lua_CFunction searchers[] =
+ {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
+ int i;
+ /* create 'searchers' table */
+ lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
+ /* fill it with pre-defined searchers */
+ for (i=0; searchers[i] != NULL; i++) {
+ lua_pushvalue(L, -2); /* set 'package' as upvalue for all searchers */
+ lua_pushcclosure(L, searchers[i], 1);
+ lua_rawseti(L, -2, i+1);
+ }
}
LUAMOD_API int luaopen_package (lua_State *L) {
- /* create table CLIBS to keep track of loaded C libraries */
- luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);
- lua_createtable(L, 0, 1); /* metatable for CLIBS */
- lua_pushcfunction(L, gctm);
- lua_setfield(L, -2, "__gc"); /* set finalizer for CLIBS table */
- lua_setmetatable(L, -2);
- /* create `package' table */
- luaL_newlib(L, pk_funcs);
- createsearcherstable(L);
+ /* create table CLIBS to keep track of loaded C libraries */
+ luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);
+ lua_createtable(L, 0, 1); /* metatable for CLIBS */
+ lua_pushcfunction(L, gctm);
+ lua_setfield(L, -2, "__gc"); /* set finalizer for CLIBS table */
+ lua_setmetatable(L, -2);
+ /* create `package' table */
+ luaL_newlib(L, pk_funcs);
+ createsearcherstable(L);
#if defined(LUA_COMPAT_LOADERS)
- lua_pushvalue(L, -1); /* make a copy of 'searchers' table */
- lua_setfield(L, -3, "loaders"); /* put it in field `loaders' */
+ lua_pushvalue(L, -1); /* make a copy of 'searchers' table */
+ lua_setfield(L, -3, "loaders"); /* put it in field `loaders' */
#endif
- lua_setfield(L, -2, "searchers"); /* put it in field 'searchers' */
- /* set field 'path' */
- setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT);
- /* set field 'cpath' */
- setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT);
- /* store config information */
- lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
- LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
- lua_setfield(L, -2, "config");
- /* set field `loaded' */
- luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
- lua_setfield(L, -2, "loaded");
- /* set field `preload' */
- luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
- lua_setfield(L, -2, "preload");
- lua_pushglobaltable(L);
- lua_pushvalue(L, -2); /* set 'package' as upvalue for next lib */
- luaL_setfuncs(L, ll_funcs, 1); /* open lib into global table */
- lua_pop(L, 1); /* pop global table */
- return 1; /* return 'package' table */
+ lua_setfield(L, -2, "searchers"); /* put it in field 'searchers' */
+ /* set field 'path' */
+ setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT);
+ /* set field 'cpath' */
+ setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT);
+ /* store config information */
+ lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
+ LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
+ lua_setfield(L, -2, "config");
+ /* set field `loaded' */
+ luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+ lua_setfield(L, -2, "loaded");
+ /* set field `preload' */
+ luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+ lua_setfield(L, -2, "preload");
+ lua_pushglobaltable(L);
+ lua_pushvalue(L, -2); /* set 'package' as upvalue for next lib */
+ luaL_setfuncs(L, ll_funcs, 1); /* open lib into global table */
+ lua_pop(L, 1); /* pop global table */
+ return 1; /* return 'package' table */
}
-
diff --git a/src/lib/lua/lobject.c b/src/lib/lua/lobject.c
index 5def409f05d..0ce4f536294 100644
--- a/src/lib/lua/lobject.c
+++ b/src/lib/lua/lobject.c
@@ -34,59 +34,59 @@ LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
** eeeee != 0 and (xxx) otherwise.
*/
int luaO_int2fb (unsigned int x) {
- int e = 0; /* exponent */
- if (x < 8) return x;
- while (x >= 0x10) {
- x = (x+1) >> 1;
- e++;
- }
- return ((e+1) << 3) | (cast_int(x) - 8);
+ int e = 0; /* exponent */
+ if (x < 8) return x;
+ while (x >= 0x10) {
+ x = (x+1) >> 1;
+ e++;
+ }
+ return ((e+1) << 3) | (cast_int(x) - 8);
}
/* converts back */
int luaO_fb2int (int x) {
- int e = (x >> 3) & 0x1f;
- if (e == 0) return x;
- else return ((x & 7) + 8) << (e - 1);
+ int e = (x >> 3) & 0x1f;
+ if (e == 0) return x;
+ else return ((x & 7) + 8) << (e - 1);
}
int luaO_ceillog2 (unsigned int x) {
- static const lu_byte log_2[256] = {
- 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
- 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
- 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
- 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
- 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
- };
- int l = 0;
- x--;
- while (x >= 256) { l += 8; x >>= 8; }
- return l + log_2[x];
+ static const lu_byte log_2[256] = {
+ 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+ 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
+ };
+ int l = 0;
+ x--;
+ while (x >= 256) { l += 8; x >>= 8; }
+ return l + log_2[x];
}
lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2) {
- switch (op) {
- case LUA_OPADD: return luai_numadd(NULL, v1, v2);
- case LUA_OPSUB: return luai_numsub(NULL, v1, v2);
- case LUA_OPMUL: return luai_nummul(NULL, v1, v2);
- case LUA_OPDIV: return luai_numdiv(NULL, v1, v2);
- case LUA_OPMOD: return luai_nummod(NULL, v1, v2);
- case LUA_OPPOW: return luai_numpow(NULL, v1, v2);
- case LUA_OPUNM: return luai_numunm(NULL, v1);
- default: lua_assert(0); return 0;
- }
+ switch (op) {
+ case LUA_OPADD: return luai_numadd(NULL, v1, v2);
+ case LUA_OPSUB: return luai_numsub(NULL, v1, v2);
+ case LUA_OPMUL: return luai_nummul(NULL, v1, v2);
+ case LUA_OPDIV: return luai_numdiv(NULL, v1, v2);
+ case LUA_OPMOD: return luai_nummod(NULL, v1, v2);
+ case LUA_OPPOW: return luai_numpow(NULL, v1, v2);
+ case LUA_OPUNM: return luai_numunm(NULL, v1);
+ default: lua_assert(0); return 0;
+ }
}
int luaO_hexavalue (int c) {
- if (lisdigit(c)) return c - '0';
- else return ltolower(c) - 'a' + 10;
+ if (lisdigit(c)) return c - '0';
+ else return ltolower(c) - 'a' + 10;
}
@@ -96,18 +96,18 @@ int luaO_hexavalue (int c) {
static int isneg (const char **s) {
- if (**s == '-') { (*s)++; return 1; }
- else if (**s == '+') (*s)++;
- return 0;
+ if (**s == '-') { (*s)++; return 1; }
+ else if (**s == '+') (*s)++;
+ return 0;
}
static lua_Number readhexa (const char **s, lua_Number r, int *count) {
- for (; lisxdigit(cast_uchar(**s)); (*s)++) { /* read integer part */
- r = (r * cast_num(16.0)) + cast_num(1.0*luaO_hexavalue(cast_uchar(**s)));
- (*count)++;
- }
- return r;
+ for (; lisxdigit(cast_uchar(**s)); (*s)++) { /* read integer part */
+ r = (r * cast_num(16.0)) + cast_num(1.0*luaO_hexavalue(cast_uchar(**s)));
+ (*count)++;
+ }
+ return r;
}
@@ -116,172 +116,171 @@ static lua_Number readhexa (const char **s, lua_Number r, int *count) {
** C99 specification for 'strtod'
*/
static lua_Number lua_strx2number (const char *s, char **endptr) {
- lua_Number r = 0.0;
- int e = 0, i = 0;
- int neg = 0; /* 1 if number is negative */
- *endptr = cast(char *, s); /* nothing is valid yet */
- while (lisspace(cast_uchar(*s))) s++; /* skip initial spaces */
- neg = isneg(&s); /* check signal */
- if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))) /* check '0x' */
- return 0.0; /* invalid format (no '0x') */
- s += 2; /* skip '0x' */
- r = readhexa(&s, r, &i); /* read integer part */
- if (*s == '.') {
- s++; /* skip dot */
- r = readhexa(&s, r, &e); /* read fractional part */
- }
- if (i == 0 && e == 0)
- return 0.0; /* invalid format (no digit) */
- e *= -4; /* each fractional digit divides value by 2^-4 */
- *endptr = cast(char *, s); /* valid up to here */
- if (*s == 'p' || *s == 'P') { /* exponent part? */
- int exp1 = 0;
- int neg1;
- s++; /* skip 'p' */
- neg1 = isneg(&s); /* signal */
- if (!lisdigit(cast_uchar(*s)))
- goto ret; /* must have at least one digit */
- while (lisdigit(cast_uchar(*s))) /* read exponent */
- exp1 = exp1 * 10 + *(s++) - '0';
- if (neg1) exp1 = -exp1;
- e += exp1;
- }
- *endptr = cast(char *, s); /* valid up to here */
- ret:
- if (neg) r = -r;
- return l_mathop(ldexp)(r, e);
+ lua_Number r = 0.0;
+ int e = 0, i = 0;
+ int neg = 0; /* 1 if number is negative */
+ *endptr = cast(char *, s); /* nothing is valid yet */
+ while (lisspace(cast_uchar(*s))) s++; /* skip initial spaces */
+ neg = isneg(&s); /* check signal */
+ if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))) /* check '0x' */
+ return 0.0; /* invalid format (no '0x') */
+ s += 2; /* skip '0x' */
+ r = readhexa(&s, r, &i); /* read integer part */
+ if (*s == '.') {
+ s++; /* skip dot */
+ r = readhexa(&s, r, &e); /* read fractional part */
+ }
+ if (i == 0 && e == 0)
+ return 0.0; /* invalid format (no digit) */
+ e *= -4; /* each fractional digit divides value by 2^-4 */
+ *endptr = cast(char *, s); /* valid up to here */
+ if (*s == 'p' || *s == 'P') { /* exponent part? */
+ int exp1 = 0;
+ int neg1;
+ s++; /* skip 'p' */
+ neg1 = isneg(&s); /* signal */
+ if (!lisdigit(cast_uchar(*s)))
+ goto ret; /* must have at least one digit */
+ while (lisdigit(cast_uchar(*s))) /* read exponent */
+ exp1 = exp1 * 10 + *(s++) - '0';
+ if (neg1) exp1 = -exp1;
+ e += exp1;
+ }
+ *endptr = cast(char *, s); /* valid up to here */
+ ret:
+ if (neg) r = -r;
+ return l_mathop(ldexp)(r, e);
}
#endif
int luaO_str2d (const char *s, size_t len, lua_Number *result) {
- char *endptr;
- if (strpbrk(s, "nN")) /* reject 'inf' and 'nan' */
- return 0;
- else if (strpbrk(s, "xX")) /* hexa? */
- *result = lua_strx2number(s, &endptr);
- else
- *result = lua_str2number(s, &endptr);
- if (endptr == s) return 0; /* nothing recognized */
- while (lisspace(cast_uchar(*endptr))) endptr++;
- return (endptr == s + len); /* OK if no trailing characters */
+ char *endptr;
+ if (strpbrk(s, "nN")) /* reject 'inf' and 'nan' */
+ return 0;
+ else if (strpbrk(s, "xX")) /* hexa? */
+ *result = lua_strx2number(s, &endptr);
+ else
+ *result = lua_str2number(s, &endptr);
+ if (endptr == s) return 0; /* nothing recognized */
+ while (lisspace(cast_uchar(*endptr))) endptr++;
+ return (endptr == s + len); /* OK if no trailing characters */
}
static void pushstr (lua_State *L, const char *str, size_t l) {
- setsvalue2s(L, L->top++, luaS_newlstr(L, str, l));
+ setsvalue2s(L, L->top++, luaS_newlstr(L, str, l));
}
/* this function handles only `%d', `%c', %f, %p, and `%s' formats */
const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
- int n = 0;
- for (;;) {
- const char *e = strchr(fmt, '%');
- if (e == NULL) break;
- luaD_checkstack(L, 2); /* fmt + item */
- pushstr(L, fmt, e - fmt);
- switch (*(e+1)) {
- case 's': {
- const char *s = va_arg(argp, char *);
- if (s == NULL) s = "(null)";
- pushstr(L, s, strlen(s));
- break;
- }
- case 'c': {
- char buff;
- buff = cast(char, va_arg(argp, int));
- pushstr(L, &buff, 1);
- break;
- }
- case 'd': {
- setnvalue(L->top++, cast_num(va_arg(argp, int)));
- break;
- }
- case 'f': {
- setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber)));
- break;
- }
- case 'p': {
- char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
- int l = sprintf(buff, "%p", va_arg(argp, void *));
- pushstr(L, buff, l);
- break;
- }
- case '%': {
- pushstr(L, "%", 1);
- break;
- }
- default: {
- luaG_runerror(L,
- "invalid option " LUA_QL("%%%c") " to " LUA_QL("lua_pushfstring"),
- *(e + 1));
- }
- }
- n += 2;
- fmt = e+2;
- }
- luaD_checkstack(L, 1);
- pushstr(L, fmt, strlen(fmt));
- if (n > 0) luaV_concat(L, n + 1);
- return svalue(L->top - 1);
+ int n = 0;
+ for (;;) {
+ const char *e = strchr(fmt, '%');
+ if (e == NULL) break;
+ luaD_checkstack(L, 2); /* fmt + item */
+ pushstr(L, fmt, e - fmt);
+ switch (*(e+1)) {
+ case 's': {
+ const char *s = va_arg(argp, char *);
+ if (s == NULL) s = "(null)";
+ pushstr(L, s, strlen(s));
+ break;
+ }
+ case 'c': {
+ char buff;
+ buff = cast(char, va_arg(argp, int));
+ pushstr(L, &buff, 1);
+ break;
+ }
+ case 'd': {
+ setnvalue(L->top++, cast_num(va_arg(argp, int)));
+ break;
+ }
+ case 'f': {
+ setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber)));
+ break;
+ }
+ case 'p': {
+ char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
+ int l = sprintf(buff, "%p", va_arg(argp, void *));
+ pushstr(L, buff, l);
+ break;
+ }
+ case '%': {
+ pushstr(L, "%", 1);
+ break;
+ }
+ default: {
+ luaG_runerror(L,
+ "invalid option " LUA_QL("%%%c") " to " LUA_QL("lua_pushfstring"),
+ *(e + 1));
+ }
+ }
+ n += 2;
+ fmt = e+2;
+ }
+ luaD_checkstack(L, 1);
+ pushstr(L, fmt, strlen(fmt));
+ if (n > 0) luaV_concat(L, n + 1);
+ return svalue(L->top - 1);
}
const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
- const char *msg;
- va_list argp;
- va_start(argp, fmt);
- msg = luaO_pushvfstring(L, fmt, argp);
- va_end(argp);
- return msg;
+ const char *msg;
+ va_list argp;
+ va_start(argp, fmt);
+ msg = luaO_pushvfstring(L, fmt, argp);
+ va_end(argp);
+ return msg;
}
/* number of chars of a literal string without the ending \0 */
-#define LL(x) (sizeof(x)/sizeof(char) - 1)
+#define LL(x) (sizeof(x)/sizeof(char) - 1)
-#define RETS "..."
-#define PRE "[string \""
-#define POS "\"]"
+#define RETS "..."
+#define PRE "[string \""
+#define POS "\"]"
-#define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) )
+#define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) )
void luaO_chunkid (char *out, const char *source, size_t bufflen) {
- size_t l = strlen(source);
- if (*source == '=') { /* 'literal' source */
- if (l <= bufflen) /* small enough? */
- memcpy(out, source + 1, l * sizeof(char));
- else { /* truncate it */
- addstr(out, source + 1, bufflen - 1);
- *out = '\0';
- }
- }
- else if (*source == '@') { /* file name */
- if (l <= bufflen) /* small enough? */
- memcpy(out, source + 1, l * sizeof(char));
- else { /* add '...' before rest of name */
- addstr(out, RETS, LL(RETS));
- bufflen -= LL(RETS);
- memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char));
- }
- }
- else { /* string; format as [string "source"] */
- const char *nl = strchr(source, '\n'); /* find first new line (if any) */
- addstr(out, PRE, LL(PRE)); /* add prefix */
- bufflen -= LL(PRE RETS POS) + 1; /* save space for prefix+suffix+'\0' */
- if (l < bufflen && nl == NULL) { /* small one-line source? */
- addstr(out, source, l); /* keep it */
- }
- else {
- if (nl != NULL) l = nl - source; /* stop at first newline */
- if (l > bufflen) l = bufflen;
- addstr(out, source, l);
- addstr(out, RETS, LL(RETS));
- }
- memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
- }
+ size_t l = strlen(source);
+ if (*source == '=') { /* 'literal' source */
+ if (l <= bufflen) /* small enough? */
+ memcpy(out, source + 1, l * sizeof(char));
+ else { /* truncate it */
+ addstr(out, source + 1, bufflen - 1);
+ *out = '\0';
+ }
+ }
+ else if (*source == '@') { /* file name */
+ if (l <= bufflen) /* small enough? */
+ memcpy(out, source + 1, l * sizeof(char));
+ else { /* add '...' before rest of name */
+ addstr(out, RETS, LL(RETS));
+ bufflen -= LL(RETS);
+ memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char));
+ }
+ }
+ else { /* string; format as [string "source"] */
+ const char *nl = strchr(source, '\n'); /* find first new line (if any) */
+ addstr(out, PRE, LL(PRE)); /* add prefix */
+ bufflen -= LL(PRE RETS POS) + 1; /* save space for prefix+suffix+'\0' */
+ if (l < bufflen && nl == NULL) { /* small one-line source? */
+ addstr(out, source, l); /* keep it */
+ }
+ else {
+ if (nl != NULL) l = nl - source; /* stop at first newline */
+ if (l > bufflen) l = bufflen;
+ addstr(out, source, l);
+ addstr(out, RETS, LL(RETS));
+ }
+ memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
+ }
}
-
diff --git a/src/lib/lua/lopcodes.c b/src/lib/lua/lopcodes.c
index 4190dc76242..5750316ff24 100644
--- a/src/lib/lua/lopcodes.c
+++ b/src/lib/lua/lopcodes.c
@@ -15,93 +15,92 @@
/* ORDER OP */
LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
- "MOVE",
- "LOADK",
- "LOADKX",
- "LOADBOOL",
- "LOADNIL",
- "GETUPVAL",
- "GETTABUP",
- "GETTABLE",
- "SETTABUP",
- "SETUPVAL",
- "SETTABLE",
- "NEWTABLE",
- "SELF",
- "ADD",
- "SUB",
- "MUL",
- "DIV",
- "MOD",
- "POW",
- "UNM",
- "NOT",
- "LEN",
- "CONCAT",
- "JMP",
- "EQ",
- "LT",
- "LE",
- "TEST",
- "TESTSET",
- "CALL",
- "TAILCALL",
- "RETURN",
- "FORLOOP",
- "FORPREP",
- "TFORCALL",
- "TFORLOOP",
- "SETLIST",
- "CLOSURE",
- "VARARG",
- "EXTRAARG",
- NULL
+ "MOVE",
+ "LOADK",
+ "LOADKX",
+ "LOADBOOL",
+ "LOADNIL",
+ "GETUPVAL",
+ "GETTABUP",
+ "GETTABLE",
+ "SETTABUP",
+ "SETUPVAL",
+ "SETTABLE",
+ "NEWTABLE",
+ "SELF",
+ "ADD",
+ "SUB",
+ "MUL",
+ "DIV",
+ "MOD",
+ "POW",
+ "UNM",
+ "NOT",
+ "LEN",
+ "CONCAT",
+ "JMP",
+ "EQ",
+ "LT",
+ "LE",
+ "TEST",
+ "TESTSET",
+ "CALL",
+ "TAILCALL",
+ "RETURN",
+ "FORLOOP",
+ "FORPREP",
+ "TFORCALL",
+ "TFORLOOP",
+ "SETLIST",
+ "CLOSURE",
+ "VARARG",
+ "EXTRAARG",
+ NULL
};
#define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m))
LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
-/* T A B C mode opcode */
- opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */
- ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */
- ,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */
- ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */
- ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_LOADNIL */
- ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_GETUPVAL */
- ,opmode(0, 1, OpArgU, OpArgK, iABC) /* OP_GETTABUP */
- ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_GETTABLE */
- ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABUP */
- ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_SETUPVAL */
- ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABLE */
- ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_NEWTABLE */
- ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_SELF */
- ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_ADD */
- ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_SUB */
- ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MUL */
- ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_DIV */
- ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MOD */
- ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_POW */
- ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_UNM */
- ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_NOT */
- ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_LEN */
- ,opmode(0, 1, OpArgR, OpArgR, iABC) /* OP_CONCAT */
- ,opmode(0, 0, OpArgR, OpArgN, iAsBx) /* OP_JMP */
- ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */
- ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LT */
- ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LE */
- ,opmode(1, 0, OpArgN, OpArgU, iABC) /* OP_TEST */
- ,opmode(1, 1, OpArgR, OpArgU, iABC) /* OP_TESTSET */
- ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_CALL */
- ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_TAILCALL */
- ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_RETURN */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORLOOP */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORPREP */
- ,opmode(0, 0, OpArgN, OpArgU, iABC) /* OP_TFORCALL */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_TFORLOOP */
- ,opmode(0, 0, OpArgU, OpArgU, iABC) /* OP_SETLIST */
- ,opmode(0, 1, OpArgU, OpArgN, iABx) /* OP_CLOSURE */
- ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_VARARG */
- ,opmode(0, 0, OpArgU, OpArgU, iAx) /* OP_EXTRAARG */
+/* T A B C mode opcode */
+ opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */
+ ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */
+ ,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_LOADNIL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_GETUPVAL */
+ ,opmode(0, 1, OpArgU, OpArgK, iABC) /* OP_GETTABUP */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_GETTABLE */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABUP */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_SETUPVAL */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABLE */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_NEWTABLE */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_SELF */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_ADD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_SUB */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MUL */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_DIV */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MOD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_POW */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_UNM */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_NOT */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_LEN */
+ ,opmode(0, 1, OpArgR, OpArgR, iABC) /* OP_CONCAT */
+ ,opmode(0, 0, OpArgR, OpArgN, iAsBx) /* OP_JMP */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LT */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LE */
+ ,opmode(1, 0, OpArgN, OpArgU, iABC) /* OP_TEST */
+ ,opmode(1, 1, OpArgR, OpArgU, iABC) /* OP_TESTSET */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_CALL */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_TAILCALL */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_RETURN */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORLOOP */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORPREP */
+ ,opmode(0, 0, OpArgN, OpArgU, iABC) /* OP_TFORCALL */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_TFORLOOP */
+ ,opmode(0, 0, OpArgU, OpArgU, iABC) /* OP_SETLIST */
+ ,opmode(0, 1, OpArgU, OpArgN, iABx) /* OP_CLOSURE */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_VARARG */
+ ,opmode(0, 0, OpArgU, OpArgU, iAx) /* OP_EXTRAARG */
};
-
diff --git a/src/lib/lua/loslib.c b/src/lib/lua/loslib.c
index 41aeeef81d1..b2f04ea7a9e 100644
--- a/src/lib/lua/loslib.c
+++ b/src/lib/lua/loslib.c
@@ -26,12 +26,12 @@
#if !defined(LUA_STRFTIMEOPTIONS)
#if !defined(LUA_USE_POSIX)
-#define LUA_STRFTIMEOPTIONS { "aAbBcdHIjmMpSUwWxXyYz%", "" }
+#define LUA_STRFTIMEOPTIONS { "aAbBcdHIjmMpSUwWxXyYz%", "" }
#else
#define LUA_STRFTIMEOPTIONS \
{ "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \
- "", "E", "cCxXyY", \
- "O", "deHImMSuUVwWy" }
+ "", "E", "cCxXyY", \
+ "O", "deHImMSuUVwWy" }
#endif
#endif
@@ -44,17 +44,17 @@
*/
#if defined(LUA_USE_MKSTEMP)
#include <unistd.h>
-#define LUA_TMPNAMBUFSIZE 32
+#define LUA_TMPNAMBUFSIZE 32
#define lua_tmpnam(b,e) { \
- strcpy(b, "/tmp/lua_XXXXXX"); \
- e = mkstemp(b); \
- if (e != -1) close(e); \
- e = (e == -1); }
+ strcpy(b, "/tmp/lua_XXXXXX"); \
+ e = mkstemp(b); \
+ if (e != -1) close(e); \
+ e = (e == -1); }
#elif !defined(lua_tmpnam)
-#define LUA_TMPNAMBUFSIZE L_tmpnam
-#define lua_tmpnam(b,e) { e = (tmpnam(b) == NULL); }
+#define LUA_TMPNAMBUFSIZE L_tmpnam
+#define lua_tmpnam(b,e) { e = (tmpnam(b) == NULL); }
#endif
@@ -65,63 +65,63 @@
*/
#if defined(LUA_USE_GMTIME_R)
-#define l_gmtime(t,r) gmtime_r(t,r)
-#define l_localtime(t,r) localtime_r(t,r)
+#define l_gmtime(t,r) gmtime_r(t,r)
+#define l_localtime(t,r) localtime_r(t,r)
#elif !defined(l_gmtime)
-#define l_gmtime(t,r) ((void)r, gmtime(t))
-#define l_localtime(t,r) ((void)r, localtime(t))
+#define l_gmtime(t,r) ((void)r, gmtime(t))
+#define l_localtime(t,r) ((void)r, localtime(t))
#endif
static int os_execute (lua_State *L) {
- const char *cmd = luaL_optstring(L, 1, NULL);
- int stat = system(cmd);
- if (cmd != NULL)
- return luaL_execresult(L, stat);
- else {
- lua_pushboolean(L, stat); /* true if there is a shell */
- return 1;
- }
+ const char *cmd = luaL_optstring(L, 1, NULL);
+ int stat = system(cmd);
+ if (cmd != NULL)
+ return luaL_execresult(L, stat);
+ else {
+ lua_pushboolean(L, stat); /* true if there is a shell */
+ return 1;
+ }
}
static int os_remove (lua_State *L) {
- const char *filename = luaL_checkstring(L, 1);
- return luaL_fileresult(L, remove(filename) == 0, filename);
+ const char *filename = luaL_checkstring(L, 1);
+ return luaL_fileresult(L, remove(filename) == 0, filename);
}
static int os_rename (lua_State *L) {
- const char *fromname = luaL_checkstring(L, 1);
- const char *toname = luaL_checkstring(L, 2);
- return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
+ const char *fromname = luaL_checkstring(L, 1);
+ const char *toname = luaL_checkstring(L, 2);
+ return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
}
static int os_tmpname (lua_State *L) {
- char buff[LUA_TMPNAMBUFSIZE];
- int err;
- lua_tmpnam(buff, err);
- if (err)
- return luaL_error(L, "unable to generate a unique filename");
- lua_pushstring(L, buff);
- return 1;
+ char buff[LUA_TMPNAMBUFSIZE];
+ int err;
+ lua_tmpnam(buff, err);
+ if (err)
+ return luaL_error(L, "unable to generate a unique filename");
+ lua_pushstring(L, buff);
+ return 1;
}
static int os_getenv (lua_State *L) {
- lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */
- return 1;
+ lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */
+ return 1;
}
static int os_clock (lua_State *L) {
- lua_pushnumber(L, ((lua_Number)(1.0*clock()))/(lua_Number)CLOCKS_PER_SEC);
- return 1;
+ lua_pushnumber(L, ((lua_Number)(1.0*clock()))/(lua_Number)CLOCKS_PER_SEC);
+ return 1;
}
@@ -134,182 +134,182 @@ static int os_clock (lua_State *L) {
*/
static void setfield (lua_State *L, const char *key, int value) {
- lua_pushinteger(L, value);
- lua_setfield(L, -2, key);
+ lua_pushinteger(L, value);
+ lua_setfield(L, -2, key);
}
static void setboolfield (lua_State *L, const char *key, int value) {
- if (value < 0) /* undefined? */
- return; /* does not set field */
- lua_pushboolean(L, value);
- lua_setfield(L, -2, key);
+ if (value < 0) /* undefined? */
+ return; /* does not set field */
+ lua_pushboolean(L, value);
+ lua_setfield(L, -2, key);
}
static int getboolfield (lua_State *L, const char *key) {
- int res;
- lua_getfield(L, -1, key);
- res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1);
- lua_pop(L, 1);
- return res;
+ int res;
+ lua_getfield(L, -1, key);
+ res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1);
+ lua_pop(L, 1);
+ return res;
}
static int getfield (lua_State *L, const char *key, int d) {
- int res, isnum;
- lua_getfield(L, -1, key);
- res = (int)lua_tointegerx(L, -1, &isnum);
- if (!isnum) {
- if (d < 0)
- return luaL_error(L, "field " LUA_QS " missing in date table", key);
- res = d;
- }
- lua_pop(L, 1);
- return res;
+ int res, isnum;
+ lua_getfield(L, -1, key);
+ res = (int)lua_tointegerx(L, -1, &isnum);
+ if (!isnum) {
+ if (d < 0)
+ return luaL_error(L, "field " LUA_QS " missing in date table", key);
+ res = d;
+ }
+ lua_pop(L, 1);
+ return res;
}
static const char *checkoption (lua_State *L, const char *conv, char *buff) {
- static const char *const options[] = LUA_STRFTIMEOPTIONS;
- unsigned int i;
- for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) {
- if (*conv != '\0' && strchr(options[i], *conv) != NULL) {
- buff[1] = *conv;
- if (*options[i + 1] == '\0') { /* one-char conversion specifier? */
- buff[2] = '\0'; /* end buffer */
- return conv + 1;
- }
- else if (*(conv + 1) != '\0' &&
- strchr(options[i + 1], *(conv + 1)) != NULL) {
- buff[2] = *(conv + 1); /* valid two-char conversion specifier */
- buff[3] = '\0'; /* end buffer */
- return conv + 2;
- }
- }
- }
- luaL_argerror(L, 1,
- lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
- return conv; /* to avoid warnings */
+ static const char *const options[] = LUA_STRFTIMEOPTIONS;
+ unsigned int i;
+ for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) {
+ if (*conv != '\0' && strchr(options[i], *conv) != NULL) {
+ buff[1] = *conv;
+ if (*options[i + 1] == '\0') { /* one-char conversion specifier? */
+ buff[2] = '\0'; /* end buffer */
+ return conv + 1;
+ }
+ else if (*(conv + 1) != '\0' &&
+ strchr(options[i + 1], *(conv + 1)) != NULL) {
+ buff[2] = *(conv + 1); /* valid two-char conversion specifier */
+ buff[3] = '\0'; /* end buffer */
+ return conv + 2;
+ }
+ }
+ }
+ luaL_argerror(L, 1,
+ lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
+ return conv; /* to avoid warnings */
}
static int os_date (lua_State *L) {
- const char *s = luaL_optstring(L, 1, "%c");
- time_t t = luaL_opt(L, luaL_checknumber, 2, time(NULL));
- struct tm tmr, *stm;
- if (*s == '!') { /* UTC? */
- stm = l_gmtime(&t, &tmr);
- s++; /* skip `!' */
- }
- else
- stm = l_localtime(&t, &tmr);
- if (stm == NULL) /* invalid date? */
- lua_pushnil(L);
- else if (strcmp(s, "*t") == 0) {
- lua_createtable(L, 0, 9); /* 9 = number of fields */
- setfield(L, "sec", stm->tm_sec);
- setfield(L, "min", stm->tm_min);
- setfield(L, "hour", stm->tm_hour);
- setfield(L, "day", stm->tm_mday);
- setfield(L, "month", stm->tm_mon+1);
- setfield(L, "year", stm->tm_year+1900);
- setfield(L, "wday", stm->tm_wday+1);
- setfield(L, "yday", stm->tm_yday+1);
- setboolfield(L, "isdst", stm->tm_isdst);
- }
- else {
- char cc[4];
- luaL_Buffer b;
- cc[0] = '%';
- luaL_buffinit(L, &b);
- while (*s) {
- if (*s != '%') /* no conversion specifier? */
- luaL_addchar(&b, *s++);
- else {
- size_t reslen;
- char buff[200]; /* should be big enough for any conversion result */
- s = checkoption(L, s + 1, cc);
- reslen = strftime(buff, sizeof(buff), cc, stm);
- luaL_addlstring(&b, buff, reslen);
- }
- }
- luaL_pushresult(&b);
- }
- return 1;
+ const char *s = luaL_optstring(L, 1, "%c");
+ time_t t = luaL_opt(L, luaL_checknumber, 2, time(NULL));
+ struct tm tmr, *stm;
+ if (*s == '!') { /* UTC? */
+ stm = l_gmtime(&t, &tmr);
+ s++; /* skip `!' */
+ }
+ else
+ stm = l_localtime(&t, &tmr);
+ if (stm == NULL) /* invalid date? */
+ lua_pushnil(L);
+ else if (strcmp(s, "*t") == 0) {
+ lua_createtable(L, 0, 9); /* 9 = number of fields */
+ setfield(L, "sec", stm->tm_sec);
+ setfield(L, "min", stm->tm_min);
+ setfield(L, "hour", stm->tm_hour);
+ setfield(L, "day", stm->tm_mday);
+ setfield(L, "month", stm->tm_mon+1);
+ setfield(L, "year", stm->tm_year+1900);
+ setfield(L, "wday", stm->tm_wday+1);
+ setfield(L, "yday", stm->tm_yday+1);
+ setboolfield(L, "isdst", stm->tm_isdst);
+ }
+ else {
+ char cc[4];
+ luaL_Buffer b;
+ cc[0] = '%';
+ luaL_buffinit(L, &b);
+ while (*s) {
+ if (*s != '%') /* no conversion specifier? */
+ luaL_addchar(&b, *s++);
+ else {
+ size_t reslen;
+ char buff[200]; /* should be big enough for any conversion result */
+ s = checkoption(L, s + 1, cc);
+ reslen = strftime(buff, sizeof(buff), cc, stm);
+ luaL_addlstring(&b, buff, reslen);
+ }
+ }
+ luaL_pushresult(&b);
+ }
+ return 1;
}
static int os_time (lua_State *L) {
- time_t t;
- if (lua_isnoneornil(L, 1)) /* called without args? */
- t = time(NULL); /* get current time */
- else {
- struct tm ts;
- luaL_checktype(L, 1, LUA_TTABLE);
- lua_settop(L, 1); /* make sure table is at the top */
- ts.tm_sec = getfield(L, "sec", 0);
- ts.tm_min = getfield(L, "min", 0);
- ts.tm_hour = getfield(L, "hour", 12);
- ts.tm_mday = getfield(L, "day", -1);
- ts.tm_mon = getfield(L, "month", -1) - 1;
- ts.tm_year = getfield(L, "year", -1) - 1900;
- ts.tm_isdst = getboolfield(L, "isdst");
- t = mktime(&ts);
- }
- if (t == (time_t)(-1))
- lua_pushnil(L);
- else
- lua_pushnumber(L, (lua_Number)t);
- return 1;
+ time_t t;
+ if (lua_isnoneornil(L, 1)) /* called without args? */
+ t = time(NULL); /* get current time */
+ else {
+ struct tm ts;
+ luaL_checktype(L, 1, LUA_TTABLE);
+ lua_settop(L, 1); /* make sure table is at the top */
+ ts.tm_sec = getfield(L, "sec", 0);
+ ts.tm_min = getfield(L, "min", 0);
+ ts.tm_hour = getfield(L, "hour", 12);
+ ts.tm_mday = getfield(L, "day", -1);
+ ts.tm_mon = getfield(L, "month", -1) - 1;
+ ts.tm_year = getfield(L, "year", -1) - 1900;
+ ts.tm_isdst = getboolfield(L, "isdst");
+ t = mktime(&ts);
+ }
+ if (t == (time_t)(-1))
+ lua_pushnil(L);
+ else
+ lua_pushnumber(L, (lua_Number)t);
+ return 1;
}
static int os_difftime (lua_State *L) {
- lua_pushnumber(L, difftime((luaL_checknumber(L, 1)),
- (luaL_optnumber(L, 2, 0))));
- return 1;
+ lua_pushnumber(L, difftime((luaL_checknumber(L, 1)),
+ (luaL_optnumber(L, 2, 0))));
+ return 1;
}
/* }====================================================== */
static int os_setlocale (lua_State *L) {
- static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
- LC_NUMERIC, LC_TIME};
- static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
- "numeric", "time", NULL};
- const char *l = luaL_optstring(L, 1, NULL);
- int op = luaL_checkoption(L, 2, "all", catnames);
- lua_pushstring(L, setlocale(cat[op], l));
- return 1;
+ static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
+ LC_NUMERIC, LC_TIME};
+ static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
+ "numeric", "time", NULL};
+ const char *l = luaL_optstring(L, 1, NULL);
+ int op = luaL_checkoption(L, 2, "all", catnames);
+ lua_pushstring(L, setlocale(cat[op], l));
+ return 1;
}
static int os_exit (lua_State *L) {
- int status;
- if (lua_isboolean(L, 1))
- status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
- else
- status = luaL_optint(L, 1, EXIT_SUCCESS);
- if (lua_toboolean(L, 2))
- lua_close(L);
- if (L) exit(status); /* 'if' to avoid warnings for unreachable 'return' */
- return 0;
+ int status;
+ if (lua_isboolean(L, 1))
+ status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
+ else
+ status = luaL_optint(L, 1, EXIT_SUCCESS);
+ if (lua_toboolean(L, 2))
+ lua_close(L);
+ if (L) exit(status); /* 'if' to avoid warnings for unreachable 'return' */
+ return 0;
}
static const luaL_Reg syslib[] = {
- {"clock", os_clock},
- {"date", os_date},
- {"difftime", os_difftime},
- {"execute", os_execute},
- {"exit", os_exit},
- {"getenv", os_getenv},
- {"remove", os_remove},
- {"rename", os_rename},
- {"setlocale", os_setlocale},
- {"time", os_time},
- {"tmpname", os_tmpname},
- {NULL, NULL}
+ {"clock", os_clock},
+ {"date", os_date},
+ {"difftime", os_difftime},
+ {"execute", os_execute},
+ {"exit", os_exit},
+ {"getenv", os_getenv},
+ {"remove", os_remove},
+ {"rename", os_rename},
+ {"setlocale", os_setlocale},
+ {"time", os_time},
+ {"tmpname", os_tmpname},
+ {NULL, NULL}
};
/* }====================================================== */
@@ -317,7 +317,6 @@ static const luaL_Reg syslib[] = {
LUAMOD_API int luaopen_os (lua_State *L) {
- luaL_newlib(L, syslib);
- return 1;
+ luaL_newlib(L, syslib);
+ return 1;
}
-
diff --git a/src/lib/lua/lparser.c b/src/lib/lua/lparser.c
index 9e1a9ca2cfe..9b6a89e4f87 100644
--- a/src/lib/lua/lparser.c
+++ b/src/lib/lua/lparser.c
@@ -29,10 +29,10 @@
/* maximum number of local variables per function (must be smaller
than 250, due to the bytecode format) */
-#define MAXVARS 200
+#define MAXVARS 200
-#define hasmultret(k) ((k) == VCALL || (k) == VVARARG)
+#define hasmultret(k) ((k) == VCALL || (k) == VVARARG)
@@ -40,12 +40,12 @@
** nodes for block list (list of active blocks)
*/
typedef struct BlockCnt {
- struct BlockCnt *previous; /* chain */
- short firstlabel; /* index of first label in this block */
- short firstgoto; /* index of first pending goto in this block */
- lu_byte nactvar; /* # active locals outside the block */
- lu_byte upval; /* true if some variable in the block is an upvalue */
- lu_byte isloop; /* true if `block' is a loop */
+ struct BlockCnt *previous; /* chain */
+ short firstlabel; /* index of first label in this block */
+ short firstgoto; /* index of first pending goto in this block */
+ lu_byte nactvar; /* # active locals outside the block */
+ lu_byte upval; /* true if some variable in the block is an upvalue */
+ lu_byte isloop; /* true if `block' is a loop */
} BlockCnt;
@@ -58,137 +58,137 @@ static void expr (LexState *ls, expdesc *v);
static void anchor_token (LexState *ls) {
- /* last token from outer function must be EOS */
- lua_assert(ls->fs != NULL || ls->t.token == TK_EOS);
- if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) {
- TString *ts = ls->t.seminfo.ts;
- luaX_newstring(ls, getstr(ts), ts->tsv.len);
- }
+ /* last token from outer function must be EOS */
+ lua_assert(ls->fs != NULL || ls->t.token == TK_EOS);
+ if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) {
+ TString *ts = ls->t.seminfo.ts;
+ luaX_newstring(ls, getstr(ts), ts->tsv.len);
+ }
}
/* semantic error */
static l_noret semerror (LexState *ls, const char *msg) {
- ls->t.token = 0; /* remove 'near to' from final message */
- luaX_syntaxerror(ls, msg);
+ ls->t.token = 0; /* remove 'near to' from final message */
+ luaX_syntaxerror(ls, msg);
}
static l_noret error_expected (LexState *ls, int token) {
- luaX_syntaxerror(ls,
- luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
+ luaX_syntaxerror(ls,
+ luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
}
static l_noret errorlimit (FuncState *fs, int limit, const char *what) {
- lua_State *L = fs->ls->L;
- const char *msg;
- int line = fs->f->linedefined;
- const char *where = (line == 0)
- ? "main function"
- : luaO_pushfstring(L, "function at line %d", line);
- msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s",
- what, limit, where);
- luaX_syntaxerror(fs->ls, msg);
+ lua_State *L = fs->ls->L;
+ const char *msg;
+ int line = fs->f->linedefined;
+ const char *where = (line == 0)
+ ? "main function"
+ : luaO_pushfstring(L, "function at line %d", line);
+ msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s",
+ what, limit, where);
+ luaX_syntaxerror(fs->ls, msg);
}
static void checklimit (FuncState *fs, int v, int l, const char *what) {
- if (v > l) errorlimit(fs, l, what);
+ if (v > l) errorlimit(fs, l, what);
}
static int testnext (LexState *ls, int c) {
- if (ls->t.token == c) {
- luaX_next(ls);
- return 1;
- }
- else return 0;
+ if (ls->t.token == c) {
+ luaX_next(ls);
+ return 1;
+ }
+ else return 0;
}
static void check (LexState *ls, int c) {
- if (ls->t.token != c)
- error_expected(ls, c);
+ if (ls->t.token != c)
+ error_expected(ls, c);
}
static void checknext (LexState *ls, int c) {
- check(ls, c);
- luaX_next(ls);
+ check(ls, c);
+ luaX_next(ls);
}
-#define check_condition(ls,c,msg) { if (!(c)) luaX_syntaxerror(ls, msg); }
+#define check_condition(ls,c,msg) { if (!(c)) luaX_syntaxerror(ls, msg); }
static void check_match (LexState *ls, int what, int who, int where) {
- if (!testnext(ls, what)) {
- if (where == ls->linenumber)
- error_expected(ls, what);
- else {
- luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
- "%s expected (to close %s at line %d)",
- luaX_token2str(ls, what), luaX_token2str(ls, who), where));
- }
- }
+ if (!testnext(ls, what)) {
+ if (where == ls->linenumber)
+ error_expected(ls, what);
+ else {
+ luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
+ "%s expected (to close %s at line %d)",
+ luaX_token2str(ls, what), luaX_token2str(ls, who), where));
+ }
+ }
}
static TString *str_checkname (LexState *ls) {
- TString *ts;
- check(ls, TK_NAME);
- ts = ls->t.seminfo.ts;
- luaX_next(ls);
- return ts;
+ TString *ts;
+ check(ls, TK_NAME);
+ ts = ls->t.seminfo.ts;
+ luaX_next(ls);
+ return ts;
}
static void init_exp (expdesc *e, expkind k, int i) {
- e->f = e->t = NO_JUMP;
- e->k = k;
- e->u.info = i;
+ e->f = e->t = NO_JUMP;
+ e->k = k;
+ e->u.info = i;
}
static void codestring (LexState *ls, expdesc *e, TString *s) {
- init_exp(e, VK, luaK_stringK(ls->fs, s));
+ init_exp(e, VK, luaK_stringK(ls->fs, s));
}
static void checkname (LexState *ls, expdesc *e) {
- codestring(ls, e, str_checkname(ls));
+ codestring(ls, e, str_checkname(ls));
}
static int registerlocalvar (LexState *ls, TString *varname) {
- FuncState *fs = ls->fs;
- Proto *f = fs->f;
- int oldsize = f->sizelocvars;
- luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
- LocVar, SHRT_MAX, "local variables");
- while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
- f->locvars[fs->nlocvars].varname = varname;
- luaC_objbarrier(ls->L, f, varname);
- return fs->nlocvars++;
+ FuncState *fs = ls->fs;
+ Proto *f = fs->f;
+ int oldsize = f->sizelocvars;
+ luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
+ LocVar, SHRT_MAX, "local variables");
+ while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
+ f->locvars[fs->nlocvars].varname = varname;
+ luaC_objbarrier(ls->L, f, varname);
+ return fs->nlocvars++;
}
static void new_localvar (LexState *ls, TString *name) {
- FuncState *fs = ls->fs;
- Dyndata *dyd = ls->dyd;
- int reg = registerlocalvar(ls, name);
- checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
- MAXVARS, "local variables");
- luaM_growvector(ls->L, dyd->actvar.arr, dyd->actvar.n + 1,
- dyd->actvar.size, Vardesc, MAX_INT, "local variables");
- dyd->actvar.arr[dyd->actvar.n++].idx = cast(short, reg);
+ FuncState *fs = ls->fs;
+ Dyndata *dyd = ls->dyd;
+ int reg = registerlocalvar(ls, name);
+ checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
+ MAXVARS, "local variables");
+ luaM_growvector(ls->L, dyd->actvar.arr, dyd->actvar.n + 1,
+ dyd->actvar.size, Vardesc, MAX_INT, "local variables");
+ dyd->actvar.arr[dyd->actvar.n++].idx = cast(short, reg);
}
static void new_localvarliteral_ (LexState *ls, const char *name, size_t sz) {
- new_localvar(ls, luaX_newstring(ls, name, sz));
+ new_localvar(ls, luaX_newstring(ls, name, sz));
}
#define new_localvarliteral(ls,v) \
@@ -196,60 +196,60 @@ static void new_localvarliteral_ (LexState *ls, const char *name, size_t sz) {
static LocVar *getlocvar (FuncState *fs, int i) {
- int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx;
- lua_assert(idx < fs->nlocvars);
- return &fs->f->locvars[idx];
+ int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx;
+ lua_assert(idx < fs->nlocvars);
+ return &fs->f->locvars[idx];
}
static void adjustlocalvars (LexState *ls, int nvars) {
- FuncState *fs = ls->fs;
- fs->nactvar = cast_byte(fs->nactvar + nvars);
- for (; nvars; nvars--) {
- getlocvar(fs, fs->nactvar - nvars)->startpc = fs->pc;
- }
+ FuncState *fs = ls->fs;
+ fs->nactvar = cast_byte(fs->nactvar + nvars);
+ for (; nvars; nvars--) {
+ getlocvar(fs, fs->nactvar - nvars)->startpc = fs->pc;
+ }
}
static void removevars (FuncState *fs, int tolevel) {
- fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
- while (fs->nactvar > tolevel)
- getlocvar(fs, --fs->nactvar)->endpc = fs->pc;
+ fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
+ while (fs->nactvar > tolevel)
+ getlocvar(fs, --fs->nactvar)->endpc = fs->pc;
}
static int searchupvalue (FuncState *fs, TString *name) {
- int i;
- Upvaldesc *up = fs->f->upvalues;
- for (i = 0; i < fs->nups; i++) {
- if (luaS_eqstr(up[i].name, name)) return i;
- }
- return -1; /* not found */
+ int i;
+ Upvaldesc *up = fs->f->upvalues;
+ for (i = 0; i < fs->nups; i++) {
+ if (luaS_eqstr(up[i].name, name)) return i;
+ }
+ return -1; /* not found */
}
static int newupvalue (FuncState *fs, TString *name, expdesc *v) {
- Proto *f = fs->f;
- int oldsize = f->sizeupvalues;
- checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
- luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
- Upvaldesc, MAXUPVAL, "upvalues");
- while (oldsize < f->sizeupvalues) f->upvalues[oldsize++].name = NULL;
- f->upvalues[fs->nups].instack = (v->k == VLOCAL);
- f->upvalues[fs->nups].idx = cast_byte(v->u.info);
- f->upvalues[fs->nups].name = name;
- luaC_objbarrier(fs->ls->L, f, name);
- return fs->nups++;
+ Proto *f = fs->f;
+ int oldsize = f->sizeupvalues;
+ checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
+ luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
+ Upvaldesc, MAXUPVAL, "upvalues");
+ while (oldsize < f->sizeupvalues) f->upvalues[oldsize++].name = NULL;
+ f->upvalues[fs->nups].instack = (v->k == VLOCAL);
+ f->upvalues[fs->nups].idx = cast_byte(v->u.info);
+ f->upvalues[fs->nups].name = name;
+ luaC_objbarrier(fs->ls->L, f, name);
+ return fs->nups++;
}
static int searchvar (FuncState *fs, TString *n) {
- int i;
- for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
- if (luaS_eqstr(n, getlocvar(fs, i)->varname))
- return i;
- }
- return -1; /* not found */
+ int i;
+ for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
+ if (luaS_eqstr(n, getlocvar(fs, i)->varname))
+ return i;
+ }
+ return -1; /* not found */
}
@@ -258,9 +258,9 @@ static int searchvar (FuncState *fs, TString *n) {
(to emit close instructions later).
*/
static void markupval (FuncState *fs, int level) {
- BlockCnt *bl = fs->bl;
- while (bl->nactvar > level) bl = bl->previous;
- bl->upval = 1;
+ BlockCnt *bl = fs->bl;
+ while (bl->nactvar > level) bl = bl->previous;
+ bl->upval = 1;
}
@@ -269,92 +269,92 @@ static void markupval (FuncState *fs, int level) {
upvalue into all intermediate functions.
*/
static int singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) {
- if (fs == NULL) /* no more levels? */
- return VVOID; /* default is global */
- else {
- int v = searchvar(fs, n); /* look up locals at current level */
- if (v >= 0) { /* found? */
- init_exp(var, VLOCAL, v); /* variable is local */
- if (!base)
- markupval(fs, v); /* local will be used as an upval */
- return VLOCAL;
- }
- else { /* not found as local at current level; try upvalues */
- int idx = searchupvalue(fs, n); /* try existing upvalues */
- if (idx < 0) { /* not found? */
- if (singlevaraux(fs->prev, n, var, 0) == VVOID) /* try upper levels */
- return VVOID; /* not found; is a global */
- /* else was LOCAL or UPVAL */
- idx = newupvalue(fs, n, var); /* will be a new upvalue */
- }
- init_exp(var, VUPVAL, idx);
- return VUPVAL;
- }
- }
+ if (fs == NULL) /* no more levels? */
+ return VVOID; /* default is global */
+ else {
+ int v = searchvar(fs, n); /* look up locals at current level */
+ if (v >= 0) { /* found? */
+ init_exp(var, VLOCAL, v); /* variable is local */
+ if (!base)
+ markupval(fs, v); /* local will be used as an upval */
+ return VLOCAL;
+ }
+ else { /* not found as local at current level; try upvalues */
+ int idx = searchupvalue(fs, n); /* try existing upvalues */
+ if (idx < 0) { /* not found? */
+ if (singlevaraux(fs->prev, n, var, 0) == VVOID) /* try upper levels */
+ return VVOID; /* not found; is a global */
+ /* else was LOCAL or UPVAL */
+ idx = newupvalue(fs, n, var); /* will be a new upvalue */
+ }
+ init_exp(var, VUPVAL, idx);
+ return VUPVAL;
+ }
+ }
}
static void singlevar (LexState *ls, expdesc *var) {
- TString *varname = str_checkname(ls);
- FuncState *fs = ls->fs;
- if (singlevaraux(fs, varname, var, 1) == VVOID) { /* global name? */
- expdesc key;
- singlevaraux(fs, ls->envn, var, 1); /* get environment variable */
- lua_assert(var->k == VLOCAL || var->k == VUPVAL);
- codestring(ls, &key, varname); /* key is variable name */
- luaK_indexed(fs, var, &key); /* env[varname] */
- }
+ TString *varname = str_checkname(ls);
+ FuncState *fs = ls->fs;
+ if (singlevaraux(fs, varname, var, 1) == VVOID) { /* global name? */
+ expdesc key;
+ singlevaraux(fs, ls->envn, var, 1); /* get environment variable */
+ lua_assert(var->k == VLOCAL || var->k == VUPVAL);
+ codestring(ls, &key, varname); /* key is variable name */
+ luaK_indexed(fs, var, &key); /* env[varname] */
+ }
}
static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
- FuncState *fs = ls->fs;
- int extra = nvars - nexps;
- if (hasmultret(e->k)) {
- extra++; /* includes call itself */
- if (extra < 0) extra = 0;
- luaK_setreturns(fs, e, extra); /* last exp. provides the difference */
- if (extra > 1) luaK_reserveregs(fs, extra-1);
- }
- else {
- if (e->k != VVOID) luaK_exp2nextreg(fs, e); /* close last expression */
- if (extra > 0) {
- int reg = fs->freereg;
- luaK_reserveregs(fs, extra);
- luaK_nil(fs, reg, extra);
- }
- }
+ FuncState *fs = ls->fs;
+ int extra = nvars - nexps;
+ if (hasmultret(e->k)) {
+ extra++; /* includes call itself */
+ if (extra < 0) extra = 0;
+ luaK_setreturns(fs, e, extra); /* last exp. provides the difference */
+ if (extra > 1) luaK_reserveregs(fs, extra-1);
+ }
+ else {
+ if (e->k != VVOID) luaK_exp2nextreg(fs, e); /* close last expression */
+ if (extra > 0) {
+ int reg = fs->freereg;
+ luaK_reserveregs(fs, extra);
+ luaK_nil(fs, reg, extra);
+ }
+ }
}
static void enterlevel (LexState *ls) {
- lua_State *L = ls->L;
- ++L->nCcalls;
- checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels");
+ lua_State *L = ls->L;
+ ++L->nCcalls;
+ checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels");
}
-#define leavelevel(ls) ((ls)->L->nCcalls--)
+#define leavelevel(ls) ((ls)->L->nCcalls--)
static void closegoto (LexState *ls, int g, Labeldesc *label) {
- int i;
- FuncState *fs = ls->fs;
- Labellist *gl = &ls->dyd->gt;
- Labeldesc *gt = &gl->arr[g];
- lua_assert(luaS_eqstr(gt->name, label->name));
- if (gt->nactvar < label->nactvar) {
- TString *vname = getlocvar(fs, gt->nactvar)->varname;
- const char *msg = luaO_pushfstring(ls->L,
- "<goto %s> at line %d jumps into the scope of local " LUA_QS,
- getstr(gt->name), gt->line, getstr(vname));
- semerror(ls, msg);
- }
- luaK_patchlist(fs, gt->pc, label->pc);
- /* remove goto from pending list */
- for (i = g; i < gl->n - 1; i++)
- gl->arr[i] = gl->arr[i + 1];
- gl->n--;
+ int i;
+ FuncState *fs = ls->fs;
+ Labellist *gl = &ls->dyd->gt;
+ Labeldesc *gt = &gl->arr[g];
+ lua_assert(luaS_eqstr(gt->name, label->name));
+ if (gt->nactvar < label->nactvar) {
+ TString *vname = getlocvar(fs, gt->nactvar)->varname;
+ const char *msg = luaO_pushfstring(ls->L,
+ "<goto %s> at line %d jumps into the scope of local " LUA_QS,
+ getstr(gt->name), gt->line, getstr(vname));
+ semerror(ls, msg);
+ }
+ luaK_patchlist(fs, gt->pc, label->pc);
+ /* remove goto from pending list */
+ for (i = g; i < gl->n - 1; i++)
+ gl->arr[i] = gl->arr[i + 1];
+ gl->n--;
}
@@ -362,36 +362,36 @@ static void closegoto (LexState *ls, int g, Labeldesc *label) {
** try to close a goto with existing labels; this solves backward jumps
*/
static int findlabel (LexState *ls, int g) {
- int i;
- BlockCnt *bl = ls->fs->bl;
- Dyndata *dyd = ls->dyd;
- Labeldesc *gt = &dyd->gt.arr[g];
- /* check labels in current block for a match */
- for (i = bl->firstlabel; i < dyd->label.n; i++) {
- Labeldesc *lb = &dyd->label.arr[i];
- if (luaS_eqstr(lb->name, gt->name)) { /* correct label? */
- if (gt->nactvar > lb->nactvar &&
- (bl->upval || dyd->label.n > bl->firstlabel))
- luaK_patchclose(ls->fs, gt->pc, lb->nactvar);
- closegoto(ls, g, lb); /* close it */
- return 1;
- }
- }
- return 0; /* label not found; cannot close goto */
+ int i;
+ BlockCnt *bl = ls->fs->bl;
+ Dyndata *dyd = ls->dyd;
+ Labeldesc *gt = &dyd->gt.arr[g];
+ /* check labels in current block for a match */
+ for (i = bl->firstlabel; i < dyd->label.n; i++) {
+ Labeldesc *lb = &dyd->label.arr[i];
+ if (luaS_eqstr(lb->name, gt->name)) { /* correct label? */
+ if (gt->nactvar > lb->nactvar &&
+ (bl->upval || dyd->label.n > bl->firstlabel))
+ luaK_patchclose(ls->fs, gt->pc, lb->nactvar);
+ closegoto(ls, g, lb); /* close it */
+ return 1;
+ }
+ }
+ return 0; /* label not found; cannot close goto */
}
static int newlabelentry (LexState *ls, Labellist *l, TString *name,
- int line, int pc) {
- int n = l->n;
- luaM_growvector(ls->L, l->arr, n, l->size,
- Labeldesc, SHRT_MAX, "labels/gotos");
- l->arr[n].name = name;
- l->arr[n].line = line;
- l->arr[n].nactvar = ls->fs->nactvar;
- l->arr[n].pc = pc;
- l->n++;
- return n;
+ int line, int pc) {
+ int n = l->n;
+ luaM_growvector(ls->L, l->arr, n, l->size,
+ Labeldesc, SHRT_MAX, "labels/gotos");
+ l->arr[n].name = name;
+ l->arr[n].line = line;
+ l->arr[n].nactvar = ls->fs->nactvar;
+ l->arr[n].pc = pc;
+ l->n++;
+ return n;
}
@@ -400,14 +400,14 @@ static int newlabelentry (LexState *ls, Labellist *l, TString *name,
** block; solves forward jumps
*/
static void findgotos (LexState *ls, Labeldesc *lb) {
- Labellist *gl = &ls->dyd->gt;
- int i = ls->fs->bl->firstgoto;
- while (i < gl->n) {
- if (luaS_eqstr(gl->arr[i].name, lb->name))
- closegoto(ls, i, lb);
- else
- i++;
- }
+ Labellist *gl = &ls->dyd->gt;
+ int i = ls->fs->bl->firstgoto;
+ while (i < gl->n) {
+ if (luaS_eqstr(gl->arr[i].name, lb->name))
+ closegoto(ls, i, lb);
+ else
+ i++;
+ }
}
@@ -418,32 +418,32 @@ static void findgotos (LexState *ls, Labeldesc *lb) {
** upvalue), close those variables being exited.
*/
static void movegotosout (FuncState *fs, BlockCnt *bl) {
- int i = bl->firstgoto;
- Labellist *gl = &fs->ls->dyd->gt;
- /* correct pending gotos to current block and try to close it
- with visible labels */
- while (i < gl->n) {
- Labeldesc *gt = &gl->arr[i];
- if (gt->nactvar > bl->nactvar) {
- if (bl->upval)
- luaK_patchclose(fs, gt->pc, bl->nactvar);
- gt->nactvar = bl->nactvar;
- }
- if (!findlabel(fs->ls, i))
- i++; /* move to next one */
- }
+ int i = bl->firstgoto;
+ Labellist *gl = &fs->ls->dyd->gt;
+ /* correct pending gotos to current block and try to close it
+ with visible labels */
+ while (i < gl->n) {
+ Labeldesc *gt = &gl->arr[i];
+ if (gt->nactvar > bl->nactvar) {
+ if (bl->upval)
+ luaK_patchclose(fs, gt->pc, bl->nactvar);
+ gt->nactvar = bl->nactvar;
+ }
+ if (!findlabel(fs->ls, i))
+ i++; /* move to next one */
+ }
}
static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) {
- bl->isloop = isloop;
- bl->nactvar = fs->nactvar;
- bl->firstlabel = fs->ls->dyd->label.n;
- bl->firstgoto = fs->ls->dyd->gt.n;
- bl->upval = 0;
- bl->previous = fs->bl;
- fs->bl = bl;
- lua_assert(fs->freereg == fs->nactvar);
+ bl->isloop = isloop;
+ bl->nactvar = fs->nactvar;
+ bl->firstlabel = fs->ls->dyd->label.n;
+ bl->firstgoto = fs->ls->dyd->gt.n;
+ bl->upval = 0;
+ bl->previous = fs->bl;
+ fs->bl = bl;
+ lua_assert(fs->freereg == fs->nactvar);
}
@@ -451,9 +451,9 @@ static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) {
** create a label named "break" to resolve break statements
*/
static void breaklabel (LexState *ls) {
- TString *n = luaS_new(ls->L, "break");
- int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc);
- findgotos(ls, &ls->dyd->label.arr[l]);
+ TString *n = luaS_new(ls->L, "break");
+ int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc);
+ findgotos(ls, &ls->dyd->label.arr[l]);
}
/*
@@ -461,34 +461,34 @@ static void breaklabel (LexState *ls) {
** message when label name is a reserved word (which can only be 'break')
*/
static l_noret undefgoto (LexState *ls, Labeldesc *gt) {
- const char *msg = isreserved(gt->name)
- ? "<%s> at line %d not inside a loop"
- : "no visible label " LUA_QS " for <goto> at line %d";
- msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line);
- semerror(ls, msg);
+ const char *msg = isreserved(gt->name)
+ ? "<%s> at line %d not inside a loop"
+ : "no visible label " LUA_QS " for <goto> at line %d";
+ msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line);
+ semerror(ls, msg);
}
static void leaveblock (FuncState *fs) {
- BlockCnt *bl = fs->bl;
- LexState *ls = fs->ls;
- if (bl->previous && bl->upval) {
- /* create a 'jump to here' to close upvalues */
- int j = luaK_jump(fs);
- luaK_patchclose(fs, j, bl->nactvar);
- luaK_patchtohere(fs, j);
- }
- if (bl->isloop)
- breaklabel(ls); /* close pending breaks */
- fs->bl = bl->previous;
- removevars(fs, bl->nactvar);
- lua_assert(bl->nactvar == fs->nactvar);
- fs->freereg = fs->nactvar; /* free registers */
- ls->dyd->label.n = bl->firstlabel; /* remove local labels */
- if (bl->previous) /* inner block? */
- movegotosout(fs, bl); /* update pending gotos to outer block */
- else if (bl->firstgoto < ls->dyd->gt.n) /* pending gotos in outer block? */
- undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]); /* error */
+ BlockCnt *bl = fs->bl;
+ LexState *ls = fs->ls;
+ if (bl->previous && bl->upval) {
+ /* create a 'jump to here' to close upvalues */
+ int j = luaK_jump(fs);
+ luaK_patchclose(fs, j, bl->nactvar);
+ luaK_patchtohere(fs, j);
+ }
+ if (bl->isloop)
+ breaklabel(ls); /* close pending breaks */
+ fs->bl = bl->previous;
+ removevars(fs, bl->nactvar);
+ lua_assert(bl->nactvar == fs->nactvar);
+ fs->freereg = fs->nactvar; /* free registers */
+ ls->dyd->label.n = bl->firstlabel; /* remove local labels */
+ if (bl->previous) /* inner block? */
+ movegotosout(fs, bl); /* update pending gotos to outer block */
+ else if (bl->firstgoto < ls->dyd->gt.n) /* pending gotos in outer block? */
+ undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]); /* error */
}
@@ -496,18 +496,18 @@ static void leaveblock (FuncState *fs) {
** adds a new prototype into list of prototypes
*/
static Proto *addprototype (LexState *ls) {
- Proto *clp;
- lua_State *L = ls->L;
- FuncState *fs = ls->fs;
- Proto *f = fs->f; /* prototype of current function */
- if (fs->np >= f->sizep) {
- int oldsize = f->sizep;
- luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions");
- while (oldsize < f->sizep) f->p[oldsize++] = NULL;
- }
- f->p[fs->np++] = clp = luaF_newproto(L);
- luaC_objbarrier(L, f, clp);
- return clp;
+ Proto *clp;
+ lua_State *L = ls->L;
+ FuncState *fs = ls->fs;
+ Proto *f = fs->f; /* prototype of current function */
+ if (fs->np >= f->sizep) {
+ int oldsize = f->sizep;
+ luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions");
+ while (oldsize < f->sizep) f->p[oldsize++] = NULL;
+ }
+ f->p[fs->np++] = clp = luaF_newproto(L);
+ luaC_objbarrier(L, f, clp);
+ return clp;
}
@@ -518,64 +518,64 @@ static Proto *addprototype (LexState *ls) {
** are in use at that time.
*/
static void codeclosure (LexState *ls, expdesc *v) {
- FuncState *fs = ls->fs->prev;
- init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
- luaK_exp2nextreg(fs, v); /* fix it at the last register */
+ FuncState *fs = ls->fs->prev;
+ init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
+ luaK_exp2nextreg(fs, v); /* fix it at the last register */
}
static void open_func (LexState *ls, FuncState *fs, BlockCnt *bl) {
- lua_State *L = ls->L;
- Proto *f;
- fs->prev = ls->fs; /* linked list of funcstates */
- fs->ls = ls;
- ls->fs = fs;
- fs->pc = 0;
- fs->lasttarget = 0;
- fs->jpc = NO_JUMP;
- fs->freereg = 0;
- fs->nk = 0;
- fs->np = 0;
- fs->nups = 0;
- fs->nlocvars = 0;
- fs->nactvar = 0;
- fs->firstlocal = ls->dyd->actvar.n;
- fs->bl = NULL;
- f = fs->f;
- f->source = ls->source;
- f->maxstacksize = 2; /* registers 0/1 are always valid */
- fs->h = luaH_new(L);
- /* anchor table of constants (to avoid being collected) */
- sethvalue2s(L, L->top, fs->h);
- incr_top(L);
- enterblock(fs, bl, 0);
+ lua_State *L = ls->L;
+ Proto *f;
+ fs->prev = ls->fs; /* linked list of funcstates */
+ fs->ls = ls;
+ ls->fs = fs;
+ fs->pc = 0;
+ fs->lasttarget = 0;
+ fs->jpc = NO_JUMP;
+ fs->freereg = 0;
+ fs->nk = 0;
+ fs->np = 0;
+ fs->nups = 0;
+ fs->nlocvars = 0;
+ fs->nactvar = 0;
+ fs->firstlocal = ls->dyd->actvar.n;
+ fs->bl = NULL;
+ f = fs->f;
+ f->source = ls->source;
+ f->maxstacksize = 2; /* registers 0/1 are always valid */
+ fs->h = luaH_new(L);
+ /* anchor table of constants (to avoid being collected) */
+ sethvalue2s(L, L->top, fs->h);
+ incr_top(L);
+ enterblock(fs, bl, 0);
}
static void close_func (LexState *ls) {
- lua_State *L = ls->L;
- FuncState *fs = ls->fs;
- Proto *f = fs->f;
- luaK_ret(fs, 0, 0); /* final return */
- leaveblock(fs);
- luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction);
- f->sizecode = fs->pc;
- luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int);
- f->sizelineinfo = fs->pc;
- luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue);
- f->sizek = fs->nk;
- luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *);
- f->sizep = fs->np;
- luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar);
- f->sizelocvars = fs->nlocvars;
- luaM_reallocvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc);
- f->sizeupvalues = fs->nups;
- lua_assert(fs->bl == NULL);
- ls->fs = fs->prev;
- /* last token read was anchored in defunct function; must re-anchor it */
- anchor_token(ls);
- L->top--; /* pop table of constants */
- luaC_checkGC(L);
+ lua_State *L = ls->L;
+ FuncState *fs = ls->fs;
+ Proto *f = fs->f;
+ luaK_ret(fs, 0, 0); /* final return */
+ leaveblock(fs);
+ luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction);
+ f->sizecode = fs->pc;
+ luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int);
+ f->sizelineinfo = fs->pc;
+ luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue);
+ f->sizek = fs->nk;
+ luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *);
+ f->sizep = fs->np;
+ luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar);
+ f->sizelocvars = fs->nlocvars;
+ luaM_reallocvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc);
+ f->sizeupvalues = fs->nups;
+ lua_assert(fs->bl == NULL);
+ ls->fs = fs->prev;
+ /* last token read was anchored in defunct function; must re-anchor it */
+ anchor_token(ls);
+ L->top--; /* pop table of constants */
+ luaC_checkGC(L);
}
@@ -591,45 +591,45 @@ static void close_func (LexState *ls) {
** so it handled in separate.
*/
static int block_follow (LexState *ls, int withuntil) {
- switch (ls->t.token) {
- case TK_ELSE: case TK_ELSEIF:
- case TK_END: case TK_EOS:
- return 1;
- case TK_UNTIL: return withuntil;
- default: return 0;
- }
+ switch (ls->t.token) {
+ case TK_ELSE: case TK_ELSEIF:
+ case TK_END: case TK_EOS:
+ return 1;
+ case TK_UNTIL: return withuntil;
+ default: return 0;
+ }
}
static void statlist (LexState *ls) {
- /* statlist -> { stat [`;'] } */
- while (!block_follow(ls, 1)) {
- if (ls->t.token == TK_RETURN) {
- statement(ls);
- return; /* 'return' must be last statement */
- }
- statement(ls);
- }
+ /* statlist -> { stat [`;'] } */
+ while (!block_follow(ls, 1)) {
+ if (ls->t.token == TK_RETURN) {
+ statement(ls);
+ return; /* 'return' must be last statement */
+ }
+ statement(ls);
+ }
}
static void fieldsel (LexState *ls, expdesc *v) {
- /* fieldsel -> ['.' | ':'] NAME */
- FuncState *fs = ls->fs;
- expdesc key;
- luaK_exp2anyregup(fs, v);
- luaX_next(ls); /* skip the dot or colon */
- checkname(ls, &key);
- luaK_indexed(fs, v, &key);
+ /* fieldsel -> ['.' | ':'] NAME */
+ FuncState *fs = ls->fs;
+ expdesc key;
+ luaK_exp2anyregup(fs, v);
+ luaX_next(ls); /* skip the dot or colon */
+ checkname(ls, &key);
+ luaK_indexed(fs, v, &key);
}
static void yindex (LexState *ls, expdesc *v) {
- /* index -> '[' expr ']' */
- luaX_next(ls); /* skip the '[' */
- expr(ls, v);
- luaK_exp2val(ls->fs, v);
- checknext(ls, ']');
+ /* index -> '[' expr ']' */
+ luaX_next(ls); /* skip the '[' */
+ expr(ls, v);
+ luaK_exp2val(ls->fs, v);
+ checknext(ls, ']');
}
@@ -641,115 +641,115 @@ static void yindex (LexState *ls, expdesc *v) {
struct ConsControl {
- expdesc v; /* last list item read */
- expdesc *t; /* table descriptor */
- int nh; /* total number of `record' elements */
- int na; /* total number of array elements */
- int tostore; /* number of array elements pending to be stored */
+ expdesc v; /* last list item read */
+ expdesc *t; /* table descriptor */
+ int nh; /* total number of `record' elements */
+ int na; /* total number of array elements */
+ int tostore; /* number of array elements pending to be stored */
};
static void recfield (LexState *ls, struct ConsControl *cc) {
- /* recfield -> (NAME | `['exp1`]') = exp1 */
- FuncState *fs = ls->fs;
- int reg = ls->fs->freereg;
- expdesc key, val;
- int rkkey;
- if (ls->t.token == TK_NAME) {
- checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
- checkname(ls, &key);
- }
- else /* ls->t.token == '[' */
- yindex(ls, &key);
- cc->nh++;
- checknext(ls, '=');
- rkkey = luaK_exp2RK(fs, &key);
- expr(ls, &val);
- luaK_codeABC(fs, OP_SETTABLE, cc->t->u.info, rkkey, luaK_exp2RK(fs, &val));
- fs->freereg = reg; /* free registers */
+ /* recfield -> (NAME | `['exp1`]') = exp1 */
+ FuncState *fs = ls->fs;
+ int reg = ls->fs->freereg;
+ expdesc key, val;
+ int rkkey;
+ if (ls->t.token == TK_NAME) {
+ checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
+ checkname(ls, &key);
+ }
+ else /* ls->t.token == '[' */
+ yindex(ls, &key);
+ cc->nh++;
+ checknext(ls, '=');
+ rkkey = luaK_exp2RK(fs, &key);
+ expr(ls, &val);
+ luaK_codeABC(fs, OP_SETTABLE, cc->t->u.info, rkkey, luaK_exp2RK(fs, &val));
+ fs->freereg = reg; /* free registers */
}
static void closelistfield (FuncState *fs, struct ConsControl *cc) {
- if (cc->v.k == VVOID) return; /* there is no list item */
- luaK_exp2nextreg(fs, &cc->v);
- cc->v.k = VVOID;
- if (cc->tostore == LFIELDS_PER_FLUSH) {
- luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore); /* flush */
- cc->tostore = 0; /* no more items pending */
- }
+ if (cc->v.k == VVOID) return; /* there is no list item */
+ luaK_exp2nextreg(fs, &cc->v);
+ cc->v.k = VVOID;
+ if (cc->tostore == LFIELDS_PER_FLUSH) {
+ luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore); /* flush */
+ cc->tostore = 0; /* no more items pending */
+ }
}
static void lastlistfield (FuncState *fs, struct ConsControl *cc) {
- if (cc->tostore == 0) return;
- if (hasmultret(cc->v.k)) {
- luaK_setmultret(fs, &cc->v);
- luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET);
- cc->na--; /* do not count last expression (unknown number of elements) */
- }
- else {
- if (cc->v.k != VVOID)
- luaK_exp2nextreg(fs, &cc->v);
- luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);
- }
+ if (cc->tostore == 0) return;
+ if (hasmultret(cc->v.k)) {
+ luaK_setmultret(fs, &cc->v);
+ luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET);
+ cc->na--; /* do not count last expression (unknown number of elements) */
+ }
+ else {
+ if (cc->v.k != VVOID)
+ luaK_exp2nextreg(fs, &cc->v);
+ luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);
+ }
}
static void listfield (LexState *ls, struct ConsControl *cc) {
- /* listfield -> exp */
- expr(ls, &cc->v);
- checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor");
- cc->na++;
- cc->tostore++;
+ /* listfield -> exp */
+ expr(ls, &cc->v);
+ checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor");
+ cc->na++;
+ cc->tostore++;
}
static void field (LexState *ls, struct ConsControl *cc) {
- /* field -> listfield | recfield */
- switch(ls->t.token) {
- case TK_NAME: { /* may be 'listfield' or 'recfield' */
- if (luaX_lookahead(ls) != '=') /* expression? */
- listfield(ls, cc);
- else
- recfield(ls, cc);
- break;
- }
- case '[': {
- recfield(ls, cc);
- break;
- }
- default: {
- listfield(ls, cc);
- break;
- }
- }
+ /* field -> listfield | recfield */
+ switch(ls->t.token) {
+ case TK_NAME: { /* may be 'listfield' or 'recfield' */
+ if (luaX_lookahead(ls) != '=') /* expression? */
+ listfield(ls, cc);
+ else
+ recfield(ls, cc);
+ break;
+ }
+ case '[': {
+ recfield(ls, cc);
+ break;
+ }
+ default: {
+ listfield(ls, cc);
+ break;
+ }
+ }
}
static void constructor (LexState *ls, expdesc *t) {
- /* constructor -> '{' [ field { sep field } [sep] ] '}'
- sep -> ',' | ';' */
- FuncState *fs = ls->fs;
- int line = ls->linenumber;
- int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
- struct ConsControl cc;
- cc.na = cc.nh = cc.tostore = 0;
- cc.t = t;
- init_exp(t, VRELOCABLE, pc);
- init_exp(&cc.v, VVOID, 0); /* no value (yet) */
- luaK_exp2nextreg(ls->fs, t); /* fix it at stack top */
- checknext(ls, '{');
- do {
- lua_assert(cc.v.k == VVOID || cc.tostore > 0);
- if (ls->t.token == '}') break;
- closelistfield(fs, &cc);
- field(ls, &cc);
- } while (testnext(ls, ',') || testnext(ls, ';'));
- check_match(ls, '}', '{', line);
- lastlistfield(fs, &cc);
- SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */
- SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh)); /* set initial table size */
+ /* constructor -> '{' [ field { sep field } [sep] ] '}'
+ sep -> ',' | ';' */
+ FuncState *fs = ls->fs;
+ int line = ls->linenumber;
+ int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
+ struct ConsControl cc;
+ cc.na = cc.nh = cc.tostore = 0;
+ cc.t = t;
+ init_exp(t, VRELOCABLE, pc);
+ init_exp(&cc.v, VVOID, 0); /* no value (yet) */
+ luaK_exp2nextreg(ls->fs, t); /* fix it at stack top */
+ checknext(ls, '{');
+ do {
+ lua_assert(cc.v.k == VVOID || cc.tostore > 0);
+ if (ls->t.token == '}') break;
+ closelistfield(fs, &cc);
+ field(ls, &cc);
+ } while (testnext(ls, ',') || testnext(ls, ';'));
+ check_match(ls, '}', '{', line);
+ lastlistfield(fs, &cc);
+ SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */
+ SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh)); /* set initial table size */
}
/* }====================================================================== */
@@ -757,110 +757,110 @@ static void constructor (LexState *ls, expdesc *t) {
static void parlist (LexState *ls) {
- /* parlist -> [ param { `,' param } ] */
- FuncState *fs = ls->fs;
- Proto *f = fs->f;
- int nparams = 0;
- f->is_vararg = 0;
- if (ls->t.token != ')') { /* is `parlist' not empty? */
- do {
- switch (ls->t.token) {
- case TK_NAME: { /* param -> NAME */
- new_localvar(ls, str_checkname(ls));
- nparams++;
- break;
- }
- case TK_DOTS: { /* param -> `...' */
- luaX_next(ls);
- f->is_vararg = 1;
- break;
- }
- default: luaX_syntaxerror(ls, "<name> or " LUA_QL("...") " expected");
- }
- } while (!f->is_vararg && testnext(ls, ','));
- }
- adjustlocalvars(ls, nparams);
- f->numparams = cast_byte(fs->nactvar);
- luaK_reserveregs(fs, fs->nactvar); /* reserve register for parameters */
+ /* parlist -> [ param { `,' param } ] */
+ FuncState *fs = ls->fs;
+ Proto *f = fs->f;
+ int nparams = 0;
+ f->is_vararg = 0;
+ if (ls->t.token != ')') { /* is `parlist' not empty? */
+ do {
+ switch (ls->t.token) {
+ case TK_NAME: { /* param -> NAME */
+ new_localvar(ls, str_checkname(ls));
+ nparams++;
+ break;
+ }
+ case TK_DOTS: { /* param -> `...' */
+ luaX_next(ls);
+ f->is_vararg = 1;
+ break;
+ }
+ default: luaX_syntaxerror(ls, "<name> or " LUA_QL("...") " expected");
+ }
+ } while (!f->is_vararg && testnext(ls, ','));
+ }
+ adjustlocalvars(ls, nparams);
+ f->numparams = cast_byte(fs->nactvar);
+ luaK_reserveregs(fs, fs->nactvar); /* reserve register for parameters */
}
static void body (LexState *ls, expdesc *e, int ismethod, int line) {
- /* body -> `(' parlist `)' block END */
- FuncState new_fs;
- BlockCnt bl;
- new_fs.f = addprototype(ls);
- new_fs.f->linedefined = line;
- open_func(ls, &new_fs, &bl);
- checknext(ls, '(');
- if (ismethod) {
- new_localvarliteral(ls, "self"); /* create 'self' parameter */
- adjustlocalvars(ls, 1);
- }
- parlist(ls);
- checknext(ls, ')');
- statlist(ls);
- new_fs.f->lastlinedefined = ls->linenumber;
- check_match(ls, TK_END, TK_FUNCTION, line);
- codeclosure(ls, e);
- close_func(ls);
+ /* body -> `(' parlist `)' block END */
+ FuncState new_fs;
+ BlockCnt bl;
+ new_fs.f = addprototype(ls);
+ new_fs.f->linedefined = line;
+ open_func(ls, &new_fs, &bl);
+ checknext(ls, '(');
+ if (ismethod) {
+ new_localvarliteral(ls, "self"); /* create 'self' parameter */
+ adjustlocalvars(ls, 1);
+ }
+ parlist(ls);
+ checknext(ls, ')');
+ statlist(ls);
+ new_fs.f->lastlinedefined = ls->linenumber;
+ check_match(ls, TK_END, TK_FUNCTION, line);
+ codeclosure(ls, e);
+ close_func(ls);
}
static int explist (LexState *ls, expdesc *v) {
- /* explist -> expr { `,' expr } */
- int n = 1; /* at least one expression */
- expr(ls, v);
- while (testnext(ls, ',')) {
- luaK_exp2nextreg(ls->fs, v);
- expr(ls, v);
- n++;
- }
- return n;
+ /* explist -> expr { `,' expr } */
+ int n = 1; /* at least one expression */
+ expr(ls, v);
+ while (testnext(ls, ',')) {
+ luaK_exp2nextreg(ls->fs, v);
+ expr(ls, v);
+ n++;
+ }
+ return n;
}
static void funcargs (LexState *ls, expdesc *f, int line) {
- FuncState *fs = ls->fs;
- expdesc args;
- int base, nparams;
- switch (ls->t.token) {
- case '(': { /* funcargs -> `(' [ explist ] `)' */
- luaX_next(ls);
- if (ls->t.token == ')') /* arg list is empty? */
- args.k = VVOID;
- else {
- explist(ls, &args);
- luaK_setmultret(fs, &args);
- }
- check_match(ls, ')', '(', line);
- break;
- }
- case '{': { /* funcargs -> constructor */
- constructor(ls, &args);
- break;
- }
- case TK_STRING: { /* funcargs -> STRING */
- codestring(ls, &args, ls->t.seminfo.ts);
- luaX_next(ls); /* must use `seminfo' before `next' */
- break;
- }
- default: {
- luaX_syntaxerror(ls, "function arguments expected");
- }
- }
- lua_assert(f->k == VNONRELOC);
- base = f->u.info; /* base register for call */
- if (hasmultret(args.k))
- nparams = LUA_MULTRET; /* open call */
- else {
- if (args.k != VVOID)
- luaK_exp2nextreg(fs, &args); /* close last argument */
- nparams = fs->freereg - (base+1);
- }
- init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
- luaK_fixline(fs, line);
- fs->freereg = base+1; /* call remove function and arguments and leaves
+ FuncState *fs = ls->fs;
+ expdesc args;
+ int base, nparams;
+ switch (ls->t.token) {
+ case '(': { /* funcargs -> `(' [ explist ] `)' */
+ luaX_next(ls);
+ if (ls->t.token == ')') /* arg list is empty? */
+ args.k = VVOID;
+ else {
+ explist(ls, &args);
+ luaK_setmultret(fs, &args);
+ }
+ check_match(ls, ')', '(', line);
+ break;
+ }
+ case '{': { /* funcargs -> constructor */
+ constructor(ls, &args);
+ break;
+ }
+ case TK_STRING: { /* funcargs -> STRING */
+ codestring(ls, &args, ls->t.seminfo.ts);
+ luaX_next(ls); /* must use `seminfo' before `next' */
+ break;
+ }
+ default: {
+ luaX_syntaxerror(ls, "function arguments expected");
+ }
+ }
+ lua_assert(f->k == VNONRELOC);
+ base = f->u.info; /* base register for call */
+ if (hasmultret(args.k))
+ nparams = LUA_MULTRET; /* open call */
+ else {
+ if (args.k != VVOID)
+ luaK_exp2nextreg(fs, &args); /* close last argument */
+ nparams = fs->freereg - (base+1);
+ }
+ init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
+ luaK_fixline(fs, line);
+ fs->freereg = base+1; /* call remove function and arguments and leaves
(unless changed) one result */
}
@@ -875,159 +875,159 @@ static void funcargs (LexState *ls, expdesc *f, int line) {
static void primaryexp (LexState *ls, expdesc *v) {
- /* primaryexp -> NAME | '(' expr ')' */
- switch (ls->t.token) {
- case '(': {
- int line = ls->linenumber;
- luaX_next(ls);
- expr(ls, v);
- check_match(ls, ')', '(', line);
- luaK_dischargevars(ls->fs, v);
- return;
- }
- case TK_NAME: {
- singlevar(ls, v);
- return;
- }
- default: {
- luaX_syntaxerror(ls, "unexpected symbol");
- }
- }
+ /* primaryexp -> NAME | '(' expr ')' */
+ switch (ls->t.token) {
+ case '(': {
+ int line = ls->linenumber;
+ luaX_next(ls);
+ expr(ls, v);
+ check_match(ls, ')', '(', line);
+ luaK_dischargevars(ls->fs, v);
+ return;
+ }
+ case TK_NAME: {
+ singlevar(ls, v);
+ return;
+ }
+ default: {
+ luaX_syntaxerror(ls, "unexpected symbol");
+ }
+ }
}
static void suffixedexp (LexState *ls, expdesc *v) {
- /* suffixedexp ->
- primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
- FuncState *fs = ls->fs;
- int line = ls->linenumber;
- primaryexp(ls, v);
- for (;;) {
- switch (ls->t.token) {
- case '.': { /* fieldsel */
- fieldsel(ls, v);
- break;
- }
- case '[': { /* `[' exp1 `]' */
- expdesc key;
- luaK_exp2anyregup(fs, v);
- yindex(ls, &key);
- luaK_indexed(fs, v, &key);
- break;
- }
- case ':': { /* `:' NAME funcargs */
- expdesc key;
- luaX_next(ls);
- checkname(ls, &key);
- luaK_self(fs, v, &key);
- funcargs(ls, v, line);
- break;
- }
- case '(': case TK_STRING: case '{': { /* funcargs */
- luaK_exp2nextreg(fs, v);
- funcargs(ls, v, line);
- break;
- }
- default: return;
- }
- }
+ /* suffixedexp ->
+ primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
+ FuncState *fs = ls->fs;
+ int line = ls->linenumber;
+ primaryexp(ls, v);
+ for (;;) {
+ switch (ls->t.token) {
+ case '.': { /* fieldsel */
+ fieldsel(ls, v);
+ break;
+ }
+ case '[': { /* `[' exp1 `]' */
+ expdesc key;
+ luaK_exp2anyregup(fs, v);
+ yindex(ls, &key);
+ luaK_indexed(fs, v, &key);
+ break;
+ }
+ case ':': { /* `:' NAME funcargs */
+ expdesc key;
+ luaX_next(ls);
+ checkname(ls, &key);
+ luaK_self(fs, v, &key);
+ funcargs(ls, v, line);
+ break;
+ }
+ case '(': case TK_STRING: case '{': { /* funcargs */
+ luaK_exp2nextreg(fs, v);
+ funcargs(ls, v, line);
+ break;
+ }
+ default: return;
+ }
+ }
}
static void simpleexp (LexState *ls, expdesc *v) {
- /* simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... |
- constructor | FUNCTION body | suffixedexp */
- switch (ls->t.token) {
- case TK_NUMBER: {
- init_exp(v, VKNUM, 0);
- v->u.nval = ls->t.seminfo.r;
- break;
- }
- case TK_STRING: {
- codestring(ls, v, ls->t.seminfo.ts);
- break;
- }
- case TK_NIL: {
- init_exp(v, VNIL, 0);
- break;
- }
- case TK_TRUE: {
- init_exp(v, VTRUE, 0);
- break;
- }
- case TK_FALSE: {
- init_exp(v, VFALSE, 0);
- break;
- }
- case TK_DOTS: { /* vararg */
- FuncState *fs = ls->fs;
- check_condition(ls, fs->f->is_vararg,
- "cannot use " LUA_QL("...") " outside a vararg function");
- init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
- break;
- }
- case '{': { /* constructor */
- constructor(ls, v);
- return;
- }
- case TK_FUNCTION: {
- luaX_next(ls);
- body(ls, v, 0, ls->linenumber);
- return;
- }
- default: {
- suffixedexp(ls, v);
- return;
- }
- }
- luaX_next(ls);
+ /* simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... |
+ constructor | FUNCTION body | suffixedexp */
+ switch (ls->t.token) {
+ case TK_NUMBER: {
+ init_exp(v, VKNUM, 0);
+ v->u.nval = ls->t.seminfo.r;
+ break;
+ }
+ case TK_STRING: {
+ codestring(ls, v, ls->t.seminfo.ts);
+ break;
+ }
+ case TK_NIL: {
+ init_exp(v, VNIL, 0);
+ break;
+ }
+ case TK_TRUE: {
+ init_exp(v, VTRUE, 0);
+ break;
+ }
+ case TK_FALSE: {
+ init_exp(v, VFALSE, 0);
+ break;
+ }
+ case TK_DOTS: { /* vararg */
+ FuncState *fs = ls->fs;
+ check_condition(ls, fs->f->is_vararg,
+ "cannot use " LUA_QL("...") " outside a vararg function");
+ init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
+ break;
+ }
+ case '{': { /* constructor */
+ constructor(ls, v);
+ return;
+ }
+ case TK_FUNCTION: {
+ luaX_next(ls);
+ body(ls, v, 0, ls->linenumber);
+ return;
+ }
+ default: {
+ suffixedexp(ls, v);
+ return;
+ }
+ }
+ luaX_next(ls);
}
static UnOpr getunopr (int op) {
- switch (op) {
- case TK_NOT: return OPR_NOT;
- case '-': return OPR_MINUS;
- case '#': return OPR_LEN;
- default: return OPR_NOUNOPR;
- }
+ switch (op) {
+ case TK_NOT: return OPR_NOT;
+ case '-': return OPR_MINUS;
+ case '#': return OPR_LEN;
+ default: return OPR_NOUNOPR;
+ }
}
static BinOpr getbinopr (int op) {
- switch (op) {
- case '+': return OPR_ADD;
- case '-': return OPR_SUB;
- case '*': return OPR_MUL;
- case '/': return OPR_DIV;
- case '%': return OPR_MOD;
- case '^': return OPR_POW;
- case TK_CONCAT: return OPR_CONCAT;
- case TK_NE: return OPR_NE;
- case TK_EQ: return OPR_EQ;
- case '<': return OPR_LT;
- case TK_LE: return OPR_LE;
- case '>': return OPR_GT;
- case TK_GE: return OPR_GE;
- case TK_AND: return OPR_AND;
- case TK_OR: return OPR_OR;
- default: return OPR_NOBINOPR;
- }
+ switch (op) {
+ case '+': return OPR_ADD;
+ case '-': return OPR_SUB;
+ case '*': return OPR_MUL;
+ case '/': return OPR_DIV;
+ case '%': return OPR_MOD;
+ case '^': return OPR_POW;
+ case TK_CONCAT: return OPR_CONCAT;
+ case TK_NE: return OPR_NE;
+ case TK_EQ: return OPR_EQ;
+ case '<': return OPR_LT;
+ case TK_LE: return OPR_LE;
+ case '>': return OPR_GT;
+ case TK_GE: return OPR_GE;
+ case TK_AND: return OPR_AND;
+ case TK_OR: return OPR_OR;
+ default: return OPR_NOBINOPR;
+ }
}
static const struct {
- lu_byte left; /* left priority for each binary operator */
- lu_byte right; /* right priority */
+ lu_byte left; /* left priority for each binary operator */
+ lu_byte right; /* right priority */
} priority[] = { /* ORDER OPR */
- {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `*' `/' `%' */
- {10, 9}, {5, 4}, /* ^, .. (right associative) */
- {3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */
- {3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */
- {2, 2}, {1, 1} /* and, or */
+ {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `*' `/' `%' */
+ {10, 9}, {5, 4}, /* ^, .. (right associative) */
+ {3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */
+ {3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */
+ {2, 2}, {1, 1} /* and, or */
};
-#define UNARY_PRIORITY 8 /* priority for unary operators */
+#define UNARY_PRIORITY 8 /* priority for unary operators */
/*
@@ -1035,37 +1035,37 @@ static const struct {
** where `binop' is any binary operator with a priority higher than `limit'
*/
static BinOpr subexpr (LexState *ls, expdesc *v, int limit) {
- BinOpr op;
- UnOpr uop;
- enterlevel(ls);
- uop = getunopr(ls->t.token);
- if (uop != OPR_NOUNOPR) {
- int line = ls->linenumber;
- luaX_next(ls);
- subexpr(ls, v, UNARY_PRIORITY);
- luaK_prefix(ls->fs, uop, v, line);
- }
- else simpleexp(ls, v);
- /* expand while operators have priorities higher than `limit' */
- op = getbinopr(ls->t.token);
- while (op != OPR_NOBINOPR && priority[op].left > limit) {
- expdesc v2;
- BinOpr nextop;
- int line = ls->linenumber;
- luaX_next(ls);
- luaK_infix(ls->fs, op, v);
- /* read sub-expression with higher priority */
- nextop = subexpr(ls, &v2, priority[op].right);
- luaK_posfix(ls->fs, op, v, &v2, line);
- op = nextop;
- }
- leavelevel(ls);
- return op; /* return first untreated operator */
+ BinOpr op;
+ UnOpr uop;
+ enterlevel(ls);
+ uop = getunopr(ls->t.token);
+ if (uop != OPR_NOUNOPR) {
+ int line = ls->linenumber;
+ luaX_next(ls);
+ subexpr(ls, v, UNARY_PRIORITY);
+ luaK_prefix(ls->fs, uop, v, line);
+ }
+ else simpleexp(ls, v);
+ /* expand while operators have priorities higher than `limit' */
+ op = getbinopr(ls->t.token);
+ while (op != OPR_NOBINOPR && priority[op].left > limit) {
+ expdesc v2;
+ BinOpr nextop;
+ int line = ls->linenumber;
+ luaX_next(ls);
+ luaK_infix(ls->fs, op, v);
+ /* read sub-expression with higher priority */
+ nextop = subexpr(ls, &v2, priority[op].right);
+ luaK_posfix(ls->fs, op, v, &v2, line);
+ op = nextop;
+ }
+ leavelevel(ls);
+ return op; /* return first untreated operator */
}
static void expr (LexState *ls, expdesc *v) {
- subexpr(ls, v, 0);
+ subexpr(ls, v, 0);
}
/* }==================================================================== */
@@ -1080,12 +1080,12 @@ static void expr (LexState *ls, expdesc *v) {
static void block (LexState *ls) {
- /* block -> statlist */
- FuncState *fs = ls->fs;
- BlockCnt bl;
- enterblock(fs, &bl, 0);
- statlist(ls);
- leaveblock(fs);
+ /* block -> statlist */
+ FuncState *fs = ls->fs;
+ BlockCnt bl;
+ enterblock(fs, &bl, 0);
+ statlist(ls);
+ leaveblock(fs);
}
@@ -1094,8 +1094,8 @@ static void block (LexState *ls) {
** assignment
*/
struct LHS_assign {
- struct LHS_assign *prev;
- expdesc v; /* variable (global, local, upvalue, or indexed) */
+ struct LHS_assign *prev;
+ expdesc v; /* variable (global, local, upvalue, or indexed) */
};
@@ -1106,492 +1106,492 @@ struct LHS_assign {
** use this safe copy in the previous assignment.
*/
static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) {
- FuncState *fs = ls->fs;
- int extra = fs->freereg; /* eventual position to save local variable */
- int conflict = 0;
- for (; lh; lh = lh->prev) { /* check all previous assignments */
- if (lh->v.k == VINDEXED) { /* assigning to a table? */
- /* table is the upvalue/local being assigned now? */
- if (lh->v.u.ind.vt == v->k && lh->v.u.ind.t == v->u.info) {
- conflict = 1;
- lh->v.u.ind.vt = VLOCAL;
- lh->v.u.ind.t = extra; /* previous assignment will use safe copy */
- }
- /* index is the local being assigned? (index cannot be upvalue) */
- if (v->k == VLOCAL && lh->v.u.ind.idx == v->u.info) {
- conflict = 1;
- lh->v.u.ind.idx = extra; /* previous assignment will use safe copy */
- }
- }
- }
- if (conflict) {
- /* copy upvalue/local value to a temporary (in position 'extra') */
- OpCode op = (v->k == VLOCAL) ? OP_MOVE : OP_GETUPVAL;
- luaK_codeABC(fs, op, extra, v->u.info, 0);
- luaK_reserveregs(fs, 1);
- }
+ FuncState *fs = ls->fs;
+ int extra = fs->freereg; /* eventual position to save local variable */
+ int conflict = 0;
+ for (; lh; lh = lh->prev) { /* check all previous assignments */
+ if (lh->v.k == VINDEXED) { /* assigning to a table? */
+ /* table is the upvalue/local being assigned now? */
+ if (lh->v.u.ind.vt == v->k && lh->v.u.ind.t == v->u.info) {
+ conflict = 1;
+ lh->v.u.ind.vt = VLOCAL;
+ lh->v.u.ind.t = extra; /* previous assignment will use safe copy */
+ }
+ /* index is the local being assigned? (index cannot be upvalue) */
+ if (v->k == VLOCAL && lh->v.u.ind.idx == v->u.info) {
+ conflict = 1;
+ lh->v.u.ind.idx = extra; /* previous assignment will use safe copy */
+ }
+ }
+ }
+ if (conflict) {
+ /* copy upvalue/local value to a temporary (in position 'extra') */
+ OpCode op = (v->k == VLOCAL) ? OP_MOVE : OP_GETUPVAL;
+ luaK_codeABC(fs, op, extra, v->u.info, 0);
+ luaK_reserveregs(fs, 1);
+ }
}
static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) {
- expdesc e;
- check_condition(ls, vkisvar(lh->v.k), "syntax error");
- if (testnext(ls, ',')) { /* assignment -> ',' suffixedexp assignment */
- struct LHS_assign nv;
- nv.prev = lh;
- suffixedexp(ls, &nv.v);
- if (nv.v.k != VINDEXED)
- check_conflict(ls, lh, &nv.v);
- checklimit(ls->fs, nvars + ls->L->nCcalls, LUAI_MAXCCALLS,
- "C levels");
- assignment(ls, &nv, nvars+1);
- }
- else { /* assignment -> `=' explist */
- int nexps;
- checknext(ls, '=');
- nexps = explist(ls, &e);
- if (nexps != nvars) {
- adjust_assign(ls, nvars, nexps, &e);
- if (nexps > nvars)
- ls->fs->freereg -= nexps - nvars; /* remove extra values */
- }
- else {
- luaK_setoneret(ls->fs, &e); /* close last expression */
- luaK_storevar(ls->fs, &lh->v, &e);
- return; /* avoid default */
- }
- }
- init_exp(&e, VNONRELOC, ls->fs->freereg-1); /* default assignment */
- luaK_storevar(ls->fs, &lh->v, &e);
+ expdesc e;
+ check_condition(ls, vkisvar(lh->v.k), "syntax error");
+ if (testnext(ls, ',')) { /* assignment -> ',' suffixedexp assignment */
+ struct LHS_assign nv;
+ nv.prev = lh;
+ suffixedexp(ls, &nv.v);
+ if (nv.v.k != VINDEXED)
+ check_conflict(ls, lh, &nv.v);
+ checklimit(ls->fs, nvars + ls->L->nCcalls, LUAI_MAXCCALLS,
+ "C levels");
+ assignment(ls, &nv, nvars+1);
+ }
+ else { /* assignment -> `=' explist */
+ int nexps;
+ checknext(ls, '=');
+ nexps = explist(ls, &e);
+ if (nexps != nvars) {
+ adjust_assign(ls, nvars, nexps, &e);
+ if (nexps > nvars)
+ ls->fs->freereg -= nexps - nvars; /* remove extra values */
+ }
+ else {
+ luaK_setoneret(ls->fs, &e); /* close last expression */
+ luaK_storevar(ls->fs, &lh->v, &e);
+ return; /* avoid default */
+ }
+ }
+ init_exp(&e, VNONRELOC, ls->fs->freereg-1); /* default assignment */
+ luaK_storevar(ls->fs, &lh->v, &e);
}
static int cond (LexState *ls) {
- /* cond -> exp */
- expdesc v;
- expr(ls, &v); /* read condition */
- if (v.k == VNIL) v.k = VFALSE; /* `falses' are all equal here */
- luaK_goiftrue(ls->fs, &v);
- return v.f;
+ /* cond -> exp */
+ expdesc v;
+ expr(ls, &v); /* read condition */
+ if (v.k == VNIL) v.k = VFALSE; /* `falses' are all equal here */
+ luaK_goiftrue(ls->fs, &v);
+ return v.f;
}
static void gotostat (LexState *ls, int pc) {
- int line = ls->linenumber;
- TString *label;
- int g;
- if (testnext(ls, TK_GOTO))
- label = str_checkname(ls);
- else {
- luaX_next(ls); /* skip break */
- label = luaS_new(ls->L, "break");
- }
- g = newlabelentry(ls, &ls->dyd->gt, label, line, pc);
- findlabel(ls, g); /* close it if label already defined */
+ int line = ls->linenumber;
+ TString *label;
+ int g;
+ if (testnext(ls, TK_GOTO))
+ label = str_checkname(ls);
+ else {
+ luaX_next(ls); /* skip break */
+ label = luaS_new(ls->L, "break");
+ }
+ g = newlabelentry(ls, &ls->dyd->gt, label, line, pc);
+ findlabel(ls, g); /* close it if label already defined */
}
/* check for repeated labels on the same block */
static void checkrepeated (FuncState *fs, Labellist *ll, TString *label) {
- int i;
- for (i = fs->bl->firstlabel; i < ll->n; i++) {
- if (luaS_eqstr(label, ll->arr[i].name)) {
- const char *msg = luaO_pushfstring(fs->ls->L,
- "label " LUA_QS " already defined on line %d",
- getstr(label), ll->arr[i].line);
- semerror(fs->ls, msg);
- }
- }
+ int i;
+ for (i = fs->bl->firstlabel; i < ll->n; i++) {
+ if (luaS_eqstr(label, ll->arr[i].name)) {
+ const char *msg = luaO_pushfstring(fs->ls->L,
+ "label " LUA_QS " already defined on line %d",
+ getstr(label), ll->arr[i].line);
+ semerror(fs->ls, msg);
+ }
+ }
}
/* skip no-op statements */
static void skipnoopstat (LexState *ls) {
- while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
- statement(ls);
+ while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
+ statement(ls);
}
static void labelstat (LexState *ls, TString *label, int line) {
- /* label -> '::' NAME '::' */
- FuncState *fs = ls->fs;
- Labellist *ll = &ls->dyd->label;
- int l; /* index of new label being created */
- checkrepeated(fs, ll, label); /* check for repeated labels */
- checknext(ls, TK_DBCOLON); /* skip double colon */
- /* create new entry for this label */
- l = newlabelentry(ls, ll, label, line, fs->pc);
- skipnoopstat(ls); /* skip other no-op statements */
- if (block_follow(ls, 0)) { /* label is last no-op statement in the block? */
- /* assume that locals are already out of scope */
- ll->arr[l].nactvar = fs->bl->nactvar;
- }
- findgotos(ls, &ll->arr[l]);
+ /* label -> '::' NAME '::' */
+ FuncState *fs = ls->fs;
+ Labellist *ll = &ls->dyd->label;
+ int l; /* index of new label being created */
+ checkrepeated(fs, ll, label); /* check for repeated labels */
+ checknext(ls, TK_DBCOLON); /* skip double colon */
+ /* create new entry for this label */
+ l = newlabelentry(ls, ll, label, line, fs->pc);
+ skipnoopstat(ls); /* skip other no-op statements */
+ if (block_follow(ls, 0)) { /* label is last no-op statement in the block? */
+ /* assume that locals are already out of scope */
+ ll->arr[l].nactvar = fs->bl->nactvar;
+ }
+ findgotos(ls, &ll->arr[l]);
}
static void whilestat (LexState *ls, int line) {
- /* whilestat -> WHILE cond DO block END */
- FuncState *fs = ls->fs;
- int whileinit;
- int condexit;
- BlockCnt bl;
- luaX_next(ls); /* skip WHILE */
- whileinit = luaK_getlabel(fs);
- condexit = cond(ls);
- enterblock(fs, &bl, 1);
- checknext(ls, TK_DO);
- block(ls);
- luaK_jumpto(fs, whileinit);
- check_match(ls, TK_END, TK_WHILE, line);
- leaveblock(fs);
- luaK_patchtohere(fs, condexit); /* false conditions finish the loop */
+ /* whilestat -> WHILE cond DO block END */
+ FuncState *fs = ls->fs;
+ int whileinit;
+ int condexit;
+ BlockCnt bl;
+ luaX_next(ls); /* skip WHILE */
+ whileinit = luaK_getlabel(fs);
+ condexit = cond(ls);
+ enterblock(fs, &bl, 1);
+ checknext(ls, TK_DO);
+ block(ls);
+ luaK_jumpto(fs, whileinit);
+ check_match(ls, TK_END, TK_WHILE, line);
+ leaveblock(fs);
+ luaK_patchtohere(fs, condexit); /* false conditions finish the loop */
}
static void repeatstat (LexState *ls, int line) {
- /* repeatstat -> REPEAT block UNTIL cond */
- int condexit;
- FuncState *fs = ls->fs;
- int repeat_init = luaK_getlabel(fs);
- BlockCnt bl1, bl2;
- enterblock(fs, &bl1, 1); /* loop block */
- enterblock(fs, &bl2, 0); /* scope block */
- luaX_next(ls); /* skip REPEAT */
- statlist(ls);
- check_match(ls, TK_UNTIL, TK_REPEAT, line);
- condexit = cond(ls); /* read condition (inside scope block) */
- if (bl2.upval) /* upvalues? */
- luaK_patchclose(fs, condexit, bl2.nactvar);
- leaveblock(fs); /* finish scope */
- luaK_patchlist(fs, condexit, repeat_init); /* close the loop */
- leaveblock(fs); /* finish loop */
+ /* repeatstat -> REPEAT block UNTIL cond */
+ int condexit;
+ FuncState *fs = ls->fs;
+ int repeat_init = luaK_getlabel(fs);
+ BlockCnt bl1, bl2;
+ enterblock(fs, &bl1, 1); /* loop block */
+ enterblock(fs, &bl2, 0); /* scope block */
+ luaX_next(ls); /* skip REPEAT */
+ statlist(ls);
+ check_match(ls, TK_UNTIL, TK_REPEAT, line);
+ condexit = cond(ls); /* read condition (inside scope block) */
+ if (bl2.upval) /* upvalues? */
+ luaK_patchclose(fs, condexit, bl2.nactvar);
+ leaveblock(fs); /* finish scope */
+ luaK_patchlist(fs, condexit, repeat_init); /* close the loop */
+ leaveblock(fs); /* finish loop */
}
static int exp1 (LexState *ls) {
- expdesc e;
- int reg;
- expr(ls, &e);
- luaK_exp2nextreg(ls->fs, &e);
- lua_assert(e.k == VNONRELOC);
- reg = e.u.info;
- return reg;
+ expdesc e;
+ int reg;
+ expr(ls, &e);
+ luaK_exp2nextreg(ls->fs, &e);
+ lua_assert(e.k == VNONRELOC);
+ reg = e.u.info;
+ return reg;
}
static void forbody (LexState *ls, int base, int line, int nvars, int isnum) {
- /* forbody -> DO block */
- BlockCnt bl;
- FuncState *fs = ls->fs;
- int prep, endfor;
- adjustlocalvars(ls, 3); /* control variables */
- checknext(ls, TK_DO);
- prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs);
- enterblock(fs, &bl, 0); /* scope for declared variables */
- adjustlocalvars(ls, nvars);
- luaK_reserveregs(fs, nvars);
- block(ls);
- leaveblock(fs); /* end of scope for declared variables */
- luaK_patchtohere(fs, prep);
- if (isnum) /* numeric for? */
- endfor = luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP);
- else { /* generic for */
- luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars);
- luaK_fixline(fs, line);
- endfor = luaK_codeAsBx(fs, OP_TFORLOOP, base + 2, NO_JUMP);
- }
- luaK_patchlist(fs, endfor, prep + 1);
- luaK_fixline(fs, line);
+ /* forbody -> DO block */
+ BlockCnt bl;
+ FuncState *fs = ls->fs;
+ int prep, endfor;
+ adjustlocalvars(ls, 3); /* control variables */
+ checknext(ls, TK_DO);
+ prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs);
+ enterblock(fs, &bl, 0); /* scope for declared variables */
+ adjustlocalvars(ls, nvars);
+ luaK_reserveregs(fs, nvars);
+ block(ls);
+ leaveblock(fs); /* end of scope for declared variables */
+ luaK_patchtohere(fs, prep);
+ if (isnum) /* numeric for? */
+ endfor = luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP);
+ else { /* generic for */
+ luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars);
+ luaK_fixline(fs, line);
+ endfor = luaK_codeAsBx(fs, OP_TFORLOOP, base + 2, NO_JUMP);
+ }
+ luaK_patchlist(fs, endfor, prep + 1);
+ luaK_fixline(fs, line);
}
static void fornum (LexState *ls, TString *varname, int line) {
- /* fornum -> NAME = exp1,exp1[,exp1] forbody */
- FuncState *fs = ls->fs;
- int base = fs->freereg;
- new_localvarliteral(ls, "(for index)");
- new_localvarliteral(ls, "(for limit)");
- new_localvarliteral(ls, "(for step)");
- new_localvar(ls, varname);
- checknext(ls, '=');
- exp1(ls); /* initial value */
- checknext(ls, ',');
- exp1(ls); /* limit */
- if (testnext(ls, ','))
- exp1(ls); /* optional step */
- else { /* default step = 1 */
- luaK_codek(fs, fs->freereg, luaK_numberK(fs, 1));
- luaK_reserveregs(fs, 1);
- }
- forbody(ls, base, line, 1, 1);
+ /* fornum -> NAME = exp1,exp1[,exp1] forbody */
+ FuncState *fs = ls->fs;
+ int base = fs->freereg;
+ new_localvarliteral(ls, "(for index)");
+ new_localvarliteral(ls, "(for limit)");
+ new_localvarliteral(ls, "(for step)");
+ new_localvar(ls, varname);
+ checknext(ls, '=');
+ exp1(ls); /* initial value */
+ checknext(ls, ',');
+ exp1(ls); /* limit */
+ if (testnext(ls, ','))
+ exp1(ls); /* optional step */
+ else { /* default step = 1 */
+ luaK_codek(fs, fs->freereg, luaK_numberK(fs, 1));
+ luaK_reserveregs(fs, 1);
+ }
+ forbody(ls, base, line, 1, 1);
}
static void forlist (LexState *ls, TString *indexname) {
- /* forlist -> NAME {,NAME} IN explist forbody */
- FuncState *fs = ls->fs;
- expdesc e;
- int nvars = 4; /* gen, state, control, plus at least one declared var */
- int line;
- int base = fs->freereg;
- /* create control variables */
- new_localvarliteral(ls, "(for generator)");
- new_localvarliteral(ls, "(for state)");
- new_localvarliteral(ls, "(for control)");
- /* create declared variables */
- new_localvar(ls, indexname);
- while (testnext(ls, ',')) {
- new_localvar(ls, str_checkname(ls));
- nvars++;
- }
- checknext(ls, TK_IN);
- line = ls->linenumber;
- adjust_assign(ls, 3, explist(ls, &e), &e);
- luaK_checkstack(fs, 3); /* extra space to call generator */
- forbody(ls, base, line, nvars - 3, 0);
+ /* forlist -> NAME {,NAME} IN explist forbody */
+ FuncState *fs = ls->fs;
+ expdesc e;
+ int nvars = 4; /* gen, state, control, plus at least one declared var */
+ int line;
+ int base = fs->freereg;
+ /* create control variables */
+ new_localvarliteral(ls, "(for generator)");
+ new_localvarliteral(ls, "(for state)");
+ new_localvarliteral(ls, "(for control)");
+ /* create declared variables */
+ new_localvar(ls, indexname);
+ while (testnext(ls, ',')) {
+ new_localvar(ls, str_checkname(ls));
+ nvars++;
+ }
+ checknext(ls, TK_IN);
+ line = ls->linenumber;
+ adjust_assign(ls, 3, explist(ls, &e), &e);
+ luaK_checkstack(fs, 3); /* extra space to call generator */
+ forbody(ls, base, line, nvars - 3, 0);
}
static void forstat (LexState *ls, int line) {
- /* forstat -> FOR (fornum | forlist) END */
- FuncState *fs = ls->fs;
- TString *varname;
- BlockCnt bl;
- enterblock(fs, &bl, 1); /* scope for loop and control variables */
- luaX_next(ls); /* skip `for' */
- varname = str_checkname(ls); /* first variable name */
- switch (ls->t.token) {
- case '=': fornum(ls, varname, line); break;
- case ',': case TK_IN: forlist(ls, varname); break;
- default: luaX_syntaxerror(ls, LUA_QL("=") " or " LUA_QL("in") " expected");
- }
- check_match(ls, TK_END, TK_FOR, line);
- leaveblock(fs); /* loop scope (`break' jumps to this point) */
+ /* forstat -> FOR (fornum | forlist) END */
+ FuncState *fs = ls->fs;
+ TString *varname;
+ BlockCnt bl;
+ enterblock(fs, &bl, 1); /* scope for loop and control variables */
+ luaX_next(ls); /* skip `for' */
+ varname = str_checkname(ls); /* first variable name */
+ switch (ls->t.token) {
+ case '=': fornum(ls, varname, line); break;
+ case ',': case TK_IN: forlist(ls, varname); break;
+ default: luaX_syntaxerror(ls, LUA_QL("=") " or " LUA_QL("in") " expected");
+ }
+ check_match(ls, TK_END, TK_FOR, line);
+ leaveblock(fs); /* loop scope (`break' jumps to this point) */
}
static void test_then_block (LexState *ls, int *escapelist) {
- /* test_then_block -> [IF | ELSEIF] cond THEN block */
- BlockCnt bl;
- FuncState *fs = ls->fs;
- expdesc v;
- int jf; /* instruction to skip 'then' code (if condition is false) */
- luaX_next(ls); /* skip IF or ELSEIF */
- expr(ls, &v); /* read condition */
- checknext(ls, TK_THEN);
- if (ls->t.token == TK_GOTO || ls->t.token == TK_BREAK) {
- luaK_goiffalse(ls->fs, &v); /* will jump to label if condition is true */
- enterblock(fs, &bl, 0); /* must enter block before 'goto' */
- gotostat(ls, v.t); /* handle goto/break */
- skipnoopstat(ls); /* skip other no-op statements */
- if (block_follow(ls, 0)) { /* 'goto' is the entire block? */
- leaveblock(fs);
- return; /* and that is it */
- }
- else /* must skip over 'then' part if condition is false */
- jf = luaK_jump(fs);
- }
- else { /* regular case (not goto/break) */
- luaK_goiftrue(ls->fs, &v); /* skip over block if condition is false */
- enterblock(fs, &bl, 0);
- jf = v.f;
- }
- statlist(ls); /* `then' part */
- leaveblock(fs);
- if (ls->t.token == TK_ELSE ||
- ls->t.token == TK_ELSEIF) /* followed by 'else'/'elseif'? */
- luaK_concat(fs, escapelist, luaK_jump(fs)); /* must jump over it */
- luaK_patchtohere(fs, jf);
+ /* test_then_block -> [IF | ELSEIF] cond THEN block */
+ BlockCnt bl;
+ FuncState *fs = ls->fs;
+ expdesc v;
+ int jf; /* instruction to skip 'then' code (if condition is false) */
+ luaX_next(ls); /* skip IF or ELSEIF */
+ expr(ls, &v); /* read condition */
+ checknext(ls, TK_THEN);
+ if (ls->t.token == TK_GOTO || ls->t.token == TK_BREAK) {
+ luaK_goiffalse(ls->fs, &v); /* will jump to label if condition is true */
+ enterblock(fs, &bl, 0); /* must enter block before 'goto' */
+ gotostat(ls, v.t); /* handle goto/break */
+ skipnoopstat(ls); /* skip other no-op statements */
+ if (block_follow(ls, 0)) { /* 'goto' is the entire block? */
+ leaveblock(fs);
+ return; /* and that is it */
+ }
+ else /* must skip over 'then' part if condition is false */
+ jf = luaK_jump(fs);
+ }
+ else { /* regular case (not goto/break) */
+ luaK_goiftrue(ls->fs, &v); /* skip over block if condition is false */
+ enterblock(fs, &bl, 0);
+ jf = v.f;
+ }
+ statlist(ls); /* `then' part */
+ leaveblock(fs);
+ if (ls->t.token == TK_ELSE ||
+ ls->t.token == TK_ELSEIF) /* followed by 'else'/'elseif'? */
+ luaK_concat(fs, escapelist, luaK_jump(fs)); /* must jump over it */
+ luaK_patchtohere(fs, jf);
}
static void ifstat (LexState *ls, int line) {
- /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
- FuncState *fs = ls->fs;
- int escapelist = NO_JUMP; /* exit list for finished parts */
- test_then_block(ls, &escapelist); /* IF cond THEN block */
- while (ls->t.token == TK_ELSEIF)
- test_then_block(ls, &escapelist); /* ELSEIF cond THEN block */
- if (testnext(ls, TK_ELSE))
- block(ls); /* `else' part */
- check_match(ls, TK_END, TK_IF, line);
- luaK_patchtohere(fs, escapelist); /* patch escape list to 'if' end */
+ /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
+ FuncState *fs = ls->fs;
+ int escapelist = NO_JUMP; /* exit list for finished parts */
+ test_then_block(ls, &escapelist); /* IF cond THEN block */
+ while (ls->t.token == TK_ELSEIF)
+ test_then_block(ls, &escapelist); /* ELSEIF cond THEN block */
+ if (testnext(ls, TK_ELSE))
+ block(ls); /* `else' part */
+ check_match(ls, TK_END, TK_IF, line);
+ luaK_patchtohere(fs, escapelist); /* patch escape list to 'if' end */
}
static void localfunc (LexState *ls) {
- expdesc b;
- FuncState *fs = ls->fs;
- new_localvar(ls, str_checkname(ls)); /* new local variable */
- adjustlocalvars(ls, 1); /* enter its scope */
- body(ls, &b, 0, ls->linenumber); /* function created in next register */
- /* debug information will only see the variable after this point! */
- getlocvar(fs, b.u.info)->startpc = fs->pc;
+ expdesc b;
+ FuncState *fs = ls->fs;
+ new_localvar(ls, str_checkname(ls)); /* new local variable */
+ adjustlocalvars(ls, 1); /* enter its scope */
+ body(ls, &b, 0, ls->linenumber); /* function created in next register */
+ /* debug information will only see the variable after this point! */
+ getlocvar(fs, b.u.info)->startpc = fs->pc;
}
static void localstat (LexState *ls) {
- /* stat -> LOCAL NAME {`,' NAME} [`=' explist] */
- int nvars = 0;
- int nexps;
- expdesc e;
- do {
- new_localvar(ls, str_checkname(ls));
- nvars++;
- } while (testnext(ls, ','));
- if (testnext(ls, '='))
- nexps = explist(ls, &e);
- else {
- e.k = VVOID;
- nexps = 0;
- }
- adjust_assign(ls, nvars, nexps, &e);
- adjustlocalvars(ls, nvars);
+ /* stat -> LOCAL NAME {`,' NAME} [`=' explist] */
+ int nvars = 0;
+ int nexps;
+ expdesc e;
+ do {
+ new_localvar(ls, str_checkname(ls));
+ nvars++;
+ } while (testnext(ls, ','));
+ if (testnext(ls, '='))
+ nexps = explist(ls, &e);
+ else {
+ e.k = VVOID;
+ nexps = 0;
+ }
+ adjust_assign(ls, nvars, nexps, &e);
+ adjustlocalvars(ls, nvars);
}
static int funcname (LexState *ls, expdesc *v) {
- /* funcname -> NAME {fieldsel} [`:' NAME] */
- int ismethod = 0;
- singlevar(ls, v);
- while (ls->t.token == '.')
- fieldsel(ls, v);
- if (ls->t.token == ':') {
- ismethod = 1;
- fieldsel(ls, v);
- }
- return ismethod;
+ /* funcname -> NAME {fieldsel} [`:' NAME] */
+ int ismethod = 0;
+ singlevar(ls, v);
+ while (ls->t.token == '.')
+ fieldsel(ls, v);
+ if (ls->t.token == ':') {
+ ismethod = 1;
+ fieldsel(ls, v);
+ }
+ return ismethod;
}
static void funcstat (LexState *ls, int line) {
- /* funcstat -> FUNCTION funcname body */
- int ismethod;
- expdesc v, b;
- luaX_next(ls); /* skip FUNCTION */
- ismethod = funcname(ls, &v);
- body(ls, &b, ismethod, line);
- luaK_storevar(ls->fs, &v, &b);
- luaK_fixline(ls->fs, line); /* definition `happens' in the first line */
+ /* funcstat -> FUNCTION funcname body */
+ int ismethod;
+ expdesc v, b;
+ luaX_next(ls); /* skip FUNCTION */
+ ismethod = funcname(ls, &v);
+ body(ls, &b, ismethod, line);
+ luaK_storevar(ls->fs, &v, &b);
+ luaK_fixline(ls->fs, line); /* definition `happens' in the first line */
}
static void exprstat (LexState *ls) {
- /* stat -> func | assignment */
- FuncState *fs = ls->fs;
- struct LHS_assign v;
- suffixedexp(ls, &v.v);
- if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */
- v.prev = NULL;
- assignment(ls, &v, 1);
- }
- else { /* stat -> func */
- check_condition(ls, v.v.k == VCALL, "syntax error");
- SETARG_C(getcode(fs, &v.v), 1); /* call statement uses no results */
- }
+ /* stat -> func | assignment */
+ FuncState *fs = ls->fs;
+ struct LHS_assign v;
+ suffixedexp(ls, &v.v);
+ if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */
+ v.prev = NULL;
+ assignment(ls, &v, 1);
+ }
+ else { /* stat -> func */
+ check_condition(ls, v.v.k == VCALL, "syntax error");
+ SETARG_C(getcode(fs, &v.v), 1); /* call statement uses no results */
+ }
}
static void retstat (LexState *ls) {
- /* stat -> RETURN [explist] [';'] */
- FuncState *fs = ls->fs;
- expdesc e;
- int first, nret; /* registers with returned values */
- if (block_follow(ls, 1) || ls->t.token == ';')
- first = nret = 0; /* return no values */
- else {
- nret = explist(ls, &e); /* optional return values */
- if (hasmultret(e.k)) {
- luaK_setmultret(fs, &e);
- if (e.k == VCALL && nret == 1) { /* tail call? */
- SET_OPCODE(getcode(fs,&e), OP_TAILCALL);
- lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar);
- }
- first = fs->nactvar;
- nret = LUA_MULTRET; /* return all values */
- }
- else {
- if (nret == 1) /* only one single value? */
- first = luaK_exp2anyreg(fs, &e);
- else {
- luaK_exp2nextreg(fs, &e); /* values must go to the `stack' */
- first = fs->nactvar; /* return all `active' values */
- lua_assert(nret == fs->freereg - first);
- }
- }
- }
- luaK_ret(fs, first, nret);
- testnext(ls, ';'); /* skip optional semicolon */
+ /* stat -> RETURN [explist] [';'] */
+ FuncState *fs = ls->fs;
+ expdesc e;
+ int first, nret; /* registers with returned values */
+ if (block_follow(ls, 1) || ls->t.token == ';')
+ first = nret = 0; /* return no values */
+ else {
+ nret = explist(ls, &e); /* optional return values */
+ if (hasmultret(e.k)) {
+ luaK_setmultret(fs, &e);
+ if (e.k == VCALL && nret == 1) { /* tail call? */
+ SET_OPCODE(getcode(fs,&e), OP_TAILCALL);
+ lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar);
+ }
+ first = fs->nactvar;
+ nret = LUA_MULTRET; /* return all values */
+ }
+ else {
+ if (nret == 1) /* only one single value? */
+ first = luaK_exp2anyreg(fs, &e);
+ else {
+ luaK_exp2nextreg(fs, &e); /* values must go to the `stack' */
+ first = fs->nactvar; /* return all `active' values */
+ lua_assert(nret == fs->freereg - first);
+ }
+ }
+ }
+ luaK_ret(fs, first, nret);
+ testnext(ls, ';'); /* skip optional semicolon */
}
static void statement (LexState *ls) {
- int line = ls->linenumber; /* may be needed for error messages */
- enterlevel(ls);
- switch (ls->t.token) {
- case ';': { /* stat -> ';' (empty statement) */
- luaX_next(ls); /* skip ';' */
- break;
- }
- case TK_IF: { /* stat -> ifstat */
- ifstat(ls, line);
- break;
- }
- case TK_WHILE: { /* stat -> whilestat */
- whilestat(ls, line);
- break;
- }
- case TK_DO: { /* stat -> DO block END */
- luaX_next(ls); /* skip DO */
- block(ls);
- check_match(ls, TK_END, TK_DO, line);
- break;
- }
- case TK_FOR: { /* stat -> forstat */
- forstat(ls, line);
- break;
- }
- case TK_REPEAT: { /* stat -> repeatstat */
- repeatstat(ls, line);
- break;
- }
- case TK_FUNCTION: { /* stat -> funcstat */
- funcstat(ls, line);
- break;
- }
- case TK_LOCAL: { /* stat -> localstat */
- luaX_next(ls); /* skip LOCAL */
- if (testnext(ls, TK_FUNCTION)) /* local function? */
- localfunc(ls);
- else
- localstat(ls);
- break;
- }
- case TK_DBCOLON: { /* stat -> label */
- luaX_next(ls); /* skip double colon */
- labelstat(ls, str_checkname(ls), line);
- break;
- }
- case TK_RETURN: { /* stat -> retstat */
- luaX_next(ls); /* skip RETURN */
- retstat(ls);
- break;
- }
- case TK_BREAK: /* stat -> breakstat */
- case TK_GOTO: { /* stat -> 'goto' NAME */
- gotostat(ls, luaK_jump(ls->fs));
- break;
- }
- default: { /* stat -> func | assignment */
- exprstat(ls);
- break;
- }
- }
- lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
- ls->fs->freereg >= ls->fs->nactvar);
- ls->fs->freereg = ls->fs->nactvar; /* free registers */
- leavelevel(ls);
+ int line = ls->linenumber; /* may be needed for error messages */
+ enterlevel(ls);
+ switch (ls->t.token) {
+ case ';': { /* stat -> ';' (empty statement) */
+ luaX_next(ls); /* skip ';' */
+ break;
+ }
+ case TK_IF: { /* stat -> ifstat */
+ ifstat(ls, line);
+ break;
+ }
+ case TK_WHILE: { /* stat -> whilestat */
+ whilestat(ls, line);
+ break;
+ }
+ case TK_DO: { /* stat -> DO block END */
+ luaX_next(ls); /* skip DO */
+ block(ls);
+ check_match(ls, TK_END, TK_DO, line);
+ break;
+ }
+ case TK_FOR: { /* stat -> forstat */
+ forstat(ls, line);
+ break;
+ }
+ case TK_REPEAT: { /* stat -> repeatstat */
+ repeatstat(ls, line);
+ break;
+ }
+ case TK_FUNCTION: { /* stat -> funcstat */
+ funcstat(ls, line);
+ break;
+ }
+ case TK_LOCAL: { /* stat -> localstat */
+ luaX_next(ls); /* skip LOCAL */
+ if (testnext(ls, TK_FUNCTION)) /* local function? */
+ localfunc(ls);
+ else
+ localstat(ls);
+ break;
+ }
+ case TK_DBCOLON: { /* stat -> label */
+ luaX_next(ls); /* skip double colon */
+ labelstat(ls, str_checkname(ls), line);
+ break;
+ }
+ case TK_RETURN: { /* stat -> retstat */
+ luaX_next(ls); /* skip RETURN */
+ retstat(ls);
+ break;
+ }
+ case TK_BREAK: /* stat -> breakstat */
+ case TK_GOTO: { /* stat -> 'goto' NAME */
+ gotostat(ls, luaK_jump(ls->fs));
+ break;
+ }
+ default: { /* stat -> func | assignment */
+ exprstat(ls);
+ break;
+ }
+ }
+ lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
+ ls->fs->freereg >= ls->fs->nactvar);
+ ls->fs->freereg = ls->fs->nactvar; /* free registers */
+ leavelevel(ls);
}
/* }====================================================================== */
@@ -1602,37 +1602,36 @@ static void statement (LexState *ls) {
** upvalue named LUA_ENV
*/
static void mainfunc (LexState *ls, FuncState *fs) {
- BlockCnt bl;
- expdesc v;
- open_func(ls, fs, &bl);
- fs->f->is_vararg = 1; /* main function is always vararg */
- init_exp(&v, VLOCAL, 0); /* create and... */
- newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */
- luaX_next(ls); /* read first token */
- statlist(ls); /* parse main body */
- check(ls, TK_EOS);
- close_func(ls);
+ BlockCnt bl;
+ expdesc v;
+ open_func(ls, fs, &bl);
+ fs->f->is_vararg = 1; /* main function is always vararg */
+ init_exp(&v, VLOCAL, 0); /* create and... */
+ newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */
+ luaX_next(ls); /* read first token */
+ statlist(ls); /* parse main body */
+ check(ls, TK_EOS);
+ close_func(ls);
}
Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
- Dyndata *dyd, const char *name, int firstchar) {
- LexState lexstate;
- FuncState funcstate;
- Closure *cl = luaF_newLclosure(L, 1); /* create main closure */
- /* anchor closure (to avoid being collected) */
- setclLvalue(L, L->top, cl);
- incr_top(L);
- funcstate.f = cl->l.p = luaF_newproto(L);
- funcstate.f->source = luaS_new(L, name); /* create and anchor TString */
- lexstate.buff = buff;
- lexstate.dyd = dyd;
- dyd->actvar.n = dyd->gt.n = dyd->label.n = 0;
- luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar);
- mainfunc(&lexstate, &funcstate);
- lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs);
- /* all scopes should be correctly finished */
- lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0);
- return cl; /* it's on the stack too */
+ Dyndata *dyd, const char *name, int firstchar) {
+ LexState lexstate;
+ FuncState funcstate;
+ Closure *cl = luaF_newLclosure(L, 1); /* create main closure */
+ /* anchor closure (to avoid being collected) */
+ setclLvalue(L, L->top, cl);
+ incr_top(L);
+ funcstate.f = cl->l.p = luaF_newproto(L);
+ funcstate.f->source = luaS_new(L, name); /* create and anchor TString */
+ lexstate.buff = buff;
+ lexstate.dyd = dyd;
+ dyd->actvar.n = dyd->gt.n = dyd->label.n = 0;
+ luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar);
+ mainfunc(&lexstate, &funcstate);
+ lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs);
+ /* all scopes should be correctly finished */
+ lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0);
+ return cl; /* it's on the stack too */
}
-
diff --git a/src/lib/lua/lstate.c b/src/lib/lua/lstate.c
index c7f2672be7b..44d4423711c 100644
--- a/src/lib/lua/lstate.c
+++ b/src/lib/lua/lstate.c
@@ -27,19 +27,19 @@
#if !defined(LUAI_GCPAUSE)
-#define LUAI_GCPAUSE 200 /* 200% */
+#define LUAI_GCPAUSE 200 /* 200% */
#endif
#if !defined(LUAI_GCMAJOR)
-#define LUAI_GCMAJOR 200 /* 200% */
+#define LUAI_GCMAJOR 200 /* 200% */
#endif
#if !defined(LUAI_GCMUL)
-#define LUAI_GCMUL 200 /* GC runs 'twice the speed' of memory allocation */
+#define LUAI_GCMUL 200 /* GC runs 'twice the speed' of memory allocation */
#endif
-#define MEMERRMSG "not enough memory"
+#define MEMERRMSG "not enough memory"
/*
@@ -48,7 +48,7 @@
*/
#if !defined(luai_makeseed)
#include <time.h>
-#define luai_makeseed() cast(unsigned int, time(NULL))
+#define luai_makeseed() cast(unsigned int, time(NULL))
#endif
@@ -58,9 +58,9 @@
*/
typedef struct LX {
#if defined(LUAI_EXTRASPACE)
- char buff[LUAI_EXTRASPACE];
+ char buff[LUAI_EXTRASPACE];
#endif
- lua_State l;
+ lua_State l;
} LX;
@@ -68,13 +68,13 @@ typedef struct LX {
** Main thread combines a thread state and the global state
*/
typedef struct LG {
- LX l;
- global_State g;
+ LX l;
+ global_State g;
} LG;
-#define fromstate(L) (cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
+#define fromstate(L) (cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
/*
@@ -83,19 +83,19 @@ typedef struct LG {
** randomness..
*/
#define addbuff(b,p,e) \
- { size_t t = cast(size_t, e); \
- memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); }
+ { size_t t = cast(size_t, e); \
+ memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); }
static unsigned int makeseed (lua_State *L) {
- char buff[4 * sizeof(size_t)];
- unsigned int h = luai_makeseed();
- int p = 0;
- addbuff(buff, p, L); /* heap variable */
- addbuff(buff, p, &h); /* local variable */
- addbuff(buff, p, luaO_nilobject); /* global variable */
- addbuff(buff, p, &lua_newstate); /* public function */
- lua_assert(p == sizeof(buff));
- return luaS_hash(buff, p, h);
+ char buff[4 * sizeof(size_t)];
+ unsigned int h = luai_makeseed();
+ int p = 0;
+ addbuff(buff, p, L); /* heap variable */
+ addbuff(buff, p, &h); /* local variable */
+ addbuff(buff, p, luaO_nilobject); /* global variable */
+ addbuff(buff, p, &lua_newstate); /* public function */
+ lua_assert(p == sizeof(buff));
+ return luaS_hash(buff, p, h);
}
@@ -104,58 +104,58 @@ static unsigned int makeseed (lua_State *L) {
** invariant
*/
void luaE_setdebt (global_State *g, l_mem debt) {
- g->totalbytes -= (debt - g->GCdebt);
- g->GCdebt = debt;
+ g->totalbytes -= (debt - g->GCdebt);
+ g->GCdebt = debt;
}
CallInfo *luaE_extendCI (lua_State *L) {
- CallInfo *ci = luaM_new(L, CallInfo);
- lua_assert(L->ci->next == NULL);
- L->ci->next = ci;
- ci->previous = L->ci;
- ci->next = NULL;
- return ci;
+ CallInfo *ci = luaM_new(L, CallInfo);
+ lua_assert(L->ci->next == NULL);
+ L->ci->next = ci;
+ ci->previous = L->ci;
+ ci->next = NULL;
+ return ci;
}
void luaE_freeCI (lua_State *L) {
- CallInfo *ci = L->ci;
- CallInfo *next = ci->next;
- ci->next = NULL;
- while ((ci = next) != NULL) {
- next = ci->next;
- luaM_free(L, ci);
- }
+ CallInfo *ci = L->ci;
+ CallInfo *next = ci->next;
+ ci->next = NULL;
+ while ((ci = next) != NULL) {
+ next = ci->next;
+ luaM_free(L, ci);
+ }
}
static void stack_init (lua_State *L1, lua_State *L) {
- int i; CallInfo *ci;
- /* initialize stack array */
- L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
- L1->stacksize = BASIC_STACK_SIZE;
- for (i = 0; i < BASIC_STACK_SIZE; i++)
- setnilvalue(L1->stack + i); /* erase new stack */
- L1->top = L1->stack;
- L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK;
- /* initialize first ci */
- ci = &L1->base_ci;
- ci->next = ci->previous = NULL;
- ci->callstatus = 0;
- ci->func = L1->top;
- setnilvalue(L1->top++); /* 'function' entry for this 'ci' */
- ci->top = L1->top + LUA_MINSTACK;
- L1->ci = ci;
+ int i; CallInfo *ci;
+ /* initialize stack array */
+ L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
+ L1->stacksize = BASIC_STACK_SIZE;
+ for (i = 0; i < BASIC_STACK_SIZE; i++)
+ setnilvalue(L1->stack + i); /* erase new stack */
+ L1->top = L1->stack;
+ L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK;
+ /* initialize first ci */
+ ci = &L1->base_ci;
+ ci->next = ci->previous = NULL;
+ ci->callstatus = 0;
+ ci->func = L1->top;
+ setnilvalue(L1->top++); /* 'function' entry for this 'ci' */
+ ci->top = L1->top + LUA_MINSTACK;
+ L1->ci = ci;
}
static void freestack (lua_State *L) {
- if (L->stack == NULL)
- return; /* stack not completely built yet */
- L->ci = &L->base_ci; /* free the entire 'ci' list */
- luaE_freeCI(L);
- luaM_freearray(L, L->stack, L->stacksize); /* free stack array */
+ if (L->stack == NULL)
+ return; /* stack not completely built yet */
+ L->ci = &L->base_ci; /* free the entire 'ci' list */
+ luaE_freeCI(L);
+ luaM_freearray(L, L->stack, L->stacksize); /* free stack array */
}
@@ -163,17 +163,17 @@ static void freestack (lua_State *L) {
** Create registry table and its predefined values
*/
static void init_registry (lua_State *L, global_State *g) {
- TValue mt;
- /* create registry */
- Table *registry = luaH_new(L);
- sethvalue(L, &g->l_registry, registry);
- luaH_resize(L, registry, LUA_RIDX_LAST, 0);
- /* registry[LUA_RIDX_MAINTHREAD] = L */
- setthvalue(L, &mt, L);
- luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt);
- /* registry[LUA_RIDX_GLOBALS] = table of globals */
- sethvalue(L, &mt, luaH_new(L));
- luaH_setint(L, registry, LUA_RIDX_GLOBALS, &mt);
+ TValue mt;
+ /* create registry */
+ Table *registry = luaH_new(L);
+ sethvalue(L, &g->l_registry, registry);
+ luaH_resize(L, registry, LUA_RIDX_LAST, 0);
+ /* registry[LUA_RIDX_MAINTHREAD] = L */
+ setthvalue(L, &mt, L);
+ luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt);
+ /* registry[LUA_RIDX_GLOBALS] = table of globals */
+ sethvalue(L, &mt, luaH_new(L));
+ luaH_setint(L, registry, LUA_RIDX_GLOBALS, &mt);
}
@@ -181,19 +181,19 @@ static void init_registry (lua_State *L, global_State *g) {
** open parts of the state that may cause memory-allocation errors
*/
static void f_luaopen (lua_State *L, void *ud) {
- global_State *g = G(L);
- UNUSED(ud);
- stack_init(L, L); /* init stack */
- init_registry(L, g);
- luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
- luaT_init(L);
- luaX_init(L);
- /* pre-create memory-error message */
- g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
- luaS_fix(g->memerrmsg); /* it should never be collected */
- g->gcrunning = 1; /* allow gc */
- g->version = lua_version(NULL);
- luai_userstateopen(L);
+ global_State *g = G(L);
+ UNUSED(ud);
+ stack_init(L, L); /* init stack */
+ init_registry(L, g);
+ luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
+ luaT_init(L);
+ luaX_init(L);
+ /* pre-create memory-error message */
+ g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+ luaS_fix(g->memerrmsg); /* it should never be collected */
+ g->gcrunning = 1; /* allow gc */
+ g->version = lua_version(NULL);
+ luai_userstateopen(L);
}
@@ -202,122 +202,120 @@ static void f_luaopen (lua_State *L, void *ud) {
** any memory (to avoid errors)
*/
static void preinit_state (lua_State *L, global_State *g) {
- G(L) = g;
- L->stack = NULL;
- L->ci = NULL;
- L->stacksize = 0;
- L->errorJmp = NULL;
- L->nCcalls = 0;
- L->hook = NULL;
- L->hookmask = 0;
- L->basehookcount = 0;
- L->allowhook = 1;
- resethookcount(L);
- L->openupval = NULL;
- L->nny = 1;
- L->status = LUA_OK;
- L->errfunc = 0;
+ G(L) = g;
+ L->stack = NULL;
+ L->ci = NULL;
+ L->stacksize = 0;
+ L->errorJmp = NULL;
+ L->nCcalls = 0;
+ L->hook = NULL;
+ L->hookmask = 0;
+ L->basehookcount = 0;
+ L->allowhook = 1;
+ resethookcount(L);
+ L->openupval = NULL;
+ L->nny = 1;
+ L->status = LUA_OK;
+ L->errfunc = 0;
}
static void close_state (lua_State *L) {
- global_State *g = G(L);
- luaF_close(L, L->stack); /* close all upvalues for this thread */
- luaC_freeallobjects(L); /* collect all objects */
- if (g->version) /* closing a fully built state? */
- luai_userstateclose(L);
- luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
- luaZ_freebuffer(L, &g->buff);
- freestack(L);
- lua_assert(gettotalbytes(g) == sizeof(LG));
- (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0); /* free main block */
+ global_State *g = G(L);
+ luaF_close(L, L->stack); /* close all upvalues for this thread */
+ luaC_freeallobjects(L); /* collect all objects */
+ if (g->version) /* closing a fully built state? */
+ luai_userstateclose(L);
+ luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
+ luaZ_freebuffer(L, &g->buff);
+ freestack(L);
+ lua_assert(gettotalbytes(g) == sizeof(LG));
+ (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0); /* free main block */
}
LUA_API lua_State *lua_newthread (lua_State *L) {
- lua_State *L1;
- lua_lock(L);
- luaC_checkGC(L);
- L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th;
- setthvalue(L, L->top, L1);
- api_incr_top(L);
- preinit_state(L1, G(L));
- L1->hookmask = L->hookmask;
- L1->basehookcount = L->basehookcount;
- L1->hook = L->hook;
- resethookcount(L1);
- luai_userstatethread(L, L1);
- stack_init(L1, L); /* init stack */
- lua_unlock(L);
- return L1;
+ lua_State *L1;
+ lua_lock(L);
+ luaC_checkGC(L);
+ L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th;
+ setthvalue(L, L->top, L1);
+ api_incr_top(L);
+ preinit_state(L1, G(L));
+ L1->hookmask = L->hookmask;
+ L1->basehookcount = L->basehookcount;
+ L1->hook = L->hook;
+ resethookcount(L1);
+ luai_userstatethread(L, L1);
+ stack_init(L1, L); /* init stack */
+ lua_unlock(L);
+ return L1;
}
void luaE_freethread (lua_State *L, lua_State *L1) {
- LX *l = fromstate(L1);
- luaF_close(L1, L1->stack); /* close all upvalues for this thread */
- lua_assert(L1->openupval == NULL);
- luai_userstatefree(L, L1);
- freestack(L1);
- luaM_free(L, l);
+ LX *l = fromstate(L1);
+ luaF_close(L1, L1->stack); /* close all upvalues for this thread */
+ lua_assert(L1->openupval == NULL);
+ luai_userstatefree(L, L1);
+ freestack(L1);
+ luaM_free(L, l);
}
LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
- int i;
- lua_State *L;
- global_State *g;
- LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
- if (l == NULL) return NULL;
- L = &l->l.l;
- g = &l->g;
- L->next = NULL;
- L->tt = LUA_TTHREAD;
- g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT);
- L->marked = luaC_white(g);
- g->gckind = KGC_NORMAL;
- preinit_state(L, g);
- g->frealloc = f;
- g->ud = ud;
- g->mainthread = L;
- g->seed = makeseed(L);
- g->uvhead.u.l.prev = &g->uvhead;
- g->uvhead.u.l.next = &g->uvhead;
- g->gcrunning = 0; /* no GC while building state */
- g->GCestimate = 0;
- g->strt.size = 0;
- g->strt.nuse = 0;
- g->strt.hash = NULL;
- setnilvalue(&g->l_registry);
- luaZ_initbuffer(L, &g->buff);
- g->panic = NULL;
- g->version = NULL;
- g->gcstate = GCSpause;
- g->allgc = NULL;
- g->finobj = NULL;
- g->tobefnz = NULL;
- g->sweepgc = g->sweepfin = NULL;
- g->gray = g->grayagain = NULL;
- g->weak = g->ephemeron = g->allweak = NULL;
- g->totalbytes = sizeof(LG);
- g->GCdebt = 0;
- g->gcpause = LUAI_GCPAUSE;
- g->gcmajorinc = LUAI_GCMAJOR;
- g->gcstepmul = LUAI_GCMUL;
- for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
- if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
- /* memory allocation error: free partial state */
- close_state(L);
- L = NULL;
- }
- return L;
+ int i;
+ lua_State *L;
+ global_State *g;
+ LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
+ if (l == NULL) return NULL;
+ L = &l->l.l;
+ g = &l->g;
+ L->next = NULL;
+ L->tt = LUA_TTHREAD;
+ g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT);
+ L->marked = luaC_white(g);
+ g->gckind = KGC_NORMAL;
+ preinit_state(L, g);
+ g->frealloc = f;
+ g->ud = ud;
+ g->mainthread = L;
+ g->seed = makeseed(L);
+ g->uvhead.u.l.prev = &g->uvhead;
+ g->uvhead.u.l.next = &g->uvhead;
+ g->gcrunning = 0; /* no GC while building state */
+ g->GCestimate = 0;
+ g->strt.size = 0;
+ g->strt.nuse = 0;
+ g->strt.hash = NULL;
+ setnilvalue(&g->l_registry);
+ luaZ_initbuffer(L, &g->buff);
+ g->panic = NULL;
+ g->version = NULL;
+ g->gcstate = GCSpause;
+ g->allgc = NULL;
+ g->finobj = NULL;
+ g->tobefnz = NULL;
+ g->sweepgc = g->sweepfin = NULL;
+ g->gray = g->grayagain = NULL;
+ g->weak = g->ephemeron = g->allweak = NULL;
+ g->totalbytes = sizeof(LG);
+ g->GCdebt = 0;
+ g->gcpause = LUAI_GCPAUSE;
+ g->gcmajorinc = LUAI_GCMAJOR;
+ g->gcstepmul = LUAI_GCMUL;
+ for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
+ if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
+ /* memory allocation error: free partial state */
+ close_state(L);
+ L = NULL;
+ }
+ return L;
}
LUA_API void lua_close (lua_State *L) {
- L = G(L)->mainthread; /* only the main thread can be closed */
- lua_lock(L);
- close_state(L);
+ L = G(L)->mainthread; /* only the main thread can be closed */
+ lua_lock(L);
+ close_state(L);
}
-
-
diff --git a/src/lib/lua/lstring.c b/src/lib/lua/lstring.c
index af96c89c183..a471631ea07 100644
--- a/src/lib/lua/lstring.c
+++ b/src/lib/lua/lstring.c
@@ -23,7 +23,7 @@
** compute its hash
*/
#if !defined(LUAI_HASHLIMIT)
-#define LUAI_HASHLIMIT 5
+#define LUAI_HASHLIMIT 5
#endif
@@ -31,11 +31,11 @@
** equality for long strings
*/
int luaS_eqlngstr (TString *a, TString *b) {
- size_t len = a->tsv.len;
- lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR);
- return (a == b) || /* same instance or... */
- ((len == b->tsv.len) && /* equal length and ... */
- (memcmp(getstr(a), getstr(b), len) == 0)); /* equal contents */
+ size_t len = a->tsv.len;
+ lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR);
+ return (a == b) || /* same instance or... */
+ ((len == b->tsv.len) && /* equal length and ... */
+ (memcmp(getstr(a), getstr(b), len) == 0)); /* equal contents */
}
@@ -43,18 +43,18 @@ int luaS_eqlngstr (TString *a, TString *b) {
** equality for strings
*/
int luaS_eqstr (TString *a, TString *b) {
- return (a->tsv.tt == b->tsv.tt) &&
- (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b));
+ return (a->tsv.tt == b->tsv.tt) &&
+ (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b));
}
unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
- unsigned int h = seed ^ cast(unsigned int, l);
- size_t l1;
- size_t step = (l >> LUAI_HASHLIMIT) + 1;
- for (l1 = l; l1 >= step; l1 -= step)
- h = h ^ ((h<<5) + (h>>2) + cast_byte(str[l1 - 1]));
- return h;
+ unsigned int h = seed ^ cast(unsigned int, l);
+ size_t l1;
+ size_t step = (l >> LUAI_HASHLIMIT) + 1;
+ for (l1 = l; l1 >= step; l1 -= step)
+ h = h ^ ((h<<5) + (h>>2) + cast_byte(str[l1 - 1]));
+ return h;
}
@@ -62,33 +62,33 @@ unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
** resizes the string table
*/
void luaS_resize (lua_State *L, int newsize) {
- int i;
- stringtable *tb = &G(L)->strt;
- /* cannot resize while GC is traversing strings */
- luaC_runtilstate(L, ~bitmask(GCSsweepstring));
- if (newsize > tb->size) {
- luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
- for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL;
- }
- /* rehash */
- for (i=0; i<tb->size; i++) {
- GCObject *p = tb->hash[i];
- tb->hash[i] = NULL;
- while (p) { /* for each node in the list */
- GCObject *next = gch(p)->next; /* save next */
- unsigned int h = lmod(gco2ts(p)->hash, newsize); /* new position */
- gch(p)->next = tb->hash[h]; /* chain it */
- tb->hash[h] = p;
- resetoldbit(p); /* see MOVE OLD rule */
- p = next;
- }
- }
- if (newsize < tb->size) {
- /* shrinking slice must be empty */
- lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL);
- luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
- }
- tb->size = newsize;
+ int i;
+ stringtable *tb = &G(L)->strt;
+ /* cannot resize while GC is traversing strings */
+ luaC_runtilstate(L, ~bitmask(GCSsweepstring));
+ if (newsize > tb->size) {
+ luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
+ for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL;
+ }
+ /* rehash */
+ for (i=0; i<tb->size; i++) {
+ GCObject *p = tb->hash[i];
+ tb->hash[i] = NULL;
+ while (p) { /* for each node in the list */
+ GCObject *next = gch(p)->next; /* save next */
+ unsigned int h = lmod(gco2ts(p)->hash, newsize); /* new position */
+ gch(p)->next = tb->hash[h]; /* chain it */
+ tb->hash[h] = p;
+ resetoldbit(p); /* see MOVE OLD rule */
+ p = next;
+ }
+ }
+ if (newsize < tb->size) {
+ /* shrinking slice must be empty */
+ lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL);
+ luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
+ }
+ tb->size = newsize;
}
@@ -96,17 +96,17 @@ void luaS_resize (lua_State *L, int newsize) {
** creates a new string object
*/
static TString *createstrobj (lua_State *L, const char *str, size_t l,
- int tag, unsigned int h, GCObject **list) {
- TString *ts;
- size_t totalsize; /* total size of TString object */
- totalsize = sizeof(TString) + ((l + 1) * sizeof(char));
- ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts;
- ts->tsv.len = l;
- ts->tsv.hash = h;
- ts->tsv.extra = 0;
- memcpy(ts+1, str, l*sizeof(char));
- ((char *)(ts+1))[l] = '\0'; /* ending 0 */
- return ts;
+ int tag, unsigned int h, GCObject **list) {
+ TString *ts;
+ size_t totalsize; /* total size of TString object */
+ totalsize = sizeof(TString) + ((l + 1) * sizeof(char));
+ ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts;
+ ts->tsv.len = l;
+ ts->tsv.hash = h;
+ ts->tsv.extra = 0;
+ memcpy(ts+1, str, l*sizeof(char));
+ ((char *)(ts+1))[l] = '\0'; /* ending 0 */
+ return ts;
}
@@ -114,16 +114,16 @@ static TString *createstrobj (lua_State *L, const char *str, size_t l,
** creates a new short string, inserting it into string table
*/
static TString *newshrstr (lua_State *L, const char *str, size_t l,
- unsigned int h) {
- GCObject **list; /* (pointer to) list where it will be inserted */
- stringtable *tb = &G(L)->strt;
- TString *s;
- if (tb->nuse >= cast(lu_int32, tb->size) && tb->size <= MAX_INT/2)
- luaS_resize(L, tb->size*2); /* too crowded */
- list = &tb->hash[lmod(h, tb->size)];
- s = createstrobj(L, str, l, LUA_TSHRSTR, h, list);
- tb->nuse++;
- return s;
+ unsigned int h) {
+ GCObject **list; /* (pointer to) list where it will be inserted */
+ stringtable *tb = &G(L)->strt;
+ TString *s;
+ if (tb->nuse >= cast(lu_int32, tb->size) && tb->size <= MAX_INT/2)
+ luaS_resize(L, tb->size*2); /* too crowded */
+ list = &tb->hash[lmod(h, tb->size)];
+ s = createstrobj(L, str, l, LUA_TSHRSTR, h, list);
+ tb->nuse++;
+ return s;
}
@@ -131,22 +131,22 @@ static TString *newshrstr (lua_State *L, const char *str, size_t l,
** checks whether short string exists and reuses it or creates a new one
*/
static TString *internshrstr (lua_State *L, const char *str, size_t l) {
- GCObject *o;
- global_State *g = G(L);
- unsigned int h = luaS_hash(str, l, g->seed);
- for (o = g->strt.hash[lmod(h, g->strt.size)];
- o != NULL;
- o = gch(o)->next) {
- TString *ts = rawgco2ts(o);
- if (h == ts->tsv.hash &&
- l == ts->tsv.len &&
- (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
- if (isdead(G(L), o)) /* string is dead (but was not collected yet)? */
- changewhite(o); /* resurrect it */
- return ts;
- }
- }
- return newshrstr(L, str, l, h); /* not found; create a new string */
+ GCObject *o;
+ global_State *g = G(L);
+ unsigned int h = luaS_hash(str, l, g->seed);
+ for (o = g->strt.hash[lmod(h, g->strt.size)];
+ o != NULL;
+ o = gch(o)->next) {
+ TString *ts = rawgco2ts(o);
+ if (h == ts->tsv.hash &&
+ l == ts->tsv.len &&
+ (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
+ if (isdead(G(L), o)) /* string is dead (but was not collected yet)? */
+ changewhite(o); /* resurrect it */
+ return ts;
+ }
+ }
+ return newshrstr(L, str, l, h); /* not found; create a new string */
}
@@ -154,13 +154,13 @@ static TString *internshrstr (lua_State *L, const char *str, size_t l) {
** new string (with explicit length)
*/
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
- if (l <= LUAI_MAXSHORTLEN) /* short string? */
- return internshrstr(L, str, l);
- else {
- if (l + 1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
- luaM_toobig(L);
- return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL);
- }
+ if (l <= LUAI_MAXSHORTLEN) /* short string? */
+ return internshrstr(L, str, l);
+ else {
+ if (l + 1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
+ luaM_toobig(L);
+ return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL);
+ }
}
@@ -168,18 +168,17 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
** new zero-terminated string
*/
TString *luaS_new (lua_State *L, const char *str) {
- return luaS_newlstr(L, str, strlen(str));
+ return luaS_newlstr(L, str, strlen(str));
}
Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
- Udata *u;
- if (s > MAX_SIZET - sizeof(Udata))
- luaM_toobig(L);
- u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u;
- u->uv.len = s;
- u->uv.metatable = NULL;
- u->uv.env = e;
- return u;
+ Udata *u;
+ if (s > MAX_SIZET - sizeof(Udata))
+ luaM_toobig(L);
+ u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u;
+ u->uv.len = s;
+ u->uv.metatable = NULL;
+ u->uv.env = e;
+ return u;
}
-
diff --git a/src/lib/lua/lstrlib.c b/src/lib/lua/lstrlib.c
index 9261fd220db..05133acc8a1 100644
--- a/src/lib/lua/lstrlib.c
+++ b/src/lib/lua/lstrlib.c
@@ -25,161 +25,161 @@
** pattern-matching. This limit is arbitrary.
*/
#if !defined(LUA_MAXCAPTURES)
-#define LUA_MAXCAPTURES 32
+#define LUA_MAXCAPTURES 32
#endif
/* macro to `unsign' a character */
-#define uchar(c) ((unsigned char)(c))
+#define uchar(c) ((unsigned char)(c))
static int str_len (lua_State *L) {
- size_t l;
- luaL_checklstring(L, 1, &l);
- lua_pushinteger(L, (lua_Integer)l);
- return 1;
+ size_t l;
+ luaL_checklstring(L, 1, &l);
+ lua_pushinteger(L, (lua_Integer)l);
+ return 1;
}
/* translate a relative string position: negative means back from end */
static size_t posrelat (ptrdiff_t pos, size_t len) {
- if (pos >= 0) return (size_t)pos;
- else if (0u - (size_t)pos > len) return 0;
- else return len - ((size_t)-pos) + 1;
+ if (pos >= 0) return (size_t)pos;
+ else if (0u - (size_t)pos > len) return 0;
+ else return len - ((size_t)-pos) + 1;
}
static int str_sub (lua_State *L) {
- size_t l;
- const char *s = luaL_checklstring(L, 1, &l);
- size_t start = posrelat(luaL_checkinteger(L, 2), l);
- size_t end = posrelat(luaL_optinteger(L, 3, -1), l);
- if (start < 1) start = 1;
- if (end > l) end = l;
- if (start <= end)
- lua_pushlstring(L, s + start - 1, end - start + 1);
- else lua_pushliteral(L, "");
- return 1;
+ size_t l;
+ const char *s = luaL_checklstring(L, 1, &l);
+ size_t start = posrelat(luaL_checkinteger(L, 2), l);
+ size_t end = posrelat(luaL_optinteger(L, 3, -1), l);
+ if (start < 1) start = 1;
+ if (end > l) end = l;
+ if (start <= end)
+ lua_pushlstring(L, s + start - 1, end - start + 1);
+ else lua_pushliteral(L, "");
+ return 1;
}
static int str_reverse (lua_State *L) {
- size_t l, i;
- luaL_Buffer b;
- const char *s = luaL_checklstring(L, 1, &l);
- char *p = luaL_buffinitsize(L, &b, l);
- for (i = 0; i < l; i++)
- p[i] = s[l - i - 1];
- luaL_pushresultsize(&b, l);
- return 1;
+ size_t l, i;
+ luaL_Buffer b;
+ const char *s = luaL_checklstring(L, 1, &l);
+ char *p = luaL_buffinitsize(L, &b, l);
+ for (i = 0; i < l; i++)
+ p[i] = s[l - i - 1];
+ luaL_pushresultsize(&b, l);
+ return 1;
}
static int str_lower (lua_State *L) {
- size_t l;
- size_t i;
- luaL_Buffer b;
- const char *s = luaL_checklstring(L, 1, &l);
- char *p = luaL_buffinitsize(L, &b, l);
- for (i=0; i<l; i++)
- p[i] = tolower(uchar(s[i]));
- luaL_pushresultsize(&b, l);
- return 1;
+ size_t l;
+ size_t i;
+ luaL_Buffer b;
+ const char *s = luaL_checklstring(L, 1, &l);
+ char *p = luaL_buffinitsize(L, &b, l);
+ for (i=0; i<l; i++)
+ p[i] = tolower(uchar(s[i]));
+ luaL_pushresultsize(&b, l);
+ return 1;
}
static int str_upper (lua_State *L) {
- size_t l;
- size_t i;
- luaL_Buffer b;
- const char *s = luaL_checklstring(L, 1, &l);
- char *p = luaL_buffinitsize(L, &b, l);
- for (i=0; i<l; i++)
- p[i] = toupper(uchar(s[i]));
- luaL_pushresultsize(&b, l);
- return 1;
+ size_t l;
+ size_t i;
+ luaL_Buffer b;
+ const char *s = luaL_checklstring(L, 1, &l);
+ char *p = luaL_buffinitsize(L, &b, l);
+ for (i=0; i<l; i++)
+ p[i] = toupper(uchar(s[i]));
+ luaL_pushresultsize(&b, l);
+ return 1;
}
/* reasonable limit to avoid arithmetic overflow */
-#define MAXSIZE ((~(size_t)0) >> 1)
+#define MAXSIZE ((~(size_t)0) >> 1)
static int str_rep (lua_State *L) {
- size_t l, lsep;
- const char *s = luaL_checklstring(L, 1, &l);
- int n = luaL_checkint(L, 2);
- const char *sep = luaL_optlstring(L, 3, "", &lsep);
- if (n <= 0) lua_pushliteral(L, "");
- else if (l + lsep < l || l + lsep >= MAXSIZE / n) /* may overflow? */
- return luaL_error(L, "resulting string too large");
- else {
- size_t totallen = n * l + (n - 1) * lsep;
- luaL_Buffer b;
- char *p = luaL_buffinitsize(L, &b, totallen);
- while (n-- > 1) { /* first n-1 copies (followed by separator) */
- memcpy(p, s, l * sizeof(char)); p += l;
- if (lsep > 0) { /* avoid empty 'memcpy' (may be expensive) */
- memcpy(p, sep, lsep * sizeof(char)); p += lsep;
- }
- }
- memcpy(p, s, l * sizeof(char)); /* last copy (not followed by separator) */
- luaL_pushresultsize(&b, totallen);
- }
- return 1;
+ size_t l, lsep;
+ const char *s = luaL_checklstring(L, 1, &l);
+ int n = luaL_checkint(L, 2);
+ const char *sep = luaL_optlstring(L, 3, "", &lsep);
+ if (n <= 0) lua_pushliteral(L, "");
+ else if (l + lsep < l || l + lsep >= MAXSIZE / n) /* may overflow? */
+ return luaL_error(L, "resulting string too large");
+ else {
+ size_t totallen = n * l + (n - 1) * lsep;
+ luaL_Buffer b;
+ char *p = luaL_buffinitsize(L, &b, totallen);
+ while (n-- > 1) { /* first n-1 copies (followed by separator) */
+ memcpy(p, s, l * sizeof(char)); p += l;
+ if (lsep > 0) { /* avoid empty 'memcpy' (may be expensive) */
+ memcpy(p, sep, lsep * sizeof(char)); p += lsep;
+ }
+ }
+ memcpy(p, s, l * sizeof(char)); /* last copy (not followed by separator) */
+ luaL_pushresultsize(&b, totallen);
+ }
+ return 1;
}
static int str_byte (lua_State *L) {
- size_t l;
- const char *s = luaL_checklstring(L, 1, &l);
- size_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
- size_t pose = posrelat(luaL_optinteger(L, 3, posi), l);
- int n, i;
- if (posi < 1) posi = 1;
- if (pose > l) pose = l;
- if (posi > pose) return 0; /* empty interval; return no values */
- n = (int)(pose - posi + 1);
- if (posi + n <= pose) /* (size_t -> int) overflow? */
- return luaL_error(L, "string slice too long");
- luaL_checkstack(L, n, "string slice too long");
- for (i=0; i<n; i++)
- lua_pushinteger(L, uchar(s[posi+i-1]));
- return n;
+ size_t l;
+ const char *s = luaL_checklstring(L, 1, &l);
+ size_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
+ size_t pose = posrelat(luaL_optinteger(L, 3, posi), l);
+ int n, i;
+ if (posi < 1) posi = 1;
+ if (pose > l) pose = l;
+ if (posi > pose) return 0; /* empty interval; return no values */
+ n = (int)(pose - posi + 1);
+ if (posi + n <= pose) /* (size_t -> int) overflow? */
+ return luaL_error(L, "string slice too long");
+ luaL_checkstack(L, n, "string slice too long");
+ for (i=0; i<n; i++)
+ lua_pushinteger(L, uchar(s[posi+i-1]));
+ return n;
}
static int str_char (lua_State *L) {
- int n = lua_gettop(L); /* number of arguments */
- int i;
- luaL_Buffer b;
- char *p = luaL_buffinitsize(L, &b, n);
- for (i=1; i<=n; i++) {
- int c = luaL_checkint(L, i);
- luaL_argcheck(L, uchar(c) == c, i, "value out of range");
- p[i - 1] = uchar(c);
- }
- luaL_pushresultsize(&b, n);
- return 1;
+ int n = lua_gettop(L); /* number of arguments */
+ int i;
+ luaL_Buffer b;
+ char *p = luaL_buffinitsize(L, &b, n);
+ for (i=1; i<=n; i++) {
+ int c = luaL_checkint(L, i);
+ luaL_argcheck(L, uchar(c) == c, i, "value out of range");
+ p[i - 1] = uchar(c);
+ }
+ luaL_pushresultsize(&b, n);
+ return 1;
}
static int writer (lua_State *L, const void* b, size_t size, void* B) {
- (void)L;
- luaL_addlstring((luaL_Buffer*) B, (const char *)b, size);
- return 0;
+ (void)L;
+ luaL_addlstring((luaL_Buffer*) B, (const char *)b, size);
+ return 0;
}
static int str_dump (lua_State *L) {
- luaL_Buffer b;
- luaL_checktype(L, 1, LUA_TFUNCTION);
- lua_settop(L, 1);
- luaL_buffinit(L,&b);
- if (lua_dump(L, writer, &b) != 0)
- return luaL_error(L, "unable to dump given function");
- luaL_pushresult(&b);
- return 1;
+ luaL_Buffer b;
+ luaL_checktype(L, 1, LUA_TFUNCTION);
+ lua_settop(L, 1);
+ luaL_buffinit(L,&b);
+ if (lua_dump(L, writer, &b) != 0)
+ return luaL_error(L, "unable to dump given function");
+ luaL_pushresult(&b);
+ return 1;
}
@@ -191,21 +191,21 @@ static int str_dump (lua_State *L) {
*/
-#define CAP_UNFINISHED (-1)
-#define CAP_POSITION (-2)
+#define CAP_UNFINISHED (-1)
+#define CAP_POSITION (-2)
typedef struct MatchState {
- int matchdepth; /* control for recursive depth (to avoid C stack overflow) */
- const char *src_init; /* init of source string */
- const char *src_end; /* end ('\0') of source string */
- const char *p_end; /* end ('\0') of pattern */
- lua_State *L;
- int level; /* total number of captures (finished or unfinished) */
- struct {
- const char *init;
- ptrdiff_t len;
- } capture[LUA_MAXCAPTURES];
+ int matchdepth; /* control for recursive depth (to avoid C stack overflow) */
+ const char *src_init; /* init of source string */
+ const char *src_end; /* end ('\0') of source string */
+ const char *p_end; /* end ('\0') of pattern */
+ lua_State *L;
+ int level; /* total number of captures (finished or unfinished) */
+ struct {
+ const char *init;
+ ptrdiff_t len;
+ } capture[LUA_MAXCAPTURES];
} MatchState;
@@ -215,565 +215,565 @@ static const char *match (MatchState *ms, const char *s, const char *p);
/* maximum recursion depth for 'match' */
#if !defined(MAXCCALLS)
-#define MAXCCALLS 200
+#define MAXCCALLS 200
#endif
-#define L_ESC '%'
-#define SPECIALS "^$*+?.([%-"
+#define L_ESC '%'
+#define SPECIALS "^$*+?.([%-"
static int check_capture (MatchState *ms, int l) {
- l -= '1';
- if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
- return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
- return l;
+ l -= '1';
+ if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
+ return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
+ return l;
}
static int capture_to_close (MatchState *ms) {
- int level = ms->level;
- for (level--; level>=0; level--)
- if (ms->capture[level].len == CAP_UNFINISHED) return level;
- return luaL_error(ms->L, "invalid pattern capture");
+ int level = ms->level;
+ for (level--; level>=0; level--)
+ if (ms->capture[level].len == CAP_UNFINISHED) return level;
+ return luaL_error(ms->L, "invalid pattern capture");
}
static const char *classend (MatchState *ms, const char *p) {
- switch (*p++) {
- case L_ESC: {
- if (p == ms->p_end)
- luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")");
- return p+1;
- }
- case '[': {
- if (*p == '^') p++;
- do { /* look for a `]' */
- if (p == ms->p_end)
- luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")");
- if (*(p++) == L_ESC && p < ms->p_end)
- p++; /* skip escapes (e.g. `%]') */
- } while (*p != ']');
- return p+1;
- }
- default: {
- return p;
- }
- }
+ switch (*p++) {
+ case L_ESC: {
+ if (p == ms->p_end)
+ luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")");
+ return p+1;
+ }
+ case '[': {
+ if (*p == '^') p++;
+ do { /* look for a `]' */
+ if (p == ms->p_end)
+ luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")");
+ if (*(p++) == L_ESC && p < ms->p_end)
+ p++; /* skip escapes (e.g. `%]') */
+ } while (*p != ']');
+ return p+1;
+ }
+ default: {
+ return p;
+ }
+ }
}
static int match_class (int c, int cl) {
- int res;
- switch (tolower(cl)) {
- case 'a' : res = isalpha(c); break;
- case 'c' : res = iscntrl(c); break;
- case 'd' : res = isdigit(c); break;
- case 'g' : res = isgraph(c); break;
- case 'l' : res = islower(c); break;
- case 'p' : res = ispunct(c); break;
- case 's' : res = isspace(c); break;
- case 'u' : res = isupper(c); break;
- case 'w' : res = isalnum(c); break;
- case 'x' : res = isxdigit(c); break;
- case 'z' : res = (c == 0); break; /* deprecated option */
- default: return (cl == c);
- }
- return (islower(cl) ? res : !res);
+ int res;
+ switch (tolower(cl)) {
+ case 'a' : res = isalpha(c); break;
+ case 'c' : res = iscntrl(c); break;
+ case 'd' : res = isdigit(c); break;
+ case 'g' : res = isgraph(c); break;
+ case 'l' : res = islower(c); break;
+ case 'p' : res = ispunct(c); break;
+ case 's' : res = isspace(c); break;
+ case 'u' : res = isupper(c); break;
+ case 'w' : res = isalnum(c); break;
+ case 'x' : res = isxdigit(c); break;
+ case 'z' : res = (c == 0); break; /* deprecated option */
+ default: return (cl == c);
+ }
+ return (islower(cl) ? res : !res);
}
static int matchbracketclass (int c, const char *p, const char *ec) {
- int sig = 1;
- if (*(p+1) == '^') {
- sig = 0;
- p++; /* skip the `^' */
- }
- while (++p < ec) {
- if (*p == L_ESC) {
- p++;
- if (match_class(c, uchar(*p)))
- return sig;
- }
- else if ((*(p+1) == '-') && (p+2 < ec)) {
- p+=2;
- if (uchar(*(p-2)) <= c && c <= uchar(*p))
- return sig;
- }
- else if (uchar(*p) == c) return sig;
- }
- return !sig;
+ int sig = 1;
+ if (*(p+1) == '^') {
+ sig = 0;
+ p++; /* skip the `^' */
+ }
+ while (++p < ec) {
+ if (*p == L_ESC) {
+ p++;
+ if (match_class(c, uchar(*p)))
+ return sig;
+ }
+ else if ((*(p+1) == '-') && (p+2 < ec)) {
+ p+=2;
+ if (uchar(*(p-2)) <= c && c <= uchar(*p))
+ return sig;
+ }
+ else if (uchar(*p) == c) return sig;
+ }
+ return !sig;
}
static int singlematch (MatchState *ms, const char *s, const char *p,
- const char *ep) {
- if (s >= ms->src_end)
- return 0;
- else {
- int c = uchar(*s);
- switch (*p) {
- case '.': return 1; /* matches any char */
- case L_ESC: return match_class(c, uchar(*(p+1)));
- case '[': return matchbracketclass(c, p, ep-1);
- default: return (uchar(*p) == c);
- }
- }
+ const char *ep) {
+ if (s >= ms->src_end)
+ return 0;
+ else {
+ int c = uchar(*s);
+ switch (*p) {
+ case '.': return 1; /* matches any char */
+ case L_ESC: return match_class(c, uchar(*(p+1)));
+ case '[': return matchbracketclass(c, p, ep-1);
+ default: return (uchar(*p) == c);
+ }
+ }
}
static const char *matchbalance (MatchState *ms, const char *s,
- const char *p) {
- if (p >= ms->p_end - 1)
- luaL_error(ms->L, "malformed pattern "
- "(missing arguments to " LUA_QL("%%b") ")");
- if (*s != *p) return NULL;
- else {
- int b = *p;
- int e = *(p+1);
- int cont = 1;
- while (++s < ms->src_end) {
- if (*s == e) {
- if (--cont == 0) return s+1;
- }
- else if (*s == b) cont++;
- }
- }
- return NULL; /* string ends out of balance */
+ const char *p) {
+ if (p >= ms->p_end - 1)
+ luaL_error(ms->L, "malformed pattern "
+ "(missing arguments to " LUA_QL("%%b") ")");
+ if (*s != *p) return NULL;
+ else {
+ int b = *p;
+ int e = *(p+1);
+ int cont = 1;
+ while (++s < ms->src_end) {
+ if (*s == e) {
+ if (--cont == 0) return s+1;
+ }
+ else if (*s == b) cont++;
+ }
+ }
+ return NULL; /* string ends out of balance */
}
static const char *max_expand (MatchState *ms, const char *s,
- const char *p, const char *ep) {
- ptrdiff_t i = 0; /* counts maximum expand for item */
- while (singlematch(ms, s + i, p, ep))
- i++;
- /* keeps trying to match with the maximum repetitions */
- while (i>=0) {
- const char *res = match(ms, (s+i), ep+1);
- if (res) return res;
- i--; /* else didn't match; reduce 1 repetition to try again */
- }
- return NULL;
+ const char *p, const char *ep) {
+ ptrdiff_t i = 0; /* counts maximum expand for item */
+ while (singlematch(ms, s + i, p, ep))
+ i++;
+ /* keeps trying to match with the maximum repetitions */
+ while (i>=0) {
+ const char *res = match(ms, (s+i), ep+1);
+ if (res) return res;
+ i--; /* else didn't match; reduce 1 repetition to try again */
+ }
+ return NULL;
}
static const char *min_expand (MatchState *ms, const char *s,
- const char *p, const char *ep) {
- for (;;) {
- const char *res = match(ms, s, ep+1);
- if (res != NULL)
- return res;
- else if (singlematch(ms, s, p, ep))
- s++; /* try with one more repetition */
- else return NULL;
- }
+ const char *p, const char *ep) {
+ for (;;) {
+ const char *res = match(ms, s, ep+1);
+ if (res != NULL)
+ return res;
+ else if (singlematch(ms, s, p, ep))
+ s++; /* try with one more repetition */
+ else return NULL;
+ }
}
static const char *start_capture (MatchState *ms, const char *s,
- const char *p, int what) {
- const char *res;
- int level = ms->level;
- if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
- ms->capture[level].init = s;
- ms->capture[level].len = what;
- ms->level = level+1;
- if ((res=match(ms, s, p)) == NULL) /* match failed? */
- ms->level--; /* undo capture */
- return res;
+ const char *p, int what) {
+ const char *res;
+ int level = ms->level;
+ if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
+ ms->capture[level].init = s;
+ ms->capture[level].len = what;
+ ms->level = level+1;
+ if ((res=match(ms, s, p)) == NULL) /* match failed? */
+ ms->level--; /* undo capture */
+ return res;
}
static const char *end_capture (MatchState *ms, const char *s,
- const char *p) {
- int l = capture_to_close(ms);
- const char *res;
- ms->capture[l].len = s - ms->capture[l].init; /* close capture */
- if ((res = match(ms, s, p)) == NULL) /* match failed? */
- ms->capture[l].len = CAP_UNFINISHED; /* undo capture */
- return res;
+ const char *p) {
+ int l = capture_to_close(ms);
+ const char *res;
+ ms->capture[l].len = s - ms->capture[l].init; /* close capture */
+ if ((res = match(ms, s, p)) == NULL) /* match failed? */
+ ms->capture[l].len = CAP_UNFINISHED; /* undo capture */
+ return res;
}
static const char *match_capture (MatchState *ms, const char *s, int l) {
- size_t len;
- l = check_capture(ms, l);
- len = ms->capture[l].len;
- if ((size_t)(ms->src_end-s) >= len &&
- memcmp(ms->capture[l].init, s, len) == 0)
- return s+len;
- else return NULL;
+ size_t len;
+ l = check_capture(ms, l);
+ len = ms->capture[l].len;
+ if ((size_t)(ms->src_end-s) >= len &&
+ memcmp(ms->capture[l].init, s, len) == 0)
+ return s+len;
+ else return NULL;
}
static const char *match (MatchState *ms, const char *s, const char *p) {
- if (ms->matchdepth-- == 0)
- luaL_error(ms->L, "pattern too complex");
- init: /* using goto's to optimize tail recursion */
- if (p != ms->p_end) { /* end of pattern? */
- switch (*p) {
- case '(': { /* start capture */
- if (*(p + 1) == ')') /* position capture? */
- s = start_capture(ms, s, p + 2, CAP_POSITION);
- else
- s = start_capture(ms, s, p + 1, CAP_UNFINISHED);
- break;
- }
- case ')': { /* end capture */
- s = end_capture(ms, s, p + 1);
- break;
- }
- case '$': {
- if ((p + 1) != ms->p_end) /* is the `$' the last char in pattern? */
- goto dflt; /* no; go to default */
- s = (s == ms->src_end) ? s : NULL; /* check end of string */
- break;
- }
- case L_ESC: { /* escaped sequences not in the format class[*+?-]? */
- switch (*(p + 1)) {
- case 'b': { /* balanced string? */
- s = matchbalance(ms, s, p + 2);
- if (s != NULL) {
- p += 4; goto init; /* return match(ms, s, p + 4); */
- } /* else fail (s == NULL) */
- break;
- }
- case 'f': { /* frontier? */
- const char *ep; char previous;
- p += 2;
- if (*p != '[')
- luaL_error(ms->L, "missing " LUA_QL("[") " after "
- LUA_QL("%%f") " in pattern");
- ep = classend(ms, p); /* points to what is next */
- previous = (s == ms->src_init) ? '\0' : *(s - 1);
- if (!matchbracketclass(uchar(previous), p, ep - 1) &&
- matchbracketclass(uchar(*s), p, ep - 1)) {
- p = ep; goto init; /* return match(ms, s, ep); */
- }
- s = NULL; /* match failed */
- break;
- }
- case '0': case '1': case '2': case '3':
- case '4': case '5': case '6': case '7':
- case '8': case '9': { /* capture results (%0-%9)? */
- s = match_capture(ms, s, uchar(*(p + 1)));
- if (s != NULL) {
- p += 2; goto init; /* return match(ms, s, p + 2) */
- }
- break;
- }
- default: goto dflt;
- }
- break;
- }
- default: dflt: { /* pattern class plus optional suffix */
- const char *ep = classend(ms, p); /* points to optional suffix */
- /* does not match at least once? */
- if (!singlematch(ms, s, p, ep)) {
- if (*ep == '*' || *ep == '?' || *ep == '-') { /* accept empty? */
- p = ep + 1; goto init; /* return match(ms, s, ep + 1); */
- }
- else /* '+' or no suffix */
- s = NULL; /* fail */
- }
- else { /* matched once */
- switch (*ep) { /* handle optional suffix */
- case '?': { /* optional */
- const char *res;
- if ((res = match(ms, s + 1, ep + 1)) != NULL)
- s = res;
- else {
- p = ep + 1; goto init; /* else return match(ms, s, ep + 1); */
- }
- break;
- }
- case '+': /* 1 or more repetitions */
- s++; /* 1 match already done */
- /* go through */
- case '*': /* 0 or more repetitions */
- s = max_expand(ms, s, p, ep);
- break;
- case '-': /* 0 or more repetitions (minimum) */
- s = min_expand(ms, s, p, ep);
- break;
- default: /* no suffix */
- s++; p = ep; goto init; /* return match(ms, s + 1, ep); */
- }
- }
- break;
- }
- }
- }
- ms->matchdepth++;
- return s;
+ if (ms->matchdepth-- == 0)
+ luaL_error(ms->L, "pattern too complex");
+ init: /* using goto's to optimize tail recursion */
+ if (p != ms->p_end) { /* end of pattern? */
+ switch (*p) {
+ case '(': { /* start capture */
+ if (*(p + 1) == ')') /* position capture? */
+ s = start_capture(ms, s, p + 2, CAP_POSITION);
+ else
+ s = start_capture(ms, s, p + 1, CAP_UNFINISHED);
+ break;
+ }
+ case ')': { /* end capture */
+ s = end_capture(ms, s, p + 1);
+ break;
+ }
+ case '$': {
+ if ((p + 1) != ms->p_end) /* is the `$' the last char in pattern? */
+ goto dflt; /* no; go to default */
+ s = (s == ms->src_end) ? s : NULL; /* check end of string */
+ break;
+ }
+ case L_ESC: { /* escaped sequences not in the format class[*+?-]? */
+ switch (*(p + 1)) {
+ case 'b': { /* balanced string? */
+ s = matchbalance(ms, s, p + 2);
+ if (s != NULL) {
+ p += 4; goto init; /* return match(ms, s, p + 4); */
+ } /* else fail (s == NULL) */
+ break;
+ }
+ case 'f': { /* frontier? */
+ const char *ep; char previous;
+ p += 2;
+ if (*p != '[')
+ luaL_error(ms->L, "missing " LUA_QL("[") " after "
+ LUA_QL("%%f") " in pattern");
+ ep = classend(ms, p); /* points to what is next */
+ previous = (s == ms->src_init) ? '\0' : *(s - 1);
+ if (!matchbracketclass(uchar(previous), p, ep - 1) &&
+ matchbracketclass(uchar(*s), p, ep - 1)) {
+ p = ep; goto init; /* return match(ms, s, ep); */
+ }
+ s = NULL; /* match failed */
+ break;
+ }
+ case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7':
+ case '8': case '9': { /* capture results (%0-%9)? */
+ s = match_capture(ms, s, uchar(*(p + 1)));
+ if (s != NULL) {
+ p += 2; goto init; /* return match(ms, s, p + 2) */
+ }
+ break;
+ }
+ default: goto dflt;
+ }
+ break;
+ }
+ default: dflt: { /* pattern class plus optional suffix */
+ const char *ep = classend(ms, p); /* points to optional suffix */
+ /* does not match at least once? */
+ if (!singlematch(ms, s, p, ep)) {
+ if (*ep == '*' || *ep == '?' || *ep == '-') { /* accept empty? */
+ p = ep + 1; goto init; /* return match(ms, s, ep + 1); */
+ }
+ else /* '+' or no suffix */
+ s = NULL; /* fail */
+ }
+ else { /* matched once */
+ switch (*ep) { /* handle optional suffix */
+ case '?': { /* optional */
+ const char *res;
+ if ((res = match(ms, s + 1, ep + 1)) != NULL)
+ s = res;
+ else {
+ p = ep + 1; goto init; /* else return match(ms, s, ep + 1); */
+ }
+ break;
+ }
+ case '+': /* 1 or more repetitions */
+ s++; /* 1 match already done */
+ /* go through */
+ case '*': /* 0 or more repetitions */
+ s = max_expand(ms, s, p, ep);
+ break;
+ case '-': /* 0 or more repetitions (minimum) */
+ s = min_expand(ms, s, p, ep);
+ break;
+ default: /* no suffix */
+ s++; p = ep; goto init; /* return match(ms, s + 1, ep); */
+ }
+ }
+ break;
+ }
+ }
+ }
+ ms->matchdepth++;
+ return s;
}
static const char *lmemfind (const char *s1, size_t l1,
- const char *s2, size_t l2) {
- if (l2 == 0) return s1; /* empty strings are everywhere */
- else if (l2 > l1) return NULL; /* avoids a negative `l1' */
- else {
- const char *init; /* to search for a `*s2' inside `s1' */
- l2--; /* 1st char will be checked by `memchr' */
- l1 = l1-l2; /* `s2' cannot be found after that */
- while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
- init++; /* 1st char is already checked */
- if (memcmp(init, s2+1, l2) == 0)
- return init-1;
- else { /* correct `l1' and `s1' to try again */
- l1 -= init-s1;
- s1 = init;
- }
- }
- return NULL; /* not found */
- }
+ const char *s2, size_t l2) {
+ if (l2 == 0) return s1; /* empty strings are everywhere */
+ else if (l2 > l1) return NULL; /* avoids a negative `l1' */
+ else {
+ const char *init; /* to search for a `*s2' inside `s1' */
+ l2--; /* 1st char will be checked by `memchr' */
+ l1 = l1-l2; /* `s2' cannot be found after that */
+ while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
+ init++; /* 1st char is already checked */
+ if (memcmp(init, s2+1, l2) == 0)
+ return init-1;
+ else { /* correct `l1' and `s1' to try again */
+ l1 -= init-s1;
+ s1 = init;
+ }
+ }
+ return NULL; /* not found */
+ }
}
static void push_onecapture (MatchState *ms, int i, const char *s,
- const char *e) {
- if (i >= ms->level) {
- if (i == 0) /* ms->level == 0, too */
- lua_pushlstring(ms->L, s, e - s); /* add whole match */
- else
- luaL_error(ms->L, "invalid capture index");
- }
- else {
- ptrdiff_t l = ms->capture[i].len;
- if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
- if (l == CAP_POSITION)
- lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1);
- else
- lua_pushlstring(ms->L, ms->capture[i].init, l);
- }
+ const char *e) {
+ if (i >= ms->level) {
+ if (i == 0) /* ms->level == 0, too */
+ lua_pushlstring(ms->L, s, e - s); /* add whole match */
+ else
+ luaL_error(ms->L, "invalid capture index");
+ }
+ else {
+ ptrdiff_t l = ms->capture[i].len;
+ if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
+ if (l == CAP_POSITION)
+ lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1);
+ else
+ lua_pushlstring(ms->L, ms->capture[i].init, l);
+ }
}
static int push_captures (MatchState *ms, const char *s, const char *e) {
- int i;
- int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
- luaL_checkstack(ms->L, nlevels, "too many captures");
- for (i = 0; i < nlevels; i++)
- push_onecapture(ms, i, s, e);
- return nlevels; /* number of strings pushed */
+ int i;
+ int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
+ luaL_checkstack(ms->L, nlevels, "too many captures");
+ for (i = 0; i < nlevels; i++)
+ push_onecapture(ms, i, s, e);
+ return nlevels; /* number of strings pushed */
}
/* check whether pattern has no special characters */
static int nospecials (const char *p, size_t l) {
- size_t upto = 0;
- do {
- if (strpbrk(p + upto, SPECIALS))
- return 0; /* pattern has a special character */
- upto += strlen(p + upto) + 1; /* may have more after \0 */
- } while (upto <= l);
- return 1; /* no special chars found */
+ size_t upto = 0;
+ do {
+ if (strpbrk(p + upto, SPECIALS))
+ return 0; /* pattern has a special character */
+ upto += strlen(p + upto) + 1; /* may have more after \0 */
+ } while (upto <= l);
+ return 1; /* no special chars found */
}
static int str_find_aux (lua_State *L, int find) {
- size_t ls, lp;
- const char *s = luaL_checklstring(L, 1, &ls);
- const char *p = luaL_checklstring(L, 2, &lp);
- size_t init = posrelat(luaL_optinteger(L, 3, 1), ls);
- if (init < 1) init = 1;
- else if (init > ls + 1) { /* start after string's end? */
- lua_pushnil(L); /* cannot find anything */
- return 1;
- }
- /* explicit request or no special characters? */
- if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) {
- /* do a plain search */
- const char *s2 = lmemfind(s + init - 1, ls - init + 1, p, lp);
- if (s2) {
- lua_pushinteger(L, s2 - s + 1);
- lua_pushinteger(L, s2 - s + lp);
- return 2;
- }
- }
- else {
- MatchState ms;
- const char *s1 = s + init - 1;
- int anchor = (*p == '^');
- if (anchor) {
- p++; lp--; /* skip anchor character */
- }
- ms.L = L;
- ms.matchdepth = MAXCCALLS;
- ms.src_init = s;
- ms.src_end = s + ls;
- ms.p_end = p + lp;
- do {
- const char *res;
- ms.level = 0;
- lua_assert(ms.matchdepth == MAXCCALLS);
- if ((res=match(&ms, s1, p)) != NULL) {
- if (find) {
- lua_pushinteger(L, s1 - s + 1); /* start */
- lua_pushinteger(L, res - s); /* end */
- return push_captures(&ms, NULL, 0) + 2;
- }
- else
- return push_captures(&ms, s1, res);
- }
- } while (s1++ < ms.src_end && !anchor);
- }
- lua_pushnil(L); /* not found */
- return 1;
+ size_t ls, lp;
+ const char *s = luaL_checklstring(L, 1, &ls);
+ const char *p = luaL_checklstring(L, 2, &lp);
+ size_t init = posrelat(luaL_optinteger(L, 3, 1), ls);
+ if (init < 1) init = 1;
+ else if (init > ls + 1) { /* start after string's end? */
+ lua_pushnil(L); /* cannot find anything */
+ return 1;
+ }
+ /* explicit request or no special characters? */
+ if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) {
+ /* do a plain search */
+ const char *s2 = lmemfind(s + init - 1, ls - init + 1, p, lp);
+ if (s2) {
+ lua_pushinteger(L, s2 - s + 1);
+ lua_pushinteger(L, s2 - s + lp);
+ return 2;
+ }
+ }
+ else {
+ MatchState ms;
+ const char *s1 = s + init - 1;
+ int anchor = (*p == '^');
+ if (anchor) {
+ p++; lp--; /* skip anchor character */
+ }
+ ms.L = L;
+ ms.matchdepth = MAXCCALLS;
+ ms.src_init = s;
+ ms.src_end = s + ls;
+ ms.p_end = p + lp;
+ do {
+ const char *res;
+ ms.level = 0;
+ lua_assert(ms.matchdepth == MAXCCALLS);
+ if ((res=match(&ms, s1, p)) != NULL) {
+ if (find) {
+ lua_pushinteger(L, s1 - s + 1); /* start */
+ lua_pushinteger(L, res - s); /* end */
+ return push_captures(&ms, NULL, 0) + 2;
+ }
+ else
+ return push_captures(&ms, s1, res);
+ }
+ } while (s1++ < ms.src_end && !anchor);
+ }
+ lua_pushnil(L); /* not found */
+ return 1;
}
static int str_find (lua_State *L) {
- return str_find_aux(L, 1);
+ return str_find_aux(L, 1);
}
static int str_match (lua_State *L) {
- return str_find_aux(L, 0);
+ return str_find_aux(L, 0);
}
static int gmatch_aux (lua_State *L) {
- MatchState ms;
- size_t ls, lp;
- const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls);
- const char *p = lua_tolstring(L, lua_upvalueindex(2), &lp);
- const char *src;
- ms.L = L;
- ms.matchdepth = MAXCCALLS;
- ms.src_init = s;
- ms.src_end = s+ls;
- ms.p_end = p + lp;
- for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3));
- src <= ms.src_end;
- src++) {
- const char *e;
- ms.level = 0;
- lua_assert(ms.matchdepth == MAXCCALLS);
- if ((e = match(&ms, src, p)) != NULL) {
- lua_Integer newstart = e-s;
- if (e == src) newstart++; /* empty match? go at least one position */
- lua_pushinteger(L, newstart);
- lua_replace(L, lua_upvalueindex(3));
- return push_captures(&ms, src, e);
- }
- }
- return 0; /* not found */
+ MatchState ms;
+ size_t ls, lp;
+ const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls);
+ const char *p = lua_tolstring(L, lua_upvalueindex(2), &lp);
+ const char *src;
+ ms.L = L;
+ ms.matchdepth = MAXCCALLS;
+ ms.src_init = s;
+ ms.src_end = s+ls;
+ ms.p_end = p + lp;
+ for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3));
+ src <= ms.src_end;
+ src++) {
+ const char *e;
+ ms.level = 0;
+ lua_assert(ms.matchdepth == MAXCCALLS);
+ if ((e = match(&ms, src, p)) != NULL) {
+ lua_Integer newstart = e-s;
+ if (e == src) newstart++; /* empty match? go at least one position */
+ lua_pushinteger(L, newstart);
+ lua_replace(L, lua_upvalueindex(3));
+ return push_captures(&ms, src, e);
+ }
+ }
+ return 0; /* not found */
}
static int gmatch (lua_State *L) {
- luaL_checkstring(L, 1);
- luaL_checkstring(L, 2);
- lua_settop(L, 2);
- lua_pushinteger(L, 0);
- lua_pushcclosure(L, gmatch_aux, 3);
- return 1;
+ luaL_checkstring(L, 1);
+ luaL_checkstring(L, 2);
+ lua_settop(L, 2);
+ lua_pushinteger(L, 0);
+ lua_pushcclosure(L, gmatch_aux, 3);
+ return 1;
}
static void add_s (MatchState *ms, luaL_Buffer *b, const char *s,
- const char *e) {
- size_t l, i;
- const char *news = lua_tolstring(ms->L, 3, &l);
- for (i = 0; i < l; i++) {
- if (news[i] != L_ESC)
- luaL_addchar(b, news[i]);
- else {
- i++; /* skip ESC */
- if (!isdigit(uchar(news[i]))) {
- if (news[i] != L_ESC)
- luaL_error(ms->L, "invalid use of " LUA_QL("%c")
- " in replacement string", L_ESC);
- luaL_addchar(b, news[i]);
- }
- else if (news[i] == '0')
- luaL_addlstring(b, s, e - s);
- else {
- push_onecapture(ms, news[i] - '1', s, e);
- luaL_addvalue(b); /* add capture to accumulated result */
- }
- }
- }
+ const char *e) {
+ size_t l, i;
+ const char *news = lua_tolstring(ms->L, 3, &l);
+ for (i = 0; i < l; i++) {
+ if (news[i] != L_ESC)
+ luaL_addchar(b, news[i]);
+ else {
+ i++; /* skip ESC */
+ if (!isdigit(uchar(news[i]))) {
+ if (news[i] != L_ESC)
+ luaL_error(ms->L, "invalid use of " LUA_QL("%c")
+ " in replacement string", L_ESC);
+ luaL_addchar(b, news[i]);
+ }
+ else if (news[i] == '0')
+ luaL_addlstring(b, s, e - s);
+ else {
+ push_onecapture(ms, news[i] - '1', s, e);
+ luaL_addvalue(b); /* add capture to accumulated result */
+ }
+ }
+ }
}
static void add_value (MatchState *ms, luaL_Buffer *b, const char *s,
- const char *e, int tr) {
- lua_State *L = ms->L;
- switch (tr) {
- case LUA_TFUNCTION: {
- int n;
- lua_pushvalue(L, 3);
- n = push_captures(ms, s, e);
- lua_call(L, n, 1);
- break;
- }
- case LUA_TTABLE: {
- push_onecapture(ms, 0, s, e);
- lua_gettable(L, 3);
- break;
- }
- default: { /* LUA_TNUMBER or LUA_TSTRING */
- add_s(ms, b, s, e);
- return;
- }
- }
- if (!lua_toboolean(L, -1)) { /* nil or false? */
- lua_pop(L, 1);
- lua_pushlstring(L, s, e - s); /* keep original text */
- }
- else if (!lua_isstring(L, -1))
- luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1));
- luaL_addvalue(b); /* add result to accumulator */
+ const char *e, int tr) {
+ lua_State *L = ms->L;
+ switch (tr) {
+ case LUA_TFUNCTION: {
+ int n;
+ lua_pushvalue(L, 3);
+ n = push_captures(ms, s, e);
+ lua_call(L, n, 1);
+ break;
+ }
+ case LUA_TTABLE: {
+ push_onecapture(ms, 0, s, e);
+ lua_gettable(L, 3);
+ break;
+ }
+ default: { /* LUA_TNUMBER or LUA_TSTRING */
+ add_s(ms, b, s, e);
+ return;
+ }
+ }
+ if (!lua_toboolean(L, -1)) { /* nil or false? */
+ lua_pop(L, 1);
+ lua_pushlstring(L, s, e - s); /* keep original text */
+ }
+ else if (!lua_isstring(L, -1))
+ luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1));
+ luaL_addvalue(b); /* add result to accumulator */
}
static int str_gsub (lua_State *L) {
- size_t srcl, lp;
- const char *src = luaL_checklstring(L, 1, &srcl);
- const char *p = luaL_checklstring(L, 2, &lp);
- int tr = lua_type(L, 3);
- size_t max_s = luaL_optinteger(L, 4, srcl+1);
- int anchor = (*p == '^');
- size_t n = 0;
- MatchState ms;
- luaL_Buffer b;
- luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
- tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
- "string/function/table expected");
- luaL_buffinit(L, &b);
- if (anchor) {
- p++; lp--; /* skip anchor character */
- }
- ms.L = L;
- ms.matchdepth = MAXCCALLS;
- ms.src_init = src;
- ms.src_end = src+srcl;
- ms.p_end = p + lp;
- while (n < max_s) {
- const char *e;
- ms.level = 0;
- lua_assert(ms.matchdepth == MAXCCALLS);
- e = match(&ms, src, p);
- if (e) {
- n++;
- add_value(&ms, &b, src, e, tr);
- }
- if (e && e>src) /* non empty match? */
- src = e; /* skip it */
- else if (src < ms.src_end)
- luaL_addchar(&b, *src++);
- else break;
- if (anchor) break;
- }
- luaL_addlstring(&b, src, ms.src_end-src);
- luaL_pushresult(&b);
- lua_pushinteger(L, n); /* number of substitutions */
- return 2;
+ size_t srcl, lp;
+ const char *src = luaL_checklstring(L, 1, &srcl);
+ const char *p = luaL_checklstring(L, 2, &lp);
+ int tr = lua_type(L, 3);
+ size_t max_s = luaL_optinteger(L, 4, srcl+1);
+ int anchor = (*p == '^');
+ size_t n = 0;
+ MatchState ms;
+ luaL_Buffer b;
+ luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
+ tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
+ "string/function/table expected");
+ luaL_buffinit(L, &b);
+ if (anchor) {
+ p++; lp--; /* skip anchor character */
+ }
+ ms.L = L;
+ ms.matchdepth = MAXCCALLS;
+ ms.src_init = src;
+ ms.src_end = src+srcl;
+ ms.p_end = p + lp;
+ while (n < max_s) {
+ const char *e;
+ ms.level = 0;
+ lua_assert(ms.matchdepth == MAXCCALLS);
+ e = match(&ms, src, p);
+ if (e) {
+ n++;
+ add_value(&ms, &b, src, e, tr);
+ }
+ if (e && e>src) /* non empty match? */
+ src = e; /* skip it */
+ else if (src < ms.src_end)
+ luaL_addchar(&b, *src++);
+ else break;
+ if (anchor) break;
+ }
+ luaL_addlstring(&b, src, ms.src_end-src);
+ luaL_pushresult(&b);
+ lua_pushinteger(L, n); /* number of substitutions */
+ return 2;
}
/* }====================================================== */
@@ -791,19 +791,19 @@ static int str_gsub (lua_State *L) {
** 'string.format'; LUA_INTFRM_T is the integer type corresponding to
** the previous length
*/
-#if !defined(LUA_INTFRMLEN) /* { */
+#if !defined(LUA_INTFRMLEN) /* { */
#if defined(LUA_USE_LONGLONG)
-#define LUA_INTFRMLEN "ll"
-#define LUA_INTFRM_T long long
+#define LUA_INTFRMLEN "ll"
+#define LUA_INTFRM_T long long
#else
-#define LUA_INTFRMLEN "l"
-#define LUA_INTFRM_T long
+#define LUA_INTFRMLEN "l"
+#define LUA_INTFRM_T long
#endif
-#endif /* } */
+#endif /* } */
/*
@@ -813,66 +813,66 @@ static int str_gsub (lua_State *L) {
*/
#if !defined(LUA_FLTFRMLEN)
-#define LUA_FLTFRMLEN ""
-#define LUA_FLTFRM_T double
+#define LUA_FLTFRMLEN ""
+#define LUA_FLTFRM_T double
#endif
/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */
-#define MAX_ITEM 512
+#define MAX_ITEM 512
/* valid flags in a format specification */
-#define FLAGS "-+ #0"
+#define FLAGS "-+ #0"
/*
** maximum size of each format specification (such as '%-099.99d')
** (+10 accounts for %99.99x plus margin of error)
*/
-#define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
+#define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
- size_t l;
- const char *s = luaL_checklstring(L, arg, &l);
- luaL_addchar(b, '"');
- while (l--) {
- if (*s == '"' || *s == '\\' || *s == '\n') {
- luaL_addchar(b, '\\');
- luaL_addchar(b, *s);
- }
- else if (*s == '\0' || iscntrl(uchar(*s))) {
- char buff[10];
- if (!isdigit(uchar(*(s+1))))
- sprintf(buff, "\\%d", (int)uchar(*s));
- else
- sprintf(buff, "\\%03d", (int)uchar(*s));
- luaL_addstring(b, buff);
- }
- else
- luaL_addchar(b, *s);
- s++;
- }
- luaL_addchar(b, '"');
+ size_t l;
+ const char *s = luaL_checklstring(L, arg, &l);
+ luaL_addchar(b, '"');
+ while (l--) {
+ if (*s == '"' || *s == '\\' || *s == '\n') {
+ luaL_addchar(b, '\\');
+ luaL_addchar(b, *s);
+ }
+ else if (*s == '\0' || iscntrl(uchar(*s))) {
+ char buff[10];
+ if (!isdigit(uchar(*(s+1))))
+ sprintf(buff, "\\%d", (int)uchar(*s));
+ else
+ sprintf(buff, "\\%03d", (int)uchar(*s));
+ luaL_addstring(b, buff);
+ }
+ else
+ luaL_addchar(b, *s);
+ s++;
+ }
+ luaL_addchar(b, '"');
}
static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
- const char *p = strfrmt;
- while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++; /* skip flags */
- if ((size_t)(p - strfrmt) >= sizeof(FLAGS)/sizeof(char))
- luaL_error(L, "invalid format (repeated flags)");
- if (isdigit(uchar(*p))) p++; /* skip width */
- if (isdigit(uchar(*p))) p++; /* (2 digits at most) */
- if (*p == '.') {
- p++;
- if (isdigit(uchar(*p))) p++; /* skip precision */
- if (isdigit(uchar(*p))) p++; /* (2 digits at most) */
- }
- if (isdigit(uchar(*p)))
- luaL_error(L, "invalid format (width or precision too long)");
- *(form++) = '%';
- memcpy(form, strfrmt, (p - strfrmt + 1) * sizeof(char));
- form += p - strfrmt + 1;
- *form = '\0';
- return p;
+ const char *p = strfrmt;
+ while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++; /* skip flags */
+ if ((size_t)(p - strfrmt) >= sizeof(FLAGS)/sizeof(char))
+ luaL_error(L, "invalid format (repeated flags)");
+ if (isdigit(uchar(*p))) p++; /* skip width */
+ if (isdigit(uchar(*p))) p++; /* (2 digits at most) */
+ if (*p == '.') {
+ p++;
+ if (isdigit(uchar(*p))) p++; /* skip precision */
+ if (isdigit(uchar(*p))) p++; /* (2 digits at most) */
+ }
+ if (isdigit(uchar(*p)))
+ luaL_error(L, "invalid format (width or precision too long)");
+ *(form++) = '%';
+ memcpy(form, strfrmt, (p - strfrmt + 1) * sizeof(char));
+ form += p - strfrmt + 1;
+ *form = '\0';
+ return p;
}
@@ -880,131 +880,131 @@ static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
** add length modifier into formats
*/
static void addlenmod (char *form, const char *lenmod) {
- size_t l = strlen(form);
- size_t lm = strlen(lenmod);
- char spec = form[l - 1];
- strcpy(form + l - 1, lenmod);
- form[l + lm - 1] = spec;
- form[l + lm] = '\0';
+ size_t l = strlen(form);
+ size_t lm = strlen(lenmod);
+ char spec = form[l - 1];
+ strcpy(form + l - 1, lenmod);
+ form[l + lm - 1] = spec;
+ form[l + lm] = '\0';
}
static int str_format (lua_State *L) {
- int top = lua_gettop(L);
- int arg = 1;
- size_t sfl;
- const char *strfrmt = luaL_checklstring(L, arg, &sfl);
- const char *strfrmt_end = strfrmt+sfl;
- luaL_Buffer b;
- luaL_buffinit(L, &b);
- while (strfrmt < strfrmt_end) {
- if (*strfrmt != L_ESC)
- luaL_addchar(&b, *strfrmt++);
- else if (*++strfrmt == L_ESC)
- luaL_addchar(&b, *strfrmt++); /* %% */
- else { /* format item */
- char form[MAX_FORMAT]; /* to store the format (`%...') */
- char *buff = luaL_prepbuffsize(&b, MAX_ITEM); /* to put formatted item */
- int nb = 0; /* number of bytes in added item */
- if (++arg > top)
- luaL_argerror(L, arg, "no value");
- strfrmt = scanformat(L, strfrmt, form);
- switch (*strfrmt++) {
- case 'c': {
- nb = sprintf(buff, form, luaL_checkint(L, arg));
- break;
- }
- case 'd': case 'i': {
- lua_Number n = luaL_checknumber(L, arg);
- LUA_INTFRM_T ni = (LUA_INTFRM_T)n;
- lua_Number diff = n - (lua_Number)ni;
- luaL_argcheck(L, -1 < diff && diff < 1, arg,
- "not a number in proper range");
- addlenmod(form, LUA_INTFRMLEN);
- nb = sprintf(buff, form, ni);
- break;
- }
- case 'o': case 'u': case 'x': case 'X': {
- lua_Number n = luaL_checknumber(L, arg);
- unsigned LUA_INTFRM_T ni = (unsigned LUA_INTFRM_T)n;
- lua_Number diff = n - (lua_Number)ni;
- luaL_argcheck(L, -1 < diff && diff < 1, arg,
- "not a non-negative number in proper range");
- addlenmod(form, LUA_INTFRMLEN);
- nb = sprintf(buff, form, ni);
- break;
- }
- case 'e': case 'E': case 'f':
+ int top = lua_gettop(L);
+ int arg = 1;
+ size_t sfl;
+ const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+ const char *strfrmt_end = strfrmt+sfl;
+ luaL_Buffer b;
+ luaL_buffinit(L, &b);
+ while (strfrmt < strfrmt_end) {
+ if (*strfrmt != L_ESC)
+ luaL_addchar(&b, *strfrmt++);
+ else if (*++strfrmt == L_ESC)
+ luaL_addchar(&b, *strfrmt++); /* %% */
+ else { /* format item */
+ char form[MAX_FORMAT]; /* to store the format (`%...') */
+ char *buff = luaL_prepbuffsize(&b, MAX_ITEM); /* to put formatted item */
+ int nb = 0; /* number of bytes in added item */
+ if (++arg > top)
+ luaL_argerror(L, arg, "no value");
+ strfrmt = scanformat(L, strfrmt, form);
+ switch (*strfrmt++) {
+ case 'c': {
+ nb = sprintf(buff, form, luaL_checkint(L, arg));
+ break;
+ }
+ case 'd': case 'i': {
+ lua_Number n = luaL_checknumber(L, arg);
+ LUA_INTFRM_T ni = (LUA_INTFRM_T)n;
+ lua_Number diff = n - (lua_Number)ni;
+ luaL_argcheck(L, -1 < diff && diff < 1, arg,
+ "not a number in proper range");
+ addlenmod(form, LUA_INTFRMLEN);
+ nb = sprintf(buff, form, ni);
+ break;
+ }
+ case 'o': case 'u': case 'x': case 'X': {
+ lua_Number n = luaL_checknumber(L, arg);
+ unsigned LUA_INTFRM_T ni = (unsigned LUA_INTFRM_T)n;
+ lua_Number diff = n - (lua_Number)ni;
+ luaL_argcheck(L, -1 < diff && diff < 1, arg,
+ "not a non-negative number in proper range");
+ addlenmod(form, LUA_INTFRMLEN);
+ nb = sprintf(buff, form, ni);
+ break;
+ }
+ case 'e': case 'E': case 'f':
#if defined(LUA_USE_AFORMAT)
- case 'a': case 'A':
+ case 'a': case 'A':
#endif
- case 'g': case 'G': {
- addlenmod(form, LUA_FLTFRMLEN);
- nb = sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg));
- break;
- }
- case 'q': {
- addquoted(L, &b, arg);
- break;
- }
- case 's': {
- size_t l;
- const char *s = luaL_tolstring(L, arg, &l);
- if (!strchr(form, '.') && l >= 100) {
- /* no precision and string is too long to be formatted;
- keep original string */
- luaL_addvalue(&b);
- break;
- }
- else {
- nb = sprintf(buff, form, s);
- lua_pop(L, 1); /* remove result from 'luaL_tolstring' */
- break;
- }
- }
- default: { /* also treat cases `pnLlh' */
- return luaL_error(L, "invalid option " LUA_QL("%%%c") " to "
- LUA_QL("format"), *(strfrmt - 1));
- }
- }
- luaL_addsize(&b, nb);
- }
- }
- luaL_pushresult(&b);
- return 1;
+ case 'g': case 'G': {
+ addlenmod(form, LUA_FLTFRMLEN);
+ nb = sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg));
+ break;
+ }
+ case 'q': {
+ addquoted(L, &b, arg);
+ break;
+ }
+ case 's': {
+ size_t l;
+ const char *s = luaL_tolstring(L, arg, &l);
+ if (!strchr(form, '.') && l >= 100) {
+ /* no precision and string is too long to be formatted;
+ keep original string */
+ luaL_addvalue(&b);
+ break;
+ }
+ else {
+ nb = sprintf(buff, form, s);
+ lua_pop(L, 1); /* remove result from 'luaL_tolstring' */
+ break;
+ }
+ }
+ default: { /* also treat cases `pnLlh' */
+ return luaL_error(L, "invalid option " LUA_QL("%%%c") " to "
+ LUA_QL("format"), *(strfrmt - 1));
+ }
+ }
+ luaL_addsize(&b, nb);
+ }
+ }
+ luaL_pushresult(&b);
+ return 1;
}
/* }====================================================== */
static const luaL_Reg strlib[] = {
- {"byte", str_byte},
- {"char", str_char},
- {"dump", str_dump},
- {"find", str_find},
- {"format", str_format},
- {"gmatch", gmatch},
- {"gsub", str_gsub},
- {"len", str_len},
- {"lower", str_lower},
- {"match", str_match},
- {"rep", str_rep},
- {"reverse", str_reverse},
- {"sub", str_sub},
- {"upper", str_upper},
- {NULL, NULL}
+ {"byte", str_byte},
+ {"char", str_char},
+ {"dump", str_dump},
+ {"find", str_find},
+ {"format", str_format},
+ {"gmatch", gmatch},
+ {"gsub", str_gsub},
+ {"len", str_len},
+ {"lower", str_lower},
+ {"match", str_match},
+ {"rep", str_rep},
+ {"reverse", str_reverse},
+ {"sub", str_sub},
+ {"upper", str_upper},
+ {NULL, NULL}
};
static void createmetatable (lua_State *L) {
- lua_createtable(L, 0, 1); /* table to be metatable for strings */
- lua_pushliteral(L, ""); /* dummy string */
- lua_pushvalue(L, -2); /* copy table */
- lua_setmetatable(L, -2); /* set table as metatable for strings */
- lua_pop(L, 1); /* pop dummy string */
- lua_pushvalue(L, -2); /* get string library */
- lua_setfield(L, -2, "__index"); /* metatable.__index = string */
- lua_pop(L, 1); /* pop metatable */
+ lua_createtable(L, 0, 1); /* table to be metatable for strings */
+ lua_pushliteral(L, ""); /* dummy string */
+ lua_pushvalue(L, -2); /* copy table */
+ lua_setmetatable(L, -2); /* set table as metatable for strings */
+ lua_pop(L, 1); /* pop dummy string */
+ lua_pushvalue(L, -2); /* get string library */
+ lua_setfield(L, -2, "__index"); /* metatable.__index = string */
+ lua_pop(L, 1); /* pop metatable */
}
@@ -1012,8 +1012,7 @@ static void createmetatable (lua_State *L) {
** Open string library
*/
LUAMOD_API int luaopen_string (lua_State *L) {
- luaL_newlib(L, strlib);
- createmetatable(L);
- return 1;
+ luaL_newlib(L, strlib);
+ createmetatable(L);
+ return 1;
}
-
diff --git a/src/lib/lua/ltable.c b/src/lib/lua/ltable.c
index 5d76f97ec3c..ee0c5d530e8 100644
--- a/src/lib/lua/ltable.c
+++ b/src/lib/lua/ltable.c
@@ -40,37 +40,37 @@
** max size of array part is 2^MAXBITS
*/
#if LUAI_BITSINT >= 32
-#define MAXBITS 30
+#define MAXBITS 30
#else
-#define MAXBITS (LUAI_BITSINT-2)
+#define MAXBITS (LUAI_BITSINT-2)
#endif
-#define MAXASIZE (1 << MAXBITS)
+#define MAXASIZE (1 << MAXBITS)
-#define hashpow2(t,n) (gnode(t, lmod((n), sizenode(t))))
+#define hashpow2(t,n) (gnode(t, lmod((n), sizenode(t))))
-#define hashstr(t,str) hashpow2(t, (str)->tsv.hash)
-#define hashboolean(t,p) hashpow2(t, p)
+#define hashstr(t,str) hashpow2(t, (str)->tsv.hash)
+#define hashboolean(t,p) hashpow2(t, p)
/*
** for some types, it is better to avoid modulus by power of 2, as
** they tend to have many 2 factors.
*/
-#define hashmod(t,n) (gnode(t, ((n) % ((sizenode(t)-1)|1))))
+#define hashmod(t,n) (gnode(t, ((n) % ((sizenode(t)-1)|1))))
-#define hashpointer(t,p) hashmod(t, IntPoint(p))
+#define hashpointer(t,p) hashmod(t, IntPoint(p))
-#define dummynode (&dummynode_)
+#define dummynode (&dummynode_)
-#define isdummy(n) ((n) == dummynode)
+#define isdummy(n) ((n) == dummynode)
static const Node dummynode_ = {
- {NILCONSTANT}, /* value */
- {{NILCONSTANT, NULL}} /* key */
+ {NILCONSTANT}, /* value */
+ {{NILCONSTANT, NULL}} /* key */
};
@@ -78,14 +78,14 @@ static const Node dummynode_ = {
** hash for lua_Numbers
*/
static Node *hashnum (const Table *t, lua_Number n) {
- int i;
- luai_hashnum(i, n);
- if (i < 0) {
- if (cast(unsigned int, i) == 0u - i) /* use unsigned to avoid overflows */
- i = 0; /* handle INT_MIN */
- i = -i; /* must be a positive value */
- }
- return hashmod(t, i);
+ int i;
+ luai_hashnum(i, n);
+ if (i < 0) {
+ if (cast(unsigned int, i) == 0u - i) /* use unsigned to avoid overflows */
+ i = 0; /* handle INT_MIN */
+ i = -i; /* must be a positive value */
+ }
+ return hashmod(t, i);
}
@@ -95,28 +95,28 @@ static Node *hashnum (const Table *t, lua_Number n) {
** of its hash value)
*/
static Node *mainposition (const Table *t, const TValue *key) {
- switch (ttype(key)) {
- case LUA_TNUMBER:
- return hashnum(t, nvalue(key));
- case LUA_TLNGSTR: {
- TString *s = rawtsvalue(key);
- if (s->tsv.extra == 0) { /* no hash? */
- s->tsv.hash = luaS_hash(getstr(s), s->tsv.len, s->tsv.hash);
- s->tsv.extra = 1; /* now it has its hash */
- }
- return hashstr(t, rawtsvalue(key));
- }
- case LUA_TSHRSTR:
- return hashstr(t, rawtsvalue(key));
- case LUA_TBOOLEAN:
- return hashboolean(t, bvalue(key));
- case LUA_TLIGHTUSERDATA:
- return hashpointer(t, pvalue(key));
- case LUA_TLCF:
- return hashpointer(t, fvalue(key));
- default:
- return hashpointer(t, gcvalue(key));
- }
+ switch (ttype(key)) {
+ case LUA_TNUMBER:
+ return hashnum(t, nvalue(key));
+ case LUA_TLNGSTR: {
+ TString *s = rawtsvalue(key);
+ if (s->tsv.extra == 0) { /* no hash? */
+ s->tsv.hash = luaS_hash(getstr(s), s->tsv.len, s->tsv.hash);
+ s->tsv.extra = 1; /* now it has its hash */
+ }
+ return hashstr(t, rawtsvalue(key));
+ }
+ case LUA_TSHRSTR:
+ return hashstr(t, rawtsvalue(key));
+ case LUA_TBOOLEAN:
+ return hashboolean(t, bvalue(key));
+ case LUA_TLIGHTUSERDATA:
+ return hashpointer(t, pvalue(key));
+ case LUA_TLCF:
+ return hashpointer(t, fvalue(key));
+ default:
+ return hashpointer(t, gcvalue(key));
+ }
}
@@ -125,14 +125,14 @@ static Node *mainposition (const Table *t, const TValue *key) {
** the array part of the table, -1 otherwise.
*/
static int arrayindex (const TValue *key) {
- if (ttisnumber(key)) {
- lua_Number n = nvalue(key);
- int k;
- lua_number2int(k, n);
- if (luai_numeq(cast_num(k), n))
- return k;
- }
- return -1; /* `key' did not match some condition */
+ if (ttisnumber(key)) {
+ lua_Number n = nvalue(key);
+ int k;
+ lua_number2int(k, n);
+ if (luai_numeq(cast_num(k), n))
+ return k;
+ }
+ return -1; /* `key' did not match some condition */
}
@@ -142,47 +142,47 @@ static int arrayindex (const TValue *key) {
** beginning of a traversal is signaled by -1.
*/
static int findindex (lua_State *L, Table *t, StkId key) {
- int i;
- if (ttisnil(key)) return -1; /* first iteration */
- i = arrayindex(key);
- if (0 < i && i <= t->sizearray) /* is `key' inside array part? */
- return i-1; /* yes; that's the index (corrected to C) */
- else {
- Node *n = mainposition(t, key);
- for (;;) { /* check whether `key' is somewhere in the chain */
- /* key may be dead already, but it is ok to use it in `next' */
- if (luaV_rawequalobj(gkey(n), key) ||
- (ttisdeadkey(gkey(n)) && iscollectable(key) &&
- deadvalue(gkey(n)) == gcvalue(key))) {
- i = cast_int(n - gnode(t, 0)); /* key index in hash table */
- /* hash elements are numbered after array ones */
- return i + t->sizearray;
- }
- else n = gnext(n);
- if (n == NULL)
- luaG_runerror(L, "invalid key to " LUA_QL("next")); /* key not found */
- }
- }
+ int i;
+ if (ttisnil(key)) return -1; /* first iteration */
+ i = arrayindex(key);
+ if (0 < i && i <= t->sizearray) /* is `key' inside array part? */
+ return i-1; /* yes; that's the index (corrected to C) */
+ else {
+ Node *n = mainposition(t, key);
+ for (;;) { /* check whether `key' is somewhere in the chain */
+ /* key may be dead already, but it is ok to use it in `next' */
+ if (luaV_rawequalobj(gkey(n), key) ||
+ (ttisdeadkey(gkey(n)) && iscollectable(key) &&
+ deadvalue(gkey(n)) == gcvalue(key))) {
+ i = cast_int(n - gnode(t, 0)); /* key index in hash table */
+ /* hash elements are numbered after array ones */
+ return i + t->sizearray;
+ }
+ else n = gnext(n);
+ if (n == NULL)
+ luaG_runerror(L, "invalid key to " LUA_QL("next")); /* key not found */
+ }
+ }
}
int luaH_next (lua_State *L, Table *t, StkId key) {
- int i = findindex(L, t, key); /* find original element */
- for (i++; i < t->sizearray; i++) { /* try first array part */
- if (!ttisnil(&t->array[i])) { /* a non-nil value? */
- setnvalue(key, cast_num(i+1));
- setobj2s(L, key+1, &t->array[i]);
- return 1;
- }
- }
- for (i -= t->sizearray; i < sizenode(t); i++) { /* then hash part */
- if (!ttisnil(gval(gnode(t, i)))) { /* a non-nil value? */
- setobj2s(L, key, gkey(gnode(t, i)));
- setobj2s(L, key+1, gval(gnode(t, i)));
- return 1;
- }
- }
- return 0; /* no more elements */
+ int i = findindex(L, t, key); /* find original element */
+ for (i++; i < t->sizearray; i++) { /* try first array part */
+ if (!ttisnil(&t->array[i])) { /* a non-nil value? */
+ setnvalue(key, cast_num(i+1));
+ setobj2s(L, key+1, &t->array[i]);
+ return 1;
+ }
+ }
+ for (i -= t->sizearray; i < sizenode(t); i++) { /* then hash part */
+ if (!ttisnil(gval(gnode(t, i)))) { /* a non-nil value? */
+ setobj2s(L, key, gkey(gnode(t, i)));
+ setobj2s(L, key+1, gval(gnode(t, i)));
+ return 1;
+ }
+ }
+ return 0; /* no more elements */
}
@@ -194,168 +194,168 @@ int luaH_next (lua_State *L, Table *t, StkId key) {
static int computesizes (int nums[], int *narray) {
- int i;
- int twotoi; /* 2^i */
- int a = 0; /* number of elements smaller than 2^i */
- int na = 0; /* number of elements to go to array part */
- int n = 0; /* optimal size for array part */
- for (i = 0, twotoi = 1; twotoi/2 < *narray; i++, twotoi *= 2) {
- if (nums[i] > 0) {
- a += nums[i];
- if (a > twotoi/2) { /* more than half elements present? */
- n = twotoi; /* optimal size (till now) */
- na = a; /* all elements smaller than n will go to array part */
- }
- }
- if (a == *narray) break; /* all elements already counted */
- }
- *narray = n;
- lua_assert(*narray/2 <= na && na <= *narray);
- return na;
+ int i;
+ int twotoi; /* 2^i */
+ int a = 0; /* number of elements smaller than 2^i */
+ int na = 0; /* number of elements to go to array part */
+ int n = 0; /* optimal size for array part */
+ for (i = 0, twotoi = 1; twotoi/2 < *narray; i++, twotoi *= 2) {
+ if (nums[i] > 0) {
+ a += nums[i];
+ if (a > twotoi/2) { /* more than half elements present? */
+ n = twotoi; /* optimal size (till now) */
+ na = a; /* all elements smaller than n will go to array part */
+ }
+ }
+ if (a == *narray) break; /* all elements already counted */
+ }
+ *narray = n;
+ lua_assert(*narray/2 <= na && na <= *narray);
+ return na;
}
static int countint (const TValue *key, int *nums) {
- int k = arrayindex(key);
- if (0 < k && k <= MAXASIZE) { /* is `key' an appropriate array index? */
- nums[luaO_ceillog2(k)]++; /* count as such */
- return 1;
- }
- else
- return 0;
+ int k = arrayindex(key);
+ if (0 < k && k <= MAXASIZE) { /* is `key' an appropriate array index? */
+ nums[luaO_ceillog2(k)]++; /* count as such */
+ return 1;
+ }
+ else
+ return 0;
}
static int numusearray (const Table *t, int *nums) {
- int lg;
- int ttlg; /* 2^lg */
- int ause = 0; /* summation of `nums' */
- int i = 1; /* count to traverse all array keys */
- for (lg=0, ttlg=1; lg<=MAXBITS; lg++, ttlg*=2) { /* for each slice */
- int lc = 0; /* counter */
- int lim = ttlg;
- if (lim > t->sizearray) {
- lim = t->sizearray; /* adjust upper limit */
- if (i > lim)
- break; /* no more elements to count */
- }
- /* count elements in range (2^(lg-1), 2^lg] */
- for (; i <= lim; i++) {
- if (!ttisnil(&t->array[i-1]))
- lc++;
- }
- nums[lg] += lc;
- ause += lc;
- }
- return ause;
+ int lg;
+ int ttlg; /* 2^lg */
+ int ause = 0; /* summation of `nums' */
+ int i = 1; /* count to traverse all array keys */
+ for (lg=0, ttlg=1; lg<=MAXBITS; lg++, ttlg*=2) { /* for each slice */
+ int lc = 0; /* counter */
+ int lim = ttlg;
+ if (lim > t->sizearray) {
+ lim = t->sizearray; /* adjust upper limit */
+ if (i > lim)
+ break; /* no more elements to count */
+ }
+ /* count elements in range (2^(lg-1), 2^lg] */
+ for (; i <= lim; i++) {
+ if (!ttisnil(&t->array[i-1]))
+ lc++;
+ }
+ nums[lg] += lc;
+ ause += lc;
+ }
+ return ause;
}
static int numusehash (const Table *t, int *nums, int *pnasize) {
- int totaluse = 0; /* total number of elements */
- int ause = 0; /* summation of `nums' */
- int i = sizenode(t);
- while (i--) {
- Node *n = &t->node[i];
- if (!ttisnil(gval(n))) {
- ause += countint(gkey(n), nums);
- totaluse++;
- }
- }
- *pnasize += ause;
- return totaluse;
+ int totaluse = 0; /* total number of elements */
+ int ause = 0; /* summation of `nums' */
+ int i = sizenode(t);
+ while (i--) {
+ Node *n = &t->node[i];
+ if (!ttisnil(gval(n))) {
+ ause += countint(gkey(n), nums);
+ totaluse++;
+ }
+ }
+ *pnasize += ause;
+ return totaluse;
}
static void setarrayvector (lua_State *L, Table *t, int size) {
- int i;
- luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
- for (i=t->sizearray; i<size; i++)
- setnilvalue(&t->array[i]);
- t->sizearray = size;
+ int i;
+ luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
+ for (i=t->sizearray; i<size; i++)
+ setnilvalue(&t->array[i]);
+ t->sizearray = size;
}
static void setnodevector (lua_State *L, Table *t, int size) {
- int lsize;
- if (size == 0) { /* no elements to hash part? */
- t->node = cast(Node *, dummynode); /* use common `dummynode' */
- lsize = 0;
- }
- else {
- int i;
- lsize = luaO_ceillog2(size);
- if (lsize > MAXBITS)
- luaG_runerror(L, "table overflow");
- size = twoto(lsize);
- t->node = luaM_newvector(L, size, Node);
- for (i=0; i<size; i++) {
- Node *n = gnode(t, i);
- gnext(n) = NULL;
- setnilvalue(gkey(n));
- setnilvalue(gval(n));
- }
- }
- t->lsizenode = cast_byte(lsize);
- t->lastfree = gnode(t, size); /* all positions are free */
+ int lsize;
+ if (size == 0) { /* no elements to hash part? */
+ t->node = cast(Node *, dummynode); /* use common `dummynode' */
+ lsize = 0;
+ }
+ else {
+ int i;
+ lsize = luaO_ceillog2(size);
+ if (lsize > MAXBITS)
+ luaG_runerror(L, "table overflow");
+ size = twoto(lsize);
+ t->node = luaM_newvector(L, size, Node);
+ for (i=0; i<size; i++) {
+ Node *n = gnode(t, i);
+ gnext(n) = NULL;
+ setnilvalue(gkey(n));
+ setnilvalue(gval(n));
+ }
+ }
+ t->lsizenode = cast_byte(lsize);
+ t->lastfree = gnode(t, size); /* all positions are free */
}
void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize) {
- int i;
- int oldasize = t->sizearray;
- int oldhsize = t->lsizenode;
- Node *nold = t->node; /* save old hash ... */
- if (nasize > oldasize) /* array part must grow? */
- setarrayvector(L, t, nasize);
- /* create new hash part with appropriate size */
- setnodevector(L, t, nhsize);
- if (nasize < oldasize) { /* array part must shrink? */
- t->sizearray = nasize;
- /* re-insert elements from vanishing slice */
- for (i=nasize; i<oldasize; i++) {
- if (!ttisnil(&t->array[i]))
- luaH_setint(L, t, i + 1, &t->array[i]);
- }
- /* shrink array */
- luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
- }
- /* re-insert elements from hash part */
- for (i = twoto(oldhsize) - 1; i >= 0; i--) {
- Node *old = nold+i;
- if (!ttisnil(gval(old))) {
- /* doesn't need barrier/invalidate cache, as entry was
- already present in the table */
- setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old));
- }
- }
- if (!isdummy(nold))
- luaM_freearray(L, nold, cast(size_t, twoto(oldhsize))); /* free old array */
+ int i;
+ int oldasize = t->sizearray;
+ int oldhsize = t->lsizenode;
+ Node *nold = t->node; /* save old hash ... */
+ if (nasize > oldasize) /* array part must grow? */
+ setarrayvector(L, t, nasize);
+ /* create new hash part with appropriate size */
+ setnodevector(L, t, nhsize);
+ if (nasize < oldasize) { /* array part must shrink? */
+ t->sizearray = nasize;
+ /* re-insert elements from vanishing slice */
+ for (i=nasize; i<oldasize; i++) {
+ if (!ttisnil(&t->array[i]))
+ luaH_setint(L, t, i + 1, &t->array[i]);
+ }
+ /* shrink array */
+ luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
+ }
+ /* re-insert elements from hash part */
+ for (i = twoto(oldhsize) - 1; i >= 0; i--) {
+ Node *old = nold+i;
+ if (!ttisnil(gval(old))) {
+ /* doesn't need barrier/invalidate cache, as entry was
+ already present in the table */
+ setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old));
+ }
+ }
+ if (!isdummy(nold))
+ luaM_freearray(L, nold, cast(size_t, twoto(oldhsize))); /* free old array */
}
void luaH_resizearray (lua_State *L, Table *t, int nasize) {
- int nsize = isdummy(t->node) ? 0 : sizenode(t);
- luaH_resize(L, t, nasize, nsize);
+ int nsize = isdummy(t->node) ? 0 : sizenode(t);
+ luaH_resize(L, t, nasize, nsize);
}
static void rehash (lua_State *L, Table *t, const TValue *ek) {
- int nasize, na;
- int nums[MAXBITS+1]; /* nums[i] = number of keys with 2^(i-1) < k <= 2^i */
- int i;
- int totaluse;
- for (i=0; i<=MAXBITS; i++) nums[i] = 0; /* reset counts */
- nasize = numusearray(t, nums); /* count keys in array part */
- totaluse = nasize; /* all those keys are integer keys */
- totaluse += numusehash(t, nums, &nasize); /* count keys in hash part */
- /* count extra key */
- nasize += countint(ek, nums);
- totaluse++;
- /* compute new size for array part */
- na = computesizes(nums, &nasize);
- /* resize the table to new computed sizes */
- luaH_resize(L, t, nasize, totaluse - na);
+ int nasize, na;
+ int nums[MAXBITS+1]; /* nums[i] = number of keys with 2^(i-1) < k <= 2^i */
+ int i;
+ int totaluse;
+ for (i=0; i<=MAXBITS; i++) nums[i] = 0; /* reset counts */
+ nasize = numusearray(t, nums); /* count keys in array part */
+ totaluse = nasize; /* all those keys are integer keys */
+ totaluse += numusehash(t, nums, &nasize); /* count keys in hash part */
+ /* count extra key */
+ nasize += countint(ek, nums);
+ totaluse++;
+ /* compute new size for array part */
+ na = computesizes(nums, &nasize);
+ /* resize the table to new computed sizes */
+ luaH_resize(L, t, nasize, totaluse - na);
}
@@ -366,31 +366,31 @@ static void rehash (lua_State *L, Table *t, const TValue *ek) {
Table *luaH_new (lua_State *L) {
- Table *t = &luaC_newobj(L, LUA_TTABLE, sizeof(Table), NULL, 0)->h;
- t->metatable = NULL;
- t->flags = cast_byte(~0);
- t->array = NULL;
- t->sizearray = 0;
- setnodevector(L, t, 0);
- return t;
+ Table *t = &luaC_newobj(L, LUA_TTABLE, sizeof(Table), NULL, 0)->h;
+ t->metatable = NULL;
+ t->flags = cast_byte(~0);
+ t->array = NULL;
+ t->sizearray = 0;
+ setnodevector(L, t, 0);
+ return t;
}
void luaH_free (lua_State *L, Table *t) {
- if (!isdummy(t->node))
- luaM_freearray(L, t->node, cast(size_t, sizenode(t)));
- luaM_freearray(L, t->array, t->sizearray);
- luaM_free(L, t);
+ if (!isdummy(t->node))
+ luaM_freearray(L, t->node, cast(size_t, sizenode(t)));
+ luaM_freearray(L, t->array, t->sizearray);
+ luaM_free(L, t);
}
static Node *getfreepos (Table *t) {
- while (t->lastfree > t->node) {
- t->lastfree--;
- if (ttisnil(gkey(t->lastfree)))
- return t->lastfree;
- }
- return NULL; /* could not find a free place */
+ while (t->lastfree > t->node) {
+ t->lastfree--;
+ if (ttisnil(gkey(t->lastfree)))
+ return t->lastfree;
+ }
+ return NULL; /* could not find a free place */
}
@@ -403,40 +403,40 @@ static Node *getfreepos (Table *t) {
** position), new key goes to an empty position.
*/
TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
- Node *mp;
- if (ttisnil(key)) luaG_runerror(L, "table index is nil");
- else if (ttisnumber(key) && luai_numisnan(L, nvalue(key)))
- luaG_runerror(L, "table index is NaN");
- mp = mainposition(t, key);
- if (!ttisnil(gval(mp)) || isdummy(mp)) { /* main position is taken? */
- Node *othern;
- Node *n = getfreepos(t); /* get a free place */
- if (n == NULL) { /* cannot find a free place? */
- rehash(L, t, key); /* grow table */
- /* whatever called 'newkey' take care of TM cache and GC barrier */
- return luaH_set(L, t, key); /* insert key into grown table */
- }
- lua_assert(!isdummy(n));
- othern = mainposition(t, gkey(mp));
- if (othern != mp) { /* is colliding node out of its main position? */
- /* yes; move colliding node into free position */
- while (gnext(othern) != mp) othern = gnext(othern); /* find previous */
- gnext(othern) = n; /* redo the chain with `n' in place of `mp' */
- *n = *mp; /* copy colliding node into free pos. (mp->next also goes) */
- gnext(mp) = NULL; /* now `mp' is free */
- setnilvalue(gval(mp));
- }
- else { /* colliding node is in its own main position */
- /* new node will go into free position */
- gnext(n) = gnext(mp); /* chain new position */
- gnext(mp) = n;
- mp = n;
- }
- }
- setobj2t(L, gkey(mp), key);
- luaC_barrierback(L, obj2gco(t), key);
- lua_assert(ttisnil(gval(mp)));
- return gval(mp);
+ Node *mp;
+ if (ttisnil(key)) luaG_runerror(L, "table index is nil");
+ else if (ttisnumber(key) && luai_numisnan(L, nvalue(key)))
+ luaG_runerror(L, "table index is NaN");
+ mp = mainposition(t, key);
+ if (!ttisnil(gval(mp)) || isdummy(mp)) { /* main position is taken? */
+ Node *othern;
+ Node *n = getfreepos(t); /* get a free place */
+ if (n == NULL) { /* cannot find a free place? */
+ rehash(L, t, key); /* grow table */
+ /* whatever called 'newkey' take care of TM cache and GC barrier */
+ return luaH_set(L, t, key); /* insert key into grown table */
+ }
+ lua_assert(!isdummy(n));
+ othern = mainposition(t, gkey(mp));
+ if (othern != mp) { /* is colliding node out of its main position? */
+ /* yes; move colliding node into free position */
+ while (gnext(othern) != mp) othern = gnext(othern); /* find previous */
+ gnext(othern) = n; /* redo the chain with `n' in place of `mp' */
+ *n = *mp; /* copy colliding node into free pos. (mp->next also goes) */
+ gnext(mp) = NULL; /* now `mp' is free */
+ setnilvalue(gval(mp));
+ }
+ else { /* colliding node is in its own main position */
+ /* new node will go into free position */
+ gnext(n) = gnext(mp); /* chain new position */
+ gnext(mp) = n;
+ mp = n;
+ }
+ }
+ setobj2t(L, gkey(mp), key);
+ luaC_barrierback(L, obj2gco(t), key);
+ lua_assert(ttisnil(gval(mp)));
+ return gval(mp);
}
@@ -444,19 +444,19 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
** search function for integers
*/
const TValue *luaH_getint (Table *t, int key) {
- /* (1 <= key && key <= t->sizearray) */
- if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray))
- return &t->array[key-1];
- else {
- lua_Number nk = cast_num(key);
- Node *n = hashnum(t, nk);
- do { /* check whether `key' is somewhere in the chain */
- if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
- return gval(n); /* that's it */
- else n = gnext(n);
- } while (n);
- return luaO_nilobject;
- }
+ /* (1 <= key && key <= t->sizearray) */
+ if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray))
+ return &t->array[key-1];
+ else {
+ lua_Number nk = cast_num(key);
+ Node *n = hashnum(t, nk);
+ do { /* check whether `key' is somewhere in the chain */
+ if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
+ return gval(n); /* that's it */
+ else n = gnext(n);
+ } while (n);
+ return luaO_nilobject;
+ }
}
@@ -464,14 +464,14 @@ const TValue *luaH_getint (Table *t, int key) {
** search function for short strings
*/
const TValue *luaH_getstr (Table *t, TString *key) {
- Node *n = hashstr(t, key);
- lua_assert(key->tsv.tt == LUA_TSHRSTR);
- do { /* check whether `key' is somewhere in the chain */
- if (ttisshrstring(gkey(n)) && eqshrstr(rawtsvalue(gkey(n)), key))
- return gval(n); /* that's it */
- else n = gnext(n);
- } while (n);
- return luaO_nilobject;
+ Node *n = hashstr(t, key);
+ lua_assert(key->tsv.tt == LUA_TSHRSTR);
+ do { /* check whether `key' is somewhere in the chain */
+ if (ttisshrstring(gkey(n)) && eqshrstr(rawtsvalue(gkey(n)), key))
+ return gval(n); /* that's it */
+ else n = gnext(n);
+ } while (n);
+ return luaO_nilobject;
}
@@ -479,27 +479,27 @@ const TValue *luaH_getstr (Table *t, TString *key) {
** main search function
*/
const TValue *luaH_get (Table *t, const TValue *key) {
- switch (ttype(key)) {
- case LUA_TSHRSTR: return luaH_getstr(t, rawtsvalue(key));
- case LUA_TNIL: return luaO_nilobject;
- case LUA_TNUMBER: {
- int k;
- lua_Number n = nvalue(key);
- lua_number2int(k, n);
- if (luai_numeq(cast_num(k), n)) /* index is int? */
- return luaH_getint(t, k); /* use specialized version */
- /* else go through */
- }
- default: {
- Node *n = mainposition(t, key);
- do { /* check whether `key' is somewhere in the chain */
- if (luaV_rawequalobj(gkey(n), key))
- return gval(n); /* that's it */
- else n = gnext(n);
- } while (n);
- return luaO_nilobject;
- }
- }
+ switch (ttype(key)) {
+ case LUA_TSHRSTR: return luaH_getstr(t, rawtsvalue(key));
+ case LUA_TNIL: return luaO_nilobject;
+ case LUA_TNUMBER: {
+ int k;
+ lua_Number n = nvalue(key);
+ lua_number2int(k, n);
+ if (luai_numeq(cast_num(k), n)) /* index is int? */
+ return luaH_getint(t, k); /* use specialized version */
+ /* else go through */
+ }
+ default: {
+ Node *n = mainposition(t, key);
+ do { /* check whether `key' is somewhere in the chain */
+ if (luaV_rawequalobj(gkey(n), key))
+ return gval(n); /* that's it */
+ else n = gnext(n);
+ } while (n);
+ return luaO_nilobject;
+ }
+ }
}
@@ -508,48 +508,48 @@ const TValue *luaH_get (Table *t, const TValue *key) {
** barrier and invalidate the TM cache.
*/
TValue *luaH_set (lua_State *L, Table *t, const TValue *key) {
- const TValue *p = luaH_get(t, key);
- if (p != luaO_nilobject)
- return cast(TValue *, p);
- else return luaH_newkey(L, t, key);
+ const TValue *p = luaH_get(t, key);
+ if (p != luaO_nilobject)
+ return cast(TValue *, p);
+ else return luaH_newkey(L, t, key);
}
void luaH_setint (lua_State *L, Table *t, int key, TValue *value) {
- const TValue *p = luaH_getint(t, key);
- TValue *cell;
- if (p != luaO_nilobject)
- cell = cast(TValue *, p);
- else {
- TValue k;
- setnvalue(&k, cast_num(key));
- cell = luaH_newkey(L, t, &k);
- }
- setobj2t(L, cell, value);
+ const TValue *p = luaH_getint(t, key);
+ TValue *cell;
+ if (p != luaO_nilobject)
+ cell = cast(TValue *, p);
+ else {
+ TValue k;
+ setnvalue(&k, cast_num(key));
+ cell = luaH_newkey(L, t, &k);
+ }
+ setobj2t(L, cell, value);
}
static int unbound_search (Table *t, unsigned int j) {
- unsigned int i = j; /* i is zero or a present index */
- j++;
- /* find `i' and `j' such that i is present and j is not */
- while (!ttisnil(luaH_getint(t, j))) {
- i = j;
- j *= 2;
- if (j > cast(unsigned int, MAX_INT)) { /* overflow? */
- /* table was built with bad purposes: resort to linear search */
- i = 1;
- while (!ttisnil(luaH_getint(t, i))) i++;
- return i - 1;
- }
- }
- /* now do a binary search between them */
- while (j - i > 1) {
- unsigned int m = (i+j)/2;
- if (ttisnil(luaH_getint(t, m))) j = m;
- else i = m;
- }
- return i;
+ unsigned int i = j; /* i is zero or a present index */
+ j++;
+ /* find `i' and `j' such that i is present and j is not */
+ while (!ttisnil(luaH_getint(t, j))) {
+ i = j;
+ j *= 2;
+ if (j > cast(unsigned int, MAX_INT)) { /* overflow? */
+ /* table was built with bad purposes: resort to linear search */
+ i = 1;
+ while (!ttisnil(luaH_getint(t, i))) i++;
+ return i - 1;
+ }
+ }
+ /* now do a binary search between them */
+ while (j - i > 1) {
+ unsigned int m = (i+j)/2;
+ if (ttisnil(luaH_getint(t, m))) j = m;
+ else i = m;
+ }
+ return i;
}
@@ -558,21 +558,21 @@ static int unbound_search (Table *t, unsigned int j) {
** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil).
*/
int luaH_getn (Table *t) {
- unsigned int j = t->sizearray;
- if (j > 0 && ttisnil(&t->array[j - 1])) {
- /* there is a boundary in the array part: (binary) search for it */
- unsigned int i = 0;
- while (j - i > 1) {
- unsigned int m = (i+j)/2;
- if (ttisnil(&t->array[m - 1])) j = m;
- else i = m;
- }
- return i;
- }
- /* else must find a boundary in hash part */
- else if (isdummy(t->node)) /* hash part is empty? */
- return j; /* that is easy... */
- else return unbound_search(t, j);
+ unsigned int j = t->sizearray;
+ if (j > 0 && ttisnil(&t->array[j - 1])) {
+ /* there is a boundary in the array part: (binary) search for it */
+ unsigned int i = 0;
+ while (j - i > 1) {
+ unsigned int m = (i+j)/2;
+ if (ttisnil(&t->array[m - 1])) j = m;
+ else i = m;
+ }
+ return i;
+ }
+ /* else must find a boundary in hash part */
+ else if (isdummy(t->node)) /* hash part is empty? */
+ return j; /* that is easy... */
+ else return unbound_search(t, j);
}
@@ -580,7 +580,7 @@ int luaH_getn (Table *t) {
#if defined(LUA_DEBUG)
Node *luaH_mainposition (const Table *t, const TValue *key) {
- return mainposition(t, key);
+ return mainposition(t, key);
}
int luaH_isdummy (Node *n) { return isdummy(n); }
diff --git a/src/lib/lua/ltablib.c b/src/lib/lua/ltablib.c
index 6001224e39b..0bb603ea62d 100644
--- a/src/lib/lua/ltablib.c
+++ b/src/lib/lua/ltablib.c
@@ -16,97 +16,97 @@
#include "lualib.h"
-#define aux_getn(L,n) (luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
+#define aux_getn(L,n) (luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
#if defined(LUA_COMPAT_MAXN)
static int maxn (lua_State *L) {
- lua_Number max = 0;
- luaL_checktype(L, 1, LUA_TTABLE);
- lua_pushnil(L); /* first key */
- while (lua_next(L, 1)) {
- lua_pop(L, 1); /* remove value */
- if (lua_type(L, -1) == LUA_TNUMBER) {
- lua_Number v = lua_tonumber(L, -1);
- if (v > max) max = v;
- }
- }
- lua_pushnumber(L, max);
- return 1;
+ lua_Number max = 0;
+ luaL_checktype(L, 1, LUA_TTABLE);
+ lua_pushnil(L); /* first key */
+ while (lua_next(L, 1)) {
+ lua_pop(L, 1); /* remove value */
+ if (lua_type(L, -1) == LUA_TNUMBER) {
+ lua_Number v = lua_tonumber(L, -1);
+ if (v > max) max = v;
+ }
+ }
+ lua_pushnumber(L, max);
+ return 1;
}
#endif
static int tinsert (lua_State *L) {
- int e = aux_getn(L, 1) + 1; /* first empty element */
- int pos; /* where to insert new element */
- switch (lua_gettop(L)) {
- case 2: { /* called with only 2 arguments */
- pos = e; /* insert new element at the end */
- break;
- }
- case 3: {
- int i;
- pos = luaL_checkint(L, 2); /* 2nd argument is the position */
- luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
- for (i = e; i > pos; i--) { /* move up elements */
- lua_rawgeti(L, 1, i-1);
- lua_rawseti(L, 1, i); /* t[i] = t[i-1] */
- }
- break;
- }
- default: {
- return luaL_error(L, "wrong number of arguments to " LUA_QL("insert"));
- }
- }
- lua_rawseti(L, 1, pos); /* t[pos] = v */
- return 0;
+ int e = aux_getn(L, 1) + 1; /* first empty element */
+ int pos; /* where to insert new element */
+ switch (lua_gettop(L)) {
+ case 2: { /* called with only 2 arguments */
+ pos = e; /* insert new element at the end */
+ break;
+ }
+ case 3: {
+ int i;
+ pos = luaL_checkint(L, 2); /* 2nd argument is the position */
+ luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
+ for (i = e; i > pos; i--) { /* move up elements */
+ lua_rawgeti(L, 1, i-1);
+ lua_rawseti(L, 1, i); /* t[i] = t[i-1] */
+ }
+ break;
+ }
+ default: {
+ return luaL_error(L, "wrong number of arguments to " LUA_QL("insert"));
+ }
+ }
+ lua_rawseti(L, 1, pos); /* t[pos] = v */
+ return 0;
}
static int tremove (lua_State *L) {
- int size = aux_getn(L, 1);
- int pos = luaL_optint(L, 2, size);
- if (pos != size) /* validate 'pos' if given */
- luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
- lua_rawgeti(L, 1, pos); /* result = t[pos] */
- for ( ; pos < size; pos++) {
- lua_rawgeti(L, 1, pos+1);
- lua_rawseti(L, 1, pos); /* t[pos] = t[pos+1] */
- }
- lua_pushnil(L);
- lua_rawseti(L, 1, pos); /* t[pos] = nil */
- return 1;
+ int size = aux_getn(L, 1);
+ int pos = luaL_optint(L, 2, size);
+ if (pos != size) /* validate 'pos' if given */
+ luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
+ lua_rawgeti(L, 1, pos); /* result = t[pos] */
+ for ( ; pos < size; pos++) {
+ lua_rawgeti(L, 1, pos+1);
+ lua_rawseti(L, 1, pos); /* t[pos] = t[pos+1] */
+ }
+ lua_pushnil(L);
+ lua_rawseti(L, 1, pos); /* t[pos] = nil */
+ return 1;
}
static void addfield (lua_State *L, luaL_Buffer *b, int i) {
- lua_rawgeti(L, 1, i);
- if (!lua_isstring(L, -1))
- luaL_error(L, "invalid value (%s) at index %d in table for "
- LUA_QL("concat"), luaL_typename(L, -1), i);
- luaL_addvalue(b);
+ lua_rawgeti(L, 1, i);
+ if (!lua_isstring(L, -1))
+ luaL_error(L, "invalid value (%s) at index %d in table for "
+ LUA_QL("concat"), luaL_typename(L, -1), i);
+ luaL_addvalue(b);
}
static int tconcat (lua_State *L) {
- luaL_Buffer b;
- size_t lsep;
- int i, last;
- const char *sep = luaL_optlstring(L, 2, "", &lsep);
- luaL_checktype(L, 1, LUA_TTABLE);
- i = luaL_optint(L, 3, 1);
- last = luaL_opt(L, luaL_checkint, 4, luaL_len(L, 1));
- luaL_buffinit(L, &b);
- for (; i < last; i++) {
- addfield(L, &b, i);
- luaL_addlstring(&b, sep, lsep);
- }
- if (i == last) /* add last value (if interval was not empty) */
- addfield(L, &b, i);
- luaL_pushresult(&b);
- return 1;
+ luaL_Buffer b;
+ size_t lsep;
+ int i, last;
+ const char *sep = luaL_optlstring(L, 2, "", &lsep);
+ luaL_checktype(L, 1, LUA_TTABLE);
+ i = luaL_optint(L, 3, 1);
+ last = luaL_opt(L, luaL_checkint, 4, luaL_len(L, 1));
+ luaL_buffinit(L, &b);
+ for (; i < last; i++) {
+ addfield(L, &b, i);
+ luaL_addlstring(&b, sep, lsep);
+ }
+ if (i == last) /* add last value (if interval was not empty) */
+ addfield(L, &b, i);
+ luaL_pushresult(&b);
+ return 1;
}
@@ -117,35 +117,35 @@ static int tconcat (lua_State *L) {
*/
static int pack (lua_State *L) {
- int n = lua_gettop(L); /* number of elements to pack */
- lua_createtable(L, n, 1); /* create result table */
- lua_pushinteger(L, n);
- lua_setfield(L, -2, "n"); /* t.n = number of elements */
- if (n > 0) { /* at least one element? */
- int i;
- lua_pushvalue(L, 1);
- lua_rawseti(L, -2, 1); /* insert first element */
- lua_replace(L, 1); /* move table into index 1 */
- for (i = n; i >= 2; i--) /* assign other elements */
- lua_rawseti(L, 1, i);
- }
- return 1; /* return table */
+ int n = lua_gettop(L); /* number of elements to pack */
+ lua_createtable(L, n, 1); /* create result table */
+ lua_pushinteger(L, n);
+ lua_setfield(L, -2, "n"); /* t.n = number of elements */
+ if (n > 0) { /* at least one element? */
+ int i;
+ lua_pushvalue(L, 1);
+ lua_rawseti(L, -2, 1); /* insert first element */
+ lua_replace(L, 1); /* move table into index 1 */
+ for (i = n; i >= 2; i--) /* assign other elements */
+ lua_rawseti(L, 1, i);
+ }
+ return 1; /* return table */
}
static int unpack (lua_State *L) {
- int i, e, n;
- luaL_checktype(L, 1, LUA_TTABLE);
- i = luaL_optint(L, 2, 1);
- e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1));
- if (i > e) return 0; /* empty range */
- n = e - i + 1; /* number of elements */
- if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */
- return luaL_error(L, "too many results to unpack");
- lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */
- while (i++ < e) /* push arg[i + 1...e] */
- lua_rawgeti(L, 1, i);
- return n;
+ int i, e, n;
+ luaL_checktype(L, 1, LUA_TTABLE);
+ i = luaL_optint(L, 2, 1);
+ e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1));
+ if (i > e) return 0; /* empty range */
+ n = e - i + 1; /* number of elements */
+ if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */
+ return luaL_error(L, "too many results to unpack");
+ lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */
+ while (i++ < e) /* push arg[i + 1...e] */
+ lua_rawgeti(L, 1, i);
+ return n;
}
/* }====================================================== */
@@ -162,122 +162,121 @@ static int unpack (lua_State *L) {
static void set2 (lua_State *L, int i, int j) {
- lua_rawseti(L, 1, i);
- lua_rawseti(L, 1, j);
+ lua_rawseti(L, 1, i);
+ lua_rawseti(L, 1, j);
}
static int sort_comp (lua_State *L, int a, int b) {
- if (!lua_isnil(L, 2)) { /* function? */
- int res;
- lua_pushvalue(L, 2);
- lua_pushvalue(L, a-1); /* -1 to compensate function */
- lua_pushvalue(L, b-2); /* -2 to compensate function and `a' */
- lua_call(L, 2, 1);
- res = lua_toboolean(L, -1);
- lua_pop(L, 1);
- return res;
- }
- else /* a < b? */
- return lua_compare(L, a, b, LUA_OPLT);
+ if (!lua_isnil(L, 2)) { /* function? */
+ int res;
+ lua_pushvalue(L, 2);
+ lua_pushvalue(L, a-1); /* -1 to compensate function */
+ lua_pushvalue(L, b-2); /* -2 to compensate function and `a' */
+ lua_call(L, 2, 1);
+ res = lua_toboolean(L, -1);
+ lua_pop(L, 1);
+ return res;
+ }
+ else /* a < b? */
+ return lua_compare(L, a, b, LUA_OPLT);
}
static void auxsort (lua_State *L, int l, int u) {
- while (l < u) { /* for tail recursion */
- int i, j;
- /* sort elements a[l], a[(l+u)/2] and a[u] */
- lua_rawgeti(L, 1, l);
- lua_rawgeti(L, 1, u);
- if (sort_comp(L, -1, -2)) /* a[u] < a[l]? */
- set2(L, l, u); /* swap a[l] - a[u] */
- else
- lua_pop(L, 2);
- if (u-l == 1) break; /* only 2 elements */
- i = (l+u)/2;
- lua_rawgeti(L, 1, i);
- lua_rawgeti(L, 1, l);
- if (sort_comp(L, -2, -1)) /* a[i]<a[l]? */
- set2(L, i, l);
- else {
- lua_pop(L, 1); /* remove a[l] */
- lua_rawgeti(L, 1, u);
- if (sort_comp(L, -1, -2)) /* a[u]<a[i]? */
- set2(L, i, u);
- else
- lua_pop(L, 2);
- }
- if (u-l == 2) break; /* only 3 elements */
- lua_rawgeti(L, 1, i); /* Pivot */
- lua_pushvalue(L, -1);
- lua_rawgeti(L, 1, u-1);
- set2(L, i, u-1);
- /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
- i = l; j = u-1;
- for (;;) { /* invariant: a[l..i] <= P <= a[j..u] */
- /* repeat ++i until a[i] >= P */
- while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
- if (i>=u) luaL_error(L, "invalid order function for sorting");
- lua_pop(L, 1); /* remove a[i] */
- }
- /* repeat --j until a[j] <= P */
- while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
- if (j<=l) luaL_error(L, "invalid order function for sorting");
- lua_pop(L, 1); /* remove a[j] */
- }
- if (j<i) {
- lua_pop(L, 3); /* pop pivot, a[i], a[j] */
- break;
- }
- set2(L, i, j);
- }
- lua_rawgeti(L, 1, u-1);
- lua_rawgeti(L, 1, i);
- set2(L, u-1, i); /* swap pivot (a[u-1]) with a[i] */
- /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
- /* adjust so that smaller half is in [j..i] and larger one in [l..u] */
- if (i-l < u-i) {
- j=l; i=i-1; l=i+2;
- }
- else {
- j=i+1; i=u; u=j-2;
- }
- auxsort(L, j, i); /* call recursively the smaller one */
- } /* repeat the routine for the larger one */
+ while (l < u) { /* for tail recursion */
+ int i, j;
+ /* sort elements a[l], a[(l+u)/2] and a[u] */
+ lua_rawgeti(L, 1, l);
+ lua_rawgeti(L, 1, u);
+ if (sort_comp(L, -1, -2)) /* a[u] < a[l]? */
+ set2(L, l, u); /* swap a[l] - a[u] */
+ else
+ lua_pop(L, 2);
+ if (u-l == 1) break; /* only 2 elements */
+ i = (l+u)/2;
+ lua_rawgeti(L, 1, i);
+ lua_rawgeti(L, 1, l);
+ if (sort_comp(L, -2, -1)) /* a[i]<a[l]? */
+ set2(L, i, l);
+ else {
+ lua_pop(L, 1); /* remove a[l] */
+ lua_rawgeti(L, 1, u);
+ if (sort_comp(L, -1, -2)) /* a[u]<a[i]? */
+ set2(L, i, u);
+ else
+ lua_pop(L, 2);
+ }
+ if (u-l == 2) break; /* only 3 elements */
+ lua_rawgeti(L, 1, i); /* Pivot */
+ lua_pushvalue(L, -1);
+ lua_rawgeti(L, 1, u-1);
+ set2(L, i, u-1);
+ /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
+ i = l; j = u-1;
+ for (;;) { /* invariant: a[l..i] <= P <= a[j..u] */
+ /* repeat ++i until a[i] >= P */
+ while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
+ if (i>=u) luaL_error(L, "invalid order function for sorting");
+ lua_pop(L, 1); /* remove a[i] */
+ }
+ /* repeat --j until a[j] <= P */
+ while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
+ if (j<=l) luaL_error(L, "invalid order function for sorting");
+ lua_pop(L, 1); /* remove a[j] */
+ }
+ if (j<i) {
+ lua_pop(L, 3); /* pop pivot, a[i], a[j] */
+ break;
+ }
+ set2(L, i, j);
+ }
+ lua_rawgeti(L, 1, u-1);
+ lua_rawgeti(L, 1, i);
+ set2(L, u-1, i); /* swap pivot (a[u-1]) with a[i] */
+ /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
+ /* adjust so that smaller half is in [j..i] and larger one in [l..u] */
+ if (i-l < u-i) {
+ j=l; i=i-1; l=i+2;
+ }
+ else {
+ j=i+1; i=u; u=j-2;
+ }
+ auxsort(L, j, i); /* call recursively the smaller one */
+ } /* repeat the routine for the larger one */
}
static int sort (lua_State *L) {
- int n = aux_getn(L, 1);
- luaL_checkstack(L, 40, ""); /* assume array is smaller than 2^40 */
- if (!lua_isnoneornil(L, 2)) /* is there a 2nd argument? */
- luaL_checktype(L, 2, LUA_TFUNCTION);
- lua_settop(L, 2); /* make sure there is two arguments */
- auxsort(L, 1, n);
- return 0;
+ int n = aux_getn(L, 1);
+ luaL_checkstack(L, 40, ""); /* assume array is smaller than 2^40 */
+ if (!lua_isnoneornil(L, 2)) /* is there a 2nd argument? */
+ luaL_checktype(L, 2, LUA_TFUNCTION);
+ lua_settop(L, 2); /* make sure there is two arguments */
+ auxsort(L, 1, n);
+ return 0;
}
/* }====================================================== */
static const luaL_Reg tab_funcs[] = {
- {"concat", tconcat},
+ {"concat", tconcat},
#if defined(LUA_COMPAT_MAXN)
- {"maxn", maxn},
+ {"maxn", maxn},
#endif
- {"insert", tinsert},
- {"pack", pack},
- {"unpack", unpack},
- {"remove", tremove},
- {"sort", sort},
- {NULL, NULL}
+ {"insert", tinsert},
+ {"pack", pack},
+ {"unpack", unpack},
+ {"remove", tremove},
+ {"sort", sort},
+ {NULL, NULL}
};
LUAMOD_API int luaopen_table (lua_State *L) {
- luaL_newlib(L, tab_funcs);
+ luaL_newlib(L, tab_funcs);
#if defined(LUA_COMPAT_UNPACK)
- /* _G.unpack = table.unpack */
- lua_getfield(L, -1, "unpack");
- lua_setglobal(L, "unpack");
+ /* _G.unpack = table.unpack */
+ lua_getfield(L, -1, "unpack");
+ lua_setglobal(L, "unpack");
#endif
- return 1;
+ return 1;
}
-
diff --git a/src/lib/lua/ltm.c b/src/lib/lua/ltm.c
index 69b4ed77271..7936956f3a2 100644
--- a/src/lib/lua/ltm.c
+++ b/src/lib/lua/ltm.c
@@ -22,26 +22,26 @@
static const char udatatypename[] = "userdata";
LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = {
- "no value",
- "nil", "boolean", udatatypename, "number",
- "string", "table", "function", udatatypename, "thread",
- "proto", "upval" /* these last two cases are used for tests only */
+ "no value",
+ "nil", "boolean", udatatypename, "number",
+ "string", "table", "function", udatatypename, "thread",
+ "proto", "upval" /* these last two cases are used for tests only */
};
void luaT_init (lua_State *L) {
- static const char *const luaT_eventname[] = { /* ORDER TM */
- "__index", "__newindex",
- "__gc", "__mode", "__len", "__eq",
- "__add", "__sub", "__mul", "__div", "__mod",
- "__pow", "__unm", "__lt", "__le",
- "__concat", "__call"
- };
- int i;
- for (i=0; i<TM_N; i++) {
- G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
- luaS_fix(G(L)->tmname[i]); /* never collect these names */
- }
+ static const char *const luaT_eventname[] = { /* ORDER TM */
+ "__index", "__newindex",
+ "__gc", "__mode", "__len", "__eq",
+ "__add", "__sub", "__mul", "__div", "__mod",
+ "__pow", "__unm", "__lt", "__le",
+ "__concat", "__call"
+ };
+ int i;
+ for (i=0; i<TM_N; i++) {
+ G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
+ luaS_fix(G(L)->tmname[i]); /* never collect these names */
+ }
}
@@ -50,28 +50,27 @@ void luaT_init (lua_State *L) {
** tag methods
*/
const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
- const TValue *tm = luaH_getstr(events, ename);
- lua_assert(event <= TM_EQ);
- if (ttisnil(tm)) { /* no tag method? */
- events->flags |= cast_byte(1u<<event); /* cache this fact */
- return NULL;
- }
- else return tm;
+ const TValue *tm = luaH_getstr(events, ename);
+ lua_assert(event <= TM_EQ);
+ if (ttisnil(tm)) { /* no tag method? */
+ events->flags |= cast_byte(1u<<event); /* cache this fact */
+ return NULL;
+ }
+ else return tm;
}
const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
- Table *mt;
- switch (ttypenv(o)) {
- case LUA_TTABLE:
- mt = hvalue(o)->metatable;
- break;
- case LUA_TUSERDATA:
- mt = uvalue(o)->metatable;
- break;
- default:
- mt = G(L)->mt[ttypenv(o)];
- }
- return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
+ Table *mt;
+ switch (ttypenv(o)) {
+ case LUA_TTABLE:
+ mt = hvalue(o)->metatable;
+ break;
+ case LUA_TUSERDATA:
+ mt = uvalue(o)->metatable;
+ break;
+ default:
+ mt = G(L)->mt[ttypenv(o)];
+ }
+ return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
}
-
diff --git a/src/lib/lua/lua.c b/src/lib/lua/lua.c
index 4345e554e92..2d527599698 100644
--- a/src/lib/lua/lua.c
+++ b/src/lib/lua/lua.c
@@ -19,20 +19,20 @@
#if !defined(LUA_PROMPT)
-#define LUA_PROMPT "> "
-#define LUA_PROMPT2 ">> "
+#define LUA_PROMPT "> "
+#define LUA_PROMPT2 ">> "
#endif
#if !defined(LUA_PROGNAME)
-#define LUA_PROGNAME "lua"
+#define LUA_PROGNAME "lua"
#endif
#if !defined(LUA_MAXINPUT)
-#define LUA_MAXINPUT 512
+#define LUA_MAXINPUT 512
#endif
#if !defined(LUA_INIT)
-#define LUA_INIT "LUA_INIT"
+#define LUA_INIT "LUA_INIT"
#endif
#define LUA_INITVERSION \
@@ -45,13 +45,13 @@
*/
#if defined(LUA_USE_ISATTY)
#include <unistd.h>
-#define lua_stdin_is_tty() isatty(0)
+#define lua_stdin_is_tty() isatty(0)
#elif defined(LUA_WIN)
#include <io.h>
#include <stdio.h>
-#define lua_stdin_is_tty() _isatty(_fileno(stdin))
+#define lua_stdin_is_tty() _isatty(_fileno(stdin))
#else
-#define lua_stdin_is_tty() 1 /* assume stdin is a tty */
+#define lua_stdin_is_tty() 1 /* assume stdin is a tty */
#endif
@@ -66,19 +66,19 @@
#include <stdio.h>
#include <readline/readline.h>
#include <readline/history.h>
-#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
+#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
#define lua_saveline(L,idx) \
- if (lua_rawlen(L,idx) > 0) /* non-empty line? */ \
- add_history(lua_tostring(L, idx)); /* add it to history */
-#define lua_freeline(L,b) ((void)L, free(b))
+ if (lua_rawlen(L,idx) > 0) /* non-empty line? */ \
+ add_history(lua_tostring(L, idx)); /* add it to history */
+#define lua_freeline(L,b) ((void)L, free(b))
#elif !defined(lua_readline)
#define lua_readline(L,b,p) \
- ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \
- fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */
-#define lua_saveline(L,idx) { (void)L; (void)idx; }
-#define lua_freeline(L,b) { (void)L; (void)b; }
+ ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \
+ fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */
+#define lua_saveline(L,idx) { (void)L; (void)idx; }
+#define lua_freeline(L,b) { (void)L; (void)b; }
#endif
@@ -92,406 +92,405 @@ static const char *progname = LUA_PROGNAME;
static void lstop (lua_State *L, lua_Debug *ar) {
- (void)ar; /* unused arg. */
- lua_sethook(L, NULL, 0, 0);
- luaL_error(L, "interrupted!");
+ (void)ar; /* unused arg. */
+ lua_sethook(L, NULL, 0, 0);
+ luaL_error(L, "interrupted!");
}
static void laction (int i) {
- signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
+ signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
terminate process (default action) */
- lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
+ lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
}
static void print_usage (const char *badoption) {
- luai_writestringerror("%s: ", progname);
- if (badoption[1] == 'e' || badoption[1] == 'l')
- luai_writestringerror("'%s' needs argument\n", badoption);
- else
- luai_writestringerror("unrecognized option '%s'\n", badoption);
- luai_writestringerror(
- "usage: %s [options] [script [args]]\n"
- "Available options are:\n"
- " -e stat execute string " LUA_QL("stat") "\n"
- " -i enter interactive mode after executing " LUA_QL("script") "\n"
- " -l name require library " LUA_QL("name") "\n"
- " -v show version information\n"
- " -E ignore environment variables\n"
- " -- stop handling options\n"
- " - stop handling options and execute stdin\n"
- ,
- progname);
+ luai_writestringerror("%s: ", progname);
+ if (badoption[1] == 'e' || badoption[1] == 'l')
+ luai_writestringerror("'%s' needs argument\n", badoption);
+ else
+ luai_writestringerror("unrecognized option '%s'\n", badoption);
+ luai_writestringerror(
+ "usage: %s [options] [script [args]]\n"
+ "Available options are:\n"
+ " -e stat execute string " LUA_QL("stat") "\n"
+ " -i enter interactive mode after executing " LUA_QL("script") "\n"
+ " -l name require library " LUA_QL("name") "\n"
+ " -v show version information\n"
+ " -E ignore environment variables\n"
+ " -- stop handling options\n"
+ " - stop handling options and execute stdin\n"
+ ,
+ progname);
}
static void l_message (const char *pname, const char *msg) {
- if (pname) luai_writestringerror("%s: ", pname);
- luai_writestringerror("%s\n", msg);
+ if (pname) luai_writestringerror("%s: ", pname);
+ luai_writestringerror("%s\n", msg);
}
static int report (lua_State *L, int status) {
- if (status != LUA_OK && !lua_isnil(L, -1)) {
- const char *msg = lua_tostring(L, -1);
- if (msg == NULL) msg = "(error object is not a string)";
- l_message(progname, msg);
- lua_pop(L, 1);
- /* force a complete garbage collection in case of errors */
- lua_gc(L, LUA_GCCOLLECT, 0);
- }
- return status;
+ if (status != LUA_OK && !lua_isnil(L, -1)) {
+ const char *msg = lua_tostring(L, -1);
+ if (msg == NULL) msg = "(error object is not a string)";
+ l_message(progname, msg);
+ lua_pop(L, 1);
+ /* force a complete garbage collection in case of errors */
+ lua_gc(L, LUA_GCCOLLECT, 0);
+ }
+ return status;
}
/* the next function is called unprotected, so it must avoid errors */
static void finalreport (lua_State *L, int status) {
- if (status != LUA_OK) {
- const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
- : NULL;
- if (msg == NULL) msg = "(error object is not a string)";
- l_message(progname, msg);
- lua_pop(L, 1);
- }
+ if (status != LUA_OK) {
+ const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
+ : NULL;
+ if (msg == NULL) msg = "(error object is not a string)";
+ l_message(progname, msg);
+ lua_pop(L, 1);
+ }
}
static int traceback (lua_State *L) {
- const char *msg = lua_tostring(L, 1);
- if (msg)
- luaL_traceback(L, L, msg, 1);
- else if (!lua_isnoneornil(L, 1)) { /* is there an error object? */
- if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */
- lua_pushliteral(L, "(no error message)");
- }
- return 1;
+ const char *msg = lua_tostring(L, 1);
+ if (msg)
+ luaL_traceback(L, L, msg, 1);
+ else if (!lua_isnoneornil(L, 1)) { /* is there an error object? */
+ if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */
+ lua_pushliteral(L, "(no error message)");
+ }
+ return 1;
}
static int docall (lua_State *L, int narg, int nres) {
- int status;
- int base = lua_gettop(L) - narg; /* function index */
- lua_pushcfunction(L, traceback); /* push traceback function */
- lua_insert(L, base); /* put it under chunk and args */
- globalL = L; /* to be available to 'laction' */
- signal(SIGINT, laction);
- status = lua_pcall(L, narg, nres, base);
- signal(SIGINT, SIG_DFL);
- lua_remove(L, base); /* remove traceback function */
- return status;
+ int status;
+ int base = lua_gettop(L) - narg; /* function index */
+ lua_pushcfunction(L, traceback); /* push traceback function */
+ lua_insert(L, base); /* put it under chunk and args */
+ globalL = L; /* to be available to 'laction' */
+ signal(SIGINT, laction);
+ status = lua_pcall(L, narg, nres, base);
+ signal(SIGINT, SIG_DFL);
+ lua_remove(L, base); /* remove traceback function */
+ return status;
}
static void print_version (void) {
- luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
- luai_writeline();
+ luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
+ luai_writeline();
}
static int getargs (lua_State *L, char **argv, int n) {
- int narg;
- int i;
- int argc = 0;
- while (argv[argc]) argc++; /* count total number of arguments */
- narg = argc - (n + 1); /* number of arguments to the script */
- luaL_checkstack(L, narg + 3, "too many arguments to script");
- for (i=n+1; i < argc; i++)
- lua_pushstring(L, argv[i]);
- lua_createtable(L, narg, n + 1);
- for (i=0; i < argc; i++) {
- lua_pushstring(L, argv[i]);
- lua_rawseti(L, -2, i - n);
- }
- return narg;
+ int narg;
+ int i;
+ int argc = 0;
+ while (argv[argc]) argc++; /* count total number of arguments */
+ narg = argc - (n + 1); /* number of arguments to the script */
+ luaL_checkstack(L, narg + 3, "too many arguments to script");
+ for (i=n+1; i < argc; i++)
+ lua_pushstring(L, argv[i]);
+ lua_createtable(L, narg, n + 1);
+ for (i=0; i < argc; i++) {
+ lua_pushstring(L, argv[i]);
+ lua_rawseti(L, -2, i - n);
+ }
+ return narg;
}
static int dofile (lua_State *L, const char *name) {
- int status = luaL_loadfile(L, name);
- if (status == LUA_OK) status = docall(L, 0, 0);
- return report(L, status);
+ int status = luaL_loadfile(L, name);
+ if (status == LUA_OK) status = docall(L, 0, 0);
+ return report(L, status);
}
static int dostring (lua_State *L, const char *s, const char *name) {
- int status = luaL_loadbuffer(L, s, strlen(s), name);
- if (status == LUA_OK) status = docall(L, 0, 0);
- return report(L, status);
+ int status = luaL_loadbuffer(L, s, strlen(s), name);
+ if (status == LUA_OK) status = docall(L, 0, 0);
+ return report(L, status);
}
static int dolibrary (lua_State *L, const char *name) {
- int status;
- lua_getglobal(L, "require");
- lua_pushstring(L, name);
- status = docall(L, 1, 1); /* call 'require(name)' */
- if (status == LUA_OK)
- lua_setglobal(L, name); /* global[name] = require return */
- return report(L, status);
+ int status;
+ lua_getglobal(L, "require");
+ lua_pushstring(L, name);
+ status = docall(L, 1, 1); /* call 'require(name)' */
+ if (status == LUA_OK)
+ lua_setglobal(L, name); /* global[name] = require return */
+ return report(L, status);
}
static const char *get_prompt (lua_State *L, int firstline) {
- const char *p;
- lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
- p = lua_tostring(L, -1);
- if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
- return p;
+ const char *p;
+ lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
+ p = lua_tostring(L, -1);
+ if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
+ return p;
}
/* mark in error messages for incomplete statements */
-#define EOFMARK "<eof>"
-#define marklen (sizeof(EOFMARK)/sizeof(char) - 1)
+#define EOFMARK "<eof>"
+#define marklen (sizeof(EOFMARK)/sizeof(char) - 1)
static int incomplete (lua_State *L, int status) {
- if (status == LUA_ERRSYNTAX) {
- size_t lmsg;
- const char *msg = lua_tolstring(L, -1, &lmsg);
- if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
- lua_pop(L, 1);
- return 1;
- }
- }
- return 0; /* else... */
+ if (status == LUA_ERRSYNTAX) {
+ size_t lmsg;
+ const char *msg = lua_tolstring(L, -1, &lmsg);
+ if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
+ lua_pop(L, 1);
+ return 1;
+ }
+ }
+ return 0; /* else... */
}
static int pushline (lua_State *L, int firstline) {
- char buffer[LUA_MAXINPUT];
- char *b = buffer;
- size_t l;
- const char *prmt = get_prompt(L, firstline);
- int readstatus = lua_readline(L, b, prmt);
- lua_pop(L, 1); /* remove result from 'get_prompt' */
- if (readstatus == 0)
- return 0; /* no input */
- l = strlen(b);
- if (l > 0 && b[l-1] == '\n') /* line ends with newline? */
- b[l-1] = '\0'; /* remove it */
- if (firstline && b[0] == '=') /* first line starts with `=' ? */
- lua_pushfstring(L, "return %s", b+1); /* change it to `return' */
- else
- lua_pushstring(L, b);
- lua_freeline(L, b);
- return 1;
+ char buffer[LUA_MAXINPUT];
+ char *b = buffer;
+ size_t l;
+ const char *prmt = get_prompt(L, firstline);
+ int readstatus = lua_readline(L, b, prmt);
+ lua_pop(L, 1); /* remove result from 'get_prompt' */
+ if (readstatus == 0)
+ return 0; /* no input */
+ l = strlen(b);
+ if (l > 0 && b[l-1] == '\n') /* line ends with newline? */
+ b[l-1] = '\0'; /* remove it */
+ if (firstline && b[0] == '=') /* first line starts with `=' ? */
+ lua_pushfstring(L, "return %s", b+1); /* change it to `return' */
+ else
+ lua_pushstring(L, b);
+ lua_freeline(L, b);
+ return 1;
}
static int loadline (lua_State *L) {
- int status;
- lua_settop(L, 0);
- if (!pushline(L, 1))
- return -1; /* no input */
- for (;;) { /* repeat until gets a complete line */
- size_t l;
- const char *line = lua_tolstring(L, 1, &l);
- status = luaL_loadbuffer(L, line, l, "=stdin");
- if (!incomplete(L, status)) break; /* cannot try to add lines? */
- if (!pushline(L, 0)) /* no more input? */
- return -1;
- lua_pushliteral(L, "\n"); /* add a new line... */
- lua_insert(L, -2); /* ...between the two lines */
- lua_concat(L, 3); /* join them */
- }
- lua_saveline(L, 1);
- lua_remove(L, 1); /* remove line */
- return status;
+ int status;
+ lua_settop(L, 0);
+ if (!pushline(L, 1))
+ return -1; /* no input */
+ for (;;) { /* repeat until gets a complete line */
+ size_t l;
+ const char *line = lua_tolstring(L, 1, &l);
+ status = luaL_loadbuffer(L, line, l, "=stdin");
+ if (!incomplete(L, status)) break; /* cannot try to add lines? */
+ if (!pushline(L, 0)) /* no more input? */
+ return -1;
+ lua_pushliteral(L, "\n"); /* add a new line... */
+ lua_insert(L, -2); /* ...between the two lines */
+ lua_concat(L, 3); /* join them */
+ }
+ lua_saveline(L, 1);
+ lua_remove(L, 1); /* remove line */
+ return status;
}
static void dotty (lua_State *L) {
- int status;
- const char *oldprogname = progname;
- progname = NULL;
- while ((status = loadline(L)) != -1) {
- if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET);
- report(L, status);
- if (status == LUA_OK && lua_gettop(L) > 0) { /* any result to print? */
- luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
- lua_getglobal(L, "print");
- lua_insert(L, 1);
- if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK)
- l_message(progname, lua_pushfstring(L,
- "error calling " LUA_QL("print") " (%s)",
- lua_tostring(L, -1)));
- }
- }
- lua_settop(L, 0); /* clear stack */
- luai_writeline();
- progname = oldprogname;
+ int status;
+ const char *oldprogname = progname;
+ progname = NULL;
+ while ((status = loadline(L)) != -1) {
+ if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET);
+ report(L, status);
+ if (status == LUA_OK && lua_gettop(L) > 0) { /* any result to print? */
+ luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
+ lua_getglobal(L, "print");
+ lua_insert(L, 1);
+ if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK)
+ l_message(progname, lua_pushfstring(L,
+ "error calling " LUA_QL("print") " (%s)",
+ lua_tostring(L, -1)));
+ }
+ }
+ lua_settop(L, 0); /* clear stack */
+ luai_writeline();
+ progname = oldprogname;
}
static int handle_script (lua_State *L, char **argv, int n) {
- int status;
- const char *fname;
- int narg = getargs(L, argv, n); /* collect arguments */
- lua_setglobal(L, "arg");
- fname = argv[n];
- if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0)
- fname = NULL; /* stdin */
- status = luaL_loadfile(L, fname);
- lua_insert(L, -(narg+1));
- if (status == LUA_OK)
- status = docall(L, narg, LUA_MULTRET);
- else
- lua_pop(L, narg);
- return report(L, status);
+ int status;
+ const char *fname;
+ int narg = getargs(L, argv, n); /* collect arguments */
+ lua_setglobal(L, "arg");
+ fname = argv[n];
+ if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0)
+ fname = NULL; /* stdin */
+ status = luaL_loadfile(L, fname);
+ lua_insert(L, -(narg+1));
+ if (status == LUA_OK)
+ status = docall(L, narg, LUA_MULTRET);
+ else
+ lua_pop(L, narg);
+ return report(L, status);
}
/* check that argument has no extra characters at the end */
-#define noextrachars(x) {if ((x)[2] != '\0') return -1;}
+#define noextrachars(x) {if ((x)[2] != '\0') return -1;}
/* indices of various argument indicators in array args */
-#define has_i 0 /* -i */
-#define has_v 1 /* -v */
-#define has_e 2 /* -e */
-#define has_E 3 /* -E */
+#define has_i 0 /* -i */
+#define has_v 1 /* -v */
+#define has_e 2 /* -e */
+#define has_E 3 /* -E */
-#define num_has 4 /* number of 'has_*' */
+#define num_has 4 /* number of 'has_*' */
static int collectargs (char **argv, int *args) {
- int i;
- for (i = 1; argv[i] != NULL; i++) {
- if (argv[i][0] != '-') /* not an option? */
- return i;
- switch (argv[i][1]) { /* option */
- case '-':
- noextrachars(argv[i]);
- return (argv[i+1] != NULL ? i+1 : 0);
- case '\0':
- return i;
- case 'E':
- args[has_E] = 1;
- break;
- case 'i':
- noextrachars(argv[i]);
- args[has_i] = 1; /* go through */
- case 'v':
- noextrachars(argv[i]);
- args[has_v] = 1;
- break;
- case 'e':
- args[has_e] = 1; /* go through */
- case 'l': /* both options need an argument */
- if (argv[i][2] == '\0') { /* no concatenated argument? */
- i++; /* try next 'argv' */
- if (argv[i] == NULL || argv[i][0] == '-')
- return -(i - 1); /* no next argument or it is another option */
- }
- break;
- default: /* invalid option; return its index... */
- return -i; /* ...as a negative value */
- }
- }
- return 0;
+ int i;
+ for (i = 1; argv[i] != NULL; i++) {
+ if (argv[i][0] != '-') /* not an option? */
+ return i;
+ switch (argv[i][1]) { /* option */
+ case '-':
+ noextrachars(argv[i]);
+ return (argv[i+1] != NULL ? i+1 : 0);
+ case '\0':
+ return i;
+ case 'E':
+ args[has_E] = 1;
+ break;
+ case 'i':
+ noextrachars(argv[i]);
+ args[has_i] = 1; /* go through */
+ case 'v':
+ noextrachars(argv[i]);
+ args[has_v] = 1;
+ break;
+ case 'e':
+ args[has_e] = 1; /* go through */
+ case 'l': /* both options need an argument */
+ if (argv[i][2] == '\0') { /* no concatenated argument? */
+ i++; /* try next 'argv' */
+ if (argv[i] == NULL || argv[i][0] == '-')
+ return -(i - 1); /* no next argument or it is another option */
+ }
+ break;
+ default: /* invalid option; return its index... */
+ return -i; /* ...as a negative value */
+ }
+ }
+ return 0;
}
static int runargs (lua_State *L, char **argv, int n) {
- int i;
- for (i = 1; i < n; i++) {
- lua_assert(argv[i][0] == '-');
- switch (argv[i][1]) { /* option */
- case 'e': {
- const char *chunk = argv[i] + 2;
- if (*chunk == '\0') chunk = argv[++i];
- lua_assert(chunk != NULL);
- if (dostring(L, chunk, "=(command line)") != LUA_OK)
- return 0;
- break;
- }
- case 'l': {
- const char *filename = argv[i] + 2;
- if (*filename == '\0') filename = argv[++i];
- lua_assert(filename != NULL);
- if (dolibrary(L, filename) != LUA_OK)
- return 0; /* stop if file fails */
- break;
- }
- default: break;
- }
- }
- return 1;
+ int i;
+ for (i = 1; i < n; i++) {
+ lua_assert(argv[i][0] == '-');
+ switch (argv[i][1]) { /* option */
+ case 'e': {
+ const char *chunk = argv[i] + 2;
+ if (*chunk == '\0') chunk = argv[++i];
+ lua_assert(chunk != NULL);
+ if (dostring(L, chunk, "=(command line)") != LUA_OK)
+ return 0;
+ break;
+ }
+ case 'l': {
+ const char *filename = argv[i] + 2;
+ if (*filename == '\0') filename = argv[++i];
+ lua_assert(filename != NULL);
+ if (dolibrary(L, filename) != LUA_OK)
+ return 0; /* stop if file fails */
+ break;
+ }
+ default: break;
+ }
+ }
+ return 1;
}
static int handle_luainit (lua_State *L) {
- const char *name = "=" LUA_INITVERSION;
- const char *init = getenv(name + 1);
- if (init == NULL) {
- name = "=" LUA_INIT;
- init = getenv(name + 1); /* try alternative name */
- }
- if (init == NULL) return LUA_OK;
- else if (init[0] == '@')
- return dofile(L, init+1);
- else
- return dostring(L, init, name);
+ const char *name = "=" LUA_INITVERSION;
+ const char *init = getenv(name + 1);
+ if (init == NULL) {
+ name = "=" LUA_INIT;
+ init = getenv(name + 1); /* try alternative name */
+ }
+ if (init == NULL) return LUA_OK;
+ else if (init[0] == '@')
+ return dofile(L, init+1);
+ else
+ return dostring(L, init, name);
}
static int pmain (lua_State *L) {
- int argc = (int)lua_tointeger(L, 1);
- char **argv = (char **)lua_touserdata(L, 2);
- int script;
- int args[num_has];
- args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0;
- if (argv[0] && argv[0][0]) progname = argv[0];
- script = collectargs(argv, args);
- if (script < 0) { /* invalid arg? */
- print_usage(argv[-script]);
- return 0;
- }
- if (args[has_v]) print_version();
- if (args[has_E]) { /* option '-E'? */
- lua_pushboolean(L, 1); /* signal for libraries to ignore env. vars. */
- lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
- }
- /* open standard libraries */
- luaL_checkversion(L);
- lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */
- luaL_openlibs(L); /* open libraries */
- lua_gc(L, LUA_GCRESTART, 0);
- if (!args[has_E] && handle_luainit(L) != LUA_OK)
- return 0; /* error running LUA_INIT */
- /* execute arguments -e and -l */
- if (!runargs(L, argv, (script > 0) ? script : argc)) return 0;
- /* execute main script (if there is one) */
- if (script && handle_script(L, argv, script) != LUA_OK) return 0;
- if (args[has_i]) /* -i option? */
- dotty(L);
- else if (script == 0 && !args[has_e] && !args[has_v]) { /* no arguments? */
- if (lua_stdin_is_tty()) {
- print_version();
- dotty(L);
- }
- else dofile(L, NULL); /* executes stdin as a file */
- }
- lua_pushboolean(L, 1); /* signal no errors */
- return 1;
+ int argc = (int)lua_tointeger(L, 1);
+ char **argv = (char **)lua_touserdata(L, 2);
+ int script;
+ int args[num_has];
+ args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0;
+ if (argv[0] && argv[0][0]) progname = argv[0];
+ script = collectargs(argv, args);
+ if (script < 0) { /* invalid arg? */
+ print_usage(argv[-script]);
+ return 0;
+ }
+ if (args[has_v]) print_version();
+ if (args[has_E]) { /* option '-E'? */
+ lua_pushboolean(L, 1); /* signal for libraries to ignore env. vars. */
+ lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+ }
+ /* open standard libraries */
+ luaL_checkversion(L);
+ lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */
+ luaL_openlibs(L); /* open libraries */
+ lua_gc(L, LUA_GCRESTART, 0);
+ if (!args[has_E] && handle_luainit(L) != LUA_OK)
+ return 0; /* error running LUA_INIT */
+ /* execute arguments -e and -l */
+ if (!runargs(L, argv, (script > 0) ? script : argc)) return 0;
+ /* execute main script (if there is one) */
+ if (script && handle_script(L, argv, script) != LUA_OK) return 0;
+ if (args[has_i]) /* -i option? */
+ dotty(L);
+ else if (script == 0 && !args[has_e] && !args[has_v]) { /* no arguments? */
+ if (lua_stdin_is_tty()) {
+ print_version();
+ dotty(L);
+ }
+ else dofile(L, NULL); /* executes stdin as a file */
+ }
+ lua_pushboolean(L, 1); /* signal no errors */
+ return 1;
}
int main (int argc, char **argv) {
- int status, result;
- lua_State *L = luaL_newstate(); /* create state */
- if (L == NULL) {
- l_message(argv[0], "cannot create state: not enough memory");
- return EXIT_FAILURE;
- }
- /* call 'pmain' in protected mode */
- lua_pushcfunction(L, &pmain);
- lua_pushinteger(L, argc); /* 1st argument */
- lua_pushlightuserdata(L, argv); /* 2nd argument */
- status = lua_pcall(L, 2, 1, 0);
- result = lua_toboolean(L, -1); /* get result */
- finalreport(L, status);
- lua_close(L);
- return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
+ int status, result;
+ lua_State *L = luaL_newstate(); /* create state */
+ if (L == NULL) {
+ l_message(argv[0], "cannot create state: not enough memory");
+ return EXIT_FAILURE;
+ }
+ /* call 'pmain' in protected mode */
+ lua_pushcfunction(L, &pmain);
+ lua_pushinteger(L, argc); /* 1st argument */
+ lua_pushlightuserdata(L, argv); /* 2nd argument */
+ status = lua_pcall(L, 2, 1, 0);
+ result = lua_toboolean(L, -1); /* get result */
+ finalreport(L, status);
+ lua_close(L);
+ return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
}
-
diff --git a/src/lib/lua/luac.c b/src/lib/lua/luac.c
index 7409706ec72..c0133dc431b 100644
--- a/src/lib/lua/luac.c
+++ b/src/lib/lua/luac.c
@@ -20,186 +20,186 @@
#include "lundump.h"
static void PrintFunction(const Proto* f, int full);
-#define luaU_print PrintFunction
+#define luaU_print PrintFunction
-#define PROGNAME "luac" /* default program name */
-#define OUTPUT PROGNAME ".out" /* default output file */
+#define PROGNAME "luac" /* default program name */
+#define OUTPUT PROGNAME ".out" /* default output file */
-static int listing=0; /* list bytecodes? */
-static int dumping=1; /* dump bytecodes? */
-static int stripping=0; /* strip debug information? */
-static char Output[]={ OUTPUT }; /* default output file name */
-static const char* output=Output; /* actual output file name */
-static const char* progname=PROGNAME; /* actual program name */
+static int listing=0; /* list bytecodes? */
+static int dumping=1; /* dump bytecodes? */
+static int stripping=0; /* strip debug information? */
+static char Output[]={ OUTPUT }; /* default output file name */
+static const char* output=Output; /* actual output file name */
+static const char* progname=PROGNAME; /* actual program name */
static void fatal(const char* message)
{
- fprintf(stderr,"%s: %s\n",progname,message);
- exit(EXIT_FAILURE);
+ fprintf(stderr,"%s: %s\n",progname,message);
+ exit(EXIT_FAILURE);
}
static void cannot(const char* what)
{
- fprintf(stderr,"%s: cannot %s %s: %s\n",progname,what,output,strerror(errno));
- exit(EXIT_FAILURE);
+ fprintf(stderr,"%s: cannot %s %s: %s\n",progname,what,output,strerror(errno));
+ exit(EXIT_FAILURE);
}
static void usage(const char* message)
{
- if (*message=='-')
- fprintf(stderr,"%s: unrecognized option " LUA_QS "\n",progname,message);
- else
- fprintf(stderr,"%s: %s\n",progname,message);
- fprintf(stderr,
- "usage: %s [options] [filenames]\n"
- "Available options are:\n"
- " -l list (use -l -l for full listing)\n"
- " -o name output to file " LUA_QL("name") " (default is \"%s\")\n"
- " -p parse only\n"
- " -s strip debug information\n"
- " -v show version information\n"
- " -- stop handling options\n"
- " - stop handling options and process stdin\n"
- ,progname,Output);
- exit(EXIT_FAILURE);
+ if (*message=='-')
+ fprintf(stderr,"%s: unrecognized option " LUA_QS "\n",progname,message);
+ else
+ fprintf(stderr,"%s: %s\n",progname,message);
+ fprintf(stderr,
+ "usage: %s [options] [filenames]\n"
+ "Available options are:\n"
+ " -l list (use -l -l for full listing)\n"
+ " -o name output to file " LUA_QL("name") " (default is \"%s\")\n"
+ " -p parse only\n"
+ " -s strip debug information\n"
+ " -v show version information\n"
+ " -- stop handling options\n"
+ " - stop handling options and process stdin\n"
+ ,progname,Output);
+ exit(EXIT_FAILURE);
}
-#define IS(s) (strcmp(argv[i],s)==0)
+#define IS(s) (strcmp(argv[i],s)==0)
static int doargs(int argc, char* argv[])
{
- int i;
- int version=0;
- if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0];
- for (i=1; i<argc; i++)
- {
- if (*argv[i]!='-') /* end of options; keep it */
- break;
- else if (IS("--")) /* end of options; skip it */
- {
- ++i;
- if (version) ++version;
- break;
- }
- else if (IS("-")) /* end of options; use stdin */
- break;
- else if (IS("-l")) /* list */
- ++listing;
- else if (IS("-o")) /* output file */
- {
- output=argv[++i];
- if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
- usage(LUA_QL("-o") " needs argument");
- if (IS("-")) output=NULL;
- }
- else if (IS("-p")) /* parse only */
- dumping=0;
- else if (IS("-s")) /* strip debug information */
- stripping=1;
- else if (IS("-v")) /* show version */
- ++version;
- else /* unknown option */
- usage(argv[i]);
- }
- if (i==argc && (listing || !dumping))
- {
- dumping=0;
- argv[--i]=Output;
- }
- if (version)
- {
- printf("%s\n",LUA_COPYRIGHT);
- if (version==argc-1) exit(EXIT_SUCCESS);
- }
- return i;
+ int i;
+ int version=0;
+ if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0];
+ for (i=1; i<argc; i++)
+ {
+ if (*argv[i]!='-') /* end of options; keep it */
+ break;
+ else if (IS("--")) /* end of options; skip it */
+ {
+ ++i;
+ if (version) ++version;
+ break;
+ }
+ else if (IS("-")) /* end of options; use stdin */
+ break;
+ else if (IS("-l")) /* list */
+ ++listing;
+ else if (IS("-o")) /* output file */
+ {
+ output=argv[++i];
+ if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
+ usage(LUA_QL("-o") " needs argument");
+ if (IS("-")) output=NULL;
+ }
+ else if (IS("-p")) /* parse only */
+ dumping=0;
+ else if (IS("-s")) /* strip debug information */
+ stripping=1;
+ else if (IS("-v")) /* show version */
+ ++version;
+ else /* unknown option */
+ usage(argv[i]);
+ }
+ if (i==argc && (listing || !dumping))
+ {
+ dumping=0;
+ argv[--i]=Output;
+ }
+ if (version)
+ {
+ printf("%s\n",LUA_COPYRIGHT);
+ if (version==argc-1) exit(EXIT_SUCCESS);
+ }
+ return i;
}
#define FUNCTION "(function()end)();"
static const char* reader(lua_State *L, void *ud, size_t *size)
{
- UNUSED(L);
- if ((*(int*)ud)--)
- {
- *size=sizeof(FUNCTION)-1;
- return FUNCTION;
- }
- else
- {
- *size=0;
- return NULL;
- }
+ UNUSED(L);
+ if ((*(int*)ud)--)
+ {
+ *size=sizeof(FUNCTION)-1;
+ return FUNCTION;
+ }
+ else
+ {
+ *size=0;
+ return NULL;
+ }
}
#define toproto(L,i) getproto(L->top+(i))
static const Proto* combine(lua_State* L, int n)
{
- if (n==1)
- return toproto(L,-1);
- else
- {
- Proto* f;
- int i=n;
- if (lua_load(L,reader,&i,"=(" PROGNAME ")",NULL)!=LUA_OK) fatal(lua_tostring(L,-1));
- f=toproto(L,-1);
- for (i=0; i<n; i++)
- {
- f->p[i]=toproto(L,i-n-1);
- if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0;
- }
- f->sizelineinfo=0;
- return f;
- }
+ if (n==1)
+ return toproto(L,-1);
+ else
+ {
+ Proto* f;
+ int i=n;
+ if (lua_load(L,reader,&i,"=(" PROGNAME ")",NULL)!=LUA_OK) fatal(lua_tostring(L,-1));
+ f=toproto(L,-1);
+ for (i=0; i<n; i++)
+ {
+ f->p[i]=toproto(L,i-n-1);
+ if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0;
+ }
+ f->sizelineinfo=0;
+ return f;
+ }
}
static int writer(lua_State* L, const void* p, size_t size, void* u)
{
- UNUSED(L);
- return (fwrite(p,size,1,(FILE*)u)!=1) && (size!=0);
+ UNUSED(L);
+ return (fwrite(p,size,1,(FILE*)u)!=1) && (size!=0);
}
static int pmain(lua_State* L)
{
- int argc=(int)lua_tointeger(L,1);
- char** argv=(char**)lua_touserdata(L,2);
- const Proto* f;
- int i;
- if (!lua_checkstack(L,argc)) fatal("too many input files");
- for (i=0; i<argc; i++)
- {
- const char* filename=IS("-") ? NULL : argv[i];
- if (luaL_loadfile(L,filename)!=LUA_OK) fatal(lua_tostring(L,-1));
- }
- f=combine(L,argc);
- if (listing) luaU_print(f,listing>1);
- if (dumping)
- {
- FILE* D= (output==NULL) ? stdout : fopen(output,"wb");
- if (D==NULL) cannot("open");
- lua_lock(L);
- luaU_dump(L,f,writer,D,stripping);
- lua_unlock(L);
- if (ferror(D)) cannot("write");
- if (fclose(D)) cannot("close");
- }
- return 0;
+ int argc=(int)lua_tointeger(L,1);
+ char** argv=(char**)lua_touserdata(L,2);
+ const Proto* f;
+ int i;
+ if (!lua_checkstack(L,argc)) fatal("too many input files");
+ for (i=0; i<argc; i++)
+ {
+ const char* filename=IS("-") ? NULL : argv[i];
+ if (luaL_loadfile(L,filename)!=LUA_OK) fatal(lua_tostring(L,-1));
+ }
+ f=combine(L,argc);
+ if (listing) luaU_print(f,listing>1);
+ if (dumping)
+ {
+ FILE* D= (output==NULL) ? stdout : fopen(output,"wb");
+ if (D==NULL) cannot("open");
+ lua_lock(L);
+ luaU_dump(L,f,writer,D,stripping);
+ lua_unlock(L);
+ if (ferror(D)) cannot("write");
+ if (fclose(D)) cannot("close");
+ }
+ return 0;
}
int main(int argc, char* argv[])
{
- lua_State* L;
- int i=doargs(argc,argv);
- argc-=i; argv+=i;
- if (argc<=0) usage("no input files given");
- L=luaL_newstate();
- if (L==NULL) fatal("cannot create state: not enough memory");
- lua_pushcfunction(L,&pmain);
- lua_pushinteger(L,argc);
- lua_pushlightuserdata(L,argv);
- if (lua_pcall(L,2,0,0)!=LUA_OK) fatal(lua_tostring(L,-1));
- lua_close(L);
- return EXIT_SUCCESS;
+ lua_State* L;
+ int i=doargs(argc,argv);
+ argc-=i; argv+=i;
+ if (argc<=0) usage("no input files given");
+ L=luaL_newstate();
+ if (L==NULL) fatal("cannot create state: not enough memory");
+ lua_pushcfunction(L,&pmain);
+ lua_pushinteger(L,argc);
+ lua_pushlightuserdata(L,argv);
+ if (lua_pcall(L,2,0,0)!=LUA_OK) fatal(lua_tostring(L,-1));
+ lua_close(L);
+ return EXIT_SUCCESS;
}
/*
@@ -218,215 +218,215 @@ int main(int argc, char* argv[])
#include "lobject.h"
#include "lopcodes.h"
-#define VOID(p) ((const void*)(p))
+#define VOID(p) ((const void*)(p))
static void PrintString(const TString* ts)
{
- const char* s=getstr(ts);
- size_t i,n=ts->tsv.len;
- printf("%c",'"');
- for (i=0; i<n; i++)
- {
- int c=(int)(unsigned char)s[i];
- switch (c)
- {
- case '"': printf("\\\""); break;
- case '\\': printf("\\\\"); break;
- case '\a': printf("\\a"); break;
- case '\b': printf("\\b"); break;
- case '\f': printf("\\f"); break;
- case '\n': printf("\\n"); break;
- case '\r': printf("\\r"); break;
- case '\t': printf("\\t"); break;
- case '\v': printf("\\v"); break;
- default: if (isprint(c))
- printf("%c",c);
+ const char* s=getstr(ts);
+ size_t i,n=ts->tsv.len;
+ printf("%c",'"');
+ for (i=0; i<n; i++)
+ {
+ int c=(int)(unsigned char)s[i];
+ switch (c)
+ {
+ case '"': printf("\\\""); break;
+ case '\\': printf("\\\\"); break;
+ case '\a': printf("\\a"); break;
+ case '\b': printf("\\b"); break;
+ case '\f': printf("\\f"); break;
+ case '\n': printf("\\n"); break;
+ case '\r': printf("\\r"); break;
+ case '\t': printf("\\t"); break;
+ case '\v': printf("\\v"); break;
+ default: if (isprint(c))
+ printf("%c",c);
else
printf("\\%03d",c);
- }
- }
- printf("%c",'"');
+ }
+ }
+ printf("%c",'"');
}
static void PrintConstant(const Proto* f, int i)
{
- const TValue* o=&f->k[i];
- switch (ttypenv(o))
- {
- case LUA_TNIL:
+ const TValue* o=&f->k[i];
+ switch (ttypenv(o))
+ {
+ case LUA_TNIL:
printf("nil");
break;
- case LUA_TBOOLEAN:
+ case LUA_TBOOLEAN:
printf(bvalue(o) ? "true" : "false");
break;
- case LUA_TNUMBER:
+ case LUA_TNUMBER:
printf(LUA_NUMBER_FMT,nvalue(o));
break;
- case LUA_TSTRING:
+ case LUA_TSTRING:
PrintString(rawtsvalue(o));
break;
- default: /* cannot happen */
+ default: /* cannot happen */
printf("? type=%d",ttype(o));
break;
- }
+ }
}
#define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
-#define MYK(x) (-1-(x))
+#define MYK(x) (-1-(x))
static void PrintCode(const Proto* f)
{
- const Instruction* code=f->code;
- int pc,n=f->sizecode;
- for (pc=0; pc<n; pc++)
- {
- Instruction i=code[pc];
- OpCode o=GET_OPCODE(i);
- int a=GETARG_A(i);
- int b=GETARG_B(i);
- int c=GETARG_C(i);
- int ax=GETARG_Ax(i);
- int bx=GETARG_Bx(i);
- int sbx=GETARG_sBx(i);
- int line=getfuncline(f,pc);
- printf("\t%d\t",pc+1);
- if (line>0) printf("[%d]\t",line); else printf("[-]\t");
- printf("%-9s\t",luaP_opnames[o]);
- switch (getOpMode(o))
- {
- case iABC:
- printf("%d",a);
- if (getBMode(o)!=OpArgN) printf(" %d",ISK(b) ? (MYK(INDEXK(b))) : b);
- if (getCMode(o)!=OpArgN) printf(" %d",ISK(c) ? (MYK(INDEXK(c))) : c);
- break;
- case iABx:
- printf("%d",a);
- if (getBMode(o)==OpArgK) printf(" %d",MYK(bx));
- if (getBMode(o)==OpArgU) printf(" %d",bx);
- break;
- case iAsBx:
- printf("%d %d",a,sbx);
- break;
- case iAx:
- printf("%d",MYK(ax));
- break;
- }
- switch (o)
- {
- case OP_LOADK:
- printf("\t; "); PrintConstant(f,bx);
- break;
- case OP_GETUPVAL:
- case OP_SETUPVAL:
- printf("\t; %s",UPVALNAME(b));
- break;
- case OP_GETTABUP:
- printf("\t; %s",UPVALNAME(b));
- if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
- break;
- case OP_SETTABUP:
- printf("\t; %s",UPVALNAME(a));
- if (ISK(b)) { printf(" "); PrintConstant(f,INDEXK(b)); }
- if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
- break;
- case OP_GETTABLE:
- case OP_SELF:
- if (ISK(c)) { printf("\t; "); PrintConstant(f,INDEXK(c)); }
- break;
- case OP_SETTABLE:
- case OP_ADD:
- case OP_SUB:
- case OP_MUL:
- case OP_DIV:
- case OP_POW:
- case OP_EQ:
- case OP_LT:
- case OP_LE:
- if (ISK(b) || ISK(c))
- {
- printf("\t; ");
- if (ISK(b)) PrintConstant(f,INDEXK(b)); else printf("-");
- printf(" ");
- if (ISK(c)) PrintConstant(f,INDEXK(c)); else printf("-");
- }
- break;
- case OP_JMP:
- case OP_FORLOOP:
- case OP_FORPREP:
- case OP_TFORLOOP:
- printf("\t; to %d",sbx+pc+2);
- break;
- case OP_CLOSURE:
- printf("\t; %p",VOID(f->p[bx]));
- break;
- case OP_SETLIST:
- if (c==0) printf("\t; %d",(int)code[++pc]); else printf("\t; %d",c);
- break;
- case OP_EXTRAARG:
- printf("\t; "); PrintConstant(f,ax);
- break;
- default:
- break;
- }
- printf("\n");
- }
+ const Instruction* code=f->code;
+ int pc,n=f->sizecode;
+ for (pc=0; pc<n; pc++)
+ {
+ Instruction i=code[pc];
+ OpCode o=GET_OPCODE(i);
+ int a=GETARG_A(i);
+ int b=GETARG_B(i);
+ int c=GETARG_C(i);
+ int ax=GETARG_Ax(i);
+ int bx=GETARG_Bx(i);
+ int sbx=GETARG_sBx(i);
+ int line=getfuncline(f,pc);
+ printf("\t%d\t",pc+1);
+ if (line>0) printf("[%d]\t",line); else printf("[-]\t");
+ printf("%-9s\t",luaP_opnames[o]);
+ switch (getOpMode(o))
+ {
+ case iABC:
+ printf("%d",a);
+ if (getBMode(o)!=OpArgN) printf(" %d",ISK(b) ? (MYK(INDEXK(b))) : b);
+ if (getCMode(o)!=OpArgN) printf(" %d",ISK(c) ? (MYK(INDEXK(c))) : c);
+ break;
+ case iABx:
+ printf("%d",a);
+ if (getBMode(o)==OpArgK) printf(" %d",MYK(bx));
+ if (getBMode(o)==OpArgU) printf(" %d",bx);
+ break;
+ case iAsBx:
+ printf("%d %d",a,sbx);
+ break;
+ case iAx:
+ printf("%d",MYK(ax));
+ break;
+ }
+ switch (o)
+ {
+ case OP_LOADK:
+ printf("\t; "); PrintConstant(f,bx);
+ break;
+ case OP_GETUPVAL:
+ case OP_SETUPVAL:
+ printf("\t; %s",UPVALNAME(b));
+ break;
+ case OP_GETTABUP:
+ printf("\t; %s",UPVALNAME(b));
+ if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
+ break;
+ case OP_SETTABUP:
+ printf("\t; %s",UPVALNAME(a));
+ if (ISK(b)) { printf(" "); PrintConstant(f,INDEXK(b)); }
+ if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
+ break;
+ case OP_GETTABLE:
+ case OP_SELF:
+ if (ISK(c)) { printf("\t; "); PrintConstant(f,INDEXK(c)); }
+ break;
+ case OP_SETTABLE:
+ case OP_ADD:
+ case OP_SUB:
+ case OP_MUL:
+ case OP_DIV:
+ case OP_POW:
+ case OP_EQ:
+ case OP_LT:
+ case OP_LE:
+ if (ISK(b) || ISK(c))
+ {
+ printf("\t; ");
+ if (ISK(b)) PrintConstant(f,INDEXK(b)); else printf("-");
+ printf(" ");
+ if (ISK(c)) PrintConstant(f,INDEXK(c)); else printf("-");
+ }
+ break;
+ case OP_JMP:
+ case OP_FORLOOP:
+ case OP_FORPREP:
+ case OP_TFORLOOP:
+ printf("\t; to %d",sbx+pc+2);
+ break;
+ case OP_CLOSURE:
+ printf("\t; %p",VOID(f->p[bx]));
+ break;
+ case OP_SETLIST:
+ if (c==0) printf("\t; %d",(int)code[++pc]); else printf("\t; %d",c);
+ break;
+ case OP_EXTRAARG:
+ printf("\t; "); PrintConstant(f,ax);
+ break;
+ default:
+ break;
+ }
+ printf("\n");
+ }
}
-#define SS(x) ((x==1)?"":"s")
-#define S(x) (int)(x),SS(x)
+#define SS(x) ((x==1)?"":"s")
+#define S(x) (int)(x),SS(x)
static void PrintHeader(const Proto* f)
{
- const char* s=f->source ? getstr(f->source) : "=?";
- if (*s=='@' || *s=='=')
- s++;
- else if (*s==LUA_SIGNATURE[0])
- s="(bstring)";
- else
- s="(string)";
- printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
- (f->linedefined==0)?"main":"function",s,
+ const char* s=f->source ? getstr(f->source) : "=?";
+ if (*s=='@' || *s=='=')
+ s++;
+ else if (*s==LUA_SIGNATURE[0])
+ s="(bstring)";
+ else
+ s="(string)";
+ printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
+ (f->linedefined==0)?"main":"function",s,
f->linedefined,f->lastlinedefined,
S(f->sizecode),VOID(f));
- printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
+ printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
(int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams),
S(f->maxstacksize),S(f->sizeupvalues));
- printf("%d local%s, %d constant%s, %d function%s\n",
+ printf("%d local%s, %d constant%s, %d function%s\n",
S(f->sizelocvars),S(f->sizek),S(f->sizep));
}
static void PrintDebug(const Proto* f)
{
- int i,n;
- n=f->sizek;
- printf("constants (%d) for %p:\n",n,VOID(f));
- for (i=0; i<n; i++)
- {
- printf("\t%d\t",i+1);
- PrintConstant(f,i);
- printf("\n");
- }
- n=f->sizelocvars;
- printf("locals (%d) for %p:\n",n,VOID(f));
- for (i=0; i<n; i++)
- {
- printf("\t%d\t%s\t%d\t%d\n",
- i,getstr(f->locvars[i].varname),f->locvars[i].startpc+1,f->locvars[i].endpc+1);
- }
- n=f->sizeupvalues;
- printf("upvalues (%d) for %p:\n",n,VOID(f));
- for (i=0; i<n; i++)
- {
- printf("\t%d\t%s\t%d\t%d\n",
- i,UPVALNAME(i),f->upvalues[i].instack,f->upvalues[i].idx);
- }
+ int i,n;
+ n=f->sizek;
+ printf("constants (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+ printf("\t%d\t",i+1);
+ PrintConstant(f,i);
+ printf("\n");
+ }
+ n=f->sizelocvars;
+ printf("locals (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+ printf("\t%d\t%s\t%d\t%d\n",
+ i,getstr(f->locvars[i].varname),f->locvars[i].startpc+1,f->locvars[i].endpc+1);
+ }
+ n=f->sizeupvalues;
+ printf("upvalues (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+ printf("\t%d\t%s\t%d\t%d\n",
+ i,UPVALNAME(i),f->upvalues[i].instack,f->upvalues[i].idx);
+ }
}
static void PrintFunction(const Proto* f, int full)
{
- int i,n=f->sizep;
- PrintHeader(f);
- PrintCode(f);
- if (full) PrintDebug(f);
- for (i=0; i<n; i++) PrintFunction(f->p[i],full);
+ int i,n=f->sizep;
+ PrintHeader(f);
+ PrintCode(f);
+ if (full) PrintDebug(f);
+ for (i=0; i<n; i++) PrintFunction(f->p[i],full);
}
diff --git a/src/lib/lua/lundump.c b/src/lib/lua/lundump.c
index 4163cb5d3b0..e05646102b7 100644
--- a/src/lib/lua/lundump.c
+++ b/src/lib/lua/lundump.c
@@ -21,183 +21,183 @@
#include "lzio.h"
typedef struct {
- lua_State* L;
- ZIO* Z;
- Mbuffer* b;
- const char* name;
+ lua_State* L;
+ ZIO* Z;
+ Mbuffer* b;
+ const char* name;
} LoadState;
static l_noret error(LoadState* S, const char* why)
{
- luaO_pushfstring(S->L,"%s: %s precompiled chunk",S->name,why);
- luaD_throw(S->L,LUA_ERRSYNTAX);
+ luaO_pushfstring(S->L,"%s: %s precompiled chunk",S->name,why);
+ luaD_throw(S->L,LUA_ERRSYNTAX);
}
-#define LoadMem(S,b,n,size) LoadBlock(S,b,(n)*(size))
-#define LoadByte(S) (lu_byte)LoadChar(S)
-#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x))
-#define LoadVector(S,b,n,size) LoadMem(S,b,n,size)
+#define LoadMem(S,b,n,size) LoadBlock(S,b,(n)*(size))
+#define LoadByte(S) (lu_byte)LoadChar(S)
+#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x))
+#define LoadVector(S,b,n,size) LoadMem(S,b,n,size)
#if !defined(luai_verifycode)
-#define luai_verifycode(L,b,f) /* empty */
+#define luai_verifycode(L,b,f) /* empty */
#endif
static void LoadBlock(LoadState* S, void* b, size_t size)
{
- if (luaZ_read(S->Z,b,size)!=0) error(S,"truncated");
+ if (luaZ_read(S->Z,b,size)!=0) error(S,"truncated");
}
static int LoadChar(LoadState* S)
{
- char x;
- LoadVar(S,x);
- return x;
+ char x;
+ LoadVar(S,x);
+ return x;
}
static int LoadInt(LoadState* S)
{
- int x;
- LoadVar(S,x);
- if (x<0) error(S,"corrupted");
- return x;
+ int x;
+ LoadVar(S,x);
+ if (x<0) error(S,"corrupted");
+ return x;
}
static lua_Number LoadNumber(LoadState* S)
{
- lua_Number x;
- LoadVar(S,x);
- return x;
+ lua_Number x;
+ LoadVar(S,x);
+ return x;
}
static TString* LoadString(LoadState* S)
{
- size_t size;
- LoadVar(S,size);
- if (size==0)
- return NULL;
- else
- {
- char* s=luaZ_openspace(S->L,S->b,size);
- LoadBlock(S,s,size*sizeof(char));
- return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */
- }
+ size_t size;
+ LoadVar(S,size);
+ if (size==0)
+ return NULL;
+ else
+ {
+ char* s=luaZ_openspace(S->L,S->b,size);
+ LoadBlock(S,s,size*sizeof(char));
+ return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */
+ }
}
static void LoadCode(LoadState* S, Proto* f)
{
- int n=LoadInt(S);
- f->code=luaM_newvector(S->L,n,Instruction);
- f->sizecode=n;
- LoadVector(S,f->code,n,sizeof(Instruction));
+ int n=LoadInt(S);
+ f->code=luaM_newvector(S->L,n,Instruction);
+ f->sizecode=n;
+ LoadVector(S,f->code,n,sizeof(Instruction));
}
static void LoadFunction(LoadState* S, Proto* f);
static void LoadConstants(LoadState* S, Proto* f)
{
- int i,n;
- n=LoadInt(S);
- f->k=luaM_newvector(S->L,n,TValue);
- f->sizek=n;
- for (i=0; i<n; i++) setnilvalue(&f->k[i]);
- for (i=0; i<n; i++)
- {
- TValue* o=&f->k[i];
- int t=LoadChar(S);
- switch (t)
- {
- case LUA_TNIL:
+ int i,n;
+ n=LoadInt(S);
+ f->k=luaM_newvector(S->L,n,TValue);
+ f->sizek=n;
+ for (i=0; i<n; i++) setnilvalue(&f->k[i]);
+ for (i=0; i<n; i++)
+ {
+ TValue* o=&f->k[i];
+ int t=LoadChar(S);
+ switch (t)
+ {
+ case LUA_TNIL:
setnilvalue(o);
break;
- case LUA_TBOOLEAN:
+ case LUA_TBOOLEAN:
setbvalue(o,LoadChar(S));
break;
- case LUA_TNUMBER:
+ case LUA_TNUMBER:
setnvalue(o,LoadNumber(S));
break;
- case LUA_TSTRING:
+ case LUA_TSTRING:
setsvalue2n(S->L,o,LoadString(S));
break;
- default: lua_assert(0);
- }
- }
- n=LoadInt(S);
- f->p=luaM_newvector(S->L,n,Proto*);
- f->sizep=n;
- for (i=0; i<n; i++) f->p[i]=NULL;
- for (i=0; i<n; i++)
- {
- f->p[i]=luaF_newproto(S->L);
- LoadFunction(S,f->p[i]);
- }
+ default: lua_assert(0);
+ }
+ }
+ n=LoadInt(S);
+ f->p=luaM_newvector(S->L,n,Proto*);
+ f->sizep=n;
+ for (i=0; i<n; i++) f->p[i]=NULL;
+ for (i=0; i<n; i++)
+ {
+ f->p[i]=luaF_newproto(S->L);
+ LoadFunction(S,f->p[i]);
+ }
}
static void LoadUpvalues(LoadState* S, Proto* f)
{
- int i,n;
- n=LoadInt(S);
- f->upvalues=luaM_newvector(S->L,n,Upvaldesc);
- f->sizeupvalues=n;
- for (i=0; i<n; i++) f->upvalues[i].name=NULL;
- for (i=0; i<n; i++)
- {
- f->upvalues[i].instack=LoadByte(S);
- f->upvalues[i].idx=LoadByte(S);
- }
+ int i,n;
+ n=LoadInt(S);
+ f->upvalues=luaM_newvector(S->L,n,Upvaldesc);
+ f->sizeupvalues=n;
+ for (i=0; i<n; i++) f->upvalues[i].name=NULL;
+ for (i=0; i<n; i++)
+ {
+ f->upvalues[i].instack=LoadByte(S);
+ f->upvalues[i].idx=LoadByte(S);
+ }
}
static void LoadDebug(LoadState* S, Proto* f)
{
- int i,n;
- f->source=LoadString(S);
- n=LoadInt(S);
- f->lineinfo=luaM_newvector(S->L,n,int);
- f->sizelineinfo=n;
- LoadVector(S,f->lineinfo,n,sizeof(int));
- n=LoadInt(S);
- f->locvars=luaM_newvector(S->L,n,LocVar);
- f->sizelocvars=n;
- for (i=0; i<n; i++) f->locvars[i].varname=NULL;
- for (i=0; i<n; i++)
- {
- f->locvars[i].varname=LoadString(S);
- f->locvars[i].startpc=LoadInt(S);
- f->locvars[i].endpc=LoadInt(S);
- }
- n=LoadInt(S);
- for (i=0; i<n; i++) f->upvalues[i].name=LoadString(S);
+ int i,n;
+ f->source=LoadString(S);
+ n=LoadInt(S);
+ f->lineinfo=luaM_newvector(S->L,n,int);
+ f->sizelineinfo=n;
+ LoadVector(S,f->lineinfo,n,sizeof(int));
+ n=LoadInt(S);
+ f->locvars=luaM_newvector(S->L,n,LocVar);
+ f->sizelocvars=n;
+ for (i=0; i<n; i++) f->locvars[i].varname=NULL;
+ for (i=0; i<n; i++)
+ {
+ f->locvars[i].varname=LoadString(S);
+ f->locvars[i].startpc=LoadInt(S);
+ f->locvars[i].endpc=LoadInt(S);
+ }
+ n=LoadInt(S);
+ for (i=0; i<n; i++) f->upvalues[i].name=LoadString(S);
}
static void LoadFunction(LoadState* S, Proto* f)
{
- f->linedefined=LoadInt(S);
- f->lastlinedefined=LoadInt(S);
- f->numparams=LoadByte(S);
- f->is_vararg=LoadByte(S);
- f->maxstacksize=LoadByte(S);
- LoadCode(S,f);
- LoadConstants(S,f);
- LoadUpvalues(S,f);
- LoadDebug(S,f);
+ f->linedefined=LoadInt(S);
+ f->lastlinedefined=LoadInt(S);
+ f->numparams=LoadByte(S);
+ f->is_vararg=LoadByte(S);
+ f->maxstacksize=LoadByte(S);
+ LoadCode(S,f);
+ LoadConstants(S,f);
+ LoadUpvalues(S,f);
+ LoadDebug(S,f);
}
/* the code below must be consistent with the code in luaU_header */
-#define N0 LUAC_HEADERSIZE
-#define N1 (sizeof(LUA_SIGNATURE)-sizeof(char))
-#define N2 N1+2
-#define N3 N2+6
+#define N0 LUAC_HEADERSIZE
+#define N1 (sizeof(LUA_SIGNATURE)-sizeof(char))
+#define N2 N1+2
+#define N3 N2+6
static void LoadHeader(LoadState* S)
{
- lu_byte h[LUAC_HEADERSIZE];
- lu_byte s[LUAC_HEADERSIZE];
- luaU_header(h);
- memcpy(s,h,sizeof(char)); /* first char already read */
- LoadBlock(S,s+sizeof(char),LUAC_HEADERSIZE-sizeof(char));
- if (memcmp(h,s,N0)==0) return;
- if (memcmp(h,s,N1)!=0) error(S,"not a");
- if (memcmp(h,s,N2)!=0) error(S,"version mismatch in");
- if (memcmp(h,s,N3)!=0) error(S,"incompatible"); else error(S,"corrupted");
+ lu_byte h[LUAC_HEADERSIZE];
+ lu_byte s[LUAC_HEADERSIZE];
+ luaU_header(h);
+ memcpy(s,h,sizeof(char)); /* first char already read */
+ LoadBlock(S,s+sizeof(char),LUAC_HEADERSIZE-sizeof(char));
+ if (memcmp(h,s,N0)==0) return;
+ if (memcmp(h,s,N1)!=0) error(S,"not a");
+ if (memcmp(h,s,N2)!=0) error(S,"version mismatch in");
+ if (memcmp(h,s,N3)!=0) error(S,"incompatible"); else error(S,"corrupted");
}
/*
@@ -205,36 +205,36 @@ static void LoadHeader(LoadState* S)
*/
Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
{
- LoadState S;
- Closure* cl;
- if (*name=='@' || *name=='=')
- S.name=name+1;
- else if (*name==LUA_SIGNATURE[0])
- S.name="binary string";
- else
- S.name=name;
- S.L=L;
- S.Z=Z;
- S.b=buff;
- LoadHeader(&S);
- cl=luaF_newLclosure(L,1);
- setclLvalue(L,L->top,cl); incr_top(L);
- cl->l.p=luaF_newproto(L);
- LoadFunction(&S,cl->l.p);
- if (cl->l.p->sizeupvalues != 1)
- {
- Proto* p=cl->l.p;
- cl=luaF_newLclosure(L,cl->l.p->sizeupvalues);
- cl->l.p=p;
- setclLvalue(L,L->top-1,cl);
- }
- luai_verifycode(L,buff,cl->l.p);
- return cl;
+ LoadState S;
+ Closure* cl;
+ if (*name=='@' || *name=='=')
+ S.name=name+1;
+ else if (*name==LUA_SIGNATURE[0])
+ S.name="binary string";
+ else
+ S.name=name;
+ S.L=L;
+ S.Z=Z;
+ S.b=buff;
+ LoadHeader(&S);
+ cl=luaF_newLclosure(L,1);
+ setclLvalue(L,L->top,cl); incr_top(L);
+ cl->l.p=luaF_newproto(L);
+ LoadFunction(&S,cl->l.p);
+ if (cl->l.p->sizeupvalues != 1)
+ {
+ Proto* p=cl->l.p;
+ cl=luaF_newLclosure(L,cl->l.p->sizeupvalues);
+ cl->l.p=p;
+ setclLvalue(L,L->top-1,cl);
+ }
+ luai_verifycode(L,buff,cl->l.p);
+ return cl;
}
-#define MYINT(s) (s[0]-'0')
-#define VERSION MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR)
-#define FORMAT 0 /* this is the official format */
+#define MYINT(s) (s[0]-'0')
+#define VERSION MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR)
+#define FORMAT 0 /* this is the official format */
/*
* make header for precompiled chunks
@@ -243,16 +243,16 @@ Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
*/
void luaU_header (lu_byte* h)
{
- int x=1;
- memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-sizeof(char));
- h+=sizeof(LUA_SIGNATURE)-sizeof(char);
- *h++=cast_byte(VERSION);
- *h++=cast_byte(FORMAT);
- *h++=cast_byte(*(char*)&x); /* endianness */
- *h++=cast_byte(sizeof(int));
- *h++=cast_byte(sizeof(size_t));
- *h++=cast_byte(sizeof(Instruction));
- *h++=cast_byte(sizeof(lua_Number));
- *h++=cast_byte(((lua_Number)0.5)==0); /* is lua_Number integral? */
- memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char));
+ int x=1;
+ memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-sizeof(char));
+ h+=sizeof(LUA_SIGNATURE)-sizeof(char);
+ *h++=cast_byte(VERSION);
+ *h++=cast_byte(FORMAT);
+ *h++=cast_byte(*(char*)&x); /* endianness */
+ *h++=cast_byte(sizeof(int));
+ *h++=cast_byte(sizeof(size_t));
+ *h++=cast_byte(sizeof(Instruction));
+ *h++=cast_byte(sizeof(lua_Number));
+ *h++=cast_byte(((lua_Number)0.5)==0); /* is lua_Number integral? */
+ memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char));
}
diff --git a/src/lib/lua/lvm.c b/src/lib/lua/lvm.c
index 25fa82e7137..6ceebe595ff 100644
--- a/src/lib/lua/lvm.c
+++ b/src/lib/lua/lvm.c
@@ -29,228 +29,228 @@
/* limit for table tag-method chains (to avoid loops) */
-#define MAXTAGLOOP 100
+#define MAXTAGLOOP 100
const TValue *luaV_tonumber (const TValue *obj, TValue *n) {
- lua_Number num;
- if (ttisnumber(obj)) return obj;
- if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) {
- setnvalue(n, num);
- return n;
- }
- else
- return NULL;
+ lua_Number num;
+ if (ttisnumber(obj)) return obj;
+ if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) {
+ setnvalue(n, num);
+ return n;
+ }
+ else
+ return NULL;
}
int luaV_tostring (lua_State *L, StkId obj) {
- if (!ttisnumber(obj))
- return 0;
- else {
- char s[LUAI_MAXNUMBER2STR];
- lua_Number n = nvalue(obj);
- int l = lua_number2str(s, n);
- setsvalue2s(L, obj, luaS_newlstr(L, s, l));
- return 1;
- }
+ if (!ttisnumber(obj))
+ return 0;
+ else {
+ char s[LUAI_MAXNUMBER2STR];
+ lua_Number n = nvalue(obj);
+ int l = lua_number2str(s, n);
+ setsvalue2s(L, obj, luaS_newlstr(L, s, l));
+ return 1;
+ }
}
static void traceexec (lua_State *L) {
- CallInfo *ci = L->ci;
- lu_byte mask = L->hookmask;
- int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0);
- if (counthook)
- resethookcount(L); /* reset count */
- if (ci->callstatus & CIST_HOOKYIELD) { /* called hook last time? */
- ci->callstatus &= ~CIST_HOOKYIELD; /* erase mark */
- return; /* do not call hook again (VM yielded, so it did not move) */
- }
- if (counthook)
- luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */
- if (mask & LUA_MASKLINE) {
- Proto *p = ci_func(ci)->p;
- int npc = pcRel(ci->u.l.savedpc, p);
- int newline = getfuncline(p, npc);
- if (npc == 0 || /* call linehook when enter a new function, */
- ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */
- newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */
- luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */
- }
- L->oldpc = ci->u.l.savedpc;
- if (L->status == LUA_YIELD) { /* did hook yield? */
- if (counthook)
- L->hookcount = 1; /* undo decrement to zero */
- ci->u.l.savedpc--; /* undo increment (resume will increment it again) */
- ci->callstatus |= CIST_HOOKYIELD; /* mark that it yielded */
- ci->func = L->top - 1; /* protect stack below results */
- luaD_throw(L, LUA_YIELD);
- }
+ CallInfo *ci = L->ci;
+ lu_byte mask = L->hookmask;
+ int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0);
+ if (counthook)
+ resethookcount(L); /* reset count */
+ if (ci->callstatus & CIST_HOOKYIELD) { /* called hook last time? */
+ ci->callstatus &= ~CIST_HOOKYIELD; /* erase mark */
+ return; /* do not call hook again (VM yielded, so it did not move) */
+ }
+ if (counthook)
+ luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */
+ if (mask & LUA_MASKLINE) {
+ Proto *p = ci_func(ci)->p;
+ int npc = pcRel(ci->u.l.savedpc, p);
+ int newline = getfuncline(p, npc);
+ if (npc == 0 || /* call linehook when enter a new function, */
+ ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */
+ newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */
+ luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */
+ }
+ L->oldpc = ci->u.l.savedpc;
+ if (L->status == LUA_YIELD) { /* did hook yield? */
+ if (counthook)
+ L->hookcount = 1; /* undo decrement to zero */
+ ci->u.l.savedpc--; /* undo increment (resume will increment it again) */
+ ci->callstatus |= CIST_HOOKYIELD; /* mark that it yielded */
+ ci->func = L->top - 1; /* protect stack below results */
+ luaD_throw(L, LUA_YIELD);
+ }
}
static void callTM (lua_State *L, const TValue *f, const TValue *p1,
- const TValue *p2, TValue *p3, int hasres) {
- ptrdiff_t result = savestack(L, p3);
- setobj2s(L, L->top++, f); /* push function */
- setobj2s(L, L->top++, p1); /* 1st argument */
- setobj2s(L, L->top++, p2); /* 2nd argument */
- if (!hasres) /* no result? 'p3' is third argument */
- setobj2s(L, L->top++, p3); /* 3rd argument */
- /* metamethod may yield only when called from Lua code */
- luaD_call(L, L->top - (4 - hasres), hasres, isLua(L->ci));
- if (hasres) { /* if has result, move it to its place */
- p3 = restorestack(L, result);
- setobjs2s(L, p3, --L->top);
- }
+ const TValue *p2, TValue *p3, int hasres) {
+ ptrdiff_t result = savestack(L, p3);
+ setobj2s(L, L->top++, f); /* push function */
+ setobj2s(L, L->top++, p1); /* 1st argument */
+ setobj2s(L, L->top++, p2); /* 2nd argument */
+ if (!hasres) /* no result? 'p3' is third argument */
+ setobj2s(L, L->top++, p3); /* 3rd argument */
+ /* metamethod may yield only when called from Lua code */
+ luaD_call(L, L->top - (4 - hasres), hasres, isLua(L->ci));
+ if (hasres) { /* if has result, move it to its place */
+ p3 = restorestack(L, result);
+ setobjs2s(L, p3, --L->top);
+ }
}
void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) {
- int loop;
- for (loop = 0; loop < MAXTAGLOOP; loop++) {
- const TValue *tm;
- if (ttistable(t)) { /* `t' is a table? */
- Table *h = hvalue(t);
- const TValue *res = luaH_get(h, key); /* do a primitive get */
- if (!ttisnil(res) || /* result is not nil? */
- (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
- setobj2s(L, val, res);
- return;
- }
- /* else will try the tag method */
- }
- else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX)))
- luaG_typeerror(L, t, "index");
- if (ttisfunction(tm)) {
- callTM(L, tm, t, key, val, 1);
- return;
- }
- t = tm; /* else repeat with 'tm' */
- }
- luaG_runerror(L, "loop in gettable");
+ int loop;
+ for (loop = 0; loop < MAXTAGLOOP; loop++) {
+ const TValue *tm;
+ if (ttistable(t)) { /* `t' is a table? */
+ Table *h = hvalue(t);
+ const TValue *res = luaH_get(h, key); /* do a primitive get */
+ if (!ttisnil(res) || /* result is not nil? */
+ (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
+ setobj2s(L, val, res);
+ return;
+ }
+ /* else will try the tag method */
+ }
+ else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX)))
+ luaG_typeerror(L, t, "index");
+ if (ttisfunction(tm)) {
+ callTM(L, tm, t, key, val, 1);
+ return;
+ }
+ t = tm; /* else repeat with 'tm' */
+ }
+ luaG_runerror(L, "loop in gettable");
}
void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
- int loop;
- for (loop = 0; loop < MAXTAGLOOP; loop++) {
- const TValue *tm;
- if (ttistable(t)) { /* `t' is a table? */
- Table *h = hvalue(t);
- TValue *oldval = cast(TValue *, luaH_get(h, key));
- /* if previous value is not nil, there must be a previous entry
- in the table; moreover, a metamethod has no relevance */
- if (!ttisnil(oldval) ||
- /* previous value is nil; must check the metamethod */
- ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
- /* no metamethod; is there a previous entry in the table? */
- (oldval != luaO_nilobject ||
- /* no previous entry; must create one. (The next test is
- always true; we only need the assignment.) */
- (oldval = luaH_newkey(L, h, key), 1)))) {
- /* no metamethod and (now) there is an entry with given key */
- setobj2t(L, oldval, val); /* assign new value to that entry */
- invalidateTMcache(h);
- luaC_barrierback(L, obj2gco(h), val);
- return;
- }
- /* else will try the metamethod */
- }
- else /* not a table; check metamethod */
- if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
- luaG_typeerror(L, t, "index");
- /* there is a metamethod */
- if (ttisfunction(tm)) {
- callTM(L, tm, t, key, val, 0);
- return;
- }
- t = tm; /* else repeat with 'tm' */
- }
- luaG_runerror(L, "loop in settable");
+ int loop;
+ for (loop = 0; loop < MAXTAGLOOP; loop++) {
+ const TValue *tm;
+ if (ttistable(t)) { /* `t' is a table? */
+ Table *h = hvalue(t);
+ TValue *oldval = cast(TValue *, luaH_get(h, key));
+ /* if previous value is not nil, there must be a previous entry
+ in the table; moreover, a metamethod has no relevance */
+ if (!ttisnil(oldval) ||
+ /* previous value is nil; must check the metamethod */
+ ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
+ /* no metamethod; is there a previous entry in the table? */
+ (oldval != luaO_nilobject ||
+ /* no previous entry; must create one. (The next test is
+ always true; we only need the assignment.) */
+ (oldval = luaH_newkey(L, h, key), 1)))) {
+ /* no metamethod and (now) there is an entry with given key */
+ setobj2t(L, oldval, val); /* assign new value to that entry */
+ invalidateTMcache(h);
+ luaC_barrierback(L, obj2gco(h), val);
+ return;
+ }
+ /* else will try the metamethod */
+ }
+ else /* not a table; check metamethod */
+ if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
+ luaG_typeerror(L, t, "index");
+ /* there is a metamethod */
+ if (ttisfunction(tm)) {
+ callTM(L, tm, t, key, val, 0);
+ return;
+ }
+ t = tm; /* else repeat with 'tm' */
+ }
+ luaG_runerror(L, "loop in settable");
}
static int call_binTM (lua_State *L, const TValue *p1, const TValue *p2,
- StkId res, TMS event) {
- const TValue *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */
- if (ttisnil(tm))
- tm = luaT_gettmbyobj(L, p2, event); /* try second operand */
- if (ttisnil(tm)) return 0;
- callTM(L, tm, p1, p2, res, 1);
- return 1;
+ StkId res, TMS event) {
+ const TValue *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */
+ if (ttisnil(tm))
+ tm = luaT_gettmbyobj(L, p2, event); /* try second operand */
+ if (ttisnil(tm)) return 0;
+ callTM(L, tm, p1, p2, res, 1);
+ return 1;
}
static const TValue *get_equalTM (lua_State *L, Table *mt1, Table *mt2,
- TMS event) {
- const TValue *tm1 = fasttm(L, mt1, event);
- const TValue *tm2;
- if (tm1 == NULL) return NULL; /* no metamethod */
- if (mt1 == mt2) return tm1; /* same metatables => same metamethods */
- tm2 = fasttm(L, mt2, event);
- if (tm2 == NULL) return NULL; /* no metamethod */
- if (luaV_rawequalobj(tm1, tm2)) /* same metamethods? */
- return tm1;
- return NULL;
+ TMS event) {
+ const TValue *tm1 = fasttm(L, mt1, event);
+ const TValue *tm2;
+ if (tm1 == NULL) return NULL; /* no metamethod */
+ if (mt1 == mt2) return tm1; /* same metatables => same metamethods */
+ tm2 = fasttm(L, mt2, event);
+ if (tm2 == NULL) return NULL; /* no metamethod */
+ if (luaV_rawequalobj(tm1, tm2)) /* same metamethods? */
+ return tm1;
+ return NULL;
}
static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2,
- TMS event) {
- if (!call_binTM(L, p1, p2, L->top, event))
- return -1; /* no metamethod */
- else
- return !l_isfalse(L->top);
+ TMS event) {
+ if (!call_binTM(L, p1, p2, L->top, event))
+ return -1; /* no metamethod */
+ else
+ return !l_isfalse(L->top);
}
static int l_strcmp (const TString *ls, const TString *rs) {
- const char *l = getstr(ls);
- size_t ll = ls->tsv.len;
- const char *r = getstr(rs);
- size_t lr = rs->tsv.len;
- for (;;) {
- int temp = strcoll(l, r);
- if (temp != 0) return temp;
- else { /* strings are equal up to a `\0' */
- size_t len = strlen(l); /* index of first `\0' in both strings */
- if (len == lr) /* r is finished? */
- return (len == ll) ? 0 : 1;
- else if (len == ll) /* l is finished? */
- return -1; /* l is smaller than r (because r is not finished) */
- /* both strings longer than `len'; go on comparing (after the `\0') */
- len++;
- l += len; ll -= len; r += len; lr -= len;
- }
- }
+ const char *l = getstr(ls);
+ size_t ll = ls->tsv.len;
+ const char *r = getstr(rs);
+ size_t lr = rs->tsv.len;
+ for (;;) {
+ int temp = strcoll(l, r);
+ if (temp != 0) return temp;
+ else { /* strings are equal up to a `\0' */
+ size_t len = strlen(l); /* index of first `\0' in both strings */
+ if (len == lr) /* r is finished? */
+ return (len == ll) ? 0 : 1;
+ else if (len == ll) /* l is finished? */
+ return -1; /* l is smaller than r (because r is not finished) */
+ /* both strings longer than `len'; go on comparing (after the `\0') */
+ len++;
+ l += len; ll -= len; r += len; lr -= len;
+ }
+ }
}
int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
- int res;
- if (ttisnumber(l) && ttisnumber(r))
- return luai_numlt(L, nvalue(l), nvalue(r));
- else if (ttisstring(l) && ttisstring(r))
- return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
- else if ((res = call_orderTM(L, l, r, TM_LT)) < 0)
- luaG_ordererror(L, l, r);
- return res;
+ int res;
+ if (ttisnumber(l) && ttisnumber(r))
+ return luai_numlt(L, nvalue(l), nvalue(r));
+ else if (ttisstring(l) && ttisstring(r))
+ return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
+ else if ((res = call_orderTM(L, l, r, TM_LT)) < 0)
+ luaG_ordererror(L, l, r);
+ return res;
}
int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) {
- int res;
- if (ttisnumber(l) && ttisnumber(r))
- return luai_numle(L, nvalue(l), nvalue(r));
- else if (ttisstring(l) && ttisstring(r))
- return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
- else if ((res = call_orderTM(L, l, r, TM_LE)) >= 0) /* first try `le' */
- return res;
- else if ((res = call_orderTM(L, r, l, TM_LT)) < 0) /* else try `lt' */
- luaG_ordererror(L, l, r);
- return !res;
+ int res;
+ if (ttisnumber(l) && ttisnumber(r))
+ return luai_numle(L, nvalue(l), nvalue(r));
+ else if (ttisstring(l) && ttisstring(r))
+ return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
+ else if ((res = call_orderTM(L, l, r, TM_LE)) >= 0) /* first try `le' */
+ return res;
+ else if ((res = call_orderTM(L, r, l, TM_LT)) < 0) /* else try `lt' */
+ luaG_ordererror(L, l, r);
+ return !res;
}
@@ -258,116 +258,116 @@ int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) {
** equality of Lua values. L == NULL means raw equality (no metamethods)
*/
int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2) {
- const TValue *tm;
- lua_assert(ttisequal(t1, t2));
- switch (ttype(t1)) {
- case LUA_TNIL: return 1;
- case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2));
- case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */
- case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
- case LUA_TLCF: return fvalue(t1) == fvalue(t2);
- case LUA_TSHRSTR: return eqshrstr(rawtsvalue(t1), rawtsvalue(t2));
- case LUA_TLNGSTR: return luaS_eqlngstr(rawtsvalue(t1), rawtsvalue(t2));
- case LUA_TUSERDATA: {
- if (uvalue(t1) == uvalue(t2)) return 1;
- else if (L == NULL) return 0;
- tm = get_equalTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, TM_EQ);
- break; /* will try TM */
- }
- case LUA_TTABLE: {
- if (hvalue(t1) == hvalue(t2)) return 1;
- else if (L == NULL) return 0;
- tm = get_equalTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
- break; /* will try TM */
- }
- default:
- lua_assert(iscollectable(t1));
- return gcvalue(t1) == gcvalue(t2);
- }
- if (tm == NULL) return 0; /* no TM? */
- callTM(L, tm, t1, t2, L->top, 1); /* call TM */
- return !l_isfalse(L->top);
+ const TValue *tm;
+ lua_assert(ttisequal(t1, t2));
+ switch (ttype(t1)) {
+ case LUA_TNIL: return 1;
+ case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2));
+ case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */
+ case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
+ case LUA_TLCF: return fvalue(t1) == fvalue(t2);
+ case LUA_TSHRSTR: return eqshrstr(rawtsvalue(t1), rawtsvalue(t2));
+ case LUA_TLNGSTR: return luaS_eqlngstr(rawtsvalue(t1), rawtsvalue(t2));
+ case LUA_TUSERDATA: {
+ if (uvalue(t1) == uvalue(t2)) return 1;
+ else if (L == NULL) return 0;
+ tm = get_equalTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, TM_EQ);
+ break; /* will try TM */
+ }
+ case LUA_TTABLE: {
+ if (hvalue(t1) == hvalue(t2)) return 1;
+ else if (L == NULL) return 0;
+ tm = get_equalTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
+ break; /* will try TM */
+ }
+ default:
+ lua_assert(iscollectable(t1));
+ return gcvalue(t1) == gcvalue(t2);
+ }
+ if (tm == NULL) return 0; /* no TM? */
+ callTM(L, tm, t1, t2, L->top, 1); /* call TM */
+ return !l_isfalse(L->top);
}
void luaV_concat (lua_State *L, int total) {
- lua_assert(total >= 2);
- do {
- StkId top = L->top;
- int n = 2; /* number of elements handled in this pass (at least 2) */
- if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) {
- if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))
- luaG_concaterror(L, top-2, top-1);
- }
- else if (tsvalue(top-1)->len == 0) /* second operand is empty? */
- (void)tostring(L, top - 2); /* result is first operand */
- else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) {
- setobjs2s(L, top - 2, top - 1); /* result is second op. */
- }
- else {
- /* at least two non-empty string values; get as many as possible */
- size_t tl = tsvalue(top-1)->len;
- char *buffer;
- int i;
- /* collect total length */
- for (i = 1; i < total && tostring(L, top-i-1); i++) {
- size_t l = tsvalue(top-i-1)->len;
- if (l >= (MAX_SIZET/sizeof(char)) - tl)
- luaG_runerror(L, "string length overflow");
- tl += l;
- }
- buffer = luaZ_openspace(L, &G(L)->buff, tl);
- tl = 0;
- n = i;
- do { /* concat all strings */
- size_t l = tsvalue(top-i)->len;
- memcpy(buffer+tl, svalue(top-i), l * sizeof(char));
- tl += l;
- } while (--i > 0);
- setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl));
- }
- total -= n-1; /* got 'n' strings to create 1 new */
- L->top -= n-1; /* popped 'n' strings and pushed one */
- } while (total > 1); /* repeat until only 1 result left */
+ lua_assert(total >= 2);
+ do {
+ StkId top = L->top;
+ int n = 2; /* number of elements handled in this pass (at least 2) */
+ if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) {
+ if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))
+ luaG_concaterror(L, top-2, top-1);
+ }
+ else if (tsvalue(top-1)->len == 0) /* second operand is empty? */
+ (void)tostring(L, top - 2); /* result is first operand */
+ else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) {
+ setobjs2s(L, top - 2, top - 1); /* result is second op. */
+ }
+ else {
+ /* at least two non-empty string values; get as many as possible */
+ size_t tl = tsvalue(top-1)->len;
+ char *buffer;
+ int i;
+ /* collect total length */
+ for (i = 1; i < total && tostring(L, top-i-1); i++) {
+ size_t l = tsvalue(top-i-1)->len;
+ if (l >= (MAX_SIZET/sizeof(char)) - tl)
+ luaG_runerror(L, "string length overflow");
+ tl += l;
+ }
+ buffer = luaZ_openspace(L, &G(L)->buff, tl);
+ tl = 0;
+ n = i;
+ do { /* concat all strings */
+ size_t l = tsvalue(top-i)->len;
+ memcpy(buffer+tl, svalue(top-i), l * sizeof(char));
+ tl += l;
+ } while (--i > 0);
+ setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl));
+ }
+ total -= n-1; /* got 'n' strings to create 1 new */
+ L->top -= n-1; /* popped 'n' strings and pushed one */
+ } while (total > 1); /* repeat until only 1 result left */
}
void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) {
- const TValue *tm;
- switch (ttypenv(rb)) {
- case LUA_TTABLE: {
- Table *h = hvalue(rb);
- tm = fasttm(L, h->metatable, TM_LEN);
- if (tm) break; /* metamethod? break switch to call it */
- setnvalue(ra, cast_num(1.0*luaH_getn(h))); /* else primitive len */
- return;
- }
- case LUA_TSTRING: {
- setnvalue(ra, cast_num(tsvalue(rb)->len));
- return;
- }
- default: { /* try metamethod */
- tm = luaT_gettmbyobj(L, rb, TM_LEN);
- if (ttisnil(tm)) /* no metamethod? */
- luaG_typeerror(L, rb, "get length of");
- break;
- }
- }
- callTM(L, tm, rb, rb, ra, 1);
+ const TValue *tm;
+ switch (ttypenv(rb)) {
+ case LUA_TTABLE: {
+ Table *h = hvalue(rb);
+ tm = fasttm(L, h->metatable, TM_LEN);
+ if (tm) break; /* metamethod? break switch to call it */
+ setnvalue(ra, cast_num(1.0*luaH_getn(h))); /* else primitive len */
+ return;
+ }
+ case LUA_TSTRING: {
+ setnvalue(ra, cast_num(tsvalue(rb)->len));
+ return;
+ }
+ default: { /* try metamethod */
+ tm = luaT_gettmbyobj(L, rb, TM_LEN);
+ if (ttisnil(tm)) /* no metamethod? */
+ luaG_typeerror(L, rb, "get length of");
+ break;
+ }
+ }
+ callTM(L, tm, rb, rb, ra, 1);
}
void luaV_arith (lua_State *L, StkId ra, const TValue *rb,
- const TValue *rc, TMS op) {
- TValue tempb, tempc;
- const TValue *b, *c;
- if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
- (c = luaV_tonumber(rc, &tempc)) != NULL) {
- lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c));
- setnvalue(ra, res);
- }
- else if (!call_binTM(L, rb, rc, ra, op))
- luaG_aritherror(L, rb, rc);
+ const TValue *rc, TMS op) {
+ TValue tempb, tempc;
+ const TValue *b, *c;
+ if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
+ (c = luaV_tonumber(rc, &tempc)) != NULL) {
+ lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c));
+ setnvalue(ra, res);
+ }
+ else if (!call_binTM(L, rb, rc, ra, op))
+ luaG_aritherror(L, rb, rc);
}
@@ -377,18 +377,18 @@ void luaV_arith (lua_State *L, StkId ra, const TValue *rb,
** new closure to be created.
*/
static Closure *getcached (Proto *p, UpVal **encup, StkId base) {
- Closure *c = p->cache;
- if (c != NULL) { /* is there a cached closure? */
- int nup = p->sizeupvalues;
- Upvaldesc *uv = p->upvalues;
- int i;
- for (i = 0; i < nup; i++) { /* check whether it has right upvalues */
- TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v;
- if (c->l.upvals[i]->v != v)
- return NULL; /* wrong upvalue; cannot reuse closure */
- }
- }
- return c; /* return cached closure (or NULL if no cached closure) */
+ Closure *c = p->cache;
+ if (c != NULL) { /* is there a cached closure? */
+ int nup = p->sizeupvalues;
+ Upvaldesc *uv = p->upvalues;
+ int i;
+ for (i = 0; i < nup; i++) { /* check whether it has right upvalues */
+ TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v;
+ if (c->l.upvals[i]->v != v)
+ return NULL; /* wrong upvalue; cannot reuse closure */
+ }
+ }
+ return c; /* return cached closure (or NULL if no cached closure) */
}
@@ -399,21 +399,21 @@ static Closure *getcached (Proto *p, UpVal **encup, StkId base) {
** original value of that field.
*/
static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base,
- StkId ra) {
- int nup = p->sizeupvalues;
- Upvaldesc *uv = p->upvalues;
- int i;
- Closure *ncl = luaF_newLclosure(L, nup);
- ncl->l.p = p;
- setclLvalue(L, ra, ncl); /* anchor new closure in stack */
- for (i = 0; i < nup; i++) { /* fill in its upvalues */
- if (uv[i].instack) /* upvalue refers to local variable? */
- ncl->l.upvals[i] = luaF_findupval(L, base + uv[i].idx);
- else /* get upvalue from enclosing function */
- ncl->l.upvals[i] = encup[uv[i].idx];
- }
- luaC_barrierproto(L, p, ncl);
- p->cache = ncl; /* save it on cache for reuse */
+ StkId ra) {
+ int nup = p->sizeupvalues;
+ Upvaldesc *uv = p->upvalues;
+ int i;
+ Closure *ncl = luaF_newLclosure(L, nup);
+ ncl->l.p = p;
+ setclLvalue(L, ra, ncl); /* anchor new closure in stack */
+ for (i = 0; i < nup; i++) { /* fill in its upvalues */
+ if (uv[i].instack) /* upvalue refers to local variable? */
+ ncl->l.upvals[i] = luaF_findupval(L, base + uv[i].idx);
+ else /* get upvalue from enclosing function */
+ ncl->l.upvals[i] = encup[uv[i].idx];
+ }
+ luaC_barrierproto(L, p, ncl);
+ p->cache = ncl; /* save it on cache for reuse */
}
@@ -421,58 +421,58 @@ static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base,
** finish execution of an opcode interrupted by an yield
*/
void luaV_finishOp (lua_State *L) {
- CallInfo *ci = L->ci;
- StkId base = ci->u.l.base;
- Instruction inst = *(ci->u.l.savedpc - 1); /* interrupted instruction */
- OpCode op = GET_OPCODE(inst);
- switch (op) { /* finish its execution */
- case OP_ADD: case OP_SUB: case OP_MUL: case OP_DIV:
- case OP_MOD: case OP_POW: case OP_UNM: case OP_LEN:
- case OP_GETTABUP: case OP_GETTABLE: case OP_SELF: {
- setobjs2s(L, base + GETARG_A(inst), --L->top);
- break;
- }
- case OP_LE: case OP_LT: case OP_EQ: {
- int res = !l_isfalse(L->top - 1);
- L->top--;
- /* metamethod should not be called when operand is K */
- lua_assert(!ISK(GETARG_B(inst)));
- if (op == OP_LE && /* "<=" using "<" instead? */
- ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE)))
- res = !res; /* invert result */
- lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
- if (res != GETARG_A(inst)) /* condition failed? */
- ci->u.l.savedpc++; /* skip jump instruction */
- break;
- }
- case OP_CONCAT: {
- StkId top = L->top - 1; /* top when 'call_binTM' was called */
- int b = GETARG_B(inst); /* first element to concatenate */
- int total = cast_int(top - 1 - (base + b)); /* yet to concatenate */
- setobj2s(L, top - 2, top); /* put TM result in proper position */
- if (total > 1) { /* are there elements to concat? */
- L->top = top - 1; /* top is one after last element (at top-2) */
- luaV_concat(L, total); /* concat them (may yield again) */
- }
- /* move final result to final position */
- setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1);
- L->top = ci->top; /* restore top */
- break;
- }
- case OP_TFORCALL: {
- lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP);
- L->top = ci->top; /* correct top */
- break;
- }
- case OP_CALL: {
- if (GETARG_C(inst) - 1 >= 0) /* nresults >= 0? */
- L->top = ci->top; /* adjust results */
- break;
- }
- case OP_TAILCALL: case OP_SETTABUP: case OP_SETTABLE:
- break;
- default: lua_assert(0);
- }
+ CallInfo *ci = L->ci;
+ StkId base = ci->u.l.base;
+ Instruction inst = *(ci->u.l.savedpc - 1); /* interrupted instruction */
+ OpCode op = GET_OPCODE(inst);
+ switch (op) { /* finish its execution */
+ case OP_ADD: case OP_SUB: case OP_MUL: case OP_DIV:
+ case OP_MOD: case OP_POW: case OP_UNM: case OP_LEN:
+ case OP_GETTABUP: case OP_GETTABLE: case OP_SELF: {
+ setobjs2s(L, base + GETARG_A(inst), --L->top);
+ break;
+ }
+ case OP_LE: case OP_LT: case OP_EQ: {
+ int res = !l_isfalse(L->top - 1);
+ L->top--;
+ /* metamethod should not be called when operand is K */
+ lua_assert(!ISK(GETARG_B(inst)));
+ if (op == OP_LE && /* "<=" using "<" instead? */
+ ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE)))
+ res = !res; /* invert result */
+ lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
+ if (res != GETARG_A(inst)) /* condition failed? */
+ ci->u.l.savedpc++; /* skip jump instruction */
+ break;
+ }
+ case OP_CONCAT: {
+ StkId top = L->top - 1; /* top when 'call_binTM' was called */
+ int b = GETARG_B(inst); /* first element to concatenate */
+ int total = cast_int(top - 1 - (base + b)); /* yet to concatenate */
+ setobj2s(L, top - 2, top); /* put TM result in proper position */
+ if (total > 1) { /* are there elements to concat? */
+ L->top = top - 1; /* top is one after last element (at top-2) */
+ luaV_concat(L, total); /* concat them (may yield again) */
+ }
+ /* move final result to final position */
+ setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1);
+ L->top = ci->top; /* restore top */
+ break;
+ }
+ case OP_TFORCALL: {
+ lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP);
+ L->top = ci->top; /* correct top */
+ break;
+ }
+ case OP_CALL: {
+ if (GETARG_C(inst) - 1 >= 0) /* nresults >= 0? */
+ L->top = ci->top; /* adjust results */
+ break;
+ }
+ case OP_TAILCALL: case OP_SETTABUP: case OP_SETTABLE:
+ break;
+ default: lua_assert(0);
+ }
}
@@ -482,386 +482,385 @@ void luaV_finishOp (lua_State *L) {
*/
#if !defined luai_runtimecheck
-#define luai_runtimecheck(L, c) /* void */
+#define luai_runtimecheck(L, c) /* void */
#endif
-#define RA(i) (base+GETARG_A(i))
+#define RA(i) (base+GETARG_A(i))
/* to be used after possible stack reallocation */
-#define RB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i))
-#define RC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i))
-#define RKB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \
+#define RB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i))
+#define RC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i))
+#define RKB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \
ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i))
-#define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \
+#define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \
ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i))
#define KBx(i) \
- (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++)))
+ (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++)))
/* execute a jump instruction */
#define dojump(ci,i,e) \
- { int a = GETARG_A(i); \
- if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \
- ci->u.l.savedpc += GETARG_sBx(i) + e; }
+ { int a = GETARG_A(i); \
+ if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \
+ ci->u.l.savedpc += GETARG_sBx(i) + e; }
/* for test instructions, execute the jump instruction that follows it */
-#define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); }
+#define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); }
-#define Protect(x) { {x;}; base = ci->u.l.base; }
+#define Protect(x) { {x;}; base = ci->u.l.base; }
#define checkGC(L,c) \
- Protect( luaC_condGC(L,{L->top = (c); /* limit of live values */ \
- luaC_step(L); \
- L->top = ci->top;}) /* restore top */ \
- luai_threadyield(L); )
+ Protect( luaC_condGC(L,{L->top = (c); /* limit of live values */ \
+ luaC_step(L); \
+ L->top = ci->top;}) /* restore top */ \
+ luai_threadyield(L); )
#define arith_op(op,tm) { \
- TValue *rb = RKB(i); \
- TValue *rc = RKC(i); \
- if (ttisnumber(rb) && ttisnumber(rc)) { \
- lua_Number nb = nvalue(rb), nc = nvalue(rc); \
- setnvalue(ra, op(L, nb, nc)); \
- } \
- else { Protect(luaV_arith(L, ra, rb, rc, tm)); } }
+ TValue *rb = RKB(i); \
+ TValue *rc = RKC(i); \
+ if (ttisnumber(rb) && ttisnumber(rc)) { \
+ lua_Number nb = nvalue(rb), nc = nvalue(rc); \
+ setnvalue(ra, op(L, nb, nc)); \
+ } \
+ else { Protect(luaV_arith(L, ra, rb, rc, tm)); } }
-#define vmdispatch(o) switch(o)
-#define vmcase(l,b) case l: {b} break;
-#define vmcasenb(l,b) case l: {b} /* nb = no break */
+#define vmdispatch(o) switch(o)
+#define vmcase(l,b) case l: {b} break;
+#define vmcasenb(l,b) case l: {b} /* nb = no break */
void luaV_execute (lua_State *L) {
- CallInfo *ci = L->ci;
- LClosure *cl;
- TValue *k;
- StkId base;
- newframe: /* reentry point when frame changes (call/return) */
- lua_assert(ci == L->ci);
- cl = clLvalue(ci->func);
- k = cl->p->k;
- base = ci->u.l.base;
- /* main loop of interpreter */
- for (;;) {
- Instruction i = *(ci->u.l.savedpc++);
- StkId ra;
- if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
- (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
- Protect(traceexec(L));
- }
- /* WARNING: several calls may realloc the stack and invalidate `ra' */
- ra = RA(i);
- lua_assert(base == ci->u.l.base);
- lua_assert(base <= L->top && L->top < L->stack + L->stacksize);
- vmdispatch (GET_OPCODE(i)) {
- vmcase(OP_MOVE,
- setobjs2s(L, ra, RB(i));
- )
- vmcase(OP_LOADK,
- TValue *rb = k + GETARG_Bx(i);
- setobj2s(L, ra, rb);
- )
- vmcase(OP_LOADKX,
- TValue *rb;
- lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
- rb = k + GETARG_Ax(*ci->u.l.savedpc++);
- setobj2s(L, ra, rb);
- )
- vmcase(OP_LOADBOOL,
- setbvalue(ra, GETARG_B(i));
- if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */
- )
- vmcase(OP_LOADNIL,
- int b = GETARG_B(i);
- do {
- setnilvalue(ra++);
- } while (b--);
- )
- vmcase(OP_GETUPVAL,
- int b = GETARG_B(i);
- setobj2s(L, ra, cl->upvals[b]->v);
- )
- vmcase(OP_GETTABUP,
- int b = GETARG_B(i);
- Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra));
- )
- vmcase(OP_GETTABLE,
- Protect(luaV_gettable(L, RB(i), RKC(i), ra));
- )
- vmcase(OP_SETTABUP,
- int a = GETARG_A(i);
- Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i)));
- )
- vmcase(OP_SETUPVAL,
- UpVal *uv = cl->upvals[GETARG_B(i)];
- setobj(L, uv->v, ra);
- luaC_barrier(L, uv, ra);
- )
- vmcase(OP_SETTABLE,
- Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
- )
- vmcase(OP_NEWTABLE,
- int b = GETARG_B(i);
- int c = GETARG_C(i);
- Table *t = luaH_new(L);
- sethvalue(L, ra, t);
- if (b != 0 || c != 0)
- luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
- checkGC(L, ra + 1);
- )
- vmcase(OP_SELF,
- StkId rb = RB(i);
- setobjs2s(L, ra+1, rb);
- Protect(luaV_gettable(L, rb, RKC(i), ra));
- )
- vmcase(OP_ADD,
- arith_op(luai_numadd, TM_ADD);
- )
- vmcase(OP_SUB,
- arith_op(luai_numsub, TM_SUB);
- )
- vmcase(OP_MUL,
- arith_op(luai_nummul, TM_MUL);
- )
- vmcase(OP_DIV,
- arith_op(luai_numdiv, TM_DIV);
- )
- vmcase(OP_MOD,
- arith_op(luai_nummod, TM_MOD);
- )
- vmcase(OP_POW,
- arith_op(luai_numpow, TM_POW);
- )
- vmcase(OP_UNM,
- TValue *rb = RB(i);
- if (ttisnumber(rb)) {
- lua_Number nb = nvalue(rb);
- setnvalue(ra, luai_numunm(L, nb));
- }
- else {
- Protect(luaV_arith(L, ra, rb, rb, TM_UNM));
- }
- )
- vmcase(OP_NOT,
- TValue *rb = RB(i);
- int res = l_isfalse(rb); /* next assignment may change this value */
- setbvalue(ra, res);
- )
- vmcase(OP_LEN,
- Protect(luaV_objlen(L, ra, RB(i)));
- )
- vmcase(OP_CONCAT,
- int b = GETARG_B(i);
- int c = GETARG_C(i);
- StkId rb;
- L->top = base + c + 1; /* mark the end of concat operands */
- Protect(luaV_concat(L, c - b + 1));
- ra = RA(i); /* 'luav_concat' may invoke TMs and move the stack */
- rb = b + base;
- setobjs2s(L, ra, rb);
- checkGC(L, (ra >= rb ? ra + 1 : rb));
- L->top = ci->top; /* restore top */
- )
- vmcase(OP_JMP,
- dojump(ci, i, 0);
- )
- vmcase(OP_EQ,
- TValue *rb = RKB(i);
- TValue *rc = RKC(i);
- Protect(
- if (cast_int(equalobj(L, rb, rc)) != GETARG_A(i))
- ci->u.l.savedpc++;
- else
- donextjump(ci);
- )
- )
- vmcase(OP_LT,
- Protect(
- if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i))
- ci->u.l.savedpc++;
- else
- donextjump(ci);
- )
- )
- vmcase(OP_LE,
- Protect(
- if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i))
- ci->u.l.savedpc++;
- else
- donextjump(ci);
- )
- )
- vmcase(OP_TEST,
- if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra))
- ci->u.l.savedpc++;
- else
- donextjump(ci);
- )
- vmcase(OP_TESTSET,
- TValue *rb = RB(i);
- if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb))
- ci->u.l.savedpc++;
- else {
- setobjs2s(L, ra, rb);
- donextjump(ci);
- }
- )
- vmcase(OP_CALL,
- int b = GETARG_B(i);
- int nresults = GETARG_C(i) - 1;
- if (b != 0) L->top = ra+b; /* else previous instruction set top */
- if (luaD_precall(L, ra, nresults)) { /* C function? */
- if (nresults >= 0) L->top = ci->top; /* adjust results */
- base = ci->u.l.base;
- }
- else { /* Lua function */
- ci = L->ci;
- ci->callstatus |= CIST_REENTRY;
- goto newframe; /* restart luaV_execute over new Lua function */
- }
- )
- vmcase(OP_TAILCALL,
- int b = GETARG_B(i);
- if (b != 0) L->top = ra+b; /* else previous instruction set top */
- lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
- if (luaD_precall(L, ra, LUA_MULTRET)) /* C function? */
- base = ci->u.l.base;
- else {
- /* tail call: put called frame (n) in place of caller one (o) */
- CallInfo *nci = L->ci; /* called frame */
- CallInfo *oci = nci->previous; /* caller frame */
- StkId nfunc = nci->func; /* called function */
- StkId ofunc = oci->func; /* caller function */
- /* last stack slot filled by 'precall' */
- StkId lim = nci->u.l.base + getproto(nfunc)->numparams;
- int aux;
- /* close all upvalues from previous call */
- if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base);
- /* move new frame into old one */
- for (aux = 0; nfunc + aux < lim; aux++)
- setobjs2s(L, ofunc + aux, nfunc + aux);
- oci->u.l.base = ofunc + (nci->u.l.base - nfunc); /* correct base */
- oci->top = L->top = ofunc + (L->top - nfunc); /* correct top */
- oci->u.l.savedpc = nci->u.l.savedpc;
- oci->callstatus |= CIST_TAIL; /* function was tail called */
- ci = L->ci = oci; /* remove new frame */
- lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
- goto newframe; /* restart luaV_execute over new Lua function */
- }
- )
- vmcasenb(OP_RETURN,
- int b = GETARG_B(i);
- if (b != 0) L->top = ra+b-1;
- if (cl->p->sizep > 0) luaF_close(L, base);
- b = luaD_poscall(L, ra);
- if (!(ci->callstatus & CIST_REENTRY)) /* 'ci' still the called one */
- return; /* external invocation: return */
- else { /* invocation via reentry: continue execution */
- ci = L->ci;
- if (b) L->top = ci->top;
- lua_assert(isLua(ci));
- lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
- goto newframe; /* restart luaV_execute over new Lua function */
- }
- )
- vmcase(OP_FORLOOP,
- lua_Number step = nvalue(ra+2);
- lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */
- lua_Number limit = nvalue(ra+1);
- if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit)
- : luai_numle(L, limit, idx)) {
- ci->u.l.savedpc += GETARG_sBx(i); /* jump back */
- setnvalue(ra, idx); /* update internal index... */
- setnvalue(ra+3, idx); /* ...and external index */
- }
- )
- vmcase(OP_FORPREP,
- const TValue *init = ra;
- const TValue *plimit = ra+1;
- const TValue *pstep = ra+2;
- if (!tonumber(init, ra))
- luaG_runerror(L, LUA_QL("for") " initial value must be a number");
- else if (!tonumber(plimit, ra+1))
- luaG_runerror(L, LUA_QL("for") " limit must be a number");
- else if (!tonumber(pstep, ra+2))
- luaG_runerror(L, LUA_QL("for") " step must be a number");
- setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep)));
- ci->u.l.savedpc += GETARG_sBx(i);
- )
- vmcasenb(OP_TFORCALL,
- StkId cb = ra + 3; /* call base */
- setobjs2s(L, cb+2, ra+2);
- setobjs2s(L, cb+1, ra+1);
- setobjs2s(L, cb, ra);
- L->top = cb + 3; /* func. + 2 args (state and index) */
- Protect(luaD_call(L, cb, GETARG_C(i), 1));
- L->top = ci->top;
- i = *(ci->u.l.savedpc++); /* go to next instruction */
- ra = RA(i);
- lua_assert(GET_OPCODE(i) == OP_TFORLOOP);
- goto l_tforloop;
- )
- vmcase(OP_TFORLOOP,
- l_tforloop:
- if (!ttisnil(ra + 1)) { /* continue loop? */
- setobjs2s(L, ra, ra + 1); /* save control variable */
- ci->u.l.savedpc += GETARG_sBx(i); /* jump back */
- }
- )
- vmcase(OP_SETLIST,
- int n = GETARG_B(i);
- int c = GETARG_C(i);
- int last;
- Table *h;
- if (n == 0) n = cast_int(L->top - ra) - 1;
- if (c == 0) {
- lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
- c = GETARG_Ax(*ci->u.l.savedpc++);
- }
- luai_runtimecheck(L, ttistable(ra));
- h = hvalue(ra);
- last = ((c-1)*LFIELDS_PER_FLUSH) + n;
- if (last > h->sizearray) /* needs more space? */
- luaH_resizearray(L, h, last); /* pre-allocate it at once */
- for (; n > 0; n--) {
- TValue *val = ra+n;
- luaH_setint(L, h, last--, val);
- luaC_barrierback(L, obj2gco(h), val);
- }
- L->top = ci->top; /* correct top (in case of previous open call) */
- )
- vmcase(OP_CLOSURE,
- Proto *p = cl->p->p[GETARG_Bx(i)];
- Closure *ncl = getcached(p, cl->upvals, base); /* cached closure */
- if (ncl == NULL) /* no match? */
- pushclosure(L, p, cl->upvals, base, ra); /* create a new one */
- else
- setclLvalue(L, ra, ncl); /* push cashed closure */
- checkGC(L, ra + 1);
- )
- vmcase(OP_VARARG,
- int b = GETARG_B(i) - 1;
- int j;
- int n = cast_int(base - ci->func) - cl->p->numparams - 1;
- if (b < 0) { /* B == 0? */
- b = n; /* get all var. arguments */
- Protect(luaD_checkstack(L, n));
- ra = RA(i); /* previous call may change the stack */
- L->top = ra + n;
- }
- for (j = 0; j < b; j++) {
- if (j < n) {
- setobjs2s(L, ra + j, base - n + j);
- }
- else {
- setnilvalue(ra + j);
- }
- }
- )
- vmcase(OP_EXTRAARG,
- lua_assert(0);
- )
- }
- }
+ CallInfo *ci = L->ci;
+ LClosure *cl;
+ TValue *k;
+ StkId base;
+ newframe: /* reentry point when frame changes (call/return) */
+ lua_assert(ci == L->ci);
+ cl = clLvalue(ci->func);
+ k = cl->p->k;
+ base = ci->u.l.base;
+ /* main loop of interpreter */
+ for (;;) {
+ Instruction i = *(ci->u.l.savedpc++);
+ StkId ra;
+ if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
+ (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
+ Protect(traceexec(L));
+ }
+ /* WARNING: several calls may realloc the stack and invalidate `ra' */
+ ra = RA(i);
+ lua_assert(base == ci->u.l.base);
+ lua_assert(base <= L->top && L->top < L->stack + L->stacksize);
+ vmdispatch (GET_OPCODE(i)) {
+ vmcase(OP_MOVE,
+ setobjs2s(L, ra, RB(i));
+ )
+ vmcase(OP_LOADK,
+ TValue *rb = k + GETARG_Bx(i);
+ setobj2s(L, ra, rb);
+ )
+ vmcase(OP_LOADKX,
+ TValue *rb;
+ lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
+ rb = k + GETARG_Ax(*ci->u.l.savedpc++);
+ setobj2s(L, ra, rb);
+ )
+ vmcase(OP_LOADBOOL,
+ setbvalue(ra, GETARG_B(i));
+ if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */
+ )
+ vmcase(OP_LOADNIL,
+ int b = GETARG_B(i);
+ do {
+ setnilvalue(ra++);
+ } while (b--);
+ )
+ vmcase(OP_GETUPVAL,
+ int b = GETARG_B(i);
+ setobj2s(L, ra, cl->upvals[b]->v);
+ )
+ vmcase(OP_GETTABUP,
+ int b = GETARG_B(i);
+ Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra));
+ )
+ vmcase(OP_GETTABLE,
+ Protect(luaV_gettable(L, RB(i), RKC(i), ra));
+ )
+ vmcase(OP_SETTABUP,
+ int a = GETARG_A(i);
+ Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i)));
+ )
+ vmcase(OP_SETUPVAL,
+ UpVal *uv = cl->upvals[GETARG_B(i)];
+ setobj(L, uv->v, ra);
+ luaC_barrier(L, uv, ra);
+ )
+ vmcase(OP_SETTABLE,
+ Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
+ )
+ vmcase(OP_NEWTABLE,
+ int b = GETARG_B(i);
+ int c = GETARG_C(i);
+ Table *t = luaH_new(L);
+ sethvalue(L, ra, t);
+ if (b != 0 || c != 0)
+ luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
+ checkGC(L, ra + 1);
+ )
+ vmcase(OP_SELF,
+ StkId rb = RB(i);
+ setobjs2s(L, ra+1, rb);
+ Protect(luaV_gettable(L, rb, RKC(i), ra));
+ )
+ vmcase(OP_ADD,
+ arith_op(luai_numadd, TM_ADD);
+ )
+ vmcase(OP_SUB,
+ arith_op(luai_numsub, TM_SUB);
+ )
+ vmcase(OP_MUL,
+ arith_op(luai_nummul, TM_MUL);
+ )
+ vmcase(OP_DIV,
+ arith_op(luai_numdiv, TM_DIV);
+ )
+ vmcase(OP_MOD,
+ arith_op(luai_nummod, TM_MOD);
+ )
+ vmcase(OP_POW,
+ arith_op(luai_numpow, TM_POW);
+ )
+ vmcase(OP_UNM,
+ TValue *rb = RB(i);
+ if (ttisnumber(rb)) {
+ lua_Number nb = nvalue(rb);
+ setnvalue(ra, luai_numunm(L, nb));
+ }
+ else {
+ Protect(luaV_arith(L, ra, rb, rb, TM_UNM));
+ }
+ )
+ vmcase(OP_NOT,
+ TValue *rb = RB(i);
+ int res = l_isfalse(rb); /* next assignment may change this value */
+ setbvalue(ra, res);
+ )
+ vmcase(OP_LEN,
+ Protect(luaV_objlen(L, ra, RB(i)));
+ )
+ vmcase(OP_CONCAT,
+ int b = GETARG_B(i);
+ int c = GETARG_C(i);
+ StkId rb;
+ L->top = base + c + 1; /* mark the end of concat operands */
+ Protect(luaV_concat(L, c - b + 1));
+ ra = RA(i); /* 'luav_concat' may invoke TMs and move the stack */
+ rb = b + base;
+ setobjs2s(L, ra, rb);
+ checkGC(L, (ra >= rb ? ra + 1 : rb));
+ L->top = ci->top; /* restore top */
+ )
+ vmcase(OP_JMP,
+ dojump(ci, i, 0);
+ )
+ vmcase(OP_EQ,
+ TValue *rb = RKB(i);
+ TValue *rc = RKC(i);
+ Protect(
+ if (cast_int(equalobj(L, rb, rc)) != GETARG_A(i))
+ ci->u.l.savedpc++;
+ else
+ donextjump(ci);
+ )
+ )
+ vmcase(OP_LT,
+ Protect(
+ if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i))
+ ci->u.l.savedpc++;
+ else
+ donextjump(ci);
+ )
+ )
+ vmcase(OP_LE,
+ Protect(
+ if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i))
+ ci->u.l.savedpc++;
+ else
+ donextjump(ci);
+ )
+ )
+ vmcase(OP_TEST,
+ if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra))
+ ci->u.l.savedpc++;
+ else
+ donextjump(ci);
+ )
+ vmcase(OP_TESTSET,
+ TValue *rb = RB(i);
+ if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb))
+ ci->u.l.savedpc++;
+ else {
+ setobjs2s(L, ra, rb);
+ donextjump(ci);
+ }
+ )
+ vmcase(OP_CALL,
+ int b = GETARG_B(i);
+ int nresults = GETARG_C(i) - 1;
+ if (b != 0) L->top = ra+b; /* else previous instruction set top */
+ if (luaD_precall(L, ra, nresults)) { /* C function? */
+ if (nresults >= 0) L->top = ci->top; /* adjust results */
+ base = ci->u.l.base;
+ }
+ else { /* Lua function */
+ ci = L->ci;
+ ci->callstatus |= CIST_REENTRY;
+ goto newframe; /* restart luaV_execute over new Lua function */
+ }
+ )
+ vmcase(OP_TAILCALL,
+ int b = GETARG_B(i);
+ if (b != 0) L->top = ra+b; /* else previous instruction set top */
+ lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
+ if (luaD_precall(L, ra, LUA_MULTRET)) /* C function? */
+ base = ci->u.l.base;
+ else {
+ /* tail call: put called frame (n) in place of caller one (o) */
+ CallInfo *nci = L->ci; /* called frame */
+ CallInfo *oci = nci->previous; /* caller frame */
+ StkId nfunc = nci->func; /* called function */
+ StkId ofunc = oci->func; /* caller function */
+ /* last stack slot filled by 'precall' */
+ StkId lim = nci->u.l.base + getproto(nfunc)->numparams;
+ int aux;
+ /* close all upvalues from previous call */
+ if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base);
+ /* move new frame into old one */
+ for (aux = 0; nfunc + aux < lim; aux++)
+ setobjs2s(L, ofunc + aux, nfunc + aux);
+ oci->u.l.base = ofunc + (nci->u.l.base - nfunc); /* correct base */
+ oci->top = L->top = ofunc + (L->top - nfunc); /* correct top */
+ oci->u.l.savedpc = nci->u.l.savedpc;
+ oci->callstatus |= CIST_TAIL; /* function was tail called */
+ ci = L->ci = oci; /* remove new frame */
+ lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
+ goto newframe; /* restart luaV_execute over new Lua function */
+ }
+ )
+ vmcasenb(OP_RETURN,
+ int b = GETARG_B(i);
+ if (b != 0) L->top = ra+b-1;
+ if (cl->p->sizep > 0) luaF_close(L, base);
+ b = luaD_poscall(L, ra);
+ if (!(ci->callstatus & CIST_REENTRY)) /* 'ci' still the called one */
+ return; /* external invocation: return */
+ else { /* invocation via reentry: continue execution */
+ ci = L->ci;
+ if (b) L->top = ci->top;
+ lua_assert(isLua(ci));
+ lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
+ goto newframe; /* restart luaV_execute over new Lua function */
+ }
+ )
+ vmcase(OP_FORLOOP,
+ lua_Number step = nvalue(ra+2);
+ lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */
+ lua_Number limit = nvalue(ra+1);
+ if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit)
+ : luai_numle(L, limit, idx)) {
+ ci->u.l.savedpc += GETARG_sBx(i); /* jump back */
+ setnvalue(ra, idx); /* update internal index... */
+ setnvalue(ra+3, idx); /* ...and external index */
+ }
+ )
+ vmcase(OP_FORPREP,
+ const TValue *init = ra;
+ const TValue *plimit = ra+1;
+ const TValue *pstep = ra+2;
+ if (!tonumber(init, ra))
+ luaG_runerror(L, LUA_QL("for") " initial value must be a number");
+ else if (!tonumber(plimit, ra+1))
+ luaG_runerror(L, LUA_QL("for") " limit must be a number");
+ else if (!tonumber(pstep, ra+2))
+ luaG_runerror(L, LUA_QL("for") " step must be a number");
+ setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep)));
+ ci->u.l.savedpc += GETARG_sBx(i);
+ )
+ vmcasenb(OP_TFORCALL,
+ StkId cb = ra + 3; /* call base */
+ setobjs2s(L, cb+2, ra+2);
+ setobjs2s(L, cb+1, ra+1);
+ setobjs2s(L, cb, ra);
+ L->top = cb + 3; /* func. + 2 args (state and index) */
+ Protect(luaD_call(L, cb, GETARG_C(i), 1));
+ L->top = ci->top;
+ i = *(ci->u.l.savedpc++); /* go to next instruction */
+ ra = RA(i);
+ lua_assert(GET_OPCODE(i) == OP_TFORLOOP);
+ goto l_tforloop;
+ )
+ vmcase(OP_TFORLOOP,
+ l_tforloop:
+ if (!ttisnil(ra + 1)) { /* continue loop? */
+ setobjs2s(L, ra, ra + 1); /* save control variable */
+ ci->u.l.savedpc += GETARG_sBx(i); /* jump back */
+ }
+ )
+ vmcase(OP_SETLIST,
+ int n = GETARG_B(i);
+ int c = GETARG_C(i);
+ int last;
+ Table *h;
+ if (n == 0) n = cast_int(L->top - ra) - 1;
+ if (c == 0) {
+ lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
+ c = GETARG_Ax(*ci->u.l.savedpc++);
+ }
+ luai_runtimecheck(L, ttistable(ra));
+ h = hvalue(ra);
+ last = ((c-1)*LFIELDS_PER_FLUSH) + n;
+ if (last > h->sizearray) /* needs more space? */
+ luaH_resizearray(L, h, last); /* pre-allocate it at once */
+ for (; n > 0; n--) {
+ TValue *val = ra+n;
+ luaH_setint(L, h, last--, val);
+ luaC_barrierback(L, obj2gco(h), val);
+ }
+ L->top = ci->top; /* correct top (in case of previous open call) */
+ )
+ vmcase(OP_CLOSURE,
+ Proto *p = cl->p->p[GETARG_Bx(i)];
+ Closure *ncl = getcached(p, cl->upvals, base); /* cached closure */
+ if (ncl == NULL) /* no match? */
+ pushclosure(L, p, cl->upvals, base, ra); /* create a new one */
+ else
+ setclLvalue(L, ra, ncl); /* push cashed closure */
+ checkGC(L, ra + 1);
+ )
+ vmcase(OP_VARARG,
+ int b = GETARG_B(i) - 1;
+ int j;
+ int n = cast_int(base - ci->func) - cl->p->numparams - 1;
+ if (b < 0) { /* B == 0? */
+ b = n; /* get all var. arguments */
+ Protect(luaD_checkstack(L, n));
+ ra = RA(i); /* previous call may change the stack */
+ L->top = ra + n;
+ }
+ for (j = 0; j < b; j++) {
+ if (j < n) {
+ setobjs2s(L, ra + j, base - n + j);
+ }
+ else {
+ setnilvalue(ra + j);
+ }
+ }
+ )
+ vmcase(OP_EXTRAARG,
+ lua_assert(0);
+ )
+ }
+ }
}
-
diff --git a/src/lib/lua/lzio.c b/src/lib/lua/lzio.c
index 20efea98300..0cd44717a47 100644
--- a/src/lib/lua/lzio.c
+++ b/src/lib/lua/lzio.c
@@ -19,58 +19,56 @@
int luaZ_fill (ZIO *z) {
- size_t size;
- lua_State *L = z->L;
- const char *buff;
- lua_unlock(L);
- buff = z->reader(L, z->data, &size);
- lua_lock(L);
- if (buff == NULL || size == 0)
- return EOZ;
- z->n = size - 1; /* discount char being returned */
- z->p = buff;
- return cast_uchar(*(z->p++));
+ size_t size;
+ lua_State *L = z->L;
+ const char *buff;
+ lua_unlock(L);
+ buff = z->reader(L, z->data, &size);
+ lua_lock(L);
+ if (buff == NULL || size == 0)
+ return EOZ;
+ z->n = size - 1; /* discount char being returned */
+ z->p = buff;
+ return cast_uchar(*(z->p++));
}
void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
- z->L = L;
- z->reader = reader;
- z->data = data;
- z->n = 0;
- z->p = NULL;
+ z->L = L;
+ z->reader = reader;
+ z->data = data;
+ z->n = 0;
+ z->p = NULL;
}
/* --------------------------------------------------------------- read --- */
size_t luaZ_read (ZIO *z, void *b, size_t n) {
- while (n) {
- size_t m;
- if (z->n == 0) { /* no bytes in buffer? */
- if (luaZ_fill(z) == EOZ) /* try to read more */
- return n; /* no more input; return number of missing bytes */
- else {
- z->n++; /* luaZ_fill consumed first byte; put it back */
- z->p--;
- }
- }
- m = (n <= z->n) ? n : z->n; /* min. between n and z->n */
- memcpy(b, z->p, m);
- z->n -= m;
- z->p += m;
- b = (char *)b + m;
- n -= m;
- }
- return 0;
+ while (n) {
+ size_t m;
+ if (z->n == 0) { /* no bytes in buffer? */
+ if (luaZ_fill(z) == EOZ) /* try to read more */
+ return n; /* no more input; return number of missing bytes */
+ else {
+ z->n++; /* luaZ_fill consumed first byte; put it back */
+ z->p--;
+ }
+ }
+ m = (n <= z->n) ? n : z->n; /* min. between n and z->n */
+ memcpy(b, z->p, m);
+ z->n -= m;
+ z->p += m;
+ b = (char *)b + m;
+ n -= m;
+ }
+ return 0;
}
/* ------------------------------------------------------------------------ */
char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n) {
- if (n > buff->buffsize) {
- if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
- luaZ_resizebuffer(L, buff, n);
- }
- return buff->buffer;
+ if (n > buff->buffsize) {
+ if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
+ luaZ_resizebuffer(L, buff, n);
+ }
+ return buff->buffer;
}
-
-
diff --git a/src/lib/sqlite3/shell.c b/src/lib/sqlite3/shell.c
index 296dd22873f..3004c467123 100644
--- a/src/lib/sqlite3/shell.c
+++ b/src/lib/sqlite3/shell.c
@@ -102,21 +102,21 @@ static int enableTimer = 0;
/* Return the current wall-clock time */
static sqlite3_int64 timeOfDay(void){
- static sqlite3_vfs *clockVfs = 0;
- sqlite3_int64 t;
- if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
- if( clockVfs->iVersion>=1 && clockVfs->xCurrentTimeInt64!=0 ){
- clockVfs->xCurrentTimeInt64(clockVfs, &t);
- }else{
- double r;
- clockVfs->xCurrentTime(clockVfs, &r);
- t = (sqlite3_int64)(r*86400000.0);
- }
- return t;
+ static sqlite3_vfs *clockVfs = 0;
+ sqlite3_int64 t;
+ if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
+ if( clockVfs->iVersion>=1 && clockVfs->xCurrentTimeInt64!=0 ){
+ clockVfs->xCurrentTimeInt64(clockVfs, &t);
+ }else{
+ double r;
+ clockVfs->xCurrentTime(clockVfs, &r);
+ t = (sqlite3_int64)(r*86400000.0);
+ }
+ return t;
}
#if !defined(_WIN32) && !defined(WIN32) && !defined(_WRS_KERNEL) \
- && !defined(__minux)
+ && !defined(__minux)
#include <sys/time.h>
#include <sys/resource.h>
@@ -128,31 +128,31 @@ static sqlite3_int64 iBegin; /* Wall-clock time at start */
** Begin timing an operation
*/
static void beginTimer(void){
- if( enableTimer ){
- getrusage(RUSAGE_SELF, &sBegin);
- iBegin = timeOfDay();
- }
+ if( enableTimer ){
+ getrusage(RUSAGE_SELF, &sBegin);
+ iBegin = timeOfDay();
+ }
}
/* Return the difference of two time_structs in seconds */
static double timeDiff(struct timeval *pStart, struct timeval *pEnd){
- return (pEnd->tv_usec - pStart->tv_usec)*0.000001 +
- (double)(pEnd->tv_sec - pStart->tv_sec);
+ return (pEnd->tv_usec - pStart->tv_usec)*0.000001 +
+ (double)(pEnd->tv_sec - pStart->tv_sec);
}
/*
** Print the timing results.
*/
static void endTimer(void){
- if( enableTimer ){
- struct rusage sEnd;
- sqlite3_int64 iEnd = timeOfDay();
- getrusage(RUSAGE_SELF, &sEnd);
- printf("Run Time: real %.3f user %f sys %f\n",
- (iEnd - iBegin)*0.001,
- timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
- timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
- }
+ if( enableTimer ){
+ struct rusage sEnd;
+ sqlite3_int64 iEnd = timeOfDay();
+ getrusage(RUSAGE_SELF, &sEnd);
+ printf("Run Time: real %.3f user %f sys %f\n",
+ (iEnd - iBegin)*0.001,
+ timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
+ timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
+ }
}
#define BEGIN_TIMER beginTimer()
@@ -176,59 +176,59 @@ static GETPROCTIMES getProcessTimesAddr = NULL;
** support found (or found previously).
*/
static int hasTimer(void){
- if( getProcessTimesAddr ){
- return 1;
- } else {
- /* GetProcessTimes() isn't supported in WIN95 and some other Windows versions.
- ** See if the version we are running on has it, and if it does, save off
- ** a pointer to it and the current process handle.
- */
- hProcess = GetCurrentProcess();
- if( hProcess ){
- HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll"));
- if( NULL != hinstLib ){
- getProcessTimesAddr = (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes");
- if( NULL != getProcessTimesAddr ){
- return 1;
- }
- FreeLibrary(hinstLib);
- }
- }
- }
- return 0;
+ if( getProcessTimesAddr ){
+ return 1;
+ } else {
+ /* GetProcessTimes() isn't supported in WIN95 and some other Windows versions.
+ ** See if the version we are running on has it, and if it does, save off
+ ** a pointer to it and the current process handle.
+ */
+ hProcess = GetCurrentProcess();
+ if( hProcess ){
+ HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll"));
+ if( NULL != hinstLib ){
+ getProcessTimesAddr = (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes");
+ if( NULL != getProcessTimesAddr ){
+ return 1;
+ }
+ FreeLibrary(hinstLib);
+ }
+ }
+ }
+ return 0;
}
/*
** Begin timing an operation
*/
static void beginTimer(void){
- if( enableTimer && getProcessTimesAddr ){
- FILETIME ftCreation, ftExit;
- getProcessTimesAddr(hProcess, &ftCreation, &ftExit, &ftKernelBegin, &ftUserBegin);
- ftWallBegin = timeOfDay();
- }
+ if( enableTimer && getProcessTimesAddr ){
+ FILETIME ftCreation, ftExit;
+ getProcessTimesAddr(hProcess, &ftCreation, &ftExit, &ftKernelBegin, &ftUserBegin);
+ ftWallBegin = timeOfDay();
+ }
}
/* Return the difference of two FILETIME structs in seconds */
static double timeDiff(FILETIME *pStart, FILETIME *pEnd){
- sqlite_int64 i64Start = *((sqlite_int64 *) pStart);
- sqlite_int64 i64End = *((sqlite_int64 *) pEnd);
- return (double) ((i64End - i64Start) / 10000000.0);
+ sqlite_int64 i64Start = *((sqlite_int64 *) pStart);
+ sqlite_int64 i64End = *((sqlite_int64 *) pEnd);
+ return (double) ((i64End - i64Start) / 10000000.0);
}
/*
** Print the timing results.
*/
static void endTimer(void){
- if( enableTimer && getProcessTimesAddr){
- FILETIME ftCreation, ftExit, ftKernelEnd, ftUserEnd;
- sqlite3_int64 ftWallEnd = timeOfDay();
- getProcessTimesAddr(hProcess, &ftCreation, &ftExit, &ftKernelEnd, &ftUserEnd);
- printf("Run Time: real %.3f user %f sys %f\n",
- (ftWallEnd - ftWallBegin)*0.001,
- timeDiff(&ftUserBegin, &ftUserEnd),
- timeDiff(&ftKernelBegin, &ftKernelEnd));
- }
+ if( enableTimer && getProcessTimesAddr){
+ FILETIME ftCreation, ftExit, ftKernelEnd, ftUserEnd;
+ sqlite3_int64 ftWallEnd = timeOfDay();
+ getProcessTimesAddr(hProcess, &ftCreation, &ftExit, &ftKernelEnd, &ftUserEnd);
+ printf("Run Time: real %.3f user %f sys %f\n",
+ (ftWallEnd - ftWallBegin)*0.001,
+ timeDiff(&ftUserBegin, &ftUserEnd),
+ timeDiff(&ftKernelBegin, &ftKernelEnd));
+ }
}
#define BEGIN_TIMER beginTimer()
@@ -236,7 +236,7 @@ static void endTimer(void){
#define HAS_TIMER hasTimer()
#else
-#define BEGIN_TIMER
+#define BEGIN_TIMER
#define END_TIMER
#define HAS_TIMER 0
#endif
@@ -298,14 +298,14 @@ static FILE *iotrace = 0;
*/
#ifdef SQLITE_ENABLE_IOTRACE
static void iotracePrintf(const char *zFormat, ...){
- va_list ap;
- char *z;
- if( iotrace==0 ) return;
- va_start(ap, zFormat);
- z = sqlite3_vmprintf(zFormat, ap);
- va_end(ap);
- fprintf(iotrace, "%s", z);
- sqlite3_free(z);
+ va_list ap;
+ char *z;
+ if( iotrace==0 ) return;
+ va_start(ap, zFormat);
+ z = sqlite3_vmprintf(zFormat, ap);
+ va_end(ap);
+ fprintf(iotrace, "%s", z);
+ sqlite3_free(z);
}
#endif
@@ -314,32 +314,32 @@ static void iotracePrintf(const char *zFormat, ...){
** Determines if a string is a number of not.
*/
static int isNumber(const char *z, int *realnum){
- if( *z=='-' || *z=='+' ) z++;
- if( !IsDigit(*z) ){
- return 0;
- }
- z++;
- if( realnum ) *realnum = 0;
- while( IsDigit(*z) ){ z++; }
- if( *z=='.' ){
- z++;
- if( !IsDigit(*z) ) return 0;
- while( IsDigit(*z) ){ z++; }
- if( realnum ) *realnum = 1;
- }
- if( *z=='e' || *z=='E' ){
- z++;
- if( *z=='+' || *z=='-' ) z++;
- if( !IsDigit(*z) ) return 0;
- while( IsDigit(*z) ){ z++; }
- if( realnum ) *realnum = 1;
- }
- return *z==0;
+ if( *z=='-' || *z=='+' ) z++;
+ if( !IsDigit(*z) ){
+ return 0;
+ }
+ z++;
+ if( realnum ) *realnum = 0;
+ while( IsDigit(*z) ){ z++; }
+ if( *z=='.' ){
+ z++;
+ if( !IsDigit(*z) ) return 0;
+ while( IsDigit(*z) ){ z++; }
+ if( realnum ) *realnum = 1;
+ }
+ if( *z=='e' || *z=='E' ){
+ z++;
+ if( *z=='+' || *z=='-' ) z++;
+ if( !IsDigit(*z) ) return 0;
+ while( IsDigit(*z) ){ z++; }
+ if( realnum ) *realnum = 1;
+ }
+ return *z==0;
}
/*
-** A global char* and an SQL function to access its current value
-** from within an SQL statement. This program used to use the
+** A global char* and an SQL function to access its current value
+** from within an SQL statement. This program used to use the
** sqlite_exec_printf() API to substitue a string into an SQL statement.
** The correct way to do this with sqlite3 is to use the bind API, but
** since the shell is built around the callback paradigm it would be a lot
@@ -347,15 +347,15 @@ static int isNumber(const char *z, int *realnum){
*/
static const char *zShellStatic = 0;
static void shellstaticFunc(
- sqlite3_context *context,
- int argc,
- sqlite3_value **argv
+ sqlite3_context *context,
+ int argc,
+ sqlite3_value **argv
){
- assert( 0==argc );
- assert( zShellStatic );
- UNUSED_PARAMETER(argc);
- UNUSED_PARAMETER(argv);
- sqlite3_result_text(context, zShellStatic, -1, SQLITE_STATIC);
+ assert( 0==argc );
+ assert( zShellStatic );
+ UNUSED_PARAMETER(argc);
+ UNUSED_PARAMETER(argv);
+ sqlite3_result_text(context, zShellStatic, -1, SQLITE_STATIC);
}
@@ -369,32 +369,32 @@ static void shellstaticFunc(
** a previous call to this routine that may be reused.
*/
static char *local_getline(char *zLine, FILE *in){
- int nLine = zLine==0 ? 0 : 100;
- int n = 0;
-
- while( 1 ){
- if( n+100>nLine ){
- nLine = nLine*2 + 100;
- zLine = (char*)realloc(zLine, nLine);
- if( zLine==0 ) return 0;
- }
- if( fgets(&zLine[n], nLine - n, in)==0 ){
- if( n==0 ){
- free(zLine);
- return 0;
- }
- zLine[n] = 0;
- break;
- }
- while( zLine[n] ) n++;
- if( n>0 && zLine[n-1]=='\n' ){
- n--;
- if( n>0 && zLine[n-1]=='\r' ) n--;
- zLine[n] = 0;
- break;
- }
- }
- return zLine;
+ int nLine = zLine==0 ? 0 : 100;
+ int n = 0;
+
+ while( 1 ){
+ if( n+100>nLine ){
+ nLine = nLine*2 + 100;
+ zLine = (char*)realloc(zLine, nLine);
+ if( zLine==0 ) return 0;
+ }
+ if( fgets(&zLine[n], nLine - n, in)==0 ){
+ if( n==0 ){
+ free(zLine);
+ return 0;
+ }
+ zLine[n] = 0;
+ break;
+ }
+ while( zLine[n] ) n++;
+ if( n>0 && zLine[n-1]=='\n' ){
+ n--;
+ if( n>0 && zLine[n-1]=='\r' ) n--;
+ zLine[n] = 0;
+ break;
+ }
+ }
+ return zLine;
}
/*
@@ -412,30 +412,30 @@ static char *local_getline(char *zLine, FILE *in){
** zPrior argument for reuse.
*/
static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
- char *zPrompt;
- char *zResult;
- if( in!=0 ){
- zResult = local_getline(zPrior, in);
- }else{
- zPrompt = isContinuation ? continuePrompt : mainPrompt;
+ char *zPrompt;
+ char *zResult;
+ if( in!=0 ){
+ zResult = local_getline(zPrior, in);
+ }else{
+ zPrompt = isContinuation ? continuePrompt : mainPrompt;
#if defined(HAVE_READLINE)
- free(zPrior);
- zResult = readline(zPrompt);
- if( zResult && *zResult ) add_history(zResult);
+ free(zPrior);
+ zResult = readline(zPrompt);
+ if( zResult && *zResult ) add_history(zResult);
#else
- printf("%s", zPrompt);
- fflush(stdout);
- zResult = local_getline(zPrior, stdin);
+ printf("%s", zPrompt);
+ fflush(stdout);
+ zResult = local_getline(zPrior, stdin);
#endif
- }
- return zResult;
+ }
+ return zResult;
}
struct previous_mode_data {
- int valid; /* Is there legit data in here? */
- int mode;
- int showHeader;
- int colWidth[100];
+ int valid; /* Is there legit data in here? */
+ int mode;
+ int showHeader;
+ int colWidth[100];
};
/*
@@ -444,35 +444,35 @@ struct previous_mode_data {
** state and mode information.
*/
struct callback_data {
- sqlite3 *db; /* The database */
- int echoOn; /* True to echo input commands */
- int autoEQP; /* Run EXPLAIN QUERY PLAN prior to seach SQL statement */
- int statsOn; /* True to display memory stats before each finalize */
- int cnt; /* Number of records displayed so far */
- FILE *out; /* Write results here */
- FILE *traceOut; /* Output for sqlite3_trace() */
- int nErr; /* Number of errors seen */
- int mode; /* An output mode setting */
- int writableSchema; /* True if PRAGMA writable_schema=ON */
- int showHeader; /* True to show column names in List or Column mode */
- char *zDestTable; /* Name of destination table when MODE_Insert */
- char separator[20]; /* Separator character for MODE_List */
- int colWidth[100]; /* Requested width of each column when in column mode*/
- int actualWidth[100]; /* Actual width of each column */
- char nullvalue[20]; /* The text to print when a NULL comes back from
+ sqlite3 *db; /* The database */
+ int echoOn; /* True to echo input commands */
+ int autoEQP; /* Run EXPLAIN QUERY PLAN prior to seach SQL statement */
+ int statsOn; /* True to display memory stats before each finalize */
+ int cnt; /* Number of records displayed so far */
+ FILE *out; /* Write results here */
+ FILE *traceOut; /* Output for sqlite3_trace() */
+ int nErr; /* Number of errors seen */
+ int mode; /* An output mode setting */
+ int writableSchema; /* True if PRAGMA writable_schema=ON */
+ int showHeader; /* True to show column names in List or Column mode */
+ char *zDestTable; /* Name of destination table when MODE_Insert */
+ char separator[20]; /* Separator character for MODE_List */
+ int colWidth[100]; /* Requested width of each column when in column mode*/
+ int actualWidth[100]; /* Actual width of each column */
+ char nullvalue[20]; /* The text to print when a NULL comes back from
** the database */
- struct previous_mode_data explainPrev;
- /* Holds the mode information just before
- ** .explain ON */
- char outfile[FILENAME_MAX]; /* Filename for *out */
- const char *zDbFilename; /* name of the database file */
- char *zFreeOnClose; /* Filename to free when closing */
- const char *zVfs; /* Name of VFS to use */
- sqlite3_stmt *pStmt; /* Current statement if any. */
- FILE *pLog; /* Write log output here */
- int *aiIndent; /* Array of indents used in MODE_Explain */
- int nIndent; /* Size of array aiIndent[] */
- int iIndent; /* Index of current op in aiIndent[] */
+ struct previous_mode_data explainPrev;
+ /* Holds the mode information just before
+ ** .explain ON */
+ char outfile[FILENAME_MAX]; /* Filename for *out */
+ const char *zDbFilename; /* name of the database file */
+ char *zFreeOnClose; /* Filename to free when closing */
+ const char *zVfs; /* Name of VFS to use */
+ sqlite3_stmt *pStmt; /* Current statement if any. */
+ FILE *pLog; /* Write log output here */
+ int *aiIndent; /* Array of indents used in MODE_Explain */
+ int nIndent; /* Size of array aiIndent[] */
+ int iIndent; /* Index of current op in aiIndent[] */
};
/*
@@ -489,15 +489,15 @@ struct callback_data {
#define MODE_Explain 8 /* Like MODE_Column, but do not truncate data */
static const char *modeDescr[] = {
- "line",
- "column",
- "list",
- "semi",
- "html",
- "insert",
- "tcl",
- "csv",
- "explain",
+ "line",
+ "column",
+ "list",
+ "semi",
+ "html",
+ "insert",
+ "tcl",
+ "csv",
+ "explain",
};
/*
@@ -510,91 +510,91 @@ static const char *modeDescr[] = {
** lower 30 bits of a 32-bit signed integer.
*/
static int strlen30(const char *z){
- const char *z2 = z;
- while( *z2 ){ z2++; }
- return 0x3fffffff & (int)(z2 - z);
+ const char *z2 = z;
+ while( *z2 ){ z2++; }
+ return 0x3fffffff & (int)(z2 - z);
}
/*
** A callback for the sqlite3_log() interface.
*/
static void shellLog(void *pArg, int iErrCode, const char *zMsg){
- struct callback_data *p = (struct callback_data*)pArg;
- if( p->pLog==0 ) return;
- fprintf(p->pLog, "(%d) %s\n", iErrCode, zMsg);
- fflush(p->pLog);
+ struct callback_data *p = (struct callback_data*)pArg;
+ if( p->pLog==0 ) return;
+ fprintf(p->pLog, "(%d) %s\n", iErrCode, zMsg);
+ fflush(p->pLog);
}
/*
** Output the given string as a hex-encoded blob (eg. X'1234' )
*/
static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){
- int i;
- char *zBlob = (char *)pBlob;
- fprintf(out,"X'");
- for(i=0; i<nBlob; i++){ fprintf(out,"%02x",zBlob[i]&0xff); }
- fprintf(out,"'");
+ int i;
+ char *zBlob = (char *)pBlob;
+ fprintf(out,"X'");
+ for(i=0; i<nBlob; i++){ fprintf(out,"%02x",zBlob[i]&0xff); }
+ fprintf(out,"'");
}
/*
** Output the given string as a quoted string using SQL quoting conventions.
*/
static void output_quoted_string(FILE *out, const char *z){
- int i;
- int nSingle = 0;
- for(i=0; z[i]; i++){
- if( z[i]=='\'' ) nSingle++;
- }
- if( nSingle==0 ){
- fprintf(out,"'%s'",z);
- }else{
- fprintf(out,"'");
- while( *z ){
- for(i=0; z[i] && z[i]!='\''; i++){}
- if( i==0 ){
- fprintf(out,"''");
- z++;
- }else if( z[i]=='\'' ){
- fprintf(out,"%.*s''",i,z);
- z += i+1;
- }else{
- fprintf(out,"%s",z);
- break;
- }
- }
- fprintf(out,"'");
- }
+ int i;
+ int nSingle = 0;
+ for(i=0; z[i]; i++){
+ if( z[i]=='\'' ) nSingle++;
+ }
+ if( nSingle==0 ){
+ fprintf(out,"'%s'",z);
+ }else{
+ fprintf(out,"'");
+ while( *z ){
+ for(i=0; z[i] && z[i]!='\''; i++){}
+ if( i==0 ){
+ fprintf(out,"''");
+ z++;
+ }else if( z[i]=='\'' ){
+ fprintf(out,"%.*s''",i,z);
+ z += i+1;
+ }else{
+ fprintf(out,"%s",z);
+ break;
+ }
+ }
+ fprintf(out,"'");
+ }
}
/*
** Output the given string as a quoted according to C or TCL quoting rules.
*/
static void output_c_string(FILE *out, const char *z){
- unsigned int c;
- fputc('"', out);
- while( (c = *(z++))!=0 ){
- if( c=='\\' ){
- fputc(c, out);
- fputc(c, out);
- }else if( c=='"' ){
- fputc('\\', out);
- fputc('"', out);
- }else if( c=='\t' ){
- fputc('\\', out);
- fputc('t', out);
- }else if( c=='\n' ){
- fputc('\\', out);
- fputc('n', out);
- }else if( c=='\r' ){
- fputc('\\', out);
- fputc('r', out);
- }else if( !isprint(c&0xff) ){
- fprintf(out, "\\%03o", c&0xff);
- }else{
- fputc(c, out);
- }
- }
- fputc('"', out);
+ unsigned int c;
+ fputc('"', out);
+ while( (c = *(z++))!=0 ){
+ if( c=='\\' ){
+ fputc(c, out);
+ fputc(c, out);
+ }else if( c=='"' ){
+ fputc('\\', out);
+ fputc('"', out);
+ }else if( c=='\t' ){
+ fputc('\\', out);
+ fputc('t', out);
+ }else if( c=='\n' ){
+ fputc('\\', out);
+ fputc('n', out);
+ }else if( c=='\r' ){
+ fputc('\\', out);
+ fputc('r', out);
+ }else if( !isprint(c&0xff) ){
+ fprintf(out, "\\%03o", c&0xff);
+ }else{
+ fputc(c, out);
+ }
+ }
+ fputc('"', out);
}
/*
@@ -602,34 +602,34 @@ static void output_c_string(FILE *out, const char *z){
** HTML escaped.
*/
static void output_html_string(FILE *out, const char *z){
- int i;
- if( z==0 ) z = "";
- while( *z ){
- for(i=0; z[i]
- && z[i]!='<'
- && z[i]!='&'
- && z[i]!='>'
- && z[i]!='\"'
- && z[i]!='\'';
- i++){}
- if( i>0 ){
- fprintf(out,"%.*s",i,z);
- }
- if( z[i]=='<' ){
- fprintf(out,"&lt;");
- }else if( z[i]=='&' ){
- fprintf(out,"&amp;");
- }else if( z[i]=='>' ){
- fprintf(out,"&gt;");
- }else if( z[i]=='\"' ){
- fprintf(out,"&quot;");
- }else if( z[i]=='\'' ){
- fprintf(out,"&#39;");
- }else{
- break;
- }
- z += i + 1;
- }
+ int i;
+ if( z==0 ) z = "";
+ while( *z ){
+ for(i=0; z[i]
+ && z[i]!='<'
+ && z[i]!='&'
+ && z[i]!='>'
+ && z[i]!='\"'
+ && z[i]!='\'';
+ i++){}
+ if( i>0 ){
+ fprintf(out,"%.*s",i,z);
+ }
+ if( z[i]=='<' ){
+ fprintf(out,"&lt;");
+ }else if( z[i]=='&' ){
+ fprintf(out,"&amp;");
+ }else if( z[i]=='>' ){
+ fprintf(out,"&gt;");
+ }else if( z[i]=='\"' ){
+ fprintf(out,"&quot;");
+ }else if( z[i]=='\'' ){
+ fprintf(out,"&#39;");
+ }else{
+ break;
+ }
+ z += i + 1;
+ }
}
/*
@@ -637,22 +637,22 @@ static void output_html_string(FILE *out, const char *z){
** array, then the string must be quoted for CSV.
*/
static const char needCsvQuote[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
};
/*
@@ -661,34 +661,34 @@ static const char needCsvQuote[] = {
** the null value. Strings are quoted if necessary.
*/
static void output_csv(struct callback_data *p, const char *z, int bSep){
- FILE *out = p->out;
- if( z==0 ){
- fprintf(out,"%s",p->nullvalue);
- }else{
- int i;
- int nSep = strlen30(p->separator);
- for(i=0; z[i]; i++){
- if( needCsvQuote[((unsigned char*)z)[i]]
- || (z[i]==p->separator[0] &&
- (nSep==1 || memcmp(z, p->separator, nSep)==0)) ){
- i = 0;
- break;
- }
- }
- if( i==0 ){
- putc('"', out);
- for(i=0; z[i]; i++){
- if( z[i]=='"' ) putc('"', out);
- putc(z[i], out);
- }
- putc('"', out);
- }else{
- fprintf(out, "%s", z);
- }
- }
- if( bSep ){
- fprintf(p->out, "%s", p->separator);
- }
+ FILE *out = p->out;
+ if( z==0 ){
+ fprintf(out,"%s",p->nullvalue);
+ }else{
+ int i;
+ int nSep = strlen30(p->separator);
+ for(i=0; z[i]; i++){
+ if( needCsvQuote[((unsigned char*)z)[i]]
+ || (z[i]==p->separator[0] &&
+ (nSep==1 || memcmp(z, p->separator, nSep)==0)) ){
+ i = 0;
+ break;
+ }
+ }
+ if( i==0 ){
+ putc('"', out);
+ for(i=0; z[i]; i++){
+ if( z[i]=='"' ) putc('"', out);
+ putc(z[i], out);
+ }
+ putc('"', out);
+ }else{
+ fprintf(out, "%s", z);
+ }
+ }
+ if( bSep ){
+ fprintf(p->out, "%s", p->separator);
+ }
}
#ifdef SIGINT
@@ -696,9 +696,9 @@ static void output_csv(struct callback_data *p, const char *z, int bSep){
** This routine runs when the user presses Ctrl-C
*/
static void interrupt_handler(int NotUsed){
- UNUSED_PARAMETER(NotUsed);
- seenInterrupt = 1;
- if( db ) sqlite3_interrupt(db);
+ UNUSED_PARAMETER(NotUsed);
+ seenInterrupt = 1;
+ if( db ) sqlite3_interrupt(db);
}
#endif
@@ -707,195 +707,195 @@ static void interrupt_handler(int NotUsed){
** invokes for each row of a query result.
*/
static int shell_callback(void *pArg, int nArg, char **azArg, char **azCol, int *aiType){
- int i;
- struct callback_data *p = (struct callback_data*)pArg;
-
- switch( p->mode ){
- case MODE_Line: {
- int w = 5;
- if( azArg==0 ) break;
- for(i=0; i<nArg; i++){
- int len = strlen30(azCol[i] ? azCol[i] : "");
- if( len>w ) w = len;
- }
- if( p->cnt++>0 ) fprintf(p->out,"\n");
- for(i=0; i<nArg; i++){
- fprintf(p->out,"%*s = %s\n", w, azCol[i],
- azArg[i] ? azArg[i] : p->nullvalue);
- }
- break;
- }
- case MODE_Explain:
- case MODE_Column: {
- if( p->cnt++==0 ){
- for(i=0; i<nArg; i++){
- int w, n;
- if( i<ArraySize(p->colWidth) ){
- w = p->colWidth[i];
- }else{
- w = 0;
- }
- if( w==0 ){
- w = strlen30(azCol[i] ? azCol[i] : "");
- if( w<10 ) w = 10;
- n = strlen30(azArg && azArg[i] ? azArg[i] : p->nullvalue);
- if( w<n ) w = n;
- }
- if( i<ArraySize(p->actualWidth) ){
- p->actualWidth[i] = w;
- }
- if( p->showHeader ){
- if( w<0 ){
- fprintf(p->out,"%*.*s%s",-w,-w,azCol[i], i==nArg-1 ? "\n": " ");
- }else{
- fprintf(p->out,"%-*.*s%s",w,w,azCol[i], i==nArg-1 ? "\n": " ");
- }
- }
- }
- if( p->showHeader ){
- for(i=0; i<nArg; i++){
- int w;
- if( i<ArraySize(p->actualWidth) ){
- w = p->actualWidth[i];
- if( w<0 ) w = -w;
- }else{
- w = 10;
- }
- fprintf(p->out,"%-*.*s%s",w,w,"-----------------------------------"
- "----------------------------------------------------------",
- i==nArg-1 ? "\n": " ");
- }
- }
- }
- if( azArg==0 ) break;
- for(i=0; i<nArg; i++){
- int w;
- if( i<ArraySize(p->actualWidth) ){
- w = p->actualWidth[i];
- }else{
- w = 10;
- }
- if( p->mode==MODE_Explain && azArg[i] && strlen30(azArg[i])>w ){
- w = strlen30(azArg[i]);
- }
- if( i==1 && p->aiIndent && p->pStmt ){
- if( p->iIndent<p->nIndent ){
- fprintf(p->out, "%*.s", p->aiIndent[p->iIndent], "");
- }
- p->iIndent++;
- }
- if( w<0 ){
- fprintf(p->out,"%*.*s%s",-w,-w,
- azArg[i] ? azArg[i] : p->nullvalue, i==nArg-1 ? "\n": " ");
- }else{
- fprintf(p->out,"%-*.*s%s",w,w,
- azArg[i] ? azArg[i] : p->nullvalue, i==nArg-1 ? "\n": " ");
- }
- }
- break;
- }
- case MODE_Semi:
- case MODE_List: {
- if( p->cnt++==0 && p->showHeader ){
- for(i=0; i<nArg; i++){
- fprintf(p->out,"%s%s",azCol[i], i==nArg-1 ? "\n" : p->separator);
- }
- }
- if( azArg==0 ) break;
- for(i=0; i<nArg; i++){
- char *z = azArg[i];
- if( z==0 ) z = p->nullvalue;
- fprintf(p->out, "%s", z);
- if( i<nArg-1 ){
- fprintf(p->out, "%s", p->separator);
- }else if( p->mode==MODE_Semi ){
- fprintf(p->out, ";\n");
- }else{
- fprintf(p->out, "\n");
- }
- }
- break;
- }
- case MODE_Html: {
- if( p->cnt++==0 && p->showHeader ){
- fprintf(p->out,"<TR>");
- for(i=0; i<nArg; i++){
- fprintf(p->out,"<TH>");
- output_html_string(p->out, azCol[i]);
- fprintf(p->out,"</TH>\n");
- }
- fprintf(p->out,"</TR>\n");
- }
- if( azArg==0 ) break;
- fprintf(p->out,"<TR>");
- for(i=0; i<nArg; i++){
- fprintf(p->out,"<TD>");
- output_html_string(p->out, azArg[i] ? azArg[i] : p->nullvalue);
- fprintf(p->out,"</TD>\n");
- }
- fprintf(p->out,"</TR>\n");
- break;
- }
- case MODE_Tcl: {
- if( p->cnt++==0 && p->showHeader ){
- for(i=0; i<nArg; i++){
- output_c_string(p->out,azCol[i] ? azCol[i] : "");
- if(i<nArg-1) fprintf(p->out, "%s", p->separator);
- }
- fprintf(p->out,"\n");
- }
- if( azArg==0 ) break;
- for(i=0; i<nArg; i++){
- output_c_string(p->out, azArg[i] ? azArg[i] : p->nullvalue);
- if(i<nArg-1) fprintf(p->out, "%s", p->separator);
- }
- fprintf(p->out,"\n");
- break;
- }
- case MODE_Csv: {
- if( p->cnt++==0 && p->showHeader ){
- for(i=0; i<nArg; i++){
- output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
- }
- fprintf(p->out,"\n");
- }
- if( azArg==0 ) break;
- for(i=0; i<nArg; i++){
- output_csv(p, azArg[i], i<nArg-1);
- }
- fprintf(p->out,"\n");
- break;
- }
- case MODE_Insert: {
- p->cnt++;
- if( azArg==0 ) break;
- fprintf(p->out,"INSERT INTO %s VALUES(",p->zDestTable);
- for(i=0; i<nArg; i++){
- const char *zSep = i>0 ? ",": "";
- if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
- fprintf(p->out,"%sNULL",zSep);
- }else if( aiType && aiType[i]==SQLITE_TEXT ){
- if( zSep[0] ) fprintf(p->out,"%s",zSep);
- output_quoted_string(p->out, azArg[i]);
- }else if( aiType && (aiType[i]==SQLITE_INTEGER || aiType[i]==SQLITE_FLOAT) ){
- fprintf(p->out,"%s%s",zSep, azArg[i]);
- }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
- const void *pBlob = sqlite3_column_blob(p->pStmt, i);
- int nBlob = sqlite3_column_bytes(p->pStmt, i);
- if( zSep[0] ) fprintf(p->out,"%s",zSep);
- output_hex_blob(p->out, pBlob, nBlob);
- }else if( isNumber(azArg[i], 0) ){
- fprintf(p->out,"%s%s",zSep, azArg[i]);
- }else{
- if( zSep[0] ) fprintf(p->out,"%s",zSep);
- output_quoted_string(p->out, azArg[i]);
- }
- }
- fprintf(p->out,");\n");
- break;
- }
- }
- return 0;
+ int i;
+ struct callback_data *p = (struct callback_data*)pArg;
+
+ switch( p->mode ){
+ case MODE_Line: {
+ int w = 5;
+ if( azArg==0 ) break;
+ for(i=0; i<nArg; i++){
+ int len = strlen30(azCol[i] ? azCol[i] : "");
+ if( len>w ) w = len;
+ }
+ if( p->cnt++>0 ) fprintf(p->out,"\n");
+ for(i=0; i<nArg; i++){
+ fprintf(p->out,"%*s = %s\n", w, azCol[i],
+ azArg[i] ? azArg[i] : p->nullvalue);
+ }
+ break;
+ }
+ case MODE_Explain:
+ case MODE_Column: {
+ if( p->cnt++==0 ){
+ for(i=0; i<nArg; i++){
+ int w, n;
+ if( i<ArraySize(p->colWidth) ){
+ w = p->colWidth[i];
+ }else{
+ w = 0;
+ }
+ if( w==0 ){
+ w = strlen30(azCol[i] ? azCol[i] : "");
+ if( w<10 ) w = 10;
+ n = strlen30(azArg && azArg[i] ? azArg[i] : p->nullvalue);
+ if( w<n ) w = n;
+ }
+ if( i<ArraySize(p->actualWidth) ){
+ p->actualWidth[i] = w;
+ }
+ if( p->showHeader ){
+ if( w<0 ){
+ fprintf(p->out,"%*.*s%s",-w,-w,azCol[i], i==nArg-1 ? "\n": " ");
+ }else{
+ fprintf(p->out,"%-*.*s%s",w,w,azCol[i], i==nArg-1 ? "\n": " ");
+ }
+ }
+ }
+ if( p->showHeader ){
+ for(i=0; i<nArg; i++){
+ int w;
+ if( i<ArraySize(p->actualWidth) ){
+ w = p->actualWidth[i];
+ if( w<0 ) w = -w;
+ }else{
+ w = 10;
+ }
+ fprintf(p->out,"%-*.*s%s",w,w,"-----------------------------------"
+ "----------------------------------------------------------",
+ i==nArg-1 ? "\n": " ");
+ }
+ }
+ }
+ if( azArg==0 ) break;
+ for(i=0; i<nArg; i++){
+ int w;
+ if( i<ArraySize(p->actualWidth) ){
+ w = p->actualWidth[i];
+ }else{
+ w = 10;
+ }
+ if( p->mode==MODE_Explain && azArg[i] && strlen30(azArg[i])>w ){
+ w = strlen30(azArg[i]);
+ }
+ if( i==1 && p->aiIndent && p->pStmt ){
+ if( p->iIndent<p->nIndent ){
+ fprintf(p->out, "%*.s", p->aiIndent[p->iIndent], "");
+ }
+ p->iIndent++;
+ }
+ if( w<0 ){
+ fprintf(p->out,"%*.*s%s",-w,-w,
+ azArg[i] ? azArg[i] : p->nullvalue, i==nArg-1 ? "\n": " ");
+ }else{
+ fprintf(p->out,"%-*.*s%s",w,w,
+ azArg[i] ? azArg[i] : p->nullvalue, i==nArg-1 ? "\n": " ");
+ }
+ }
+ break;
+ }
+ case MODE_Semi:
+ case MODE_List: {
+ if( p->cnt++==0 && p->showHeader ){
+ for(i=0; i<nArg; i++){
+ fprintf(p->out,"%s%s",azCol[i], i==nArg-1 ? "\n" : p->separator);
+ }
+ }
+ if( azArg==0 ) break;
+ for(i=0; i<nArg; i++){
+ char *z = azArg[i];
+ if( z==0 ) z = p->nullvalue;
+ fprintf(p->out, "%s", z);
+ if( i<nArg-1 ){
+ fprintf(p->out, "%s", p->separator);
+ }else if( p->mode==MODE_Semi ){
+ fprintf(p->out, ";\n");
+ }else{
+ fprintf(p->out, "\n");
+ }
+ }
+ break;
+ }
+ case MODE_Html: {
+ if( p->cnt++==0 && p->showHeader ){
+ fprintf(p->out,"<TR>");
+ for(i=0; i<nArg; i++){
+ fprintf(p->out,"<TH>");
+ output_html_string(p->out, azCol[i]);
+ fprintf(p->out,"</TH>\n");
+ }
+ fprintf(p->out,"</TR>\n");
+ }
+ if( azArg==0 ) break;
+ fprintf(p->out,"<TR>");
+ for(i=0; i<nArg; i++){
+ fprintf(p->out,"<TD>");
+ output_html_string(p->out, azArg[i] ? azArg[i] : p->nullvalue);
+ fprintf(p->out,"</TD>\n");
+ }
+ fprintf(p->out,"</TR>\n");
+ break;
+ }
+ case MODE_Tcl: {
+ if( p->cnt++==0 && p->showHeader ){
+ for(i=0; i<nArg; i++){
+ output_c_string(p->out,azCol[i] ? azCol[i] : "");
+ if(i<nArg-1) fprintf(p->out, "%s", p->separator);
+ }
+ fprintf(p->out,"\n");
+ }
+ if( azArg==0 ) break;
+ for(i=0; i<nArg; i++){
+ output_c_string(p->out, azArg[i] ? azArg[i] : p->nullvalue);
+ if(i<nArg-1) fprintf(p->out, "%s", p->separator);
+ }
+ fprintf(p->out,"\n");
+ break;
+ }
+ case MODE_Csv: {
+ if( p->cnt++==0 && p->showHeader ){
+ for(i=0; i<nArg; i++){
+ output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
+ }
+ fprintf(p->out,"\n");
+ }
+ if( azArg==0 ) break;
+ for(i=0; i<nArg; i++){
+ output_csv(p, azArg[i], i<nArg-1);
+ }
+ fprintf(p->out,"\n");
+ break;
+ }
+ case MODE_Insert: {
+ p->cnt++;
+ if( azArg==0 ) break;
+ fprintf(p->out,"INSERT INTO %s VALUES(",p->zDestTable);
+ for(i=0; i<nArg; i++){
+ const char *zSep = i>0 ? ",": "";
+ if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
+ fprintf(p->out,"%sNULL",zSep);
+ }else if( aiType && aiType[i]==SQLITE_TEXT ){
+ if( zSep[0] ) fprintf(p->out,"%s",zSep);
+ output_quoted_string(p->out, azArg[i]);
+ }else if( aiType && (aiType[i]==SQLITE_INTEGER || aiType[i]==SQLITE_FLOAT) ){
+ fprintf(p->out,"%s%s",zSep, azArg[i]);
+ }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
+ const void *pBlob = sqlite3_column_blob(p->pStmt, i);
+ int nBlob = sqlite3_column_bytes(p->pStmt, i);
+ if( zSep[0] ) fprintf(p->out,"%s",zSep);
+ output_hex_blob(p->out, pBlob, nBlob);
+ }else if( isNumber(azArg[i], 0) ){
+ fprintf(p->out,"%s%s",zSep, azArg[i]);
+ }else{
+ if( zSep[0] ) fprintf(p->out,"%s",zSep);
+ output_quoted_string(p->out, azArg[i]);
+ }
+ }
+ fprintf(p->out,");\n");
+ break;
+ }
+ }
+ return 0;
}
/*
@@ -903,8 +903,8 @@ static int shell_callback(void *pArg, int nArg, char **azArg, char **azCol, int
** invokes for each row of a query result.
*/
static int callback(void *pArg, int nArg, char **azArg, char **azCol){
- /* since we don't have type info, call the shell_callback with a NULL value */
- return shell_callback(pArg, nArg, azArg, azCol, NULL);
+ /* since we don't have type info, call the shell_callback with a NULL value */
+ return shell_callback(pArg, nArg, azArg, azCol, NULL);
}
/*
@@ -913,36 +913,36 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
** table name.
*/
static void set_table_name(struct callback_data *p, const char *zName){
- int i, n;
- int needQuote;
- char *z;
-
- if( p->zDestTable ){
- free(p->zDestTable);
- p->zDestTable = 0;
- }
- if( zName==0 ) return;
- needQuote = !isalpha((unsigned char)*zName) && *zName!='_';
- for(i=n=0; zName[i]; i++, n++){
- if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ){
- needQuote = 1;
- if( zName[i]=='\'' ) n++;
- }
- }
- if( needQuote ) n += 2;
- z = p->zDestTable = (char*)malloc( n+1 );
- if( z==0 ){
- fprintf(stderr,"Error: out of memory\n");
- exit(1);
- }
- n = 0;
- if( needQuote ) z[n++] = '\'';
- for(i=0; zName[i]; i++){
- z[n++] = zName[i];
- if( zName[i]=='\'' ) z[n++] = '\'';
- }
- if( needQuote ) z[n++] = '\'';
- z[n] = 0;
+ int i, n;
+ int needQuote;
+ char *z;
+
+ if( p->zDestTable ){
+ free(p->zDestTable);
+ p->zDestTable = 0;
+ }
+ if( zName==0 ) return;
+ needQuote = !isalpha((unsigned char)*zName) && *zName!='_';
+ for(i=n=0; zName[i]; i++, n++){
+ if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ){
+ needQuote = 1;
+ if( zName[i]=='\'' ) n++;
+ }
+ }
+ if( needQuote ) n += 2;
+ z = p->zDestTable = (char*)malloc( n+1 );
+ if( z==0 ){
+ fprintf(stderr,"Error: out of memory\n");
+ exit(1);
+ }
+ n = 0;
+ if( needQuote ) z[n++] = '\'';
+ for(i=0; zName[i]; i++){
+ z[n++] = zName[i];
+ if( zName[i]=='\'' ) z[n++] = '\'';
+ }
+ if( needQuote ) z[n++] = '\'';
+ z[n] = 0;
}
/* zIn is either a pointer to a NULL-terminated string in memory obtained
@@ -950,44 +950,44 @@ static void set_table_name(struct callback_data *p, const char *zName){
** added to zIn, and the result returned in memory obtained from malloc().
** zIn, if it was not NULL, is freed.
**
-** If the third argument, quote, is not '\0', then it is used as a
+** If the third argument, quote, is not '\0', then it is used as a
** quote character for zAppend.
*/
static char *appendText(char *zIn, char const *zAppend, char quote){
- int len;
- int i;
- int nAppend = strlen30(zAppend);
- int nIn = (zIn?strlen30(zIn):0);
-
- len = nAppend+nIn+1;
- if( quote ){
- len += 2;
- for(i=0; i<nAppend; i++){
- if( zAppend[i]==quote ) len++;
- }
- }
-
- zIn = (char *)realloc(zIn, len);
- if( !zIn ){
- return 0;
- }
-
- if( quote ){
- char *zCsr = &zIn[nIn];
- *zCsr++ = quote;
- for(i=0; i<nAppend; i++){
- *zCsr++ = zAppend[i];
- if( zAppend[i]==quote ) *zCsr++ = quote;
- }
- *zCsr++ = quote;
- *zCsr++ = '\0';
- assert( (zCsr-zIn)==len );
- }else{
- memcpy(&zIn[nIn], zAppend, nAppend);
- zIn[len-1] = '\0';
- }
-
- return zIn;
+ int len;
+ int i;
+ int nAppend = strlen30(zAppend);
+ int nIn = (zIn?strlen30(zIn):0);
+
+ len = nAppend+nIn+1;
+ if( quote ){
+ len += 2;
+ for(i=0; i<nAppend; i++){
+ if( zAppend[i]==quote ) len++;
+ }
+ }
+
+ zIn = (char *)realloc(zIn, len);
+ if( !zIn ){
+ return 0;
+ }
+
+ if( quote ){
+ char *zCsr = &zIn[nIn];
+ *zCsr++ = quote;
+ for(i=0; i<nAppend; i++){
+ *zCsr++ = zAppend[i];
+ if( zAppend[i]==quote ) *zCsr++ = quote;
+ }
+ *zCsr++ = quote;
+ *zCsr++ = '\0';
+ assert( (zCsr-zIn)==len );
+ }else{
+ memcpy(&zIn[nIn], zAppend, nAppend);
+ zIn[len-1] = '\0';
+ }
+
+ return zIn;
}
@@ -997,163 +997,162 @@ static char *appendText(char *zIn, char const *zAppend, char quote){
** semicolon terminator to the end of that line.
**
** If the number of columns is 1 and that column contains text "--"
-** then write the semicolon on a separate line. That way, if a
+** then write the semicolon on a separate line. That way, if a
** "--" comment occurs at the end of the statement, the comment
** won't consume the semicolon terminator.
*/
static int run_table_dump_query(
- struct callback_data *p, /* Query context */
- const char *zSelect, /* SELECT statement to extract content */
- const char *zFirstRow /* Print before first row, if not NULL */
+ struct callback_data *p, /* Query context */
+ const char *zSelect, /* SELECT statement to extract content */
+ const char *zFirstRow /* Print before first row, if not NULL */
){
- sqlite3_stmt *pSelect;
- int rc;
- int nResult;
- int i;
- const char *z;
- rc = sqlite3_prepare_v2(p->db, zSelect, -1, &pSelect, 0);
- if( rc!=SQLITE_OK || !pSelect ){
- fprintf(p->out, "/**** ERROR: (%d) %s *****/\n", rc, sqlite3_errmsg(p->db));
- if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
- return rc;
- }
- rc = sqlite3_step(pSelect);
- nResult = sqlite3_column_count(pSelect);
- while( rc==SQLITE_ROW ){
- if( zFirstRow ){
- fprintf(p->out, "%s", zFirstRow);
- zFirstRow = 0;
- }
- z = (const char*)sqlite3_column_text(pSelect, 0);
- fprintf(p->out, "%s", z);
- for(i=1; i<nResult; i++){
- fprintf(p->out, ",%s", sqlite3_column_text(pSelect, i));
- }
- if( z==0 ) z = "";
- while( z[0] && (z[0]!='-' || z[1]!='-') ) z++;
- if( z[0] ){
- fprintf(p->out, "\n;\n");
- }else{
- fprintf(p->out, ";\n");
- }
- rc = sqlite3_step(pSelect);
- }
- rc = sqlite3_finalize(pSelect);
- if( rc!=SQLITE_OK ){
- fprintf(p->out, "/**** ERROR: (%d) %s *****/\n", rc, sqlite3_errmsg(p->db));
- if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
- }
- return rc;
+ sqlite3_stmt *pSelect;
+ int rc;
+ int nResult;
+ int i;
+ const char *z;
+ rc = sqlite3_prepare_v2(p->db, zSelect, -1, &pSelect, 0);
+ if( rc!=SQLITE_OK || !pSelect ){
+ fprintf(p->out, "/**** ERROR: (%d) %s *****/\n", rc, sqlite3_errmsg(p->db));
+ if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
+ return rc;
+ }
+ rc = sqlite3_step(pSelect);
+ nResult = sqlite3_column_count(pSelect);
+ while( rc==SQLITE_ROW ){
+ if( zFirstRow ){
+ fprintf(p->out, "%s", zFirstRow);
+ zFirstRow = 0;
+ }
+ z = (const char*)sqlite3_column_text(pSelect, 0);
+ fprintf(p->out, "%s", z);
+ for(i=1; i<nResult; i++){
+ fprintf(p->out, ",%s", sqlite3_column_text(pSelect, i));
+ }
+ if( z==0 ) z = "";
+ while( z[0] && (z[0]!='-' || z[1]!='-') ) z++;
+ if( z[0] ){
+ fprintf(p->out, "\n;\n");
+ }else{
+ fprintf(p->out, ";\n");
+ }
+ rc = sqlite3_step(pSelect);
+ }
+ rc = sqlite3_finalize(pSelect);
+ if( rc!=SQLITE_OK ){
+ fprintf(p->out, "/**** ERROR: (%d) %s *****/\n", rc, sqlite3_errmsg(p->db));
+ if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
+ }
+ return rc;
}
/*
** Allocate space and save off current error string.
*/
static char *save_err_msg(
- sqlite3 *db /* Database to query */
+ sqlite3 *db /* Database to query */
){
- int nErrMsg = 1+strlen30(sqlite3_errmsg(db));
- char *zErrMsg = (char*)sqlite3_malloc(nErrMsg);
- if( zErrMsg ){
- memcpy(zErrMsg, sqlite3_errmsg(db), nErrMsg);
- }
- return zErrMsg;
+ int nErrMsg = 1+strlen30(sqlite3_errmsg(db));
+ char *zErrMsg = (char*)sqlite3_malloc(nErrMsg);
+ if( zErrMsg ){
+ memcpy(zErrMsg, sqlite3_errmsg(db), nErrMsg);
+ }
+ return zErrMsg;
}
/*
** Display memory stats.
*/
static int display_stats(
- sqlite3 *db, /* Database to query */
- struct callback_data *pArg, /* Pointer to struct callback_data */
- int bReset /* True to reset the stats */
+ sqlite3 *db, /* Database to query */
+ struct callback_data *pArg, /* Pointer to struct callback_data */
+ int bReset /* True to reset the stats */
){
- int iCur;
- int iHiwtr;
-
- if( pArg && pArg->out ){
-
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_MEMORY_USED, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Memory Used: %d (max %d) bytes\n", iCur, iHiwtr);
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_MALLOC_COUNT, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Number of Outstanding Allocations: %d (max %d)\n", iCur, iHiwtr);
+ int iCur;
+ int iHiwtr;
+
+ if( pArg && pArg->out ){
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_MEMORY_USED, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Memory Used: %d (max %d) bytes\n", iCur, iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_MALLOC_COUNT, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Number of Outstanding Allocations: %d (max %d)\n", iCur, iHiwtr);
/*
** Not currently used by the CLI.
** iHiwtr = iCur = -1;
** sqlite3_status(SQLITE_STATUS_PAGECACHE_USED, &iCur, &iHiwtr, bReset);
** fprintf(pArg->out, "Number of Pcache Pages Used: %d (max %d) pages\n", iCur, iHiwtr);
*/
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_PAGECACHE_OVERFLOW, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Number of Pcache Overflow Bytes: %d (max %d) bytes\n", iCur, iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_PAGECACHE_OVERFLOW, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Number of Pcache Overflow Bytes: %d (max %d) bytes\n", iCur, iHiwtr);
/*
** Not currently used by the CLI.
** iHiwtr = iCur = -1;
** sqlite3_status(SQLITE_STATUS_SCRATCH_USED, &iCur, &iHiwtr, bReset);
** fprintf(pArg->out, "Number of Scratch Allocations Used: %d (max %d)\n", iCur, iHiwtr);
*/
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_SCRATCH_OVERFLOW, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Number of Scratch Overflow Bytes: %d (max %d) bytes\n", iCur, iHiwtr);
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_MALLOC_SIZE, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Largest Allocation: %d bytes\n", iHiwtr);
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_PAGECACHE_SIZE, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Largest Pcache Allocation: %d bytes\n", iHiwtr);
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_SCRATCH_SIZE, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Largest Scratch Allocation: %d bytes\n", iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_SCRATCH_OVERFLOW, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Number of Scratch Overflow Bytes: %d (max %d) bytes\n", iCur, iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_MALLOC_SIZE, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Largest Allocation: %d bytes\n", iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_PAGECACHE_SIZE, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Largest Pcache Allocation: %d bytes\n", iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_SCRATCH_SIZE, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Largest Scratch Allocation: %d bytes\n", iHiwtr);
#ifdef YYTRACKMAXSTACKDEPTH
- iHiwtr = iCur = -1;
- sqlite3_status(SQLITE_STATUS_PARSER_STACK, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Deepest Parser Stack: %d (max %d)\n", iCur, iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_status(SQLITE_STATUS_PARSER_STACK, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Deepest Parser Stack: %d (max %d)\n", iCur, iHiwtr);
#endif
- }
-
- if( pArg && pArg->out && db ){
- iHiwtr = iCur = -1;
- sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_USED, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Lookaside Slots Used: %d (max %d)\n", iCur, iHiwtr);
- sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_HIT, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Successful lookaside attempts: %d\n", iHiwtr);
- sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Lookaside failures due to size: %d\n", iHiwtr);
- sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Lookaside failures due to OOM: %d\n", iHiwtr);
- iHiwtr = iCur = -1;
- sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Pager Heap Usage: %d bytes\n", iCur); iHiwtr = iCur = -1;
- sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHiwtr, 1);
- fprintf(pArg->out, "Page cache hits: %d\n", iCur);
- iHiwtr = iCur = -1;
- sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHiwtr, 1);
- fprintf(pArg->out, "Page cache misses: %d\n", iCur);
- iHiwtr = iCur = -1;
- sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHiwtr, 1);
- fprintf(pArg->out, "Page cache writes: %d\n", iCur);
- iHiwtr = iCur = -1;
- sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Schema Heap Usage: %d bytes\n", iCur);
- iHiwtr = iCur = -1;
- sqlite3_db_status(db, SQLITE_DBSTATUS_STMT_USED, &iCur, &iHiwtr, bReset);
- fprintf(pArg->out, "Statement Heap/Lookaside Usage: %d bytes\n", iCur);
- }
-
- if( pArg && pArg->out && db && pArg->pStmt ){
- iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_FULLSCAN_STEP, bReset);
- fprintf(pArg->out, "Fullscan Steps: %d\n", iCur);
- iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
- fprintf(pArg->out, "Sort Operations: %d\n", iCur);
- iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX, bReset);
- fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
- iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
- fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
- }
-
- return 0;
+ }
+
+ if( pArg && pArg->out && db ){
+ iHiwtr = iCur = -1;
+ sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_USED, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Lookaside Slots Used: %d (max %d)\n", iCur, iHiwtr);
+ sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_HIT, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Successful lookaside attempts: %d\n", iHiwtr);
+ sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Lookaside failures due to size: %d\n", iHiwtr);
+ sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Lookaside failures due to OOM: %d\n", iHiwtr);
+ iHiwtr = iCur = -1;
+ sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Pager Heap Usage: %d bytes\n", iCur); iHiwtr = iCur = -1;
+ sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHiwtr, 1);
+ fprintf(pArg->out, "Page cache hits: %d\n", iCur);
+ iHiwtr = iCur = -1;
+ sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHiwtr, 1);
+ fprintf(pArg->out, "Page cache misses: %d\n", iCur);
+ iHiwtr = iCur = -1;
+ sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHiwtr, 1);
+ fprintf(pArg->out, "Page cache writes: %d\n", iCur);
+ iHiwtr = iCur = -1;
+ sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Schema Heap Usage: %d bytes\n", iCur);
+ iHiwtr = iCur = -1;
+ sqlite3_db_status(db, SQLITE_DBSTATUS_STMT_USED, &iCur, &iHiwtr, bReset);
+ fprintf(pArg->out, "Statement Heap/Lookaside Usage: %d bytes\n", iCur);
+ }
+
+ if( pArg && pArg->out && db && pArg->pStmt ){
+ iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_FULLSCAN_STEP, bReset);
+ fprintf(pArg->out, "Fullscan Steps: %d\n", iCur);
+ iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
+ fprintf(pArg->out, "Sort Operations: %d\n", iCur);
+ iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX, bReset);
+ fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
+ iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
+ fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
+ }
+
+ return 0;
}
/*
@@ -1163,17 +1162,17 @@ static int display_stats(
** Otherwise, return zero.
*/
static int str_in_array(const char *zStr, const char **azArray){
- int i;
- for(i=0; azArray[i]; i++){
- if( 0==strcmp(zStr, azArray[i]) ) return 1;
- }
- return 0;
+ int i;
+ for(i=0; azArray[i]; i++){
+ if( 0==strcmp(zStr, azArray[i]) ) return 1;
+ }
+ return 0;
}
/*
** If compiled statement pSql appears to be an EXPLAIN statement, allocate
** and populate the callback_data.aiIndent[] array with the number of
-** spaces each opcode should be indented before it is output.
+** spaces each opcode should be indented before it is output.
**
** The indenting rules are:
**
@@ -1189,239 +1188,239 @@ static int str_in_array(const char *zStr, const char **azArray){
** and "Goto" by 2 spaces.
*/
static void explain_data_prepare(struct callback_data *p, sqlite3_stmt *pSql){
- const char *zSql; /* The text of the SQL statement */
- const char *z; /* Used to check if this is an EXPLAIN */
- int *abYield = 0; /* True if op is an OP_Yield */
- int nAlloc = 0; /* Allocated size of p->aiIndent[], abYield */
- int iOp; /* Index of operation in p->aiIndent[] */
-
- const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", "SorterNext", 0 };
- const char *azYield[] = { "Yield", "SeekLt", "SeekGt", "RowSetRead", "Rewind", 0 };
- const char *azGoto[] = { "Goto", 0 };
-
- /* Try to figure out if this is really an EXPLAIN statement. If this
- ** cannot be verified, return early. */
- zSql = sqlite3_sql(pSql);
- if( zSql==0 ) return;
- for(z=zSql; *z==' ' || *z=='\t' || *z=='\n' || *z=='\f' || *z=='\r'; z++);
- if( sqlite3_strnicmp(z, "explain", 7) ) return;
-
- for(iOp=0; SQLITE_ROW==sqlite3_step(pSql); iOp++){
- int i;
- int iAddr = sqlite3_column_int(pSql, 0);
- const char *zOp = (const char*)sqlite3_column_text(pSql, 1);
-
- /* Set p2 to the P2 field of the current opcode. Then, assuming that
- ** p2 is an instruction address, set variable p2op to the index of that
- ** instruction in the aiIndent[] array. p2 and p2op may be different if
- ** the current instruction is part of a sub-program generated by an
- ** SQL trigger or foreign key. */
- int p2 = sqlite3_column_int(pSql, 3);
- int p2op = (p2 + (iOp-iAddr));
-
- /* Grow the p->aiIndent array as required */
- if( iOp>=nAlloc ){
- nAlloc += 100;
- p->aiIndent = (int*)sqlite3_realloc(p->aiIndent, nAlloc*sizeof(int));
- abYield = (int*)sqlite3_realloc(abYield, nAlloc*sizeof(int));
- }
- abYield[iOp] = str_in_array(zOp, azYield);
- p->aiIndent[iOp] = 0;
- p->nIndent = iOp+1;
-
- if( str_in_array(zOp, azNext) ){
- for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
- }
- if( str_in_array(zOp, azGoto) && p2op<p->nIndent
- && (abYield[p2op] || sqlite3_column_int(pSql, 2))
- ){
- for(i=p2op+1; i<iOp; i++) p->aiIndent[i] += 2;
- }
- }
-
- p->iIndent = 0;
- sqlite3_free(abYield);
- sqlite3_reset(pSql);
+ const char *zSql; /* The text of the SQL statement */
+ const char *z; /* Used to check if this is an EXPLAIN */
+ int *abYield = 0; /* True if op is an OP_Yield */
+ int nAlloc = 0; /* Allocated size of p->aiIndent[], abYield */
+ int iOp; /* Index of operation in p->aiIndent[] */
+
+ const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", "SorterNext", 0 };
+ const char *azYield[] = { "Yield", "SeekLt", "SeekGt", "RowSetRead", "Rewind", 0 };
+ const char *azGoto[] = { "Goto", 0 };
+
+ /* Try to figure out if this is really an EXPLAIN statement. If this
+ ** cannot be verified, return early. */
+ zSql = sqlite3_sql(pSql);
+ if( zSql==0 ) return;
+ for(z=zSql; *z==' ' || *z=='\t' || *z=='\n' || *z=='\f' || *z=='\r'; z++);
+ if( sqlite3_strnicmp(z, "explain", 7) ) return;
+
+ for(iOp=0; SQLITE_ROW==sqlite3_step(pSql); iOp++){
+ int i;
+ int iAddr = sqlite3_column_int(pSql, 0);
+ const char *zOp = (const char*)sqlite3_column_text(pSql, 1);
+
+ /* Set p2 to the P2 field of the current opcode. Then, assuming that
+ ** p2 is an instruction address, set variable p2op to the index of that
+ ** instruction in the aiIndent[] array. p2 and p2op may be different if
+ ** the current instruction is part of a sub-program generated by an
+ ** SQL trigger or foreign key. */
+ int p2 = sqlite3_column_int(pSql, 3);
+ int p2op = (p2 + (iOp-iAddr));
+
+ /* Grow the p->aiIndent array as required */
+ if( iOp>=nAlloc ){
+ nAlloc += 100;
+ p->aiIndent = (int*)sqlite3_realloc(p->aiIndent, nAlloc*sizeof(int));
+ abYield = (int*)sqlite3_realloc(abYield, nAlloc*sizeof(int));
+ }
+ abYield[iOp] = str_in_array(zOp, azYield);
+ p->aiIndent[iOp] = 0;
+ p->nIndent = iOp+1;
+
+ if( str_in_array(zOp, azNext) ){
+ for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
+ }
+ if( str_in_array(zOp, azGoto) && p2op<p->nIndent
+ && (abYield[p2op] || sqlite3_column_int(pSql, 2))
+ ){
+ for(i=p2op+1; i<iOp; i++) p->aiIndent[i] += 2;
+ }
+ }
+
+ p->iIndent = 0;
+ sqlite3_free(abYield);
+ sqlite3_reset(pSql);
}
/*
** Free the array allocated by explain_data_prepare().
*/
static void explain_data_delete(struct callback_data *p){
- sqlite3_free(p->aiIndent);
- p->aiIndent = 0;
- p->nIndent = 0;
- p->iIndent = 0;
+ sqlite3_free(p->aiIndent);
+ p->aiIndent = 0;
+ p->nIndent = 0;
+ p->iIndent = 0;
}
/*
-** Execute a statement or set of statements. Print
-** any result rows/columns depending on the current mode
+** Execute a statement or set of statements. Print
+** any result rows/columns depending on the current mode
** set via the supplied callback.
**
-** This is very similar to SQLite's built-in sqlite3_exec()
-** function except it takes a slightly different callback
+** This is very similar to SQLite's built-in sqlite3_exec()
+** function except it takes a slightly different callback
** and callback data argument.
*/
static int shell_exec(
- sqlite3 *db, /* An open database */
- const char *zSql, /* SQL to be evaluated */
- int (*xCallback)(void*,int,char**,char**,int*), /* Callback function */
- /* (not the same as sqlite3_exec) */
- struct callback_data *pArg, /* Pointer to struct callback_data */
- char **pzErrMsg /* Error msg written here */
+ sqlite3 *db, /* An open database */
+ const char *zSql, /* SQL to be evaluated */
+ int (*xCallback)(void*,int,char**,char**,int*), /* Callback function */
+ /* (not the same as sqlite3_exec) */
+ struct callback_data *pArg, /* Pointer to struct callback_data */
+ char **pzErrMsg /* Error msg written here */
){
- sqlite3_stmt *pStmt = NULL; /* Statement to execute. */
- int rc = SQLITE_OK; /* Return Code */
- int rc2;
- const char *zLeftover; /* Tail of unprocessed SQL */
-
- if( pzErrMsg ){
- *pzErrMsg = NULL;
- }
-
- while( zSql[0] && (SQLITE_OK == rc) ){
- rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
- if( SQLITE_OK != rc ){
- if( pzErrMsg ){
- *pzErrMsg = save_err_msg(db);
- }
- }else{
- if( !pStmt ){
- /* this happens for a comment or white-space */
- zSql = zLeftover;
- while( IsSpace(zSql[0]) ) zSql++;
- continue;
- }
-
- /* save off the prepared statment handle and reset row count */
- if( pArg ){
- pArg->pStmt = pStmt;
- pArg->cnt = 0;
- }
-
- /* echo the sql statement if echo on */
- if( pArg && pArg->echoOn ){
- const char *zStmtSql = sqlite3_sql(pStmt);
- fprintf(pArg->out, "%s\n", zStmtSql ? zStmtSql : zSql);
- }
-
- /* Show the EXPLAIN QUERY PLAN if .eqp is on */
- if( pArg && pArg->autoEQP ){
- sqlite3_stmt *pExplain;
- char *zEQP = sqlite3_mprintf("EXPLAIN QUERY PLAN %s", sqlite3_sql(pStmt));
- rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
- if( rc==SQLITE_OK ){
- while( sqlite3_step(pExplain)==SQLITE_ROW ){
- fprintf(pArg->out,"--EQP-- %d,", sqlite3_column_int(pExplain, 0));
- fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 1));
- fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
- fprintf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
- }
- }
- sqlite3_finalize(pExplain);
- sqlite3_free(zEQP);
- }
-
- /* Output TESTCTRL_EXPLAIN text of requested */
- if( pArg && pArg->mode==MODE_Explain ){
- const char *zExplain = 0;
- sqlite3_test_control(SQLITE_TESTCTRL_EXPLAIN_STMT, pStmt, &zExplain);
- if( zExplain && zExplain[0] ){
- fprintf(pArg->out, "%s", zExplain);
- }
- }
-
- /* If the shell is currently in ".explain" mode, gather the extra
- ** data required to add indents to the output.*/
- if( pArg && pArg->mode==MODE_Explain ){
- explain_data_prepare(pArg, pStmt);
- }
-
- /* perform the first step. this will tell us if we
- ** have a result set or not and how wide it is.
- */
- rc = sqlite3_step(pStmt);
- /* if we have a result set... */
- if( SQLITE_ROW == rc ){
- /* if we have a callback... */
- if( xCallback ){
- /* allocate space for col name ptr, value ptr, and type */
- int nCol = sqlite3_column_count(pStmt);
- void *pData = sqlite3_malloc(3*nCol*sizeof(const char*) + 1);
- if( !pData ){
- rc = SQLITE_NOMEM;
- }else{
- char **azCols = (char **)pData; /* Names of result columns */
- char **azVals = &azCols[nCol]; /* Results */
- int *aiTypes = (int *)&azVals[nCol]; /* Result types */
- int i, x;
- assert(sizeof(int) <= sizeof(char *));
- /* save off ptrs to column names */
- for(i=0; i<nCol; i++){
- azCols[i] = (char *)sqlite3_column_name(pStmt, i);
- }
- do{
- /* extract the data and data types */
- for(i=0; i<nCol; i++){
- aiTypes[i] = x = sqlite3_column_type(pStmt, i);
- if( x==SQLITE_BLOB && pArg && pArg->mode==MODE_Insert ){
- azVals[i] = "";
- }else{
- azVals[i] = (char*)sqlite3_column_text(pStmt, i);
- }
- if( !azVals[i] && (aiTypes[i]!=SQLITE_NULL) ){
- rc = SQLITE_NOMEM;
- break; /* from for */
- }
- } /* end for */
-
- /* if data and types extracted successfully... */
- if( SQLITE_ROW == rc ){
- /* call the supplied callback with the result row data */
- if( xCallback(pArg, nCol, azVals, azCols, aiTypes) ){
- rc = SQLITE_ABORT;
- }else{
- rc = sqlite3_step(pStmt);
- }
- }
- } while( SQLITE_ROW == rc );
- sqlite3_free(pData);
- }
- }else{
- do{
- rc = sqlite3_step(pStmt);
- } while( rc == SQLITE_ROW );
- }
- }
-
- explain_data_delete(pArg);
-
- /* print usage stats if stats on */
- if( pArg && pArg->statsOn ){
- display_stats(db, pArg, 0);
- }
-
- /* Finalize the statement just executed. If this fails, save a
- ** copy of the error message. Otherwise, set zSql to point to the
- ** next statement to execute. */
- rc2 = sqlite3_finalize(pStmt);
- if( rc!=SQLITE_NOMEM ) rc = rc2;
- if( rc==SQLITE_OK ){
- zSql = zLeftover;
- while( IsSpace(zSql[0]) ) zSql++;
- }else if( pzErrMsg ){
- *pzErrMsg = save_err_msg(db);
- }
-
- /* clear saved stmt handle */
- if( pArg ){
- pArg->pStmt = NULL;
- }
- }
- } /* end while */
-
- return rc;
+ sqlite3_stmt *pStmt = NULL; /* Statement to execute. */
+ int rc = SQLITE_OK; /* Return Code */
+ int rc2;
+ const char *zLeftover; /* Tail of unprocessed SQL */
+
+ if( pzErrMsg ){
+ *pzErrMsg = NULL;
+ }
+
+ while( zSql[0] && (SQLITE_OK == rc) ){
+ rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
+ if( SQLITE_OK != rc ){
+ if( pzErrMsg ){
+ *pzErrMsg = save_err_msg(db);
+ }
+ }else{
+ if( !pStmt ){
+ /* this happens for a comment or white-space */
+ zSql = zLeftover;
+ while( IsSpace(zSql[0]) ) zSql++;
+ continue;
+ }
+
+ /* save off the prepared statment handle and reset row count */
+ if( pArg ){
+ pArg->pStmt = pStmt;
+ pArg->cnt = 0;
+ }
+
+ /* echo the sql statement if echo on */
+ if( pArg && pArg->echoOn ){
+ const char *zStmtSql = sqlite3_sql(pStmt);
+ fprintf(pArg->out, "%s\n", zStmtSql ? zStmtSql : zSql);
+ }
+
+ /* Show the EXPLAIN QUERY PLAN if .eqp is on */
+ if( pArg && pArg->autoEQP ){
+ sqlite3_stmt *pExplain;
+ char *zEQP = sqlite3_mprintf("EXPLAIN QUERY PLAN %s", sqlite3_sql(pStmt));
+ rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
+ if( rc==SQLITE_OK ){
+ while( sqlite3_step(pExplain)==SQLITE_ROW ){
+ fprintf(pArg->out,"--EQP-- %d,", sqlite3_column_int(pExplain, 0));
+ fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 1));
+ fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
+ fprintf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
+ }
+ }
+ sqlite3_finalize(pExplain);
+ sqlite3_free(zEQP);
+ }
+
+ /* Output TESTCTRL_EXPLAIN text of requested */
+ if( pArg && pArg->mode==MODE_Explain ){
+ const char *zExplain = 0;
+ sqlite3_test_control(SQLITE_TESTCTRL_EXPLAIN_STMT, pStmt, &zExplain);
+ if( zExplain && zExplain[0] ){
+ fprintf(pArg->out, "%s", zExplain);
+ }
+ }
+
+ /* If the shell is currently in ".explain" mode, gather the extra
+ ** data required to add indents to the output.*/
+ if( pArg && pArg->mode==MODE_Explain ){
+ explain_data_prepare(pArg, pStmt);
+ }
+
+ /* perform the first step. this will tell us if we
+ ** have a result set or not and how wide it is.
+ */
+ rc = sqlite3_step(pStmt);
+ /* if we have a result set... */
+ if( SQLITE_ROW == rc ){
+ /* if we have a callback... */
+ if( xCallback ){
+ /* allocate space for col name ptr, value ptr, and type */
+ int nCol = sqlite3_column_count(pStmt);
+ void *pData = sqlite3_malloc(3*nCol*sizeof(const char*) + 1);
+ if( !pData ){
+ rc = SQLITE_NOMEM;
+ }else{
+ char **azCols = (char **)pData; /* Names of result columns */
+ char **azVals = &azCols[nCol]; /* Results */
+ int *aiTypes = (int *)&azVals[nCol]; /* Result types */
+ int i, x;
+ assert(sizeof(int) <= sizeof(char *));
+ /* save off ptrs to column names */
+ for(i=0; i<nCol; i++){
+ azCols[i] = (char *)sqlite3_column_name(pStmt, i);
+ }
+ do{
+ /* extract the data and data types */
+ for(i=0; i<nCol; i++){
+ aiTypes[i] = x = sqlite3_column_type(pStmt, i);
+ if( x==SQLITE_BLOB && pArg && pArg->mode==MODE_Insert ){
+ azVals[i] = "";
+ }else{
+ azVals[i] = (char*)sqlite3_column_text(pStmt, i);
+ }
+ if( !azVals[i] && (aiTypes[i]!=SQLITE_NULL) ){
+ rc = SQLITE_NOMEM;
+ break; /* from for */
+ }
+ } /* end for */
+
+ /* if data and types extracted successfully... */
+ if( SQLITE_ROW == rc ){
+ /* call the supplied callback with the result row data */
+ if( xCallback(pArg, nCol, azVals, azCols, aiTypes) ){
+ rc = SQLITE_ABORT;
+ }else{
+ rc = sqlite3_step(pStmt);
+ }
+ }
+ } while( SQLITE_ROW == rc );
+ sqlite3_free(pData);
+ }
+ }else{
+ do{
+ rc = sqlite3_step(pStmt);
+ } while( rc == SQLITE_ROW );
+ }
+ }
+
+ explain_data_delete(pArg);
+
+ /* print usage stats if stats on */
+ if( pArg && pArg->statsOn ){
+ display_stats(db, pArg, 0);
+ }
+
+ /* Finalize the statement just executed. If this fails, save a
+ ** copy of the error message. Otherwise, set zSql to point to the
+ ** next statement to execute. */
+ rc2 = sqlite3_finalize(pStmt);
+ if( rc!=SQLITE_NOMEM ) rc = rc2;
+ if( rc==SQLITE_OK ){
+ zSql = zLeftover;
+ while( IsSpace(zSql[0]) ) zSql++;
+ }else if( pzErrMsg ){
+ *pzErrMsg = save_err_msg(db);
+ }
+
+ /* clear saved stmt handle */
+ if( pArg ){
+ pArg->pStmt = NULL;
+ }
+ }
+ } /* end while */
+
+ return rc;
}
@@ -1432,97 +1431,97 @@ static int shell_exec(
** This routine should print text sufficient to recreate the table.
*/
static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
- int rc;
- const char *zTable;
- const char *zType;
- const char *zSql;
- const char *zPrepStmt = 0;
- struct callback_data *p = (struct callback_data *)pArg;
-
- UNUSED_PARAMETER(azCol);
- if( nArg!=3 ) return 1;
- zTable = azArg[0];
- zType = azArg[1];
- zSql = azArg[2];
-
- if( strcmp(zTable, "sqlite_sequence")==0 ){
- zPrepStmt = "DELETE FROM sqlite_sequence;\n";
- }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
- fprintf(p->out, "ANALYZE sqlite_master;\n");
- }else if( strncmp(zTable, "sqlite_", 7)==0 ){
- return 0;
- }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
- char *zIns;
- if( !p->writableSchema ){
- fprintf(p->out, "PRAGMA writable_schema=ON;\n");
- p->writableSchema = 1;
- }
- zIns = sqlite3_mprintf(
- "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
- "VALUES('table','%q','%q',0,'%q');",
- zTable, zTable, zSql);
- fprintf(p->out, "%s\n", zIns);
- sqlite3_free(zIns);
- return 0;
- }else{
- fprintf(p->out, "%s;\n", zSql);
- }
-
- if( strcmp(zType, "table")==0 ){
- sqlite3_stmt *pTableInfo = 0;
- char *zSelect = 0;
- char *zTableInfo = 0;
- char *zTmp = 0;
- int nRow = 0;
-
- zTableInfo = appendText(zTableInfo, "PRAGMA table_info(", 0);
- zTableInfo = appendText(zTableInfo, zTable, '"');
- zTableInfo = appendText(zTableInfo, ");", 0);
-
- rc = sqlite3_prepare_v2(p->db, zTableInfo, -1, &pTableInfo, 0);
- free(zTableInfo);
- if( rc!=SQLITE_OK || !pTableInfo ){
- return 1;
- }
-
- zSelect = appendText(zSelect, "SELECT 'INSERT INTO ' || ", 0);
- /* Always quote the table name, even if it appears to be pure ascii,
- ** in case it is a keyword. Ex: INSERT INTO "table" ... */
- zTmp = appendText(zTmp, zTable, '"');
- if( zTmp ){
- zSelect = appendText(zSelect, zTmp, '\'');
- free(zTmp);
- }
- zSelect = appendText(zSelect, " || ' VALUES(' || ", 0);
- rc = sqlite3_step(pTableInfo);
- while( rc==SQLITE_ROW ){
- const char *zText = (const char *)sqlite3_column_text(pTableInfo, 1);
- zSelect = appendText(zSelect, "quote(", 0);
- zSelect = appendText(zSelect, zText, '"');
- rc = sqlite3_step(pTableInfo);
- if( rc==SQLITE_ROW ){
- zSelect = appendText(zSelect, "), ", 0);
- }else{
- zSelect = appendText(zSelect, ") ", 0);
- }
- nRow++;
- }
- rc = sqlite3_finalize(pTableInfo);
- if( rc!=SQLITE_OK || nRow==0 ){
- free(zSelect);
- return 1;
- }
- zSelect = appendText(zSelect, "|| ')' FROM ", 0);
- zSelect = appendText(zSelect, zTable, '"');
-
- rc = run_table_dump_query(p, zSelect, zPrepStmt);
- if( rc==SQLITE_CORRUPT ){
- zSelect = appendText(zSelect, " ORDER BY rowid DESC", 0);
- run_table_dump_query(p, zSelect, 0);
- }
- free(zSelect);
- }
- return 0;
+ int rc;
+ const char *zTable;
+ const char *zType;
+ const char *zSql;
+ const char *zPrepStmt = 0;
+ struct callback_data *p = (struct callback_data *)pArg;
+
+ UNUSED_PARAMETER(azCol);
+ if( nArg!=3 ) return 1;
+ zTable = azArg[0];
+ zType = azArg[1];
+ zSql = azArg[2];
+
+ if( strcmp(zTable, "sqlite_sequence")==0 ){
+ zPrepStmt = "DELETE FROM sqlite_sequence;\n";
+ }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
+ fprintf(p->out, "ANALYZE sqlite_master;\n");
+ }else if( strncmp(zTable, "sqlite_", 7)==0 ){
+ return 0;
+ }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
+ char *zIns;
+ if( !p->writableSchema ){
+ fprintf(p->out, "PRAGMA writable_schema=ON;\n");
+ p->writableSchema = 1;
+ }
+ zIns = sqlite3_mprintf(
+ "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
+ "VALUES('table','%q','%q',0,'%q');",
+ zTable, zTable, zSql);
+ fprintf(p->out, "%s\n", zIns);
+ sqlite3_free(zIns);
+ return 0;
+ }else{
+ fprintf(p->out, "%s;\n", zSql);
+ }
+
+ if( strcmp(zType, "table")==0 ){
+ sqlite3_stmt *pTableInfo = 0;
+ char *zSelect = 0;
+ char *zTableInfo = 0;
+ char *zTmp = 0;
+ int nRow = 0;
+
+ zTableInfo = appendText(zTableInfo, "PRAGMA table_info(", 0);
+ zTableInfo = appendText(zTableInfo, zTable, '"');
+ zTableInfo = appendText(zTableInfo, ");", 0);
+
+ rc = sqlite3_prepare_v2(p->db, zTableInfo, -1, &pTableInfo, 0);
+ free(zTableInfo);
+ if( rc!=SQLITE_OK || !pTableInfo ){
+ return 1;
+ }
+
+ zSelect = appendText(zSelect, "SELECT 'INSERT INTO ' || ", 0);
+ /* Always quote the table name, even if it appears to be pure ascii,
+ ** in case it is a keyword. Ex: INSERT INTO "table" ... */
+ zTmp = appendText(zTmp, zTable, '"');
+ if( zTmp ){
+ zSelect = appendText(zSelect, zTmp, '\'');
+ free(zTmp);
+ }
+ zSelect = appendText(zSelect, " || ' VALUES(' || ", 0);
+ rc = sqlite3_step(pTableInfo);
+ while( rc==SQLITE_ROW ){
+ const char *zText = (const char *)sqlite3_column_text(pTableInfo, 1);
+ zSelect = appendText(zSelect, "quote(", 0);
+ zSelect = appendText(zSelect, zText, '"');
+ rc = sqlite3_step(pTableInfo);
+ if( rc==SQLITE_ROW ){
+ zSelect = appendText(zSelect, "), ", 0);
+ }else{
+ zSelect = appendText(zSelect, ") ", 0);
+ }
+ nRow++;
+ }
+ rc = sqlite3_finalize(pTableInfo);
+ if( rc!=SQLITE_OK || nRow==0 ){
+ free(zSelect);
+ return 1;
+ }
+ zSelect = appendText(zSelect, "|| ')' FROM ", 0);
+ zSelect = appendText(zSelect, zTable, '"');
+
+ rc = run_table_dump_query(p, zSelect, zPrepStmt);
+ if( rc==SQLITE_CORRUPT ){
+ zSelect = appendText(zSelect, " ORDER BY rowid DESC", 0);
+ run_table_dump_query(p, zSelect, 0);
+ }
+ free(zSelect);
+ }
+ return 0;
}
/*
@@ -1533,100 +1532,100 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
** "ORDER BY rowid DESC" to the end.
*/
static int run_schema_dump_query(
- struct callback_data *p,
- const char *zQuery
+ struct callback_data *p,
+ const char *zQuery
){
- int rc;
- char *zErr = 0;
- rc = sqlite3_exec(p->db, zQuery, dump_callback, p, &zErr);
- if( rc==SQLITE_CORRUPT ){
- char *zQ2;
- int len = strlen30(zQuery);
- fprintf(p->out, "/****** CORRUPTION ERROR *******/\n");
- if( zErr ){
- fprintf(p->out, "/****** %s ******/\n", zErr);
- sqlite3_free(zErr);
- zErr = 0;
- }
- zQ2 = (char *)malloc( len+100 );
- if( zQ2==0 ) return rc;
- sqlite3_snprintf(len+100, zQ2, "%s ORDER BY rowid DESC", zQuery);
- rc = sqlite3_exec(p->db, zQ2, dump_callback, p, &zErr);
- if( rc ){
- fprintf(p->out, "/****** ERROR: %s ******/\n", zErr);
- }else{
- rc = SQLITE_CORRUPT;
- }
- sqlite3_free(zErr);
- free(zQ2);
- }
- return rc;
+ int rc;
+ char *zErr = 0;
+ rc = sqlite3_exec(p->db, zQuery, dump_callback, p, &zErr);
+ if( rc==SQLITE_CORRUPT ){
+ char *zQ2;
+ int len = strlen30(zQuery);
+ fprintf(p->out, "/****** CORRUPTION ERROR *******/\n");
+ if( zErr ){
+ fprintf(p->out, "/****** %s ******/\n", zErr);
+ sqlite3_free(zErr);
+ zErr = 0;
+ }
+ zQ2 = (char *)malloc( len+100 );
+ if( zQ2==0 ) return rc;
+ sqlite3_snprintf(len+100, zQ2, "%s ORDER BY rowid DESC", zQuery);
+ rc = sqlite3_exec(p->db, zQ2, dump_callback, p, &zErr);
+ if( rc ){
+ fprintf(p->out, "/****** ERROR: %s ******/\n", zErr);
+ }else{
+ rc = SQLITE_CORRUPT;
+ }
+ sqlite3_free(zErr);
+ free(zQ2);
+ }
+ return rc;
}
/*
** Text of a help message
*/
static char zHelp[] =
- ".backup ?DB? FILE Backup DB (default \"main\") to FILE\n"
- ".bail ON|OFF Stop after hitting an error. Default OFF\n"
- ".clone NEWDB Clone data into NEWDB from the existing database\n"
- ".databases List names and files of attached databases\n"
- ".dump ?TABLE? ... Dump the database in an SQL text format\n"
- " If TABLE specified, only dump tables matching\n"
- " LIKE pattern TABLE.\n"
- ".echo ON|OFF Turn command echo on or off\n"
- ".exit Exit this program\n"
- ".explain ?ON|OFF? Turn output mode suitable for EXPLAIN on or off.\n"
- " With no args, it turns EXPLAIN on.\n"
- ".header(s) ON|OFF Turn display of headers on or off\n"
- ".help Show this message\n"
- ".import FILE TABLE Import data from FILE into TABLE\n"
- ".indices ?TABLE? Show names of all indices\n"
- " If TABLE specified, only show indices for tables\n"
- " matching LIKE pattern TABLE.\n"
+ ".backup ?DB? FILE Backup DB (default \"main\") to FILE\n"
+ ".bail ON|OFF Stop after hitting an error. Default OFF\n"
+ ".clone NEWDB Clone data into NEWDB from the existing database\n"
+ ".databases List names and files of attached databases\n"
+ ".dump ?TABLE? ... Dump the database in an SQL text format\n"
+ " If TABLE specified, only dump tables matching\n"
+ " LIKE pattern TABLE.\n"
+ ".echo ON|OFF Turn command echo on or off\n"
+ ".exit Exit this program\n"
+ ".explain ?ON|OFF? Turn output mode suitable for EXPLAIN on or off.\n"
+ " With no args, it turns EXPLAIN on.\n"
+ ".header(s) ON|OFF Turn display of headers on or off\n"
+ ".help Show this message\n"
+ ".import FILE TABLE Import data from FILE into TABLE\n"
+ ".indices ?TABLE? Show names of all indices\n"
+ " If TABLE specified, only show indices for tables\n"
+ " matching LIKE pattern TABLE.\n"
#ifdef SQLITE_ENABLE_IOTRACE
- ".iotrace FILE Enable I/O diagnostic logging to FILE\n"
+ ".iotrace FILE Enable I/O diagnostic logging to FILE\n"
#endif
#ifndef SQLITE_OMIT_LOAD_EXTENSION
- ".load FILE ?ENTRY? Load an extension library\n"
+ ".load FILE ?ENTRY? Load an extension library\n"
#endif
- ".log FILE|off Turn logging on or off. FILE can be stderr/stdout\n"
- ".mode MODE ?TABLE? Set output mode where MODE is one of:\n"
- " csv Comma-separated values\n"
- " column Left-aligned columns. (See .width)\n"
- " html HTML <table> code\n"
- " insert SQL insert statements for TABLE\n"
- " line One value per line\n"
- " list Values delimited by .separator string\n"
- " tabs Tab-separated values\n"
- " tcl TCL list elements\n"
- ".nullvalue STRING Use STRING in place of NULL values\n"
- ".open ?FILENAME? Close existing database and reopen FILENAME\n"
- ".output FILENAME Send output to FILENAME\n"
- ".output stdout Send output to the screen\n"
- ".print STRING... Print literal STRING\n"
- ".prompt MAIN CONTINUE Replace the standard prompts\n"
- ".quit Exit this program\n"
- ".read FILENAME Execute SQL in FILENAME\n"
- ".restore ?DB? FILE Restore content of DB (default \"main\") from FILE\n"
- ".save FILE Write in-memory database into FILE\n"
- ".schema ?TABLE? Show the CREATE statements\n"
- " If TABLE specified, only show tables matching\n"
- " LIKE pattern TABLE.\n"
- ".separator STRING Change separator used by output mode and .import\n"
- ".show Show the current values for various settings\n"
- ".stats ON|OFF Turn stats on or off\n"
- ".tables ?TABLE? List names of tables\n"
- " If TABLE specified, only list tables matching\n"
- " LIKE pattern TABLE.\n"
- ".timeout MS Try opening locked tables for MS milliseconds\n"
- ".trace FILE|off Output each SQL statement as it is run\n"
- ".vfsname ?AUX? Print the name of the VFS stack\n"
- ".width NUM1 NUM2 ... Set column widths for \"column\" mode\n"
+ ".log FILE|off Turn logging on or off. FILE can be stderr/stdout\n"
+ ".mode MODE ?TABLE? Set output mode where MODE is one of:\n"
+ " csv Comma-separated values\n"
+ " column Left-aligned columns. (See .width)\n"
+ " html HTML <table> code\n"
+ " insert SQL insert statements for TABLE\n"
+ " line One value per line\n"
+ " list Values delimited by .separator string\n"
+ " tabs Tab-separated values\n"
+ " tcl TCL list elements\n"
+ ".nullvalue STRING Use STRING in place of NULL values\n"
+ ".open ?FILENAME? Close existing database and reopen FILENAME\n"
+ ".output FILENAME Send output to FILENAME\n"
+ ".output stdout Send output to the screen\n"
+ ".print STRING... Print literal STRING\n"
+ ".prompt MAIN CONTINUE Replace the standard prompts\n"
+ ".quit Exit this program\n"
+ ".read FILENAME Execute SQL in FILENAME\n"
+ ".restore ?DB? FILE Restore content of DB (default \"main\") from FILE\n"
+ ".save FILE Write in-memory database into FILE\n"
+ ".schema ?TABLE? Show the CREATE statements\n"
+ " If TABLE specified, only show tables matching\n"
+ " LIKE pattern TABLE.\n"
+ ".separator STRING Change separator used by output mode and .import\n"
+ ".show Show the current values for various settings\n"
+ ".stats ON|OFF Turn stats on or off\n"
+ ".tables ?TABLE? List names of tables\n"
+ " If TABLE specified, only list tables matching\n"
+ " LIKE pattern TABLE.\n"
+ ".timeout MS Try opening locked tables for MS milliseconds\n"
+ ".trace FILE|off Output each SQL statement as it is run\n"
+ ".vfsname ?AUX? Print the name of the VFS stack\n"
+ ".width NUM1 NUM2 ... Set column widths for \"column\" mode\n"
;
static char zTimerHelp[] =
- ".timer ON|OFF Turn the CPU timer measurement on or off\n"
+ ".timer ON|OFF Turn the CPU timer measurement on or off\n"
;
/* Forward reference */
@@ -1637,24 +1636,24 @@ static int process_input(struct callback_data *p, FILE *in);
** the database fails to open, print an error message and exit.
*/
static void open_db(struct callback_data *p, int keepAlive){
- if( p->db==0 ){
- sqlite3_initialize();
- sqlite3_open(p->zDbFilename, &p->db);
- db = p->db;
- if( db && sqlite3_errcode(db)==SQLITE_OK ){
- sqlite3_create_function(db, "shellstatic", 0, SQLITE_UTF8, 0,
- shellstaticFunc, 0, 0);
- }
- if( db==0 || SQLITE_OK!=sqlite3_errcode(db) ){
- fprintf(stderr,"Error: unable to open database \"%s\": %s\n",
- p->zDbFilename, sqlite3_errmsg(db));
- if( keepAlive ) return;
- exit(1);
- }
+ if( p->db==0 ){
+ sqlite3_initialize();
+ sqlite3_open(p->zDbFilename, &p->db);
+ db = p->db;
+ if( db && sqlite3_errcode(db)==SQLITE_OK ){
+ sqlite3_create_function(db, "shellstatic", 0, SQLITE_UTF8, 0,
+ shellstaticFunc, 0, 0);
+ }
+ if( db==0 || SQLITE_OK!=sqlite3_errcode(db) ){
+ fprintf(stderr,"Error: unable to open database \"%s\": %s\n",
+ p->zDbFilename, sqlite3_errmsg(db));
+ if( keepAlive ) return;
+ exit(1);
+ }
#ifndef SQLITE_OMIT_LOAD_EXTENSION
- sqlite3_enable_load_extension(p->db, 1);
+ sqlite3_enable_load_extension(p->db, 1);
#endif
- }
+ }
}
/*
@@ -1668,34 +1667,34 @@ static void open_db(struct callback_data *p, int keepAlive){
** \\ -> backslash
*/
static void resolve_backslashes(char *z){
- int i, j;
- char c;
- for(i=j=0; (c = z[i])!=0; i++, j++){
- if( c=='\\' ){
- c = z[++i];
- if( c=='n' ){
- c = '\n';
- }else if( c=='t' ){
- c = '\t';
- }else if( c=='r' ){
- c = '\r';
- }else if( c=='\\' ){
- c = '\\';
- }else if( c>='0' && c<='7' ){
- c -= '0';
- if( z[i+1]>='0' && z[i+1]<='7' ){
- i++;
- c = (c<<3) + z[i] - '0';
- if( z[i+1]>='0' && z[i+1]<='7' ){
- i++;
- c = (c<<3) + z[i] - '0';
- }
- }
- }
- }
- z[j] = c;
- }
- z[j] = 0;
+ int i, j;
+ char c;
+ for(i=j=0; (c = z[i])!=0; i++, j++){
+ if( c=='\\' ){
+ c = z[++i];
+ if( c=='n' ){
+ c = '\n';
+ }else if( c=='t' ){
+ c = '\t';
+ }else if( c=='r' ){
+ c = '\r';
+ }else if( c=='\\' ){
+ c = '\\';
+ }else if( c>='0' && c<='7' ){
+ c -= '0';
+ if( z[i+1]>='0' && z[i+1]<='7' ){
+ i++;
+ c = (c<<3) + z[i] - '0';
+ if( z[i+1]>='0' && z[i+1]<='7' ){
+ i++;
+ c = (c<<3) + z[i] - '0';
+ }
+ }
+ }
+ }
+ z[j] = c;
+ }
+ z[j] = 0;
}
/*
@@ -1703,56 +1702,56 @@ static void resolve_backslashes(char *z){
** is not a hex digit.
*/
static int hexDigitValue(char c){
- if( c>='0' && c<='9' ) return c - '0';
- if( c>='a' && c<='f' ) return c - 'a' + 10;
- if( c>='A' && c<='F' ) return c - 'A' + 10;
- return -1;
+ if( c>='0' && c<='9' ) return c - '0';
+ if( c>='a' && c<='f' ) return c - 'a' + 10;
+ if( c>='A' && c<='F' ) return c - 'A' + 10;
+ return -1;
}
/*
** Interpret zArg as an integer value, possibly with suffixes.
*/
static sqlite3_int64 integerValue(const char *zArg){
- sqlite3_int64 v = 0;
- static const struct { char *zSuffix; int iMult; } aMult[] = {
- { "KiB", 1024 },
- { "MiB", 1024*1024 },
- { "GiB", 1024*1024*1024 },
- { "KB", 1000 },
- { "MB", 1000000 },
- { "GB", 1000000000 },
- { "K", 1000 },
- { "M", 1000000 },
- { "G", 1000000000 },
- };
- int i;
- int isNeg = 0;
- if( zArg[0]=='-' ){
- isNeg = 1;
- zArg++;
- }else if( zArg[0]=='+' ){
- zArg++;
- }
- if( zArg[0]=='0' && zArg[1]=='x' ){
- int x;
- zArg += 2;
- while( (x = hexDigitValue(zArg[0]))>=0 ){
- v = (v<<4) + x;
- zArg++;
- }
- }else{
- while( IsDigit(zArg[0]) ){
- v = v*10 + zArg[0] - '0';
- zArg++;
- }
- }
- for(i=0; i<ArraySize(aMult); i++){
- if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
- v *= aMult[i].iMult;
- break;
- }
- }
- return isNeg? -v : v;
+ sqlite3_int64 v = 0;
+ static const struct { char *zSuffix; int iMult; } aMult[] = {
+ { "KiB", 1024 },
+ { "MiB", 1024*1024 },
+ { "GiB", 1024*1024*1024 },
+ { "KB", 1000 },
+ { "MB", 1000000 },
+ { "GB", 1000000000 },
+ { "K", 1000 },
+ { "M", 1000000 },
+ { "G", 1000000000 },
+ };
+ int i;
+ int isNeg = 0;
+ if( zArg[0]=='-' ){
+ isNeg = 1;
+ zArg++;
+ }else if( zArg[0]=='+' ){
+ zArg++;
+ }
+ if( zArg[0]=='0' && zArg[1]=='x' ){
+ int x;
+ zArg += 2;
+ while( (x = hexDigitValue(zArg[0]))>=0 ){
+ v = (v<<4) + x;
+ zArg++;
+ }
+ }else{
+ while( IsDigit(zArg[0]) ){
+ v = v*10 + zArg[0] - '0';
+ zArg++;
+ }
+ }
+ for(i=0; i<ArraySize(aMult); i++){
+ if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
+ v *= aMult[i].iMult;
+ break;
+ }
+ }
+ return isNeg? -v : v;
}
/*
@@ -1760,59 +1759,59 @@ static sqlite3_int64 integerValue(const char *zArg){
** for TRUE and FALSE. Return the integer value if appropriate.
*/
static int booleanValue(char *zArg){
- int i;
- if( zArg[0]=='0' && zArg[1]=='x' ){
- for(i=2; hexDigitValue(zArg[i])>=0; i++){}
- }else{
- for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
- }
- if( i>0 && zArg[i]==0 ) return (int)(integerValue(zArg) & 0xffffffff);
- if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
- return 1;
- }
- if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
- return 0;
- }
- fprintf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
- zArg);
- return 0;
+ int i;
+ if( zArg[0]=='0' && zArg[1]=='x' ){
+ for(i=2; hexDigitValue(zArg[i])>=0; i++){}
+ }else{
+ for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
+ }
+ if( i>0 && zArg[i]==0 ) return (int)(integerValue(zArg) & 0xffffffff);
+ if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
+ return 1;
+ }
+ if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
+ return 0;
+ }
+ fprintf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
+ zArg);
+ return 0;
}
/*
** Close an output file, assuming it is not stderr or stdout
*/
static void output_file_close(FILE *f){
- if( f && f!=stdout && f!=stderr ) fclose(f);
+ if( f && f!=stdout && f!=stderr ) fclose(f);
}
/*
** Try to open an output file. The names "stdout" and "stderr" are
-** recognized and do the right thing. NULL is returned if the output
+** recognized and do the right thing. NULL is returned if the output
** filename is "off".
*/
static FILE *output_file_open(const char *zFile){
- FILE *f;
- if( strcmp(zFile,"stdout")==0 ){
- f = stdout;
- }else if( strcmp(zFile, "stderr")==0 ){
- f = stderr;
- }else if( strcmp(zFile, "off")==0 ){
- f = 0;
- }else{
- f = fopen(zFile, "wb");
- if( f==0 ){
- fprintf(stderr, "Error: cannot open \"%s\"\n", zFile);
- }
- }
- return f;
+ FILE *f;
+ if( strcmp(zFile,"stdout")==0 ){
+ f = stdout;
+ }else if( strcmp(zFile, "stderr")==0 ){
+ f = stderr;
+ }else if( strcmp(zFile, "off")==0 ){
+ f = 0;
+ }else{
+ f = fopen(zFile, "wb");
+ if( f==0 ){
+ fprintf(stderr, "Error: cannot open \"%s\"\n", zFile);
+ }
+ }
+ return f;
}
/*
** A routine for handling output from sqlite3_trace().
*/
static void sql_trace_callback(void *pArg, const char *z){
- FILE *f = (FILE*)pArg;
- if( f ) fprintf(f, "%s\n", z);
+ FILE *f = (FILE*)pArg;
+ if( f ) fprintf(f, "%s\n", z);
}
/*
@@ -1820,8 +1819,8 @@ static void sql_trace_callback(void *pArg, const char *z){
** a useful spot to set a debugger breakpoint.
*/
static void test_breakpoint(void){
- static int nCall = 0;
- nCall++;
+ static int nCall = 0;
+ nCall++;
}
/*
@@ -1829,27 +1828,27 @@ static void test_breakpoint(void){
*/
typedef struct CSVReader CSVReader;
struct CSVReader {
- const char *zFile; /* Name of the input file */
- FILE *in; /* Read the CSV text from this input stream */
- char *z; /* Accumulated text for a field */
- int n; /* Number of bytes in z */
- int nAlloc; /* Space allocated for z[] */
- int nLine; /* Current line number */
- int cTerm; /* Character that terminated the most recent field */
- int cSeparator; /* The separator character. (Usually ",") */
+ const char *zFile; /* Name of the input file */
+ FILE *in; /* Read the CSV text from this input stream */
+ char *z; /* Accumulated text for a field */
+ int n; /* Number of bytes in z */
+ int nAlloc; /* Space allocated for z[] */
+ int nLine; /* Current line number */
+ int cTerm; /* Character that terminated the most recent field */
+ int cSeparator; /* The separator character. (Usually ",") */
};
/* Append a single byte to z[] */
static void csv_append_char(CSVReader *p, int c){
- if( p->n+1>=p->nAlloc ){
- p->nAlloc += p->nAlloc + 100;
- p->z = (char *)sqlite3_realloc(p->z, p->nAlloc);
- if( p->z==0 ){
- fprintf(stderr, "out of memory\n");
- exit(1);
- }
- }
- p->z[p->n++] = (char)c;
+ if( p->n+1>=p->nAlloc ){
+ p->nAlloc += p->nAlloc + 100;
+ p->z = (char *)sqlite3_realloc(p->z, p->nAlloc);
+ if( p->z==0 ){
+ fprintf(stderr, "out of memory\n");
+ exit(1);
+ }
+ }
+ p->z[p->n++] = (char)c;
}
/* Read a single field of CSV text. Compatible with rfc4180 and extended
@@ -1865,63 +1864,63 @@ static void csv_append_char(CSVReader *p, int c){
** + Report syntax errors on stderr
*/
static char *csv_read_one_field(CSVReader *p){
- int c, pc, ppc;
- int cSep = p->cSeparator;
- p->n = 0;
- c = fgetc(p->in);
- if( c==EOF || seenInterrupt ){
- p->cTerm = EOF;
- return 0;
- }
- if( c=='"' ){
- int startLine = p->nLine;
- int cQuote = c;
- pc = ppc = 0;
- while( 1 ){
- c = fgetc(p->in);
- if( c=='\n' ) p->nLine++;
- if( c==cQuote ){
- if( pc==cQuote ){
- pc = 0;
- continue;
- }
- }
- if( (c==cSep && pc==cQuote)
- || (c=='\n' && pc==cQuote)
- || (c=='\n' && pc=='\r' && ppc==cQuote)
- || (c==EOF && pc==cQuote)
- ){
- do{ p->n--; }while( p->z[p->n]!=cQuote );
- p->cTerm = c;
- break;
- }
- if( pc==cQuote && c!='\r' ){
- fprintf(stderr, "%s:%d: unescaped %c character\n",
- p->zFile, p->nLine, cQuote);
- }
- if( c==EOF ){
- fprintf(stderr, "%s:%d: unterminated %c-quoted field\n",
- p->zFile, startLine, cQuote);
- p->cTerm = EOF;
- break;
- }
- csv_append_char(p, c);
- ppc = pc;
- pc = c;
- }
- }else{
- while( c!=EOF && c!=cSep && c!='\n' ){
- csv_append_char(p, c);
- c = fgetc(p->in);
- }
- if( c=='\n' ){
- p->nLine++;
- if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
- }
- p->cTerm = c;
- }
- if( p->z ) p->z[p->n] = 0;
- return p->z;
+ int c, pc, ppc;
+ int cSep = p->cSeparator;
+ p->n = 0;
+ c = fgetc(p->in);
+ if( c==EOF || seenInterrupt ){
+ p->cTerm = EOF;
+ return 0;
+ }
+ if( c=='"' ){
+ int startLine = p->nLine;
+ int cQuote = c;
+ pc = ppc = 0;
+ while( 1 ){
+ c = fgetc(p->in);
+ if( c=='\n' ) p->nLine++;
+ if( c==cQuote ){
+ if( pc==cQuote ){
+ pc = 0;
+ continue;
+ }
+ }
+ if( (c==cSep && pc==cQuote)
+ || (c=='\n' && pc==cQuote)
+ || (c=='\n' && pc=='\r' && ppc==cQuote)
+ || (c==EOF && pc==cQuote)
+ ){
+ do{ p->n--; }while( p->z[p->n]!=cQuote );
+ p->cTerm = c;
+ break;
+ }
+ if( pc==cQuote && c!='\r' ){
+ fprintf(stderr, "%s:%d: unescaped %c character\n",
+ p->zFile, p->nLine, cQuote);
+ }
+ if( c==EOF ){
+ fprintf(stderr, "%s:%d: unterminated %c-quoted field\n",
+ p->zFile, startLine, cQuote);
+ p->cTerm = EOF;
+ break;
+ }
+ csv_append_char(p, c);
+ ppc = pc;
+ pc = c;
+ }
+ }else{
+ while( c!=EOF && c!=cSep && c!='\n' ){
+ csv_append_char(p, c);
+ c = fgetc(p->in);
+ }
+ if( c=='\n' ){
+ p->nLine++;
+ if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
+ }
+ p->cTerm = c;
+ }
+ if( p->z ) p->z[p->n] = 0;
+ return p->z;
}
/*
@@ -1930,109 +1929,109 @@ static char *csv_read_one_field(CSVReader *p){
** work for WITHOUT ROWID tables.
*/
static void tryToCloneData(
- struct callback_data *p,
- sqlite3 *newDb,
- const char *zTable
+ struct callback_data *p,
+ sqlite3 *newDb,
+ const char *zTable
){
- sqlite3_stmt *pQuery = 0;
- sqlite3_stmt *pInsert = 0;
- char *zQuery = 0;
- char *zInsert = 0;
- int rc;
- int i, j, n;
- int nTable = (int)strlen(zTable);
- int k = 0;
- int cnt = 0;
- const int spinRate = 10000;
-
- zQuery = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
- rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
- if( rc ){
- fprintf(stderr, "Error %d: %s on [%s]\n",
- sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
- zQuery);
- goto end_data_xfer;
- }
- n = sqlite3_column_count(pQuery);
- zInsert = (char *)sqlite3_malloc(200 + nTable + n*3);
- if( zInsert==0 ){
- fprintf(stderr, "out of memory\n");
- goto end_data_xfer;
- }
- sqlite3_snprintf(200+nTable,zInsert,
- "INSERT OR IGNORE INTO \"%s\" VALUES(?", zTable);
- i = (int)strlen(zInsert);
- for(j=1; j<n; j++){
- memcpy(zInsert+i, ",?", 2);
- i += 2;
- }
- memcpy(zInsert+i, ");", 3);
- rc = sqlite3_prepare_v2(newDb, zInsert, -1, &pInsert, 0);
- if( rc ){
- fprintf(stderr, "Error %d: %s on [%s]\n",
- sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
- zQuery);
- goto end_data_xfer;
- }
- for(k=0; k<2; k++){
- while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
- for(i=0; i<n; i++){
- switch( sqlite3_column_type(pQuery, i) ){
- case SQLITE_NULL: {
- sqlite3_bind_null(pInsert, i+1);
- break;
- }
- case SQLITE_INTEGER: {
- sqlite3_bind_int64(pInsert, i+1, sqlite3_column_int64(pQuery,i));
- break;
- }
- case SQLITE_FLOAT: {
- sqlite3_bind_double(pInsert, i+1, sqlite3_column_double(pQuery,i));
- break;
- }
- case SQLITE_TEXT: {
- sqlite3_bind_text(pInsert, i+1,
- (const char*)sqlite3_column_text(pQuery,i),
- -1, SQLITE_STATIC);
- break;
- }
- case SQLITE_BLOB: {
- sqlite3_bind_blob(pInsert, i+1, sqlite3_column_blob(pQuery,i),
- sqlite3_column_bytes(pQuery,i),
- SQLITE_STATIC);
- break;
- }
- }
- } /* End for */
- rc = sqlite3_step(pInsert);
- if( rc!=SQLITE_OK && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
- fprintf(stderr, "Error %d: %s\n", sqlite3_extended_errcode(newDb),
- sqlite3_errmsg(newDb));
- }
- sqlite3_reset(pInsert);
- cnt++;
- if( (cnt%spinRate)==0 ){
- printf("%c\b", "|/-\\"[(cnt/spinRate)%4]);
- fflush(stdout);
- }
- } /* End while */
- if( rc==SQLITE_DONE ) break;
- sqlite3_finalize(pQuery);
- sqlite3_free(zQuery);
- zQuery = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY rowid DESC;",
- zTable);
- rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
- if( rc ){
- fprintf(stderr, "Warning: cannot step \"%s\" backwards", zTable);
- break;
- }
- } /* End for(k=0...) */
+ sqlite3_stmt *pQuery = 0;
+ sqlite3_stmt *pInsert = 0;
+ char *zQuery = 0;
+ char *zInsert = 0;
+ int rc;
+ int i, j, n;
+ int nTable = (int)strlen(zTable);
+ int k = 0;
+ int cnt = 0;
+ const int spinRate = 10000;
+
+ zQuery = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
+ rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+ if( rc ){
+ fprintf(stderr, "Error %d: %s on [%s]\n",
+ sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
+ zQuery);
+ goto end_data_xfer;
+ }
+ n = sqlite3_column_count(pQuery);
+ zInsert = (char *)sqlite3_malloc(200 + nTable + n*3);
+ if( zInsert==0 ){
+ fprintf(stderr, "out of memory\n");
+ goto end_data_xfer;
+ }
+ sqlite3_snprintf(200+nTable,zInsert,
+ "INSERT OR IGNORE INTO \"%s\" VALUES(?", zTable);
+ i = (int)strlen(zInsert);
+ for(j=1; j<n; j++){
+ memcpy(zInsert+i, ",?", 2);
+ i += 2;
+ }
+ memcpy(zInsert+i, ");", 3);
+ rc = sqlite3_prepare_v2(newDb, zInsert, -1, &pInsert, 0);
+ if( rc ){
+ fprintf(stderr, "Error %d: %s on [%s]\n",
+ sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
+ zQuery);
+ goto end_data_xfer;
+ }
+ for(k=0; k<2; k++){
+ while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
+ for(i=0; i<n; i++){
+ switch( sqlite3_column_type(pQuery, i) ){
+ case SQLITE_NULL: {
+ sqlite3_bind_null(pInsert, i+1);
+ break;
+ }
+ case SQLITE_INTEGER: {
+ sqlite3_bind_int64(pInsert, i+1, sqlite3_column_int64(pQuery,i));
+ break;
+ }
+ case SQLITE_FLOAT: {
+ sqlite3_bind_double(pInsert, i+1, sqlite3_column_double(pQuery,i));
+ break;
+ }
+ case SQLITE_TEXT: {
+ sqlite3_bind_text(pInsert, i+1,
+ (const char*)sqlite3_column_text(pQuery,i),
+ -1, SQLITE_STATIC);
+ break;
+ }
+ case SQLITE_BLOB: {
+ sqlite3_bind_blob(pInsert, i+1, sqlite3_column_blob(pQuery,i),
+ sqlite3_column_bytes(pQuery,i),
+ SQLITE_STATIC);
+ break;
+ }
+ }
+ } /* End for */
+ rc = sqlite3_step(pInsert);
+ if( rc!=SQLITE_OK && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
+ fprintf(stderr, "Error %d: %s\n", sqlite3_extended_errcode(newDb),
+ sqlite3_errmsg(newDb));
+ }
+ sqlite3_reset(pInsert);
+ cnt++;
+ if( (cnt%spinRate)==0 ){
+ printf("%c\b", "|/-\\"[(cnt/spinRate)%4]);
+ fflush(stdout);
+ }
+ } /* End while */
+ if( rc==SQLITE_DONE ) break;
+ sqlite3_finalize(pQuery);
+ sqlite3_free(zQuery);
+ zQuery = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY rowid DESC;",
+ zTable);
+ rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+ if( rc ){
+ fprintf(stderr, "Warning: cannot step \"%s\" backwards", zTable);
+ break;
+ }
+ } /* End for(k=0...) */
end_data_xfer:
- sqlite3_finalize(pQuery);
- sqlite3_finalize(pInsert);
- sqlite3_free(zQuery);
- sqlite3_free(zInsert);
+ sqlite3_finalize(pQuery);
+ sqlite3_finalize(pInsert);
+ sqlite3_free(zQuery);
+ sqlite3_free(zInsert);
}
@@ -2043,73 +2042,73 @@ end_data_xfer:
** sqlite_master table, try again moving backwards.
*/
static void tryToCloneSchema(
- struct callback_data *p,
- sqlite3 *newDb,
- const char *zWhere,
- void (*xForEach)(struct callback_data*,sqlite3*,const char*)
+ struct callback_data *p,
+ sqlite3 *newDb,
+ const char *zWhere,
+ void (*xForEach)(struct callback_data*,sqlite3*,const char*)
){
- sqlite3_stmt *pQuery = 0;
- char *zQuery = 0;
- int rc;
- const unsigned char *zName;
- const unsigned char *zSql;
- char *zErrMsg = 0;
-
- zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
- " WHERE %s", zWhere);
- rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
- if( rc ){
- fprintf(stderr, "Error: (%d) %s on [%s]\n",
- sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
- zQuery);
- goto end_schema_xfer;
- }
- while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
- zName = sqlite3_column_text(pQuery, 0);
- zSql = sqlite3_column_text(pQuery, 1);
- printf("%s... ", zName); fflush(stdout);
- sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
- if( zErrMsg ){
- fprintf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
- sqlite3_free(zErrMsg);
- zErrMsg = 0;
- }
- if( xForEach ){
- xForEach(p, newDb, (const char*)zName);
- }
- printf("done\n");
- }
- if( rc!=SQLITE_DONE ){
- sqlite3_finalize(pQuery);
- sqlite3_free(zQuery);
- zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
- " WHERE %s ORDER BY rowid DESC", zWhere);
- rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
- if( rc ){
- fprintf(stderr, "Error: (%d) %s on [%s]\n",
- sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
- zQuery);
- goto end_schema_xfer;
- }
- while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
- zName = sqlite3_column_text(pQuery, 0);
- zSql = sqlite3_column_text(pQuery, 1);
- printf("%s... ", zName); fflush(stdout);
- sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
- if( zErrMsg ){
- fprintf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
- sqlite3_free(zErrMsg);
- zErrMsg = 0;
- }
- if( xForEach ){
- xForEach(p, newDb, (const char*)zName);
- }
- printf("done\n");
- }
- }
+ sqlite3_stmt *pQuery = 0;
+ char *zQuery = 0;
+ int rc;
+ const unsigned char *zName;
+ const unsigned char *zSql;
+ char *zErrMsg = 0;
+
+ zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
+ " WHERE %s", zWhere);
+ rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+ if( rc ){
+ fprintf(stderr, "Error: (%d) %s on [%s]\n",
+ sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
+ zQuery);
+ goto end_schema_xfer;
+ }
+ while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
+ zName = sqlite3_column_text(pQuery, 0);
+ zSql = sqlite3_column_text(pQuery, 1);
+ printf("%s... ", zName); fflush(stdout);
+ sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
+ if( zErrMsg ){
+ fprintf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
+ sqlite3_free(zErrMsg);
+ zErrMsg = 0;
+ }
+ if( xForEach ){
+ xForEach(p, newDb, (const char*)zName);
+ }
+ printf("done\n");
+ }
+ if( rc!=SQLITE_DONE ){
+ sqlite3_finalize(pQuery);
+ sqlite3_free(zQuery);
+ zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
+ " WHERE %s ORDER BY rowid DESC", zWhere);
+ rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+ if( rc ){
+ fprintf(stderr, "Error: (%d) %s on [%s]\n",
+ sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
+ zQuery);
+ goto end_schema_xfer;
+ }
+ while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
+ zName = sqlite3_column_text(pQuery, 0);
+ zSql = sqlite3_column_text(pQuery, 1);
+ printf("%s... ", zName); fflush(stdout);
+ sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
+ if( zErrMsg ){
+ fprintf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
+ sqlite3_free(zErrMsg);
+ zErrMsg = 0;
+ }
+ if( xForEach ){
+ xForEach(p, newDb, (const char*)zName);
+ }
+ printf("done\n");
+ }
+ }
end_schema_xfer:
- sqlite3_finalize(pQuery);
- sqlite3_free(zQuery);
+ sqlite3_finalize(pQuery);
+ sqlite3_free(zQuery);
}
/*
@@ -2118,23 +2117,23 @@ end_schema_xfer:
** into zNewDb.
*/
static void tryToClone(struct callback_data *p, const char *zNewDb){
- int rc;
- sqlite3 *newDb = 0;
- if( access(zNewDb,0)==0 ){
- fprintf(stderr, "File \"%s\" already exists.\n", zNewDb);
- return;
- }
- rc = sqlite3_open(zNewDb, &newDb);
- if( rc ){
- fprintf(stderr, "Cannot create output database: %s\n",
- sqlite3_errmsg(newDb));
- }else{
- sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0);
- tryToCloneSchema(p, newDb, "type='table'", tryToCloneData);
- tryToCloneSchema(p, newDb, "type!='table'", 0);
- sqlite3_exec(newDb, "COMMIT;", 0, 0, 0);
- }
- sqlite3_close(newDb);
+ int rc;
+ sqlite3 *newDb = 0;
+ if( access(zNewDb,0)==0 ){
+ fprintf(stderr, "File \"%s\" already exists.\n", zNewDb);
+ return;
+ }
+ rc = sqlite3_open(zNewDb, &newDb);
+ if( rc ){
+ fprintf(stderr, "Cannot create output database: %s\n",
+ sqlite3_errmsg(newDb));
+ }else{
+ sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0);
+ tryToCloneSchema(p, newDb, "type='table'", tryToCloneData);
+ tryToCloneSchema(p, newDb, "type!='table'", 0);
+ sqlite3_exec(newDb, "COMMIT;", 0, 0, 0);
+ }
+ sqlite3_close(newDb);
}
/*
@@ -2144,1051 +2143,1050 @@ static void tryToClone(struct callback_data *p, const char *zNewDb){
** Return 1 on error, 2 to exit, and 0 otherwise.
*/
static int do_meta_command(char *zLine, struct callback_data *p){
- int i = 1;
- int nArg = 0;
- int n, c;
- int rc = 0;
- char *azArg[50];
-
- /* Parse the input line into tokens.
- */
- while( zLine[i] && nArg<ArraySize(azArg) ){
- while( IsSpace(zLine[i]) ){ i++; }
- if( zLine[i]==0 ) break;
- if( zLine[i]=='\'' || zLine[i]=='"' ){
- int delim = zLine[i++];
- azArg[nArg++] = &zLine[i];
- while( zLine[i] && zLine[i]!=delim ){
- if( zLine[i]=='\\' && delim=='"' && zLine[i+1]!=0 ) i++;
- i++;
- }
- if( zLine[i]==delim ){
- zLine[i++] = 0;
- }
- if( delim=='"' ) resolve_backslashes(azArg[nArg-1]);
- }else{
- azArg[nArg++] = &zLine[i];
- while( zLine[i] && !IsSpace(zLine[i]) ){ i++; }
- if( zLine[i] ) zLine[i++] = 0;
- resolve_backslashes(azArg[nArg-1]);
- }
- }
-
- /* Process the input line.
- */
- if( nArg==0 ) return 0; /* no tokens, no error */
- n = strlen30(azArg[0]);
- c = azArg[0][0];
- if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
- || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
- ){
- const char *zDestFile = 0;
- const char *zDb = 0;
- sqlite3 *pDest;
- sqlite3_backup *pBackup;
- int j;
- for(j=1; j<nArg; j++){
- const char *z = azArg[j];
- if( z[0]=='-' ){
- while( z[0]=='-' ) z++;
- /* No options to process at this time */
- {
- fprintf(stderr, "unknown option: %s\n", azArg[j]);
- return 1;
- }
- }else if( zDestFile==0 ){
- zDestFile = azArg[j];
- }else if( zDb==0 ){
- zDb = zDestFile;
- zDestFile = azArg[j];
- }else{
- fprintf(stderr, "too many arguments to .backup\n");
- return 1;
- }
- }
- if( zDestFile==0 ){
- fprintf(stderr, "missing FILENAME argument on .backup\n");
- return 1;
- }
- if( zDb==0 ) zDb = "main";
- rc = sqlite3_open(zDestFile, &pDest);
- if( rc!=SQLITE_OK ){
- fprintf(stderr, "Error: cannot open \"%s\"\n", zDestFile);
- sqlite3_close(pDest);
- return 1;
- }
- open_db(p, 0);
- pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
- if( pBackup==0 ){
- fprintf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
- sqlite3_close(pDest);
- return 1;
- }
- while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK ){}
- sqlite3_backup_finish(pBackup);
- if( rc==SQLITE_DONE ){
- rc = 0;
- }else{
- fprintf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
- rc = 1;
- }
- sqlite3_close(pDest);
- }else
-
- if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 && nArg>1 && nArg<3 ){
- bail_on_error = booleanValue(azArg[1]);
- }else
-
- /* The undocumented ".breakpoint" command causes a call to the no-op
- ** routine named test_breakpoint().
- */
- if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
- test_breakpoint();
- }else
-
- if( c=='c' && strncmp(azArg[0], "clone", n)==0 && nArg>1 && nArg<3 ){
- tryToClone(p, azArg[1]);
- }else
-
- if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 && nArg==1 ){
- struct callback_data data;
- char *zErrMsg = 0;
- open_db(p, 0);
- memcpy(&data, p, sizeof(data));
- data.showHeader = 1;
- data.mode = MODE_Column;
- data.colWidth[0] = 3;
- data.colWidth[1] = 15;
- data.colWidth[2] = 58;
- data.cnt = 0;
- sqlite3_exec(p->db, "PRAGMA database_list; ", callback, &data, &zErrMsg);
- if( zErrMsg ){
- fprintf(stderr,"Error: %s\n", zErrMsg);
- sqlite3_free(zErrMsg);
- rc = 1;
- }
- }else
-
- if( c=='d' && strncmp(azArg[0], "dump", n)==0 && nArg<3 ){
- open_db(p, 0);
- /* When playing back a "dump", the content might appear in an order
- ** which causes immediate foreign key constraints to be violated.
- ** So disable foreign-key constraint enforcement to prevent problems. */
- fprintf(p->out, "PRAGMA foreign_keys=OFF;\n");
- fprintf(p->out, "BEGIN TRANSACTION;\n");
- p->writableSchema = 0;
- sqlite3_exec(p->db, "SAVEPOINT dump; PRAGMA writable_schema=ON", 0, 0, 0);
- p->nErr = 0;
- if( nArg==1 ){
- run_schema_dump_query(p,
- "SELECT name, type, sql FROM sqlite_master "
- "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'"
- );
- run_schema_dump_query(p,
- "SELECT name, type, sql FROM sqlite_master "
- "WHERE name=='sqlite_sequence'"
- );
- run_table_dump_query(p,
- "SELECT sql FROM sqlite_master "
- "WHERE sql NOT NULL AND type IN ('index','trigger','view')", 0
- );
- }else{
- int i;
- for(i=1; i<nArg; i++){
- zShellStatic = azArg[i];
- run_schema_dump_query(p,
- "SELECT name, type, sql FROM sqlite_master "
- "WHERE tbl_name LIKE shellstatic() AND type=='table'"
- " AND sql NOT NULL");
- run_table_dump_query(p,
- "SELECT sql FROM sqlite_master "
- "WHERE sql NOT NULL"
- " AND type IN ('index','trigger','view')"
- " AND tbl_name LIKE shellstatic()", 0
- );
- zShellStatic = 0;
- }
- }
- if( p->writableSchema ){
- fprintf(p->out, "PRAGMA writable_schema=OFF;\n");
- p->writableSchema = 0;
- }
- sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
- sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0);
- fprintf(p->out, p->nErr ? "ROLLBACK; -- due to errors\n" : "COMMIT;\n");
- }else
-
- if( c=='e' && strncmp(azArg[0], "echo", n)==0 && nArg>1 && nArg<3 ){
- p->echoOn = booleanValue(azArg[1]);
- }else
-
- if( c=='e' && strncmp(azArg[0], "eqp", n)==0 && nArg>1 && nArg<3 ){
- p->autoEQP = booleanValue(azArg[1]);
- }else
-
- if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
- if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
- rc = 2;
- }else
-
- if( c=='e' && strncmp(azArg[0], "explain", n)==0 && nArg<3 ){
- int val = nArg>=2 ? booleanValue(azArg[1]) : 1;
- if(val == 1) {
- if(!p->explainPrev.valid) {
- p->explainPrev.valid = 1;
- p->explainPrev.mode = p->mode;
- p->explainPrev.showHeader = p->showHeader;
- memcpy(p->explainPrev.colWidth,p->colWidth,sizeof(p->colWidth));
- }
- /* We could put this code under the !p->explainValid
- ** condition so that it does not execute if we are already in
- ** explain mode. However, always executing it allows us an easy
- ** was to reset to explain mode in case the user previously
- ** did an .explain followed by a .width, .mode or .header
- ** command.
- */
- p->mode = MODE_Explain;
- p->showHeader = 1;
- memset(p->colWidth,0,sizeof(p->colWidth));
- p->colWidth[0] = 4; /* addr */
- p->colWidth[1] = 13; /* opcode */
- p->colWidth[2] = 4; /* P1 */
- p->colWidth[3] = 4; /* P2 */
- p->colWidth[4] = 4; /* P3 */
- p->colWidth[5] = 13; /* P4 */
- p->colWidth[6] = 2; /* P5 */
- p->colWidth[7] = 13; /* Comment */
- }else if (p->explainPrev.valid) {
- p->explainPrev.valid = 0;
- p->mode = p->explainPrev.mode;
- p->showHeader = p->explainPrev.showHeader;
- memcpy(p->colWidth,p->explainPrev.colWidth,sizeof(p->colWidth));
- }
- }else
-
- if( c=='h' && (strncmp(azArg[0], "header", n)==0 ||
- strncmp(azArg[0], "headers", n)==0) && nArg>1 && nArg<3 ){
- p->showHeader = booleanValue(azArg[1]);
- }else
-
- if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
- fprintf(stderr,"%s",zHelp);
- if( HAS_TIMER ){
- fprintf(stderr,"%s",zTimerHelp);
- }
- }else
-
- if( c=='i' && strncmp(azArg[0], "import", n)==0 && nArg==3 ){
- char *zTable = azArg[2]; /* Insert data into this table */
- char *zFile = azArg[1]; /* Name of file to extra content from */
- sqlite3_stmt *pStmt = NULL; /* A statement */
- int nCol; /* Number of columns in the table */
- int nByte; /* Number of bytes in an SQL string */
- int i, j; /* Loop counters */
- int needCommit; /* True to COMMIT or ROLLBACK at end */
- int nSep; /* Number of bytes in p->separator[] */
- char *zSql; /* An SQL statement */
- CSVReader sCsv; /* Reader context */
- int (*xCloser)(FILE*); /* Procedure to close th3 connection */
-
- seenInterrupt = 0;
- memset(&sCsv, 0, sizeof(sCsv));
- open_db(p, 0);
- nSep = strlen30(p->separator);
- if( nSep==0 ){
- fprintf(stderr, "Error: non-null separator required for import\n");
- return 1;
- }
- if( nSep>1 ){
- fprintf(stderr, "Error: multi-character separators not allowed"
- " for import\n");
- return 1;
- }
- sCsv.zFile = zFile;
- sCsv.nLine = 1;
- if( sCsv.zFile[0]=='|' ){
- sCsv.in = popen(sCsv.zFile+1, "r");
- sCsv.zFile = "<pipe>";
- xCloser = pclose;
- }else{
- sCsv.in = fopen(sCsv.zFile, "rb");
- xCloser = fclose;
- }
- if( sCsv.in==0 ){
- fprintf(stderr, "Error: cannot open \"%s\"\n", zFile);
- return 1;
- }
- sCsv.cSeparator = p->separator[0];
- zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
- if( zSql==0 ){
- fprintf(stderr, "Error: out of memory\n");
- xCloser(sCsv.in);
- return 1;
- }
- nByte = strlen30(zSql);
- rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
- if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(db))==0 ){
- char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
- char cSep = '(';
- while( csv_read_one_field(&sCsv) ){
- zCreate = sqlite3_mprintf("%z%c\n \"%s\" TEXT", zCreate, cSep, sCsv.z);
- cSep = ',';
- if( sCsv.cTerm!=sCsv.cSeparator ) break;
- }
- if( cSep=='(' ){
- sqlite3_free(zCreate);
- sqlite3_free(sCsv.z);
- xCloser(sCsv.in);
- fprintf(stderr,"%s: empty file\n", sCsv.zFile);
- return 1;
- }
- zCreate = sqlite3_mprintf("%z\n)", zCreate);
- rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
- sqlite3_free(zCreate);
- if( rc ){
- fprintf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
- sqlite3_errmsg(db));
- sqlite3_free(sCsv.z);
- xCloser(sCsv.in);
- return 1;
- }
- rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
- }
- sqlite3_free(zSql);
- if( rc ){
- if (pStmt) sqlite3_finalize(pStmt);
- fprintf(stderr,"Error: %s\n", sqlite3_errmsg(db));
- xCloser(sCsv.in);
- return 1;
- }
- nCol = sqlite3_column_count(pStmt);
- sqlite3_finalize(pStmt);
- pStmt = 0;
- if( nCol==0 ) return 0; /* no columns, no error */
- zSql = (char *)sqlite3_malloc( nByte*2 + 20 + nCol*2 );
- if( zSql==0 ){
- fprintf(stderr, "Error: out of memory\n");
- xCloser(sCsv.in);
- return 1;
- }
- sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
- j = strlen30(zSql);
- for(i=1; i<nCol; i++){
- zSql[j++] = ',';
- zSql[j++] = '?';
- }
- zSql[j++] = ')';
- zSql[j] = 0;
- rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
- sqlite3_free(zSql);
- if( rc ){
- fprintf(stderr, "Error: %s\n", sqlite3_errmsg(db));
- if (pStmt) sqlite3_finalize(pStmt);
- xCloser(sCsv.in);
- return 1;
- }
- needCommit = sqlite3_get_autocommit(db);
- if( needCommit ) sqlite3_exec(db, "BEGIN", 0, 0, 0);
- do{
- int startLine = sCsv.nLine;
- for(i=0; i<nCol; i++){
- char *z = csv_read_one_field(&sCsv);
- if( z==0 && i==0 ) break;
- sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT);
- if( i<nCol-1 && sCsv.cTerm!=sCsv.cSeparator ){
- fprintf(stderr, "%s:%d: expected %d columns but found %d - "
- "filling the rest with NULL\n",
- sCsv.zFile, startLine, nCol, i+1);
- i++;
- while( i<nCol ){ sqlite3_bind_null(pStmt, i); i++; }
- }
- }
- if( sCsv.cTerm==sCsv.cSeparator ){
- do{
- csv_read_one_field(&sCsv);
- i++;
- }while( sCsv.cTerm==sCsv.cSeparator );
- fprintf(stderr, "%s:%d: expected %d columns but found %d - "
- "extras ignored\n",
- sCsv.zFile, startLine, nCol, i);
- }
- if( i>=nCol ){
- sqlite3_step(pStmt);
- rc = sqlite3_reset(pStmt);
- if( rc!=SQLITE_OK ){
- fprintf(stderr, "%s:%d: INSERT failed: %s\n", sCsv.zFile, startLine,
- sqlite3_errmsg(db));
- }
- }
- }while( sCsv.cTerm!=EOF );
-
- xCloser(sCsv.in);
- sqlite3_free(sCsv.z);
- sqlite3_finalize(pStmt);
- if( needCommit ) sqlite3_exec(db, "COMMIT", 0, 0, 0);
- }else
-
- if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg<3 ){
- struct callback_data data;
- char *zErrMsg = 0;
- open_db(p, 0);
- memcpy(&data, p, sizeof(data));
- data.showHeader = 0;
- data.mode = MODE_List;
- if( nArg==1 ){
- rc = sqlite3_exec(p->db,
- "SELECT name FROM sqlite_master "
- "WHERE type='index' AND name NOT LIKE 'sqlite_%' "
- "UNION ALL "
- "SELECT name FROM sqlite_temp_master "
- "WHERE type='index' "
- "ORDER BY 1",
- callback, &data, &zErrMsg
- );
- }else{
- zShellStatic = azArg[1];
- rc = sqlite3_exec(p->db,
- "SELECT name FROM sqlite_master "
- "WHERE type='index' AND tbl_name LIKE shellstatic() "
- "UNION ALL "
- "SELECT name FROM sqlite_temp_master "
- "WHERE type='index' AND tbl_name LIKE shellstatic() "
- "ORDER BY 1",
- callback, &data, &zErrMsg
- );
- zShellStatic = 0;
- }
- if( zErrMsg ){
- fprintf(stderr,"Error: %s\n", zErrMsg);
- sqlite3_free(zErrMsg);
- rc = 1;
- }else if( rc != SQLITE_OK ){
- fprintf(stderr,"Error: querying sqlite_master and sqlite_temp_master\n");
- rc = 1;
- }
- }else
+ int i = 1;
+ int nArg = 0;
+ int n, c;
+ int rc = 0;
+ char *azArg[50];
+
+ /* Parse the input line into tokens.
+ */
+ while( zLine[i] && nArg<ArraySize(azArg) ){
+ while( IsSpace(zLine[i]) ){ i++; }
+ if( zLine[i]==0 ) break;
+ if( zLine[i]=='\'' || zLine[i]=='"' ){
+ int delim = zLine[i++];
+ azArg[nArg++] = &zLine[i];
+ while( zLine[i] && zLine[i]!=delim ){
+ if( zLine[i]=='\\' && delim=='"' && zLine[i+1]!=0 ) i++;
+ i++;
+ }
+ if( zLine[i]==delim ){
+ zLine[i++] = 0;
+ }
+ if( delim=='"' ) resolve_backslashes(azArg[nArg-1]);
+ }else{
+ azArg[nArg++] = &zLine[i];
+ while( zLine[i] && !IsSpace(zLine[i]) ){ i++; }
+ if( zLine[i] ) zLine[i++] = 0;
+ resolve_backslashes(azArg[nArg-1]);
+ }
+ }
+
+ /* Process the input line.
+ */
+ if( nArg==0 ) return 0; /* no tokens, no error */
+ n = strlen30(azArg[0]);
+ c = azArg[0][0];
+ if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
+ || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
+ ){
+ const char *zDestFile = 0;
+ const char *zDb = 0;
+ sqlite3 *pDest;
+ sqlite3_backup *pBackup;
+ int j;
+ for(j=1; j<nArg; j++){
+ const char *z = azArg[j];
+ if( z[0]=='-' ){
+ while( z[0]=='-' ) z++;
+ /* No options to process at this time */
+ {
+ fprintf(stderr, "unknown option: %s\n", azArg[j]);
+ return 1;
+ }
+ }else if( zDestFile==0 ){
+ zDestFile = azArg[j];
+ }else if( zDb==0 ){
+ zDb = zDestFile;
+ zDestFile = azArg[j];
+ }else{
+ fprintf(stderr, "too many arguments to .backup\n");
+ return 1;
+ }
+ }
+ if( zDestFile==0 ){
+ fprintf(stderr, "missing FILENAME argument on .backup\n");
+ return 1;
+ }
+ if( zDb==0 ) zDb = "main";
+ rc = sqlite3_open(zDestFile, &pDest);
+ if( rc!=SQLITE_OK ){
+ fprintf(stderr, "Error: cannot open \"%s\"\n", zDestFile);
+ sqlite3_close(pDest);
+ return 1;
+ }
+ open_db(p, 0);
+ pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
+ if( pBackup==0 ){
+ fprintf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
+ sqlite3_close(pDest);
+ return 1;
+ }
+ while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK ){}
+ sqlite3_backup_finish(pBackup);
+ if( rc==SQLITE_DONE ){
+ rc = 0;
+ }else{
+ fprintf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
+ rc = 1;
+ }
+ sqlite3_close(pDest);
+ }else
+
+ if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 && nArg>1 && nArg<3 ){
+ bail_on_error = booleanValue(azArg[1]);
+ }else
+
+ /* The undocumented ".breakpoint" command causes a call to the no-op
+ ** routine named test_breakpoint().
+ */
+ if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
+ test_breakpoint();
+ }else
+
+ if( c=='c' && strncmp(azArg[0], "clone", n)==0 && nArg>1 && nArg<3 ){
+ tryToClone(p, azArg[1]);
+ }else
+
+ if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 && nArg==1 ){
+ struct callback_data data;
+ char *zErrMsg = 0;
+ open_db(p, 0);
+ memcpy(&data, p, sizeof(data));
+ data.showHeader = 1;
+ data.mode = MODE_Column;
+ data.colWidth[0] = 3;
+ data.colWidth[1] = 15;
+ data.colWidth[2] = 58;
+ data.cnt = 0;
+ sqlite3_exec(p->db, "PRAGMA database_list; ", callback, &data, &zErrMsg);
+ if( zErrMsg ){
+ fprintf(stderr,"Error: %s\n", zErrMsg);
+ sqlite3_free(zErrMsg);
+ rc = 1;
+ }
+ }else
+
+ if( c=='d' && strncmp(azArg[0], "dump", n)==0 && nArg<3 ){
+ open_db(p, 0);
+ /* When playing back a "dump", the content might appear in an order
+ ** which causes immediate foreign key constraints to be violated.
+ ** So disable foreign-key constraint enforcement to prevent problems. */
+ fprintf(p->out, "PRAGMA foreign_keys=OFF;\n");
+ fprintf(p->out, "BEGIN TRANSACTION;\n");
+ p->writableSchema = 0;
+ sqlite3_exec(p->db, "SAVEPOINT dump; PRAGMA writable_schema=ON", 0, 0, 0);
+ p->nErr = 0;
+ if( nArg==1 ){
+ run_schema_dump_query(p,
+ "SELECT name, type, sql FROM sqlite_master "
+ "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'"
+ );
+ run_schema_dump_query(p,
+ "SELECT name, type, sql FROM sqlite_master "
+ "WHERE name=='sqlite_sequence'"
+ );
+ run_table_dump_query(p,
+ "SELECT sql FROM sqlite_master "
+ "WHERE sql NOT NULL AND type IN ('index','trigger','view')", 0
+ );
+ }else{
+ int i;
+ for(i=1; i<nArg; i++){
+ zShellStatic = azArg[i];
+ run_schema_dump_query(p,
+ "SELECT name, type, sql FROM sqlite_master "
+ "WHERE tbl_name LIKE shellstatic() AND type=='table'"
+ " AND sql NOT NULL");
+ run_table_dump_query(p,
+ "SELECT sql FROM sqlite_master "
+ "WHERE sql NOT NULL"
+ " AND type IN ('index','trigger','view')"
+ " AND tbl_name LIKE shellstatic()", 0
+ );
+ zShellStatic = 0;
+ }
+ }
+ if( p->writableSchema ){
+ fprintf(p->out, "PRAGMA writable_schema=OFF;\n");
+ p->writableSchema = 0;
+ }
+ sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
+ sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0);
+ fprintf(p->out, p->nErr ? "ROLLBACK; -- due to errors\n" : "COMMIT;\n");
+ }else
+
+ if( c=='e' && strncmp(azArg[0], "echo", n)==0 && nArg>1 && nArg<3 ){
+ p->echoOn = booleanValue(azArg[1]);
+ }else
+
+ if( c=='e' && strncmp(azArg[0], "eqp", n)==0 && nArg>1 && nArg<3 ){
+ p->autoEQP = booleanValue(azArg[1]);
+ }else
+
+ if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
+ if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
+ rc = 2;
+ }else
+
+ if( c=='e' && strncmp(azArg[0], "explain", n)==0 && nArg<3 ){
+ int val = nArg>=2 ? booleanValue(azArg[1]) : 1;
+ if(val == 1) {
+ if(!p->explainPrev.valid) {
+ p->explainPrev.valid = 1;
+ p->explainPrev.mode = p->mode;
+ p->explainPrev.showHeader = p->showHeader;
+ memcpy(p->explainPrev.colWidth,p->colWidth,sizeof(p->colWidth));
+ }
+ /* We could put this code under the !p->explainValid
+ ** condition so that it does not execute if we are already in
+ ** explain mode. However, always executing it allows us an easy
+ ** was to reset to explain mode in case the user previously
+ ** did an .explain followed by a .width, .mode or .header
+ ** command.
+ */
+ p->mode = MODE_Explain;
+ p->showHeader = 1;
+ memset(p->colWidth,0,sizeof(p->colWidth));
+ p->colWidth[0] = 4; /* addr */
+ p->colWidth[1] = 13; /* opcode */
+ p->colWidth[2] = 4; /* P1 */
+ p->colWidth[3] = 4; /* P2 */
+ p->colWidth[4] = 4; /* P3 */
+ p->colWidth[5] = 13; /* P4 */
+ p->colWidth[6] = 2; /* P5 */
+ p->colWidth[7] = 13; /* Comment */
+ }else if (p->explainPrev.valid) {
+ p->explainPrev.valid = 0;
+ p->mode = p->explainPrev.mode;
+ p->showHeader = p->explainPrev.showHeader;
+ memcpy(p->colWidth,p->explainPrev.colWidth,sizeof(p->colWidth));
+ }
+ }else
+
+ if( c=='h' && (strncmp(azArg[0], "header", n)==0 ||
+ strncmp(azArg[0], "headers", n)==0) && nArg>1 && nArg<3 ){
+ p->showHeader = booleanValue(azArg[1]);
+ }else
+
+ if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
+ fprintf(stderr,"%s",zHelp);
+ if( HAS_TIMER ){
+ fprintf(stderr,"%s",zTimerHelp);
+ }
+ }else
+
+ if( c=='i' && strncmp(azArg[0], "import", n)==0 && nArg==3 ){
+ char *zTable = azArg[2]; /* Insert data into this table */
+ char *zFile = azArg[1]; /* Name of file to extra content from */
+ sqlite3_stmt *pStmt = NULL; /* A statement */
+ int nCol; /* Number of columns in the table */
+ int nByte; /* Number of bytes in an SQL string */
+ int i, j; /* Loop counters */
+ int needCommit; /* True to COMMIT or ROLLBACK at end */
+ int nSep; /* Number of bytes in p->separator[] */
+ char *zSql; /* An SQL statement */
+ CSVReader sCsv; /* Reader context */
+ int (*xCloser)(FILE*); /* Procedure to close th3 connection */
+
+ seenInterrupt = 0;
+ memset(&sCsv, 0, sizeof(sCsv));
+ open_db(p, 0);
+ nSep = strlen30(p->separator);
+ if( nSep==0 ){
+ fprintf(stderr, "Error: non-null separator required for import\n");
+ return 1;
+ }
+ if( nSep>1 ){
+ fprintf(stderr, "Error: multi-character separators not allowed"
+ " for import\n");
+ return 1;
+ }
+ sCsv.zFile = zFile;
+ sCsv.nLine = 1;
+ if( sCsv.zFile[0]=='|' ){
+ sCsv.in = popen(sCsv.zFile+1, "r");
+ sCsv.zFile = "<pipe>";
+ xCloser = pclose;
+ }else{
+ sCsv.in = fopen(sCsv.zFile, "rb");
+ xCloser = fclose;
+ }
+ if( sCsv.in==0 ){
+ fprintf(stderr, "Error: cannot open \"%s\"\n", zFile);
+ return 1;
+ }
+ sCsv.cSeparator = p->separator[0];
+ zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
+ if( zSql==0 ){
+ fprintf(stderr, "Error: out of memory\n");
+ xCloser(sCsv.in);
+ return 1;
+ }
+ nByte = strlen30(zSql);
+ rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+ if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(db))==0 ){
+ char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
+ char cSep = '(';
+ while( csv_read_one_field(&sCsv) ){
+ zCreate = sqlite3_mprintf("%z%c\n \"%s\" TEXT", zCreate, cSep, sCsv.z);
+ cSep = ',';
+ if( sCsv.cTerm!=sCsv.cSeparator ) break;
+ }
+ if( cSep=='(' ){
+ sqlite3_free(zCreate);
+ sqlite3_free(sCsv.z);
+ xCloser(sCsv.in);
+ fprintf(stderr,"%s: empty file\n", sCsv.zFile);
+ return 1;
+ }
+ zCreate = sqlite3_mprintf("%z\n)", zCreate);
+ rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
+ sqlite3_free(zCreate);
+ if( rc ){
+ fprintf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
+ sqlite3_errmsg(db));
+ sqlite3_free(sCsv.z);
+ xCloser(sCsv.in);
+ return 1;
+ }
+ rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+ }
+ sqlite3_free(zSql);
+ if( rc ){
+ if (pStmt) sqlite3_finalize(pStmt);
+ fprintf(stderr,"Error: %s\n", sqlite3_errmsg(db));
+ xCloser(sCsv.in);
+ return 1;
+ }
+ nCol = sqlite3_column_count(pStmt);
+ sqlite3_finalize(pStmt);
+ pStmt = 0;
+ if( nCol==0 ) return 0; /* no columns, no error */
+ zSql = (char *)sqlite3_malloc( nByte*2 + 20 + nCol*2 );
+ if( zSql==0 ){
+ fprintf(stderr, "Error: out of memory\n");
+ xCloser(sCsv.in);
+ return 1;
+ }
+ sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
+ j = strlen30(zSql);
+ for(i=1; i<nCol; i++){
+ zSql[j++] = ',';
+ zSql[j++] = '?';
+ }
+ zSql[j++] = ')';
+ zSql[j] = 0;
+ rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+ sqlite3_free(zSql);
+ if( rc ){
+ fprintf(stderr, "Error: %s\n", sqlite3_errmsg(db));
+ if (pStmt) sqlite3_finalize(pStmt);
+ xCloser(sCsv.in);
+ return 1;
+ }
+ needCommit = sqlite3_get_autocommit(db);
+ if( needCommit ) sqlite3_exec(db, "BEGIN", 0, 0, 0);
+ do{
+ int startLine = sCsv.nLine;
+ for(i=0; i<nCol; i++){
+ char *z = csv_read_one_field(&sCsv);
+ if( z==0 && i==0 ) break;
+ sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT);
+ if( i<nCol-1 && sCsv.cTerm!=sCsv.cSeparator ){
+ fprintf(stderr, "%s:%d: expected %d columns but found %d - "
+ "filling the rest with NULL\n",
+ sCsv.zFile, startLine, nCol, i+1);
+ i++;
+ while( i<nCol ){ sqlite3_bind_null(pStmt, i); i++; }
+ }
+ }
+ if( sCsv.cTerm==sCsv.cSeparator ){
+ do{
+ csv_read_one_field(&sCsv);
+ i++;
+ }while( sCsv.cTerm==sCsv.cSeparator );
+ fprintf(stderr, "%s:%d: expected %d columns but found %d - "
+ "extras ignored\n",
+ sCsv.zFile, startLine, nCol, i);
+ }
+ if( i>=nCol ){
+ sqlite3_step(pStmt);
+ rc = sqlite3_reset(pStmt);
+ if( rc!=SQLITE_OK ){
+ fprintf(stderr, "%s:%d: INSERT failed: %s\n", sCsv.zFile, startLine,
+ sqlite3_errmsg(db));
+ }
+ }
+ }while( sCsv.cTerm!=EOF );
+
+ xCloser(sCsv.in);
+ sqlite3_free(sCsv.z);
+ sqlite3_finalize(pStmt);
+ if( needCommit ) sqlite3_exec(db, "COMMIT", 0, 0, 0);
+ }else
+
+ if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg<3 ){
+ struct callback_data data;
+ char *zErrMsg = 0;
+ open_db(p, 0);
+ memcpy(&data, p, sizeof(data));
+ data.showHeader = 0;
+ data.mode = MODE_List;
+ if( nArg==1 ){
+ rc = sqlite3_exec(p->db,
+ "SELECT name FROM sqlite_master "
+ "WHERE type='index' AND name NOT LIKE 'sqlite_%' "
+ "UNION ALL "
+ "SELECT name FROM sqlite_temp_master "
+ "WHERE type='index' "
+ "ORDER BY 1",
+ callback, &data, &zErrMsg
+ );
+ }else{
+ zShellStatic = azArg[1];
+ rc = sqlite3_exec(p->db,
+ "SELECT name FROM sqlite_master "
+ "WHERE type='index' AND tbl_name LIKE shellstatic() "
+ "UNION ALL "
+ "SELECT name FROM sqlite_temp_master "
+ "WHERE type='index' AND tbl_name LIKE shellstatic() "
+ "ORDER BY 1",
+ callback, &data, &zErrMsg
+ );
+ zShellStatic = 0;
+ }
+ if( zErrMsg ){
+ fprintf(stderr,"Error: %s\n", zErrMsg);
+ sqlite3_free(zErrMsg);
+ rc = 1;
+ }else if( rc != SQLITE_OK ){
+ fprintf(stderr,"Error: querying sqlite_master and sqlite_temp_master\n");
+ rc = 1;
+ }
+ }else
#ifdef SQLITE_ENABLE_IOTRACE
- if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
- extern void (*sqlite3IoTrace)(const char*, ...);
- if( iotrace && iotrace!=stdout ) fclose(iotrace);
- iotrace = 0;
- if( nArg<2 ){
- sqlite3IoTrace = 0;
- }else if( strcmp(azArg[1], "-")==0 ){
- sqlite3IoTrace = iotracePrintf;
- iotrace = stdout;
- }else{
- iotrace = fopen(azArg[1], "w");
- if( iotrace==0 ){
- fprintf(stderr, "Error: cannot open \"%s\"\n", azArg[1]);
- sqlite3IoTrace = 0;
- rc = 1;
- }else{
- sqlite3IoTrace = iotracePrintf;
- }
- }
- }else
+ if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
+ extern void (*sqlite3IoTrace)(const char*, ...);
+ if( iotrace && iotrace!=stdout ) fclose(iotrace);
+ iotrace = 0;
+ if( nArg<2 ){
+ sqlite3IoTrace = 0;
+ }else if( strcmp(azArg[1], "-")==0 ){
+ sqlite3IoTrace = iotracePrintf;
+ iotrace = stdout;
+ }else{
+ iotrace = fopen(azArg[1], "w");
+ if( iotrace==0 ){
+ fprintf(stderr, "Error: cannot open \"%s\"\n", azArg[1]);
+ sqlite3IoTrace = 0;
+ rc = 1;
+ }else{
+ sqlite3IoTrace = iotracePrintf;
+ }
+ }
+ }else
#endif
#ifndef SQLITE_OMIT_LOAD_EXTENSION
- if( c=='l' && strncmp(azArg[0], "load", n)==0 && nArg>=2 ){
- const char *zFile, *zProc;
- char *zErrMsg = 0;
- zFile = azArg[1];
- zProc = nArg>=3 ? azArg[2] : 0;
- open_db(p, 0);
- rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
- if( rc!=SQLITE_OK ){
- fprintf(stderr, "Error: %s\n", zErrMsg);
- sqlite3_free(zErrMsg);
- rc = 1;
- }
- }else
+ if( c=='l' && strncmp(azArg[0], "load", n)==0 && nArg>=2 ){
+ const char *zFile, *zProc;
+ char *zErrMsg = 0;
+ zFile = azArg[1];
+ zProc = nArg>=3 ? azArg[2] : 0;
+ open_db(p, 0);
+ rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
+ if( rc!=SQLITE_OK ){
+ fprintf(stderr, "Error: %s\n", zErrMsg);
+ sqlite3_free(zErrMsg);
+ rc = 1;
+ }
+ }else
#endif
- if( c=='l' && strncmp(azArg[0], "log", n)==0 && nArg>=2 ){
- const char *zFile = azArg[1];
- output_file_close(p->pLog);
- p->pLog = output_file_open(zFile);
- }else
-
- if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg==2 ){
- int n2 = strlen30(azArg[1]);
- if( (n2==4 && strncmp(azArg[1],"line",n2)==0)
- ||
- (n2==5 && strncmp(azArg[1],"lines",n2)==0) ){
- p->mode = MODE_Line;
- }else if( (n2==6 && strncmp(azArg[1],"column",n2)==0)
- ||
- (n2==7 && strncmp(azArg[1],"columns",n2)==0) ){
- p->mode = MODE_Column;
- }else if( n2==4 && strncmp(azArg[1],"list",n2)==0 ){
- p->mode = MODE_List;
- }else if( n2==4 && strncmp(azArg[1],"html",n2)==0 ){
- p->mode = MODE_Html;
- }else if( n2==3 && strncmp(azArg[1],"tcl",n2)==0 ){
- p->mode = MODE_Tcl;
- sqlite3_snprintf(sizeof(p->separator), p->separator, " ");
- }else if( n2==3 && strncmp(azArg[1],"csv",n2)==0 ){
- p->mode = MODE_Csv;
- sqlite3_snprintf(sizeof(p->separator), p->separator, ",");
- }else if( n2==4 && strncmp(azArg[1],"tabs",n2)==0 ){
- p->mode = MODE_List;
- sqlite3_snprintf(sizeof(p->separator), p->separator, "\t");
- }else if( n2==6 && strncmp(azArg[1],"insert",n2)==0 ){
- p->mode = MODE_Insert;
- set_table_name(p, "table");
- }else {
- fprintf(stderr,"Error: mode should be one of: "
- "column csv html insert line list tabs tcl\n");
- rc = 1;
- }
- }else
-
- if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg==3 ){
- int n2 = strlen30(azArg[1]);
- if( n2==6 && strncmp(azArg[1],"insert",n2)==0 ){
- p->mode = MODE_Insert;
- set_table_name(p, azArg[2]);
- }else {
- fprintf(stderr, "Error: invalid arguments: "
- " \"%s\". Enter \".help\" for help\n", azArg[2]);
- rc = 1;
- }
- }else
-
- if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 && nArg==2 ) {
- sqlite3_snprintf(sizeof(p->nullvalue), p->nullvalue,
- "%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]);
- }else
-
- if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
- sqlite3 *savedDb = p->db;
- const char *zSavedFilename = p->zDbFilename;
- char *zNewFilename = 0;
- p->db = 0;
- if( nArg>=2 ){
- p->zDbFilename = zNewFilename = sqlite3_mprintf("%s", azArg[1]);
- }
- open_db(p, 1);
- if( p->db!=0 ){
- sqlite3_close(savedDb);
- sqlite3_free(p->zFreeOnClose);
- p->zFreeOnClose = zNewFilename;
- }else{
- sqlite3_free(zNewFilename);
- p->db = savedDb;
- p->zDbFilename = zSavedFilename;
- }
- }else
-
- if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){
- if( p->outfile[0]=='|' ){
- pclose(p->out);
- }else{
- output_file_close(p->out);
- }
- p->outfile[0] = 0;
- if( azArg[1][0]=='|' ){
- p->out = popen(&azArg[1][1], "w");
- if( p->out==0 ){
- fprintf(stderr,"Error: cannot open pipe \"%s\"\n", &azArg[1][1]);
- p->out = stdout;
- rc = 1;
- }else{
- sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", azArg[1]);
- }
- }else{
- p->out = output_file_open(azArg[1]);
- if( p->out==0 ){
- if( strcmp(azArg[1],"off")!=0 ){
- fprintf(stderr,"Error: cannot write to \"%s\"\n", azArg[1]);
- }
- p->out = stdout;
- rc = 1;
- } else {
- sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", azArg[1]);
- }
- }
- }else
-
- if( c=='p' && n>=3 && strncmp(azArg[0], "print", n)==0 ){
- int i;
- for(i=1; i<nArg; i++){
- if( i>1 ) fprintf(p->out, " ");
- fprintf(p->out, "%s", azArg[i]);
- }
- fprintf(p->out, "\n");
- }else
-
- if( c=='p' && strncmp(azArg[0], "prompt", n)==0 && (nArg==2 || nArg==3)){
- if( nArg >= 2) {
- strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
- }
- if( nArg >= 3) {
- strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
- }
- }else
-
- if( c=='q' && strncmp(azArg[0], "quit", n)==0 && nArg==1 ){
- rc = 2;
- }else
-
- if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 && nArg==2 ){
- FILE *alt = fopen(azArg[1], "rb");
- if( alt==0 ){
- fprintf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
- rc = 1;
- }else{
- rc = process_input(p, alt);
- fclose(alt);
- }
- }else
-
- if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 && nArg>1 && nArg<4){
- const char *zSrcFile;
- const char *zDb;
- sqlite3 *pSrc;
- sqlite3_backup *pBackup;
- int nTimeout = 0;
-
- if( nArg==2 ){
- zSrcFile = azArg[1];
- zDb = "main";
- }else{
- zSrcFile = azArg[2];
- zDb = azArg[1];
- }
- rc = sqlite3_open(zSrcFile, &pSrc);
- if( rc!=SQLITE_OK ){
- fprintf(stderr, "Error: cannot open \"%s\"\n", zSrcFile);
- sqlite3_close(pSrc);
- return 1;
- }
- open_db(p, 0);
- pBackup = sqlite3_backup_init(p->db, zDb, pSrc, "main");
- if( pBackup==0 ){
- fprintf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
- sqlite3_close(pSrc);
- return 1;
- }
- while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK
- || rc==SQLITE_BUSY ){
- if( rc==SQLITE_BUSY ){
- if( nTimeout++ >= 3 ) break;
- sqlite3_sleep(100);
- }
- }
- sqlite3_backup_finish(pBackup);
- if( rc==SQLITE_DONE ){
- rc = 0;
- }else if( rc==SQLITE_BUSY || rc==SQLITE_LOCKED ){
- fprintf(stderr, "Error: source database is busy\n");
- rc = 1;
- }else{
- fprintf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
- rc = 1;
- }
- sqlite3_close(pSrc);
- }else
-
- if( c=='s' && strncmp(azArg[0], "schema", n)==0 && nArg<3 ){
- struct callback_data data;
- char *zErrMsg = 0;
- open_db(p, 0);
- memcpy(&data, p, sizeof(data));
- data.showHeader = 0;
- data.mode = MODE_Semi;
- if( nArg>1 ){
- int i;
- for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]);
- if( strcmp(azArg[1],"sqlite_master")==0 ){
- char *new_argv[2], *new_colv[2];
- new_argv[0] = "CREATE TABLE sqlite_master (\n"
- " type text,\n"
- " name text,\n"
- " tbl_name text,\n"
- " rootpage integer,\n"
- " sql text\n"
- ")";
- new_argv[1] = 0;
- new_colv[0] = "sql";
- new_colv[1] = 0;
- callback(&data, 1, new_argv, new_colv);
- rc = SQLITE_OK;
- }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
- char *new_argv[2], *new_colv[2];
- new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
- " type text,\n"
- " name text,\n"
- " tbl_name text,\n"
- " rootpage integer,\n"
- " sql text\n"
- ")";
- new_argv[1] = 0;
- new_colv[0] = "sql";
- new_colv[1] = 0;
- callback(&data, 1, new_argv, new_colv);
- rc = SQLITE_OK;
- }else{
- zShellStatic = azArg[1];
- rc = sqlite3_exec(p->db,
- "SELECT sql FROM "
- " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
- " FROM sqlite_master UNION ALL"
- " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
- "WHERE lower(tbl_name) LIKE shellstatic()"
- " AND type!='meta' AND sql NOTNULL "
- "ORDER BY rowid",
- callback, &data, &zErrMsg);
- zShellStatic = 0;
- }
- }else{
- rc = sqlite3_exec(p->db,
- "SELECT sql FROM "
- " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
- " FROM sqlite_master UNION ALL"
- " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
- "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%'"
- "ORDER BY rowid",
- callback, &data, &zErrMsg
- );
- }
- if( zErrMsg ){
- fprintf(stderr,"Error: %s\n", zErrMsg);
- sqlite3_free(zErrMsg);
- rc = 1;
- }else if( rc != SQLITE_OK ){
- fprintf(stderr,"Error: querying schema information\n");
- rc = 1;
- }else{
- rc = 0;
- }
- }else
+ if( c=='l' && strncmp(azArg[0], "log", n)==0 && nArg>=2 ){
+ const char *zFile = azArg[1];
+ output_file_close(p->pLog);
+ p->pLog = output_file_open(zFile);
+ }else
+
+ if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg==2 ){
+ int n2 = strlen30(azArg[1]);
+ if( (n2==4 && strncmp(azArg[1],"line",n2)==0)
+ ||
+ (n2==5 && strncmp(azArg[1],"lines",n2)==0) ){
+ p->mode = MODE_Line;
+ }else if( (n2==6 && strncmp(azArg[1],"column",n2)==0)
+ ||
+ (n2==7 && strncmp(azArg[1],"columns",n2)==0) ){
+ p->mode = MODE_Column;
+ }else if( n2==4 && strncmp(azArg[1],"list",n2)==0 ){
+ p->mode = MODE_List;
+ }else if( n2==4 && strncmp(azArg[1],"html",n2)==0 ){
+ p->mode = MODE_Html;
+ }else if( n2==3 && strncmp(azArg[1],"tcl",n2)==0 ){
+ p->mode = MODE_Tcl;
+ sqlite3_snprintf(sizeof(p->separator), p->separator, " ");
+ }else if( n2==3 && strncmp(azArg[1],"csv",n2)==0 ){
+ p->mode = MODE_Csv;
+ sqlite3_snprintf(sizeof(p->separator), p->separator, ",");
+ }else if( n2==4 && strncmp(azArg[1],"tabs",n2)==0 ){
+ p->mode = MODE_List;
+ sqlite3_snprintf(sizeof(p->separator), p->separator, "\t");
+ }else if( n2==6 && strncmp(azArg[1],"insert",n2)==0 ){
+ p->mode = MODE_Insert;
+ set_table_name(p, "table");
+ }else {
+ fprintf(stderr,"Error: mode should be one of: "
+ "column csv html insert line list tabs tcl\n");
+ rc = 1;
+ }
+ }else
+
+ if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg==3 ){
+ int n2 = strlen30(azArg[1]);
+ if( n2==6 && strncmp(azArg[1],"insert",n2)==0 ){
+ p->mode = MODE_Insert;
+ set_table_name(p, azArg[2]);
+ }else {
+ fprintf(stderr, "Error: invalid arguments: "
+ " \"%s\". Enter \".help\" for help\n", azArg[2]);
+ rc = 1;
+ }
+ }else
+
+ if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 && nArg==2 ) {
+ sqlite3_snprintf(sizeof(p->nullvalue), p->nullvalue,
+ "%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]);
+ }else
+
+ if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
+ sqlite3 *savedDb = p->db;
+ const char *zSavedFilename = p->zDbFilename;
+ char *zNewFilename = 0;
+ p->db = 0;
+ if( nArg>=2 ){
+ p->zDbFilename = zNewFilename = sqlite3_mprintf("%s", azArg[1]);
+ }
+ open_db(p, 1);
+ if( p->db!=0 ){
+ sqlite3_close(savedDb);
+ sqlite3_free(p->zFreeOnClose);
+ p->zFreeOnClose = zNewFilename;
+ }else{
+ sqlite3_free(zNewFilename);
+ p->db = savedDb;
+ p->zDbFilename = zSavedFilename;
+ }
+ }else
+
+ if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){
+ if( p->outfile[0]=='|' ){
+ pclose(p->out);
+ }else{
+ output_file_close(p->out);
+ }
+ p->outfile[0] = 0;
+ if( azArg[1][0]=='|' ){
+ p->out = popen(&azArg[1][1], "w");
+ if( p->out==0 ){
+ fprintf(stderr,"Error: cannot open pipe \"%s\"\n", &azArg[1][1]);
+ p->out = stdout;
+ rc = 1;
+ }else{
+ sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", azArg[1]);
+ }
+ }else{
+ p->out = output_file_open(azArg[1]);
+ if( p->out==0 ){
+ if( strcmp(azArg[1],"off")!=0 ){
+ fprintf(stderr,"Error: cannot write to \"%s\"\n", azArg[1]);
+ }
+ p->out = stdout;
+ rc = 1;
+ } else {
+ sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", azArg[1]);
+ }
+ }
+ }else
+
+ if( c=='p' && n>=3 && strncmp(azArg[0], "print", n)==0 ){
+ int i;
+ for(i=1; i<nArg; i++){
+ if( i>1 ) fprintf(p->out, " ");
+ fprintf(p->out, "%s", azArg[i]);
+ }
+ fprintf(p->out, "\n");
+ }else
+
+ if( c=='p' && strncmp(azArg[0], "prompt", n)==0 && (nArg==2 || nArg==3)){
+ if( nArg >= 2) {
+ strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
+ }
+ if( nArg >= 3) {
+ strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
+ }
+ }else
+
+ if( c=='q' && strncmp(azArg[0], "quit", n)==0 && nArg==1 ){
+ rc = 2;
+ }else
+
+ if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 && nArg==2 ){
+ FILE *alt = fopen(azArg[1], "rb");
+ if( alt==0 ){
+ fprintf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
+ rc = 1;
+ }else{
+ rc = process_input(p, alt);
+ fclose(alt);
+ }
+ }else
+
+ if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 && nArg>1 && nArg<4){
+ const char *zSrcFile;
+ const char *zDb;
+ sqlite3 *pSrc;
+ sqlite3_backup *pBackup;
+ int nTimeout = 0;
+
+ if( nArg==2 ){
+ zSrcFile = azArg[1];
+ zDb = "main";
+ }else{
+ zSrcFile = azArg[2];
+ zDb = azArg[1];
+ }
+ rc = sqlite3_open(zSrcFile, &pSrc);
+ if( rc!=SQLITE_OK ){
+ fprintf(stderr, "Error: cannot open \"%s\"\n", zSrcFile);
+ sqlite3_close(pSrc);
+ return 1;
+ }
+ open_db(p, 0);
+ pBackup = sqlite3_backup_init(p->db, zDb, pSrc, "main");
+ if( pBackup==0 ){
+ fprintf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
+ sqlite3_close(pSrc);
+ return 1;
+ }
+ while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK
+ || rc==SQLITE_BUSY ){
+ if( rc==SQLITE_BUSY ){
+ if( nTimeout++ >= 3 ) break;
+ sqlite3_sleep(100);
+ }
+ }
+ sqlite3_backup_finish(pBackup);
+ if( rc==SQLITE_DONE ){
+ rc = 0;
+ }else if( rc==SQLITE_BUSY || rc==SQLITE_LOCKED ){
+ fprintf(stderr, "Error: source database is busy\n");
+ rc = 1;
+ }else{
+ fprintf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
+ rc = 1;
+ }
+ sqlite3_close(pSrc);
+ }else
+
+ if( c=='s' && strncmp(azArg[0], "schema", n)==0 && nArg<3 ){
+ struct callback_data data;
+ char *zErrMsg = 0;
+ open_db(p, 0);
+ memcpy(&data, p, sizeof(data));
+ data.showHeader = 0;
+ data.mode = MODE_Semi;
+ if( nArg>1 ){
+ int i;
+ for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]);
+ if( strcmp(azArg[1],"sqlite_master")==0 ){
+ char *new_argv[2], *new_colv[2];
+ new_argv[0] = "CREATE TABLE sqlite_master (\n"
+ " type text,\n"
+ " name text,\n"
+ " tbl_name text,\n"
+ " rootpage integer,\n"
+ " sql text\n"
+ ")";
+ new_argv[1] = 0;
+ new_colv[0] = "sql";
+ new_colv[1] = 0;
+ callback(&data, 1, new_argv, new_colv);
+ rc = SQLITE_OK;
+ }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
+ char *new_argv[2], *new_colv[2];
+ new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
+ " type text,\n"
+ " name text,\n"
+ " tbl_name text,\n"
+ " rootpage integer,\n"
+ " sql text\n"
+ ")";
+ new_argv[1] = 0;
+ new_colv[0] = "sql";
+ new_colv[1] = 0;
+ callback(&data, 1, new_argv, new_colv);
+ rc = SQLITE_OK;
+ }else{
+ zShellStatic = azArg[1];
+ rc = sqlite3_exec(p->db,
+ "SELECT sql FROM "
+ " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
+ " FROM sqlite_master UNION ALL"
+ " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
+ "WHERE lower(tbl_name) LIKE shellstatic()"
+ " AND type!='meta' AND sql NOTNULL "
+ "ORDER BY rowid",
+ callback, &data, &zErrMsg);
+ zShellStatic = 0;
+ }
+ }else{
+ rc = sqlite3_exec(p->db,
+ "SELECT sql FROM "
+ " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
+ " FROM sqlite_master UNION ALL"
+ " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
+ "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%'"
+ "ORDER BY rowid",
+ callback, &data, &zErrMsg
+ );
+ }
+ if( zErrMsg ){
+ fprintf(stderr,"Error: %s\n", zErrMsg);
+ sqlite3_free(zErrMsg);
+ rc = 1;
+ }else if( rc != SQLITE_OK ){
+ fprintf(stderr,"Error: querying schema information\n");
+ rc = 1;
+ }else{
+ rc = 0;
+ }
+ }else
#ifdef SQLITE_DEBUG
- /* Undocumented commands for internal testing. Subject to change
- ** without notice. */
- if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
- if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
- int i, v;
- for(i=1; i<nArg; i++){
- v = booleanValue(azArg[i]);
- fprintf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
- }
- }
- if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
- int i; sqlite3_int64 v;
- for(i=1; i<nArg; i++){
- char zBuf[200];
- v = integerValue(azArg[i]);
- sqlite3_snprintf(sizeof(zBuf), zBuf, "%s: %lld 0x%llx\n", azArg[i], v, v);
- fprintf(p->out, "%s", zBuf);
- }
- }
- }else
+ /* Undocumented commands for internal testing. Subject to change
+ ** without notice. */
+ if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
+ if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
+ int i, v;
+ for(i=1; i<nArg; i++){
+ v = booleanValue(azArg[i]);
+ fprintf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
+ }
+ }
+ if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
+ int i; sqlite3_int64 v;
+ for(i=1; i<nArg; i++){
+ char zBuf[200];
+ v = integerValue(azArg[i]);
+ sqlite3_snprintf(sizeof(zBuf), zBuf, "%s: %lld 0x%llx\n", azArg[i], v, v);
+ fprintf(p->out, "%s", zBuf);
+ }
+ }
+ }else
#endif
- if( c=='s' && strncmp(azArg[0], "separator", n)==0 && nArg==2 ){
- sqlite3_snprintf(sizeof(p->separator), p->separator,
- "%.*s", (int)sizeof(p->separator)-1, azArg[1]);
- }else
-
- if( c=='s' && strncmp(azArg[0], "show", n)==0 && nArg==1 ){
- int i;
- fprintf(p->out,"%9.9s: %s\n","echo", p->echoOn ? "on" : "off");
- fprintf(p->out,"%9.9s: %s\n","eqp", p->autoEQP ? "on" : "off");
- fprintf(p->out,"%9.9s: %s\n","explain", p->explainPrev.valid ? "on" :"off");
- fprintf(p->out,"%9.9s: %s\n","headers", p->showHeader ? "on" : "off");
- fprintf(p->out,"%9.9s: %s\n","mode", modeDescr[p->mode]);
- fprintf(p->out,"%9.9s: ", "nullvalue");
- output_c_string(p->out, p->nullvalue);
- fprintf(p->out, "\n");
- fprintf(p->out,"%9.9s: %s\n","output",
- strlen30(p->outfile) ? p->outfile : "stdout");
- fprintf(p->out,"%9.9s: ", "separator");
- output_c_string(p->out, p->separator);
- fprintf(p->out, "\n");
- fprintf(p->out,"%9.9s: %s\n","stats", p->statsOn ? "on" : "off");
- fprintf(p->out,"%9.9s: ","width");
- for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
- fprintf(p->out,"%d ",p->colWidth[i]);
- }
- fprintf(p->out,"\n");
- }else
-
- if( c=='s' && strncmp(azArg[0], "stats", n)==0 && nArg>1 && nArg<3 ){
- p->statsOn = booleanValue(azArg[1]);
- }else
-
- if( c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0 && nArg<3 ){
- sqlite3_stmt *pStmt;
- char **azResult;
- int nRow, nAlloc;
- char *zSql = 0;
- int ii;
- open_db(p, 0);
- rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
- if( rc ) return rc;
- zSql = sqlite3_mprintf(
- "SELECT name FROM sqlite_master"
- " WHERE type IN ('table','view')"
- " AND name NOT LIKE 'sqlite_%%'"
- " AND name LIKE ?1");
- while( sqlite3_step(pStmt)==SQLITE_ROW ){
- const char *zDbName = (const char*)sqlite3_column_text(pStmt, 1);
- if( zDbName==0 || strcmp(zDbName,"main")==0 ) continue;
- if( strcmp(zDbName,"temp")==0 ){
- zSql = sqlite3_mprintf(
- "%z UNION ALL "
- "SELECT 'temp.' || name FROM sqlite_temp_master"
- " WHERE type IN ('table','view')"
- " AND name NOT LIKE 'sqlite_%%'"
- " AND name LIKE ?1", zSql);
- }else{
- zSql = sqlite3_mprintf(
- "%z UNION ALL "
- "SELECT '%q.' || name FROM \"%w\".sqlite_master"
- " WHERE type IN ('table','view')"
- " AND name NOT LIKE 'sqlite_%%'"
- " AND name LIKE ?1", zSql, zDbName, zDbName);
- }
- }
- sqlite3_finalize(pStmt);
- zSql = sqlite3_mprintf("%z ORDER BY 1", zSql);
- rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
- sqlite3_free(zSql);
- if( rc ) return rc;
- nRow = nAlloc = 0;
- azResult = 0;
- if( nArg>1 ){
- sqlite3_bind_text(pStmt, 1, azArg[1], -1, SQLITE_TRANSIENT);
- }else{
- sqlite3_bind_text(pStmt, 1, "%", -1, SQLITE_STATIC);
- }
- while( sqlite3_step(pStmt)==SQLITE_ROW ){
- if( nRow>=nAlloc ){
- char **azNew;
- int n = nAlloc*2 + 10;
- azNew = (char **)sqlite3_realloc(azResult, sizeof(azResult[0])*n);
- if( azNew==0 ){
- fprintf(stderr, "Error: out of memory\n");
- break;
- }
- nAlloc = n;
- azResult = azNew;
- }
- azResult[nRow] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 0));
- if( azResult[nRow] ) nRow++;
- }
- sqlite3_finalize(pStmt);
- if( nRow>0 ){
- int len, maxlen = 0;
- int i, j;
- int nPrintCol, nPrintRow;
- for(i=0; i<nRow; i++){
- len = strlen30(azResult[i]);
- if( len>maxlen ) maxlen = len;
- }
- nPrintCol = 80/(maxlen+2);
- if( nPrintCol<1 ) nPrintCol = 1;
- nPrintRow = (nRow + nPrintCol - 1)/nPrintCol;
- for(i=0; i<nPrintRow; i++){
- for(j=i; j<nRow; j+=nPrintRow){
- const char *zSp = j<nPrintRow ? "" : " ";
- fprintf(p->out, "%s%-*s", zSp, maxlen, azResult[j] ? azResult[j] : "");
- }
- fprintf(p->out, "\n");
- }
- }
- for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
- sqlite3_free(azResult);
- }else
-
- if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 && nArg>=2 ){
- static const struct {
- const char *zCtrlName; /* Name of a test-control option */
- int ctrlCode; /* Integer code for that option */
- } aCtrl[] = {
- { "prng_save", SQLITE_TESTCTRL_PRNG_SAVE },
- { "prng_restore", SQLITE_TESTCTRL_PRNG_RESTORE },
- { "prng_reset", SQLITE_TESTCTRL_PRNG_RESET },
- { "bitvec_test", SQLITE_TESTCTRL_BITVEC_TEST },
- { "fault_install", SQLITE_TESTCTRL_FAULT_INSTALL },
- { "benign_malloc_hooks", SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS },
- { "pending_byte", SQLITE_TESTCTRL_PENDING_BYTE },
- { "assert", SQLITE_TESTCTRL_ASSERT },
- { "always", SQLITE_TESTCTRL_ALWAYS },
- { "reserve", SQLITE_TESTCTRL_RESERVE },
- { "optimizations", SQLITE_TESTCTRL_OPTIMIZATIONS },
- { "iskeyword", SQLITE_TESTCTRL_ISKEYWORD },
- { "scratchmalloc", SQLITE_TESTCTRL_SCRATCHMALLOC },
- };
- int testctrl = -1;
- int rc = 0;
- int i, n;
- open_db(p, 0);
-
- /* convert testctrl text option to value. allow any unique prefix
- ** of the option name, or a numerical value. */
- n = strlen30(azArg[1]);
- for(i=0; i<(int)(sizeof(aCtrl)/sizeof(aCtrl[0])); i++){
- if( strncmp(azArg[1], aCtrl[i].zCtrlName, n)==0 ){
- if( testctrl<0 ){
- testctrl = aCtrl[i].ctrlCode;
- }else{
- fprintf(stderr, "ambiguous option name: \"%s\"\n", azArg[1]);
- testctrl = -1;
- break;
- }
- }
- }
- if( testctrl<0 ) testctrl = (int)integerValue(azArg[1]);
- if( (testctrl<SQLITE_TESTCTRL_FIRST) || (testctrl>SQLITE_TESTCTRL_LAST) ){
- fprintf(stderr,"Error: invalid testctrl option: %s\n", azArg[1]);
- }else{
- switch(testctrl){
-
- /* sqlite3_test_control(int, db, int) */
- case SQLITE_TESTCTRL_OPTIMIZATIONS:
- case SQLITE_TESTCTRL_RESERVE:
- if( nArg==3 ){
- int opt = (int)strtol(azArg[2], 0, 0);
- rc = sqlite3_test_control(testctrl, p->db, opt);
- fprintf(p->out, "%d (0x%08x)\n", rc, rc);
- } else {
- fprintf(stderr,"Error: testctrl %s takes a single int option\n",
- azArg[1]);
- }
- break;
-
- /* sqlite3_test_control(int) */
- case SQLITE_TESTCTRL_PRNG_SAVE:
- case SQLITE_TESTCTRL_PRNG_RESTORE:
- case SQLITE_TESTCTRL_PRNG_RESET:
- if( nArg==2 ){
- rc = sqlite3_test_control(testctrl);
- fprintf(p->out, "%d (0x%08x)\n", rc, rc);
- } else {
- fprintf(stderr,"Error: testctrl %s takes no options\n", azArg[1]);
- }
- break;
-
- /* sqlite3_test_control(int, uint) */
- case SQLITE_TESTCTRL_PENDING_BYTE:
- if( nArg==3 ){
- unsigned int opt = (unsigned int)integerValue(azArg[2]);
- rc = sqlite3_test_control(testctrl, opt);
- fprintf(p->out, "%d (0x%08x)\n", rc, rc);
- } else {
- fprintf(stderr,"Error: testctrl %s takes a single unsigned"
- " int option\n", azArg[1]);
- }
- break;
-
- /* sqlite3_test_control(int, int) */
- case SQLITE_TESTCTRL_ASSERT:
- case SQLITE_TESTCTRL_ALWAYS:
- if( nArg==3 ){
- int opt = booleanValue(azArg[2]);
- rc = sqlite3_test_control(testctrl, opt);
- fprintf(p->out, "%d (0x%08x)\n", rc, rc);
- } else {
- fprintf(stderr,"Error: testctrl %s takes a single int option\n",
- azArg[1]);
- }
- break;
-
- /* sqlite3_test_control(int, char *) */
+ if( c=='s' && strncmp(azArg[0], "separator", n)==0 && nArg==2 ){
+ sqlite3_snprintf(sizeof(p->separator), p->separator,
+ "%.*s", (int)sizeof(p->separator)-1, azArg[1]);
+ }else
+
+ if( c=='s' && strncmp(azArg[0], "show", n)==0 && nArg==1 ){
+ int i;
+ fprintf(p->out,"%9.9s: %s\n","echo", p->echoOn ? "on" : "off");
+ fprintf(p->out,"%9.9s: %s\n","eqp", p->autoEQP ? "on" : "off");
+ fprintf(p->out,"%9.9s: %s\n","explain", p->explainPrev.valid ? "on" :"off");
+ fprintf(p->out,"%9.9s: %s\n","headers", p->showHeader ? "on" : "off");
+ fprintf(p->out,"%9.9s: %s\n","mode", modeDescr[p->mode]);
+ fprintf(p->out,"%9.9s: ", "nullvalue");
+ output_c_string(p->out, p->nullvalue);
+ fprintf(p->out, "\n");
+ fprintf(p->out,"%9.9s: %s\n","output",
+ strlen30(p->outfile) ? p->outfile : "stdout");
+ fprintf(p->out,"%9.9s: ", "separator");
+ output_c_string(p->out, p->separator);
+ fprintf(p->out, "\n");
+ fprintf(p->out,"%9.9s: %s\n","stats", p->statsOn ? "on" : "off");
+ fprintf(p->out,"%9.9s: ","width");
+ for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
+ fprintf(p->out,"%d ",p->colWidth[i]);
+ }
+ fprintf(p->out,"\n");
+ }else
+
+ if( c=='s' && strncmp(azArg[0], "stats", n)==0 && nArg>1 && nArg<3 ){
+ p->statsOn = booleanValue(azArg[1]);
+ }else
+
+ if( c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0 && nArg<3 ){
+ sqlite3_stmt *pStmt;
+ char **azResult;
+ int nRow, nAlloc;
+ char *zSql = 0;
+ int ii;
+ open_db(p, 0);
+ rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
+ if( rc ) return rc;
+ zSql = sqlite3_mprintf(
+ "SELECT name FROM sqlite_master"
+ " WHERE type IN ('table','view')"
+ " AND name NOT LIKE 'sqlite_%%'"
+ " AND name LIKE ?1");
+ while( sqlite3_step(pStmt)==SQLITE_ROW ){
+ const char *zDbName = (const char*)sqlite3_column_text(pStmt, 1);
+ if( zDbName==0 || strcmp(zDbName,"main")==0 ) continue;
+ if( strcmp(zDbName,"temp")==0 ){
+ zSql = sqlite3_mprintf(
+ "%z UNION ALL "
+ "SELECT 'temp.' || name FROM sqlite_temp_master"
+ " WHERE type IN ('table','view')"
+ " AND name NOT LIKE 'sqlite_%%'"
+ " AND name LIKE ?1", zSql);
+ }else{
+ zSql = sqlite3_mprintf(
+ "%z UNION ALL "
+ "SELECT '%q.' || name FROM \"%w\".sqlite_master"
+ " WHERE type IN ('table','view')"
+ " AND name NOT LIKE 'sqlite_%%'"
+ " AND name LIKE ?1", zSql, zDbName, zDbName);
+ }
+ }
+ sqlite3_finalize(pStmt);
+ zSql = sqlite3_mprintf("%z ORDER BY 1", zSql);
+ rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+ sqlite3_free(zSql);
+ if( rc ) return rc;
+ nRow = nAlloc = 0;
+ azResult = 0;
+ if( nArg>1 ){
+ sqlite3_bind_text(pStmt, 1, azArg[1], -1, SQLITE_TRANSIENT);
+ }else{
+ sqlite3_bind_text(pStmt, 1, "%", -1, SQLITE_STATIC);
+ }
+ while( sqlite3_step(pStmt)==SQLITE_ROW ){
+ if( nRow>=nAlloc ){
+ char **azNew;
+ int n = nAlloc*2 + 10;
+ azNew = (char **)sqlite3_realloc(azResult, sizeof(azResult[0])*n);
+ if( azNew==0 ){
+ fprintf(stderr, "Error: out of memory\n");
+ break;
+ }
+ nAlloc = n;
+ azResult = azNew;
+ }
+ azResult[nRow] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 0));
+ if( azResult[nRow] ) nRow++;
+ }
+ sqlite3_finalize(pStmt);
+ if( nRow>0 ){
+ int len, maxlen = 0;
+ int i, j;
+ int nPrintCol, nPrintRow;
+ for(i=0; i<nRow; i++){
+ len = strlen30(azResult[i]);
+ if( len>maxlen ) maxlen = len;
+ }
+ nPrintCol = 80/(maxlen+2);
+ if( nPrintCol<1 ) nPrintCol = 1;
+ nPrintRow = (nRow + nPrintCol - 1)/nPrintCol;
+ for(i=0; i<nPrintRow; i++){
+ for(j=i; j<nRow; j+=nPrintRow){
+ const char *zSp = j<nPrintRow ? "" : " ";
+ fprintf(p->out, "%s%-*s", zSp, maxlen, azResult[j] ? azResult[j] : "");
+ }
+ fprintf(p->out, "\n");
+ }
+ }
+ for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
+ sqlite3_free(azResult);
+ }else
+
+ if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 && nArg>=2 ){
+ static const struct {
+ const char *zCtrlName; /* Name of a test-control option */
+ int ctrlCode; /* Integer code for that option */
+ } aCtrl[] = {
+ { "prng_save", SQLITE_TESTCTRL_PRNG_SAVE },
+ { "prng_restore", SQLITE_TESTCTRL_PRNG_RESTORE },
+ { "prng_reset", SQLITE_TESTCTRL_PRNG_RESET },
+ { "bitvec_test", SQLITE_TESTCTRL_BITVEC_TEST },
+ { "fault_install", SQLITE_TESTCTRL_FAULT_INSTALL },
+ { "benign_malloc_hooks", SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS },
+ { "pending_byte", SQLITE_TESTCTRL_PENDING_BYTE },
+ { "assert", SQLITE_TESTCTRL_ASSERT },
+ { "always", SQLITE_TESTCTRL_ALWAYS },
+ { "reserve", SQLITE_TESTCTRL_RESERVE },
+ { "optimizations", SQLITE_TESTCTRL_OPTIMIZATIONS },
+ { "iskeyword", SQLITE_TESTCTRL_ISKEYWORD },
+ { "scratchmalloc", SQLITE_TESTCTRL_SCRATCHMALLOC },
+ };
+ int testctrl = -1;
+ int rc = 0;
+ int i, n;
+ open_db(p, 0);
+
+ /* convert testctrl text option to value. allow any unique prefix
+ ** of the option name, or a numerical value. */
+ n = strlen30(azArg[1]);
+ for(i=0; i<(int)(sizeof(aCtrl)/sizeof(aCtrl[0])); i++){
+ if( strncmp(azArg[1], aCtrl[i].zCtrlName, n)==0 ){
+ if( testctrl<0 ){
+ testctrl = aCtrl[i].ctrlCode;
+ }else{
+ fprintf(stderr, "ambiguous option name: \"%s\"\n", azArg[1]);
+ testctrl = -1;
+ break;
+ }
+ }
+ }
+ if( testctrl<0 ) testctrl = (int)integerValue(azArg[1]);
+ if( (testctrl<SQLITE_TESTCTRL_FIRST) || (testctrl>SQLITE_TESTCTRL_LAST) ){
+ fprintf(stderr,"Error: invalid testctrl option: %s\n", azArg[1]);
+ }else{
+ switch(testctrl){
+ /* sqlite3_test_control(int, db, int) */
+ case SQLITE_TESTCTRL_OPTIMIZATIONS:
+ case SQLITE_TESTCTRL_RESERVE:
+ if( nArg==3 ){
+ int opt = (int)strtol(azArg[2], 0, 0);
+ rc = sqlite3_test_control(testctrl, p->db, opt);
+ fprintf(p->out, "%d (0x%08x)\n", rc, rc);
+ } else {
+ fprintf(stderr,"Error: testctrl %s takes a single int option\n",
+ azArg[1]);
+ }
+ break;
+
+ /* sqlite3_test_control(int) */
+ case SQLITE_TESTCTRL_PRNG_SAVE:
+ case SQLITE_TESTCTRL_PRNG_RESTORE:
+ case SQLITE_TESTCTRL_PRNG_RESET:
+ if( nArg==2 ){
+ rc = sqlite3_test_control(testctrl);
+ fprintf(p->out, "%d (0x%08x)\n", rc, rc);
+ } else {
+ fprintf(stderr,"Error: testctrl %s takes no options\n", azArg[1]);
+ }
+ break;
+
+ /* sqlite3_test_control(int, uint) */
+ case SQLITE_TESTCTRL_PENDING_BYTE:
+ if( nArg==3 ){
+ unsigned int opt = (unsigned int)integerValue(azArg[2]);
+ rc = sqlite3_test_control(testctrl, opt);
+ fprintf(p->out, "%d (0x%08x)\n", rc, rc);
+ } else {
+ fprintf(stderr,"Error: testctrl %s takes a single unsigned"
+ " int option\n", azArg[1]);
+ }
+ break;
+
+ /* sqlite3_test_control(int, int) */
+ case SQLITE_TESTCTRL_ASSERT:
+ case SQLITE_TESTCTRL_ALWAYS:
+ if( nArg==3 ){
+ int opt = booleanValue(azArg[2]);
+ rc = sqlite3_test_control(testctrl, opt);
+ fprintf(p->out, "%d (0x%08x)\n", rc, rc);
+ } else {
+ fprintf(stderr,"Error: testctrl %s takes a single int option\n",
+ azArg[1]);
+ }
+ break;
+
+ /* sqlite3_test_control(int, char *) */
#ifdef SQLITE_N_KEYWORD
- case SQLITE_TESTCTRL_ISKEYWORD:
- if( nArg==3 ){
- const char *opt = azArg[2];
- rc = sqlite3_test_control(testctrl, opt);
- fprintf(p->out, "%d (0x%08x)\n", rc, rc);
- } else {
- fprintf(stderr,"Error: testctrl %s takes a single char * option\n",
- azArg[1]);
- }
- break;
+ case SQLITE_TESTCTRL_ISKEYWORD:
+ if( nArg==3 ){
+ const char *opt = azArg[2];
+ rc = sqlite3_test_control(testctrl, opt);
+ fprintf(p->out, "%d (0x%08x)\n", rc, rc);
+ } else {
+ fprintf(stderr,"Error: testctrl %s takes a single char * option\n",
+ azArg[1]);
+ }
+ break;
#endif
- case SQLITE_TESTCTRL_BITVEC_TEST:
- case SQLITE_TESTCTRL_FAULT_INSTALL:
- case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS:
- case SQLITE_TESTCTRL_SCRATCHMALLOC:
- default:
- fprintf(stderr,"Error: CLI support for testctrl %s not implemented\n",
- azArg[1]);
- break;
- }
- }
- }else
-
- if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 && nArg==2 ){
- open_db(p, 0);
- sqlite3_busy_timeout(p->db, (int)integerValue(azArg[1]));
- }else
-
- if( HAS_TIMER && c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0
- && nArg==2
- ){
- enableTimer = booleanValue(azArg[1]);
- }else
-
- if( c=='t' && strncmp(azArg[0], "trace", n)==0 && nArg>1 ){
- open_db(p, 0);
- output_file_close(p->traceOut);
- p->traceOut = output_file_open(azArg[1]);
+ case SQLITE_TESTCTRL_BITVEC_TEST:
+ case SQLITE_TESTCTRL_FAULT_INSTALL:
+ case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS:
+ case SQLITE_TESTCTRL_SCRATCHMALLOC:
+ default:
+ fprintf(stderr,"Error: CLI support for testctrl %s not implemented\n",
+ azArg[1]);
+ break;
+ }
+ }
+ }else
+
+ if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 && nArg==2 ){
+ open_db(p, 0);
+ sqlite3_busy_timeout(p->db, (int)integerValue(azArg[1]));
+ }else
+
+ if( HAS_TIMER && c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0
+ && nArg==2
+ ){
+ enableTimer = booleanValue(azArg[1]);
+ }else
+
+ if( c=='t' && strncmp(azArg[0], "trace", n)==0 && nArg>1 ){
+ open_db(p, 0);
+ output_file_close(p->traceOut);
+ p->traceOut = output_file_open(azArg[1]);
#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
- if( p->traceOut==0 ){
- sqlite3_trace(p->db, 0, 0);
- }else{
- sqlite3_trace(p->db, sql_trace_callback, p->traceOut);
- }
+ if( p->traceOut==0 ){
+ sqlite3_trace(p->db, 0, 0);
+ }else{
+ sqlite3_trace(p->db, sql_trace_callback, p->traceOut);
+ }
#endif
- }else
-
- if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
- fprintf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
- sqlite3_libversion(), sqlite3_sourceid());
- }else
-
- if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
- const char *zDbName = nArg==2 ? azArg[1] : "main";
- char *zVfsName = 0;
- if( p->db ){
- sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsName);
- if( zVfsName ){
- fprintf(p->out, "%s\n", zVfsName);
- sqlite3_free(zVfsName);
- }
- }
- }else
+ }else
+
+ if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
+ fprintf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
+ sqlite3_libversion(), sqlite3_sourceid());
+ }else
+
+ if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
+ const char *zDbName = nArg==2 ? azArg[1] : "main";
+ char *zVfsName = 0;
+ if( p->db ){
+ sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsName);
+ if( zVfsName ){
+ fprintf(p->out, "%s\n", zVfsName);
+ sqlite3_free(zVfsName);
+ }
+ }
+ }else
#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
- if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
- extern int sqlite3WhereTrace;
- sqlite3WhereTrace = booleanValue(azArg[1]);
- }else
+ if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
+ extern int sqlite3WhereTrace;
+ sqlite3WhereTrace = booleanValue(azArg[1]);
+ }else
#endif
- if( c=='w' && strncmp(azArg[0], "width", n)==0 && nArg>1 ){
- int j;
- assert( nArg<=ArraySize(azArg) );
- for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
- p->colWidth[j-1] = (int)integerValue(azArg[j]);
- }
- }else
-
- {
- fprintf(stderr, "Error: unknown command or invalid arguments: "
- " \"%s\". Enter \".help\" for help\n", azArg[0]);
- rc = 1;
- }
-
- return rc;
+ if( c=='w' && strncmp(azArg[0], "width", n)==0 && nArg>1 ){
+ int j;
+ assert( nArg<=ArraySize(azArg) );
+ for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
+ p->colWidth[j-1] = (int)integerValue(azArg[j]);
+ }
+ }else
+
+ {
+ fprintf(stderr, "Error: unknown command or invalid arguments: "
+ " \"%s\". Enter \".help\" for help\n", azArg[0]);
+ rc = 1;
+ }
+
+ return rc;
}
/*
@@ -3196,33 +3194,33 @@ static int do_meta_command(char *zLine, struct callback_data *p){
** of string z[].
*/
static int line_contains_semicolon(const char *z, int N){
- int i;
- for(i=0; i<N; i++){ if( z[i]==';' ) return 1; }
- return 0;
+ int i;
+ for(i=0; i<N; i++){ if( z[i]==';' ) return 1; }
+ return 0;
}
/*
** Test to see if a line consists entirely of whitespace.
*/
static int _all_whitespace(const char *z){
- for(; *z; z++){
- if( IsSpace(z[0]) ) continue;
- if( *z=='/' && z[1]=='*' ){
- z += 2;
- while( *z && (*z!='*' || z[1]!='/') ){ z++; }
- if( *z==0 ) return 0;
- z++;
- continue;
- }
- if( *z=='-' && z[1]=='-' ){
- z += 2;
- while( *z && *z!='\n' ){ z++; }
- if( *z==0 ) return 1;
- continue;
- }
- return 0;
- }
- return 1;
+ for(; *z; z++){
+ if( IsSpace(z[0]) ) continue;
+ if( *z=='/' && z[1]=='*' ){
+ z += 2;
+ while( *z && (*z!='*' || z[1]!='/') ){ z++; }
+ if( *z==0 ) return 0;
+ z++;
+ continue;
+ }
+ if( *z=='-' && z[1]=='-' ){
+ z += 2;
+ while( *z && *z!='\n' ){ z++; }
+ if( *z==0 ) return 1;
+ continue;
+ }
+ return 0;
+ }
+ return 1;
}
/*
@@ -3231,15 +3229,15 @@ static int _all_whitespace(const char *z){
** as is the Oracle "/".
*/
static int line_is_command_terminator(const char *zLine){
- while( IsSpace(zLine[0]) ){ zLine++; };
- if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ){
- return 1; /* Oracle */
- }
- if( ToLower(zLine[0])=='g' && ToLower(zLine[1])=='o'
- && _all_whitespace(&zLine[2]) ){
- return 1; /* SQL Server */
- }
- return 0;
+ while( IsSpace(zLine[0]) ){ zLine++; };
+ if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ){
+ return 1; /* Oracle */
+ }
+ if( ToLower(zLine[0])=='g' && ToLower(zLine[1])=='o'
+ && _all_whitespace(&zLine[2]) ){
+ return 1; /* SQL Server */
+ }
+ return 0;
}
/*
@@ -3247,13 +3245,13 @@ static int line_is_command_terminator(const char *zLine){
** ends in the middle of a string literal or C-style comment.
*/
static int line_is_complete(char *zSql, int nSql){
- int rc;
- if( zSql==0 ) return 1;
- zSql[nSql] = ';';
- zSql[nSql+1] = 0;
- rc = sqlite3_complete(zSql);
- zSql[nSql] = 0;
- return rc;
+ int rc;
+ if( zSql==0 ) return 1;
+ zSql[nSql] = ';';
+ zSql[nSql+1] = 0;
+ rc = sqlite3_complete(zSql);
+ zSql[nSql] = 0;
+ return rc;
}
/*
@@ -3266,108 +3264,108 @@ static int line_is_complete(char *zSql, int nSql){
** Return the number of errors.
*/
static int process_input(struct callback_data *p, FILE *in){
- char *zLine = 0; /* A single input line */
- char *zSql = 0; /* Accumulated SQL text */
- int nLine; /* Length of current line */
- int nSql = 0; /* Bytes of zSql[] used */
- int nAlloc = 0; /* Allocated zSql[] space */
- int nSqlPrior = 0; /* Bytes of zSql[] used by prior line */
- char *zErrMsg; /* Error message returned */
- int rc; /* Error code */
- int errCnt = 0; /* Number of errors seen */
- int lineno = 0; /* Current line number */
- int startline = 0; /* Line number for start of current input */
-
- while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
- fflush(p->out);
- zLine = one_input_line(in, zLine, nSql>0);
- if( zLine==0 ){
- /* End of input */
- if( stdin_is_interactive ) printf("\n");
- break;
- }
- if( seenInterrupt ){
- if( in!=0 ) break;
- seenInterrupt = 0;
- }
- lineno++;
- if( nSql==0 && _all_whitespace(zLine) ){
- if( p->echoOn ) printf("%s\n", zLine);
- continue;
- }
- if( zLine && zLine[0]=='.' && nSql==0 ){
- if( p->echoOn ) printf("%s\n", zLine);
- rc = do_meta_command(zLine, p);
- if( rc==2 ){ /* exit requested */
- break;
- }else if( rc ){
- errCnt++;
- }
- continue;
- }
- if( line_is_command_terminator(zLine) && line_is_complete(zSql, nSql) ){
- memcpy(zLine,";",2);
- }
- nLine = strlen30(zLine);
- if( nSql+nLine+2>=nAlloc ){
- nAlloc = nSql+nLine+100;
- zSql = (char *)realloc(zSql, nAlloc);
- if( zSql==0 ){
- fprintf(stderr, "Error: out of memory\n");
- exit(1);
- }
- }
- nSqlPrior = nSql;
- if( nSql==0 ){
- int i;
- for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
- assert( nAlloc>0 && zSql!=0 );
- memcpy(zSql, zLine+i, nLine+1-i);
- startline = lineno;
- nSql = nLine-i;
- }else{
- zSql[nSql++] = '\n';
- memcpy(zSql+nSql, zLine, nLine+1);
- nSql += nLine;
- }
- if( nSql && line_contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
- && sqlite3_complete(zSql) ){
- p->cnt = 0;
- open_db(p, 0);
- BEGIN_TIMER;
- rc = shell_exec(p->db, zSql, shell_callback, p, &zErrMsg);
- END_TIMER;
- if( rc || zErrMsg ){
- char zPrefix[100];
- if( in!=0 || !stdin_is_interactive ){
- sqlite3_snprintf(sizeof(zPrefix), zPrefix,
- "Error: near line %d:", startline);
- }else{
- sqlite3_snprintf(sizeof(zPrefix), zPrefix, "Error:");
- }
- if( zErrMsg!=0 ){
- fprintf(stderr, "%s %s\n", zPrefix, zErrMsg);
- sqlite3_free(zErrMsg);
- zErrMsg = 0;
- }else{
- fprintf(stderr, "%s %s\n", zPrefix, sqlite3_errmsg(p->db));
- }
- errCnt++;
- }
- nSql = 0;
- }else if( nSql && _all_whitespace(zSql) ){
- if( p->echoOn ) printf("%s\n", zSql);
- nSql = 0;
- }
- }
- if( nSql ){
- if( !_all_whitespace(zSql) ){
- fprintf(stderr, "Error: incomplete SQL: %s\n", zSql);
- }
- free(zSql);
- }
- free(zLine);
- return errCnt>0;
+ char *zLine = 0; /* A single input line */
+ char *zSql = 0; /* Accumulated SQL text */
+ int nLine; /* Length of current line */
+ int nSql = 0; /* Bytes of zSql[] used */
+ int nAlloc = 0; /* Allocated zSql[] space */
+ int nSqlPrior = 0; /* Bytes of zSql[] used by prior line */
+ char *zErrMsg; /* Error message returned */
+ int rc; /* Error code */
+ int errCnt = 0; /* Number of errors seen */
+ int lineno = 0; /* Current line number */
+ int startline = 0; /* Line number for start of current input */
+
+ while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
+ fflush(p->out);
+ zLine = one_input_line(in, zLine, nSql>0);
+ if( zLine==0 ){
+ /* End of input */
+ if( stdin_is_interactive ) printf("\n");
+ break;
+ }
+ if( seenInterrupt ){
+ if( in!=0 ) break;
+ seenInterrupt = 0;
+ }
+ lineno++;
+ if( nSql==0 && _all_whitespace(zLine) ){
+ if( p->echoOn ) printf("%s\n", zLine);
+ continue;
+ }
+ if( zLine && zLine[0]=='.' && nSql==0 ){
+ if( p->echoOn ) printf("%s\n", zLine);
+ rc = do_meta_command(zLine, p);
+ if( rc==2 ){ /* exit requested */
+ break;
+ }else if( rc ){
+ errCnt++;
+ }
+ continue;
+ }
+ if( line_is_command_terminator(zLine) && line_is_complete(zSql, nSql) ){
+ memcpy(zLine,";",2);
+ }
+ nLine = strlen30(zLine);
+ if( nSql+nLine+2>=nAlloc ){
+ nAlloc = nSql+nLine+100;
+ zSql = (char *)realloc(zSql, nAlloc);
+ if( zSql==0 ){
+ fprintf(stderr, "Error: out of memory\n");
+ exit(1);
+ }
+ }
+ nSqlPrior = nSql;
+ if( nSql==0 ){
+ int i;
+ for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
+ assert( nAlloc>0 && zSql!=0 );
+ memcpy(zSql, zLine+i, nLine+1-i);
+ startline = lineno;
+ nSql = nLine-i;
+ }else{
+ zSql[nSql++] = '\n';
+ memcpy(zSql+nSql, zLine, nLine+1);
+ nSql += nLine;
+ }
+ if( nSql && line_contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
+ && sqlite3_complete(zSql) ){
+ p->cnt = 0;
+ open_db(p, 0);
+ BEGIN_TIMER;
+ rc = shell_exec(p->db, zSql, shell_callback, p, &zErrMsg);
+ END_TIMER;
+ if( rc || zErrMsg ){
+ char zPrefix[100];
+ if( in!=0 || !stdin_is_interactive ){
+ sqlite3_snprintf(sizeof(zPrefix), zPrefix,
+ "Error: near line %d:", startline);
+ }else{
+ sqlite3_snprintf(sizeof(zPrefix), zPrefix, "Error:");
+ }
+ if( zErrMsg!=0 ){
+ fprintf(stderr, "%s %s\n", zPrefix, zErrMsg);
+ sqlite3_free(zErrMsg);
+ zErrMsg = 0;
+ }else{
+ fprintf(stderr, "%s %s\n", zPrefix, sqlite3_errmsg(p->db));
+ }
+ errCnt++;
+ }
+ nSql = 0;
+ }else if( nSql && _all_whitespace(zSql) ){
+ if( p->echoOn ) printf("%s\n", zSql);
+ nSql = 0;
+ }
+ }
+ if( nSql ){
+ if( !_all_whitespace(zSql) ){
+ fprintf(stderr, "Error: incomplete SQL: %s\n", zSql);
+ }
+ free(zSql);
+ }
+ free(zLine);
+ return errCnt>0;
}
/*
@@ -3375,62 +3373,62 @@ static int process_input(struct callback_data *p, FILE *in){
** 0 return indicates an error of some kind.
*/
static char *find_home_dir(void){
- static char *home_dir = NULL;
- if( home_dir ) return home_dir;
+ static char *home_dir = NULL;
+ if( home_dir ) return home_dir;
#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL)
- {
- struct passwd *pwent;
- uid_t uid = getuid();
- if( (pwent=getpwuid(uid)) != NULL) {
- home_dir = pwent->pw_dir;
- }
- }
+ {
+ struct passwd *pwent;
+ uid_t uid = getuid();
+ if( (pwent=getpwuid(uid)) != NULL) {
+ home_dir = pwent->pw_dir;
+ }
+ }
#endif
#if defined(_WIN32_WCE)
- /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
- */
- home_dir = "/";
+ /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
+ */
+ home_dir = "/";
#else
#if defined(_WIN32) || defined(WIN32)
- if (!home_dir) {
- home_dir = getenv("USERPROFILE");
- }
+ if (!home_dir) {
+ home_dir = getenv("USERPROFILE");
+ }
#endif
- if (!home_dir) {
- home_dir = getenv("HOME");
- }
+ if (!home_dir) {
+ home_dir = getenv("HOME");
+ }
#if defined(_WIN32) || defined(WIN32)
- if (!home_dir) {
- char *zDrive, *zPath;
- int n;
- zDrive = getenv("HOMEDRIVE");
- zPath = getenv("HOMEPATH");
- if( zDrive && zPath ){
- n = strlen30(zDrive) + strlen30(zPath) + 1;
- home_dir = (char *)malloc( n );
- if( home_dir==0 ) return 0;
- sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
- return home_dir;
- }
- home_dir = "c:\\";
- }
+ if (!home_dir) {
+ char *zDrive, *zPath;
+ int n;
+ zDrive = getenv("HOMEDRIVE");
+ zPath = getenv("HOMEPATH");
+ if( zDrive && zPath ){
+ n = strlen30(zDrive) + strlen30(zPath) + 1;
+ home_dir = (char *)malloc( n );
+ if( home_dir==0 ) return 0;
+ sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
+ return home_dir;
+ }
+ home_dir = "c:\\";
+ }
#endif
#endif /* !_WIN32_WCE */
- if( home_dir ){
- int n = strlen30(home_dir) + 1;
- char *z = (char *)malloc( n );
- if( z ) memcpy(z, home_dir, n);
- home_dir = z;
- }
+ if( home_dir ){
+ int n = strlen30(home_dir) + 1;
+ char *z = (char *)malloc( n );
+ if( z ) memcpy(z, home_dir, n);
+ home_dir = z;
+ }
- return home_dir;
+ return home_dir;
}
/*
@@ -3440,98 +3438,98 @@ static char *find_home_dir(void){
** Returns the number of errors.
*/
static int process_sqliterc(
- struct callback_data *p, /* Configuration data */
- const char *sqliterc_override /* Name of config file. NULL to use default */
+ struct callback_data *p, /* Configuration data */
+ const char *sqliterc_override /* Name of config file. NULL to use default */
){
- char *home_dir = NULL;
- const char *sqliterc = sqliterc_override;
- char *zBuf = 0;
- FILE *in = NULL;
- int rc = 0;
-
- if (sqliterc == NULL) {
- home_dir = find_home_dir();
- if( home_dir==0 ){
+ char *home_dir = NULL;
+ const char *sqliterc = sqliterc_override;
+ char *zBuf = 0;
+ FILE *in = NULL;
+ int rc = 0;
+
+ if (sqliterc == NULL) {
+ home_dir = find_home_dir();
+ if( home_dir==0 ){
#if !defined(__RTP__) && !defined(_WRS_KERNEL)
- fprintf(stderr,"%s: Error: cannot locate your home directory\n", Argv0);
+ fprintf(stderr,"%s: Error: cannot locate your home directory\n", Argv0);
#endif
- return 1;
- }
- sqlite3_initialize();
- zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
- sqliterc = zBuf;
- }
- in = fopen(sqliterc,"rb");
- if( in ){
- if( stdin_is_interactive ){
- fprintf(stderr,"-- Loading resources from %s\n",sqliterc);
- }
- rc = process_input(p,in);
- fclose(in);
- }
- sqlite3_free(zBuf);
- return rc;
+ return 1;
+ }
+ sqlite3_initialize();
+ zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
+ sqliterc = zBuf;
+ }
+ in = fopen(sqliterc,"rb");
+ if( in ){
+ if( stdin_is_interactive ){
+ fprintf(stderr,"-- Loading resources from %s\n",sqliterc);
+ }
+ rc = process_input(p,in);
+ fclose(in);
+ }
+ sqlite3_free(zBuf);
+ return rc;
}
/*
** Show available command line options
*/
-static const char zOptions[] =
- " -bail stop after hitting an error\n"
- " -batch force batch I/O\n"
- " -column set output mode to 'column'\n"
- " -cmd COMMAND run \"COMMAND\" before reading stdin\n"
- " -csv set output mode to 'csv'\n"
- " -echo print commands before execution\n"
- " -init FILENAME read/process named file\n"
- " -[no]header turn headers on or off\n"
+static const char zOptions[] =
+ " -bail stop after hitting an error\n"
+ " -batch force batch I/O\n"
+ " -column set output mode to 'column'\n"
+ " -cmd COMMAND run \"COMMAND\" before reading stdin\n"
+ " -csv set output mode to 'csv'\n"
+ " -echo print commands before execution\n"
+ " -init FILENAME read/process named file\n"
+ " -[no]header turn headers on or off\n"
#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
- " -heap SIZE Size of heap for memsys3 or memsys5\n"
+ " -heap SIZE Size of heap for memsys3 or memsys5\n"
#endif
- " -help show this message\n"
- " -html set output mode to HTML\n"
- " -interactive force interactive I/O\n"
- " -line set output mode to 'line'\n"
- " -list set output mode to 'list'\n"
- " -mmap N default mmap size set to N\n"
+ " -help show this message\n"
+ " -html set output mode to HTML\n"
+ " -interactive force interactive I/O\n"
+ " -line set output mode to 'line'\n"
+ " -list set output mode to 'list'\n"
+ " -mmap N default mmap size set to N\n"
#ifdef SQLITE_ENABLE_MULTIPLEX
- " -multiplex enable the multiplexor VFS\n"
+ " -multiplex enable the multiplexor VFS\n"
#endif
- " -nullvalue TEXT set text string for NULL values. Default ''\n"
- " -separator SEP set output field separator. Default: '|'\n"
- " -stats print memory stats before each finalize\n"
- " -version show SQLite version\n"
- " -vfs NAME use NAME as the default VFS\n"
+ " -nullvalue TEXT set text string for NULL values. Default ''\n"
+ " -separator SEP set output field separator. Default: '|'\n"
+ " -stats print memory stats before each finalize\n"
+ " -version show SQLite version\n"
+ " -vfs NAME use NAME as the default VFS\n"
#ifdef SQLITE_ENABLE_VFSTRACE
- " -vfstrace enable tracing of all VFS calls\n"
+ " -vfstrace enable tracing of all VFS calls\n"
#endif
;
static void usage(int showDetail){
- fprintf(stderr,
- "Usage: %s [OPTIONS] FILENAME [SQL]\n"
- "FILENAME is the name of an SQLite database. A new database is created\n"
- "if the file does not previously exist.\n", Argv0);
- if( showDetail ){
- fprintf(stderr, "OPTIONS include:\n%s", zOptions);
- }else{
- fprintf(stderr, "Use the -help option for additional information\n");
- }
- exit(1);
+ fprintf(stderr,
+ "Usage: %s [OPTIONS] FILENAME [SQL]\n"
+ "FILENAME is the name of an SQLite database. A new database is created\n"
+ "if the file does not previously exist.\n", Argv0);
+ if( showDetail ){
+ fprintf(stderr, "OPTIONS include:\n%s", zOptions);
+ }else{
+ fprintf(stderr, "Use the -help option for additional information\n");
+ }
+ exit(1);
}
/*
** Initialize the state information in data
*/
static void main_init(struct callback_data *data) {
- memset(data, 0, sizeof(*data));
- data->mode = MODE_List;
- memcpy(data->separator,"|", 2);
- data->showHeader = 0;
- sqlite3_config(SQLITE_CONFIG_URI, 1);
- sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
- sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
- sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> ");
- sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
+ memset(data, 0, sizeof(*data));
+ data->mode = MODE_List;
+ memcpy(data->separator,"|", 2);
+ data->showHeader = 0;
+ sqlite3_config(SQLITE_CONFIG_URI, 1);
+ sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
+ sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
+ sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> ");
+ sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
}
/*
@@ -3539,18 +3537,18 @@ static void main_init(struct callback_data *data) {
*/
#ifdef _WIN32
static void printBold(const char *zText){
- HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);
- CONSOLE_SCREEN_BUFFER_INFO defaultScreenInfo;
- GetConsoleScreenBufferInfo(out, &defaultScreenInfo);
- SetConsoleTextAttribute(out,
- FOREGROUND_RED|FOREGROUND_INTENSITY
- );
- printf("%s", zText);
- SetConsoleTextAttribute(out, defaultScreenInfo.wAttributes);
+ HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);
+ CONSOLE_SCREEN_BUFFER_INFO defaultScreenInfo;
+ GetConsoleScreenBufferInfo(out, &defaultScreenInfo);
+ SetConsoleTextAttribute(out,
+ FOREGROUND_RED|FOREGROUND_INTENSITY
+ );
+ printf("%s", zText);
+ SetConsoleTextAttribute(out, defaultScreenInfo.wAttributes);
}
#else
static void printBold(const char *zText){
- printf("\033[1m%s\033[0m", zText);
+ printf("\033[1m%s\033[0m", zText);
}
#endif
@@ -3559,295 +3557,295 @@ static void printBold(const char *zText){
** is available.
*/
static char *cmdline_option_value(int argc, char **argv, int i){
- if( i==argc ){
- fprintf(stderr, "%s: Error: missing argument to %s\n",
- argv[0], argv[argc-1]);
- exit(1);
- }
- return argv[i];
+ if( i==argc ){
+ fprintf(stderr, "%s: Error: missing argument to %s\n",
+ argv[0], argv[argc-1]);
+ exit(1);
+ }
+ return argv[i];
}
int main(int argc, char **argv){
- char *zErrMsg = 0;
- struct callback_data data;
- const char *zInitFile = 0;
- char *zFirstCmd = 0;
- int i;
- int rc = 0;
- int warnInmemoryDb = 0;
+ char *zErrMsg = 0;
+ struct callback_data data;
+ const char *zInitFile = 0;
+ char *zFirstCmd = 0;
+ int i;
+ int rc = 0;
+ int warnInmemoryDb = 0;
#if USE_SYSTEM_SQLITE+0!=1
- if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
- fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
- sqlite3_sourceid(), SQLITE_SOURCE_ID);
- exit(1);
- }
+ if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
+ fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
+ sqlite3_sourceid(), SQLITE_SOURCE_ID);
+ exit(1);
+ }
#endif
- Argv0 = argv[0];
- main_init(&data);
- stdin_is_interactive = isatty(0);
+ Argv0 = argv[0];
+ main_init(&data);
+ stdin_is_interactive = isatty(0);
- /* Make sure we have a valid signal handler early, before anything
- ** else is done.
- */
+ /* Make sure we have a valid signal handler early, before anything
+ ** else is done.
+ */
#ifdef SIGINT
- signal(SIGINT, interrupt_handler);
+ signal(SIGINT, interrupt_handler);
#endif
- /* Do an initial pass through the command-line argument to locate
- ** the name of the database file, the name of the initialization file,
- ** the size of the alternative malloc heap,
- ** and the first command to execute.
- */
- for(i=1; i<argc; i++){
- char *z;
- z = argv[i];
- if( z[0]!='-' ){
- if( data.zDbFilename==0 ){
- data.zDbFilename = z;
- continue;
- }
- if( zFirstCmd==0 ){
- zFirstCmd = z;
- continue;
- }
- fprintf(stderr,"%s: Error: too many options: \"%s\"\n", Argv0, argv[i]);
- fprintf(stderr,"Use -help for a list of options.\n");
- return 1;
- }
- if( z[1]=='-' ) z++;
- if( strcmp(z,"-separator")==0
- || strcmp(z,"-nullvalue")==0
- || strcmp(z,"-cmd")==0
- ){
- (void)cmdline_option_value(argc, argv, ++i);
- }else if( strcmp(z,"-init")==0 ){
- zInitFile = cmdline_option_value(argc, argv, ++i);
- }else if( strcmp(z,"-batch")==0 ){
- /* Need to check for batch mode here to so we can avoid printing
- ** informational messages (like from process_sqliterc) before
- ** we do the actual processing of arguments later in a second pass.
- */
- stdin_is_interactive = 0;
- }else if( strcmp(z,"-heap")==0 ){
+ /* Do an initial pass through the command-line argument to locate
+ ** the name of the database file, the name of the initialization file,
+ ** the size of the alternative malloc heap,
+ ** and the first command to execute.
+ */
+ for(i=1; i<argc; i++){
+ char *z;
+ z = argv[i];
+ if( z[0]!='-' ){
+ if( data.zDbFilename==0 ){
+ data.zDbFilename = z;
+ continue;
+ }
+ if( zFirstCmd==0 ){
+ zFirstCmd = z;
+ continue;
+ }
+ fprintf(stderr,"%s: Error: too many options: \"%s\"\n", Argv0, argv[i]);
+ fprintf(stderr,"Use -help for a list of options.\n");
+ return 1;
+ }
+ if( z[1]=='-' ) z++;
+ if( strcmp(z,"-separator")==0
+ || strcmp(z,"-nullvalue")==0
+ || strcmp(z,"-cmd")==0
+ ){
+ (void)cmdline_option_value(argc, argv, ++i);
+ }else if( strcmp(z,"-init")==0 ){
+ zInitFile = cmdline_option_value(argc, argv, ++i);
+ }else if( strcmp(z,"-batch")==0 ){
+ /* Need to check for batch mode here to so we can avoid printing
+ ** informational messages (like from process_sqliterc) before
+ ** we do the actual processing of arguments later in a second pass.
+ */
+ stdin_is_interactive = 0;
+ }else if( strcmp(z,"-heap")==0 ){
#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
- const char *zSize;
- sqlite3_int64 szHeap;
+ const char *zSize;
+ sqlite3_int64 szHeap;
- zSize = cmdline_option_value(argc, argv, ++i);
- szHeap = integerValue(zSize);
- if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
- sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
+ zSize = cmdline_option_value(argc, argv, ++i);
+ szHeap = integerValue(zSize);
+ if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
+ sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
#endif
#ifdef SQLITE_ENABLE_VFSTRACE
- }else if( strcmp(z,"-vfstrace")==0 ){
- extern int vfstrace_register(
- const char *zTraceName,
- const char *zOldVfsName,
- int (*xOut)(const char*,void*),
- void *pOutArg,
- int makeDefault
- );
- vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1);
+ }else if( strcmp(z,"-vfstrace")==0 ){
+ extern int vfstrace_register(
+ const char *zTraceName,
+ const char *zOldVfsName,
+ int (*xOut)(const char*,void*),
+ void *pOutArg,
+ int makeDefault
+ );
+ vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1);
#endif
#ifdef SQLITE_ENABLE_MULTIPLEX
- }else if( strcmp(z,"-multiplex")==0 ){
- extern int sqlite3_multiple_initialize(const char*,int);
- sqlite3_multiplex_initialize(0, 1);
+ }else if( strcmp(z,"-multiplex")==0 ){
+ extern int sqlite3_multiple_initialize(const char*,int);
+ sqlite3_multiplex_initialize(0, 1);
#endif
- }else if( strcmp(z,"-mmap")==0 ){
- sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
- sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
- }else if( strcmp(z,"-vfs")==0 ){
- sqlite3_vfs *pVfs = sqlite3_vfs_find(cmdline_option_value(argc,argv,++i));
- if( pVfs ){
- sqlite3_vfs_register(pVfs, 1);
- }else{
- fprintf(stderr, "no such VFS: \"%s\"\n", argv[i]);
- exit(1);
- }
- }
- }
- if( data.zDbFilename==0 ){
+ }else if( strcmp(z,"-mmap")==0 ){
+ sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
+ sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
+ }else if( strcmp(z,"-vfs")==0 ){
+ sqlite3_vfs *pVfs = sqlite3_vfs_find(cmdline_option_value(argc,argv,++i));
+ if( pVfs ){
+ sqlite3_vfs_register(pVfs, 1);
+ }else{
+ fprintf(stderr, "no such VFS: \"%s\"\n", argv[i]);
+ exit(1);
+ }
+ }
+ }
+ if( data.zDbFilename==0 ){
#ifndef SQLITE_OMIT_MEMORYDB
- data.zDbFilename = ":memory:";
- warnInmemoryDb = argc==1;
+ data.zDbFilename = ":memory:";
+ warnInmemoryDb = argc==1;
#else
- fprintf(stderr,"%s: Error: no database filename specified\n", Argv0);
- return 1;
+ fprintf(stderr,"%s: Error: no database filename specified\n", Argv0);
+ return 1;
#endif
#ifdef SQLITE_SHELL_DBNAME_PROC
- { extern void SQLITE_SHELL_DBNAME_PROC(const char**);
- SQLITE_SHELL_DBNAME_PROC(&data.zDbFilename);
- warnInmemoryDb = 0; }
+ { extern void SQLITE_SHELL_DBNAME_PROC(const char**);
+ SQLITE_SHELL_DBNAME_PROC(&data.zDbFilename);
+ warnInmemoryDb = 0; }
#endif
- }
- data.out = stdout;
-
- /* Go ahead and open the database file if it already exists. If the
- ** file does not exist, delay opening it. This prevents empty database
- ** files from being created if a user mistypes the database name argument
- ** to the sqlite command-line tool.
- */
- if( access(data.zDbFilename, 0)==0 ){
- open_db(&data, 0);
- }
-
- /* Process the initialization file if there is one. If no -init option
- ** is given on the command line, look for a file named ~/.sqliterc and
- ** try to process it.
- */
- rc = process_sqliterc(&data,zInitFile);
- if( rc>0 ){
- return rc;
- }
-
- /* Make a second pass through the command-line argument and set
- ** options. This second pass is delayed until after the initialization
- ** file is processed so that the command-line arguments will override
- ** settings in the initialization file.
- */
- for(i=1; i<argc; i++){
- char *z = argv[i];
- if( z[0]!='-' ) continue;
- if( z[1]=='-' ){ z++; }
- if( strcmp(z,"-init")==0 ){
- i++;
- }else if( strcmp(z,"-html")==0 ){
- data.mode = MODE_Html;
- }else if( strcmp(z,"-list")==0 ){
- data.mode = MODE_List;
- }else if( strcmp(z,"-line")==0 ){
- data.mode = MODE_Line;
- }else if( strcmp(z,"-column")==0 ){
- data.mode = MODE_Column;
- }else if( strcmp(z,"-csv")==0 ){
- data.mode = MODE_Csv;
- memcpy(data.separator,",",2);
- }else if( strcmp(z,"-separator")==0 ){
- sqlite3_snprintf(sizeof(data.separator), data.separator,
- "%s",cmdline_option_value(argc,argv,++i));
- }else if( strcmp(z,"-nullvalue")==0 ){
- sqlite3_snprintf(sizeof(data.nullvalue), data.nullvalue,
- "%s",cmdline_option_value(argc,argv,++i));
- }else if( strcmp(z,"-header")==0 ){
- data.showHeader = 1;
- }else if( strcmp(z,"-noheader")==0 ){
- data.showHeader = 0;
- }else if( strcmp(z,"-echo")==0 ){
- data.echoOn = 1;
- }else if( strcmp(z,"-eqp")==0 ){
- data.autoEQP = 1;
- }else if( strcmp(z,"-stats")==0 ){
- data.statsOn = 1;
- }else if( strcmp(z,"-bail")==0 ){
- bail_on_error = 1;
- }else if( strcmp(z,"-version")==0 ){
- printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
- return 0;
- }else if( strcmp(z,"-interactive")==0 ){
- stdin_is_interactive = 1;
- }else if( strcmp(z,"-batch")==0 ){
- stdin_is_interactive = 0;
- }else if( strcmp(z,"-heap")==0 ){
- i++;
- }else if( strcmp(z,"-mmap")==0 ){
- i++;
- }else if( strcmp(z,"-vfs")==0 ){
- i++;
+ }
+ data.out = stdout;
+
+ /* Go ahead and open the database file if it already exists. If the
+ ** file does not exist, delay opening it. This prevents empty database
+ ** files from being created if a user mistypes the database name argument
+ ** to the sqlite command-line tool.
+ */
+ if( access(data.zDbFilename, 0)==0 ){
+ open_db(&data, 0);
+ }
+
+ /* Process the initialization file if there is one. If no -init option
+ ** is given on the command line, look for a file named ~/.sqliterc and
+ ** try to process it.
+ */
+ rc = process_sqliterc(&data,zInitFile);
+ if( rc>0 ){
+ return rc;
+ }
+
+ /* Make a second pass through the command-line argument and set
+ ** options. This second pass is delayed until after the initialization
+ ** file is processed so that the command-line arguments will override
+ ** settings in the initialization file.
+ */
+ for(i=1; i<argc; i++){
+ char *z = argv[i];
+ if( z[0]!='-' ) continue;
+ if( z[1]=='-' ){ z++; }
+ if( strcmp(z,"-init")==0 ){
+ i++;
+ }else if( strcmp(z,"-html")==0 ){
+ data.mode = MODE_Html;
+ }else if( strcmp(z,"-list")==0 ){
+ data.mode = MODE_List;
+ }else if( strcmp(z,"-line")==0 ){
+ data.mode = MODE_Line;
+ }else if( strcmp(z,"-column")==0 ){
+ data.mode = MODE_Column;
+ }else if( strcmp(z,"-csv")==0 ){
+ data.mode = MODE_Csv;
+ memcpy(data.separator,",",2);
+ }else if( strcmp(z,"-separator")==0 ){
+ sqlite3_snprintf(sizeof(data.separator), data.separator,
+ "%s",cmdline_option_value(argc,argv,++i));
+ }else if( strcmp(z,"-nullvalue")==0 ){
+ sqlite3_snprintf(sizeof(data.nullvalue), data.nullvalue,
+ "%s",cmdline_option_value(argc,argv,++i));
+ }else if( strcmp(z,"-header")==0 ){
+ data.showHeader = 1;
+ }else if( strcmp(z,"-noheader")==0 ){
+ data.showHeader = 0;
+ }else if( strcmp(z,"-echo")==0 ){
+ data.echoOn = 1;
+ }else if( strcmp(z,"-eqp")==0 ){
+ data.autoEQP = 1;
+ }else if( strcmp(z,"-stats")==0 ){
+ data.statsOn = 1;
+ }else if( strcmp(z,"-bail")==0 ){
+ bail_on_error = 1;
+ }else if( strcmp(z,"-version")==0 ){
+ printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
+ return 0;
+ }else if( strcmp(z,"-interactive")==0 ){
+ stdin_is_interactive = 1;
+ }else if( strcmp(z,"-batch")==0 ){
+ stdin_is_interactive = 0;
+ }else if( strcmp(z,"-heap")==0 ){
+ i++;
+ }else if( strcmp(z,"-mmap")==0 ){
+ i++;
+ }else if( strcmp(z,"-vfs")==0 ){
+ i++;
#ifdef SQLITE_ENABLE_VFSTRACE
- }else if( strcmp(z,"-vfstrace")==0 ){
- i++;
+ }else if( strcmp(z,"-vfstrace")==0 ){
+ i++;
#endif
#ifdef SQLITE_ENABLE_MULTIPLEX
- }else if( strcmp(z,"-multiplex")==0 ){
- i++;
+ }else if( strcmp(z,"-multiplex")==0 ){
+ i++;
#endif
- }else if( strcmp(z,"-help")==0 ){
- usage(1);
- }else if( strcmp(z,"-cmd")==0 ){
- if( i==argc-1 ) break;
- z = cmdline_option_value(argc,argv,++i);
- if( z[0]=='.' ){
- rc = do_meta_command(z, &data);
- if( rc && bail_on_error ) return rc==2 ? 0 : rc;
- }else{
- open_db(&data, 0);
- rc = shell_exec(data.db, z, shell_callback, &data, &zErrMsg);
- if( zErrMsg!=0 ){
- fprintf(stderr,"Error: %s\n", zErrMsg);
- if( bail_on_error ) return rc!=0 ? rc : 1;
- }else if( rc!=0 ){
- fprintf(stderr,"Error: unable to process SQL \"%s\"\n", z);
- if( bail_on_error ) return rc;
- }
- }
- }else{
- fprintf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);
- fprintf(stderr,"Use -help for a list of options.\n");
- return 1;
- }
- }
-
- if( zFirstCmd ){
- /* Run just the command that follows the database name
- */
- if( zFirstCmd[0]=='.' ){
- rc = do_meta_command(zFirstCmd, &data);
- if( rc==2 ) rc = 0;
- }else{
- open_db(&data, 0);
- rc = shell_exec(data.db, zFirstCmd, shell_callback, &data, &zErrMsg);
- if( zErrMsg!=0 ){
- fprintf(stderr,"Error: %s\n", zErrMsg);
- return rc!=0 ? rc : 1;
- }else if( rc!=0 ){
- fprintf(stderr,"Error: unable to process SQL \"%s\"\n", zFirstCmd);
- return rc;
- }
- }
- }else{
- /* Run commands received from standard input
- */
- if( stdin_is_interactive ){
- char *zHome;
- char *zHistory = 0;
- int nHistory;
- printf(
- "SQLite version %s %.19s\n" /*extra-version-info*/
- "Enter \".help\" for usage hints.\n",
- sqlite3_libversion(), sqlite3_sourceid()
- );
- if( warnInmemoryDb ){
- printf("Connected to a ");
- printBold("transient in-memory database");
- printf(".\nUse \".open FILENAME\" to reopen on a "
- "persistent database.\n");
- }
- zHome = find_home_dir();
- if( zHome ){
- nHistory = strlen30(zHome) + 20;
- if( (zHistory = (char *)malloc(nHistory))!=0 ){
- sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
- }
- }
+ }else if( strcmp(z,"-help")==0 ){
+ usage(1);
+ }else if( strcmp(z,"-cmd")==0 ){
+ if( i==argc-1 ) break;
+ z = cmdline_option_value(argc,argv,++i);
+ if( z[0]=='.' ){
+ rc = do_meta_command(z, &data);
+ if( rc && bail_on_error ) return rc==2 ? 0 : rc;
+ }else{
+ open_db(&data, 0);
+ rc = shell_exec(data.db, z, shell_callback, &data, &zErrMsg);
+ if( zErrMsg!=0 ){
+ fprintf(stderr,"Error: %s\n", zErrMsg);
+ if( bail_on_error ) return rc!=0 ? rc : 1;
+ }else if( rc!=0 ){
+ fprintf(stderr,"Error: unable to process SQL \"%s\"\n", z);
+ if( bail_on_error ) return rc;
+ }
+ }
+ }else{
+ fprintf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);
+ fprintf(stderr,"Use -help for a list of options.\n");
+ return 1;
+ }
+ }
+
+ if( zFirstCmd ){
+ /* Run just the command that follows the database name
+ */
+ if( zFirstCmd[0]=='.' ){
+ rc = do_meta_command(zFirstCmd, &data);
+ if( rc==2 ) rc = 0;
+ }else{
+ open_db(&data, 0);
+ rc = shell_exec(data.db, zFirstCmd, shell_callback, &data, &zErrMsg);
+ if( zErrMsg!=0 ){
+ fprintf(stderr,"Error: %s\n", zErrMsg);
+ return rc!=0 ? rc : 1;
+ }else if( rc!=0 ){
+ fprintf(stderr,"Error: unable to process SQL \"%s\"\n", zFirstCmd);
+ return rc;
+ }
+ }
+ }else{
+ /* Run commands received from standard input
+ */
+ if( stdin_is_interactive ){
+ char *zHome;
+ char *zHistory = 0;
+ int nHistory;
+ printf(
+ "SQLite version %s %.19s\n" /*extra-version-info*/
+ "Enter \".help\" for usage hints.\n",
+ sqlite3_libversion(), sqlite3_sourceid()
+ );
+ if( warnInmemoryDb ){
+ printf("Connected to a ");
+ printBold("transient in-memory database");
+ printf(".\nUse \".open FILENAME\" to reopen on a "
+ "persistent database.\n");
+ }
+ zHome = find_home_dir();
+ if( zHome ){
+ nHistory = strlen30(zHome) + 20;
+ if( (zHistory = (char *)malloc(nHistory))!=0 ){
+ sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
+ }
+ }
#if defined(HAVE_READLINE)
- if( zHistory ) read_history(zHistory);
+ if( zHistory ) read_history(zHistory);
#endif
- rc = process_input(&data, 0);
- if( zHistory ){
- stifle_history(100);
- write_history(zHistory);
- free(zHistory);
- }
- }else{
- rc = process_input(&data, stdin);
- }
- }
- set_table_name(&data, 0);
- if( data.db ){
- sqlite3_close(data.db);
- }
- sqlite3_free(data.zFreeOnClose);
- return rc;
-} \ No newline at end of file
+ rc = process_input(&data, 0);
+ if( zHistory ){
+ stifle_history(100);
+ write_history(zHistory);
+ free(zHistory);
+ }
+ }else{
+ rc = process_input(&data, stdin);
+ }
+ }
+ set_table_name(&data, 0);
+ if( data.db ){
+ sqlite3_close(data.db);
+ }
+ sqlite3_free(data.zFreeOnClose);
+ return rc;
+}
diff --git a/src/lib/util/corealloc.c b/src/lib/util/corealloc.c
index 8e13023ddad..af4ec856887 100644
--- a/src/lib/util/corealloc.c
+++ b/src/lib/util/corealloc.c
@@ -181,7 +181,7 @@ void free_file_line(void *memory, const char *file, int line, bool array)
//-------------------------------------------------
// track_memory - enables or disables the memory
-// tracking
+// tracking
//-------------------------------------------------
void track_memory(bool track)
diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c
index fb5b4eb8204..d0f5931658d 100644
--- a/src/lib/util/zippath.c
+++ b/src/lib/util/zippath.c
@@ -394,8 +394,8 @@ static int is_7z_file(const char *path)
const char *s = strrchr(path, '.');
return (s != NULL) && !core_stricmp(s, ".7z");
}
-
-
+
+
/*-------------------------------------------------
is_zip_file - tests to see if this file is a
ZIP file
diff --git a/src/lib/web/mongoose.c b/src/lib/web/mongoose.c
index b1006b04311..0959d58edf6 100644
--- a/src/lib/web/mongoose.c
+++ b/src/lib/web/mongoose.c
@@ -121,7 +121,7 @@ typedef int sock_t;
#ifdef NS_ENABLE_DEBUG
#define DBG(x) do { printf("%-20s ", __func__); printf x; putchar('\n'); \
- fflush(stdout); } while(0)
+ fflush(stdout); } while(0)
#else
#define DBG(x)
#endif
@@ -143,20 +143,20 @@ extern "C" {
#endif // __cplusplus
union socket_address {
- struct sockaddr sa;
- struct sockaddr_in sin;
+ struct sockaddr sa;
+ struct sockaddr_in sin;
#ifdef NS_ENABLE_IPV6
- struct sockaddr_in6 sin6;
+ struct sockaddr_in6 sin6;
#else
- struct sockaddr sin6;
+ struct sockaddr sin6;
#endif
};
// IO buffers interface
struct iobuf {
- char *buf;
- size_t len;
- size_t size;
+ char *buf;
+ size_t len;
+ size_t size;
};
void iobuf_init(struct iobuf *, size_t initial_size);
@@ -167,12 +167,12 @@ void iobuf_remove(struct iobuf *, size_t data_size);
// Net skeleton interface
// Events. Meaning of event parameter (evp) is given in the comment.
enum ns_event {
- NS_POLL, // Sent to each connection on each call to ns_server_poll()
- NS_ACCEPT, // New connection accept()-ed. union socket_address *remote_addr
- NS_CONNECT, // connect() succeeded or failed. int *success_status
- NS_RECV, // Data has benn received. int *num_bytes
- NS_SEND, // Data has been written to a socket. int *num_bytes
- NS_CLOSE // Connection is closed. NULL
+ NS_POLL, // Sent to each connection on each call to ns_server_poll()
+ NS_ACCEPT, // New connection accept()-ed. union socket_address *remote_addr
+ NS_CONNECT, // connect() succeeded or failed. int *success_status
+ NS_RECV, // Data has benn received. int *num_bytes
+ NS_SEND, // Data has been written to a socket. int *num_bytes
+ NS_CLOSE // Connection is closed. NULL
};
// Callback function (event handler) prototype, must be defined by user.
@@ -181,26 +181,26 @@ struct ns_connection;
typedef void (*ns_callback_t)(struct ns_connection *, enum ns_event, void *evp);
struct ns_server {
- void *server_data;
- sock_t listening_sock;
- struct ns_connection *active_connections;
- ns_callback_t callback;
- SSL_CTX *ssl_ctx;
- SSL_CTX *client_ssl_ctx;
- sock_t ctl[2];
+ void *server_data;
+ sock_t listening_sock;
+ struct ns_connection *active_connections;
+ ns_callback_t callback;
+ SSL_CTX *ssl_ctx;
+ SSL_CTX *client_ssl_ctx;
+ sock_t ctl[2];
};
struct ns_connection {
- struct ns_connection *prev, *next;
- struct ns_server *server;
- sock_t sock;
- union socket_address sa;
- struct iobuf recv_iobuf;
- struct iobuf send_iobuf;
- SSL *ssl;
- void *connection_data;
- time_t last_io_time;
- unsigned int flags;
+ struct ns_connection *prev, *next;
+ struct ns_server *server;
+ sock_t sock;
+ union socket_address sa;
+ struct iobuf recv_iobuf;
+ struct iobuf send_iobuf;
+ SSL *ssl;
+ void *connection_data;
+ time_t last_io_time;
+ unsigned int flags;
#define NSF_FINISHED_SENDING_DATA (1 << 0)
#define NSF_BUFFER_BUT_DONT_SEND (1 << 1)
#define NSF_SSL_HANDSHAKE_DONE (1 << 2)
@@ -231,7 +231,7 @@ int ns_bind(struct ns_server *, const char *addr);
int ns_set_ssl_cert(struct ns_server *, const char *ssl_cert);
int ns_set_ssl_ca_cert(struct ns_server *, const char *ssl_ca_cert);
struct ns_connection *ns_connect(struct ns_server *, const char *host,
- int port, int ssl, void *connection_param);
+ int port, int ssl, void *connection_param);
int ns_send(struct ns_connection *, const void *buf, int len);
int ns_printf(struct ns_connection *, const char *fmt, ...);
@@ -280,795 +280,795 @@ int ns_hexdump(const void *buf, int len, char *dst, int dst_len);
#endif
struct ctl_msg {
- ns_callback_t callback;
- char message[1024 * 8];
+ ns_callback_t callback;
+ char message[1024 * 8];
};
void iobuf_init(struct iobuf *iobuf, size_t size) {
- iobuf->len = iobuf->size = 0;
- iobuf->buf = NULL;
+ iobuf->len = iobuf->size = 0;
+ iobuf->buf = NULL;
- if (size > 0 && (iobuf->buf = (char *) NS_MALLOC(size)) != NULL) {
- iobuf->size = size;
- }
+ if (size > 0 && (iobuf->buf = (char *) NS_MALLOC(size)) != NULL) {
+ iobuf->size = size;
+ }
}
void iobuf_free(struct iobuf *iobuf) {
- if (iobuf != NULL) {
- if (iobuf->buf != NULL) NS_FREE(iobuf->buf);
- iobuf_init(iobuf, 0);
- }
+ if (iobuf != NULL) {
+ if (iobuf->buf != NULL) NS_FREE(iobuf->buf);
+ iobuf_init(iobuf, 0);
+ }
}
size_t iobuf_append(struct iobuf *io, const void *buf, size_t len) {
- char *p = NULL;
+ char *p = NULL;
- assert(io != NULL);
- assert(io->len <= io->size);
+ assert(io != NULL);
+ assert(io->len <= io->size);
- if (len <= 0) {
- } else if (io->len + len <= io->size) {
- memcpy(io->buf + io->len, buf, len);
- io->len += len;
- } else if ((p = (char *) NS_REALLOC(io->buf, io->len + len)) != NULL) {
- io->buf = p;
- memcpy(io->buf + io->len, buf, len);
- io->len += len;
- io->size = io->len;
- } else {
- len = 0;
- }
+ if (len <= 0) {
+ } else if (io->len + len <= io->size) {
+ memcpy(io->buf + io->len, buf, len);
+ io->len += len;
+ } else if ((p = (char *) NS_REALLOC(io->buf, io->len + len)) != NULL) {
+ io->buf = p;
+ memcpy(io->buf + io->len, buf, len);
+ io->len += len;
+ io->size = io->len;
+ } else {
+ len = 0;
+ }
- return len;
+ return len;
}
void iobuf_remove(struct iobuf *io, size_t n) {
- if (n > 0 && n <= io->len) {
- memmove(io->buf, io->buf + n, io->len - n);
- io->len -= n;
- }
+ if (n > 0 && n <= io->len) {
+ memmove(io->buf, io->buf + n, io->len - n);
+ io->len -= n;
+ }
}
#ifndef NS_DISABLE_THREADS
void *ns_start_thread(void *(*f)(void *), void *p) {
#ifdef _WIN32
- return (void *) _beginthread((void (__cdecl *)(void *)) f, 0, p);
+ return (void *) _beginthread((void (__cdecl *)(void *)) f, 0, p);
#else
- pthread_t thread_id = (pthread_t) 0;
- pthread_attr_t attr;
+ pthread_t thread_id = (pthread_t) 0;
+ pthread_attr_t attr;
- (void) pthread_attr_init(&attr);
- (void) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ (void) pthread_attr_init(&attr);
+ (void) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
#if defined(NS_STACK_SIZE) && NS_STACK_SIZE > 1
- (void) pthread_attr_setstacksize(&attr, NS_STACK_SIZE);
+ (void) pthread_attr_setstacksize(&attr, NS_STACK_SIZE);
#endif
- pthread_create(&thread_id, &attr, f, p);
- pthread_attr_destroy(&attr);
+ pthread_create(&thread_id, &attr, f, p);
+ pthread_attr_destroy(&attr);
- return (void *) thread_id;
+ return (void *) thread_id;
#endif
}
#endif // NS_DISABLE_THREADS
static void ns_add_conn(struct ns_server *server, struct ns_connection *c) {
- c->next = server->active_connections;
- server->active_connections = c;
- c->prev = NULL;
- if (c->next != NULL) c->next->prev = c;
+ c->next = server->active_connections;
+ server->active_connections = c;
+ c->prev = NULL;
+ if (c->next != NULL) c->next->prev = c;
}
static void ns_remove_conn(struct ns_connection *conn) {
- if (conn->prev == NULL) conn->server->active_connections = conn->next;
- if (conn->prev) conn->prev->next = conn->next;
- if (conn->next) conn->next->prev = conn->prev;
+ if (conn->prev == NULL) conn->server->active_connections = conn->next;
+ if (conn->prev) conn->prev->next = conn->next;
+ if (conn->next) conn->next->prev = conn->prev;
}
// Print message to buffer. If buffer is large enough to hold the message,
// return buffer. If buffer is to small, allocate large enough buffer on heap,
// and return allocated buffer.
static int ns_avprintf(char **buf, size_t size, const char *fmt, va_list ap) {
- va_list ap_copy;
- int len;
-
- va_copy(ap_copy, ap);
- len = vsnprintf(*buf, size, fmt, ap_copy);
- va_end(ap_copy);
-
- if (len < 0) {
- // eCos and Windows are not standard-compliant and return -1 when
- // the buffer is too small. Keep allocating larger buffers until we
- // succeed or out of memory.
- *buf = NULL;
- while (len < 0) {
- if (*buf) free(*buf);
- size *= 2;
- if ((*buf = (char *) NS_MALLOC(size)) == NULL) break;
- va_copy(ap_copy, ap);
- len = vsnprintf(*buf, size, fmt, ap_copy);
- va_end(ap_copy);
- }
- } else if (len > (int) size) {
- // Standard-compliant code path. Allocate a buffer that is large enough.
- if ((*buf = (char *) NS_MALLOC(len + 1)) == NULL) {
- len = -1;
- } else {
- va_copy(ap_copy, ap);
- len = vsnprintf(*buf, len + 1, fmt, ap_copy);
- va_end(ap_copy);
- }
- }
-
- return len;
+ va_list ap_copy;
+ int len;
+
+ va_copy(ap_copy, ap);
+ len = vsnprintf(*buf, size, fmt, ap_copy);
+ va_end(ap_copy);
+
+ if (len < 0) {
+ // eCos and Windows are not standard-compliant and return -1 when
+ // the buffer is too small. Keep allocating larger buffers until we
+ // succeed or out of memory.
+ *buf = NULL;
+ while (len < 0) {
+ if (*buf) free(*buf);
+ size *= 2;
+ if ((*buf = (char *) NS_MALLOC(size)) == NULL) break;
+ va_copy(ap_copy, ap);
+ len = vsnprintf(*buf, size, fmt, ap_copy);
+ va_end(ap_copy);
+ }
+ } else if (len > (int) size) {
+ // Standard-compliant code path. Allocate a buffer that is large enough.
+ if ((*buf = (char *) NS_MALLOC(len + 1)) == NULL) {
+ len = -1;
+ } else {
+ va_copy(ap_copy, ap);
+ len = vsnprintf(*buf, len + 1, fmt, ap_copy);
+ va_end(ap_copy);
+ }
+ }
+
+ return len;
}
int ns_vprintf(struct ns_connection *conn, const char *fmt, va_list ap) {
- char mem[2000], *buf = mem;
- int len;
+ char mem[2000], *buf = mem;
+ int len;
- if ((len = ns_avprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
- iobuf_append(&conn->send_iobuf, buf, len);
- }
- if (buf != mem && buf != NULL) {
- free(buf);
- }
+ if ((len = ns_avprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
+ iobuf_append(&conn->send_iobuf, buf, len);
+ }
+ if (buf != mem && buf != NULL) {
+ free(buf);
+ }
- return len;
+ return len;
}
int ns_printf(struct ns_connection *conn, const char *fmt, ...) {
- int len;
- va_list ap;
- va_start(ap, fmt);
- len = ns_vprintf(conn, fmt, ap);
- va_end(ap);
- return len;
+ int len;
+ va_list ap;
+ va_start(ap, fmt);
+ len = ns_vprintf(conn, fmt, ap);
+ va_end(ap);
+ return len;
}
static void ns_call(struct ns_connection *conn, enum ns_event ev, void *p) {
- if (conn->server->callback) conn->server->callback(conn, ev, p);
+ if (conn->server->callback) conn->server->callback(conn, ev, p);
}
static void ns_close_conn(struct ns_connection *conn) {
- DBG(("%p %d", conn, conn->flags));
- ns_call(conn, NS_CLOSE, NULL);
- ns_remove_conn(conn);
- closesocket(conn->sock);
- iobuf_free(&conn->recv_iobuf);
- iobuf_free(&conn->send_iobuf);
+ DBG(("%p %d", conn, conn->flags));
+ ns_call(conn, NS_CLOSE, NULL);
+ ns_remove_conn(conn);
+ closesocket(conn->sock);
+ iobuf_free(&conn->recv_iobuf);
+ iobuf_free(&conn->send_iobuf);
#ifdef NS_ENABLE_SSL
- if (conn->ssl != NULL) {
- SSL_free(conn->ssl);
- }
+ if (conn->ssl != NULL) {
+ SSL_free(conn->ssl);
+ }
#endif
- NS_FREE(conn);
+ NS_FREE(conn);
}
void ns_set_close_on_exec(sock_t sock) {
#ifdef _WIN32
- (void) SetHandleInformation((HANDLE) sock, HANDLE_FLAG_INHERIT, 0);
+ (void) SetHandleInformation((HANDLE) sock, HANDLE_FLAG_INHERIT, 0);
#else
- fcntl(sock, F_SETFD, FD_CLOEXEC);
+ fcntl(sock, F_SETFD, FD_CLOEXEC);
#endif
}
static void ns_set_non_blocking_mode(sock_t sock) {
#ifdef _WIN32
- unsigned long on = 1;
- ioctlsocket(sock, FIONBIO, &on);
+ unsigned long on = 1;
+ ioctlsocket(sock, FIONBIO, &on);
#else
- int flags = fcntl(sock, F_GETFL, 0);
- fcntl(sock, F_SETFL, flags | O_NONBLOCK);
+ int flags = fcntl(sock, F_GETFL, 0);
+ fcntl(sock, F_SETFL, flags | O_NONBLOCK);
#endif
}
#ifndef NS_DISABLE_SOCKETPAIR
int ns_socketpair2(sock_t sp[2], int sock_type) {
- union socket_address sa;
- sock_t sock;
- socklen_t len = sizeof(sa.sin);
- int ret = 0;
-
- sp[0] = sp[1] = INVALID_SOCKET;
-
- (void) memset(&sa, 0, sizeof(sa));
- sa.sin.sin_family = AF_INET;
- sa.sin.sin_port = htons(0);
- sa.sin.sin_addr.s_addr = htonl(0x7f000001);
-
- if ((sock = socket(AF_INET, sock_type, 0)) != INVALID_SOCKET &&
- !bind(sock, &sa.sa, len) &&
- (sock_type == SOCK_DGRAM || !listen(sock, 1)) &&
- !getsockname(sock, &sa.sa, &len) &&
- (sp[0] = socket(AF_INET, sock_type, 0)) != INVALID_SOCKET &&
- !connect(sp[0], &sa.sa, len) &&
- (sock_type == SOCK_STREAM ||
- (!getsockname(sp[0], &sa.sa, &len) && !connect(sock, &sa.sa, len))) &&
- (sp[1] = (sock_type == SOCK_DGRAM ? sock :
- accept(sock, &sa.sa, &len))) != INVALID_SOCKET) {
- ns_set_close_on_exec(sp[0]);
- ns_set_close_on_exec(sp[1]);
- ret = 1;
- } else {
- if (sp[0] != INVALID_SOCKET) closesocket(sp[0]);
- if (sp[1] != INVALID_SOCKET) closesocket(sp[1]);
- sp[0] = sp[1] = INVALID_SOCKET;
- }
- if (sock_type != SOCK_DGRAM) closesocket(sock);
-
- return ret;
+ union socket_address sa;
+ sock_t sock;
+ socklen_t len = sizeof(sa.sin);
+ int ret = 0;
+
+ sp[0] = sp[1] = INVALID_SOCKET;
+
+ (void) memset(&sa, 0, sizeof(sa));
+ sa.sin.sin_family = AF_INET;
+ sa.sin.sin_port = htons(0);
+ sa.sin.sin_addr.s_addr = htonl(0x7f000001);
+
+ if ((sock = socket(AF_INET, sock_type, 0)) != INVALID_SOCKET &&
+ !bind(sock, &sa.sa, len) &&
+ (sock_type == SOCK_DGRAM || !listen(sock, 1)) &&
+ !getsockname(sock, &sa.sa, &len) &&
+ (sp[0] = socket(AF_INET, sock_type, 0)) != INVALID_SOCKET &&
+ !connect(sp[0], &sa.sa, len) &&
+ (sock_type == SOCK_STREAM ||
+ (!getsockname(sp[0], &sa.sa, &len) && !connect(sock, &sa.sa, len))) &&
+ (sp[1] = (sock_type == SOCK_DGRAM ? sock :
+ accept(sock, &sa.sa, &len))) != INVALID_SOCKET) {
+ ns_set_close_on_exec(sp[0]);
+ ns_set_close_on_exec(sp[1]);
+ ret = 1;
+ } else {
+ if (sp[0] != INVALID_SOCKET) closesocket(sp[0]);
+ if (sp[1] != INVALID_SOCKET) closesocket(sp[1]);
+ sp[0] = sp[1] = INVALID_SOCKET;
+ }
+ if (sock_type != SOCK_DGRAM) closesocket(sock);
+
+ return ret;
}
int ns_socketpair(sock_t sp[2]) {
- return ns_socketpair2(sp, SOCK_STREAM);
+ return ns_socketpair2(sp, SOCK_STREAM);
}
#endif // NS_DISABLE_SOCKETPAIR
// Valid listening port spec is: [ip_address:]port, e.g. "80", "127.0.0.1:3128"
static int ns_parse_port_string(const char *str, union socket_address *sa) {
- unsigned int a, b, c, d, port;
- int len = 0;
+ unsigned int a, b, c, d, port;
+ int len = 0;
#ifdef NS_ENABLE_IPV6
- char buf[100];
+ char buf[100];
#endif
- // MacOS needs that. If we do not zero it, subsequent bind() will fail.
- // Also, all-zeroes in the socket address means binding to all addresses
- // for both IPv4 and IPv6 (INADDR_ANY and IN6ADDR_ANY_INIT).
- memset(sa, 0, sizeof(*sa));
- sa->sin.sin_family = AF_INET;
+ // MacOS needs that. If we do not zero it, subsequent bind() will fail.
+ // Also, all-zeroes in the socket address means binding to all addresses
+ // for both IPv4 and IPv6 (INADDR_ANY and IN6ADDR_ANY_INIT).
+ memset(sa, 0, sizeof(*sa));
+ sa->sin.sin_family = AF_INET;
- if (sscanf(str, "%u.%u.%u.%u:%u%n", &a, &b, &c, &d, &port, &len) == 5) {
- // Bind to a specific IPv4 address, e.g. 192.168.1.5:8080
- sa->sin.sin_addr.s_addr = htonl((a << 24) | (b << 16) | (c << 8) | d);
- sa->sin.sin_port = htons((uint16_t) port);
+ if (sscanf(str, "%u.%u.%u.%u:%u%n", &a, &b, &c, &d, &port, &len) == 5) {
+ // Bind to a specific IPv4 address, e.g. 192.168.1.5:8080
+ sa->sin.sin_addr.s_addr = htonl((a << 24) | (b << 16) | (c << 8) | d);
+ sa->sin.sin_port = htons((uint16_t) port);
#ifdef NS_ENABLE_IPV6
- } else if (sscanf(str, "[%49[^]]]:%u%n", buf, &port, &len) == 2 &&
- inet_pton(AF_INET6, buf, &sa->sin6.sin6_addr)) {
- // IPv6 address, e.g. [3ffe:2a00:100:7031::1]:8080
- sa->sin6.sin6_family = AF_INET6;
- sa->sin6.sin6_port = htons((uint16_t) port);
+ } else if (sscanf(str, "[%49[^]]]:%u%n", buf, &port, &len) == 2 &&
+ inet_pton(AF_INET6, buf, &sa->sin6.sin6_addr)) {
+ // IPv6 address, e.g. [3ffe:2a00:100:7031::1]:8080
+ sa->sin6.sin6_family = AF_INET6;
+ sa->sin6.sin6_port = htons((uint16_t) port);
#endif
- } else if (sscanf(str, "%u%n", &port, &len) == 1) {
- // If only port is specified, bind to IPv4, INADDR_ANY
- sa->sin.sin_port = htons((uint16_t) port);
- } else {
- port = 0; // Parsing failure. Make port invalid.
- }
+ } else if (sscanf(str, "%u%n", &port, &len) == 1) {
+ // If only port is specified, bind to IPv4, INADDR_ANY
+ sa->sin.sin_port = htons((uint16_t) port);
+ } else {
+ port = 0; // Parsing failure. Make port invalid.
+ }
- return port <= 0xffff && str[len] == '\0';
+ return port <= 0xffff && str[len] == '\0';
}
// 'sa' must be an initialized address to bind to
static sock_t ns_open_listening_socket(union socket_address *sa) {
- socklen_t len = sizeof(*sa);
- sock_t sock = INVALID_SOCKET;
+ socklen_t len = sizeof(*sa);
+ sock_t sock = INVALID_SOCKET;
#ifndef _WIN32
- int on = 1;
+ int on = 1;
#endif
- if ((sock = socket(sa->sa.sa_family, SOCK_STREAM, 6)) != INVALID_SOCKET &&
+ if ((sock = socket(sa->sa.sa_family, SOCK_STREAM, 6)) != INVALID_SOCKET &&
#ifndef _WIN32
- // SO_RESUSEADDR is not enabled on Windows because the semantics of
- // SO_REUSEADDR on UNIX and Windows is different. On Windows,
- // SO_REUSEADDR allows to bind a socket to a port without error even if
- // the port is already open by another program. This is not the behavior
- // SO_REUSEADDR was designed for, and leads to hard-to-track failure
- // scenarios. Therefore, SO_REUSEADDR was disabled on Windows.
- !setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof(on)) &&
+ // SO_RESUSEADDR is not enabled on Windows because the semantics of
+ // SO_REUSEADDR on UNIX and Windows is different. On Windows,
+ // SO_REUSEADDR allows to bind a socket to a port without error even if
+ // the port is already open by another program. This is not the behavior
+ // SO_REUSEADDR was designed for, and leads to hard-to-track failure
+ // scenarios. Therefore, SO_REUSEADDR was disabled on Windows.
+ !setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof(on)) &&
#endif
- !bind(sock, &sa->sa, sa->sa.sa_family == AF_INET ?
- sizeof(sa->sin) : sizeof(sa->sin6)) &&
- !listen(sock, SOMAXCONN)) {
- ns_set_non_blocking_mode(sock);
- // In case port was set to 0, get the real port number
- (void) getsockname(sock, &sa->sa, &len);
- } else if (sock != INVALID_SOCKET) {
- closesocket(sock);
- sock = INVALID_SOCKET;
- }
+ !bind(sock, &sa->sa, sa->sa.sa_family == AF_INET ?
+ sizeof(sa->sin) : sizeof(sa->sin6)) &&
+ !listen(sock, SOMAXCONN)) {
+ ns_set_non_blocking_mode(sock);
+ // In case port was set to 0, get the real port number
+ (void) getsockname(sock, &sa->sa, &len);
+ } else if (sock != INVALID_SOCKET) {
+ closesocket(sock);
+ sock = INVALID_SOCKET;
+ }
- return sock;
+ return sock;
}
// Certificate generation script is at
// https://github.com/cesanta/net_skeleton/blob/master/examples/gen_certs.sh
int ns_set_ssl_ca_cert(struct ns_server *server, const char *cert) {
#ifdef NS_ENABLE_SSL
- STACK_OF(X509_NAME) *list = SSL_load_client_CA_file(cert);
- if (cert != NULL && server->ssl_ctx != NULL && list != NULL) {
- SSL_CTX_set_client_CA_list(server->ssl_ctx, list);
- SSL_CTX_set_verify(server->ssl_ctx, SSL_VERIFY_PEER |
- SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
- return 0;
- }
+ STACK_OF(X509_NAME) *list = SSL_load_client_CA_file(cert);
+ if (cert != NULL && server->ssl_ctx != NULL && list != NULL) {
+ SSL_CTX_set_client_CA_list(server->ssl_ctx, list);
+ SSL_CTX_set_verify(server->ssl_ctx, SSL_VERIFY_PEER |
+ SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
+ return 0;
+ }
#endif
- return server != NULL && cert == NULL ? 0 : -1;
+ return server != NULL && cert == NULL ? 0 : -1;
}
int ns_set_ssl_cert(struct ns_server *server, const char *cert) {
#ifdef NS_ENABLE_SSL
- if (cert != NULL &&
- (server->ssl_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) {
- return -1;
- } else if (SSL_CTX_use_certificate_file(server->ssl_ctx, cert, 1) == 0 ||
- SSL_CTX_use_PrivateKey_file(server->ssl_ctx, cert, 1) == 0) {
- return -2;
- } else {
- SSL_CTX_use_certificate_chain_file(server->ssl_ctx, cert);
- return 0;
- }
+ if (cert != NULL &&
+ (server->ssl_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) {
+ return -1;
+ } else if (SSL_CTX_use_certificate_file(server->ssl_ctx, cert, 1) == 0 ||
+ SSL_CTX_use_PrivateKey_file(server->ssl_ctx, cert, 1) == 0) {
+ return -2;
+ } else {
+ SSL_CTX_use_certificate_chain_file(server->ssl_ctx, cert);
+ return 0;
+ }
#endif
- return server != NULL && cert == NULL ? 0 : -3;
+ return server != NULL && cert == NULL ? 0 : -3;
}
int ns_bind(struct ns_server *server, const char *str) {
- union socket_address sa;
- ns_parse_port_string(str, &sa);
- if (server->listening_sock != INVALID_SOCKET) {
- closesocket(server->listening_sock);
- }
- server->listening_sock = ns_open_listening_socket(&sa);
- return server->listening_sock == INVALID_SOCKET ? -1 :
- (int) ntohs(sa.sin.sin_port);
+ union socket_address sa;
+ ns_parse_port_string(str, &sa);
+ if (server->listening_sock != INVALID_SOCKET) {
+ closesocket(server->listening_sock);
+ }
+ server->listening_sock = ns_open_listening_socket(&sa);
+ return server->listening_sock == INVALID_SOCKET ? -1 :
+ (int) ntohs(sa.sin.sin_port);
}
static struct ns_connection *accept_conn(struct ns_server *server) {
- struct ns_connection *c = NULL;
- union socket_address sa;
- socklen_t len = sizeof(sa);
- sock_t sock = INVALID_SOCKET;
-
- // NOTE(lsm): on Windows, sock is always > FD_SETSIZE
- if ((sock = accept(server->listening_sock, &sa.sa, &len)) == INVALID_SOCKET) {
- } else if ((c = (struct ns_connection *) NS_MALLOC(sizeof(*c))) == NULL ||
- memset(c, 0, sizeof(*c)) == NULL) {
- closesocket(sock);
+ struct ns_connection *c = NULL;
+ union socket_address sa;
+ socklen_t len = sizeof(sa);
+ sock_t sock = INVALID_SOCKET;
+
+ // NOTE(lsm): on Windows, sock is always > FD_SETSIZE
+ if ((sock = accept(server->listening_sock, &sa.sa, &len)) == INVALID_SOCKET) {
+ } else if ((c = (struct ns_connection *) NS_MALLOC(sizeof(*c))) == NULL ||
+ memset(c, 0, sizeof(*c)) == NULL) {
+ closesocket(sock);
#ifdef NS_ENABLE_SSL
- } else if (server->ssl_ctx != NULL &&
- ((c->ssl = SSL_new(server->ssl_ctx)) == NULL ||
- SSL_set_fd(c->ssl, sock) != 1)) {
- DBG(("SSL error"));
- closesocket(sock);
- free(c);
- c = NULL;
+ } else if (server->ssl_ctx != NULL &&
+ ((c->ssl = SSL_new(server->ssl_ctx)) == NULL ||
+ SSL_set_fd(c->ssl, sock) != 1)) {
+ DBG(("SSL error"));
+ closesocket(sock);
+ free(c);
+ c = NULL;
#endif
- } else {
- ns_set_close_on_exec(sock);
- ns_set_non_blocking_mode(sock);
- c->server = server;
- c->sock = sock;
- c->flags |= NSF_ACCEPTED;
+ } else {
+ ns_set_close_on_exec(sock);
+ ns_set_non_blocking_mode(sock);
+ c->server = server;
+ c->sock = sock;
+ c->flags |= NSF_ACCEPTED;
- ns_add_conn(server, c);
- ns_call(c, NS_ACCEPT, &sa);
- DBG(("%p %d %p %p", c, c->sock, c->ssl, server->ssl_ctx));
- }
+ ns_add_conn(server, c);
+ ns_call(c, NS_ACCEPT, &sa);
+ DBG(("%p %d %p %p", c, c->sock, c->ssl, server->ssl_ctx));
+ }
- return c;
+ return c;
}
static int ns_is_error(int n) {
- return n == 0 ||
- (n < 0 && errno != EINTR && errno != EINPROGRESS &&
- errno != EAGAIN && errno != EWOULDBLOCK
+ return n == 0 ||
+ (n < 0 && errno != EINTR && errno != EINPROGRESS &&
+ errno != EAGAIN && errno != EWOULDBLOCK
#ifdef _WIN32
- && WSAGetLastError() != WSAEINTR && WSAGetLastError() != WSAEWOULDBLOCK
+ && WSAGetLastError() != WSAEINTR && WSAGetLastError() != WSAEWOULDBLOCK
#endif
- );
+ );
}
void ns_sock_to_str(sock_t sock, char *buf, size_t len, int flags) {
- union socket_address sa;
- socklen_t slen = sizeof(sa);
-
- if (buf != NULL && len > 0) {
- buf[0] = '\0';
- memset(&sa, 0, sizeof(sa));
- if (flags & 4) {
- getpeername(sock, &sa.sa, &slen);
- } else {
- getsockname(sock, &sa.sa, &slen);
- }
- if (flags & 1) {
+ union socket_address sa;
+ socklen_t slen = sizeof(sa);
+
+ if (buf != NULL && len > 0) {
+ buf[0] = '\0';
+ memset(&sa, 0, sizeof(sa));
+ if (flags & 4) {
+ getpeername(sock, &sa.sa, &slen);
+ } else {
+ getsockname(sock, &sa.sa, &slen);
+ }
+ if (flags & 1) {
#if defined(NS_ENABLE_IPV6)
- inet_ntop(sa.sa.sa_family, sa.sa.sa_family == AF_INET ?
- (void *) &sa.sin.sin_addr :
- (void *) &sa.sin6.sin6_addr, buf, len);
+ inet_ntop(sa.sa.sa_family, sa.sa.sa_family == AF_INET ?
+ (void *) &sa.sin.sin_addr :
+ (void *) &sa.sin6.sin6_addr, buf, len);
#elif defined(_WIN32)
- // Only Windoze Vista (and newer) have inet_ntop()
- strncpy(buf, inet_ntoa(sa.sin.sin_addr), len);
+ // Only Windoze Vista (and newer) have inet_ntop()
+ strncpy(buf, inet_ntoa(sa.sin.sin_addr), len);
#else
- inet_ntop(sa.sa.sa_family, (void *) &sa.sin.sin_addr, buf, len);
+ inet_ntop(sa.sa.sa_family, (void *) &sa.sin.sin_addr, buf, len);
#endif
- }
- if (flags & 2) {
- snprintf(buf + strlen(buf), len - (strlen(buf) + 1), "%s%d",
- flags & 1 ? ":" : "", (int) ntohs(sa.sin.sin_port));
- }
- }
+ }
+ if (flags & 2) {
+ snprintf(buf + strlen(buf), len - (strlen(buf) + 1), "%s%d",
+ flags & 1 ? ":" : "", (int) ntohs(sa.sin.sin_port));
+ }
+ }
}
int ns_hexdump(const void *buf, int len, char *dst, int dst_len) {
- const unsigned char *p = (const unsigned char *) buf;
- char ascii[17] = "";
- int i, idx, n = 0;
+ const unsigned char *p = (const unsigned char *) buf;
+ char ascii[17] = "";
+ int i, idx, n = 0;
- for (i = 0; i < len; i++) {
- idx = i % 16;
- if (idx == 0) {
- if (i > 0) n += snprintf(dst + n, dst_len - n, " %s\n", ascii);
- n += snprintf(dst + n, dst_len - n, "%04x ", i);
- }
- n += snprintf(dst + n, dst_len - n, " %02x", p[i]);
- ascii[idx] = p[i] < 0x20 || p[i] > 0x7e ? '.' : p[i];
- ascii[idx + 1] = '\0';
- }
+ for (i = 0; i < len; i++) {
+ idx = i % 16;
+ if (idx == 0) {
+ if (i > 0) n += snprintf(dst + n, dst_len - n, " %s\n", ascii);
+ n += snprintf(dst + n, dst_len - n, "%04x ", i);
+ }
+ n += snprintf(dst + n, dst_len - n, " %02x", p[i]);
+ ascii[idx] = p[i] < 0x20 || p[i] > 0x7e ? '.' : p[i];
+ ascii[idx + 1] = '\0';
+ }
- while (i++ % 16) n += snprintf(dst + n, dst_len - n, "%s", " ");
- n += snprintf(dst + n, dst_len - n, " %s\n\n", ascii);
+ while (i++ % 16) n += snprintf(dst + n, dst_len - n, "%s", " ");
+ n += snprintf(dst + n, dst_len - n, " %s\n\n", ascii);
- return n;
+ return n;
}
static void ns_read_from_socket(struct ns_connection *conn) {
- char buf[2048];
- int n = 0;
+ char buf[2048];
+ int n = 0;
- if (conn->flags & NSF_CONNECTING) {
- int ok = 1, ret;
- socklen_t len = sizeof(ok);
+ if (conn->flags & NSF_CONNECTING) {
+ int ok = 1, ret;
+ socklen_t len = sizeof(ok);
- ret = getsockopt(conn->sock, SOL_SOCKET, SO_ERROR, (char *) &ok, &len);
- (void) ret;
+ ret = getsockopt(conn->sock, SOL_SOCKET, SO_ERROR, (char *) &ok, &len);
+ (void) ret;
#ifdef NS_ENABLE_SSL
- if (ret == 0 && ok == 0 && conn->ssl != NULL) {
- int res = SSL_connect(conn->ssl);
- int ssl_err = SSL_get_error(conn->ssl, res);
- DBG(("%p %d wres %d %d", conn, conn->flags, res, ssl_err));
- if (ssl_err == SSL_ERROR_WANT_READ) conn->flags |= NSF_WANT_READ;
- if (ssl_err == SSL_ERROR_WANT_WRITE) conn->flags |= NSF_WANT_WRITE;
- if (res == 1) {
- conn->flags |= NSF_SSL_HANDSHAKE_DONE;
- } else if (ssl_err == SSL_ERROR_WANT_READ ||
- ssl_err == SSL_ERROR_WANT_WRITE) {
- return; // Call us again
- } else {
- ok = 1;
- }
- }
+ if (ret == 0 && ok == 0 && conn->ssl != NULL) {
+ int res = SSL_connect(conn->ssl);
+ int ssl_err = SSL_get_error(conn->ssl, res);
+ DBG(("%p %d wres %d %d", conn, conn->flags, res, ssl_err));
+ if (ssl_err == SSL_ERROR_WANT_READ) conn->flags |= NSF_WANT_READ;
+ if (ssl_err == SSL_ERROR_WANT_WRITE) conn->flags |= NSF_WANT_WRITE;
+ if (res == 1) {
+ conn->flags |= NSF_SSL_HANDSHAKE_DONE;
+ } else if (ssl_err == SSL_ERROR_WANT_READ ||
+ ssl_err == SSL_ERROR_WANT_WRITE) {
+ return; // Call us again
+ } else {
+ ok = 1;
+ }
+ }
#endif
- conn->flags &= ~NSF_CONNECTING;
- DBG(("%p ok=%d", conn, ok));
- if (ok != 0) {
- conn->flags |= NSF_CLOSE_IMMEDIATELY;
- }
- ns_call(conn, NS_CONNECT, &ok);
- return;
- }
+ conn->flags &= ~NSF_CONNECTING;
+ DBG(("%p ok=%d", conn, ok));
+ if (ok != 0) {
+ conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
+ ns_call(conn, NS_CONNECT, &ok);
+ return;
+ }
#ifdef NS_ENABLE_SSL
- if (conn->ssl != NULL) {
- if (conn->flags & NSF_SSL_HANDSHAKE_DONE) {
- n = SSL_read(conn->ssl, buf, sizeof(buf));
- } else {
- int res = SSL_accept(conn->ssl);
- int ssl_err = SSL_get_error(conn->ssl, res);
- DBG(("%p %d rres %d %d", conn, conn->flags, res, ssl_err));
- if (ssl_err == SSL_ERROR_WANT_READ) conn->flags |= NSF_WANT_READ;
- if (ssl_err == SSL_ERROR_WANT_WRITE) conn->flags |= NSF_WANT_WRITE;
- if (res == 1) {
- conn->flags |= NSF_SSL_HANDSHAKE_DONE;
- } else if (ssl_err == SSL_ERROR_WANT_READ ||
- ssl_err == SSL_ERROR_WANT_WRITE) {
- return; // Call us again
- } else {
- conn->flags |= NSF_CLOSE_IMMEDIATELY;
- }
- return;
- }
- } else
+ if (conn->ssl != NULL) {
+ if (conn->flags & NSF_SSL_HANDSHAKE_DONE) {
+ n = SSL_read(conn->ssl, buf, sizeof(buf));
+ } else {
+ int res = SSL_accept(conn->ssl);
+ int ssl_err = SSL_get_error(conn->ssl, res);
+ DBG(("%p %d rres %d %d", conn, conn->flags, res, ssl_err));
+ if (ssl_err == SSL_ERROR_WANT_READ) conn->flags |= NSF_WANT_READ;
+ if (ssl_err == SSL_ERROR_WANT_WRITE) conn->flags |= NSF_WANT_WRITE;
+ if (res == 1) {
+ conn->flags |= NSF_SSL_HANDSHAKE_DONE;
+ } else if (ssl_err == SSL_ERROR_WANT_READ ||
+ ssl_err == SSL_ERROR_WANT_WRITE) {
+ return; // Call us again
+ } else {
+ conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
+ return;
+ }
+ } else
#endif
- {
- n = recv(conn->sock, buf, sizeof(buf), 0);
- }
+ {
+ n = recv(conn->sock, buf, sizeof(buf), 0);
+ }
- DBG(("%p %d <- %d bytes", conn, conn->flags, n));
+ DBG(("%p %d <- %d bytes", conn, conn->flags, n));
- if (ns_is_error(n)) {
- conn->flags |= NSF_CLOSE_IMMEDIATELY;
- } else if (n > 0) {
- iobuf_append(&conn->recv_iobuf, buf, n);
- ns_call(conn, NS_RECV, &n);
- }
+ if (ns_is_error(n)) {
+ conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ } else if (n > 0) {
+ iobuf_append(&conn->recv_iobuf, buf, n);
+ ns_call(conn, NS_RECV, &n);
+ }
}
static void ns_write_to_socket(struct ns_connection *conn) {
- struct iobuf *io = &conn->send_iobuf;
- int n = 0;
+ struct iobuf *io = &conn->send_iobuf;
+ int n = 0;
#ifdef NS_ENABLE_SSL
- if (conn->ssl != NULL) {
- n = SSL_write(conn->ssl, io->buf, io->len);
- if (n < 0) {
- int ssl_err = SSL_get_error(conn->ssl, n);
- DBG(("%p %d %d", conn, n, ssl_err));
- if (ssl_err == 2 || ssl_err == 3) {
- return; // Call us again
- } else {
- conn->flags |= NSF_CLOSE_IMMEDIATELY;
- }
- }
- } else
+ if (conn->ssl != NULL) {
+ n = SSL_write(conn->ssl, io->buf, io->len);
+ if (n < 0) {
+ int ssl_err = SSL_get_error(conn->ssl, n);
+ DBG(("%p %d %d", conn, n, ssl_err));
+ if (ssl_err == 2 || ssl_err == 3) {
+ return; // Call us again
+ } else {
+ conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
+ }
+ } else
#endif
- { n = send(conn->sock, io->buf, io->len, 0); }
+ { n = send(conn->sock, io->buf, io->len, 0); }
- DBG(("%p %d -> %d bytes", conn, conn->flags, n));
+ DBG(("%p %d -> %d bytes", conn, conn->flags, n));
- ns_call(conn, NS_SEND, &n);
- if (ns_is_error(n)) {
- conn->flags |= NSF_CLOSE_IMMEDIATELY;
- } else if (n > 0) {
- iobuf_remove(io, n);
- }
+ ns_call(conn, NS_SEND, &n);
+ if (ns_is_error(n)) {
+ conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ } else if (n > 0) {
+ iobuf_remove(io, n);
+ }
- if (io->len == 0 && (conn->flags & NSF_FINISHED_SENDING_DATA)) {
- conn->flags |= NSF_CLOSE_IMMEDIATELY;
- }
+ if (io->len == 0 && (conn->flags & NSF_FINISHED_SENDING_DATA)) {
+ conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
}
int ns_send(struct ns_connection *conn, const void *buf, int len) {
- return iobuf_append(&conn->send_iobuf, buf, len);
+ return iobuf_append(&conn->send_iobuf, buf, len);
}
static void ns_add_to_set(sock_t sock, fd_set *set, sock_t *max_fd) {
- if (sock != INVALID_SOCKET) {
- FD_SET(sock, set);
- if (*max_fd == INVALID_SOCKET || sock > *max_fd) {
- *max_fd = sock;
- }
- }
+ if (sock != INVALID_SOCKET) {
+ FD_SET(sock, set);
+ if (*max_fd == INVALID_SOCKET || sock > *max_fd) {
+ *max_fd = sock;
+ }
+ }
}
int ns_server_poll(struct ns_server *server, int milli) {
- struct ns_connection *conn, *tmp_conn;
- struct timeval tv;
- fd_set read_set, write_set;
- int num_active_connections = 0;
- sock_t max_fd = INVALID_SOCKET;
- time_t current_time = time(NULL);
-
- if (server->listening_sock == INVALID_SOCKET &&
- server->active_connections == NULL) return 0;
-
- FD_ZERO(&read_set);
- FD_ZERO(&write_set);
- ns_add_to_set(server->listening_sock, &read_set, &max_fd);
- ns_add_to_set(server->ctl[1], &read_set, &max_fd);
-
- for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
- tmp_conn = conn->next;
- ns_call(conn, NS_POLL, &current_time);
- if (!(conn->flags & NSF_WANT_WRITE)) {
- //DBG(("%p read_set", conn));
- ns_add_to_set(conn->sock, &read_set, &max_fd);
- }
- if (((conn->flags & NSF_CONNECTING) && !(conn->flags & NSF_WANT_READ)) ||
- (conn->send_iobuf.len > 0 && !(conn->flags & NSF_CONNECTING) &&
- !(conn->flags & NSF_BUFFER_BUT_DONT_SEND))) {
- //DBG(("%p write_set", conn));
- ns_add_to_set(conn->sock, &write_set, &max_fd);
- }
- if (conn->flags & NSF_CLOSE_IMMEDIATELY) {
- ns_close_conn(conn);
- }
- }
-
- tv.tv_sec = milli / 1000;
- tv.tv_usec = (milli % 1000) * 1000;
-
- if (select((int) max_fd + 1, &read_set, &write_set, NULL, &tv) > 0) {
- // select() might have been waiting for a long time, reset current_time
- // now to prevent last_io_time being set to the past.
- current_time = time(NULL);
-
- // Accept new connections
- if (server->listening_sock != INVALID_SOCKET &&
- FD_ISSET(server->listening_sock, &read_set)) {
- // We're not looping here, and accepting just one connection at
- // a time. The reason is that eCos does not respect non-blocking
- // flag on a listening socket and hangs in a loop.
- if ((conn = accept_conn(server)) != NULL) {
- conn->last_io_time = current_time;
- }
- }
-
- // Read wakeup messages
- if (server->ctl[1] != INVALID_SOCKET &&
- FD_ISSET(server->ctl[1], &read_set)) {
- struct ctl_msg ctl_msg;
- int len = recv(server->ctl[1], (char *) &ctl_msg, sizeof(ctl_msg), 0);
- send(server->ctl[1], ctl_msg.message, 1, 0);
- if (len >= (int) sizeof(ctl_msg.callback) && ctl_msg.callback != NULL) {
- ns_iterate(server, ctl_msg.callback, ctl_msg.message);
- }
- }
-
- for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
- tmp_conn = conn->next;
- if (FD_ISSET(conn->sock, &read_set)) {
- conn->last_io_time = current_time;
- ns_read_from_socket(conn);
- }
- if (FD_ISSET(conn->sock, &write_set)) {
- if (conn->flags & NSF_CONNECTING) {
- ns_read_from_socket(conn);
- } else if (!(conn->flags & NSF_BUFFER_BUT_DONT_SEND)) {
- conn->last_io_time = current_time;
- ns_write_to_socket(conn);
- }
- }
- }
- }
-
- for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
- tmp_conn = conn->next;
- num_active_connections++;
- if (conn->flags & NSF_CLOSE_IMMEDIATELY) {
- ns_close_conn(conn);
- }
- }
- //DBG(("%d active connections", num_active_connections));
-
- return num_active_connections;
+ struct ns_connection *conn, *tmp_conn;
+ struct timeval tv;
+ fd_set read_set, write_set;
+ int num_active_connections = 0;
+ sock_t max_fd = INVALID_SOCKET;
+ time_t current_time = time(NULL);
+
+ if (server->listening_sock == INVALID_SOCKET &&
+ server->active_connections == NULL) return 0;
+
+ FD_ZERO(&read_set);
+ FD_ZERO(&write_set);
+ ns_add_to_set(server->listening_sock, &read_set, &max_fd);
+ ns_add_to_set(server->ctl[1], &read_set, &max_fd);
+
+ for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
+ tmp_conn = conn->next;
+ ns_call(conn, NS_POLL, &current_time);
+ if (!(conn->flags & NSF_WANT_WRITE)) {
+ //DBG(("%p read_set", conn));
+ ns_add_to_set(conn->sock, &read_set, &max_fd);
+ }
+ if (((conn->flags & NSF_CONNECTING) && !(conn->flags & NSF_WANT_READ)) ||
+ (conn->send_iobuf.len > 0 && !(conn->flags & NSF_CONNECTING) &&
+ !(conn->flags & NSF_BUFFER_BUT_DONT_SEND))) {
+ //DBG(("%p write_set", conn));
+ ns_add_to_set(conn->sock, &write_set, &max_fd);
+ }
+ if (conn->flags & NSF_CLOSE_IMMEDIATELY) {
+ ns_close_conn(conn);
+ }
+ }
+
+ tv.tv_sec = milli / 1000;
+ tv.tv_usec = (milli % 1000) * 1000;
+
+ if (select((int) max_fd + 1, &read_set, &write_set, NULL, &tv) > 0) {
+ // select() might have been waiting for a long time, reset current_time
+ // now to prevent last_io_time being set to the past.
+ current_time = time(NULL);
+
+ // Accept new connections
+ if (server->listening_sock != INVALID_SOCKET &&
+ FD_ISSET(server->listening_sock, &read_set)) {
+ // We're not looping here, and accepting just one connection at
+ // a time. The reason is that eCos does not respect non-blocking
+ // flag on a listening socket and hangs in a loop.
+ if ((conn = accept_conn(server)) != NULL) {
+ conn->last_io_time = current_time;
+ }
+ }
+
+ // Read wakeup messages
+ if (server->ctl[1] != INVALID_SOCKET &&
+ FD_ISSET(server->ctl[1], &read_set)) {
+ struct ctl_msg ctl_msg;
+ int len = recv(server->ctl[1], (char *) &ctl_msg, sizeof(ctl_msg), 0);
+ send(server->ctl[1], ctl_msg.message, 1, 0);
+ if (len >= (int) sizeof(ctl_msg.callback) && ctl_msg.callback != NULL) {
+ ns_iterate(server, ctl_msg.callback, ctl_msg.message);
+ }
+ }
+
+ for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
+ tmp_conn = conn->next;
+ if (FD_ISSET(conn->sock, &read_set)) {
+ conn->last_io_time = current_time;
+ ns_read_from_socket(conn);
+ }
+ if (FD_ISSET(conn->sock, &write_set)) {
+ if (conn->flags & NSF_CONNECTING) {
+ ns_read_from_socket(conn);
+ } else if (!(conn->flags & NSF_BUFFER_BUT_DONT_SEND)) {
+ conn->last_io_time = current_time;
+ ns_write_to_socket(conn);
+ }
+ }
+ }
+ }
+
+ for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
+ tmp_conn = conn->next;
+ num_active_connections++;
+ if (conn->flags & NSF_CLOSE_IMMEDIATELY) {
+ ns_close_conn(conn);
+ }
+ }
+ //DBG(("%d active connections", num_active_connections));
+
+ return num_active_connections;
}
struct ns_connection *ns_connect(struct ns_server *server, const char *host,
- int port, int use_ssl, void *param) {
- sock_t sock = INVALID_SOCKET;
- struct sockaddr_in sin;
- struct hostent *he = NULL;
- struct ns_connection *conn = NULL;
- int connect_ret_val;
-
- (void) use_ssl;
-
- if (host == NULL || (he = gethostbyname(host)) == NULL ||
- (sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
- DBG(("gethostbyname(%s) failed: %s", host, strerror(errno)));
- return NULL;
- }
-
- sin.sin_family = AF_INET;
- sin.sin_port = htons((uint16_t) port);
- sin.sin_addr = * (struct in_addr *) he->h_addr_list[0];
- ns_set_non_blocking_mode(sock);
-
- connect_ret_val = connect(sock, (struct sockaddr *) &sin, sizeof(sin));
- if (ns_is_error(connect_ret_val)) {
- closesocket(sock);
- return NULL;
- } else if ((conn = (struct ns_connection *)
- NS_MALLOC(sizeof(*conn))) == NULL) {
- closesocket(sock);
- return NULL;
- }
-
- memset(conn, 0, sizeof(*conn));
- conn->server = server;
- conn->sock = sock;
- conn->connection_data = param;
- conn->flags = NSF_CONNECTING;
- conn->last_io_time = time(NULL);
+ int port, int use_ssl, void *param) {
+ sock_t sock = INVALID_SOCKET;
+ struct sockaddr_in sin;
+ struct hostent *he = NULL;
+ struct ns_connection *conn = NULL;
+ int connect_ret_val;
+
+ (void) use_ssl;
+
+ if (host == NULL || (he = gethostbyname(host)) == NULL ||
+ (sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
+ DBG(("gethostbyname(%s) failed: %s", host, strerror(errno)));
+ return NULL;
+ }
+
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons((uint16_t) port);
+ sin.sin_addr = * (struct in_addr *) he->h_addr_list[0];
+ ns_set_non_blocking_mode(sock);
+
+ connect_ret_val = connect(sock, (struct sockaddr *) &sin, sizeof(sin));
+ if (ns_is_error(connect_ret_val)) {
+ closesocket(sock);
+ return NULL;
+ } else if ((conn = (struct ns_connection *)
+ NS_MALLOC(sizeof(*conn))) == NULL) {
+ closesocket(sock);
+ return NULL;
+ }
+
+ memset(conn, 0, sizeof(*conn));
+ conn->server = server;
+ conn->sock = sock;
+ conn->connection_data = param;
+ conn->flags = NSF_CONNECTING;
+ conn->last_io_time = time(NULL);
#ifdef NS_ENABLE_SSL
- if (use_ssl &&
- (conn->ssl = SSL_new(server->client_ssl_ctx)) != NULL) {
- SSL_set_fd(conn->ssl, sock);
- }
+ if (use_ssl &&
+ (conn->ssl = SSL_new(server->client_ssl_ctx)) != NULL) {
+ SSL_set_fd(conn->ssl, sock);
+ }
#endif
- ns_add_conn(server, conn);
- DBG(("%p %s:%d %d %p", conn, host, port, conn->sock, conn->ssl));
+ ns_add_conn(server, conn);
+ DBG(("%p %s:%d %d %p", conn, host, port, conn->sock, conn->ssl));
- return conn;
+ return conn;
}
struct ns_connection *ns_add_sock(struct ns_server *s, sock_t sock, void *p) {
- struct ns_connection *conn;
- if ((conn = (struct ns_connection *) NS_MALLOC(sizeof(*conn))) != NULL) {
- memset(conn, 0, sizeof(*conn));
- ns_set_non_blocking_mode(sock);
- conn->sock = sock;
- conn->connection_data = p;
- conn->server = s;
- conn->last_io_time = time(NULL);
- ns_add_conn(s, conn);
- DBG(("%p %d", conn, sock));
- }
- return conn;
+ struct ns_connection *conn;
+ if ((conn = (struct ns_connection *) NS_MALLOC(sizeof(*conn))) != NULL) {
+ memset(conn, 0, sizeof(*conn));
+ ns_set_non_blocking_mode(sock);
+ conn->sock = sock;
+ conn->connection_data = p;
+ conn->server = s;
+ conn->last_io_time = time(NULL);
+ ns_add_conn(s, conn);
+ DBG(("%p %d", conn, sock));
+ }
+ return conn;
}
struct ns_connection *ns_next(struct ns_server *s, struct ns_connection *conn) {
- return conn == NULL ? s->active_connections : conn->next;
+ return conn == NULL ? s->active_connections : conn->next;
}
void ns_iterate(struct ns_server *server, ns_callback_t cb, void *param) {
- struct ns_connection *conn, *tmp_conn;
+ struct ns_connection *conn, *tmp_conn;
- for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
- tmp_conn = conn->next;
- cb(conn, NS_POLL, param);
- }
+ for (conn = server->active_connections; conn != NULL; conn = tmp_conn) {
+ tmp_conn = conn->next;
+ cb(conn, NS_POLL, param);
+ }
}
void ns_server_wakeup_ex(struct ns_server *server, ns_callback_t cb,
- void *data, size_t len) {
- struct ctl_msg ctl_msg;
- if (server->ctl[0] != INVALID_SOCKET && data != NULL &&
- len < sizeof(ctl_msg.message)) {
- ctl_msg.callback = cb;
- memcpy(ctl_msg.message, data, len);
- send(server->ctl[0], (char *) &ctl_msg,
- offsetof(struct ctl_msg, message) + len, 0);
- recv(server->ctl[0], (char *) &len, 1, 0);
- }
+ void *data, size_t len) {
+ struct ctl_msg ctl_msg;
+ if (server->ctl[0] != INVALID_SOCKET && data != NULL &&
+ len < sizeof(ctl_msg.message)) {
+ ctl_msg.callback = cb;
+ memcpy(ctl_msg.message, data, len);
+ send(server->ctl[0], (char *) &ctl_msg,
+ offsetof(struct ctl_msg, message) + len, 0);
+ recv(server->ctl[0], (char *) &len, 1, 0);
+ }
}
void ns_server_wakeup(struct ns_server *server) {
- ns_server_wakeup_ex(server, NULL, (void *) "", 0);
+ ns_server_wakeup_ex(server, NULL, (void *) "", 0);
}
void ns_server_init(struct ns_server *s, void *server_data, ns_callback_t cb) {
- memset(s, 0, sizeof(*s));
- s->listening_sock = s->ctl[0] = s->ctl[1] = INVALID_SOCKET;
- s->server_data = server_data;
- s->callback = cb;
+ memset(s, 0, sizeof(*s));
+ s->listening_sock = s->ctl[0] = s->ctl[1] = INVALID_SOCKET;
+ s->server_data = server_data;
+ s->callback = cb;
#ifdef _WIN32
- { WSADATA data; WSAStartup(MAKEWORD(2, 2), &data); }
+ { WSADATA data; WSAStartup(MAKEWORD(2, 2), &data); }
#else
- // Ignore SIGPIPE signal, so if client cancels the request, it
- // won't kill the whole process.
- signal(SIGPIPE, SIG_IGN);
+ // Ignore SIGPIPE signal, so if client cancels the request, it
+ // won't kill the whole process.
+ signal(SIGPIPE, SIG_IGN);
#endif
#ifndef NS_DISABLE_SOCKETPAIR
- do {
- ns_socketpair2(s->ctl, SOCK_DGRAM);
- } while (s->ctl[0] == INVALID_SOCKET);
+ do {
+ ns_socketpair2(s->ctl, SOCK_DGRAM);
+ } while (s->ctl[0] == INVALID_SOCKET);
#endif
#ifdef NS_ENABLE_SSL
- SSL_library_init();
- s->client_ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+ SSL_library_init();
+ s->client_ssl_ctx = SSL_CTX_new(SSLv23_client_method());
#endif
}
void ns_server_free(struct ns_server *s) {
- struct ns_connection *conn, *tmp_conn;
+ struct ns_connection *conn, *tmp_conn;
- DBG(("%p", s));
- if (s == NULL) return;
- // Do one last poll, see https://github.com/cesanta/mongoose/issues/286
- ns_server_poll(s, 0);
+ DBG(("%p", s));
+ if (s == NULL) return;
+ // Do one last poll, see https://github.com/cesanta/mongoose/issues/286
+ ns_server_poll(s, 0);
- if (s->listening_sock != INVALID_SOCKET) closesocket(s->listening_sock);
- if (s->ctl[0] != INVALID_SOCKET) closesocket(s->ctl[0]);
- if (s->ctl[1] != INVALID_SOCKET) closesocket(s->ctl[1]);
- s->listening_sock = s->ctl[0] = s->ctl[1] = INVALID_SOCKET;
+ if (s->listening_sock != INVALID_SOCKET) closesocket(s->listening_sock);
+ if (s->ctl[0] != INVALID_SOCKET) closesocket(s->ctl[0]);
+ if (s->ctl[1] != INVALID_SOCKET) closesocket(s->ctl[1]);
+ s->listening_sock = s->ctl[0] = s->ctl[1] = INVALID_SOCKET;
- for (conn = s->active_connections; conn != NULL; conn = tmp_conn) {
- tmp_conn = conn->next;
- ns_close_conn(conn);
- }
+ for (conn = s->active_connections; conn != NULL; conn = tmp_conn) {
+ tmp_conn = conn->next;
+ ns_close_conn(conn);
+ }
#ifdef NS_ENABLE_SSL
- if (s->ssl_ctx != NULL) SSL_CTX_free(s->ssl_ctx);
- if (s->client_ssl_ctx != NULL) SSL_CTX_free(s->client_ssl_ctx);
- s->ssl_ctx = s->client_ssl_ctx = NULL;
+ if (s->ssl_ctx != NULL) SSL_CTX_free(s->ssl_ctx);
+ if (s->client_ssl_ctx != NULL) SSL_CTX_free(s->client_ssl_ctx);
+ s->ssl_ctx = s->client_ssl_ctx = NULL;
#endif
}
// net_skeleton end
@@ -1168,117 +1168,117 @@ typedef pid_t process_id_t;
#endif
struct vec {
- const char *ptr;
- int len;
+ const char *ptr;
+ int len;
};
// For directory listing and WevDAV support
struct dir_entry {
- struct connection *conn;
- char *file_name;
- file_stat_t st;
+ struct connection *conn;
+ char *file_name;
+ file_stat_t st;
};
// NOTE(lsm): this enum shoulds be in sync with the config_options.
enum {
- ACCESS_CONTROL_LIST,
+ ACCESS_CONTROL_LIST,
#ifndef MONGOOSE_NO_FILESYSTEM
- ACCESS_LOG_FILE,
+ ACCESS_LOG_FILE,
#ifndef MONGOOSE_NO_AUTH
- AUTH_DOMAIN,
+ AUTH_DOMAIN,
#endif
#ifndef MONGOOSE_NO_CGI
- CGI_INTERPRETER,
- CGI_PATTERN,
+ CGI_INTERPRETER,
+ CGI_PATTERN,
#endif
- DAV_AUTH_FILE,
- DOCUMENT_ROOT,
+ DAV_AUTH_FILE,
+ DOCUMENT_ROOT,
#ifndef MONGOOSE_NO_DIRECTORY_LISTING
- ENABLE_DIRECTORY_LISTING,
+ ENABLE_DIRECTORY_LISTING,
#endif
#endif
- EXTRA_MIME_TYPES,
+ EXTRA_MIME_TYPES,
#if !defined(MONGOOSE_NO_FILESYSTEM) && !defined(MONGOOSE_NO_AUTH)
- GLOBAL_AUTH_FILE,
+ GLOBAL_AUTH_FILE,
#endif
#ifndef MONGOOSE_NO_FILESYSTEM
- HIDE_FILES_PATTERN,
- HEXDUMP_FILE,
- INDEX_FILES,
+ HIDE_FILES_PATTERN,
+ HEXDUMP_FILE,
+ INDEX_FILES,
#endif
- LISTENING_PORT,
+ LISTENING_PORT,
#ifndef _WIN32
- RUN_AS_USER,
+ RUN_AS_USER,
#endif
#ifndef MONGOOSE_NO_SSI
- SSI_PATTERN,
+ SSI_PATTERN,
#endif
#ifdef NS_ENABLE_SSL
- SSL_CERTIFICATE,
- SSL_CA_CERTIFICATE,
- SSL_MITM_CERTS,
+ SSL_CERTIFICATE,
+ SSL_CA_CERTIFICATE,
+ SSL_MITM_CERTS,
#endif
- URL_REWRITES,
- NUM_OPTIONS
+ URL_REWRITES,
+ NUM_OPTIONS
};
static const char *static_config_options[] = {
- "access_control_list", NULL,
+ "access_control_list", NULL,
#ifndef MONGOOSE_NO_FILESYSTEM
- "access_log_file", NULL,
+ "access_log_file", NULL,
#ifndef MONGOOSE_NO_AUTH
- "auth_domain", "mydomain.com",
+ "auth_domain", "mydomain.com",
#endif
#ifndef MONGOOSE_NO_CGI
- "cgi_interpreter", NULL,
- "cgi_pattern", DEFAULT_CGI_PATTERN,
+ "cgi_interpreter", NULL,
+ "cgi_pattern", DEFAULT_CGI_PATTERN,
#endif
- "dav_auth_file", NULL,
- "document_root", NULL,
+ "dav_auth_file", NULL,
+ "document_root", NULL,
#ifndef MONGOOSE_NO_DIRECTORY_LISTING
- "enable_directory_listing", "yes",
+ "enable_directory_listing", "yes",
#endif
#endif
- "extra_mime_types", NULL,
+ "extra_mime_types", NULL,
#if !defined(MONGOOSE_NO_FILESYSTEM) && !defined(MONGOOSE_NO_AUTH)
- "global_auth_file", NULL,
+ "global_auth_file", NULL,
#endif
#ifndef MONGOOSE_NO_FILESYSTEM
- "hide_files_patterns", NULL,
- "hexdump_file", NULL,
- "index_files","index.html,index.htm,index.shtml,index.cgi,index.php,index.lp",
+ "hide_files_patterns", NULL,
+ "hexdump_file", NULL,
+ "index_files","index.html,index.htm,index.shtml,index.cgi,index.php,index.lp",
#endif
- "listening_port", NULL,
+ "listening_port", NULL,
#ifndef _WIN32
- "run_as_user", NULL,
+ "run_as_user", NULL,
#endif
#ifndef MONGOOSE_NO_SSI
- "ssi_pattern", "**.shtml$|**.shtm$",
+ "ssi_pattern", "**.shtml$|**.shtm$",
#endif
#ifdef NS_ENABLE_SSL
- "ssl_certificate", NULL,
- "ssl_ca_certificate", NULL,
- "ssl_mitm_certs", NULL,
+ "ssl_certificate", NULL,
+ "ssl_ca_certificate", NULL,
+ "ssl_mitm_certs", NULL,
#endif
- "url_rewrites", NULL,
- NULL
+ "url_rewrites", NULL,
+ NULL
};
struct mg_server {
- struct ns_server ns_server;
- union socket_address lsa; // Listening socket address
- mg_handler_t event_handler;
- char *config_options[NUM_OPTIONS];
+ struct ns_server ns_server;
+ union socket_address lsa; // Listening socket address
+ mg_handler_t event_handler;
+ char *config_options[NUM_OPTIONS];
};
// Local endpoint representation
union endpoint {
- int fd; // Opened regular local file
- struct ns_connection *nc; // CGI or proxy->target connection
+ int fd; // Opened regular local file
+ struct ns_connection *nc; // CGI or proxy->target connection
};
enum endpoint_type {
- EP_NONE, EP_FILE, EP_CGI, EP_USER, EP_PUT, EP_CLIENT, EP_PROXY
+ EP_NONE, EP_FILE, EP_CGI, EP_USER, EP_PUT, EP_CLIENT, EP_PROXY
};
#define MG_HEADERS_SENT NSF_USER_1
@@ -1287,82 +1287,82 @@ enum endpoint_type {
#define MG_PROXY_CONN NSF_USER_4
struct connection {
- struct ns_connection *ns_conn; // NOTE(lsm): main.c depends on this order
- struct mg_connection mg_conn;
- struct mg_server *server;
- union endpoint endpoint;
- enum endpoint_type endpoint_type;
- char *path_info;
- char *request;
- int64_t num_bytes_sent; // Total number of bytes sent
- int64_t cl; // Reply content length, for Range support
- int request_len; // Request length, including last \r\n after last header
+ struct ns_connection *ns_conn; // NOTE(lsm): main.c depends on this order
+ struct mg_connection mg_conn;
+ struct mg_server *server;
+ union endpoint endpoint;
+ enum endpoint_type endpoint_type;
+ char *path_info;
+ char *request;
+ int64_t num_bytes_sent; // Total number of bytes sent
+ int64_t cl; // Reply content length, for Range support
+ int request_len; // Request length, including last \r\n after last header
};
#define MG_CONN_2_CONN(c) ((struct connection *) ((char *) (c) - \
- offsetof(struct connection, mg_conn)))
+ offsetof(struct connection, mg_conn)))
static void open_local_endpoint(struct connection *conn, int skip_user);
static void close_local_endpoint(struct connection *conn);
static const struct {
- const char *extension;
- size_t ext_len;
- const char *mime_type;
+ const char *extension;
+ size_t ext_len;
+ const char *mime_type;
} static_builtin_mime_types[] = {
- {".html", 5, "text/html"},
- {".htm", 4, "text/html"},
- {".shtm", 5, "text/html"},
- {".shtml", 6, "text/html"},
- {".css", 4, "text/css"},
- {".js", 3, "application/x-javascript"},
- {".ico", 4, "image/x-icon"},
- {".gif", 4, "image/gif"},
- {".jpg", 4, "image/jpeg"},
- {".jpeg", 5, "image/jpeg"},
- {".png", 4, "image/png"},
- {".svg", 4, "image/svg+xml"},
- {".txt", 4, "text/plain"},
- {".torrent", 8, "application/x-bittorrent"},
- {".wav", 4, "audio/x-wav"},
- {".mp3", 4, "audio/x-mp3"},
- {".mid", 4, "audio/mid"},
- {".m3u", 4, "audio/x-mpegurl"},
- {".ogg", 4, "application/ogg"},
- {".ram", 4, "audio/x-pn-realaudio"},
- {".xml", 4, "text/xml"},
- {".json", 5, "text/json"},
- {".xslt", 5, "application/xml"},
- {".xsl", 4, "application/xml"},
- {".ra", 3, "audio/x-pn-realaudio"},
- {".doc", 4, "application/msword"},
- {".exe", 4, "application/octet-stream"},
- {".zip", 4, "application/x-zip-compressed"},
- {".xls", 4, "application/excel"},
- {".tgz", 4, "application/x-tar-gz"},
- {".tar", 4, "application/x-tar"},
- {".gz", 3, "application/x-gunzip"},
- {".arj", 4, "application/x-arj-compressed"},
- {".rar", 4, "application/x-rar-compressed"},
- {".rtf", 4, "application/rtf"},
- {".pdf", 4, "application/pdf"},
- {".swf", 4, "application/x-shockwave-flash"},
- {".mpg", 4, "video/mpeg"},
- {".webm", 5, "video/webm"},
- {".mpeg", 5, "video/mpeg"},
- {".mov", 4, "video/quicktime"},
- {".mp4", 4, "video/mp4"},
- {".m4v", 4, "video/x-m4v"},
- {".asf", 4, "video/x-ms-asf"},
- {".avi", 4, "video/x-msvideo"},
- {".bmp", 4, "image/bmp"},
- {".ttf", 4, "application/x-font-ttf"},
- {NULL, 0, NULL}
+ {".html", 5, "text/html"},
+ {".htm", 4, "text/html"},
+ {".shtm", 5, "text/html"},
+ {".shtml", 6, "text/html"},
+ {".css", 4, "text/css"},
+ {".js", 3, "application/x-javascript"},
+ {".ico", 4, "image/x-icon"},
+ {".gif", 4, "image/gif"},
+ {".jpg", 4, "image/jpeg"},
+ {".jpeg", 5, "image/jpeg"},
+ {".png", 4, "image/png"},
+ {".svg", 4, "image/svg+xml"},
+ {".txt", 4, "text/plain"},
+ {".torrent", 8, "application/x-bittorrent"},
+ {".wav", 4, "audio/x-wav"},
+ {".mp3", 4, "audio/x-mp3"},
+ {".mid", 4, "audio/mid"},
+ {".m3u", 4, "audio/x-mpegurl"},
+ {".ogg", 4, "application/ogg"},
+ {".ram", 4, "audio/x-pn-realaudio"},
+ {".xml", 4, "text/xml"},
+ {".json", 5, "text/json"},
+ {".xslt", 5, "application/xml"},
+ {".xsl", 4, "application/xml"},
+ {".ra", 3, "audio/x-pn-realaudio"},
+ {".doc", 4, "application/msword"},
+ {".exe", 4, "application/octet-stream"},
+ {".zip", 4, "application/x-zip-compressed"},
+ {".xls", 4, "application/excel"},
+ {".tgz", 4, "application/x-tar-gz"},
+ {".tar", 4, "application/x-tar"},
+ {".gz", 3, "application/x-gunzip"},
+ {".arj", 4, "application/x-arj-compressed"},
+ {".rar", 4, "application/x-rar-compressed"},
+ {".rtf", 4, "application/rtf"},
+ {".pdf", 4, "application/pdf"},
+ {".swf", 4, "application/x-shockwave-flash"},
+ {".mpg", 4, "video/mpeg"},
+ {".webm", 5, "video/webm"},
+ {".mpeg", 5, "video/mpeg"},
+ {".mov", 4, "video/quicktime"},
+ {".mp4", 4, "video/mp4"},
+ {".m4v", 4, "video/x-m4v"},
+ {".asf", 4, "video/x-ms-asf"},
+ {".avi", 4, "video/x-msvideo"},
+ {".bmp", 4, "image/bmp"},
+ {".ttf", 4, "application/x-font-ttf"},
+ {NULL, 0, NULL}
};
#ifndef MONGOOSE_NO_THREADS
void *mg_start_thread(void *(*f)(void *), void *p) {
- return ns_start_thread(f, p);
+ return ns_start_thread(f, p);
}
#endif // MONGOOSE_NO_THREADS
@@ -1370,44 +1370,44 @@ void *mg_start_thread(void *(*f)(void *), void *p) {
// Encode 'path' which is assumed UTF-8 string, into UNICODE string.
// wbuf and wbuf_len is a target buffer and its length.
static void to_wchar(const char *path, wchar_t *wbuf, size_t wbuf_len) {
- char buf[MAX_PATH_SIZE * 2], buf2[MAX_PATH_SIZE * 2], *p;
+ char buf[MAX_PATH_SIZE * 2], buf2[MAX_PATH_SIZE * 2], *p;
- strncpy(buf, path, sizeof(buf));
- buf[sizeof(buf) - 1] = '\0';
+ strncpy(buf, path, sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
- // Trim trailing slashes. Leave backslash for paths like "X:\"
- p = buf + strlen(buf) - 1;
- while (p > buf && p[-1] != ':' && (p[0] == '\\' || p[0] == '/')) *p-- = '\0';
+ // Trim trailing slashes. Leave backslash for paths like "X:\"
+ p = buf + strlen(buf) - 1;
+ while (p > buf && p[-1] != ':' && (p[0] == '\\' || p[0] == '/')) *p-- = '\0';
- // Convert to Unicode and back. If doubly-converted string does not
- // match the original, something is fishy, reject.
- memset(wbuf, 0, wbuf_len * sizeof(wchar_t));
- MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, (int) wbuf_len);
- WideCharToMultiByte(CP_UTF8, 0, wbuf, (int) wbuf_len, buf2, sizeof(buf2),
- NULL, NULL);
- if (strcmp(buf, buf2) != 0) {
- wbuf[0] = L'\0';
- }
+ // Convert to Unicode and back. If doubly-converted string does not
+ // match the original, something is fishy, reject.
+ memset(wbuf, 0, wbuf_len * sizeof(wchar_t));
+ MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, (int) wbuf_len);
+ WideCharToMultiByte(CP_UTF8, 0, wbuf, (int) wbuf_len, buf2, sizeof(buf2),
+ NULL, NULL);
+ if (strcmp(buf, buf2) != 0) {
+ wbuf[0] = L'\0';
+ }
}
static int mg_stat(const char *path, file_stat_t *st) {
- wchar_t wpath[MAX_PATH_SIZE];
- to_wchar(path, wpath, ARRAY_SIZE(wpath));
- DBG(("[%ls] -> %d", wpath, _wstati64(wpath, st)));
- return _wstati64(wpath, st);
+ wchar_t wpath[MAX_PATH_SIZE];
+ to_wchar(path, wpath, ARRAY_SIZE(wpath));
+ DBG(("[%ls] -> %d", wpath, _wstati64(wpath, st)));
+ return _wstati64(wpath, st);
}
static FILE *mg_fopen(const char *path, const char *mode) {
- wchar_t wpath[MAX_PATH_SIZE], wmode[10];
- to_wchar(path, wpath, ARRAY_SIZE(wpath));
- to_wchar(mode, wmode, ARRAY_SIZE(wmode));
- return _wfopen(wpath, wmode);
+ wchar_t wpath[MAX_PATH_SIZE], wmode[10];
+ to_wchar(path, wpath, ARRAY_SIZE(wpath));
+ to_wchar(mode, wmode, ARRAY_SIZE(wmode));
+ return _wfopen(wpath, wmode);
}
static int mg_open(const char *path, int flag) {
- wchar_t wpath[MAX_PATH_SIZE];
- to_wchar(path, wpath, ARRAY_SIZE(wpath));
- return _wopen(wpath, flag);
+ wchar_t wpath[MAX_PATH_SIZE];
+ to_wchar(path, wpath, ARRAY_SIZE(wpath));
+ return _wopen(wpath, flag);
}
#endif // _WIN32 && !MONGOOSE_NO_FILESYSTEM
@@ -1418,60 +1418,60 @@ static int mg_open(const char *path, int flag) {
// vector is initialized to point to the "y" part, and val vector length
// is adjusted to point only to "x".
static const char *next_option(const char *list, struct vec *val,
- struct vec *eq_val) {
- if (list == NULL || *list == '\0') {
- // End of the list
- list = NULL;
- } else {
- val->ptr = list;
- if ((list = strchr(val->ptr, ',')) != NULL) {
- // Comma found. Store length and shift the list ptr
- val->len = list - val->ptr;
- list++;
- } else {
- // This value is the last one
- list = val->ptr + strlen(val->ptr);
- val->len = list - val->ptr;
- }
-
- if (eq_val != NULL) {
- // Value has form "x=y", adjust pointers and lengths
- // so that val points to "x", and eq_val points to "y".
- eq_val->len = 0;
- eq_val->ptr = (const char *) memchr(val->ptr, '=', val->len);
- if (eq_val->ptr != NULL) {
- eq_val->ptr++; // Skip over '=' character
- eq_val->len = val->ptr + val->len - eq_val->ptr;
- val->len = (eq_val->ptr - val->ptr) - 1;
- }
- }
- }
-
- return list;
+ struct vec *eq_val) {
+ if (list == NULL || *list == '\0') {
+ // End of the list
+ list = NULL;
+ } else {
+ val->ptr = list;
+ if ((list = strchr(val->ptr, ',')) != NULL) {
+ // Comma found. Store length and shift the list ptr
+ val->len = list - val->ptr;
+ list++;
+ } else {
+ // This value is the last one
+ list = val->ptr + strlen(val->ptr);
+ val->len = list - val->ptr;
+ }
+
+ if (eq_val != NULL) {
+ // Value has form "x=y", adjust pointers and lengths
+ // so that val points to "x", and eq_val points to "y".
+ eq_val->len = 0;
+ eq_val->ptr = (const char *) memchr(val->ptr, '=', val->len);
+ if (eq_val->ptr != NULL) {
+ eq_val->ptr++; // Skip over '=' character
+ eq_val->len = val->ptr + val->len - eq_val->ptr;
+ val->len = (eq_val->ptr - val->ptr) - 1;
+ }
+ }
+ }
+
+ return list;
}
// Like snprintf(), but never returns negative value, or a value
// that is larger than a supplied buffer.
static int mg_vsnprintf(char *buf, size_t buflen, const char *fmt, va_list ap) {
- int n;
- if (buflen < 1) return 0;
- n = vsnprintf(buf, buflen, fmt, ap);
- if (n < 0) {
- n = 0;
- } else if (n >= (int) buflen) {
- n = (int) buflen - 1;
- }
- buf[n] = '\0';
- return n;
+ int n;
+ if (buflen < 1) return 0;
+ n = vsnprintf(buf, buflen, fmt, ap);
+ if (n < 0) {
+ n = 0;
+ } else if (n >= (int) buflen) {
+ n = (int) buflen - 1;
+ }
+ buf[n] = '\0';
+ return n;
}
static int mg_snprintf(char *buf, size_t buflen, const char *fmt, ...) {
- va_list ap;
- int n;
- va_start(ap, fmt);
- n = mg_vsnprintf(buf, buflen, fmt, ap);
- va_end(ap);
- return n;
+ va_list ap;
+ int n;
+ va_start(ap, fmt);
+ n = mg_vsnprintf(buf, buflen, fmt, ap);
+ va_end(ap);
+ return n;
}
// Check whether full request is buffered. Return:
@@ -1479,332 +1479,332 @@ static int mg_snprintf(char *buf, size_t buflen, const char *fmt, ...) {
// 0 if request is not yet fully buffered
// >0 actual request length, including last \r\n\r\n
static int get_request_len(const char *s, int buf_len) {
- const unsigned char *buf = (unsigned char *) s;
- int i;
+ const unsigned char *buf = (unsigned char *) s;
+ int i;
- for (i = 0; i < buf_len; i++) {
- // Control characters are not allowed but >=128 are.
- // Abort scan as soon as one malformed character is found.
- if (!isprint(buf[i]) && buf[i] != '\r' && buf[i] != '\n' && buf[i] < 128) {
- return -1;
- } else if (buf[i] == '\n' && i + 1 < buf_len && buf[i + 1] == '\n') {
- return i + 2;
- } else if (buf[i] == '\n' && i + 2 < buf_len && buf[i + 1] == '\r' &&
- buf[i + 2] == '\n') {
- return i + 3;
- }
- }
+ for (i = 0; i < buf_len; i++) {
+ // Control characters are not allowed but >=128 are.
+ // Abort scan as soon as one malformed character is found.
+ if (!isprint(buf[i]) && buf[i] != '\r' && buf[i] != '\n' && buf[i] < 128) {
+ return -1;
+ } else if (buf[i] == '\n' && i + 1 < buf_len && buf[i + 1] == '\n') {
+ return i + 2;
+ } else if (buf[i] == '\n' && i + 2 < buf_len && buf[i + 1] == '\r' &&
+ buf[i + 2] == '\n') {
+ return i + 3;
+ }
+ }
- return 0;
+ return 0;
}
// Skip the characters until one of the delimiters characters found.
// 0-terminate resulting word. Skip the rest of the delimiters if any.
// Advance pointer to buffer to the next word. Return found 0-terminated word.
static char *skip(char **buf, const char *delimiters) {
- char *p, *begin_word, *end_word, *end_delimiters;
+ char *p, *begin_word, *end_word, *end_delimiters;
- begin_word = *buf;
- end_word = begin_word + strcspn(begin_word, delimiters);
- end_delimiters = end_word + strspn(end_word, delimiters);
+ begin_word = *buf;
+ end_word = begin_word + strcspn(begin_word, delimiters);
+ end_delimiters = end_word + strspn(end_word, delimiters);
- for (p = end_word; p < end_delimiters; p++) {
- *p = '\0';
- }
+ for (p = end_word; p < end_delimiters; p++) {
+ *p = '\0';
+ }
- *buf = end_delimiters;
+ *buf = end_delimiters;
- return begin_word;
+ return begin_word;
}
// Parse HTTP headers from the given buffer, advance buffer to the point
// where parsing stopped.
static void parse_http_headers(char **buf, struct mg_connection *ri) {
- size_t i;
+ size_t i;
- for (i = 0; i < ARRAY_SIZE(ri->http_headers); i++) {
- ri->http_headers[i].name = skip(buf, ": ");
- ri->http_headers[i].value = skip(buf, "\r\n");
- if (ri->http_headers[i].name[0] == '\0')
- break;
- ri->num_headers = i + 1;
- }
+ for (i = 0; i < ARRAY_SIZE(ri->http_headers); i++) {
+ ri->http_headers[i].name = skip(buf, ": ");
+ ri->http_headers[i].value = skip(buf, "\r\n");
+ if (ri->http_headers[i].name[0] == '\0')
+ break;
+ ri->num_headers = i + 1;
+ }
}
static const char *status_code_to_str(int status_code) {
- switch (status_code) {
- case 200: return "OK";
- case 201: return "Created";
- case 204: return "No Content";
- case 301: return "Moved Permanently";
- case 302: return "Found";
- case 304: return "Not Modified";
- case 400: return "Bad Request";
- case 403: return "Forbidden";
- case 404: return "Not Found";
- case 405: return "Method Not Allowed";
- case 409: return "Conflict";
- case 411: return "Length Required";
- case 413: return "Request Entity Too Large";
- case 415: return "Unsupported Media Type";
- case 423: return "Locked";
- case 500: return "Server Error";
- case 501: return "Not Implemented";
- default: return "Server Error";
- }
+ switch (status_code) {
+ case 200: return "OK";
+ case 201: return "Created";
+ case 204: return "No Content";
+ case 301: return "Moved Permanently";
+ case 302: return "Found";
+ case 304: return "Not Modified";
+ case 400: return "Bad Request";
+ case 403: return "Forbidden";
+ case 404: return "Not Found";
+ case 405: return "Method Not Allowed";
+ case 409: return "Conflict";
+ case 411: return "Length Required";
+ case 413: return "Request Entity Too Large";
+ case 415: return "Unsupported Media Type";
+ case 423: return "Locked";
+ case 500: return "Server Error";
+ case 501: return "Not Implemented";
+ default: return "Server Error";
+ }
}
static int call_user(struct connection *conn, enum mg_event ev) {
- return conn != NULL && conn->server != NULL &&
- conn->server->event_handler != NULL ?
- conn->server->event_handler(&conn->mg_conn, ev) : MG_FALSE;
+ return conn != NULL && conn->server != NULL &&
+ conn->server->event_handler != NULL ?
+ conn->server->event_handler(&conn->mg_conn, ev) : MG_FALSE;
}
static void send_http_error(struct connection *conn, int code,
- const char *fmt, ...) {
- const char *message = status_code_to_str(code);
- const char *rewrites = conn->server->config_options[URL_REWRITES];
- char headers[200], body[200];
- struct vec a, b;
- va_list ap;
- int body_len, headers_len, match_code;
-
- conn->mg_conn.status_code = code;
-
- // Invoke error handler if it is set
- if (call_user(conn, MG_HTTP_ERROR) == MG_TRUE) {
- close_local_endpoint(conn);
- return;
- }
-
- // Handle error code rewrites
- while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
- if ((match_code = atoi(a.ptr)) > 0 && match_code == code) {
- struct mg_connection *c = &conn->mg_conn;
- c->status_code = 302;
- mg_printf(c, "HTTP/1.1 %d Moved\r\n"
- "Location: %.*s?code=%d&orig_uri=%s&query_string=%s\r\n\r\n",
- c->status_code, b.len, b.ptr, code, c->uri,
- c->query_string == NULL ? "" : c->query_string);
- close_local_endpoint(conn);
- return;
- }
- }
-
- body_len = mg_snprintf(body, sizeof(body), "%d %s\n", code, message);
- if (fmt != NULL) {
- va_start(ap, fmt);
- body_len += mg_vsnprintf(body + body_len, sizeof(body) - body_len, fmt, ap);
- va_end(ap);
- }
- if ((code >= 300 && code <= 399) || code == 204) {
- // 3xx errors do not have body
- body_len = 0;
- }
- headers_len = mg_snprintf(headers, sizeof(headers),
- "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n"
- "Content-Type: text/plain\r\n\r\n",
- code, message, body_len);
- ns_send(conn->ns_conn, headers, headers_len);
- ns_send(conn->ns_conn, body, body_len);
- close_local_endpoint(conn); // This will write to the log file
+ const char *fmt, ...) {
+ const char *message = status_code_to_str(code);
+ const char *rewrites = conn->server->config_options[URL_REWRITES];
+ char headers[200], body[200];
+ struct vec a, b;
+ va_list ap;
+ int body_len, headers_len, match_code;
+
+ conn->mg_conn.status_code = code;
+
+ // Invoke error handler if it is set
+ if (call_user(conn, MG_HTTP_ERROR) == MG_TRUE) {
+ close_local_endpoint(conn);
+ return;
+ }
+
+ // Handle error code rewrites
+ while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
+ if ((match_code = atoi(a.ptr)) > 0 && match_code == code) {
+ struct mg_connection *c = &conn->mg_conn;
+ c->status_code = 302;
+ mg_printf(c, "HTTP/1.1 %d Moved\r\n"
+ "Location: %.*s?code=%d&orig_uri=%s&query_string=%s\r\n\r\n",
+ c->status_code, b.len, b.ptr, code, c->uri,
+ c->query_string == NULL ? "" : c->query_string);
+ close_local_endpoint(conn);
+ return;
+ }
+ }
+
+ body_len = mg_snprintf(body, sizeof(body), "%d %s\n", code, message);
+ if (fmt != NULL) {
+ va_start(ap, fmt);
+ body_len += mg_vsnprintf(body + body_len, sizeof(body) - body_len, fmt, ap);
+ va_end(ap);
+ }
+ if ((code >= 300 && code <= 399) || code == 204) {
+ // 3xx errors do not have body
+ body_len = 0;
+ }
+ headers_len = mg_snprintf(headers, sizeof(headers),
+ "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n"
+ "Content-Type: text/plain\r\n\r\n",
+ code, message, body_len);
+ ns_send(conn->ns_conn, headers, headers_len);
+ ns_send(conn->ns_conn, body, body_len);
+ close_local_endpoint(conn); // This will write to the log file
}
static void write_chunk(struct connection *conn, const char *buf, int len) {
- char chunk_size[50];
- int n = mg_snprintf(chunk_size, sizeof(chunk_size), "%X\r\n", len);
- ns_send(conn->ns_conn, chunk_size, n);
- ns_send(conn->ns_conn, buf, len);
- ns_send(conn->ns_conn, "\r\n", 2);
+ char chunk_size[50];
+ int n = mg_snprintf(chunk_size, sizeof(chunk_size), "%X\r\n", len);
+ ns_send(conn->ns_conn, chunk_size, n);
+ ns_send(conn->ns_conn, buf, len);
+ ns_send(conn->ns_conn, "\r\n", 2);
}
size_t mg_printf(struct mg_connection *conn, const char *fmt, ...) {
- struct connection *c = MG_CONN_2_CONN(conn);
- va_list ap;
+ struct connection *c = MG_CONN_2_CONN(conn);
+ va_list ap;
- va_start(ap, fmt);
- ns_vprintf(c->ns_conn, fmt, ap);
- va_end(ap);
+ va_start(ap, fmt);
+ ns_vprintf(c->ns_conn, fmt, ap);
+ va_end(ap);
- return c->ns_conn->send_iobuf.len;
+ return c->ns_conn->send_iobuf.len;
}
static void ns_forward(struct ns_connection *from, struct ns_connection *to) {
- DBG(("%p -> %p %zu bytes", from, to, from->recv_iobuf.len));
- ns_send(to, from->recv_iobuf.buf, from->recv_iobuf.len);
- iobuf_remove(&from->recv_iobuf, from->recv_iobuf.len);
+ DBG(("%p -> %p %zu bytes", from, to, from->recv_iobuf.len));
+ ns_send(to, from->recv_iobuf.buf, from->recv_iobuf.len);
+ iobuf_remove(&from->recv_iobuf, from->recv_iobuf.len);
}
#ifndef MONGOOSE_NO_CGI
#ifdef _WIN32
struct threadparam {
- sock_t s;
- HANDLE hPipe;
+ sock_t s;
+ HANDLE hPipe;
};
static int wait_until_ready(sock_t sock, int for_read) {
- fd_set set;
- FD_ZERO(&set);
- FD_SET(sock, &set);
- select(sock + 1, for_read ? &set : 0, for_read ? 0 : &set, 0, 0);
- return 1;
+ fd_set set;
+ FD_ZERO(&set);
+ FD_SET(sock, &set);
+ select(sock + 1, for_read ? &set : 0, for_read ? 0 : &set, 0, 0);
+ return 1;
}
static void *push_to_stdin(void *arg) {
- struct threadparam *tp = (struct threadparam *)arg;
- int n, sent, stop = 0;
- DWORD k;
- char buf[IOBUF_SIZE];
-
- while (!stop && wait_until_ready(tp->s, 1) &&
- (n = recv(tp->s, buf, sizeof(buf), 0)) > 0) {
- if (n == -1 && GetLastError() == WSAEWOULDBLOCK) continue;
- for (sent = 0; !stop && sent < n; sent += k) {
- if (!WriteFile(tp->hPipe, buf + sent, n - sent, &k, 0)) stop = 1;
- }
- }
- DBG(("%s", "FORWARED EVERYTHING TO CGI"));
- CloseHandle(tp->hPipe);
- free(tp);
- _endthread();
- return NULL;
+ struct threadparam *tp = (struct threadparam *)arg;
+ int n, sent, stop = 0;
+ DWORD k;
+ char buf[IOBUF_SIZE];
+
+ while (!stop && wait_until_ready(tp->s, 1) &&
+ (n = recv(tp->s, buf, sizeof(buf), 0)) > 0) {
+ if (n == -1 && GetLastError() == WSAEWOULDBLOCK) continue;
+ for (sent = 0; !stop && sent < n; sent += k) {
+ if (!WriteFile(tp->hPipe, buf + sent, n - sent, &k, 0)) stop = 1;
+ }
+ }
+ DBG(("%s", "FORWARED EVERYTHING TO CGI"));
+ CloseHandle(tp->hPipe);
+ free(tp);
+ _endthread();
+ return NULL;
}
static void *pull_from_stdout(void *arg) {
- struct threadparam *tp = (struct threadparam *)arg;
- int k = 0, stop = 0;
- DWORD n, sent;
- char buf[IOBUF_SIZE];
-
- while (!stop && ReadFile(tp->hPipe, buf, sizeof(buf), &n, NULL)) {
- for (sent = 0; !stop && sent < n; sent += k) {
- if (wait_until_ready(tp->s, 0) &&
- (k = send(tp->s, buf + sent, n - sent, 0)) <= 0) stop = 1;
- }
- }
- DBG(("%s", "EOF FROM CGI"));
- CloseHandle(tp->hPipe);
- shutdown(tp->s, 2); // Without this, IO thread may get truncated data
- closesocket(tp->s);
- free(tp);
- _endthread();
- return NULL;
+ struct threadparam *tp = (struct threadparam *)arg;
+ int k = 0, stop = 0;
+ DWORD n, sent;
+ char buf[IOBUF_SIZE];
+
+ while (!stop && ReadFile(tp->hPipe, buf, sizeof(buf), &n, NULL)) {
+ for (sent = 0; !stop && sent < n; sent += k) {
+ if (wait_until_ready(tp->s, 0) &&
+ (k = send(tp->s, buf + sent, n - sent, 0)) <= 0) stop = 1;
+ }
+ }
+ DBG(("%s", "EOF FROM CGI"));
+ CloseHandle(tp->hPipe);
+ shutdown(tp->s, 2); // Without this, IO thread may get truncated data
+ closesocket(tp->s);
+ free(tp);
+ _endthread();
+ return NULL;
}
static void spawn_stdio_thread(sock_t sock, HANDLE hPipe,
- void *(*func)(void *)) {
- struct threadparam *tp = (struct threadparam *)malloc(sizeof(*tp));
- if (tp != NULL) {
- tp->s = sock;
- tp->hPipe = hPipe;
- mg_start_thread(func, tp);
- }
+ void *(*func)(void *)) {
+ struct threadparam *tp = (struct threadparam *)malloc(sizeof(*tp));
+ if (tp != NULL) {
+ tp->s = sock;
+ tp->hPipe = hPipe;
+ mg_start_thread(func, tp);
+ }
}
static void abs_path(const char *utf8_path, char *abs_path, size_t len) {
- wchar_t buf[MAX_PATH_SIZE], buf2[MAX_PATH_SIZE];
- to_wchar(utf8_path, buf, ARRAY_SIZE(buf));
- GetFullPathNameW(buf, ARRAY_SIZE(buf2), buf2, NULL);
- WideCharToMultiByte(CP_UTF8, 0, buf2, wcslen(buf2) + 1, abs_path, len, 0, 0);
+ wchar_t buf[MAX_PATH_SIZE], buf2[MAX_PATH_SIZE];
+ to_wchar(utf8_path, buf, ARRAY_SIZE(buf));
+ GetFullPathNameW(buf, ARRAY_SIZE(buf2), buf2, NULL);
+ WideCharToMultiByte(CP_UTF8, 0, buf2, wcslen(buf2) + 1, abs_path, len, 0, 0);
}
static process_id_t start_process(char *interp, const char *cmd,
- const char *env, const char *envp[],
- const char *dir, sock_t sock) {
- STARTUPINFOW si = {0};
- PROCESS_INFORMATION pi = {0};
- HANDLE a[2], b[2], me = GetCurrentProcess();
- wchar_t wcmd[MAX_PATH_SIZE], full_dir[MAX_PATH_SIZE];
- char buf[MAX_PATH_SIZE], buf4[MAX_PATH_SIZE], buf5[MAX_PATH_SIZE],
- cmdline[MAX_PATH_SIZE], *p;
- DWORD flags = DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS;
- FILE *fp;
-
- si.cb = sizeof(si);
- si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
- si.wShowWindow = SW_HIDE;
- si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-
- CreatePipe(&a[0], &a[1], NULL, 0);
- CreatePipe(&b[0], &b[1], NULL, 0);
- DuplicateHandle(me, a[0], me, &si.hStdInput, 0, TRUE, flags);
- DuplicateHandle(me, b[1], me, &si.hStdOutput, 0, TRUE, flags);
-
- if (interp == NULL && (fp = fopen(cmd, "r")) != NULL) {
- buf[0] = buf[1] = '\0';
- fgets(buf, sizeof(buf), fp);
- buf[sizeof(buf) - 1] = '\0';
- if (buf[0] == '#' && buf[1] == '!') {
- interp = buf + 2;
- for (p = interp + strlen(interp);
- isspace(* (uint8_t *) p) && p > interp; p--) *p = '\0';
- }
- fclose(fp);
- }
-
- if (interp != NULL) {
- abs_path(interp, buf4, ARRAY_SIZE(buf4));
- interp = buf4;
- }
- abs_path(dir, buf5, ARRAY_SIZE(buf5));
- to_wchar(dir, full_dir, ARRAY_SIZE(full_dir));
- mg_snprintf(cmdline, sizeof(cmdline), "%s%s\"%s\"",
- interp ? interp : "", interp ? " " : "", cmd);
- to_wchar(cmdline, wcmd, ARRAY_SIZE(wcmd));
-
- if (CreateProcessW(NULL, wcmd, NULL, NULL, TRUE, CREATE_NEW_PROCESS_GROUP,
- (void *) env, full_dir, &si, &pi) != 0) {
- spawn_stdio_thread(sock, a[1], push_to_stdin);
- spawn_stdio_thread(sock, b[0], pull_from_stdout);
- } else {
- CloseHandle(a[1]);
- CloseHandle(b[0]);
- closesocket(sock);
- }
- DBG(("CGI command: [%ls] -> %p", wcmd, pi.hProcess));
-
- CloseHandle(si.hStdOutput);
- CloseHandle(si.hStdInput);
- CloseHandle(a[0]);
- CloseHandle(b[1]);
- CloseHandle(pi.hThread);
- CloseHandle(pi.hProcess);
-
- return pi.hProcess;
+ const char *env, const char *envp[],
+ const char *dir, sock_t sock) {
+ STARTUPINFOW si = {0};
+ PROCESS_INFORMATION pi = {0};
+ HANDLE a[2], b[2], me = GetCurrentProcess();
+ wchar_t wcmd[MAX_PATH_SIZE], full_dir[MAX_PATH_SIZE];
+ char buf[MAX_PATH_SIZE], buf4[MAX_PATH_SIZE], buf5[MAX_PATH_SIZE],
+ cmdline[MAX_PATH_SIZE], *p;
+ DWORD flags = DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS;
+ FILE *fp;
+
+ si.cb = sizeof(si);
+ si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+ si.wShowWindow = SW_HIDE;
+ si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+
+ CreatePipe(&a[0], &a[1], NULL, 0);
+ CreatePipe(&b[0], &b[1], NULL, 0);
+ DuplicateHandle(me, a[0], me, &si.hStdInput, 0, TRUE, flags);
+ DuplicateHandle(me, b[1], me, &si.hStdOutput, 0, TRUE, flags);
+
+ if (interp == NULL && (fp = fopen(cmd, "r")) != NULL) {
+ buf[0] = buf[1] = '\0';
+ fgets(buf, sizeof(buf), fp);
+ buf[sizeof(buf) - 1] = '\0';
+ if (buf[0] == '#' && buf[1] == '!') {
+ interp = buf + 2;
+ for (p = interp + strlen(interp);
+ isspace(* (uint8_t *) p) && p > interp; p--) *p = '\0';
+ }
+ fclose(fp);
+ }
+
+ if (interp != NULL) {
+ abs_path(interp, buf4, ARRAY_SIZE(buf4));
+ interp = buf4;
+ }
+ abs_path(dir, buf5, ARRAY_SIZE(buf5));
+ to_wchar(dir, full_dir, ARRAY_SIZE(full_dir));
+ mg_snprintf(cmdline, sizeof(cmdline), "%s%s\"%s\"",
+ interp ? interp : "", interp ? " " : "", cmd);
+ to_wchar(cmdline, wcmd, ARRAY_SIZE(wcmd));
+
+ if (CreateProcessW(NULL, wcmd, NULL, NULL, TRUE, CREATE_NEW_PROCESS_GROUP,
+ (void *) env, full_dir, &si, &pi) != 0) {
+ spawn_stdio_thread(sock, a[1], push_to_stdin);
+ spawn_stdio_thread(sock, b[0], pull_from_stdout);
+ } else {
+ CloseHandle(a[1]);
+ CloseHandle(b[0]);
+ closesocket(sock);
+ }
+ DBG(("CGI command: [%ls] -> %p", wcmd, pi.hProcess));
+
+ CloseHandle(si.hStdOutput);
+ CloseHandle(si.hStdInput);
+ CloseHandle(a[0]);
+ CloseHandle(b[1]);
+ CloseHandle(pi.hThread);
+ CloseHandle(pi.hProcess);
+
+ return pi.hProcess;
}
#else
static process_id_t start_process(const char *interp, const char *cmd,
- const char *env, const char *envp[],
- const char *dir, sock_t sock) {
- char buf[500];
- process_id_t pid = fork();
- (void) env;
-
- if (pid == 0) {
- (void) chdir(dir);
- (void) dup2(sock, 0);
- (void) dup2(sock, 1);
- closesocket(sock);
-
- // After exec, all signal handlers are restored to their default values,
- // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's
- // implementation, SIGCHLD's handler will leave unchanged after exec
- // if it was set to be ignored. Restore it to default action.
- signal(SIGCHLD, SIG_DFL);
-
- if (interp == NULL) {
- execle(cmd, cmd, NULL, envp);
- } else {
- execle(interp, interp, cmd, NULL, envp);
- }
- snprintf(buf, sizeof(buf), "Status: 500\r\n\r\n"
- "500 Server Error: %s%s%s: %s", interp == NULL ? "" : interp,
- interp == NULL ? "" : " ", cmd, strerror(errno));
- send(1, buf, strlen(buf), 0);
- exit(EXIT_FAILURE); // exec call failed
- }
-
- return pid;
+ const char *env, const char *envp[],
+ const char *dir, sock_t sock) {
+ char buf[500];
+ process_id_t pid = fork();
+ (void) env;
+
+ if (pid == 0) {
+ (void) chdir(dir);
+ (void) dup2(sock, 0);
+ (void) dup2(sock, 1);
+ closesocket(sock);
+
+ // After exec, all signal handlers are restored to their default values,
+ // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's
+ // implementation, SIGCHLD's handler will leave unchanged after exec
+ // if it was set to be ignored. Restore it to default action.
+ signal(SIGCHLD, SIG_DFL);
+
+ if (interp == NULL) {
+ execle(cmd, cmd, NULL, envp);
+ } else {
+ execle(interp, interp, cmd, NULL, envp);
+ }
+ snprintf(buf, sizeof(buf), "Status: 500\r\n\r\n"
+ "500 Server Error: %s%s%s: %s", interp == NULL ? "" : interp,
+ interp == NULL ? "" : " ", cmd, strerror(errno));
+ send(1, buf, strlen(buf), 0);
+ exit(EXIT_FAILURE); // exec call failed
+ }
+
+ return pid;
}
#endif // _WIN32
@@ -1817,338 +1817,338 @@ static process_id_t start_process(const char *interp, const char *cmd,
// We satisfy both worlds: we create an envp array (which is vars), all
// entries are actually pointers inside buf.
struct cgi_env_block {
- struct mg_connection *conn;
- char buf[CGI_ENVIRONMENT_SIZE]; // Environment buffer
- const char *vars[MAX_CGI_ENVIR_VARS]; // char *envp[]
- int len; // Space taken
- int nvars; // Number of variables in envp[]
+ struct mg_connection *conn;
+ char buf[CGI_ENVIRONMENT_SIZE]; // Environment buffer
+ const char *vars[MAX_CGI_ENVIR_VARS]; // char *envp[]
+ int len; // Space taken
+ int nvars; // Number of variables in envp[]
};
// Append VARIABLE=VALUE\0 string to the buffer, and add a respective
// pointer into the vars array.
static char *addenv(struct cgi_env_block *block, const char *fmt, ...) {
- int n, space;
- char *added;
- va_list ap;
+ int n, space;
+ char *added;
+ va_list ap;
- // Calculate how much space is left in the buffer
- space = sizeof(block->buf) - block->len - 2;
- assert(space >= 0);
+ // Calculate how much space is left in the buffer
+ space = sizeof(block->buf) - block->len - 2;
+ assert(space >= 0);
- // Make a pointer to the free space int the buffer
- added = block->buf + block->len;
+ // Make a pointer to the free space int the buffer
+ added = block->buf + block->len;
- // Copy VARIABLE=VALUE\0 string into the free space
- va_start(ap, fmt);
- n = mg_vsnprintf(added, (size_t) space, fmt, ap);
- va_end(ap);
+ // Copy VARIABLE=VALUE\0 string into the free space
+ va_start(ap, fmt);
+ n = mg_vsnprintf(added, (size_t) space, fmt, ap);
+ va_end(ap);
- // Make sure we do not overflow buffer and the envp array
- if (n > 0 && n + 1 < space &&
- block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {
- // Append a pointer to the added string into the envp array
- block->vars[block->nvars++] = added;
- // Bump up used length counter. Include \0 terminator
- block->len += n + 1;
- }
+ // Make sure we do not overflow buffer and the envp array
+ if (n > 0 && n + 1 < space &&
+ block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {
+ // Append a pointer to the added string into the envp array
+ block->vars[block->nvars++] = added;
+ // Bump up used length counter. Include \0 terminator
+ block->len += n + 1;
+ }
- return added;
+ return added;
}
static void addenv2(struct cgi_env_block *blk, const char *name) {
- const char *s;
- if ((s = getenv(name)) != NULL) addenv(blk, "%s=%s", name, s);
+ const char *s;
+ if ((s = getenv(name)) != NULL) addenv(blk, "%s=%s", name, s);
}
static void prepare_cgi_environment(struct connection *conn,
- const char *prog,
- struct cgi_env_block *blk) {
- struct mg_connection *ri = &conn->mg_conn;
- const char *s, *slash;
- char *p, **opts = conn->server->config_options;
- int i;
-
- blk->len = blk->nvars = 0;
- blk->conn = ri;
-
- if ((s = getenv("SERVER_NAME")) != NULL) {
- addenv(blk, "SERVER_NAME=%s", s);
- } else {
- addenv(blk, "SERVER_NAME=%s", ri->local_ip);
- }
- addenv(blk, "SERVER_ROOT=%s", opts[DOCUMENT_ROOT]);
- addenv(blk, "DOCUMENT_ROOT=%s", opts[DOCUMENT_ROOT]);
- addenv(blk, "SERVER_SOFTWARE=%s/%s", "Mongoose", MONGOOSE_VERSION);
-
- // Prepare the environment block
- addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");
- addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");
- addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP
-
- // TODO(lsm): fix this for IPv6 case
- //addenv(blk, "SERVER_PORT=%d", ri->remote_port);
-
- addenv(blk, "REQUEST_METHOD=%s", ri->request_method);
- addenv(blk, "REMOTE_ADDR=%s", ri->remote_ip);
- addenv(blk, "REMOTE_PORT=%d", ri->remote_port);
- addenv(blk, "REQUEST_URI=%s%s%s", ri->uri,
- ri->query_string == NULL ? "" : "?",
- ri->query_string == NULL ? "" : ri->query_string);
-
- // SCRIPT_NAME
- if (conn->path_info != NULL) {
- addenv(blk, "SCRIPT_NAME=%.*s",
- (int) (strlen(ri->uri) - strlen(conn->path_info)), ri->uri);
- addenv(blk, "PATH_INFO=%s", conn->path_info);
- } else {
- s = strrchr(prog, '/');
- slash = strrchr(ri->uri, '/');
- addenv(blk, "SCRIPT_NAME=%.*s%s",
- slash == NULL ? 0 : (int) (slash - ri->uri), ri->uri,
- s == NULL ? prog : s);
- }
-
- addenv(blk, "SCRIPT_FILENAME=%s", prog);
- addenv(blk, "PATH_TRANSLATED=%s", prog);
- addenv(blk, "HTTPS=%s", conn->ns_conn->ssl != NULL ? "on" : "off");
-
- if ((s = mg_get_header(ri, "Content-Type")) != NULL)
- addenv(blk, "CONTENT_TYPE=%s", s);
-
- if (ri->query_string != NULL)
- addenv(blk, "QUERY_STRING=%s", ri->query_string);
-
- if ((s = mg_get_header(ri, "Content-Length")) != NULL)
- addenv(blk, "CONTENT_LENGTH=%s", s);
-
- addenv2(blk, "PATH");
- addenv2(blk, "TMP");
- addenv2(blk, "TEMP");
- addenv2(blk, "TMPDIR");
- addenv2(blk, "PERLLIB");
- addenv2(blk, ENV_EXPORT_TO_CGI);
+ const char *prog,
+ struct cgi_env_block *blk) {
+ struct mg_connection *ri = &conn->mg_conn;
+ const char *s, *slash;
+ char *p, **opts = conn->server->config_options;
+ int i;
+
+ blk->len = blk->nvars = 0;
+ blk->conn = ri;
+
+ if ((s = getenv("SERVER_NAME")) != NULL) {
+ addenv(blk, "SERVER_NAME=%s", s);
+ } else {
+ addenv(blk, "SERVER_NAME=%s", ri->local_ip);
+ }
+ addenv(blk, "SERVER_ROOT=%s", opts[DOCUMENT_ROOT]);
+ addenv(blk, "DOCUMENT_ROOT=%s", opts[DOCUMENT_ROOT]);
+ addenv(blk, "SERVER_SOFTWARE=%s/%s", "Mongoose", MONGOOSE_VERSION);
+
+ // Prepare the environment block
+ addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");
+ addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");
+ addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP
+
+ // TODO(lsm): fix this for IPv6 case
+ //addenv(blk, "SERVER_PORT=%d", ri->remote_port);
+
+ addenv(blk, "REQUEST_METHOD=%s", ri->request_method);
+ addenv(blk, "REMOTE_ADDR=%s", ri->remote_ip);
+ addenv(blk, "REMOTE_PORT=%d", ri->remote_port);
+ addenv(blk, "REQUEST_URI=%s%s%s", ri->uri,
+ ri->query_string == NULL ? "" : "?",
+ ri->query_string == NULL ? "" : ri->query_string);
+
+ // SCRIPT_NAME
+ if (conn->path_info != NULL) {
+ addenv(blk, "SCRIPT_NAME=%.*s",
+ (int) (strlen(ri->uri) - strlen(conn->path_info)), ri->uri);
+ addenv(blk, "PATH_INFO=%s", conn->path_info);
+ } else {
+ s = strrchr(prog, '/');
+ slash = strrchr(ri->uri, '/');
+ addenv(blk, "SCRIPT_NAME=%.*s%s",
+ slash == NULL ? 0 : (int) (slash - ri->uri), ri->uri,
+ s == NULL ? prog : s);
+ }
+
+ addenv(blk, "SCRIPT_FILENAME=%s", prog);
+ addenv(blk, "PATH_TRANSLATED=%s", prog);
+ addenv(blk, "HTTPS=%s", conn->ns_conn->ssl != NULL ? "on" : "off");
+
+ if ((s = mg_get_header(ri, "Content-Type")) != NULL)
+ addenv(blk, "CONTENT_TYPE=%s", s);
+
+ if (ri->query_string != NULL)
+ addenv(blk, "QUERY_STRING=%s", ri->query_string);
+
+ if ((s = mg_get_header(ri, "Content-Length")) != NULL)
+ addenv(blk, "CONTENT_LENGTH=%s", s);
+
+ addenv2(blk, "PATH");
+ addenv2(blk, "TMP");
+ addenv2(blk, "TEMP");
+ addenv2(blk, "TMPDIR");
+ addenv2(blk, "PERLLIB");
+ addenv2(blk, ENV_EXPORT_TO_CGI);
#if defined(_WIN32)
- addenv2(blk, "COMSPEC");
- addenv2(blk, "SYSTEMROOT");
- addenv2(blk, "SystemDrive");
- addenv2(blk, "ProgramFiles");
- addenv2(blk, "ProgramFiles(x86)");
- addenv2(blk, "CommonProgramFiles(x86)");
+ addenv2(blk, "COMSPEC");
+ addenv2(blk, "SYSTEMROOT");
+ addenv2(blk, "SystemDrive");
+ addenv2(blk, "ProgramFiles");
+ addenv2(blk, "ProgramFiles(x86)");
+ addenv2(blk, "CommonProgramFiles(x86)");
#else
- addenv2(blk, "LD_LIBRARY_PATH");
+ addenv2(blk, "LD_LIBRARY_PATH");
#endif // _WIN32
- // Add all headers as HTTP_* variables
- for (i = 0; i < ri->num_headers; i++) {
- p = addenv(blk, "HTTP_%s=%s",
- ri->http_headers[i].name, ri->http_headers[i].value);
+ // Add all headers as HTTP_* variables
+ for (i = 0; i < ri->num_headers; i++) {
+ p = addenv(blk, "HTTP_%s=%s",
+ ri->http_headers[i].name, ri->http_headers[i].value);
- // Convert variable name into uppercase, and change - to _
- for (; *p != '=' && *p != '\0'; p++) {
- if (*p == '-')
- *p = '_';
- *p = (char) toupper(* (unsigned char *) p);
- }
- }
+ // Convert variable name into uppercase, and change - to _
+ for (; *p != '=' && *p != '\0'; p++) {
+ if (*p == '-')
+ *p = '_';
+ *p = (char) toupper(* (unsigned char *) p);
+ }
+ }
- blk->vars[blk->nvars++] = NULL;
- blk->buf[blk->len++] = '\0';
+ blk->vars[blk->nvars++] = NULL;
+ blk->buf[blk->len++] = '\0';
- assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));
- assert(blk->len > 0);
- assert(blk->len < (int) sizeof(blk->buf));
+ assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));
+ assert(blk->len > 0);
+ assert(blk->len < (int) sizeof(blk->buf));
}
static const char cgi_status[] = "HTTP/1.1 200 OK\r\n";
static void open_cgi_endpoint(struct connection *conn, const char *prog) {
- struct cgi_env_block blk;
- char dir[MAX_PATH_SIZE];
- const char *p;
- sock_t fds[2];
-
- prepare_cgi_environment(conn, prog, &blk);
- // CGI must be executed in its own directory. 'dir' must point to the
- // directory containing executable program, 'p' must point to the
- // executable program name relative to 'dir'.
- if ((p = strrchr(prog, '/')) == NULL) {
- mg_snprintf(dir, sizeof(dir), "%s", ".");
- } else {
- mg_snprintf(dir, sizeof(dir), "%.*s", (int) (p - prog), prog);
- }
-
- // Try to create socketpair in a loop until success. ns_socketpair()
- // can be interrupted by a signal and fail.
- // TODO(lsm): use sigaction to restart interrupted syscall
- do {
- ns_socketpair(fds);
- } while (fds[0] == INVALID_SOCKET);
-
- if (start_process(conn->server->config_options[CGI_INTERPRETER],
- prog, blk.buf, blk.vars, dir, fds[1]) > 0) {
- conn->endpoint_type = EP_CGI;
- conn->endpoint.nc = ns_add_sock(&conn->server->ns_server,
- fds[0], conn);
- conn->endpoint.nc->flags |= MG_CGI_CONN;
- ns_send(conn->ns_conn, cgi_status, sizeof(cgi_status) - 1);
- conn->mg_conn.status_code = 200;
- conn->ns_conn->flags |= NSF_BUFFER_BUT_DONT_SEND;
- // Pass POST data to the CGI process
- conn->endpoint.nc->send_iobuf = conn->ns_conn->recv_iobuf;
- iobuf_init(&conn->ns_conn->recv_iobuf, 0);
- } else {
- closesocket(fds[0]);
- send_http_error(conn, 500, "start_process(%s) failed", prog);
- }
+ struct cgi_env_block blk;
+ char dir[MAX_PATH_SIZE];
+ const char *p;
+ sock_t fds[2];
+
+ prepare_cgi_environment(conn, prog, &blk);
+ // CGI must be executed in its own directory. 'dir' must point to the
+ // directory containing executable program, 'p' must point to the
+ // executable program name relative to 'dir'.
+ if ((p = strrchr(prog, '/')) == NULL) {
+ mg_snprintf(dir, sizeof(dir), "%s", ".");
+ } else {
+ mg_snprintf(dir, sizeof(dir), "%.*s", (int) (p - prog), prog);
+ }
+
+ // Try to create socketpair in a loop until success. ns_socketpair()
+ // can be interrupted by a signal and fail.
+ // TODO(lsm): use sigaction to restart interrupted syscall
+ do {
+ ns_socketpair(fds);
+ } while (fds[0] == INVALID_SOCKET);
+
+ if (start_process(conn->server->config_options[CGI_INTERPRETER],
+ prog, blk.buf, blk.vars, dir, fds[1]) > 0) {
+ conn->endpoint_type = EP_CGI;
+ conn->endpoint.nc = ns_add_sock(&conn->server->ns_server,
+ fds[0], conn);
+ conn->endpoint.nc->flags |= MG_CGI_CONN;
+ ns_send(conn->ns_conn, cgi_status, sizeof(cgi_status) - 1);
+ conn->mg_conn.status_code = 200;
+ conn->ns_conn->flags |= NSF_BUFFER_BUT_DONT_SEND;
+ // Pass POST data to the CGI process
+ conn->endpoint.nc->send_iobuf = conn->ns_conn->recv_iobuf;
+ iobuf_init(&conn->ns_conn->recv_iobuf, 0);
+ } else {
+ closesocket(fds[0]);
+ send_http_error(conn, 500, "start_process(%s) failed", prog);
+ }
#ifndef _WIN32
- closesocket(fds[1]); // On Windows, CGI stdio thread closes that socket
+ closesocket(fds[1]); // On Windows, CGI stdio thread closes that socket
#endif
}
static void on_cgi_data(struct ns_connection *nc) {
- struct connection *conn = (struct connection *) nc->connection_data;
- const char *status = "500";
- struct mg_connection c;
-
- if (!conn) return;
-
- // Copy CGI data from CGI socket to the client send buffer
- ns_forward(nc, conn->ns_conn);
-
- // If reply has not been parsed yet, parse it
- if (conn->ns_conn->flags & NSF_BUFFER_BUT_DONT_SEND) {
- struct iobuf *io = &conn->ns_conn->send_iobuf;
- int s_len = sizeof(cgi_status) - 1;
- int len = get_request_len(io->buf + s_len, io->len - s_len);
- char buf[MAX_REQUEST_SIZE], *s = buf;
-
- if (len == 0) return;
-
- if (len < 0 || len > (int) sizeof(buf)) {
- len = io->len;
- iobuf_remove(io, io->len);
- send_http_error(conn, 500, "CGI program sent malformed headers: [%.*s]",
- len, io->buf);
- } else {
- memset(&c, 0, sizeof(c));
- memcpy(buf, io->buf + s_len, len);
- buf[len - 1] = '\0';
- parse_http_headers(&s, &c);
- if (mg_get_header(&c, "Location") != NULL) {
- status = "302";
- } else if ((status = (char *) mg_get_header(&c, "Status")) == NULL) {
- status = "200";
- }
- memcpy(io->buf + 9, status, 3);
- conn->mg_conn.status_code = atoi(status);
- }
- conn->ns_conn->flags &= ~NSF_BUFFER_BUT_DONT_SEND;
- }
+ struct connection *conn = (struct connection *) nc->connection_data;
+ const char *status = "500";
+ struct mg_connection c;
+
+ if (!conn) return;
+
+ // Copy CGI data from CGI socket to the client send buffer
+ ns_forward(nc, conn->ns_conn);
+
+ // If reply has not been parsed yet, parse it
+ if (conn->ns_conn->flags & NSF_BUFFER_BUT_DONT_SEND) {
+ struct iobuf *io = &conn->ns_conn->send_iobuf;
+ int s_len = sizeof(cgi_status) - 1;
+ int len = get_request_len(io->buf + s_len, io->len - s_len);
+ char buf[MAX_REQUEST_SIZE], *s = buf;
+
+ if (len == 0) return;
+
+ if (len < 0 || len > (int) sizeof(buf)) {
+ len = io->len;
+ iobuf_remove(io, io->len);
+ send_http_error(conn, 500, "CGI program sent malformed headers: [%.*s]",
+ len, io->buf);
+ } else {
+ memset(&c, 0, sizeof(c));
+ memcpy(buf, io->buf + s_len, len);
+ buf[len - 1] = '\0';
+ parse_http_headers(&s, &c);
+ if (mg_get_header(&c, "Location") != NULL) {
+ status = "302";
+ } else if ((status = (char *) mg_get_header(&c, "Status")) == NULL) {
+ status = "200";
+ }
+ memcpy(io->buf + 9, status, 3);
+ conn->mg_conn.status_code = atoi(status);
+ }
+ conn->ns_conn->flags &= ~NSF_BUFFER_BUT_DONT_SEND;
+ }
}
#endif // !MONGOOSE_NO_CGI
static char *mg_strdup(const char *str) {
- char *copy = (char *) malloc(strlen(str) + 1);
- if (copy != NULL) {
- strcpy(copy, str);
- }
- return copy;
+ char *copy = (char *) malloc(strlen(str) + 1);
+ if (copy != NULL) {
+ strcpy(copy, str);
+ }
+ return copy;
}
static int isbyte(int n) {
- return n >= 0 && n <= 255;
+ return n >= 0 && n <= 255;
}
static int parse_net(const char *spec, uint32_t *net, uint32_t *mask) {
- int n, a, b, c, d, slash = 32, len = 0;
+ int n, a, b, c, d, slash = 32, len = 0;
- if ((sscanf(spec, "%d.%d.%d.%d/%d%n", &a, &b, &c, &d, &slash, &n) == 5 ||
- sscanf(spec, "%d.%d.%d.%d%n", &a, &b, &c, &d, &n) == 4) &&
- isbyte(a) && isbyte(b) && isbyte(c) && isbyte(d) &&
- slash >= 0 && slash < 33) {
- len = n;
- *net = ((uint32_t)a << 24) | ((uint32_t)b << 16) | ((uint32_t)c << 8) | d;
- *mask = slash ? 0xffffffffU << (32 - slash) : 0;
- }
+ if ((sscanf(spec, "%d.%d.%d.%d/%d%n", &a, &b, &c, &d, &slash, &n) == 5 ||
+ sscanf(spec, "%d.%d.%d.%d%n", &a, &b, &c, &d, &n) == 4) &&
+ isbyte(a) && isbyte(b) && isbyte(c) && isbyte(d) &&
+ slash >= 0 && slash < 33) {
+ len = n;
+ *net = ((uint32_t)a << 24) | ((uint32_t)b << 16) | ((uint32_t)c << 8) | d;
+ *mask = slash ? 0xffffffffU << (32 - slash) : 0;
+ }
- return len;
+ return len;
}
// Verify given socket address against the ACL.
// Return -1 if ACL is malformed, 0 if address is disallowed, 1 if allowed.
static int check_acl(const char *acl, uint32_t remote_ip) {
- int allowed, flag;
- uint32_t net, mask;
- struct vec vec;
+ int allowed, flag;
+ uint32_t net, mask;
+ struct vec vec;
- // If any ACL is set, deny by default
- allowed = acl == NULL ? '+' : '-';
+ // If any ACL is set, deny by default
+ allowed = acl == NULL ? '+' : '-';
- while ((acl = next_option(acl, &vec, NULL)) != NULL) {
- flag = vec.ptr[0];
- if ((flag != '+' && flag != '-') ||
- parse_net(&vec.ptr[1], &net, &mask) == 0) {
- return -1;
- }
+ while ((acl = next_option(acl, &vec, NULL)) != NULL) {
+ flag = vec.ptr[0];
+ if ((flag != '+' && flag != '-') ||
+ parse_net(&vec.ptr[1], &net, &mask) == 0) {
+ return -1;
+ }
- if (net == (remote_ip & mask)) {
- allowed = flag;
- }
- }
+ if (net == (remote_ip & mask)) {
+ allowed = flag;
+ }
+ }
- return allowed == '+';
+ return allowed == '+';
}
// Protect against directory disclosure attack by removing '..',
// excessive '/' and '\' characters
static void remove_double_dots_and_double_slashes(char *s) {
- char *p = s;
-
- while (*s != '\0') {
- *p++ = *s++;
- if (s[-1] == '/' || s[-1] == '\\') {
- // Skip all following slashes, backslashes and double-dots
- while (s[0] != '\0') {
- if (s[0] == '/' || s[0] == '\\') { s++; }
- else if (s[0] == '.' && s[1] == '.') { s += 2; }
- else { break; }
- }
- }
- }
- *p = '\0';
+ char *p = s;
+
+ while (*s != '\0') {
+ *p++ = *s++;
+ if (s[-1] == '/' || s[-1] == '\\') {
+ // Skip all following slashes, backslashes and double-dots
+ while (s[0] != '\0') {
+ if (s[0] == '/' || s[0] == '\\') { s++; }
+ else if (s[0] == '.' && s[1] == '.') { s += 2; }
+ else { break; }
+ }
+ }
+ }
+ *p = '\0';
}
int mg_url_decode(const char *src, int src_len, char *dst,
- int dst_len, int is_form_url_encoded) {
- int i, j, a, b;
+ int dst_len, int is_form_url_encoded) {
+ int i, j, a, b;
#define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W')
- for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++) {
- if (src[i] == '%' && i < src_len - 2 &&
- isxdigit(* (const unsigned char *) (src + i + 1)) &&
- isxdigit(* (const unsigned char *) (src + i + 2))) {
- a = tolower(* (const unsigned char *) (src + i + 1));
- b = tolower(* (const unsigned char *) (src + i + 2));
- dst[j] = (char) ((HEXTOI(a) << 4) | HEXTOI(b));
- i += 2;
- } else if (is_form_url_encoded && src[i] == '+') {
- dst[j] = ' ';
- } else {
- dst[j] = src[i];
- }
- }
+ for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++) {
+ if (src[i] == '%' && i < src_len - 2 &&
+ isxdigit(* (const unsigned char *) (src + i + 1)) &&
+ isxdigit(* (const unsigned char *) (src + i + 2))) {
+ a = tolower(* (const unsigned char *) (src + i + 1));
+ b = tolower(* (const unsigned char *) (src + i + 2));
+ dst[j] = (char) ((HEXTOI(a) << 4) | HEXTOI(b));
+ i += 2;
+ } else if (is_form_url_encoded && src[i] == '+') {
+ dst[j] = ' ';
+ } else {
+ dst[j] = src[i];
+ }
+ }
- dst[j] = '\0'; // Null-terminate the destination
+ dst[j] = '\0'; // Null-terminate the destination
- return i >= src_len ? j : -1;
+ return i >= src_len ? j : -1;
}
static int is_valid_http_method(const char *s) {
- return !strcmp(s, "GET") || !strcmp(s, "POST") || !strcmp(s, "HEAD") ||
- !strcmp(s, "CONNECT") || !strcmp(s, "PUT") || !strcmp(s, "DELETE") ||
- !strcmp(s, "OPTIONS") || !strcmp(s, "PROPFIND") || !strcmp(s, "MKCOL");
+ return !strcmp(s, "GET") || !strcmp(s, "POST") || !strcmp(s, "HEAD") ||
+ !strcmp(s, "CONNECT") || !strcmp(s, "PUT") || !strcmp(s, "DELETE") ||
+ !strcmp(s, "OPTIONS") || !strcmp(s, "PROPFIND") || !strcmp(s, "MKCOL");
}
// Parse HTTP request, fill in mg_request structure.
@@ -2156,120 +2156,120 @@ static int is_valid_http_method(const char *s) {
// HTTP request components, header names and header values.
// Note that len must point to the last \n of HTTP headers.
static int parse_http_message(char *buf, int len, struct mg_connection *ri) {
- int is_request, n;
-
- // Reset the connection. Make sure that we don't touch fields that are
- // set elsewhere: remote_ip, remote_port, server_param
- ri->request_method = ri->uri = ri->http_version = ri->query_string = NULL;
- ri->num_headers = ri->status_code = ri->is_websocket = ri->content_len = 0;
-
- buf[len - 1] = '\0';
-
- // RFC says that all initial whitespaces should be ingored
- while (*buf != '\0' && isspace(* (unsigned char *) buf)) {
- buf++;
- }
- ri->request_method = skip(&buf, " ");
- ri->uri = skip(&buf, " ");
- ri->http_version = skip(&buf, "\r\n");
-
- // HTTP message could be either HTTP request or HTTP response, e.g.
- // "GET / HTTP/1.0 ...." or "HTTP/1.0 200 OK ..."
- is_request = is_valid_http_method(ri->request_method);
- if ((is_request && memcmp(ri->http_version, "HTTP/", 5) != 0) ||
- (!is_request && memcmp(ri->request_method, "HTTP/", 5) != 0)) {
- len = -1;
- } else {
- if (is_request) {
- ri->http_version += 5;
- }
- parse_http_headers(&buf, ri);
-
- if ((ri->query_string = strchr(ri->uri, '?')) != NULL) {
- *(char *) ri->query_string++ = '\0';
- }
- n = (int) strlen(ri->uri);
- mg_url_decode(ri->uri, n, (char *) ri->uri, n + 1, 0);
- if (*ri->uri == '/' || *ri->uri == '.') {
- remove_double_dots_and_double_slashes((char *) ri->uri);
- }
- }
-
- return len;
+ int is_request, n;
+
+ // Reset the connection. Make sure that we don't touch fields that are
+ // set elsewhere: remote_ip, remote_port, server_param
+ ri->request_method = ri->uri = ri->http_version = ri->query_string = NULL;
+ ri->num_headers = ri->status_code = ri->is_websocket = ri->content_len = 0;
+
+ buf[len - 1] = '\0';
+
+ // RFC says that all initial whitespaces should be ingored
+ while (*buf != '\0' && isspace(* (unsigned char *) buf)) {
+ buf++;
+ }
+ ri->request_method = skip(&buf, " ");
+ ri->uri = skip(&buf, " ");
+ ri->http_version = skip(&buf, "\r\n");
+
+ // HTTP message could be either HTTP request or HTTP response, e.g.
+ // "GET / HTTP/1.0 ...." or "HTTP/1.0 200 OK ..."
+ is_request = is_valid_http_method(ri->request_method);
+ if ((is_request && memcmp(ri->http_version, "HTTP/", 5) != 0) ||
+ (!is_request && memcmp(ri->request_method, "HTTP/", 5) != 0)) {
+ len = -1;
+ } else {
+ if (is_request) {
+ ri->http_version += 5;
+ }
+ parse_http_headers(&buf, ri);
+
+ if ((ri->query_string = strchr(ri->uri, '?')) != NULL) {
+ *(char *) ri->query_string++ = '\0';
+ }
+ n = (int) strlen(ri->uri);
+ mg_url_decode(ri->uri, n, (char *) ri->uri, n + 1, 0);
+ if (*ri->uri == '/' || *ri->uri == '.') {
+ remove_double_dots_and_double_slashes((char *) ri->uri);
+ }
+ }
+
+ return len;
}
static int lowercase(const char *s) {
- return tolower(* (const unsigned char *) s);
+ return tolower(* (const unsigned char *) s);
}
static int mg_strcasecmp(const char *s1, const char *s2) {
- int diff;
+ int diff;
- do {
- diff = lowercase(s1++) - lowercase(s2++);
- } while (diff == 0 && s1[-1] != '\0');
+ do {
+ diff = lowercase(s1++) - lowercase(s2++);
+ } while (diff == 0 && s1[-1] != '\0');
- return diff;
+ return diff;
}
static int mg_strncasecmp(const char *s1, const char *s2, size_t len) {
- int diff = 0;
+ int diff = 0;
- if (len > 0)
- do {
- diff = lowercase(s1++) - lowercase(s2++);
- } while (diff == 0 && s1[-1] != '\0' && --len > 0);
+ if (len > 0)
+ do {
+ diff = lowercase(s1++) - lowercase(s2++);
+ } while (diff == 0 && s1[-1] != '\0' && --len > 0);
- return diff;
+ return diff;
}
// Return HTTP header value, or NULL if not found.
const char *mg_get_header(const struct mg_connection *ri, const char *s) {
- int i;
+ int i;
- for (i = 0; i < ri->num_headers; i++)
- if (!mg_strcasecmp(s, ri->http_headers[i].name))
- return ri->http_headers[i].value;
+ for (i = 0; i < ri->num_headers; i++)
+ if (!mg_strcasecmp(s, ri->http_headers[i].name))
+ return ri->http_headers[i].value;
- return NULL;
+ return NULL;
}
// Perform case-insensitive match of string against pattern
int mg_match_prefix(const char *pattern, int pattern_len, const char *str) {
- const char *or_str;
- int len, res, i = 0, j = 0;
-
- if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) {
- res = mg_match_prefix(pattern, or_str - pattern, str);
- return res > 0 ? res : mg_match_prefix(or_str + 1,
- (pattern + pattern_len) - (or_str + 1), str);
- }
-
- for (; i < pattern_len; i++, j++) {
- if (pattern[i] == '?' && str[j] != '\0') {
- continue;
- } else if (pattern[i] == '$') {
- return str[j] == '\0' ? j : -1;
- } else if (pattern[i] == '*') {
- i++;
- if (pattern[i] == '*') {
- i++;
- len = (int) strlen(str + j);
- } else {
- len = (int) strcspn(str + j, "/");
- }
- if (i == pattern_len) {
- return j + len;
- }
- do {
- res = mg_match_prefix(pattern + i, pattern_len - i, str + j + len);
- } while (res == -1 && len-- > 0);
- return res == -1 ? -1 : j + res + len;
- } else if (lowercase(&pattern[i]) != lowercase(&str[j])) {
- return -1;
- }
- }
- return j;
+ const char *or_str;
+ int len, res, i = 0, j = 0;
+
+ if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) {
+ res = mg_match_prefix(pattern, or_str - pattern, str);
+ return res > 0 ? res : mg_match_prefix(or_str + 1,
+ (pattern + pattern_len) - (or_str + 1), str);
+ }
+
+ for (; i < pattern_len; i++, j++) {
+ if (pattern[i] == '?' && str[j] != '\0') {
+ continue;
+ } else if (pattern[i] == '$') {
+ return str[j] == '\0' ? j : -1;
+ } else if (pattern[i] == '*') {
+ i++;
+ if (pattern[i] == '*') {
+ i++;
+ len = (int) strlen(str + j);
+ } else {
+ len = (int) strcspn(str + j, "/");
+ }
+ if (i == pattern_len) {
+ return j + len;
+ }
+ do {
+ res = mg_match_prefix(pattern + i, pattern_len - i, str + j + len);
+ } while (res == -1 && len-- > 0);
+ return res == -1 ? -1 : j + res + len;
+ } else if (lowercase(&pattern[i]) != lowercase(&str[j])) {
+ return -1;
+ }
+ }
+ return j;
}
// This function prints HTML pages, and expands "{{something}}" blocks
@@ -2277,182 +2277,182 @@ int mg_match_prefix(const char *pattern, int pattern_len, const char *str) {
// Note that {{@path/to/file}} construct outputs embedded file's contents,
// which provides SSI-like functionality.
void mg_template(struct mg_connection *conn, const char *s,
- struct mg_expansion *expansions) {
- int i, j, pos = 0, inside_marker = 0;
-
- for (i = 0; s[i] != '\0'; i++) {
- if (inside_marker == 0 && !memcmp(&s[i], "{{", 2)) {
- if (i > pos) {
- mg_send_data(conn, &s[pos], i - pos);
- }
- pos = i;
- inside_marker = 1;
- }
- if (inside_marker == 1 && !memcmp(&s[i], "}}", 2)) {
- for (j = 0; expansions[j].keyword != NULL; j++) {
- const char *kw = expansions[j].keyword;
- if ((int) strlen(kw) == i - (pos + 2) &&
- memcmp(kw, &s[pos + 2], i - (pos + 2)) == 0) {
- expansions[j].handler(conn);
- pos = i + 2;
- break;
- }
- }
- inside_marker = 0;
- }
- }
- if (i > pos) {
- mg_send_data(conn, &s[pos], i - pos);
- }
+ struct mg_expansion *expansions) {
+ int i, j, pos = 0, inside_marker = 0;
+
+ for (i = 0; s[i] != '\0'; i++) {
+ if (inside_marker == 0 && !memcmp(&s[i], "{{", 2)) {
+ if (i > pos) {
+ mg_send_data(conn, &s[pos], i - pos);
+ }
+ pos = i;
+ inside_marker = 1;
+ }
+ if (inside_marker == 1 && !memcmp(&s[i], "}}", 2)) {
+ for (j = 0; expansions[j].keyword != NULL; j++) {
+ const char *kw = expansions[j].keyword;
+ if ((int) strlen(kw) == i - (pos + 2) &&
+ memcmp(kw, &s[pos + 2], i - (pos + 2)) == 0) {
+ expansions[j].handler(conn);
+ pos = i + 2;
+ break;
+ }
+ }
+ inside_marker = 0;
+ }
+ }
+ if (i > pos) {
+ mg_send_data(conn, &s[pos], i - pos);
+ }
}
#ifndef MONGOOSE_NO_FILESYSTEM
static int must_hide_file(struct connection *conn, const char *path) {
- const char *pw_pattern = "**" PASSWORDS_FILE_NAME "$";
- const char *pattern = conn->server->config_options[HIDE_FILES_PATTERN];
- return mg_match_prefix(pw_pattern, strlen(pw_pattern), path) > 0 ||
- (pattern != NULL && mg_match_prefix(pattern, strlen(pattern), path) > 0);
+ const char *pw_pattern = "**" PASSWORDS_FILE_NAME "$";
+ const char *pattern = conn->server->config_options[HIDE_FILES_PATTERN];
+ return mg_match_prefix(pw_pattern, strlen(pw_pattern), path) > 0 ||
+ (pattern != NULL && mg_match_prefix(pattern, strlen(pattern), path) > 0);
}
// Return 1 if real file has been found, 0 otherwise
static int convert_uri_to_file_name(struct connection *conn, char *buf,
- size_t buf_len, file_stat_t *st) {
- struct vec a, b;
- const char *rewrites = conn->server->config_options[URL_REWRITES];
- const char *root = conn->server->config_options[DOCUMENT_ROOT];
+ size_t buf_len, file_stat_t *st) {
+ struct vec a, b;
+ const char *rewrites = conn->server->config_options[URL_REWRITES];
+ const char *root = conn->server->config_options[DOCUMENT_ROOT];
#ifndef MONGOOSE_NO_CGI
- const char *cgi_pat = conn->server->config_options[CGI_PATTERN];
- char *p;
+ const char *cgi_pat = conn->server->config_options[CGI_PATTERN];
+ char *p;
#endif
- const char *uri = conn->mg_conn.uri;
- const char *domain = mg_get_header(&conn->mg_conn, "Host");
- int match_len, root_len = root == NULL ? 0 : strlen(root);
-
- // Perform virtual hosting rewrites
- if (rewrites != NULL && domain != NULL) {
- const char *colon = strchr(domain, ':');
- int domain_len = colon == NULL ? (int) strlen(domain) : colon - domain;
-
- while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
- if (a.len > 1 && a.ptr[0] == '@' && a.len == domain_len + 1 &&
- mg_strncasecmp(a.ptr + 1, domain, domain_len) == 0) {
- root = b.ptr;
- root_len = b.len;
- break;
- }
- }
- }
-
- // No filesystem access
- if (root == NULL || root_len == 0) return 0;
-
- // Handle URL rewrites
- mg_snprintf(buf, buf_len, "%.*s%s", root_len, root, uri);
- rewrites = conn->server->config_options[URL_REWRITES]; // Re-initialize!
- while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
- if ((match_len = mg_match_prefix(a.ptr, a.len, uri)) > 0) {
- mg_snprintf(buf, buf_len, "%.*s%s", (int) b.len, b.ptr, uri + match_len);
- break;
- }
- }
-
- if (stat(buf, st) == 0) return 1;
+ const char *uri = conn->mg_conn.uri;
+ const char *domain = mg_get_header(&conn->mg_conn, "Host");
+ int match_len, root_len = root == NULL ? 0 : strlen(root);
+
+ // Perform virtual hosting rewrites
+ if (rewrites != NULL && domain != NULL) {
+ const char *colon = strchr(domain, ':');
+ int domain_len = colon == NULL ? (int) strlen(domain) : colon - domain;
+
+ while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
+ if (a.len > 1 && a.ptr[0] == '@' && a.len == domain_len + 1 &&
+ mg_strncasecmp(a.ptr + 1, domain, domain_len) == 0) {
+ root = b.ptr;
+ root_len = b.len;
+ break;
+ }
+ }
+ }
+
+ // No filesystem access
+ if (root == NULL || root_len == 0) return 0;
+
+ // Handle URL rewrites
+ mg_snprintf(buf, buf_len, "%.*s%s", root_len, root, uri);
+ rewrites = conn->server->config_options[URL_REWRITES]; // Re-initialize!
+ while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
+ if ((match_len = mg_match_prefix(a.ptr, a.len, uri)) > 0) {
+ mg_snprintf(buf, buf_len, "%.*s%s", (int) b.len, b.ptr, uri + match_len);
+ break;
+ }
+ }
+
+ if (stat(buf, st) == 0) return 1;
#ifndef MONGOOSE_NO_CGI
- // Support PATH_INFO for CGI scripts.
- for (p = buf + strlen(root) + 2; *p != '\0'; p++) {
- if (*p == '/') {
- *p = '\0';
- if (mg_match_prefix(cgi_pat, strlen(cgi_pat), buf) > 0 &&
- !stat(buf, st)) {
- DBG(("!!!! [%s]", buf));
- *p = '/';
- conn->path_info = mg_strdup(p);
- *p = '\0';
- return 1;
- }
- *p = '/';
- }
- }
+ // Support PATH_INFO for CGI scripts.
+ for (p = buf + strlen(root) + 2; *p != '\0'; p++) {
+ if (*p == '/') {
+ *p = '\0';
+ if (mg_match_prefix(cgi_pat, strlen(cgi_pat), buf) > 0 &&
+ !stat(buf, st)) {
+ DBG(("!!!! [%s]", buf));
+ *p = '/';
+ conn->path_info = mg_strdup(p);
+ *p = '\0';
+ return 1;
+ }
+ *p = '/';
+ }
+ }
#endif
- return 0;
+ return 0;
}
#endif // MONGOOSE_NO_FILESYSTEM
static int should_keep_alive(const struct mg_connection *conn) {
- struct connection *c = MG_CONN_2_CONN(conn);
- const char *method = conn->request_method;
- const char *http_version = conn->http_version;
- const char *header = mg_get_header(conn, "Connection");
- return method != NULL &&
- (!strcmp(method, "GET") || c->endpoint_type == EP_USER) &&
- ((header != NULL && !mg_strcasecmp(header, "keep-alive")) ||
- (header == NULL && http_version && !strcmp(http_version, "1.1")));
+ struct connection *c = MG_CONN_2_CONN(conn);
+ const char *method = conn->request_method;
+ const char *http_version = conn->http_version;
+ const char *header = mg_get_header(conn, "Connection");
+ return method != NULL &&
+ (!strcmp(method, "GET") || c->endpoint_type == EP_USER) &&
+ ((header != NULL && !mg_strcasecmp(header, "keep-alive")) ||
+ (header == NULL && http_version && !strcmp(http_version, "1.1")));
}
size_t mg_write(struct mg_connection *c, const void *buf, int len) {
- struct connection *conn = MG_CONN_2_CONN(c);
- ns_send(conn->ns_conn, buf, len);
- return conn->ns_conn->send_iobuf.len;
+ struct connection *conn = MG_CONN_2_CONN(c);
+ ns_send(conn->ns_conn, buf, len);
+ return conn->ns_conn->send_iobuf.len;
}
void mg_send_status(struct mg_connection *c, int status) {
- if (c->status_code == 0) {
- c->status_code = status;
- mg_printf(c, "HTTP/1.1 %d %s\r\n", status, status_code_to_str(status));
- }
+ if (c->status_code == 0) {
+ c->status_code = status;
+ mg_printf(c, "HTTP/1.1 %d %s\r\n", status, status_code_to_str(status));
+ }
}
void mg_send_header(struct mg_connection *c, const char *name, const char *v) {
- if (c->status_code == 0) {
- c->status_code = 200;
- mg_printf(c, "HTTP/1.1 %d %s\r\n", 200, status_code_to_str(200));
- }
- mg_printf(c, "%s: %s\r\n", name, v);
+ if (c->status_code == 0) {
+ c->status_code = 200;
+ mg_printf(c, "HTTP/1.1 %d %s\r\n", 200, status_code_to_str(200));
+ }
+ mg_printf(c, "%s: %s\r\n", name, v);
}
static void terminate_headers(struct mg_connection *c) {
- struct connection *conn = MG_CONN_2_CONN(c);
- if (!(conn->ns_conn->flags & MG_HEADERS_SENT)) {
- mg_send_header(c, "Transfer-Encoding", "chunked");
- mg_write(c, "\r\n", 2);
- conn->ns_conn->flags |= MG_HEADERS_SENT;
- }
+ struct connection *conn = MG_CONN_2_CONN(c);
+ if (!(conn->ns_conn->flags & MG_HEADERS_SENT)) {
+ mg_send_header(c, "Transfer-Encoding", "chunked");
+ mg_write(c, "\r\n", 2);
+ conn->ns_conn->flags |= MG_HEADERS_SENT;
+ }
}
size_t mg_send_data(struct mg_connection *c, const void *data, int data_len) {
- struct connection *conn = MG_CONN_2_CONN(c);
- terminate_headers(c);
- write_chunk(MG_CONN_2_CONN(c), (const char *) data, data_len);
- return conn->ns_conn->send_iobuf.len;
+ struct connection *conn = MG_CONN_2_CONN(c);
+ terminate_headers(c);
+ write_chunk(MG_CONN_2_CONN(c), (const char *) data, data_len);
+ return conn->ns_conn->send_iobuf.len;
}
size_t mg_printf_data(struct mg_connection *c, const char *fmt, ...) {
- struct connection *conn = MG_CONN_2_CONN(c);
- va_list ap;
- int len;
- char mem[IOBUF_SIZE], *buf = mem;
+ struct connection *conn = MG_CONN_2_CONN(c);
+ va_list ap;
+ int len;
+ char mem[IOBUF_SIZE], *buf = mem;
- terminate_headers(c);
+ terminate_headers(c);
- va_start(ap, fmt);
- len = ns_avprintf(&buf, sizeof(mem), fmt, ap);
- va_end(ap);
+ va_start(ap, fmt);
+ len = ns_avprintf(&buf, sizeof(mem), fmt, ap);
+ va_end(ap);
- if (len >= 0) {
- write_chunk((struct connection *) conn, buf, len);
- }
- if (buf != mem && buf != NULL) {
- free(buf);
- }
- return conn->ns_conn->send_iobuf.len;
+ if (len >= 0) {
+ write_chunk((struct connection *) conn, buf, len);
+ }
+ if (buf != mem && buf != NULL) {
+ free(buf);
+ }
+ return conn->ns_conn->send_iobuf.len;
}
#if !defined(MONGOOSE_NO_WEBSOCKET) || !defined(MONGOOSE_NO_AUTH)
static int is_big_endian(void) {
- static const int n = 1;
- return ((char *) &n)[0] == 0;
+ static const int n = 1;
+ return ((char *) &n)[0] == 0;
}
#endif
@@ -2469,16 +2469,16 @@ union char64long16 { unsigned char c[64]; uint32_t l[16]; };
#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
static uint32_t blk0(union char64long16 *block, int i) {
- // Forrest: SHA expect BIG_ENDIAN, swap if LITTLE_ENDIAN
- if (!is_big_endian()) {
- block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) |
- (rol(block->l[i], 8) & 0x00FF00FF);
- }
- return block->l[i];
+ // Forrest: SHA expect BIG_ENDIAN, swap if LITTLE_ENDIAN
+ if (!is_big_endian()) {
+ block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) |
+ (rol(block->l[i], 8) & 0x00FF00FF);
+ }
+ return block->l[i];
}
#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
- ^block->l[(i+2)&15]^block->l[i&15],1))
+ ^block->l[(i+2)&15]^block->l[i&15],1))
#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(block, i)+0x5A827999+rol(v,5);w=rol(w,30);
#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
@@ -2486,1050 +2486,1049 @@ static uint32_t blk0(union char64long16 *block, int i) {
#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
typedef struct {
- uint32_t state[5];
- uint32_t count[2];
- unsigned char buffer[64];
+ uint32_t state[5];
+ uint32_t count[2];
+ unsigned char buffer[64];
} SHA1_CTX;
static void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]) {
- uint32_t a, b, c, d, e;
- union char64long16 block[1];
-
- memcpy(block, buffer, 64);
- a = state[0];
- b = state[1];
- c = state[2];
- d = state[3];
- e = state[4];
- R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
- R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
- R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
- R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
- R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
- R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
- R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
- R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
- R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
- R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
- R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
- R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
- R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
- R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
- R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
- R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
- R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
- R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
- R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
- R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
- state[0] += a;
- state[1] += b;
- state[2] += c;
- state[3] += d;
- state[4] += e;
- // Erase working structures. The order of operations is important,
- // used to ensure that compiler doesn't optimize those out.
- memset(block, 0, sizeof(block));
- a = b = c = d = e = 0;
- (void) a; (void) b; (void) c; (void) d; (void) e;
+ uint32_t a, b, c, d, e;
+ union char64long16 block[1];
+
+ memcpy(block, buffer, 64);
+ a = state[0];
+ b = state[1];
+ c = state[2];
+ d = state[3];
+ e = state[4];
+ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+ R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+ R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+ R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+ R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+ R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+ R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+ R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+ R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+ R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+ R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+ R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+ R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+ R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+ R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+ R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+ R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+ R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+ R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+ R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+ state[4] += e;
+ // Erase working structures. The order of operations is important,
+ // used to ensure that compiler doesn't optimize those out.
+ memset(block, 0, sizeof(block));
+ a = b = c = d = e = 0;
+ (void) a; (void) b; (void) c; (void) d; (void) e;
}
static void SHA1Init(SHA1_CTX* context) {
- context->state[0] = 0x67452301;
- context->state[1] = 0xEFCDAB89;
- context->state[2] = 0x98BADCFE;
- context->state[3] = 0x10325476;
- context->state[4] = 0xC3D2E1F0;
- context->count[0] = context->count[1] = 0;
+ context->state[0] = 0x67452301;
+ context->state[1] = 0xEFCDAB89;
+ context->state[2] = 0x98BADCFE;
+ context->state[3] = 0x10325476;
+ context->state[4] = 0xC3D2E1F0;
+ context->count[0] = context->count[1] = 0;
}
static void SHA1Update(SHA1_CTX* context, const unsigned char* data,
- uint32_t len) {
- uint32_t i, j;
-
- j = context->count[0];
- if ((context->count[0] += len << 3) < j)
- context->count[1]++;
- context->count[1] += (len>>29);
- j = (j >> 3) & 63;
- if ((j + len) > 63) {
- memcpy(&context->buffer[j], data, (i = 64-j));
- SHA1Transform(context->state, context->buffer);
- for ( ; i + 63 < len; i += 64) {
- SHA1Transform(context->state, &data[i]);
- }
- j = 0;
- }
- else i = 0;
- memcpy(&context->buffer[j], &data[i], len - i);
+ uint32_t len) {
+ uint32_t i, j;
+
+ j = context->count[0];
+ if ((context->count[0] += len << 3) < j)
+ context->count[1]++;
+ context->count[1] += (len>>29);
+ j = (j >> 3) & 63;
+ if ((j + len) > 63) {
+ memcpy(&context->buffer[j], data, (i = 64-j));
+ SHA1Transform(context->state, context->buffer);
+ for ( ; i + 63 < len; i += 64) {
+ SHA1Transform(context->state, &data[i]);
+ }
+ j = 0;
+ }
+ else i = 0;
+ memcpy(&context->buffer[j], &data[i], len - i);
}
static void SHA1Final(unsigned char digest[20], SHA1_CTX* context) {
- unsigned i;
- unsigned char finalcount[8], c;
-
- for (i = 0; i < 8; i++) {
- finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
- >> ((3-(i & 3)) * 8) ) & 255);
- }
- c = 0200;
- SHA1Update(context, &c, 1);
- while ((context->count[0] & 504) != 448) {
- c = 0000;
- SHA1Update(context, &c, 1);
- }
- SHA1Update(context, finalcount, 8);
- for (i = 0; i < 20; i++) {
- digest[i] = (unsigned char)
- ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
- }
- memset(context, '\0', sizeof(*context));
- memset(&finalcount, '\0', sizeof(finalcount));
+ unsigned i;
+ unsigned char finalcount[8], c;
+
+ for (i = 0; i < 8; i++) {
+ finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+ >> ((3-(i & 3)) * 8) ) & 255);
+ }
+ c = 0200;
+ SHA1Update(context, &c, 1);
+ while ((context->count[0] & 504) != 448) {
+ c = 0000;
+ SHA1Update(context, &c, 1);
+ }
+ SHA1Update(context, finalcount, 8);
+ for (i = 0; i < 20; i++) {
+ digest[i] = (unsigned char)
+ ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+ }
+ memset(context, '\0', sizeof(*context));
+ memset(&finalcount, '\0', sizeof(finalcount));
}
// END OF SHA1 CODE
static void base64_encode(const unsigned char *src, int src_len, char *dst) {
- static const char *b64 =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- int i, j, a, b, c;
-
- for (i = j = 0; i < src_len; i += 3) {
- a = src[i];
- b = i + 1 >= src_len ? 0 : src[i + 1];
- c = i + 2 >= src_len ? 0 : src[i + 2];
-
- dst[j++] = b64[a >> 2];
- dst[j++] = b64[((a & 3) << 4) | (b >> 4)];
- if (i + 1 < src_len) {
- dst[j++] = b64[(b & 15) << 2 | (c >> 6)];
- }
- if (i + 2 < src_len) {
- dst[j++] = b64[c & 63];
- }
- }
- while (j % 4 != 0) {
- dst[j++] = '=';
- }
- dst[j++] = '\0';
+ static const char *b64 =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ int i, j, a, b, c;
+
+ for (i = j = 0; i < src_len; i += 3) {
+ a = src[i];
+ b = i + 1 >= src_len ? 0 : src[i + 1];
+ c = i + 2 >= src_len ? 0 : src[i + 2];
+
+ dst[j++] = b64[a >> 2];
+ dst[j++] = b64[((a & 3) << 4) | (b >> 4)];
+ if (i + 1 < src_len) {
+ dst[j++] = b64[(b & 15) << 2 | (c >> 6)];
+ }
+ if (i + 2 < src_len) {
+ dst[j++] = b64[c & 63];
+ }
+ }
+ while (j % 4 != 0) {
+ dst[j++] = '=';
+ }
+ dst[j++] = '\0';
}
static void send_websocket_handshake(struct mg_connection *conn,
- const char *key) {
- static const char *magic = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
- char buf[500], sha[20], b64_sha[sizeof(sha) * 2];
- SHA1_CTX sha_ctx;
+ const char *key) {
+ static const char *magic = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+ char buf[500], sha[20], b64_sha[sizeof(sha) * 2];
+ SHA1_CTX sha_ctx;
- mg_snprintf(buf, sizeof(buf), "%s%s", key, magic);
- SHA1Init(&sha_ctx);
- SHA1Update(&sha_ctx, (unsigned char *) buf, strlen(buf));
- SHA1Final((unsigned char *) sha, &sha_ctx);
- base64_encode((unsigned char *) sha, sizeof(sha), b64_sha);
- mg_snprintf(buf, sizeof(buf), "%s%s%s",
- "HTTP/1.1 101 Switching Protocols\r\n"
- "Upgrade: websocket\r\n"
- "Connection: Upgrade\r\n"
- "Sec-WebSocket-Accept: ", b64_sha, "\r\n\r\n");
+ mg_snprintf(buf, sizeof(buf), "%s%s", key, magic);
+ SHA1Init(&sha_ctx);
+ SHA1Update(&sha_ctx, (unsigned char *) buf, strlen(buf));
+ SHA1Final((unsigned char *) sha, &sha_ctx);
+ base64_encode((unsigned char *) sha, sizeof(sha), b64_sha);
+ mg_snprintf(buf, sizeof(buf), "%s%s%s",
+ "HTTP/1.1 101 Switching Protocols\r\n"
+ "Upgrade: websocket\r\n"
+ "Connection: Upgrade\r\n"
+ "Sec-WebSocket-Accept: ", b64_sha, "\r\n\r\n");
- mg_write(conn, buf, strlen(buf));
+ mg_write(conn, buf, strlen(buf));
}
static int deliver_websocket_frame(struct connection *conn) {
- // Having buf unsigned char * is important, as it is used below in arithmetic
- unsigned char *buf = (unsigned char *) conn->ns_conn->recv_iobuf.buf;
- int i, len, buf_len = conn->ns_conn->recv_iobuf.len, frame_len = 0,
- mask_len = 0, header_len = 0, data_len = 0, buffered = 0;
-
- if (buf_len >= 2) {
- len = buf[1] & 127;
- mask_len = buf[1] & 128 ? 4 : 0;
- if (len < 126 && buf_len >= mask_len) {
- data_len = len;
- header_len = 2 + mask_len;
- } else if (len == 126 && buf_len >= 4 + mask_len) {
- header_len = 4 + mask_len;
- data_len = ((((int) buf[2]) << 8) + buf[3]);
- } else if (buf_len >= 10 + mask_len) {
- header_len = 10 + mask_len;
- data_len = (int) (((uint64_t) htonl(* (uint32_t *) &buf[2])) << 32) +
- htonl(* (uint32_t *) &buf[6]);
- }
- }
-
- frame_len = header_len + data_len;
- buffered = frame_len > 0 && frame_len <= buf_len;
-
- if (buffered) {
- conn->mg_conn.content_len = data_len;
- conn->mg_conn.content = (char *) buf + header_len;
- conn->mg_conn.wsbits = buf[0];
-
- // Apply mask if necessary
- if (mask_len > 0) {
- for (i = 0; i < data_len; i++) {
- buf[i + header_len] ^= (buf + header_len - mask_len)[i % 4];
- }
- }
-
- // Call the handler and remove frame from the iobuf
- if (call_user(conn, MG_REQUEST) == MG_FALSE) {
- conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
- }
- iobuf_remove(&conn->ns_conn->recv_iobuf, frame_len);
- }
-
- return buffered;
+ // Having buf unsigned char * is important, as it is used below in arithmetic
+ unsigned char *buf = (unsigned char *) conn->ns_conn->recv_iobuf.buf;
+ int i, len, buf_len = conn->ns_conn->recv_iobuf.len, frame_len = 0,
+ mask_len = 0, header_len = 0, data_len = 0, buffered = 0;
+
+ if (buf_len >= 2) {
+ len = buf[1] & 127;
+ mask_len = buf[1] & 128 ? 4 : 0;
+ if (len < 126 && buf_len >= mask_len) {
+ data_len = len;
+ header_len = 2 + mask_len;
+ } else if (len == 126 && buf_len >= 4 + mask_len) {
+ header_len = 4 + mask_len;
+ data_len = ((((int) buf[2]) << 8) + buf[3]);
+ } else if (buf_len >= 10 + mask_len) {
+ header_len = 10 + mask_len;
+ data_len = (int) (((uint64_t) htonl(* (uint32_t *) &buf[2])) << 32) +
+ htonl(* (uint32_t *) &buf[6]);
+ }
+ }
+
+ frame_len = header_len + data_len;
+ buffered = frame_len > 0 && frame_len <= buf_len;
+
+ if (buffered) {
+ conn->mg_conn.content_len = data_len;
+ conn->mg_conn.content = (char *) buf + header_len;
+ conn->mg_conn.wsbits = buf[0];
+
+ // Apply mask if necessary
+ if (mask_len > 0) {
+ for (i = 0; i < data_len; i++) {
+ buf[i + header_len] ^= (buf + header_len - mask_len)[i % 4];
+ }
+ }
+
+ // Call the handler and remove frame from the iobuf
+ if (call_user(conn, MG_REQUEST) == MG_FALSE) {
+ conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
+ }
+ iobuf_remove(&conn->ns_conn->recv_iobuf, frame_len);
+ }
+
+ return buffered;
}
size_t mg_websocket_write(struct mg_connection* conn, int opcode,
- const char *data, size_t data_len) {
- unsigned char mem[4192], *copy = mem;
- size_t copy_len = 0;
-
- if (data_len + 10 > sizeof(mem) &&
- (copy = (unsigned char *) malloc(data_len + 10)) == NULL) {
- return 0;
- }
-
- copy[0] = 0x80 + (opcode & 0x0f);
-
- // Frame format: http://tools.ietf.org/html/rfc6455#section-5.2
- if (data_len < 126) {
- // Inline 7-bit length field
- copy[1] = data_len;
- memcpy(copy + 2, data, data_len);
- copy_len = 2 + data_len;
- } else if (data_len <= 0xFFFF) {
- // 16-bit length field
- copy[1] = 126;
- * (uint16_t *) (copy + 2) = (uint16_t) htons((uint16_t) data_len);
- memcpy(copy + 4, data, data_len);
- copy_len = 4 + data_len;
- } else {
- // 64-bit length field
- copy[1] = 127;
- * (uint32_t *) (copy + 2) = (uint32_t)
- htonl((uint32_t) ((uint64_t) data_len >> 32));
- * (uint32_t *) (copy + 6) = (uint32_t) htonl(data_len & 0xffffffff);
- memcpy(copy + 10, data, data_len);
- copy_len = 10 + data_len;
- }
-
- if (copy_len > 0) {
- mg_write(conn, copy, copy_len);
- }
- if (copy != mem) {
- free(copy);
- }
-
- // If we send closing frame, schedule a connection to be closed after
- // data is drained to the client.
- if (opcode == WEBSOCKET_OPCODE_CONNECTION_CLOSE) {
- MG_CONN_2_CONN(conn)->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
- }
-
- return MG_CONN_2_CONN(conn)->ns_conn->send_iobuf.len;
+ const char *data, size_t data_len) {
+ unsigned char mem[4192], *copy = mem;
+ size_t copy_len = 0;
+
+ if (data_len + 10 > sizeof(mem) &&
+ (copy = (unsigned char *) malloc(data_len + 10)) == NULL) {
+ return 0;
+ }
+
+ copy[0] = 0x80 + (opcode & 0x0f);
+
+ // Frame format: http://tools.ietf.org/html/rfc6455#section-5.2
+ if (data_len < 126) {
+ // Inline 7-bit length field
+ copy[1] = data_len;
+ memcpy(copy + 2, data, data_len);
+ copy_len = 2 + data_len;
+ } else if (data_len <= 0xFFFF) {
+ // 16-bit length field
+ copy[1] = 126;
+ * (uint16_t *) (copy + 2) = (uint16_t) htons((uint16_t) data_len);
+ memcpy(copy + 4, data, data_len);
+ copy_len = 4 + data_len;
+ } else {
+ // 64-bit length field
+ copy[1] = 127;
+ * (uint32_t *) (copy + 2) = (uint32_t)
+ htonl((uint32_t) ((uint64_t) data_len >> 32));
+ * (uint32_t *) (copy + 6) = (uint32_t) htonl(data_len & 0xffffffff);
+ memcpy(copy + 10, data, data_len);
+ copy_len = 10 + data_len;
+ }
+
+ if (copy_len > 0) {
+ mg_write(conn, copy, copy_len);
+ }
+ if (copy != mem) {
+ free(copy);
+ }
+
+ // If we send closing frame, schedule a connection to be closed after
+ // data is drained to the client.
+ if (opcode == WEBSOCKET_OPCODE_CONNECTION_CLOSE) {
+ MG_CONN_2_CONN(conn)->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
+ }
+
+ return MG_CONN_2_CONN(conn)->ns_conn->send_iobuf.len;
}
size_t mg_websocket_printf(struct mg_connection* conn, int opcode,
- const char *fmt, ...) {
- char mem[4192], *buf = mem;
- va_list ap;
- int len;
+ const char *fmt, ...) {
+ char mem[4192], *buf = mem;
+ va_list ap;
+ int len;
- va_start(ap, fmt);
- if ((len = ns_avprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
- mg_websocket_write(conn, opcode, buf, len);
- }
- va_end(ap);
+ va_start(ap, fmt);
+ if ((len = ns_avprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
+ mg_websocket_write(conn, opcode, buf, len);
+ }
+ va_end(ap);
- if (buf != mem && buf != NULL) {
- free(buf);
- }
+ if (buf != mem && buf != NULL) {
+ free(buf);
+ }
- return MG_CONN_2_CONN(conn)->ns_conn->send_iobuf.len;
+ return MG_CONN_2_CONN(conn)->ns_conn->send_iobuf.len;
}
static void send_websocket_handshake_if_requested(struct mg_connection *conn) {
- const char *ver = mg_get_header(conn, "Sec-WebSocket-Version"),
- *key = mg_get_header(conn, "Sec-WebSocket-Key");
- if (ver != NULL && key != NULL) {
- conn->is_websocket = 1;
- if (call_user(MG_CONN_2_CONN(conn), MG_WS_HANDSHAKE) == MG_FALSE) {
- send_websocket_handshake(conn, key);
- }
- call_user(MG_CONN_2_CONN(conn), MG_WS_CONNECT);
- }
+ const char *ver = mg_get_header(conn, "Sec-WebSocket-Version"),
+ *key = mg_get_header(conn, "Sec-WebSocket-Key");
+ if (ver != NULL && key != NULL) {
+ conn->is_websocket = 1;
+ if (call_user(MG_CONN_2_CONN(conn), MG_WS_HANDSHAKE) == MG_FALSE) {
+ send_websocket_handshake(conn, key);
+ }
+ call_user(MG_CONN_2_CONN(conn), MG_WS_CONNECT);
+ }
}
static void ping_idle_websocket_connection(struct connection *conn, time_t t) {
- if (t - conn->ns_conn->last_io_time > MONGOOSE_USE_WEBSOCKET_PING_INTERVAL) {
- mg_websocket_write(&conn->mg_conn, WEBSOCKET_OPCODE_PING, "", 0);
- }
+ if (t - conn->ns_conn->last_io_time > MONGOOSE_USE_WEBSOCKET_PING_INTERVAL) {
+ mg_websocket_write(&conn->mg_conn, WEBSOCKET_OPCODE_PING, "", 0);
+ }
}
#else
#define ping_idle_websocket_connection(conn, t)
#endif // !MONGOOSE_NO_WEBSOCKET
static void write_terminating_chunk(struct connection *conn) {
- mg_write(&conn->mg_conn, "0\r\n\r\n", 5);
+ mg_write(&conn->mg_conn, "0\r\n\r\n", 5);
}
static int call_request_handler(struct connection *conn) {
- int result;
- conn->mg_conn.content = conn->ns_conn->recv_iobuf.buf;
- if ((result = call_user(conn, MG_REQUEST)) == MG_TRUE) {
- if (conn->ns_conn->flags & MG_HEADERS_SENT) {
- write_terminating_chunk(conn);
- }
- close_local_endpoint(conn);
- }
- return result;
+ int result;
+ conn->mg_conn.content = conn->ns_conn->recv_iobuf.buf;
+ if ((result = call_user(conn, MG_REQUEST)) == MG_TRUE) {
+ if (conn->ns_conn->flags & MG_HEADERS_SENT) {
+ write_terminating_chunk(conn);
+ }
+ close_local_endpoint(conn);
+ }
+ return result;
}
const char *mg_get_mime_type(const char *path, const char *default_mime_type) {
- const char *ext;
- size_t i, path_len;
+ const char *ext;
+ size_t i, path_len;
- path_len = strlen(path);
+ path_len = strlen(path);
- for (i = 0; static_builtin_mime_types[i].extension != NULL; i++) {
- ext = path + (path_len - static_builtin_mime_types[i].ext_len);
- if (path_len > static_builtin_mime_types[i].ext_len &&
- mg_strcasecmp(ext, static_builtin_mime_types[i].extension) == 0) {
- return static_builtin_mime_types[i].mime_type;
- }
- }
+ for (i = 0; static_builtin_mime_types[i].extension != NULL; i++) {
+ ext = path + (path_len - static_builtin_mime_types[i].ext_len);
+ if (path_len > static_builtin_mime_types[i].ext_len &&
+ mg_strcasecmp(ext, static_builtin_mime_types[i].extension) == 0) {
+ return static_builtin_mime_types[i].mime_type;
+ }
+ }
- return default_mime_type;
+ return default_mime_type;
}
#ifndef MONGOOSE_NO_FILESYSTEM
// Convert month to the month number. Return -1 on error, or month number
static int get_month_index(const char *s) {
- static const char *month_names[] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
- int i;
+ static const char *month_names[] = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
+ int i;
- for (i = 0; i < (int) ARRAY_SIZE(month_names); i++)
- if (!strcmp(s, month_names[i]))
- return i;
+ for (i = 0; i < (int) ARRAY_SIZE(month_names); i++)
+ if (!strcmp(s, month_names[i]))
+ return i;
- return -1;
+ return -1;
}
static int num_leap_years(int year) {
- return year / 4 - year / 100 + year / 400;
+ return year / 4 - year / 100 + year / 400;
}
// Parse UTC date-time string, and return the corresponding time_t value.
static time_t parse_date_string(const char *datetime) {
- static const unsigned short days_before_month[] = {
- 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
- };
- char month_str[32];
- int second, minute, hour, day, month, year, leap_days, days;
- time_t result = (time_t) 0;
-
- if (((sscanf(datetime, "%d/%3s/%d %d:%d:%d",
- &day, month_str, &year, &hour, &minute, &second) == 6) ||
- (sscanf(datetime, "%d %3s %d %d:%d:%d",
- &day, month_str, &year, &hour, &minute, &second) == 6) ||
- (sscanf(datetime, "%*3s, %d %3s %d %d:%d:%d",
- &day, month_str, &year, &hour, &minute, &second) == 6) ||
- (sscanf(datetime, "%d-%3s-%d %d:%d:%d",
- &day, month_str, &year, &hour, &minute, &second) == 6)) &&
- year > 1970 &&
- (month = get_month_index(month_str)) != -1) {
- leap_days = num_leap_years(year) - num_leap_years(1970);
- year -= 1970;
- days = year * 365 + days_before_month[month] + (day - 1) + leap_days;
- result = days * 24 * 3600 + hour * 3600 + minute * 60 + second;
- }
-
- return result;
+ static const unsigned short days_before_month[] = {
+ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
+ };
+ char month_str[32];
+ int second, minute, hour, day, month, year, leap_days, days;
+ time_t result = (time_t) 0;
+
+ if (((sscanf(datetime, "%d/%3s/%d %d:%d:%d",
+ &day, month_str, &year, &hour, &minute, &second) == 6) ||
+ (sscanf(datetime, "%d %3s %d %d:%d:%d",
+ &day, month_str, &year, &hour, &minute, &second) == 6) ||
+ (sscanf(datetime, "%*3s, %d %3s %d %d:%d:%d",
+ &day, month_str, &year, &hour, &minute, &second) == 6) ||
+ (sscanf(datetime, "%d-%3s-%d %d:%d:%d",
+ &day, month_str, &year, &hour, &minute, &second) == 6)) &&
+ year > 1970 &&
+ (month = get_month_index(month_str)) != -1) {
+ leap_days = num_leap_years(year) - num_leap_years(1970);
+ year -= 1970;
+ days = year * 365 + days_before_month[month] + (day - 1) + leap_days;
+ result = days * 24 * 3600 + hour * 3600 + minute * 60 + second;
+ }
+
+ return result;
}
// Look at the "path" extension and figure what mime type it has.
// Store mime type in the vector.
static void get_mime_type(const struct mg_server *server, const char *path,
- struct vec *vec) {
- struct vec ext_vec, mime_vec;
- const char *list, *ext;
- size_t path_len;
+ struct vec *vec) {
+ struct vec ext_vec, mime_vec;
+ const char *list, *ext;
+ size_t path_len;
- path_len = strlen(path);
+ path_len = strlen(path);
- // Scan user-defined mime types first, in case user wants to
- // override default mime types.
- list = server->config_options[EXTRA_MIME_TYPES];
- while ((list = next_option(list, &ext_vec, &mime_vec)) != NULL) {
- // ext now points to the path suffix
- ext = path + path_len - ext_vec.len;
- if (mg_strncasecmp(ext, ext_vec.ptr, ext_vec.len) == 0) {
- *vec = mime_vec;
- return;
- }
- }
+ // Scan user-defined mime types first, in case user wants to
+ // override default mime types.
+ list = server->config_options[EXTRA_MIME_TYPES];
+ while ((list = next_option(list, &ext_vec, &mime_vec)) != NULL) {
+ // ext now points to the path suffix
+ ext = path + path_len - ext_vec.len;
+ if (mg_strncasecmp(ext, ext_vec.ptr, ext_vec.len) == 0) {
+ *vec = mime_vec;
+ return;
+ }
+ }
- vec->ptr = mg_get_mime_type(path, "text/plain");
- vec->len = strlen(vec->ptr);
+ vec->ptr = mg_get_mime_type(path, "text/plain");
+ vec->len = strlen(vec->ptr);
}
static const char *suggest_connection_header(const struct mg_connection *conn) {
- return should_keep_alive(conn) ? "keep-alive" : "close";
+ return should_keep_alive(conn) ? "keep-alive" : "close";
}
static void construct_etag(char *buf, size_t buf_len, const file_stat_t *st) {
- mg_snprintf(buf, buf_len, "\"%lx.%" INT64_FMT "\"",
- (unsigned long) st->st_mtime, (int64_t) st->st_size);
+ mg_snprintf(buf, buf_len, "\"%lx.%" INT64_FMT "\"",
+ (unsigned long) st->st_mtime, (int64_t) st->st_size);
}
// Return True if we should reply 304 Not Modified.
static int is_not_modified(const struct connection *conn,
- const file_stat_t *stp) {
- char etag[64];
- const char *ims = mg_get_header(&conn->mg_conn, "If-Modified-Since");
- const char *inm = mg_get_header(&conn->mg_conn, "If-None-Match");
- construct_etag(etag, sizeof(etag), stp);
- return (inm != NULL && !mg_strcasecmp(etag, inm)) ||
- (ims != NULL && stp->st_mtime <= parse_date_string(ims));
+ const file_stat_t *stp) {
+ char etag[64];
+ const char *ims = mg_get_header(&conn->mg_conn, "If-Modified-Since");
+ const char *inm = mg_get_header(&conn->mg_conn, "If-None-Match");
+ construct_etag(etag, sizeof(etag), stp);
+ return (inm != NULL && !mg_strcasecmp(etag, inm)) ||
+ (ims != NULL && stp->st_mtime <= parse_date_string(ims));
}
// For given directory path, substitute it to valid index file.
// Return 0 if index file has been found, -1 if not found.
// If the file is found, it's stats is returned in stp.
static int find_index_file(struct connection *conn, char *path,
- size_t path_len, file_stat_t *stp) {
- const char *list = conn->server->config_options[INDEX_FILES];
- file_stat_t st;
- struct vec filename_vec;
- size_t n = strlen(path), found = 0;
-
- // The 'path' given to us points to the directory. Remove all trailing
- // directory separator characters from the end of the path, and
- // then append single directory separator character.
- while (n > 0 && path[n - 1] == '/') {
- n--;
- }
- path[n] = '/';
-
- // Traverse index files list. For each entry, append it to the given
- // path and see if the file exists. If it exists, break the loop
- while ((list = next_option(list, &filename_vec, NULL)) != NULL) {
-
- // Ignore too long entries that may overflow path buffer
- if (filename_vec.len > (int) (path_len - (n + 2)))
- continue;
-
- // Prepare full path to the index file
- strncpy(path + n + 1, filename_vec.ptr, filename_vec.len);
- path[n + 1 + filename_vec.len] = '\0';
-
- //DBG(("[%s]", path));
-
- // Does it exist?
- if (!stat(path, &st)) {
- // Yes it does, break the loop
- *stp = st;
- found = 1;
- break;
- }
- }
-
- // If no index file exists, restore directory path
- if (!found) {
- path[n] = '\0';
- }
-
- return found;
+ size_t path_len, file_stat_t *stp) {
+ const char *list = conn->server->config_options[INDEX_FILES];
+ file_stat_t st;
+ struct vec filename_vec;
+ size_t n = strlen(path), found = 0;
+
+ // The 'path' given to us points to the directory. Remove all trailing
+ // directory separator characters from the end of the path, and
+ // then append single directory separator character.
+ while (n > 0 && path[n - 1] == '/') {
+ n--;
+ }
+ path[n] = '/';
+
+ // Traverse index files list. For each entry, append it to the given
+ // path and see if the file exists. If it exists, break the loop
+ while ((list = next_option(list, &filename_vec, NULL)) != NULL) {
+ // Ignore too long entries that may overflow path buffer
+ if (filename_vec.len > (int) (path_len - (n + 2)))
+ continue;
+
+ // Prepare full path to the index file
+ strncpy(path + n + 1, filename_vec.ptr, filename_vec.len);
+ path[n + 1 + filename_vec.len] = '\0';
+
+ //DBG(("[%s]", path));
+
+ // Does it exist?
+ if (!stat(path, &st)) {
+ // Yes it does, break the loop
+ *stp = st;
+ found = 1;
+ break;
+ }
+ }
+
+ // If no index file exists, restore directory path
+ if (!found) {
+ path[n] = '\0';
+ }
+
+ return found;
}
static int parse_range_header(const char *header, int64_t *a, int64_t *b) {
- return sscanf(header, "bytes=%" INT64_FMT "-%" INT64_FMT, a, b);
+ return sscanf(header, "bytes=%" INT64_FMT "-%" INT64_FMT, a, b);
}
static void gmt_time_string(char *buf, size_t buf_len, time_t *t) {
- strftime(buf, buf_len, "%a, %d %b %Y %H:%M:%S GMT", gmtime(t));
+ strftime(buf, buf_len, "%a, %d %b %Y %H:%M:%S GMT", gmtime(t));
}
static void open_file_endpoint(struct connection *conn, const char *path,
- file_stat_t *st) {
- char date[64], lm[64], etag[64], range[64], headers[500];
- const char *msg = "OK", *hdr;
- time_t curtime = time(NULL);
- int64_t r1, r2;
- struct vec mime_vec;
- int n;
-
- conn->endpoint_type = EP_FILE;
- ns_set_close_on_exec(conn->endpoint.fd);
- conn->mg_conn.status_code = 200;
-
- get_mime_type(conn->server, path, &mime_vec);
- conn->cl = st->st_size;
- range[0] = '\0';
-
- // If Range: header specified, act accordingly
- r1 = r2 = 0;
- hdr = mg_get_header(&conn->mg_conn, "Range");
- if (hdr != NULL && (n = parse_range_header(hdr, &r1, &r2)) > 0 &&
- r1 >= 0 && r2 >= 0) {
- conn->mg_conn.status_code = 206;
- conn->cl = n == 2 ? (r2 > conn->cl ? conn->cl : r2) - r1 + 1: conn->cl - r1;
- mg_snprintf(range, sizeof(range), "Content-Range: bytes "
- "%" INT64_FMT "-%" INT64_FMT "/%" INT64_FMT "\r\n",
- r1, r1 + conn->cl - 1, (int64_t) st->st_size);
- msg = "Partial Content";
- lseek(conn->endpoint.fd, r1, SEEK_SET);
- }
-
- // Prepare Etag, Date, Last-Modified headers. Must be in UTC, according to
- // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
- gmt_time_string(date, sizeof(date), &curtime);
- gmt_time_string(lm, sizeof(lm), &st->st_mtime);
- construct_etag(etag, sizeof(etag), st);
-
- n = mg_snprintf(headers, sizeof(headers),
- "HTTP/1.1 %d %s\r\n"
- "Date: %s\r\n"
- "Last-Modified: %s\r\n"
- "Etag: %s\r\n"
- "Content-Type: %.*s\r\n"
- "Content-Length: %" INT64_FMT "\r\n"
- "Connection: %s\r\n"
- "Accept-Ranges: bytes\r\n"
- "%s%s\r\n",
- conn->mg_conn.status_code, msg, date, lm, etag,
- (int) mime_vec.len, mime_vec.ptr, conn->cl,
- suggest_connection_header(&conn->mg_conn),
- range, MONGOOSE_USE_EXTRA_HTTP_HEADERS);
- ns_send(conn->ns_conn, headers, n);
-
- if (!strcmp(conn->mg_conn.request_method, "HEAD")) {
- conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
- close(conn->endpoint.fd);
- conn->endpoint_type = EP_NONE;
- }
+ file_stat_t *st) {
+ char date[64], lm[64], etag[64], range[64], headers[500];
+ const char *msg = "OK", *hdr;
+ time_t curtime = time(NULL);
+ int64_t r1, r2;
+ struct vec mime_vec;
+ int n;
+
+ conn->endpoint_type = EP_FILE;
+ ns_set_close_on_exec(conn->endpoint.fd);
+ conn->mg_conn.status_code = 200;
+
+ get_mime_type(conn->server, path, &mime_vec);
+ conn->cl = st->st_size;
+ range[0] = '\0';
+
+ // If Range: header specified, act accordingly
+ r1 = r2 = 0;
+ hdr = mg_get_header(&conn->mg_conn, "Range");
+ if (hdr != NULL && (n = parse_range_header(hdr, &r1, &r2)) > 0 &&
+ r1 >= 0 && r2 >= 0) {
+ conn->mg_conn.status_code = 206;
+ conn->cl = n == 2 ? (r2 > conn->cl ? conn->cl : r2) - r1 + 1: conn->cl - r1;
+ mg_snprintf(range, sizeof(range), "Content-Range: bytes "
+ "%" INT64_FMT "-%" INT64_FMT "/%" INT64_FMT "\r\n",
+ r1, r1 + conn->cl - 1, (int64_t) st->st_size);
+ msg = "Partial Content";
+ lseek(conn->endpoint.fd, r1, SEEK_SET);
+ }
+
+ // Prepare Etag, Date, Last-Modified headers. Must be in UTC, according to
+ // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
+ gmt_time_string(date, sizeof(date), &curtime);
+ gmt_time_string(lm, sizeof(lm), &st->st_mtime);
+ construct_etag(etag, sizeof(etag), st);
+
+ n = mg_snprintf(headers, sizeof(headers),
+ "HTTP/1.1 %d %s\r\n"
+ "Date: %s\r\n"
+ "Last-Modified: %s\r\n"
+ "Etag: %s\r\n"
+ "Content-Type: %.*s\r\n"
+ "Content-Length: %" INT64_FMT "\r\n"
+ "Connection: %s\r\n"
+ "Accept-Ranges: bytes\r\n"
+ "%s%s\r\n",
+ conn->mg_conn.status_code, msg, date, lm, etag,
+ (int) mime_vec.len, mime_vec.ptr, conn->cl,
+ suggest_connection_header(&conn->mg_conn),
+ range, MONGOOSE_USE_EXTRA_HTTP_HEADERS);
+ ns_send(conn->ns_conn, headers, n);
+
+ if (!strcmp(conn->mg_conn.request_method, "HEAD")) {
+ conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
+ close(conn->endpoint.fd);
+ conn->endpoint_type = EP_NONE;
+ }
}
#endif // MONGOOSE_NO_FILESYSTEM
static void call_request_handler_if_data_is_buffered(struct connection *conn) {
- struct iobuf *loc = &conn->ns_conn->recv_iobuf;
- struct mg_connection *c = &conn->mg_conn;
+ struct iobuf *loc = &conn->ns_conn->recv_iobuf;
+ struct mg_connection *c = &conn->mg_conn;
#ifndef MONGOOSE_NO_WEBSOCKET
- if (conn->mg_conn.is_websocket) {
- do { } while (deliver_websocket_frame(conn));
- } else
+ if (conn->mg_conn.is_websocket) {
+ do { } while (deliver_websocket_frame(conn));
+ } else
#endif
- if ((size_t) loc->len >= c->content_len &&
- call_request_handler(conn) == MG_FALSE) {
- open_local_endpoint(conn, 1);
- }
+ if ((size_t) loc->len >= c->content_len &&
+ call_request_handler(conn) == MG_FALSE) {
+ open_local_endpoint(conn, 1);
+ }
}
#if !defined(MONGOOSE_NO_DIRECTORY_LISTING) || !defined(MONGOOSE_NO_DAV)
#ifdef _WIN32
struct dirent {
- char d_name[MAX_PATH_SIZE];
+ char d_name[MAX_PATH_SIZE];
};
typedef struct DIR {
- HANDLE handle;
- WIN32_FIND_DATAW info;
- struct dirent result;
+ HANDLE handle;
+ WIN32_FIND_DATAW info;
+ struct dirent result;
} DIR;
// Implementation of POSIX opendir/closedir/readdir for Windows.
static DIR *opendir(const char *name) {
- DIR *dir = NULL;
- wchar_t wpath[MAX_PATH_SIZE];
- DWORD attrs;
-
- if (name == NULL) {
- SetLastError(ERROR_BAD_ARGUMENTS);
- } else if ((dir = (DIR *) malloc(sizeof(*dir))) == NULL) {
- SetLastError(ERROR_NOT_ENOUGH_MEMORY);
- } else {
- to_wchar(name, wpath, ARRAY_SIZE(wpath));
- attrs = GetFileAttributesW(wpath);
- if (attrs != 0xFFFFFFFF &&
- ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)) {
- (void) wcscat(wpath, L"\\*");
- dir->handle = FindFirstFileW(wpath, &dir->info);
- dir->result.d_name[0] = '\0';
- } else {
- free(dir);
- dir = NULL;
- }
- }
-
- return dir;
+ DIR *dir = NULL;
+ wchar_t wpath[MAX_PATH_SIZE];
+ DWORD attrs;
+
+ if (name == NULL) {
+ SetLastError(ERROR_BAD_ARGUMENTS);
+ } else if ((dir = (DIR *) malloc(sizeof(*dir))) == NULL) {
+ SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+ } else {
+ to_wchar(name, wpath, ARRAY_SIZE(wpath));
+ attrs = GetFileAttributesW(wpath);
+ if (attrs != 0xFFFFFFFF &&
+ ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)) {
+ (void) wcscat(wpath, L"\\*");
+ dir->handle = FindFirstFileW(wpath, &dir->info);
+ dir->result.d_name[0] = '\0';
+ } else {
+ free(dir);
+ dir = NULL;
+ }
+ }
+
+ return dir;
}
static int closedir(DIR *dir) {
- int result = 0;
+ int result = 0;
- if (dir != NULL) {
- if (dir->handle != INVALID_HANDLE_VALUE)
- result = FindClose(dir->handle) ? 0 : -1;
+ if (dir != NULL) {
+ if (dir->handle != INVALID_HANDLE_VALUE)
+ result = FindClose(dir->handle) ? 0 : -1;
- free(dir);
- } else {
- result = -1;
- SetLastError(ERROR_BAD_ARGUMENTS);
- }
+ free(dir);
+ } else {
+ result = -1;
+ SetLastError(ERROR_BAD_ARGUMENTS);
+ }
- return result;
+ return result;
}
static struct dirent *readdir(DIR *dir) {
- struct dirent *result = 0;
+ struct dirent *result = 0;
- if (dir) {
- if (dir->handle != INVALID_HANDLE_VALUE) {
- result = &dir->result;
- (void) WideCharToMultiByte(CP_UTF8, 0,
- dir->info.cFileName, -1, result->d_name,
- sizeof(result->d_name), NULL, NULL);
+ if (dir) {
+ if (dir->handle != INVALID_HANDLE_VALUE) {
+ result = &dir->result;
+ (void) WideCharToMultiByte(CP_UTF8, 0,
+ dir->info.cFileName, -1, result->d_name,
+ sizeof(result->d_name), NULL, NULL);
- if (!FindNextFileW(dir->handle, &dir->info)) {
- (void) FindClose(dir->handle);
- dir->handle = INVALID_HANDLE_VALUE;
- }
+ if (!FindNextFileW(dir->handle, &dir->info)) {
+ (void) FindClose(dir->handle);
+ dir->handle = INVALID_HANDLE_VALUE;
+ }
- } else {
- SetLastError(ERROR_FILE_NOT_FOUND);
- }
- } else {
- SetLastError(ERROR_BAD_ARGUMENTS);
- }
+ } else {
+ SetLastError(ERROR_FILE_NOT_FOUND);
+ }
+ } else {
+ SetLastError(ERROR_BAD_ARGUMENTS);
+ }
- return result;
+ return result;
}
#endif // _WIN32 POSIX opendir/closedir/readdir implementation
static int scan_directory(struct connection *conn, const char *dir,
- struct dir_entry **arr) {
- char path[MAX_PATH_SIZE];
- struct dir_entry *p;
- struct dirent *dp;
- int arr_size = 0, arr_ind = 0, inc = 100;
- DIR *dirp;
-
- *arr = NULL;
- if ((dirp = (opendir(dir))) == NULL) return 0;
-
- while ((dp = readdir(dirp)) != NULL) {
- // Do not show current dir and hidden files
- if (!strcmp(dp->d_name, ".") ||
- !strcmp(dp->d_name, "..") ||
- must_hide_file(conn, dp->d_name)) {
- continue;
- }
- mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
-
- // Resize the array if nesessary
- if (arr_ind >= arr_size) {
- if ((p = (struct dir_entry *)
- realloc(*arr, (inc + arr_size) * sizeof(**arr))) != NULL) {
- // Memset new chunk to zero, otherwize st_mtime will have garbage which
- // can make strftime() segfault, see
- // http://code.google.com/p/mongoose/issues/detail?id=79
- memset(p + arr_size, 0, sizeof(**arr) * inc);
-
- *arr = p;
- arr_size += inc;
- }
- }
-
- if (arr_ind < arr_size) {
- (*arr)[arr_ind].conn = conn;
- (*arr)[arr_ind].file_name = strdup(dp->d_name);
- stat(path, &(*arr)[arr_ind].st);
- arr_ind++;
- }
- }
- closedir(dirp);
-
- return arr_ind;
+ struct dir_entry **arr) {
+ char path[MAX_PATH_SIZE];
+ struct dir_entry *p;
+ struct dirent *dp;
+ int arr_size = 0, arr_ind = 0, inc = 100;
+ DIR *dirp;
+
+ *arr = NULL;
+ if ((dirp = (opendir(dir))) == NULL) return 0;
+
+ while ((dp = readdir(dirp)) != NULL) {
+ // Do not show current dir and hidden files
+ if (!strcmp(dp->d_name, ".") ||
+ !strcmp(dp->d_name, "..") ||
+ must_hide_file(conn, dp->d_name)) {
+ continue;
+ }
+ mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
+
+ // Resize the array if nesessary
+ if (arr_ind >= arr_size) {
+ if ((p = (struct dir_entry *)
+ realloc(*arr, (inc + arr_size) * sizeof(**arr))) != NULL) {
+ // Memset new chunk to zero, otherwize st_mtime will have garbage which
+ // can make strftime() segfault, see
+ // http://code.google.com/p/mongoose/issues/detail?id=79
+ memset(p + arr_size, 0, sizeof(**arr) * inc);
+
+ *arr = p;
+ arr_size += inc;
+ }
+ }
+
+ if (arr_ind < arr_size) {
+ (*arr)[arr_ind].conn = conn;
+ (*arr)[arr_ind].file_name = strdup(dp->d_name);
+ stat(path, &(*arr)[arr_ind].st);
+ arr_ind++;
+ }
+ }
+ closedir(dirp);
+
+ return arr_ind;
}
int mg_url_encode(const char *src, size_t s_len, char *dst, size_t dst_len) {
- static const char *dont_escape = "._-$,;~()";
- static const char *hex = "0123456789abcdef";
- size_t i = 0, j = 0;
-
- for (i = j = 0; dst_len > 0 && i < s_len && j < dst_len - 1; i++, j++) {
- if (isalnum(* (const unsigned char *) (src + i)) ||
- strchr(dont_escape, * (const unsigned char *) (src + i)) != NULL) {
- dst[j] = src[i];
- } else if (j + 3 < dst_len) {
- dst[j] = '%';
- dst[j + 1] = hex[(* (const unsigned char *) (src + i)) >> 4];
- dst[j + 2] = hex[(* (const unsigned char *) (src + i)) & 0xf];
- j += 2;
- }
- }
-
- dst[j] = '\0';
- return j;
+ static const char *dont_escape = "._-$,;~()";
+ static const char *hex = "0123456789abcdef";
+ size_t i = 0, j = 0;
+
+ for (i = j = 0; dst_len > 0 && i < s_len && j < dst_len - 1; i++, j++) {
+ if (isalnum(* (const unsigned char *) (src + i)) ||
+ strchr(dont_escape, * (const unsigned char *) (src + i)) != NULL) {
+ dst[j] = src[i];
+ } else if (j + 3 < dst_len) {
+ dst[j] = '%';
+ dst[j + 1] = hex[(* (const unsigned char *) (src + i)) >> 4];
+ dst[j + 2] = hex[(* (const unsigned char *) (src + i)) & 0xf];
+ j += 2;
+ }
+ }
+
+ dst[j] = '\0';
+ return j;
}
#endif // !NO_DIRECTORY_LISTING || !MONGOOSE_NO_DAV
#ifndef MONGOOSE_NO_DIRECTORY_LISTING
static void print_dir_entry(const struct dir_entry *de) {
- char size[64], mod[64], href[MAX_PATH_SIZE * 3];
- int64_t fsize = de->st.st_size;
- int is_dir = S_ISDIR(de->st.st_mode);
- const char *slash = is_dir ? "/" : "";
-
- if (is_dir) {
- mg_snprintf(size, sizeof(size), "%s", "[DIRECTORY]");
- } else {
- // We use (signed) cast below because MSVC 6 compiler cannot
- // convert unsigned __int64 to double.
- if (fsize < 1024) {
- mg_snprintf(size, sizeof(size), "%d", (int) fsize);
- } else if (fsize < 0x100000) {
- mg_snprintf(size, sizeof(size), "%.1fk", (double) fsize / 1024.0);
- } else if (fsize < 0x40000000) {
- mg_snprintf(size, sizeof(size), "%.1fM", (double) fsize / 1048576);
- } else {
- mg_snprintf(size, sizeof(size), "%.1fG", (double) fsize / 1073741824);
- }
- }
- strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M", localtime(&de->st.st_mtime));
- mg_url_encode(de->file_name, strlen(de->file_name), href, sizeof(href));
- mg_printf_data(&de->conn->mg_conn,
- "<tr><td><a href=\"%s%s\">%s%s</a></td>"
- "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
- href, slash, de->file_name, slash, mod, size);
+ char size[64], mod[64], href[MAX_PATH_SIZE * 3];
+ int64_t fsize = de->st.st_size;
+ int is_dir = S_ISDIR(de->st.st_mode);
+ const char *slash = is_dir ? "/" : "";
+
+ if (is_dir) {
+ mg_snprintf(size, sizeof(size), "%s", "[DIRECTORY]");
+ } else {
+ // We use (signed) cast below because MSVC 6 compiler cannot
+ // convert unsigned __int64 to double.
+ if (fsize < 1024) {
+ mg_snprintf(size, sizeof(size), "%d", (int) fsize);
+ } else if (fsize < 0x100000) {
+ mg_snprintf(size, sizeof(size), "%.1fk", (double) fsize / 1024.0);
+ } else if (fsize < 0x40000000) {
+ mg_snprintf(size, sizeof(size), "%.1fM", (double) fsize / 1048576);
+ } else {
+ mg_snprintf(size, sizeof(size), "%.1fG", (double) fsize / 1073741824);
+ }
+ }
+ strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M", localtime(&de->st.st_mtime));
+ mg_url_encode(de->file_name, strlen(de->file_name), href, sizeof(href));
+ mg_printf_data(&de->conn->mg_conn,
+ "<tr><td><a href=\"%s%s\">%s%s</a></td>"
+ "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
+ href, slash, de->file_name, slash, mod, size);
}
// Sort directory entries by size, or name, or modification time.
// On windows, __cdecl specification is needed in case if project is built
// with __stdcall convention. qsort always requires __cdels callback.
static int __cdecl compare_dir_entries(const void *p1, const void *p2) {
- const struct dir_entry *a = (const struct dir_entry *) p1,
- *b = (const struct dir_entry *) p2;
- const char *qs = a->conn->mg_conn.query_string ?
- a->conn->mg_conn.query_string : "na";
- int cmp_result = 0;
-
- if (S_ISDIR(a->st.st_mode) && !S_ISDIR(b->st.st_mode)) {
- return -1; // Always put directories on top
- } else if (!S_ISDIR(a->st.st_mode) && S_ISDIR(b->st.st_mode)) {
- return 1; // Always put directories on top
- } else if (*qs == 'n') {
- cmp_result = strcmp(a->file_name, b->file_name);
- } else if (*qs == 's') {
- cmp_result = a->st.st_size == b->st.st_size ? 0 :
- a->st.st_size > b->st.st_size ? 1 : -1;
- } else if (*qs == 'd') {
- cmp_result = a->st.st_mtime == b->st.st_mtime ? 0 :
- a->st.st_mtime > b->st.st_mtime ? 1 : -1;
- }
-
- return qs[1] == 'd' ? -cmp_result : cmp_result;
+ const struct dir_entry *a = (const struct dir_entry *) p1,
+ *b = (const struct dir_entry *) p2;
+ const char *qs = a->conn->mg_conn.query_string ?
+ a->conn->mg_conn.query_string : "na";
+ int cmp_result = 0;
+
+ if (S_ISDIR(a->st.st_mode) && !S_ISDIR(b->st.st_mode)) {
+ return -1; // Always put directories on top
+ } else if (!S_ISDIR(a->st.st_mode) && S_ISDIR(b->st.st_mode)) {
+ return 1; // Always put directories on top
+ } else if (*qs == 'n') {
+ cmp_result = strcmp(a->file_name, b->file_name);
+ } else if (*qs == 's') {
+ cmp_result = a->st.st_size == b->st.st_size ? 0 :
+ a->st.st_size > b->st.st_size ? 1 : -1;
+ } else if (*qs == 'd') {
+ cmp_result = a->st.st_mtime == b->st.st_mtime ? 0 :
+ a->st.st_mtime > b->st.st_mtime ? 1 : -1;
+ }
+
+ return qs[1] == 'd' ? -cmp_result : cmp_result;
}
static void send_directory_listing(struct connection *conn, const char *dir) {
- struct dir_entry *arr = NULL;
- int i, num_entries, sort_direction = conn->mg_conn.query_string != NULL &&
- conn->mg_conn.query_string[1] == 'd' ? 'a' : 'd';
-
- mg_send_header(&conn->mg_conn, "Transfer-Encoding", "chunked");
- mg_send_header(&conn->mg_conn, "Content-Type", "text/html; charset=utf-8");
-
- mg_printf_data(&conn->mg_conn,
- "<html><head><title>Index of %s</title>"
- "<style>th {text-align: left;}</style></head>"
- "<body><h1>Index of %s</h1><pre><table cellpadding=\"0\">"
- "<tr><th><a href=\"?n%c\">Name</a></th>"
- "<th><a href=\"?d%c\">Modified</a></th>"
- "<th><a href=\"?s%c\">Size</a></th></tr>"
- "<tr><td colspan=\"3\"><hr></td></tr>",
- conn->mg_conn.uri, conn->mg_conn.uri,
- sort_direction, sort_direction, sort_direction);
-
- num_entries = scan_directory(conn, dir, &arr);
- qsort(arr, num_entries, sizeof(arr[0]), compare_dir_entries);
- for (i = 0; i < num_entries; i++) {
- print_dir_entry(&arr[i]);
- free(arr[i].file_name);
- }
- free(arr);
-
- write_terminating_chunk(conn);
- close_local_endpoint(conn);
+ struct dir_entry *arr = NULL;
+ int i, num_entries, sort_direction = conn->mg_conn.query_string != NULL &&
+ conn->mg_conn.query_string[1] == 'd' ? 'a' : 'd';
+
+ mg_send_header(&conn->mg_conn, "Transfer-Encoding", "chunked");
+ mg_send_header(&conn->mg_conn, "Content-Type", "text/html; charset=utf-8");
+
+ mg_printf_data(&conn->mg_conn,
+ "<html><head><title>Index of %s</title>"
+ "<style>th {text-align: left;}</style></head>"
+ "<body><h1>Index of %s</h1><pre><table cellpadding=\"0\">"
+ "<tr><th><a href=\"?n%c\">Name</a></th>"
+ "<th><a href=\"?d%c\">Modified</a></th>"
+ "<th><a href=\"?s%c\">Size</a></th></tr>"
+ "<tr><td colspan=\"3\"><hr></td></tr>",
+ conn->mg_conn.uri, conn->mg_conn.uri,
+ sort_direction, sort_direction, sort_direction);
+
+ num_entries = scan_directory(conn, dir, &arr);
+ qsort(arr, num_entries, sizeof(arr[0]), compare_dir_entries);
+ for (i = 0; i < num_entries; i++) {
+ print_dir_entry(&arr[i]);
+ free(arr[i].file_name);
+ }
+ free(arr);
+
+ write_terminating_chunk(conn);
+ close_local_endpoint(conn);
}
#endif // MONGOOSE_NO_DIRECTORY_LISTING
#ifndef MONGOOSE_NO_DAV
static void print_props(struct connection *conn, const char *uri,
- file_stat_t *stp) {
- char mtime[64];
-
- gmt_time_string(mtime, sizeof(mtime), &stp->st_mtime);
- mg_printf(&conn->mg_conn,
- "<d:response>"
- "<d:href>%s</d:href>"
- "<d:propstat>"
- "<d:prop>"
- "<d:resourcetype>%s</d:resourcetype>"
- "<d:getcontentlength>%" INT64_FMT "</d:getcontentlength>"
- "<d:getlastmodified>%s</d:getlastmodified>"
- "</d:prop>"
- "<d:status>HTTP/1.1 200 OK</d:status>"
- "</d:propstat>"
- "</d:response>\n",
- uri, S_ISDIR(stp->st_mode) ? "<d:collection/>" : "",
- (int64_t) stp->st_size, mtime);
+ file_stat_t *stp) {
+ char mtime[64];
+
+ gmt_time_string(mtime, sizeof(mtime), &stp->st_mtime);
+ mg_printf(&conn->mg_conn,
+ "<d:response>"
+ "<d:href>%s</d:href>"
+ "<d:propstat>"
+ "<d:prop>"
+ "<d:resourcetype>%s</d:resourcetype>"
+ "<d:getcontentlength>%" INT64_FMT "</d:getcontentlength>"
+ "<d:getlastmodified>%s</d:getlastmodified>"
+ "</d:prop>"
+ "<d:status>HTTP/1.1 200 OK</d:status>"
+ "</d:propstat>"
+ "</d:response>\n",
+ uri, S_ISDIR(stp->st_mode) ? "<d:collection/>" : "",
+ (int64_t) stp->st_size, mtime);
}
static void handle_propfind(struct connection *conn, const char *path,
- file_stat_t *stp, int exists) {
- static const char header[] = "HTTP/1.1 207 Multi-Status\r\n"
- "Connection: close\r\n"
- "Content-Type: text/xml; charset=utf-8\r\n\r\n"
- "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
- "<d:multistatus xmlns:d='DAV:'>\n";
- static const char footer[] = "</d:multistatus>";
- const char *depth = mg_get_header(&conn->mg_conn, "Depth"),
- *list_dir = conn->server->config_options[ENABLE_DIRECTORY_LISTING];
-
- conn->mg_conn.status_code = 207;
-
- // Print properties for the requested resource itself
- if (!exists) {
- conn->mg_conn.status_code = 404;
- mg_printf(&conn->mg_conn, "%s", "HTTP/1.1 404 Not Found\r\n\r\n");
- } else if (S_ISDIR(stp->st_mode) && mg_strcasecmp(list_dir, "yes") != 0) {
- conn->mg_conn.status_code = 403;
- mg_printf(&conn->mg_conn, "%s",
- "HTTP/1.1 403 Directory Listing Denied\r\n\r\n");
- } else {
- ns_send(conn->ns_conn, header, sizeof(header) - 1);
- print_props(conn, conn->mg_conn.uri, stp);
-
- if (S_ISDIR(stp->st_mode) &&
- (depth == NULL || strcmp(depth, "0") != 0)) {
- struct dir_entry *arr = NULL;
- int i, num_entries = scan_directory(conn, path, &arr);
-
- for (i = 0; i < num_entries; i++) {
- char buf[MAX_PATH_SIZE * 3];
- struct dir_entry *de = &arr[i];
- mg_url_encode(de->file_name, strlen(de->file_name), buf, sizeof(buf));
- print_props(conn, buf, &de->st);
- }
- }
- ns_send(conn->ns_conn, footer, sizeof(footer) - 1);
- }
-
- close_local_endpoint(conn);
+ file_stat_t *stp, int exists) {
+ static const char header[] = "HTTP/1.1 207 Multi-Status\r\n"
+ "Connection: close\r\n"
+ "Content-Type: text/xml; charset=utf-8\r\n\r\n"
+ "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+ "<d:multistatus xmlns:d='DAV:'>\n";
+ static const char footer[] = "</d:multistatus>";
+ const char *depth = mg_get_header(&conn->mg_conn, "Depth"),
+ *list_dir = conn->server->config_options[ENABLE_DIRECTORY_LISTING];
+
+ conn->mg_conn.status_code = 207;
+
+ // Print properties for the requested resource itself
+ if (!exists) {
+ conn->mg_conn.status_code = 404;
+ mg_printf(&conn->mg_conn, "%s", "HTTP/1.1 404 Not Found\r\n\r\n");
+ } else if (S_ISDIR(stp->st_mode) && mg_strcasecmp(list_dir, "yes") != 0) {
+ conn->mg_conn.status_code = 403;
+ mg_printf(&conn->mg_conn, "%s",
+ "HTTP/1.1 403 Directory Listing Denied\r\n\r\n");
+ } else {
+ ns_send(conn->ns_conn, header, sizeof(header) - 1);
+ print_props(conn, conn->mg_conn.uri, stp);
+
+ if (S_ISDIR(stp->st_mode) &&
+ (depth == NULL || strcmp(depth, "0") != 0)) {
+ struct dir_entry *arr = NULL;
+ int i, num_entries = scan_directory(conn, path, &arr);
+
+ for (i = 0; i < num_entries; i++) {
+ char buf[MAX_PATH_SIZE * 3];
+ struct dir_entry *de = &arr[i];
+ mg_url_encode(de->file_name, strlen(de->file_name), buf, sizeof(buf));
+ print_props(conn, buf, &de->st);
+ }
+ }
+ ns_send(conn->ns_conn, footer, sizeof(footer) - 1);
+ }
+
+ close_local_endpoint(conn);
}
static void handle_mkcol(struct connection *conn, const char *path) {
- int status_code = 500;
-
- if (conn->mg_conn.content_len > 0) {
- status_code = 415;
- } else if (!mkdir(path, 0755)) {
- status_code = 201;
- } else if (errno == EEXIST) {
- status_code = 405;
- } else if (errno == EACCES) {
- status_code = 403;
- } else if (errno == ENOENT) {
- status_code = 409;
- }
- send_http_error(conn, status_code, NULL);
+ int status_code = 500;
+
+ if (conn->mg_conn.content_len > 0) {
+ status_code = 415;
+ } else if (!mkdir(path, 0755)) {
+ status_code = 201;
+ } else if (errno == EEXIST) {
+ status_code = 405;
+ } else if (errno == EACCES) {
+ status_code = 403;
+ } else if (errno == ENOENT) {
+ status_code = 409;
+ }
+ send_http_error(conn, status_code, NULL);
}
static int remove_directory(const char *dir) {
- char path[MAX_PATH_SIZE];
- struct dirent *dp;
- file_stat_t st;
- DIR *dirp;
+ char path[MAX_PATH_SIZE];
+ struct dirent *dp;
+ file_stat_t st;
+ DIR *dirp;
- if ((dirp = opendir(dir)) == NULL) return 0;
+ if ((dirp = opendir(dir)) == NULL) return 0;
- while ((dp = readdir(dirp)) != NULL) {
- if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) continue;
- mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
- stat(path, &st);
- if (S_ISDIR(st.st_mode)) {
- remove_directory(path);
- } else {
- remove(path);
- }
- }
- closedir(dirp);
- rmdir(dir);
+ while ((dp = readdir(dirp)) != NULL) {
+ if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) continue;
+ mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
+ stat(path, &st);
+ if (S_ISDIR(st.st_mode)) {
+ remove_directory(path);
+ } else {
+ remove(path);
+ }
+ }
+ closedir(dirp);
+ rmdir(dir);
- return 1;
+ return 1;
}
static void handle_delete(struct connection *conn, const char *path) {
- file_stat_t st;
+ file_stat_t st;
- if (stat(path, &st) != 0) {
- send_http_error(conn, 404, NULL);
- } else if (S_ISDIR(st.st_mode)) {
- remove_directory(path);
- send_http_error(conn, 204, NULL);
- } else if (remove(path) == 0) {
- send_http_error(conn, 204, NULL);
- } else {
- send_http_error(conn, 423, NULL);
- }
+ if (stat(path, &st) != 0) {
+ send_http_error(conn, 404, NULL);
+ } else if (S_ISDIR(st.st_mode)) {
+ remove_directory(path);
+ send_http_error(conn, 204, NULL);
+ } else if (remove(path) == 0) {
+ send_http_error(conn, 204, NULL);
+ } else {
+ send_http_error(conn, 423, NULL);
+ }
}
// For a given PUT path, create all intermediate subdirectories
// for given path. Return 0 if the path itself is a directory,
// or -1 on error, 1 if OK.
static int put_dir(const char *path) {
- char buf[MAX_PATH_SIZE];
- const char *s, *p;
- file_stat_t st;
+ char buf[MAX_PATH_SIZE];
+ const char *s, *p;
+ file_stat_t st;
- // Create intermediate directories if they do not exist
- for (s = p = path + 1; (p = strchr(s, '/')) != NULL; s = ++p) {
- if (p - path >= (int) sizeof(buf)) return -1; // Buffer overflow
- memcpy(buf, path, p - path);
- buf[p - path] = '\0';
- if (stat(buf, &st) != 0 && mkdir(buf, 0755) != 0) return -1;
- if (p[1] == '\0') return 0; // Path is a directory itself
- }
+ // Create intermediate directories if they do not exist
+ for (s = p = path + 1; (p = strchr(s, '/')) != NULL; s = ++p) {
+ if (p - path >= (int) sizeof(buf)) return -1; // Buffer overflow
+ memcpy(buf, path, p - path);
+ buf[p - path] = '\0';
+ if (stat(buf, &st) != 0 && mkdir(buf, 0755) != 0) return -1;
+ if (p[1] == '\0') return 0; // Path is a directory itself
+ }
- return 1;
+ return 1;
}
static void handle_put(struct connection *conn, const char *path) {
- file_stat_t st;
- const char *range, *cl_hdr = mg_get_header(&conn->mg_conn, "Content-Length");
- int64_t r1, r2;
- int rc;
-
- conn->mg_conn.status_code = !stat(path, &st) ? 200 : 201;
- if ((rc = put_dir(path)) == 0) {
- mg_printf(&conn->mg_conn, "HTTP/1.1 %d OK\r\n\r\n",
- conn->mg_conn.status_code);
- close_local_endpoint(conn);
- } else if (rc == -1) {
- send_http_error(conn, 500, "put_dir: %s", strerror(errno));
- } else if (cl_hdr == NULL) {
- send_http_error(conn, 411, NULL);
+ file_stat_t st;
+ const char *range, *cl_hdr = mg_get_header(&conn->mg_conn, "Content-Length");
+ int64_t r1, r2;
+ int rc;
+
+ conn->mg_conn.status_code = !stat(path, &st) ? 200 : 201;
+ if ((rc = put_dir(path)) == 0) {
+ mg_printf(&conn->mg_conn, "HTTP/1.1 %d OK\r\n\r\n",
+ conn->mg_conn.status_code);
+ close_local_endpoint(conn);
+ } else if (rc == -1) {
+ send_http_error(conn, 500, "put_dir: %s", strerror(errno));
+ } else if (cl_hdr == NULL) {
+ send_http_error(conn, 411, NULL);
#ifdef _WIN32
- //On Windows, open() is a macro with 2 params
- } else if ((conn->endpoint.fd =
- open(path, O_RDWR | O_CREAT | O_TRUNC)) < 0) {
+ //On Windows, open() is a macro with 2 params
+ } else if ((conn->endpoint.fd =
+ open(path, O_RDWR | O_CREAT | O_TRUNC)) < 0) {
#else
- } else if ((conn->endpoint.fd =
- open(path, O_RDWR | O_CREAT | O_TRUNC, 0644)) < 0) {
+ } else if ((conn->endpoint.fd =
+ open(path, O_RDWR | O_CREAT | O_TRUNC, 0644)) < 0) {
#endif
- send_http_error(conn, 500, "open(%s): %s", path, strerror(errno));
- } else {
- DBG(("PUT [%s] %zu", path, conn->ns_conn->recv_iobuf.len));
- conn->endpoint_type = EP_PUT;
- ns_set_close_on_exec(conn->endpoint.fd);
- range = mg_get_header(&conn->mg_conn, "Content-Range");
- conn->cl = to64(cl_hdr);
- r1 = r2 = 0;
- if (range != NULL && parse_range_header(range, &r1, &r2) > 0) {
- conn->mg_conn.status_code = 206;
- lseek(conn->endpoint.fd, r1, SEEK_SET);
- conn->cl = r2 > r1 ? r2 - r1 + 1: conn->cl - r1;
- }
- mg_printf(&conn->mg_conn, "HTTP/1.1 %d OK\r\nContent-Length: 0\r\n\r\n",
- conn->mg_conn.status_code);
- }
+ send_http_error(conn, 500, "open(%s): %s", path, strerror(errno));
+ } else {
+ DBG(("PUT [%s] %zu", path, conn->ns_conn->recv_iobuf.len));
+ conn->endpoint_type = EP_PUT;
+ ns_set_close_on_exec(conn->endpoint.fd);
+ range = mg_get_header(&conn->mg_conn, "Content-Range");
+ conn->cl = to64(cl_hdr);
+ r1 = r2 = 0;
+ if (range != NULL && parse_range_header(range, &r1, &r2) > 0) {
+ conn->mg_conn.status_code = 206;
+ lseek(conn->endpoint.fd, r1, SEEK_SET);
+ conn->cl = r2 > r1 ? r2 - r1 + 1: conn->cl - r1;
+ }
+ mg_printf(&conn->mg_conn, "HTTP/1.1 %d OK\r\nContent-Length: 0\r\n\r\n",
+ conn->mg_conn.status_code);
+ }
}
static void forward_put_data(struct connection *conn) {
- struct iobuf *io = &conn->ns_conn->recv_iobuf;
- size_t k = conn->cl < (int64_t) io->len ? conn->cl : io->len; // To write
- int n = write(conn->endpoint.fd, io->buf, k); // Write them!
- if (n > 0) {
- iobuf_remove(io, n);
- conn->cl -= n;
- }
- if (conn->cl <= 0) {
- close_local_endpoint(conn);
- }
+ struct iobuf *io = &conn->ns_conn->recv_iobuf;
+ size_t k = conn->cl < (int64_t) io->len ? conn->cl : io->len; // To write
+ int n = write(conn->endpoint.fd, io->buf, k); // Write them!
+ if (n > 0) {
+ iobuf_remove(io, n);
+ conn->cl -= n;
+ }
+ if (conn->cl <= 0) {
+ close_local_endpoint(conn);
+ }
}
#endif // MONGOOSE_NO_DAV
static void send_options(struct connection *conn) {
- conn->mg_conn.status_code = 200;
- mg_printf(&conn->mg_conn, "%s",
- "HTTP/1.1 200 OK\r\nAllow: GET, POST, HEAD, CONNECT, PUT, "
- "DELETE, OPTIONS, PROPFIND, MKCOL\r\nDAV: 1\r\n\r\n");
- close_local_endpoint(conn);
+ conn->mg_conn.status_code = 200;
+ mg_printf(&conn->mg_conn, "%s",
+ "HTTP/1.1 200 OK\r\nAllow: GET, POST, HEAD, CONNECT, PUT, "
+ "DELETE, OPTIONS, PROPFIND, MKCOL\r\nDAV: 1\r\n\r\n");
+ close_local_endpoint(conn);
}
#ifndef MONGOOSE_NO_AUTH
void mg_send_digest_auth_request(struct mg_connection *c) {
- struct connection *conn = MG_CONN_2_CONN(c);
- c->status_code = 401;
- mg_printf(c,
- "HTTP/1.1 401 Unauthorized\r\n"
- "WWW-Authenticate: Digest qop=\"auth\", "
- "realm=\"%s\", nonce=\"%lu\"\r\n\r\n",
- conn->server->config_options[AUTH_DOMAIN],
- (unsigned long) time(NULL));
- close_local_endpoint(conn);
+ struct connection *conn = MG_CONN_2_CONN(c);
+ c->status_code = 401;
+ mg_printf(c,
+ "HTTP/1.1 401 Unauthorized\r\n"
+ "WWW-Authenticate: Digest qop=\"auth\", "
+ "realm=\"%s\", nonce=\"%lu\"\r\n\r\n",
+ conn->server->config_options[AUTH_DOMAIN],
+ (unsigned long) time(NULL));
+ close_local_endpoint(conn);
}
// Use the global passwords file, if specified by auth_gpass option,
// or search for .htpasswd in the requested directory.
static FILE *open_auth_file(struct connection *conn, const char *path) {
- char name[MAX_PATH_SIZE];
- const char *p, *gpass = conn->server->config_options[GLOBAL_AUTH_FILE];
- file_stat_t st;
- FILE *fp = NULL;
-
- if (gpass != NULL) {
- // Use global passwords file
- fp = fopen(gpass, "r");
- } else if (!stat(path, &st) && S_ISDIR(st.st_mode)) {
- mg_snprintf(name, sizeof(name), "%s%c%s", path, '/', PASSWORDS_FILE_NAME);
- fp = fopen(name, "r");
- } else {
- // Try to find .htpasswd in requested directory.
- if ((p = strrchr(path, '/')) == NULL) p = path;
- mg_snprintf(name, sizeof(name), "%.*s%c%s",
- (int) (p - path), path, '/', PASSWORDS_FILE_NAME);
- fp = fopen(name, "r");
- }
-
- return fp;
+ char name[MAX_PATH_SIZE];
+ const char *p, *gpass = conn->server->config_options[GLOBAL_AUTH_FILE];
+ file_stat_t st;
+ FILE *fp = NULL;
+
+ if (gpass != NULL) {
+ // Use global passwords file
+ fp = fopen(gpass, "r");
+ } else if (!stat(path, &st) && S_ISDIR(st.st_mode)) {
+ mg_snprintf(name, sizeof(name), "%s%c%s", path, '/', PASSWORDS_FILE_NAME);
+ fp = fopen(name, "r");
+ } else {
+ // Try to find .htpasswd in requested directory.
+ if ((p = strrchr(path, '/')) == NULL) p = path;
+ mg_snprintf(name, sizeof(name), "%.*s%c%s",
+ (int) (p - path), path, '/', PASSWORDS_FILE_NAME);
+ fp = fopen(name, "r");
+ }
+
+ return fp;
}
#if !defined(HAVE_MD5) && !defined(MONGOOSE_NO_AUTH)
typedef struct MD5Context {
- uint32_t buf[4];
- uint32_t bits[2];
- unsigned char in[64];
+ uint32_t buf[4];
+ uint32_t bits[2];
+ unsigned char in[64];
} MD5_CTX;
static void byteReverse(unsigned char *buf, unsigned longs) {
- uint32_t t;
+ uint32_t t;
- // Forrest: MD5 expect LITTLE_ENDIAN, swap if BIG_ENDIAN
- if (is_big_endian()) {
- do {
- t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
- ((unsigned) buf[1] << 8 | buf[0]);
- * (uint32_t *) buf = t;
- buf += 4;
- } while (--longs);
- }
+ // Forrest: MD5 expect LITTLE_ENDIAN, swap if BIG_ENDIAN
+ if (is_big_endian()) {
+ do {
+ t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+ ((unsigned) buf[1] << 8 | buf[0]);
+ * (uint32_t *) buf = t;
+ buf += 4;
+ } while (--longs);
+ }
}
#define F1(x, y, z) (z ^ (x & (y ^ z)))
@@ -3538,166 +3537,166 @@ static void byteReverse(unsigned char *buf, unsigned longs) {
#define F4(x, y, z) (y ^ (x | ~z))
#define MD5STEP(f, w, x, y, z, data, s) \
- ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
+ ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
// Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
// initialization constants.
static void MD5Init(MD5_CTX *ctx) {
- ctx->buf[0] = 0x67452301;
- ctx->buf[1] = 0xefcdab89;
- ctx->buf[2] = 0x98badcfe;
- ctx->buf[3] = 0x10325476;
+ ctx->buf[0] = 0x67452301;
+ ctx->buf[1] = 0xefcdab89;
+ ctx->buf[2] = 0x98badcfe;
+ ctx->buf[3] = 0x10325476;
- ctx->bits[0] = 0;
- ctx->bits[1] = 0;
+ ctx->bits[0] = 0;
+ ctx->bits[1] = 0;
}
static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) {
- register uint32_t a, b, c, d;
-
- a = buf[0];
- b = buf[1];
- c = buf[2];
- d = buf[3];
-
- MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
- MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
- MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
- MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
- MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
- MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
- MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
- MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
- MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
- MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
- MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
- MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
- MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
- MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
- MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
- MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
- MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
- MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
- MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
- MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
- MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
- MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
- MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
- MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
- MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
- MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
- MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
- MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
- MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
- MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
- MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
- MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
- MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
- MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
- MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
- MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
- MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
- MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
- MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
- MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
- MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
- MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
- MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
- MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
- MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
- MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
- MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
- MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
- MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
- MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
- MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
- MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
- MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
- MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
- MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
- MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
- MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
- MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
- MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
- MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
- MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
- MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
- MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
- MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
- buf[0] += a;
- buf[1] += b;
- buf[2] += c;
- buf[3] += d;
+ register uint32_t a, b, c, d;
+
+ a = buf[0];
+ b = buf[1];
+ c = buf[2];
+ d = buf[3];
+
+ MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+ MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+ MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+ MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+ MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+ MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+ MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+ MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+ MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+ MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+ MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+ MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+ MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+ MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+ MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+ MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+ MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+ MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+ MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+ MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+ MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+ MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+ MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+ MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+ MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+ MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+ MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+ MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+ MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+ MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+ MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+ MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+ MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+ MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+ MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+ MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+ MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+ MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+ MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+ MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+ MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+ MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+ MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+ MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+ MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+ MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+ MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+ MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+ MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+ MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+ MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+ MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+ MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+ MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+ MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+ MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+ MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+ MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+ MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+ MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+ MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+ MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+ MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+ MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+ buf[0] += a;
+ buf[1] += b;
+ buf[2] += c;
+ buf[3] += d;
}
static void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len) {
- uint32_t t;
+ uint32_t t;
- t = ctx->bits[0];
- if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
- ctx->bits[1]++;
- ctx->bits[1] += len >> 29;
+ t = ctx->bits[0];
+ if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
+ ctx->bits[1]++;
+ ctx->bits[1] += len >> 29;
- t = (t >> 3) & 0x3f;
+ t = (t >> 3) & 0x3f;
- if (t) {
- unsigned char *p = (unsigned char *) ctx->in + t;
+ if (t) {
+ unsigned char *p = (unsigned char *) ctx->in + t;
- t = 64 - t;
- if (len < t) {
- memcpy(p, buf, len);
- return;
- }
- memcpy(p, buf, t);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
- buf += t;
- len -= t;
- }
+ t = 64 - t;
+ if (len < t) {
+ memcpy(p, buf, len);
+ return;
+ }
+ memcpy(p, buf, t);
+ byteReverse(ctx->in, 16);
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ buf += t;
+ len -= t;
+ }
- while (len >= 64) {
- memcpy(ctx->in, buf, 64);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
- buf += 64;
- len -= 64;
- }
+ while (len >= 64) {
+ memcpy(ctx->in, buf, 64);
+ byteReverse(ctx->in, 16);
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ buf += 64;
+ len -= 64;
+ }
- memcpy(ctx->in, buf, len);
+ memcpy(ctx->in, buf, len);
}
static void MD5Final(unsigned char digest[16], MD5_CTX *ctx) {
- unsigned count;
- unsigned char *p;
- uint32_t *a;
-
- count = (ctx->bits[0] >> 3) & 0x3F;
-
- p = ctx->in + count;
- *p++ = 0x80;
- count = 64 - 1 - count;
- if (count < 8) {
- memset(p, 0, count);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
- memset(ctx->in, 0, 56);
- } else {
- memset(p, 0, count - 8);
- }
- byteReverse(ctx->in, 14);
-
- a = (uint32_t *)ctx->in;
- a[14] = ctx->bits[0];
- a[15] = ctx->bits[1];
-
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
- byteReverse((unsigned char *) ctx->buf, 4);
- memcpy(digest, ctx->buf, 16);
- memset((char *) ctx, 0, sizeof(*ctx));
+ unsigned count;
+ unsigned char *p;
+ uint32_t *a;
+
+ count = (ctx->bits[0] >> 3) & 0x3F;
+
+ p = ctx->in + count;
+ *p++ = 0x80;
+ count = 64 - 1 - count;
+ if (count < 8) {
+ memset(p, 0, count);
+ byteReverse(ctx->in, 16);
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ memset(ctx->in, 0, 56);
+ } else {
+ memset(p, 0, count - 8);
+ }
+ byteReverse(ctx->in, 14);
+
+ a = (uint32_t *)ctx->in;
+ a[14] = ctx->bits[0];
+ a[15] = ctx->bits[1];
+
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ byteReverse((unsigned char *) ctx->buf, 4);
+ memcpy(digest, ctx->buf, 16);
+ memset((char *) ctx, 0, sizeof(*ctx));
}
#endif // !HAVE_MD5
@@ -3706,1324 +3705,1323 @@ static void MD5Final(unsigned char digest[16], MD5_CTX *ctx) {
// Stringify binary data. Output buffer must be twice as big as input,
// because each byte takes 2 bytes in string representation
static void bin2str(char *to, const unsigned char *p, size_t len) {
- static const char *hex = "0123456789abcdef";
+ static const char *hex = "0123456789abcdef";
- for (; len--; p++) {
- *to++ = hex[p[0] >> 4];
- *to++ = hex[p[0] & 0x0f];
- }
- *to = '\0';
+ for (; len--; p++) {
+ *to++ = hex[p[0] >> 4];
+ *to++ = hex[p[0] & 0x0f];
+ }
+ *to = '\0';
}
// Return stringified MD5 hash for list of strings. Buffer must be 33 bytes.
char *mg_md5(char buf[33], ...) {
- unsigned char hash[16];
- const char *p;
- va_list ap;
- MD5_CTX ctx;
+ unsigned char hash[16];
+ const char *p;
+ va_list ap;
+ MD5_CTX ctx;
- MD5Init(&ctx);
+ MD5Init(&ctx);
- va_start(ap, buf);
- while ((p = va_arg(ap, const char *)) != NULL) {
- MD5Update(&ctx, (const unsigned char *) p, (unsigned) strlen(p));
- }
- va_end(ap);
+ va_start(ap, buf);
+ while ((p = va_arg(ap, const char *)) != NULL) {
+ MD5Update(&ctx, (const unsigned char *) p, (unsigned) strlen(p));
+ }
+ va_end(ap);
- MD5Final(hash, &ctx);
- bin2str(buf, hash, sizeof(hash));
- return buf;
+ MD5Final(hash, &ctx);
+ bin2str(buf, hash, sizeof(hash));
+ return buf;
}
// Check the user's password, return 1 if OK
static int check_password(const char *method, const char *ha1, const char *uri,
- const char *nonce, const char *nc, const char *cnonce,
- const char *qop, const char *response) {
- char ha2[32 + 1], expected_response[32 + 1];
+ const char *nonce, const char *nc, const char *cnonce,
+ const char *qop, const char *response) {
+ char ha2[32 + 1], expected_response[32 + 1];
#if 0
- // Check for authentication timeout
- if ((unsigned long) time(NULL) - (unsigned long) to64(nonce) > 3600 * 2) {
- return 0;
- }
+ // Check for authentication timeout
+ if ((unsigned long) time(NULL) - (unsigned long) to64(nonce) > 3600 * 2) {
+ return 0;
+ }
#endif
- mg_md5(ha2, method, ":", uri, NULL);
- mg_md5(expected_response, ha1, ":", nonce, ":", nc,
- ":", cnonce, ":", qop, ":", ha2, NULL);
+ mg_md5(ha2, method, ":", uri, NULL);
+ mg_md5(expected_response, ha1, ":", nonce, ":", nc,
+ ":", cnonce, ":", qop, ":", ha2, NULL);
- return mg_strcasecmp(response, expected_response) == 0 ? MG_TRUE : MG_FALSE;
+ return mg_strcasecmp(response, expected_response) == 0 ? MG_TRUE : MG_FALSE;
}
// Authorize against the opened passwords file. Return 1 if authorized.
int mg_authorize_digest(struct mg_connection *c, FILE *fp) {
- struct connection *conn = MG_CONN_2_CONN(c);
- const char *hdr;
- char line[256], f_user[256], ha1[256], f_domain[256], user[100], nonce[100],
- uri[MAX_REQUEST_SIZE], cnonce[100], resp[100], qop[100], nc[100];
-
- if (c == NULL || fp == NULL) return 0;
- if ((hdr = mg_get_header(c, "Authorization")) == NULL ||
- mg_strncasecmp(hdr, "Digest ", 7) != 0) return 0;
- if (!mg_parse_header(hdr, "username", user, sizeof(user))) return 0;
- if (!mg_parse_header(hdr, "cnonce", cnonce, sizeof(cnonce))) return 0;
- if (!mg_parse_header(hdr, "response", resp, sizeof(resp))) return 0;
- if (!mg_parse_header(hdr, "uri", uri, sizeof(uri))) return 0;
- if (!mg_parse_header(hdr, "qop", qop, sizeof(qop))) return 0;
- if (!mg_parse_header(hdr, "nc", nc, sizeof(nc))) return 0;
- if (!mg_parse_header(hdr, "nonce", nonce, sizeof(nonce))) return 0;
-
- while (fgets(line, sizeof(line), fp) != NULL) {
- if (sscanf(line, "%[^:]:%[^:]:%s", f_user, f_domain, ha1) == 3 &&
- !strcmp(user, f_user) &&
- // NOTE(lsm): due to a bug in MSIE, we do not compare URIs
- !strcmp(conn->server->config_options[AUTH_DOMAIN], f_domain))
- return check_password(c->request_method, ha1, uri,
- nonce, nc, cnonce, qop, resp);
- }
- return MG_FALSE;
+ struct connection *conn = MG_CONN_2_CONN(c);
+ const char *hdr;
+ char line[256], f_user[256], ha1[256], f_domain[256], user[100], nonce[100],
+ uri[MAX_REQUEST_SIZE], cnonce[100], resp[100], qop[100], nc[100];
+
+ if (c == NULL || fp == NULL) return 0;
+ if ((hdr = mg_get_header(c, "Authorization")) == NULL ||
+ mg_strncasecmp(hdr, "Digest ", 7) != 0) return 0;
+ if (!mg_parse_header(hdr, "username", user, sizeof(user))) return 0;
+ if (!mg_parse_header(hdr, "cnonce", cnonce, sizeof(cnonce))) return 0;
+ if (!mg_parse_header(hdr, "response", resp, sizeof(resp))) return 0;
+ if (!mg_parse_header(hdr, "uri", uri, sizeof(uri))) return 0;
+ if (!mg_parse_header(hdr, "qop", qop, sizeof(qop))) return 0;
+ if (!mg_parse_header(hdr, "nc", nc, sizeof(nc))) return 0;
+ if (!mg_parse_header(hdr, "nonce", nonce, sizeof(nonce))) return 0;
+
+ while (fgets(line, sizeof(line), fp) != NULL) {
+ if (sscanf(line, "%[^:]:%[^:]:%s", f_user, f_domain, ha1) == 3 &&
+ !strcmp(user, f_user) &&
+ // NOTE(lsm): due to a bug in MSIE, we do not compare URIs
+ !strcmp(conn->server->config_options[AUTH_DOMAIN], f_domain))
+ return check_password(c->request_method, ha1, uri,
+ nonce, nc, cnonce, qop, resp);
+ }
+ return MG_FALSE;
}
// Return 1 if request is authorised, 0 otherwise.
static int is_authorized(struct connection *conn, const char *path) {
- FILE *fp;
- int authorized = MG_TRUE;
+ FILE *fp;
+ int authorized = MG_TRUE;
- if ((fp = open_auth_file(conn, path)) != NULL) {
- authorized = mg_authorize_digest(&conn->mg_conn, fp);
- fclose(fp);
- }
+ if ((fp = open_auth_file(conn, path)) != NULL) {
+ authorized = mg_authorize_digest(&conn->mg_conn, fp);
+ fclose(fp);
+ }
- return authorized;
+ return authorized;
}
static int is_authorized_for_dav(struct connection *conn) {
- const char *auth_file = conn->server->config_options[DAV_AUTH_FILE];
- const char *method = conn->mg_conn.request_method;
- FILE *fp;
- int authorized = MG_FALSE;
+ const char *auth_file = conn->server->config_options[DAV_AUTH_FILE];
+ const char *method = conn->mg_conn.request_method;
+ FILE *fp;
+ int authorized = MG_FALSE;
- // If dav_auth_file is not set, allow non-authorized PROPFIND
- if (method != NULL && !strcmp(method, "PROPFIND") && auth_file == NULL) {
- authorized = MG_TRUE;
- } else if (auth_file != NULL && (fp = fopen(auth_file, "r")) != NULL) {
- authorized = mg_authorize_digest(&conn->mg_conn, fp);
- fclose(fp);
- }
+ // If dav_auth_file is not set, allow non-authorized PROPFIND
+ if (method != NULL && !strcmp(method, "PROPFIND") && auth_file == NULL) {
+ authorized = MG_TRUE;
+ } else if (auth_file != NULL && (fp = fopen(auth_file, "r")) != NULL) {
+ authorized = mg_authorize_digest(&conn->mg_conn, fp);
+ fclose(fp);
+ }
- return authorized;
+ return authorized;
}
static int is_dav_request(const struct connection *conn) {
- const char *s = conn->mg_conn.request_method;
- return !strcmp(s, "PUT") || !strcmp(s, "DELETE") ||
- !strcmp(s, "MKCOL") || !strcmp(s, "PROPFIND");
+ const char *s = conn->mg_conn.request_method;
+ return !strcmp(s, "PUT") || !strcmp(s, "DELETE") ||
+ !strcmp(s, "MKCOL") || !strcmp(s, "PROPFIND");
}
#endif // MONGOOSE_NO_AUTH
static int parse_header(const char *str, int str_len, const char *var_name,
- char *buf, size_t buf_size) {
- int ch = ' ', len = 0, n = strlen(var_name);
- const char *p, *end = str + str_len, *s = NULL;
-
- if (buf != NULL && buf_size > 0) buf[0] = '\0';
-
- // Find where variable starts
- for (s = str; s != NULL && s + n < end; s++) {
- if ((s == str || s[-1] == ' ' || s[-1] == ',') && s[n] == '=' &&
- !memcmp(s, var_name, n)) break;
- }
-
- if (s != NULL && &s[n + 1] < end) {
- s += n + 1;
- if (*s == '"' || *s == '\'') ch = *s++;
- p = s;
- while (p < end && p[0] != ch && p[0] != ',' && len < (int) buf_size) {
- if (p[0] == '\\' && p[1] == ch) p++;
- buf[len++] = *p++;
- }
- if (len >= (int) buf_size || (ch != ' ' && *p != ch)) {
- len = 0;
- } else {
- if (len > 0 && s[len - 1] == ',') len--;
- if (len > 0 && s[len - 1] == ';') len--;
- buf[len] = '\0';
- }
- }
-
- return len;
+ char *buf, size_t buf_size) {
+ int ch = ' ', len = 0, n = strlen(var_name);
+ const char *p, *end = str + str_len, *s = NULL;
+
+ if (buf != NULL && buf_size > 0) buf[0] = '\0';
+
+ // Find where variable starts
+ for (s = str; s != NULL && s + n < end; s++) {
+ if ((s == str || s[-1] == ' ' || s[-1] == ',') && s[n] == '=' &&
+ !memcmp(s, var_name, n)) break;
+ }
+
+ if (s != NULL && &s[n + 1] < end) {
+ s += n + 1;
+ if (*s == '"' || *s == '\'') ch = *s++;
+ p = s;
+ while (p < end && p[0] != ch && p[0] != ',' && len < (int) buf_size) {
+ if (p[0] == '\\' && p[1] == ch) p++;
+ buf[len++] = *p++;
+ }
+ if (len >= (int) buf_size || (ch != ' ' && *p != ch)) {
+ len = 0;
+ } else {
+ if (len > 0 && s[len - 1] == ',') len--;
+ if (len > 0 && s[len - 1] == ';') len--;
+ buf[len] = '\0';
+ }
+ }
+
+ return len;
}
int mg_parse_header(const char *s, const char *var_name, char *buf,
- size_t buf_size) {
- return parse_header(s, s == NULL ? 0 : strlen(s), var_name, buf, buf_size);
+ size_t buf_size) {
+ return parse_header(s, s == NULL ? 0 : strlen(s), var_name, buf, buf_size);
}
#ifndef MONGOOSE_NO_SSI
static void send_ssi_file(struct mg_connection *, const char *, FILE *, int);
static void send_file_data(struct mg_connection *conn, FILE *fp) {
- char buf[IOBUF_SIZE];
- int n;
- while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
- mg_write(conn, buf, n);
- }
+ char buf[IOBUF_SIZE];
+ int n;
+ while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
+ mg_write(conn, buf, n);
+ }
}
static void do_ssi_include(struct mg_connection *conn, const char *ssi,
- char *tag, int include_level) {
- char file_name[IOBUF_SIZE], path[MAX_PATH_SIZE], *p;
- char **opts = (MG_CONN_2_CONN(conn))->server->config_options;
- FILE *fp;
-
- // sscanf() is safe here, since send_ssi_file() also uses buffer
- // of size MG_BUF_LEN to get the tag. So strlen(tag) is always < MG_BUF_LEN.
- if (sscanf(tag, " virtual=\"%[^\"]\"", file_name) == 1) {
- // File name is relative to the webserver root
- mg_snprintf(path, sizeof(path), "%s%c%s",
- opts[DOCUMENT_ROOT], '/', file_name);
- } else if (sscanf(tag, " abspath=\"%[^\"]\"", file_name) == 1) {
- // File name is relative to the webserver working directory
- // or it is absolute system path
- mg_snprintf(path, sizeof(path), "%s", file_name);
- } else if (sscanf(tag, " file=\"%[^\"]\"", file_name) == 1 ||
- sscanf(tag, " \"%[^\"]\"", file_name) == 1) {
- // File name is relative to the currect document
- mg_snprintf(path, sizeof(path), "%s", ssi);
- if ((p = strrchr(path, '/')) != NULL) {
- p[1] = '\0';
- }
- mg_snprintf(path + strlen(path), sizeof(path) - strlen(path), "%s",
- file_name);
- } else {
- mg_printf(conn, "Bad SSI #include: [%s]", tag);
- return;
- }
-
- if ((fp = fopen(path, "rb")) == NULL) {
- mg_printf(conn, "Cannot open SSI #include: [%s]: fopen(%s): %s",
- tag, path, strerror(errno));
- } else {
- ns_set_close_on_exec(fileno(fp));
- if (mg_match_prefix(opts[SSI_PATTERN], strlen(opts[SSI_PATTERN]),
- path) > 0) {
- send_ssi_file(conn, path, fp, include_level + 1);
- } else {
- send_file_data(conn, fp);
- }
- fclose(fp);
- }
+ char *tag, int include_level) {
+ char file_name[IOBUF_SIZE], path[MAX_PATH_SIZE], *p;
+ char **opts = (MG_CONN_2_CONN(conn))->server->config_options;
+ FILE *fp;
+
+ // sscanf() is safe here, since send_ssi_file() also uses buffer
+ // of size MG_BUF_LEN to get the tag. So strlen(tag) is always < MG_BUF_LEN.
+ if (sscanf(tag, " virtual=\"%[^\"]\"", file_name) == 1) {
+ // File name is relative to the webserver root
+ mg_snprintf(path, sizeof(path), "%s%c%s",
+ opts[DOCUMENT_ROOT], '/', file_name);
+ } else if (sscanf(tag, " abspath=\"%[^\"]\"", file_name) == 1) {
+ // File name is relative to the webserver working directory
+ // or it is absolute system path
+ mg_snprintf(path, sizeof(path), "%s", file_name);
+ } else if (sscanf(tag, " file=\"%[^\"]\"", file_name) == 1 ||
+ sscanf(tag, " \"%[^\"]\"", file_name) == 1) {
+ // File name is relative to the currect document
+ mg_snprintf(path, sizeof(path), "%s", ssi);
+ if ((p = strrchr(path, '/')) != NULL) {
+ p[1] = '\0';
+ }
+ mg_snprintf(path + strlen(path), sizeof(path) - strlen(path), "%s",
+ file_name);
+ } else {
+ mg_printf(conn, "Bad SSI #include: [%s]", tag);
+ return;
+ }
+
+ if ((fp = fopen(path, "rb")) == NULL) {
+ mg_printf(conn, "Cannot open SSI #include: [%s]: fopen(%s): %s",
+ tag, path, strerror(errno));
+ } else {
+ ns_set_close_on_exec(fileno(fp));
+ if (mg_match_prefix(opts[SSI_PATTERN], strlen(opts[SSI_PATTERN]),
+ path) > 0) {
+ send_ssi_file(conn, path, fp, include_level + 1);
+ } else {
+ send_file_data(conn, fp);
+ }
+ fclose(fp);
+ }
}
#ifndef MONGOOSE_NO_POPEN
static void do_ssi_exec(struct mg_connection *conn, char *tag) {
- char cmd[IOBUF_SIZE];
- FILE *fp;
-
- if (sscanf(tag, " \"%[^\"]\"", cmd) != 1) {
- mg_printf(conn, "Bad SSI #exec: [%s]", tag);
- } else if ((fp = popen(cmd, "r")) == NULL) {
- mg_printf(conn, "Cannot SSI #exec: [%s]: %s", cmd, strerror(errno));
- } else {
- send_file_data(conn, fp);
- pclose(fp);
- }
+ char cmd[IOBUF_SIZE];
+ FILE *fp;
+
+ if (sscanf(tag, " \"%[^\"]\"", cmd) != 1) {
+ mg_printf(conn, "Bad SSI #exec: [%s]", tag);
+ } else if ((fp = popen(cmd, "r")) == NULL) {
+ mg_printf(conn, "Cannot SSI #exec: [%s]: %s", cmd, strerror(errno));
+ } else {
+ send_file_data(conn, fp);
+ pclose(fp);
+ }
}
#endif // !MONGOOSE_NO_POPEN
static void send_ssi_file(struct mg_connection *conn, const char *path,
- FILE *fp, int include_level) {
- char buf[IOBUF_SIZE];
- int ch, offset, len, in_ssi_tag;
-
- if (include_level > 10) {
- mg_printf(conn, "SSI #include level is too deep (%s)", path);
- return;
- }
-
- in_ssi_tag = len = offset = 0;
- while ((ch = fgetc(fp)) != EOF) {
- if (in_ssi_tag && ch == '>') {
- in_ssi_tag = 0;
- buf[len++] = (char) ch;
- buf[len] = '\0';
- assert(len <= (int) sizeof(buf));
- if (len < 6 || memcmp(buf, "<!--#", 5) != 0) {
- // Not an SSI tag, pass it
- (void) mg_write(conn, buf, (size_t) len);
- } else {
- if (!memcmp(buf + 5, "include", 7)) {
- do_ssi_include(conn, path, buf + 12, include_level);
+ FILE *fp, int include_level) {
+ char buf[IOBUF_SIZE];
+ int ch, offset, len, in_ssi_tag;
+
+ if (include_level > 10) {
+ mg_printf(conn, "SSI #include level is too deep (%s)", path);
+ return;
+ }
+
+ in_ssi_tag = len = offset = 0;
+ while ((ch = fgetc(fp)) != EOF) {
+ if (in_ssi_tag && ch == '>') {
+ in_ssi_tag = 0;
+ buf[len++] = (char) ch;
+ buf[len] = '\0';
+ assert(len <= (int) sizeof(buf));
+ if (len < 6 || memcmp(buf, "<!--#", 5) != 0) {
+ // Not an SSI tag, pass it
+ (void) mg_write(conn, buf, (size_t) len);
+ } else {
+ if (!memcmp(buf + 5, "include", 7)) {
+ do_ssi_include(conn, path, buf + 12, include_level);
#if !defined(MONGOOSE_NO_POPEN)
- } else if (!memcmp(buf + 5, "exec", 4)) {
- do_ssi_exec(conn, buf + 9);
+ } else if (!memcmp(buf + 5, "exec", 4)) {
+ do_ssi_exec(conn, buf + 9);
#endif // !NO_POPEN
- } else {
- mg_printf(conn, "%s: unknown SSI " "command: \"%s\"", path, buf);
- }
- }
- len = 0;
- } else if (in_ssi_tag) {
- if (len == 5 && memcmp(buf, "<!--#", 5) != 0) {
- // Not an SSI tag
- in_ssi_tag = 0;
- } else if (len == (int) sizeof(buf) - 2) {
- mg_printf(conn, "%s: SSI tag is too large", path);
- len = 0;
- }
- buf[len++] = ch & 0xff;
- } else if (ch == '<') {
- in_ssi_tag = 1;
- if (len > 0) {
- mg_write(conn, buf, (size_t) len);
- }
- len = 0;
- buf[len++] = ch & 0xff;
- } else {
- buf[len++] = ch & 0xff;
- if (len == (int) sizeof(buf)) {
- mg_write(conn, buf, (size_t) len);
- len = 0;
- }
- }
- }
-
- // Send the rest of buffered data
- if (len > 0) {
- mg_write(conn, buf, (size_t) len);
- }
+ } else {
+ mg_printf(conn, "%s: unknown SSI " "command: \"%s\"", path, buf);
+ }
+ }
+ len = 0;
+ } else if (in_ssi_tag) {
+ if (len == 5 && memcmp(buf, "<!--#", 5) != 0) {
+ // Not an SSI tag
+ in_ssi_tag = 0;
+ } else if (len == (int) sizeof(buf) - 2) {
+ mg_printf(conn, "%s: SSI tag is too large", path);
+ len = 0;
+ }
+ buf[len++] = ch & 0xff;
+ } else if (ch == '<') {
+ in_ssi_tag = 1;
+ if (len > 0) {
+ mg_write(conn, buf, (size_t) len);
+ }
+ len = 0;
+ buf[len++] = ch & 0xff;
+ } else {
+ buf[len++] = ch & 0xff;
+ if (len == (int) sizeof(buf)) {
+ mg_write(conn, buf, (size_t) len);
+ len = 0;
+ }
+ }
+ }
+
+ // Send the rest of buffered data
+ if (len > 0) {
+ mg_write(conn, buf, (size_t) len);
+ }
}
static void handle_ssi_request(struct connection *conn, const char *path) {
- FILE *fp;
- struct vec mime_vec;
-
- if ((fp = fopen(path, "rb")) == NULL) {
- send_http_error(conn, 500, "fopen(%s): %s", path, strerror(errno));
- } else {
- ns_set_close_on_exec(fileno(fp));
- get_mime_type(conn->server, path, &mime_vec);
- conn->mg_conn.status_code = 200;
- mg_printf(&conn->mg_conn,
- "HTTP/1.1 %d OK\r\n"
- "Content-Type: %.*s\r\n"
- "Connection: close\r\n\r\n",
- conn->mg_conn.status_code, (int) mime_vec.len, mime_vec.ptr);
- send_ssi_file(&conn->mg_conn, path, fp, 0);
- fclose(fp);
- close_local_endpoint(conn);
- }
+ FILE *fp;
+ struct vec mime_vec;
+
+ if ((fp = fopen(path, "rb")) == NULL) {
+ send_http_error(conn, 500, "fopen(%s): %s", path, strerror(errno));
+ } else {
+ ns_set_close_on_exec(fileno(fp));
+ get_mime_type(conn->server, path, &mime_vec);
+ conn->mg_conn.status_code = 200;
+ mg_printf(&conn->mg_conn,
+ "HTTP/1.1 %d OK\r\n"
+ "Content-Type: %.*s\r\n"
+ "Connection: close\r\n\r\n",
+ conn->mg_conn.status_code, (int) mime_vec.len, mime_vec.ptr);
+ send_ssi_file(&conn->mg_conn, path, fp, 0);
+ fclose(fp);
+ close_local_endpoint(conn);
+ }
}
#endif
static void proxy_request(struct ns_connection *pc, struct mg_connection *c) {
- int i, sent_close_header = 0;
-
- ns_printf(pc, "%s %s HTTP/%s\r\n", c->request_method, c->uri,
- c->http_version);
- for (i = 0; i < c->num_headers; i++) {
- if (mg_strcasecmp(c->http_headers[i].name, "Connection") == 0) {
- // Force connection close, cause we don't parse proxy replies
- // therefore we don't know message boundaries
- //ns_printf(pc, "%s: %s\r\n", "Connection", "close");
- sent_close_header = 1;
- //} else {
- }
- ns_printf(pc, "%s: %s\r\n", c->http_headers[i].name,
- c->http_headers[i].value);
- }
- if (!sent_close_header) {
- ns_printf(pc, "%s: %s\r\n", "Connection", "close");
- }
- ns_printf(pc, "%s", "\r\n");
- ns_send(pc, c->content, c->content_len);
+ int i, sent_close_header = 0;
+
+ ns_printf(pc, "%s %s HTTP/%s\r\n", c->request_method, c->uri,
+ c->http_version);
+ for (i = 0; i < c->num_headers; i++) {
+ if (mg_strcasecmp(c->http_headers[i].name, "Connection") == 0) {
+ // Force connection close, cause we don't parse proxy replies
+ // therefore we don't know message boundaries
+ //ns_printf(pc, "%s: %s\r\n", "Connection", "close");
+ sent_close_header = 1;
+ //} else {
+ }
+ ns_printf(pc, "%s: %s\r\n", c->http_headers[i].name,
+ c->http_headers[i].value);
+ }
+ if (!sent_close_header) {
+ ns_printf(pc, "%s: %s\r\n", "Connection", "close");
+ }
+ ns_printf(pc, "%s", "\r\n");
+ ns_send(pc, c->content, c->content_len);
}
#ifdef NS_ENABLE_SSL
int mg_terminate_ssl(struct mg_connection *c, const char *cert) {
- static const char ok[] = "HTTP/1.0 200 OK\r\n\r\n";
- struct connection *conn = MG_CONN_2_CONN(c);
- int n;
- SSL_CTX *ctx;
-
- DBG(("%p MITM", conn));
- SSL_library_init();
- if ((ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) return 0;
-
- SSL_CTX_use_certificate_file(ctx, cert, 1);
- SSL_CTX_use_PrivateKey_file(ctx, cert, 1);
- SSL_CTX_use_certificate_chain_file(ctx, cert);
-
- // When clear-text reply is pushed to client, switch to SSL mode.
- n = send(conn->ns_conn->sock, ok, sizeof(ok) - 1, 0);
- DBG(("%p %lu %d SEND", c, sizeof(ok) - 1, n));
- conn->ns_conn->send_iobuf.len = 0;
- conn->endpoint_type = EP_USER; // To keep-alive in close_local_endpoint()
- close_local_endpoint(conn); // Clean up current CONNECT request
- if ((conn->ns_conn->ssl = SSL_new(ctx)) != NULL) {
- SSL_set_fd(conn->ns_conn->ssl, conn->ns_conn->sock);
- }
- SSL_CTX_free(ctx);
- return 1;
+ static const char ok[] = "HTTP/1.0 200 OK\r\n\r\n";
+ struct connection *conn = MG_CONN_2_CONN(c);
+ int n;
+ SSL_CTX *ctx;
+
+ DBG(("%p MITM", conn));
+ SSL_library_init();
+ if ((ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) return 0;
+
+ SSL_CTX_use_certificate_file(ctx, cert, 1);
+ SSL_CTX_use_PrivateKey_file(ctx, cert, 1);
+ SSL_CTX_use_certificate_chain_file(ctx, cert);
+
+ // When clear-text reply is pushed to client, switch to SSL mode.
+ n = send(conn->ns_conn->sock, ok, sizeof(ok) - 1, 0);
+ DBG(("%p %lu %d SEND", c, sizeof(ok) - 1, n));
+ conn->ns_conn->send_iobuf.len = 0;
+ conn->endpoint_type = EP_USER; // To keep-alive in close_local_endpoint()
+ close_local_endpoint(conn); // Clean up current CONNECT request
+ if ((conn->ns_conn->ssl = SSL_new(ctx)) != NULL) {
+ SSL_set_fd(conn->ns_conn->ssl, conn->ns_conn->sock);
+ }
+ SSL_CTX_free(ctx);
+ return 1;
}
#endif
static void proxify_connection(struct connection *conn) {
- char proto[10], host[500], cert[500];
- unsigned short port = 80;
- struct mg_connection *c = &conn->mg_conn;
- struct ns_server *server = &conn->server->ns_server;
- struct ns_connection *pc = NULL;
- int n = 0;
- const char *url = c->uri;
-
- proto[0] = host[0] = cert[0] = '\0';
- if (sscanf(url, "%499[^: ]:%hu%n", host, &port, &n) != 2 &&
- sscanf(url, "%9[a-z]://%499[^: ]:%hu%n", proto, host, &port, &n) != 3 &&
- sscanf(url, "%9[a-z]://%499[^/ ]%n", proto, host, &n) != 2) {
- n = 0;
- }
+ char proto[10], host[500], cert[500];
+ unsigned short port = 80;
+ struct mg_connection *c = &conn->mg_conn;
+ struct ns_server *server = &conn->server->ns_server;
+ struct ns_connection *pc = NULL;
+ int n = 0;
+ const char *url = c->uri;
+
+ proto[0] = host[0] = cert[0] = '\0';
+ if (sscanf(url, "%499[^: ]:%hu%n", host, &port, &n) != 2 &&
+ sscanf(url, "%9[a-z]://%499[^: ]:%hu%n", proto, host, &port, &n) != 3 &&
+ sscanf(url, "%9[a-z]://%499[^/ ]%n", proto, host, &n) != 2) {
+ n = 0;
+ }
#ifdef NS_ENABLE_SSL
- // Find out whether we should be in the MITM mode
- {
- const char *certs = conn->server->config_options[SSL_MITM_CERTS];
- int host_len = strlen(host);
- struct vec a, b;
-
- while (conn->ns_conn->ssl == NULL && port != 80 &&
- (certs = next_option(certs, &a, &b)) != NULL) {
- if (a.len != host_len || mg_strncasecmp(a.ptr, host, a.len)) continue;
- snprintf(cert, sizeof(cert), "%.*s", b.len, b.ptr);
- mg_terminate_ssl(&conn->mg_conn, cert);
- return;
- }
- }
+ // Find out whether we should be in the MITM mode
+ {
+ const char *certs = conn->server->config_options[SSL_MITM_CERTS];
+ int host_len = strlen(host);
+ struct vec a, b;
+
+ while (conn->ns_conn->ssl == NULL && port != 80 &&
+ (certs = next_option(certs, &a, &b)) != NULL) {
+ if (a.len != host_len || mg_strncasecmp(a.ptr, host, a.len)) continue;
+ snprintf(cert, sizeof(cert), "%.*s", b.len, b.ptr);
+ mg_terminate_ssl(&conn->mg_conn, cert);
+ return;
+ }
+ }
#endif
- if (n > 0 &&
- (pc = ns_connect(server, host, port, conn->ns_conn->ssl != NULL,
- conn)) != NULL) {
- // Interlink two connections
- pc->flags |= MG_PROXY_CONN;
- conn->endpoint_type = EP_PROXY;
- conn->endpoint.nc = pc;
- DBG(("%p [%s] -> %p %p", conn, c->uri, pc, conn->ns_conn->ssl));
-
- if (strcmp(c->request_method, "CONNECT") == 0) {
- // For CONNECT request, reply with 200 OK. Tunnel is established.
- mg_printf(c, "%s", "HTTP/1.1 200 OK\r\n\r\n");
- conn->request_len = 0;
- free(conn->request);
- conn->request = NULL;
- } else {
- // For other methods, forward the request to the target host.
- c->uri += n;
- proxy_request(pc, c);
- }
- } else {
- conn->ns_conn->flags |= NSF_CLOSE_IMMEDIATELY;
- }
+ if (n > 0 &&
+ (pc = ns_connect(server, host, port, conn->ns_conn->ssl != NULL,
+ conn)) != NULL) {
+ // Interlink two connections
+ pc->flags |= MG_PROXY_CONN;
+ conn->endpoint_type = EP_PROXY;
+ conn->endpoint.nc = pc;
+ DBG(("%p [%s] -> %p %p", conn, c->uri, pc, conn->ns_conn->ssl));
+
+ if (strcmp(c->request_method, "CONNECT") == 0) {
+ // For CONNECT request, reply with 200 OK. Tunnel is established.
+ mg_printf(c, "%s", "HTTP/1.1 200 OK\r\n\r\n");
+ conn->request_len = 0;
+ free(conn->request);
+ conn->request = NULL;
+ } else {
+ // For other methods, forward the request to the target host.
+ c->uri += n;
+ proxy_request(pc, c);
+ }
+ } else {
+ conn->ns_conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
}
#ifndef MONGOOSE_NO_FILESYSTEM
void mg_send_file(struct mg_connection *c, const char *file_name) {
- struct connection *conn = MG_CONN_2_CONN(c);
- file_stat_t st;
- char path[MAX_PATH_SIZE];
- int exists = 0, is_directory = 0;
+ struct connection *conn = MG_CONN_2_CONN(c);
+ file_stat_t st;
+ char path[MAX_PATH_SIZE];
+ int exists = 0, is_directory = 0;
#ifndef MONGOOSE_NO_CGI
- const char *cgi_pat = conn->server->config_options[CGI_PATTERN];
+ const char *cgi_pat = conn->server->config_options[CGI_PATTERN];
#else
- const char *cgi_pat = DEFAULT_CGI_PATTERN;
+ const char *cgi_pat = DEFAULT_CGI_PATTERN;
#endif
#ifndef MONGOOSE_NO_DIRECTORY_LISTING
- const char *dir_lst = conn->server->config_options[ENABLE_DIRECTORY_LISTING];
+ const char *dir_lst = conn->server->config_options[ENABLE_DIRECTORY_LISTING];
#else
- const char *dir_lst = "yes";
+ const char *dir_lst = "yes";
#endif
- mg_snprintf(path, sizeof(path), "%s", file_name);
- exists = stat(path, &st) == 0;
- is_directory = S_ISDIR(st.st_mode);
-
- if (!exists || must_hide_file(conn, path)) {
- send_http_error(conn, 404, NULL);
- } else if (is_directory &&
- conn->mg_conn.uri[strlen(conn->mg_conn.uri) - 1] != '/') {
- conn->mg_conn.status_code = 301;
- mg_printf(&conn->mg_conn, "HTTP/1.1 301 Moved Permanently\r\n"
- "Location: %s/\r\n\r\n", conn->mg_conn.uri);
- close_local_endpoint(conn);
- } else if (is_directory && !find_index_file(conn, path, sizeof(path), &st)) {
- if (!mg_strcasecmp(dir_lst, "yes")) {
+ mg_snprintf(path, sizeof(path), "%s", file_name);
+ exists = stat(path, &st) == 0;
+ is_directory = S_ISDIR(st.st_mode);
+
+ if (!exists || must_hide_file(conn, path)) {
+ send_http_error(conn, 404, NULL);
+ } else if (is_directory &&
+ conn->mg_conn.uri[strlen(conn->mg_conn.uri) - 1] != '/') {
+ conn->mg_conn.status_code = 301;
+ mg_printf(&conn->mg_conn, "HTTP/1.1 301 Moved Permanently\r\n"
+ "Location: %s/\r\n\r\n", conn->mg_conn.uri);
+ close_local_endpoint(conn);
+ } else if (is_directory && !find_index_file(conn, path, sizeof(path), &st)) {
+ if (!mg_strcasecmp(dir_lst, "yes")) {
#ifndef MONGOOSE_NO_DIRECTORY_LISTING
- send_directory_listing(conn, path);
+ send_directory_listing(conn, path);
#else
- send_http_error(conn, 501, NULL);
+ send_http_error(conn, 501, NULL);
#endif
- } else {
- send_http_error(conn, 403, NULL);
- }
- } else if (mg_match_prefix(cgi_pat, strlen(cgi_pat), path) > 0) {
+ } else {
+ send_http_error(conn, 403, NULL);
+ }
+ } else if (mg_match_prefix(cgi_pat, strlen(cgi_pat), path) > 0) {
#if !defined(MONGOOSE_NO_CGI)
- open_cgi_endpoint(conn, path);
+ open_cgi_endpoint(conn, path);
#else
- send_http_error(conn, 501, NULL);
+ send_http_error(conn, 501, NULL);
#endif // !MONGOOSE_NO_CGI
#ifndef MONGOOSE_NO_SSI
- } else if (mg_match_prefix(conn->server->config_options[SSI_PATTERN],
- strlen(conn->server->config_options[SSI_PATTERN]),
- path) > 0) {
- handle_ssi_request(conn, path);
+ } else if (mg_match_prefix(conn->server->config_options[SSI_PATTERN],
+ strlen(conn->server->config_options[SSI_PATTERN]),
+ path) > 0) {
+ handle_ssi_request(conn, path);
#endif
- } else if (is_not_modified(conn, &st)) {
- send_http_error(conn, 304, NULL);
- } else if ((conn->endpoint.fd = open(path, O_RDONLY | O_BINARY)) != -1) {
- // O_BINARY is required for Windows, otherwise in default text mode
- // two bytes \r\n will be read as one.
- open_file_endpoint(conn, path, &st);
- } else {
- send_http_error(conn, 404, NULL);
- }
+ } else if (is_not_modified(conn, &st)) {
+ send_http_error(conn, 304, NULL);
+ } else if ((conn->endpoint.fd = open(path, O_RDONLY | O_BINARY)) != -1) {
+ // O_BINARY is required for Windows, otherwise in default text mode
+ // two bytes \r\n will be read as one.
+ open_file_endpoint(conn, path, &st);
+ } else {
+ send_http_error(conn, 404, NULL);
+ }
}
#endif // !MONGOOSE_NO_FILESYSTEM
static void open_local_endpoint(struct connection *conn, int skip_user) {
#ifndef MONGOOSE_NO_FILESYSTEM
- char path[MAX_PATH_SIZE];
- file_stat_t st;
- int exists = 0;
+ char path[MAX_PATH_SIZE];
+ file_stat_t st;
+ int exists = 0;
#endif
- // If EP_USER was set in a prev call, reset it
- conn->endpoint_type = EP_NONE;
+ // If EP_USER was set in a prev call, reset it
+ conn->endpoint_type = EP_NONE;
#ifndef MONGOOSE_NO_AUTH
- if (conn->server->event_handler && call_user(conn, MG_AUTH) == MG_FALSE) {
- mg_send_digest_auth_request(&conn->mg_conn);
- return;
- }
+ if (conn->server->event_handler && call_user(conn, MG_AUTH) == MG_FALSE) {
+ mg_send_digest_auth_request(&conn->mg_conn);
+ return;
+ }
#endif
- // Call URI handler if one is registered for this URI
- if (skip_user == 0 && conn->server->event_handler != NULL) {
- conn->endpoint_type = EP_USER;
+ // Call URI handler if one is registered for this URI
+ if (skip_user == 0 && conn->server->event_handler != NULL) {
+ conn->endpoint_type = EP_USER;
#if MONGOOSE_POST_SIZE_LIMIT > 1
- {
- const char *cl = mg_get_header(&conn->mg_conn, "Content-Length");
- if ((strcmp(conn->mg_conn.request_method, "POST") == 0 ||
- strcmp(conn->mg_conn.request_method, "PUT") == 0) &&
- (cl == NULL || to64(cl) > MONGOOSE_POST_SIZE_LIMIT)) {
- send_http_error(conn, 500, "POST size > %zu",
- (size_t) MONGOOSE_POST_SIZE_LIMIT);
- }
- }
+ {
+ const char *cl = mg_get_header(&conn->mg_conn, "Content-Length");
+ if ((strcmp(conn->mg_conn.request_method, "POST") == 0 ||
+ strcmp(conn->mg_conn.request_method, "PUT") == 0) &&
+ (cl == NULL || to64(cl) > MONGOOSE_POST_SIZE_LIMIT)) {
+ send_http_error(conn, 500, "POST size > %zu",
+ (size_t) MONGOOSE_POST_SIZE_LIMIT);
+ }
+ }
#endif
- return;
- }
-
- if (strcmp(conn->mg_conn.request_method, "CONNECT") == 0 ||
- memcmp(conn->mg_conn.uri, "http", 4) == 0) {
- proxify_connection(conn);
- return;
- }
-
- if (!strcmp(conn->mg_conn.request_method, "OPTIONS")) {
- send_options(conn);
- return;
- }
-
+ return;
+ }
+
+ if (strcmp(conn->mg_conn.request_method, "CONNECT") == 0 ||
+ memcmp(conn->mg_conn.uri, "http", 4) == 0) {
+ proxify_connection(conn);
+ return;
+ }
+
+ if (!strcmp(conn->mg_conn.request_method, "OPTIONS")) {
+ send_options(conn);
+ return;
+ }
+
#ifdef MONGOOSE_NO_FILESYSTEM
- send_http_error(conn, 404, NULL);
+ send_http_error(conn, 404, NULL);
#else
- exists = convert_uri_to_file_name(conn, path, sizeof(path), &st);
+ exists = convert_uri_to_file_name(conn, path, sizeof(path), &st);
- if (!strcmp(conn->mg_conn.request_method, "OPTIONS")) {
- send_options(conn);
- } else if (conn->server->config_options[DOCUMENT_ROOT] == NULL) {
- send_http_error(conn, 404, NULL);
+ if (!strcmp(conn->mg_conn.request_method, "OPTIONS")) {
+ send_options(conn);
+ } else if (conn->server->config_options[DOCUMENT_ROOT] == NULL) {
+ send_http_error(conn, 404, NULL);
#ifndef MONGOOSE_NO_AUTH
- } else if ((!is_dav_request(conn) && !is_authorized(conn, path)) ||
- (is_dav_request(conn) && !is_authorized_for_dav(conn))) {
- mg_send_digest_auth_request(&conn->mg_conn);
- close_local_endpoint(conn);
+ } else if ((!is_dav_request(conn) && !is_authorized(conn, path)) ||
+ (is_dav_request(conn) && !is_authorized_for_dav(conn))) {
+ mg_send_digest_auth_request(&conn->mg_conn);
+ close_local_endpoint(conn);
#endif
#ifndef MONGOOSE_NO_DAV
- } else if (!strcmp(conn->mg_conn.request_method, "PROPFIND")) {
- handle_propfind(conn, path, &st, exists);
- } else if (!strcmp(conn->mg_conn.request_method, "MKCOL")) {
- handle_mkcol(conn, path);
- } else if (!strcmp(conn->mg_conn.request_method, "DELETE")) {
- handle_delete(conn, path);
- } else if (!strcmp(conn->mg_conn.request_method, "PUT")) {
- handle_put(conn, path);
+ } else if (!strcmp(conn->mg_conn.request_method, "PROPFIND")) {
+ handle_propfind(conn, path, &st, exists);
+ } else if (!strcmp(conn->mg_conn.request_method, "MKCOL")) {
+ handle_mkcol(conn, path);
+ } else if (!strcmp(conn->mg_conn.request_method, "DELETE")) {
+ handle_delete(conn, path);
+ } else if (!strcmp(conn->mg_conn.request_method, "PUT")) {
+ handle_put(conn, path);
#endif
- } else {
- mg_send_file(&conn->mg_conn, path);
- }
+ } else {
+ mg_send_file(&conn->mg_conn, path);
+ }
#endif // MONGOOSE_NO_FILESYSTEM
}
static void send_continue_if_expected(struct connection *conn) {
- static const char expect_response[] = "HTTP/1.1 100 Continue\r\n\r\n";
- const char *expect_hdr = mg_get_header(&conn->mg_conn, "Expect");
+ static const char expect_response[] = "HTTP/1.1 100 Continue\r\n\r\n";
+ const char *expect_hdr = mg_get_header(&conn->mg_conn, "Expect");
- if (expect_hdr != NULL && !mg_strcasecmp(expect_hdr, "100-continue")) {
- ns_send(conn->ns_conn, expect_response, sizeof(expect_response) - 1);
- }
+ if (expect_hdr != NULL && !mg_strcasecmp(expect_hdr, "100-continue")) {
+ ns_send(conn->ns_conn, expect_response, sizeof(expect_response) - 1);
+ }
}
// Conform to http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2
static int is_valid_uri(const char *uri) {
- unsigned short n;
- return uri[0] == '/' ||
- strcmp(uri, "*") == 0 || // OPTIONS method can use asterisk URI
- memcmp(uri, "http", 4) == 0 || // Naive check for the absolute URI
- sscanf(uri, "%*[^ :]:%hu", &n) > 0; // CONNECT method can use host:port
+ unsigned short n;
+ return uri[0] == '/' ||
+ strcmp(uri, "*") == 0 || // OPTIONS method can use asterisk URI
+ memcmp(uri, "http", 4) == 0 || // Naive check for the absolute URI
+ sscanf(uri, "%*[^ :]:%hu", &n) > 0; // CONNECT method can use host:port
}
static void try_parse(struct connection *conn) {
- struct iobuf *io = &conn->ns_conn->recv_iobuf;
-
- if (conn->request_len == 0 &&
- (conn->request_len = get_request_len(io->buf, io->len)) > 0) {
- // If request is buffered in, remove it from the iobuf. This is because
- // iobuf could be reallocated, and pointers in parsed request could
- // become invalid.
- conn->request = (char *) malloc(conn->request_len);
- memcpy(conn->request, io->buf, conn->request_len);
- //DBG(("%p [%.*s]", conn, conn->request_len, conn->request));
- iobuf_remove(io, conn->request_len);
- conn->request_len = parse_http_message(conn->request, conn->request_len,
- &conn->mg_conn);
- if (conn->request_len > 0) {
- const char *cl_hdr = mg_get_header(&conn->mg_conn, "Content-Length");
- conn->cl = cl_hdr == NULL ? 0 : to64(cl_hdr);
- conn->mg_conn.content_len = (size_t) conn->cl;
- }
- }
+ struct iobuf *io = &conn->ns_conn->recv_iobuf;
+
+ if (conn->request_len == 0 &&
+ (conn->request_len = get_request_len(io->buf, io->len)) > 0) {
+ // If request is buffered in, remove it from the iobuf. This is because
+ // iobuf could be reallocated, and pointers in parsed request could
+ // become invalid.
+ conn->request = (char *) malloc(conn->request_len);
+ memcpy(conn->request, io->buf, conn->request_len);
+ //DBG(("%p [%.*s]", conn, conn->request_len, conn->request));
+ iobuf_remove(io, conn->request_len);
+ conn->request_len = parse_http_message(conn->request, conn->request_len,
+ &conn->mg_conn);
+ if (conn->request_len > 0) {
+ const char *cl_hdr = mg_get_header(&conn->mg_conn, "Content-Length");
+ conn->cl = cl_hdr == NULL ? 0 : to64(cl_hdr);
+ conn->mg_conn.content_len = (size_t) conn->cl;
+ }
+ }
}
static void do_proxy(struct connection *conn) {
- if (conn->request_len == 0) {
- try_parse(conn);
- DBG(("%p parsing -> %d", conn, conn->request_len));
- if (conn->request_len > 0 && call_user(conn, MG_REQUEST) == MG_FALSE) {
- proxy_request(conn->endpoint.nc, &conn->mg_conn);
- } else if (conn->request_len < 0) {
- ns_forward(conn->ns_conn, conn->endpoint.nc);
- }
- } else {
- DBG(("%p forwarding", conn));
- ns_forward(conn->ns_conn, conn->endpoint.nc);
- }
+ if (conn->request_len == 0) {
+ try_parse(conn);
+ DBG(("%p parsing -> %d", conn, conn->request_len));
+ if (conn->request_len > 0 && call_user(conn, MG_REQUEST) == MG_FALSE) {
+ proxy_request(conn->endpoint.nc, &conn->mg_conn);
+ } else if (conn->request_len < 0) {
+ ns_forward(conn->ns_conn, conn->endpoint.nc);
+ }
+ } else {
+ DBG(("%p forwarding", conn));
+ ns_forward(conn->ns_conn, conn->endpoint.nc);
+ }
}
static void on_recv_data(struct connection *conn) {
- struct iobuf *io = &conn->ns_conn->recv_iobuf;
-
- if (conn->endpoint_type == EP_PROXY && conn->endpoint.nc != NULL) {
- do_proxy(conn);
- return;
- }
-
- try_parse(conn);
- DBG(("%p %d %zu %d", conn, conn->request_len, io->len, conn->ns_conn->flags));
- if (conn->request_len < 0 ||
- (conn->request_len > 0 && !is_valid_uri(conn->mg_conn.uri))) {
- send_http_error(conn, 400, NULL);
- } else if (conn->request_len == 0 && io->len > MAX_REQUEST_SIZE) {
- send_http_error(conn, 413, NULL);
- } else if (conn->request_len > 0 &&
- strcmp(conn->mg_conn.http_version, "1.0") != 0 &&
- strcmp(conn->mg_conn.http_version, "1.1") != 0) {
- send_http_error(conn, 505, NULL);
- } else if (conn->request_len > 0 && conn->endpoint_type == EP_NONE) {
+ struct iobuf *io = &conn->ns_conn->recv_iobuf;
+
+ if (conn->endpoint_type == EP_PROXY && conn->endpoint.nc != NULL) {
+ do_proxy(conn);
+ return;
+ }
+
+ try_parse(conn);
+ DBG(("%p %d %zu %d", conn, conn->request_len, io->len, conn->ns_conn->flags));
+ if (conn->request_len < 0 ||
+ (conn->request_len > 0 && !is_valid_uri(conn->mg_conn.uri))) {
+ send_http_error(conn, 400, NULL);
+ } else if (conn->request_len == 0 && io->len > MAX_REQUEST_SIZE) {
+ send_http_error(conn, 413, NULL);
+ } else if (conn->request_len > 0 &&
+ strcmp(conn->mg_conn.http_version, "1.0") != 0 &&
+ strcmp(conn->mg_conn.http_version, "1.1") != 0) {
+ send_http_error(conn, 505, NULL);
+ } else if (conn->request_len > 0 && conn->endpoint_type == EP_NONE) {
#ifndef MONGOOSE_NO_WEBSOCKET
- send_websocket_handshake_if_requested(&conn->mg_conn);
+ send_websocket_handshake_if_requested(&conn->mg_conn);
#endif
- send_continue_if_expected(conn);
- open_local_endpoint(conn, 0);
- }
+ send_continue_if_expected(conn);
+ open_local_endpoint(conn, 0);
+ }
#ifndef MONGOOSE_NO_CGI
- if (conn->endpoint_type == EP_CGI && conn->endpoint.nc != NULL) {
- ns_forward(conn->ns_conn, conn->endpoint.nc);
- }
+ if (conn->endpoint_type == EP_CGI && conn->endpoint.nc != NULL) {
+ ns_forward(conn->ns_conn, conn->endpoint.nc);
+ }
#endif
- if (conn->endpoint_type == EP_USER) {
- call_request_handler_if_data_is_buffered(conn);
- }
+ if (conn->endpoint_type == EP_USER) {
+ call_request_handler_if_data_is_buffered(conn);
+ }
#ifndef MONGOOSE_NO_DAV
- if (conn->endpoint_type == EP_PUT && io->len > 0) {
- forward_put_data(conn);
- }
+ if (conn->endpoint_type == EP_PUT && io->len > 0) {
+ forward_put_data(conn);
+ }
#endif
}
static void call_http_client_handler(struct connection *conn) {
- //conn->mg_conn.status_code = code;
- // For responses without Content-Lengh, use the whole buffer
- if (conn->cl == 0) {
- conn->mg_conn.content_len = conn->ns_conn->recv_iobuf.len;
- }
- conn->mg_conn.content = conn->ns_conn->recv_iobuf.buf;
- if (call_user(conn, MG_REPLY) == MG_FALSE) {
- conn->ns_conn->flags |= NSF_CLOSE_IMMEDIATELY;
- }
- iobuf_remove(&conn->ns_conn->recv_iobuf, conn->mg_conn.content_len);
- conn->mg_conn.status_code = 0;
- conn->cl = conn->num_bytes_sent = conn->request_len = 0;
- free(conn->request);
- conn->request = NULL;
+ //conn->mg_conn.status_code = code;
+ // For responses without Content-Lengh, use the whole buffer
+ if (conn->cl == 0) {
+ conn->mg_conn.content_len = conn->ns_conn->recv_iobuf.len;
+ }
+ conn->mg_conn.content = conn->ns_conn->recv_iobuf.buf;
+ if (call_user(conn, MG_REPLY) == MG_FALSE) {
+ conn->ns_conn->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
+ iobuf_remove(&conn->ns_conn->recv_iobuf, conn->mg_conn.content_len);
+ conn->mg_conn.status_code = 0;
+ conn->cl = conn->num_bytes_sent = conn->request_len = 0;
+ free(conn->request);
+ conn->request = NULL;
}
static void process_response(struct connection *conn) {
- struct iobuf *io = &conn->ns_conn->recv_iobuf;
+ struct iobuf *io = &conn->ns_conn->recv_iobuf;
- try_parse(conn);
- DBG(("%p %d %zu", conn, conn->request_len, io->len));
- if (conn->request_len < 0 ||
- (conn->request_len == 0 && io->len > MAX_REQUEST_SIZE)) {
- call_http_client_handler(conn);
- } else if ((int64_t) io->len >= conn->cl) {
- call_http_client_handler(conn);
- }
+ try_parse(conn);
+ DBG(("%p %d %zu", conn, conn->request_len, io->len));
+ if (conn->request_len < 0 ||
+ (conn->request_len == 0 && io->len > MAX_REQUEST_SIZE)) {
+ call_http_client_handler(conn);
+ } else if ((int64_t) io->len >= conn->cl) {
+ call_http_client_handler(conn);
+ }
}
struct mg_connection *mg_connect(struct mg_server *server, const char *host,
- int port, int use_ssl) {
- struct ns_connection *nsconn;
- struct connection *conn;
+ int port, int use_ssl) {
+ struct ns_connection *nsconn;
+ struct connection *conn;
- nsconn = ns_connect(&server->ns_server, host, port, use_ssl, NULL);
- if (nsconn == NULL) return 0;
+ nsconn = ns_connect(&server->ns_server, host, port, use_ssl, NULL);
+ if (nsconn == NULL) return 0;
- if ((conn = (struct connection *) calloc(1, sizeof(*conn))) == NULL) {
- nsconn->flags |= NSF_CLOSE_IMMEDIATELY;
- return 0;
- }
+ if ((conn = (struct connection *) calloc(1, sizeof(*conn))) == NULL) {
+ nsconn->flags |= NSF_CLOSE_IMMEDIATELY;
+ return 0;
+ }
- // Interlink two structs
- conn->ns_conn = nsconn;
- nsconn->connection_data = conn;
+ // Interlink two structs
+ conn->ns_conn = nsconn;
+ nsconn->connection_data = conn;
- conn->server = server;
- conn->endpoint_type = EP_CLIENT;
- //conn->handler = handler;
- conn->mg_conn.server_param = server->ns_server.server_data;
- conn->ns_conn->flags = NSF_CONNECTING;
+ conn->server = server;
+ conn->endpoint_type = EP_CLIENT;
+ //conn->handler = handler;
+ conn->mg_conn.server_param = server->ns_server.server_data;
+ conn->ns_conn->flags = NSF_CONNECTING;
- return &conn->mg_conn;
+ return &conn->mg_conn;
}
#ifndef MONGOOSE_NO_LOGGING
static void log_header(const struct mg_connection *conn, const char *header,
- FILE *fp) {
- const char *header_value;
+ FILE *fp) {
+ const char *header_value;
- if ((header_value = mg_get_header(conn, header)) == NULL) {
- (void) fprintf(fp, "%s", " -");
- } else {
- (void) fprintf(fp, " \"%s\"", header_value);
- }
+ if ((header_value = mg_get_header(conn, header)) == NULL) {
+ (void) fprintf(fp, "%s", " -");
+ } else {
+ (void) fprintf(fp, " \"%s\"", header_value);
+ }
}
static void log_access(const struct connection *conn, const char *path) {
- const struct mg_connection *c = &conn->mg_conn;
- FILE *fp = (path == NULL) ? NULL : fopen(path, "a+");
- char date[64], user[100];
- time_t now;
-
- if (fp == NULL) return;
- now = time(NULL);
- strftime(date, sizeof(date), "%d/%b/%Y:%H:%M:%S %z", localtime(&now));
-
- flockfile(fp);
- mg_parse_header(mg_get_header(&conn->mg_conn, "Authorization"), "username",
- user, sizeof(user));
- fprintf(fp, "%s - %s [%s] \"%s %s%s%s HTTP/%s\" %d %" INT64_FMT,
- c->remote_ip, user[0] == '\0' ? "-" : user, date,
- c->request_method ? c->request_method : "-",
- c->uri ? c->uri : "-", c->query_string ? "?" : "",
- c->query_string ? c->query_string : "",
- c->http_version, c->status_code, conn->num_bytes_sent);
- log_header(c, "Referer", fp);
- log_header(c, "User-Agent", fp);
- fputc('\n', fp);
- fflush(fp);
-
- funlockfile(fp);
- fclose(fp);
+ const struct mg_connection *c = &conn->mg_conn;
+ FILE *fp = (path == NULL) ? NULL : fopen(path, "a+");
+ char date[64], user[100];
+ time_t now;
+
+ if (fp == NULL) return;
+ now = time(NULL);
+ strftime(date, sizeof(date), "%d/%b/%Y:%H:%M:%S %z", localtime(&now));
+
+ flockfile(fp);
+ mg_parse_header(mg_get_header(&conn->mg_conn, "Authorization"), "username",
+ user, sizeof(user));
+ fprintf(fp, "%s - %s [%s] \"%s %s%s%s HTTP/%s\" %d %" INT64_FMT,
+ c->remote_ip, user[0] == '\0' ? "-" : user, date,
+ c->request_method ? c->request_method : "-",
+ c->uri ? c->uri : "-", c->query_string ? "?" : "",
+ c->query_string ? c->query_string : "",
+ c->http_version, c->status_code, conn->num_bytes_sent);
+ log_header(c, "Referer", fp);
+ log_header(c, "User-Agent", fp);
+ fputc('\n', fp);
+ fflush(fp);
+
+ funlockfile(fp);
+ fclose(fp);
}
#endif
static void close_local_endpoint(struct connection *conn) {
- struct mg_connection *c = &conn->mg_conn;
- // Must be done before free()
- int keep_alive = should_keep_alive(&conn->mg_conn) &&
- (conn->endpoint_type == EP_FILE || conn->endpoint_type == EP_USER);
- DBG(("%p %d %d %d", conn, conn->endpoint_type, keep_alive,
- conn->ns_conn->flags));
-
- switch (conn->endpoint_type) {
- case EP_PUT:
- case EP_FILE:
- close(conn->endpoint.fd);
- break;
- case EP_CGI:
- case EP_PROXY:
- if (conn->endpoint.nc != NULL) {
- DBG(("%p %p %p :-)", conn, conn->ns_conn, conn->endpoint.nc));
- conn->endpoint.nc->flags |= NSF_CLOSE_IMMEDIATELY;
- conn->endpoint.nc->connection_data = NULL;
- }
- break;
- default: break;
- }
+ struct mg_connection *c = &conn->mg_conn;
+ // Must be done before free()
+ int keep_alive = should_keep_alive(&conn->mg_conn) &&
+ (conn->endpoint_type == EP_FILE || conn->endpoint_type == EP_USER);
+ DBG(("%p %d %d %d", conn, conn->endpoint_type, keep_alive,
+ conn->ns_conn->flags));
+
+ switch (conn->endpoint_type) {
+ case EP_PUT:
+ case EP_FILE:
+ close(conn->endpoint.fd);
+ break;
+ case EP_CGI:
+ case EP_PROXY:
+ if (conn->endpoint.nc != NULL) {
+ DBG(("%p %p %p :-)", conn, conn->ns_conn, conn->endpoint.nc));
+ conn->endpoint.nc->flags |= NSF_CLOSE_IMMEDIATELY;
+ conn->endpoint.nc->connection_data = NULL;
+ }
+ break;
+ default: break;
+ }
#ifndef MONGOOSE_NO_LOGGING
- if (c->status_code > 0 && conn->endpoint_type != EP_CLIENT &&
- c->status_code != 400) {
- log_access(conn, conn->server->config_options[ACCESS_LOG_FILE]);
- }
+ if (c->status_code > 0 && conn->endpoint_type != EP_CLIENT &&
+ c->status_code != 400) {
+ log_access(conn, conn->server->config_options[ACCESS_LOG_FILE]);
+ }
#endif
- // Gobble possible POST data sent to the URI handler
- iobuf_free(&conn->ns_conn->recv_iobuf);
- free(conn->request);
- free(conn->path_info);
-
- conn->endpoint_type = EP_NONE;
- conn->cl = conn->num_bytes_sent = conn->request_len = 0;
- conn->ns_conn->flags &= ~(NSF_FINISHED_SENDING_DATA |
- NSF_BUFFER_BUT_DONT_SEND | NSF_CLOSE_IMMEDIATELY |
- MG_HEADERS_SENT | MG_LONG_RUNNING);
- c->num_headers = c->status_code = c->is_websocket = c->content_len = 0;
- conn->endpoint.nc = NULL;
- c->request_method = c->uri = c->http_version = c->query_string = NULL;
- conn->request = conn->path_info = NULL;
-
- if (keep_alive) {
- on_recv_data(conn); // Can call us recursively if pipelining is used
- } else {
- conn->ns_conn->flags |= conn->ns_conn->send_iobuf.len == 0 ?
- NSF_CLOSE_IMMEDIATELY : NSF_FINISHED_SENDING_DATA;
- }
+ // Gobble possible POST data sent to the URI handler
+ iobuf_free(&conn->ns_conn->recv_iobuf);
+ free(conn->request);
+ free(conn->path_info);
+
+ conn->endpoint_type = EP_NONE;
+ conn->cl = conn->num_bytes_sent = conn->request_len = 0;
+ conn->ns_conn->flags &= ~(NSF_FINISHED_SENDING_DATA |
+ NSF_BUFFER_BUT_DONT_SEND | NSF_CLOSE_IMMEDIATELY |
+ MG_HEADERS_SENT | MG_LONG_RUNNING);
+ c->num_headers = c->status_code = c->is_websocket = c->content_len = 0;
+ conn->endpoint.nc = NULL;
+ c->request_method = c->uri = c->http_version = c->query_string = NULL;
+ conn->request = conn->path_info = NULL;
+
+ if (keep_alive) {
+ on_recv_data(conn); // Can call us recursively if pipelining is used
+ } else {
+ conn->ns_conn->flags |= conn->ns_conn->send_iobuf.len == 0 ?
+ NSF_CLOSE_IMMEDIATELY : NSF_FINISHED_SENDING_DATA;
+ }
}
static void transfer_file_data(struct connection *conn) {
- char buf[IOBUF_SIZE];
- int n;
+ char buf[IOBUF_SIZE];
+ int n;
- // If output buffer is too big, don't send anything. Wait until
- // mongoose drains already buffered data to the client.
- if (conn->ns_conn->send_iobuf.len > sizeof(buf) * 2) return;
+ // If output buffer is too big, don't send anything. Wait until
+ // mongoose drains already buffered data to the client.
+ if (conn->ns_conn->send_iobuf.len > sizeof(buf) * 2) return;
- // Do not send anyt
- n = read(conn->endpoint.fd, buf, conn->cl < (int64_t) sizeof(buf) ?
- (int) conn->cl : (int) sizeof(buf));
+ // Do not send anyt
+ n = read(conn->endpoint.fd, buf, conn->cl < (int64_t) sizeof(buf) ?
+ (int) conn->cl : (int) sizeof(buf));
- if (n <= 0) {
- close_local_endpoint(conn);
- } else if (n > 0) {
- conn->cl -= n;
- ns_send(conn->ns_conn, buf, n);
- if (conn->cl <= 0) {
- close_local_endpoint(conn);
- }
- }
+ if (n <= 0) {
+ close_local_endpoint(conn);
+ } else if (n > 0) {
+ conn->cl -= n;
+ ns_send(conn->ns_conn, buf, n);
+ if (conn->cl <= 0) {
+ close_local_endpoint(conn);
+ }
+ }
}
int mg_poll_server(struct mg_server *server, int milliseconds) {
- return ns_server_poll(&server->ns_server, milliseconds);
+ return ns_server_poll(&server->ns_server, milliseconds);
}
void mg_destroy_server(struct mg_server **server) {
- if (server != NULL && *server != NULL) {
- struct mg_server *s = *server;
- int i;
+ if (server != NULL && *server != NULL) {
+ struct mg_server *s = *server;
+ int i;
- ns_server_free(&s->ns_server);
- for (i = 0; i < (int) ARRAY_SIZE(s->config_options); i++) {
- free(s->config_options[i]); // It is OK to free(NULL)
- }
- free(s);
- *server = NULL;
- }
+ ns_server_free(&s->ns_server);
+ for (i = 0; i < (int) ARRAY_SIZE(s->config_options); i++) {
+ free(s->config_options[i]); // It is OK to free(NULL)
+ }
+ free(s);
+ *server = NULL;
+ }
}
struct mg_iterator {
- mg_handler_t cb;
- void *param;
+ mg_handler_t cb;
+ void *param;
};
static void iter(struct ns_connection *nsconn, enum ns_event ev, void *param) {
- if (ev == NS_POLL) {
- struct mg_iterator *it = (struct mg_iterator *) param;
- struct connection *c = (struct connection *) nsconn->connection_data;
- if (c != NULL) c->mg_conn.callback_param = it->param;
- it->cb(&c->mg_conn, MG_POLL);
- }
+ if (ev == NS_POLL) {
+ struct mg_iterator *it = (struct mg_iterator *) param;
+ struct connection *c = (struct connection *) nsconn->connection_data;
+ if (c != NULL) c->mg_conn.callback_param = it->param;
+ it->cb(&c->mg_conn, MG_POLL);
+ }
}
struct mg_connection *mg_next(struct mg_server *s, struct mg_connection *c) {
- struct connection *conn = MG_CONN_2_CONN(c);
- struct ns_connection *nc = ns_next(&s->ns_server,
- c == NULL ? NULL : conn->ns_conn);
-
- return nc == NULL ? NULL :
- & ((struct connection *) nc->connection_data)->mg_conn;
+ struct connection *conn = MG_CONN_2_CONN(c);
+ struct ns_connection *nc = ns_next(&s->ns_server,
+ c == NULL ? NULL : conn->ns_conn);
+
+ return nc == NULL ? NULL :
+ & ((struct connection *) nc->connection_data)->mg_conn;
}
// Apply function to all active connections.
void mg_iterate_over_connections(struct mg_server *server, mg_handler_t cb,
- void *param) {
- struct mg_iterator it = { cb, param };
- ns_iterate(&server->ns_server, iter, &it);
+ void *param) {
+ struct mg_iterator it = { cb, param };
+ ns_iterate(&server->ns_server, iter, &it);
}
static int get_var(const char *data, size_t data_len, const char *name,
- char *dst, size_t dst_len) {
- const char *p, *e, *s;
- size_t name_len;
- int len;
-
- if (dst == NULL || dst_len == 0) {
- len = -2;
- } else if (data == NULL || name == NULL || data_len == 0) {
- len = -1;
- dst[0] = '\0';
- } else {
- name_len = strlen(name);
- e = data + data_len;
- len = -1;
- dst[0] = '\0';
-
- // data is "var1=val1&var2=val2...". Find variable first
- for (p = data; p + name_len < e; p++) {
- if ((p == data || p[-1] == '&') && p[name_len] == '=' &&
- !mg_strncasecmp(name, p, name_len)) {
-
- // Point p to variable value
- p += name_len + 1;
-
- // Point s to the end of the value
- s = (const char *) memchr(p, '&', (size_t)(e - p));
- if (s == NULL) {
- s = e;
- }
- assert(s >= p);
-
- // Decode variable into destination buffer
- len = mg_url_decode(p, (size_t)(s - p), dst, dst_len, 1);
-
- // Redirect error code from -1 to -2 (destination buffer too small).
- if (len == -1) {
- len = -2;
- }
- break;
- }
- }
- }
-
- return len;
+ char *dst, size_t dst_len) {
+ const char *p, *e, *s;
+ size_t name_len;
+ int len;
+
+ if (dst == NULL || dst_len == 0) {
+ len = -2;
+ } else if (data == NULL || name == NULL || data_len == 0) {
+ len = -1;
+ dst[0] = '\0';
+ } else {
+ name_len = strlen(name);
+ e = data + data_len;
+ len = -1;
+ dst[0] = '\0';
+
+ // data is "var1=val1&var2=val2...". Find variable first
+ for (p = data; p + name_len < e; p++) {
+ if ((p == data || p[-1] == '&') && p[name_len] == '=' &&
+ !mg_strncasecmp(name, p, name_len)) {
+ // Point p to variable value
+ p += name_len + 1;
+
+ // Point s to the end of the value
+ s = (const char *) memchr(p, '&', (size_t)(e - p));
+ if (s == NULL) {
+ s = e;
+ }
+ assert(s >= p);
+
+ // Decode variable into destination buffer
+ len = mg_url_decode(p, (size_t)(s - p), dst, dst_len, 1);
+
+ // Redirect error code from -1 to -2 (destination buffer too small).
+ if (len == -1) {
+ len = -2;
+ }
+ break;
+ }
+ }
+ }
+
+ return len;
}
int mg_get_var(const struct mg_connection *conn, const char *name,
- char *dst, size_t dst_len) {
- int len = get_var(conn->query_string, conn->query_string == NULL ? 0 :
- strlen(conn->query_string), name, dst, dst_len);
- if (len < 0) {
- len = get_var(conn->content, conn->content_len, name, dst, dst_len);
- }
- return len;
+ char *dst, size_t dst_len) {
+ int len = get_var(conn->query_string, conn->query_string == NULL ? 0 :
+ strlen(conn->query_string), name, dst, dst_len);
+ if (len < 0) {
+ len = get_var(conn->content, conn->content_len, name, dst, dst_len);
+ }
+ return len;
}
static int get_line_len(const char *buf, int buf_len) {
- int len = 0;
- while (len < buf_len && buf[len] != '\n') len++;
- return buf[len] == '\n' ? len + 1: -1;
+ int len = 0;
+ while (len < buf_len && buf[len] != '\n') len++;
+ return buf[len] == '\n' ? len + 1: -1;
}
int mg_parse_multipart(const char *buf, int buf_len,
- char *var_name, int var_name_len,
- char *file_name, int file_name_len,
- const char **data, int *data_len) {
- static const char cd[] = "Content-Disposition: ";
- //struct mg_connection c;
- int hl, bl, n, ll, pos, cdl = sizeof(cd) - 1;
- //char *p;
-
- if (buf == NULL || buf_len <= 0) return 0;
- if ((hl = get_request_len(buf, buf_len)) <= 0) return 0;
- if (buf[0] != '-' || buf[1] != '-' || buf[2] == '\n') return 0;
-
- // Get boundary length
- bl = get_line_len(buf, buf_len);
-
- // Loop through headers, fetch variable name and file name
- var_name[0] = file_name[0] = '\0';
- for (n = bl; (ll = get_line_len(buf + n, hl - n)) > 0; n += ll) {
- if (mg_strncasecmp(cd, buf + n, cdl) == 0) {
- parse_header(buf + n + cdl, ll - (cdl + 2), "name",
- var_name, var_name_len);
- parse_header(buf + n + cdl, ll - (cdl + 2), "filename",
- file_name, file_name_len);
- }
- }
-
- // Scan body, search for terminating boundary
- for (pos = hl; pos + (bl - 2) < buf_len; pos++) {
- if (buf[pos] == '-' && !memcmp(buf, &buf[pos], bl - 2)) {
- if (data_len != NULL) *data_len = (pos - 2) - hl;
- if (data != NULL) *data = buf + hl;
- return pos;
- }
- }
-
- return 0;
+ char *var_name, int var_name_len,
+ char *file_name, int file_name_len,
+ const char **data, int *data_len) {
+ static const char cd[] = "Content-Disposition: ";
+ //struct mg_connection c;
+ int hl, bl, n, ll, pos, cdl = sizeof(cd) - 1;
+ //char *p;
+
+ if (buf == NULL || buf_len <= 0) return 0;
+ if ((hl = get_request_len(buf, buf_len)) <= 0) return 0;
+ if (buf[0] != '-' || buf[1] != '-' || buf[2] == '\n') return 0;
+
+ // Get boundary length
+ bl = get_line_len(buf, buf_len);
+
+ // Loop through headers, fetch variable name and file name
+ var_name[0] = file_name[0] = '\0';
+ for (n = bl; (ll = get_line_len(buf + n, hl - n)) > 0; n += ll) {
+ if (mg_strncasecmp(cd, buf + n, cdl) == 0) {
+ parse_header(buf + n + cdl, ll - (cdl + 2), "name",
+ var_name, var_name_len);
+ parse_header(buf + n + cdl, ll - (cdl + 2), "filename",
+ file_name, file_name_len);
+ }
+ }
+
+ // Scan body, search for terminating boundary
+ for (pos = hl; pos + (bl - 2) < buf_len; pos++) {
+ if (buf[pos] == '-' && !memcmp(buf, &buf[pos], bl - 2)) {
+ if (data_len != NULL) *data_len = (pos - 2) - hl;
+ if (data != NULL) *data = buf + hl;
+ return pos;
+ }
+ }
+
+ return 0;
}
const char **mg_get_valid_option_names(void) {
- return static_config_options;
+ return static_config_options;
}
static int get_option_index(const char *name) {
- int i;
+ int i;
- for (i = 0; static_config_options[i * 2] != NULL; i++) {
- if (strcmp(static_config_options[i * 2], name) == 0) {
- return i;
- }
- }
- return -1;
+ for (i = 0; static_config_options[i * 2] != NULL; i++) {
+ if (strcmp(static_config_options[i * 2], name) == 0) {
+ return i;
+ }
+ }
+ return -1;
}
static void set_default_option_values(char **opts) {
- const char *value, **all_opts = mg_get_valid_option_names();
- int i;
+ const char *value, **all_opts = mg_get_valid_option_names();
+ int i;
- for (i = 0; all_opts[i * 2] != NULL; i++) {
- value = all_opts[i * 2 + 1];
- if (opts[i] == NULL && value != NULL) {
- opts[i] = mg_strdup(value);
- }
- }
+ for (i = 0; all_opts[i * 2] != NULL; i++) {
+ value = all_opts[i * 2 + 1];
+ if (opts[i] == NULL && value != NULL) {
+ opts[i] = mg_strdup(value);
+ }
+ }
}
const char *mg_set_option(struct mg_server *server, const char *name,
- const char *value) {
- int ind = get_option_index(name);
- const char *error_msg = NULL;
- char **v = NULL;
-
- if (ind < 0) return "No such option";
- v = &server->config_options[ind];
-
- // Return success immediately if setting to the same value
- if ((*v == NULL && value == NULL) ||
- (value != NULL && *v != NULL && !strcmp(value, *v))) {
- return NULL;
- }
-
- if (*v != NULL) {
- free(*v);
- *v = NULL;
- }
-
- if (value == NULL || value[0] == '\0') return NULL;
-
- *v = mg_strdup(value);
- DBG(("%s [%s]", name, *v));
-
- if (ind == LISTENING_PORT) {
- int port = ns_bind(&server->ns_server, value);
- if (port < 0) {
- error_msg = "Cannot bind to port";
- } else {
- char buf[100];
- ns_sock_to_str(server->ns_server.listening_sock, buf, sizeof(buf), 2);
- free(*v);
- *v = mg_strdup(buf);
- }
+ const char *value) {
+ int ind = get_option_index(name);
+ const char *error_msg = NULL;
+ char **v = NULL;
+
+ if (ind < 0) return "No such option";
+ v = &server->config_options[ind];
+
+ // Return success immediately if setting to the same value
+ if ((*v == NULL && value == NULL) ||
+ (value != NULL && *v != NULL && !strcmp(value, *v))) {
+ return NULL;
+ }
+
+ if (*v != NULL) {
+ free(*v);
+ *v = NULL;
+ }
+
+ if (value == NULL || value[0] == '\0') return NULL;
+
+ *v = mg_strdup(value);
+ DBG(("%s [%s]", name, *v));
+
+ if (ind == LISTENING_PORT) {
+ int port = ns_bind(&server->ns_server, value);
+ if (port < 0) {
+ error_msg = "Cannot bind to port";
+ } else {
+ char buf[100];
+ ns_sock_to_str(server->ns_server.listening_sock, buf, sizeof(buf), 2);
+ free(*v);
+ *v = mg_strdup(buf);
+ }
#ifndef _WIN32
- } else if (ind == RUN_AS_USER) {
- struct passwd *pw;
- if ((pw = getpwnam(value)) == NULL) {
- error_msg = "Unknown user";
- } else if (setgid(pw->pw_gid) != 0) {
- error_msg = "setgid() failed";
- } else if (setuid(pw->pw_uid) != 0) {
- error_msg = "setuid() failed";
- }
+ } else if (ind == RUN_AS_USER) {
+ struct passwd *pw;
+ if ((pw = getpwnam(value)) == NULL) {
+ error_msg = "Unknown user";
+ } else if (setgid(pw->pw_gid) != 0) {
+ error_msg = "setgid() failed";
+ } else if (setuid(pw->pw_uid) != 0) {
+ error_msg = "setuid() failed";
+ }
#endif
#ifdef NS_ENABLE_SSL
- } else if (ind == SSL_CERTIFICATE) {
- int res = ns_set_ssl_cert(&server->ns_server, value);
- if (res == -2) {
- error_msg = "Cannot load PEM";
- } else if (res == -3) {
- error_msg = "SSL not enabled";
- } else if (res == -1) {
- error_msg = "SSL_CTX_new() failed";
- }
- } else if (ind == SSL_CA_CERTIFICATE) {
- if (ns_set_ssl_ca_cert(&server->ns_server, value) != 0) {
- error_msg = "Error setting CA cert";
- }
+ } else if (ind == SSL_CERTIFICATE) {
+ int res = ns_set_ssl_cert(&server->ns_server, value);
+ if (res == -2) {
+ error_msg = "Cannot load PEM";
+ } else if (res == -3) {
+ error_msg = "SSL not enabled";
+ } else if (res == -1) {
+ error_msg = "SSL_CTX_new() failed";
+ }
+ } else if (ind == SSL_CA_CERTIFICATE) {
+ if (ns_set_ssl_ca_cert(&server->ns_server, value) != 0) {
+ error_msg = "Error setting CA cert";
+ }
#endif
- }
+ }
- return error_msg;
+ return error_msg;
}
static void set_ips(struct ns_connection *nc, int is_rem) {
- struct connection *conn = (struct connection *) nc->connection_data;
- struct mg_connection *c = &conn->mg_conn;
- char buf[100];
+ struct connection *conn = (struct connection *) nc->connection_data;
+ struct mg_connection *c = &conn->mg_conn;
+ char buf[100];
- ns_sock_to_str(nc->sock, buf, sizeof(buf), is_rem ? 7 : 3);
- sscanf(buf, "%47[^:]:%hu",
- is_rem ? c->remote_ip : c->local_ip,
- is_rem ? &c->remote_port : &c->local_port);
- //DBG(("%p %s %s", conn, is_rem ? "rem" : "loc", buf));
+ ns_sock_to_str(nc->sock, buf, sizeof(buf), is_rem ? 7 : 3);
+ sscanf(buf, "%47[^:]:%hu",
+ is_rem ? c->remote_ip : c->local_ip,
+ is_rem ? &c->remote_port : &c->local_port);
+ //DBG(("%p %s %s", conn, is_rem ? "rem" : "loc", buf));
}
static void on_accept(struct ns_connection *nc, union socket_address *sa) {
- struct mg_server *server = (struct mg_server *) nc->server;
- struct connection *conn;
-
- if (!check_acl(server->config_options[ACCESS_CONTROL_LIST],
- ntohl(* (uint32_t *) &sa->sin.sin_addr)) ||
- (conn = (struct connection *) calloc(1, sizeof(*conn))) == NULL) {
- nc->flags |= NSF_CLOSE_IMMEDIATELY;
- } else {
- // Circularly link two connection structures
- nc->connection_data = conn;
- conn->ns_conn = nc;
-
- // Initialize the rest of connection attributes
- conn->server = server;
- conn->mg_conn.server_param = nc->server->server_data;
- set_ips(nc, 1);
- set_ips(nc, 0);
- }
+ struct mg_server *server = (struct mg_server *) nc->server;
+ struct connection *conn;
+
+ if (!check_acl(server->config_options[ACCESS_CONTROL_LIST],
+ ntohl(* (uint32_t *) &sa->sin.sin_addr)) ||
+ (conn = (struct connection *) calloc(1, sizeof(*conn))) == NULL) {
+ nc->flags |= NSF_CLOSE_IMMEDIATELY;
+ } else {
+ // Circularly link two connection structures
+ nc->connection_data = conn;
+ conn->ns_conn = nc;
+
+ // Initialize the rest of connection attributes
+ conn->server = server;
+ conn->mg_conn.server_param = nc->server->server_data;
+ set_ips(nc, 1);
+ set_ips(nc, 0);
+ }
}
#ifndef MONGOOSE_NO_FILESYSTEM
static void hexdump(struct ns_connection *nc, const char *path,
- int num_bytes, int is_sent) {
- const struct iobuf *io = is_sent ? &nc->send_iobuf : &nc->recv_iobuf;
- FILE *fp;
- char *buf, src[60], dst[60];
- int buf_size = num_bytes * 5 + 100;
-
- if (path != NULL && (fp = fopen(path, "a")) != NULL) {
- ns_sock_to_str(nc->sock, src, sizeof(src), 3);
- ns_sock_to_str(nc->sock, dst, sizeof(dst), 7);
- fprintf(fp, "%lu %p %s %s %s %d\n", (unsigned long) time(NULL),
- nc->connection_data, src,
- is_sent == 0 ? "<-" : is_sent == 1 ? "->" :
- is_sent == 2 ? "<A" : "C>", dst, num_bytes);
- if (num_bytes > 0 && (buf = (char *) malloc(buf_size)) != NULL) {
- ns_hexdump(io->buf + (is_sent ? 0 : io->len) - (is_sent ? 0 : num_bytes),
- num_bytes, buf, buf_size);
- fprintf(fp, "%s", buf);
- free(buf);
- }
- fclose(fp);
- }
+ int num_bytes, int is_sent) {
+ const struct iobuf *io = is_sent ? &nc->send_iobuf : &nc->recv_iobuf;
+ FILE *fp;
+ char *buf, src[60], dst[60];
+ int buf_size = num_bytes * 5 + 100;
+
+ if (path != NULL && (fp = fopen(path, "a")) != NULL) {
+ ns_sock_to_str(nc->sock, src, sizeof(src), 3);
+ ns_sock_to_str(nc->sock, dst, sizeof(dst), 7);
+ fprintf(fp, "%lu %p %s %s %s %d\n", (unsigned long) time(NULL),
+ nc->connection_data, src,
+ is_sent == 0 ? "<-" : is_sent == 1 ? "->" :
+ is_sent == 2 ? "<A" : "C>", dst, num_bytes);
+ if (num_bytes > 0 && (buf = (char *) malloc(buf_size)) != NULL) {
+ ns_hexdump(io->buf + (is_sent ? 0 : io->len) - (is_sent ? 0 : num_bytes),
+ num_bytes, buf, buf_size);
+ fprintf(fp, "%s", buf);
+ free(buf);
+ }
+ fclose(fp);
+ }
}
#endif
static void mg_ev_handler(struct ns_connection *nc, enum ns_event ev, void *p) {
- struct connection *conn = (struct connection *) nc->connection_data;
+ struct connection *conn = (struct connection *) nc->connection_data;
#ifndef MONGOOSE_NO_FILESYSTEM
- struct mg_server *server = (struct mg_server *) nc->server;
+ struct mg_server *server = (struct mg_server *) nc->server;
#endif
- // Send NS event to the handler. Note that call_user won't send an event
- // if conn == NULL. Therefore, repeat this for NS_ACCEPT event as well.
+ // Send NS event to the handler. Note that call_user won't send an event
+ // if conn == NULL. Therefore, repeat this for NS_ACCEPT event as well.
#ifdef MONGOOSE_SEND_NS_EVENTS
- {
- struct connection *conn = (struct connection *) nc->connection_data;
- if (conn != NULL) conn->mg_conn.callback_param = p;
- call_user(conn, (enum mg_event) ev);
- }
+ {
+ struct connection *conn = (struct connection *) nc->connection_data;
+ if (conn != NULL) conn->mg_conn.callback_param = p;
+ call_user(conn, (enum mg_event) ev);
+ }
#endif
- switch (ev) {
- case NS_ACCEPT:
- on_accept(nc, (union socket_address *) p);
+ switch (ev) {
+ case NS_ACCEPT:
+ on_accept(nc, (union socket_address *) p);
#ifndef MONGOOSE_NO_FILESYSTEM
- hexdump(nc, server->config_options[HEXDUMP_FILE], 0, 2);
+ hexdump(nc, server->config_options[HEXDUMP_FILE], 0, 2);
#endif
#ifdef MONGOOSE_SEND_NS_EVENTS
- {
- struct connection *conn = (struct connection *) nc->connection_data;
- if (conn != NULL) conn->mg_conn.callback_param = p;
- call_user(conn, (enum mg_event) ev);
- }
+ {
+ struct connection *conn = (struct connection *) nc->connection_data;
+ if (conn != NULL) conn->mg_conn.callback_param = p;
+ call_user(conn, (enum mg_event) ev);
+ }
#endif
- break;
+ break;
- case NS_CONNECT:
- if (nc->connection_data != NULL) {
- set_ips(nc, 1);
- set_ips(nc, 0);
- }
+ case NS_CONNECT:
+ if (nc->connection_data != NULL) {
+ set_ips(nc, 1);
+ set_ips(nc, 0);
+ }
#ifndef MONGOOSE_NO_FILESYSTEM
- hexdump(nc, server->config_options[HEXDUMP_FILE], 0, 3);
+ hexdump(nc, server->config_options[HEXDUMP_FILE], 0, 3);
#endif
- conn->mg_conn.status_code = * (int *) p;
- if (conn->mg_conn.status_code != 0 ||
- (!(nc->flags & MG_PROXY_CONN) &&
- call_user(conn, MG_CONNECT) == MG_FALSE)) {
- nc->flags |= NSF_CLOSE_IMMEDIATELY;
- }
- break;
-
- case NS_RECV:
+ conn->mg_conn.status_code = * (int *) p;
+ if (conn->mg_conn.status_code != 0 ||
+ (!(nc->flags & MG_PROXY_CONN) &&
+ call_user(conn, MG_CONNECT) == MG_FALSE)) {
+ nc->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
+ break;
+
+ case NS_RECV:
#ifndef MONGOOSE_NO_FILESYSTEM
- hexdump(nc, server->config_options[HEXDUMP_FILE], * (int *) p, 0);
+ hexdump(nc, server->config_options[HEXDUMP_FILE], * (int *) p, 0);
#endif
- if (nc->flags & NSF_ACCEPTED) {
- on_recv_data(conn);
+ if (nc->flags & NSF_ACCEPTED) {
+ on_recv_data(conn);
#ifndef MONGOOSE_NO_CGI
- } else if (nc->flags & MG_CGI_CONN) {
- on_cgi_data(nc);
+ } else if (nc->flags & MG_CGI_CONN) {
+ on_cgi_data(nc);
#endif
- } else if (nc->flags & MG_PROXY_CONN) {
- if (conn != NULL) {
- ns_forward(nc, conn->ns_conn);
- }
- } else {
- process_response(conn);
- }
- break;
-
- case NS_SEND:
+ } else if (nc->flags & MG_PROXY_CONN) {
+ if (conn != NULL) {
+ ns_forward(nc, conn->ns_conn);
+ }
+ } else {
+ process_response(conn);
+ }
+ break;
+
+ case NS_SEND:
#ifndef MONGOOSE_NO_FILESYSTEM
- hexdump(nc, server->config_options[HEXDUMP_FILE], * (int *) p, 1);
+ hexdump(nc, server->config_options[HEXDUMP_FILE], * (int *) p, 1);
#endif
- break;
-
- case NS_CLOSE:
- nc->connection_data = NULL;
- if (nc->flags & (MG_CGI_CONN | MG_PROXY_CONN)) {
- DBG(("%p %p closing cgi/proxy conn", conn, nc));
- if (conn && conn->ns_conn) {
- conn->ns_conn->flags &= ~NSF_BUFFER_BUT_DONT_SEND;
- conn->ns_conn->flags |= conn->ns_conn->send_iobuf.len > 0 ?
- NSF_FINISHED_SENDING_DATA : NSF_CLOSE_IMMEDIATELY;
- conn->endpoint.nc = NULL;
- }
- } else if (conn != NULL) {
- DBG(("%p %p %d closing", conn, nc, conn->endpoint_type));
-
- if (conn->endpoint_type == EP_CLIENT && nc->recv_iobuf.len > 0) {
- call_http_client_handler(conn);
- }
-
- call_user(conn, MG_CLOSE);
- close_local_endpoint(conn);
- conn->ns_conn = NULL;
- free(conn);
- }
- break;
-
- case NS_POLL:
- if (call_user(conn, MG_POLL) == MG_TRUE) {
- if (conn->ns_conn->flags & MG_HEADERS_SENT) {
- write_terminating_chunk(conn);
- }
- close_local_endpoint(conn);
- }
-
- if (conn != NULL && conn->endpoint_type == EP_FILE) {
- transfer_file_data(conn);
- }
-
- // Expire idle connections
- {
- time_t current_time = * (time_t *) p;
-
- if (conn != NULL && conn->mg_conn.is_websocket) {
- ping_idle_websocket_connection(conn, current_time);
- }
-
- if (nc->last_io_time + MONGOOSE_IDLE_TIMEOUT_SECONDS < current_time) {
- mg_ev_handler(nc, NS_CLOSE, NULL);
- nc->flags |= NSF_CLOSE_IMMEDIATELY;
- }
- }
- break;
-
- default:
- break;
- }
+ break;
+
+ case NS_CLOSE:
+ nc->connection_data = NULL;
+ if (nc->flags & (MG_CGI_CONN | MG_PROXY_CONN)) {
+ DBG(("%p %p closing cgi/proxy conn", conn, nc));
+ if (conn && conn->ns_conn) {
+ conn->ns_conn->flags &= ~NSF_BUFFER_BUT_DONT_SEND;
+ conn->ns_conn->flags |= conn->ns_conn->send_iobuf.len > 0 ?
+ NSF_FINISHED_SENDING_DATA : NSF_CLOSE_IMMEDIATELY;
+ conn->endpoint.nc = NULL;
+ }
+ } else if (conn != NULL) {
+ DBG(("%p %p %d closing", conn, nc, conn->endpoint_type));
+
+ if (conn->endpoint_type == EP_CLIENT && nc->recv_iobuf.len > 0) {
+ call_http_client_handler(conn);
+ }
+
+ call_user(conn, MG_CLOSE);
+ close_local_endpoint(conn);
+ conn->ns_conn = NULL;
+ free(conn);
+ }
+ break;
+
+ case NS_POLL:
+ if (call_user(conn, MG_POLL) == MG_TRUE) {
+ if (conn->ns_conn->flags & MG_HEADERS_SENT) {
+ write_terminating_chunk(conn);
+ }
+ close_local_endpoint(conn);
+ }
+
+ if (conn != NULL && conn->endpoint_type == EP_FILE) {
+ transfer_file_data(conn);
+ }
+
+ // Expire idle connections
+ {
+ time_t current_time = * (time_t *) p;
+
+ if (conn != NULL && conn->mg_conn.is_websocket) {
+ ping_idle_websocket_connection(conn, current_time);
+ }
+
+ if (nc->last_io_time + MONGOOSE_IDLE_TIMEOUT_SECONDS < current_time) {
+ mg_ev_handler(nc, NS_CLOSE, NULL);
+ nc->flags |= NSF_CLOSE_IMMEDIATELY;
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
}
static void iter2(struct ns_connection *nc, enum ns_event ev, void *param) {
- mg_handler_t func = NULL;
- struct connection *conn = (struct connection *) nc->connection_data;
- const char *msg = (const char *) param;
- int n;
- (void) ev;
+ mg_handler_t func = NULL;
+ struct connection *conn = (struct connection *) nc->connection_data;
+ const char *msg = (const char *) param;
+ int n;
+ (void) ev;
- //DBG(("%p [%s]", conn, msg));
- if (sscanf(msg, "%p %n", &func, &n) && func != NULL) {
- conn->mg_conn.callback_param = (void *) (msg + n);
- func(&conn->mg_conn, MG_POLL);
- }
+ //DBG(("%p [%s]", conn, msg));
+ if (sscanf(msg, "%p %n", &func, &n) && func != NULL) {
+ conn->mg_conn.callback_param = (void *) (msg + n);
+ func(&conn->mg_conn, MG_POLL);
+ }
}
void mg_wakeup_server_ex(struct mg_server *server, mg_handler_t cb,
- const char *fmt, ...) {
- va_list ap;
- char buf[8 * 1024];
- int len;
+ const char *fmt, ...) {
+ va_list ap;
+ char buf[8 * 1024];
+ int len;
- // Encode callback (cb) into a buffer
- len = snprintf(buf, sizeof(buf), "%p ", cb);
- va_start(ap, fmt);
- len += vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
- va_end(ap);
+ // Encode callback (cb) into a buffer
+ len = snprintf(buf, sizeof(buf), "%p ", cb);
+ va_start(ap, fmt);
+ len += vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
+ va_end(ap);
- // "len + 1" is to include terminating \0 in the message
- ns_server_wakeup_ex(&server->ns_server, iter2, buf, len + 1);
+ // "len + 1" is to include terminating \0 in the message
+ ns_server_wakeup_ex(&server->ns_server, iter2, buf, len + 1);
}
void mg_wakeup_server(struct mg_server *server) {
- ns_server_wakeup_ex(&server->ns_server, NULL, (void *) "", 0);
+ ns_server_wakeup_ex(&server->ns_server, NULL, (void *) "", 0);
}
void mg_set_listening_socket(struct mg_server *server, int sock) {
- if (server->ns_server.listening_sock != INVALID_SOCKET) {
- closesocket(server->ns_server.listening_sock);
- }
- server->ns_server.listening_sock = (sock_t) sock;
+ if (server->ns_server.listening_sock != INVALID_SOCKET) {
+ closesocket(server->ns_server.listening_sock);
+ }
+ server->ns_server.listening_sock = (sock_t) sock;
}
int mg_get_listening_socket(struct mg_server *server) {
- return server->ns_server.listening_sock;
+ return server->ns_server.listening_sock;
}
const char *mg_get_option(const struct mg_server *server, const char *name) {
- const char **opts = (const char **) server->config_options;
- int i = get_option_index(name);
- return i == -1 ? NULL : opts[i] == NULL ? "" : opts[i];
+ const char **opts = (const char **) server->config_options;
+ int i = get_option_index(name);
+ return i == -1 ? NULL : opts[i] == NULL ? "" : opts[i];
}
struct mg_server *mg_create_server(void *server_data, mg_handler_t handler) {
- struct mg_server *server = (struct mg_server *) calloc(1, sizeof(*server));
- ns_server_init(&server->ns_server, server_data, mg_ev_handler);
- set_default_option_values(server->config_options);
- server->event_handler = handler;
- return server;
+ struct mg_server *server = (struct mg_server *) calloc(1, sizeof(*server));
+ ns_server_init(&server->ns_server, server_data, mg_ev_handler);
+ set_default_option_values(server->config_options);
+ server->event_handler = handler;
+ return server;
}
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 004360a138d..0e18499ae89 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -104,7 +104,7 @@ static const char *const register_names[] =
* Initialization
*
*************************************/
-
+
const device_type ATARI_CAGE = &device_creator<atari_cage_device>;
@@ -581,7 +581,6 @@ void atari_cage_device::control_w(UINT16 data)
WRITE32_MEMBER( atari_cage_device::speedup_w )
{
-
space.device().execute().eat_cycles(100);
COMBINE_DATA(&m_speedup_ram[offset]);
}
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index c6e72571138..c4b3305f399 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -1421,8 +1421,8 @@ MACHINE_CONFIG_FRAGMENT( demon_sound )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay3", AY8910, 3579545)
-
-
+
+
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(cinemat_state, sound_output_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index b0cce78d423..8c880f1e5ee 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -779,7 +779,7 @@ void dcs_audio_device::dcs_register_state()
machine().save().register_postload(save_prepost_delegate(FUNC(dcs_audio_device::sdrc_remap_memory), this));
}
-
+
//-------------------------------------------------
// dcs_audio_device - constructor
//-------------------------------------------------
@@ -911,7 +911,7 @@ void dcs2_audio_device::device_start()
}
if (m_cpu != NULL && !m_cpu->started())
throw device_missing_dependencies();
-
+
m_program = &m_cpu->space(AS_PROGRAM);
m_data = &m_cpu->space(AS_DATA);
m_channels = 2;
@@ -1450,7 +1450,7 @@ void dcs_audio_device::reset_w(int state)
/* going high halts the CPU */
if (state)
{
- // logerror("%s: DCS reset = %d\n", machine().describe_context(), state);
+ // logerror("%s: DCS reset = %d\n", machine().describe_context(), state);
/* just run through the init code again */
machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::dcs_reset),this));
@@ -2444,7 +2444,7 @@ dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type
{
}
-
+
const device_type DCS2_AUDIO_2115 = &device_creator<dcs2_audio_2115_device>;
//-------------------------------------------------
@@ -2509,5 +2509,3 @@ machine_config_constructor dcs2_audio_denver_device::device_mconfig_additions()
{
return MACHINE_CONFIG_NAME( dcs2_audio_denver );
}
-
-
diff --git a/src/mame/audio/midway.c b/src/mame/audio/midway.c
index b9880422fee..320b45c3c0f 100644
--- a/src/mame/audio/midway.c
+++ b/src/mame/audio/midway.c
@@ -384,15 +384,15 @@ static MACHINE_CONFIG_FRAGMENT( midway_ssio )
MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, SSIO_CLOCK/2/16/10)
MCFG_SOUND_ADD("ay0", AY8910, SSIO_CLOCK/2/4)
-
-
+
+
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(midway_ssio_device, porta0_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(midway_ssio_device, portb0_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.33, 0)
MCFG_SOUND_ADD("ay1", AY8910, SSIO_CLOCK/2/4)
-
-
+
+
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(midway_ssio_device, porta1_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(midway_ssio_device, portb1_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.33, 1)
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 7ef2d4b2db8..616e727562b 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -84,11 +84,11 @@ static NETLIST_START(nl_1942)
SOLVER(Solver, 48000)
ANALOG_INPUT(V5, 5)
- PARAM(Solver.ACCURACY, 1e-6)
- PARAM(Solver.GS_LOOPS, 6)
- PARAM(Solver.SOR_FACTOR, 1.0)
- //PARAM(Solver.DYNAMIC_TS, 1)
- //PARAM(Solver.LTE, 5e-8)
+ PARAM(Solver.ACCURACY, 1e-6)
+ PARAM(Solver.GS_LOOPS, 6)
+ PARAM(Solver.SOR_FACTOR, 1.0)
+ //PARAM(Solver.DYNAMIC_TS, 1)
+ //PARAM(Solver.LTE, 5e-8)
/* AY 8910 internal resistors */
@@ -143,9 +143,9 @@ static NETLIST_START(nl_1942)
NET_C(CC6.1, VR.2)
NET_C(CC6.2, R1.1)
- CAP(CC3, 220e-6)
- NET_C(R1.2, CC3.1)
- NET_C(CC3.2, GND)
+ CAP(CC3, 220e-6)
+ NET_C(R1.2, CC3.1)
+ NET_C(CC3.2, GND)
NETLIST_END()
@@ -556,23 +556,23 @@ static MACHINE_CONFIG_START( 1942, _1942_state )
MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
- MCFG_AY8910_RES_LOADS(10000.0, 10000.0, 10000.0)
-
+ MCFG_AY8910_RES_LOADS(10000.0, 10000.0, 10000.0)
+
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 0)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 1)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 2)
MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
- MCFG_AY8910_RES_LOADS(10000.0, 10000.0, 10000.0)
-
+ MCFG_AY8910_RES_LOADS(10000.0, 10000.0, 10000.0)
+
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 3)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 4)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 5)
/* NETLIST configuration using internal AY8910 resistor values */
- /* Minimize resampling between ay8910 and netlist */
+ /* Minimize resampling between ay8910 and netlist */
MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, AUDIO_CLOCK / 8 / 2)
MCFG_NETLIST_SETUP(nl_1942)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
@@ -921,7 +921,7 @@ DRIVER_INIT_MEMBER(_1942_state,1942)
GAME( 1984, 1942, 0, 1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (Revision B)", GAME_SUPPORTS_SAVE )
GAME( 1984, 1942a, 1942, 1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (Revision A)", GAME_SUPPORTS_SAVE )
GAME( 1984, 1942abl, 1942, 1942, 1942, _1942_state, 1942, ROT270, "bootleg", "1942 (Revision A, bootleg)", GAME_SUPPORTS_SAVE ) // data is the same as 1942a set, different rom format
-GAME( 198?, 1942h, 1942, 1942, 1942, _1942_state, 1942, ROT270, "hack (Two Bit Score?)", "42", GAME_SUPPORTS_SAVE )
+GAME( 198?, 1942h, 1942, 1942, 1942, _1942_state, 1942, ROT270, "hack (Two Bit Score?)", "42", GAME_SUPPORTS_SAVE )
GAME( 1984, 1942b, 1942, 1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (First Version)", GAME_SUPPORTS_SAVE )
GAME( 1985, 1942w, 1942, 1942, 1942, _1942_state, 1942, ROT270, "Capcom (Williams Electronics license)", "1942 (Williams Electronics license)", GAME_SUPPORTS_SAVE ) /* Based on 1942 (Revision B) */
GAME( 1984, 1942p, 1942, 1942p,1942p,_1942_state, 1942, ROT270, "Capcom", "1942 (prototype)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 9dab2419e02..17332ac03f1 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -3340,7 +3340,7 @@ ROM_START( sinvemag )
ROM_LOAD( "emag_si.e", 0x1800, 0x0400, CRC(c4e80586) SHA1(3d427d5a2eea3c911ec7bd055e06e6747ce5e84d) )
ROM_LOAD( "emag_si.f", 0x1c00, 0x0400, CRC(077f5ef2) SHA1(625de6839073ac4c904f949efc1b2e0afea5d676) )
ROM_END
-
+
ROM_START( tst_invd )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "test.h", 0x0000, 0x0800, CRC(f86a2eea) SHA1(4a72ff01f3e6d16bbe9bf7f123cd98895bfbed9a) ) /* The Test ROM */
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 624bcd4c31e..41e4752b6f5 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -380,7 +380,7 @@ ROM_START( 88games )
ROM_LOAD32_BYTE( "861a09.b", 0x040002, 0x10000, CRC(4917158d) SHA1(b53da3f29c9aeb59933dc3a8214cc1314e21000b) )
ROM_LOAD32_BYTE( "861a09.d", 0x040003, 0x10000, CRC(2bb3282c) SHA1(6ca54948a02c91543b7e595641b0edc2564f83ff) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "861a05.a", 0x000000, 0x10000, CRC(cedc19d0) SHA1(6eb2a292d574dee06e214e61c0e08fa233ac68e8) )
ROM_LOAD32_BYTE( "861a05.e", 0x000001, 0x10000, CRC(725af3fc) SHA1(98ac364db4b2c5682a299f4d2a288ebc8a303b1f) )
ROM_LOAD32_BYTE( "861a06.a", 0x000002, 0x10000, CRC(85e2e30e) SHA1(11010727db8c71650c5b9df5340f9bc412435d11) )
@@ -398,7 +398,7 @@ ROM_START( 88games )
ROM_LOAD32_BYTE( "861a06.d", 0x0c0002, 0x10000, CRC(bc70ab39) SHA1(a6fa0502ceb6862e7b1e4815326e268fd6511881) )
ROM_LOAD32_BYTE( "861a06.h", 0x0c0003, 0x10000, CRC(d906b79b) SHA1(905814ce708d80fd4d1a398f60faa0bc680fccaf) )
- ROM_REGION( 0x040000, "k051316", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x040000, "k051316", 0 ) /* zoom/rotate */
ROM_LOAD( "861a04.a", 0x000000, 0x10000, CRC(092a8b15) SHA1(d98a81bfa4bba73805f0236f8a80da130fcb378d) )
ROM_LOAD( "861a04.b", 0x010000, 0x10000, CRC(75744b56) SHA1(5133d8f6622796ed6b9e6a0d0f1df28f00331fc7) )
ROM_LOAD( "861a04.c", 0x020000, 0x10000, CRC(a00021c5) SHA1(f73f88af33387d73b4262e8652507e699926fabe) )
@@ -434,7 +434,7 @@ ROM_START( konami88 )
ROM_LOAD32_BYTE( "861a09.b", 0x040002, 0x10000, CRC(4917158d) SHA1(b53da3f29c9aeb59933dc3a8214cc1314e21000b) )
ROM_LOAD32_BYTE( "861a09.d", 0x040003, 0x10000, CRC(2bb3282c) SHA1(6ca54948a02c91543b7e595641b0edc2564f83ff) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "861a05.a", 0x000000, 0x10000, CRC(cedc19d0) SHA1(6eb2a292d574dee06e214e61c0e08fa233ac68e8) )
ROM_LOAD32_BYTE( "861a05.e", 0x000001, 0x10000, CRC(725af3fc) SHA1(98ac364db4b2c5682a299f4d2a288ebc8a303b1f) )
ROM_LOAD32_BYTE( "861a06.a", 0x000002, 0x10000, CRC(85e2e30e) SHA1(11010727db8c71650c5b9df5340f9bc412435d11) )
@@ -452,7 +452,7 @@ ROM_START( konami88 )
ROM_LOAD32_BYTE( "861a06.d", 0x0c0002, 0x10000, CRC(bc70ab39) SHA1(a6fa0502ceb6862e7b1e4815326e268fd6511881) )
ROM_LOAD32_BYTE( "861a06.h", 0x0c0003, 0x10000, CRC(d906b79b) SHA1(905814ce708d80fd4d1a398f60faa0bc680fccaf) )
- ROM_REGION( 0x040000, "k051316", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x040000, "k051316", 0 ) /* zoom/rotate */
ROM_LOAD( "861a04.a", 0x000000, 0x10000, CRC(092a8b15) SHA1(d98a81bfa4bba73805f0236f8a80da130fcb378d) )
ROM_LOAD( "861a04.b", 0x010000, 0x10000, CRC(75744b56) SHA1(5133d8f6622796ed6b9e6a0d0f1df28f00331fc7) )
ROM_LOAD( "861a04.c", 0x020000, 0x10000, CRC(a00021c5) SHA1(f73f88af33387d73b4262e8652507e699926fabe) )
@@ -488,7 +488,7 @@ ROM_START( hypsptsp )
ROM_LOAD32_BYTE( "861a09.b", 0x040002, 0x10000, CRC(4917158d) SHA1(b53da3f29c9aeb59933dc3a8214cc1314e21000b) )
ROM_LOAD32_BYTE( "861a09.d", 0x040003, 0x10000, CRC(2bb3282c) SHA1(6ca54948a02c91543b7e595641b0edc2564f83ff) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "861a05.a", 0x000000, 0x10000, CRC(cedc19d0) SHA1(6eb2a292d574dee06e214e61c0e08fa233ac68e8) )
ROM_LOAD32_BYTE( "861a05.e", 0x000001, 0x10000, CRC(725af3fc) SHA1(98ac364db4b2c5682a299f4d2a288ebc8a303b1f) )
ROM_LOAD32_BYTE( "861a06.a", 0x000002, 0x10000, CRC(85e2e30e) SHA1(11010727db8c71650c5b9df5340f9bc412435d11) )
@@ -506,7 +506,7 @@ ROM_START( hypsptsp )
ROM_LOAD32_BYTE( "861a06.d", 0x0c0002, 0x10000, CRC(bc70ab39) SHA1(a6fa0502ceb6862e7b1e4815326e268fd6511881) )
ROM_LOAD32_BYTE( "861a06.h", 0x0c0003, 0x10000, CRC(d906b79b) SHA1(905814ce708d80fd4d1a398f60faa0bc680fccaf) )
- ROM_REGION( 0x040000, "k051316", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x040000, "k051316", 0 ) /* zoom/rotate */
ROM_LOAD( "861a04.a", 0x000000, 0x10000, CRC(092a8b15) SHA1(d98a81bfa4bba73805f0236f8a80da130fcb378d) )
ROM_LOAD( "861a04.b", 0x010000, 0x10000, CRC(75744b56) SHA1(5133d8f6622796ed6b9e6a0d0f1df28f00331fc7) )
ROM_LOAD( "861a04.c", 0x020000, 0x10000, CRC(a00021c5) SHA1(f73f88af33387d73b4262e8652507e699926fabe) )
diff --git a/src/mame/drivers/aces1.c b/src/mame/drivers/aces1.c
index c0a64402644..72b7c1af982 100644
--- a/src/mame/drivers/aces1.c
+++ b/src/mame/drivers/aces1.c
@@ -260,21 +260,21 @@ static MACHINE_CONFIG_START( aces1, aces1_state )
// 0xafb0 IC24 - lamps, 7segs
MCFG_DEVICE_ADD("ic24", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(aces1_state, ic24_write_a)) // 7segs
- MCFG_I8255_OUT_PORTB_CB(WRITE8(aces1_state, ic24_write_b)) // lamps
- MCFG_I8255_OUT_PORTC_CB(WRITE8(aces1_state, ic24_write_c)) // strobe
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(aces1_state, ic24_write_a)) // 7segs
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(aces1_state, ic24_write_b)) // lamps
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(aces1_state, ic24_write_c)) // strobe
// 0xafd0 IC25 - lamps, meters, reel comms (writes)
MCFG_DEVICE_ADD("ic25", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(aces1_state, ic25_write_a)) // extra lamps
- MCFG_I8255_OUT_PORTB_CB(WRITE8(aces1_state, ic25_write_b)) // meters, extra lamp select
- MCFG_I8255_OUT_PORTC_CB(WRITE8(aces1_state, ic25_write_c)) // reel write, extra lamp strobe
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(aces1_state, ic25_write_a)) // extra lamps
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(aces1_state, ic25_write_b)) // meters, extra lamp select
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(aces1_state, ic25_write_c)) // reel write, extra lamp strobe
// 0xafe0 IC37 - doors, coins, reel optics (reads)
MCFG_DEVICE_ADD("ic37", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(aces1_state, ic37_read_a)) // extra lamps
- MCFG_I8255_IN_PORTB_CB(READ8(aces1_state, ic37_read_b)) // meters, extra lamp select
- MCFG_I8255_IN_PORTC_CB(READ8(aces1_state, ic37_read_c)) // reel write, extra lamp strobe
+ MCFG_I8255_IN_PORTA_CB(READ8(aces1_state, ic37_read_a)) // extra lamps
+ MCFG_I8255_IN_PORTB_CB(READ8(aces1_state, ic37_read_b)) // meters, extra lamp select
+ MCFG_I8255_IN_PORTC_CB(READ8(aces1_state, ic37_read_c)) // reel write, extra lamp strobe
MCFG_DEFAULT_LAYOUT(layout_aces1)
@@ -337,8 +337,8 @@ ROM_START( ac1taklv )
ROM_END
ROM_START( ac1cshtw ) // Cash Towers, same ROM as above, original machine apparently plays the same, reskinned machine?
- ROM_REGION( 0x8000, "maincpu", 0 )
- ROM_LOAD( "ctp1.bin", 0x0000, 0x8000, CRC(2fabb08f) SHA1(b737930e428f9258ab22394229c2b5039edf8f97) )
+ ROM_REGION( 0x8000, "maincpu", 0 )
+ ROM_LOAD( "ctp1.bin", 0x0000, 0x8000, CRC(2fabb08f) SHA1(b737930e428f9258ab22394229c2b5039edf8f97) )
ROM_END
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 6a009308d58..86fdbe0c01a 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -259,7 +259,7 @@ ROM_START( ajax )
ROM_LOAD32_BYTE( "770c12-b.e5", 0x040002, 0x010000, CRC(5f221cc6) SHA1(9a7a9c7853a3b582c4034b773cef08aee5391d6e) )
ROM_LOAD32_BYTE( "770c12-d.e6", 0x040003, 0x010000, CRC(f1edb2f4) SHA1(3e66cc711e25cbf6e6a747d43a9efec0710d5b7a) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "770c09-a.f8", 0x000000, 0x010000, CRC(76690fb8) SHA1(afe267a37b65d63d3765dc3b88d8a8262446f786) )
ROM_LOAD32_BYTE( "770c09-e.f9", 0x000001, 0x010000, CRC(17b482c9) SHA1(3535197956f5bf5b564fec1ddbb3e3ea3bf1f7bd) )
ROM_LOAD32_BYTE( "770c08-a.f10", 0x000002, 0x010000, CRC(efd29a56) SHA1(2a9f138d1242a35162a3f092b0343dff899e3b83) )
@@ -277,7 +277,7 @@ ROM_START( ajax )
ROM_LOAD32_BYTE( "770c08-d.c10", 0x0c0002, 0x010000, CRC(91591777) SHA1(53f416a51f7075f070168bced7b6f925f54c7b84) )
ROM_LOAD32_BYTE( "770c08-h.c11", 0x0c0003, 0x010000, CRC(d97d4b15) SHA1(e3d7d7adeec8c8c808acb9f84641fd3a6bf249be) )
- ROM_REGION( 0x080000, "k051316", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x080000, "k051316", 0 ) /* zoom/rotate */
ROM_LOAD( "770c06.f4", 0x000000, 0x040000, CRC(d0c592ee) SHA1(c1be73dd259f2779d715659b177e47513776a0d4) )
ROM_LOAD( "770c07.h4", 0x040000, 0x040000, CRC(0b399fb1) SHA1(fbe26f9aa9a655d08bebcdd79719d35134ca4dd5) )
@@ -319,11 +319,11 @@ ROM_START( typhoon )
ROM_LOAD32_WORD( "770c13.n22", 0x000000, 0x040000, CRC(b859ca4e) SHA1(f58678d503683f78cca0d5ed2d79f6f68ab3495a) )
ROM_LOAD32_WORD( "770c12.k22", 0x000002, 0x040000, CRC(50d14b72) SHA1(e3ff4a5aeefa6c10b5f7fec18297948b7c5acfdf) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "770c09.n4", 0x000000, 0x080000, CRC(1ab4a7ff) SHA1(fa007b41027f95d29d2a9f931a2fe235844db637) )
ROM_LOAD32_WORD( "770c08.k4", 0x000002, 0x080000, CRC(a8e80586) SHA1(0401f59baa691905287cef94427f39e0c3f0adc6) )
- ROM_REGION( 0x080000, "k051316", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x080000, "k051316", 0 ) /* zoom/rotate */
ROM_LOAD( "770c06.f4", 0x000000, 0x040000, CRC(d0c592ee) SHA1(c1be73dd259f2779d715659b177e47513776a0d4) )
ROM_LOAD( "770c07.h4", 0x040000, 0x040000, CRC(0b399fb1) SHA1(fbe26f9aa9a655d08bebcdd79719d35134ca4dd5) )
@@ -355,11 +355,11 @@ ROM_START( ajaxj )
ROM_LOAD32_WORD( "770c13.n22", 0x000000, 0x040000, CRC(b859ca4e) SHA1(f58678d503683f78cca0d5ed2d79f6f68ab3495a) )
ROM_LOAD32_WORD( "770c12.k22", 0x000002, 0x040000, CRC(50d14b72) SHA1(e3ff4a5aeefa6c10b5f7fec18297948b7c5acfdf) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "770c09.n4", 0x000000, 0x080000, CRC(1ab4a7ff) SHA1(fa007b41027f95d29d2a9f931a2fe235844db637) )
ROM_LOAD32_WORD( "770c08.k4", 0x000002, 0x080000, CRC(a8e80586) SHA1(0401f59baa691905287cef94427f39e0c3f0adc6) )
- ROM_REGION( 0x080000, "k051316", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x080000, "k051316", 0 ) /* zoom/rotate */
ROM_LOAD( "770c06.f4", 0x000000, 0x040000, CRC(d0c592ee) SHA1(c1be73dd259f2779d715659b177e47513776a0d4) )
ROM_LOAD( "770c07.h4", 0x040000, 0x040000, CRC(0b399fb1) SHA1(fbe26f9aa9a655d08bebcdd79719d35134ca4dd5) )
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index cce78fe7c14..d4d9194079e 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -267,7 +267,7 @@ ROM_START( aliens )
ROM_LOAD32_WORD( "875b08.j19", 0x100002, 0x40000, CRC(f9387966) SHA1(470ecc4a5a3edd08d5e0ab10b0c590db1968fb0a) )
/* second half empty */
- ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
ROM_LOAD32_WORD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
ROM_LOAD32_WORD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
@@ -299,7 +299,7 @@ ROM_START( aliens2 )
/* second half empty */
- ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
ROM_LOAD32_WORD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
ROM_LOAD32_WORD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
@@ -330,7 +330,7 @@ ROM_START( aliens3 )
ROM_LOAD32_WORD( "875b08.j19", 0x100002, 0x40000, CRC(f9387966) SHA1(470ecc4a5a3edd08d5e0ab10b0c590db1968fb0a) )
/* second half empty */
- ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
ROM_LOAD32_WORD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
ROM_LOAD32_WORD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
@@ -361,7 +361,7 @@ ROM_START( aliensu )
ROM_LOAD32_WORD( "875b08.j19", 0x100002, 0x40000, CRC(f9387966) SHA1(470ecc4a5a3edd08d5e0ab10b0c590db1968fb0a) )
/* second half empty */
- ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
ROM_LOAD32_WORD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
ROM_LOAD32_WORD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
@@ -392,7 +392,7 @@ ROM_START( aliensj )
ROM_LOAD32_WORD( "875b08.j19", 0x100002, 0x40000, CRC(f9387966) SHA1(470ecc4a5a3edd08d5e0ab10b0c590db1968fb0a) )
/* second half empty */
- ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
ROM_LOAD32_WORD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
ROM_LOAD32_WORD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
@@ -423,7 +423,7 @@ ROM_START( aliensj2 )
ROM_LOAD32_WORD( "875b08.j19", 0x100002, 0x40000, CRC(f9387966) SHA1(470ecc4a5a3edd08d5e0ab10b0c590db1968fb0a) )
/* second half empty */
- ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
ROM_LOAD32_WORD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
ROM_LOAD32_WORD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
@@ -454,7 +454,7 @@ ROM_START( aliensa )
ROM_LOAD32_WORD( "875b08.j19", 0x100002, 0x40000, CRC(f9387966) SHA1(470ecc4a5a3edd08d5e0ab10b0c590db1968fb0a) )
/* second half empty */
- ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x200000, "k051960", 0 ) /* sprites */
ROM_LOAD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
ROM_LOAD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
ROM_LOAD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index c02072b31a8..c327fb6bdbb 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -3118,7 +3118,7 @@ ROM_START( gangwarsj )
ROM_LOAD( "gw-5.21f", 0x080000, 0x20000, CRC(9ef36031) SHA1(2faeb6a769991ab11403c6c37507b706a61bad69) )
ROM_LOAD( "guernica-c2.18h", 0x100000, 0x80000, CRC(2fcbea97) SHA1(eb60bf374ef771e379030d2b660a813be76bed5e) )
ROM_LOAD( "gw-6.20f", 0x180000, 0x20000, CRC(ddbbcda7) SHA1(1c368ad2a4ed31748c94545fc7c808aa53d76f64) )
- ROM_LOAD( "guernica-c1.20h", 0x200000, 0x80000, CRC(b0fd1c23) SHA1(a6dbed81b751c1f662f63a7426d8333aca866d79) )
+ ROM_LOAD( "guernica-c1.20h", 0x200000, 0x80000, CRC(b0fd1c23) SHA1(a6dbed81b751c1f662f63a7426d8333aca866d79) )
ROM_LOAD( "gw-7.18f", 0x280000, 0x20000, CRC(4656d377) SHA1(67d6f714cca3891be0173c543ece5e8ab699f645) )
ROM_LOAD( "guernica-c0.21h", 0x300000, 0x80000, CRC(e60c9882) SHA1(8cf1d9cf0db72977b303fd6b469611600631ab9a) )
ROM_LOAD( "gw-8.17f", 0x380000, 0x20000, CRC(798ed82a) SHA1(1932131e05aae0a77ba8d8ef947c1a3b0b5e3d43) )
@@ -3151,7 +3151,7 @@ ROM_START( gangwarsu )
ROM_LOAD( "u5", 0x080000, 0x20000, CRC(94612190) SHA1(dd7818744b1b6738d268044f13e0647e7a3b2d1e) ) // this set of u5,u6,u7,u8 have a one-way sign, used on stage 3
ROM_LOAD( "guernica-c2.18h", 0x100000, 0x80000, CRC(2fcbea97) SHA1(eb60bf374ef771e379030d2b660a813be76bed5e) )
ROM_LOAD( "u6", 0x180000, 0x20000, CRC(5a4ea0f0) SHA1(7ea8b3f66f32ab9b33a522edca6d5c6416fd7a9b) )
- ROM_LOAD( "guernica-c1.20h", 0x200000, 0x80000, CRC(b0fd1c23) SHA1(a6dbed81b751c1f662f63a7426d8333aca866d79) )
+ ROM_LOAD( "guernica-c1.20h", 0x200000, 0x80000, CRC(b0fd1c23) SHA1(a6dbed81b751c1f662f63a7426d8333aca866d79) )
ROM_LOAD( "u7", 0x280000, 0x20000, CRC(33f324cb) SHA1(c00f55ce85749cbbb9569a22cc6c9c886ed9ab78) )
ROM_LOAD( "guernica-c0.21h", 0x300000, 0x80000, CRC(e60c9882) SHA1(8cf1d9cf0db72977b303fd6b469611600631ab9a) )
ROM_LOAD( "u8", 0x380000, 0x20000, CRC(c1995c2c) SHA1(909e1070b4ec28a1f4a2cd9fbc3bde781ffbdda8) )
diff --git a/src/mame/drivers/alvg.c b/src/mame/drivers/alvg.c
index 5c0cd3bc214..dfbb3c39a34 100644
--- a/src/mame/drivers/alvg.c
+++ b/src/mame/drivers/alvg.c
@@ -204,7 +204,7 @@ ROM_START(mystcasta)
ROM_LOAD("u5.bin", 0x00000, 0x40000, CRC(e5126980) SHA1(2c6d412c87bf27098dae4351958d84e8f9348423))
ROM_RELOAD( 0x80000, 0x40000)
ROM_LOAD("u6.bin", 0x40000, 0x40000, CRC(eb241633) SHA1(8e5db75b32ed2ea74088615bbe1403d4c8feafbd))
- ROM_RELOAD( 0xc0000, 0x40000)
+ ROM_RELOAD( 0xc0000, 0x40000)
ROM_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index 657b7a54708..f6959e1faa4 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -835,7 +835,7 @@ static MACHINE_CONFIG_START( amaticmg, amaticmg_state )
MCFG_I8255_IN_PORTB_CB(IOPORT("SW1"))
MCFG_I8255_OUT_PORTC_CB(WRITE8(amaticmg_state, out_c_w))
-// MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
+// MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/arachnid.c b/src/mame/drivers/arachnid.c
index f671962f80f..7a39aa2ff55 100644
--- a/src/mame/drivers/arachnid.c
+++ b/src/mame/drivers/arachnid.c
@@ -436,7 +436,7 @@ static MACHINE_CONFIG_START( arachnid, arachnid_state )
// video hardware
MCFG_DEVICE_ADD( TMS9118_TAG, TMS9118, XTAL_10_738635MHz / 2 )
- MCFG_TMS9928A_VRAM_SIZE(0x4000)
+ MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(M6809_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TMS9118_TAG, tms9118_device, screen_update )
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 44f2650fab8..35bc9e90cf7 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -337,7 +337,7 @@ WRITE8_MEMBER(astinvad_state::kamikaze_sound1_w)
// d4: bonus sound generator
// d5: sound enabled
// other bits: unused
-
+
int bits_gone_hi = data & ~m_sound_state[0];
m_sound_state[0] = data;
@@ -347,7 +347,7 @@ WRITE8_MEMBER(astinvad_state::kamikaze_sound1_w)
if (bits_gone_hi & 0x04) m_samples->start(2, SND_BASEHIT);
if (bits_gone_hi & 0x08) m_samples->start(3, SND_INVADERHIT);
if (bits_gone_hi & 0x10) m_samples->start(3, SND_INVADERHIT);
-
+
machine().sound().system_enable(data & 0x20);
}
@@ -671,7 +671,7 @@ static MACHINE_CONFIG_DERIVED( spcking2, kamikaze )
MCFG_I8255_OUT_PORTA_CB(WRITE8(astinvad_state, spcking2_sound1_w))
MCFG_I8255_OUT_PORTB_CB(WRITE8(astinvad_state, spcking2_sound2_w))
MCFG_I8255_OUT_PORTC_CB(WRITE8(astinvad_state, spcking2_sound3_w))
-
+
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 16, 240)
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index c5d88c1edd5..d93748a3ce3 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -1161,7 +1161,7 @@ ROM_START( acombat3 )
ROM_LOAD( "c.bin", 0xe400, 0x0400, CRC(0101ab24) SHA1(90e99001ef6890fbc76b4f58cc54df12dfa79e2e) )
ROM_LOAD( "b(__acombat3).bin", 0xe800, 0x0400, CRC(4b847950) SHA1(49de63ac72dff22b962fc7b8d7b1c97939072b4a) ) // b.bin
ROM_LOAD( "a(__acombat3).bin", 0xec00, 0x0400, CRC(7eb7969b) SHA1(1aaf7af67b544d01a66a1f3d0eda8d42d2c5bb5d) ) // a.bin
- ROM_LOAD( "j.bin", 0xf000, 0x0400, CRC(a7e2b47e) SHA1(97eda53dfc7f1914f7df36c13747d1d824b62734) )
+ ROM_LOAD( "j.bin", 0xf000, 0x0400, CRC(a7e2b47e) SHA1(97eda53dfc7f1914f7df36c13747d1d824b62734) )
ROM_LOAD( "h.bin", 0xf400, 0x0400, CRC(261ca943) SHA1(17136843f74d2236a5f81f2261b166c02dde138d) )
ROM_LOAD( "f.bin", 0xf800, 0x0400, CRC(6ce39b64) SHA1(ba99ddc2d1208afd3f27a9749dac1faca645bbdc) )
ROM_LOAD( "e.bin", 0xfc00, 0x0400, CRC(2acae469) SHA1(80019bc645a9919f9ec455452ea3e588d61a563f) )
diff --git a/src/mame/drivers/atari_s1.c b/src/mame/drivers/atari_s1.c
index 9b56e920cdd..801fff79249 100644
--- a/src/mame/drivers/atari_s1.c
+++ b/src/mame/drivers/atari_s1.c
@@ -322,13 +322,13 @@ ROM_END
#if 0
*-------------------------------------------------------------------
- The Atarians (working bootleg)
+ The Atarians (working bootleg)
Game modified to work in emulation from original set (atarians)
-------------------------------------------------------------------*/
ROM_START(atarianb)
ROM_REGION(0x10000, "maincpu", 0)
ROM_LOAD("atarianb.e00", 0x7000, 0x0800, CRC(74fc86e4) SHA1(135d75e5c03feae0929fa84caa3c802353cdd94e))
- ROM_LOAD("atarian.e0", 0x7800, 0x0800, CRC(45cb0427) SHA1(e286930ca36bdd0f79acefd142d2a5431fa8005b))
+ ROM_LOAD("atarian.e0", 0x7800, 0x0800, CRC(45cb0427) SHA1(e286930ca36bdd0f79acefd142d2a5431fa8005b))
ROM_REGION(0x1000, "sound1", 0)
ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b))
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 503e0966169..6b1c489b66a 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -836,21 +836,21 @@ static MACHINE_CONFIG_DERIVED( tmek, atarigt )
/* sound hardware */
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x4fad)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( primrage, atarigt )
/* sound hardware */
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x42f2)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( primrage20, atarigt )
/* sound hardware */
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x48a4)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
MACHINE_CONFIG_END
/*************************************
@@ -1331,10 +1331,10 @@ DRIVER_INIT_MEMBER(atarigt_state,primrage)
*
*************************************/
-GAME( 1994, tmek, 0, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, The Warlords)", GAME_UNEMULATED_PROTECTION )
-GAME( 1994, tmek51p, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, prototype)", GAME_UNEMULATED_PROTECTION )
-GAME( 1994, tmek45, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.5)", GAME_UNEMULATED_PROTECTION )
-GAME( 1994, tmek44, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.4)", GAME_UNEMULATED_PROTECTION )
-GAME( 1994, tmek20, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v2.0, prototype)", 0 )
+GAME( 1994, tmek, 0, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, The Warlords)", GAME_UNEMULATED_PROTECTION )
+GAME( 1994, tmek51p, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, prototype)", GAME_UNEMULATED_PROTECTION )
+GAME( 1994, tmek45, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.5)", GAME_UNEMULATED_PROTECTION )
+GAME( 1994, tmek44, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.4)", GAME_UNEMULATED_PROTECTION )
+GAME( 1994, tmek20, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v2.0, prototype)", 0 )
GAME( 1994, primrage, 0, primrage, primrage, atarigt_state, primrage, ROT0, "Atari Games", "Primal Rage (version 2.3)", GAME_UNEMULATED_PROTECTION )
GAME( 1994, primrage20, primrage, primrage20,primrage, atarigt_state, primrage, ROT0, "Atari Games", "Primal Rage (version 2.0)", GAME_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 9f5264d828e..9e60c66bc8d 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -99,7 +99,7 @@ public:
void descramble_sound();
DECO16IC_BANK_CB_MEMBER(bank_callback);
DECOSPR_PRIORITY_CB_MEMBER(pri_callback);
-
+
required_ioport m_io_in0;
required_ioport m_io_in1;
required_ioport m_io_in2;
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 3cf3fd9bc67..20ae3877ca6 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -443,7 +443,7 @@ static MACHINE_CONFIG_START( bagman, bagman_state )
MCFG_TMSPROM_STOP_BIT(7) /* bit # of stop */
MCFG_TMSPROM_PDC_CB(DEVWRITELINE("tms", tms5110_device, pdc_w)) /* tms pdc func */
MCFG_TMSPROM_CTL_CB(DEVWRITE8("tms", tms5110_device, ctl_w)) /* tms ctl func */
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index ff337a17c28..bf2c76f0961 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -355,27 +355,27 @@ READ8_MEMBER(bfm_sc1_state::nec_r)
WRITE8_MEMBER(bfm_sc1_state::vfd_w)
{
-/* int changed = m_vfd_latch ^ data;
-
- m_vfd_latch = data;
-
- if ( changed )
- {
- if ( changed & VFD_RESET )
- { // vfd reset line changed
- if ( !(data & VFD_RESET) )
- { // reset the vfd
- m_vfd0->reset();
- }
- }
- if ( changed & VFD_CLOCK1 )
- { // clock line changed
- if ( !(data & VFD_CLOCK1) && (data & VFD_RESET) )
- { // new data clocked into vfd
- m_vfd0->shift_data(data & VFD_DATA );
- }
- }
- }
+/* int changed = m_vfd_latch ^ data;
+
+ m_vfd_latch = data;
+
+ if ( changed )
+ {
+ if ( changed & VFD_RESET )
+ { // vfd reset line changed
+ if ( !(data & VFD_RESET) )
+ { // reset the vfd
+ m_vfd0->reset();
+ }
+ }
+ if ( changed & VFD_CLOCK1 )
+ { // clock line changed
+ if ( !(data & VFD_CLOCK1) && (data & VFD_RESET) )
+ { // new data clocked into vfd
+ m_vfd0->shift_data(data & VFD_DATA );
+ }
+ }
+ }
*/
m_vfd0->por(data & VFD_RESET);
m_vfd0->data(data & VFD_DATA);
diff --git a/src/mame/drivers/bfm_sc4.c b/src/mame/drivers/bfm_sc4.c
index e369c3cc5e1..fa417929d04 100644
--- a/src/mame/drivers/bfm_sc4.c
+++ b/src/mame/drivers/bfm_sc4.c
@@ -23477,52 +23477,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pstat_mbus)
INPUT_PORTS_START( sc4pstat ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("up")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("right")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("down")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("left")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cash")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("up")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("right")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("down")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("left")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// can't get past 'read meters'
@@ -23571,49 +23571,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cvani)
}
INPUT_PORTS_START( sc4cvani ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("low r")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low l")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("high l")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("high r")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("low r")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low l")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("high l")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("high r")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2052 CASHLVANIA VANIASND CASH'!'VANIA
@@ -23651,53 +23651,53 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cvclb_mbus)
}
INPUT_PORTS_START( sc4cvclb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("high l")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("high r")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudges")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("low r")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("low l")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("igor")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("high l")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("high r")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("low r")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("low l")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("igor")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PRXXXX CLUBCASHLVANIA V1.0 CLUBVANIASND CLUB CASH!VANIA
@@ -23737,56 +23737,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4gcclb_mbus)
// inputs are from sc4gcclbl, the earlier(?) sets don't appear to have the structure filled in
INPUT_PORTS_START( sc4gcclbl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake1")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake2")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stake3")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0004 - "botdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "topdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake1")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake2")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stake3")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0004 - "botdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "topdor" // standard input (expected here)
INPUT_PORTS_END
// this was marked (and has the header) GRAND CASINO, and was paired with some (bad dumps) of 'Grand Casino' sound roms, but it actually
@@ -23832,48 +23832,48 @@ DRIVER_INIT_MEMBER(sc4_state,sc4botn)
}
INPUT_PORTS_START( sc4botn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchge")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c pot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchge")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c pot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2538 BACK OF THE NET V011 BACKOFTHENETSND BACK OF THE NET
@@ -23904,50 +23904,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bbclb_mbus)
}
INPUT_PORTS_START( sc4bbclb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("qps")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("nudges")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("qps")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("nudges")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// doesn't play
@@ -23979,50 +23979,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4captn)
}
INPUT_PORTS_START( sc4captn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0010 - "topup" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkndge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk ko")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featre OR tkfeat")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("cash OR tkcash")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "topup" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkndge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk ko")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featre OR tkfeat")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("cash OR tkcash")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2013 CAPTAIN CASH CCASH SOUNDS CAPTAIN CASH
@@ -24052,49 +24052,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cmous)
}
INPUT_PORTS_START( sc4cmous ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2534 CASH AND MOUSE V041 CASHANDMOUSESND CASH AND MOUSE
@@ -24128,49 +24128,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cad_mbus)
}
INPUT_PORTS_START( sc4cad ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("dice")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("dice")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2528 CASH ADDER V1.0 CASHADDERSND CASH ADDER
@@ -24217,51 +24217,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cadcl)
}
INPUT_PORTS_START( sc4cadcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("qps")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("cash")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cpot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("qps")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("cash")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cpot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PRXXXX QPS155 CLUB CASH ADDER Version 411 CLUBCASHADDERSND CLUB CASH ADDER
@@ -24285,52 +24285,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cr)
}
INPUT_PORTS_START( sc4cr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("up")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("right")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("down")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("left")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cash")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("up")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("right")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("down")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("left")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -24369,51 +24369,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4crcl_mbus)
}
INPUT_PORTS_START( sc4crcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("up")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("right")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("down")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("left")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("igor")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("up")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("right")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("down")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("left")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("igor")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR???? CLUB CASHRAKER V1.0 CLUBRAKERSND CLUB CASHRAKER
@@ -24445,43 +24445,43 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cashm)
}
INPUT_PORTS_START( sc4cashm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("take")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blast")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("feat")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("topbrd")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("take")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blast")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("feat")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("topbrd")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
INPUT_PORTS_END
// PR2008 CASHANOVA CASH SOUNDS
@@ -24529,60 +24529,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ckx3p)
// the topbox sets contain no input defs
INPUT_PORTS_START( sc4ckxg ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("trnsfr")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autply")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "top up" // unexpected here
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("trnsfr")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autply")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "top up" // unexpected here
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
// this seems to need all the units connected to function
@@ -24615,43 +24615,43 @@ DRIVER_INIT_MEMBER(sc4_state,sc4chick)
}
INPUT_PORTS_START( sc4chick ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("cancel")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "refloa" // unexpected here
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cash d" // standard input (expected here)
- // 0x0004 - "top do" // standard input (expected here)
- // 0x0008 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "refloa" // unexpected here
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cash d" // standard input (expected here)
+ // 0x0004 - "top do" // standard input (expected here)
+ // 0x0008 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR7060CASINO CHICKEN DALES TTTWO SOUNDS CHICKEN DALES
@@ -24675,49 +24675,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ccogs)
}
INPUT_PORTS_START( sc4ccogs ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("green")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blue")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("red")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("green")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blue")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("red")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2522 CLEVERCOGS V1.0 CLEVERCOGSSND CLEVER COGS
@@ -24751,60 +24751,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cclim_mbus)
}
INPUT_PORTS_START( sc4cclime ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
- // 0x0008 - "hoptop" // known extended(?) input, sometimes 'hop top'
- // 0x0100 - "hop lo" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grn bu" // standard input (motherboard)
- // 0x0002 - "botdor" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "hopdum" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
+ // 0x0008 - "hoptop" // known extended(?) input, sometimes 'hop top'
+ // 0x0100 - "hop lo" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grn bu" // standard input (motherboard)
+ // 0x0002 - "botdor" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "hopdum" // standard input (expected here)
INPUT_PORTS_END
// PR1129 CASINO CRAZY CLIMBER PR1129 CRAZY CLIMBER SOUNDS11
@@ -24869,51 +24869,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cfqps_alt)
// Crazy Fruits sets are a bit strange compared to others..
// sc4cfqpsc, sc4cfqpse, sc4cfqpsf, sc4cfqpsg, sc4cfqpsh, sc4cfqpsi are the only sets to specify inputs, and they use port 7 which is VERY unusual
INPUT_PORTS_START( sc4cfqpsf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchan")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-7")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("take s")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_1 ) PORT_NAME("take n")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("banana")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("qps bu")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take c")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-7")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("take s")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_1 ) PORT_NAME("take n")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("banana")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("qps bu")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take c")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR6813 CRAZY FRUITS PR6813 CRAZY FRUITS SOUNDS11
@@ -24976,60 +24976,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4crzky_mbus)
}
INPUT_PORTS_START( sc4crzkyi ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
- // 0x0008 - "hop to" // known extended(?) input, sometimes 'hop top'
- // 0x0100 - "hop lo" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "botdor" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "hopper" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
+ // 0x0008 - "hop to" // known extended(?) input, sometimes 'hop top'
+ // 0x0100 - "hop lo" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "botdor" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "hopper" // standard input (expected here)
INPUT_PORTS_END
// PR1128 CASINO CRAZY KEYS PR1128 CRAZY KEYS SOUNDS11
@@ -25078,47 +25078,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4deepi)
}
INPUT_PORTS_START( sc4deepi ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("use")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tke my")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("use")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tke my")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2099 DEEP IMPACT DIMP SOUNDS DEEP IMPACT
@@ -25146,38 +25146,38 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dblfr)
}
INPUT_PORTS_START( sc4dblfr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("collec OR cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("streak")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("collec OR cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
INPUT_PORTS_END
// PR7060 DOUBLE FRENZY DFRZYSND
@@ -25206,49 +25206,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4darw)
}
INPUT_PORTS_START( sc4darw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("mixed")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("rshoot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bshoot")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("mixed")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("rshoot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bshoot")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2026 DOUGH AND ARROW DOUGHSND DOUGH AND ARROW
@@ -25274,46 +25274,46 @@ DRIVER_INIT_MEMBER(sc4_state,sc4duckq)
}
INPUT_PORTS_START( sc4duckq ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("autnud")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("autnud")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2519 THEDUCKSOFHAZZARD V1.0 DUCKSOFHAZZARDSND DUCKS OF HAZZARD
@@ -25337,60 +25337,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4eascs)
}
INPUT_PORTS_START( sc4eascs ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("cancel")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
- // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
- // 0x0100 - "hop lo" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "frt do" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
+ // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
+ // 0x0100 - "hop lo" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "frt do" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
// PR1326 CASINO EASY STREAK PR1326 EASY STREAK SOUNDS11 (actually expects PR1326_CAS_EASY_STREAK_SOUNDS11 ? )
@@ -25424,54 +25424,54 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fastf)
}
INPUT_PORTS_START( sc4fastf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collct")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ft exc")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("kos lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("ndg lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spn lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("kos hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ndg hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("spn hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("stop")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collct")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ft exc")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("kos lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("ndg lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spn lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("kos hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ndg hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("spn hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("stop")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2071 FAST 'N' FURIOUS FNF SOUNDS FAST 'N' FURIOUS
@@ -25497,51 +25497,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ffru)
}
INPUT_PORTS_START( sc4ffru ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0010 - "topup" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh ko")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("bonus")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("featre")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet ko")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "topup" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh ko")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("featre")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet ko")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR7070 FAST FRUIT FFRUIT SOUNDS FAST FRUIT
@@ -25570,45 +25570,45 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fire)
}
INPUT_PORTS_START( sc4fire ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2082 FIRE POWER FPOW SOUNDS FIRE POWER
@@ -25633,63 +25633,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4frenz)
}
INPUT_PORTS_START( sc4frenz ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("boost")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("no lse")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ch num")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("boost")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("no lse")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ch num")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1101 FRUIT FRENZY PR1101 FRUIT FRENZY SOUNDS11
@@ -25717,48 +25717,48 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ftopi)
}
INPUT_PORTS_START( sc4ftopi ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2027 FRUITOPIA FRUITOPIASND FRUITOPIA
@@ -25793,50 +25793,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fullt)
}
INPUT_PORTS_START( sc4fullt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("wserie")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("wserie")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2537 FULL THROTTLE 011 FULLTHROTTLESND FULL THROTTLE
@@ -25873,55 +25873,55 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ziggy)
}
INPUT_PORTS_START( sc4ziggy ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2162 GETTIN' ZIGGY ZIGY SOUNDS GETTIN' ZIGGY
@@ -25951,61 +25951,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4gldcl)
}
INPUT_PORTS_START( sc4gldcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk spi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk cpo")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk spi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk cpo")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2292 CLUB GLADIATOR CLUB GLADIATOR CLUB CLUB GLAD SOUNDS CLUB GLADIATOR
@@ -26050,55 +26050,55 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ghosttb)
}
INPUT_PORTS_START( sc4ghost ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("cancel")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autply")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12 OR doorlk" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0004 - "cshdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autply")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12 OR doorlk" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0004 - "cshdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
// PR7090 GOLDEN GHOST GOLDEN GHOST MAZ GHOST SOUNDS GOLDEN GHOST
@@ -26137,49 +26137,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ggrid_mbus)
}
INPUT_PORTS_START( sc4ggrid ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("right")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("right")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2518 GOLDEN GRID V1.0 GOLDENGRIDSND GOLDEN GRID
@@ -26227,50 +26227,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ggcl_mbus)
}
INPUT_PORTS_START( sc4ggcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("qps")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("right")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("up")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cash")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("qps")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("right")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("up")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR???? CLUB GOLDEN GRID V1.0 CLUBGOLDENGRIDSND CLUB GOLDEN GRID
@@ -26301,115 +26301,115 @@ DRIVER_INIT_MEMBER(sc4_state,sc4goldw)
}
INPUT_PORTS_START( sc4goldw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("bell")
- // 0x0100 - "pndlow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- // 0x0100 - "10plow" // unexpected here
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("bell")
+ // 0x0100 - "pndlow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ // 0x0100 - "10plow" // unexpected here
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4goldwd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("bell")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("pndlow OR 10plow")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("bell")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("pndlow OR 10plow")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -26426,44 +26426,44 @@ GAMEL( 200?, sc4goldwf ,sc4goldw, sc4, sc4goldwd, sc4_state, sc4, ROT0, "BFM"
GAMEL( 200?, sc4goldwg ,sc4goldw, sc4, sc4goldwd, sc4_state, sc4, ROT0, "BFM","Golden Winner (Bellfruit) (Scorpion 4) (set 8)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4ggdlx ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green OR test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green OR test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
@@ -26501,62 +26501,62 @@ DRIVER_INIT_MEMBER(sc4_state,sc4greed)
}
INPUT_PORTS_START( sc4greed ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk not")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk not")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1401 AWP GREEDY GONZALEZ PR1401 GREEDY GONZ SOUNDS11
@@ -26580,59 +26580,59 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hf)
}
INPUT_PORTS_START( sc4hf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
//PR1011 HAPPY FRUITS PR1011 HAPPY FRUITS SOUNDS11
@@ -26663,45 +26663,45 @@ DRIVER_INIT_MEMBER(sc4_state,sc4himi)
}
INPUT_PORTS_START( sc4himi ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2999 HIGH 'N' MIGHTY MITY SOUNDS HIGH 'N' MIGHTY
@@ -26736,60 +26736,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hi5)
}
INPUT_PORTS_START( sc4hi5 ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "pzkey1" // standard input (expected here)
- // 0x0002 - "pzkey2" // standard input (expected here)
- // 0x0004 - "pzkey3" // standard input (expected here)
- // 0x0008 - "pzkey4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pckey1" // standard input (expected here)
- // 0x0002 - "pckey2" // standard input (expected here)
- // 0x0004 - "pckey3" // standard input (expected here)
- // 0x0008 - "pckey4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "pzkey1" // standard input (expected here)
+ // 0x0002 - "pzkey2" // standard input (expected here)
+ // 0x0004 - "pzkey3" // standard input (expected here)
+ // 0x0008 - "pzkey4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pckey1" // standard input (expected here)
+ // 0x0002 - "pckey2" // standard input (expected here)
+ // 0x0004 - "pckey3" // standard input (expected here)
+ // 0x0008 - "pckey4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1003 HIGH FIVE PR1003 HIGH FIVE SOUNDS11
@@ -26819,49 +26819,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sprng)
}
INPUT_PORTS_START( sc4sprng ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("holdhi")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("holdlo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blasts")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("prize")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("holdhi")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("holdlo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blasts")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("prize")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2066 HIGHLY SPRUNG HIGH SOUNDS HIGHLY SPRUNG
@@ -26885,73 +26885,73 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hilo)
}
INPUT_PORTS_START( sc4hilo ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "hpunit" // unexpected here
- // 0x0010 - "htopup" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "pzkey4" // standard input (expected here)
- // 0x0002 - "pzkey3" // standard input (expected here)
- // 0x0004 - "pzkey2" // standard input (expected here)
- // 0x0008 - "pzkey1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pckey1" // standard input (expected here)
- // 0x0002 - "pckey2" // standard input (expected here)
- // 0x0004 - "pckey3" // standard input (expected here)
- // 0x0008 - "pckey4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi csh")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo nud")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("lo csh")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("lo fet")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk brc")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "hpunit" // unexpected here
+ // 0x0010 - "htopup" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "pzkey4" // standard input (expected here)
+ // 0x0002 - "pzkey3" // standard input (expected here)
+ // 0x0004 - "pzkey2" // standard input (expected here)
+ // 0x0008 - "pzkey1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pckey1" // standard input (expected here)
+ // 0x0002 - "pckey2" // standard input (expected here)
+ // 0x0004 - "pckey3" // standard input (expected here)
+ // 0x0008 - "pckey4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi csh")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo nud")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("lo csh")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("lo fet")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk brc")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1013 HILOWATHA PR1013 HILOWATHA SOUNDS11
@@ -26986,74 +26986,74 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hitsh)
}
INPUT_PORTS_START( sc4hitsh ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("col rd")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("blu lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("red lo")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("gre lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk stp")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("col bl")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("blu hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("red hi")
- PORT_MODIFY("IN-10")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("gre hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("col gr")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp OR hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("col rd")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("blu lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("red lo")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("gre lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk stp")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("col bl")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("blu hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("red hi")
+ PORT_MODIFY("IN-10")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("gre hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("col gr")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp OR hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1112 HIT SHOT PR1112 HIT SHOT SOUNDS11
@@ -27081,63 +27081,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4h6cl)
}
INPUT_PORTS_START( sc4h6cl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake1")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake2")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stake3")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake1")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake2")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stake3")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1759 CLUB HOT SIX HOT SIX CLUB PR1759 HOSX SOUNDS11
@@ -27164,59 +27164,59 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ijclb)
}
INPUT_PORTS_START( sc4ijclb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk spi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk cpo")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk spi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk cpo")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2403 CLUB ITALIAN JOB CLUB ITALIAN JOB CLUB CLUB ITJB SOUNDS
@@ -27239,50 +27239,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4jack)
}
INPUT_PORTS_START( sc4jack ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tke ft")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tke ng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("csh pt")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tke ft")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tke ng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("csh pt")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2078 JACK THE KIPPER JKIP SOUNDS JACK THE KIPPER
@@ -27313,65 +27313,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4jjunc)
}
INPUT_PORTS_START( sc4jjunc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk haz")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk ss")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk haz")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk ss")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1304 JACKPOT JUNCTION PR1304 JACKPOT JUNCTION SOUNDS11
@@ -27411,64 +27411,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4jjucl_mbus)
}
INPUT_PORTS_START( sc4jjucl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "hop2lo" // unexpected here
- // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudges")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blasts")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shots")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk haz")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "hop2lo" // unexpected here
+ // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blasts")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shots")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk haz")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// REEL7 ERR 27 (where does reel 7 connect?!)
@@ -27501,52 +27501,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4jolly)
INPUT_PORTS_START( sc4jolly ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchge")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("nudge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("hi 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo 2")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("lo 1")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchge")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("hi 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo 2")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("lo 1")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2054 JOLLY JOUSTINGV2.0 JJOLLSND JOLLY JOUSTING
@@ -27578,48 +27578,48 @@ DRIVER_INIT_MEMBER(sc4_state,sc4juicy_mbus)
INPUT_PORTS_START( sc4juicy ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1136 JUICY JACKPOTS 65% FERRY PR1136 JUICY JACKPOTS SOUNDS11
@@ -27656,50 +27656,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4kalei)
}
INPUT_PORTS_START( sc4kalei ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c pot")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("streak")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c pot")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2538 KALEIDOSCOPE 011 KALEIDOSCOPESND KALEIDOSCOPE
@@ -27729,47 +27729,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4lir)
}
INPUT_PORTS_START( sc4lir ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk dic")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk thr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dils 1" // standard input (motherboard)
- // 0x0002 - "dils 2" // standard input (motherboard)
- // 0x0004 - "dils 3" // standard input (motherboard)
- // 0x0008 - "dils 4" // standard input (motherboard)
- // 0x0010 - "dils 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dils 6" // standard input (motherboard)
- // 0x0002 - "dils 7" // standard input (motherboard)
- // 0x0004 - "dils 8" // standard input (motherboard)
- // 0x0008 - "dils 9" // standard input (motherboard)
- // 0x0010 - "dils10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dils11" // standard input (motherboard)
- // 0x0002 - "dils12" // standard input (motherboard)
- // 0x0004 - "dils13" // standard input (motherboard)
- // 0x0008 - "dils14" // standard input (motherboard)
- // 0x0010 - "dils15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dils16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk dic")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk thr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dils 1" // standard input (motherboard)
+ // 0x0002 - "dils 2" // standard input (motherboard)
+ // 0x0004 - "dils 3" // standard input (motherboard)
+ // 0x0008 - "dils 4" // standard input (motherboard)
+ // 0x0010 - "dils 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dils 6" // standard input (motherboard)
+ // 0x0002 - "dils 7" // standard input (motherboard)
+ // 0x0004 - "dils 8" // standard input (motherboard)
+ // 0x0008 - "dils 9" // standard input (motherboard)
+ // 0x0010 - "dils10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dils11" // standard input (motherboard)
+ // 0x0002 - "dils12" // standard input (motherboard)
+ // 0x0004 - "dils13" // standard input (motherboard)
+ // 0x0008 - "dils14" // standard input (motherboard)
+ // 0x0010 - "dils15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dils16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
INPUT_PORTS_END
// PR1001 LET IT ROLL PR1001 LETITROLL SOUNDS11
@@ -27802,61 +27802,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ldvcl)
}
INPUT_PORTS_START( sc4ldvcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("xfer")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("mov up")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("pick")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("xfer")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("mov up")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("pick")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2421 LITTLEDEVIL CLUB LITTLEDEVIL CLUB CLILDEV SOUNDS CLUB LITTLEDEVIL
@@ -27879,65 +27879,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4lockb)
}
INPUT_PORTS_START( sc4lockb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1108 LOCKBUSTER PR1108 LOCKBUSTER SOUNDS11
@@ -27973,61 +27973,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4lkbcl_mbus)
}
INPUT_PORTS_START( sc4lkbcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t.cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t.cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1321 CLUB LOCKBUSTER PR1321 CLUB LOCKBUSTER SOUNDS11
@@ -28063,64 +28063,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4lotrf)
}
INPUT_PORTS_START( sc4lotrf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auto n")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auto n")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1115 LORD OF THE RINGS PR1115 L O T RINGS SOUNDS11
@@ -28160,65 +28160,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4lotr2_mbus)
}
INPUT_PORTS_START( sc4lotr2 ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -28262,61 +28262,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ltr2c_mbus)
}
INPUT_PORTS_START( sc4ltr2c ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("sspins")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("sspins")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1420 CLUB LOTR TWO TOWERS PR1420 CLUB TWOTOWERS SOUNDS11
@@ -28351,47 +28351,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4magic)
}
INPUT_PORTS_START( sc4magic ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudges")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudges")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2520 MAGIC POUND ABOUT V1.0 MAGICPOUNDABOUTSND MAGIC POUNDABOUT
@@ -28417,49 +28417,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4maxim)
}
INPUT_PORTS_START( sc4maxim ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk spk")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk spk")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2019 MAXIMUS CASH MAX SOUNDS MAXIMUS CASH
@@ -28490,47 +28490,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4monob)
}
INPUT_PORTS_START( sc4monob ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cas")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cas")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2121 MONOPOLY MPLY SOUNDS MONOPOLY
@@ -28569,44 +28569,44 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mondx)
}
INPUT_PORTS_START( sc4mondx ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// So which Top Box roms should thse use? Why do some play without one?
@@ -28630,45 +28630,45 @@ GAMEL( 200?, sc4mondxc ,sc4mondx, sc4, sc4mondx, sc4_state, sc4mondx, ROT0, "
INPUT_PORTS_START( sc4mont ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("streak")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "botdor" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "topdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "botdor" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "topdor" // standard input (expected here)
INPUT_PORTS_END
@@ -28719,53 +28719,53 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mou)
}
INPUT_PORTS_START( sc4mou ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi l")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo l")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("change")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo r")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi r")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi l")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo l")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("change")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo r")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi r")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2523 MOVE ON UP V1.0 MOVEONUPSND MOVE ON UP
@@ -28790,55 +28790,55 @@ DRIVER_INIT_MEMBER(sc4_state,sc4nmtj)
}
INPUT_PORTS_START( sc4nmtj ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2171 NEVER MIND JPS NMTJ SOUNDS NEVER MIND JPS
@@ -28865,66 +28865,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4oyf)
}
INPUT_PORTS_START( sc4oyf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("st/col")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudges")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("notes")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("st/col")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("notes")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1310 AWP OFF YOUR FACE PR1310 OFF YOUR FACE SOUNDS11
@@ -28949,65 +28949,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4opses)
}
INPUT_PORTS_START( sc4opses ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk ss")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk haz")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk ss")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk haz")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1106 OPEN SESAME PR1106 OPEN SESAME SOUNDS11
@@ -29032,51 +29032,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4paccl)
}
INPUT_PORTS_START( sc4paccl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-7")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_1 ) PORT_NAME("tk sht")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk met")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mickey")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-7")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_1 ) PORT_NAME("tk sht")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk met")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mickey")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2018 PACMAN CLUB CLUB PACMAN SOUNDS PACMAN C L U B
@@ -29102,49 +29102,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pmani)
}
INPUT_PORTS_START( sc4pmani ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("coll")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("higher")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lower")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk prz")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("coll")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("higher")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lower")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk prz")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// REEL 4 ERR 24
@@ -29170,65 +29170,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pgold)
}
INPUT_PORTS_START( sc4pgold ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk eye")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("high")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("low")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk eye")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("high")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("low")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1012 PHARAOH'S GOLD PR1012 PHARAOHS GOLD SOUNDS11
@@ -29258,51 +29258,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ppclb)
}
INPUT_PORTS_START( sc4ppclb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin p")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin c")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c pot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin p")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin c")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c pot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2236 CLUB PINK PANTHER 411 CLUBPINKPANTHERSND CLUB PINKPANTHER
@@ -29329,50 +29329,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pipe)
}
INPUT_PORTS_START( sc4pipe ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkecs")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cshhi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cshlo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("fetlo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fethi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkecs")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cshhi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cshlo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("fetlo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fethi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2110 PIPING HOT PIPE SOUNDS PIPING HOT
@@ -29396,49 +29396,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4plumb)
}
INPUT_PORTS_START( sc4plumb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c pot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c pot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// QPS142 CLUB PLUMB CRAZY 413 CLUBPLUMBCRAZYSND CLUB PLUMB CRAZY
@@ -29469,44 +29469,44 @@ DRIVER_INIT_MEMBER(sc4_state,sc4polic)
}
INPUT_PORTS_START( sc4polic ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2514 POLICE SQUID V1.0 POLICESQUIDSND POLICE SQUID
@@ -29534,46 +29534,46 @@ DRIVER_INIT_MEMBER(sc4_state,sc4potsh)
}
INPUT_PORTS_START( sc4potsh ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// QPS143 POT SHOT V1.0 POTSHOTSND POT SHOT
@@ -29598,58 +29598,58 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pogbl)
}
INPUT_PORTS_START( sc4pogbl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collec")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("tra/ex")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collec")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("tra/ex")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3083 CLUB POTS OF GOLD POTS OF GOLD CLUB PR3082 C POTS OF GOLD SOUNDS11 POTS OF GOLD
@@ -29677,47 +29677,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pwrsg)
}
INPUT_PORTS_START( sc4pwrsg ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchge")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step r")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step l")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchge")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step r")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step l")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2053 POWERSURGE SURGESND POWERSURGE
@@ -29743,65 +29743,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pir)
}
INPUT_PORTS_START( sc4pir ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1303 THE PRIZE IS RIGHT PR1303 T PRIZE I R SOUNDS11
@@ -29831,41 +29831,41 @@ DRIVER_INIT_MEMBER(sc4_state,sc4qmodo)
}
INPUT_PORTS_START( sc4qmodo ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excha")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-7")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("bonus")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excha")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-7")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("bonus")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
INPUT_PORTS_END
// QUAZZI MO' DOUGH..........QUAZZSND....... (no standard header)
@@ -29892,48 +29892,48 @@ DRIVER_INIT_MEMBER(sc4_state,sc4quidr)
}
INPUT_PORTS_START( sc4quidr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nshoot")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cshoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nshoot")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cshoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
GAMEL( 200?, sc4quidr ,0, sc4, sc4quidr, sc4_state, sc4quidr, ROT0, "Qps","Quid Rock (Qps) (Scorpion 4) (set 1)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
@@ -29958,49 +29958,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rdrag)
}
INPUT_PORTS_START( sc4rdrag ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c pot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c pot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2542 RED DRAGON 011 REDDRAGONSND RED DRAGON
@@ -30028,50 +30028,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rdrcl)
}
INPUT_PORTS_START( sc4rdrcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c pot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c pot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// QPS160 CLUB RED DRAGON 411 CLUBREDDRAGONSND CLUB RED DRAGON
@@ -30098,65 +30098,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4relcz)
}
INPUT_PORTS_START( sc4relcz ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk ko")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t blst")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk ko")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t blst")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1015 REELY CRAZY PR1015 REELY CRAZY SOUNDS11
@@ -30183,49 +30183,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rotc)
}
INPUT_PORTS_START( sc4rotc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cas")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cas")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2132 RETURN OF THE COUNT ROTC SOUNDS THE COUNT
@@ -30259,46 +30259,46 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rttt_mbus)
}
INPUT_PORTS_START( sc4rttt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tke ft")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tke ft")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2089 RISE TO THE TOP RISE SOUNDS RISE TO THE TOP
@@ -30326,49 +30326,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4roksc)
}
INPUT_PORTS_START( sc4roksc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudge")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("sushot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("sushot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2527 ROCKET SCIENCE V1.1 ROCKETSCIENCESND ROCKET SCIENCE
@@ -30395,49 +30395,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4blast)
}
INPUT_PORTS_START( sc4blast ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudge")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("sushot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("feat")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudge")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("sushot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// only starts 2nd time (requires valid ram?)
@@ -30470,49 +30470,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rogds)
}
INPUT_PORTS_START( sc4rogds ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo r")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo l")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi l")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi r")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo r")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo l")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi l")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi r")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -30547,52 +30547,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rt)
}
INPUT_PORTS_START( sc4rt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collct")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ft exc")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spn lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ndg lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("ndg hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("spn hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("csh hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collct")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ft exc")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spn lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ndg lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("ndg hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("spn hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("csh hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
@@ -30620,52 +30620,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4broll)
}
INPUT_PORTS_START( sc4broll ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collct")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ft exc")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spn lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ndg lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("ndg hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("spn hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("csh hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collct")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ft exc")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spn lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ndg lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("ndg hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("spn hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("csh hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// missing sound roms, doesn't play, same game code and sound ident as Rolling Thunder?
@@ -30694,65 +30694,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rbank)
}
INPUT_PORTS_START( sc4rbank ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk haz")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk ss")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk haz")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk ss")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1111 ROYAL BANKER PR1111 ROYLEBANKER SOUNDS11
@@ -30779,73 +30779,73 @@ DRIVER_INIT_MEMBER(sc4_state,sc4royle)
}
INPUT_PORTS_START( sc4royle ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi csh")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo nud")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("lo csh")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("lo fet")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk brc")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi csh")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo nud")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("lo csh")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("lo fet")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk brc")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1102 ROYLEFAMILY PR1102 ROYLEFAMILY SOUNDS11
@@ -30883,48 +30883,48 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sidsp)
}
INPUT_PORTS_START( sc4sidsp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkcsh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkcsh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2117 SIDE SPLITTER SSPT SOUNDS SIDE SPLITTER
@@ -30950,64 +30950,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4srr)
}
INPUT_PORTS_START( sc4srr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auto n")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auto n")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -31040,61 +31040,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4slc_mbus)
}
INPUT_PORTS_START( sc4slc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk win")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk win")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1423 CLUB SNAKES N LADDERS PR1423 CSNK SOUNDS11 SNAKES N LADDERS
@@ -31133,69 +31133,69 @@ DRIVER_INIT_MEMBER(sc4_state,sc4solgl)
}
INPUT_PORTS_START( sc4solgl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk wsp")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo csh")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("lo fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("tk mat")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk wsp")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lo csh")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("lo fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("tk mat")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1010 SOLID GOLD PR1010 SOLID GOLD SOUNDS11
@@ -31221,46 +31221,46 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sace)
}
INPUT_PORTS_START( sc4sace ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shots")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shots")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -31286,46 +31286,46 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sbust)
}
INPUT_PORTS_START( sc4sbust ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step f")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step f")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2506 SPACEBUSTER BUSTERSND SPACEBUSTER
@@ -31351,50 +31351,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4stirc)
}
INPUT_PORTS_START( sc4stirc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("excnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("higher")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lower")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk prz")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("excnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("higher")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lower")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk prz")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2005 STIR CRAZY STIR SOUNDS STIR CRAZY
@@ -31428,54 +31428,54 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sahed)
}
INPUT_PORTS_START( sc4sahed ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("right")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi r")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi l")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("lo r")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo l")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("streak")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("right")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi r")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi l")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("lo r")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo l")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("streak")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PRxxxx STREAKS AHEAD V1.0 STREAKSSND STREAKS AHEAD
@@ -31500,64 +31500,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4strx)
}
INPUT_PORTS_START( sc4strx ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auto n")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("shuffl")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auto n")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -31592,57 +31592,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4suscl_mbus)
}
INPUT_PORTS_START( sc4suscl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2357 CLUB SUITS U SIR SUITS U SIR CLUB CLUB SUIT SOUNDS
@@ -31676,49 +31676,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4taekw_mbus)
}
INPUT_PORTS_START( sc4taekw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("low r")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low l")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("high l")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("high r")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("low r")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low l")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("high l")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("high r")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -31753,66 +31753,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4taknt)
}
INPUT_PORTS_START( sc4taknt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("st/col")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudges")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("notes")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("st/col")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("notes")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1302 AWP TAKE NOTE PR1302 TAKE NOTE SOUNDS11
@@ -31842,59 +31842,59 @@ DRIVER_INIT_MEMBER(sc4_state,sc4takcl_mbus)
}
INPUT_PORTS_START( sc4takcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancol")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c nuds")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancol")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c nuds")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1323 CLUB TAKE NOTE PR1323 CNOT SOUNDS11
@@ -31930,43 +31930,43 @@ DRIVER_INIT_MEMBER(sc4_state,sc4tetri)
}
INPUT_PORTS_START( sc4tetri ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk spn")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk ndg")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk spn")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk ndg")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
INPUT_PORTS_END
@@ -32002,64 +32002,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4tbana)
}
INPUT_PORTS_START( sc4tbana ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk ss")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk fea")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk ss")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk fea")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1110 TOP BANANA PR1110 TOP BANANA SOUNDS11
@@ -32083,45 +32083,45 @@ DRIVER_INIT_MEMBER(sc4_state,sc4tgear)
}
INPUT_PORTS_START( sc4tgear ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("runmon")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("higher")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lower")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk prz")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("runmon")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("higher")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lower")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk prz")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
INPUT_PORTS_END
// REEL 4 ERR 24
@@ -32153,46 +32153,46 @@ DRIVER_INIT_MEMBER(sc4_state,sc4tload)
}
INPUT_PORTS_START( sc4tload ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take f")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take f")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2112 TOP LOADER LOAD SOUNDS TOP LOADER
@@ -32217,74 +32217,74 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ttomb)
}
INPUT_PORTS_START( sc4ttomb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blu lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("red lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("gre lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk stp")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("blu hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("red hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("gre hi")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("col rd")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk nud")
- PORT_MODIFY("IN-10")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("col bl")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_2 ) PORT_NAME("col gr")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp OR hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blu lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("red lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("gre lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk stp")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("blu hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("red hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("gre hi")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("col rd")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk nud")
+ PORT_MODIFY("IN-10")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("col bl")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_2 ) PORT_NAME("col gr")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp OR hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1305 TREASURE TOMB PR1305 TRES TOMB SOUNDS11 / HIT SHOT
@@ -32311,43 +32311,43 @@ DRIVER_INIT_MEMBER(sc4_state,sc4tridn)
}
INPUT_PORTS_START( sc4tridn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2103 THE TRIDENT TRID SOUNDS THE TRIDENT
@@ -32379,68 +32379,68 @@ DRIVER_INIT_MEMBER(sc4_state,sc4vrgcl_mbus)
}
INPUT_PORTS_START( sc4vrgcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "hop2lo" // unexpected here
- // 0x0002 - "hop1lo" // known extended(?) input, sometimes 'hop hi'
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk knk")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nud hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("knk hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("nud lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("fet lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("knk lo")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "hop2lo" // unexpected here
+ // 0x0002 - "hop1lo" // known extended(?) input, sometimes 'hop hi'
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk knk")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nud hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("knk hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("nud lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("fet lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("knk lo")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1037 CLUB VERY RICH GEEZER PR1037 RICH SOUNDS11 VERY RICH GEEZER
@@ -32473,67 +32473,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4leg)
}
INPUT_PORTS_START( sc4leg ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sun")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fsh")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("t high")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("t low")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1 OR dil sw" // standard input (motherboard)
- // 0x0002 - "dil 2 OR dil sw" // standard input (motherboard)
- // 0x0004 - "dil 3 OR dil sw" // standard input (motherboard)
- // 0x0008 - "dil 4 OR dil sw" // standard input (motherboard)
- // 0x0010 - "dil 5 OR dil sw" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6 OR dil sw" // standard input (motherboard)
- // 0x0002 - "dil 7 OR dil sw" // standard input (motherboard)
- // 0x0004 - "dil 8 OR dil sw" // standard input (motherboard)
- // 0x0008 - "dil 9 OR dil sw" // standard input (motherboard)
- // 0x0010 - "dil10 OR dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11 OR dil sw" // standard input (motherboard)
- // 0x0002 - "dil12 OR dil sw" // standard input (motherboard)
- // 0x0004 - "dil13 OR dil sw" // standard input (motherboard)
- // 0x0008 - "dil14 OR dil sw" // standard input (motherboard)
- // 0x0010 - "dil15 OR dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut OR green" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sun")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fsh")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("t high")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("t low")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1 OR dil sw" // standard input (motherboard)
+ // 0x0002 - "dil 2 OR dil sw" // standard input (motherboard)
+ // 0x0004 - "dil 3 OR dil sw" // standard input (motherboard)
+ // 0x0008 - "dil 4 OR dil sw" // standard input (motherboard)
+ // 0x0010 - "dil 5 OR dil sw" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6 OR dil sw" // standard input (motherboard)
+ // 0x0002 - "dil 7 OR dil sw" // standard input (motherboard)
+ // 0x0004 - "dil 8 OR dil sw" // standard input (motherboard)
+ // 0x0008 - "dil 9 OR dil sw" // standard input (motherboard)
+ // 0x0010 - "dil10 OR dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11 OR dil sw" // standard input (motherboard)
+ // 0x0002 - "dil12 OR dil sw" // standard input (motherboard)
+ // 0x0004 - "dil13 OR dil sw" // standard input (motherboard)
+ // 0x0008 - "dil14 OR dil sw" // standard input (motherboard)
+ // 0x0010 - "dil15 OR dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut OR green" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR7120 WHO WANTS TO BE A LEGIONNAIRE PR7120 LEGIONNAIRE SOUNDS11
@@ -32569,65 +32569,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cleg_mbus)
}
INPUT_PORTS_START( sc4legcb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sun")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("high")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("low")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sun")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("high")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("low")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1038 CLUB WHO WANTS TO BE A LEGIONNAIRE PR1038 CLUB WWTBAL SOUNDS11
@@ -32657,44 +32657,44 @@ DRIVER_INIT_MEMBER(sc4_state,sc4wspin)
}
INPUT_PORTS_START( sc4wspin ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("blank")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("blank")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// QPS162 WIN SPINNER Arcade Version 011 WINSPINNERSND WIN SPINNER
@@ -32721,70 +32721,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4wwys)
}
INPUT_PORTS_START( sc4wwys ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo blt")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo ko")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk spr")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hi blt")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hi ko")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("hi nud")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo blt")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo ko")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk spr")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hi blt")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hi ko")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("hi nud")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1301 WIN WHEN YOUR SPINNING PR1301 WIN W Y S SOUNDS11
@@ -32825,45 +32825,45 @@ DRIVER_INIT_MEMBER(sc4_state,sc4winsp)
}
INPUT_PORTS_START( sc4winspa ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "botdor OR botdor" // standard input (expected here)
- // 0x0004 - "topdor OR topdor" // standard input (expected here)
- // 0x0008 - "hopdmp OR hopdmp" // standard input (expected here)
- // 0x0010 - "topdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "botdor OR botdor" // standard input (expected here)
+ // 0x0004 - "topdor OR topdor" // standard input (expected here)
+ // 0x0008 - "hopdmp OR hopdmp" // standard input (expected here)
+ // 0x0010 - "topdor" // standard input (expected here)
INPUT_PORTS_END
// PR2526 WINNING SPIN TOP BOX WINNINGSPINSND WINNING SPIN
@@ -32926,62 +32926,62 @@ DRIVER_INIT_MEMBER(sc4_state,sc4wondw)
}
INPUT_PORTS_START( sc4wondw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht OR tk ss")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk haz")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fea")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht OR tk ss")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk haz")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fea")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1318 WONDER WHEEL PR1314 WONDER WHEEL SOUNDS11
@@ -33005,74 +33005,74 @@ DRIVER_INIT_MEMBER(sc4_state,sc4xmark)
}
INPUT_PORTS_START( sc4xmark ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("low 3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("low 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk grd")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("high 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("high 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("high 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-10")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("left")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("up")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_2 ) PORT_NAME("right")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_3 ) PORT_NAME("down")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("low 3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("low 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk grd")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("high 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("high 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("high 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-10")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("left")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("up")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_2 ) PORT_NAME("right")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_3 ) PORT_NAME("down")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1116 X MARKS THE SPOT PR1116 X MARKS THE SPOT SOUNDS11
@@ -33098,56 +33098,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4blokq)
}
INPUT_PORTS_START( sc4blokq ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0010 - "topup" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("rig hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lef hi")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("up lo")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("rig lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("featre")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "topup" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("rig hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lef hi")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("up lo")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("rig lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("featre")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2025 BLOCK BUSTER BUSTERSND BLOCK BUSTER
@@ -33178,53 +33178,53 @@ DRIVER_INIT_MEMBER(sc4_state,sc4onup)
}
INPUT_PORTS_START( sc4onup ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("rgt hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("rgt lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("rgt hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("rgt lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2076 ON THE UP HYPE SOUNDS ON THE UP
@@ -33248,52 +33248,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hyper)
}
INPUT_PORTS_START( sc4hyper ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("rgt lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mid lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("rgt lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mid lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2053 HYPERACTIVEL HYPE SOUNDS HYPERACTIVE
@@ -33318,49 +33318,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pglcl)
}
INPUT_PORTS_START( sc4pglcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("cancel")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stpcol")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-4")
- // 0x0001 - "hop2lo" // unexpected here
- // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("cancel")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stpcol")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "hop2lo" // unexpected here
+ // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1623 PHARAOHS GOLD PHARAOHS GOLD CLUB PR1623 CLASS PHAR GOLD SOUNDS11
@@ -33397,49 +33397,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4po8_mbus)
}
INPUT_PORTS_START( sc4po8 ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("right")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("right")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("up")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2530 PIECES OF EIGHT V1.0 PIECESOFEIGHTSND PIECES OF EIGHT
@@ -33484,67 +33484,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4adjb)
}
INPUT_PORTS_START( sc4adjb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b gamb")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("leave")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("jiggy")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("streak")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b gamb")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("leave")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("jiggy")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3039 AWP ANT N DECS JIGGY BANK S4 PR3009 JIGGY BANK SOUNDS11 JIGGY BANK S.SITE
@@ -33576,67 +33576,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4adwta)
}
INPUT_PORTS_START( sc4adwta ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("no")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("useky")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("yes")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("big gm")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("no")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("useky")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("yes")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("big gm")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1940 AWP ANT N DECS WTAD S4 PR1940 ADSNT SHOWTIME SOUNDS11 ANTNDECSWTAD S.SITE
@@ -33660,50 +33660,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4a40)
}
INPUT_PORTS_START( sc4a40 ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("h nuds")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkspin")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tkcpot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("h nuds")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkspin")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tkcpot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2200 AROUND THE BOARD AROU SOUNDS AROUND THE BOARD
@@ -33729,60 +33729,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4a40cl)
}
INPUT_PORTS_START( sc4a40cl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk mtr")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk mtr")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2154 CLUB AROUND BOAR CLB AROUND BOARD CLUB AROU SOUNDS
@@ -33809,70 +33809,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bantm)
}
INPUT_PORTS_START( sc4bantm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("b lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("b hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f lo")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("f hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up OR top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f lo")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up OR top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2301 BANTAM OF THE OPERA BANTAM SOUNDS BANTAMOFTHEOPERA
@@ -33899,115 +33899,115 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bar7)
}
INPUT_PORTS_START( sc4bar7 ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("autply")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("cancel")
- // 0x0100 - "pndlow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- // 0x0100 - "10plow" // unexpected here
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("autply")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("cancel")
+ // 0x0100 - "pndlow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ // 0x0100 - "10plow" // unexpected here
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4bar7b ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autply")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("pndlow OR 10plow")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "cshdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autply")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("pndlow OR 10plow")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "cshdor" // standard input (expected here)
INPUT_PORTS_END
// PR1433 BAR7S PR1433 BAR SEVENS SOUNDS11
@@ -34037,65 +34037,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4batl)
}
INPUT_PORTS_START( sc4batl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("death")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featur")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("death")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featur")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1724 AWP BATTLESHIPS AND CRUISERS S4 PR1704 B AND C SOUNDS11 BATTLESHIPSCRUIS S.SITE
@@ -34120,66 +34120,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bull)
}
INPUT_PORTS_START( sc4bull ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1722 AWP BULLSEYE SCORP4 PR1702 BULLSEYE SOUNDS11 BULLSEYE S.SITE
@@ -34205,65 +34205,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bullcs)
}
INPUT_PORTS_START( sc4bulcs ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("colect")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("colect")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1740 AWP BULLSEYE CLASSIC SCORP4 PR1702 BULLSEYE SOUNDS11 BULLSEYE CLASSIC S.SITE
@@ -34289,69 +34289,69 @@ DRIVER_INIT_MEMBER(sc4_state,sc4butch)
}
INPUT_PORTS_START( sc4butch ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("dead")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo rig")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi rig")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo lef")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi lef")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("streak")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("dead")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo rig")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi rig")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo lef")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi lef")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1930 AWP BUTCH CASHIDY AND THE SUNDANCE QUID S4 PR1910 B C AND THE S Q SOUNDS11 BUTCH N SUNDANCE S.SITE
@@ -34382,55 +34382,55 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cabin)
}
INPUT_PORTS_START( sc4cabin ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2209 CABIN FEVER CABF SOUNDS CABIN FEVER
@@ -34466,56 +34466,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cari)
}
INPUT_PORTS_START( sc4cari ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh 4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh 4")
- // 0x0100 - "hoplw" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh 3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("c hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("b hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("f hi")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh 4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh 4")
+ // 0x0100 - "hoplw" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh 3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2326 CARIBBEAN CASH CABC SOUNDS CARIBBEAN CASH
@@ -34544,52 +34544,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cariq)
}
INPUT_PORTS_START( sc4cariq ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collec")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchan")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("qps")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "pay dr" // standard input (expected here)
- // 0x0004 - "bot dr" // standard input (expected here)
- // 0x0008 - "dump" // standard input (expected here)
- // 0x0010 - "top dr" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("collec")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("qps")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "pay dr" // standard input (expected here)
+ // 0x0004 - "bot dr" // standard input (expected here)
+ // 0x0008 - "dump" // standard input (expected here)
+ // 0x0010 - "top dr" // standard input (expected here)
INPUT_PORTS_END
// these lack identification strings, and it's not the same game as above
@@ -34619,67 +34619,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cblas)
}
INPUT_PORTS_START( sc4cblas ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("holda")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("holdb")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("holdc")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take f")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("take c")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take b")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take n")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("take s")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("take b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("holda")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("holdb")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("holdc")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take f")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("take c")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take b")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take n")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("take s")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("take b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1683 BLAS14
@@ -34704,60 +34704,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4casxt)
}
INPUT_PORTS_START( sc4casxt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green OR test" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green OR test" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
// PR2338 XTRAVAGANZA XTRV SOUNDS XTRAVAGANZA
@@ -34785,60 +34785,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4chavi)
}
INPUT_PORTS_START( sc4chavi ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("chav i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("g bonu")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("chav i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("g bonu")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1731 AWP CHAV IT SCORP4 PR1711 CHAV IT SOUNDS11 CHAV IT S.SITE
@@ -34868,51 +34868,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4chavy)
}
INPUT_PORTS_START( sc4chavy ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- // 0x0100 - "hoplw" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("pink")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("yell")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nuds")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ // 0x0100 - "hoplw" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("pink")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("yell")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nuds")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2305 CHAVVY CHASE CHVY SOUNDS
@@ -34943,74 +34943,74 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cmani)
}
INPUT_PORTS_START( sc4cmani ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blu lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("red lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("gre lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk stp")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("col bl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("blu hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("red hi")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("gre hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk nud")
- PORT_MODIFY("IN-10")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("col rd")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("col gr")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp OR hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blu lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("red lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("gre lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk stp")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("col bl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("blu hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("red hi")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("gre hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("tk nud")
+ PORT_MODIFY("IN-10")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("col rd")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_1 ) PORT_NAME("col gr")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp OR hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1308 COLOUR MANIA PR1308 COLOUR MAN SOUNDS11
@@ -35035,65 +35035,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ctl)
}
INPUT_PORTS_START( sc4ctl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -35107,66 +35107,66 @@ GAMEL( 200?, sc4ctle ,sc4ctl, sc4, sc4ctl, sc4_state, sc4ctl, ROT0, "BFM"
INPUT_PORTS_START( sc4crsc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("safe c")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h or m")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("leave")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("takeit")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("streak")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("safe c")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h or m")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("leave")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("takeit")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3035 AWP COPS AND ROBBERS SAFE CRACKER S4 PR3005 SAFE CRACKER SOUNDS11 SAFE CRACKER S.SITE
@@ -35197,54 +35197,54 @@ DRIVER_INIT_MEMBER(sc4_state,sc4coro)
}
INPUT_PORTS_START( sc4coro ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("levl1")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("levl2")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("levl3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("levl4")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15 OR deflt" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "hoplow" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("levl1")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("levl2")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("levl3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("levl4")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15 OR deflt" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "hoplow" // standard input (expected here)
INPUT_PORTS_END
// PR2252 CORONATION ST CORRY SOUNDS CORONATION ST
@@ -35292,100 +35292,100 @@ DRIVER_INIT_MEMBER(sc4_state,sc4corotb)
}
INPUT_PORTS_START( sc4coroc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("blank")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "botdor OR botdor" // standard input (expected here)
- // 0x0004 - "topdor OR topdor" // standard input (expected here)
- // 0x0008 - "hopdmp OR hopdmp" // standard input (expected here)
- // 0x0010 - "topdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("blank")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "botdor OR botdor" // standard input (expected here)
+ // 0x0004 - "topdor OR topdor" // standard input (expected here)
+ // 0x0008 - "hopdmp OR hopdmp" // standard input (expected here)
+ // 0x0010 - "topdor" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4corod ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR colect")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "top up" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0004 - "cshdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR colect")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "top up" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0004 - "cshdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
@@ -35422,65 +35422,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4corcl)
}
INPUT_PORTS_START( sc4corcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh5")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh4")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh3")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("rh1")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("havnud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("level1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("level2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("level3")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("level4")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh5")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh4")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("rh1")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("havnud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("level1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("level2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("level3")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("level4")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2383 CLUBCORONATIONSTREET CLUBCORONATIONST CLUB CCORO SOUNDS CLUB CORO ST
@@ -35504,63 +35504,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4count)
}
INPUT_PORTS_START( sc4count ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1929 AWP COUNTDOWN S4 PR1909 COUNTDOWN SOUNDS11 COUNTDOWN S.SITE
@@ -35586,66 +35586,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dnd)
}
INPUT_PORTS_START( sc4dnd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("deal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c or b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("deal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c or b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dnd25 )
PORT_INCLUDE( sc4dnd )
@@ -35698,65 +35698,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndcs)
}
INPUT_PORTS_START( sc4dndcs ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("deal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c or b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("deal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c or b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndcs5 )
@@ -35791,70 +35791,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndbb)
}
INPUT_PORTS_START( sc4dndbb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("pl del")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("pl del")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndbb35 )
@@ -35900,64 +35900,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndcl)
m_reel_setup = sc4dndcl_reel_configs;
}
INPUT_PORTS_START( sc4dndcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("st/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch gme")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("exchng")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("start")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("gam ft")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("deal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("st/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch gme")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("exchng")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("start")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("gam ft")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndcl250 )
@@ -36000,67 +36000,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dnddd)
m_reel_setup = sc4dnddd_reel_configs;
}
INPUT_PORTS_START( sc4dnddd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c or b")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("pl don")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("no dea")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c or b")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("pl don")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("no dea")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dnddd35 )
@@ -36105,66 +36105,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndhf)
}
INPUT_PORTS_START( sc4dndhf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("autonu")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("play d")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("autonu")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("play d")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -36214,76 +36214,76 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndys)
}
INPUT_PORTS_START( sc4dndys ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchan")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bns gm")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo fea")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo sup")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo csh")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("step")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fea")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hi sup")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hi csh")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("ply dl")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("nodeal")
- PORT_MODIFY("IN-10")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("deal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bns gm")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo fea")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo sup")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo csh")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("step")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fea")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hi sup")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hi csh")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("ply dl")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("nodeal")
+ PORT_MODIFY("IN-10")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_10_0 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndys35 )
@@ -36325,74 +36325,74 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndlp)
}
INPUT_PORTS_START( sc4dndlp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("z1 but")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("z2 but")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("z3 but")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("z4 but")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("deal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("pl del")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("nodeal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("z1 but")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("z2 but")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("z3 but")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("z4 but")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("deal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("pl del")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("nodeal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -36430,69 +36430,69 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndra)
}
INPUT_PORTS_START( sc4dndra ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b gamb")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("p deal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("deal")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("p s bd")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b gamb")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("p deal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("p s bd")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndra35 )
@@ -36534,70 +36534,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndbd)
}
INPUT_PORTS_START( sc4dndbd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("pl del")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk mes")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk str")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("pl del")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk mes")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk str")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndbd35 )
@@ -36640,67 +36640,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndbr)
}
INPUT_PORTS_START( sc4dndbr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchan")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("play d")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c or b")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk mes")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("play d")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c or b")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk mes")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndbr35 )
@@ -36745,70 +36745,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndcc)
}
INPUT_PORTS_START( sc4dndcc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("pl del")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("deal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("pl del")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndcc35 )
@@ -36851,71 +36851,71 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dnddw)
m_reel_setup = sc4dnddw_reel_configs;
}
INPUT_PORTS_START( sc4dnddw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchan")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("p deal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("streak")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("l deal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("m deal")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("r deal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("dond")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("p deal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("streak")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("l deal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("m deal")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("r deal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("dond")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dnddw35 )
@@ -36959,67 +36959,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dnddf)
}
INPUT_PORTS_START( sc4dnddf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tra/ex")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("sta/ga")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bns")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("bankit")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ply dl")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tra/ex")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("sta/ga")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bns")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("bankit")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("deal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ply dl")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dnddf35 )
@@ -37061,70 +37061,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndpg)
}
INPUT_PORTS_START( sc4dndpg ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("pl del")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("deal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("pl del")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndpg35 )
@@ -37166,65 +37166,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndtp)
m_reel_setup = sc4dndtp_reel_configs;
}
INPUT_PORTS_START( sc4dndtp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("dond")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("dond")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndtp35 )
@@ -37268,73 +37268,73 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndww)
}
INPUT_PORTS_START( sc4dndww ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b ndel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b deal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("pl del")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("deal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("cs bus")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b ndel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b deal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("pl del")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("deal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("cs bus")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndww35 )
@@ -37370,72 +37370,72 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndcw)
}
INPUT_PORTS_START( sc4dndcw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchag")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b ndel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b deal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("pl del")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("deal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("cs bus")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b ndel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b deal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("pl del")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("deal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("cs bus")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndcw5 )
@@ -37469,67 +37469,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndtr)
}
INPUT_PORTS_START( sc4dndtr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchan")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("no dea")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("play g")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk msg")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("csh bu")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("no dea")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("play g")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk msg")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("csh bu")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndtr70 )
@@ -37561,73 +37561,73 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndwb)
}
INPUT_PORTS_START( sc4dndwb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("csh lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("sup lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("fet lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("csh hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("sup hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("fet hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("play")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("deal")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("csh lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("sup lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("fet lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("csh hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("sup hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("fet hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("play")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("deal")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndwb35 )
@@ -37664,66 +37664,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndbe)
}
INPUT_PORTS_START( sc4dndbe ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("deal o")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c or b")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("streak")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("deal o")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c or b")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("deal")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndbe25 )
@@ -37773,71 +37773,71 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dndbc)
}
INPUT_PORTS_START( sc4dndbc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nodeal")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("pl del")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("deal")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk stk")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cs bus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mes")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nodeal")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("pl del")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("deal")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk stk")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4dndbc70 )
@@ -37869,65 +37869,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dmine)
}
INPUT_PORTS_START( sc4dmine ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("spins")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1307 AWP DIAMOND MINE PR1307 DIAM MINE SOUNDS11
@@ -37962,67 +37962,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ddosh_mbus)
}
INPUT_PORTS_START( sc4ddosh ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudges")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk kos")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk kos")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// saw a crash on exit with this game, why?
@@ -38046,69 +38046,69 @@ GAMEL( 200?, sc4ddoshj ,sc4ddosh, sc4, sc4ddosh, sc4_state, sc4ddosh_mbus, RO
GAMEL( 200?, sc4ddoshk ,sc4ddosh, sc4, sc4ddosh, sc4_state, sc4ddosh_mbus, ROT0, "BFM","Doctor Dosh (Bellfruit) (Scorpion 4) (set 16)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4dhh ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("sink")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo rig")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi rig")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo lef")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi lef")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("streak")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("sink")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo rig")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi rig")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo lef")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi lef")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// board positions & steppa feature don't light anything, investigate (might only be a problem in demo mode?)
@@ -38137,66 +38137,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4dough)
}
INPUT_PORTS_START( sc4dough ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("sshoot")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("f shot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk bon")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("high")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c shot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("low")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("sshoot")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("f shot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk bon")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("high")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c shot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1615 AWP DOUGH SELECTA SCORP4 PR1615 DOUGH SELECTA SOUNDS11 DOUGH SELECTA S.SITE
@@ -38220,64 +38220,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4emmer)
}
INPUT_PORTS_START( sc4emmer ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test OR test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test OR test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2313 EMMERDALE EMMR SOUNDS EMMERDALE
@@ -38304,47 +38304,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4evol)
}
INPUT_PORTS_START( sc4evol ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2135 EVOLUTION EVOL SOUNDS EVOLUTION
@@ -38374,67 +38374,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fguy)
}
INPUT_PORTS_START( sc4fguy ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c or b")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("ply fg")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("streak")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c or b")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("ply fg")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4fguy35 )
@@ -38476,61 +38476,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fbspn)
}
INPUT_PORTS_START( sc4fbspn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("g gutz")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("g bonu")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("g gutz")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("g bonu")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1721 AWP FAT BOY SPIN SCORP4 PR1701 FAT BOY SPIN SOUNDS11 FAT BOY SPIN S.SITE
@@ -38557,63 +38557,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fmj)
}
INPUT_PORTS_START( sc4fmj ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test OR test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test OR test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2328 FULL METAL JACKPOT FULLM SOUNDS F METAL JACKPOT
@@ -38640,65 +38640,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4gd)
}
INPUT_PORTS_START( sc4gd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk haz")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk ss")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk fea")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk haz")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk ss")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk fea")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1016 GOLD DIGGER PR1016 GOLD DIGGER SOUNDS11
@@ -38729,57 +38729,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4gdclb)
INPUT_PORTS_START( sc4gdclb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "hop2lo" // unexpected here
- // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "hop2lo" // unexpected here
+ // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1137 CLUB GOLD DIGGER PR1137 GOLDD CL SOUNDS11
@@ -38813,62 +38813,62 @@ DRIVER_INIT_MEMBER(sc4_state,sc4gball)
}
INPUT_PORTS_START( sc4gball ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// this is a football themed game... completely different to golden balls casino
@@ -38895,67 +38895,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4gunp)
}
INPUT_PORTS_START( sc4gunp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("do/die")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("sp d/d")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bns")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("s mess")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("do/die")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("sp d/d")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bns")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("s mess")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3046 AWP THE GUNPOWDER SLOT S4 PR3016 GUNPOWDER SLOT SOUNDS11 GUNPOWDER SLOT S.SITE
@@ -38985,59 +38985,59 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hapnt)
}
INPUT_PORTS_START( sc4hapnt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk not")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk not")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1306 AWP HAPPY NOTES PR1306 HAPPY NOTES SOUNDS11
@@ -39050,62 +39050,62 @@ GAMEL( 200?, sc4hapnte ,sc4hapnt, sc4, sc4hapnt, sc4_state, sc4hapnt, ROT0, "
INPUT_PORTS_START( sc4hellb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1419 AWP HELLS BELLS PR1402 HELLS BELLS SOUNDS11
@@ -39139,71 +39139,71 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hill)
}
INPUT_PORTS_START( sc4hill ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1643 AWP HILLBILLIONAIRE SCORP4 PR1613 HILLBILLIONAIRE SOUNDS11 HILLBILLIONAIRE S.SITE
@@ -39228,55 +39228,55 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hiss)
}
INPUT_PORTS_START( sc4hiss ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("b hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("f hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("b hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2176 HISSING QUID VIPA SOUNDS HISSING QUID
@@ -39307,68 +39307,68 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hotrd)
}
INPUT_PORTS_START( sc4hotrd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lose")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hole8")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hole7")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hole6")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hole5")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hole4")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hole3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("hole2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("hole1")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lose")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hole8")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hole7")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hole6")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hole5")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hole4")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hole3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("hole2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("hole1")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1733 AWP HOT ROD SCORP4 PR1713 HOT ROD SOUNDS11 HOT ROD S.SITE
@@ -39392,71 +39392,71 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hotsh)
}
INPUT_PORTS_START( sc4hotsh ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchan")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h or m")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk str")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk tip")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ply hs")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("bankit")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h or m")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk str")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk tip")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ply hs")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("bankit")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3231 AWP HOT SHOT SCORP4 PR3211 HOT SHOT SOUNDS11 HOT SHOT S.SITE
@@ -39482,63 +39482,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4hotwd)
INPUT_PORTS_START( sc4hotwd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk haz")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk ss")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk haz")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk ss")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1311 HOT WAD PR1311 HOT WAD SOUNDS11
@@ -39569,64 +39569,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4celeb)
}
INPUT_PORTS_START( sc4celeb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("get me")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("get me")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1603 AWP IM A CELEBRITY PR1603 IM A CELEB SOUNDS11 IM A CELEBRITY S.SITE
@@ -39654,47 +39654,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4inspn)
}
INPUT_PORTS_START( sc4inspn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take s")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cashpo")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take s")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cashpo")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2555 INNER SPIN V013 INNERSPINSND INNER SPIN
@@ -39719,66 +39719,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ijob)
}
INPUT_PORTS_START( sc4ijob ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ply it")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("get aw")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("streak")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ply it")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("get aw")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("streak")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
@@ -39815,65 +39815,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ldvl)
}
INPUT_PORTS_START( sc4ldvl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("chgstk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("move u")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk cpo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk sho")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("chgstk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("move u")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk cpo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk sho")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2376 LITTLE DEVIL LDEVIL SOUNDS LITTLE DEVIL
@@ -39900,62 +39900,62 @@ DRIVER_INIT_MEMBER(sc4_state,sc4lotrr)
}
INPUT_PORTS_START( sc4lotrr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1427 AWP RETURN OF THE KING PR1413 RETURN OF THE SOUNDS11 RETURN OF KING S.SITE
@@ -39984,65 +39984,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4manic)
}
INPUT_PORTS_START( sc4manic ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tra/ex")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("sta/ga")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bns")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tra/ex")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("sta/ga")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bns")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3034 AWP MANIC MINER SCORP4 PR3004 MANIC MINER SOUNDS11 MANIC MINER S.SITE
@@ -40072,65 +40072,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mmm)
}
INPUT_PORTS_START( sc4mmm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bon ga")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take m")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("p supe")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bon ga")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take m")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("p supe")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
@@ -40161,58 +40161,58 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mmad)
}
INPUT_PORTS_START( sc4mmad ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2533 MONEY MADNESS MONM SOUNDS MONEY MADNESS
@@ -40244,67 +40244,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mdm)
}
INPUT_PORTS_START( sc4mdm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b or b")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("pl mon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b or b")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("pl mon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk str")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3333 AWP MONOPOLY DOUBLE MONEY S4 PR3308 MPOLY D MONEY SOUNDS11 DOUBLE MONEY S.SITE
@@ -40328,70 +40328,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mhn)
}
INPUT_PORTS_START( sc4mhn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2380 MONOPOLY HERE AND NOW MR2R SOUNDS NITH
@@ -40416,66 +40416,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mhp)
}
INPUT_PORTS_START( sc4mhp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hot p")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("streak")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b or b")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("refuse")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("sell")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hot p")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("streak")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b or b")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("refuse")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("sell")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2345 AWP MONOPOLY HOT PROPERTY S4 PR2345 HOT PROPERTY SOUNDS11 HOT PROPERTY S.SITE
@@ -40513,62 +40513,62 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mmb)
}
INPUT_PORTS_START( sc4mmb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("takfet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("sneakp")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("gamfet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("gambon")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("takfet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("sneakp")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("gamfet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("gambon")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1931 AWP MONOLOLY MONEY BAGS SCORP4 PR1911 MPOLY MONEYBAGS SOUNDS11 MONEYBAGS S.SITE
@@ -40592,60 +40592,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mrh)
}
INPUT_PORTS_START( sc4mrh ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green OR test" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green OR test" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
// PR2363 RED HOT MONOP MONOPOLY ARCADE MONO SOUNDS MONOPOLY
@@ -40673,65 +40673,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4mr2r)
}
INPUT_PORTS_START( sc4mr2r ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("take m")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bon ga")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("p supe")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("take m")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bon ga")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("p supe")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2329 MONOPOLY ROAD TO RICHES MR2R SOUNDS ROAD TO RICHES
@@ -40759,68 +40759,68 @@ DRIVER_INIT_MEMBER(sc4_state,sc4nmare)
}
INPUT_PORTS_START( sc4nmare ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("hold 4")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("s or g")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("grab")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("slash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk stk")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("d or a")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("hold 4")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("s or g")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("grab")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("slash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk stk")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("d or a")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3032 AWP NIGHTMARE ON ELM STREET S4 PR3002 ELM STREET SOUNDS11 NIGHTMARE ELM ST S.SITE
@@ -40847,65 +40847,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4potp)
}
INPUT_PORTS_START( sc4potp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c feat")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c feat")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1612 PICK OF THE PACK PR1612 PICK OF THE PACK SOUNDS11 PICK OF THE PACK S.SITE
@@ -40914,58 +40914,58 @@ GAMEL( 200?, sc4potpa ,sc4potp, sc4, sc4potp, sc4_state, sc4potp, ROT0, "BF
INPUT_PORTS_START( sc4ppcr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR colect")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "top up" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR colect")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "top up" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2279 PINK PANTHER CLOUSEAUS REVENGE REVENGE QPS REVENGE SOUNDS
@@ -41000,73 +41000,73 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ppctc)
}
INPUT_PORTS_START( sc4ppctc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b leav")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b take")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk clu")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cs bus")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk str")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("leave")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("pl ctc")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchag")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("b leav")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b take")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk clu")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("cs bus")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk str")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("leave")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("pl ctc")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2407 AWP PINK PANTHER CRACK THE CODE SCORP4 PR2407 CRACK THE CODE SOUNDS11 CRACK THE CODE S.SITE
@@ -41081,59 +41081,59 @@ GAMEL( 200?, sc4ppctcg ,sc4ppctc, sc4, sc4ppctc, sc4_state, sc4ppctc, ROT0, "
INPUT_PORTS_START( sc4ppdym ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("blank")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill OR refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test OR grnbut OR test" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "cshdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("blank")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill OR refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test OR grnbut OR test" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "cshdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
// PR2330 PINK PANTHER DYM PINK PANTHER DYM QPS DYMT SOUNDS PINK PANTHER DYM -
@@ -41166,64 +41166,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pony)
}
INPUT_PORTS_START( sc4pony ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spins")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1408 PONY EXPRESS PR1408 PONY EXPRESS SOUNDS11 PONY EXPRESS S.SITE
@@ -41251,66 +41251,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4popey)
}
INPUT_PORTS_START( sc4popey ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ply it")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("streak")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("s or s")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("can/co")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ply it")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("streak")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("s or s")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("leave")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2417 AWP POPEYE S4 PR2417 POPEYE SOUNDS11 POPEYE S.SITE
@@ -41339,75 +41339,75 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pwrbl)
}
INPUT_PORTS_START( sc4pwrbl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-7")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("tilt")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("r ball")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lose")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hole 8")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hole 7")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hole 6")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hole 5")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hole 4")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hole 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("hole 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("hole 1")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-7")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("tilt")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("r ball")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lose")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hole 8")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hole 7")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hole 6")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hole 5")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hole 4")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("hole 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("hole 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("hole 1")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// sequel to gamball, mechanical?
@@ -41433,63 +41433,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4quidv)
}
INPUT_PORTS_START( sc4quidv ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test OR test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test OR test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2342 QUID VICIOUS QUIDV SOUNDS QUID VICIOUS
@@ -41515,60 +41515,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rhxcs)
}
INPUT_PORTS_START( sc4rhxcs ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green OR test" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
- // 0x0010 - "serdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR collec")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("transf")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "top up OR top up" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green OR test" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
+ // 0x0010 - "serdor" // standard input (expected here)
INPUT_PORTS_END
// PR2364 CASINO RED HOT X RED HOT X CRHX SOUNDS RED HOT X
@@ -41598,53 +41598,53 @@ DRIVER_INIT_MEMBER(sc4_state,sc4redsq)
}
INPUT_PORTS_START( sc4redsq ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cnccol")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exch")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t nuds")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t cash")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("m rght")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("m down")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("m left")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("m up")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("t cpot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cnccol")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exch")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t nuds")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t cash")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("m rght")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("m down")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("m left")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("m up")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("t cpot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
@@ -41672,60 +41672,60 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rosts)
}
INPUT_PORTS_START( sc4rosts ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ex/tra")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk win")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ex/tra")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk win")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3256 CLUB RONNIE O SULLIVANS TOURNAMENT SCORP4 RONNIE OSULLIVAN CLUB PR3256 RONNIE O SOUNDS11 RONNIE SULLIVAN
@@ -41755,70 +41755,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rovrt)
}
INPUT_PORTS_START( sc4rovrt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up OR top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up OR top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2311 ROVERS RETURN ROVERS RETURN SOUNDS ROVERS RETURN
@@ -41846,68 +41846,68 @@ DRIVER_INIT_MEMBER(sc4_state,sc4showt)
}
INPUT_PORTS_START( sc4showt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchan")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("p show")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("streak")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c cash")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("sh tim")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchan")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("transf")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("p show")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("streak")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("sh tim")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3043 AWP SHOW TIME S4 PR3013 SHOWTIME SOUNDS11 SHOW TIME S.SITE
@@ -41937,57 +41937,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4spice)
}
INPUT_PORTS_START( sc4spice ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trf/ex")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trf/ex")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1921 AWP SPICE IT UP SCORP4 PR1901 SPICE IT UP SOUNDS11 SPICE IT UP S.SITE
@@ -42013,63 +42013,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sus)
}
INPUT_PORTS_START( sc4sus ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test OR test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test OR test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2255 SUITUSIR SUIT SOUNDS SUITS U SIR
@@ -42099,56 +42099,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sslam)
}
INPUT_PORTS_START( sc4sslam ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("colwin")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("payout")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("sprslm")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("selins")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("chgstk")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("maxbet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("colwin")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("payout")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("sprslm")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("selins")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("chgstk")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("maxbet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3081 CLUB SUPER SLAM SUPER SLAM CLUB PR3080 SUPER SLAM SOUNDS11
@@ -42173,63 +42173,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4swbak)
}
INPUT_PORTS_START( sc4swbak ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("gamble")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("gamble")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2235 SWITCHBACK SWBK SOUNDS SWITCHBACK
@@ -42256,63 +42256,63 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ttpie)
}
INPUT_PORTS_START( sc4ttpie ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("checkm")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 4")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("cstake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("checkm")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1714 AWP TAKE THE PIECE S4 PR1714 TAKE THE PIECE SOUNDS11 TAKETHEPIECE S.SITE
@@ -42344,67 +42344,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4typ)
}
INPUT_PORTS_START( sc4typ ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("cstake")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("colect")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("open r")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("reject")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("accept")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("open l")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c or b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("cstake")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("colect")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("open r")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("reject")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("accept")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("open l")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c or b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3031 AWP TAKE YOUR PICK S4 PR3001 TAKE YOUR PICK SOUNDS11 TAKE YOUR PICK S.SITE
@@ -42430,49 +42430,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4trail)
}
INPUT_PORTS_START( sc4trail ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step OR tke ft")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("step OR tke ft")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2170 TRAIL BLAZER TRAB SOUNDS TRAIL BLAZER
@@ -42500,64 +42500,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bpb)
}
INPUT_PORTS_START( sc4bpb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("gamble")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("throws")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("gamble")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("throws")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1728 AWP BULLY'S PRIZE BOARD PR1708 B PRIZE BOARD SOUNDS11 BULLYSPRIZEBOARD S.SITE
@@ -42587,65 +42587,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bsp)
}
INPUT_PORTS_START( sc4bsp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tra/ex")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("sta/ga")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bns")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tra/ex")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("sta/ga")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bankit")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bns")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3040 AWP BULLYS STAR PRIZE SCORP4 PR3012 BULLYS STAR P SOUNDS11 BULLYS STARPRIZE S.SITE
@@ -42677,71 +42677,71 @@ DRIVER_INIT_MEMBER(sc4_state,sc4chain)
}
INPUT_PORTS_START( sc4chain ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cas lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ch stp")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("db gam")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ft stp")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("fet lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c feat")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("cas hi")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("c doub")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("fet hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cas lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ch stp")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("db gam")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ft stp")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("fet lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c feat")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("cas hi")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("c doub")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("fet hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1316 AWP CHAIN REACTION PR1312 CHAIN REACT SOUNDS11
@@ -42768,70 +42768,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4clown)
}
INPUT_PORTS_START( sc4clown ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel OR coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkstep")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lorght")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lomid")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("loleft")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hirght")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("himid")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("hileft")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1727 AWP CLOWN AROUND SCORP4 PR1707 CLOWN AROUND SOUNDS11 CLOWN AROUND S.SITE
@@ -42845,50 +42845,50 @@ GAMEL( 200?, sc4clownf ,sc4clown, sc4, sc4clown, sc4_state, sc4clown, ROT0, "
GAMEL( 200?, sc4clowng ,sc4clown, sc4, sc4clown, sc4_state, sc4clown, ROT0, "BFM","Clown Around (Bellfruit) (Scorpion 4) (set 8)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4mowow ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("h nuds")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkspin")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tkcpot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("h nuds")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkspin")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tkcpot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
/* wrong sound roms */
@@ -42921,65 +42921,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bwow)
}
INPUT_PORTS_START( sc4bwow ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("r or d")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("w of w")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featur")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("r or d")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("w of w")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featur")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
GAMEL( 200?, sc4bwow ,0, sc4, sc4bwow, sc4_state, sc4bwow, ROT0, "BFM","Wheel Of Wealth (Bellfruit) (PR1726) (Scorpion 4) (WHEL013, set 1)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 ) // PR1726 AWP WHEEL OF WEALTH PR1706 WHEEL OF WEALTH SOUNDS11 WHEEL OF WEALTH S.SITE
@@ -43003,56 +43003,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4nunsm)
}
INPUT_PORTS_START( sc4nunsm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2166 NUN N ROSES NANR SOUNDS NUNS N ROSES
@@ -43085,46 +43085,46 @@ DRIVER_INIT_MEMBER(sc4_state,sc4acesh)
}
INPUT_PORTS_START( sc4acesh ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stop")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold a")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold b")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold c")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stop")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold a")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold b")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold c")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2070 ACES HIGH ACEHI SOUNDS ACES HIGH
@@ -43151,53 +43151,53 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bed)
}
INPUT_PORTS_START( sc4bed ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk pic")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("move u")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk pic")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("move u")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2094 BEDAZZLED BEDZ SOUNDS BEDAZZLED
@@ -43225,61 +43225,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bedcl)
}
INPUT_PORTS_START( sc4bedcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("pick")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mov up")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("pick")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mov up")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2102 CLUB BEDAZZLED CBED SOUNDS CLUB BEDAZZLED
@@ -43313,47 +43313,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bblas_mbus)
}
INPUT_PORTS_START( sc4bblas ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cas")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cas")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2083 BIG BLASTER BBST SOUNDS BIG BLASTER
@@ -43383,48 +43383,48 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bankb)
}
INPUT_PORTS_START( sc4bankb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("spin")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR???? BANKETYBANK V1.0 BANKETYBANKSND BANKETY BANK
@@ -43451,65 +43451,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bobcl)
}
INPUT_PORTS_START( sc4bobcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("level1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("level2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("level3")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("level4")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("level1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("level2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("level3")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("level4")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2298 CLUB BOBBY DAZZLER CLUB BOB DAZZLER CLUB CLUBBOBD SOUNDS
@@ -43533,50 +43533,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4brksp)
}
INPUT_PORTS_START( sc4brksp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("mv rht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mv lft")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk stp")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("excnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("mv rht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("mv lft")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk stp")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2033 BREAK THE SPELL SPELL SOUNDS BREAK THE SPELL
@@ -43600,61 +43600,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bulcl)
}
INPUT_PORTS_START( sc4bulcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("st/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk win")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("st/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk win")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1753 CLUB BULLSEYE BULLSEYE CLUB PR1751 BULLSEYE SOUNDS11 BULLSYE
@@ -43686,61 +43686,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4carry)
}
INPUT_PORTS_START( sc4carry ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkcash")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkcash")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1113 CARRY ON WINNING PR1113 CARRY ON WINNING SOUNDS11
@@ -43748,62 +43748,62 @@ GAMEL( 200?, sc4carry ,0, sc4, sc4carry, sc4_state, sc4carry, ROT0, "
GAMEL( 200?, sc4carrya ,sc4carry, sc4, sc4carry, sc4_state, sc4carry, ROT0, "BFM","Carry On Winning (Bellfruit) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4cbaz ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR high")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4 OR low")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cml")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR high")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4 OR low")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk cml")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1349 CLUB CASH BAZAAR PR1349 CLUB CASH BAZAAR SOUNDS11
@@ -43825,49 +43825,49 @@ GAMEL( 200?, sc4cbazk ,sc4cbaz, sc4, sc4cbaz, sc4_state, sc4mbus, ROT0, "BF
INPUT_PORTS_START( sc4clash ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkcash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("moveup")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkpick")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tknuds")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkcash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("moveup")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkpick")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tknuds")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2118 CASH ON THE LASH COTL SOUNDS CASH ON THE LASH
@@ -43882,59 +43882,59 @@ GAMEL( 200?, sc4clashg ,sc4clash, sc4, sc4clash, sc4_state, sc4, ROT0, "Mazoo
INPUT_PORTS_START( sc4cckey ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
- // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hop hi" // known extended(?) input, sometimes 'hop hi'
+ // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1426 CASINO CRAZY FRUITS GOLD PR1426 CRAZY F GOLD SOUNDS11 CRAZY FRUIT GOLD S.SITE (set was marked as Casino Crazy Keys)
@@ -43972,61 +43972,61 @@ DRIVER_INIT_MEMBER(sc4_state,sc4clclo)
}
INPUT_PORTS_START( sc4clclo ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("level1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("level3")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("level2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("lh1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("lh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("lh3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("lh4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("rh4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("rh3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("rh2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("rh1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("level1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("level3")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("level2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2383 CLUBCLOUSEAU CLUBCLOUSEAU CLUB CCLOU SOUNDS CLUB CLOSEAU
@@ -44049,64 +44049,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cjcl)
}
INPUT_PORTS_START( sc4cjcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "hop2lo" // unexpected here
- // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudges")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spr mt")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("bell")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "hop2lo" // unexpected here
+ // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spr mt")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("bell")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1621 CLUB COOL JEWELS PR1621 COOL SOUNDS11 CLUB COOL JEWELS CLUB
@@ -44120,60 +44120,60 @@ GAMEL( 200?, sc4cjclf ,sc4cjcl, sc4, sc4cjcl, sc4_state, sc4cjcl, ROT0, "BF
INPUT_PORTS_START( sc4crcp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ex/tra")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk swg")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("ex/tra")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk swg")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR3241 CLUB COPS AND ROBBERS PLATINUM SCORP4 COPS & ROBRS PLT CLUB PR3241 C N R PLATINUM SOUNDS11 COPS AND ROBBERS
@@ -44189,60 +44189,60 @@ GAMEL( 200?, sc4crcpi ,sc4crcp, sc4, sc4crcp, sc4_state, sc4mbus, ROT0, "BF
GAMEL( 200?, sc4crcpj ,sc4crcp, sc4, sc4crcp, sc4_state, sc4mbus, ROT0, "BFM","Cops 'n' Robbers Club Platinum (Bellfruit) (Scorpion 4) (set 10)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4crgc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk swg")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk swg")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1348 CLUB COPS AND ROBBERS GOLD PR1348 CCRG SOUNDS11 COPS AND ROBBERS
@@ -44293,59 +44293,59 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cfcla)
}
INPUT_PORTS_START( sc4cfcla ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- // 0x0100 - "pndlow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- // 0x0100 - "10plow" // unexpected here
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ // 0x0100 - "pndlow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ // 0x0100 - "10plow" // unexpected here
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1396 CLASSIC CRAZY FRUITS PR1396 CLSIC CRAZY FRUITS SND11
@@ -44373,59 +44373,59 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cfdu)
}
INPUT_PORTS_START( sc4cfdu ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1107 CRAZY FRUITS DOWNUNDER PR1107 DOWN UNDER SOUNDS11
@@ -44452,64 +44452,64 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cfgcl)
}
INPUT_PORTS_START( sc4cfgcl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "hop2lo" // unexpected here
- // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudges")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spr mt")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("bell")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "hop2lo" // unexpected here
+ // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shots")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spr mt")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("bell")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1620 CLUB CRAZY FRUITS GOLD PR1620 CRAZY SOUNDS11 CRAZY FRUITS CLUB
@@ -44536,65 +44536,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4derby)
}
INPUT_PORTS_START( sc4derby ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk prz")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mat")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk prz")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk mat")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1006 DEMOLITION DERBY PR1006 DEMDERBY SOUNDS11
@@ -44606,99 +44606,99 @@ GAMEL( 200?, sc4derbyd ,sc4derby, sc4, sc4derby, sc4_state, sc4derby, ROT0, "
GAMEL( 200?, sc4derbye ,sc4derby, sc4, sc4derby, sc4_state, sc4derby, ROT0, "BFM","Demolition Derby (Bellfruit) (Scorpion 4) (set 6)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4dbldm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("btn 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("btn 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("btn 4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("btn 5")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("max")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bet2")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("bet1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bet3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("bet5")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("bet4")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("bet6")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("btn 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("btn 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("btn 4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("btn 5")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("max")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bet2")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("bet1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bet3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("bet5")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("bet4")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("bet6")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2558 DOUBLE DIAMOND 011 DOUBLEDIAMONDSND DOUBLE DIAMOND
GAMEL( 200?, sc4dbldm ,0, sc4, sc4dbldm, sc4_state, sc4, ROT0, "Qps","Double Diamond (Qps) (Scorpion 4)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4dyna ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk skl")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dils 1" // standard input (motherboard)
- // 0x0002 - "dils 2" // standard input (motherboard)
- // 0x0004 - "dils 3" // standard input (motherboard)
- // 0x0008 - "dils 4" // standard input (motherboard)
- // 0x0010 - "dils 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dils 6" // standard input (motherboard)
- // 0x0002 - "dils 7" // standard input (motherboard)
- // 0x0004 - "dils 8" // standard input (motherboard)
- // 0x0008 - "dils 9" // standard input (motherboard)
- // 0x0010 - "dils10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dils11" // standard input (motherboard)
- // 0x0002 - "dils12" // standard input (motherboard)
- // 0x0004 - "dils13" // standard input (motherboard)
- // 0x0008 - "dils14" // standard input (motherboard)
- // 0x0010 - "dils15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dils16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk bon")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("blast")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk skl")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dils 1" // standard input (motherboard)
+ // 0x0002 - "dils 2" // standard input (motherboard)
+ // 0x0004 - "dils 3" // standard input (motherboard)
+ // 0x0008 - "dils 4" // standard input (motherboard)
+ // 0x0010 - "dils 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dils 6" // standard input (motherboard)
+ // 0x0002 - "dils 7" // standard input (motherboard)
+ // 0x0004 - "dils 8" // standard input (motherboard)
+ // 0x0008 - "dils 9" // standard input (motherboard)
+ // 0x0010 - "dils10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dils11" // standard input (motherboard)
+ // 0x0002 - "dils12" // standard input (motherboard)
+ // 0x0004 - "dils13" // standard input (motherboard)
+ // 0x0008 - "dils14" // standard input (motherboard)
+ // 0x0010 - "dils15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dils16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
INPUT_PORTS_END
// PR1104 DYNAMITE PR1104 DYNAMITE SOUNDS11
@@ -44706,65 +44706,65 @@ GAMEL( 200?, sc4dyna ,0, sc4, sc4dyna, sc4_state, sc4, ROT0, "BFM","
GAMEL( 200?, sc4dynaa ,sc4dyna, sc4, sc4dyna, sc4_state, sc4, ROT0, "BFM","Dynamite (Bellfruit) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4easy ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("step")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("shoot")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1017 EASY STREAK PR1017 EASY STREAK SOUNDS11 EASY STREAK
@@ -44777,62 +44777,62 @@ GAMEL( 200?, sc4easye ,sc4easy, sc4, sc4easy, sc4_state, sc4, ROT0, "BFM","
GAMEL( 200?, sc4easyf ,sc4easy, sc4, sc4easy, sc4_state, sc4, ROT0, "BFM","Easy Streak (Bellfruit) (Scorpion 4) (set 11)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4clbmn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("takfet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("sneakp")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("gamfet")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("gambon")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ // 0x0100 - "hopfit" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("takfet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("sneakp")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("gamfet")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("gambon")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
//PROJECT NUMBER PR1955 CLUB MONEYBAGS MONEY BAGS CLUB PR1955 C M MONEYBAGS SOUNDS11 DEAL OR NO DEAL 5-10-20 10-20-30 20-30-50 30-50-100
@@ -44859,66 +44859,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4boomb)
}
INPUT_PORTS_START( sc4boomb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auctio")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("leave")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c or b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("auctio")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("leave")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("c or b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
//PROJECT NUMBER PR3332 AWP MONOPOLY BOOM OR BUST S4 PR3307 MPOLY BOOM OR B SOUNDS11 BOOM OR BUST S.SITE
@@ -44944,66 +44944,66 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fever)
}
INPUT_PORTS_START( sc4fever ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "pzkey1" // standard input (expected here)
- // 0x0002 - "pzkey2" // standard input (expected here)
- // 0x0004 - "pzkey3" // standard input (expected here)
- // 0x0008 - "pzkey4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pckey1" // standard input (expected here)
- // 0x0002 - "pckey2" // standard input (expected here)
- // 0x0004 - "pckey3" // standard input (expected here)
- // 0x0008 - "pckey4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t blts")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t feat")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("t nuds")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("t ko")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0002 - "hoplow" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "pzkey1" // standard input (expected here)
+ // 0x0002 - "pzkey2" // standard input (expected here)
+ // 0x0004 - "pzkey3" // standard input (expected here)
+ // 0x0008 - "pzkey4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pckey1" // standard input (expected here)
+ // 0x0002 - "pckey2" // standard input (expected here)
+ // 0x0004 - "pckey3" // standard input (expected here)
+ // 0x0008 - "pckey4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t blts")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t feat")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("t nuds")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("t ko")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// we have FEVER SOUNDS12 but it accepts those?
@@ -45043,54 +45043,54 @@ DRIVER_INIT_MEMBER(sc4_state,sc4aztec)
}
INPUT_PORTS_START( sc4aztec ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "dump" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "dump" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
GAMEL( 200?, sc4aztec ,0, sc4, sc4aztec, sc4_state, sc4aztec, ROT0, "BFG / Eurocoin","Aztec Casino (Dutch) (Bellfruit) (Scorpion 4)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )// PR1225 AZTEC CASINO
@@ -45114,57 +45114,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4helrd)
}
INPUT_PORTS_START( sc4helrd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("munt")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "player" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("munt")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "player" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1254 HELLRAISER ART12 95004326 HELLRAISER PR1254
@@ -45189,56 +45189,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4heatw)
}
INPUT_PORTS_START( sc4heatw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "player" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "player" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1216 HEATWAVE ART 12 95004287 HEATWAVE PR1156
@@ -45262,58 +45262,58 @@ DRIVER_INIT_MEMBER(sc4_state,sc4colos)
}
INPUT_PORTS_START( sc4colos ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies m")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies b")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies c")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem m" // unexpected here
- // 0x0004 - "neem w" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies m")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies b")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies c")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem m" // unexpected here
+ // 0x0004 - "neem w" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1208 COLOSSUS 95004235 COLOSSUS PR7155 COLOSSUS
@@ -45336,56 +45336,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fevdt)
}
INPUT_PORTS_START( sc4fevdt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1202 FEVER 95004239 FEVER PR7157
@@ -45410,57 +45410,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4fevnx)
}
INPUT_PORTS_START( sc4fevnx ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k spel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("key/go")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "player" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k spel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("key/go")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "player" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1216 FEVER ART12 95004318 FEVER T N PR1251
@@ -45484,106 +45484,106 @@ DRIVER_INIT_MEMBER(sc4_state,sc4game)
}
INPUT_PORTS_START( sc4gamcs ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "dump" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "dump" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4game ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem c" // unexpected here
- // 0x0004 - "neem w" // standard input (expected here)
- // 0x0010 - "info/l" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem c" // unexpected here
+ // 0x0004 - "neem w" // standard input (expected here)
+ // 0x0010 - "info/l" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
GAMEL( 200?, sc4gamcs ,0, sc4, sc4gamcs, sc4_state, sc4game, ROT0, "BFM","The Game Casino (Dutch) (Bellfruit) (Scorpion 4)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 ) // PR1224 THE GAME CASINO 95004285 THEGAME PR1153
@@ -45606,65 +45606,65 @@ DRIVER_INIT_MEMBER(sc4_state,sc4goud)
}
INPUT_PORTS_START( sc4goud ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herste")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("neem p")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop OR wissel")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("uitbet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("player")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi lef")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi mid")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi rig")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("neem g")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo lef")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("lo mid")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("lo rig")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("neem s")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herste")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("neem p")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("stop OR wissel")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("uitbet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("player")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("hi lef")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi mid")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi rig")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("neem g")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("lo lef")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("lo mid")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("lo rig")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_4 ) PORT_NAME("neem s")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
@@ -45689,47 +45689,47 @@ DRIVER_INIT_MEMBER(sc4_state,sc4lasv)
}
INPUT_PORTS_START( sc4lasv ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k spel")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0008 - "vegas" // standard input (expected here)
- // 0x0010 - "call a" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0004 - "black" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k spel")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0008 - "vegas" // standard input (expected here)
+ // 0x0010 - "call a" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0004 - "black" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
INPUT_PORTS_END
// PR1209 LAS VEGAS 95004261 LASVEGAS PR7159
@@ -45753,110 +45753,110 @@ DRIVER_INIT_MEMBER(sc4_state,sc4miljo)
}
INPUT_PORTS_START( sc4miljo ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "player" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "player" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4milja ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k spel")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0010 - "roep b" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("k inze")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k spel")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0010 - "roep b" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
GAMEL( 200?, sc4miljo ,0, sc4, sc4miljo, sc4_state, sc4miljo, ROT0, "BFM","Miljonairs (Dutch) (Bellfruit) (Scorpion 4) (set 1)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 ) // PR1217 MILJONAIRSART12 95004305 MILJONAIRE PR1157
@@ -45879,57 +45879,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4paytm)
}
INPUT_PORTS_START( sc4paytm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0010 - "roep b" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0010 - "roep b" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1205 PAY TIME 95004224 PAYTIME PR7156 PAY TIME
@@ -45953,52 +45953,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pglcs)
}
INPUT_PORTS_START( sc4pglcs ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hgst" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "dump" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kop")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("munt")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hgst" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "dump" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1261 PHARAOH'S GOLD 95004316 CAS PHAR GOLD PR1261
@@ -46023,57 +46023,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4redad)
}
INPUT_PORTS_START( sc4redad ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "naar c" // unexpected here
- // 0x0004 - "neem w" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "naar c" // unexpected here
+ // 0x0004 - "neem w" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1206 RED ALERT 95004266 REDALERT PR1051
@@ -46098,55 +46098,55 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rvlnx)
}
INPUT_PORTS_START( sc4rvlnx ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herste")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem c" // unexpected here
- // 0x0010 - "info/l" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herste")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem c" // unexpected here
+ // 0x0010 - "info/l" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1252 REVOLUTION NEXT 95004320 REVOLUTIONTN PR1252
@@ -46169,58 +46169,58 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rvl)
}
INPUT_PORTS_START( sc4rvl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herste")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0010 - "r behe" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herste")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0010 - "r behe" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1203 REVOLUTION 95004259 REVOLUTION PR7158
@@ -46243,57 +46243,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4rio)
}
INPUT_PORTS_START( sc4rio ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "neem w" // unexpected here
- // 0x0002 - "neem h" // unexpected here
- // 0x0004 - "uitbet" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "black" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "neem w" // unexpected here
+ // 0x0002 - "neem h" // unexpected here
+ // 0x0004 - "uitbet" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "black" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1222 RIO GRANDE 95004309 RIO GRANDE SOUNDS11
@@ -46317,112 +46317,112 @@ DRIVER_INIT_MEMBER(sc4_state,sc4strbr)
}
INPUT_PORTS_START( sc4strbr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem c" // unexpected here
- // 0x0004 - "neem s" // standard input (expected here)
- // 0x0010 - "info/l" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies i")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem c" // unexpected here
+ // 0x0004 - "neem s" // standard input (expected here)
+ // 0x0010 - "info/l" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
INPUT_PORTS_START( sc4strbra ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("neem s")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem h" // unexpected here
- // 0x0004 - "neem w" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("neem s")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem h" // unexpected here
+ // 0x0004 - "neem w" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1219 STARS 'N BARS 95004290 STARSNBARS PR1159
@@ -46451,57 +46451,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4twilt)
INPUT_PORTS_START( sc4twilt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem c" // unexpected here
- // 0x0010 - "info/l" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem c" // unexpected here
+ // 0x0010 - "info/l" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1214 TWILIGHT 95004299 TWILIGHT PR1154
@@ -46525,57 +46525,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4monsp)
}
INPUT_PORTS_START( sc4monsp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herst")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("munt")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "player" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 4")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("herst")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("munt")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "player" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1218 MONEY SPINNER ART12 95004291 MONEYSPINNER PR1158
@@ -46599,58 +46599,58 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ivply)
}
INPUT_PORTS_START( sc4ivply ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
@@ -46675,58 +46675,58 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ccc)
INPUT_PORTS_START( sc4ccc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- // 0x0010 - "roep" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ // 0x0010 - "roep" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1221 CRISSCROSSCRAZY ART13 95004282 CRISSCROSS PR1161
@@ -46749,56 +46749,56 @@ DRIVER_INIT_MEMBER(sc4_state,sc4valqp)
}
INPUT_PORTS_START( sc4valqp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("spel")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("inzet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "player" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("spel")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("inzet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "player" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR2040E VALHALLA...PR2040 SOUNDS V1.... (non-standard header)
@@ -46822,57 +46822,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4winxp)
}
INPUT_PORTS_START( sc4winxp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n hoog" // unexpected here
- // 0x0004 - "n winb" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("vast 4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("kies i")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("kies s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n hoog" // unexpected here
+ // 0x0004 - "n winb" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1207 WIN XPLOSION 95004265 WINXPLOSION PR1053
@@ -46896,52 +46896,52 @@ DRIVER_INIT_MEMBER(sc4_state,sc4xcash)
}
INPUT_PORTS_START( sc4xcash ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("uitbet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("test s")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("test s")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("test s")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("test s")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("test s")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0010 - "roep b" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "dump" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("uitbet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("test s")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("test s")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("test s")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("test s")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("zijdeu OR l hop OR r hop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("test s")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0010 - "roep b" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "dump" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1264 XTRA CASH ART13 XTRA CASH CASINO (LOTECH) - ART13 95004321 XTRACASH PR1264
@@ -46964,57 +46964,57 @@ DRIVER_INIT_MEMBER(sc4_state,sc4helld)
}
INPUT_PORTS_START( sc4helld ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies m")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k basi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("k club")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem m" // unexpected here
- // 0x0004 - "neem w" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herste")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("kies m")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("k basi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("k club")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem m" // unexpected here
+ // 0x0004 - "neem w" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1201 HELLS BELLS 95004211 HELLS BELLS PR6945 HELLS BELLS (non english?)
@@ -47037,55 +47037,55 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cashn)
}
INPUT_PORTS_START( sc4cashn ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("inzet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "n club" // unexpected here
- // 0x0010 - "player" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("herst")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("inzet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "n club" // unexpected here
+ // 0x0010 - "player" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
@@ -47110,58 +47110,58 @@ DRIVER_INIT_MEMBER(sc4_state,sc4czfra)
}
INPUT_PORTS_START( sc4czfra ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("herste")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ruilen")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
- PORT_MODIFY("IN-3")
- // 0x0001 - "uitbet" // unexpected here
- // 0x0002 - "neem w" // unexpected here
- // 0x0004 - "neem l" // standard input (expected here)
- // 0x0008 - "neem s" // standard input (expected here)
- // 0x0010 - "info/l" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "l hop" // unexpected here
- // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
- // 0x0004 - "l hop" // unexpected here
- // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
- // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "l lege" // standard input (expected here)
- // 0x0002 - "r lege" // standard input (expected here)
- // 0x0004 - "dump" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "cashbo" // standard input (expected here)
- // 0x0008 - "zijdeu" // standard input (expected here)
- // 0x0010 - "boekho" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("vast 1")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("vast 2")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("vast 3")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("herste")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ruilen")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("start")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("bijvul")
+ PORT_MODIFY("IN-3")
+ // 0x0001 - "uitbet" // unexpected here
+ // 0x0002 - "neem w" // unexpected here
+ // 0x0004 - "neem l" // standard input (expected here)
+ // 0x0008 - "neem s" // standard input (expected here)
+ // 0x0010 - "info/l" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "l hop" // unexpected here
+ // 0x0002 - "r hop" // known extended(?) input, sometimes 'hop hi'
+ // 0x0004 - "l hop" // unexpected here
+ // 0x0008 - "r hop" // known extended(?) input, sometimes 'hop top'
+ // 0x0010 - "hopper" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "l lege" // standard input (expected here)
+ // 0x0002 - "r lege" // standard input (expected here)
+ // 0x0004 - "dump" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "cashbo" // standard input (expected here)
+ // 0x0008 - "zijdeu" // standard input (expected here)
+ // 0x0010 - "boekho" // standard input (expected here)
INPUT_PORTS_END
// PR1212 CRAZY FRUITS PR1152 CRAZY FRUITS SOUNDS11
@@ -47174,66 +47174,66 @@ GAMEL( 200?, sc4czfra ,0, sc4, sc4czfra, sc4_state, sc4czfra, ROT0, "BFM","Cr
/**********************************************************************************************************************************/
INPUT_PORTS_START( sc4adsnt ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("gamble")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("grabs")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featur")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("gamble")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("grabs")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("featur")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47242,59 +47242,59 @@ GAMEL( 200?, sc4adsnt ,0, sc4, sc4adsnt, sc4_state, sc4, ROT0, "BFM",
GAMEL( 200?, sc4adsnta ,sc4adsnt, sc4, sc4adsnt, sc4_state, sc4, ROT0, "BFM","Ant & Dec's Saturday Night Takeaway (Bellfruit) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4slad ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47310,44 +47310,44 @@ GAMEL( 200?, sc4sladg ,sc4slad, sc4, sc4slad, sc4_state, sc4, ROT0, "BFM","
GAMEL( 200?, sc4sladh ,sc4slad, sc4, sc4slad, sc4_state, sc4, ROT0, "BFM","Snakes & Ladders (Bellfruit) (Scorpion 4) (set 9)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4magci ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("magic")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "botdor" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("magic")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "botdor" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47385,44 +47385,44 @@ GAMEL( 200?, sc4magcij ,sc4magci, sc4, sc4magci, sc4_state, sc4, ROT0, "Qps",
GAMEL( 200?, sc4magciu ,sc4magci, sc4, sc4magci, sc4_state, sc4, ROT0, "Qps","Magic Circle (034) (Qps) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4dcrls ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("streak")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "botdor" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("streak")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "botdor" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47446,44 +47446,44 @@ GAMEL( 200?, sc4dcrlse ,sc4dcrls, sc4, sc4dcrls, sc4_state, sc4, ROT0, "Mazoo
GAMEL( 200?, sc4dcrlsk ,sc4dcrls, sc4, sc4dcrls, sc4_state, sc4, ROT0, "Mazooma","Double Crazy Reels (033) (Mazooma) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4gshot ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-4")
- // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "botdor" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("auto")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "topup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "botdor" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47495,66 +47495,66 @@ GAMEL( 200?, sc4gshota ,sc4gshot, sc4, sc4gshot, sc4_state, sc4, ROT0, "Qps",
GAMEL( 200?, sc4gshotc ,sc4gshot, sc4, sc4gshot, sc4_state, sc4, ROT0, "Qps","Golden Shot Arcade (Qps) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4cj ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c feat")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c feat")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47566,68 +47566,68 @@ GAMEL( 200?, sc4cjc ,sc4cj, sc4, sc4cj, sc4_state, sc4, ROT0, "BFM","Co
GAMEL( 200?, sc4cjd ,sc4cj, sc4, sc4cj, sc4_state, sc4, ROT0, "BFM","Cool Jewels (Bellfruit) (Scorpion 4) (set 5)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 ) // incomplete pairing
INPUT_PORTS_START( sc4crnjw ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("red b")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("oran b")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bonus")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("blue b")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("gren b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("red b")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("oran b")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("blue b")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("gren b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERROR 17
@@ -47636,70 +47636,70 @@ GAMEL( 200?, sc4crnjw ,0, sc4, sc4crnjw, sc4_state, sc4, ROT0, "BFM",
GAMEL( 200?, sc4crnjwa ,sc4crnjw, sc4, sc4crnjw, sc4_state, sc4, ROT0, "BFM","Crown Jewels (Bellfruit) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4jjok ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 2" // standard input (expected here)
- // 0x0010 - "stk 3" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi nud")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi csh")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("bonus")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "htopup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 2" // standard input (expected here)
+ // 0x0010 - "stk 3" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("lo csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("hi nud")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi csh")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("hi fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("bonus")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "htopup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47709,59 +47709,59 @@ GAMEL( 200?, sc4jjoka ,sc4jjok, sc4, sc4jjok, sc4_state, sc4, ROT0, "BFM","
INPUT_PORTS_START( sc4copsr ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PAY UNIT ERR 17
@@ -47778,59 +47778,59 @@ GAMEL( 200?, sc4copsrh ,sc4copsr, sc4, sc4copsr, sc4_state, sc4, ROT0, "BFM",
GAMEL( 200?, sc4copsri ,sc4copsr, sc4, sc4copsr, sc4_state, sc4, ROT0, "BFM","Cops 'n' Robbers (Bellfruit) (Scorpion 4) (set 10)", GAME_NOT_WORKING | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4druby ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("pndlow OR 10plow")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "cshdor" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("autopl")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("pndlow OR 10plow")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("transf")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0008 - "htopup" // known extended(?) input, sometimes 'hop top'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "cshdor" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// gives an 'init comms' countdown
@@ -47870,54 +47870,54 @@ DRIVER_INIT_MEMBER(sc4_state,sc4abra)
}
INPUT_PORTS_START( sc4abra ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// missing sound roms
@@ -47931,43 +47931,43 @@ GAMEL( 200?, sc4abrae ,sc4abra, sc4, sc4abra, sc4_state, sc4abra, ROT0, "Qp
INPUT_PORTS_START( sc4alad ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("take")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("ko")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blast")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("winspn")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("take")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("ko")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("blast")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("cash")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("winspn")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
INPUT_PORTS_END
// bad / missing sound roms
@@ -47995,49 +47995,49 @@ DRIVER_INIT_MEMBER(sc4_state,sc4bigdl)
}
INPUT_PORTS_START( sc4bigdl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudges")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("feats")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("knock")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("cash")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nudges")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("feats")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("knock")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// missing sound roms, doesn't play
@@ -48101,41 +48101,41 @@ DRIVER_INIT_MEMBER(sc4_state,sc4cconxd)
}
INPUT_PORTS_START( sc4cconxd ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("take")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonusn")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("take")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonusn")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
INPUT_PORTS_END
// no sound roms
@@ -48163,53 +48163,53 @@ DRIVER_INIT_MEMBER(sc4_state,sc4ccrus)
}
INPUT_PORTS_START( sc4ccrus ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("excnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("higher")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("lower")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk zpb")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk zpr")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk p r")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk p b")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("excnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("higher")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("lower")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk zpb")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk zpr")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk p r")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("tk p b")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
@@ -48239,54 +48239,54 @@ DRIVER_INIT_MEMBER(sc4_state,sc4jjc)
}
INPUT_PORTS_START( sc4jjc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2152 JUMPIN JACK CASH JACK SOUNDS JUMPIN JACK CASH
@@ -48303,50 +48303,50 @@ GAMEL( 200?, sc4jjci ,sc4jjc, sc4, sc4jjc, sc4_state, sc4jjc, ROT0, "Mazo
INPUT_PORTS_START( sc4kkong ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("dice")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("c pot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("dice")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nudge")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2161 KING KONG CASH 000 KKCSH SOUNDS KING KONG CASH
@@ -48396,45 +48396,45 @@ DRIVER_INIT_MEMBER(sc4_state,sc4knokb)
}
INPUT_PORTS_START( sc4knok ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto n")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("take f")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("ko")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi c")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo c")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo n")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi n")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("auto n")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("take f")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("ko")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi c")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lo c")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lo n")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("hi n")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
INPUT_PORTS_END
@@ -48444,46 +48444,46 @@ GAMEL( 200?, sc4knoka ,sc4knok, sc4, sc4knok, sc4_state, sc4knok, ROT0, "Ma
INPUT_PORTS_START( sc4knokb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold a")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold b")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold c")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold a")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold b")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold c")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// This is a different game
@@ -48510,67 +48510,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4maxcc)
}
INPUT_PORTS_START( sc4maxcc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nud lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("fet lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("knk lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("knk hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nud hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("tk knk")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nud lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("fet lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("knk lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("knk hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nud hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("tk knk")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2130 CLUB MAXIMUS CASH MAXIMUS CASH CLUB CMAX SOUNDS MAXIMUS CASH
@@ -48596,51 +48596,51 @@ DRIVER_INIT_MEMBER(sc4_state,sc4wadzl)
}
INPUT_PORTS_START( sc4wadzl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("yel lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("csh lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("fet lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("fet hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("csh hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("yel hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colect")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("yel lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("csh lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("fet lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("fet hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("csh hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("yel hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2052 WADZILLA WADZ SOUNDS WADZILLA
@@ -48649,48 +48649,48 @@ GAMEL( 200?, sc4wadzla ,sc4wadzl, sc4, sc4wadzl, sc4_state, sc4wadzl, ROT0, "
INPUT_PORTS_START( sc4s16 ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("blnk1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("blnk2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("blnk3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("max be")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("stake3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("stake1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("stake2")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("blnk1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("blnk2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("blnk3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("max be")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("stake3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("stake1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("stake2")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// RNG ERR 99
@@ -48700,54 +48700,54 @@ GAMEL( 200?, sc4s16a ,sc4s16, sc4, sc4s16, sc4_state, sc4, ROT0, "Mazooma
INPUT_PORTS_START( sc4bob ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash OR tke ft")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("levl1")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("levl2")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("levl3")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("levl4")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash OR tke ft")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("levl1")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("levl2")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("levl3")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("levl4")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2170 BOBBY DAZZLER BOBD SOUNDS BOBBY DAZZLER
@@ -48763,66 +48763,66 @@ GAMEL( 200?, sc4bobh ,sc4bob, sc4, sc4bob, sc4_state, sc4, ROT0, "Mazooma
GAMEL( 200?, sc4bobi ,sc4bob, sc4, sc4bob, sc4_state, sc4, ROT0, "Mazooma","Bobby Dazzler (Mazooma) (Scorpion 4) (set 10)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4clue ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("h nuds")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkcpot")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tkspin")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fastpy")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("h cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("h nuds")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkcpot")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tkspin")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fastpy")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2230 CLUEDO CLUE SOUNDS CLUEDO
@@ -48836,48 +48836,48 @@ GAMEL( 200?, sc4cluef ,sc4clue, sc4, sc4clue, sc4_state, sc4, ROT0, "Mazoom
GAMEL( 200?, sc4clueg ,sc4clue, sc4, sc4clue, sc4_state, sc4, ROT0, "Mazooma","Cluedo (Mazooma) (Scorpion 4) (set 8)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4ducks ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc OR coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exch")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("turbo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkcpot")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("carry")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkwins")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "hp dmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc OR coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("exch")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("turbo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tkcpot")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("carry")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkwins")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "hp dmp" // standard input (expected here)
INPUT_PORTS_END
// PR2118 DUCKS OF HAZZARD DUCKSOFHAZZARDSND DUCKS OF HAZZARD
@@ -48903,67 +48903,67 @@ DRIVER_INIT_MEMBER(sc4_state,sc4glad)
}
INPUT_PORTS_START( sc4glad ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12 OR dorlk" // standard input (motherboard)
- // 0x0004 - "dil13 OR topdr" // standard input (motherboard)
- // 0x0008 - "dil14 OR cshbx" // standard input (motherboard)
- // 0x0010 - "dil15 OR dump" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12 OR dorlk" // standard input (motherboard)
+ // 0x0004 - "dil13 OR topdr" // standard input (motherboard)
+ // 0x0008 - "dil14 OR cshbx" // standard input (motherboard)
+ // 0x0010 - "dil15 OR dump" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
INPUT_PORTS_END
// PR2255 GLADIATOR GLAD SOUNDS GLADIATOR
@@ -48978,61 +48978,61 @@ GAMEL( 200?, sc4gladg ,sc4glad, sc4, sc4glad, sc4_state, sc4glad, ROT0, "QP
INPUT_PORTS_START( sc4hotdg ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trf/ex")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trf/ex")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1936 AWP HOT DOG SCORP4 PR1916 HOT DOG SOUNDS11 HOT DOG S.SITE
@@ -49059,70 +49059,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4pp)
}
INPUT_PORTS_START( sc4pp ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up OR top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("shoot")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("c hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("f hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up OR top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// doesn't like any of the sound roms we have
@@ -49135,55 +49135,55 @@ GAMEL( 200?, sc4ppd ,sc4pp, sc4, sc4pp, sc4_state, sc4pp, ROT0, "Mazoom
INPUT_PORTS_START( sc4ppsag ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("game")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nuds")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("levl1")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("levl2")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("levl3")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("levl4")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15 OR deflt" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "hoplo" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("game")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("cash")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nuds")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("levl1")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("levl2")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("levl3")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("levl4")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15 OR deflt" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "hoplo" // standard input (expected here)
INPUT_PORTS_END
// PR2303 STRIKES AGAIN PPSA SOUNDS STRIKES AGAIN
@@ -49199,68 +49199,68 @@ GAMEL( 200?, sc4ppsagh ,sc4ppsag, sc4, sc4ppsag, sc4_state, sc4, ROT0, "Mazoo
GAMEL( 200?, sc4ppsagi ,sc4ppsag, sc4, sc4ppsag, sc4_state, sc4, ROT0, "Mazooma","Pink Panther Strikes Again (Mazooma) (Scorpion 4) (set 10)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4pog ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bns")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bronze")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("silver")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("gold")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil1" // standard input (motherboard)
- // 0x0002 - "dil2" // standard input (motherboard)
- // 0x0004 - "dil3" // standard input (motherboard)
- // 0x0008 - "dil4" // standard input (motherboard)
- // 0x0010 - "dil5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil6" // standard input (motherboard)
- // 0x0002 - "dil7" // standard input (motherboard)
- // 0x0004 - "dil8" // standard input (motherboard)
- // 0x0008 - "dil9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "serdor" // standard input (expected here)
- // 0x0008 - "cshdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collct")
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_5 ) PORT_NAME("hpunit")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("ch stk")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("trnsfr")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk bns")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk csh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("bronze")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("silver")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("gold")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil1" // standard input (motherboard)
+ // 0x0002 - "dil2" // standard input (motherboard)
+ // 0x0004 - "dil3" // standard input (motherboard)
+ // 0x0008 - "dil4" // standard input (motherboard)
+ // 0x0010 - "dil5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil6" // standard input (motherboard)
+ // 0x0002 - "dil7" // standard input (motherboard)
+ // 0x0004 - "dil8" // standard input (motherboard)
+ // 0x0008 - "dil9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "serdor" // standard input (expected here)
+ // 0x0008 - "cshdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR1938 AWP POTS OF GOLD SCORP4 PR1918 POTS OF GOLD SOUNDS11 POTS OF GOLD S.SITE
@@ -49276,50 +49276,50 @@ GAMEL( 200?, sc4pogh ,sc4pog, sc4, sc4pog, sc4_state, sc4mbus, ROT0, "BFM
GAMEL( 200?, sc4pogi ,sc4pog, sc4, sc4pog, sc4_state, sc4mbus, ROT0, "BFM","Pots Of Gold (Bellfruit) (Scorpion 4) (set 10)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4pwrpl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("power")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- // 0x0100 - "hoplw" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("suph")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("power")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ // 0x0100 - "hoplw" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("suph")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("nuds")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2272 POWER PLAY PPLY SOUNDS
@@ -49346,50 +49346,50 @@ DRIVER_INIT_MEMBER(sc4_state,sc4swywm)
}
INPUT_PORTS_START( sc4swywm ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash OR tke ft")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("feat")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("move")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("cash OR tke ft")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("feat")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("move")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
@@ -49420,70 +49420,70 @@ DRIVER_INIT_MEMBER(sc4_state,sc4sumit)
}
INPUT_PORTS_START( sc4sumit ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake")
- // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk3" // standard input (expected here)
- // 0x0008 - "stk1" // standard input (expected here)
- // 0x0010 - "stk2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "jp 1" // standard input (expected here)
- // 0x0002 - "jp 2" // standard input (expected here)
- // 0x0004 - "jp 3" // standard input (expected here)
- // 0x0008 - "jp 4" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "pc 1" // standard input (expected here)
- // 0x0002 - "pc 2" // standard input (expected here)
- // 0x0004 - "pc 3" // standard input (expected here)
- // 0x0008 - "pc 4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "topdr" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "dump" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stake")
+ // 0x0100 - "hoplo" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk3" // standard input (expected here)
+ // 0x0008 - "stk1" // standard input (expected here)
+ // 0x0010 - "stk2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "jp 1" // standard input (expected here)
+ // 0x0002 - "jp 2" // standard input (expected here)
+ // 0x0004 - "jp 3" // standard input (expected here)
+ // 0x0008 - "jp 4" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "pc 1" // standard input (expected here)
+ // 0x0002 - "pc 2" // standard input (expected here)
+ // 0x0004 - "pc 3" // standard input (expected here)
+ // 0x0008 - "pc 4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "topdr" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "dump" // standard input (expected here)
INPUT_PORTS_END
// PR2176 SUMMIT UP SUMMIT SOUNDS SUMMIT UP (was in the Suits U Sir set)
@@ -49493,49 +49493,49 @@ GAMEL( 200?, sc4sumitb ,sc4sus, sc4, sc4sumit, sc4_state, sc4sumit, ROT0, "
GAMEL( 200?, sc4sumitc ,sc4sus, sc4, sc4sumit, sc4_state, sc4sumit, ROT0, "Mazooma","Summit Up (Mazooma) (Scorpion 4) (set 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4tpsht ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "lock" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("step")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "lock" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2211 TOP OF THE SHOTS TOTS SOUNDS TOP OF THE SHOTS
@@ -49550,47 +49550,47 @@ GAMEL( 200?, sc4tpshtg ,sc4tpsht, sc4, sc4tpsht, sc4_state, sc4, ROT0, "Mazoo
INPUT_PORTS_START( sc4adren ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("usebon")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("trans")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("usebon")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// does not want the 'COTL SOUNDS' from Cash On The Lash
@@ -49602,52 +49602,52 @@ GAMEL( 200?, sc4adrenc ,sc4adren, sc4, sc4adren, sc4_state, sc4, ROT0, "Mazoo
INPUT_PORTS_START( sc4bingb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("maxbet")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("fast")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("stake6")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("stake3")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("stake2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("stake5")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("stake4")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("stake1")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("maxbet")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("fast")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("stake6")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("stake3")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("stake2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("stake5")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("stake4")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("stake1")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// check if Side Splitter sound is correct
@@ -49657,50 +49657,50 @@ GAMEL( 200?, sc4bingb ,0, sc4, sc4bingb, sc4_state, sc4, ROT0, "Mazoo
GAMEL( 200?, sc4bingba ,sc4bingb, sc4, sc4bingb, sc4_state, sc4, ROT0, "Mazooma","Bingo Belle (Mazooma) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4cerup ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("a ndge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tk ftr")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("ndg hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ndg lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("csh lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("coll")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("a ndge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("tk ftr")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("csh hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("ndg hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ndg lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("csh lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
@@ -49708,52 +49708,52 @@ INPUT_PORTS_END
GAMEL( 200?, sc4cerup ,0, sc4, sc4cerup, sc4_state, sc4, ROT0, "Mazooma","Cash Eruption (Mazooma) (Scorpion 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4cexpl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk pic")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("move u")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("collec")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk cas")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk pic")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("move u")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("lef hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("mid hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("rgt hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2076 CASH EXPLOSION CEXP SOUNDS CASH EXPLSION
@@ -49776,44 +49776,44 @@ GAMEL( 200?, sc4casrye ,sc4casry, sc4, sc4, sc4_state, sc4, ROT0, "Mazooma","
// I guess this isn't a fruit machine
INPUT_PORTS_START( sc4casrya ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- // 0x0100 - "esc" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("tilt")
- // 0x0100 - "c hop" // unexpected here
- PORT_MODIFY("IN-4")
- // 0x0100 - "vib" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-6")
- // 0x0001 - "arm l" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("arm r")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green OR t bot" // standard input (motherboard)
- // 0x0002 - "door l" // standard input (expected here)
- // 0x0004 - "top do" // standard input (expected here)
- // 0x0008 - "cashbo OR cash b" // standard input (expected here)
- // 0x0010 - "defloa" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ // 0x0100 - "esc" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("tilt")
+ // 0x0100 - "c hop" // unexpected here
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "vib" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "arm l" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("arm r")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green OR t bot" // standard input (motherboard)
+ // 0x0002 - "door l" // standard input (expected here)
+ // 0x0004 - "top do" // standard input (expected here)
+ // 0x0008 - "cashbo OR cash b" // standard input (expected here)
+ // 0x0010 - "defloa" // standard input (expected here)
INPUT_PORTS_END
// PR2073, CZECH CASINO ROYALE.......................CROY SOUNDS... (not standard header)
@@ -49821,60 +49821,60 @@ GAMEL( 200?, sc4casrya ,sc4casry, sc4, sc4casrya, sc4_state, sc4, ROT0, "Mazo
GAMEL( 200?, sc4casryb ,sc4casry, sc4, sc4casrya, sc4_state, sc4, ROT0, "Mazooma","Casino Royale (PR2073) (Czech) (Mazooma) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4clucl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk mtr")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk mtr")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2237 CLUB CLUEDO CLUB CLUEDO CLUB CCLU SOUNDS CLUB CLUEDO
@@ -49882,65 +49882,65 @@ GAMEL( 200?, sc4clucl ,0, sc4, sc4clucl, sc4_state, sc4, ROT0, "Mazoo
GAMEL( 200?, sc4clucla ,sc4clucl, sc4, sc4clucl, sc4_state, sc4, ROT0, "Mazooma","Cluedo Club (Mazooma) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4cyc ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-6")
- // 0x0001 - "perc1" // standard input (expected here)
- // 0x0002 - "perc2" // standard input (expected here)
- // 0x0004 - "perc3" // standard input (expected here)
- // 0x0008 - "perc4" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk ss")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk haz")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2 OR high")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3 OR low")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("colect")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper fit'
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-6")
+ // 0x0001 - "perc1" // standard input (expected here)
+ // 0x0002 - "perc2" // standard input (expected here)
+ // 0x0004 - "perc3" // standard input (expected here)
+ // 0x0008 - "perc4" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk fea")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk sht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk ss")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk haz")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// half size sound rom, or missing a rom
@@ -49952,65 +49952,65 @@ GAMEL( 200?, sc4cycc ,sc4cyc, sc4, sc4cyc, sc4_state, sc4, ROT0, "Mazooma
GAMEL( 200?, sc4cycd ,sc4cyc, sc4, sc4cyc, sc4_state, sc4, ROT0, "Mazooma","Count Yer Cash (Mazooma) (Scorpion 4) (set 5)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4cyccl ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0001 - "hop2lo" // unexpected here
- // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t fet")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t sht")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("t nuds")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("t ssht")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("t sfet")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("t hazd")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0001 - "hop2lo" // unexpected here
+ // 0x0002 - "hop1lo OR hop lo" // known extended(?) input, sometimes 'hop hi'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("t fet")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("t sht")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("t nuds")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("t ssht")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("t sfet")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("t hazd")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// half size sound rom, or missing a rom
@@ -50021,44 +50021,44 @@ GAMEL( 200?, sc4cycclb ,sc4cyccl, sc4, sc4cyccl, sc4_state, sc4, ROT0, "Mazoo
GAMEL( 200?, sc4cycclc ,sc4cyccl, sc4, sc4cyccl, sc4_state, sc4, ROT0, "Mazooma","Count Yer Cash Club (Mazooma) (Scorpion 4) (set 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4supst ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("coll")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("blnk1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("blnk2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("blnk3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "hp dmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("coll")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("trans")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("blnk1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("blnk2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("blnk3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "hp dmp" // standard input (expected here)
INPUT_PORTS_END
// PR2206 STREAKX STRX SOUNDS SUPER STREAX
@@ -50066,50 +50066,50 @@ GAMEL( 200?, sc4supst ,0, sc4, sc4supst, sc4_state, sc4, ROT0, "Mazoo
GAMEL( 200?, sc4supsta ,sc4supst, sc4, sc4supst, sc4_state, sc4, ROT0, "Mazooma","Super Streax (Mazooma) (Scorpion 4) (set 2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4sf ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("excnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("coll")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("brd ex")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("higher")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lower")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("excnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("coll")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("brd ex")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("higher")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lower")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("tk csh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// NUMBER PR2024 STREET FIGHTER STRF SOUNDS STREET FIGHTER
@@ -50120,53 +50120,53 @@ GAMEL( 200?, sc4sfc ,sc4sf, sc4, sc4sf, sc4_state, sc4, ROT0, "Mazooma"
GAMEL( 200?, sc4sfd ,sc4sf, sc4, sc4sf, sc4_state, sc4, ROT0, "Mazooma","Street Fighter (Mazooma) (Scorpion 4) (set 5)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4hyde ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold a")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold b")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold c")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ftr")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ko")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("blast")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("cash")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold a")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold b")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold c")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("stop")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xchnge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("ftr")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("ko")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("blast")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("cash")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2036 HYDE & STREAK HYDE SOUNDS HYDE & STREAK
@@ -50176,67 +50176,67 @@ GAMEL( 200?, sc4hydeb ,sc4hyde, sc4, sc4hyde, sc4_state, sc4, ROT0, "Mazoom
GAMEL( 200?, sc4hydec ,sc4hyde, sc4, sc4hyde, sc4_state, sc4, ROT0, "Mazooma","Hyde & Streak (Mazooma) (Scorpion 4) (set 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4rtclb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("knk lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("fet lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nud lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nud hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("knk hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk knk")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("tk fet")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("tk nud")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("knk lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("fet lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("nud lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("nud hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("fet hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("knk hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("tk knk")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("tk fet")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_3 ) PORT_NAME("tk nud")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// PR2051 CLUB ROLLING THUNDER CLRT SOUNDS ROLLING THUNDER
@@ -50256,50 +50256,50 @@ GAMEL( 200?, sc4wldjkg ,sc4wldjk, sc4, sc4, sc4_state, sc4, ROT0, "Mazooma","
// only sc4jive has this structure intact
INPUT_PORTS_START( sc4jive ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tke cs")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tke sh")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take_w")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("collec")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("collec")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tke cs")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tke sh")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("take_w")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("spin")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("collec")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2096 JIVE MONEY JIVE SOUNDS JIVE MONEY
@@ -50311,60 +50311,60 @@ GAMEL( 200?, sc4jivec ,sc4jive, sc4, sc4jive, sc4_state, sc4, ROT0, "Mazoom
GAMEL( 200?, sc4jived ,sc4jive, sc4, sc4jive, sc4_state, sc4, ROT0, "Mazooma","Jive Money (PR2160) (Mazooma) (Scorpion 4) (set 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4mclb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
- PORT_MODIFY("IN-3")
- // 0x0004 - "stk 4" // standard input (expected here)
- // 0x0008 - "stk 3" // standard input (expected here)
- // 0x0010 - "stk 2" // standard input (expected here)
- PORT_MODIFY("IN-4")
- // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
- PORT_MODIFY("IN-5")
- // 0x0001 - "priz4" // standard input (expected here)
- // 0x0002 - "priz3" // standard input (expected here)
- // 0x0004 - "priz2" // standard input (expected here)
- // 0x0008 - "priz1" // standard input (expected here)
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk mtr")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
- // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "grnbut" // standard input (motherboard)
- // 0x0002 - "dorlok" // standard input (expected here)
- // 0x0004 - "topdor" // standard input (expected here)
- // 0x0008 - "botdor" // standard input (expected here)
- // 0x0010 - "hopdmp" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cn/col")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold3")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold4")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("stop")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("xfer")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("exchng")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4 ) PORT_NAME("start")
+ PORT_MODIFY("IN-3")
+ // 0x0004 - "stk 4" // standard input (expected here)
+ // 0x0008 - "stk 3" // standard input (expected here)
+ // 0x0010 - "stk 2" // standard input (expected here)
+ PORT_MODIFY("IN-4")
+ // 0x0100 - "hoplow" // known extended input, usually 'hopper low'
+ PORT_MODIFY("IN-5")
+ // 0x0001 - "priz4" // standard input (expected here)
+ // 0x0002 - "priz3" // standard input (expected here)
+ // 0x0004 - "priz2" // standard input (expected here)
+ // 0x0008 - "priz1" // standard input (expected here)
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("tk nud")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("tk mtr")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14 OR perc1" // standard input (motherboard)
+ // 0x0010 - "dil15 OR perc2" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16 OR perc3" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "grnbut" // standard input (motherboard)
+ // 0x0002 - "dorlok" // standard input (expected here)
+ // 0x0004 - "topdor" // standard input (expected here)
+ // 0x0008 - "botdor" // standard input (expected here)
+ // 0x0010 - "hopdmp" // standard input (expected here)
INPUT_PORTS_END
// no sound roms
@@ -50378,43 +50378,43 @@ GAMEL( 200?, sc4mclbe ,sc4mclb, sc4, sc4mclb, sc4_state, sc4, ROT0, "Mazoom
INPUT_PORTS_START( sc4monot ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("streak")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil sw" // standard input (motherboard)
- // 0x0002 - "dil sw" // standard input (motherboard)
- // 0x0004 - "dil sw" // standard input (motherboard)
- // 0x0008 - "dil sw" // standard input (motherboard)
- // 0x0010 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil sw" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "green" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("transf")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("streak")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ // 0x0002 - "dil sw" // standard input (motherboard)
+ // 0x0004 - "dil sw" // standard input (motherboard)
+ // 0x0008 - "dil sw" // standard input (motherboard)
+ // 0x0010 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil sw" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "green" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
GAMEL( 200?, sc4monot ,0, sc4, sc4monot, sc4_state, sc4, ROT0, "Mazooma","Monopoly TTT (PR2133) (Mazooma) (Scorpion 4) (set 1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 ) // PR2133MONOPOLY TTT MONOPOLY TTT MAZ MONL SOUNDS MONOPOLY
@@ -50423,54 +50423,54 @@ GAMEL( 200?, sc4monotb ,sc4monot, sc4, sc4monot, sc4_state, sc4, ROT0, "Mazoo
GAMEL( 200?, sc4monotc ,sc4monot, sc4, sc4monot, sc4_state, sc4, ROT0, "Mazooma","Monopoly TTT (PR2133) (Mazooma) (Scorpion 4) (set 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 ) // PR2133MONOPOLY TTT MONOPOLY TTT ARCADE MONL SOUNDS MONOPOLY
INPUT_PORTS_START( sc4r2r ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("take f")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("a ndge")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("swop t")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-7")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("tk pik")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("rht lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("mid lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lef lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef hi")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("mid hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("rht hi")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "top up" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("take f")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("a ndge")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("swop t")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-7")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_7_0 ) PORT_NAME("tk pik")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("rht lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("mid lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("lef lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("lef hi")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("mid hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("rht hi")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "top up" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2037 REEL TO REEL RTOR SOUNDS REEL 2 REEL
@@ -50480,53 +50480,53 @@ GAMEL( 200?, sc4r2rb ,sc4r2r, sc4, sc4r2r, sc4_state, sc4, ROT0, "Mazooma
GAMEL( 200?, sc4r2rc ,sc4r2r, sc4, sc4r2r, sc4_state, sc4, ROT0, "Mazooma","Reel To Reel (Mazooma) (Scorpion 4) (set 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4revo ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("colect")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchge")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_MODIFY("IN-4")
- // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nge hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("wsp hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("csh hi")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("csh lo")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("wsp lo")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nge lo")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil 10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil 11" // standard input (motherboard)
- // 0x0002 - "dil 12" // standard input (motherboard)
- // 0x0004 - "dil 13" // standard input (motherboard)
- // 0x0008 - "dil 14" // standard input (motherboard)
- // 0x0010 - "dil 15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil 16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "testsw" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancel")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold 1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold 2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold 3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("colect")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exchge")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_MODIFY("IN-4")
+ // 0x0010 - "top up" // known extended(?) input, sometimes 'top up'
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("nge hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("wsp hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("csh hi")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("csh lo")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("wsp lo")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("nge lo")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil 10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil 11" // standard input (motherboard)
+ // 0x0002 - "dil 12" // standard input (motherboard)
+ // 0x0004 - "dil 13" // standard input (motherboard)
+ // 0x0008 - "dil 14" // standard input (motherboard)
+ // 0x0010 - "dil 15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil 16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "testsw" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// PR2020 REVOLVER REV SOUNDS REVOLVER
@@ -50538,49 +50538,49 @@ GAMEL( 200?, sc4revod ,sc4revo, sc4, sc4revo, sc4_state, sc4, ROT0, "Mazoom
GAMEL( 200?, sc4revoe ,sc4revo, sc4, sc4revo, sc4_state, sc4, ROT0, "Mazooma","Revolver (Mazooma) (Scorpion 4) (set 6)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4slih ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xfer")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkcsh")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dor lk" // standard input (expected here)
- // 0x0004 - "tp dor" // standard input (expected here)
- // 0x0008 - "csh bx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("canc")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("colct")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("xfer")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_1 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refill")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("bonus")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("shot")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("tkcsh")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dor lk" // standard input (expected here)
+ // 0x0004 - "tp dor" // standard input (expected here)
+ // 0x0008 - "csh bx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// half size sound roms
@@ -50593,54 +50593,54 @@ GAMEL( 200?, sc4slihd ,sc4slih, sc4, sc4slih, sc4_state, sc4, ROT0, "Mazoom
GAMEL( 200?, sc4slihe ,sc4slih, sc4, sc4slih, sc4_state, sc4, ROT0, "Mazooma","Some Like It Hot (Mazooma) (Scorpion 4) (set 6)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_CLICKABLE_ARTWORK, layout_bfm_sc4 )
INPUT_PORTS_START( sc4gcb ) // this structure is generated
- PORT_INCLUDE( sc4_base )
- PORT_MODIFY("IN-1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
- PORT_MODIFY("IN-2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
- PORT_MODIFY("IN-8")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
- PORT_MODIFY("IN-9")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
- PORT_MODIFY("IN-16")
- // 0x0001 - "dil 1" // standard input (motherboard)
- // 0x0002 - "dil 2" // standard input (motherboard)
- // 0x0004 - "dil 3" // standard input (motherboard)
- // 0x0008 - "dil 4" // standard input (motherboard)
- // 0x0010 - "dil 5" // standard input (motherboard)
- // 0x0100 - "topup" // known extended input, usually 'top up'
- PORT_MODIFY("IN-17")
- // 0x0001 - "dil 6" // standard input (motherboard)
- // 0x0002 - "dil 7" // standard input (motherboard)
- // 0x0004 - "dil 8" // standard input (motherboard)
- // 0x0008 - "dil 9" // standard input (motherboard)
- // 0x0010 - "dil10" // standard input (motherboard)
- PORT_MODIFY("IN-18")
- // 0x0001 - "dil11" // standard input (motherboard)
- // 0x0002 - "dil12" // standard input (motherboard)
- // 0x0004 - "dil13" // standard input (motherboard)
- // 0x0008 - "dil14" // standard input (motherboard)
- // 0x0010 - "dil15" // standard input (motherboard)
- PORT_MODIFY("IN-19")
- // 0x0001 - "dil16" // standard input (motherboard)
- PORT_MODIFY("IN-20")
- // 0x0001 - "test" // standard input (motherboard)
- // 0x0002 - "dorlk" // standard input (expected here)
- // 0x0004 - "tpdor" // standard input (expected here)
- // 0x0008 - "cshbx" // standard input (expected here)
- // 0x0010 - "deflt" // standard input (expected here)
+ PORT_INCLUDE( sc4_base )
+ PORT_MODIFY("IN-1")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_0 ) PORT_NAME("cancl")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_1 ) PORT_NAME("stake")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_2 ) PORT_NAME("hold1")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_3 ) PORT_NAME("hold2")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_1_4 ) PORT_NAME("hold3")
+ PORT_MODIFY("IN-2")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_0 ) PORT_NAME("exch")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_2 ) PORT_NAME("start")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3 ) PORT_NAME("refil")
+ PORT_MODIFY("IN-8")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_0 ) PORT_NAME("c lo")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_1 ) PORT_NAME("b lo")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_2 ) PORT_NAME("f lo")
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_3 ) PORT_NAME("step")
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_8_4 ) PORT_NAME("f hi")
+ PORT_MODIFY("IN-9")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_0 ) PORT_NAME("b hi")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_1 ) PORT_NAME("c hi")
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_9_2 ) PORT_NAME("take")
+ PORT_MODIFY("IN-16")
+ // 0x0001 - "dil 1" // standard input (motherboard)
+ // 0x0002 - "dil 2" // standard input (motherboard)
+ // 0x0004 - "dil 3" // standard input (motherboard)
+ // 0x0008 - "dil 4" // standard input (motherboard)
+ // 0x0010 - "dil 5" // standard input (motherboard)
+ // 0x0100 - "topup" // known extended input, usually 'top up'
+ PORT_MODIFY("IN-17")
+ // 0x0001 - "dil 6" // standard input (motherboard)
+ // 0x0002 - "dil 7" // standard input (motherboard)
+ // 0x0004 - "dil 8" // standard input (motherboard)
+ // 0x0008 - "dil 9" // standard input (motherboard)
+ // 0x0010 - "dil10" // standard input (motherboard)
+ PORT_MODIFY("IN-18")
+ // 0x0001 - "dil11" // standard input (motherboard)
+ // 0x0002 - "dil12" // standard input (motherboard)
+ // 0x0004 - "dil13" // standard input (motherboard)
+ // 0x0008 - "dil14" // standard input (motherboard)
+ // 0x0010 - "dil15" // standard input (motherboard)
+ PORT_MODIFY("IN-19")
+ // 0x0001 - "dil16" // standard input (motherboard)
+ PORT_MODIFY("IN-20")
+ // 0x0001 - "test" // standard input (motherboard)
+ // 0x0002 - "dorlk" // standard input (expected here)
+ // 0x0004 - "tpdor" // standard input (expected here)
+ // 0x0008 - "cshbx" // standard input (expected here)
+ // 0x0010 - "deflt" // standard input (expected here)
INPUT_PORTS_END
// no sound roms
diff --git a/src/mame/drivers/bfm_sc45_helper.c b/src/mame/drivers/bfm_sc45_helper.c
index 45700d1a4d5..4b9084a39b8 100644
--- a/src/mame/drivers/bfm_sc45_helper.c
+++ b/src/mame/drivers/bfm_sc45_helper.c
@@ -141,7 +141,7 @@ bool compare_input_code(running_machine &machine, int addr)
if ((rom[0] != 0x48e7) || (rom[1] != 0x3020) || (rom[2] != 0x322f) || (rom[3] != 0x0010) || (rom[4] != 0x227c))
return false;
- if ((rom[7] != 0x4242) || (rom[8] != 0x2449) || (rom[9] != 0x3639))
+ if ((rom[7] != 0x4242) || (rom[8] != 0x2449) || (rom[9] != 0x3639))
return false;
return true;
@@ -175,7 +175,6 @@ int find_input_strings(running_machine &machine)
if (found==true)
{
-
startblock = (rom[i + 5] << 16) | rom[i + 6];
endblock = (rom[i + 10] << 16) | rom[i + 11];
sc45helperlog("------------ INPUTS -----------------\n");
@@ -189,7 +188,7 @@ int find_input_strings(running_machine &machine)
UINT16 portpos = rom[j + 0];
int port = (portpos & 0x1f);
int pos = (portpos >> 5);
-
+
UINT16 unk2 = rom[j + 1];
UINT32 stringaddr = (rom[j + 2] << 16) | rom[j + 3];
@@ -208,7 +207,7 @@ int find_input_strings(running_machine &machine)
{
tempstring.cat(chr);
}
-
+
}
tempstring.trimspace();
@@ -232,11 +231,11 @@ int find_input_strings(running_machine &machine)
}
//else
//{
- // printf("invalid port position?\n");
+ // printf("invalid port position?\n");
//}
-
-
+
+
sc45helperlog("%s", tempstring.cstr());
sc45helperlog("\n");
@@ -298,7 +297,7 @@ int find_input_strings(running_machine &machine)
int buttons_used = 1;
printf("INPUT_PORTS_START( %s ) // this structure is generated\n", machine.system().name);
- printf(" PORT_INCLUDE( sc4_base )\n");
+ printf(" PORT_INCLUDE( sc4_base )\n");
for (int i = 0; i < 32; i++)
{
@@ -310,54 +309,54 @@ int find_input_strings(running_machine &machine)
{
if (thisportused == 0)
{
- printf(" PORT_MODIFY(\"IN-%d\")\n", i);
+ printf(" PORT_MODIFY(\"IN-%d\")\n", i);
thisportused = 1;
}
if (ignoreports[i][j] > 0)
{
- printf(" PORT_BIT( 0x%04x, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_%d_%d ) PORT_NAME(\"%s\")\n", 1 << j, i,j/*ignoreports[i][j]*/, sc4inputs[i][j].name.cstr());
+ printf(" PORT_BIT( 0x%04x, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_%d_%d ) PORT_NAME(\"%s\")\n", 1 << j, i,j/*ignoreports[i][j]*/, sc4inputs[i][j].name.cstr());
buttons_used++;
}
else if (ignoreports[i][j] == -3)
{
- printf(" // 0x%04x - \"%s\" // standard input (motherboard)\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // standard input (motherboard)\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -2)
{
- printf(" // 0x%04x - \"%s\" // standard input (expected here)\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // standard input (expected here)\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -1)
{
- printf(" // 0x%04x - \"%s\" // unexpected here\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // unexpected here\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -4)
{
- printf(" // 0x%04x - \"%s\" // known extended input, mapping not understood\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // known extended input, mapping not understood\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -5)
{
- printf(" // 0x%04x - \"%s\" // known extended input, usually 'top up'\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // known extended input, usually 'top up'\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -6)
{
- printf(" // 0x%04x - \"%s\" // known extended input, usually 'hopper low'\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // known extended input, usually 'hopper low'\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -7)
{
- printf(" // 0x%04x - \"%s\" // known extended input, usually 'hopper fit'\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // known extended input, usually 'hopper fit'\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -8)
{
- printf(" // 0x%04x - \"%s\" // known extended(?) input, sometimes 'top up'\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // known extended(?) input, sometimes 'top up'\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -9)
{
- printf(" // 0x%04x - \"%s\" // known extended(?) input, sometimes 'hop hi'\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // known extended(?) input, sometimes 'hop hi'\n", 1 << j, sc4inputs[i][j].name.cstr());
}
else if (ignoreports[i][j] == -10)
{
- printf(" // 0x%04x - \"%s\" // known extended(?) input, sometimes 'hop top'\n", 1 << j, sc4inputs[i][j].name.cstr());
+ printf(" // 0x%04x - \"%s\" // known extended(?) input, sometimes 'hop top'\n", 1 << j, sc4inputs[i][j].name.cstr());
}
buttons_used++;
}
@@ -404,7 +403,6 @@ void set_clickable_temp(running_machine &machine, astring teststring, int clickp
int find_lamp_strings(running_machine &machine)
{
-
int startblock = -1;
int endblock = -1;
@@ -428,7 +426,7 @@ int find_lamp_strings(running_machine &machine)
if (startblock == -1)
return 0;
-
+
for (int y = 0; y < 16; y++)
@@ -463,7 +461,7 @@ int find_lamp_strings(running_machine &machine)
UINT16 *rom = (UINT16*)machine.root_device().memregion( "maincpu" )->base();
UINT8 *rom8 = machine.root_device().memregion( "maincpu" )->base();
-// sc45helperlog("------------ LAMPS -----------------\n");
+// sc45helperlog("------------ LAMPS -----------------\n");
if (endblock > startblock)
{
@@ -476,7 +474,7 @@ int find_lamp_strings(running_machine &machine)
UINT32 stringaddr = (rom[j + 1] << 16) | rom[j + 2];
//sc45helperlog("(row %02d, col %02d, unused %02x) addr %08x ", row,col, (portpos&0xff00)>>8, stringaddr);
-
+
astring tempstring;
for (int k = stringaddr; k < stringaddr + 10; k++)
@@ -491,7 +489,7 @@ int find_lamp_strings(running_machine &machine)
{
tempstring.cat(chr);
}
-
+
}
if (lamps[row][col].used == false)
@@ -538,7 +536,7 @@ int find_lamp_strings(running_machine &machine)
for (int x = 0; x < 6; x++)
{
sc45helperlog("<element name=\"inputlabel%d-%d\"><text string=\"%s\"><color red=\"1.0\" green=\"1.0\" blue=\"1.0\" /></text></element>\n", realy,x,sc4inputs[realy][x].name.cstr());
-
+
}
}
sc45helperlog("\n");
@@ -606,13 +604,13 @@ int find_lamp_strings(running_machine &machine)
// try to find some specific named elements and move them around
d = 0;
-
+
for (int reel = 0; reel < 8; reel++)
{
char tempname[32];
sprintf(tempname, "reel%d ", reel+1);
-
-
+
+
for (int pos = 0; pos < 3; pos++)
{
char tempname2[32];
@@ -626,7 +624,6 @@ int find_lamp_strings(running_machine &machine)
{
for (int x = 0; x < 16; x++)
{
-
if (!strcmp(tempname2, lamps[y][x].lampname_alt.cstr()))
{
//sc45helperlog("%s found\n", tempname2);
@@ -637,7 +634,7 @@ int find_lamp_strings(running_machine &machine)
lamps[y][x].width = 50;
lamps[y][x].height = 17;
lamps[y][x].lamptypename = "reellamp";
-
+
}
else
@@ -669,7 +666,7 @@ int find_lamp_strings(running_machine &machine)
set_clickable_temp(machine, "cash bust", 8, 0x04);
// no 'refill' lamp?
-
+
}
@@ -692,7 +689,7 @@ int find_lamp_strings(running_machine &machine)
}
}
- // print out a simple matrix of some of the most common inputs,
+ // print out a simple matrix of some of the most common inputs,
d = 0;
for (int y = 0; y < 7; y++)
{
@@ -777,7 +774,7 @@ int find_lamp_strings(running_machine &machine)
return 0;
}
-
+
int find_reel_strings(running_machine &machine)
{
@@ -787,7 +784,7 @@ int find_reel_strings(running_machine &machine)
dynamic_array<int> reelsizes;
// these are for sc4dnd ONLY, need to work out how the code calculates them
-
+
// this list is 4 * 16 symbols for the regular reels, 12 symbols for the number spin, and 2 groups of 16 depending on jackpot/stake keys used for the prize reel
// code that points at these is likely to be complex because it's conditional on the game code / mode..
if (!strcmp(machine.system().name, "sc4dnd"))
@@ -841,7 +838,7 @@ int find_reel_strings(running_machine &machine)
if (startblock == -1)
return 0;
-
+
@@ -868,11 +865,11 @@ int find_reel_strings(running_machine &machine)
if (current_symbols == 0)
{
int shifted = ((0x10000 / 16) * 11 ) + 692;
- // sc45helperlog("REEL %d\n", which_reel+1);
+ // sc45helperlog("REEL %d\n", which_reel+1);
sc45helperlog("<element name=\"SteppersReel%d\" defstate=\"0\">\n", which_reel+1);
sc45helperlog("<reel stateoffset=\"%d\" symbollist=\"", shifted);
}
-
+
UINT32 stringaddr = (rom[j + 0] << 16) | rom[j + 1];
stringaddr &= 0xfffff;
@@ -880,7 +877,7 @@ int find_reel_strings(running_machine &machine)
continue;
//sc45helperlog("addr %08x ", stringaddr);
-
+
astring tempstring;
for (int k = stringaddr; k < stringaddr + 10; k++)
@@ -895,7 +892,7 @@ int find_reel_strings(running_machine &machine)
{
tempstring.cat(chr);
}
-
+
}
tempstring.trimspace();
@@ -908,7 +905,7 @@ int find_reel_strings(running_machine &machine)
}
sc45helperlog("%s", tempstring.cstr());
-
+
//sc45helperlog("\n");
diff --git a/src/mame/drivers/bfm_sc4h.c b/src/mame/drivers/bfm_sc4h.c
index be7703dd80f..e067f66486b 100644
--- a/src/mame/drivers/bfm_sc4h.c
+++ b/src/mame/drivers/bfm_sc4h.c
@@ -22,29 +22,29 @@
see bfm_sc4.c
The hopper(s) are not currently emulated, many of the games can
- be operated in 'Door Open' mode granting you free credits.
+ be operated in 'Door Open' mode granting you free credits.
- Most games will show a RAM error on first boot due, after that they
- will initialize their NVRAM.
+ Most games will show a RAM error on first boot due, after that they
+ will initialize their NVRAM.
- If 'Read Meters' is shown press the 'Cancel' button (this moves around
- per game, so where it maps might not be obvious) Doing this will allow
- the games to run in Door Open mode, pressing 'Start' (also moves around)
- will allow you to test the game. Not all games have this feature.
+ If 'Read Meters' is shown press the 'Cancel' button (this moves around
+ per game, so where it maps might not be obvious) Doing this will allow
+ the games to run in Door Open mode, pressing 'Start' (also moves around)
+ will allow you to test the game. Not all games have this feature.
- Pressing the service key ('Green Button') often allows test mode to be
- entered, some games have more comprehensive tests than others.
+ Pressing the service key ('Green Button') often allows test mode to be
+ entered, some games have more comprehensive tests than others.
- Various (poorly programmed) sets require specific Jackpot 'keys' etc. to
- boot and won't even warn you if they're invalid, others allow you to
- set options if keys are not present. (again the buttons to do so move
- between games)
+ Various (poorly programmed) sets require specific Jackpot 'keys' etc. to
+ boot and won't even warn you if they're invalid, others allow you to
+ set options if keys are not present. (again the buttons to do so move
+ between games)
- Many games have missing sound roms, incorrect sound roms, or badly
- dumped sound roms. We also have several dumps where only sound roms
- are present.
+ Many games have missing sound roms, incorrect sound roms, or badly
+ dumped sound roms. We also have several dumps where only sound roms
+ are present.
- Many of the titles here were also released on the SC5 platform.
+ Many of the titles here were also released on the SC5 platform.
*/
@@ -723,7 +723,7 @@ MACHINE_CONFIG_START( sc4, sc4_state )
MCFG_BFMBDA_ADD("vfd0",0)
-// MCFG_DEFAULT_LAYOUT(layout_bfm_sc4)
+// MCFG_DEFAULT_LAYOUT(layout_bfm_sc4)
MCFG_SOUND_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(sc4_state, bfm_sc4_irqhandler))
@@ -942,7 +942,7 @@ INPUT_PORTS_START( sc4_raw ) // completley unmapped, but named inputs for all th
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
PORT_BIT( 0xffe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START("IN-10")
+ PORT_START("IN-10")
PORT_DIPNAME( 0x01, 0x00, "IN 10-0 (STRB 10 Data 0)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -980,7 +980,7 @@ INPUT_PORTS_START( sc4_raw ) // completley unmapped, but named inputs for all th
PORT_BIT( 0xffe0, IP_ACTIVE_HIGH, IPT_UNUSED )
// where are 11,12,13,14,15 ?
-
+
PORT_START("IN-16")
PORT_DIPNAME( 0x01, 0x00, "IN 16-0 (STRB 16 Data 0)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1098,12 +1098,12 @@ INPUT_PORTS_START( sc4_base ) // just some fairly generic defaults we map to gam
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_3) PORT_NAME("IN2-3")
PORT_BIT( 0x0010, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_4) PORT_NAME("IN2-4")
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, SC45_BUTTON_MATRIX_2_5) PORT_NAME("IN2-5")
-
+
PORT_MODIFY("IN-3")
PORT_DIPNAME( 0x04, 0x00, "IN 3-2 (STK 4 3.2)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x04, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x00, "IN 3-3 (STK 2 3.3)" )
+ PORT_DIPNAME( 0x08, 0x00, "IN 3-3 (STK 2 3.3)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x00, "IN 3-4 (STK 3 3.4)" )
@@ -1178,7 +1178,7 @@ INPUT_PORTS_START( sc4_base ) // just some fairly generic defaults we map to gam
PORT_DIPNAME( 0x0004, 0x0000, "Service Door" ) // SERDOR20.2
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0004, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0000, "Cashbox Door" ) // CSHDOR20.3
+ PORT_DIPNAME( 0x0008, 0x0000, "Cashbox Door" ) // CSHDOR20.3
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0008, DEF_STR( On ) )
PORT_DIPNAME( 0x0010, 0x0000, "Hopper DMP" ) // HOPDMP20.4
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 5ccd5b7e348..6d80adc6821 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -600,11 +600,11 @@ DRIVER_INIT_MEMBER(blktiger_state,blktigerb3)
UINT8 *src = memregion("audiocpu")->base();
int len = 0x8000;
dynamic_buffer buffer(len);
-
+
for (int i = 0; i < len; i++)
{
int addr;
-
+
addr = BITSWAP16(i, 15,14,13,12,11,10,9,8, 3,4,5,6, 7,2,1,0);
buffer[i] = src[addr];
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index bc7c390c4b9..cf8c093cf80 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -186,21 +186,21 @@ WRITE8_MEMBER( blockhl_state::banking_callback )
/* bits 0-1 = ROM bank */
m_rombank = data & 0x03;
membank("bank1")->set_entry(m_rombank);
-
+
/* bits 3/4 = coin counters */
coin_counter_w(machine(), 0, data & 0x08);
coin_counter_w(machine(), 1, data & 0x10);
-
+
/* bit 5 = select palette RAM or work RAM at 5800-5fff */
m_palette_selected = ~data & 0x20;
-
+
/* bit 6 = enable char ROM reading through the video RAM */
m_k052109->set_rmrd_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
-
+
/* bit 7 used but unknown */
-
+
/* other bits unknown */
-
+
if ((data & 0x84) != 0x80)
logerror("%04x: setlines %02x\n", machine().device("maincpu")->safe_pc(), data);
}
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 667fadb15d8..a47a7acab46 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1327,8 +1327,8 @@ static MACHINE_CONFIG_START( bnstars, bnstars_state )
MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz
MCFG_CPU_PROGRAM_MAP(bnstars_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(ms32_state,irq_callback)
-
- MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bnstars_state, ms32_interrupt, "lscreen", 0, 1)
+
+ MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bnstars_state, ms32_interrupt, "lscreen", 0, 1)
MCFG_CPU_ADD("audiocpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(bnstars_sound_map)
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index af86f2b07db..b6e7b0f6ae4 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -342,9 +342,9 @@ static MACHINE_CONFIG_START( boogwing, boogwing_state )
MCFG_DECO16IC_SPLIT(0)
MCFG_DECO16IC_WIDTH12(1)
MCFG_DECO16IC_PF1_TRANS_MASK(0x0f)
- MCFG_DECO16IC_PF2_TRANS_MASK(0x1f) // pf2 has 5bpp graphics
+ MCFG_DECO16IC_PF2_TRANS_MASK(0x1f) // pf2 has 5bpp graphics
MCFG_DECO16IC_PF1_COL_BANK(0)
- MCFG_DECO16IC_PF2_COL_BANK(0) // pf2 is non default
+ MCFG_DECO16IC_PF2_COL_BANK(0) // pf2 is non default
MCFG_DECO16IC_PF1_COL_MASK(0x0f)
MCFG_DECO16IC_PF2_COL_MASK(0x0f)
// no bank1 callback
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index f935a538a5f..78087d893db 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -481,7 +481,7 @@ ROM_START( mstadium )
ROM_LOAD32_BYTE( "891e09d", 0x40002, 0x10000, CRC(4e1335e6) SHA1(b892ab40a41978a89658ea2e7aabe9b073430b5d) )
ROM_LOAD32_BYTE( "891e09b", 0x40003, 0x10000, CRC(b6f914fb) SHA1(e95f3e899c2ead15ef8a529dbc67e8f4a0f88bdd) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "891e06e", 0x00000, 0x10000, CRC(0b04db1c) SHA1(0beae7bb8da49379915c0253ce03091eb71a58b5) )
ROM_LOAD32_BYTE( "891e06a", 0x00001, 0x10000, CRC(5ee37327) SHA1(f63ddaf63af06ea5421b0361315940582ef57922) )
ROM_LOAD32_BYTE( "891e05e", 0x00002, 0x10000, CRC(b356e729) SHA1(2cda591415b0f139fdb1f80c349d432bb0579d8e) )
diff --git a/src/mame/drivers/byvid.c b/src/mame/drivers/byvid.c
index 4868275a33d..6e7773510b3 100644
--- a/src/mame/drivers/byvid.c
+++ b/src/mame/drivers/byvid.c
@@ -687,7 +687,7 @@ WRITE8_MEMBER( by133_state::u11_a_w )
{
m_u11_a = data;
m_pia_u7->ca1_w(BIT(data, 1));
- m_pia_u7->ca2_w(BIT(data, 2));
+ m_pia_u7->ca2_w(BIT(data, 2));
}
READ8_MEMBER( by133_state::u11_b_r )
@@ -705,7 +705,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( by133_state::u10_timer )
{
m_u10_timer ^= 1;
m_pia_u10->cb1_w(m_u10_timer);
-}
+}
// 555 timer for display refresh
TIMER_DEVICE_CALLBACK_MEMBER( by133_state::u11_timer )
diff --git a/src/mame/drivers/capcom.c b/src/mame/drivers/capcom.c
index 1eaed370109..60dade3992c 100644
--- a/src/mame/drivers/capcom.c
+++ b/src/mame/drivers/capcom.c
@@ -289,11 +289,11 @@ ROM_START(ghv101)
ROM_REGION(0x20000, "cpu2", 0)
ROM_LOAD("u24_v11.bin", 0x0000, 0x2000, CRC(d46212f4) SHA1(50f1279d995b597c468805b323e0252800b28274))
ROM_REGION(0x500000, "sound1", 0)
- ROM_LOAD("u15_v10.bin", 0 , 0x80000, CRC(a77c884c) SHA1(10e7e242876fe197f582f1574ed47c4682b87db5))
+ ROM_LOAD("u15_v10.bin", 0 , 0x80000, CRC(a77c884c) SHA1(10e7e242876fe197f582f1574ed47c4682b87db5))
ROM_LOAD("u19_v10.bin", 0x100000, 0x80000, CRC(550c1c52) SHA1(f97cceb552a6bffe55c85fc01120ad99d3b7f19b))
ROM_LOAD("u30_v10.bin", 0x200000, 0x80000, CRC(44a2edb9) SHA1(c14b00e07cc873ef99ec629fbdeda72e9e69ac47))
ROM_LOAD("u32_v10.bin", 0x300000, 0x80000, CRC(73ee0ecc) SHA1(48aed6f76c0b506bd39430c7f1ea8735db99b8e3))
- ROM_LOAD("u34_v10.bin", 0x400000, 0x80000, CRC(cd5ea236) SHA1(dded158bc2f8443d2e69834cde87e81661ca7c53))
+ ROM_LOAD("u34_v10.bin", 0x400000, 0x80000, CRC(cd5ea236) SHA1(dded158bc2f8443d2e69834cde87e81661ca7c53))
ROM_END
GAME(1996, abv106, 0, capcom, capcom, capcom_state, capcom, ROT0, "Capcom", "Airborne", GAME_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index cdd58236046..7374eb08355 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -2101,7 +2101,7 @@ static MACHINE_CONFIG_START( donpachi, cave_state )
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
MCFG_NMK112_ROM0("oki1")
MCFG_NMK112_ROM1("oki2")
- MCFG_NMK112_DISABLE_PAGEMASK(1 << 0) // chip #0 (music) is not paged
+ MCFG_NMK112_DISABLE_PAGEMASK(1 << 0) // chip #0 (music) is not paged
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index 91852d7971f..74ec03b0dd6 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -409,8 +409,8 @@ static MACHINE_CONFIG_START( chanbara, chanbara_state )
MCFG_SOUND_ADD("ymsnd", YM2203, 12000000/8)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(chanbara_state, sound_irq))
-
-
+
+
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(chanbara_state, chanbara_ay_out_0_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(chanbara_state, chanbara_ay_out_1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index 885ddcccdc7..6a8273c50b5 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -449,7 +449,7 @@ public:
UINT32 gpdsp_sgblocks;
UINT32 gpdsp_address;
UINT32 epdsp_sgaddress; // encoder processor scatter-gather
- UINT32 epdsp_sgblocks;
+ UINT32 epdsp_sgblocks;
UINT32 unknown_sgaddress;
UINT32 unknown_sgblocks;
int voice_number;
@@ -3345,13 +3345,13 @@ void nv2a_renderer::geforce_exec_method(address_space & space,UINT32 chanel,UINT
// Vertex program (shader)
if (maddress == 0x1e94) {
/*if (data == 2)
- logerror("Enabled vertex program\n");
+ logerror("Enabled vertex program\n");
else if (data == 4)
- logerror("Enabled fixed function pipeline\n");
+ logerror("Enabled fixed function pipeline\n");
else if (data == 6)
- logerror("Enabled both fixed function pipeline and vertex program ?\n");
+ logerror("Enabled both fixed function pipeline and vertex program ?\n");
else
- logerror("Unknown value %d to method 0x1e94\n",data);*/
+ logerror("Unknown value %d to method 0x1e94\n",data);*/
vertex_pipeline = data & 6;
countlen--;
}
@@ -5373,8 +5373,8 @@ Peripheral String 0000000
Product Number GDX-0001
Version V1.004
Release Date 20021029
-Manufacturer ID
-TOC DISC
+Manufacturer ID
+TOC DISC
Track Start Sector End Sector Track Size
track01.bin 150 599 1058400
track02.raw 750 2101 3179904
@@ -5405,8 +5405,8 @@ Peripheral String 0000000
Product Number GDX-0002B
Version V3.000
Release Date 20030224
-Manufacturer ID
-TOC DISC
+Manufacturer ID
+TOC DISC
Track Start Sector End Sector Track Size
track01.bin 150 599 1058400
track02.raw 750 2101 3179904
@@ -5485,12 +5485,12 @@ Peripheral String 0000000
Product Number GDX-0006G
Version V8.000
Release Date 20050202
-Manufacturer ID
-TOC DISC
+Manufacturer ID
+TOC DISC
Track Start Sector End Sector Track Size
track01.bin 150 599 1058400
-track02.raw 750 2101 3179904
-track03.bin 45150 549299 1185760800
+track02.raw 750 2101 3179904
+track03.bin 45150 549299 1185760800
*/
ROM_START( mj2 )
CHIHIRO_BIOS
@@ -5627,8 +5627,8 @@ Peripheral String 0000000
Product Number GDX-0024A
Version V2.000
Release Date 20090331
-Manufacturer ID
-TOC DISC
+Manufacturer ID
+TOC DISC
Track Start Sector End Sector Track Size
track01.bin 150 8740 20206032
track02.raw 8891 10242 3179904
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 441edd09a6c..26fd032f298 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -367,14 +367,14 @@ ROM_START( chqflag )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */
ROM_LOAD( "717e01", 0x000000, 0x008000, CRC(966b8ba8) SHA1(ab7448cb61fa5922b1d8ae5f0d0f42d734ed4f93) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "717e04", 0x000000, 0x080000, CRC(1a50a1cc) SHA1(bc16fab84c637ed124e37b115ddc0149560b727d) )
ROM_LOAD32_WORD( "717e05", 0x000002, 0x080000, CRC(46ccb506) SHA1(3ed1f54744fc5cdc0f48e42f250c366267a8199a) )
- ROM_REGION( 0x020000, "k051316_1", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x020000, "k051316_1", 0 ) /* zoom/rotate */
ROM_LOAD( "717e06.n16", 0x000000, 0x020000, CRC(1ec26c7a) SHA1(05b5b522c5ebf5d0a71a7fc39ec9382008ef33c8) )
- ROM_REGION( 0x100000, "k051316_2", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x100000, "k051316_2", 0 ) /* zoom/rotate */
ROM_LOAD( "717e07.l20", 0x000000, 0x040000, CRC(b9a565a8) SHA1(a11782f7336e5ad58a4c6ea81f2eeac35d5e7d0a) )
ROM_LOAD( "717e08.l22", 0x040000, 0x040000, CRC(b68a212e) SHA1(b2bd121a43552c3ade528ac763a0df40c3e648e0) )
ROM_LOAD( "717e11.n20", 0x080000, 0x040000, CRC(ebb171ec) SHA1(d65d4a6b169ce03e4427b2a397484634f938236b) )
@@ -397,14 +397,14 @@ ROM_START( chqflagj )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */
ROM_LOAD( "717e01", 0x000000, 0x008000, CRC(966b8ba8) SHA1(ab7448cb61fa5922b1d8ae5f0d0f42d734ed4f93) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "717e04", 0x000000, 0x080000, CRC(1a50a1cc) SHA1(bc16fab84c637ed124e37b115ddc0149560b727d) )
ROM_LOAD32_WORD( "717e05", 0x000002, 0x080000, CRC(46ccb506) SHA1(3ed1f54744fc5cdc0f48e42f250c366267a8199a) )
- ROM_REGION( 0x020000, "k051316_1", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x020000, "k051316_1", 0 ) /* zoom/rotate */
ROM_LOAD( "717e06.n16", 0x000000, 0x020000, CRC(1ec26c7a) SHA1(05b5b522c5ebf5d0a71a7fc39ec9382008ef33c8) )
- ROM_REGION( 0x100000, "k051316_2", 0 ) /* zoom/rotate */
+ ROM_REGION( 0x100000, "k051316_2", 0 ) /* zoom/rotate */
ROM_LOAD( "717e07.l20", 0x000000, 0x040000, CRC(b9a565a8) SHA1(a11782f7336e5ad58a4c6ea81f2eeac35d5e7d0a) )
ROM_LOAD( "717e08.l22", 0x040000, 0x040000, CRC(b68a212e) SHA1(b2bd121a43552c3ade528ac763a0df40c3e648e0) )
ROM_LOAD( "717e11.n20", 0x080000, 0x040000, CRC(ebb171ec) SHA1(d65d4a6b169ce03e4427b2a397484634f938236b) )
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 71a2a681db4..854170a6d46 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -704,7 +704,7 @@ static MACHINE_CONFIG_START( cliffhgr, cliffhgr_state )
/* start with the TMS9928a video configuration */
MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL_10_738635MHz / 2 ) /* TMS9128NL on the board */
- MCFG_TMS9928A_VRAM_SIZE(0x4000)
+ MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(cliffhgr_state, vdp_interrupt))
/* override video rendering and raw screen info */
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index fd632a7dcda..ac8a9d1dbc5 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -818,7 +818,7 @@ DECOSPR_PRIORITY_CB_MEMBER(cninja_state::pri_callback)
case 0x8000: return 0xf0 | 0xcc;
case 0xc000: return 0xf0 | 0xcc; /* Perhaps 0xf0|0xcc|0xaa (Sprite under bottom layer) */
}
-
+
return 0;
}
diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c
index 571c0ebc8d9..8983948fd45 100644
--- a/src/mame/drivers/cobra.c
+++ b/src/mame/drivers/cobra.c
@@ -3215,8 +3215,8 @@ static MACHINE_CONFIG_START( cobra, cobra_state )
MCFG_K001604_GFX_INDEX2(1)
MCFG_K001604_LAYER_SIZE(0)
MCFG_K001604_ROZ_SIZE(1)
- MCFG_K001604_TXT_OFFSET(0) // correct?
- MCFG_K001604_ROZ_OFFSET(0) // correct?
+ MCFG_K001604_TXT_OFFSET(0) // correct?
+ MCFG_K001604_ROZ_OFFSET(0) // correct?
MCFG_K001604_GFXDECODE("gfxdecode")
MCFG_K001604_PALETTE("palette")
diff --git a/src/mame/drivers/cocoloco.c b/src/mame/drivers/cocoloco.c
index 8ad513d8230..d47795cefb4 100644
--- a/src/mame/drivers/cocoloco.c
+++ b/src/mame/drivers/cocoloco.c
@@ -30,7 +30,7 @@
***************************************************************************************
PCB Layout...
-
+
.------------------------------------------------------------------------------------.
| A B C D E F |
| .-----. .-----. .-----. .-----. .-----. .-----. |
@@ -125,7 +125,7 @@
| | 0.1 uf | |
| R 2.2 '--| |---' -+-
'--/\/\/\/--. GND
- |
+ |
-+-
GND
@@ -211,43 +211,43 @@ public:
static NETLIST_START(nl_cocoloco)
- /* Standard stuff */
+ /* Standard stuff */
- SOLVER(Solver, 48000)
- PARAM(Solver.ACCURACY, 1e-5)
- ANALOG_INPUT(V5, 5)
+ SOLVER(Solver, 48000)
+ PARAM(Solver.ACCURACY, 1e-5)
+ ANALOG_INPUT(V5, 5)
- /* AY 8910 internal resistors */
+ /* AY 8910 internal resistors */
- RES(R_AY1_1, 1000);
- RES(R_AY1_2, 1000);
- RES(R_AY1_3, 1000);
+ RES(R_AY1_1, 1000);
+ RES(R_AY1_2, 1000);
+ RES(R_AY1_3, 1000);
- RES(R1, 4700)
- RES(R2, 4700)
- RES(R3, 4700)
- RES(RAMP, 150000)
- //RES(RAMP, 150)
- POT(P1, 5000)
- PARAM(P1.DIAL, 0.5) // 50%
+ RES(R1, 4700)
+ RES(R2, 4700)
+ RES(R3, 4700)
+ RES(RAMP, 150000)
+ //RES(RAMP, 150)
+ POT(P1, 5000)
+ PARAM(P1.DIAL, 0.5) // 50%
- CAP(C1, 10e-6)
+ CAP(C1, 10e-6)
- NET_C(V5, R_AY1_1.1, R_AY1_2.1, R_AY1_3.1)
+ NET_C(V5, R_AY1_1.1, R_AY1_2.1, R_AY1_3.1)
- NET_C(R_AY1_1.2, R1.1)
- NET_C(R_AY1_2.2, R2.1)
- NET_C(R_AY1_3.2, R3.1)
+ NET_C(R_AY1_1.2, R1.1)
+ NET_C(R_AY1_2.2, R2.1)
+ NET_C(R_AY1_3.2, R3.1)
- NET_C(R1.2, R2.2, R3.2, P1.1)
+ NET_C(R1.2, R2.2, R3.2, P1.1)
- NET_C(P1.3, RAMP.2, GND)
- NET_C(P1.2, C1.1)
- NET_C(C1.2, RAMP.1)
+ NET_C(P1.3, RAMP.2, GND)
+ NET_C(P1.2, C1.1)
+ NET_C(C1.2, RAMP.1)
#if 0
- CAP(C2, 0.1e-6)
- NET_C(C2.2, GND)
- NET_C(C2.1, RAMP.1)
+ CAP(C2, 0.1e-6)
+ NET_C(C2.2, GND)
+ NET_C(C2.1, RAMP.1)
#endif
NETLIST_END()
@@ -339,10 +339,10 @@ WRITE8_MEMBER( cocoloco_state::cocoloco_vbank_w )
WRITE8_MEMBER( cocoloco_state::cocoloco_vram_clear_w )
{
/* ??? */
-// for(int i=0;i<0x8000;i++)
-// m_videoram[i] = 0;
+// for(int i=0;i<0x8000;i++)
+// m_videoram[i] = 0;
-// popmessage("A005 writes: %02X", data);
+// popmessage("A005 writes: %02X", data);
}
@@ -354,8 +354,8 @@ WRITE8_MEMBER( cocoloco_state::cocoloco_coin_counter_w )
xxxx -xxx Unknown.
The coin counter gives 2 pulses for each coin inserted.
- They explain in a sheet that the coin in for 50 pesetas
- behaves like 2x 25 pesetas (1 duro) coins, so has sense.
+ They explain in a sheet that the coin in for 50 pesetas
+ behaves like 2x 25 pesetas (1 duro) coins, so has sense.
*/
coin_counter_w(machine(), 0, data & 0x08);
}
@@ -367,7 +367,7 @@ WRITE8_MEMBER( cocoloco_state::cocoloco_coin_counter_w )
static ADDRESS_MAP_START( cocoloco_map, AS_PROGRAM, 8, cocoloco_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE(cocoloco_vram_r, cocoloco_vram_w) // 256 x 256 x 1
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(cocoloco_vram_r, cocoloco_vram_w) // 256 x 256 x 1
AM_RANGE(0x6001, 0x6001) AM_DEVREAD("ay8910", ay8910_device, data_r)
AM_RANGE(0x6002, 0x6002) AM_DEVWRITE("ay8910", ay8910_device, data_w)
AM_RANGE(0x6003, 0x6003) AM_DEVWRITE("ay8910", ay8910_device, address_w)
@@ -414,37 +414,37 @@ static INPUT_PORTS_START( cocoloco )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen")
PORT_START("DSW1") // DSW1 @4B
- PORT_DIPNAME( 0x01, 0x00, "Char Speed" ) PORT_DIPLOCATION("DSW1:!1")
+ PORT_DIPNAME( 0x01, 0x00, "Char Speed" ) PORT_DIPLOCATION("DSW1:!1")
PORT_DIPSETTING( 0x00, "Fast" )
PORT_DIPSETTING( 0x01, "Slow" )
- PORT_DIPNAME( 0x02, 0x00, "Monsters Speed" ) PORT_DIPLOCATION("DSW1:!2")
+ PORT_DIPNAME( 0x02, 0x00, "Monsters Speed" ) PORT_DIPLOCATION("DSW1:!2")
PORT_DIPSETTING( 0x00, "Fast" )
PORT_DIPSETTING( 0x02, "Slow" )
- PORT_DIPNAME( 0x0c, 0x00, "Monsters: Time before go out" ) PORT_DIPLOCATION("DSW1:!3,!4")
+ PORT_DIPNAME( 0x0c, 0x00, "Monsters: Time before go out" ) PORT_DIPLOCATION("DSW1:!3,!4")
PORT_DIPSETTING( 0x00, "Long" )
PORT_DIPSETTING( 0x04, "Medium-Long" )
PORT_DIPSETTING( 0x08, "Medium-Short" )
PORT_DIPSETTING( 0x0c, "Short" )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) // switches 5-6-7-8 marked as unused.
+ PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) // switches 5-6-7-8 marked as unused.
PORT_START("DSW2") // DSW2 @5C
- PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW2:!1,!2")
+ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW2:!1,!2")
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_5C ) )
- PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DSW2:!3,!4")
+ PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DSW2:!3,!4")
PORT_DIPSETTING( 0x00, "10000 Points" )
PORT_DIPSETTING( 0x04, "15000 Points" )
PORT_DIPSETTING( 0x08, "20000 Points" )
PORT_DIPSETTING( 0x0c, "30000 Points" )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW2:!5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW2:!5")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x10, "3" )
- PORT_DIPNAME( 0x20, 0x00, "Monsters" ) PORT_DIPLOCATION("DSW2:!6")
+ PORT_DIPNAME( 0x20, 0x00, "Monsters" ) PORT_DIPLOCATION("DSW2:!6")
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x20, "5" )
- PORT_DIPNAME( 0xc0, 0x00, "Vitamine Time" ) PORT_DIPLOCATION("DSW2:!7,!8")
+ PORT_DIPNAME( 0xc0, 0x00, "Vitamine Time" ) PORT_DIPLOCATION("DSW2:!7,!8")
PORT_DIPSETTING( 0x00, "Long" )
PORT_DIPSETTING( 0x40, "Medium-Long" )
PORT_DIPSETTING( 0x80, "Medium-Short" )
@@ -459,7 +459,7 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( cocoloco, cocoloco_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
+ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
MCFG_CPU_PROGRAM_MAP(cocoloco_map)
/* video hardware */
@@ -473,26 +473,26 @@ static MACHINE_CONFIG_START( cocoloco, cocoloco_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, SND_CLOCK) /* confirmed */
+ MCFG_SOUND_ADD("ay8910", AY8910, SND_CLOCK) /* confirmed */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
- MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
- MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 0)
- MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 1)
- MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 2)
+ MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
+ MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 0)
+ MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 1)
+ MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 2)
- /* NETLIST configuration using internal AY8910 resistor values */
+ /* NETLIST configuration using internal AY8910 resistor values */
- MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000)
- MCFG_NETLIST_SETUP(nl_cocoloco)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000)
+ MCFG_NETLIST_SETUP(nl_cocoloco)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_NETLIST_STREAM_INPUT("snd_nl", 0, "R_AY1_1.R")
- MCFG_NETLIST_STREAM_INPUT("snd_nl", 1, "R_AY1_2.R")
- MCFG_NETLIST_STREAM_INPUT("snd_nl", 2, "R_AY1_3.R")
+ MCFG_NETLIST_STREAM_INPUT("snd_nl", 0, "R_AY1_1.R")
+ MCFG_NETLIST_STREAM_INPUT("snd_nl", 1, "R_AY1_2.R")
+ MCFG_NETLIST_STREAM_INPUT("snd_nl", 2, "R_AY1_3.R")
- MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "RAMP.1")
- MCFG_NETLIST_ANALOG_MULT_OFFSET(30000.0 * 1.5, 0)
+ MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "RAMP.1")
+ MCFG_NETLIST_ANALOG_MULT_OFFSET(30000.0 * 1.5, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index c5841c2b679..fbcf4f64fbe 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -821,7 +821,7 @@ static INPUT_PORTS_START( trailblz )
INPUT_PORTS_END
static INPUT_PORTS_START( supnudg2 ) /* need to find the button 'B' to be playable */
- PORT_INCLUDE ( trailblz )
+ PORT_INCLUDE ( trailblz )
PORT_MODIFY("PIA0.A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("1 Pound (5 credits)") // coin x 5
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index 532a2817e87..52a400c8eb1 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -3713,7 +3713,7 @@ DRIVER_INIT_MEMBER(coolridr_state,coolridr)
m_maincpu->sh2drc_add_fastram(0x06000000, 0x060d7fff, 0, &m_sysh1_workram_h[0]);
m_maincpu->sh2drc_add_fastram(0x060d9000, 0x060fffff, 0, &m_sysh1_workram_h[0xd9000/4]);
m_maincpu->sh2drc_add_fastram(0x00000000, 0x001fffff, 1, &m_rom[0]);
- m_maincpu->sh2drc_add_fastram(0x20000000, 0x201fffff, 1, &m_rom[0]);
+ m_maincpu->sh2drc_add_fastram(0x20000000, 0x201fffff, 1, &m_rom[0]);
}
GAME( 1995, coolridr, 0, coolridr, coolridr, coolridr_state, coolridr, ROT0, "Sega", "Cool Riders",GAME_IMPERFECT_SOUND) // region is set in test mode, this set is for Japan, USA and Export (all regions)
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 20dc26fc262..abc1fe85cb3 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -241,7 +241,7 @@ WRITE8_MEMBER( crimfght_state::banking_callback )
}
else
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x0000, 0x03ff, "bank1"); /* RAM */
-
+
/* bit 6 = enable char ROM reading through the video RAM */
m_k052109->set_rmrd_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
@@ -314,7 +314,7 @@ ROM_START( crimfght )
ROM_LOAD32_WORD( "821k06.k13", 0x000000, 0x040000, CRC(a1eadb24) SHA1(ca305b904b34e03918ad07281fda86ad63caa44f) )
ROM_LOAD32_WORD( "821k07.k19", 0x000002, 0x040000, CRC(060019fa) SHA1(c3bca007aaa5f1c534d2a75fe4f96d01a740dd58) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "821k04.k2", 0x000000, 0x080000, CRC(00e0291b) SHA1(39d5db6cf36826e47cdf5308eff9bfa8afc82050) )
ROM_LOAD32_WORD( "821k05.k8", 0x000002, 0x080000, CRC(e09ea05d) SHA1(50ac9a2117ce63fe774c48d769ec445a83f1269e) )
@@ -337,7 +337,7 @@ ROM_START( crimfghtj )
ROM_LOAD32_WORD( "821k06.k13", 0x000000, 0x040000, CRC(a1eadb24) SHA1(ca305b904b34e03918ad07281fda86ad63caa44f) )
ROM_LOAD32_WORD( "821k07.k19", 0x000002, 0x040000, CRC(060019fa) SHA1(c3bca007aaa5f1c534d2a75fe4f96d01a740dd58) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "821k04.k2", 0x000000, 0x080000, CRC(00e0291b) SHA1(39d5db6cf36826e47cdf5308eff9bfa8afc82050) ) /* sprites */
ROM_LOAD32_WORD( "821k05.k8", 0x000002, 0x080000, CRC(e09ea05d) SHA1(50ac9a2117ce63fe774c48d769ec445a83f1269e) )
@@ -360,7 +360,7 @@ ROM_REGION( 0x28000, "maincpu", 0 ) /* code + banked roms */
ROM_LOAD32_WORD( "821k06.k13", 0x000000, 0x040000, CRC(a1eadb24) SHA1(ca305b904b34e03918ad07281fda86ad63caa44f) )
ROM_LOAD32_WORD( "821k07.k19", 0x000002, 0x040000, CRC(060019fa) SHA1(c3bca007aaa5f1c534d2a75fe4f96d01a740dd58) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "821k04.k2", 0x000000, 0x080000, CRC(00e0291b) SHA1(39d5db6cf36826e47cdf5308eff9bfa8afc82050) ) /* sprites */
ROM_LOAD32_WORD( "821k05.k8", 0x000002, 0x080000, CRC(e09ea05d) SHA1(50ac9a2117ce63fe774c48d769ec445a83f1269e) )
diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c
index bf1fb74c2f4..bd3f03ba829 100644
--- a/src/mame/drivers/csplayh5.c
+++ b/src/mame/drivers/csplayh5.c
@@ -60,7 +60,7 @@ public:
DECLARE_READ16_MEMBER(test_r);
DECLARE_READ8_MEMBER(csplayh5_sound_r);
DECLARE_WRITE8_MEMBER(csplayh5_soundclr_w);
-
+
DECLARE_READ8_MEMBER(soundcpu_portd_r);
DECLARE_WRITE8_MEMBER(soundcpu_porta_w);
DECLARE_WRITE8_MEMBER(soundcpu_dac2_w);
@@ -460,7 +460,7 @@ static MACHINE_CONFIG_START( csplayh5, csplayh5_state )
MCFG_CPU_ADD("maincpu",M68000,16000000) /* TMP68301-16 */
MCFG_CPU_PROGRAM_MAP(csplayh5_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
-
+
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", csplayh5_state, csplayh5_irq, "screen", 0, 1)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
diff --git a/src/mame/drivers/cubo.c b/src/mame/drivers/cubo.c
index 023f24633f9..b198cbfd14f 100644
--- a/src/mame/drivers/cubo.c
+++ b/src/mame/drivers/cubo.c
@@ -359,15 +359,15 @@ private:
required_device<cdda_device> m_cdda;
typedef void (cubo_state::*input_hack_func)();
- input_hack_func m_input_hack;
-
- void cndypuzl_input_hack();
- void haremchl_input_hack();
- void lsrquiz_input_hack();
- void lsrquiz2_input_hack();
- void lasstixx_input_hack();
- void mgnumber_input_hack();
- void mgprem11_input_hack();
+ input_hack_func m_input_hack;
+
+ void cndypuzl_input_hack();
+ void haremchl_input_hack();
+ void lsrquiz_input_hack();
+ void lsrquiz2_input_hack();
+ void lasstixx_input_hack();
+ void mgnumber_input_hack();
+ void mgprem11_input_hack();
};
static void handle_cd32_joystick_cia(running_machine &machine, UINT8 pra, UINT8 dra);
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 63626c11aeb..7c6bd773c51 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -246,7 +246,7 @@ static MACHINE_CONFIG_START( darkseal, darkseal_state )
MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
MCFG_DECO16IC_SPLIT(0)
- MCFG_DECO16IC_WIDTH12(3) // both these tilemaps need to be twice the y size of usual!
+ MCFG_DECO16IC_WIDTH12(3) // both these tilemaps need to be twice the y size of usual!
MCFG_DECO16IC_PF1_TRANS_MASK(0x0f)
MCFG_DECO16IC_PF2_TRANS_MASK(0x0f)
MCFG_DECO16IC_PF1_COL_BANK(0x00)
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index d55dc288c72..6ed22a1c85b 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -520,7 +520,7 @@ static MACHINE_CONFIG_START( dassault, dassault_state )
MCFG_DECO16IC_BANK2_CB(dassault_state, bank_callback)
MCFG_DECO16IC_PF12_8X8_BANK(0)
MCFG_DECO16IC_PF12_16X16_BANK(2)
-
+
MCFG_DECO16IC_GFXDECODE("gfxdecode")
MCFG_DECO16IC_PALETTE("palette")
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 1ef26260caf..0b7ac11a169 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -350,7 +350,7 @@ static MACHINE_CONFIG_START( dbz, dbz_state )
MCFG_DEVICE_ADD("k053246", K053246, 0)
MCFG_K053246_CB(dbz_state, sprite_callback)
- MCFG_K053246_CONFIG("gfx2", 3, NORMAL_PLANE_ORDER, -87, 32) // or -52, 16?
+ MCFG_K053246_CONFIG("gfx2", 3, NORMAL_PLANE_ORDER, -87, 32) // or -52, 16?
MCFG_K053246_GFXDECODE("gfxdecode")
MCFG_K053246_PALETTE("palette")
diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c
index cc9ea4de196..b062271318c 100644
--- a/src/mame/drivers/de_3.c
+++ b/src/mame/drivers/de_3.c
@@ -1126,7 +1126,7 @@ GAME(1992, trek_120, trek_201, de_3_dmd1, de_3, de_3_state, de_3,
GAME(1992, trek_110, trek_201, de_3_dmd1, de_3, de_3_state, de_3, ROT0, "Data East", "Star Trek 25th Anniversary (1.10)", GAME_IS_SKELETON_MECHANICAL)
GAME(1992, trek_11a, trek_201, de_3_dmd1, de_3, de_3_state, de_3, ROT0, "Data East", "Star Trek 25th Anniversary (1.10 Alpha Display)", GAME_IS_SKELETON_MECHANICAL)
GAME(1992, stwr_104, 0, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Star Wars (1.04)", GAME_IS_SKELETON_MECHANICAL)
-GAME(1992, stwr_103, stwr_104, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Star Wars (1.03)", GAME_IS_SKELETON_MECHANICAL)
+GAME(1992, stwr_103, stwr_104, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Star Wars (1.03)", GAME_IS_SKELETON_MECHANICAL)
GAME(1992, stwr_g11, stwr_104, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Star Wars (1.01 Germany)", GAME_IS_SKELETON_MECHANICAL)
GAME(1992, stwr_a14, stwr_104, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Star Wars (Display Rev.1.04)", GAME_IS_SKELETON_MECHANICAL)
GAME(1992, stwr_102, stwr_104, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Star Wars (1.02)", GAME_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 3959bc42197..06d63e05afc 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1712,7 +1712,7 @@ static MACHINE_CONFIG_START( captaven, deco32_state )
MCFG_DECO16IC_GFXDECODE("gfxdecode")
MCFG_DECO16IC_PALETTE("palette")
- MCFG_DEVICE_ADD("tilegen2", DECO16IC, 0) // pf3 is in 8bpp mode, pf4 is not used
+ MCFG_DEVICE_ADD("tilegen2", DECO16IC, 0) // pf3 is in 8bpp mode, pf4 is not used
MCFG_DECO16IC_SPLIT(0)
MCFG_DECO16IC_WIDTH12(0)
MCFG_DECO16IC_PF1_TRANS_MASK(0xff)
@@ -1777,7 +1777,7 @@ DECO16IC_BANK_CB_MEMBER(deco32_state::fghthist_bank_callback)
{
bank = bank >> 4;
bank = (bank & 1) | ((bank & 4) >> 1) | ((bank & 2) << 1);
-
+
return bank * 0x1000;
}
@@ -2129,7 +2129,7 @@ static MACHINE_CONFIG_START( lockload, dragngun_state )
MCFG_DEVICE_ADD("tilegen2", DECO16IC, 0)
MCFG_DECO16IC_SPLIT(0)
- MCFG_DECO16IC_WIDTH12(0) // lockload definitely wants pf34 half width..
+ MCFG_DECO16IC_WIDTH12(0) // lockload definitely wants pf34 half width..
MCFG_DECO16IC_PF1_TRANS_MASK(0xff)
MCFG_DECO16IC_PF2_TRANS_MASK(0xff)
MCFG_DECO16IC_PF1_COL_BANK(0x04)
@@ -2146,7 +2146,7 @@ static MACHINE_CONFIG_START( lockload, dragngun_state )
MCFG_DEVICE_ADD("spritegen_zoom", DECO_ZOOMSPR, 0)
MCFG_DECO_ZOOMSPR_GFXDECODE("gfxdecode")
MCFG_DECO_ZOOMSPR_PALETTE("palette")
-
+
MCFG_DECO146_ADD("ioprot")
MCFG_DECO146_SET_SOUNDLATCH_CALLBACK(deco32_state, deco32_sound_cb)
MCFG_DECO146_SET_INTERFACE_SCRAMBLE_REVERSE
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 72de72ec543..87ab8d5222d 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -560,7 +560,7 @@ static INPUT_PORTS_START( rolcrush )
PORT_DIPNAME( 0x7000, 0x7000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7")
PORT_DIPSETTING( 0x2000, "Level 1" )
PORT_DIPSETTING( 0x1000, "Level 2" )
- PORT_DIPSETTING( 0x0000, "Level 3" )
+ PORT_DIPSETTING( 0x0000, "Level 3" )
PORT_DIPSETTING( 0x7000, "Level 4" )
PORT_DIPSETTING( 0x6000, "Level 5" )
PORT_DIPSETTING( 0x5000, "Level 6" )
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index b72553282ac..f93773907f3 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -579,7 +579,7 @@ I8275_DRAW_CHARACTER_MEMBER(dwarfd_state::display_pixels)
m_back_color = false;
//if(!linecount)
- // logerror("%d %d %02x %02x %02x %02x %02x %02x %02x\n", x/8, y/8, charcode, lineattr, lten, rvv, vsp, gpa, hlgt);
+ // logerror("%d %d %02x %02x %02x %02x %02x %02x %02x\n", x/8, y/8, charcode, lineattr, lten, rvv, vsp, gpa, hlgt);
for(i=0;i<8;i+=2)
{
@@ -603,7 +603,7 @@ I8275_DRAW_CHARACTER_MEMBER(dwarfd_state::qc_display_pixels)
m_back_color = false;
//if(!linecount)
- // logerror("%d %d %02x %02x %02x %02x %02x %02x %02x\n", x/8, y/8, charcode, lineattr, lten, rvv, vsp, gpa, hlgt);
+ // logerror("%d %d %02x %02x %02x %02x %02x %02x %02x\n", x/8, y/8, charcode, lineattr, lten, rvv, vsp, gpa, hlgt);
for(i=0;i<8;i+=2)
{
diff --git a/src/mame/drivers/ecoinf2.c b/src/mame/drivers/ecoinf2.c
index b1b2dece9c7..c5e4999fcc0 100644
--- a/src/mame/drivers/ecoinf2.c
+++ b/src/mame/drivers/ecoinf2.c
@@ -527,14 +527,14 @@ static MACHINE_CONFIG_START( ecoinf2_oxo, ecoinf2_state )
MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf2_state, ppi8255_ic24_write_c_inhibits))
MCFG_DEVICE_ADD("ic22_inpt", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf2_state, ppi8255_ic22_read_a_levels)) // manual says level switches
+ MCFG_I8255_IN_PORTA_CB(READ8(ecoinf2_state, ppi8255_ic22_read_a_levels)) // manual says level switches
MCFG_I8255_IN_PORTB_CB(READ8(ecoinf2_state, ppi8255_ic22_read_b_coins))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf2_state, ppi8255_ic22_read_c_misc)) // 0x20 appears to be meter power
+ MCFG_I8255_IN_PORTC_CB(READ8(ecoinf2_state, ppi8255_ic22_read_c_misc)) // 0x20 appears to be meter power
MCFG_DEVICE_ADD("ic23_reel", I8255, 0)
MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf2_state, ppi8255_ic23_write_a_reel01))
MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf2_state, ppi8255_ic23_write_b_reel23))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf2_state, ppi8255_ic23_read_c_key)) // optos and keys
+ MCFG_I8255_IN_PORTC_CB(READ8(ecoinf2_state, ppi8255_ic23_read_c_key)) // optos and keys
MCFG_DEVICE_ADD("ic13_leds", I8255, 0)
MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf2_state, ppi8255_ic13_write_a_strobedat0))
diff --git a/src/mame/drivers/ecoinf3.c b/src/mame/drivers/ecoinf3.c
index 2fbd6630c8b..00df2922006 100644
--- a/src/mame/drivers/ecoinf3.c
+++ b/src/mame/drivers/ecoinf3.c
@@ -681,7 +681,7 @@ static MACHINE_CONFIG_START( ecoinf3_pyramid, ecoinf3_state )
MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_a_read_a))
MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_a_write_a_strobedat0))
MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_a_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_a_write_b_strobedat1))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_a_write_b_strobedat1))
MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_a_read_c))
MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_a_write_c_strobe))
@@ -711,11 +711,11 @@ static MACHINE_CONFIG_START( ecoinf3_pyramid, ecoinf3_state )
MCFG_DEVICE_ADD("ppi8255_e", I8255, 0)
MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_e_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_a_alpha_display)) // alpha display characters
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_a_alpha_display)) // alpha display characters
MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_e_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_b)) // not written at an appropriate time for it to be a 'send' address for the text
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_b)) // not written at an appropriate time for it to be a 'send' address for the text
MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_e_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_c)) // not written at an appropriate time for it to be a 'send' address for the text
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_c)) // not written at an appropriate time for it to be a 'send' address for the text
MCFG_DEVICE_ADD("ppi8255_f", I8255, 0)
MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_f_read_a))
diff --git a/src/mame/drivers/fireball.c b/src/mame/drivers/fireball.c
index 9f8f7f2e07e..f30a2404fa6 100644
--- a/src/mame/drivers/fireball.c
+++ b/src/mame/drivers/fireball.c
@@ -1,14 +1,14 @@
/***********************************************************************************
-
- fireball.c
-
- Mechanical game where you have a gun shooting rubber balls.
- some pics here
- http://www.schausteller.de/anzeigenmarkt/euro-ball-66634.html
+ fireball.c
- TODO
- -NEVER sends store command to Eeprom so all change are lost
+ Mechanical game where you have a gun shooting rubber balls.
+
+ some pics here
+ http://www.schausteller.de/anzeigenmarkt/euro-ball-66634.html
+
+ TODO
+ -NEVER sends store command to Eeprom so all change are lost
************************************************************************************/
@@ -20,19 +20,19 @@
#include "machine/eepromser.h"
/****************************
-* LOG defines *
+* LOG defines *
****************************/
#define LOG_DISPLAY 0
#define LOG_DISPLAY2 0
#define LOG_INPUT 0
-#define LOG_AY8912 0
+#define LOG_AY8912 0
#define LOG_P1 0
#define LOG_P3 0
#define LOG_OUTPUT 0
/****************************
-* Clock defines *
+* Clock defines *
****************************/
#define CPU_CLK XTAL_11_0592MHz
#define AY_CLK XTAL_11_0592MHz/8
@@ -76,7 +76,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<ay8912_device> m_ay;
required_device<eeprom_serial_x24c44_device> m_eeprom;
-
+
// driver_device overrides
virtual void machine_reset();
@@ -101,27 +101,26 @@ READ8_MEMBER(fireball_state::io_00_r)
WRITE8_MEMBER(fireball_state::io_00_w)
{
-
m_display_data= m_display_data&0x7f;
if (LOG_DISPLAY)
logerror("write to 0x00 IO %02X, m_display_data= %01X\n",data,m_display_data);
-
+
switch (data&0x0f)
{
- case 1: output_set_digit_value(2, m_display_data);
+ case 1: output_set_digit_value(2, m_display_data);
break;
- case 2: output_set_digit_value(1, m_display_data);
+ case 2: output_set_digit_value(1, m_display_data);
break;
- case 4: output_set_digit_value(4, m_display_data);
+ case 4: output_set_digit_value(4, m_display_data);
break;
- case 8: output_set_digit_value(3, m_display_data);
+ case 8: output_set_digit_value(3, m_display_data);
break;
}
-
+
if (LOG_OUTPUT)
- logerror("write to 0x00 IO (X11-X11A) %02X\n",data&0xf0);
-
+ 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));
@@ -141,7 +140,7 @@ READ8_MEMBER(fireball_state::io_02_r)
WRITE8_MEMBER(fireball_state::io_02_w)
{
if (LOG_OUTPUT)
- logerror("write to 0x00 IO (X7-X9) %02X\n",data);
+ logerror("write to 0x00 IO (X7-X9) %02X\n",data);
output_set_value("GameOver", BIT(data, 0));
output_set_value("Title", BIT(data, 1));
@@ -154,14 +153,14 @@ WRITE8_MEMBER(fireball_state::io_02_w)
}
READ8_MEMBER(fireball_state::io_04_r)
-{ //contraves per mod prog
+{ //contraves per mod prog
UINT8 tmp=0;
tmp=ioport("X10-12")->read();
if (LOG_INPUT)
logerror("return %02X from 0x04\n",tmp);
- return tmp;
+ return tmp;
}
WRITE8_MEMBER(fireball_state::io_04_w)
@@ -189,41 +188,41 @@ WRITE8_MEMBER(fireball_state::io_06_w)
logerror("write to 0x06 data =%02X\n",data);
to_ay_data= data;
-
+
if (LOG_DISPLAY2)
logerror("On board display write %02X\n",UINT8(~(data&0xff)));
-
+
output_set_digit_value(7, UINT8(~(data&0xff)));
}
-
- READ8_MEMBER(fireball_state::p1_r)
- {
+
+ READ8_MEMBER(fireball_state::p1_r)
+ {
UINT8 tmp=0;
tmp=(m_p1_data&0xfe)|(m_eeprom->do_read());
if (LOG_P1)
logerror("readP1 port data %02X\n",tmp&0x01);
return tmp;
- }
-
- WRITE8_MEMBER(fireball_state::p1_w)
- {
+ }
+
+ WRITE8_MEMBER(fireball_state::p1_w)
+ {
//eeprom x24c44/ay8912/system stuff...
//bit0 goes to eeprom pin 3 and 4 (0x01) Data_in and Data_out
- //bit1 goes to eeprom pin 1 (0x02) CE Hi active
- //bit2 goes to eeprom pin 2 (0x04) SK Clock
- //bit3 goes to dis/thr input of a ne555 that somehow reset the 8031... TODO
- //bit4 goes to ay8912 pin bc1 (0x10)
+ //bit1 goes to eeprom pin 1 (0x02) CE Hi active
+ //bit2 goes to eeprom pin 2 (0x04) SK Clock
+ //bit3 goes to dis/thr input of a ne555 that somehow reset the 8031... TODO
+ //bit4 goes to ay8912 pin bc1 (0x10)
//bit5 goes to ay8912 pin bdir (0x20)
- //bit6 goes to TODO
- //bit7 goes to TODO
+ //bit6 goes to TODO
+ //bit7 goes to TODO
if (LOG_AY8912){
if(( data&0x30) != (m_p1_data&0x30)){
logerror("write ay8910 controll bc1= %02X bdir= %02X\n",data&0x10, data&0x20);
}
}
-
+
m_eeprom->di_write(data & 0x01);
m_eeprom->clk_write((data & 0x04) ? ASSERT_LINE : CLEAR_LINE);
m_eeprom->cs_write((data & 0x02) ? ASSERT_LINE : CLEAR_LINE);
@@ -236,7 +235,7 @@ WRITE8_MEMBER(fireball_state::io_06_w)
//AY 3-8912 data write/read
- if (data & 0x20){ //bdir
+ if (data & 0x20){ //bdir
//write to ay8912
if (LOG_AY8912)
logerror("write to 0x06 bdir=1\n");
@@ -248,7 +247,7 @@ WRITE8_MEMBER(fireball_state::io_06_w)
if (LOG_AY8912)
logerror("AY8912 address latch write=%02X\n",to_ay_data);
}else{
- //data_w
+ //data_w
if (LOG_AY8912)
logerror("write to 0x06 bc1=0\n");
m_ay->data_w(space,0,to_ay_data );
@@ -259,43 +258,43 @@ WRITE8_MEMBER(fireball_state::io_06_w)
if (LOG_AY8912)
logerror("write to 0x06 bdir=0\n");
ay_data=m_ay->data_r(space,0);
- }
-
+ }
+
m_p1_data=data;
}
-
- READ8_MEMBER(fireball_state::p3_r)
- {
+
+ READ8_MEMBER(fireball_state::p3_r)
+ {
UINT8 ret = 0xfb | ((int_data&1)<<2);
if (LOG_P3)
logerror("read P3 port data = %02X\n",ret);
return ret;
- }
-
+ }
+
WRITE8_MEMBER(fireball_state::p3_w)
- {
+ {
if (LOG_P3)
logerror("write to P3 port data=%02X\n",data);
-
+
m_p3_data=data;
}
-
+
/*************************
* Memory Map Information *
*************************/
-
+
static ADDRESS_MAP_START( fireball_map, AS_PROGRAM, 8, fireball_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( fireball_io_map, AS_IO, 8, fireball_state )
-
+
AM_RANGE(0x00, 0x01)AM_READWRITE(io_00_r,io_00_w)
AM_RANGE(0x02, 0x03)AM_READWRITE(io_02_r,io_02_w)
AM_RANGE(0x04, 0x05)AM_READWRITE(io_04_r,io_04_w)
- AM_RANGE(0x06, 0x07)AM_READWRITE(io_06_r,io_06_w)
-
+ AM_RANGE(0x06, 0x07)AM_READWRITE(io_06_r,io_06_w)
+
//internal port
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READWRITE(p1_r, p1_w)
AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_READWRITE(p3_r, p3_w)
@@ -321,7 +320,7 @@ static INPUT_PORTS_START( fireball )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_I) PORT_NAME("800 Points")
PORT_START("X6-8")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("Empty Hopper A") //activeLow to fool the game code...
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("Empty Hopper A") //activeLow to fool the game code...
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("Empty Hopper B")//at least one hopper must be full
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_D) PORT_NAME("Empty Hopper C")
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -330,10 +329,10 @@ static INPUT_PORTS_START( fireball )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_X) PORT_NAME("Confirm Value")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_C) PORT_NAME("All Options Default value")
- PORT_START("X10-12")
+ PORT_START("X10-12")
PORT_DIPNAME( 0xff, 0x00, "Programming Value" )
- PORT_DIPSETTING( 0x00, "00" ) //0
- PORT_DIPSETTING( 0x01, "01" )
+ PORT_DIPSETTING( 0x00, "00" ) //0
+ PORT_DIPSETTING( 0x01, "01" )
PORT_DIPSETTING( 0x02, "02" )
PORT_DIPSETTING( 0x03, "03" )
PORT_DIPSETTING( 0x04, "04" )
@@ -342,7 +341,7 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x07, "07" )
PORT_DIPSETTING( 0x08, "08" )
PORT_DIPSETTING( 0x09, "09" )
- PORT_DIPSETTING( 0x10, "10" ) //10
+ PORT_DIPSETTING( 0x10, "10" ) //10
PORT_DIPSETTING( 0x11, "11" )
PORT_DIPSETTING( 0x12, "12" )
PORT_DIPSETTING( 0x13, "13" )
@@ -352,7 +351,7 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x17, "17" )
PORT_DIPSETTING( 0x18, "18" )
PORT_DIPSETTING( 0x19, "19" )
- PORT_DIPSETTING( 0x20, "20" ) //20
+ PORT_DIPSETTING( 0x20, "20" ) //20
PORT_DIPSETTING( 0x21, "21" )
PORT_DIPSETTING( 0x22, "22" )
PORT_DIPSETTING( 0x23, "23" )
@@ -362,7 +361,7 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x27, "27" )
PORT_DIPSETTING( 0x28, "28" )
PORT_DIPSETTING( 0x29, "29" )
- PORT_DIPSETTING( 0x30, "30" ) //30
+ PORT_DIPSETTING( 0x30, "30" ) //30
PORT_DIPSETTING( 0x31, "31" )
PORT_DIPSETTING( 0x32, "32" )
PORT_DIPSETTING( 0x33, "33" )
@@ -372,7 +371,7 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x37, "37" )
PORT_DIPSETTING( 0x38, "38" )
PORT_DIPSETTING( 0x39, "39" )
- PORT_DIPSETTING( 0x40, "40" ) //40
+ PORT_DIPSETTING( 0x40, "40" ) //40
PORT_DIPSETTING( 0x41, "41" )
PORT_DIPSETTING( 0x42, "42" )
PORT_DIPSETTING( 0x43, "43" )
@@ -382,7 +381,7 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x47, "47" )
PORT_DIPSETTING( 0x48, "48" )
PORT_DIPSETTING( 0x49, "49" )
- PORT_DIPSETTING( 0x50, "50" ) //50
+ PORT_DIPSETTING( 0x50, "50" ) //50
PORT_DIPSETTING( 0x51, "51" )
PORT_DIPSETTING( 0x52, "52" )
PORT_DIPSETTING( 0x53, "53" )
@@ -392,7 +391,7 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x57, "57" )
PORT_DIPSETTING( 0x58, "58" )
PORT_DIPSETTING( 0x59, "59" )
- PORT_DIPSETTING( 0x60, "60" ) //60
+ PORT_DIPSETTING( 0x60, "60" ) //60
PORT_DIPSETTING( 0x61, "61" )
PORT_DIPSETTING( 0x62, "62" )
PORT_DIPSETTING( 0x63, "63" )
@@ -402,17 +401,17 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x67, "67" )
PORT_DIPSETTING( 0x68, "68" )
PORT_DIPSETTING( 0x69, "69" )
- PORT_DIPSETTING( 0x70, "70" ) //70
+ PORT_DIPSETTING( 0x70, "70" ) //70
PORT_DIPSETTING( 0x71, "71" )
PORT_DIPSETTING( 0x72, "72" )
- PORT_DIPSETTING( 0x73, "73" )
+ PORT_DIPSETTING( 0x73, "73" )
PORT_DIPSETTING( 0x74, "74" )
PORT_DIPSETTING( 0x75, "75" )
PORT_DIPSETTING( 0x76, "76" )
PORT_DIPSETTING( 0x77, "77" )
PORT_DIPSETTING( 0x78, "78" )
PORT_DIPSETTING( 0x79, "79" )
- PORT_DIPSETTING( 0x80, "80" ) //80
+ PORT_DIPSETTING( 0x80, "80" ) //80
PORT_DIPSETTING( 0x81, "81" )
PORT_DIPSETTING( 0x82, "82" )
PORT_DIPSETTING( 0x83, "83" )
@@ -422,10 +421,10 @@ static INPUT_PORTS_START( fireball )
PORT_DIPSETTING( 0x87, "87" )
PORT_DIPSETTING( 0x88, "88" )
PORT_DIPSETTING( 0x89, "89" )
- PORT_DIPSETTING( 0x90, "90" ) //90
+ PORT_DIPSETTING( 0x90, "90" ) //90
PORT_DIPSETTING( 0x91, "91" )
PORT_DIPSETTING( 0x92, "92" )
- PORT_DIPSETTING( 0x93, "93" )
+ PORT_DIPSETTING( 0x93, "93" )
PORT_DIPSETTING( 0x94, "94" )
PORT_DIPSETTING( 0x95, "95" )
PORT_DIPSETTING( 0x96, "96" )
@@ -436,7 +435,7 @@ static INPUT_PORTS_START( fireball )
INPUT_PORTS_END
/******************************
-* machine reset *
+* machine reset *
******************************/
void fireball_state::machine_reset()
@@ -444,7 +443,7 @@ 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);
@@ -469,16 +468,16 @@ TIMER_DEVICE_CALLBACK_MEMBER( fireball_state::int_0 )
if (int_timing==1){
//logerror("INT set\n");
m_maincpu->set_input_line(MCS51_INT0_LINE, ASSERT_LINE);
- int_data=1;
+ int_data=1;
}
if (int_timing==2){
//logerror("INT clear\n");
m_maincpu->set_input_line(MCS51_INT0_LINE, CLEAR_LINE);
int_data=0;
- }
+ }
if (int_timing==5){
int_timing=0;
- }
+ }
int_timing++;
}
@@ -490,18 +489,18 @@ TIMER_DEVICE_CALLBACK_MEMBER( fireball_state::int_0 )
static MACHINE_CONFIG_START( fireball, fireball_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8031, CPU_CLK) //
+ MCFG_CPU_ADD("maincpu", I8031, CPU_CLK) //
MCFG_CPU_PROGRAM_MAP(fireball_map)
MCFG_CPU_IO_MAP(fireball_io_map)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("int_0", fireball_state, int_0, attotime::from_hz(555)) //9ms from scope reading 111Hz take care of this in the handler
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("int_0", fireball_state, int_0, attotime::from_hz(555)) //9ms from scope reading 111Hz take care of this in the handler
MCFG_EEPROM_SERIAL_X24C44_ADD("eeprom")
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("aysnd", AY8912, AY_CLK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-
+
/* Video */
MCFG_DEFAULT_LAYOUT(layout_fireball)
MACHINE_CONFIG_END
@@ -514,15 +513,13 @@ MACHINE_CONFIG_END
ROM_START(fireball)
ROM_REGION(0x10000, "maincpu", 0)
ROM_LOAD("euroball-89-07-13-c026.bin", 0x0000, 0x2000, CRC(cab3fc1c) SHA1(bcf0d17e26f2d9f5e20bda258728c989ea138702))
-
+
ROM_REGION( 0x20, "eeprom", 0 ) // default eeprom must have some specific value at 0x03 at least
- ROM_LOAD( "fireball.nv", 0x0000, 0x020, CRC(1d0f5f0f) SHA1(8e68fcd8782f39ed3b1df6162db9be83cb3335e4) ) //default setting
+ ROM_LOAD( "fireball.nv", 0x0000, 0x020, CRC(1d0f5f0f) SHA1(8e68fcd8782f39ed3b1df6162db9be83cb3335e4) ) //default setting
ROM_END
/*************************
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS*/
-GAME( 1989, fireball, 0, fireball, fireball, driver_device, 0, ROT0, "Valco", "Fireball", GAME_MECHANICAL ) //1989 by rom name
-
-
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS*/
+GAME( 1989, fireball, 0, fireball, fireball, driver_device, 0, ROT0, "Valco", "Fireball", GAME_MECHANICAL ) //1989 by rom name
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index 89a6854c2b4..154a7a409bd 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -659,7 +659,7 @@ static MACHINE_CONFIG_START( fortecar, fortecar_state )
MCFG_DEVICE_ADD("fcppi0", I8255A, 0)
/* Init with 0x9a... A, B and high C as input
- Serial Eprom connected to Port C */
+ Serial Eprom connected to Port C */
MCFG_I8255_IN_PORTA_CB(IOPORT("SYSTEM"))
MCFG_I8255_IN_PORTB_CB(IOPORT("INPUT"))
MCFG_I8255_IN_PORTC_CB(READ8(fortecar_state, ppi0_portc_r))
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index de250ac92ec..48129b2cd93 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -2718,26 +2718,26 @@ static INPUT_PORTS_START( rcdino4 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_START("DSW")
- PORT_DIPNAME( 0x01, 0x01, "Test Mode" ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x01, 0x01, "Test Mode" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, "Royal Flush" ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x02, 0x02, "Royal Flush" ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x02, DEF_STR( Yes ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPNAME( 0x04, 0x04, "5 of a Kind" ) PORT_DIPLOCATION("SW1:6")
+ PORT_DIPNAME( 0x04, 0x04, "5 of a Kind" ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPNAME( 0x18, 0x08, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,4")
+ PORT_DIPNAME( 0x18, 0x08, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,4")
PORT_DIPSETTING( 0x08, "1C-10C" )
PORT_DIPSETTING( 0x10, "1C-1C" )
PORT_DIPSETTING( 0x18, "1C-2C" )
PORT_DIPSETTING( 0x00, "1C-5C" )
- PORT_DIPNAME( 0x60, 0x60, "Payment Type" ) PORT_DIPLOCATION("SW1:3,2")
+ PORT_DIPNAME( 0x60, 0x60, "Payment Type" ) PORT_DIPLOCATION("SW1:3,2")
PORT_DIPSETTING( 0x00, "Ticket + Hopper" )
PORT_DIPSETTING( 0x20, "Ticket" )
PORT_DIPSETTING( 0x40, "Hopper" )
PORT_DIPSETTING( 0x60, "Ticket + Hopper" )
- PORT_DIPNAME( 0x80, 0x80, "Pagamenti (Payment)" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x80, 0x80, "Pagamenti (Payment)" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x80, "Pagamenti (Payment) A" )
PORT_DIPSETTING( 0x00, "Pagamenti (Payment) B" )
INPUT_PORTS_END
@@ -6218,86 +6218,86 @@ static void decrypt_rcdino4(UINT8 *rom, int size, UINT8 *gfxrom, int sizeg, UINT
static UINT8 rcdino4_add[] =
{
-/* 0 1 2 3 4 5 6 7 8 9 a b c d e f*/
-/*0*/ 1, 9, 9, 9, 9, 2, 9, 9, 1, 2, 1, 9, 9, 3, 9, 9,
-/*1*/ 2, 2, 9, 9, 9, 9, 9, 9, 1, 9, 1, 9, 9, 9, 9, 9,
-/*2*/ 3, 9, 9, 9, 9, 2, 2, 9, 1, 2, 1, 9, 9, 3, 3, 9,
-/*3*/ 2, 9, 9, 9, 9, 9, 9, 9, 1, 9, 1, 9, 9, 3, 9, 9,
-/*4*/ 1, 9, 9, 9, 9, 2, 9, 9, 1, 2, 1, 9, 3, 3, 9, 9,
-/*5*/ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 1, 9, 9, 9, 9, 9,
-/*6*/ 1, 9, 9, 9, 2, 2, 9, 9, 1, 2, 1, 9, 3, 3, 3, 9,
-/*7*/ 9, 2, 9, 9, 9, 9, 9, 9, 9, 3, 1, 9, 9, 3, 9, 9,
-/*8*/ 2, 9, 9, 9, 2, 2, 2, 9, 1, 9, 1, 9, 9, 3, 3, 9,
-/*9*/ 2, 2, 9, 9, 9, 2, 9, 9, 1, 3, 9, 9, 3, 3, 3, 9,
-/*a*/ 2, 9, 2, 9, 2, 2, 2, 9, 1, 2, 1, 9, 9, 3, 3, 2,
-/*b*/ 2, 2, 9, 9, 9, 2, 9, 9, 9, 3, 9, 9, 9, 3, 9, 9,
-/*c*/ 2, 9, 9, 9, 2, 2, 2, 9, 1, 2, 1, 9, 3, 3, 3, 9,
-/*d*/ 2, 9, 9, 9, 9, 9, 9, 9, 1, 9, 1, 9, 9, 3, 9, 9,
-/*e*/ 2, 9, 9, 9, 2, 9, 2, 9, 1, 2, 1, 9, 3, 9, 3, 9,
-/*f*/ 2, 9, 9, 9, 9, 2, 9, 9, 1, 3, 1, 9, 9, 3, 9, 9
+/* 0 1 2 3 4 5 6 7 8 9 a b c d e f*/
+/*0*/ 1, 9, 9, 9, 9, 2, 9, 9, 1, 2, 1, 9, 9, 3, 9, 9,
+/*1*/ 2, 2, 9, 9, 9, 9, 9, 9, 1, 9, 1, 9, 9, 9, 9, 9,
+/*2*/ 3, 9, 9, 9, 9, 2, 2, 9, 1, 2, 1, 9, 9, 3, 3, 9,
+/*3*/ 2, 9, 9, 9, 9, 9, 9, 9, 1, 9, 1, 9, 9, 3, 9, 9,
+/*4*/ 1, 9, 9, 9, 9, 2, 9, 9, 1, 2, 1, 9, 3, 3, 9, 9,
+/*5*/ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 1, 9, 9, 9, 9, 9,
+/*6*/ 1, 9, 9, 9, 2, 2, 9, 9, 1, 2, 1, 9, 3, 3, 3, 9,
+/*7*/ 9, 2, 9, 9, 9, 9, 9, 9, 9, 3, 1, 9, 9, 3, 9, 9,
+/*8*/ 2, 9, 9, 9, 2, 2, 2, 9, 1, 9, 1, 9, 9, 3, 3, 9,
+/*9*/ 2, 2, 9, 9, 9, 2, 9, 9, 1, 3, 9, 9, 3, 3, 3, 9,
+/*a*/ 2, 9, 2, 9, 2, 2, 2, 9, 1, 2, 1, 9, 9, 3, 3, 2,
+/*b*/ 2, 2, 9, 9, 9, 2, 9, 9, 9, 3, 9, 9, 9, 3, 9, 9,
+/*c*/ 2, 9, 9, 9, 2, 2, 2, 9, 1, 2, 1, 9, 3, 3, 3, 9,
+/*d*/ 2, 9, 9, 9, 9, 9, 9, 9, 1, 9, 1, 9, 9, 3, 9, 9,
+/*e*/ 2, 9, 9, 9, 2, 9, 2, 9, 1, 2, 1, 9, 3, 9, 3, 9,
+/*f*/ 2, 9, 9, 9, 9, 2, 9, 9, 1, 3, 1, 9, 9, 3, 9, 9
};
static UINT8 rcdino4_keys40[] =
{
-/* 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d*/
+/* 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d*/
0x36, 0x54, 0x47, 0x6b, 0xce, 0x95, 0xa2, 0x66, 0x3a, 0x46, 0x53, 0xd7, 0xc4, 0xa4,
-/* 4e 4f*/
+/* 4e 4f*/
0x00, 0x00,
-/* 50*/
+/* 50*/
0x56
};
static UINT8 rcdino4_keys80[] =
{
-/* 81 82 83 84 85 */
- 0xb8, 0x32, 0x1c, 0x23, 0xe2,
-/* 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91*/
+/* 81 82 83 84 85 */
+ 0xb8, 0x32, 0x1c, 0x23, 0xe2,
+/* 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91*/
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 92 93 94 95 96 97 */
+/* 92 93 94 95 96 97 */
0x4c, 0x00, 0x3d, 0x00, 0xd9, 0x16,
-/* 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3*/
+/* 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3*/
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* a4 a5 a6*/
+/* a4 a5 a6*/
0x5e, 0x73, 0x69,
-/* a7 a8 a9*/
+/* a7 a8 a9*/
0x00, 0x00, 0x00,
-/* aa*/
+/* aa*/
0xa6,
-/* ab ac ad ae af*/
+/* ab ac ad ae af*/
0x00, 0x00, 0x00, 0x00, 0x00,
-/* b0 b1*/
+/* b0 b1*/
0xc3, 0x40,
-/* b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2*/
+/* b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2*/
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* c3 c4 c5*/
+/* c3 c4 c5*/
0x92, 0xb7, 0x24,
-/* c6 c7 c8 c9*/
+/* c6 c7 c8 c9*/
0x00, 0x00, 0x00, 0x00,
-/* ca*/
+/* ca*/
0x62,
-/* cb cc cd ce cf*/
+/* cb cc cd ce cf*/
0x00, 0x00, 0x00, 0x00, 0x00,
-/* d0*/
+/* d0*/
0x84,
-/* d1*/
+/* d1*/
0x00,
-/* d2*/
+/* d2*/
0xaa,
-/* d3 d4 d5*/
+/* d3 d4 d5*/
0x00, 0x00, 0x00,
-/* d6*/
+/* d6*/
0xea,
-/* d7 d8 d9 da db dc dd de df*/
+/* d7 d8 d9 da db dc dd de df*/
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* e0*/
+/* e0*/
0x17,
-/* e1 e2 e3*/
+/* e1 e2 e3*/
0x00, 0x00, 0x00,
-/* e4*/
+/* e4*/
0xc0,
-/* e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7*/
+/* e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7*/
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* f8 f9 fa fb fc fd fe*/
+/* f8 f9 fa fb fc fd fe*/
0x06, 0x1e, 0x28, 0x5a, 0xcf, 0x79, 0x11
};
@@ -6368,44 +6368,44 @@ DRIVER_INIT_MEMBER(funworld_state, rcdino4)
add = rcdino4_add[c];
if (((i == 0x81)
- && (j >= 0xa3) && (j <= 0xb1) /* text string */
- )
- || ((i == 0x82)
- && (j >= 0x35) && (j <= 0x53) /* table of addresses */
- )
- || ((i == 0x85)
- && (j >= 0x7e) && (j <= 0x8d) /* '0'-'9', 'A'-'F' */
- )
- || ((i == 0x94)
- && (((j >= 0x4a) && (j <= 0x86)) /* zeroes */
- || ((j >= 0xbf) && (j <= 0xc1)) /* set of masks */
- )
- )
- || ((i == 0x96)
- && (j >= 0x39) && (j <= 0x3e) /* set of masks */
- )
- || ((i == 0xa6)
- && (j >= 0x30) && (j <= 0x32) /* set of masks */
- )
- || ((i == 0xaa)
- && (j >= 0xf2) /* table of addresses */
- )
- || ((i == 0xc3)
- && (j >= 0x70) && (j <= 0xaf) /* set of masks */
- )
- || ((i == 0xc4)
- && (j >= 0xdc) /* zeroes and things */
- )
- || ((i == 0xd0)
- && (j >= 0xd2) /* text and zeroes */
- )
- || ((i == 0xd2)
- && ((j <= 0x2f) /* text and zeroes */
- || ((j >= 0x84) && (j <= 0xaf)) /* text and zeroes */
- )
- )
- || (add == 9)
- )
+ && (j >= 0xa3) && (j <= 0xb1) /* text string */
+ )
+ || ((i == 0x82)
+ && (j >= 0x35) && (j <= 0x53) /* table of addresses */
+ )
+ || ((i == 0x85)
+ && (j >= 0x7e) && (j <= 0x8d) /* '0'-'9', 'A'-'F' */
+ )
+ || ((i == 0x94)
+ && (((j >= 0x4a) && (j <= 0x86)) /* zeroes */
+ || ((j >= 0xbf) && (j <= 0xc1)) /* set of masks */
+ )
+ )
+ || ((i == 0x96)
+ && (j >= 0x39) && (j <= 0x3e) /* set of masks */
+ )
+ || ((i == 0xa6)
+ && (j >= 0x30) && (j <= 0x32) /* set of masks */
+ )
+ || ((i == 0xaa)
+ && (j >= 0xf2) /* table of addresses */
+ )
+ || ((i == 0xc3)
+ && (j >= 0x70) && (j <= 0xaf) /* set of masks */
+ )
+ || ((i == 0xc4)
+ && (j >= 0xdc) /* zeroes and things */
+ )
+ || ((i == 0xd0)
+ && (j >= 0xd2) /* text and zeroes */
+ )
+ || ((i == 0xd2)
+ && ((j <= 0x2f) /* text and zeroes */
+ || ((j >= 0x84) && (j <= 0xaf)) /* text and zeroes */
+ )
+ )
+ || (add == 9)
+ )
{
++j;
}
@@ -6421,9 +6421,9 @@ DRIVER_INIT_MEMBER(funworld_state, rcdino4)
do {} while (!rcdino4_keys80[++i - 0x81]);
if ((i == 0xa4)
- || (i == 0xb0)
- || (i == 0xf8)
- )
+ || (i == 0xb0)
+ || (i == 0xf8)
+ )
{
j = 0; /* re-align offset after skipping some pages */
}
diff --git a/src/mame/drivers/g627.c b/src/mame/drivers/g627.c
index 6eb288295d1..107e06b4960 100644
--- a/src/mame/drivers/g627.c
+++ b/src/mame/drivers/g627.c
@@ -301,18 +301,18 @@ ROM_END
ROM_START(rota_115)
ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF)
- ROM_LOAD("v115-a.bin", 0x0000, 0x0800, CRC(474884b3) SHA1(b7919bf2e3a3897c1180373cccf88240c57b5645))
- ROM_LOAD("v115-b.bin", 0x0800, 0x0800, CRC(8779fc6c) SHA1(df00f58d38b4eca68603247ae69009e13cfa31fb))
- ROM_LOAD("v115-c.bin", 0x1000, 0x0800, CRC(54b420f9) SHA1(597bb9f8ad0b20babc696175e9fbcecf2d5d799d))
+ ROM_LOAD("v115-a.bin", 0x0000, 0x0800, CRC(474884b3) SHA1(b7919bf2e3a3897c1180373cccf88240c57b5645))
+ ROM_LOAD("v115-b.bin", 0x0800, 0x0800, CRC(8779fc6c) SHA1(df00f58d38b4eca68603247ae69009e13cfa31fb))
+ ROM_LOAD("v115-c.bin", 0x1000, 0x0800, CRC(54b420f9) SHA1(597bb9f8ad0b20babc696175e9fbcecf2d5d799d))
ROM_END
ROM_START(rota_101)
ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF)
- ROM_LOAD("v101-a.bin", 0x0000, 0x0800, CRC(e89f3de6) SHA1(0b62220a24e176f2d7838da080b447a3df9ce05d))
- ROM_LOAD("v101-b.bin", 0x0800, 0x0800, CRC(0690670b) SHA1(6399a7df707d644d0b7fe7b4fea6fb5091a9883d))
- ROM_LOAD("v101-c.bin", 0x1000, 0x0800, CRC(c7e85638) SHA1(b59805d8b558ab8f5ea5b4b9261e862afca4b9d3))
+ ROM_LOAD("v101-a.bin", 0x0000, 0x0800, CRC(e89f3de6) SHA1(0b62220a24e176f2d7838da080b447a3df9ce05d))
+ ROM_LOAD("v101-b.bin", 0x0800, 0x0800, CRC(0690670b) SHA1(6399a7df707d644d0b7fe7b4fea6fb5091a9883d))
+ ROM_LOAD("v101-c.bin", 0x1000, 0x0800, CRC(c7e85638) SHA1(b59805d8b558ab8f5ea5b4b9261e862afca4b9d3))
ROM_END
-GAME(1978, rotation, 0, g627, g627, driver_device, 0, ROT0, "Midway", "Rotation VIII (v. 1.17)", GAME_MECHANICAL )
+GAME(1978, rotation, 0, g627, g627, driver_device, 0, ROT0, "Midway", "Rotation VIII (v. 1.17)", GAME_MECHANICAL )
GAME(1978, rota_115, rotation, g627, g627, driver_device, 0, ROT0, "Midway", "Rotation VIII (v. 1.15)", GAME_MECHANICAL )
GAME(1978, rota_101, rotation, g627, g627, driver_device, 0, ROT0, "Midway", "Rotation VIII (v. 1.01)", GAME_MECHANICAL )
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index af97ccbf4c8..064cef5b05e 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -3175,16 +3175,16 @@ ROM_END
ROM_START( tazzmang2 ) // Original Sparcade set
ROM_REGION( 0x10000, "maincpu", 0 )
- ROM_LOAD( "tazmania.1", 0x000000, 0x000800, CRC(6ecc84a2) SHA1(6f31e69bd613b93e1fac26163f39676299c65a76) )
- ROM_LOAD( "tazmania.2", 0x000800, 0x000800, CRC(e27b09f6) SHA1(1a419c8f45639e2c2351eeb94bf62fca35d5928e) )
- ROM_LOAD( "tazmania.3", 0x001000, 0x000800, CRC(954868f3) SHA1(3882e17ffd9bcfcff383ed95279606962f89dafd) )
- ROM_LOAD( "tazmania.4", 0x001800, 0x000800, CRC(238520e6) SHA1(eec76b54058a6a6139f13f188d243f20d1a7aa12) )
- ROM_LOAD( "tazmania.5", 0x002000, 0x000800, CRC(0527e513) SHA1(20175c293f1cf45fa21dd400cb2718dd8ee0dcea) )
- ROM_LOAD( "tazmania.6", 0x002800, 0x000800, CRC(af2b92d8) SHA1(5642666eb66d549390cd5b13a7029daede6d3ff8) )
- ROM_LOAD( "tazmania.7", 0x003000, 0x000800, CRC(bbdc41d3) SHA1(17de825efd56541dbdbacdc83f77f3ccaef2d07f) )
- ROM_LOAD( "tazmania.8", 0x003800, 0x000800, CRC(eb35f49c) SHA1(0f2bf1043092e746fdbc5d2e0292aeaa7b7f0218) )
- ROM_LOAD( "tazmania.a", 0x004000, 0x001000, CRC(38f326f8) SHA1(5c5463666b6ed15cbcc874faf79cc06ae1cba59a) )
- ROM_LOAD( "tazmania.b", 0x005000, 0x001000, CRC(2a22a9dc) SHA1(07aecdff852065671e488682cf710fd48273b88c) )
+ ROM_LOAD( "tazmania.1", 0x000000, 0x000800, CRC(6ecc84a2) SHA1(6f31e69bd613b93e1fac26163f39676299c65a76) )
+ ROM_LOAD( "tazmania.2", 0x000800, 0x000800, CRC(e27b09f6) SHA1(1a419c8f45639e2c2351eeb94bf62fca35d5928e) )
+ ROM_LOAD( "tazmania.3", 0x001000, 0x000800, CRC(954868f3) SHA1(3882e17ffd9bcfcff383ed95279606962f89dafd) )
+ ROM_LOAD( "tazmania.4", 0x001800, 0x000800, CRC(238520e6) SHA1(eec76b54058a6a6139f13f188d243f20d1a7aa12) )
+ ROM_LOAD( "tazmania.5", 0x002000, 0x000800, CRC(0527e513) SHA1(20175c293f1cf45fa21dd400cb2718dd8ee0dcea) )
+ ROM_LOAD( "tazmania.6", 0x002800, 0x000800, CRC(af2b92d8) SHA1(5642666eb66d549390cd5b13a7029daede6d3ff8) )
+ ROM_LOAD( "tazmania.7", 0x003000, 0x000800, CRC(bbdc41d3) SHA1(17de825efd56541dbdbacdc83f77f3ccaef2d07f) )
+ ROM_LOAD( "tazmania.8", 0x003800, 0x000800, CRC(eb35f49c) SHA1(0f2bf1043092e746fdbc5d2e0292aeaa7b7f0218) )
+ ROM_LOAD( "tazmania.a", 0x004000, 0x001000, CRC(38f326f8) SHA1(5c5463666b6ed15cbcc874faf79cc06ae1cba59a) )
+ ROM_LOAD( "tazmania.b", 0x005000, 0x001000, CRC(2a22a9dc) SHA1(07aecdff852065671e488682cf710fd48273b88c) )
ROM_REGION( 0x1000, "gfx1", 0 )
ROM_LOAD( "tazm8.1lk", 0x0000, 0x0800, CRC(2c5b612b) SHA1(32e3a41a9a4a8b1285b6a195213ff0d98012360a) ) // tazmania.g1
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index ecdd6b8a1f4..6814f52866f 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -262,13 +262,13 @@ WRITE8_MEMBER( gbusters_state::banking_callback )
{
/* bits 0-3 ROM bank */
membank("bank1")->set_entry(data & 0x0f);
-
+
if (data & 0xf0)
{
//logerror("%04x: (lines) write %02x\n",device->safe_pc(), data);
//popmessage("lines = %02x", data);
}
-
+
/* other bits unknown */
}
@@ -337,8 +337,8 @@ ROM_START( gbusters )
ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) )
ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) )
- ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
- ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) )
+ ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
+ ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) )
ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -361,7 +361,7 @@ ROM_START( gbustersa )
ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) )
ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) )
- ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) )
ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) )
@@ -385,7 +385,7 @@ ROM_START( crazycop )
ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) )
ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) )
- ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) )
ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) )
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index 16f2b39daec..614bbca55c7 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -32,7 +32,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
- Reset the game while pressing START1 to enter the "test mode"
-
+
***************************************************************************/
#include "emu.h"
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index 842edc30a6c..442f22ff9be 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -635,7 +635,7 @@ static MACHINE_CONFIG_START( ghosteo, ghosteo_state )
MCFG_S3C2410_NAND_DATA_W_CB(WRITE8(ghosteo_state, s3c2410_nand_data_w))
// MCFG_DEVICE_ADD("nand", NAND, 0)
-// MCFG_NAND_TYPE(NAND_CHIP_K9F5608U0D) // or another variant with ID 0xEC 0x75 ?
+// MCFG_NAND_TYPE(NAND_CHIP_K9F5608U0D) // or another variant with ID 0xEC 0x75 ?
// MCFG_DEVICE_CONFIG(bballoon_nand_intf)
// MCFG_I2CMEM_ADD("i2cmem", 0xA0, 0, 0x100, NULL)
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 3bba642ce23..db3cfb590a1 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -222,8 +222,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( star100_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(sangho_fg_vidram_w ) AM_SHARE("fg_vidram") // videoram 1
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(sangho_fg_atrram_w ) AM_SHARE("fg_atrram") // atrram 1
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(sangho_fg_vidram_w ) AM_SHARE("fg_vidram") // videoram 1
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(sangho_fg_atrram_w ) AM_SHARE("fg_atrram") // atrram 1
AM_RANGE(0xd800, 0xd83f) AM_RAM AM_SHARE("reel1_scroll")
AM_RANGE(0xd840, 0xd9ff) AM_RAM
@@ -236,13 +236,13 @@ static ADDRESS_MAP_START( star100_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0xe200, 0xe3ff) AM_RAM_WRITE(goldstar_reel2_ram_w ) AM_SHARE("reel2_ram")
AM_RANGE(0xe400, 0xe5ff) AM_RAM_WRITE(goldstar_reel3_ram_w ) AM_SHARE("reel3_ram")
- AM_RANGE(0xe600, 0xe7ff) AM_RAM_WRITE(sangho_bg_vidram_w ) AM_SHARE("bg_vidram") // videoram 2
+ AM_RANGE(0xe600, 0xe7ff) AM_RAM_WRITE(sangho_bg_vidram_w ) AM_SHARE("bg_vidram") // videoram 2
AM_RANGE(0xe800, 0xe9ff) AM_RAM_WRITE(sangho_reel1_attrram_w ) AM_SHARE("reel1_attrram")
AM_RANGE(0xea00, 0xebff) AM_RAM_WRITE(sangho_reel2_attrram_w ) AM_SHARE("reel2_attrram")
AM_RANGE(0xec00, 0xedff) AM_RAM_WRITE(sangho_reel3_attrram_w ) AM_SHARE("reel3_attrram")
- AM_RANGE(0xee00, 0xefff) AM_RAM_WRITE(sangho_bg_atrram_w ) AM_SHARE("bg_atrram") // atrram 2
+ AM_RANGE(0xee00, 0xefff) AM_RAM_WRITE(sangho_bg_atrram_w ) AM_SHARE("bg_atrram") // atrram 2
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf800, 0xffff) AM_RAM
@@ -278,7 +278,7 @@ WRITE8_MEMBER(goldstar_state::sangho_enable_w)
static ADDRESS_MAP_START( star100_readport, AS_IO, 8, goldstar_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
-
+
AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("aysnd", ay8910_device, data_r, data_w)
AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("aysnd", ay8910_device, address_w)
@@ -291,35 +291,35 @@ static ADDRESS_MAP_START( star100_readport, AS_IO, 8, goldstar_state )
AM_RANGE(0x1c, 0x1c) AM_DEVWRITE("ramdac", ramdac_device, index_w)
AM_RANGE(0x1d ,0x1d) AM_DEVWRITE("ramdac", ramdac_device, pal_w)
AM_RANGE(0x1e ,0x1e) AM_DEVWRITE("ramdac", ramdac_device, mask_w)
-
- AM_RANGE(0x20, 0x20) AM_READ_PORT("DSW4-0") // the first 4 bits map to DSW4 1 to 4.
- AM_RANGE(0x21, 0x21) AM_READ_PORT("DSW4-1") // the first 4 bits map to DSW4 5 to 8.
- AM_RANGE(0x24, 0x24) AM_WRITE(sangho_coincount_w) // coin counters.
+ AM_RANGE(0x20, 0x20) AM_READ_PORT("DSW4-0") // the first 4 bits map to DSW4 1 to 4.
+ AM_RANGE(0x21, 0x21) AM_READ_PORT("DSW4-1") // the first 4 bits map to DSW4 5 to 8.
+
+ AM_RANGE(0x24, 0x24) AM_WRITE(sangho_coincount_w) // coin counters.
AM_RANGE(0x25, 0x25) AM_READ_PORT("DSW2")
AM_RANGE(0x26, 0x26) AM_READ_PORT("DSW3")
- AM_RANGE(0xe0, 0xe0) AM_WRITENOP // writting 0's and 1's constantly. seems watchdog feeder.
- AM_RANGE(0xe1, 0xe1) AM_WRITE(sangho_enable_w) // enable/disable reels register.
+ AM_RANGE(0xe0, 0xe0) AM_WRITENOP // writting 0's and 1's constantly. seems watchdog feeder.
+ AM_RANGE(0xe1, 0xe1) AM_WRITE(sangho_enable_w) // enable/disable reels register.
ADDRESS_MAP_END
/*
- 08: W (3F) AY8910 data
- 0C: W (07) AY8910 address
+ 08: W (3F) AY8910 data
+ 0C: W (07) AY8910 address
- 10: R Input #0
- 11: R Input #1
- 12: R Input #2
- 13: R Input #3
-
- 14: R DSW #1
+ 10: R Input #0
+ 11: R Input #1
+ 12: R Input #2
+ 13: R Input #3
+
+ 14: R DSW #1
17: W
- 1C: W \ these looks like RAMDAC commands. After write to 1C, there are 3 writes to 1D.
- 1D: W / bp: 6c5b.
+ 1C: W \ these looks like RAMDAC commands. After write to 1C, there are 3 writes to 1D.
+ 1D: W / bp: 6c5b.
1E: W (FF) --> seems the RAMDAC mask.
20: R DSW #4-0
@@ -332,14 +332,14 @@ ADDRESS_MAP_END
2F: W (9C)
E0: W
- E1: W Reels enable/disable register
+ E1: W Reels enable/disable register
*/
static ADDRESS_MAP_START( ramdac_map, AS_0, 8, goldstar_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
-ADDRESS_MAP_END
+ADDRESS_MAP_END
-/*
+/*
RAMDAC written commands:
1C 1D 1D 1D 1C 1D 1D 1D 1C 1D 1D 1D 1C 1D 1D 1D
@@ -972,7 +972,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bonusch_map, AS_PROGRAM, 8, goldstar_state )
/* Reels stuff and RAM are there just as placeholder, and obviously in wrong offset */
- AM_RANGE(0x0000, 0xbfff) AM_ROM // ok
+ AM_RANGE(0x0000, 0xbfff) AM_ROM // ok
AM_RANGE(0xd800, 0xdfff) AM_RAM //AM_SHARE("nvram")
AM_RANGE(0xf000, 0xffff) AM_RAM
@@ -1016,10 +1016,10 @@ static ADDRESS_MAP_START( bonusch_portmap, AS_IO, 8, goldstar_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_READ_PORT("IN0")
AM_RANGE(0x20, 0x20) AM_READ_PORT("IN1")
- AM_RANGE(0x50, 0x50) AM_DEVWRITE("sn1", sn76489_device, write) /* SN76489 #1 */
- AM_RANGE(0x51, 0x51) AM_DEVWRITE("sn2", sn76489_device, write) /* SN76489 #2 */
- AM_RANGE(0x52, 0x52) AM_DEVWRITE("sn3", sn76489_device, write) /* SN76489 #3 */
- AM_RANGE(0x53, 0x53) AM_DEVWRITE("sn4", sn76489_device, write) /* SN76489 #4 */
+ AM_RANGE(0x50, 0x50) AM_DEVWRITE("sn1", sn76489_device, write) /* SN76489 #1 */
+ AM_RANGE(0x51, 0x51) AM_DEVWRITE("sn2", sn76489_device, write) /* SN76489 #2 */
+ AM_RANGE(0x52, 0x52) AM_DEVWRITE("sn3", sn76489_device, write) /* SN76489 #3 */
+ AM_RANGE(0x53, 0x53) AM_DEVWRITE("sn4", sn76489_device, write) /* SN76489 #4 */
AM_RANGE(0x60, 0x60) AM_READ_PORT("IN3")
ADDRESS_MAP_END
@@ -6153,14 +6153,14 @@ static INPUT_PORTS_START( star100 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_NAME("Stop 2 / Small")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start")
-// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_1) PORT_NAME("IN0-1")
-// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2) PORT_NAME("IN0-2")
-// PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3) PORT_NAME("IN0-3: BIG")
-// PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("IN0-4: DOUBLE UP")
-// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_5) PORT_NAME("IN0-5: TAKE")
-// PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_6) PORT_NAME("IN0-6: BET")
-// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7) PORT_NAME("IN0-7: SMALL")
-// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8) PORT_NAME("IN0-8: START")
+// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_1) PORT_NAME("IN0-1")
+// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2) PORT_NAME("IN0-2")
+// PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3) PORT_NAME("IN0-3: BIG")
+// PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("IN0-4: DOUBLE UP")
+// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_5) PORT_NAME("IN0-5: TAKE")
+// PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_6) PORT_NAME("IN0-6: BET")
+// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7) PORT_NAME("IN0-7: SMALL")
+// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8) PORT_NAME("IN0-8: START")
PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -6169,7 +6169,7 @@ static INPUT_PORTS_START( star100 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) /* Coin A */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) /* Coin B */
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) /* Key In */
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) /* Key In */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2) /* Coin C */
PORT_START("IN2")
@@ -6182,7 +6182,7 @@ static INPUT_PORTS_START( star100 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_9) PORT_NAME("Settings / Test Mode") PORT_TOGGLE
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_0) PORT_NAME("Statistics")
- PORT_START("IN3") // reflected in test mode
+ PORT_START("IN3") // reflected in test mode
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -6192,7 +6192,7 @@ static INPUT_PORTS_START( star100 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("IN4") // reflected in test mode
+ PORT_START("IN4") // reflected in test mode
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -6203,21 +6203,21 @@ static INPUT_PORTS_START( star100 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("DSW1")
- PORT_DIPNAME( 0x01, 0x00, "Key Out" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x01, 0x00, "Key Out" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, "x1" )
PORT_DIPSETTING( 0x01, "x100" )
- PORT_DIPNAME( 0x02, 0x02, "Bonus Rate" ) PORT_DIPLOCATION("SW1:2")
+ PORT_DIPNAME( 0x02, 0x02, "Bonus Rate" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x00, "1/24" )
PORT_DIPSETTING( 0x02, "1/32" )
- PORT_DIPNAME( 0x04, 0x04, "Spin Rate" ) PORT_DIPLOCATION("SW1:3")
+ PORT_DIPNAME( 0x04, 0x04, "Spin Rate" ) PORT_DIPLOCATION("SW1:3")
PORT_DIPSETTING( 0x04, "Slow" )
PORT_DIPSETTING( 0x00, "Fast" )
- PORT_DIPNAME( 0x18, 0x18, "Double Up Rate" ) PORT_DIPLOCATION("SW1:4,5")
+ PORT_DIPNAME( 0x18, 0x18, "Double Up Rate" ) PORT_DIPLOCATION("SW1:4,5")
PORT_DIPSETTING( 0x18, "60%" )
PORT_DIPSETTING( 0x10, "70%" )
PORT_DIPSETTING( 0x08, "80%" )
PORT_DIPSETTING( 0x00, "90%" )
- PORT_DIPNAME( 0xe0, 0xe0, "Game Rate" ) PORT_DIPLOCATION("SW1:6,7,8")
+ PORT_DIPNAME( 0xe0, 0xe0, "Game Rate" ) PORT_DIPLOCATION("SW1:6,7,8")
PORT_DIPSETTING( 0xe0, "50%" )
PORT_DIPSETTING( 0xc0, "60%" )
PORT_DIPSETTING( 0xa0, "65%" )
@@ -6228,31 +6228,31 @@ static INPUT_PORTS_START( star100 )
PORT_DIPSETTING( 0x00, "90%" )
PORT_START("DSW2")
- PORT_DIPNAME( 0x01, 0x01, "Bonus Min Bet" ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, "Bonus Min Bet" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "16" )
PORT_DIPSETTING( 0x00, "32" )
- PORT_DIPNAME( 0x02, 0x02, "Number of Jackpot" ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, "Number of Jackpot" ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x00, "3 2" )
PORT_DIPSETTING( 0x02, "6 3" )
- PORT_DIPNAME( 0x04, 0x04, "Double Up" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, "Double Up" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPNAME( 0x18, 0x18, "Payout Limit" ) PORT_DIPLOCATION("SW2:4,5")
+ PORT_DIPNAME( 0x18, 0x18, "Payout Limit" ) PORT_DIPLOCATION("SW2:4,5")
PORT_DIPSETTING( 0x18, "1000" )
PORT_DIPSETTING( 0x10, "2000" )
PORT_DIPSETTING( 0x08, "5000" )
PORT_DIPSETTING( 0x00, "No Limit" )
- PORT_DIPNAME( 0x20, 0x20, "Bonus" ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPNAME( 0x20, 0x20, "Bonus" ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x20, "Normal" )
PORT_DIPSETTING( 0x00, "Random" )
- PORT_DIPNAME( 0xc0, 0xc0, "Number of Clown" ) PORT_DIPLOCATION("SW2:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, "Number of Clown" ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0xc0, "60%" )
PORT_DIPSETTING( 0x80, "70%" )
PORT_DIPSETTING( 0x40, "80%" )
PORT_DIPSETTING( 0x00, "90%" )
PORT_START("DSW3")
- PORT_DIPNAME( 0x07, 0x07, "Key In Rate" ) PORT_DIPLOCATION("SW3:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, "Key In Rate" ) PORT_DIPLOCATION("SW3:1,2,3")
PORT_DIPSETTING( 0x00, "100 Credits" )
PORT_DIPSETTING( 0x01, "110 Credits" )
PORT_DIPSETTING( 0x02, "120 Credits" )
@@ -6261,23 +6261,23 @@ static INPUT_PORTS_START( star100 )
PORT_DIPSETTING( 0x05, "400 Credits" )
PORT_DIPSETTING( 0x06, "500 Credits" )
PORT_DIPSETTING( 0x07, "1000 Credits" )
- PORT_DIPNAME( 0x18, 0x00, "Bet Limit" ) PORT_DIPLOCATION("SW3:4,5")
+ PORT_DIPNAME( 0x18, 0x00, "Bet Limit" ) PORT_DIPLOCATION("SW3:4,5")
PORT_DIPSETTING( 0x18, "32 (Limit of Bonus: 1/4)" )
PORT_DIPSETTING( 0x10, "64 (Limit of Bonus: 1/2)" )
PORT_DIPSETTING( 0x08, "72 (Limit of Bonus: All)" )
PORT_DIPSETTING( 0x00, "80 (Limit of Bonus: All)" )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW4-0")
- PORT_DIPNAME( 0x07, 0x07, "Coinage A, B & C" ) PORT_DIPLOCATION("SW4:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, "Coinage A, B & C" ) PORT_DIPLOCATION("SW4:1,2,3")
PORT_DIPSETTING( 0x00, "1 Coin / 1 Credit" )
PORT_DIPSETTING( 0x01, "1 Coin / 5 Credits" )
PORT_DIPSETTING( 0x02, "1 Coin / 10 Credits" )
@@ -6288,7 +6288,7 @@ static INPUT_PORTS_START( star100 )
PORT_DIPSETTING( 0x07, "1 Coin / 100 Credit" )
/* the following two are 'bonus', and need conditional port since they are in different banks */
- PORT_DIPNAME( 0x08, 0x08, "Bonus (switch-1)" ) PORT_DIPLOCATION("SW4:4")
+ PORT_DIPNAME( 0x08, 0x08, "Bonus (switch-1)" ) PORT_DIPLOCATION("SW4:4")
PORT_DIPSETTING( 0x08, "20000" ) PORT_CONDITION("DSW4-1", 0x01, NOTEQUALS, 0x00)
PORT_DIPSETTING( 0x08, "40000" ) PORT_CONDITION("DSW4-1", 0x01, EQUALS, 0x00)
PORT_DIPSETTING( 0x00, "30000" ) PORT_CONDITION("DSW4-1", 0x01, NOTEQUALS, 0x00)
@@ -6296,75 +6296,75 @@ static INPUT_PORTS_START( star100 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("DSW4-1")
- PORT_DIPNAME( 0x01, 0x01, "Bonus (switch-2)" ) PORT_DIPLOCATION("SW4:5")
+ PORT_DIPNAME( 0x01, 0x01, "Bonus (switch-2)" ) PORT_DIPLOCATION("SW4:5")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, "Max Bonus" ) PORT_DIPLOCATION("SW4:6")
+ PORT_DIPNAME( 0x02, 0x02, "Max Bonus" ) PORT_DIPLOCATION("SW4:6")
PORT_DIPSETTING( 0x00, "100000" )
PORT_DIPSETTING( 0x02, "200000" )
- PORT_DIPNAME( 0x0c, 0x0c, "Minimum Bet" ) PORT_DIPLOCATION("SW4:7,8")
+ PORT_DIPNAME( 0x0c, 0x0c, "Minimum Bet" ) PORT_DIPLOCATION("SW4:7,8")
PORT_DIPSETTING( 0x0c, "0" )
PORT_DIPSETTING( 0x08, "8" )
PORT_DIPSETTING( 0x04, "16" )
PORT_DIPSETTING( 0x00, "32" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START("DSW5") // phisically tied to ay8910 port A, but unused...
- PORT_DIPNAME( 0x01, 0x01, "DSW5" ) PORT_DIPLOCATION("SW5:1")
+ PORT_START("DSW5") // phisically tied to ay8910 port A, but unused...
+ PORT_DIPNAME( 0x01, 0x01, "DSW5" ) PORT_DIPLOCATION("SW5:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START("DSW6") // phisically tied to ay8910 port B, but unused...
- PORT_DIPNAME( 0x01, 0x01, "DSW6" ) PORT_DIPLOCATION("SW6:1")
+ PORT_START("DSW6") // phisically tied to ay8910 port B, but unused...
+ PORT_DIPNAME( 0x01, 0x01, "DSW6" ) PORT_DIPLOCATION("SW6:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( crazybon ) // to analyze...
+static INPUT_PORTS_START( crazybon ) // to analyze...
PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_1) PORT_NAME("IN0-1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2) PORT_NAME("IN0-2")
@@ -6416,94 +6416,94 @@ static INPUT_PORTS_START( crazybon ) // to analyze...
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8_PAD) PORT_NAME("IN4-8")
PORT_START("DSW1")
- PORT_DIPNAME( 0x01, 0x01, "DSW1" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x01, 0x01, "DSW1" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW2")
- PORT_DIPNAME( 0x01, 0x01, "DSW2" ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, "DSW2" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW3")
- PORT_DIPNAME( 0x01, 0x01, "DSW3" ) PORT_DIPLOCATION("SW3:1")
+ PORT_DIPNAME( 0x01, 0x01, "DSW3" ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW4-0")
- PORT_DIPNAME( 0x01, 0x01, "DSW4-0" ) PORT_DIPLOCATION("SW4:1")
+ PORT_DIPNAME( 0x01, 0x01, "DSW4-0" ) PORT_DIPLOCATION("SW4:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
@@ -6520,16 +6520,16 @@ static INPUT_PORTS_START( crazybon ) // to analyze...
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW4-1")
- PORT_DIPNAME( 0x01, 0x01, "DSW4-1" ) PORT_DIPLOCATION("SW4:5")
+ PORT_DIPNAME( 0x01, 0x01, "DSW4-1" ) PORT_DIPLOCATION("SW4:5")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:6")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:6")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:7")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:7")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:8")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:8")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
@@ -6546,54 +6546,54 @@ static INPUT_PORTS_START( crazybon ) // to analyze...
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW5")
- PORT_DIPNAME( 0x01, 0x01, "DSW5" ) PORT_DIPLOCATION("SW5:1")
+ PORT_DIPNAME( 0x01, 0x01, "DSW5" ) PORT_DIPLOCATION("SW5:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW5:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW6")
- PORT_DIPNAME( 0x01, 0x01, "DSW6" ) PORT_DIPLOCATION("SW6:1")
+ PORT_DIPNAME( 0x01, 0x01, "DSW6" ) PORT_DIPLOCATION("SW6:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW6:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
@@ -6620,7 +6620,7 @@ static INPUT_PORTS_START( cmpacman )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) /* Coin A */
PORT_START("IN2")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Tied to GND and to the hidden switch that change games. (PC0+GND) -+-> PB0 */
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Tied to GND and to the hidden switch that change games. (PC0+GND) -+-> PB0 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -6782,7 +6782,7 @@ static INPUT_PORTS_START( cmtetris )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) /* Coin A */
PORT_START("IN2")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Tied to GND and to the hidden switch that change games. (PC0+GND) -+-> (PB0|PB1) */
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Tied to GND and to the hidden switch that change games. (PC0+GND) -+-> (PB0|PB1) */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -7292,7 +7292,7 @@ static GFXDECODE_START( sangho )
3*16,16 cherries in game
2*16,16 oranges and title girl in game
1*16,16 nines in game
-*/
+*/
GFXDECODE_END
@@ -7758,7 +7758,7 @@ static MACHINE_CONFIG_START( chrygld, goldstar_state )
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
+ MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
@@ -7808,7 +7808,7 @@ static MACHINE_CONFIG_START( cb3e, goldstar_state )
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
+ MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
@@ -7858,7 +7858,7 @@ static MACHINE_CONFIG_START( cb3c, goldstar_state )
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
+ MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
@@ -7907,7 +7907,7 @@ static MACHINE_CONFIG_START( ncb3, goldstar_state )
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
+ MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
@@ -7957,7 +7957,7 @@ static MACHINE_CONFIG_START( wcherry, goldstar_state )
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
+ MCFG_I8255_IN_PORTB_CB(IOPORT("IN3")) //Player2 controls, confirmed
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
@@ -8723,10 +8723,10 @@ static MACHINE_CONFIG_START( unkch, goldstar_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
// MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
-//
-//
-// MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
-// MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
+//
+//
+// MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
+// MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -13231,49 +13231,49 @@ ROM_START( cmtetrsa )
9800+ --> 3800+
*/
-// ROM_COPY( "maincpu", 0x1c000, 0x0000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x16000, 0x1000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x14000, 0x2000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x1a000, 0x3000, 0x1000 ) /* src-dest-size ok (some calls to high 5xxx appear here, maybe split in 0x800?) */
-// ROM_COPY( "maincpu", 0x15000, 0x4000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x11000, 0x6000, 0x1000 ) /* src-dest-size ok */
-// ROM_COPY( "maincpu", 0x13000, 0x8000, 0x1000 ) /* src-dest-size ok */
-
-// ROM_COPY( "maincpu", 0x17000, 0x5000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x10000, 0x7000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x18000, 0x9000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x19000, 0xa000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x12000, 0xb000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1b000, 0xc000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1d000, 0xd000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1e000, 0xe000, 0x1000 ) /* src-dest-size */
-// ROM_COPY( "maincpu", 0x1f000, 0xf000, 0x1000 ) /* src-dest-size */
-
- ROM_COPY( "maincpu", 0x1c000, 0x0000, 0x0800 ) /* src-dest-size */ // #01
- ROM_COPY( "maincpu", 0x19800, 0x0800, 0x0800 ) /* src-dest-size */ // #02
- ROM_COPY( "maincpu", 0x16000, 0x1000, 0x0800 ) /* src-dest-size */ // #03
- ROM_COPY( "maincpu", 0x17800, 0x1800, 0x0800 ) /* src-dest-size */ // #04
- ROM_COPY( "maincpu", 0x14000, 0x2000, 0x0800 ) /* src-dest-size */ // #05
- ROM_COPY( "maincpu", 0x1c800, 0x2800, 0x0800 ) /* src-dest-size */ // #06
- ROM_COPY( "maincpu", 0x1a000, 0x3000, 0x0800 ) /* src-dest-size */ // #07
- ROM_COPY( "maincpu", 0x18800, 0x3800, 0x0800 ) /* src-dest-size */ // #08
- ROM_COPY( "maincpu", 0x10000, 0x4000, 0x0800 ) /* src-dest-size */ // #09
- ROM_COPY( "maincpu", 0x15000, 0x4800, 0x0800 ) /* src-dest-size */ // #10
- ROM_COPY( "maincpu", 0x14800, 0x5000, 0x0800 ) /* src-dest-size */ // #11
- ROM_COPY( "maincpu", 0x1a800, 0x5800, 0x0800 ) /* src-dest-size */ // #12
- ROM_COPY( "maincpu", 0x11000, 0x6000, 0x0800 ) /* src-dest-size */ // #13
- ROM_COPY( "maincpu", 0x11800, 0x6800, 0x0800 ) /* src-dest-size */ // #14
- ROM_COPY( "maincpu", 0x1b000, 0x7000, 0x0800 ) /* src-dest-size */ // #15
- ROM_COPY( "maincpu", 0x1f000, 0x7800, 0x0800 ) /* src-dest-size */ // #16
- ROM_COPY( "maincpu", 0x1f800, 0x8000, 0x0800 ) /* src-dest-size */ // #17
- ROM_COPY( "maincpu", 0x13800, 0x8800, 0x0800 ) /* src-dest-size */ // #18
- ROM_COPY( "maincpu", 0x19000, 0x9000, 0x0800 ) /* src-dest-size */ // #19
- ROM_COPY( "maincpu", 0x1b800, 0x9800, 0x0800 ) /* src-dest-size */ // #20
- ROM_COPY( "maincpu", 0x12000, 0xa000, 0x0800 ) /* src-dest-size */ // #21
- ROM_COPY( "maincpu", 0x10800, 0xa800, 0x0800 ) /* src-dest-size */ // #22
- ROM_COPY( "maincpu", 0x18000, 0xb000, 0x0800 ) /* src-dest-size */ // #23
- ROM_COPY( "maincpu", 0x12800, 0xb800, 0x0800 ) /* src-dest-size */ // #24
- ROM_COPY( "maincpu", 0x13000, 0xc000, 0x0800 ) /* src-dest-size */ // #25
+// ROM_COPY( "maincpu", 0x1c000, 0x0000, 0x1000 ) /* src-dest-size ok */
+// ROM_COPY( "maincpu", 0x16000, 0x1000, 0x1000 ) /* src-dest-size ok */
+// ROM_COPY( "maincpu", 0x14000, 0x2000, 0x1000 ) /* src-dest-size ok */
+// ROM_COPY( "maincpu", 0x1a000, 0x3000, 0x1000 ) /* src-dest-size ok (some calls to high 5xxx appear here, maybe split in 0x800?) */
+// ROM_COPY( "maincpu", 0x15000, 0x4000, 0x1000 ) /* src-dest-size ok */
+// ROM_COPY( "maincpu", 0x11000, 0x6000, 0x1000 ) /* src-dest-size ok */
+// ROM_COPY( "maincpu", 0x13000, 0x8000, 0x1000 ) /* src-dest-size ok */
+
+// ROM_COPY( "maincpu", 0x17000, 0x5000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x10000, 0x7000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x18000, 0x9000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x19000, 0xa000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x12000, 0xb000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x1b000, 0xc000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x1d000, 0xd000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x1e000, 0xe000, 0x1000 ) /* src-dest-size */
+// ROM_COPY( "maincpu", 0x1f000, 0xf000, 0x1000 ) /* src-dest-size */
+
+ ROM_COPY( "maincpu", 0x1c000, 0x0000, 0x0800 ) /* src-dest-size */ // #01
+ ROM_COPY( "maincpu", 0x19800, 0x0800, 0x0800 ) /* src-dest-size */ // #02
+ ROM_COPY( "maincpu", 0x16000, 0x1000, 0x0800 ) /* src-dest-size */ // #03
+ ROM_COPY( "maincpu", 0x17800, 0x1800, 0x0800 ) /* src-dest-size */ // #04
+ ROM_COPY( "maincpu", 0x14000, 0x2000, 0x0800 ) /* src-dest-size */ // #05
+ ROM_COPY( "maincpu", 0x1c800, 0x2800, 0x0800 ) /* src-dest-size */ // #06
+ ROM_COPY( "maincpu", 0x1a000, 0x3000, 0x0800 ) /* src-dest-size */ // #07
+ ROM_COPY( "maincpu", 0x18800, 0x3800, 0x0800 ) /* src-dest-size */ // #08
+ ROM_COPY( "maincpu", 0x10000, 0x4000, 0x0800 ) /* src-dest-size */ // #09
+ ROM_COPY( "maincpu", 0x15000, 0x4800, 0x0800 ) /* src-dest-size */ // #10
+ ROM_COPY( "maincpu", 0x14800, 0x5000, 0x0800 ) /* src-dest-size */ // #11
+ ROM_COPY( "maincpu", 0x1a800, 0x5800, 0x0800 ) /* src-dest-size */ // #12
+ ROM_COPY( "maincpu", 0x11000, 0x6000, 0x0800 ) /* src-dest-size */ // #13
+ ROM_COPY( "maincpu", 0x11800, 0x6800, 0x0800 ) /* src-dest-size */ // #14
+ ROM_COPY( "maincpu", 0x1b000, 0x7000, 0x0800 ) /* src-dest-size */ // #15
+ ROM_COPY( "maincpu", 0x1f000, 0x7800, 0x0800 ) /* src-dest-size */ // #16
+ ROM_COPY( "maincpu", 0x1f800, 0x8000, 0x0800 ) /* src-dest-size */ // #17
+ ROM_COPY( "maincpu", 0x13800, 0x8800, 0x0800 ) /* src-dest-size */ // #18
+ ROM_COPY( "maincpu", 0x19000, 0x9000, 0x0800 ) /* src-dest-size */ // #19
+ ROM_COPY( "maincpu", 0x1b800, 0x9800, 0x0800 ) /* src-dest-size */ // #20
+ ROM_COPY( "maincpu", 0x12000, 0xa000, 0x0800 ) /* src-dest-size */ // #21
+ ROM_COPY( "maincpu", 0x10800, 0xa800, 0x0800 ) /* src-dest-size */ // #22
+ ROM_COPY( "maincpu", 0x18000, 0xb000, 0x0800 ) /* src-dest-size */ // #23
+ ROM_COPY( "maincpu", 0x12800, 0xb800, 0x0800 ) /* src-dest-size */ // #24
+ ROM_COPY( "maincpu", 0x13000, 0xc000, 0x0800 ) /* src-dest-size */ // #25
ROM_REGION( 0x18000, "gfx1", 0 )
ROM_LOAD( "cm89-tetri-7.u16", 0x00000, 0x8000, CRC(2f5c94bd) SHA1(d99bcaa788f8abf5c75b29572d53be109b20c4bb) )
@@ -13328,7 +13328,7 @@ ROM_END
Because of the dual amp, this might support it being a sound chip.
Probably tracing pin connections to the HX881 will confirm it.
-
+
You can switch the games pulsing their respective hidden buttons.
Hidden Switch:
@@ -14146,9 +14146,9 @@ GAMEL( 198?, kkotnoli, 0, kkotnoli, kkotnoli, driver_device, 0,
GAME( 198?, ladylinr, 0, ladylinr, ladylinr, driver_device, 0, ROT0, "TAB Austria", "Lady Liner", 0 )
GAME( 198?, wcat3, 0, wcat3, lucky8, driver_device, 0, ROT0, "E.A.I.", "Wild Cat 3", GAME_NOT_WORKING )
-GAME( 1985, luckylad, 0, lucky8, luckylad, driver_device, 0, ROT0, "Wing Co., Ltd.", "Lucky Lady (Wing, encrypted)", GAME_NOT_WORKING ) // encrypted (see notes in rom_load)...
+GAME( 1985, luckylad, 0, lucky8, luckylad, driver_device, 0, ROT0, "Wing Co., Ltd.", "Lucky Lady (Wing, encrypted)", GAME_NOT_WORKING ) // encrypted (see notes in rom_load)...
GAME( 1991, megaline, 0, megaline, megaline, driver_device, 0, ROT0, "Fun World", "Mega Lines", GAME_NOT_WORKING )
-GAME( 1990, bonusch, 0, bonusch, bonusch, driver_device, 0, ROT0, "Wing Co., Ltd.", "Bonus Chance (W-8)", GAME_NOT_WORKING ) // M80C51F MCU
+GAME( 1990, bonusch, 0, bonusch, bonusch, driver_device, 0, ROT0, "Wing Co., Ltd.", "Bonus Chance (W-8)", GAME_NOT_WORKING ) // M80C51F MCU
GAMEL( 1993, bingowng, 0, bingowng, bingowng, driver_device, 0, ROT0, "Wing Co., Ltd.", "Bingo (set 1)", 0, layout_bingowng )
@@ -14218,8 +14218,8 @@ GAME( 1999, unkch4, unkch1, unkch, unkch, goldstar_state, unkch4,
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
GAME( 198?, cmpacman, 0, cm, cmpacman, goldstar_state, cm, ROT0, "<unknown>", "Super Pacman (v1.2) + Cherry Master (Corsica, v8.31)", 0 ) /* need to press K to switch between games... */
GAME( 198?, cmtetris, 0, cm, cmtetris, goldstar_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (Corsica, v8.01, set 1)", 0 ) /* need to press K/L to switch between games... */
-GAME( 198?, cmtetrsa, 0, cm, cmtetris, goldstar_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (Corsica, v8.01, set 2)", GAME_NOT_WORKING) // seems banked...
-GAME( 198?, cmtetrsb, 0, cm, cmtetris, goldstar_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (+K, Canada Version, encrypted)", GAME_NOT_WORKING) // different Tetris game
+GAME( 198?, cmtetrsa, 0, cm, cmtetris, goldstar_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (Corsica, v8.01, set 2)", GAME_NOT_WORKING) // seems banked...
+GAME( 198?, cmtetrsb, 0, cm, cmtetris, goldstar_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (+K, Canada Version, encrypted)", GAME_NOT_WORKING) // different Tetris game
/* other possible stealth sets:
- cmv4a ---> see the 1fxx zone. put a bp in 1f9f to see the loop.
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index e77cb4c8d63..14ea8299dbe 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -49,19 +49,19 @@ Notes:
Diagnostic Menu:
- Press and keep P1 Start and Reset
- You'll see cross hatch test screen, then press P1 Start again.
+ Press and keep P1 Start and Reset
+ You'll see cross hatch test screen, then press P1 Start again.
Secret menu hack [totmejan only] (I couldn't find official way to enter, so it's a hack):
- Mame internal debugger:
- PC=ECFFD ; 'SECRET MENU'
- Keys: BACKSPC, ENTER, Z, P1 START
+ Mame internal debugger:
+ PC=ECFFD ; 'SECRET MENU'
+ Keys: BACKSPC, ENTER, Z, P1 START
- PC=E2EE2; 'TODAY: DATA' screen
- Keys: Z
+ PC=E2EE2; 'TODAY: DATA' screen
+ Keys: Z
- PC=ECC72; 'HMODE' screen
+ PC=ECC72; 'HMODE' screen
*******************************************************************************************/
@@ -496,8 +496,8 @@ static INPUT_PORTS_START( goodejan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-/* These games seems have 2 DIP Switches, DIPSW-A and DIPSW-B
- Game reads these switches at port C000h (16 bit) with two calls (subroutine 0EF522h [totmejan])
+/* These games seems have 2 DIP Switches, DIPSW-A and DIPSW-B
+ Game reads these switches at port C000h (16 bit) with two calls (subroutine 0EF522h [totmejan])
Needs to be rearranged and cleaned up (DSW1 current holds all dips and DSW2 appears to be additional inputs) */
PORT_START("DSW1")
@@ -527,7 +527,7 @@ static INPUT_PORTS_START( goodejan )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPUNKNOWN_DIPLOC( 0x0080, 0x0080, "DSWA:8" )
- PORT_DIPNAME( 0x0300, 0x0100, "Starting Points" ) PORT_DIPLOCATION("DSWB:1,2")
+ PORT_DIPNAME( 0x0300, 0x0100, "Starting Points" ) PORT_DIPLOCATION("DSWB:1,2")
PORT_DIPSETTING( 0x0300, "1500" )
PORT_DIPSETTING( 0x0200, "2000" )
PORT_DIPSETTING( 0x0100, "1000" )
@@ -535,11 +535,11 @@ static INPUT_PORTS_START( goodejan )
PORT_DIPUNKNOWN_DIPLOC( 0x0400, 0x0400, "DSWB:3" )
PORT_DIPUNKNOWN_DIPLOC( 0x0800, 0x0800, "DSWB:4" )
-/* [totmejan] Game definitely uses these, reads these 2 bits and stores at address 01A28h as 0-1st bit;
- Sub-routine at E7C19h does some arithmetic operations depending on these.
- I cound't understand whats going on. Call performs just before dealing tiles. */
+/* [totmejan] Game definitely uses these, reads these 2 bits and stores at address 01A28h as 0-1st bit;
+ Sub-routine at E7C19h does some arithmetic operations depending on these.
+ I cound't understand whats going on. Call performs just before dealing tiles. */
- PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSWB:5")
+ PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSWB:5")
PORT_DIPSETTING( 0x1000, DEF_STR( On ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPNAME( 0x2000, 0x2000, "Explicit Scenes" ) PORT_DIPLOCATION("DSWB:6")
@@ -549,8 +549,8 @@ static INPUT_PORTS_START( goodejan )
PORT_DIPUNKNOWN_DIPLOC( 0x8000, 0x8000, "DSWB:8" )
PORT_START("DSW2")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 0x0002 must be kept low to work as service coin
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 0x0002 must be kept low to work as service coin
INPUT_PORTS_END
diff --git a/src/mame/drivers/gp_1.c b/src/mame/drivers/gp_1.c
index ade27aafa1f..36a1ac05d02 100644
--- a/src/mame/drivers/gp_1.c
+++ b/src/mame/drivers/gp_1.c
@@ -290,7 +290,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( gp_1_state::zero_timer )
{
m_ctc->trg2(0);
m_ctc->trg2(1);
-}
+}
static const z80_daisy_config daisy_chain[] =
{
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index f44ef215a29..3e6b2f52291 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -272,13 +272,13 @@ WRITE_LINE_MEMBER(gstriker_state::gs_ym2610_irq)
static ADDRESS_MAP_START( gstriker_map, AS_PROGRAM, 16, gstriker_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("zoomtilemap", mb60553_zooming_tilemap_device, vram_r, vram_w )
+ AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("zoomtilemap", mb60553_zooming_tilemap_device, vram_r, vram_w )
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_SHARE("cg10103_m_vram")
- AM_RANGE(0x180000, 0x180fff) AM_DEVREADWRITE("texttilemap", vs920a_text_tilemap_device, vram_r, vram_w )
- AM_RANGE(0x181000, 0x181fff) AM_DEVREADWRITE("zoomtilemap", mb60553_zooming_tilemap_device, line_r, line_w )
+ AM_RANGE(0x180000, 0x180fff) AM_DEVREADWRITE("texttilemap", vs920a_text_tilemap_device, vram_r, vram_w )
+ AM_RANGE(0x181000, 0x181fff) AM_DEVREADWRITE("zoomtilemap", mb60553_zooming_tilemap_device, line_r, line_w )
AM_RANGE(0x1c0000, 0x1c0fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_MIRROR(0x00f000)
- AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE("zoomtilemap", mb60553_zooming_tilemap_device, regs_r, regs_w )
+ AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE("zoomtilemap", mb60553_zooming_tilemap_device, regs_r, regs_w )
AM_RANGE(0x200040, 0x20005f) AM_RAM AM_SHARE("mixerregs1")
AM_RANGE(0x200060, 0x20007f) AM_RAM AM_SHARE("mixerregs2")
AM_RANGE(0x200080, 0x200081) AM_READ_PORT("P1")
@@ -523,7 +523,7 @@ static MACHINE_CONFIG_START( gstriker, gstriker_state )
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+// MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000) /* hand-tuned, it needs a bit */)
MCFG_SCREEN_SIZE(64*8, 64*8)
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index b9b451d7ff4..ed4609fa99a 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -260,7 +260,7 @@ public:
m_k001006_2(*this, "k001006_2"),
m_generic_paletteram_32(*this, "paletteram"),
m_konppc(*this, "konppc") { }
-
+
// TODO: Needs verification on real hardware
static const int m_sound_timer_usec = 2400;
@@ -995,7 +995,7 @@ static MACHINE_CONFIG_START( gticlub, gticlub_state )
MCFG_RF5C400_ADD("rfsnd", XTAL_33_8688MHz/2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-
+
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_GTICLUB)
@@ -1074,7 +1074,7 @@ static MACHINE_CONFIG_START( hangplt, gticlub_state )
MCFG_VOODOO_SCREEN_TAG("lscreen")
MCFG_VOODOO_CPU_TAG("dsp")
MCFG_VOODOO_VBLANK_CB(WRITELINE(gticlub_state,voodoo_vblank_0))
-
+
MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK)
MCFG_VOODOO_FBMEM(2)
MCFG_VOODOO_TMUMEM(2,2)
@@ -1133,7 +1133,7 @@ static MACHINE_CONFIG_START( hangplt, gticlub_state )
MCFG_RF5C400_ADD("rfsnd", XTAL_33_8688MHz/2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-
+
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(2)
MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_HANGPLT)
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index c043b937df8..aaaa934a381 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -984,7 +984,7 @@ static MACHINE_CONFIG_START( hornet, hornet_state )
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("screen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
MCFG_DEVICE_ADD("k033906_1", K033906, 0)
MCFG_K033906_VOODOO("voodoo0")
@@ -1017,7 +1017,7 @@ static MACHINE_CONFIG_START( hornet, hornet_state )
MCFG_DEVICE_ADD("adc12138", ADC12138, 0)
MCFG_ADC1213X_IPT_CONVERT_CB(hornet_state, adc12138_input_callback)
-
+
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_HORNET)
@@ -1063,20 +1063,20 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet )
MCFG_K037122_PALETTE("palette")
MCFG_DEVICE_REMOVE("voodoo0")
-
+
MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK)
MCFG_VOODOO_FBMEM(2)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("lscreen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
-
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
+
MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK)
MCFG_VOODOO_FBMEM(2)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("rscreen")
MCFG_VOODOO_CPU_TAG("dsp2")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1))
MCFG_DEVICE_ADD("k033906_2", K033906, 0)
MCFG_K033906_VOODOO("voodoo1")
@@ -1098,7 +1098,7 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet )
MCFG_SCREEN_SIZE(512, 384)
MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
MCFG_SCREEN_UPDATE_DRIVER(hornet_state, screen_update_hornet_2board)
-
+
MCFG_DEVICE_REMOVE("konppc")
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(2)
@@ -1118,15 +1118,15 @@ static MACHINE_CONFIG_DERIVED( hornet_2board_v2, hornet_2board )
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("lscreen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
-
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
+
MCFG_DEVICE_REMOVE("voodoo1")
MCFG_DEVICE_ADD("voodoo1", VOODOO_2, STD_VOODOO_2_CLOCK)
MCFG_VOODOO_FBMEM(2)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("rscreen")
MCFG_VOODOO_CPU_TAG("dsp2")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sscope2, hornet_2board_v2)
diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c
index 11c9be97df6..3a625899eb8 100644
--- a/src/mame/drivers/icecold.c
+++ b/src/mame/drivers/icecold.c
@@ -352,10 +352,10 @@ static MACHINE_CONFIG_START( icecold, icecold_state )
MCFG_DEVICE_ADD("i8279", I8279, XTAL_6MHz/4)
MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("pia0", pia6821_device, cb1_w)) // irq
- MCFG_I8279_OUT_SL_CB(WRITE8(icecold_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(icecold_state, scanlines_w)) // scan SL lines
MCFG_I8279_OUT_DISP_CB(WRITE8(icecold_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(icecold_state, kbd_r)) // kbd RL lines
-
+ MCFG_I8279_IN_RL_CB(READ8(icecold_state, kbd_r)) // kbd RL lines
+
// 30Hz signal from CH-C of ay0
MCFG_TIMER_DRIVER_ADD_PERIODIC("sint_timer", icecold_state, icecold_sint_timer, attotime::from_hz(30))
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index c9a4424ce29..c26f011a26e 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -208,7 +208,7 @@ public:
DECLARE_DRIVER_INIT(ryukobou);
TIMER_DEVICE_CALLBACK_MEMBER(lev5_timer_irq_cb);
TIMER_DEVICE_CALLBACK_MEMBER(lhb_timer_irq_cb);
- TIMER_DEVICE_CALLBACK_MEMBER(lev3_timer_irq_cb);
+ TIMER_DEVICE_CALLBACK_MEMBER(lev3_timer_irq_cb);
virtual void video_start();
UINT32 screen_update_igs011(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof_vbowl(screen_device &screen, bool state);
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 1241cada3d3..1bad2f49317 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -84,7 +84,7 @@ public:
required_device<palette_device> m_palette;
optional_shared_ptr<UINT8> m_generic_paletteram_8;
optional_shared_ptr<UINT16> m_generic_paletteram_16;
-
+
void igs025_to_igs022_callback( void );
int m_toggle;
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 0bc41f12f19..612424792a1 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -1666,7 +1666,7 @@ static MACHINE_CONFIG_START( timekill, itech32_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 508, 0, 384, 262, 0, 240) // most games configure the screen this way
-// MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 508, 0, 384, 286, 0, 256) // sftm, wcbowl and shufshot configure it this way
+// MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 508, 0, 384, 286, 0, 256) // sftm, wcbowl and shufshot configure it this way
MCFG_SCREEN_UPDATE_DRIVER(itech32_state, screen_update_itech32)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/jpmmps.c b/src/mame/drivers/jpmmps.c
index 4f9a9300933..c997c162dd0 100644
--- a/src/mame/drivers/jpmmps.c
+++ b/src/mame/drivers/jpmmps.c
@@ -163,8 +163,8 @@ static MACHINE_CONFIG_START( jpmmps, jpmmps_state )
MCFG_DEVICE_ADD("ppi8255_ic21", I8255, 0)
MCFG_DEVICE_ADD("ppi8255_ic22", I8255, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(jpmmps_state, jpmmps_psg_buf_w)) // SN chip data
- MCFG_I8255_OUT_PORTC_CB(WRITE8(jpmmps_state, jpmmps_ic22_portc_w)) // C3 is last meter, C2 latches in data
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(jpmmps_state, jpmmps_psg_buf_w)) // SN chip data
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(jpmmps_state, jpmmps_ic22_portc_w)) // C3 is last meter, C2 latches in data
MCFG_DEVICE_ADD("ppi8255_ic25", I8255, 0)
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 2adde9762e1..3ee751bab27 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -238,7 +238,7 @@ WRITE16_MEMBER(jpmsys5_state::jpm_upd7759_w)
}
case 1:
{
- //Reset 0x04, data 0x02, clock
+ //Reset 0x04, data 0x02, clock
m_vfd->por(data & 0x04);
m_vfd->data(data & 0x02);
m_vfd->sclk(data & 0x01);
diff --git a/src/mame/drivers/kenseim.c b/src/mame/drivers/kenseim.c
index 2a6feb9edf9..62ce8696981 100644
--- a/src/mame/drivers/kenseim.c
+++ b/src/mame/drivers/kenseim.c
@@ -124,7 +124,7 @@ D9 | 8
D8 | 9
D7 | 10
D6 | 11
-D5 | 12
+D5 | 12
D4 | 13
D3 | 14
D2 | 15
@@ -152,13 +152,13 @@ public:
m_to_68k_cmd_low(0),
m_to_68k_cmd_d9(0),
m_to_68k_cmd_req(0),
- m_to_68k_cmd_LVm(0),
+ m_to_68k_cmd_LVm(0),
m_from68k_ack(0),
m_from68k_st4(0),
m_from68k_st3(0),
m_from68k_st2(0)
- {
+ {
for (int i = 0; i < 6; i++)
{
mole_state_a[i] = 0x00;
@@ -190,7 +190,7 @@ public:
sprintf(temp, "molea_%d", i);
output_set_value(temp, mole_state_a[i]);
}
-
+
for (int i = 0; i < 6; i++)
{
char temp[32];
@@ -226,7 +226,7 @@ public:
UINT8 m_to_68k_cmd_d9;
UINT8 m_to_68k_cmd_req;
UINT8 m_to_68k_cmd_LVm;
-
+
int m_from68k_ack;
int m_from68k_st4;
@@ -258,7 +258,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));
+ output_set_lamp_value(i+1, ((ledstates & (1 << i)) != 0));
}
// could be wrong
@@ -266,11 +266,10 @@ WRITE8_MEMBER(kenseim_state::mb8936_portc_w)
{
// I'm guessing these are the 20 'power meter' LEDs, 10 for each player? (it writes 42 times, with the last write being some terminator?)
-// printf("%s mb8936 write %02x to port C but no handler assigned (serial data?)\n", machine().describe_context(), data);
+// printf("%s mb8936 write %02x to port C but no handler assigned (serial data?)\n", machine().describe_context(), data);
if (data & 0x08)
{
-
if (data & 0x02)
{
if (data & 0x04)
@@ -317,7 +316,7 @@ WRITE8_MEMBER(kenseim_state::mb8936_porta_w) // maybe molesa output? (6-bits?)
update_moles();
-}
+}
WRITE8_MEMBER(kenseim_state::mb8936_portb_w) // maybe molesb output? (6-bits?)
{
@@ -503,35 +502,35 @@ static INPUT_PORTS_START( kenseim )
PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED /*IPT_COIN1*/ ) // n/c
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED /*IPT_COIN2*/ ) // n/c
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_9_r, NULL) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // D9
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_9_r, NULL) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // D9
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) // n/c?
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_req_r, NULL) // PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) // REQ
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_LVm_r, NULL) // PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // LVm
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_req_r, NULL) // PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) // REQ
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_LVm_r, NULL) // PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // LVm
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) n/c
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // n/c?
PORT_START("IN1")
-// PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) // D5
-// PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) // D6
-// PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) // D7
-// PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) // D8
+// PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) // D5
+// PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) // D6
+// PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) // D7
+// PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) // D8
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_5678_r, NULL)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED/*IPT_BUTTON1*/ ) /*PORT_PLAYER(1)*/ // n/c
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED/*IPT_BUTTON2*/ ) /*PORT_PLAYER(1)*/ // n/c
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED/*IPT_BUTTON3*/ ) /*PORT_PLAYER(1)*/ // n/c
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) // n/c?
-// PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) // D1
-// PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) // D2
-// PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) // D3
-// PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) // D4
+// PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) // D1
+// PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) // D2
+// PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) // D3
+// PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) // D4
PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, kenseim_state, kenseim_cmd_1234_r, NULL)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNUSED /*IPT_BUTTON1*/ ) /*PORT_PLAYER(2)*/ // n/c
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNUSED /*IPT_BUTTON2*/ ) /*PORT_PLAYER(2)*/ // n/c
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED /*IPT_BUTTON3*/ ) /*PORT_PLAYER(2)*/ // n/c
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // n/c?
- // most of the regular CPS1 dips are unused
+ // most of the regular CPS1 dips are unused
PORT_START("DSWA")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "CPSA SW(A):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "CPSA SW(A):2" )
@@ -699,4 +698,3 @@ DRIVER_INIT_MEMBER(kenseim_state,kenseim)
// 1994.04.18 is from extra PCB rom, Siguma or Sigma? (Siguma is in the ROM)
// the CPS1 board roms contain "M O G U R A 9 2 0 9 2 4" strings suggesting that part of the code was developed earlier
GAMEL( 1994, kenseim, 0, kenseim, kenseim, kenseim_state, kenseim, ROT0, "Capcom / Togo / Sigma", "Ken Sei Mogura: Street Fighter II (Japan 940418, Ver 1.00)", GAME_CLICKABLE_ARTWORK, layout_kenseim )
-
diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c
index 336a6f7731d..a354fb419a0 100644
--- a/src/mame/drivers/kingdrby.c
+++ b/src/mame/drivers/kingdrby.c
@@ -1156,7 +1156,7 @@ ROM_START( kingdrbb2 )
ROM_LOAD( "h6", 0x2000, 0x1000, CRC(257f4e0d) SHA1(cd61f3cf70c536aa207ebfdd28be54ac586b5249) ) // = im6_d.b6 kingdrby
ROM_REGION( 0x1000, "soundcpu", 0 )
- ROM_LOAD( "sg1_b.e1", 0x0000, 0x1000, BAD_DUMP CRC(92ef3c13) SHA1(1bf1e4106b37aadfc02822184510740e18a54d5c) ) // not in this set, using kingdrby one...
+ ROM_LOAD( "sg1_b.e1", 0x0000, 0x1000, BAD_DUMP CRC(92ef3c13) SHA1(1bf1e4106b37aadfc02822184510740e18a54d5c) ) // not in this set, using kingdrby one...
ROM_REGION( 0x4000, "slave", 0 )
ROM_LOAD( "h1", 0x0000, 0x1000, CRC(444aa020) SHA1(0d40e9499892177b4d8123ad7b6909e8f6e0c8ab) )
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index e2ff12c64bc..b2b21ad499e 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -152,8 +152,8 @@ static MACHINE_CONFIG_START( kingpin, kingpin_state )
/* video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(kingpin_state, vdp_interrupt))
-
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(kingpin_state, vdp_interrupt))
+
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 238382736d5..6724c938f82 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -1465,7 +1465,7 @@ static MACHINE_CONFIG_START( lucky74, lucky74_state )
MCFG_NVRAM_ADD_0FILL("nvram")
- // Each 82C255 behaves like 2x 8255 (in mode 0). Since MAME doesn't support it yet, I replaced
+ // Each 82C255 behaves like 2x 8255 (in mode 0). Since MAME doesn't support it yet, I replaced
// both 82C255 with 4x 8255...
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c
index a661fa51eb2..a4042ce4655 100644
--- a/src/mame/drivers/magicard.c
+++ b/src/mame/drivers/magicard.c
@@ -512,7 +512,7 @@ READ16_MEMBER(magicard_state::philips_66470_r)
UINT8 vdisp;
vdisp = m_screen->vpos() < 256;
- return (m_pcab_vregs[offset] & 0xff7f) | vdisp<<7; //TODO
+ return (m_pcab_vregs[offset] & 0xff7f) | vdisp<<7; //TODO
}
}
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index c51263a0ae5..1b1e54c5a2a 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -343,12 +343,12 @@ static MACHINE_CONFIG_START( malzak, malzak_state )
MCFG_DEVICE_ADD("s2636_0", S2636, 0)
MCFG_S2636_WORKRAM_SIZE(0x100)
- MCFG_S2636_OFFSETS(0, -16) // -8, -16
+ MCFG_S2636_OFFSETS(0, -16) // -8, -16
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("s2636_1", S2636, 0)
MCFG_S2636_WORKRAM_SIZE(0x100)
- MCFG_S2636_OFFSETS(0, -16) // -9, -16
+ MCFG_S2636_OFFSETS(0, -16) // -9, -16
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("saa5050", SAA5050, 6000000)
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index 809063c113d..160b8398c01 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -69,8 +69,8 @@
TODO: I/O is generally a nightmare, probably needs a rebuild at the address level.
- Inputs need a sort out.
- Some games require dongles for security, need to figure this out.
+ Inputs need a sort out.
+ Some games require dongles for security, need to figure this out.
******************************************************************************************/
#include "emu.h"
#include "includes/maygay1b.h"
@@ -469,7 +469,7 @@ WRITE8_MEMBER( maygay1b_state::scanlines_w )
WRITE8_MEMBER( maygay1b_state::lamp_data_w )
{
//The two A/B ports are merged back into one, to make one row of 8 lamps.
-
+
if (m_old_lamp_strobe != m_lamp_strobe)
{
// Because of the nature of the lamping circuit, there is an element of persistance
@@ -482,7 +482,7 @@ WRITE8_MEMBER( maygay1b_state::lamp_data_w )
}
m_old_lamp_strobe = m_lamp_strobe;
}
-
+
}
READ8_MEMBER( maygay1b_state::kbd_r )
@@ -494,7 +494,7 @@ READ8_MEMBER( maygay1b_state::kbd_r )
WRITE8_MEMBER( maygay1b_state::lamp_data_2_w )
{
//The two A/B ports are merged back into one, to make one row of 8 lamps.
-
+
if (m_old_lamp_strobe2 != m_lamp_strobe2)
{
// Because of the nature of the lamping circuit, there is an element of persistance
@@ -507,7 +507,7 @@ WRITE8_MEMBER( maygay1b_state::lamp_data_2_w )
}
m_old_lamp_strobe2 = m_lamp_strobe2;
}
-
+
}
// machine driver for maygay m1 board /////////////////////////////////
@@ -541,12 +541,12 @@ MACHINE_CONFIG_START( maygay_m1, maygay1b_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmitimer", maygay1b_state, maygay1b_nmitimer_callback, attotime::from_hz(75)) // freq?
MCFG_DEVICE_ADD("i8279", I8279, M1_MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(maygay1b_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(maygay1b_state, lamp_data_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(maygay1b_state, kbd_r)) // kbd RL lines
- MCFG_DEVICE_ADD("i8279_2", I8279, M1_MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_DISP_CB(WRITE8(maygay1b_state, lamp_data_2_w)) // display A&B
-
+ MCFG_I8279_OUT_SL_CB(WRITE8(maygay1b_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(maygay1b_state, lamp_data_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(maygay1b_state, kbd_r)) // kbd RL lines
+ MCFG_DEVICE_ADD("i8279_2", I8279, M1_MASTER_CLOCK/4) // unknown clock
+ MCFG_I8279_OUT_DISP_CB(WRITE8(maygay1b_state, lamp_data_2_w)) // display A&B
+
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEFAULT_LAYOUT(layout_maygay1b)
diff --git a/src/mame/drivers/maygay1bsw.c b/src/mame/drivers/maygay1bsw.c
index 9459ff31106..1069ef38903 100644
--- a/src/mame/drivers/maygay1bsw.c
+++ b/src/mame/drivers/maygay1bsw.c
@@ -3,7 +3,7 @@
/*
the MSM6376 is on the ROM board, so some games might not have it
the YM2149F is on the MAIN board, but it seems very rarely used for sound.
-
+
On various PCBs, I've seen the AY slot filled with AY8913's, 8910's,
YM2419s and even AY8930s.
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index 6b5cc4329d2..a4af1c8fb38 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -512,7 +512,7 @@ WRITE8_MEMBER( maygayv1_state::strobe_w )
WRITE8_MEMBER( maygayv1_state::lamp_data_w )
{
//The two A/B ports are merged back into one, to make one row of 8 lamps.
-
+
if (m_old_lamp_strobe != m_lamp_strobe)
{
// Because of the nature of the lamping circuit, there is an element of persistance
@@ -525,7 +525,7 @@ WRITE8_MEMBER( maygayv1_state::lamp_data_w )
}
m_old_lamp_strobe = m_lamp_strobe;
}
-
+
}
READ8_MEMBER( maygayv1_state::kbd_r )
@@ -897,10 +897,10 @@ static MACHINE_CONFIG_START( maygayv1, maygayv1_state )
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(maygayv1_state, duart_txa))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(maygayv1_state, strobe_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(maygayv1_state, lamp_data_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(maygayv1_state, kbd_r)) // kbd RL lines
-
+ MCFG_I8279_OUT_SL_CB(WRITE8(maygayv1_state, strobe_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(maygayv1_state, lamp_data_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(maygayv1_state, kbd_r)) // kbd RL lines
+
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd",YM2413, MASTER_CLOCK / 4)
diff --git a/src/mame/drivers/megaphx.c b/src/mame/drivers/megaphx.c
index 118e9d7d1bf..f565d7f36d1 100644
--- a/src/mame/drivers/megaphx.c
+++ b/src/mame/drivers/megaphx.c
@@ -349,10 +349,10 @@ WRITE8_MEMBER(megaphx_state::port_c_w)
static ADDRESS_MAP_START( megaphx_pic_io_map, AS_IO, 8, megaphx_state )
-// AM_RANGE(0x00, 0x00) AM_WRITE(playmark_oki_banking_w)
-// AM_RANGE(0x01, 0x01) AM_READWRITE(playmark_snd_command_r, playmark_oki_w)
-// AM_RANGE(0x02, 0x02) AM_READWRITE(playmark_snd_flag_r, playmark_snd_control_w)
-// AM_RANGE(PIC16C5x_T0, PIC16C5x_T0) AM_READ(PIC16C5X_T0_clk_r)
+// AM_RANGE(0x00, 0x00) AM_WRITE(playmark_oki_banking_w)
+// AM_RANGE(0x01, 0x01) AM_READWRITE(playmark_snd_command_r, playmark_oki_w)
+// AM_RANGE(0x02, 0x02) AM_READWRITE(playmark_snd_flag_r, playmark_snd_control_w)
+// AM_RANGE(PIC16C5x_T0, PIC16C5x_T0) AM_READ(PIC16C5X_T0_clk_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index dc1dd55c30b..4a9351e9038 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -1045,7 +1045,7 @@ static MACHINE_CONFIG_START( meritm_crt250, meritm_state )
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", meritm_state, meritm_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(meritm_state, meritm_crt250_port_b_w)) // used LMP x DRIVE
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(meritm_state, meritm_crt250_port_b_w)) // used LMP x DRIVE
MCFG_I8255_IN_PORTC_CB(READ8(meritm_state, meritm_8255_port_c_r))
MCFG_DEVICE_ADD("z80pio_0", Z80PIO, SYSTEM_CLK/6)
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index ec9de21f2cd..f1022e03854 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -737,7 +737,7 @@ static MACHINE_CONFIG_START( metalmx, metalmx_state )
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0) // TODO: speedup address
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(metalmx_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(metalmx_state,cage_irq_callback))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 8253e3269a2..f5f26198510 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -16,7 +16,7 @@
VRAM 256kbyte (4Display/Access bank)
PaletteRAM 96kbyte
-
+
Display 320(x)*224(y)
Sprite 16(x)*240(y(max))*380(max) (96 sprite/line(max))
@@ -605,10 +605,9 @@ void midas_state::machine_start()
void midas_state::machine_reset()
{
-
}
-
+
WRITE_LINE_MEMBER(midas_state::livequiz_irqhandler)
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index cd8c2a16efc..8567cea7de1 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -1033,16 +1033,16 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( crusnwld, midvunit )
- /* valid values are 450 or 460 */
- MCFG_DEVICE_ADD("serial_pic", MIDWAY_SERIAL_PIC, 0)
+ /* valid values are 450 or 460 */
+ MCFG_DEVICE_ADD("serial_pic", MIDWAY_SERIAL_PIC, 0)
MCFG_MIDWAY_SERIAL_PIC_UPPER(450)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( offroadc, midvunit )
/* valid values are 230 or 234 */
- MCFG_DEVICE_ADD("serial_pic2", MIDWAY_SERIAL_PIC2, 0)
+ MCFG_DEVICE_ADD("serial_pic2", MIDWAY_SERIAL_PIC2, 0)
MCFG_MIDWAY_SERIAL_PIC2_UPPER(230)
- MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(94)
+ MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(94)
MACHINE_CONFIG_END
@@ -1062,7 +1062,7 @@ static MACHINE_CONFIG_DERIVED( midvplus, midvcommon )
MCFG_MIDWAY_IOASIC_SHUFFLE(0)
MCFG_MIDWAY_IOASIC_UPPER(452) /* no alternates */
MCFG_MIDWAY_IOASIC_YEAR_OFFS(94)
-
+
/* sound hardware */
MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(2)
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index 731afdbcc28..c7ae3ec23ba 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -278,7 +278,7 @@ static MACHINE_CONFIG_START( midxunit, midxunit_state )
MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_ind16)
MCFG_SCREEN_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(midxunit_state,midxunit)
-
+
MCFG_DEVICE_ADD("serial_pic", MIDWAY_SERIAL_PIC, 0)
/* serial prefixes 419, 420 */
MCFG_MIDWAY_SERIAL_PIC_UPPER(419);
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 17c4509c1fb..c8f118f8c4f 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -1104,10 +1104,10 @@ static MACHINE_CONFIG_START( midzeus, midzeus_state )
/* sound hardware */
MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
-
+
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
- MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
- MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(94)
+ MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
+ MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(94)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mk4, midzeus )
@@ -1129,7 +1129,7 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( invasn, midzeus )
MCFG_CPU_ADD("pic", PIC16C57, 8000000) /* ? */
MCFG_CPU_IO_MAP(pic_io_map)
-
+
MCFG_DEVICE_MODIFY("ioasic")
MCFG_MIDWAY_IOASIC_UPPER(468/* or 488 */)
MACHINE_CONFIG_END
@@ -1157,7 +1157,7 @@ static MACHINE_CONFIG_START( midzeus2, midzeus2_state )
MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_M48T35_ADD( "m48t35" )
-
+
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(99)
@@ -1527,9 +1527,9 @@ DRIVER_INIT_MEMBER(midzeus_state,thegrid)
*
*************************************/
-GAME( 1997, mk4, 0, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 3.0)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
-GAME( 1997, mk4a, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 2.1)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
-GAME( 1997, mk4b, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 1.0)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
+GAME( 1997, mk4, 0, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 3.0)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
+GAME( 1997, mk4a, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 2.1)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
+GAME( 1997, mk4b, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 1.0)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1999, invasnab, 0, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 5.0)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1999, invasnab4,invasnab, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 4.0)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1999, invasnab3,invasnab, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 3.0)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 189bc7b769a..aab7cd8cd4e 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -7,30 +7,30 @@
Hardware and protection reverse-engineering and general assistance by ElSemi.
MAME driver by R. Belmont, Olivier Galibert, and ElSemi.
- TODO (updated as for April 2014):
- - all Model 2B games: FIFO comms looks way wrong, and 3d is mostly missing/incomplete. Games also tends to stalls at some point, culprit might be when i960 tries
- to use a burst type opcode read;
- - Inputs needs device-ification and clean-ups;
- - Sound comms actually passes thru a 8251-compatible device, hook it up;
- - daytona: runs at half speed in gameplay;
- - desert: several 3d bugs, presumably down to FIFO;
- - dynamcop: stalls at stage select screen;
- - fvipers: enables timers, but then irq register is empty, hence it crashes with an "interrupt halt" at POST (regression);
- - lastbrnx: uses external DMA port 0 for uploading SHARC program, hook-up might not be 100% right;
- - lastbrnx: uses a shitload of unsupported SHARC opcodes (compute_fmul_avg, shift operation 0x11, ALU operation 0x89 (compute_favg));
- - lastbrnx: eventually crashes in attract mode, geo_parse_nn_s() is the culprit apparently;
- - manxtt: missing 3d;
- - motoraid: stalls after course select;
- - pltkidsa: after few secs of gameplay, background 3d disappears and everything reports a collision against the player;
- - skytargt: MAME hardlocks after disclaimer screen;
- - srallyc: opponent cars flickers like wild;
- - vcop: lightgun input is offsetted;
- - vcop: sound dies at enter initial screen (i.e. after played the game once);
- - vcop: tilemap priority bug at stage select screen;
- - vf2: stalls after disclaimer screen;
- - vstriker: countdown in team select goes way too fast ...
- - vstriker: ... meanwhile gameplay is way too slow!?
- - zeroguna: stalls after some seconds of gameplay;
+ TODO (updated as for April 2014):
+ - all Model 2B games: FIFO comms looks way wrong, and 3d is mostly missing/incomplete. Games also tends to stalls at some point, culprit might be when i960 tries
+ to use a burst type opcode read;
+ - Inputs needs device-ification and clean-ups;
+ - Sound comms actually passes thru a 8251-compatible device, hook it up;
+ - daytona: runs at half speed in gameplay;
+ - desert: several 3d bugs, presumably down to FIFO;
+ - dynamcop: stalls at stage select screen;
+ - fvipers: enables timers, but then irq register is empty, hence it crashes with an "interrupt halt" at POST (regression);
+ - lastbrnx: uses external DMA port 0 for uploading SHARC program, hook-up might not be 100% right;
+ - lastbrnx: uses a shitload of unsupported SHARC opcodes (compute_fmul_avg, shift operation 0x11, ALU operation 0x89 (compute_favg));
+ - lastbrnx: eventually crashes in attract mode, geo_parse_nn_s() is the culprit apparently;
+ - manxtt: missing 3d;
+ - motoraid: stalls after course select;
+ - pltkidsa: after few secs of gameplay, background 3d disappears and everything reports a collision against the player;
+ - skytargt: MAME hardlocks after disclaimer screen;
+ - srallyc: opponent cars flickers like wild;
+ - vcop: lightgun input is offsetted;
+ - vcop: sound dies at enter initial screen (i.e. after played the game once);
+ - vcop: tilemap priority bug at stage select screen;
+ - vf2: stalls after disclaimer screen;
+ - vstriker: countdown in team select goes way too fast ...
+ - vstriker: ... meanwhile gameplay is way too slow!?
+ - zeroguna: stalls after some seconds of gameplay;
OK (controls may be wrong/missing/incomplete)
--
@@ -548,14 +548,14 @@ CUSTOM_INPUT_MEMBER(model2_state::_1c0001c_r)
return iptval;
}
-/* PORT_DIPSETTING( 0x00, "0" ) // 0: neutral
- PORT_DIPSETTING( 0x10, "1" ) // 2nd gear
- PORT_DIPSETTING( 0x20, "2" ) // 1st gear
- PORT_DIPSETTING( 0x30, "3" )
- PORT_DIPSETTING( 0x40, "4" )
- PORT_DIPSETTING( 0x50, "5" ) // 4th gear
- PORT_DIPSETTING( 0x60, "6" ) // 3rd gear
- PORT_DIPSETTING( 0x70, "7" )*/
+/* PORT_DIPSETTING( 0x00, "0" ) // 0: neutral
+ PORT_DIPSETTING( 0x10, "1" ) // 2nd gear
+ PORT_DIPSETTING( 0x20, "2" ) // 1st gear
+ PORT_DIPSETTING( 0x30, "3" )
+ PORT_DIPSETTING( 0x40, "4" )
+ PORT_DIPSETTING( 0x50, "5" ) // 4th gear
+ PORT_DIPSETTING( 0x60, "6" ) // 3rd gear
+ PORT_DIPSETTING( 0x70, "7" )*/
/* Used specifically by Sega Rally, others might be different */
CUSTOM_INPUT_MEMBER(model2_state::srallyc_gearbox_r)
@@ -774,8 +774,8 @@ WRITE32_MEMBER(model2_state::copro_fifo_w)
}
else
{
-// if(m_coprocnt == 0)
-// return;
+// if(m_coprocnt == 0)
+// return;
//osd_printf_debug("copro_fifo_w: %08X, %08X, %08X at %08X\n", data, offset, mem_mask, space.device().safe_pc());
if (m_dsp_type == DSP_TYPE_SHARC)
diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c
index 8e74664b15e..18bfa93cbb5 100644
--- a/src/mame/drivers/mpu4hw.c
+++ b/src/mame/drivers/mpu4hw.c
@@ -1330,7 +1330,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic8_cb2_w)
LOG_IC8(("%s: IC8 PIA write CB2 (alpha clock) %02X\n", machine().describe_context(), state & 0xFF));
// DM Data pin B
-
+
m_vfd->sclk(!state);
}
@@ -2600,7 +2600,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_common )
MCFG_PTM6840_OUT1_CB(WRITE8(mpu4_state, ic2_o2_callback))
MCFG_PTM6840_OUT2_CB(WRITE8(mpu4_state, ic2_o3_callback))
MCFG_PTM6840_IRQ_CB(WRITELINE(mpu4_state, cpu0_irq))
-
+
MCFG_DEVICE_ADD("pia_ic3", PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic3_porta_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic3_portb_w))
diff --git a/src/mame/drivers/mpu4sw.c b/src/mame/drivers/mpu4sw.c
index f1319617aa5..40c646586c1 100644
--- a/src/mame/drivers/mpu4sw.c
+++ b/src/mame/drivers/mpu4sw.c
@@ -994,8 +994,8 @@ GAME_CUSTOM( 199?, m4eaw__bx, m4eaw, "eun01y.p1", 0x0000, 0x0100
ROM_START( m4eaw__bz ) \
ROM_REGION( 0x010000, "maincpu", 0 )
ROM_LOAD( "everyones a winner v2-5p", 0x8000, 0x008000, CRC(eb8f2fc5) SHA1(0d3614bd5ff561d17bef0d1e620f2f812b8fed5b))
- M4EAW_EXTRA_ROMS
-ROM_END
+ M4EAW_EXTRA_ROMS
+ROM_END
GAME(199?, m4eaw__bz, m4eaw ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,"Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 99)",GAME_FLAGS )
diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c
index c074fe0a33d..7b071ee7b79 100644
--- a/src/mame/drivers/mpu4vid.c
+++ b/src/mame/drivers/mpu4vid.c
@@ -537,12 +537,12 @@ READ8_MEMBER(mpu4vid_state::ef9369_r )
{
UINT16 col = pal.clut[pal.addr >> 1];
-/* if ((pal.addr & 1) == 0)
- return col & 0xff;
- else
- return col >> 8;
- */
-
+/* if ((pal.addr & 1) == 0)
+ return col & 0xff;
+ else
+ return col >> 8;
+ */
+
return col;
}
else
@@ -604,7 +604,7 @@ WRITE8_MEMBER(mpu4vid_state::bt471_w )
break;
}
- default:
+ default:
{
popmessage("Bt471: Unhandled write access (offset:%x, data:%x)", offset, data);
}
diff --git a/src/mame/drivers/mrgame.c b/src/mame/drivers/mrgame.c
index a51fdc77959..c58923463cb 100644
--- a/src/mame/drivers/mrgame.c
+++ b/src/mame/drivers/mrgame.c
@@ -123,7 +123,7 @@ static ADDRESS_MAP_START( video_map, AS_PROGRAM, 8, mrgame_state )
AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM AM_SHARE("objectram")
AM_RANGE(0x6800, 0x6807) AM_MIRROR(0x07f8) AM_WRITE(video_ctrl_w)
AM_RANGE(0x7000, 0x77ff) AM_READNOP //AFR - looks like a watchdog
- AM_RANGE(0x8100, 0x8103) AM_MIRROR(0x7efc) AM_DEVREADWRITE("ppi", i8255_device, read, write)
+ AM_RANGE(0x8100, 0x8103) AM_MIRROR(0x7efc) AM_DEVREADWRITE("ppi", i8255_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( audio1_map, AS_PROGRAM, 8, mrgame_state )
@@ -373,7 +373,7 @@ PALETTE_INIT_MEMBER( mrgame_state, mrgame)
const UINT8 *color_prom = machine().root_device().memregion("proms")->base();
/* compute the color output resistor weights */
- compute_resistor_weights(0, 255, -1.0,
+ compute_resistor_weights(0, 255, -1.0,
3, &resistances[0], rweights, 0, 0,
3, &resistances[0], gweights, 0, 0,
2, &resistances[1], bweights, 0, 0);
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index 25b9dd04207..5b25748231c 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -192,7 +192,7 @@ static MACHINE_CONFIG_START( mustache, mustache_state )
MCFG_PALETTE_INIT_OWNER(mustache_state, mustache)
/* sound hardware */
- MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) // for seibu_sound_decrypt on the MAIN cpu (not sound)
+ MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) // for seibu_sound_decrypt on the MAIN cpu (not sound)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 2d568b16f37..189a3737a1b 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -1020,7 +1020,7 @@ static MACHINE_CONFIG_START( mystwarr, mystwarr_state )
MCFG_DEVICE_ADD("k054338", K054338, 0)
MCFG_K054338_ALPHAINV(1)
MCFG_K054338_MIXER("k055555")
-
+
MCFG_VIDEO_START_OVERRIDE(mystwarr_state, mystwarr)
/* sound hardware */
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 4851d9ccb31..ec970193069 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -374,8 +374,8 @@ Zombie Revenge 840-0003C 21707 19 (64Mb) ?
Notes:
OSC1 - oscillator 20.000MHz
JP1-7 - JUMPER unknown function
- SW1 - PUSHBUTTON
- SW2 - 8X2 DIPswitch
+ SW1 - PUSHBUTTON
+ SW2 - 8X2 DIPswitch
SCSI-CTRL - SCSI-II controller MB86604A
CNDB25 - DB-25 SCSI-II connector
IC17S-IC38S - FlashROM (SOP56), 64Mb.
@@ -386,7 +386,7 @@ IC17S-IC38S - FlashROM (SOP56), 64Mb.
CN1/2/3 - connectors joining to main board
Games known to use this PCB include....
- Sticker EPROM MASKROMs
+ Sticker EPROM MASKROMs
Game on cart IC16# # of SOP56 Notes
----------------------------------------------------------------------------------------------------
Puyo Puyo Fever (prototype) * not present 22 (64Mb) no cart, only development PCB
@@ -5738,15 +5738,15 @@ ROM_START( rhytngk )
ROM_REGION( 0x10000000, "rom_board", ROMREGION_ERASEFF)
// real encrypted ROM dump
- ROM_LOAD( "fpr-24423.ic8", 0x00000000, 0x4000000, CRC(c85513ce) SHA1(88490fe64c0866059492b0c1c714b50f3f270676) )
+ ROM_LOAD( "fpr-24423.ic8", 0x00000000, 0x4000000, CRC(c85513ce) SHA1(88490fe64c0866059492b0c1c714b50f3f270676) )
// decrypted version of IC8
ROM_LOAD( "fpr-24423.ic8d", 0x00000000, 0x4000000, CRC(209a991c) SHA1(d76228a215c50ff3085708182b8e47fd2ebc6a47) )
- ROM_LOAD( "fpr-24424.ic9", 0x04000000, 0x4000000, CRC(7bba2402) SHA1(94d637969c58d5dfa3ee64bc3cfb9495dbb97511) )
- ROM_LOAD( "fpr-24425.ic10", 0x08000000, 0x4000000, CRC(6223ebac) SHA1(64c0ec61c108acbb557e7d3837f578deba832cb6) )
- ROM_LOAD( "fpr-24426.ic11", 0x0c000000, 0x4000000, CRC(c78b0981) SHA1(f889acf9065566e11ff985a3b6c4824e364d57ae) )
+ ROM_LOAD( "fpr-24424.ic9", 0x04000000, 0x4000000, CRC(7bba2402) SHA1(94d637969c58d5dfa3ee64bc3cfb9495dbb97511) )
+ ROM_LOAD( "fpr-24425.ic10", 0x08000000, 0x4000000, CRC(6223ebac) SHA1(64c0ec61c108acbb557e7d3837f578deba832cb6) )
+ ROM_LOAD( "fpr-24426.ic11", 0x0c000000, 0x4000000, CRC(c78b0981) SHA1(f889acf9065566e11ff985a3b6c4824e364d57ae) )
ROM_REGION( 4, "rom_key", 0 )
- ROM_LOAD( "rhytngk-key.bin", 0x000000, 0x000004, CRC(e2560d28) SHA1(46fb9b47a0df3035f92db2b0c63a6e4e0745ad29) )
+ ROM_LOAD( "rhytngk-key.bin", 0x000000, 0x000004, CRC(e2560d28) SHA1(46fb9b47a0df3035f92db2b0c63a6e4e0745ad29) )
ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
ROM_END
@@ -8837,7 +8837,7 @@ ROM_END
/* 0170 */ GAME( 2007, manicpnc, naomi, naomim4, naomi, naomi_state, naomi, ROT0, "Sega", "Manic Panic Ghosts!", GAME_FLAGS )
/* 0170 */ GAME( 2007, pokasuka, manicpnc, naomim4, naomi, naomi_state, naomi, ROT0, "Sega", "Pokasuka Ghost", GAME_FLAGS )
/* 0175 */ GAME( 2007, asndynmt, naomi, naomim4, naomi, naomi_state, naomi, ROT0, "Sega", "Asian Dynamite", GAME_FLAGS )
-/* 0177 */ GAME( 2007, rhytngk, naomi, naomim4, naomi, naomi_state, naomi, ROT0, "Sega/Nintendo", "Rhythm Tengoku", GAME_FLAGS )
+/* 0177 */ GAME( 2007, rhytngk, naomi, naomim4, naomi, naomi_state, naomi, ROT0, "Sega/Nintendo", "Rhythm Tengoku", GAME_FLAGS )
// 00xx Mayjinsen (Formation Battle in May) - prototype, never released
/* Cartridge prototypes of games released on GD-ROM */
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 6ae78ec3a09..951f375411f 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -429,7 +429,7 @@ static MACHINE_CONFIG_START( naughtyb, naughtyb_state )
MCFG_TMS36XX_TYPE(TMS3615)
MCFG_TMS36XX_DECAY_TIMES(0.15, 0.20, 0, 0, 0, 0)
// NOTE: it's unknown if the TMS3615 mixes more than one voice internally.
- // A wav taken from Pop Flamer sounds like there are at least no 'odd'
+ // A wav taken from Pop Flamer sounds like there are at least no 'odd'
// harmonics (5 1/3' and 2 2/3')
MCFG_SOUND_ROUTE(0, "mono", 0.60)
@@ -466,7 +466,7 @@ static MACHINE_CONFIG_START( popflame, naughtyb_state )
MCFG_TMS36XX_TYPE(TMS3615)
MCFG_TMS36XX_DECAY_TIMES(0.15, 0.20, 0, 0, 0, 0)
// NOTE: it's unknown if the TMS3615 mixes more than one voice internally.
- // A wav taken from Pop Flamer sounds like there are at least no 'odd'
+ // A wav taken from Pop Flamer sounds like there are at least no 'odd'
// harmonics (5 1/3' and 2 2/3')
MCFG_SOUND_ROUTE(0, "mono", 0.60)
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 90360e1b4ca..5400a8e1c0a 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -148,7 +148,7 @@ READ8_MEMBER(nbmj9195_state::mscoutm_cpu_portb_r)
& ioport("KEY3")->read() & ioport("KEY4")->read());
break;
}
-
+
return 0xff;
}
@@ -2796,8 +2796,7 @@ static const z80_daisy_config daisy_chain_sound[] =
MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8(nbmj9195_state, soundcpu_dac1_w)) \
MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(nbmj9195_state, soundcpu_dac2_w)) \
MCFG_TMPZ84C011_PORTD_READ_CB(READ8(nbmj9195_state, soundcpu_portd_r)) \
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, soundcpu_porte_w)) \
-
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, soundcpu_porte_w))
#define MSCOUTM_TMZ84C011_SOUND_PORTS \
MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(nbmj9195_state, soundcpu_porta_w)) \
MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8(nbmj9195_state, soundcpu_dac2_w)) \
@@ -2812,8 +2811,7 @@ static const z80_daisy_config daisy_chain_sound[] =
MCFG_TMPZ84C011_PORTB_READ_CB(READ8(nbmj9195_state, mscoutm_cpu_portb_r)) \
MCFG_TMPZ84C011_PORTC_READ_CB(READ8(nbmj9195_state, mscoutm_cpu_portc_r)) \
MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(nbmj9195_state, mscoutm_cpu_portd_w)) \
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, mscoutm_cpu_porte_w)) \
-
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, mscoutm_cpu_porte_w))
#define OTHERS_TMZ84C011_MAIN_PORTS \
MCFG_TMPZ84C011_PORTA_READ_CB(READ8(nbmj9195_state, others_cpu_porta_r)) \
@@ -2821,8 +2819,7 @@ static const z80_daisy_config daisy_chain_sound[] =
MCFG_TMPZ84C011_PORTC_READ_CB(READ8(nbmj9195_state, others_cpu_portc_r)) \
MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(nbmj9195_state, others_cpu_portc_w)) \
MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(nbmj9195_state, others_cpu_portd_w)) \
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, others_cpu_porte_w)) \
-
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, others_cpu_porte_w))
static MACHINE_CONFIG_START( NBMJDRV1_base, nbmj9195_state )
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 51d3d827ad3..c212572bc8e 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -805,7 +805,7 @@ WRITE16_MEMBER(neogeo_state::memcard_w)
if (ACCESSING_BITS_0_7)
{
if (m_memcard->present() != -1)
- m_memcard->write(space, offset, data);
+ m_memcard->write(space, offset, data);
}
}
@@ -851,9 +851,9 @@ CUSTOM_INPUT_MEMBER(neogeo_state::get_audio_result)
void neogeo_state::neogeo_main_cpu_banking_init()
{
/* create vector banks */
-// m_bank_vectors->configure_entry(1, m_region_maincpu->base());
-// m_bank_vectors->configure_entry(0, memregion("mainbios")->base());
-// m_bank_vectors->set_entry(0);
+// m_bank_vectors->configure_entry(1, m_region_maincpu->base());
+// m_bank_vectors->configure_entry(0, memregion("mainbios")->base());
+// m_bank_vectors->set_entry(0);
m_use_cart_vectors = 0;
if (m_type != NEOGEO_CD)
@@ -894,7 +894,7 @@ void neogeo_state::neogeo_audio_cpu_banking_init(int set_entry)
m_bank_audio_main->configure_entry(0, memregion("audiobios")->base());
else /* on hardware with no SM1 ROM, the cart ROM is always enabled */
m_bank_audio_main->configure_entry(0, memregion("audiocpu")->base());
-
+
m_bank_audio_main->set_entry(m_use_cart_audio);
/* audio banking */
@@ -904,7 +904,7 @@ void neogeo_state::neogeo_audio_cpu_banking_init(int set_entry)
m_bank_audio_cart[3] = membank("audio_8000");
address_mask = (memregion("audiocpu")->bytes() - 0x10000 - 1) & 0x3ffff;
-
+
for (region = 0; region < 4; region++)
{
@@ -1117,12 +1117,12 @@ void neogeo_state::machine_start()
m_cartslots[3] = m_cartslot4;
m_cartslots[4] = m_cartslot5;
m_cartslots[5] = m_cartslot6;
-
+
m_sprgen->set_screen(m_screen);
m_sprgen->set_sprite_region(m_region_sprites->base(), m_region_sprites->bytes());
m_sprgen->set_fixed_regions(m_region_fixed->base(), m_region_fixed->bytes(), m_region_fixedbios);
-
+
}
@@ -1138,7 +1138,7 @@ void neogeo_state::set_slot_number(int slot)
if (slot != m_currentslot)
{
m_currentslot = slot;
-
+
address_space &space = m_maincpu->space(AS_PROGRAM);
// unmap old handlers, some carts will have installed overlays on them, we need them to be cleared
@@ -1163,7 +1163,7 @@ void neogeo_state::set_slot_number(int slot)
ym->reset();
m_cartslots[m_currentslot]->setup_memory_banks(machine()); // setup basic pointers
-
+
ym->reset(); // reset it again to get the new pointers
// these could have changed, ensure the pointers are valid
@@ -1175,7 +1175,7 @@ void neogeo_state::set_slot_number(int slot)
m_cartslots[m_currentslot]->activate_cart(machine(), m_maincpu, m_region_maincpu->base(), m_region_maincpu->bytes(), m_cartslots[m_currentslot]->get_fixed_base(), m_cartslots[m_currentslot]->get_fixed_size());
//memcpy((UINT8*)m_cartslots[m_currentslot]->get_rom_base(),m_region_maincpu->base(), m_region_maincpu->bytes()); // hack- copy back any mods activate made (eh cthd2003)c
-
+
neogeo_audio_cpu_banking_init(0); // should probably be responsibility of the cart
m_audiocpu->reset(); // or some games like svc have no sounnd if in higher slots?
@@ -1283,7 +1283,7 @@ static ADDRESS_MAP_START( main_map_slot, AS_PROGRAM, 16, neogeo_state )
AM_RANGE(0x000000, 0x00007f) AM_READ(neogeo_slot_rom_low_bectors_r)
AM_RANGE(0x000080, 0x0fffff) AM_READ(neogeo_slot_rom_low_r)
AM_RANGE(0x200000, 0x2fffff) AM_ROMBANK("cartridge")
-// AM_RANGE(0x2ffff0, 0x2fffff) AM_WRITE(main_cpu_bank_select_w)
+// AM_RANGE(0x2ffff0, 0x2fffff) AM_WRITE(main_cpu_bank_select_w)
AM_IMPORT_FROM( neogeo_main_map )
ADDRESS_MAP_END
@@ -1401,7 +1401,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( neogeo_6slot )
PORT_INCLUDE( neogeo )
-
+
PORT_MODIFY("TEST")
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SPECIAL )
INPUT_PORTS_END
@@ -1444,7 +1444,7 @@ MACHINE_CONFIG_START( neogeo_base, neogeo_state )
MCFG_PALETTE_ADD_INIT_BLACK("palette", 4096*2*2)
MCFG_DEVICE_ADD("spritegen", NEOGEO_SPRITE_OPTIMZIED, 0)
-
+
/* audio hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -1516,4 +1516,3 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT */
CONS( 1990, neogeo, 0, 0, mvs, neogeo_6slot, neogeo_state, mvs, "SNK", "Neo-Geo", GAME_IS_BIOS_ROOT | GAME_SUPPORTS_SAVE )
-
diff --git a/src/mame/drivers/neogeo_noslot.c b/src/mame/drivers/neogeo_noslot.c
index 2b2dad7c359..077b958ef73 100644
--- a/src/mame/drivers/neogeo_noslot.c
+++ b/src/mame/drivers/neogeo_noslot.c
@@ -10,8 +10,8 @@
static ADDRESS_MAP_START( main_map_noslot, AS_PROGRAM, 16, neogeo_state )
AM_RANGE(0x000000, 0x00007f) AM_READ(banked_vectors_r)
AM_RANGE(0x000080, 0x0fffff) AM_ROM
-// AM_RANGE(0x200000, 0x2fffff) AM_ROMBANK("cartridge")
-// AM_RANGE(0x2ffff0, 0x2fffff) AM_WRITE(main_cpu_bank_select_w)
+// AM_RANGE(0x200000, 0x2fffff) AM_ROMBANK("cartridge")
+// AM_RANGE(0x2ffff0, 0x2fffff) AM_WRITE(main_cpu_bank_select_w)
AM_IMPORT_FROM( neogeo_main_map )
ADDRESS_MAP_END
@@ -8480,7 +8480,7 @@ ROM_END
*
*************************************/
- // macros allow code below to be copy+pasted into slot devices more easily
+ // macros allow code below to be copy+pasted into slot devices more easily
#define cpuregion memregion("maincpu")->base()
#define cpuregion_size memregion("maincpu")->bytes()
#define spr_region memregion("sprites")->base()
@@ -9824,4 +9824,3 @@ GAME( 2004, sbp, neogeo, neogeo_noslot, neogeo, neogeo_noslot_state,
/* N.C.I - LE CORTEX */
// Bang Bang Busters (c)2010 - MVS?/AES
// Treasure of the Caribbean (c)2011 - MVS?/AES
-
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 70458fee1df..0ed984c085a 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -789,7 +789,7 @@ static MACHINE_CONFIG_START( niyanpai, niyanpai_state )
MCFG_TMPZ84C011_ZC0_CB(DEVWRITELINE("audiocpu", tmpz84c011_device, trg3))
MCFG_NVRAM_ADD_0FILL("nvram")
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/nl_pongd.c b/src/mame/drivers/nl_pongd.c
index 0fb04a9301e..075b69c77c9 100644
--- a/src/mame/drivers/nl_pongd.c
+++ b/src/mame/drivers/nl_pongd.c
@@ -93,16 +93,16 @@ static DipswitchDesc dipswitch1_desc("winning_score", "Winning Score", 0, "11",
#endif
CIRCUIT_LAYOUT( pongdoubles )
- SOLVER(Solver, 48000)
- PARAM(Solver.ACCURACY, 1e-7) // works and is sufficient
+ SOLVER(Solver, 48000)
+ PARAM(Solver.ACCURACY, 1e-7) // works and is sufficient
//CHIP("CLOCK", CLOCK_14_318_MHZ)
- MAINCLOCK(CLOCK, 14318000.0)
+ MAINCLOCK(CLOCK, 14318000.0)
ANALOG_INPUT(V5, 5)
#define VCC "V5", Q
#define GND "GND", Q
- CHIP("F9", 7493)
+ CHIP("F9", 7493)
CHIP("F10", 7493)
CHIP("F7", 74107)
CHIP("F8", 7430)
@@ -110,23 +110,23 @@ CIRCUIT_LAYOUT( pongdoubles )
CHIP("E9", 7493)
CHIP("E10", 7493)
- CHIP("D10", 74107)
- CHIP("D9", 7410)
+ CHIP("D10", 74107)
+ CHIP("D9", 7410)
- CHIP("G6", 7410)
- CHIP("H6", 7400)
- CHIP("F6", 7402)
+ CHIP("G6", 7410)
+ CHIP("H6", 7400)
+ CHIP("F6", 7402)
- CHIP("F4", 74107)
- CHIP("G4", 7400)
- CHIP("G3", 7427)
+ CHIP("F4", 74107)
+ CHIP("G4", 7400)
+ CHIP("G3", 7427)
- CHIP("E4", 7427)
+ CHIP("E4", 7427)
CHIP("E3", 7410)
CHIP("D3", 7402)
CHIP("G2", 7402)
CHIP("F3", 7425)
- CHIP("C6", 7448)
+ CHIP("C6", 7448)
CHIP("C7", 74153)
CHIP("D7", 74153)
@@ -138,19 +138,19 @@ CIRCUIT_LAYOUT( pongdoubles )
CHIP("D6", 7410)
CHIP("D4", 7430)
- //CHIP("B10", 555_Mono, &b10_555_desc)
- CHIP_555_Mono(B10, &b10_555_desc)
+ //CHIP("B10", 555_Mono, &b10_555_desc)
+ CHIP_555_Mono(B10, &b10_555_desc)
- // NETLIST - analog start
- POT(B10_POT, RES_K(1)) // This is a guess!!
- PARAM(B10_POT.DIALLOG, 1) // Log Dial ...
- RES(B10_RPRE, 470)
+ // NETLIST - analog start
+ POT(B10_POT, RES_K(1)) // This is a guess!!
+ PARAM(B10_POT.DIALLOG, 1) // Log Dial ...
+ RES(B10_RPRE, 470)
- NET_C(B10_POT.1, V5)
- NET_C(B10_POT.3, GND)
- NET_C(B10_POT.2, B10_RPRE.1)
- NET_C(B10_RPRE.2, B10.5)
- // NETLIST - analog end
+ NET_C(B10_POT.1, V5)
+ NET_C(B10_POT.3, GND)
+ NET_C(B10_POT.2, B10_RPRE.1)
+ NET_C(B10_RPRE.2, B10.5)
+ // NETLIST - analog end
CHIP("C10", 7404)
@@ -158,21 +158,21 @@ CIRCUIT_LAYOUT( pongdoubles )
CHIP("B8", 7400)
CHIP("A8", 7420)
- //CHIP("A10", 555_Mono, &a10_555_desc)
- CHIP_555_Mono(A10, &a10_555_desc)
+ //CHIP("A10", 555_Mono, &a10_555_desc)
+ CHIP_555_Mono(A10, &a10_555_desc)
- // NETLIST - analog start
- POT(A10_POT, RES_K(1)) // This is a guess!!
- PARAM(A10_POT.DIALLOG, 1) // Log Dial ...
- RES(A10_RPRE, 470)
+ // NETLIST - analog start
+ POT(A10_POT, RES_K(1)) // This is a guess!!
+ PARAM(A10_POT.DIALLOG, 1) // Log Dial ...
+ RES(A10_RPRE, 470)
- NET_C(A10_POT.1, V5)
- NET_C(A10_POT.3, GND)
- NET_C(A10_POT.2, A10_RPRE.1)
- NET_C(A10_RPRE.2, A10.5)
- // NETLIST - analog end
+ NET_C(A10_POT.1, V5)
+ NET_C(A10_POT.3, GND)
+ NET_C(A10_POT.2, A10_RPRE.1)
+ NET_C(A10_RPRE.2, A10.5)
+ // NETLIST - analog end
- CHIP("A9", 7493)
+ CHIP("A9", 7493)
CHIP("H4", 7474)
@@ -192,15 +192,15 @@ CIRCUIT_LAYOUT( pongdoubles )
CHIP("B6", 7474)
CHIP("H5", 7400)
CHIP("E7", 7400)
- //CHIP("F5", 555_Mono, &f5_555_desc)
- CHIP_555_Mono(F5, &f5_555_desc)
+ //CHIP("F5", 555_Mono, &f5_555_desc)
+ CHIP_555_Mono(F5, &f5_555_desc)
- //CHIP("G5", 555_Mono, &g5_555_desc)
- CHIP_555_Mono(G5, &g5_555_desc)
+ //CHIP("G5", 555_Mono, &g5_555_desc)
+ CHIP_555_Mono(G5, &g5_555_desc)
CHIP("C3", 7474)
CHIP("C2", 7400)
- CHIP("F2", 7493)
+ CHIP("F2", 7493)
CHIP("H2", 7400)
CHIP("H3", 74107)
@@ -211,125 +211,125 @@ CIRCUIT_LAYOUT( pongdoubles )
CHIP("C8", 7490)
CHIP("D8", 7490)
- CHIP("C9", 74107)
+ CHIP("C9", 74107)
- CHIP("A1", 74153)
- CHIP("B1", 74153)
+ CHIP("A1", 74153)
+ CHIP("B1", 74153)
- CHIP("B2", 7474)
- CHIP("H1", 7402)
- CHIP("G1", 7404)
+ CHIP("B2", 7474)
+ CHIP("H1", 7402)
+ CHIP("G1", 7404)
- CHIP("E1", 7400)
- CHIP("A2", 7420)
- CHIP("D1", 7493)
- CHIP("C1", 7493)
+ CHIP("E1", 7400)
+ CHIP("A2", 7420)
+ CHIP("D1", 7493)
+ CHIP("C1", 7493)
- CHIP("J1", 7474)
- CHIP("F1", 7427)
+ CHIP("J1", 7474)
+ CHIP("F1", 7427)
- CHIP("J10", 7400)
- CHIP("H10", 7474)
- CHIP("G10", 7474)
- //CHIP("A3", 555_Mono, &a3_555_desc)
- CHIP_555_Mono(A3, &a3_555_desc)
+ CHIP("J10", 7400)
+ CHIP("H10", 7474)
+ CHIP("G10", 7474)
+ //CHIP("A3", 555_Mono, &a3_555_desc)
+ CHIP_555_Mono(A3, &a3_555_desc)
- //CHIP("B9A", 555_Mono, &b9a_555_desc)
- CHIP_555_Mono(B9A, &b9a_555_desc)
+ //CHIP("B9A", 555_Mono, &b9a_555_desc)
+ CHIP_555_Mono(B9A, &b9a_555_desc)
- // NETLIST - analog start
- POT(B9A_POT, RES_K(1)) // This is a guess!!
- PARAM(B9A_POT.DIALLOG, 1) // Log Dial ...
- RES(B9A_RPRE, 470)
+ // NETLIST - analog start
+ POT(B9A_POT, RES_K(1)) // This is a guess!!
+ PARAM(B9A_POT.DIALLOG, 1) // Log Dial ...
+ RES(B9A_RPRE, 470)
- NET_C(B9A_POT.1, V5)
- NET_C(B9A_POT.3, GND)
- NET_C(B9A_POT.2, B9A_RPRE.1)
- NET_C(B9A_RPRE.2, B9A.5)
- // NETLIST - analog end
+ NET_C(B9A_POT.1, V5)
+ NET_C(B9A_POT.3, GND)
+ NET_C(B9A_POT.2, B9A_RPRE.1)
+ NET_C(B9A_RPRE.2, B9A.5)
+ // NETLIST - analog end
- //CHIP("B9B", 555_Mono, &b9b_555_desc)
- CHIP_555_Mono(B9B, &b9b_555_desc)
+ //CHIP("B9B", 555_Mono, &b9b_555_desc)
+ CHIP_555_Mono(B9B, &b9b_555_desc)
- // NETLIST - analog start
- POT(B9B_POT, RES_K(1)) // This is a guess!!
- PARAM(B9B_POT.DIALLOG, 1) // Log Dial ...
- RES(B9B_RPRE, 470)
+ // NETLIST - analog start
+ POT(B9B_POT, RES_K(1)) // This is a guess!!
+ PARAM(B9B_POT.DIALLOG, 1) // Log Dial ...
+ RES(B9B_RPRE, 470)
- NET_C(B9B_POT.1, V5)
- NET_C(B9B_POT.3, GND)
- NET_C(B9B_POT.2, B9B_RPRE.1)
- NET_C(B9B_RPRE.2, B9B.5)
- // NETLIST - analog end
+ NET_C(B9B_POT.1, V5)
+ NET_C(B9B_POT.3, GND)
+ NET_C(B9B_POT.2, B9B_RPRE.1)
+ NET_C(B9B_RPRE.2, B9B.5)
+ // NETLIST - analog end
- CHIP_SERIES_RC(C33, &c33_desc)
+ CHIP_SERIES_RC(C33, &c33_desc)
#if 0
- CHIP("PAD1", PADDLE1_VERTICAL_INPUT, &pad1_desc)
- PADDLE_CONNECTION("PAD1", "A10")
+ CHIP("PAD1", PADDLE1_VERTICAL_INPUT, &pad1_desc)
+ PADDLE_CONNECTION("PAD1", "A10")
- CHIP("PAD2", PADDLE2_VERTICAL_INPUT, &pad2_desc)
- PADDLE_CONNECTION("PAD2", "B10")
+ CHIP("PAD2", PADDLE2_VERTICAL_INPUT, &pad2_desc)
+ PADDLE_CONNECTION("PAD2", "B10")
- CHIP("PAD3", PADDLE3_VERTICAL_INPUT, &pad3_desc)
- PADDLE_CONNECTION("PAD3", "B9B")
+ CHIP("PAD3", PADDLE3_VERTICAL_INPUT, &pad3_desc)
+ PADDLE_CONNECTION("PAD3", "B9B")
- CHIP("PAD4", PADDLE4_VERTICAL_INPUT, &pad4_desc)
- PADDLE_CONNECTION("PAD4", "B9A")
+ CHIP("PAD4", PADDLE4_VERTICAL_INPUT, &pad4_desc)
+ PADDLE_CONNECTION("PAD4", "B9A")
- CHIP("LATCH", LATCH)
- CHIP("COIN", COIN_INPUT)
- CHIP("START", START_INPUT)
- CHIP("DIPSW1", DIPSWITCH, &dipswitch1_desc)
+ CHIP("LATCH", LATCH)
+ CHIP("COIN", COIN_INPUT)
+ CHIP("START", START_INPUT)
+ CHIP("DIPSW1", DIPSWITCH, &dipswitch1_desc)
- VIDEO(pongdoubles)
+ VIDEO(pongdoubles)
#endif
- //CHIP("COIN", COIN_INPUT)
- CHIP_INPUT_ACTIVE_LOW(COIN)
- //CHIP("LATCH", LATCH)
- CHIP_LATCH(LATCH)
- //CHIP("START", START_INPUT)
- CHIP_INPUT_ACTIVE_HIGH(START)
- //CHIP("DIPSW1", DIPSWITCH, &dipswitch1_desc)
- SWITCH2(DIPSW1)
- SWITCH2(DIPSW2)
+ //CHIP("COIN", COIN_INPUT)
+ CHIP_INPUT_ACTIVE_LOW(COIN)
+ //CHIP("LATCH", LATCH)
+ CHIP_LATCH(LATCH)
+ //CHIP("START", START_INPUT)
+ CHIP_INPUT_ACTIVE_HIGH(START)
+ //CHIP("DIPSW1", DIPSWITCH, &dipswitch1_desc)
+ SWITCH2(DIPSW1)
+ SWITCH2(DIPSW2)
#ifdef DEBUG
CHIP("LOG1", VCD_LOG, &vcd_log_desc)
#endif
// Not used, need to be connected
- CONNECTION(GND, "C2", 1)
- CONNECTION(GND, "C2", 2)
- CONNECTION(GND, "A5", 1)
- CONNECTION(GND, "A5", 2)
- CONNECTION(GND, "G7", 4)
- CONNECTION(GND, "G7", 1)
- CONNECTION(GND, "G7",13)
- CONNECTION(GND, "G7",12)
- CONNECTION(GND, "J10",13)
- CONNECTION(GND, "J10",12)
- CONNECTION(GND, "C10",9)
- CONNECTION(GND, "C10",11)
- CONNECTION(GND, "C10",13)
- CONNECTION(GND, "B1",10)
- CONNECTION(GND, "B1",11)
- CONNECTION(GND, "B1",12)
- CONNECTION(GND, "B1",13)
- CONNECTION(GND, "E7",12)
- CONNECTION(GND, "E7",13)
- CONNECTION(GND, "H1",11)
- CONNECTION(GND, "H1",12)
- CONNECTION(GND, "G1",9)
-
- // HRESET Circuit
-
- CONNECTION("CLOCK", Q, "F7", 12)
- CONNECTION(VCC, "F7", 1)
- CONNECTION(VCC, "F7", 4)
- CONNECTION(VCC, "F7", 13)
-
- #define CLK "F7", 3
+ CONNECTION(GND, "C2", 1)
+ CONNECTION(GND, "C2", 2)
+ CONNECTION(GND, "A5", 1)
+ CONNECTION(GND, "A5", 2)
+ CONNECTION(GND, "G7", 4)
+ CONNECTION(GND, "G7", 1)
+ CONNECTION(GND, "G7",13)
+ CONNECTION(GND, "G7",12)
+ CONNECTION(GND, "J10",13)
+ CONNECTION(GND, "J10",12)
+ CONNECTION(GND, "C10",9)
+ CONNECTION(GND, "C10",11)
+ CONNECTION(GND, "C10",13)
+ CONNECTION(GND, "B1",10)
+ CONNECTION(GND, "B1",11)
+ CONNECTION(GND, "B1",12)
+ CONNECTION(GND, "B1",13)
+ CONNECTION(GND, "E7",12)
+ CONNECTION(GND, "E7",13)
+ CONNECTION(GND, "H1",11)
+ CONNECTION(GND, "H1",12)
+ CONNECTION(GND, "G1",9)
+
+ // HRESET Circuit
+
+ CONNECTION("CLOCK", Q, "F7", 12)
+ CONNECTION(VCC, "F7", 1)
+ CONNECTION(VCC, "F7", 4)
+ CONNECTION(VCC, "F7", 13)
+
+ #define CLK "F7", 3
CONNECTION("F9", 12, "F9", 1)
CONNECTION(CLK, "F9", 14)
@@ -348,10 +348,10 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("F7", 5, "F8", 1)
CONNECTION("F10", 11, "F8", 11)
- CONNECTION("F10", 8, "F8", 12)
+ CONNECTION("F10", 8, "F8", 12)
CONNECTION("F9", 8, "F8", 5)
CONNECTION("F9", 9, "F8", 6)
- CONNECTION(VCC, "F8", 2)
+ CONNECTION(VCC, "F8", 2)
CONNECTION(VCC, "F8", 3)
CONNECTION(VCC, "F8", 4)
@@ -360,23 +360,23 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(VCC, "E8", 13)
CONNECTION(VCC, "E8", 10)
- #define H1 "F9", 12
- #define H2 "F9", 9
- #define H4 "F9", 8
- #define H8 "F9", 11
- #define H16 "F10", 12
- #define H32 "F10", 9
- #define H64 "F10", 8
- #define H128 "F10", 11
- #define H256 "F7", 5
- #define H256_n "F7", 6
- #define HRESET "E8", 8
- #define HRESET_n "E8", 9
-
-
- // VRESET Circuit
+ #define H1 "F9", 12
+ #define H2 "F9", 9
+ #define H4 "F9", 8
+ #define H8 "F9", 11
+ #define H16 "F10", 12
+ #define H32 "F10", 9
+ #define H64 "F10", 8
+ #define H128 "F10", 11
+ #define H256 "F7", 5
+ #define H256_n "F7", 6
+ #define HRESET "E8", 8
+ #define HRESET_n "E8", 9
+
+
+ // VRESET Circuit
CONNECTION("E9", 12, "E9", 1)
- CONNECTION(HRESET, "E9", 14)
+ CONNECTION(HRESET, "E9", 14)
CONNECTION("E8", 6, "E9", 2)
CONNECTION("E8", 6, "E9", 3)
@@ -399,82 +399,82 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(VCC, "E8", 1)
CONNECTION(VCC, "E8", 4)
- #define V1 "E9", 12
- #define V2 "E9", 9
- #define V4 "E9", 8
- #define V8 "E9", 11
- #define V16 "E10", 12
- #define V32 "E10", 9
- #define V64 "E10", 8
- #define V128 "E10", 11
- #define V256 "D10", 5
- #define V256_n "D10", 6
- #define VRESET "E8", 6
- #define VRESET_n "E8", 5
+ #define V1 "E9", 12
+ #define V2 "E9", 9
+ #define V4 "E9", 8
+ #define V8 "E9", 11
+ #define V16 "E10", 12
+ #define V32 "E10", 9
+ #define V64 "E10", 8
+ #define V128 "E10", 11
+ #define V256 "D10", 5
+ #define V256_n "D10", 6
+ #define VRESET "E8", 6
+ #define VRESET_n "E8", 5
- // HSync Logic
- CONNECTION(H16, "G6", 3)
- CONNECTION(H64, "G6", 4)
- CONNECTION(H64, "G6", 5)
+ // HSync Logic
+ CONNECTION(H16, "G6", 3)
+ CONNECTION(H64, "G6", 4)
+ CONNECTION(H64, "G6", 5)
- CONNECTION("G6", 6, "H6", 4)
- CONNECTION(HRESET_n, "H6", 10)
- CONNECTION("H6", 6, "H6", 9)
- CONNECTION("H6", 8, "H6", 5)
+ CONNECTION("G6", 6, "H6", 4)
+ CONNECTION(HRESET_n, "H6", 10)
+ CONNECTION("H6", 6, "H6", 9)
+ CONNECTION("H6", 8, "H6", 5)
- CONNECTION(H64, "D2", 9)
+ CONNECTION(H64, "D2", 9)
- CONNECTION(H64, "D3", 3)
- CONNECTION("H6", 6, "D3", 2)
+ CONNECTION(H64, "D3", 3)
+ CONNECTION("H6", 6, "D3", 2)
- CONNECTION("D2", 8, "C2", 9)
- //CONNECTION("D2", 8, "C2", 10)
- CONNECTION(H32, "C2", 10) // Not shown. Accurate?
+ CONNECTION("D2", 8, "C2", 9)
+ //CONNECTION("D2", 8, "C2", 10)
+ CONNECTION(H32, "C2", 10) // Not shown. Accurate?
- CONNECTION(VCC, "B2", 10)
- CONNECTION("C2", 8, "B2", 12)
- CONNECTION(H16, "B2", 11)
- CONNECTION("D3", 1, "B2", 13)
+ CONNECTION(VCC, "B2", 10)
+ CONNECTION("C2", 8, "B2", 12)
+ CONNECTION(H16, "B2", 11)
+ CONNECTION("D3", 1, "B2", 13)
- #define HBLANK "H6", 8
- #define HBLANK_n "H6", 6
- #define HSYNC_n "B2", 8
+ #define HBLANK "H6", 8
+ #define HBLANK_n "H6", 6
+ #define HSYNC_n "B2", 8
- // VSync Logic
- CONNECTION(VRESET, "F6", 8)
- CONNECTION(V16, "F6", 12)
- CONNECTION("F6", 10, "F6", 11)
- CONNECTION("F6", 13, "F6", 9)
+ // VSync Logic
+ CONNECTION(VRESET, "F6", 8)
+ CONNECTION(V16, "F6", 12)
+ CONNECTION("F6", 10, "F6", 11)
+ CONNECTION("F6", 13, "F6", 9)
- CONNECTION(V8, "H6", 1)
- CONNECTION(V8, "H6", 2)
+ CONNECTION(V8, "H6", 1)
+ CONNECTION(V8, "H6", 2)
- CONNECTION("F6", 13, "G6", 1)
- CONNECTION(V4, "G6", 2)
- CONNECTION("H6", 3, "G6", 13)
+ CONNECTION("F6", 13, "G6", 1)
+ CONNECTION(V4, "G6", 2)
+ CONNECTION("H6", 3, "G6", 13)
- #define VBLANK "F6", 13
- #define VBLANK_n "F6", 10
+ #define VBLANK "F6", 13
+ #define VBLANK_n "F6", 10
- // Net circuit
- CONNECTION(H256, "F4", 8)
- CONNECTION(H256_n, "F4", 11)
- CONNECTION(CLK, "F4", 9)
- CONNECTION(VCC, "F4", 10)
+ // Net circuit
+ CONNECTION(H256, "F4", 8)
+ CONNECTION(H256_n, "F4", 11)
+ CONNECTION(CLK, "F4", 9)
+ CONNECTION(VCC, "F4", 10)
- CONNECTION("F4", 6, "G4", 5)
- CONNECTION(H256, "G4", 4)
+ CONNECTION("F4", 6, "G4", 5)
+ CONNECTION(H256, "G4", 4)
- CONNECTION(V4, "G3", 3)
- CONNECTION(VBLANK, "G3", 4)
- CONNECTION("G4", 6, "G3", 5)
+ CONNECTION(V4, "G3", 3)
+ CONNECTION(VBLANK, "G3", 4)
+ CONNECTION("G4", 6, "G3", 5)
- #define NET "G3", 6
+ #define NET "G3", 6
- // Score decoding circuit
+ // Score decoding circuit
CONNECTION("C9", 2, "D7", 6)
CONNECTION("C8", 8, "D7", 5)
CONNECTION("C9", 6, "D7", 4)
@@ -501,7 +501,7 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(GND, "C7", 1)
CONNECTION(GND, "C7", 15)
- CONNECTION(H128, "E4", 1)
+ CONNECTION(H128, "E4", 1)
CONNECTION(H128, "E4", 2)
CONNECTION(H128, "E4", 13)
@@ -600,74 +600,74 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("D6", 6, "D4", 3)
- // Coin / Start Logic
- CONNECTION("COIN", 1, "C10", 5)
+ // Coin / Start Logic
+ CONNECTION("COIN", 1, "C10", 5)
- // Capacitor C33 used to drive a ~0.1ms low pulse
- // onto A3 pin 2 at the falling edge of COIN.
- CONNECTION("COIN", 1, "C33", 1)
- CONNECTION(VCC, "C33", 2)
+ // Capacitor C33 used to drive a ~0.1ms low pulse
+ // onto A3 pin 2 at the falling edge of COIN.
+ CONNECTION("COIN", 1, "C33", 1)
+ CONNECTION(VCC, "C33", 2)
- CONNECTION(VCC, "A3", 4)
- CONNECTION("C33", 3, "A3", 2)
+ CONNECTION(VCC, "A3", 4)
+ CONNECTION("C33", 3, "A3", 2)
- CONNECTION("A3", 3, "D2", 11)
+ CONNECTION("A3", 3, "D2", 11)
- CONNECTION(VCC, "B2", 4)
- CONNECTION("D2", 10, "B2", 3)
- CONNECTION("C10", 6, "B2", 2)
- CONNECTION("C10", 6, "B2", 1)
+ CONNECTION(VCC, "B2", 4)
+ CONNECTION("D2", 10, "B2", 3)
+ CONNECTION("C10", 6, "B2", 2)
+ CONNECTION("C10", 6, "B2", 1)
- CONNECTION("J10", 3, "LATCH", 1)
- CONNECTION("B2", 6, "LATCH", 2)
+ CONNECTION("J10", 3, "LATCH", 1)
+ CONNECTION("B2", 6, "LATCH", 2)
- CONNECTION("LATCH", 3, "H6", 12)
- CONNECTION("LATCH", 3, "H6", 13) // Wrong pins on schematic
+ CONNECTION("LATCH", 3, "H6", 12)
+ CONNECTION("LATCH", 3, "H6", 13) // Wrong pins on schematic
- CONNECTION("START", 1, "J10", 9)
- CONNECTION("START", 1, "J10", 10)
+ CONNECTION("START", 1, "J10", 9)
+ CONNECTION("START", 1, "J10", 10)
- CONNECTION(VCC, "C3", 10)
- CONNECTION("H10", 6, "C3", 12)
- CONNECTION("B2", 5, "C3", 11)
- CONNECTION(VCC, "C3", 13)
+ CONNECTION(VCC, "C3", 10)
+ CONNECTION("H10", 6, "C3", 12)
+ CONNECTION("B2", 5, "C3", 11)
+ CONNECTION(VCC, "C3", 13)
- CONNECTION("H6", 11, "H10", 4)
- CONNECTION(VCC, "H10", 2)
- CONNECTION("B2", 6, "H10", 1)
- CONNECTION("G10", 9, "H10", 3)
+ CONNECTION("H6", 11, "H10", 4)
+ CONNECTION(VCC, "H10", 2)
+ CONNECTION("B2", 6, "H10", 1)
+ CONNECTION("G10", 9, "H10", 3)
- CONNECTION("H10", 5, "J10", 2)
- CONNECTION("G10", 9, "J10", 1)
+ CONNECTION("H10", 5, "J10", 2)
+ CONNECTION("G10", 9, "J10", 1)
- CONNECTION(VCC, "G10", 4)
- CONNECTION("G10", 9, "G10", 2)
- CONNECTION("J10", 8, "G10", 3)
- CONNECTION("H10", 8, "G10", 1)
+ CONNECTION(VCC, "G10", 4)
+ CONNECTION("G10", 9, "G10", 2)
+ CONNECTION("J10", 8, "G10", 3)
+ CONNECTION("H10", 8, "G10", 1)
- CONNECTION(VCC, "H10", 10)
- CONNECTION("G10", 5, "H10", 12)
- CONNECTION(V256, "H10", 11)
- CONNECTION(VCC, "H10", 13)
+ CONNECTION(VCC, "H10", 10)
+ CONNECTION("G10", 5, "H10", 12)
+ CONNECTION(V256, "H10", 11)
+ CONNECTION(VCC, "H10", 13)
- CONNECTION("H10", 9, "J10", 4)
- CONNECTION("H10", 6, "J10", 5)
+ CONNECTION("H10", 9, "J10", 4)
+ CONNECTION("H10", 6, "J10", 5)
- CONNECTION("H6", 11, "G10", 10)
- CONNECTION(VCC, "G10", 12)
- CONNECTION("B3", 3, "G10", 11)
- CONNECTION("J10", 6, "G10", 13) // Schematic shows pin 10
+ CONNECTION("H6", 11, "G10", 10)
+ CONNECTION(VCC, "G10", 12)
+ CONNECTION("B3", 3, "G10", 11)
+ CONNECTION("J10", 6, "G10", 13) // Schematic shows pin 10
- CONNECTION("J10", 6, "E5", 9) // Schematic says E6?
+ CONNECTION("J10", 6, "E5", 9) // Schematic says E6?
- #define ATTRACT_n "D2", 4
- #define ATTRACT "G10", 9
+ #define ATTRACT_n "D2", 4
+ #define ATTRACT "G10", 9
- #define SRST "E5", 8
- #define SRST_n "J10", 6
+ #define SRST "E5", 8
+ #define SRST_n "J10", 6
- // Game Control Logic
+ // Game Control Logic
CONNECTION("H7", 6, "E7", 9)
CONNECTION("H6", 8, "E7", 10)
@@ -677,7 +677,7 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(ATTRACT_n, "E2", 2)
CONNECTION(SRST_n, "E7", 4)
- CONNECTION("E7", 8, "E7", 5)
+ CONNECTION("E7", 8, "E7", 5)
CONNECTION("E7", 6, "E7", 1)
CONNECTION("E7", 6, "E7", 2)
@@ -694,13 +694,13 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(VCC, "B6", 10)
CONNECTION("G3", 8, "B6", 11)
- CONNECTION(ATTRACT, "D2", 3)
+ CONNECTION(ATTRACT, "D2", 3)
- // Horizontal Ball Counter
+ // Horizontal Ball Counter
CONNECTION(ATTRACT_n, "E2", 4)
- CONNECTION("B6", 8, "E2", 5)
+ CONNECTION("B6", 8, "E2", 5)
CONNECTION("H5", 8, "G8", 3)
CONNECTION("H5", 6, "G8", 4)
@@ -732,7 +732,7 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("H8", 15, "H7", 12)
CONNECTION("G7", 5, "H7", 13)
- #define HVID_n "H7", 8
+ #define HVID_n "H7", 8
CONNECTION("H8", 15, "G6", 9)
CONNECTION("G8", 15, "G6", 10)
@@ -777,8 +777,8 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("E3", 6, "D3", 11)
CONNECTION("E3", 6, "D3", 12)
- #define VVID_n "E3", 6
- #define VVID "D3", 13
+ #define VVID_n "E3", 6
+ #define VVID "D3", 13
// Hit Logic
@@ -797,11 +797,11 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("B3", 8, "B3", 12)
CONNECTION("B3", 8, "B3", 13)
- #define HIT "B3", 8
- #define HIT_n "B3", 11
+ #define HIT "B3", 8
+ #define HIT_n "B3", 11
- // Horizontal Ball Control
+ // Horizontal Ball Control
CONNECTION("E2", 8, "E2", 12)
CONNECTION("C3", 6, "E2", 13)
@@ -854,7 +854,7 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("G4", 11, "H4", 13)
CONNECTION("G4", 3, "H4", 10)
- CONNECTION("H5", 3, "H5", 12)
+ CONNECTION("H5", 3, "H5", 12)
CONNECTION("H4", 9, "H5", 13)
CONNECTION("H5", 3, "H5", 4)
@@ -874,9 +874,9 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(H64, "B1", 14)
CONNECTION(H256, "B1", 2)
CONNECTION(GND, "B1", 1)
- CONNECTION(GND, "B1", 15) // Added
+ CONNECTION(GND, "B1", 15) // Added
- CONNECTION("A7", 8, "A1", 6)
+ CONNECTION("A7", 8, "A1", 6)
CONNECTION("D1", 8, "A1", 5)
CONNECTION("A9", 8, "A1", 4)
CONNECTION("C1", 8, "A1", 3)
@@ -943,7 +943,7 @@ CIRCUIT_LAYOUT( pongdoubles )
- // Paddle 1 Vertical
+ // Paddle 1 Vertical
CONNECTION(V256_n, "B10", 2)
CONNECTION(VCC, "B10", 4)
@@ -966,7 +966,7 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("A8", 8, "B8", 2)
// Paddle 1N Vertical
- CONNECTION(V256_n, "B9A", 2)
+ CONNECTION(V256_n, "B9A", 2)
CONNECTION(VCC, "B9A", 4)
CONNECTION("B9A", 3, "G1", 1)
@@ -1012,7 +1012,7 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("A8", 6, "B8", 12)
// Paddle 2N Vertical
- CONNECTION(V256_n, "B9B", 2)
+ CONNECTION(V256_n, "B9B", 2)
CONNECTION(VCC, "B9B", 4)
CONNECTION("B9B", 3, "G1", 3)
@@ -1034,33 +1034,33 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION("A2", 6, "E1", 10)
- // Paddle N Horizontal
- CONNECTION(H64, "G1", 5)
+ // Paddle N Horizontal
+ CONNECTION(H64, "G1", 5)
- CONNECTION(VCC, "J1", 4)
- CONNECTION("G1", 6, "J1", 2)
- CONNECTION(H4, "J1", 3)
- CONNECTION(ATTRACT_n, "J1", 1)
+ CONNECTION(VCC, "J1", 4)
+ CONNECTION("G1", 6, "J1", 2)
+ CONNECTION(H4, "J1", 3)
+ CONNECTION(ATTRACT_n, "J1", 1)
- CONNECTION("C3", 9, "J1", 10)
- CONNECTION(VCC, "J1", 12)
- CONNECTION("G4", 8, "J1", 11)
- CONNECTION(H256, "J1", 13)
+ CONNECTION("C3", 9, "J1", 10)
+ CONNECTION(VCC, "J1", 12)
+ CONNECTION("G4", 8, "J1", 11)
+ CONNECTION(H256, "J1", 13)
- CONNECTION("J1", 9, "F1", 4)
- CONNECTION("G1", 6, "F1", 3)
- CONNECTION("J1", 6, "F1", 5)
+ CONNECTION("J1", 9, "F1", 4)
+ CONNECTION("G1", 6, "F1", 3)
+ CONNECTION("J1", 6, "F1", 5)
- CONNECTION("F1", 6, "H1", 8)
- CONNECTION("F1", 6, "H1", 9)
+ CONNECTION("F1", 6, "H1", 8)
+ CONNECTION("F1", 6, "H1", 9)
- CONNECTION("H1", 10, "F1", 13)
- CONNECTION(H256, "F1", 2) // Schematic says 256V
- CONNECTION("E1", 11, "F1", 1)
+ CONNECTION("H1", 10, "F1", 13)
+ CONNECTION(H256, "F1", 2) // Schematic says 256V
+ CONNECTION("E1", 11, "F1", 1)
- CONNECTION("H1", 10, "F1", 11)
- CONNECTION(H256_n, "F1", 9)
- CONNECTION("E1", 8, "F1", 10)
+ CONNECTION("H1", 10, "F1", 11)
+ CONNECTION(H256_n, "F1", 9)
+ CONNECTION("E1", 8, "F1", 10)
// Paddle Horizontal
@@ -1080,14 +1080,14 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(H256_n, "G3", 2)
CONNECTION("G4", 8, "G3", 13)
- CONNECTION("F1", 12, "H1", 2)
- CONNECTION("G3", 8, "H1", 3)
+ CONNECTION("F1", 12, "H1", 2)
+ CONNECTION("G3", 8, "H1", 3)
- CONNECTION("F1", 8, "H1", 5)
- CONNECTION("G3", 12, "H1", 6)
+ CONNECTION("F1", 8, "H1", 5)
+ CONNECTION("G3", 12, "H1", 6)
- CONNECTION("H1", 1, "G1", 13)
- CONNECTION("H1", 4, "G1", 11)
+ CONNECTION("H1", 1, "G1", 13)
+ CONNECTION("H1", 4, "G1", 11)
// Sound
@@ -1151,81 +1151,79 @@ CIRCUIT_LAYOUT( pongdoubles )
CONNECTION(VCC, "C9", 11)
CONNECTION(SRST_n, "C9", 10)
- CONNECTION(VCC, "DIPSW1", 1)
- CONNECTION("C8", 8, "DIPSW1", 2)
+ CONNECTION(VCC, "DIPSW1", 1)
+ CONNECTION("C8", 8, "DIPSW1", 2)
CONNECTION("C8", 12, "D9", 1)
- //CONNECTION("DIPSW1", 3, "D9", 2)
+ //CONNECTION("DIPSW1", 3, "D9", 2)
CONNECTION("DIPSW1", Q, "D9", 2)
CONNECTION("C9", 3, "D9", 13)
- //CONNECTION(VCC, "DIPSW1", 4)
- //CONNECTION("D8", 8, "DIPSW1", 5)
- CONNECTION(VCC, "DIPSW2", 1)
- CONNECTION("D8", 8, "DIPSW2", 2)
+ //CONNECTION(VCC, "DIPSW1", 4)
+ //CONNECTION("D8", 8, "DIPSW1", 5)
+ CONNECTION(VCC, "DIPSW2", 1)
+ CONNECTION("D8", 8, "DIPSW2", 2)
CONNECTION("D8", 12, "D9", 3)
- //CONNECTION("DIPSW1", 6, "D9", 4)
+ //CONNECTION("DIPSW1", 6, "D9", 4)
CONNECTION("DIPSW2", Q, "D9", 4)
CONNECTION("C9", 5, "D9", 5)
- CONNECTION("D9", 12, "B3", 1)
- CONNECTION("D9", 6, "B3", 2)
+ CONNECTION("D9", 12, "B3", 1)
+ CONNECTION("D9", 6, "B3", 2)
- // Missing Logic in DICE
+ // Missing Logic in DICE
- NET_C(G6.12, A5.13)
- NET_C(B2.8, A5.12)
- NET_C(A5.11, E5.11)
+ NET_C(G6.12, A5.13)
+ NET_C(B2.8, A5.12)
+ NET_C(A5.11, E5.11)
- // Video Summing
- CONNECTION("F3", 13, "G2", 4) // Ball
- CONNECTION("F3", 12, "G1", 10)
- CONNECTION("F3", 10, NET)
- CONNECTION("F3", 9, "G1", 12)
+ // Video Summing
+ CONNECTION("F3", 13, "G2", 4) // Ball
+ CONNECTION("F3", 12, "G1", 10)
+ CONNECTION("F3", 10, NET)
+ CONNECTION("F3", 9, "G1", 12)
- CONNECTION("F3", 8, "E5", 13)
+ CONNECTION("F3", 8, "E5", 13)
- // FIXME: pong doubles uses different resistor values!
- RES(RV1, 1000)
- RES(RV2, 1200)
- RES(RV3, 22000)
- NET_C(E5.12, RV1.1) //Video
- NET_C(D4.8, RV2.1) //Score
- NET_C(E5.10, RV3.1)
+ // FIXME: pong doubles uses different resistor values!
+ RES(RV1, 1000)
+ RES(RV2, 1200)
+ RES(RV3, 22000)
+ NET_C(E5.12, RV1.1) //Video
+ NET_C(D4.8, RV2.1) //Score
+ NET_C(E5.10, RV3.1)
- NET_C(RV1.2, RV2.2)
- NET_C(RV2.2, RV3.2)
+ NET_C(RV1.2, RV2.2)
+ NET_C(RV2.2, RV3.2)
- ALIAS(videomix, RV3.2)
+ ALIAS(videomix, RV3.2)
#if 0
- CONNECTION("VIDEO", 1, "E5", 12) // VIDEO
- CONNECTION("VIDEO", 2, "D4", 8) // SCORE
+ CONNECTION("VIDEO", 1, "E5", 12) // VIDEO
+ CONNECTION("VIDEO", 2, "D4", 8) // SCORE
- CONNECTION("VIDEO", Video::HBLANK_PIN, HBLANK)
- CONNECTION("VIDEO", Video::VBLANK_PIN, VBLANK)
+ CONNECTION("VIDEO", Video::HBLANK_PIN, HBLANK)
+ CONNECTION("VIDEO", Video::VBLANK_PIN, VBLANK)
#endif
- // Audio Summing
- CONNECTION(ATTRACT_n, "C2", 4)
- CONNECTION("C5", 6, "C2", 5)
+ // Audio Summing
+ CONNECTION(ATTRACT_n, "C2", 4)
+ CONNECTION("C5", 6, "C2", 5)
- //CONNECTION("AUDIO", 1, "C2", 6)
- ALIAS(AUDIO, C2.6)
+ //CONNECTION("AUDIO", 1, "C2", 6)
+ ALIAS(AUDIO, C2.6)
#ifdef DEBUG
- CONNECTION("LOG1", 1, "COIN", 1)
- CONNECTION("LOG1", 2, "A3", 3)
- CONNECTION("LOG1", 3, "B2", 5)
- CONNECTION("LOG1", 4, "H10", 5)
- CONNECTION("LOG1", 5, "C3", 9)
- CONNECTION("LOG1", 6, "G10", 5)
- CONNECTION("LOG1", 7, "E2", 6)
- CONNECTION("LOG1", 8, "B3", 3)
+ CONNECTION("LOG1", 1, "COIN", 1)
+ CONNECTION("LOG1", 2, "A3", 3)
+ CONNECTION("LOG1", 3, "B2", 5)
+ CONNECTION("LOG1", 4, "H10", 5)
+ CONNECTION("LOG1", 5, "C3", 9)
+ CONNECTION("LOG1", 6, "G10", 5)
+ CONNECTION("LOG1", 7, "E2", 6)
+ CONNECTION("LOG1", 8, "B3", 3)
#endif
CIRCUIT_LAYOUT_END
-
-
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index cc2b3316396..1ec64fed9b6 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -1228,15 +1228,15 @@ static MACHINE_CONFIG_START( noraut_base, norautp_state )
//MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
/* (c0-c3) Group A Mode 2 (5-lines handshacked bidirectional port)
- Group B Mode 0, output; (see below for lines PC0-PC2) */
- //MCFG_I8255_IN_PORTA_CB(READ8(norautp_state, vram_data_r)) // VRAM data read
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(norautp_state, vram_data_w)) // VRAM data write
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(norautp_state, vram_addr_w)) // VRAM address write
+ Group B Mode 0, output; (see below for lines PC0-PC2) */
+ //MCFG_I8255_IN_PORTA_CB(READ8(norautp_state, vram_data_r)) // VRAM data read
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(norautp_state, vram_data_w)) // VRAM data write
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(norautp_state, vram_addr_w)) // VRAM address write
//MCFG_I8255_IN_PORTC_CB(READ8(norautp_state, ppi2_portc_r))
//MCFG_I8255_OUT_PORTC_CB(WRITE8(norautp_state, ppi2_portc_w))
/* PPI-2 is configured as mixed mode2 and mode0 output.
- It means that port A should be bidirectional and port B just as output.
- Port C as hshk regs, and P0-P2 as input (norautp, norautjp) or output (other sets). */
+ It means that port A should be bidirectional and port B just as output.
+ Port C as hshk regs, and P0-P2 as input (norautp, norautjp) or output (other sets). */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3438,16 +3438,16 @@ ROM_END
/*
ROM_START( pkii_dm )
- ROM_REGION( 0x10000, "maincpu", 0 ) // no stack, call's RET go to PC=0
- ROM_LOAD( "12.u12", 0x0000, 0x1000, CRC(048e70d8) SHA1(f0eb16ba68455638de2ce68f51f305a13d0df287) )
- ROM_LOAD( "13.u18", 0x1000, 0x1000, CRC(06cf6789) SHA1(587d883c399348b518e3be4d1dc2581824055328) )
+ ROM_REGION( 0x10000, "maincpu", 0 ) // no stack, call's RET go to PC=0
+ ROM_LOAD( "12.u12", 0x0000, 0x1000, CRC(048e70d8) SHA1(f0eb16ba68455638de2ce68f51f305a13d0df287) )
+ ROM_LOAD( "13.u18", 0x1000, 0x1000, CRC(06cf6789) SHA1(587d883c399348b518e3be4d1dc2581824055328) )
- ROM_REGION( 0x1000, "gfx", 0 )
- ROM_FILL( 0x0000, 0x0800, 0xff )
- ROM_LOAD( "cgw-f506.u31", 0x0800, 0x0800, CRC(412fc492) SHA1(094ea0ffd0c22274cfe164f07c009ffe022331fd) )
+ ROM_REGION( 0x1000, "gfx", 0 )
+ ROM_FILL( 0x0000, 0x0800, 0xff )
+ ROM_LOAD( "cgw-f506.u31", 0x0800, 0x0800, CRC(412fc492) SHA1(094ea0ffd0c22274cfe164f07c009ffe022331fd) )
- ROM_REGION( 0x0200, "proms", 0 )
- ROM_LOAD( "63s141n.u51", 0x0000, 0x0100, CRC(88302127) SHA1(aed1273974917673405f1234ab64e6f8b3856c34) )
+ ROM_REGION( 0x0200, "proms", 0 )
+ ROM_LOAD( "63s141n.u51", 0x0000, 0x0100, CRC(88302127) SHA1(aed1273974917673405f1234ab64e6f8b3856c34) )
ROM_END
*/
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 85fe51da442..1bd66eaeda1 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -750,7 +750,7 @@ static MACHINE_CONFIG_START( nwktr, nwktr_state )
MCFG_VOODOO_TMUMEM(2,2)
MCFG_VOODOO_SCREEN_TAG("screen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(nwktr_state,voodoo_vblank_0))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(nwktr_state,voodoo_vblank_0))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -767,8 +767,8 @@ static MACHINE_CONFIG_START( nwktr, nwktr_state )
MCFG_K001604_GFX_INDEX2(1)
MCFG_K001604_LAYER_SIZE(0)
MCFG_K001604_ROZ_SIZE(1)
- MCFG_K001604_TXT_OFFSET(0) // correct?
- MCFG_K001604_ROZ_OFFSET(0) // correct?
+ MCFG_K001604_TXT_OFFSET(0) // correct?
+ MCFG_K001604_ROZ_OFFSET(0) // correct?
MCFG_K001604_GFXDECODE("gfxdecode")
MCFG_K001604_PALETTE("palette")
@@ -780,10 +780,10 @@ static MACHINE_CONFIG_START( nwktr, nwktr_state )
MCFG_RF5C400_ADD("rfsnd", XTAL_16_9344MHz) // as per Guru readme above
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-
+
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(2)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_NWKTR)
+ MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_NWKTR)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( thrilld, nwktr )
@@ -794,8 +794,8 @@ static MACHINE_CONFIG_DERIVED( thrilld, nwktr )
MCFG_K001604_GFX_INDEX2(1)
MCFG_K001604_LAYER_SIZE(1)
MCFG_K001604_ROZ_SIZE(1)
- MCFG_K001604_TXT_OFFSET(0) // correct?
- MCFG_K001604_ROZ_OFFSET(0) // correct?
+ MCFG_K001604_TXT_OFFSET(0) // correct?
+ MCFG_K001604_ROZ_OFFSET(0) // correct?
MCFG_K001604_GFXDECODE("gfxdecode")
MCFG_K001604_PALETTE("palette")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 7deb94c061b..2a78f61bc38 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -624,7 +624,7 @@ static MACHINE_CONFIG_START( nyny, nyny_state )
MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - pulled high */
MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */
MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(nyny_state, ic48_1_74123_output_changed))
-
+
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 3657fffb9e5..4144e214094 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -221,7 +221,7 @@ WRITE8_MEMBER( parodius_state::banking_callback )
{
if (data & 0xf0)
logerror("%04x: setlines %02x\n", machine().device("maincpu")->safe_pc(), data);
-
+
membank("bank1")->set_entry((data & 0x0f) ^ 0x0f);
}
@@ -234,7 +234,7 @@ static MACHINE_CONFIG_START( parodius, parodius_state )
MCFG_KONAMICPU_LINE_CB(WRITE8(parodius_state, banking_callback))
MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(parodius_sound_map) /* NMIs are triggered by the 053260 */
+ MCFG_CPU_PROGRAM_MAP(parodius_sound_map) /* NMIs are triggered by the 053260 */
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank0000_map)
diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c
index 264918f2b04..360394796a2 100644
--- a/src/mame/drivers/pcxt.c
+++ b/src/mame/drivers/pcxt.c
@@ -741,7 +741,7 @@ static MACHINE_CONFIG_FRAGMENT(pcxt)
MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w))
MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w))
-
+
/*Sound Hardware*/
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index c51d7eabdd5..64d6ca7293a 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -1411,7 +1411,7 @@ ROM_START( kovsh )
PGM_68K_BIOS
ROM_LOAD16_WORD_SWAP( "p0600.322", 0x100000, 0x400000, CRC(7c78e5f3) SHA1(9b1e4bd63fb1294ebeb539966842273c8dc7683b) )
//ROM_LOAD16_WORD_SWAP( "kovsh-v0104-u1.bin", 0x100000, 0x400000, CRC(4e2ba39b) SHA1(f3b5aa6f45cfd5a7f1e2a2e893d1652a3f23d6b8) ) // identical but the last 1MB is filled with 0xff instead of 0x00
-
+
ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
ROM_LOAD( "kovsh_v100_china.asic", 0x000000, 0x04000, CRC(0f09a5c1) SHA1(621b38c05f33277608d58b49822aebc930ae4870) )
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 18593458334..734411f9829 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -472,7 +472,7 @@ static MACHINE_CONFIG_DERIVED( pleiads, phoenix )
MCFG_TMS36XX_TYPE(TMS3615)
MCFG_TMS36XX_DECAY_TIMES(0.33, 0.33, 0, 0.33, 0, 0.33)
// NOTE: it's unknown if the TMS3615 mixes more than one voice internally.
- // A wav taken from Pop Flamer sounds like there are at least no 'odd'
+ // A wav taken from Pop Flamer sounds like there are at least no 'odd'
// harmonics (5 1/3' and 2 2/3')
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
@@ -1144,7 +1144,7 @@ ROM_START( pleiadsi )
ROM_LOAD( "9 2716.bin", 0x0000, 0x0800, CRC(85866607) SHA1(cd240bd056f761b2f9e2142049434f02cae3e315) )
ROM_LOAD( "10 2716.bin", 0x0800, 0x0800, CRC(a841d511) SHA1(8349008ab1d8ef08775b54170c37deb1d391fffc) )
- ROM_REGION( 0x0200, "proms", 0 ) // not present in dump, assuming to be the same, matches screenshots, note reverse order to most sets, same as pleiadsb2.
+ ROM_REGION( 0x0200, "proms", 0 ) // not present in dump, assuming to be the same, matches screenshots, note reverse order to most sets, same as pleiadsb2.
ROM_LOAD( "7611-5.26", 0x0000, 0x0100, CRC(7a1bcb1e) SHA1(bdfab316ea26e2063879e7aa78b6ae2b55eb95c8) ) /* palette low bits */
ROM_LOAD( "7611-5.33", 0x0100, 0x0100, CRC(e38eeb83) SHA1(252880d80425b2e697146e76efdc6cb9f3ba0378) ) /* palette high bits */
ROM_END
diff --git a/src/mame/drivers/play_5.c b/src/mame/drivers/play_5.c
index 4d4d42d022a..9713ade13c1 100644
--- a/src/mame/drivers/play_5.c
+++ b/src/mame/drivers/play_5.c
@@ -216,7 +216,7 @@ ROM_START(fldragon)
ROM_LOAD("fldrcpu2.rom", 0x2000, 0x2000, CRC(6ff2b276) SHA1(040b614f0b0587521ef5550b5587b94a7f3f178b))
ROM_RELOAD(0x6000, 0x2000)
ROM_RELOAD(0xa000, 0x2000)
- ROM_RELOAD(0xe000, 0x2000)
+ ROM_RELOAD(0xe000, 0x2000)
ROM_REGION(0x10000, "cpu2", 0)
ROM_LOAD("fdsndu3.rom", 0x0000, 0x2000, NO_DUMP)
ROM_RELOAD(0x4000, 0x2000)
@@ -244,7 +244,7 @@ ROM_START(sklflite)
ROM_LOAD("skflcpu2.rom", 0x2000, 0x2000, CRC(ffc497aa) SHA1(3e88539ae1688322b9268f502d8ca41cffb28df3))
ROM_RELOAD(0x6000, 0x2000)
ROM_RELOAD(0xa000, 0x2000)
- ROM_RELOAD(0xe000, 0x2000)
+ ROM_RELOAD(0xe000, 0x2000)
ROM_REGION(0x10000, "cpu2", 0)
ROM_LOAD("sfsndu3.rom", 0x0000, 0x2000, NO_DUMP)
ROM_RELOAD(0x4000, 0x2000)
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 9dab9fe2b5c..15592d837cf 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -107,7 +107,7 @@ WRITE16_MEMBER(playmark_state::hotmind_coin_eeprom_w)
{
if (ACCESSING_BITS_0_7)
{
-// if (data & 0x80) logerror("PC$%06x Writing unknown bits %02x to the Coin/EEPROM port\n", space.device().safe_pcbase(), data);
+// if (data & 0x80) logerror("PC$%06x Writing unknown bits %02x to the Coin/EEPROM port\n", space.device().safe_pcbase(), data);
if (data) {
if ((m_dispenser_latch & 0x80) == 0) m_dispenser_latch = 0;
@@ -122,8 +122,8 @@ WRITE16_MEMBER(playmark_state::hotmind_coin_eeprom_w)
}
machine().device<ticket_dispenser_device>("ticket")->write(space, 0, (data & 0x08) ? 0x80 : 0);
- coin_counter_w(machine(), 0, data & 0x20); /* Coin In counter - transistor driven */
- coin_counter_w(machine(), 1, data & 0x40); /* Token/Ticket Out counter - transistor driven */
+ coin_counter_w(machine(), 0, data & 0x20); /* Coin In counter - transistor driven */
+ coin_counter_w(machine(), 1, data & 0x40); /* Token/Ticket Out counter - transistor driven */
m_eeprom->cs_write((data & 1) ? ASSERT_LINE : CLEAR_LINE);
m_eeprom->di_write((data & 4) >> 2);
@@ -135,7 +135,7 @@ WRITE16_MEMBER(playmark_state::luckboomh_dispenser_w)
{
if (ACCESSING_BITS_0_7)
{
-// if (data & 0x87) logerror("PC$%06x Writing unknown bits %02x to the Coin/EEPROM port\n", space.device().safe_pcbase(), data);
+// if (data & 0x87) logerror("PC$%06x Writing unknown bits %02x to the Coin/EEPROM port\n", space.device().safe_pcbase(), data);
if (data) {
if ((m_dispenser_latch & 0x80) == 0) m_dispenser_latch = 0;
@@ -150,8 +150,8 @@ WRITE16_MEMBER(playmark_state::luckboomh_dispenser_w)
}
machine().device<ticket_dispenser_device>("ticket")->write(space, 0, (data & 0x08) ? 0x80 : 0);
- coin_counter_w(machine(), 0, data & 0x20); /* Coin In counter - transistor driven */
- coin_counter_w(machine(), 1, data & 0x40); /* Token/Ticket Out counter - transistor driven */
+ coin_counter_w(machine(), 0, data & 0x20); /* Coin In counter - transistor driven */
+ coin_counter_w(machine(), 1, data & 0x40); /* Token/Ticket Out counter - transistor driven */
}
}
@@ -165,7 +165,7 @@ WRITE16_MEMBER(playmark_state::playmark_snd_command_w)
{
if (ACCESSING_BITS_0_7)
{
-// logerror("PC$%06x 68K Writing sound command %02x to OKI\n",space.device().safe_pcbase(), data);
+// logerror("PC$%06x 68K Writing sound command %02x to OKI\n",space.device().safe_pcbase(), data);
m_snd_command = (data & 0xff);
m_snd_flag = 1;
@@ -180,12 +180,12 @@ READ8_MEMBER(playmark_state::playmark_snd_command_r)
if ((m_oki_control & 0x38) == 0x30)
{
data = m_snd_command;
-// logerror("PC$%03x PortB reading %02x from the 68K\n", space.device().safe_pcbase(), data);
+// logerror("PC$%03x PortB reading %02x from the 68K\n", space.device().safe_pcbase(), data);
}
else if ((m_oki_control & 0x38) == 0x28)
{
data = (m_oki->read(space, 0) & 0x0f);
-// logerror("PC$%03x PortB reading %02x from the OKI status port\n", space.device().safe_pcbase(), data);
+// logerror("PC$%03x PortB reading %02x from the OKI status port\n", space.device().safe_pcbase(), data);
}
return data;
@@ -241,7 +241,7 @@ WRITE8_MEMBER(playmark_state::playmark_snd_control_w)
if ((data & 0x38) == 0x18)
{
-// logerror("PC$%03x Writing %02x to OKI1, PortC=%02x, Code=%02x\n",space.device().safe_pcbase(),m_oki_command,m_oki_control,m_snd_command);
+// logerror("PC$%03x Writing %02x to OKI1, PortC=%02x, Code=%02x\n",space.device().safe_pcbase(),m_oki_command,m_oki_control,m_snd_command);
m_oki->write(space, 0, m_oki_command);
}
}
@@ -252,7 +252,7 @@ WRITE8_MEMBER(playmark_state::hrdtimes_snd_control_w)
if (m_old_oki_bank != (data & 3))
{
-// logerror("PC$%03x Writing %02x to PortC (OKI bank select bits). Previous bank was %02x\n",space.device().safe_pcbase(),(data&3),m_old_oki_bank);
+// logerror("PC$%03x Writing %02x to PortC (OKI bank select bits). Previous bank was %02x\n",space.device().safe_pcbase(),(data&3),m_old_oki_bank);
m_old_oki_bank = data & 3;
@@ -266,7 +266,7 @@ WRITE8_MEMBER(playmark_state::hrdtimes_snd_control_w)
if ((data & 0x38) == 0x18)
{
-// logerror("PC$%03x Writing %02x to OKI1, PortC=%02x, Code=%02x\n",space.device().safe_pcbase(),m_oki_command,m_oki_control,m_snd_command);
+// logerror("PC$%03x Writing %02x to OKI1, PortC=%02x, Code=%02x\n",space.device().safe_pcbase(),m_oki_command,m_oki_control,m_snd_command);
m_oki->write(space, 0, m_oki_command);
}
}
@@ -338,7 +338,7 @@ static ADDRESS_MAP_START( wbeachvl_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x710018, 0x710019) AM_READ_PORT("P3")
AM_RANGE(0x71001a, 0x71001b) AM_READ_PORT("P4")
// AM_RANGE(0x71001c, 0x71001d) AM_READ(playmark_snd_status???)
-// AM_RANGE(0x71001e, 0x71001f) AM_WRITE(playmark_snd_command_w)
+// AM_RANGE(0x71001e, 0x71001f) AM_WRITE(playmark_snd_command_w)
AM_RANGE(0x780000, 0x780fff) AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -384,7 +384,7 @@ static ADDRESS_MAP_START( hrdtimes_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x300016, 0x300017) AM_WRITE(hrdtimes_coin_w)
AM_RANGE(0x30001a, 0x30001b) AM_READ_PORT("DSW2")
AM_RANGE(0x30001c, 0x30001d) AM_READ_PORT("DSW1")
-// AM_RANGE(0x30001e, 0x30001f) AM_WRITE(playmark_snd_command_w)
+// AM_RANGE(0x30001e, 0x30001f) AM_WRITE(playmark_snd_command_w)
AM_RANGE(0x304000, 0x304001) AM_WRITENOP /* watchdog? irq ack? */
ADDRESS_MAP_END
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START( playmark_sound_io_map, AS_IO, 8, playmark_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( hrdtimes_sound_io_map, AS_IO, 8, playmark_state )
- AM_RANGE(0x00, 0x00) AM_NOP /* AM_WRITE(playmark_oki_banking_w) Banking data output but not wired. Port 2 (Port C) is wired to the OKI banking instead */
+ AM_RANGE(0x00, 0x00) AM_NOP /* AM_WRITE(playmark_oki_banking_w) Banking data output but not wired. Port 2 (Port C) is wired to the OKI banking instead */
AM_RANGE(0x01, 0x01) AM_READWRITE(playmark_snd_command_r, playmark_oki_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(playmark_snd_flag_r, hrdtimes_snd_control_w)
AM_RANGE(PIC16C5x_T0, PIC16C5x_T0) AM_READ(PIC16C5X_T0_clk_r)
@@ -904,7 +904,7 @@ static INPUT_PORTS_START( hotmind )
PORT_START("DISPENSER")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Wired to Token dispenser connector, but doesn't seem to affect anything.
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Wired to Token dispenser connector, but doesn't seem to affect anything.
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Token Dispenser Empty") PORT_CODE(KEYCODE_N)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("token", ticket_dispenser_device, line_r)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Ticket Dispenser Empty") PORT_CODE(KEYCODE_T)
@@ -1922,7 +1922,7 @@ ROM_START( hotmind )
ROM_COPY( "oki", 0x00000, 0x20000, 0x20000 )
ROM_COPY( "oki", 0x00000, 0x40000, 0x20000 )
- ROM_REGION( 0x8000, "plds", 0 ) /* These were read protected */
+ ROM_REGION( 0x8000, "plds", 0 ) /* These were read protected */
ROM_LOAD( "palce16v8h-25-pc4_u58.jed", 0x0000, 0xb89, BAD_DUMP CRC(ba88c1da) SHA1(9b55e96eee44a467bdfbf760137ccb2fb3afedf0) )
ROM_LOAD( "palce16v8h-25-pc4_u182.jed", 0x0000, 0xb89, BAD_DUMP CRC(ba88c1da) SHA1(9b55e96eee44a467bdfbf760137ccb2fb3afedf0) )
ROM_LOAD( "palce16v8h-25-pc4_jamma.jed", 0x0000, 0xb89, BAD_DUMP CRC(ba88c1da) SHA1(9b55e96eee44a467bdfbf760137ccb2fb3afedf0) ) // On the Jamma Expansion board
@@ -1953,7 +1953,7 @@ ROM_START( luckboomh )
ROM_LOAD16_BYTE( "28.u40", 0x040001, 0x10000, CRC(40e65ed1) SHA1(bc75eb816c58eb0f983bb0eaee854c54e306e1da) )
ROM_CONTINUE( 0x060001, 0x10000 )
- ROM_REGION( 0x80000, "gfx2", 0 ) /* Sprites */
+ ROM_REGION( 0x80000, "gfx2", 0 ) /* Sprites */
ROM_LOAD16_BYTE( "26.u86", 0x00000, 0x20000, CRC(d3ee7d82) SHA1(b0b3df19d60430e7a9fa29fdfff2183a32986d2d) )
ROM_LOAD16_BYTE( "30.u85", 0x00001, 0x20000, CRC(4b8a9558) SHA1(9f0f2d8f50f21cf188ad778c3a0a68ec23380b23) )
ROM_LOAD16_BYTE( "25.u84", 0x40000, 0x20000, CRC(e1ab5cf5) SHA1(f76d00537cfd6f09439e44071875bf021622fd07) )
diff --git a/src/mame/drivers/pong.c b/src/mame/drivers/pong.c
index ec94b3fda5a..c0b86164ad4 100644
--- a/src/mame/drivers/pong.c
+++ b/src/mame/drivers/pong.c
@@ -207,11 +207,11 @@ static INPUT_PORTS_START( pongd )
PORT_START( "PADDLE1" ) /* fake input port for player 2 paddle */
PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) PORT_PLAYER(2) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot1")
- PORT_START( "PADDLE2" ) /* fake input port for player 3 paddle */
- PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) PORT_PLAYER(3) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot2")
+ PORT_START( "PADDLE2" ) /* fake input port for player 3 paddle */
+ PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) PORT_PLAYER(3) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot2")
- PORT_START( "PADDLE3" ) /* fake input port for player 4 paddle */
- PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) PORT_PLAYER(4) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot3")
+ PORT_START( "PADDLE3" ) /* fake input port for player 4 paddle */
+ PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) PORT_PLAYER(4) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot3")
PORT_START("IN0") /* fake as well */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "coinsw")
@@ -284,8 +284,8 @@ static MACHINE_CONFIG_START( pongd, pong_state )
#endif
MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot0", "A10_POT.DIAL")
MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "B10_POT.DIAL")
- MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot2", "B9B_POT.DIAL")
- MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot3", "B9A_POT.DIAL")
+ MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot2", "B9B_POT.DIAL")
+ MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot3", "B9A_POT.DIAL")
MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1a", "DIPSW1.POS", 0, 0x01)
MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1b", "DIPSW2.POS", 0, 0x01)
MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw", "COIN_SW.POS", 0, 0x01)
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 84993f88246..e9437e5ed6c 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -53,7 +53,7 @@ static NETLIST_START(nl_popeye)
SOLVER(Solver, 48000)
PARAM(Solver.ACCURACY, 1e-5)
- PARAM(Solver.LTE, 5e-2) // Default is not enough for paddle control
+ PARAM(Solver.LTE, 5e-2) // Default is not enough for paddle control
ANALOG_INPUT(V5, 5)
/* AY 8910 internal resistors */
@@ -482,7 +482,7 @@ static MACHINE_CONFIG_DERIVED( popeye, skyskipr )
MCFG_SOUND_MODIFY("aysnd")
MCFG_SOUND_ROUTES_RESET()
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT) /* Does Sky Skipper have the same filtering? */
- MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
+ MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(popeye_state, popeye_portB_w))
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 0)
diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c
index bbb29af5f39..fd64974d2da 100644
--- a/src/mame/drivers/proconn.c
+++ b/src/mame/drivers/proconn.c
@@ -266,7 +266,7 @@ INPUT_PORTS_END
WRITE16_MEMBER(proconn_state::serial_transmit)
{
//Don't like the look of this, should be a clock somewhere
-
+
// should probably be in the pios above
if (offset == 0)
@@ -275,7 +275,7 @@ WRITE16_MEMBER(proconn_state::serial_transmit)
{
m_vfd->data(data & (1<<i));
m_vfd->sclk(1);
- m_vfd->sclk(0);
+ m_vfd->sclk(0);
}
}
}
diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c
index 52f4ef40022..a6c9f028cdf 100644
--- a/src/mame/drivers/quakeat.c
+++ b/src/mame/drivers/quakeat.c
@@ -110,7 +110,6 @@ INPUT_PORTS_END
void quakeat_state::machine_start()
{
-
}
/*************************************************************/
diff --git a/src/mame/drivers/rastersp.c b/src/mame/drivers/rastersp.c
index a1091986a3d..773ddd23616 100644
--- a/src/mame/drivers/rastersp.c
+++ b/src/mame/drivers/rastersp.c
@@ -102,7 +102,7 @@ public:
required_device<timer_device> m_tms_timer1;
required_device<timer_device> m_tms_tx_timer;
required_device<palette_device> m_palette;
- required_device<nvram_device> m_nvram;
+ required_device<nvram_device> m_nvram;
DECLARE_WRITE32_MEMBER(cyrix_cache_w);
DECLARE_READ8_MEMBER(nvram_r);
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index 4b5b6fbb6eb..7c9bfe36b09 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -379,7 +379,7 @@ static MACHINE_CONFIG_START( re900, re900_state )
/* video hardware */
MCFG_DEVICE_ADD( "tms9128", TMS9128, XTAL_10_738635MHz / 2 ) /* TMS9128NL on the board */
- MCFG_TMS9928A_VRAM_SIZE(0x4000)
+ MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(re900_state, vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9128", tms9128_device, screen_update )
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index b850c389fb5..5b44c3b44cb 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -773,7 +773,7 @@ DECOSPR_PRIORITY_CB_MEMBER(rohga_state::rohga_pri_callback)
case 0x6000: return 0xf0 | 0xcc;
case 0x2000: return 0;//0xf0|0xcc; /* Perhaps 0xf0|0xcc|0xaa (Sprite under bottom layer) */
}
-
+
return 0;
}
@@ -787,7 +787,7 @@ DECOSPR_COLOUR_CB_MEMBER(rohga_state::schmeisr_col_callback)
UINT16 colour = ((col >> 9) & 0xf) << 2;
if (col & 0x8000)
colour++;
-
+
return colour;
}
@@ -1124,7 +1124,7 @@ static MACHINE_CONFIG_START( schmeisr, rohga_state )
MCFG_DEVICE_ADD("spritegen1", DECO_SPRITE, 0)
MCFG_DECO_SPRITE_PRIORITY_CB(rohga_state, rohga_pri_callback)
- MCFG_DECO_SPRITE_COLOUR_CB(rohga_state, schmeisr_col_callback) // wire mods on pcb...
+ MCFG_DECO_SPRITE_COLOUR_CB(rohga_state, schmeisr_col_callback) // wire mods on pcb...
MCFG_DECO_SPRITE_GFX_REGION(3)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 57e8d31de5f..b204e3e5449 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -250,7 +250,7 @@ static MACHINE_CONFIG_START( rollerg, rollerg_state )
MCFG_KONAMICPU_LINE_CB(WRITE8(rollerg_state, banking_callback))
MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(rollerg_sound_map) /* NMIs are generated by the 053260 */
+ MCFG_CPU_PROGRAM_MAP(rollerg_sound_map) /* NMIs are generated by the 053260 */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 32761463756..82271d573e0 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -122,7 +122,7 @@
* Machine initialization
*
*************************************/
-
+
void rpunch_state::machine_start()
{
save_item(NAME(m_sound_data));
@@ -749,7 +749,7 @@ ROM_START( svolleyu )
ROM_LOAD( "sps_07.bin", 0x20000, 0x10000, CRC(904b7709) SHA1(9b66a565cd599928b666baad9f97c50f35ffcc37) )
ROM_LOAD( "sps_08.bin", 0x30000, 0x10000, CRC(5430ffac) SHA1(163311d96f2f7e1ecb0901d0be73ac357b01bf6a) )
ROM_LOAD( "sps_09.bin", 0x40000, 0x10000, CRC(414a6278) SHA1(baa9dc9ab0dd3c5f27c128de23053edcddf45ad0) )
-// ROM_LOAD( "a09.bin", 0x50000, 0x08000, CRC(dd92dfe1) SHA1(08c956e11d567a215ec3cdaf6ef75fa9a886513a) ) // not on this set?
+// ROM_LOAD( "a09.bin", 0x50000, 0x08000, CRC(dd92dfe1) SHA1(08c956e11d567a215ec3cdaf6ef75fa9a886513a) ) // not on this set?
ROM_REGION( 0x80000, "sprites", ROMREGION_ERASEFF )
ROM_LOAD16_BYTE( "sps_20.bin", 0x00000, 0x10000, CRC(c9e7206d) SHA1(af5b2f49387a3b46c6693f4782aa0e587f17ab25) )
diff --git a/src/mame/drivers/sam.c b/src/mame/drivers/sam.c
index e5a7c06c38f..eccfd64ffdf 100644
--- a/src/mame/drivers/sam.c
+++ b/src/mame/drivers/sam.c
@@ -23,14 +23,13 @@ static MACHINE_CONFIG_START( sam, sam_state )
MCFG_CPU_PROGRAM_MAP(sam_map)
MACHINE_CONFIG_END
-#define ROM_LOAD_BOOT_EPROM \
+#define ROM_LOAD_BOOT_EPROM \
ROM_REGION( 0x100000, "boot", ROMREGION_ERASEFF ) \
ROM_LOAD( "boot_eprom_01_02.bin", 0x0000, 0x100000, CRC(92c93cba) SHA1(aed7ba2f988df8c95e2ad08f70409152d5caa49a)) \
ROM_LOAD( "boot_eprom_01_06.bin", 0x0000, 0x0e8ac8, CRC(fe7bcece) SHA1(775590bbd52c24950db86cc231566ba3780030d8)) \
ROM_LOAD( "boot_eprom_02_10.bin", 0x0000, 0x0f0304, CRC(0f3fd4a4) SHA1(115d0b73c40fcdb2d202a0a9065472d216ca89e0)) \
ROM_LOAD( "boot_eprom_02_30.bin", 0x0000, 0x0f0624, CRC(a4258c49) SHA1(d865edf7d1c6d2c922980dd192222dc24bc092a0)) \
- ROM_LOAD( "boot_eprom_03_10.bin", 0x0000, 0x100000, CRC(de017f82) SHA1(e4a9a818fa3f1754374cd00b52b8a087d6c442a9)) \
-
+ ROM_LOAD( "boot_eprom_03_10.bin", 0x0000, 0x100000, CRC(de017f82) SHA1(e4a9a818fa3f1754374cd00b52b8a087d6c442a9))
/*-------------------------------------------------------------------
/ 24
/-------------------------------------------------------------------*/
@@ -1065,213 +1064,213 @@ ROM_START(wpt_1400l)
ROM_LOAD( "wpt1400l.bin", 0x0000, 0x1c7072c, CRC(00eff09c) SHA1(847203d4d2ce8d11a5403374f2d5b6dda8458bc9))
ROM_END
-GAME( 200?, 24_130 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, 24_140 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, 24_144 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.44", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, 24_150 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.50", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_130 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_150 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.50", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_160 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.60", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_200 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_210 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_220 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.20", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_290 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.90", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bdk_294 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.94", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, 24_130 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, 24_140 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, 24_144 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.44", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, 24_150 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.50", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_130 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_150 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.50", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_160 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.60", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_200 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_210 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_220 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.20", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_290 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.90", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bdk_294 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.94", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 1.30 (26-Jan-2010), 1.20 (25-Jan-2010), 1.10 (21-Jan-2010), 1.00 (15-Jan-2010)
-GAME( 200?, bbh_140 ,bbh_160, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bbh_150 ,bbh_160, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.50", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, bbh_160 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.60", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, csi_102 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.02", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, csi_103 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.03", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, csi_104 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.04", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, csi_200 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, csi_210 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, csi_230 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, csi_240 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_1000af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_1000ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_1000ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_1000al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_110af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_110ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_110ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_110al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_120af ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_120ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_120ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_120al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_300ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v3.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_400a ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v4.0 (English)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_400ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v4.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_700af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v7.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_700al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v7.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, fg_800al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v8.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, im2_100 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, im2_110 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, im2_120 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.20", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, im2_140 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_113a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_113f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_113g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_113i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_113l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_114a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_114f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_114g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_114i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_114l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_116a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_116f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_116g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_116i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_116l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_210 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, indy_210f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v2.10 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bbh_140 ,bbh_160, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bbh_150 ,bbh_160, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.50", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, bbh_160 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.60", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, csi_102 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.02", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, csi_103 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.03", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, csi_104 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.04", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, csi_200 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, csi_210 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, csi_230 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, csi_240 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_1000af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_1000ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_1000ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_1000al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_110af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_110ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_110ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_110al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_120af ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_120ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_120ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_120al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_300ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v3.0 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_400a ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v4.0 (English)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_400ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v4.0 (English,German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_700af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v7.0 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_700al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v7.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, fg_800al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v8.0 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, im2_100 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, im2_110 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, im2_120 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.20", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, im2_140 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_113a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_113f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_113g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_113i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_113l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_114a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_114f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_114g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_114i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_114l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_116a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_116f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_116g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_116i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_116l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_210 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, indy_210f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v2.10 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing versions 4.00 (21-May-2009), 3.00 (20-May-2009), 2.00 (19-May-2009) and 1.00 (14-May-2009) of NBA
-GAME( 200?, nba_500 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v5.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, nba_600 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v6.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, nba_700 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v7.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, nba_801 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v8.01", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, nba_802 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v8.02", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_110af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_110ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_110gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, nba_500 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v5.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, nba_600 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v6.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, nba_700 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v7.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, nba_801 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v8.01", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, nba_802 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v8.02", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_110af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_110ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_110gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 1.11 for other languages ??? August 17, 2006
-GAME( 200?, potc_111as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.11 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_111as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.11 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 1.12 August 24, 2006
-GAME( 200?, potc_113af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_113ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_113as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_113gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_113af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_113ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_113as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_113gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 1.14 October 11, 2006
-GAME( 200?, potc_115af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_115ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_115as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_115gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_115af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_115ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_115as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_115gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 2.00 April 11, 2007
-GAME( 200?, potc_300af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_300ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_300as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_300gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_400af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_400ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_400as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_400gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_300af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_300ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_300as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_300gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_400af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_400ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_400as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_400gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 5.00 September 27, 2007
-GAME( 200?, potc_600 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_600ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_600as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, potc_600gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sh_141 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Shrek v1.41", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, skc_090 ,skc_105, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v0.90 New Jersey", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_600 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_600ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_600as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, potc_600gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sh_141 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Shrek v1.41", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, skc_090 ,skc_105, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v0.90 New Jersey", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 1.00
// Missing version 1.01 April 10, 2006
// Missing version 1.02 April 12, 2006
-GAME( 200?, skc_103 ,skc_105, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.03", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, skc_103 ,skc_105, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.03", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 1.04 May 12, 2006
-GAME( 200?, skc_105 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.05", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_130ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_130ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_130es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_130gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_140e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_140ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_140ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_140es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_140gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_142e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.42", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_160e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_160ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_160ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_160es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_160gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_170e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_170ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_170ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_170es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_170gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_190e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_190ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_190ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_190es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_190gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_192e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_192ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_192ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_192es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_192gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_200e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_210e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_210f ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_210ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_210es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_210gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_220e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.20", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_230e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, sman_240 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_100a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v1.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_200a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_200f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_200g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_200i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_300a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_300f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_300g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_300i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_300l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_400a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_400f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_400g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_400i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_400l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_500a ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_500f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_500g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_500i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wof_500l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_103a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.03", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_105a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.05", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_106a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_106f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_106g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_106i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_106l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, skc_105 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.05", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_130ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_130ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_130es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_130gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_140e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_140ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_140ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_140es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_140gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_142e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.42", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_160e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_160ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_160ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_160es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_160gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_170e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_170ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_170ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_170es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_170gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_190e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_190ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_190ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_190es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_190gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_192e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_192ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_192ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_192es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_192gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_200e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_210e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_210f ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_210ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_210es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_210gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_220e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.20", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_230e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.30", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, sman_240 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.40", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_100a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v1.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_200a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_200f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_200g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_200i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_300a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_300f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_300g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_300i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_300l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_400a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_400f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_400g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_400i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_400l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_500a ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_500f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_500g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_500i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wof_500l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_103a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.03", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_105a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.05", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_106a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_106f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_106g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_106i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_106l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
// Missing version 1.07 should be 5 different files per language
-GAME( 200?, wpt_108a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_108f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_108g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_108i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_108l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_109a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_109f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_109f2 ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)(alt)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_109g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_109i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_109l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_111l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_112l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
-GAME( 200?, wpt_1400l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_108a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_108f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_108g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_108i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_108l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_109a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_109f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_109f2 ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)(alt)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_109g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_109i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_109l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_111l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_112l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (German,French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (Italian)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
+GAME( 200?, wpt_1400l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (Spanish)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL)
diff --git a/src/mame/drivers/sanremo.c b/src/mame/drivers/sanremo.c
index 2c25c399d0c..24636cbef3a 100644
--- a/src/mame/drivers/sanremo.c
+++ b/src/mame/drivers/sanremo.c
@@ -358,7 +358,7 @@ static MACHINE_CONFIG_START( sanremo, sanremo_state )
MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK)
// *** MC6845 init ***
- //
+ //
// Register: 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17
// Value: 0x45 0x30 0x36 0x0A 0x28 0x00 0x26 0x27 0x00 0x07 0x20 0x0B 0x00 0x00 0x00 0x00 0x00 0x00.
MCFG_MC6845_SHOW_BORDER_AREA(false)
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index ab7ca24516c..ff32b04da71 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -685,7 +685,7 @@ static MACHINE_CONFIG_START( savquest, savquest_state )
MCFG_VOODOO_TMUMEM(4,4)
MCFG_VOODOO_SCREEN_TAG("screen")
MCFG_VOODOO_CPU_TAG("maincpu")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(savquest_state,vblank_assert))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(savquest_state,vblank_assert))
MACHINE_CONFIG_END
ROM_START( savquest )
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 813d263e587..2cc703f1b17 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1573,8 +1573,8 @@ static MACHINE_CONFIG_DERIVED( triplep, scramble )
/* sound hardware */
MCFG_SOUND_MODIFY("8910.1")
MCFG_SOUND_CLOCK(18432000/12) // triple punch/knock out ay clock is 1.535MHz, derived from main cpu xtal; verified on hardware
-
-
+
+
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 76acfaccd17..1b846ac620c 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -3136,20 +3136,20 @@ DRIVER_INIT_MEMBER(seattle_state,hyprdriv)
*************************************/
/* Atari */
-GAME( 1996, wg3dh, 0, wg3dh, wg3dh, seattle_state, wg3dh, ROT0, "Atari Games", "Wayne Gretzky's 3D Hockey", GAME_SUPPORTS_SAVE )
-GAME( 1996, mace, 0, mace, mace, seattle_state, mace, ROT0, "Atari Games", "Mace: The Dark Age (boot ROM 1.0ce, HDD 1.0b)", GAME_SUPPORTS_SAVE )
-GAME( 1997, macea, mace, mace, mace, seattle_state, mace, ROT0, "Atari Games", "Mace: The Dark Age (HDD 1.0a)", GAME_SUPPORTS_SAVE )
+GAME( 1996, wg3dh, 0, wg3dh, wg3dh, seattle_state, wg3dh, ROT0, "Atari Games", "Wayne Gretzky's 3D Hockey", GAME_SUPPORTS_SAVE )
+GAME( 1996, mace, 0, mace, mace, seattle_state, mace, ROT0, "Atari Games", "Mace: The Dark Age (boot ROM 1.0ce, HDD 1.0b)", GAME_SUPPORTS_SAVE )
+GAME( 1997, macea, mace, mace, mace, seattle_state, mace, ROT0, "Atari Games", "Mace: The Dark Age (HDD 1.0a)", GAME_SUPPORTS_SAVE )
GAME( 1996, sfrush, 0, sfrush, sfrush, seattle_state, sfrush, ROT0, "Atari Games", "San Francisco Rush", GAME_SUPPORTS_SAVE )
GAME( 1996, sfrushrk, 0, sfrushrk, sfrushrk, seattle_state, sfrushrk, ROT0, "Atari Games", "San Francisco Rush: The Rock", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
-GAME( 1998, calspeed, 0, calspeed, calspeed, seattle_state, calspeed, ROT0, "Atari Games", "California Speed (Version 2.1a, 4/17/98)", GAME_SUPPORTS_SAVE )
-GAME( 1998, calspeeda,calspeed, calspeed, calspeed, seattle_state, calspeed, ROT0, "Atari Games", "California Speed (Version 1.0r7a 3/4/98)", GAME_SUPPORTS_SAVE )
-GAME( 1998, vaportrx, 0, vaportrx, vaportrx, seattle_state, vaportrx, ROT0, "Atari Games", "Vapor TRX", GAME_SUPPORTS_SAVE )
-GAME( 1998, vaportrxp,vaportrx, vaportrx, vaportrx, seattle_state, vaportrx, ROT0, "Atari Games", "Vapor TRX (prototype)", GAME_SUPPORTS_SAVE )
+GAME( 1998, calspeed, 0, calspeed, calspeed, seattle_state, calspeed, ROT0, "Atari Games", "California Speed (Version 2.1a, 4/17/98)", GAME_SUPPORTS_SAVE )
+GAME( 1998, calspeeda,calspeed, calspeed, calspeed, seattle_state, calspeed, ROT0, "Atari Games", "California Speed (Version 1.0r7a 3/4/98)", GAME_SUPPORTS_SAVE )
+GAME( 1998, vaportrx, 0, vaportrx, vaportrx, seattle_state, vaportrx, ROT0, "Atari Games", "Vapor TRX", GAME_SUPPORTS_SAVE )
+GAME( 1998, vaportrxp,vaportrx, vaportrx, vaportrx, seattle_state, vaportrx, ROT0, "Atari Games", "Vapor TRX (prototype)", GAME_SUPPORTS_SAVE )
/* Midway */
GAME( 1997, biofreak, 0, biofreak, biofreak, seattle_state, biofreak, ROT0, "Midway Games", "BioFreaks (prototype)", GAME_SUPPORTS_SAVE )
-GAME( 1997, blitz, 0, blitz, blitz, seattle_state, blitz, ROT0, "Midway Games", "NFL Blitz (boot ROM 1.2)", GAME_SUPPORTS_SAVE )
-GAME( 1997, blitz11, blitz, blitz, blitz, seattle_state, blitz, ROT0, "Midway Games", "NFL Blitz (boot ROM 1.1)", GAME_SUPPORTS_SAVE )
+GAME( 1997, blitz, 0, blitz, blitz, seattle_state, blitz, ROT0, "Midway Games", "NFL Blitz (boot ROM 1.2)", GAME_SUPPORTS_SAVE )
+GAME( 1997, blitz11, blitz, blitz, blitz, seattle_state, blitz, ROT0, "Midway Games", "NFL Blitz (boot ROM 1.1)", GAME_SUPPORTS_SAVE )
GAME( 1998, blitz99, 0, blitz99, blitz99, seattle_state, blitz99, ROT0, "Midway Games", "NFL Blitz '99", GAME_SUPPORTS_SAVE )
GAME( 1999, blitz2k, 0, blitz2k, blitz99, seattle_state, blitz2k, ROT0, "Midway Games", "NFL Blitz 2000 Gold Edition", GAME_SUPPORTS_SAVE )
GAME( 1998, carnevil, 0, carnevil, carnevil, seattle_state, carnevil, ROT0, "Midway Games", "CarnEvil (v1.0.3)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 16a94fdaa73..87fcc9cbb36 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -3889,7 +3889,7 @@ ROM_START( altbeastj1 )
ROM_REGION( 0x2000, "maincpu:key", 0 ) // decryption key
// reconstructed key; some of the RNG-independent bits could be incorrect
- ROM_LOAD( "317-0065.key", 0x0000, 0x2000, BAD_DUMP CRC(9e0f619d) SHA1(b0392e84d1c9af681dc9bb2ca3636e7cc41a605b) )
+ ROM_LOAD( "317-0065.key", 0x0000, 0x2000, BAD_DUMP CRC(9e0f619d) SHA1(b0392e84d1c9af681dc9bb2ca3636e7cc41a605b) )
ROM_REGION( 0x60000, "gfx1", 0 ) // tiles
ROM_LOAD( "opr-11674.a14", 0x00000, 0x20000, CRC(a57a66d5) SHA1(5103583d48997abad12a0c5fee26431c486ced52) )
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index e1cd55204c3..7cd9319d123 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -642,7 +642,7 @@ void segaxbd_state::machine_reset()
{
m_segaic16vid->segaic16_tilemap_reset(*m_screen);
- // hook the RESET line, which resets CPU #1
+ // hook the RESET line, which resets CPU #1
m_maincpu->set_reset_callback(write_line_delegate(FUNC(segaxbd_state::m68k_reset_callback),this));
// start timers to track interrupts
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 40f02ebfe33..871100d39ea 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -271,8 +271,8 @@ static MACHINE_CONFIG_START( sg1000a, sg1000a_state )
/* video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(sg1000a_state, vdp_interrupt))
-
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(sg1000a_state, vdp_interrupt))
+
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index a502773352f..27ac32924f9 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -394,7 +394,7 @@ static MACHINE_CONFIG_START( chainrec, simpl156_state )
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_PALETTE_MEMBITS(16)
-
+
MCFG_GFXDECODE_ADD("gfxdecode", "palette", simpl156)
MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 2927018dc30..305d81b86a0 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -322,7 +322,7 @@ static MACHINE_CONFIG_START( simpsons, simpsons_state )
MCFG_KONAMICPU_LINE_CB(WRITE8(simpsons_state, banking_callback))
MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(z80_map) /* NMIs are generated by the 053260 */
+ MCFG_CPU_PROGRAM_MAP(z80_map) /* NMIs are generated by the 053260 */
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank0000_map)
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index f7ad812e2d9..564ec1de408 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -174,7 +174,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
optional_shared_ptr<UINT8> m_generic_paletteram_8;
- optional_shared_ptr<UINT8> m_generic_paletteram2_8;
+ optional_shared_ptr<UINT8> m_generic_paletteram2_8;
};
@@ -205,7 +205,7 @@ TILE_GET_INFO_MEMBER(skylncr_state::get_tile_info)
TILE_GET_INFO_MEMBER(skylncr_state::get_reel_1_tile_info)
{
UINT16 code = m_reeltiles_1_ram[ tile_index ] + (m_reeltileshigh_1_ram[ tile_index ] << 8);
- int pal = (code & 0x8000) >> 15;
+ int pal = (code & 0x8000) >> 15;
SET_TILE_INFO_MEMBER(1, code&0x7fff, pal^1, TILE_FLIPYX( 0 ));
}
@@ -611,7 +611,7 @@ static const gfx_layout layout8x32x8_alt2 = /* for neraidov */
RGN_FRAC(1,2)+8*1, 8*1,
RGN_FRAC(1,2)+8*0, 8*0,
RGN_FRAC(1,2)+8*3, 8*3,
- RGN_FRAC(1,2)+8*2, 8*2
+ RGN_FRAC(1,2)+8*2, 8*2
},
{
STEP16(0,8*4),
@@ -634,7 +634,7 @@ GFXDECODE_END
static GFXDECODE_START( neraidou )
GFXDECODE_ENTRY( "gfx1", 0, layout8x8x8_alt, 0, 2 )
GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_alt2, 0, 2 )
-// GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_alt, 0x100, 1 )
+// GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_alt, 0x100, 1 )
GFXDECODE_END
static GFXDECODE_START( sstar97 )
@@ -834,12 +834,12 @@ static INPUT_PORTS_START( leader )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT )
PORT_START("DSW1") /* $02 (PPI0 port C) */
- PORT_DIPNAME( 0x11, 0x11, "Butterfly Max Mul" ) PORT_DIPLOCATION("DSW-A:!4,!5")
+ PORT_DIPNAME( 0x11, 0x11, "Butterfly Max Mul" ) PORT_DIPLOCATION("DSW-A:!4,!5")
PORT_DIPSETTING( 0x11, "5" )
PORT_DIPSETTING( 0x01, "7" )
PORT_DIPSETTING( 0x10, "8" )
PORT_DIPSETTING( 0x00, "12" )
- PORT_DIPNAME( 0x0e, 0x00, "Main Win Rate" ) PORT_DIPLOCATION("DSW-A:!6,!7,!8")
+ PORT_DIPNAME( 0x0e, 0x00, "Main Win Rate" ) PORT_DIPLOCATION("DSW-A:!6,!7,!8")
PORT_DIPSETTING( 0x0e, "55%" )
PORT_DIPSETTING( 0x0c, "60%" )
PORT_DIPSETTING( 0x0a, "65%" )
@@ -848,42 +848,42 @@ static INPUT_PORTS_START( leader )
PORT_DIPSETTING( 0x04, "80%" )
PORT_DIPSETTING( 0x02, "85%" )
PORT_DIPSETTING( 0x00, "90%" )
- PORT_DIPNAME( 0x20, 0x00, "Reels Speed" ) PORT_DIPLOCATION("DSW-A:!3")
+ PORT_DIPNAME( 0x20, 0x00, "Reels Speed" ) PORT_DIPLOCATION("DSW-A:!3")
PORT_DIPSETTING( 0x20, "Slow" )
PORT_DIPSETTING( 0x00, "Fast" )
- PORT_DIPNAME( 0x40, 0x00, "Bonus Score" ) PORT_DIPLOCATION("DSW-A:!2")
+ PORT_DIPNAME( 0x40, 0x00, "Bonus Score" ) PORT_DIPLOCATION("DSW-A:!2")
PORT_DIPSETTING( 0x40, "24" )
PORT_DIPSETTING( 0x00, "32" )
- PORT_DIPNAME( 0x80, 0x00, "Key Out" ) PORT_DIPLOCATION("DSW-A:!1")
+ PORT_DIPNAME( 0x80, 0x00, "Key Out" ) PORT_DIPLOCATION("DSW-A:!1")
PORT_DIPSETTING( 0x00, "x1" )
PORT_DIPSETTING( 0x80, "x100" )
PORT_START("DSW2") /* $10 (PPI1 port A) */
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-B:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-B:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-B:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-B:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, "Double-Up" ) PORT_DIPLOCATION("DSW-B:3")
+ PORT_DIPNAME( 0x04, 0x04, "Double-Up" ) PORT_DIPLOCATION("DSW-B:3")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x18, 0x18, "Refund Coin Limit" ) PORT_DIPLOCATION("DSW-B:4,5")
+ PORT_DIPNAME( 0x18, 0x18, "Refund Coin Limit" ) PORT_DIPLOCATION("DSW-B:4,5")
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x18, "1000" )
PORT_DIPSETTING( 0x10, "2000" )
PORT_DIPSETTING( 0x08, "5000" )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-B:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-B:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0xc0, 0xc0, "Butterfly Win Rate" ) PORT_DIPLOCATION("DSW-B:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, "Butterfly Win Rate" ) PORT_DIPLOCATION("DSW-B:7,8")
PORT_DIPSETTING( 0xc0, "15%" )
PORT_DIPSETTING( 0x80, "20%" )
PORT_DIPSETTING( 0x40, "25%" )
PORT_DIPSETTING( 0x00, "30%" )
PORT_START("DSW3") /* AY8910 port A */
- PORT_DIPNAME( 0x07, 0x07, "Coinage A, B & C" ) PORT_DIPLOCATION("DSW-D:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, "Coinage A, B & C" ) PORT_DIPLOCATION("DSW-D:1,2,3")
PORT_DIPSETTING( 0x00, "1 Coin / 1 Credit" )
PORT_DIPSETTING( 0x01, "1 Coin / 5 Credits" )
PORT_DIPSETTING( 0x02, "1 Coin / 10 Credits" )
@@ -892,22 +892,22 @@ static INPUT_PORTS_START( leader )
PORT_DIPSETTING( 0x05, "1 Coin / 40 Credits" )
PORT_DIPSETTING( 0x06, "1 Coin / 50 Credits" )
PORT_DIPSETTING( 0x07, "1 Coin / 100 Credit" )
- PORT_DIPNAME( 0x18, 0x00, "Credit Limit" ) PORT_DIPLOCATION("DSW-D:4,5")
+ PORT_DIPNAME( 0x18, 0x00, "Credit Limit" ) PORT_DIPLOCATION("DSW-D:4,5")
PORT_DIPSETTING( 0x00, "120000" )
PORT_DIPSETTING( 0x08, "100000" )
PORT_DIPSETTING( 0x10, "80000" )
PORT_DIPSETTING( 0x18, "50000" )
- PORT_DIPNAME( 0x20, 0x20, "Max Win Bonus" ) PORT_DIPLOCATION("DSW-D:6")
+ PORT_DIPNAME( 0x20, 0x20, "Max Win Bonus" ) PORT_DIPLOCATION("DSW-D:6")
PORT_DIPSETTING( 0x20, "10000" )
PORT_DIPSETTING( 0x00, "20000" )
- PORT_DIPNAME( 0xc0, 0xc0, "Minimum Bet" ) PORT_DIPLOCATION("DSW-D:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, "Minimum Bet" ) PORT_DIPLOCATION("DSW-D:7,8")
PORT_DIPSETTING( 0xc0, "8" )
PORT_DIPSETTING( 0x80, "16" )
PORT_DIPSETTING( 0x40, "32" )
PORT_DIPSETTING( 0x00, "64" )
PORT_START("DSW4") /* AY8910 port B */
- PORT_DIPNAME( 0x07, 0x07, "Remote Credits" ) PORT_DIPLOCATION("DSW-C:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, "Remote Credits" ) PORT_DIPLOCATION("DSW-C:1,2,3")
PORT_DIPSETTING( 0x00, "1 Pulse / 100 Credits" )
PORT_DIPSETTING( 0x01, "1 Pulse / 110 Credits" )
PORT_DIPSETTING( 0x02, "1 Pulse / 120 Credits" )
@@ -916,18 +916,18 @@ static INPUT_PORTS_START( leader )
PORT_DIPSETTING( 0x05, "1 Pulse / 400 Credits" )
PORT_DIPSETTING( 0x06, "1 Pulse / 500 Credits" )
PORT_DIPSETTING( 0x07, "1 Pulse / 1000 Credits" )
- PORT_DIPNAME( 0x18, 0x18, "High Bet Limit" ) PORT_DIPLOCATION("DSW-C:4,5")
+ PORT_DIPNAME( 0x18, 0x18, "High Bet Limit" ) PORT_DIPLOCATION("DSW-C:4,5")
PORT_DIPSETTING( 0x18, "32" )
PORT_DIPSETTING( 0x10, "50" )
PORT_DIPSETTING( 0x08, "72" )
PORT_DIPSETTING( 0x00, "96" )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-C:6")
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-C:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-C:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW-C:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x00, "Coin Lock" ) PORT_DIPLOCATION("DSW-C:8")
+ PORT_DIPNAME( 0x80, 0x00, "Coin Lock" ) PORT_DIPLOCATION("DSW-C:8")
PORT_DIPSETTING( 0x80, "Locked" )
PORT_DIPSETTING( 0x00, "Normal" )
INPUT_PORTS_END
@@ -976,7 +976,7 @@ static INPUT_PORTS_START( neraidou )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT )
PORT_START("DSW1") /* $02 (PPI0 port C) */
- PORT_DIPNAME( 0x01, 0x01, "Hardware Type (could be inverted)" ) // leave it off, otherwise the game works bad and resets
+ PORT_DIPNAME( 0x01, 0x01, "Hardware Type (could be inverted)" ) // leave it off, otherwise the game works bad and resets
PORT_DIPSETTING( 0x01, "Rolla" )
PORT_DIPSETTING( 0x00, "Sky" )
PORT_DIPNAME( 0x0e, 0x0e, "Main Game Percentage" )
@@ -1120,7 +1120,7 @@ static INPUT_PORTS_START( gallag50 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT )
PORT_START("DSW1") /* $02 (PPI0 port C) */
- PORT_DIPNAME( 0x01, 0x01, "Hardware Type (could be inverted)" ) // leave it off, otherwise the game works bad and resets
+ PORT_DIPNAME( 0x01, 0x01, "Hardware Type (could be inverted)" ) // leave it off, otherwise the game works bad and resets
PORT_DIPSETTING( 0x01, "Rolla" )
PORT_DIPSETTING( 0x00, "Sky" )
PORT_DIPNAME( 0x0e, 0x0e, "Main Game Percentage" )
@@ -1161,7 +1161,7 @@ static INPUT_PORTS_START( gallag50 )
PORT_DIPNAME( 0x10, 0x00, "Title" )
PORT_DIPSETTING( 0x10, "Petalouda (Greek for Butterfly)" )
PORT_DIPSETTING( 0x00, "Gallag" )
- PORT_DIPNAME( 0x20, 0x20, "Alt GFX Decode (For different HW)" ) // could be a mix with 08 'Rolla GFX'
+ PORT_DIPNAME( 0x20, 0x20, "Alt GFX Decode (For different HW)" ) // could be a mix with 08 'Rolla GFX'
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0xc0, 0xc0, "Butterfly Win Rate" )
@@ -1502,10 +1502,10 @@ ROM_START( mbutrfly )
ROM_LOAD16_BYTE( "mb.u35", 0x40001, 0x20000, CRC(fdaa2288) SHA1(199323c2bd2af0d9b1d254a330670e2845f21dd9) )
ROM_REGION( 0x80000, "gfx2", 0 )
- ROM_LOAD16_BYTE( "mb.u52", 0x00000, 0x20000, CRC(15051537) SHA1(086c38c05c605f297a7bc470eb51763a7648e72c) ) // identical to butterfly.
- ROM_LOAD16_BYTE( "mb.u54", 0x00001, 0x20000, CRC(8e34d029) SHA1(ae316f2f34768938a07d62db110ce59d2751abaa) ) // identical to butterfly.
- ROM_LOAD16_BYTE( "mb.u56", 0x40000, 0x20000, CRC(21ca47f8) SHA1(b192be06a2eb817776309580dc64fd76772a8d50) ) // this one is straight fixed for reel tiles 6C-DF.
- ROM_LOAD16_BYTE( "mb.u58", 0x40001, 0x20000, CRC(21ca47f8) SHA1(b192be06a2eb817776309580dc64fd76772a8d50) ) // identical to butterfly.
+ ROM_LOAD16_BYTE( "mb.u52", 0x00000, 0x20000, CRC(15051537) SHA1(086c38c05c605f297a7bc470eb51763a7648e72c) ) // identical to butterfly.
+ ROM_LOAD16_BYTE( "mb.u54", 0x00001, 0x20000, CRC(8e34d029) SHA1(ae316f2f34768938a07d62db110ce59d2751abaa) ) // identical to butterfly.
+ ROM_LOAD16_BYTE( "mb.u56", 0x40000, 0x20000, CRC(21ca47f8) SHA1(b192be06a2eb817776309580dc64fd76772a8d50) ) // this one is straight fixed for reel tiles 6C-DF.
+ ROM_LOAD16_BYTE( "mb.u58", 0x40001, 0x20000, CRC(21ca47f8) SHA1(b192be06a2eb817776309580dc64fd76772a8d50) ) // identical to butterfly.
ROM_END
ROM_START( gallag50 )
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 66edc4422bd..0fb93befc49 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -499,7 +499,7 @@ static MACHINE_CONFIG_START( spy, spy_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", spy_state, spy_interrupt)
MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(spy_sound_map) /* nmi by the sound chip */
+ MCFG_CPU_PROGRAM_MAP(spy_sound_map) /* nmi by the sound chip */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -562,7 +562,7 @@ ROM_START( spy )
ROM_LOAD32_WORD( "857b09.bin", 0x00000, 0x40000, CRC(b8780966) SHA1(6c255f1e4d1398fa9010a1ae0f5172dc524df109) )
ROM_LOAD32_WORD( "857b08.bin", 0x00002, 0x40000, CRC(3e4d8d50) SHA1(70f45a725bf1e9d15285ffb6b280945f7ce7faf0) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_WORD( "857b06.bin", 0x00000, 0x80000, CRC(7b515fb1) SHA1(3830649d47964940023760b76e2bf94bb9163f23) )
ROM_LOAD32_WORD( "857b05.bin", 0x00002, 0x80000, CRC(27b0f73b) SHA1(6b6a3da11c3005e3a62e6280818c18ae2ea31800) )
@@ -589,8 +589,8 @@ ROM_START( spyu )
ROM_LOAD32_WORD( "857b09.bin", 0x00000, 0x40000, CRC(b8780966) SHA1(6c255f1e4d1398fa9010a1ae0f5172dc524df109) )
ROM_LOAD32_WORD( "857b08.bin", 0x00002, 0x40000, CRC(3e4d8d50) SHA1(70f45a725bf1e9d15285ffb6b280945f7ce7faf0) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
- ROM_LOAD32_WORD( "857b06.bin", 0x00000, 0x80000, CRC(7b515fb1) SHA1(3830649d47964940023760b76e2bf94bb9163f23) )
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_LOAD32_WORD( "857b06.bin", 0x00000, 0x80000, CRC(7b515fb1) SHA1(3830649d47964940023760b76e2bf94bb9163f23) )
ROM_LOAD32_WORD( "857b05.bin", 0x00002, 0x80000, CRC(27b0f73b) SHA1(6b6a3da11c3005e3a62e6280818c18ae2ea31800) )
ROM_REGION( 0x0200, "proms", 0 )
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 21ccb39afb3..f5a6de15702 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -582,8 +582,8 @@ static MACHINE_CONFIG_START( statriv2, statriv2_state )
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
/* PPI 8255 group A & B set to Mode 0.
- Port A, B and lower 4 bits of C set as Input.
- High 4 bits of C set as Output */
+ Port A, B and lower 4 bits of C set as Input.
+ High 4 bits of C set as Output */
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
diff --git a/src/mame/drivers/supercrd.c b/src/mame/drivers/supercrd.c
index a50ba81898c..3f9f84bde5d 100644
--- a/src/mame/drivers/supercrd.c
+++ b/src/mame/drivers/supercrd.c
@@ -435,8 +435,8 @@ static MACHINE_CONFIG_START( supercrd, supercrd_state )
MCFG_VIDEO_START_OVERRIDE(supercrd_state, supercrd)
// MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/8)
-// MCFG_MC6845_SHOW_BORDER_AREA(false)
-// MCFG_MC6845_CHAR_WIDTH(4)
+// MCFG_MC6845_SHOW_BORDER_AREA(false)
+// MCFG_MC6845_CHAR_WIDTH(4)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 84eb864aa91..6109a92614d 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -156,7 +156,7 @@ void surpratk_state::machine_reset()
WRITE8_MEMBER( surpratk_state::banking_callback )
{
-// logerror("%04x: setlines %02x\n", machine().device("maincpu")->safe_pc(), data);
+// logerror("%04x: setlines %02x\n", machine().device("maincpu")->safe_pc(), data);
membank("bank1")->set_entry(data & 0x1f);
}
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 5ed4628b635..54e0b746566 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2145,7 +2145,7 @@ static MACHINE_CONFIG_START( crimec, taitob_state )
MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(WRITELINE(taitob_state, irqhandler))
-
+
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
MCFG_SOUND_ROUTE(2, "mono", 1.0)
@@ -2264,7 +2264,7 @@ static MACHINE_CONFIG_START( rambo3p, taitob_state )
MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(WRITELINE(taitob_state, irqhandler))
-
+
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
MCFG_SOUND_ROUTE(2, "mono", 1.0)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 0d75bfa315b..f2facb8826d 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -1861,7 +1861,7 @@ static MACHINE_CONFIG_START( kurikint, taitol_state )
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
MCFG_CPU_PROGRAM_MAP(kurikint_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state,irq_callback)
-
+
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", taitol_state, vbl_interrupt, "screen", 0, 1)
MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* verified on pcb */
diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c
index 35f494f2948..53812d3c23c 100644
--- a/src/mame/drivers/taitopjc.c
+++ b/src/mame/drivers/taitopjc.c
@@ -56,24 +56,24 @@
/*
PPC -> TLCS Commands:
- 0x5010: ? RTC?
- 0x5020: ? RTC?
- 0x6000: ? Backup RAM init?
+ 0x5010: ? RTC?
+ 0x5020: ? RTC?
+ 0x6000: ? Backup RAM init?
0x6010: ? Backup RAM Read. Address in io_shared[0x1d00].
0x6020: ? Backup RAM Write. Address in io_shared[0x1d00].
- 0x6030: ? ?
- 0x6040: ? ?
- 0x4000: ? Sound?
- 0x4001: ?
- 0x4002: ?
- 0x4003: ?
- 0x4004: ?
- 0xf055:
- 0xf0ff:
- 0xf000:
- 0xf001:
- 0xf010:
- 0xf020:
+ 0x6030: ? ?
+ 0x6040: ? ?
+ 0x4000: ? Sound?
+ 0x4001: ?
+ 0x4002: ?
+ 0x4003: ?
+ 0x4004: ?
+ 0xf055:
+ 0xf0ff:
+ 0xf000:
+ 0xf001:
+ 0xf010:
+ 0xf020:
*/
@@ -83,8 +83,8 @@
#include "cpu/mn10200/mn10200.h"
#include "machine/nvram.h"
-#define LOG_TLCS_TO_PPC_COMMANDS 1
-#define LOG_PPC_TO_TLCS_COMMANDS 1
+#define LOG_TLCS_TO_PPC_COMMANDS 1
+#define LOG_PPC_TO_TLCS_COMMANDS 1
static UINT32 jc_char_ram[0x2000];
@@ -269,7 +269,7 @@ WRITE64_MEMBER(taitopjc_state::ppc_common_w)
{
UINT32 address = offset * 2;
-// logerror("ppc_common_w: %08X, %I64X, %I64X\n", offset, data, mem_mask);
+// logerror("ppc_common_w: %08X, %I64X, %I64X\n", offset, data, mem_mask);
if (ACCESSING_BITS_48_63)
{
@@ -422,7 +422,7 @@ WRITE8_MEMBER(taitopjc_state::tlcs_common_w)
#if LOG_TLCS_TO_PPC_COMMANDS
printf("TLCS -> PPC cmd %04X\n", m_io_share_ram[0xffe]);
#endif
-
+
m_iocpu->set_input_line(TLCS900_INT1, CLEAR_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
}
@@ -472,7 +472,7 @@ WRITE16_MEMBER(taitopjc_state::tlcs_unk_w)
static ADDRESS_MAP_START( tlcs900h_mem, AS_PROGRAM, 16, taitopjc_state )
AM_RANGE(0x010000, 0x02ffff) AM_RAM // Work RAM
AM_RANGE(0x040000, 0x0400ff) AM_READWRITE8(tlcs_sound_r, tlcs_sound_w, 0xffff)
- AM_RANGE(0x044000, 0x045fff) AM_RAM AM_SHARE("nvram")
+ AM_RANGE(0x044000, 0x045fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x060000, 0x061fff) AM_READWRITE8(tlcs_common_r, tlcs_common_w, 0xffff)
AM_RANGE(0x06c000, 0x06c00f) AM_WRITE(tlcs_unk_w)
AM_RANGE(0xfc0000, 0xffffff) AM_ROM AM_REGION("io_cpu", 0)
@@ -536,7 +536,7 @@ MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(taitopjc_state, optiger)
{
UINT8 *rom = (UINT8*)memregion("io_cpu")->base();
-
+
// skip sound check
rom[0x217] = 0x00;
rom[0x218] = 0x00;
diff --git a/src/mame/drivers/tapatune.c b/src/mame/drivers/tapatune.c
index 26e91cd0c08..6bdf74475f3 100644
--- a/src/mame/drivers/tapatune.c
+++ b/src/mame/drivers/tapatune.c
@@ -151,11 +151,11 @@ MC6845_BEGIN_UPDATE( tapatune_state::crtc_begin_update )
int r = m_paletteram[3 * i + 0];
int g = m_paletteram[3 * i + 1];
int b = m_paletteram[3 * i + 2];
-
+
r = pal6bit(r);
g = pal6bit(g);
b = pal6bit(b);
-
+
m_pens[i] = rgb_t(r, g, b);
}
}
@@ -513,7 +513,7 @@ static MACHINE_CONFIG_START( tapatune, tapatune_state )
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MCFG_NVRAM_ADD_0FILL("nvram")
-
+
MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_24MHz / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(5)
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index ce085cc48a0..7ec9da8d8df 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -491,29 +491,29 @@ static INPUT_PORTS_START( roundup5 )
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
PORT_START("DSW") /* Verified by Manual & in Game service menu */
- PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("SW-1:1,2")
+ PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("SW-1:1,2")
PORT_DIPSETTING( 0x0003, "Shortest" )
PORT_DIPSETTING( 0x0002, "Short" )
PORT_DIPSETTING( 0x0000, DEF_STR( Medium ) )
PORT_DIPSETTING( 0x0001, "Long" )
- PORT_DIPNAME( 0x000c, 0x0000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW-1:3,4")
+ PORT_DIPNAME( 0x000c, 0x0000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW-1:3,4")
PORT_DIPSETTING( 0x0004, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Medium ) )
PORT_DIPSETTING( 0x0008, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x000c, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x0010, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW-1:5")
+ PORT_DIPNAME( 0x0010, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW-1:5")
PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0000, DEF_STR( Language ) ) PORT_DIPLOCATION("SW-1:6")
+ PORT_DIPNAME( 0x0020, 0x0000, DEF_STR( Language ) ) PORT_DIPLOCATION("SW-1:6")
PORT_DIPSETTING( 0x0020, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x0000, DEF_STR( English ) )
- PORT_DIPNAME( 0x0040, 0x0000, "Stage 5 Continue" ) PORT_DIPLOCATION("SW-1:7")
+ PORT_DIPNAME( 0x0040, 0x0000, "Stage 5 Continue" ) PORT_DIPLOCATION("SW-1:7")
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0000, "Output Mode" ) PORT_DIPLOCATION("SW-1:8")
+ PORT_DIPNAME( 0x0080, 0x0000, "Output Mode" ) PORT_DIPLOCATION("SW-1:8")
PORT_DIPSETTING( 0x0000, "A (Light)" )
PORT_DIPSETTING( 0x0080, "B (Vibration)" )
- PORT_DIPNAME( 0x0700, 0x0000, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW-2:1,2,3")
+ PORT_DIPNAME( 0x0700, 0x0000, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW-2:1,2,3")
PORT_DIPSETTING( 0x0600, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x0500, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0400, DEF_STR( 4C_1C ) )
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( roundup5 )
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x0100, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0700, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x3800, 0x0000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW-2:4,5,6")
+ PORT_DIPNAME( 0x3800, 0x0000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW-2:4,5,6")
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x0800, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x1000, DEF_STR( 1C_3C ) )
@@ -531,10 +531,10 @@ static INPUT_PORTS_START( roundup5 )
PORT_DIPSETTING( 0x2800, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x3000, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x3800, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x4000, 0x0000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW-2:7") /* Manual only shows nothing for this one */
+ PORT_DIPNAME( 0x4000, 0x0000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW-2:7") /* Manual only shows nothing for this one */
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x8000, 0x8000, "Hardware Test Mode" ) PORT_DIPLOCATION("SW-2:8") /* Manual only shows nothing for this one */
+ PORT_DIPNAME( 0x8000, 0x8000, "Hardware Test Mode" ) PORT_DIPLOCATION("SW-2:8") /* Manual only shows nothing for this one */
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
INPUT_PORTS_END
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index 0be7784c7fc..4cc1e6934f3 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -300,12 +300,12 @@ public:
m_avg(*this, "avg"),
m_rom(*this, "maincpu"),
m_knob_p1(*this, TEMPEST_KNOB_P1_TAG),
- m_knob_p2(*this, TEMPEST_KNOB_P2_TAG),
- m_buttons_p1(*this, TEMPEST_BUTTONS_P1_TAG),
- m_buttons_p2(*this, TEMPEST_BUTTONS_P2_TAG),
- m_in1(*this, "IN1/DSW0"),
- m_in2(*this, "IN2")
- { }
+ m_knob_p2(*this, TEMPEST_KNOB_P2_TAG),
+ m_buttons_p1(*this, TEMPEST_BUTTONS_P1_TAG),
+ m_buttons_p2(*this, TEMPEST_BUTTONS_P2_TAG),
+ m_in1(*this, "IN1/DSW0"),
+ m_in2(*this, "IN2")
+ { }
required_device<cpu_device> m_maincpu;
required_device<mathbox_device> m_mathbox;
@@ -313,13 +313,13 @@ public:
required_memory_region m_rom;
required_ioport m_knob_p1;
- required_ioport m_knob_p2;
- required_ioport m_buttons_p1;
- required_ioport m_buttons_p2;
- required_ioport m_in1;
- required_ioport m_in2;
+ required_ioport m_knob_p2;
+ required_ioport m_buttons_p1;
+ required_ioport m_buttons_p2;
+ required_ioport m_in1;
+ required_ioport m_in2;
- UINT8 m_player_select;
+ UINT8 m_player_select;
DECLARE_WRITE8_MEMBER(wdclr_w);
DECLARE_WRITE8_MEMBER(tempest_led_w);
DECLARE_WRITE8_MEMBER(tempest_coin_w);
@@ -329,9 +329,9 @@ public:
DECLARE_READ8_MEMBER(input_port_1_bit_r);
DECLARE_READ8_MEMBER(input_port_2_bit_r);
- DECLARE_READ8_MEMBER(rom_ae1f_r);
+ DECLARE_READ8_MEMBER(rom_ae1f_r);
- virtual void machine_start();
+ virtual void machine_start();
};
@@ -365,7 +365,7 @@ CUSTOM_INPUT_MEMBER(tempest_state::tempest_knob_r)
CUSTOM_INPUT_MEMBER(tempest_state::tempest_buttons_r)
{
- return (m_player_select == 0) ? m_buttons_p1->read() : m_buttons_p2->read();
+ return (m_player_select == 0) ? m_buttons_p1->read() : m_buttons_p2->read();
}
@@ -428,8 +428,8 @@ READ8_MEMBER(tempest_state::rom_ae1f_r)
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(100));
machine().scheduler().abort_timeslice();
- const UINT8 *rom = m_rom->base();
- return rom[0xae1f];
+ const UINT8 *rom = m_rom->base();
+ return rom[0xae1f];
}
@@ -454,8 +454,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tempest_state )
AM_RANGE(0x60c0, 0x60cf) AM_DEVREADWRITE("pokey1", pokey_device, read, write)
AM_RANGE(0x60d0, 0x60df) AM_DEVREADWRITE("pokey2", pokey_device, read, write)
AM_RANGE(0x60e0, 0x60e0) AM_WRITE(tempest_led_w)
- AM_RANGE(0xae1f, 0xae1f) AM_READ(rom_ae1f_r)
- AM_RANGE(0x9000, 0xdfff) AM_ROM
+ AM_RANGE(0xae1f, 0xae1f) AM_READ(rom_ae1f_r)
+ AM_RANGE(0x9000, 0xdfff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_ROM /* for the reset / interrupt vectors */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index ec167eea09b..1c9db8201a3 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -724,7 +724,7 @@ ROM_START( scontra )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */
ROM_LOAD( "775-c01.bin", 0x00000, 0x08000, CRC(0ced785a) SHA1(1eebe005a968fbaac595c168499107e34763976c) )
- ROM_REGION( 0x100000, "k052109", 0 ) /* tiles */
+ ROM_REGION( 0x100000, "k052109", 0 ) /* tiles */
ROM_LOAD32_BYTE( "775-a07a.bin", 0x00000, 0x20000, CRC(e716bdf3) SHA1(82e10132f248aed8cc1aea6bb7afe9a1479c8b59) )
ROM_LOAD32_BYTE( "775-a07e.bin", 0x00001, 0x20000, CRC(0986e3a5) SHA1(61c33a3f2e4fde7d23d440b5c3151fe38e25716b) )
ROM_LOAD32_BYTE( "775-a08a.bin", 0x00002, 0x20000, CRC(3ddd11a4) SHA1(4831a891d6cb4507053d576eddd658c338318176) )
@@ -738,7 +738,7 @@ ROM_START( scontra )
ROM_LOAD32_BYTE( "775-f08d.bin", 0xc0002, 0x10000, CRC(102dcace) SHA1(03036b6d9d66a12cb3e97980f149c09d1efbd6d8) )
ROM_LOAD32_BYTE( "775-f08h.bin", 0xc0003, 0x10000, CRC(ad9d7016) SHA1(91e9f279b781eefcafffc70afe207f35cc6f4d9d) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "775-a05a.bin", 0x00000, 0x10000, CRC(a0767045) SHA1(e6df0731a9fb3b3d918607de81844e1f9353aac7) )
ROM_LOAD32_BYTE( "775-a05e.bin", 0x00001, 0x10000, CRC(2f656f08) SHA1(140e7948c45d27c6705622d588a65b59ebcc624c) )
ROM_LOAD32_BYTE( "775-a06a.bin", 0x00002, 0x10000, CRC(77a34ad0) SHA1(3653fb8458c1e7eb7d83b5cd63f02343c0f2d93e) )
@@ -779,7 +779,7 @@ ROM_START( scontraj )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */
ROM_LOAD( "775-c01.bin", 0x00000, 0x08000, CRC(0ced785a) SHA1(1eebe005a968fbaac595c168499107e34763976c) )
- ROM_REGION( 0x100000, "k052109", 0 ) /* tiles */
+ ROM_REGION( 0x100000, "k052109", 0 ) /* tiles */
ROM_LOAD32_BYTE( "775-a07a.bin", 0x00000, 0x20000, CRC(e716bdf3) SHA1(82e10132f248aed8cc1aea6bb7afe9a1479c8b59) )
ROM_LOAD32_BYTE( "775-a07e.bin", 0x00001, 0x20000, CRC(0986e3a5) SHA1(61c33a3f2e4fde7d23d440b5c3151fe38e25716b) )
ROM_LOAD32_BYTE( "775-a08a.bin", 0x00002, 0x20000, CRC(3ddd11a4) SHA1(4831a891d6cb4507053d576eddd658c338318176) )
@@ -793,7 +793,7 @@ ROM_START( scontraj )
ROM_LOAD32_BYTE( "775-f08d.bin", 0xc0002, 0x10000, CRC(102dcace) SHA1(03036b6d9d66a12cb3e97980f149c09d1efbd6d8) )
ROM_LOAD32_BYTE( "775-f08h.bin", 0xc0003, 0x10000, CRC(ad9d7016) SHA1(91e9f279b781eefcafffc70afe207f35cc6f4d9d) )
- ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x100000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "775-a05a.bin", 0x00000, 0x10000, CRC(a0767045) SHA1(e6df0731a9fb3b3d918607de81844e1f9353aac7) )
ROM_LOAD32_BYTE( "775-a05e.bin", 0x00001, 0x10000, CRC(2f656f08) SHA1(140e7948c45d27c6705622d588a65b59ebcc624c) )
ROM_LOAD32_BYTE( "775-a06a.bin", 0x00002, 0x10000, CRC(77a34ad0) SHA1(3653fb8458c1e7eb7d83b5cd63f02343c0f2d93e) )
@@ -844,7 +844,7 @@ ROM_START( thunderx )
ROM_LOAD32_BYTE( "873c07b.e4", 0x40002, 0x10000, CRC(12a2b8ba) SHA1(ffa32ca116e0b6ca65bb9ce83dd28f5c027956a5) )
ROM_LOAD32_BYTE( "873c07d.e3", 0x40003, 0x10000, CRC(fae9f965) SHA1(780c234507835c37bde445ab34f069714cc7a506) )
- ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "873c04a.f11", 0x00000, 0x10000, CRC(f7740bf3) SHA1(f64b7e807f19a9523a517024a9eb56736cdda6bb) )
ROM_LOAD32_BYTE( "873c04c.f10", 0x00001, 0x10000, CRC(5dacbd2b) SHA1(deb943b99fd296d20be9c4250b2348549f65ba37) )
ROM_LOAD32_BYTE( "873c05a.f9", 0x00002, 0x10000, CRC(d73e107d) SHA1(ba63b195e20a98c476e7d0f8d0187bc3327a8822) )
@@ -877,7 +877,7 @@ ROM_START( thunderxa ) /* Alternate Starting stage then the other 2 sets, Perhap
ROM_LOAD32_BYTE( "873c07b.e4", 0x40002, 0x10000, CRC(12a2b8ba) SHA1(ffa32ca116e0b6ca65bb9ce83dd28f5c027956a5) )
ROM_LOAD32_BYTE( "873c07d.e3", 0x40003, 0x10000, CRC(fae9f965) SHA1(780c234507835c37bde445ab34f069714cc7a506) )
- ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "873c04a.f11", 0x00000, 0x10000, CRC(f7740bf3) SHA1(f64b7e807f19a9523a517024a9eb56736cdda6bb) )
ROM_LOAD32_BYTE( "873c04c.f10", 0x00001, 0x10000, CRC(5dacbd2b) SHA1(deb943b99fd296d20be9c4250b2348549f65ba37) )
ROM_LOAD32_BYTE( "873c05a.f9", 0x00002, 0x10000, CRC(d73e107d) SHA1(ba63b195e20a98c476e7d0f8d0187bc3327a8822) )
@@ -910,7 +910,7 @@ ROM_START( thunderxb ) /* Set had no labels, same starting stage as parent set *
ROM_LOAD32_BYTE( "873c07b.e4", 0x40002, 0x10000, CRC(12a2b8ba) SHA1(ffa32ca116e0b6ca65bb9ce83dd28f5c027956a5) )
ROM_LOAD32_BYTE( "873c07d.e3", 0x40003, 0x10000, CRC(fae9f965) SHA1(780c234507835c37bde445ab34f069714cc7a506) )
- ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "873c04a.f11", 0x00000, 0x10000, CRC(f7740bf3) SHA1(f64b7e807f19a9523a517024a9eb56736cdda6bb) )
ROM_LOAD32_BYTE( "873c04c.f10", 0x00001, 0x10000, CRC(5dacbd2b) SHA1(deb943b99fd296d20be9c4250b2348549f65ba37) )
ROM_LOAD32_BYTE( "873c05a.f9", 0x00002, 0x10000, CRC(d73e107d) SHA1(ba63b195e20a98c476e7d0f8d0187bc3327a8822) )
@@ -943,7 +943,7 @@ ROM_START( thunderxj )
ROM_LOAD32_BYTE( "873c07b.e4", 0x40002, 0x10000, CRC(12a2b8ba) SHA1(ffa32ca116e0b6ca65bb9ce83dd28f5c027956a5) )
ROM_LOAD32_BYTE( "873c07d.e3", 0x40003, 0x10000, CRC(fae9f965) SHA1(780c234507835c37bde445ab34f069714cc7a506) )
- ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
+ ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */
ROM_LOAD32_BYTE( "873c04a.f11", 0x00000, 0x10000, CRC(f7740bf3) SHA1(f64b7e807f19a9523a517024a9eb56736cdda6bb) )
ROM_LOAD32_BYTE( "873c04c.f10", 0x00001, 0x10000, CRC(5dacbd2b) SHA1(deb943b99fd296d20be9c4250b2348549f65ba37) )
ROM_LOAD32_BYTE( "873c05a.f9", 0x00002, 0x10000, CRC(d73e107d) SHA1(ba63b195e20a98c476e7d0f8d0187bc3327a8822) )
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index f227ea0a8a7..02857437f27 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -31,7 +31,7 @@ With 'Debug Mode' on button 2 advances a level, button 3 goes back.
The microcontroller mainly controls the animation of the enemy robots,
the communication between the 68000 and MCU is probably not emulated
-100% correct but it works.
+100% correct but it works.
Emulation by Bryan McPhail, mish@tendril.co.uk
@@ -68,7 +68,7 @@ WRITE8_MEMBER(tigeroad_state::msm5205_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tigeroad_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
-
+
AM_RANGE(0xfe0800, 0xfe0cff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xfe0d00, 0xfe1807) AM_RAM /* still part of OBJ RAM */
AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("P1_P2") AM_WRITE(tigeroad_videoctrl_w) /* char bank, coin counters, + ? */
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tigeroad_state )
AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE(tigeroad_scroll_w)
AM_RANGE(0xfe800e, 0xfe800f) AM_WRITEONLY /* fe800e = watchdog or IRQ acknowledge */
AM_RANGE(0xfec000, 0xfec7ff) AM_RAM_WRITE(tigeroad_videoram_w) AM_SHARE("videoram")
-
+
AM_RANGE(0xff8000, 0xff87ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_SHARE("ram16")
ADDRESS_MAP_END
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( bballs_map, AS_PROGRAM, 16, tigeroad_state )
AM_RANGE(0xe8000, 0xe8003) AM_WRITE(tigeroad_scroll_w)
AM_RANGE(0xe800e, 0xe800f) AM_WRITENOP /* ? */
AM_RANGE(0xec000, 0xec7ff) AM_RAM_WRITE(tigeroad_videoram_w) AM_SHARE("videoram")
-
+
AM_RANGE(0xf8000, 0xf87ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
AM_RANGE(0xfc000, 0xfffff) AM_RAM AM_SHARE("ram16")
ADDRESS_MAP_END
@@ -564,7 +564,7 @@ static const gfx_layout sprite_layout =
static GFXDECODE_START( tigeroad )
GFXDECODE_ENTRY( "text", 0, text_layout, 0x300, 16 )
- GFXDECODE_ENTRY( "tiles", 0, tile_layout, 0x100, 16 )
+ GFXDECODE_ENTRY( "tiles", 0, tile_layout, 0x100, 16 )
GFXDECODE_ENTRY( "sprites", 0, sprite_layout, 0x200, 16 )
GFXDECODE_END
@@ -1177,5 +1177,3 @@ GAME( 1990, pushmant, pushman, pushman, pushman, tigeroad_state, pushman, ROT0,
GAME( 1991, bballs, 0, bballs, bballs, tigeroad_state, bballs, ROT0, "Comad", "Bouncing Balls", GAME_SUPPORTS_SAVE )
GAME( 1991, bballsa, bballs, bballs, bballs, tigeroad_state, bballs, ROT0, "Comad", "Bouncing Balls (Adult)", GAME_SUPPORTS_SAVE )
-
-
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index 221a8cc00d2..cdc2c1e21fe 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -501,7 +501,7 @@ static MACHINE_CONFIG_DERIVED( chkun, bikkuric )
/* sound hardware */
MCFG_SOUND_MODIFY("ay2")
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(timeplt_state, chkun_sound_w))
-
+
MCFG_TC8830F_ADD("tc8830f", XTAL_512kHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index da2bb1ee609..6ee825d16e9 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -621,9 +621,9 @@ Regions J
Peripheral String 0000000
Product Number GDT-0004E
Version V5.002
-Release Date 20031203
-
-PIC16C621A-20/P (317-0362-COM)
+Release Date 20031203
+
+PIC16C621A-20/P (317-0362-COM)
Sticker: 253-5508-0362
*/
ROM_START( fzeroax )
@@ -645,10 +645,10 @@ Peripheral String 0000000
Product Number GDT-0004C
Version V3.000
Release Date 20030611
-
-PIC16C621A-20/P (317-0362-COM)
+
+PIC16C621A-20/P (317-0362-COM)
Sticker: 253-5508-0362
-*/
+*/
ROM_START( fzeroaxc )
TRIFORCE_BIOS
@@ -816,8 +816,8 @@ Peripheral String 0000000
Product Number GDT-0021
Version V1.003
Release Date 20060131
-Manufacturer ID
-Ring Code
+Manufacturer ID
+Ring Code
BIN BLL.BIN
KEY ABFBD902FBD980E5
GDI Structure 3
@@ -825,20 +825,20 @@ GDI Structure 3
2 450 0 2352 track02.raw 0
3 45000 4 2352 track03.bin 0
-Files Infos :
+Files Infos :
disc.gdi - size 87 - md5 b3ecdf113fd42344dd84142679e4cb36 - sha1 9d50b816d3f69ad192f5986ab487769965c2e082
track01.bin - size 705600 - md5 0fa0aff28e75130cc9364e11755d0881 - sha1 647ff196eff7c220e1aa7829f87494d557c90be4
track02.raw - size 3179904 - md5 32a6bba6f49385515c6649bb78f8e9c4 - sha1 27c8184e6d40c48fe6466bfb4171969eaf6baab3
track03.bin - size 1185760800 - md5 8b67fe537a66fa849686df074531cb30 - sha1 153f638f5b67741687186835573ab485400f91bf
ROM_START( vs42k6ex )
- TRIFORCE_BIOS
+ TRIFORCE_BIOS
- DISK_REGION( "gdrom" )
- DISK_IMAGE_READONLY( "gdt-0021", 0, NO_DUMP ) disc.gdi is missing from available romset, it is impossible to create CHD with CHDMAN
+ DISK_REGION( "gdrom" )
+ DISK_IMAGE_READONLY( "gdt-0021", 0, NO_DUMP ) disc.gdi is missing from available romset, it is impossible to create CHD with CHDMAN
- ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE)
- ROM_LOAD("gdt-0021.data", 0x00, 0x50, NO_DUMP )
+ ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE)
+ ROM_LOAD("gdt-0021.data", 0x00, 0x50, NO_DUMP )
ROM_END
*/
@@ -848,19 +848,19 @@ Product Number GDT-0022A
Hardware Tri-Force
Sec Key 253-5508-0567
Pic 317-0567-COM
-Ver 0001
+Ver 0001
Boot File BRN.BIN
GD Unlock 70 1F 71 1F
DES Key D96446469BDCE9C1
ROM_START( tcfboxa )
- TRIFORCE_BIOS
+ TRIFORCE_BIOS
- DISK_REGION( "gdrom" )
- DISK_IMAGE_READONLY( "gdt-0022", 0, NO_DUMP ) disc.gdi is missing from available romset, it is impossible to create CHD with CHDMAN
+ DISK_REGION( "gdrom" )
+ DISK_IMAGE_READONLY( "gdt-0022", 0, NO_DUMP ) disc.gdi is missing from available romset, it is impossible to create CHD with CHDMAN
- ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE)
- ROM_LOAD("317-0567-com.data", 0x00, 0x50, NO_DUMP )
+ ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE)
+ ROM_LOAD("317-0567-com.data", 0x00, 0x50, NO_DUMP )
ROM_END
*/
@@ -879,42 +879,42 @@ ROM_START( mkartagp )
ROM_END
/*
-
+
MK21 Ver.A
Number on ROM PCB 837-14343R4S0
Number on Actel ProAsic 315-6419B
-Number on Key Chip (PIC) 235-5509-5128
-
-*/
+Number on Key Chip (PIC) 235-5509-5128
+
+*/
ROM_START( mkartag2 )
TRIFORCE_BIOS
ROM_REGION(0x21200000, "rom_board", 0)
- ROM_LOAD( "ic9_mx29lv400cttc.bin", 0x00000000, 0x0080000, CRC(2bb9f1fe) SHA1(935511d93a0ab06436b0674bef90c790c100e0b1) )
- ROM_LOAD( "ic1_k9f1208u0b.bin", 0x01000000, 0x4200000, CRC(e52f17ef) SHA1(1e007d3136cacb89c396b8261e3978956cc21bdd) )
- ROM_LOAD( "ic2_k9f1208u0b.bin", 0x04200000, 0x4200000, CRC(8a6a2649) SHA1(fd4318e7fb5020c499e06fdb1996b8d40161b674) )
- ROM_LOAD( "ic3_k9f1208u0b.bin", 0x08400000, 0x4200000, CRC(8fd44a29) SHA1(9392bc4da6541960a83e9c7b3ab4f36bc5564fb7) )
- ROM_LOAD( "ic4_k9f1208u0b.bin", 0x0c600000, 0x4200000, CRC(ae3fb198) SHA1(c9c0beb9f6875dbf7ce015454a59481524ef3ef6) )
- ROM_LOAD( "ic5_k9f1208u0b.bin", 0x10800000, 0x4200000, CRC(e9208514) SHA1(ad0ed3e681cd78a61d7ad3af83db20e364bb47fd) )
- ROM_LOAD( "ic6_k9f1208u0b.bin", 0x14c00000, 0x4200000, CRC(7363697c) SHA1(997c96d0b41774a24a2e0427a703bc295e784187) )
- ROM_LOAD( "ic7_k9f1208u0b.bin", 0x18e00000, 0x4200000, CRC(407da1d2) SHA1(c185ebd2f3d8654d8fd394c56ac9bfff7e49f125) )
- ROM_LOAD( "ic8_k9f1208u0b.bin", 0x1d000000, 0x4200000, CRC(9ab76062) SHA1(36a6317c646da5cf682d46ca438ce05e600bc354) )
+ ROM_LOAD( "ic9_mx29lv400cttc.bin", 0x00000000, 0x0080000, CRC(2bb9f1fe) SHA1(935511d93a0ab06436b0674bef90c790c100e0b1) )
+ ROM_LOAD( "ic1_k9f1208u0b.bin", 0x01000000, 0x4200000, CRC(e52f17ef) SHA1(1e007d3136cacb89c396b8261e3978956cc21bdd) )
+ ROM_LOAD( "ic2_k9f1208u0b.bin", 0x04200000, 0x4200000, CRC(8a6a2649) SHA1(fd4318e7fb5020c499e06fdb1996b8d40161b674) )
+ ROM_LOAD( "ic3_k9f1208u0b.bin", 0x08400000, 0x4200000, CRC(8fd44a29) SHA1(9392bc4da6541960a83e9c7b3ab4f36bc5564fb7) )
+ ROM_LOAD( "ic4_k9f1208u0b.bin", 0x0c600000, 0x4200000, CRC(ae3fb198) SHA1(c9c0beb9f6875dbf7ce015454a59481524ef3ef6) )
+ ROM_LOAD( "ic5_k9f1208u0b.bin", 0x10800000, 0x4200000, CRC(e9208514) SHA1(ad0ed3e681cd78a61d7ad3af83db20e364bb47fd) )
+ ROM_LOAD( "ic6_k9f1208u0b.bin", 0x14c00000, 0x4200000, CRC(7363697c) SHA1(997c96d0b41774a24a2e0427a703bc295e784187) )
+ ROM_LOAD( "ic7_k9f1208u0b.bin", 0x18e00000, 0x4200000, CRC(407da1d2) SHA1(c185ebd2f3d8654d8fd394c56ac9bfff7e49f125) )
+ ROM_LOAD( "ic8_k9f1208u0b.bin", 0x1d000000, 0x4200000, CRC(9ab76062) SHA1(36a6317c646da5cf682d46ca438ce05e600bc354) )
ROM_END
ROM_START( mkartag2a )
TRIFORCE_BIOS
ROM_REGION(0x21200000, "rom_board", 0)
- ROM_LOAD( "ic9_mx29lv400cttc(__alt).bin", 0x00000000, 0x0080000, CRC(ff854fd0) SHA1(0e42aff9a60aacd200b7a29d4d180abdab6a732e) )
- ROM_LOAD( "ic1_k9f1208u0b(__alt).bin", 0x01000000, 0x4200000, CRC(c5624816) SHA1(d6f2a2ff9e9e14d857a0ec810521c378ba1fabd5) )
- ROM_LOAD( "ic2_k9f1208u0b(__alt).bin", 0x04200000, 0x4200000, CRC(44e59a1f) SHA1(68a8c1178a33e23446980ec84486bc614f830dad) )
- ROM_LOAD( "ic3_k9f1208u0b(__alt).bin", 0x08400000, 0x4200000, CRC(6688e7f9) SHA1(7d1e60806c02fd765dd0981e790a698a29050aae) )
- ROM_LOAD( "ic4_k9f1208u0b(__alt).bin", 0x0c600000, 0x4200000, CRC(e043eac2) SHA1(0108d940a852ff03e919170957f2bca2c1a88a03) )
- ROM_LOAD( "ic5_k9f1208u0b(__alt).bin", 0x10800000, 0x4200000, CRC(20882926) SHA1(c802de32ca24bf4e9fbabf47fed23a91b3d614ac) )
- ROM_LOAD( "ic6_k9f1208u0b(__alt).bin", 0x14c00000, 0x4200000, CRC(14171ba4) SHA1(3ddace539cd8a4b53a1ef03238e8404db7dcd85e) )
- ROM_LOAD( "ic7_k9f1208u0b(__alt).bin", 0x18e00000, 0x4200000, CRC(bd0199df) SHA1(aafb171e9f5a4c8dc2ef55ba344a0eb310c63467) )
- ROM_LOAD( "ic8_k9f1208u0b(__alt).bin", 0x1d000000, 0x4200000, CRC(8ad6c7ae) SHA1(749b99a944f62aefb895a622c029656c69b3c736) )
+ ROM_LOAD( "ic9_mx29lv400cttc(__alt).bin", 0x00000000, 0x0080000, CRC(ff854fd0) SHA1(0e42aff9a60aacd200b7a29d4d180abdab6a732e) )
+ ROM_LOAD( "ic1_k9f1208u0b(__alt).bin", 0x01000000, 0x4200000, CRC(c5624816) SHA1(d6f2a2ff9e9e14d857a0ec810521c378ba1fabd5) )
+ ROM_LOAD( "ic2_k9f1208u0b(__alt).bin", 0x04200000, 0x4200000, CRC(44e59a1f) SHA1(68a8c1178a33e23446980ec84486bc614f830dad) )
+ ROM_LOAD( "ic3_k9f1208u0b(__alt).bin", 0x08400000, 0x4200000, CRC(6688e7f9) SHA1(7d1e60806c02fd765dd0981e790a698a29050aae) )
+ ROM_LOAD( "ic4_k9f1208u0b(__alt).bin", 0x0c600000, 0x4200000, CRC(e043eac2) SHA1(0108d940a852ff03e919170957f2bca2c1a88a03) )
+ ROM_LOAD( "ic5_k9f1208u0b(__alt).bin", 0x10800000, 0x4200000, CRC(20882926) SHA1(c802de32ca24bf4e9fbabf47fed23a91b3d614ac) )
+ ROM_LOAD( "ic6_k9f1208u0b(__alt).bin", 0x14c00000, 0x4200000, CRC(14171ba4) SHA1(3ddace539cd8a4b53a1ef03238e8404db7dcd85e) )
+ ROM_LOAD( "ic7_k9f1208u0b(__alt).bin", 0x18e00000, 0x4200000, CRC(bd0199df) SHA1(aafb171e9f5a4c8dc2ef55ba344a0eb310c63467) )
+ ROM_LOAD( "ic8_k9f1208u0b(__alt).bin", 0x1d000000, 0x4200000, CRC(8ad6c7ae) SHA1(749b99a944f62aefb895a622c029656c69b3c736) )
ROM_END
/* Main board */
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 953929ff99f..9c0ee24320c 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -850,10 +850,10 @@ static MACHINE_CONFIG_START( turbo, turbo_state )
MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, turbo_ppi3c_w))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
MCFG_I8279_OUT_DISP_CB(WRITE8(turbo_state, digit_w)) // display A&B
MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines
-
+
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbo)
MCFG_PALETTE_ADD("palette", 256)
@@ -890,7 +890,7 @@ static MACHINE_CONFIG_START( subroc3d, turbo_state )
MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, subroc3d_sound_c_w))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
MCFG_I8279_OUT_DISP_CB(WRITE8(turbo_state, digit_w)) // display A&B
MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines
@@ -937,7 +937,7 @@ static MACHINE_CONFIG_START( buckrog, turbo_state )
MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, buckrog_ppi1c_w))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
MCFG_I8279_OUT_DISP_CB(WRITE8(turbo_state, digit_w)) // display A&B
MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines
diff --git a/src/mame/drivers/vectrex.c b/src/mame/drivers/vectrex.c
index 7e6bd5792b8..fa6b9a704f6 100644
--- a/src/mame/drivers/vectrex.c
+++ b/src/mame/drivers/vectrex.c
@@ -135,11 +135,11 @@ ROM_START(vectrex)
ROM_SYSTEM_BIOS(1, "bios1", "exec rom intl 284001-1")
ROMX_LOAD("exec_rom_intl_284001-1.bin", 0xe000, 0x2000, CRC(6d2bd167) SHA1(77a220d5d98846b606dff608f7b5d00183ec3bab), ROM_BIOS(2) )
-// The following fastboots are listed here for reference and documentation
-// ROM_SYSTEM_BIOS(2, "bios2", "us-fastboot hack")
-// ROMX_LOAD("us-fastboot.bin", 0xe000, 0x2000, CRa6e4dac4) SHA1(e0900be6d6858b985fd7f0999d864b2fceaf01a1), ROM_BIOS(3) )
-// ROM_SYSTEM_BIOS(3, "bios3", "intl-fastboot hack")
-// ROMX_LOAD("intl-fastboot.bin", 0xe000, 0x2000, CRC(71dcf0f4) SHA1(2a257c5111f5cee841bd14acaa9df6496aaf3d8b), ROM_BIOS(4) )
+// The following fastboots are listed here for reference and documentation
+// ROM_SYSTEM_BIOS(2, "bios2", "us-fastboot hack")
+// ROMX_LOAD("us-fastboot.bin", 0xe000, 0x2000, CRa6e4dac4) SHA1(e0900be6d6858b985fd7f0999d864b2fceaf01a1), ROM_BIOS(3) )
+// ROM_SYSTEM_BIOS(3, "bios3", "intl-fastboot hack")
+// ROMX_LOAD("intl-fastboot.bin", 0xe000, 0x2000, CRC(71dcf0f4) SHA1(2a257c5111f5cee841bd14acaa9df6496aaf3d8b), ROM_BIOS(4) )
ROM_END
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 18613700250..2594138895b 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -475,7 +475,7 @@ public:
required_shared_ptr<UINT32> m_rombase;
required_device<dcs_audio_device> m_dcs;
required_device<midway_ioasic_device> m_ioasic;
-
+
UINT16 m_nile_irq_state;
UINT16 m_ide_irq_state;
UINT32 m_pci_bridge_regs[0x40];
@@ -1564,7 +1564,7 @@ void vegas_state::remap_dynamic_addresses()
/* the build the list of stuff */
m_dynamic_count = 0;
-
+
/* DCS2 */
base = m_nile_regs[NREG_DCS2] & 0x1fffff00;
if (base >= m_rambase.bytes())
@@ -2265,7 +2265,7 @@ static MACHINE_CONFIG_DERIVED( vegasban, vegascore )
MCFG_VOODOO_FBMEM(16)
MCFG_VOODOO_SCREEN_TAG("screen")
MCFG_VOODOO_CPU_TAG("maincpu")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(vegas_state,vblank_assert))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(vegas_state,vblank_assert))
MACHINE_CONFIG_END
@@ -2303,7 +2303,7 @@ MACHINE_CONFIG_END
// Per driver configs
static MACHINE_CONFIG_DERIVED( gauntleg, vegas )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
@@ -2316,7 +2316,7 @@ static MACHINE_CONFIG_DERIVED( gauntleg, vegas )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gauntdl, vegas )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
@@ -2329,7 +2329,7 @@ static MACHINE_CONFIG_DERIVED( gauntdl, vegas )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( warfa, vegas250 )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
@@ -2342,7 +2342,7 @@ static MACHINE_CONFIG_DERIVED( warfa, vegas250 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tenthdeg, vegas )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb)
@@ -2355,7 +2355,7 @@ static MACHINE_CONFIG_DERIVED( tenthdeg, vegas )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( roadburn, vegas32m )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DSIO, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DSIO, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0) /* no place to hook :-( */
@@ -2368,7 +2368,7 @@ static MACHINE_CONFIG_DERIVED( roadburn, vegas32m )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nbashowt, vegasban )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
@@ -2380,7 +2380,7 @@ static MACHINE_CONFIG_DERIVED( nbashowt, vegasban )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nbanfl, vegasban )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
@@ -2392,7 +2392,7 @@ static MACHINE_CONFIG_DERIVED( nbanfl, vegasban )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sf2049 , denver )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(8)
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
@@ -2404,7 +2404,7 @@ static MACHINE_CONFIG_DERIVED( sf2049 , denver )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sf2049se, denver )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(8)
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
@@ -2416,7 +2416,7 @@ static MACHINE_CONFIG_DERIVED( sf2049se, denver )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sf2049te, denver )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(8)
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
@@ -2428,7 +2428,7 @@ static MACHINE_CONFIG_DERIVED( sf2049te, denver )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cartfury, vegasv3 )
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
+ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 7c0c4e4a014..3e9a6d3c607 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -294,7 +294,7 @@ static MACHINE_CONFIG_START( vroulet, vroulet_state )
MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
- MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
+ MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index b717ab2f134..e823fe58bb6 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -1735,7 +1735,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( joust2, williams2, joust2_state )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(williams2_d000_rom_map)
-
+
MCFG_WILLIAMS_CVSD_SOUND_ADD("cvsd")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/wpc_95.c b/src/mame/drivers/wpc_95.c
index dd4792dee33..a08870577bb 100644
--- a/src/mame/drivers/wpc_95.c
+++ b/src/mame/drivers/wpc_95.c
@@ -18,14 +18,14 @@ class wpc_95_state : public driver_device
public:
wpc_95_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- maincpu(*this, "maincpu"),
- dcs(*this, "dcs"),
- rombank(*this, "rombank"),
- mainram(*this, "mainram"),
- nvram(*this, "nvram"),
- pic(*this, "pic"),
- lamp(*this, "lamp"),
- out(*this, "out")
+ maincpu(*this, "maincpu"),
+ dcs(*this, "dcs"),
+ rombank(*this, "rombank"),
+ mainram(*this, "mainram"),
+ nvram(*this, "nvram"),
+ pic(*this, "pic"),
+ lamp(*this, "lamp"),
+ out(*this, "out")
{ }
DECLARE_WRITE8_MEMBER(bank_w);
@@ -509,87 +509,87 @@ const char *const wpc_95_state::outputs_afm[52] = {
static INPUT_PORTS_START( afm )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IAN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IAN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -600,14 +600,14 @@ static INPUT_PORTS_START( afm )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_cc[64] = {
@@ -634,94 +634,94 @@ const char *const wpc_95_state::outputs_cc[52] = {
static INPUT_PORTS_START( cc )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Mine entrance")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Mine entrance")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup (bot)")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup (bot)")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L loop bottom")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Rt loop bottom")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L loop bottom")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Rt loop bottom")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Mine popper")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Saloon popper")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup (top)")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Beer mug switch")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L bonus X lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet exit")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Mine popper")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Saloon popper")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup (top)")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Beer mug switch")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L bonus X lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet exit")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop top")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R bonus X lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop top")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop top")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R bonus X lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop top")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #1 (L)")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #2 (LC)")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #3 (RC)")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #4 (R)")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp make")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skill bowl")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bot R ramp")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #1 (L)")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #2 (LC)")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #3 (RC)")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop #4 (R)")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp make")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skill bowl")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bot R ramp")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Train encoder")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Train home")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Saloon gate")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Saloon bart toy")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Mine home")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Mine encoder")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Train encoder")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Train home")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Saloon gate")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Saloon bart toy")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Mine home")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Mine encoder")
PORT_START("SW.7")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp make")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp make")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup (top)")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup (bot)")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp make")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp make")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup (top)")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup (bot)")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -732,14 +732,14 @@ static INPUT_PORTS_START( cc )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_cv[64] = {
@@ -766,87 +766,87 @@ const char *const wpc_95_state::outputs_cv[52] = {
static INPUT_PORTS_START( cv )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Back box luck")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Wire ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop upper")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top Eddy")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Back box luck")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Wire ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop upper")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top Eddy")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop upper")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop left")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop right")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop upper")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop left")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop right")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Poppor opto")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"WOW\" targets")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top targets")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Poppor opto")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"WOW\" targets")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top targets")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left lane")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ringmaster up")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ringmaster mid")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ringmaster down")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Trough upper")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Trough middle")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left lane")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ringmaster up")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ringmaster mid")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ringmaster down")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Trough upper")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Trough middle")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop enter")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skill shot")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ring 'N', 'G'")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skill shot")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ring 'N', 'G'")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Light\" standup")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Lock\" standup")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp magnet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp lock low")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp lock mid")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp lock high")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Light\" standup")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Lock\" standup")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp magnet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp lock low")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp lock mid")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp lock high")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left saucer")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right saucer")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Big ball rebound")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Volt\" right")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Volt\" left")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left saucer")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right saucer")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Big ball rebound")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Volt\" right")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Volt\" left")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -857,14 +857,14 @@ static INPUT_PORTS_START( cv )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right spinner")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left spinner")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right spinner")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left spinner")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_congo[64] = {
@@ -891,87 +891,87 @@ const char *const wpc_95_state::outputs_congo[52] = {
static INPUT_PORTS_START( congo )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner left loop")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper loop")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt return lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner left loop")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper loop")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt return lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt eject rubber")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lt return lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"You\" standup")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt eject rubber")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lt return lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"You\" standup")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Volcano stack")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Mystery\" eject")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right eject")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Volcano stack")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Mystery\" eject")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right eject")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock ball 1")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock ball 2")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock ball 3")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Mine shaft\"")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left bank top")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left bank center")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left bank bottom")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock ball 1")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock ball 2")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock ball 3")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Mine shaft\"")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left bank top")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left bank center")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left bank bottom")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Travi\"")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Com\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2-way popper")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"We are\" standup")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Watching\" standup")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Perimeter def\"")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp exit")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Travi\"")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Com\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2-way popper")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"We are\" standup")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Watching\" standup")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"Perimeter def\"")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp exit")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp exit")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp exit")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(A)MY")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A(M)Y")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("AM(Y)")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(C)ONGO")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C(O)NGO")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("CO(N)GO")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("CON(G)O")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("CONG(O)")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(A)MY")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A(M)Y")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("AM(Y)")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(C)ONGO")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C(O)NGO")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("CO(N)GO")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("CON(G)O")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("CONG(O)")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -982,14 +982,14 @@ static INPUT_PORTS_START( congo )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper EOS")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper EOS")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_jy[64] = {
@@ -1016,87 +1016,87 @@ const char *const wpc_95_state::outputs_jy[52] = {
static INPUT_PORTS_START( jy )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Toaster gun")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rebound sw")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top left crane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Toaster gun")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rebound sw")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top left crane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rght return lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Crane down")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rght return lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Crane down")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock up 2")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock up 1")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top right crane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock up 2")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock up 1")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top right crane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Past spinner")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("In the sewer")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock jam")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Past crane")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 1 left")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 3")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Past spinner")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("In the sewer")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lock jam")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Past crane")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 1 left")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 3")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 4")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 5 rght")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L L 3 bank bot")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L L 3 bank mid")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L L 3 bank top")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 4")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Car targ 5 rght")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L L 3 bank bot")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L L 3 bank mid")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L L 3 bank top")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R 3 bank bot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R 3 bank mid")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R 3 bank top")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U L 3 bank bot")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U L 3 bank mid")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U L 3 bank top")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bowl entry")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bowl exit")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R 3 bank bot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R 3 bank mid")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R 3 bank top")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U L 3 bank bot")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U L 3 bank mid")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U L 3 bank top")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bowl entry")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bowl exit")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp entry")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Scoop down")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Scoop made")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Dog entry")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R 3 bank bottom")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R 3 bank middle")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R 3 bank top")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp entry")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Scoop down")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Scoop made")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Dog entry")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R 3 bank bottom")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R 3 bank middle")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R 3 bank top")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1107,14 +1107,14 @@ static INPUT_PORTS_START( jy )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Spinner")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Spinner")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_mm[64] = {
@@ -1141,87 +1141,87 @@ const char *const wpc_95_state::outputs_mm[52] = {
static INPUT_PORTS_START( mm )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Catapult target")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L troll target")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Catapult target")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L troll target")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R troll target")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right eject")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R troll target")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right eject")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Castle gate")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Catapult")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Castle gate")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Catapult")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Moat enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Castle lock")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L troll (U/pfld)")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R troll (U/pfld)")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Moat enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Castle lock")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L troll (U/pfld)")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R troll (U/pfld)")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drawbridge up")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drawbridge down")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tower exit")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drawbridge up")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drawbridge down")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tower exit")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right bank top")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right bank mid")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right bank bot")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L troll up")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R troll up")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right bank top")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right bank mid")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right bank bot")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L troll up")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R troll up")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1232,14 +1232,14 @@ static INPUT_PORTS_START( mm )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_mb[64] = {
@@ -1266,94 +1266,94 @@ const char *const wpc_95_state::outputs_mb[52] = {
static INPUT_PORTS_START( mb )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac standup top")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac standup bot")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac standup top")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac standup bot")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tomb treasure")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Dracula target")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left eject")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tomb treasure")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Dracula target")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left eject")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L flip opto")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R flip opto")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L blue tgt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C blue tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R blue tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L flip prox")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R flip prox")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L flip opto")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R flip opto")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L blue tgt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C blue tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R blue tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L flip prox")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R flip prox")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle top lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle top lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center loop")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center loop")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp lock")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 5")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 4")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 3")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 1")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp lock")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 5")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 4")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 3")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drac position 1")
PORT_START("SW.7")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Up/dn bank up")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Up/dn bank down")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Frank table down")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Frank table up")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L up/dn bank tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R up/dn bank tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Frank hit")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Up/dn bank up")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Up/dn bank down")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Frank table down")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Frank table up")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L up/dn bank tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R up/dn bank tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Frank hit")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1364,14 +1364,14 @@ static INPUT_PORTS_START( mb )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center spinner")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center spinner")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_nbaf[64] = {
@@ -1398,80 +1398,80 @@ const char *const wpc_95_state::outputs_nbaf[52] = {
static INPUT_PORTS_START( nbaf )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Backbos basket")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shhoter lane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lt return lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt return lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L R standup")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Backbos basket")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shhoter lane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lt return lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt return lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L R standup")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Eject hole")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R standup")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Eject hole")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U R standup")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center ramp opto")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R loop ent opto")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop exit")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center ramp opto")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R loop ent opto")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop exit")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup '3'")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 'P'")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 'T'")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop enter")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop made")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup '3'")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 'P'")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 'T'")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop enter")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop made")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 4")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 4")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender lock pos")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 2")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 1")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jets ball drain")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 4")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 4")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender lock pos")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 2")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Defender pos 1")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jets ball drain")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L loop ramp exit")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp made")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 4")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 3")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 1")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L loop ramp exit")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp made")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 4")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 3")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"In the paint\" 1")
PORT_START("SW.6")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1482,14 +1482,14 @@ static INPUT_PORTS_START( nbaf )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Basket made")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Basket hold")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Basket made")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Basket hold")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_ngg[64] = {
@@ -1516,94 +1516,94 @@ const char *const wpc_95_state::outputs_ngg[52] = {
static INPUT_PORTS_START( ngg )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp make")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center ramp make")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter groove")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp make")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center ramp make")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter groove")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet adv standup")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Underground pass")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Kickback")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet adv standup")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Underground pass")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Kickback")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 5")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 6")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Jet popper")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 5")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 6")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Jet popper")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L gofer down")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R gofer down")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Putt out popper")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Rt popper jam")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp down")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp down")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L gofer down")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R gofer down")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Putt out popper")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Rt popper jam")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp down")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp down")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top skill shot")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Mid skill shot")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower skill shot")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top skill shot")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Mid skill shot")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower skill shot")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left spinner")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right spinner")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner wheel opto")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Outer wheel opto")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left gofer 1")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left gofer 2")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Behind L gofer")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Hole in 1 made")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left spinner")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right spinner")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner wheel opto")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Outer wheel opto")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left gofer 1")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left gofer 2")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Behind L gofer")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Hole in 1 made")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left cart path")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right cart path")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp make")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Golf cart")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right gofer 1")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right gofer 2")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Adv trap value")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Sand trap eject")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left cart path")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right cart path")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp make")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Golf cart")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right gofer 1")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right gofer 2")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Adv trap value")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Sand trap eject")
PORT_START("SW.7")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("K-I-C-K advance")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(K)ICK")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("K(I)CK")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("KI(C)K")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("KIC(K)")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Captive ball")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("K-I-C-K advance")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(K)ICK")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("K(I)CK")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("KI(C)K")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("KIC(K)")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Captive ball")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1614,13 +1614,13 @@ static INPUT_PORTS_START( ngg )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_sc[64] = {
@@ -1656,94 +1656,94 @@ const char *const wpc_95_state::outputs_sc[52] = {
static INPUT_PORTS_START( sc )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("TP trough (roof)")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("TP trough (move)")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right orbit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ballshooter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("TP trough (roof)")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("TP trough (move)")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right orbit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ballshooter")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("UR flip rollover")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left orbit")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("UR flip rollover")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left orbit")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lockup 1 front")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lockup 2 rear")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lockup 1 front")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Lockup 2 rear")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Kickback")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left big kick")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tokn chute exit")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top jet")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Kickback")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left big kick")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tokn chute exit")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top jet")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(A)LARM standup")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A(L)ARM standup")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("AL(A)RM standup")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ALA(R)M standup")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ALAR(M) standup")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Movng target C")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Movng target B")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Movng target A")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("(A)LARM standup")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A(L)ARM standup")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("AL(A)RM standup")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ALA(R)M standup")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ALAR(M) standup")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Movng target C")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Movng target B")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Movng target A")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TL 3bank top")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TL 3bank middle")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TL 3bank bottom")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TR 3bank bottom")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TR 3bank middle")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TR 3bank top")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top left lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top popper")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TL 3bank top")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TL 3bank middle")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TL 3bank bottom")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TR 3bank bottom")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TR 3bank middle")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("TR 3bank top")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top left lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top popper")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BL 3bank top")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BL 3bank middle")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BL 3bank bottom")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BR 3bank bottom")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BR 3bank middle")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BR 3bank top")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bank kickout")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top right lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BL 3bank top")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BL 3bank middle")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BL 3bank bottom")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BR 3bank bottom")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BR 3bank middle")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("BR 3bank top")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bank kickout")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top right lane")
PORT_START("SW.7")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left token lvl")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right token lvl")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp entrance")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Wheel channel A")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Wheel channel B")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left token lvl")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right token lvl")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp entrance")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Wheel channel A")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Wheel channel B")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1754,14 +1754,14 @@ static INPUT_PORTS_START( sc )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper EOS")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Token coin slot")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper EOS")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Token coin slot")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_ss[64] = {
@@ -1788,87 +1788,87 @@ const char *const wpc_95_state::outputs_ss[52] = {
static INPUT_PORTS_START( ss )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Wheel index")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt flipper lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Wheel index")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt flipper lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Extra ball lane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lft flipper lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Single standup")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Extra ball lane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lft flipper lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Single standup")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left kickout")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Crate entrance")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left kickout")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Crate entrance")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin left")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin center")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin right")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp enter")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right ramp enter")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp made")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right ramp made")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin entrance")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin left")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin center")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin right")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp enter")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right ramp enter")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp made")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right ramp made")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coffin entrance")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper slingshot")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Crate sensor")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper slingshot")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Crate sensor")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank upper")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank mid")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank lower")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left leaper")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center leaper")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right leaper")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt ramp 10 point")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank upper")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank mid")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank lower")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left leaper")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center leaper")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right leaper")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt ramp 10 point")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left skull lane")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center skull lane")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right skull lane")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Secret passage")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left skull lane")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center skull lane")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right skull lane")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Secret passage")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1879,14 +1879,14 @@ static INPUT_PORTS_START( ss )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_totan[64] = {
@@ -1913,80 +1913,80 @@ const char *const wpc_95_state::outputs_totan[52] = {
static INPUT_PORTS_START( totan )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Harem passage")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vanish tunnel")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp enter")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ball shooter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Harem passage")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vanish tunnel")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp enter")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ball shooter")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Genie standup")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bazaar eject")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left wire make")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Genie standup")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bazaar eject")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left wire make")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left cage opto")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right cage opto")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left eject")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left cage opto")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right cage opto")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left eject")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made left")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Genie target")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop left")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop right")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Mini standups")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made right")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right captive ball")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made left")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Genie target")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop left")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop right")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Mini standups")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp made right")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right captive ball")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slign")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lamp spin CCW")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lamp spin CW")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left captive ball")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slign")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lamp spin CCW")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lamp spin CW")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left captive ball")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left standups")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right standups")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top skill")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle skill")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom skill")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock 1 (bot)")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock 3 (top)")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left standups")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right standups")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top skill")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle skill")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom skill")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock 1 (bot)")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock 3 (top)")
PORT_START("SW.6")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1997,14 +1997,14 @@ static INPUT_PORTS_START( totan )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_cp[64] = {
@@ -2031,87 +2031,87 @@ const char *const wpc_95_state::outputs_cp[52] = {
static INPUT_PORTS_START( cp )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Made ramp")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Heavy bag")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock up 1")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Made ramp")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Heavy bag")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock up 1")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank mid")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Popper")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank mid")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Popper")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left jab made")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Corner eject")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right jab made")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left jab made")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Corner eject")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right jab made")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Boxer pole cntr")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Behnd left scoop")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Behnd rght scoop")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Enter ramp")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Jump rope")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Bag pole center")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Boxer pole right")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Boxer pole left")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Boxer pole cntr")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Behnd left scoop")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Behnd rght scoop")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Enter ramp")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Jump rope")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Bag pole center")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Boxer pole right")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Boxer pole left")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank bottom")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank top")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left half guy")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rght half guy")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock up 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock up 3")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank bottom")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank top")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left half guy")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rght half guy")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock up 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lock up 3")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left scoop up")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right scoop up")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Power shot")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rope cam")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Speed bag")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Boxer gut 1")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Boxer gut 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Boxer head")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left scoop up")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right scoop up")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Power shot")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rope cam")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Speed bag")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Boxer gut 1")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Boxer gut 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Boxer head")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Exit rope")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter speed bag")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter lockup")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top of ramp")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter rope")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Exit rope")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter speed bag")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter lockup")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top of ramp")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter rope")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -2122,14 +2122,14 @@ static INPUT_PORTS_START( cp )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_95_state::lamps_ttt[64] = {
@@ -2156,73 +2156,73 @@ const char *const wpc_95_state::outputs_ttt[52] = {
static INPUT_PORTS_START( ttt )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right post")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right post")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left post")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left post")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"9\"")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"8\"")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"7\"")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"6\"")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"5\"")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Kicker opto")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"9\"")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"8\"")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"7\"")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"6\"")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"5\"")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Kicker opto")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"4\"")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"3\"")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"2\"")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"1\"")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"4\"")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"3\"")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"2\"")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Hole \"1\"")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ticket opto")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tickets low")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ticket test")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ticket opto")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Tickets low")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ticket test")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.5")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -2233,14 +2233,14 @@ static INPUT_PORTS_START( ttt )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
static MACHINE_CONFIG_START( wpc_95, wpc_95_state )
diff --git a/src/mame/drivers/wpc_dcs.c b/src/mame/drivers/wpc_dcs.c
index 3c1be659623..fd970d8fa5f 100644
--- a/src/mame/drivers/wpc_dcs.c
+++ b/src/mame/drivers/wpc_dcs.c
@@ -16,14 +16,14 @@ class wpc_dcs_state : public driver_device
public:
wpc_dcs_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- maincpu(*this, "maincpu"),
- dcs(*this, "dcs"),
- rombank(*this, "rombank"),
- mainram(*this, "mainram"),
- nvram(*this, "nvram"),
- lamp(*this, "lamp"),
- out(*this, "out"),
- swarray(*this, "SW")
+ maincpu(*this, "maincpu"),
+ dcs(*this, "dcs"),
+ rombank(*this, "rombank"),
+ mainram(*this, "mainram"),
+ nvram(*this, "nvram"),
+ lamp(*this, "lamp"),
+ out(*this, "out"),
+ swarray(*this, "SW")
{ }
DECLARE_WRITE8_MEMBER(bank_w);
@@ -293,87 +293,87 @@ DRIVER_INIT_MEMBER(wpc_dcs_state, afv)
static INPUT_PORTS_START( wpc_dcs )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0x01,0x01,"Switch 1") PORT_DIPLOCATION("SWA:1")
@@ -407,14 +407,14 @@ static INPUT_PORTS_START( wpc_dcs )
PORT_DIPSETTING(0xf0,"USA 2")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
diff --git a/src/mame/drivers/wpc_s.c b/src/mame/drivers/wpc_s.c
index bc81e94e5b2..2bd08072cd7 100644
--- a/src/mame/drivers/wpc_s.c
+++ b/src/mame/drivers/wpc_s.c
@@ -14,14 +14,14 @@ class wpc_s_state : public driver_device
public:
wpc_s_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- maincpu(*this, "maincpu"),
- dcs(*this, "dcs"),
- rombank(*this, "rombank"),
- mainram(*this, "mainram"),
- nvram(*this, "nvram"),
- pic(*this, "pic"),
- lamp(*this, "lamp"),
- out(*this, "out")
+ maincpu(*this, "maincpu"),
+ dcs(*this, "dcs"),
+ rombank(*this, "rombank"),
+ mainram(*this, "mainram"),
+ nvram(*this, "nvram"),
+ pic(*this, "pic"),
+ lamp(*this, "lamp"),
+ out(*this, "out")
{ }
DECLARE_WRITE8_MEMBER(bank_w);
@@ -374,11 +374,11 @@ const char *const wpc_s_state::lamps_corv[64] = {
};
const char *const wpc_s_state::outputs_corv[54] = {
- "s:Trough eject", "s:ZR1 low rev gate", "s:Kickback", "s:Pit stop popper", "s:ZR1 up rev gate", NULL, "s:Knocker", "s:Route 66 kickout",
- "s:L slingshot", "s:R slingshot", "s:Left jet", "s:Bottom jet", "s:Right jet", NULL, "s:ZR1 lockup", "s:Loop gate",
- "s:Race direction", "s:L race enable", "s:R race enable", "f:Tenth corvette", "f:Jets", "f:R ramps", "f:U L flipper", "f:Catch me",
+ "s:Trough eject", "s:ZR1 low rev gate", "s:Kickback", "s:Pit stop popper", "s:ZR1 up rev gate", NULL, "s:Knocker", "s:Route 66 kickout",
+ "s:L slingshot", "s:R slingshot", "s:Left jet", "s:Bottom jet", "s:Right jet", NULL, "s:ZR1 lockup", "s:Loop gate",
+ "s:Race direction", "s:L race enable", "s:R race enable", "f:Tenth corvette", "f:Jets", "f:R ramps", "f:U L flipper", "f:Catch me",
"f:ZR1 ramp", "f:ZR1 underside", "f:R rear panel", "f:R standup", "s:R flip power", "s:R flip hold", "s:L flip power", "s:L flip hold",
- "s:Diverter power", "s:Diverter hold", "s:UL flip power", "s:UL flip hold", NULL, NULL, NULL, NULL,
+ "s:Diverter power", "s:Diverter hold", "s:UL flip power", "s:UL flip hold", NULL, NULL, NULL, NULL,
NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:Upper left", "g:Upper right", "g:Lower left", "g:Lower right", "g:Back box title"
@@ -386,94 +386,94 @@ const char *const wpc_s_state::outputs_corv[54] = {
static INPUT_PORTS_START( corv )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left out lane")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right out lane")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plunger")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L return lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R return lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Spinner")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left out lane")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right out lane")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plunger")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L return lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R return lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Spinner")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy in button")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1st gear (opt)")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2nd gear (opt)")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("3rd gear (opt)")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("4th gear (opt)")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy in button")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1st gear (opt)")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2nd gear (opt)")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("3rd gear (opt)")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("4th gear (opt)")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Route 66 entry")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Pit stop popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop entry")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Route 66 entry")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Pit stop popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop entry")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 bottom entry")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 top entry")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Skid pad entry")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skid pad exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Route 66 exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup 3")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup 1")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 bottom entry")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 top entry")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Skid pad entry")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skid pad exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Route 66 exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup 3")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup 1")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L race start")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R race start")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L race encoder")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R race encoder")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Route 66 kickout")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skid rte66 exit")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L race start")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R race start")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L race encoder")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R race encoder")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Route 66 kickout")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skid rte66 exit")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L rollover")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M rollover")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R rollover")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L rollover")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M rollover")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R rollover")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 full left")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 full right")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 lock ball 1")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 lock ball 2")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 lock ball 3")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 full left")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("ZR1 full right")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 lock ball 1")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 lock ball 2")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("ZR1 lock ball 3")
PORT_START("SW.7")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Million standup")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skid pad standup")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R rubber")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet rubber")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L outer loop")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R outer loop")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Million standup")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Skid pad standup")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R rubber")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet rubber")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L outer loop")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R outer loop")
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -484,14 +484,14 @@ static INPUT_PORTS_START( corv )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper EOS")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper EOS")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_dh[64] = {
@@ -506,11 +506,11 @@ const char *const wpc_s_state::lamps_dh[64] = {
};
const char *const wpc_s_state::outputs_dh[54] = {
- "s:Ball release", "s:Autoplunger", "s:Gun launch", "s:Top R popper", "s:Gun popper", "s:Drop target down", "s:Knocker", "s:Trap door hi",
- "s:Left sling", "s:Right sling", "s:Left jet", "s:Middle jet", "s:Right jet", "s:Left popper", "s:Right diverter", "s:Trap door hold",
- "f:Headquarters", "f:Top L popper", "f:Warehouse", "s:Gun motor", "f:Gun loaded", "f:Right ramp", "f:Right back", "f:Left back",
+ "s:Ball release", "s:Autoplunger", "s:Gun launch", "s:Top R popper", "s:Gun popper", "s:Drop target down", "s:Knocker", "s:Trap door hi",
+ "s:Left sling", "s:Right sling", "s:Left jet", "s:Middle jet", "s:Right jet", "s:Left popper", "s:Right diverter", "s:Trap door hold",
+ "f:Headquarters", "f:Top L popper", "f:Warehouse", "s:Gun motor", "f:Gun loaded", "f:Right ramp", "f:Right back", "f:Left back",
"s:Drop reset", "s:Top L popper", "s:Left diverter", "s:Right loop gate", "s:R flip power", "s:R flip hold", "s:L flip power", "s:L flip hold",
- "s:UR flip power", "s:UR flip hold", "s:R loop magnet", "s:Left loop gate", NULL, NULL, NULL, NULL,
+ "s:UR flip power", "s:UR flip hold", "s:R loop magnet", "s:Left loop gate", NULL, NULL, NULL, NULL,
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:Right string", "g:Left string", "g:Backbox title", "g:Backbox face", "g:Bottom string"
@@ -518,94 +518,94 @@ const char *const wpc_s_state::outputs_dh[54] = {
static INPUT_PORTS_START( dh )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Gun handle trig")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 8")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Gun handle trig")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right inlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 8")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ex ball button")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 1")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 2")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ex ball button")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left inlane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 1")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 2")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough jam")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right ramp make")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough jam")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right ramp make")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp make")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Gun chamber")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Gun popper")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Top R popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left ramp make")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Gun chamber")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Gun popper")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Top R popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target down")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 6")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 7")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 5")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 4")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 3")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target down")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 6")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 7")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 5")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 4")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Standup 3")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left rollover")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle rollover")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right rollover")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left sling")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right sling")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left rollover")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle rollover")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right rollover")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top L popper")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Gun position")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Gun lockup")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Top L popper")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Gun position")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Gun lockup")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Test switch")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Test switch")
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -616,14 +616,14 @@ static INPUT_PORTS_START( dh )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_i500[64] = {
@@ -638,11 +638,11 @@ const char *const wpc_s_state::lamps_i500[64] = {
};
const char *const wpc_s_state::outputs_i500[54] = {
- "s:Auto plunger", "s:Upper popper", "s:Upper eject", "s:Lower eject", "s:Turbo popper", NULL, "s:Knocker", "s:Left jet",
- "s:Right jet", "s:Center jet", "s:Left sling", "s:Right sling", "s:Trough", NULL, "f:Upper popper fls", "f:Top left corner",
- "f:Top right corner", "s:Race track motor", "f:Orange car", "f:Yellow car", "f:Blue car", "f:Green car", "f:Lft jet flasher", "f:Rt jet flasher",
+ "s:Auto plunger", "s:Upper popper", "s:Upper eject", "s:Lower eject", "s:Turbo popper", NULL, "s:Knocker", "s:Left jet",
+ "s:Right jet", "s:Center jet", "s:Left sling", "s:Right sling", "s:Trough", NULL, "f:Upper popper fls", "f:Top left corner",
+ "f:Top right corner", "s:Race track motor", "f:Orange car", "f:Yellow car", "f:Blue car", "f:Green car", "f:Lft jet flasher", "f:Rt jet flasher",
"f:Cntr jet flasher", "f:Right side", "f:Left side (2)", "f:Rt ramp enter", "s:R flip power", "s:R flip hold", "s:L flip power", "s:L flip hold",
- "s:UR flip power", "s:UR flip hold", "s:Diverter power", "s:Diverter hold", NULL, NULL, NULL, NULL,
+ "s:UR flip power", "s:UR flip hold", "s:Diverter power", "s:Diverter hold", NULL, NULL, NULL, NULL,
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:Upper lft plyfld", "g:Upper rt plyfld", "g:Lower playfield", "g:Backbox", "g:Title-coindoor"
@@ -650,87 +650,87 @@ const char *const wpc_s_state::outputs_i500[54] = {
static INPUT_PORTS_START( i500 )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left flip lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right flip lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right oulane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left flip lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right flip lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right oulane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy-in button")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank upper")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy-in button")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank upper")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank center")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank lower")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt flip wrench")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank center")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Three bank lower")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Rt flip wrench")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Top trough")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lft ramp standup")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Turbo wrench")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet bumpr wrench")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Top trough")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lft ramp standup")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Turbo wrench")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Jet bumpr wrench")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left lane")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center lane")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right lane")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ten point")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lest ramp wrench")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left light-up")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center light-up")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right light-up")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left lane")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center lane")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right lane")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ten point")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lest ramp wrench")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left light-up")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center light-up")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right light-up")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Upper popper")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Turbo popper")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Turbo ball sense")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper eject")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower kicker")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Turbo index")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Upper popper")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Turbo popper")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Turbo ball sense")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper eject")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower kicker")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Turbo index")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp made")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp made")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -741,14 +741,14 @@ static INPUT_PORTS_START( i500 )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_jb[64] = {
@@ -763,11 +763,11 @@ const char *const wpc_s_state::lamps_jb[64] = {
};
const char *const wpc_s_state::outputs_jb[54] = {
- "s:Ball release", NULL, "s:Game saucer", "s:Drop targets", "s:Right eject hole", "s:Raise ramp", "s:Knocker", "s:Left eject hole",
- "s:Left slingshot", "s:Right slingshot", "s:Lower jet bumper", "s:Left jet bumber", "s:Upper jet bumper", "s:Drop ramp", "f:Right visor", "f:Left visor",
- "f:Center visor", "f:Pinbot face", "f:Jet bumpers", "f:Lower left", "f:Mid left", "f:Lower right", "f:Back panel 1 (L)", "f:Back panel 2",
+ "s:Ball release", NULL, "s:Game saucer", "s:Drop targets", "s:Right eject hole", "s:Raise ramp", "s:Knocker", "s:Left eject hole",
+ "s:Left slingshot", "s:Right slingshot", "s:Lower jet bumper", "s:Left jet bumber", "s:Upper jet bumper", "s:Drop ramp", "f:Right visor", "f:Left visor",
+ "f:Center visor", "f:Pinbot face", "f:Jet bumpers", "f:Lower left", "f:Mid left", "f:Lower right", "f:Back panel 1 (L)", "f:Back panel 2",
"f:Back panel 3", "f:Back panel 4", "f:Back panel 5 (R)", NULL, "s:R flip power", "s:R flip hold", "s:L flip power", "s:L flip hold",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:Playfield lower", "g:Playfield left", "g:Playfield upper", "g:Playfield right", "g:Insert"
@@ -775,80 +775,80 @@ const char *const wpc_s_state::outputs_jb[54] = {
static INPUT_PORTS_START( jb )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L left 10 point")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U left 10 point")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp is down")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("High drop target")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center drop target")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Low drop target")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L left 10 point")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("U left 10 point")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp is down")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("High drop target")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center drop target")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Low drop target")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy extra ball")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L flipper lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R flipper lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy extra ball")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L flipper lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R flipper lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough jam")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp exit")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp entrance")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Targ under ramp")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough jam")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp exit")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ramp entrance")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Targ under ramp")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 1 (left)")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 2")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 3")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 4")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 5 (right)")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Game saucer")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right eject hole")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left eject hole")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 1 (left)")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 2")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 3")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 4")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Visor 5 (right)")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Game saucer")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right eject hole")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left eject hole")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank 1 (upper)")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank target 2")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank target 3")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank target 4")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank 5 (lower)")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vortex upper")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vortex center")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vortex lower")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank 1 (upper)")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank target 2")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank target 3")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank target 4")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5-bank 5 (lower)")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vortex upper")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vortex center")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Vortex lower")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper jet bumper")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet bumper")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower jet bumper")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right 10 point")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Hit me target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ball shooter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Upper jet bumper")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet bumper")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Lower jet bumper")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right 10 point")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Hit me target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Ball shooter")
PORT_START("SW.6")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -859,14 +859,14 @@ static INPUT_PORTS_START( jb )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Visor is closed")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Visor is open")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Visor is closed")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Visor is open")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_jm[64] = {
@@ -881,11 +881,11 @@ const char *const wpc_s_state::lamps_jm[64] = {
};
const char *const wpc_s_state::outputs_jm[54] = {
- "s:Trough eject", "s:Autoplunger", "s:Popper", NULL, "s:Clear matrix", "s:Hand magnet", "s:Knocker", NULL,
- "s:Left sling", "s:Right sling", "s:Left jet", "s:Bottom jet", "s:Right jet", "s:Crazy Bob's", "s:Drop target up", "s:Drop target down",
- "f:Jets", "f:Crazy Bob's", "f:Left sling", "f:Right sling", "s:X mot direction", "s:X motor enable", "s:Y mot direction", "s:Y motor enable",
+ "s:Trough eject", "s:Autoplunger", "s:Popper", NULL, "s:Clear matrix", "s:Hand magnet", "s:Knocker", NULL,
+ "s:Left sling", "s:Right sling", "s:Left jet", "s:Bottom jet", "s:Right jet", "s:Crazy Bob's", "s:Drop target up", "s:Drop target down",
+ "f:Jets", "f:Crazy Bob's", "f:Left sling", "f:Right sling", "s:X mot direction", "s:X motor enable", "s:Y mot direction", "s:Y motor enable",
"f:Left ramp", "f:Right ramp", "f:Hand popper", "f:R backpanel", "s:R flip power", "s:R flip hold", "s:L flip power", "s:L flip hold",
- "s:L diverter power", "s:L diverter hold", "s:R diverter power", "s:R diverter hold", NULL, NULL, NULL, NULL,
+ "s:L diverter power", "s:L diverter hold", "s:R diverter power", "s:R diverter hold", NULL, NULL, NULL, NULL,
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:String 1", "g:String 2", "g:String 3", "g:String 4", "g:String 5"
@@ -893,87 +893,87 @@ const char *const wpc_s_state::outputs_jm[54] = {
static INPUT_PORTS_START( jm )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("X hand home")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left flip lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right flip lane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("X hand home")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left flip lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right flip lane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy in button")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy in button")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L slingshot")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R slingshot")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L standup")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R standup")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough jam")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Popper ball 1")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Y hand home")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R rubber")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough jam")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Popper ball 1")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Y hand home")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R rubber")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Crazy Bob's")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Spinner")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp made")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Crazy Bob's")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Spinner")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 11")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 21")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 31")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp made")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop entry")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 11")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 21")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 31")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp made")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop entry")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 12")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 22")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 32")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet lane")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet lane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet lane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R hand control")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L hand control")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 12")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 22")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 32")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet lane")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Middle jet lane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet lane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R hand control")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L hand control")
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 13")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 23")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 33")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("X encoder A")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("X encoder B")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Y encoder B")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Y encoder A")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 13")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 23")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Cyber matrix 33")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("X encoder A")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("X encoder B")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Y encoder B")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Y encoder A")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -984,14 +984,14 @@ static INPUT_PORTS_START( jm )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Ball in hand")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Ball in hand")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_nf[64] = {
@@ -1006,11 +1006,11 @@ const char *const wpc_s_state::lamps_nf[64] = {
};
const char *const wpc_s_state::outputs_nf[54] = {
- "s:Right popper", "s:Auto plunger", "s:Right magnet", "s:Kickback", "s:Center magnet", "s:Left magnet", "s:Knocker", "s:Drop target down",
- NULL, "s:Right slingshot", "s:Left slingshot", "s:Drop target up", NULL, "s:Trough", "s:Eject", "s:Skull mouth",
- "f:Fls(2) flip rtrn", "f:Fls spinner", "f:Fls no fear", "f:Fls(3) rt ramp", "f:Fls(2) skull", "f:Fls bkbox expl", "f:Fls(3) left ramp", "f:Fls top left",
+ "s:Right popper", "s:Auto plunger", "s:Right magnet", "s:Kickback", "s:Center magnet", "s:Left magnet", "s:Knocker", "s:Drop target down",
+ NULL, "s:Right slingshot", "s:Left slingshot", "s:Drop target up", NULL, "s:Trough", "s:Eject", "s:Skull mouth",
+ "f:Fls(2) flip rtrn", "f:Fls spinner", "f:Fls no fear", "f:Fls(3) rt ramp", "f:Fls(2) skull", "f:Fls bkbox expl", "f:Fls(3) left ramp", "f:Fls top left",
"f:Fls(2) auto-fire", "f:Fls bkbox L top", "f:Fls bkbox R top", "f:Fls rt popper", "s:R flip power", "s:R flip hold", "s:L flip power", "s:L flip hold",
- "s:UR flip power", "s:UR flip hold", NULL, NULL, NULL, NULL, NULL, NULL,
+ "s:UR flip power", "s:UR flip hold", NULL, NULL, NULL, NULL, NULL, NULL,
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:Playfield top", "g:Playfield right", "g:Playfield left", "g:Insert title", "g:Insert bkground"
@@ -1018,80 +1018,80 @@ const char *const wpc_s_state::outputs_nf[54] = {
static INPUT_PORTS_START( nf )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Spinner")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Ball launch")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Spinner")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy extra ball")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Kickback")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Buy extra ball")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Kickback")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough stack")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 1 (right)")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 4")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough stack")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 1 (right)")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough 4")
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center tr entr")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left tr entr")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center tr entr")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left tr entr")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper 1")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper 2")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper 1")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper 2")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left magnet")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center magnet")
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right magnet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left magnet")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Center magnet")
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right magnet")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left wireform")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Light kb bottom")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Light kb top")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left wireform")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Inner loop")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Light kb bottom")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Light kb top")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Eject hole")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp middle")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp exit")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Eject hole")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left ramp middle")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp enter")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right ramp exit")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1102,14 +1102,14 @@ static INPUT_PORTS_START( nf )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper EOS")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_rs[64] = {
@@ -1124,11 +1124,11 @@ const char *const wpc_s_state::lamps_rs[64] = {
};
const char *const wpc_s_state::outputs_rs[54] = {
- "s:Trough", "s:L left diverter", "s:Lock-up pin", "s:U left diverter", "s:U right diverter", "s:Start city", "s:Knocker", "s:Lock kickout",
- "s:\"Ted\" eyes left", "s:\"Ted\" lids down", "s:\"Ted\" lids up", "s:\"Ted\" eyes right", "s:\"Red\" lids down", "s:\"Red\" eyes left", "s:\"Red\" lids up", "s:\"Red\" eyes right",
- "s:", "s:", "s:", "s:", "s:Left sling", "s:Right sling", "s:Bulldozer motor", "s:\"Red\" eject",
- "s:Top jet", "s:Left jet", "s:Right jet", "s:Shaker motor", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "f:Little flipper", "f:Left ramp", "f:Back white", "f:Back yellow",
+ "s:Trough", "s:L left diverter", "s:Lock-up pin", "s:U left diverter", "s:U right diverter", "s:Start city", "s:Knocker", "s:Lock kickout",
+ "s:\"Ted\" eyes left", "s:\"Ted\" lids down", "s:\"Ted\" lids up", "s:\"Ted\" eyes right", "s:\"Red\" lids down", "s:\"Red\" eyes left", "s:\"Red\" lids up", "s:\"Red\" eyes right",
+ "s:", "s:", "s:", "s:", "s:Left sling", "s:Right sling", "s:Bulldozer motor", "s:\"Red\" eject",
+ "s:Top jet", "s:Left jet", "s:Right jet", "s:Shaker motor", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "f:Little flipper", "f:Left ramp", "f:Back white", "f:Back yellow",
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:Playfld/insert 1", "g:Playfld/insert 2", "g:Playfld/insert 3", "g:Right playfield", "g:Left playfield"
@@ -1136,87 +1136,87 @@ const char *const wpc_s_state::outputs_rs[54] = {
static INPUT_PORTS_START( rs )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1227,14 +1227,14 @@ static INPUT_PORTS_START( rs )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_fs[64] = {
@@ -1249,11 +1249,11 @@ const char *const wpc_s_state::lamps_fs[64] = {
};
const char *const wpc_s_state::outputs_fs[54] = {
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:", "g:", "g:", "g:", "g:"
@@ -1261,87 +1261,87 @@ const char *const wpc_s_state::outputs_fs[54] = {
static INPUT_PORTS_START( fs )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1352,14 +1352,14 @@ static INPUT_PORTS_START( fs )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_ts[64] = {
@@ -1374,11 +1374,11 @@ const char *const wpc_s_state::lamps_ts[64] = {
};
const char *const wpc_s_state::outputs_ts[54] = {
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:", "g:", "g:", "g:", "g:"
@@ -1386,87 +1386,87 @@ const char *const wpc_s_state::outputs_ts[54] = {
static INPUT_PORTS_START( ts )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1477,14 +1477,14 @@ static INPUT_PORTS_START( ts )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_tom[64] = {
@@ -1499,11 +1499,11 @@ const char *const wpc_s_state::lamps_tom[64] = {
};
const char *const wpc_s_state::outputs_tom[54] = {
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:", "g:", "g:", "g:", "g:"
@@ -1511,87 +1511,87 @@ const char *const wpc_s_state::outputs_tom[54] = {
static INPUT_PORTS_START( tom )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1602,14 +1602,14 @@ static INPUT_PORTS_START( tom )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_wd[64] = {
@@ -1624,11 +1624,11 @@ const char *const wpc_s_state::lamps_wd[64] = {
};
const char *const wpc_s_state::outputs_wd[54] = {
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:", "g:", "g:", "g:", "g:"
@@ -1636,87 +1636,87 @@ const char *const wpc_s_state::outputs_wd[54] = {
static INPUT_PORTS_START( wd )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1727,14 +1727,14 @@ static INPUT_PORTS_START( wd )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
const char *const wpc_s_state::lamps_wcs[64] = {
@@ -1749,11 +1749,11 @@ const char *const wpc_s_state::lamps_wcs[64] = {
};
const char *const wpc_s_state::outputs_wcs[54] = {
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
- "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
+ "s:", "s:", "s:", "s:", "s:", "s:", "s:", "s:",
"s:Coin meter",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"g:", "g:", "g:", "g:", "g:"
@@ -1761,87 +1761,87 @@ const char *const wpc_s_state::outputs_wcs[54] = {
static INPUT_PORTS_START( wcs )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1852,99 +1852,99 @@ static INPUT_PORTS_START( wcs )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
static INPUT_PORTS_START( tfs )
PORT_START("SW.0")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Launch button")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start button")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Plumb bob tilt")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left outlane")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right return")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Shooter lane")
PORT_START("SW.1")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Slam tilt")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Coin door closed") PORT_TOGGLE PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left return")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right outlane")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.2")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough eject")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 1")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 2")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 3")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Trough ball 4")
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Left popper")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Right popper")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left top lane")
PORT_START("SW.3")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTI\"A\"N")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MARTIA\"N\"")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MAR\"T\"IN")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MART\"I\"AN")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L motor bank")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C motor bank")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R motor bank")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right top lane")
PORT_START("SW.4")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left slingshot")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right slingshot")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left jet")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Bottom jet")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right jet")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("\"M\"ARTIAN")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("M\"A\"RTIAN")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("MA\"R\"TIAN")
PORT_START("SW.5")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp enter")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("C ramp enter")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp enter")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L ramp exit")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R ramp exit")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank down")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Motor bank up")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("SW.6")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop hi")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right loop lo")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop hi")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Left loop lo")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("L saucer tgt")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("R saucer tgt")
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Drop target")
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Center trough")
PORT_START("SW.7")
- PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+ PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_START("DOOR")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
- PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Left coin chute")
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("Center coin chute")
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("Right coin chute")
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("4th coin chute")
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_SERVICE1) PORT_NAME("Service credit/Escape")
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Down/Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Volume Up/Up") PORT_CODE(KEYCODE_UP)
+ PORT_SERVICE_NO_TOGGLE(0x80, IP_ACTIVE_HIGH ) PORT_NAME("Begin test/Enter")
PORT_START("DSW")
PORT_DIPNAME(0xff, 0xfc, "Country") PORT_DIPLOCATION("SW1:1,2,3,4,5,6,7,8")
@@ -1955,14 +1955,14 @@ static INPUT_PORTS_START( tfs )
PORT_DIPSETTING( 0xec, "Spain")
PORT_START("FLIPPERS")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper EOS")
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("R Flipper Button")
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper EOS")
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("L Flipper Button")
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UR Flipper Button")
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
static MACHINE_CONFIG_START( wpc_s, wpc_s_state )
@@ -2400,7 +2400,7 @@ ROM_END
/*-----------------
/ The Shadow
/------------------*/
-ROM_START(ts_lh6)
+ROM_START(ts_lh6)
ROM_REGION(0x80000, "maincpu", 0)
ROM_LOAD("shad_h6.rom", 0x00000, 0x080000, CRC(0a72268d) SHA1(97836afc23c4160bca462f14c115b17e58fe5a48))
ROM_REGION16_LE(0x1000000, "dcs", ROMREGION_ERASEFF)
diff --git a/src/mame/drivers/wyvernf0.c b/src/mame/drivers/wyvernf0.c
index e40667f3eda..c3929e27eac 100644
--- a/src/mame/drivers/wyvernf0.c
+++ b/src/mame/drivers/wyvernf0.c
@@ -6,10 +6,10 @@ driver by Luca Elia
Typical Taito mid-80s hardware but with dual video outputs.
-Sound board: Z80, 2 x YM2149, OKI M5232
-CPU board: Z80, ROM and RAM, 68705P5 MCU (protected)
-OBJ board: ROMs and RAM
-Video board: ROMs and RAM, 4 x Fujitsu MB112S146 (also used on arkanoid, lkage)
+Sound board: Z80, 2 x YM2149, OKI M5232
+CPU board: Z80, ROM and RAM, 68705P5 MCU (protected)
+OBJ board: ROMs and RAM
+Video board: ROMs and RAM, 4 x Fujitsu MB112S146 (also used on arkanoid, lkage)
The rest is just common logic, there's no custom chips.
@@ -99,14 +99,14 @@ public:
Video
- Note: if MAME_DEBUG is defined, pressing Z with:
+ Note: if MAME_DEBUG is defined, pressing Z with:
- Q Shows the background tilemap
- W Shows the foreground tilemap
- A Shows the background sprites
- S Shows the foreground sprites
+ Q Shows the background tilemap
+ W Shows the foreground tilemap
+ A Shows the background sprites
+ S Shows the foreground sprites
- Keys can be used together!
+ Keys can be used together!
***************************************************************************/
@@ -191,9 +191,9 @@ yyyyyyyy fccccccc xf??pppp xxxxxxxx
int sx, sy, code, color;
sx = sprram[offs + 3] - ((sprram[offs + 2] & 0x80) << 1);
- sy = 256 - 8 - sprram[offs + 0] - 23; // center player sprite: 256 - 8 - 0x71 + dy = 256/2-32/2 -> dy = -23
+ sy = 256 - 8 - sprram[offs + 0] - 23; // center player sprite: 256 - 8 - 0x71 + dy = 256/2-32/2 -> dy = -23
- int flipx = sprram[offs + 2] & 0x40; // maybe
+ int flipx = sprram[offs + 2] & 0x40; // maybe
int flipy = sprram[offs + 1] & 0x80;
if (flip_screen_x())
@@ -262,12 +262,12 @@ if (machine().input().code_pressed(KEYCODE_Z))
bitmap.fill(0, cliprect);
// background monitor
- if (layers_ctrl & 1) m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
- if (layers_ctrl & 4) draw_sprites(bitmap, cliprect, false);
+ if (layers_ctrl & 1) m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+ if (layers_ctrl & 4) draw_sprites(bitmap, cliprect, false);
// foreground monitor
- if (layers_ctrl & 8) draw_sprites(bitmap, cliprect, true);
- if (layers_ctrl & 2) m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+ if (layers_ctrl & 8) draw_sprites(bitmap, cliprect, true);
+ if (layers_ctrl & 2) m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
return 0;
}
@@ -283,7 +283,7 @@ READ8_MEMBER(wyvernf0_state::fake_mcu_r)
int result = 0;
if ((m_mcu_val & 0x73) == 0x73)
- result = 0x42; // at boot
+ result = 0x42; // at boot
return result;
}
@@ -404,7 +404,7 @@ static ADDRESS_MAP_START( wyvernf0_map, AS_PROGRAM, 8, wyvernf0_state )
AM_RANGE(0xd800, 0xdbff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
- AM_RANGE(0xdc00, 0xdc00) AM_WRITENOP // irq ack?
+ AM_RANGE(0xdc00, 0xdc00) AM_WRITENOP // irq ack?
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, wyvernf0_state )
@@ -431,7 +431,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( wyvernf0 )
- PORT_START("DSW1") // d600 -> 800c
+ PORT_START("DSW1") // d600 -> 800c
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "?? 0" )
PORT_DIPSETTING( 0x01, "?? 1" )
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( wyvernf0 )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START("DSW2") // d601 -> 800d
+ PORT_START("DSW2") // d601 -> 800d
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -489,13 +489,13 @@ static INPUT_PORTS_START( wyvernf0 )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START("DSW3") // d602 -> 800e
+ PORT_START("DSW3") // d602 -> 800e
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
- PORT_DIPUNKNOWN( 0x04, 0x04 ) // *
+ PORT_DIPUNKNOWN( 0x04, 0x04 ) // *
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) ) /* Music at every other title screen */
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( wyvernf0 )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START("SYSTEM") // d603 -> 800f / 8023
+ PORT_START("SYSTEM") // d603 -> 800f / 8023
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( wyvernf0 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("JOY1") // d604 -> 8010 / 8024
+ PORT_START("JOY1") // d604 -> 8010 / 8024
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( wyvernf0 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START("FIRE1") // d605 -> 8011 / 8025
+ PORT_START("FIRE1") // d605 -> 8011 / 8025
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -542,7 +542,7 @@ static INPUT_PORTS_START( wyvernf0 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START("JOY2") // d606 -> 8012 / 8026
+ PORT_START("JOY2") // d606 -> 8012 / 8026
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -552,7 +552,7 @@ static INPUT_PORTS_START( wyvernf0 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START("FIRE2") // d607 -> 8013 / 8027
+ PORT_START("FIRE2") // d607 -> 8013 / 8027
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -633,10 +633,10 @@ static MACHINE_CONFIG_START( wyvernf0, wyvernf0_state )
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(wyvernf0_state, irq0_line_hold, 60*2) // IRQ generated by ??? (drives music tempo), NMI by main cpu
-// MCFG_CPU_ADD("mcu", M68705, 4000000) // ?
-// MCFG_CPU_PROGRAM_MAP(mcu_map)
+// MCFG_CPU_ADD("mcu", M68705, 4000000) // ?
+// MCFG_CPU_PROGRAM_MAP(mcu_map)
-// MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
+// MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
MCFG_MACHINE_START_OVERRIDE(wyvernf0_state,wyvernf0)
MCFG_MACHINE_RESET_OVERRIDE(wyvernf0_state,wyvernf0)
@@ -669,7 +669,7 @@ static MACHINE_CONFIG_START( wyvernf0, wyvernf0_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
// music
- MCFG_SOUND_ADD("msm", MSM5232, 2000000) // ?
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000) // ?
MCFG_MSM5232_SET_CAPACITORS(0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6) /* default 0.39 uF capacitors (not verified) */
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 3415a7a5690..8d82712a440 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -815,7 +815,7 @@ static MACHINE_CONFIG_START( zr107, zr107_state )
MCFG_DEVICE_ADD("adc0838", ADC0838, 0)
MCFG_ADC083X_INPUT_CB(zr107_state, adc0838_callback)
-
+
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_ZR107)
@@ -897,7 +897,7 @@ static MACHINE_CONFIG_START( jetwave, zr107_state )
MCFG_DEVICE_ADD("adc0838", ADC0838, 0)
MCFG_ADC083X_INPUT_CB(zr107_state, adc0838_callback)
-
+
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_GTICLUB)
diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c
index 90c61616735..303debc92a8 100644
--- a/src/mame/machine/archimds.c
+++ b/src/mame/machine/archimds.c
@@ -606,7 +606,7 @@ WRITE32_MEMBER( archimedes_state::ioc_ctrl_w )
---- ---x I2C data
*/
//if(data & 0x40)
- // popmessage("Muting sound, contact MAME/MESSdev");
+ // popmessage("Muting sound, contact MAME/MESSdev");
break;
case KART:
@@ -761,8 +761,8 @@ READ32_MEMBER(archimedes_state::archimedes_ioc_r)
case 0x18: return 0xff; // FDC latch B
case 0x40: return 0xff; // FDC latch A
case 0x50: return 0; //fdc type, new model returns 5 here
- case 0x70: return 0x0F;
- case 0x74: return 0xFF; // unknown
+ case 0x70: return 0x0F;
+ case 0x74: return 0xFF; // unknown
// case 0x78: /* joystick */
// case 0x7c:
}
@@ -916,9 +916,9 @@ void archimedes_state::vidc_dynamic_res_change()
visarea.max_y = (m_vidc_regs[VIDC_VBER] - m_vidc_regs[VIDC_VBSR]) * (m_vidc_interlace+1);
//logerror("Configuring: htotal %d vtotal %d border %d x %d display %d x %d\n",
- // m_vidc_regs[VIDC_HCR], m_vidc_regs[VIDC_VCR],
- // visarea.max_x, visarea.max_y,
- // m_vidc_regs[VIDC_HDER]-m_vidc_regs[VIDC_HDSR],m_vidc_regs[VIDC_VDER]-m_vidc_regs[VIDC_VDSR]+1);
+ // m_vidc_regs[VIDC_HCR], m_vidc_regs[VIDC_VCR],
+ // visarea.max_x, visarea.max_y,
+ // m_vidc_regs[VIDC_HDER]-m_vidc_regs[VIDC_HDSR],m_vidc_regs[VIDC_VDER]-m_vidc_regs[VIDC_VDSR]+1);
/* FIXME: pixel clock */
refresh = HZ_TO_ATTOSECONDS(pixel_rate[m_vidc_pixel_clk]*2) * m_vidc_regs[VIDC_HCR] * m_vidc_regs[VIDC_VCR];
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index ed867be3642..95cceb8712a 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -211,13 +211,13 @@ inline void balsente_state::noise_gen_chip(int chip, int count, short *buffer)
/* noise generator runs at 100kHz */
UINT32 step = (100000 << 14) / CEM3394_SAMPLE_RATE;
UINT32 noise_counter = m_noise_position[chip];
-
+
while (count--)
{
*buffer++ = m_poly17[(noise_counter >> 14) & POLY17_SIZE] << 12;
noise_counter += step;
}
-
+
/* remember the noise position */
m_noise_position[chip] = noise_counter;
}
diff --git a/src/mame/machine/bfm_bd1.c b/src/mame/machine/bfm_bd1.c
index 635d7f43f0b..a8a2f8b22f2 100644
--- a/src/mame/machine/bfm_bd1.c
+++ b/src/mame/machine/bfm_bd1.c
@@ -562,7 +562,7 @@ void bfm_bd1_t::shift_clock(int state)
WRITE_LINE_MEMBER( bfm_bd1_t::sclk ) { shift_clock(state); }
WRITE_LINE_MEMBER( bfm_bd1_t::data ) { m_data = state; }
-WRITE_LINE_MEMBER( bfm_bd1_t::por )
+WRITE_LINE_MEMBER( bfm_bd1_t::por )
{
if (!state)
{
diff --git a/src/mame/machine/fd1094.c b/src/mame/machine/fd1094.c
index 19fe9555fb9..60ffd34d847 100644
--- a/src/mame/machine/fd1094.c
+++ b/src/mame/machine/fd1094.c
@@ -305,66 +305,66 @@
driver FD1094 SP plain SP enc PC plain PC enc States Used (majority one marked with asterisk, if known)
-------- -------- -------- -------- -------- -------- ---------------------
- aceattac 317-0059 00000000 A711AF59 00000414 AF59AACD 00 12 17 31 45 90 FC*
- aceattaca 317-0060 00000000 A711AF59 00000400 AF59EADD 00 17 31 45 90 FC*
- altbeast5 317-0069 FFFFFF00 B2F7F299 00000400 CCDDEF58 00 0F 18 20 93* A7 D8
- altbeastj1 317-0065 FFFFFF00 C9C5F299 00000400 CCDDECDD 00 09 12 67* 99 FC
- altbeastj3 317-0068 FFFFFF00 B2F7F299 00000400 CCDDEF58 00 0F 18 20 93* A7 D8
- astorm 317-0154 FFFFFF00 B297F23F 00000400 BD5999DD 00 1F 48* 5F 66 ED
- astorm3 317-0148 FFFFFF00 ED9FF23F 00000400 FC58B9DC 00 06 36 50 CC D9*
- astormj 317-0146 FFFFFF00 ED8CF23F 00000400 FC58BC59 00 10 29* 44 CE DF
- astormu 317-0147 FFFFFF00 B297F23F 00000400 55334533 00 19 2D 46 58* DF
- bayroute 317-0116 00504000 5EB40000 00001000 5533A184 00 04* 11 18
- bayroutej 317-0115 00504000 56150000 00001000 85948DCF 00 05* 12 16
- bloxeed 317-0139 00000000 5D92A711 00001D38 BD59FFE8 00 49 53 55 56* DF
- bullet 317-0041 00000000 57355D96 00001882 8DDC8CF4 00 12 21 69* FE
- cltchitr 317-0176 00000000 A711A711 00000416 AF59EBCD 00 01* 80 FC
- cltchitrj 317-0175 00000000 5F94A711 00000416 AF59AFFB 00 03 19* 91
- cotton 317-0181a 00204000 5DB20000 00000716 CCDD0716 00 0E* 73
- cottonj 317-0179b 00204000 5DB20000 00000720 CCDD0720 00 0E* 73
- cottonu 317-0180 00204000 5DB20000 00000716 A1840716 00 0E* 73
- ddcrew 317-0190 00000000 AF595D92 00000408 BD59FD7F 00 07 16* 17
- ddcrew1 317-0187 00000000 5F945D96 00000408 8DDCE758 00 04 07* 13 91
- ddcrew2 317-0184 00000000 AF595D92 00000408 5533FD7F 00 07 12* 16 22
- ddcrewj 317-0185 00000000 5F945D92 00000408 5533FD7F 00 06 07* 09 91
- ddcrewu 317-0186 00000000 AF59A711 00000408 8DDCC381 00 01 07 5F 91*
- ddux 317-0096 00000000 5F94AF59 00000406 AF5987A0 00 21 28 70* D9
- desertbr 317-0196 00000000 55335D92 00001838 5533F46A 00 3C 4A 82 DA*
- desertbrj 317-0194 00000000 55335D92 00001838 BD59E720 00 3C 4A 82 DA*
- eswat 317-0130 00000000 A711AF59 00000400 5533BC59 00 05 0C EC FA*
- eswatj 317-0128 00000000 A711AF59 00000400 55334735 00 55 63 CB* D5
- eswatu 317-0129 00000000 5537AF59 00000400 55334735 00 0A 12 C3* CC
- exctleag 317-0079 00000000 5537AF59 00000410 83018384 00 02 39 4B 85 98 E5*
- fpoint 317-0127a 00000000 AF59AF59 00001A40 8DDC9960 00 15* 35 5F 82 DB
- fpoint1 317-0127a 00000000 AF59AF59 00001A40 8DDC9960 00 15* 35 5F 82 DB
- goldnaxe1 317-0110 FFFFFF00 ED62F2B9 00000400 AF59A785 00 19 2E 31 48* 5D
- goldnaxe3 317-0120 FFFFFF00 ED62F2B9 00000400 AF59A785 00 0A 0D 44 C7 EF*
- goldnaxej 317-0121 FFFFFF00 C9D6F2B9 00000400 AF59A785 00 12* 35 58 7A 9E
- goldnaxeu 317-0122 FFFFFF00 E53AF2B9 00000400 A184A196 00 03 51* 72 99 F6
- hwchampj 317-0046 00000000 5D925D96 000008AC AF59AA41 00 8B* E3
- lghost 317-0166 00000000 5F94A711 00000404 EE588241 00 A2 DC E0*
- lghostu 317-0165 00000000 AF59A711 00000404 EE58C340 00 56 C4 DE*
- mvp 317-0143 00000000 5F94A711 00000416 BD59DC5B 00 19* 20 88 98
- mwalk 317-0159 FFFFFF00 C9C7F23F 00000400 5533BD7F 00 39 51* AA CC
- mwalkj 317-0157 FFFFFF00 B2F7F23F 00000400 5533BD7F 00 20 88 99 CF*
- mwalku 317-0158 FFFFFF00 C572F23F 00000400 8DDC8DDD 00 49* 90 C0 DE
- passsht 317-0080 00000000 AF59AF59 00003202 C2003923 00 11 52* 96 EE
- passshta 317-0074 00000000 AF59AF59 000031E4 C2003F8C 00 12* 47 83 A7
- passshtj 317-0070 00000000 5D92AF59 000031E4 C2003F8C 00 12 59 83* FE
- pontoon 317-0153 00000000 A7115D92 00000E0C FC585979 00 19 70 DC* FC
- ryukyu 317-5023 00203800 AF49D30B 0000042E FC5863B5 00 DC* EF
- shinobi2 317-0049 FFFFFF00 C9C5F25F 00000400 AF598395 00 53 88 98 9B 9C* F1
- sonicbom 317-0053 00000000 5735AF59 00001000 FC587133 00*
- suprleag 317-0045 00000000 A711AF59 0000108E BD59CE5B 00 12* 34 56 AB CD
+ aceattac 317-0059 00000000 A711AF59 00000414 AF59AACD 00 12 17 31 45 90 FC*
+ aceattaca 317-0060 00000000 A711AF59 00000400 AF59EADD 00 17 31 45 90 FC*
+ altbeast5 317-0069 FFFFFF00 B2F7F299 00000400 CCDDEF58 00 0F 18 20 93* A7 D8
+ altbeastj1 317-0065 FFFFFF00 C9C5F299 00000400 CCDDECDD 00 09 12 67* 99 FC
+ altbeastj3 317-0068 FFFFFF00 B2F7F299 00000400 CCDDEF58 00 0F 18 20 93* A7 D8
+ astorm 317-0154 FFFFFF00 B297F23F 00000400 BD5999DD 00 1F 48* 5F 66 ED
+ astorm3 317-0148 FFFFFF00 ED9FF23F 00000400 FC58B9DC 00 06 36 50 CC D9*
+ astormj 317-0146 FFFFFF00 ED8CF23F 00000400 FC58BC59 00 10 29* 44 CE DF
+ astormu 317-0147 FFFFFF00 B297F23F 00000400 55334533 00 19 2D 46 58* DF
+ bayroute 317-0116 00504000 5EB40000 00001000 5533A184 00 04* 11 18
+ bayroutej 317-0115 00504000 56150000 00001000 85948DCF 00 05* 12 16
+ bloxeed 317-0139 00000000 5D92A711 00001D38 BD59FFE8 00 49 53 55 56* DF
+ bullet 317-0041 00000000 57355D96 00001882 8DDC8CF4 00 12 21 69* FE
+ cltchitr 317-0176 00000000 A711A711 00000416 AF59EBCD 00 01* 80 FC
+ cltchitrj 317-0175 00000000 5F94A711 00000416 AF59AFFB 00 03 19* 91
+ cotton 317-0181a 00204000 5DB20000 00000716 CCDD0716 00 0E* 73
+ cottonj 317-0179b 00204000 5DB20000 00000720 CCDD0720 00 0E* 73
+ cottonu 317-0180 00204000 5DB20000 00000716 A1840716 00 0E* 73
+ ddcrew 317-0190 00000000 AF595D92 00000408 BD59FD7F 00 07 16* 17
+ ddcrew1 317-0187 00000000 5F945D96 00000408 8DDCE758 00 04 07* 13 91
+ ddcrew2 317-0184 00000000 AF595D92 00000408 5533FD7F 00 07 12* 16 22
+ ddcrewj 317-0185 00000000 5F945D92 00000408 5533FD7F 00 06 07* 09 91
+ ddcrewu 317-0186 00000000 AF59A711 00000408 8DDCC381 00 01 07 5F 91*
+ ddux 317-0096 00000000 5F94AF59 00000406 AF5987A0 00 21 28 70* D9
+ desertbr 317-0196 00000000 55335D92 00001838 5533F46A 00 3C 4A 82 DA*
+ desertbrj 317-0194 00000000 55335D92 00001838 BD59E720 00 3C 4A 82 DA*
+ eswat 317-0130 00000000 A711AF59 00000400 5533BC59 00 05 0C EC FA*
+ eswatj 317-0128 00000000 A711AF59 00000400 55334735 00 55 63 CB* D5
+ eswatu 317-0129 00000000 5537AF59 00000400 55334735 00 0A 12 C3* CC
+ exctleag 317-0079 00000000 5537AF59 00000410 83018384 00 02 39 4B 85 98 E5*
+ fpoint 317-0127a 00000000 AF59AF59 00001A40 8DDC9960 00 15* 35 5F 82 DB
+ fpoint1 317-0127a 00000000 AF59AF59 00001A40 8DDC9960 00 15* 35 5F 82 DB
+ goldnaxe1 317-0110 FFFFFF00 ED62F2B9 00000400 AF59A785 00 19 2E 31 48* 5D
+ goldnaxe3 317-0120 FFFFFF00 ED62F2B9 00000400 AF59A785 00 0A 0D 44 C7 EF*
+ goldnaxej 317-0121 FFFFFF00 C9D6F2B9 00000400 AF59A785 00 12* 35 58 7A 9E
+ goldnaxeu 317-0122 FFFFFF00 E53AF2B9 00000400 A184A196 00 03 51* 72 99 F6
+ hwchampj 317-0046 00000000 5D925D96 000008AC AF59AA41 00 8B* E3
+ lghost 317-0166 00000000 5F94A711 00000404 EE588241 00 A2 DC E0*
+ lghostu 317-0165 00000000 AF59A711 00000404 EE58C340 00 56 C4 DE*
+ mvp 317-0143 00000000 5F94A711 00000416 BD59DC5B 00 19* 20 88 98
+ mwalk 317-0159 FFFFFF00 C9C7F23F 00000400 5533BD7F 00 39 51* AA CC
+ mwalkj 317-0157 FFFFFF00 B2F7F23F 00000400 5533BD7F 00 20 88 99 CF*
+ mwalku 317-0158 FFFFFF00 C572F23F 00000400 8DDC8DDD 00 49* 90 C0 DE
+ passsht 317-0080 00000000 AF59AF59 00003202 C2003923 00 11 52* 96 EE
+ passshta 317-0074 00000000 AF59AF59 000031E4 C2003F8C 00 12* 47 83 A7
+ passshtj 317-0070 00000000 5D92AF59 000031E4 C2003F8C 00 12 59 83* FE
+ pontoon 317-0153 00000000 A7115D92 00000E0C FC585979 00 19 70 DC* FC
+ ryukyu 317-5023 00203800 AF49D30B 0000042E FC5863B5 00 DC* EF
+ shinobi2 317-0049 FFFFFF00 C9C5F25F 00000400 AF598395 00 53 88 98 9B 9C* F1
+ sonicbom 317-0053 00000000 5735AF59 00001000 FC587133 00*
+ suprleag 317-0045 00000000 A711AF59 0000108E BD59CE5B 00 12* 34 56 AB CD
tetris1 317-0091 00000000 5D92AF59 00000410 AF59AE58 99 25 42 5B 68 FC
- tetris2 317-0092 00000000 5735AF59 00000410 AF598685 00 10 52 74 97* FC
+ tetris2 317-0092 00000000 5735AF59 00000410 AF598685 00 10 52 74 97* FC
wb32 317-0085 FFFFFF7E B2F78997 00000500 AF590500 00 10 13 26 77
- wb33 317-0089 FFFFFF7E E5C78997 00000500 AF590500 00 23 40 52 71*
- wb34 317-0087 FFFFFF7E B2978997 00000500 AF590500 00 11* 64 69 82
- wrestwar1 317-0090 00000000 5D96AF59 00000414 8301AE18 00 12* A7 AB CC F9 FC
- wrestwar2 317-0102 00000000 5D96AF59 00000414 EE588E5B 00 12* A7 AB CC F9 FC
- wwallyj 317-0197b 00000000 AF595D96 00000416 CCDDCE5B 00 16* 32 3F 43
- wwallyja 317-0197a 00000000 AF595D96 00000416 CCDDCE5B 00 16* 32 3F 43
+ wb33 317-0089 FFFFFF7E E5C78997 00000500 AF590500 00 23 40 52 71*
+ wb34 317-0087 FFFFFF7E B2978997 00000500 AF590500 00 11* 64 69 82
+ wrestwar1 317-0090 00000000 5D96AF59 00000414 8301AE18 00 12* A7 AB CC F9 FC
+ wrestwar2 317-0102 00000000 5D96AF59 00000414 EE588E5B 00 12* A7 AB CC F9 FC
+ wwallyj 317-0197b 00000000 AF595D96 00000416 CCDDCE5B 00 16* 32 3F 43
+ wwallyja 317-0197a 00000000 AF595D96 00000416 CCDDCE5B 00 16* 32 3F 43
*****************************************************************************/
@@ -822,68 +822,68 @@ UINT16 fd1094_device::decrypt_one(offs_t address, UINT16 val, const UINT8 *main_
UINT8 key_7a = BIT(mainkey,7) ^ BIT(gkey2,4);
- if (val & 0x8000) // block invariant: val & 0x8000 != 0
- {
- val = BITSWAP16(val, 15, 9,10,13, 3,12, 0,14, 6, 5, 2,11, 8, 1, 4, 7);
-
- if (!global_xor1) if (~val & 0x0800) val ^= 0x3002; // 1,12,13
- if (~val & 0x0020) val ^= 0x0044; // 2,6
- if (!key_1b) if (~val & 0x0400) val ^= 0x0890; // 4,7,11
- if (!global_swap2) if (!key_0c) val ^= 0x0308; // 3,8,9
- val ^= 0x6561;
-
- if (!key_2b) val = BITSWAP16(val,15,10,13,12,11,14,9,8,7,6,0,4,3,2,1,5); // 0-5, 10-14
- }
-
- if (val & 0x4000) // block invariant: val & 0x4000 != 0
- {
- val = BITSWAP16(val, 13,14, 7, 0, 8, 6, 4, 2, 1,15, 3,11,12,10, 5, 9);
-
- if (!global_xor0) if (val & 0x0010) val ^= 0x0468; // 3,5,6,10
- if (!key_3a) if (val & 0x0100) val ^= 0x0081; // 0,7
- if (!key_6a) if (val & 0x0004) val ^= 0x0100; // 8
- if (!key_5b) if (!key_0b) val ^= 0x3012; // 1,4,12,13
- val ^= 0x3523;
-
- if (!global_swap0b) val = BITSWAP16(val, 2,14,13,12, 9,10,11, 8, 7, 6, 5, 4, 3,15, 1, 0); // 2-15, 9-11
- }
-
- if (val & 0x2000) // block invariant: val & 0x2000 != 0
- {
- val = BITSWAP16(val, 10, 2,13, 7, 8, 0, 3,14, 6,15, 1,11, 9, 4, 5,12);
-
- if (!key_4a) if (val & 0x0800) val ^= 0x010c; // 2,3,8
- if (!key_1a) if (val & 0x0080) val ^= 0x1000; // 12
- if (!key_7a) if (val & 0x0400) val ^= 0x0a21; // 0,5,9,11
- if (!key_4b) if (!key_0a) val ^= 0x0080; // 7
- if (!global_swap0a) if (!key_6b) val ^= 0xc000; // 14,15
- val ^= 0x99a5;
-
- if (!key_5b) val = BITSWAP16(val,15,14,13,12,11, 1, 9, 8, 7,10, 5, 6, 3, 2, 4, 0); // 1,4,6,10
- }
+ if (val & 0x8000) // block invariant: val & 0x8000 != 0
+ {
+ val = BITSWAP16(val, 15, 9,10,13, 3,12, 0,14, 6, 5, 2,11, 8, 1, 4, 7);
+
+ if (!global_xor1) if (~val & 0x0800) val ^= 0x3002; // 1,12,13
+ if (~val & 0x0020) val ^= 0x0044; // 2,6
+ if (!key_1b) if (~val & 0x0400) val ^= 0x0890; // 4,7,11
+ if (!global_swap2) if (!key_0c) val ^= 0x0308; // 3,8,9
+ val ^= 0x6561;
+
+ if (!key_2b) val = BITSWAP16(val,15,10,13,12,11,14,9,8,7,6,0,4,3,2,1,5); // 0-5, 10-14
+ }
+
+ if (val & 0x4000) // block invariant: val & 0x4000 != 0
+ {
+ val = BITSWAP16(val, 13,14, 7, 0, 8, 6, 4, 2, 1,15, 3,11,12,10, 5, 9);
+
+ if (!global_xor0) if (val & 0x0010) val ^= 0x0468; // 3,5,6,10
+ if (!key_3a) if (val & 0x0100) val ^= 0x0081; // 0,7
+ if (!key_6a) if (val & 0x0004) val ^= 0x0100; // 8
+ if (!key_5b) if (!key_0b) val ^= 0x3012; // 1,4,12,13
+ val ^= 0x3523;
+
+ if (!global_swap0b) val = BITSWAP16(val, 2,14,13,12, 9,10,11, 8, 7, 6, 5, 4, 3,15, 1, 0); // 2-15, 9-11
+ }
+
+ if (val & 0x2000) // block invariant: val & 0x2000 != 0
+ {
+ val = BITSWAP16(val, 10, 2,13, 7, 8, 0, 3,14, 6,15, 1,11, 9, 4, 5,12);
+
+ if (!key_4a) if (val & 0x0800) val ^= 0x010c; // 2,3,8
+ if (!key_1a) if (val & 0x0080) val ^= 0x1000; // 12
+ if (!key_7a) if (val & 0x0400) val ^= 0x0a21; // 0,5,9,11
+ if (!key_4b) if (!key_0a) val ^= 0x0080; // 7
+ if (!global_swap0a) if (!key_6b) val ^= 0xc000; // 14,15
+ val ^= 0x99a5;
+
+ if (!key_5b) val = BITSWAP16(val,15,14,13,12,11, 1, 9, 8, 7,10, 5, 6, 3, 2, 4, 0); // 1,4,6,10
+ }
if (val & 0xe000) // block invariant: val & 0xe000 != 0
{
- val = BITSWAP16(val,15,13,14, 5, 6, 0, 9,10, 4,11, 1, 2,12, 3, 7, 8);
-
- val ^= 0x17ff;
-
+ val = BITSWAP16(val,15,13,14, 5, 6, 0, 9,10, 4,11, 1, 2,12, 3, 7, 8);
+
+ val ^= 0x17ff;
+
if (!global_swap4) val = BITSWAP16(val, 15,14,13, 6,11,10, 9, 5, 7,12, 8, 4, 3, 2, 1, 0); // 5-8, 6-12
if (!global_swap3) val = BITSWAP16(val, 13,15,14,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0); // 15-14-13
if (!global_swap2) val = BITSWAP16(val, 15,14,13,12,11, 2, 9, 8,10, 6, 5, 4, 3, 0, 1, 7); // 10-2-0-7
if (!key_3b) val = BITSWAP16(val, 15,14,13,12,11,10, 4, 8, 7, 6, 5, 9, 1, 2, 3, 0); // 9-4, 3-1
- if (!key_2a) val = BITSWAP16(val, 13,14,15,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0); // 13-15
-
+ if (!key_2a) val = BITSWAP16(val, 13,14,15,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0); // 13-15
+
if (!global_swap1) val = BITSWAP16(val, 15,14,13,12, 9, 8,11,10, 7, 6, 5, 4, 3, 2, 1, 0); // 11...8
if (!key_5a) val = BITSWAP16(val, 15,14,13,12,11,10, 9, 8, 4, 5, 7, 6, 3, 2, 1, 0); // 7...4
if (!global_swap0a) val = BITSWAP16(val, 15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 0, 3, 2, 1); // 3...0
}
-
- val = BITSWAP16(val, 12,15,14,13,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
- if ((val & 0xb080) == 0x8000) val ^= 0x4000;
- if ((val & 0xf000) == 0xc000) val ^= 0x0080;
- if ((val & 0xb100) == 0x0000) val ^= 0x4000;
+ val = BITSWAP16(val, 12,15,14,13,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
+
+ if ((val & 0xb080) == 0x8000) val ^= 0x4000;
+ if ((val & 0xf000) == 0xc000) val ^= 0x0080;
+ if ((val & 0xb100) == 0x0000) val ^= 0x4000;
// mask out opcodes doing PC-relative addressing, replace them with FFFF
if ((m_masked_opcodes_lookup[key_F][val >> 4] >> ((val >> 1) & 7)) & 1)
diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c
index 7e2bb96b6a4..da96bbade77 100644
--- a/src/mame/machine/midwayic.c
+++ b/src/mame/machine/midwayic.c
@@ -225,13 +225,13 @@ midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconf
m_time_index(0),
m_time_just_written(0),
m_yearoffs(0),
- m_time_write_timer(NULL)
+ m_time_write_timer(NULL)
{
memset(m_buffer,0,sizeof(m_buffer));
memset(m_time_buf,0,sizeof(m_time_buf));
memset(m_nvram,0,sizeof(m_nvram));
memset(m_default_nvram,0,sizeof(m_default_nvram));
-
+
}
midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
@@ -241,11 +241,11 @@ midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconf
m_state(0),
m_index(0),
m_total(0),
- m_nvram_addr(0),
+ m_nvram_addr(0),
m_time_index(0),
m_time_just_written(0),
m_yearoffs(0),
- m_time_write_timer(NULL)
+ m_time_write_timer(NULL)
{
memset(m_buffer,0,sizeof(m_buffer));
memset(m_time_buf,0,sizeof(m_time_buf));
@@ -531,12 +531,12 @@ void midway_serial_pic2_device::nvram_default()
}
void midway_serial_pic2_device::nvram_read(emu_file &file)
-{
+{
file.read(m_nvram, sizeof(m_nvram));
}
-void midway_serial_pic2_device::nvram_write(emu_file &file)
-{
+void midway_serial_pic2_device::nvram_write(emu_file &file)
+{
file.write(m_nvram, sizeof(m_nvram));
}
@@ -608,7 +608,7 @@ midway_ioasic_device::midway_ioasic_device(const machine_config &mconfig, const
m_fifo_in(0),
m_fifo_out(0),
m_fifo_bytes(0),
- m_fifo_force_buffer_empty_pc(0),
+ m_fifo_force_buffer_empty_pc(0),
m_cage(NULL),
m_dcs(NULL)
{
@@ -641,10 +641,10 @@ void midway_ioasic_device::device_start()
/* do we have a DCS2 sound chip connected? (most likely) */
m_dcs = machine().device<dcs_audio_device>("dcs");
- m_has_dcs = (m_dcs != NULL);
+ m_has_dcs = (m_dcs != NULL);
m_cage = machine().device<atari_cage_device>("cage");
m_has_cage = (m_cage != NULL);
-
+
m_dcs_cpu = m_dcs->subdevice("dcs2");
if (m_dcs_cpu == NULL)
m_dcs_cpu = m_dcs->subdevice("dsio");
@@ -665,10 +665,10 @@ void midway_ioasic_device::device_start()
/* configure the fifo */
if (m_has_dcs)
{
- m_dcs->set_fifo_callbacks(read16_delegate(FUNC(midway_ioasic_device::fifo_r),this),
- read16_delegate(FUNC(midway_ioasic_device::fifo_status_r),this),
+ m_dcs->set_fifo_callbacks(read16_delegate(FUNC(midway_ioasic_device::fifo_r),this),
+ read16_delegate(FUNC(midway_ioasic_device::fifo_status_r),this),
write_line_delegate(FUNC(midway_ioasic_device::fifo_reset_w),this));
- m_dcs->set_io_callbacks(write_line_delegate(FUNC(midway_ioasic_device::ioasic_output_full),this),
+ m_dcs->set_io_callbacks(write_line_delegate(FUNC(midway_ioasic_device::ioasic_output_full),this),
write_line_delegate(FUNC(midway_ioasic_device::ioasic_input_empty),this));
}
fifo_reset_w(1);
diff --git a/src/mame/machine/ng_memcard.c b/src/mame/machine/ng_memcard.c
index a878a0d7bed..ce3c02267a8 100644
--- a/src/mame/machine/ng_memcard.c
+++ b/src/mame/machine/ng_memcard.c
@@ -22,7 +22,7 @@ const device_type NG_MEMCARD = &device_creator<ng_memcard_device>;
ng_memcard_device::ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NG_MEMCARD, "NEOGEO Memory Card", tag, owner, clock, "ng_memcard", __FILE__),
- device_image_interface(mconfig, *this)
+ device_image_interface(mconfig, *this)
{
}
@@ -63,7 +63,7 @@ bool ng_memcard_device::call_load()
size_t ret = fread(m_memcard_data, 0x800);
if(ret != 0x800)
return IMAGE_INIT_FAIL;
-
+
return IMAGE_INIT_PASS;
}
@@ -74,13 +74,13 @@ void ng_memcard_device::call_unload()
}
bool ng_memcard_device::call_create(int format_type, option_resolution *format_options)
-{
+{
memset(m_memcard_data, 0, 0x800);
-
+
size_t ret = fwrite(m_memcard_data, 0x800);
if(ret != 0x800)
return IMAGE_INIT_FAIL;
-
+
return IMAGE_INIT_PASS;
}
@@ -93,4 +93,4 @@ READ8_MEMBER(ng_memcard_device::read)
WRITE8_MEMBER(ng_memcard_device::write)
{
m_memcard_data[offset] = data;
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index a935ed83a91..25c3f23d529 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -136,7 +136,7 @@ WRITE_LINE_MEMBER( pcat_base_state::at_pit8254_out2_changed )
}
- ADDRESS_MAP_START( pcat32_io_common, AS_IO, 32, pcat_base_state )
+ ADDRESS_MAP_START( pcat32_io_common, AS_IO, 32, pcat_base_state )
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", am9517a_device, read, write, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_device, read, write, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8254_device, read, write, 0xffffffff)
diff --git a/src/mame/machine/tigeroad.c b/src/mame/machine/tigeroad.c
index fa8b09c16fa..3889af6b0f5 100644
--- a/src/mame/machine/tigeroad.c
+++ b/src/mame/machine/tigeroad.c
@@ -209,4 +209,4 @@ WRITE8_MEMBER(tigeroad_state::pushman_68000_w)
m_new_latch = 1;
}
m_shared_ram[offset] = data;
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/wpc_out.c b/src/mame/machine/wpc_out.c
index a820087ad08..7450c43c9eb 100644
--- a/src/mame/machine/wpc_out.c
+++ b/src/mame/machine/wpc_out.c
@@ -136,7 +136,7 @@ void wpc_out_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
gi_update();
for(int i=0; i<gi_count; i++) {
- // fprintf(stderr, "gi[%d] = %d\n", i, gi_time[i]);
+ // fprintf(stderr, "gi[%d] = %d\n", i, gi_time[i]);
gi_time[i] = 0;
}
}
diff --git a/src/mame/machine/wpc_pic.c b/src/mame/machine/wpc_pic.c
index f61e4e5a45d..410528d8bae 100644
--- a/src/mame/machine/wpc_pic.c
+++ b/src/mame/machine/wpc_pic.c
@@ -51,7 +51,7 @@ void wpc_pic_device::check_game_id()
v = v & 0xffffff;
if(v == cmp)
logerror("%s: Detected game id %03d\n", tag(), i);
- }
+ }
}
WRITE8_MEMBER(wpc_pic_device::write)
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index e4cf10281b9..d33d6e43038 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -128,7 +128,7 @@ VIDEO_START_MEMBER(armedf_state,terraf)
m_text_videoram = auto_alloc_array(machine(), UINT8, 0x1000);
memset(m_text_videoram, 0x00, 0x1000);
-
+
save_pointer(NAME(m_text_videoram), 0x1000);
}
@@ -150,7 +150,7 @@ VIDEO_START_MEMBER(armedf_state,armedf)
m_text_videoram = auto_alloc_array(machine(), UINT8, 0x1000);
memset(m_text_videoram, 0x00, 0x1000);
-
+
save_pointer(NAME(m_text_videoram), 0x1000);
}
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 30ac9bcffd0..8d986792703 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1283,77 +1283,77 @@ Device g16v8;
Dedicated input pins
-pin 1 = I0; Input
-pin 2 = I1; Input
-pin 3 = I2; Input
-pin 4 = I3; Input
-pin 5 = I4; Input
-pin 6 = I5; Input
-pin 7 = I6; Input
-pin 8 = I7; Input
-pin 9 = I8; Input
-pin 11 = I9; Input
-
- Programmable output pins
-
-pin 12 = B0; Combinatorial output
-pin 13 = B1; Combinatorial output
-pin 14 = B2; Combinatorial output
-pin 15 = B3; Combinatorial output
-pin 16 = B4; Combinatorial output
-pin 17 = B5; Combinatorial output
-pin 18 = B6; Combinatorial output
-pin 19 = B7; Combinatorial output
-
- Output equations
-
-!B7 = !I0 & !I1 & !I2 & !I3 & !I4 & !I5 & !I9
+pin 1 = I0; Input
+pin 2 = I1; Input
+pin 3 = I2; Input
+pin 4 = I3; Input
+pin 5 = I4; Input
+pin 6 = I5; Input
+pin 7 = I6; Input
+pin 8 = I7; Input
+pin 9 = I8; Input
+pin 11 = I9; Input
+
+ Programmable output pins
+
+pin 12 = B0; Combinatorial output
+pin 13 = B1; Combinatorial output
+pin 14 = B2; Combinatorial output
+pin 15 = B3; Combinatorial output
+pin 16 = B4; Combinatorial output
+pin 17 = B5; Combinatorial output
+pin 18 = B6; Combinatorial output
+pin 19 = B7; Combinatorial output
+
+ Output equations
+
+!B7 = !I0 & !I1 & !I2 & !I3 & !I4 & !I5 & !I9
# I0 & !I1 & !I2 & !I3 & !I4 & !I5 & I9;
-!B6 = !I0 & !I1 & !I2 & !I3 & !I4 & !I5 & !I9
+!B6 = !I0 & !I1 & !I2 & !I3 & !I4 & !I5 & !I9
# I0 & !I1 & !I2 & !I3 & !I4 & !I5 & I9;
-!B5 = !I0 & !I1 & !I2 & !I3 & !I4 & I5 & !I9
+!B5 = !I0 & !I1 & !I2 & !I3 & !I4 & I5 & !I9
# I0 & !I1 & !I2 & !I3 & !I4 & I5 & I9;
-!B4 = !I0 & !I1 & !I2 & !I3 & !I4 & I5 & !I9
+!B4 = !I0 & !I1 & !I2 & !I3 & !I4 & I5 & !I9
# I0 & !I1 & !I2 & !I3 & !I4 & I5 & I9;
-!B3 = !I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & !I9
- # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & !I9
- # !I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & !I9
- # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & I8 & !I9
- # I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & I9
- # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & I9
- # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & I9
- # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & I9
- # I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & I9
- # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & I9
- # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & I9
+!B3 = !I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & !I9
+ # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & !I9
+ # !I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & !I9
+ # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & I8 & !I9
+ # I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & I9
+ # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & I9
+ # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & I9
+ # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & I9
+ # I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & I9
+ # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & I9
+ # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & I9
# I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & I8 & I9;
-!B2 = !I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & !I9
- # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & !I9
- # !I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & !I9
- # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & !I9
- # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & I8 & !I9
- # I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & I9
- # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & I9
- # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & I9
- # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & I9
- # I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & I9
- # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & I9
- # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & I9
+!B2 = !I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & !I9
+ # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & !I9
+ # !I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & !I9
+ # !I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & !I9
+ # !I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & I8 & !I9
+ # I0 & !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8 & I9
+ # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8 & I9
+ # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8 & I9
+ # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8 & I9
+ # I0 & !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8 & I9
+ # I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8 & I9
+ # I0 & !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8 & I9
# I0 & !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & I8 & I9;
-!B1 = !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8
- # !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8
- # !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8
- # !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8
- # !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8
- # !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8
- # !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8
+!B1 = !I1 & !I2 & !I3 & I4 & !I5 & !I6 & !I7 & !I8
+ # !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & !I8
+ # !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & !I8
+ # !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & !I8
+ # !I1 & !I2 & I3 & !I4 & !I5 & !I6 & !I7 & I8
+ # !I1 & I2 & !I3 & !I4 & !I5 & I6 & !I7 & I8
+ # !I1 & I2 & I3 & !I4 & !I5 & !I6 & I7 & I8
# !I1 & I2 & !I3 & !I4 & !I5 & I6 & I7 & I8;
!B0 = I0 & I9;
@@ -1582,7 +1582,7 @@ static const struct CPS1config cps1_config_table[]=
/* CPS1 board + extra support boards */
- {"kenseim", CPS_B_21_DEF, mapper_KNM10B }, // wrong, need to convert equations from PAL
+ {"kenseim", CPS_B_21_DEF, mapper_KNM10B }, // wrong, need to convert equations from PAL
{0} /* End of table */
};
diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c
index 3b0f5421995..0c063168d20 100644
--- a/src/mame/video/deco16ic.c
+++ b/src/mame/video/deco16ic.c
@@ -189,7 +189,7 @@ deco16ic_device::deco16ic_device(const machine_config &mconfig, const char *tag,
m_pf2_colour_bank(0),
m_pf1_colourmask(0xf),
m_pf2_colourmask(0xf),
- m_pf12_8x8_gfx_bank(0),
+ m_pf12_8x8_gfx_bank(0),
m_pf12_16x16_gfx_bank(0),
m_gfxdecode(*this),
m_palette(*this)
diff --git a/src/mame/video/deco_zoomspr.c b/src/mame/video/deco_zoomspr.c
index 4d60bcf032c..18e9a5b2c53 100644
--- a/src/mame/video/deco_zoomspr.c
+++ b/src/mame/video/deco_zoomspr.c
@@ -188,7 +188,7 @@ inline void deco_zoomspr_device::dragngun_drawgfxzoom(
UINT8 *pri = &pri_bitmap.pix8(y);
UINT32 *tmapcolor = &dest_bmp.pix32(y);
-
+
int x, x_index = x_index_base;
for( x=sx; x<ex; x++ )
{
@@ -279,8 +279,8 @@ void deco_zoomspr_device::dragngun_draw_sprites( bitmap_rgb32 &bitmap, const rec
*/
/* Sprite global disable bit - can't be, it's set in lockload calibration menu where the targets are sprites */
-// if (dragngun_sprite_ctrl&0x40000000)
-// return;
+// if (dragngun_sprite_ctrl&0x40000000)
+// return;
for (offs = 0;offs < 0x800;offs += 8)
{
@@ -316,12 +316,12 @@ void deco_zoomspr_device::dragngun_draw_sprites( bitmap_rgb32 &bitmap, const rec
colour = spritedata[offs+6]&0x1f;
int priority = (spritedata[offs + 6] & 0x60) >> 5;
-
-
-// printf("%02x\n", priority);
-
+
+
+// printf("%02x\n", priority);
+
if (priority == 0) priority = 7;
else if (priority == 1) priority = 7; // set to 1 to have the 'masking effect' with the dragon on the dragngun attract mode, but that breaks the player select where it needs to be 3, probably missing some bits..
else if (priority == 2) priority = 7;
@@ -415,7 +415,7 @@ void deco_zoomspr_device::dragngun_draw_sprites( bitmap_rgb32 &bitmap, const rec
ypos+=zoomy<<4;
}
}
-
+
for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
{
UINT32 *src = &temp_bitmap.pix32(y);
@@ -434,4 +434,3 @@ void deco_zoomspr_device::dragngun_draw_sprites( bitmap_rgb32 &bitmap, const rec
}
}
-
diff --git a/src/mame/video/decospr.c b/src/mame/video/decospr.c
index 19895e83e55..79af988b378 100644
--- a/src/mame/video/decospr.c
+++ b/src/mame/video/decospr.c
@@ -175,7 +175,7 @@ void decospr_device::device_start()
{
m_pri_cb.bind_relative_to(*owner());
m_col_cb.bind_relative_to(*owner());
-
+
m_alt_format = 0;
m_pixmask = 0xf;
m_raw_shift = 4; // set to 8 on tattass / nslashers for the custom mixing (because they have 5bpp sprites, and shifting by 4 isn't good enough)
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index 6cc25b40062..bf8b696df04 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -926,23 +926,23 @@ VIDEO_START_MEMBER(dkong_state,dkong_base)
save_item(NAME(m_flip));
// TRS01 TRS02
- save_item(NAME(m_sig30Hz));
- save_item(NAME(m_blue_level));
- save_item(NAME(m_cv1));
- save_item(NAME(m_cv2));
- save_item(NAME(m_vg1));
- save_item(NAME(m_vg2));
- save_item(NAME(m_vg3));
- save_item(NAME(m_cv3));
- save_item(NAME(m_cv4));
-
- save_item(NAME(m_lfsr_5I));
- save_item(NAME(m_grid_sig));
- save_item(NAME(m_rflip_sig));
- save_item(NAME(m_star_ff));
- save_item(NAME(m_counter));
- save_item(NAME(m_pixelcnt));
- save_item(NAME(m_bg_bits));
+ save_item(NAME(m_sig30Hz));
+ save_item(NAME(m_blue_level));
+ save_item(NAME(m_cv1));
+ save_item(NAME(m_cv2));
+ save_item(NAME(m_vg1));
+ save_item(NAME(m_vg2));
+ save_item(NAME(m_vg3));
+ save_item(NAME(m_cv3));
+ save_item(NAME(m_cv4));
+
+ save_item(NAME(m_lfsr_5I));
+ save_item(NAME(m_grid_sig));
+ save_item(NAME(m_rflip_sig));
+ save_item(NAME(m_star_ff));
+ save_item(NAME(m_counter));
+ save_item(NAME(m_pixelcnt));
+ save_item(NAME(m_bg_bits));
}
diff --git a/src/mame/video/excellent_spr.c b/src/mame/video/excellent_spr.c
index 294bd20150a..62829200f75 100644
--- a/src/mame/video/excellent_spr.c
+++ b/src/mame/video/excellent_spr.c
@@ -1,5 +1,5 @@
-/*
- Excellent Systems Sprite chip
+/*
+ Excellent Systems Sprite chip
is this original hw or a clone of something?
@@ -50,7 +50,7 @@ void excellent_spr_device::device_reset()
/****************************************************************
SPRITE DRAW ROUTINE
- (8-bit)
+ (8-bit)
Word | Bit(s) | Use
-----+-----------------+-----------------
@@ -71,7 +71,6 @@ void excellent_spr_device::device_reset()
void excellent_spr_device::aquarium_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, gfxdecode_device *gfxdecode, int y_offs )
{
-
int offs, chain_pos;
int x, y, curx, cury;
UINT8 col, flipx, flipy, chain;
@@ -156,7 +155,7 @@ void excellent_spr_device::gcpinbal_draw_sprites( screen_device &screen, bitmap_
UINT8 *spriteram = m_ram;
int offs, chain_pos;
int x, y, curx, cury;
-// int priority = 0;
+// int priority = 0;
UINT8 col, flipx, flipy, chain;
UINT16 code;
@@ -219,4 +218,3 @@ void excellent_spr_device::gcpinbal_draw_sprites( screen_device &screen, bitmap_
}
#endif
}
-
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index 6999c434d9c..3988d4d336a 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -77,8 +77,8 @@ VIDEO_START_MEMBER(gaiden_state,gaiden)
m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32);
m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
-// m_background->set_transparent_pen(0);
-// m_foreground->set_transparent_pen(0);
+// m_background->set_transparent_pen(0);
+// m_foreground->set_transparent_pen(0);
m_text_layer->set_transparent_pen(0);
m_background->set_scrolldy(0, 33);
@@ -104,8 +104,8 @@ VIDEO_START_MEMBER(gaiden_state,raiga)
m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_fg_tile_info_raiga),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32);
m_text_layer = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
-// m_background->set_transparent_pen(0);
-// m_foreground->set_transparent_pen(0);
+// m_background->set_transparent_pen(0);
+// m_foreground->set_transparent_pen(0);
m_text_layer->set_transparent_pen(0);
/* set up sprites */
diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c
index f88eae060e3..38180756e5a 100644
--- a/src/mame/video/galspnbl.c
+++ b/src/mame/video/galspnbl.c
@@ -46,7 +46,7 @@ void galspnbl_state::mix_sprite_layer(screen_device &screen, bitmap_ind16 &bitma
UINT16 sprpixel = (sd2[x]);
//UINT16 sprpri = (sprpixel >> 8) & 3;
UINT16 sprpri = (sprpixel >> 9) & 1; // only upper priority bit matters on the bootleg hw?
-
+
sprpixel &= 0xff;
if (sprpixel & 0xf)
@@ -55,7 +55,7 @@ void galspnbl_state::mix_sprite_layer(screen_device &screen, bitmap_ind16 &bitma
dd[x] = sprpixel;
}
- // UINT16 sprbln = (sprpixel >> 10) & 1; // we handle 'blending' from the original as a simple on/off flicker in the bootleg sprite function, I don't think the bootleg hw can blend
+ // UINT16 sprbln = (sprpixel >> 10) & 1; // we handle 'blending' from the original as a simple on/off flicker in the bootleg sprite function, I don't think the bootleg hw can blend
}
}
}
diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c
index c8ca3a5b434..7a8faddf2fd 100644
--- a/src/mame/video/gstriker.c
+++ b/src/mame/video/gstriker.c
@@ -10,9 +10,9 @@
UINT32 gstriker_state::screen_update_gstriker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(m_mixerregs1[8]&0x07ff, cliprect); // complete guess, causes green behind test grid in twc94 and blue behind title screen on gstriker
-
+
popmessage("%04x %04x %04x %04x %04x %04x %04x %04x | %04x %04x %04x %04x %04x %04x %04x %04x", m_mixerregs1[0],m_mixerregs1[1],m_mixerregs1[2],m_mixerregs1[3],m_mixerregs1[4],m_mixerregs1[5],m_mixerregs1[6],m_mixerregs1[7], m_mixerregs1[8],m_mixerregs1[9],m_mixerregs1[10],m_mixerregs1[11],m_mixerregs1[12],m_mixerregs1[13],m_mixerregs1[14],m_mixerregs1[15] );
-// popmessage("%04x %04x %04x %04x %04x %04x %04x %04x | %04x %04x %04x %04x %04x %04x %04x %04x", m_mixerregs2[0],m_mixerregs2[1],m_mixerregs2[2],m_mixerregs2[3],m_mixerregs2[4],m_mixerregs2[5],m_mixerregs2[6],m_mixerregs2[7], m_mixerregs2[8],m_mixerregs2[9],m_mixerregs2[10],m_mixerregs2[11],m_mixerregs2[12],m_mixerregs2[13],m_mixerregs2[14],m_mixerregs2[15] );
+// popmessage("%04x %04x %04x %04x %04x %04x %04x %04x | %04x %04x %04x %04x %04x %04x %04x %04x", m_mixerregs2[0],m_mixerregs2[1],m_mixerregs2[2],m_mixerregs2[3],m_mixerregs2[4],m_mixerregs2[5],m_mixerregs2[6],m_mixerregs2[7], m_mixerregs2[8],m_mixerregs2[9],m_mixerregs2[10],m_mixerregs2[11],m_mixerregs2[12],m_mixerregs2[13],m_mixerregs2[14],m_mixerregs2[15] );
m_spr->set_pal_base( (m_mixerregs1[0]&0xf000)>>8 );
m_bg->set_pal_base( (m_mixerregs1[1]&0xf000)>>8 );
diff --git a/src/mame/video/k001005.c b/src/mame/video/k001005.c
index 7e8b3a7c8c6..51a132e419d 100644
--- a/src/mame/video/k001005.c
+++ b/src/mame/video/k001005.c
@@ -110,15 +110,15 @@ void k001005_renderer::set_param(k001005_param param, UINT32 value)
{
switch (param)
{
- case K001005_LIGHT_R: m_light_r = value; break;
- case K001005_LIGHT_G: m_light_g = value; break;
- case K001005_LIGHT_B: m_light_b = value; break;
- case K001005_AMBIENT_R: m_ambient_r = value; break;
- case K001005_AMBIENT_G: m_ambient_g = value; break;
- case K001005_AMBIENT_B: m_ambient_b = value; break;
- case K001005_FOG_R: m_fog_r = value; break;
- case K001005_FOG_G: m_fog_g = value; break;
- case K001005_FOG_B: m_fog_b = value; break;
+ case K001005_LIGHT_R: m_light_r = value; break;
+ case K001005_LIGHT_G: m_light_g = value; break;
+ case K001005_LIGHT_B: m_light_b = value; break;
+ case K001005_AMBIENT_R: m_ambient_r = value; break;
+ case K001005_AMBIENT_G: m_ambient_g = value; break;
+ case K001005_AMBIENT_B: m_ambient_b = value; break;
+ case K001005_FOG_R: m_fog_r = value; break;
+ case K001005_FOG_G: m_fog_g = value; break;
+ case K001005_FOG_B: m_fog_b = value; break;
case K001005_FAR_Z:
{
UINT32 fz = value << 11;
@@ -896,7 +896,7 @@ void k001005_renderer::draw_scanline_2d(INT32 scanline, const extent_t &extent,
void k001005_renderer::draw_scanline_2d_tex(INT32 scanline, const extent_t &extent, const k001005_polydata &extradata, int threadid)
{
- // int pal_chip = (extradata.texture_palette & 0x8) ? 1 : 0;
+ // int pal_chip = (extradata.texture_palette & 0x8) ? 1 : 0;
k001006_device *k001006 = downcast<k001006_device*>(m_k001006);
int tex_page = extradata.texture_page * 0x40000;
@@ -999,7 +999,7 @@ void k001005_renderer::draw_scanline(INT32 scanline, const extent_t &extent, con
void k001005_renderer::draw_scanline_tex(INT32 scanline, const extent_t &extent, const k001005_polydata &extradata, int threadid)
{
-// int pal_chip = (extradata.texture_palette & 0x8) ? 1 : 0;
+// int pal_chip = (extradata.texture_palette & 0x8) ? 1 : 0;
k001006_device *k001006 = downcast<k001006_device*>(m_k001006);
int tex_page = extradata.texture_page * 0x40000;
@@ -1259,7 +1259,7 @@ READ32_MEMBER( k001005_device::read )
case 0x000: // FIFO read, high 16 bits
{
//osd_printf_debug("FIFO_r0: %08X\n", m_fifo_read_ptr);
- UINT16 value = m_fifo[m_fifo_read_ptr] >> 16;
+ UINT16 value = m_fifo[m_fifo_read_ptr] >> 16;
return value;
}
@@ -1370,7 +1370,7 @@ WRITE32_MEMBER( k001005_device::write )
break;
}
- case 0x100: break;
+ case 0x100: break;
case 0x101: break; // viewport x and width?
case 0x102: break; // viewport y and height?
@@ -1452,10 +1452,10 @@ WRITE32_MEMBER( k001005_device::write )
void k001005_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect )
{
- m_renderer->draw(bitmap, cliprect);
+ m_renderer->draw(bitmap, cliprect);
}
void k001005_device::set_texel_chip(device_t &device, const char *tag)
{
downcast<k001005_device &>(device).m_k001006_tag = tag;
-} \ No newline at end of file
+}
diff --git a/src/mame/video/k001006.c b/src/mame/video/k001006.c
index 3cdb727e9f9..566568b3cda 100644
--- a/src/mame/video/k001006.c
+++ b/src/mame/video/k001006.c
@@ -31,7 +31,6 @@ k001006_device::k001006_device(const machine_config &mconfig, const char *tag, d
void k001006_device::device_config_complete()
{
-
}
//-------------------------------------------------
@@ -46,7 +45,7 @@ void k001006_device::device_start()
m_gfxrom = machine().root_device().memregion(m_gfx_region)->base();
m_texrom = auto_alloc_array(machine(), UINT8, 0x800000);
-
+
preprocess_texture_data(m_texrom, m_gfxrom, 0x800000, m_tex_layout);
save_pointer(NAME(m_pal_ram), 0x800*sizeof(UINT16));
diff --git a/src/mame/video/k051316.c b/src/mame/video/k051316.c
index 2c92bb940cb..fef0973d864 100644
--- a/src/mame/video/k051316.c
+++ b/src/mame/video/k051316.c
@@ -243,18 +243,18 @@ void k051316_device::wraparound_enable( int status )
***************************************************************************/
-TILE_GET_INFO_MEMBER(k051316_device::get_tile_info)
-{
+TILE_GET_INFO_MEMBER(k051316_device::get_tile_info)
+{
int code = m_ram[tile_index];
int color = m_ram[tile_index + 0x400];
int flags = 0;
-
+
m_k051316_cb(&code, &color, &flags);
-
+
SET_TILE_INFO_MEMBER(0,
- code,
- color,
- flags);
+ code,
+ color,
+ flags);
}
diff --git a/src/mame/video/k051960.c b/src/mame/video/k051960.c
index 223880de5a9..3ff0ebec9c3 100644
--- a/src/mame/video/k051960.c
+++ b/src/mame/video/k051960.c
@@ -136,15 +136,15 @@ void k051960_device::set_plane_order(device_t &device, int order)
case K051960_PLANEORDER_BASE:
device_gfx_interface::static_set_info(dev, gfxinfo);
break;
-
+
case K051960_PLANEORDER_MIA:
device_gfx_interface::static_set_info(dev, gfxinfo_reverse);
break;
-
+
case K051960_PLANEORDER_GRADIUS3:
device_gfx_interface::static_set_info(dev, gfxinfo_gradius3);
break;
-
+
default:
fatalerror("Unknown plane_order\n");
}
@@ -166,10 +166,10 @@ void k051960_device::device_start()
popmessage("driver should use VIDEO_HAS_SHADOWS");
m_ram = auto_alloc_array_clear(machine(), UINT8, 0x400);
-
+
// bind callbacks
m_k051960_cb.bind_relative_to(*owner());
-
+
save_item(NAME(m_romoffset));
save_item(NAME(m_spriteflip));
save_item(NAME(m_readroms));
diff --git a/src/mame/video/k052109.c b/src/mame/video/k052109.c
index 8e1fa811bdb..dd9fbdeb8c5 100644
--- a/src/mame/video/k052109.c
+++ b/src/mame/video/k052109.c
@@ -220,18 +220,18 @@ void k052109_device::device_start()
m_videoram2_F = &m_ram[0x4000];
m_videoram2_A = &m_ram[0x4800];
m_videoram2_B = &m_ram[0x5000];
-
+
m_tilemap[0] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_tilemap[1] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_tilemap[2] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(k052109_device::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
-
+
m_tilemap[0]->set_transparent_pen(0);
m_tilemap[1]->set_transparent_pen(0);
m_tilemap[2]->set_transparent_pen(0);
-
+
// bind callbacks
m_k052109_cb.bind_relative_to(*owner());
-
+
save_pointer(NAME(m_ram), 0x6000);
save_item(NAME(m_rmrd_line));
save_item(NAME(m_romsubbank));
@@ -292,7 +292,7 @@ READ8_MEMBER( k052109_device::read )
else /* Punk Shot and TMNT read from 0000-1fff, Aliens from 2000-3fff */
{
assert (m_char_size != 0);
-
+
int code = (offset & 0x1fff) >> 5;
int color = m_romsubbank;
int flags = 0;
diff --git a/src/mame/video/k053246_k053247_k055673.c b/src/mame/video/k053246_k053247_k055673.c
index 9a17609dcb5..9ccd625f32c 100644
--- a/src/mame/video/k053246_k053247_k055673.c
+++ b/src/mame/video/k053246_k053247_k055673.c
@@ -965,7 +965,7 @@ void k055673_device::device_start()
{
int gfx_index;
UINT32 total;
-
+
static const gfx_layout spritelayout = /* System GX sprite layout */
{
16,16,
@@ -1013,15 +1013,15 @@ void k055673_device::device_start()
long i;
UINT16 *alt_k055673_rom;
int size4;
-
+
/* find first empty slot to decode gfx */
for (gfx_index = 0; gfx_index < MAX_GFX_ELEMENTS; gfx_index++)
if (m_gfxdecode->gfx(gfx_index) == 0)
break;
assert(gfx_index != MAX_GFX_ELEMENTS);
-
+
alt_k055673_rom = (UINT16 *)machine().root_device().memregion(m_memory_region)->base();
-
+
/* decode the graphics */
switch (m_plane_order)
{
@@ -1042,42 +1042,42 @@ void k055673_device::device_start()
*d++ = *s1++;
*d++ = *s2++;
}
-
+
total = size4 / 128;
konami_decode_gfx(machine(), m_gfxdecode, m_palette, gfx_index, (UINT8 *)alt_k055673_rom, total, &spritelayout, 5);
break;
-
+
case K055673_LAYOUT_RNG:
total = machine().root_device().memregion(m_memory_region)->bytes() / (16*16/2);
konami_decode_gfx(machine(), m_gfxdecode, m_palette, gfx_index, (UINT8 *)alt_k055673_rom, total, &spritelayout2, 4);
break;
-
+
case K055673_LAYOUT_LE2:
total = machine().root_device().memregion(m_memory_region)->bytes() / (16*16);
konami_decode_gfx(machine(), m_gfxdecode, m_palette, gfx_index, (UINT8 *)alt_k055673_rom, total, &spritelayout3, 8);
break;
-
+
case K055673_LAYOUT_GX6:
total = machine().root_device().memregion(m_memory_region)->bytes() / (16*16*6/8);
konami_decode_gfx(machine(), m_gfxdecode, m_palette, gfx_index, (UINT8 *)alt_k055673_rom, total, &spritelayout4, 6);
break;
-
+
default:
fatalerror("Unsupported layout\n");
}
-
+
if (VERBOSE && !(m_palette->shadows_enabled()))
popmessage("driver should use VIDEO_HAS_SHADOWS");
-
+
m_z_rejection = -1;
m_gfx = m_gfxdecode->gfx(gfx_index);
m_objcha_line = CLEAR_LINE;
m_ram = auto_alloc_array(machine(), UINT16, 0x1000/2);
-
+
memset(m_ram, 0, 0x1000);
memset(m_kx46_regs, 0, 8);
memset(m_kx47_regs, 0, 32);
-
+
machine().save().save_pointer(NAME(m_ram), 0x800);
machine().save().save_item(NAME(m_kx46_regs));
machine().save().save_item(NAME(m_kx47_regs));
@@ -1258,4 +1258,3 @@ READ32_MEMBER( k053247_device::k053247_reg_long_r )
offset <<= 1;
return (k053247_reg_word_r( space, offset + 1, 0xffff) | k053247_reg_word_r( space, offset, 0xffff) << 16);
}
-
diff --git a/src/mame/video/k053936.c b/src/mame/video/k053936.c
index cd440083ee4..b8d30b5145a 100644
--- a/src/mame/video/k053936.c
+++ b/src/mame/video/k053936.c
@@ -233,7 +233,7 @@ k053936_device::k053936_device(const machine_config &mconfig, const char *tag, d
m_ctrl(NULL),
m_linectrl(NULL),
m_wrap(0),
- m_xoff(0),
+ m_xoff(0),
m_yoff(0)
{
}
diff --git a/src/mame/video/k054156_k054157_k056832.c b/src/mame/video/k054156_k054157_k056832.c
index 155f3feb6fe..0b7b499e41e 100644
--- a/src/mame/video/k054156_k054157_k056832.c
+++ b/src/mame/video/k054156_k054157_k056832.c
@@ -377,7 +377,7 @@ void k056832_device::device_start()
create_tilemaps(machine());
finalize_init(machine());
-
+
// bind callbacks
m_k056832_cb.bind_relative_to(*owner());
}
@@ -2572,4 +2572,3 @@ int k056832_device::get_layer_association(void)
{
return(m_layer_association);
}
-
diff --git a/src/mame/video/k054338.c b/src/mame/video/k054338.c
index 3c3746dc5a0..24666d06ab7 100644
--- a/src/mame/video/k054338.c
+++ b/src/mame/video/k054338.c
@@ -111,7 +111,7 @@ void k054338_device::fill_solid_bg( bitmap_rgb32 &bitmap, const rectangle &clipr
// Unified k054338/K055555 BG color fill (see p.67)
void k054338_device::fill_backcolor(bitmap_rgb32 &bitmap, const rectangle &cliprect, const pen_t *pal_ptr, int mode)
{
- if ((mode & 0x02) == 0) // solid fill
+ if ((mode & 0x02) == 0) // solid fill
{
bitmap.fill(*pal_ptr, cliprect);
}
@@ -120,7 +120,7 @@ void k054338_device::fill_backcolor(bitmap_rgb32 &bitmap, const rectangle &clipr
UINT32 *dst_ptr = &bitmap.pix32(cliprect.min_y);
int dst_pitch = bitmap.rowpixels();
- if ((mode & 0x01) == 0) // vertical gradient fill
+ if ((mode & 0x01) == 0) // vertical gradient fill
{
pal_ptr += cliprect.min_y;
for(int y = cliprect.min_y; y <= cliprect.max_y; y++)
@@ -134,7 +134,7 @@ void k054338_device::fill_backcolor(bitmap_rgb32 &bitmap, const rectangle &clipr
dst_ptr += dst_pitch;
}
}
- else // horizontal gradient fill
+ else // horizontal gradient fill
{
int width = cliprect.width() * sizeof(UINT32);
pal_ptr += cliprect.min_x;
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 24cfe25c174..2141f5d0d0c 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -196,14 +196,14 @@ void kaneko16_berlwall_state::kaneko16_render_15bpp_bitmap(bitmap_rgb32 &bitmap,
if (!m_bg15_bitmap[0].valid())
return;
- int select = m_bg15_select[ 0 ];
- int scroll = m_bg15_scroll[ 0 ];
+ int select = m_bg15_select[ 0 ];
+ int scroll = m_bg15_scroll[ 0 ];
- int screen = select & 0x1f;
- int flip = select & 0x20;
+ int screen = select & 0x1f;
+ int flip = select & 0x20;
- int scrollx = (scroll >> 0) & 0xff;
- int scrolly = (scroll >> 8) & 0xff;
+ int scrollx = (scroll >> 0) & 0xff;
+ int scrolly = (scroll >> 8) & 0xff;
if (!flip)
{
@@ -222,8 +222,8 @@ void kaneko16_berlwall_state::kaneko16_render_15bpp_bitmap(bitmap_rgb32 &bitmap,
for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
{
- if (!flip) srcbitmap = &m_bg15_bitmap[screen].pix16( (y - scrolly) & 0xff );
- else srcbitmap = &m_bg15_bitmap[screen].pix16( 255 - ((y - scrolly) & 0xff) );
+ if (!flip) srcbitmap = &m_bg15_bitmap[screen].pix16( (y - scrolly) & 0xff );
+ else srcbitmap = &m_bg15_bitmap[screen].pix16( 255 - ((y - scrolly) & 0xff) );
dstbitmap = &bitmap.pix32(y);
@@ -231,8 +231,8 @@ void kaneko16_berlwall_state::kaneko16_render_15bpp_bitmap(bitmap_rgb32 &bitmap,
{
UINT16 pix;
- if (!flip) pix = srcbitmap[ (x - scrollx) & 0xff ];
- else pix = srcbitmap[ 255 - ((x - scrollx) & 0xff) ];
+ if (!flip) pix = srcbitmap[ (x - scrollx) & 0xff ];
+ else pix = srcbitmap[ 255 - ((x - scrollx) & 0xff) ];
dstbitmap[x] = pal[pix];
}
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index 87163022752..452f3236c64 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -1195,7 +1195,7 @@ void konamigx_state::common_init()
VIDEO_START_MEMBER(konamigx_state, konamigx_5bpp)
{
common_init();
-
+
if (!strcmp(machine().system().name,"tbyahhoo"))
gx_tilemode = 1;
else if (!strcmp(machine().system().name,"crzcross") || !strcmp(machine().system().name,"puzldama"))
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index 5e5e8cb8d30..87b2e2fdf43 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -327,7 +327,7 @@ VIDEO_START_MEMBER(mappy_state,mappy)
m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 31);
m_bg_tilemap->set_scroll_cols(36);
-
+
save_item(NAME(m_scroll));
}
diff --git a/src/mame/video/mb60553.c b/src/mame/video/mb60553.c
index 73de4f268cc..7d58a8d1e6f 100644
--- a/src/mame/video/mb60553.c
+++ b/src/mame/video/mb60553.c
@@ -1,6 +1,6 @@
-/* This is the tilemap chip used by Grand Striker, Tecmo World Cup '94 and V Goal Soccer for the backgrounds
+/* This is the tilemap chip used by Grand Striker, Tecmo World Cup '94 and V Goal Soccer for the backgrounds
- the actual line scroll / zoom is not properly understood
+ the actual line scroll / zoom is not properly understood
interestingly the chip seems to require doubled up ROMs (2 copies of each ROM) to draw just the single layer.
@@ -38,7 +38,6 @@ void mb60553_zooming_tilemap_device::device_start()
void mb60553_zooming_tilemap_device::device_reset()
{
-
}
@@ -119,7 +118,6 @@ TILE_GET_INFO_MEMBER(mb60553_zooming_tilemap_device::get_tile_info)
void mb60553_zooming_tilemap_device::reg_written( int num_reg)
{
-
switch (num_reg)
{
case 0:
@@ -338,6 +336,3 @@ READ16_MEMBER(mb60553_zooming_tilemap_device::line_r)
{
return m_lineram[offset];
}
-
-
-
diff --git a/src/mame/video/midzeus2.c b/src/mame/video/midzeus2.c
index b89087d3353..82b08312569 100644
--- a/src/mame/video/midzeus2.c
+++ b/src/mame/video/midzeus2.c
@@ -1328,4 +1328,3 @@ void midzeus2_state::log_fifo_command(const UINT32 *data, int numwords, const ch
logerror(" %08X", data[wordnum]);
logerror("%s", suffix);
}
-
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 49fa94d6d1a..922907481bf 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -718,7 +718,7 @@ void model3_state::real3d_display_list1_dma(UINT32 src, UINT32 dst, int length,
{
address_space &space = m_maincpu->space(AS_PROGRAM);
int d = (dst & 0xffffff) / 4;
- for (int i = 0; i < length; i += 4)
+ for (int i = 0; i < length; i += 4)
{
UINT32 w;
if (byteswap) {
@@ -735,7 +735,7 @@ void model3_state::real3d_display_list2_dma(UINT32 src, UINT32 dst, int length,
{
address_space &space = m_maincpu->space(AS_PROGRAM);
int d = (dst & 0xffffff) / 4;
- for (int i = 0; i < length; i += 4)
+ for (int i = 0; i < length; i += 4)
{
UINT32 w;
if (byteswap) {
@@ -768,7 +768,7 @@ void model3_state::real3d_vrom_texture_dma(UINT32 src, UINT32 dst, int length, i
void model3_state::real3d_texture_fifo_dma(UINT32 src, int length, int byteswap)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
- for (int i = 0; i < length; i += 4)
+ for (int i = 0; i < length; i += 4)
{
UINT32 w;
if (byteswap) {
@@ -786,7 +786,7 @@ void model3_state::real3d_polygon_ram_dma(UINT32 src, UINT32 dst, int length, in
{
address_space &space = m_maincpu->space(AS_PROGRAM);
int d = (dst & 0xffffff) / 4;
- for (int i = 0; i < length; i += 4)
+ for (int i = 0; i < length; i += 4)
{
UINT32 w;
if (byteswap) {
diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c
index d2abd849f48..b52987978ec 100644
--- a/src/mame/video/namcos21.c
+++ b/src/mame/video/namcos21.c
@@ -127,22 +127,22 @@ VIDEO_START_MEMBER(namcos21_state,namcos21)
}
-/* Palette:
- 0x0000..0x1fff sprite palettes (0x10 sets of 0x100 colors)
+/* Palette:
+ 0x0000..0x1fff sprite palettes (0x10 sets of 0x100 colors)
- 0x2000..0x3fff polygon palette bank0 (0x10 sets of 0x200 colors)
- (in starblade, some palette animation effects are performed here)
+ 0x2000..0x3fff polygon palette bank0 (0x10 sets of 0x200 colors)
+ (in starblade, some palette animation effects are performed here)
- 0x4000..0x5fff polygon palette bank1 (0x10 sets of 0x200 colors)
+ 0x4000..0x5fff polygon palette bank1 (0x10 sets of 0x200 colors)
- 0x6000..0x7fff polygon palette bank2 (0x10 sets of 0x200 colors)
+ 0x6000..0x7fff polygon palette bank2 (0x10 sets of 0x200 colors)
- The polygon-dedicated color sets within a bank typically increase in
- intensity from very dark to full intensity.
+ The polygon-dedicated color sets within a bank typically increase in
+ intensity from very dark to full intensity.
- Probably the selected palette is determined by most significant bits of z-code.
- This is not yet hooked up.
- */
+ Probably the selected palette is determined by most significant bits of z-code.
+ This is not yet hooked up.
+ */
UINT32 namcos21_state::screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index 5f28870e3e5..e32665691e7 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -168,7 +168,7 @@ WRITE16_MEMBER(nemesis_state::salamand_control_port_word_w)
void nemesis_state::create_palette_lookups()
{
- // driver is 74LS09 (AND gates with open collector)
+ // driver is 74LS09 (AND gates with open collector)
static const res_net_info nemesis_net_info =
{
diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c
index b83709e34da..54c5a673f73 100644
--- a/src/mame/video/neogeo.c
+++ b/src/mame/video/neogeo.c
@@ -67,7 +67,7 @@ void neogeo_state::set_pens()
{
const pen_t *pen_base = m_palette->pens() + m_palette_bank + (m_screen_shadow ? 0x2000 : 0);
m_sprgen->set_pens(pen_base);
- m_bg_pen = pen_base + 0xfff;
+ m_bg_pen = pen_base + 0xfff;
}
@@ -104,7 +104,7 @@ WRITE16_MEMBER(neogeo_state::neogeo_paletteram_w)
m_palette->set_pen_color(offset,
m_palette_lookup[r][dark],
m_palette_lookup[g][dark],
- m_palette_lookup[b][dark]); // normal
+ m_palette_lookup[b][dark]); // normal
m_palette->set_pen_color(offset + 0x2000,
m_palette_lookup[r][dark+2],
@@ -147,7 +147,6 @@ void neogeo_state::video_start()
void neogeo_state::video_reset()
{
-
}
@@ -274,5 +273,3 @@ WRITE16_MEMBER(neogeo_state::neogeo_video_register_w)
}
}
}
-
-
diff --git a/src/mame/video/neogeo_spr.c b/src/mame/video/neogeo_spr.c
index d429bb53cad..36a32e8bb3d 100644
--- a/src/mame/video/neogeo_spr.c
+++ b/src/mame/video/neogeo_spr.c
@@ -9,8 +9,8 @@
/*
neosprite_base_device::neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, NEOGEO_SPRITE_BASE, "Neogeo Sprites", tag, owner, clock, "neospritebase", __FILE__),
- m_bppshift(4)
+ : device_t(mconfig, NEOGEO_SPRITE_BASE, "Neogeo Sprites", tag, owner, clock, "neospritebase", __FILE__),
+ m_bppshift(4)
{
}
@@ -20,12 +20,10 @@ neosprite_base_device::neosprite_base_device(const machine_config &mconfig, cons
: device_t(mconfig, type, "Neogeo Sprites", tag, owner, clock, "neosprite", __FILE__),
m_bppshift(4)
{
-
}
void neosprite_base_device::device_start()
{
-
m_videoram = auto_alloc_array(machine(), UINT16, 0x8000 + 0x800);
m_videoram_drawsource = m_videoram;
@@ -235,7 +233,7 @@ void neosprite_base_device::draw_fixed_layer( bitmap_rgb32 &bitmap, int scanline
int gfx_offset = ((code << 5) | (scanline & 0x07)) & addr_mask;
const pen_t *char_pens;
-
+
char_pens = &m_pens[code_and_palette >> 12 << m_bppshift];
@@ -355,7 +353,7 @@ void neosprite_base_device::draw_sprites( bitmap_rgb32 &bitmap, int scanline )
{
y = 0x200 - (y_control >> 7);
x = m_videoram_drawsource[0x8400 | sprite_number] >> 7;
-
+
zoom_y = (zoom_control & 0xff);
zoom_x = (zoom_control >> 8) & 0x0f;
@@ -430,7 +428,7 @@ void neosprite_base_device::draw_sprites( bitmap_rgb32 &bitmap, int scanline )
/* compute offset in gfx ROM and mask it to the number of bits available */
int gfx_base = ((code << 8) | (sprite_y << 4)) & m_sprite_gfx_address_mask;
-
+
line_pens = &m_pens[attr >> 8 << m_bppshift];
@@ -656,7 +654,6 @@ const device_type NEOGEO_SPRITE_REGULAR = &device_creator<neosprite_regular_devi
neosprite_regular_device::neosprite_regular_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_REGULAR)
{
-
}
@@ -675,7 +672,7 @@ void neosprite_regular_device::set_sprite_region(UINT8* region_sprites, UINT32 r
{
fatalerror("please use power of 2 region sizes with neosprite_base_device to ensure masking works correctly");
}
-
+
m_sprite_gfx_address_mask = mask;
}
@@ -683,11 +680,11 @@ inline void neosprite_regular_device::draw_pixel(int romaddr, UINT32* dst, const
{
const UINT8* src = m_region_sprites + (((romaddr &~0xff)>>1) | (((romaddr&0x8)^0x8)<<3) | ((romaddr & 0xf0) >> 2));
const int x = romaddr & 0x7;
-
+
const UINT8 gfx = (((src[0x3] >> x) & 0x01) << 3) |
- (((src[0x1] >> x) & 0x01) << 2) |
- (((src[0x2] >> x) & 0x01) << 1) |
- (((src[0x0] >> x) & 0x01) << 0);
+ (((src[0x1] >> x) & 0x01) << 2) |
+ (((src[0x2] >> x) & 0x01) << 1) |
+ (((src[0x0] >> x) & 0x01) << 0);
if (gfx)
*dst = line_pens[gfx];
@@ -753,8 +750,8 @@ inline void neosprite_midas_device::draw_pixel(int romaddr, UINT32* dst, const p
{
const UINT8* src = m_region_sprites + (((romaddr &~0xff)) | (((romaddr&0x8)^0x8)<<4) | ((romaddr & 0xf0) >> 1));
const int x = romaddr & 0x7;
-
- const UINT8 gfx = (((src[0x7] >> x) & 0x01) << 7) |
+
+ const UINT8 gfx = (((src[0x7] >> x) & 0x01) << 7) |
(((src[0x6] >> x) & 0x01) << 6) |
(((src[0x5] >> x) & 0x01) << 5) |
(((src[0x4] >> x) & 0x01) << 4) |
@@ -774,7 +771,7 @@ void neosprite_midas_device::device_start()
m_videoram_buffer = auto_alloc_array(machine(), UINT16, 0x8000 + 0x800);
m_videoram_drawsource = m_videoram_buffer;
-
+
memset(m_videoram_buffer, 0x00, (0x8000 + 0x800) * sizeof(UINT16));
}
@@ -787,7 +784,7 @@ void neosprite_midas_device::buffer_vram()
inline void neosprite_midas_device::draw_fixed_layer_2pixels(UINT32*&pixel_addr, int offset, UINT8* gfx_base, const pen_t* char_pens)
{
UINT8 data;
-
+
data = ((gfx_base[(offset * 2)+0] & 0x0f)<<0) | ((gfx_base[(offset * 2)+1] & 0x0f)<<4);
if (data)
*pixel_addr = char_pens[data];
@@ -806,4 +803,3 @@ void neosprite_midas_device::set_sprite_region(UINT8* region_sprites, UINT32 reg
UINT32 mask = get_region_mask(m_region_sprites, m_region_sprites_size);
m_sprite_gfx_address_mask = mask;
}
-
diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c
index 20fd1cdceb4..9f3e3619792 100644
--- a/src/mame/video/nitedrvr.c
+++ b/src/mame/video/nitedrvr.c
@@ -52,7 +52,7 @@ void nitedrvr_state::draw_roadway(bitmap_ind16 &bitmap, const rectangle &cliprec
UINT32 nitedrvr_state::screen_update_nitedrvr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0, cliprect);
-
+
// don't wrap playfield
rectangle clip = cliprect;
if (clip.max_y > 31) clip.max_y = 31;
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index 4b79ad53cd6..4d4e8f78ccc 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -938,5 +938,3 @@ UINT32 nmk16_state::screen_update_firehawk(screen_device &screen, bitmap_ind16 &
m_tx_tilemap->draw(screen, bitmap, cliprect, 0,0);
return 0;
}
-
-
diff --git a/src/mame/video/pc080sn.c b/src/mame/video/pc080sn.c
index 01b4a8f4445..077b17dd1ec 100644
--- a/src/mame/video/pc080sn.c
+++ b/src/mame/video/pc080sn.c
@@ -53,7 +53,7 @@ pc080sn_device::pc080sn_device(const machine_config &mconfig, const char *tag, d
: device_t(mconfig, PC080SN, "Taito PC080SN", tag, owner, clock, "pc080sn", __FILE__),
m_ram(NULL),
m_gfxnum(0),
- m_x_offset(0),
+ m_x_offset(0),
m_y_offset(0),
m_y_invert(0),
m_dblwidth(0),
diff --git a/src/mame/video/pc090oj.c b/src/mame/video/pc090oj.c
index 7001e39c8a7..d037cfd247d 100644
--- a/src/mame/video/pc090oj.c
+++ b/src/mame/video/pc090oj.c
@@ -80,7 +80,7 @@ pc090oj_device::pc090oj_device(const machine_config &mconfig, const char *tag, d
m_ram(NULL),
m_ram_buffered(0),
m_gfxnum(0),
- m_x_offset(0),
+ m_x_offset(0),
m_y_offset(0),
m_use_buffer(0),
m_gfxdecode(*this),
diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c
index 612414f88bb..1b6fe218e09 100644
--- a/src/mame/video/spbactn.c
+++ b/src/mame/video/spbactn.c
@@ -128,7 +128,7 @@ int spbactn_state::draw_video(screen_device &screen, bitmap_rgb32 &bitmap, const
m_fg_tilemap->draw(screen, m_tile_bitmap_fg, cliprect, 0, 0);
m_mixer->mix_bitmaps(screen, bitmap, cliprect, m_palette, &m_tile_bitmap_bg, &m_tile_bitmap_fg, (bitmap_ind16*)0, &m_sprite_bitmap);
-
+
return 0;
}
diff --git a/src/mame/video/tc0080vco.c b/src/mame/video/tc0080vco.c
index 269b769c907..60350e3a0f1 100644
--- a/src/mame/video/tc0080vco.c
+++ b/src/mame/video/tc0080vco.c
@@ -97,7 +97,7 @@ tc0080vco_device::tc0080vco_device(const machine_config &mconfig, const char *ta
m_flipscreen(0),
m_gfxnum(0),
m_txnum(0),
- m_bg_xoffs(0),
+ m_bg_xoffs(0),
m_bg_yoffs(0),
m_bg_flip_yoffs(0),
m_has_fg0(1),
diff --git a/src/mame/video/tc0100scn.c b/src/mame/video/tc0100scn.c
index fc12b72143f..8f1c351df87 100644
--- a/src/mame/video/tc0100scn.c
+++ b/src/mame/video/tc0100scn.c
@@ -143,11 +143,11 @@ tc0100scn_device::tc0100scn_device(const machine_config &mconfig, const char *ta
m_dblwidth(0),
m_gfxnum(0),
m_txnum(0),
- m_x_offset(0),
+ m_x_offset(0),
m_y_offset(0),
- m_flip_xoffs(0),
+ m_flip_xoffs(0),
m_flip_yoffs(0),
- m_flip_text_xoffs(0),
+ m_flip_text_xoffs(0),
m_flip_text_yoffs(0),
m_multiscrn_xoffs(0),
m_multiscrn_hack(0),
diff --git a/src/mame/video/tc0480scp.c b/src/mame/video/tc0480scp.c
index d00059a6316..3c063ee606b 100644
--- a/src/mame/video/tc0480scp.c
+++ b/src/mame/video/tc0480scp.c
@@ -153,11 +153,11 @@ tc0480scp_device::tc0480scp_device(const machine_config &mconfig, const char *ta
m_dblwidth(0),
m_gfxnum(0),
m_txnum(0),
- m_x_offset(0),
+ m_x_offset(0),
m_y_offset(0),
- m_text_xoffs(0),
+ m_text_xoffs(0),
m_text_yoffs(0),
- m_flip_xoffs(0),
+ m_flip_xoffs(0),
m_flip_yoffs(0),
m_col_base(0),
m_gfxdecode(*this),
diff --git a/src/mame/video/tecmo_mix.c b/src/mame/video/tecmo_mix.c
index 8c4213f9468..37c7d5c8bb8 100644
--- a/src/mame/video/tecmo_mix.c
+++ b/src/mame/video/tecmo_mix.c
@@ -34,12 +34,6 @@ tecmo_mix_device::tecmo_mix_device(const machine_config &mconfig, const char *ta
void tecmo_mix_device::device_start()
{
-
-
-
-
-
-
}
void tecmo_mix_device::device_reset()
@@ -133,7 +127,6 @@ void tecmo_mix_device::mix_bitmaps(screen_device &screen, bitmap_rgb32 &bitmap,
{
if (m_sprpri == (0 ^ m_revspritetile)) // behind all
{
-
if (fgpixel & 0xf) // is the fg used?
{
if (fgbln)
@@ -180,7 +173,7 @@ void tecmo_mix_device::mix_bitmaps(screen_device &screen, bitmap_rgb32 &bitmap,
}
else
{
- // fg is used and blended with opaque sprite
+ // fg is used and blended with opaque sprite
dd[x] = paldata[fgpixel + m_fgblend_source] + paldata[sprpixel + m_spblend_comp];
}
}
@@ -230,10 +223,10 @@ void tecmo_mix_device::mix_bitmaps(screen_device &screen, bitmap_rgb32 &bitmap,
{
// blended sprite over solid bg pixel
dd[x] = paldata[bgpixel + m_bgblend_comp] + paldata[sprpixel + m_spblend_source];
- // dd[x] = rand();
+ // dd[x] = rand();
}
-
-
+
+
}
else
@@ -265,13 +258,13 @@ void tecmo_mix_device::mix_bitmaps(screen_device &screen, bitmap_rgb32 &bitmap,
{
// needs if bgpixel & 0xf check?
dd[x] = paldata[fgpixel + m_fgblend_source] + paldata[bgpixel + m_bgblend_comp];
-
+
}
else
{
dd[x] = paldata[fgpixel + m_fgregular_comp];
}
-
+
}
else if (bgpixel & 0x0f)
{
@@ -284,4 +277,4 @@ void tecmo_mix_device::mix_bitmaps(screen_device &screen, bitmap_rgb32 &bitmap,
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/mame/video/tecmo_spr.c b/src/mame/video/tecmo_spr.c
index 76c30bb4798..25ac2a860ef 100644
--- a/src/mame/video/tecmo_spr.c
+++ b/src/mame/video/tecmo_spr.c
@@ -131,7 +131,7 @@ void tecmo_spr_device::gaiden_draw_sprites(screen_device &screen, gfxdecode_devi
}
if (enabled)
- {
+ {
UINT32 flipx = (attributes & 1);
UINT32 flipy = (attributes & 2);
@@ -183,7 +183,7 @@ void tecmo_spr_device::gaiden_draw_sprites(screen_device &screen, gfxdecode_devi
// this contains the blend bit and the priority bits, the spbactn proto uses 0x0300 for priority, spbactn uses 0x0030, others use 0x00c0
color |= (source[attributes_word] & 0x03f0);
bitmap = &sprite_bitmap;
-
+
for (row = 0; row < sizey; row++)
{
@@ -198,9 +198,9 @@ void tecmo_spr_device::gaiden_draw_sprites(screen_device &screen, gfxdecode_devi
flipx, flipy,
sx, sy,
0);
-
+
}
- }
+ }
}
source += sourceinc;
}
@@ -214,19 +214,19 @@ void tecmo_spr_device::gaiden_draw_sprites(screen_device &screen, gfxdecode_devi
* byte bit usage
* --------+-76543210-+----------------
0 | xxxxx--- | bank / upper tile bits
- | -----x-- | enable
- | ------x- | flip y
- | -------x | flip x
- 1 | xxxxxxxx | tile number (low bits)
- 2 | ------xx | size
- 3 | xx-------| priority
- | --x----- | upper y co-ord
- | ---x---- | upper x co-ord
- | ----xxxx | colour
- 4 | xxxxxxxx | ypos
- 5 | xxxxxxxx | xpos
- 6 | -------- |
- 7 | -------- |
+ | -----x-- | enable
+ | ------x- | flip y
+ | -------x | flip x
+ 1 | xxxxxxxx | tile number (low bits)
+ 2 | ------xx | size
+ 3 | xx-------| priority
+ | --x----- | upper y co-ord
+ | ---x---- | upper x co-ord
+ | ----xxxx | colour
+ 4 | xxxxxxxx | ypos
+ 5 | xxxxxxxx | xpos
+ 6 | -------- |
+ 7 | -------- |
*/
@@ -302,7 +302,7 @@ void tecmo_spr_device::draw_sprites_8bit(screen_device &screen, bitmap_ind16 &bi
*
* byte bit usage
* --------+-76543210-+----------------
-
+
*/
@@ -326,7 +326,7 @@ void tecmo_spr_device::draw_wc90_sprites(bitmap_ind16 &bitmap, const rectangle &
if (xpos >= 0x0300) xpos -= 0x0400;
flags = spriteram[offs+4];
-
+
int sizex = 1 << ((flags >> 0) & 3);
int sizey = 1 << ((flags >> 2) & 3);
@@ -424,4 +424,4 @@ void tecmo_spr_device::tbowl_draw_sprites(bitmap_ind16 &bitmap,const rectangle &
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index d74eac9c0e8..d6faac2f7a0 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -228,7 +228,7 @@ VIDEO_START_MEMBER(tetrisp2_state,tetrisp2)
// should be smaller and mirrored like m32 I guess
m_priority = auto_alloc_array(machine(), UINT8, 0x40000);
ms32_rearrange_sprites(machine(), "gfx1");
-
+
save_item(NAME(m_flipscreen_old));
save_pointer(NAME(m_priority), 0x40000);
}
@@ -254,7 +254,7 @@ VIDEO_START_MEMBER(tetrisp2_state,rockntread)
// should be smaller and mirrored like m32 I guess
m_priority = auto_alloc_array(machine(), UINT8, 0x40000);
ms32_rearrange_sprites(machine(), "gfx1");
-
+
save_item(NAME(m_flipscreen_old));
save_pointer(NAME(m_priority), 0x40000);
}
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index 5f44adf6414..4c7d1f96808 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -165,7 +165,7 @@ WRITE8_MEMBER(vulgus_state::vulgus_palette_bank_w)
void vulgus_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
gfx_element *gfx = m_gfxdecode->gfx(2);
-
+
for (int offs = m_spriteram.bytes() - 4; offs >= 0; offs -= 4)
{
int code = m_spriteram[offs];
@@ -174,10 +174,10 @@ void vulgus_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
int sx = m_spriteram[offs + 3];
bool flip = flip_screen() ? true : false;
int dir = 1;
-
+
if (sy == 0)
continue;
-
+
if (flip)
{
sx = 240 - sx;
diff --git a/src/mame/video/wpc_dmd.c b/src/mame/video/wpc_dmd.c
index 6eb96d8673d..1bade28d999 100644
--- a/src/mame/video/wpc_dmd.c
+++ b/src/mame/video/wpc_dmd.c
@@ -153,7 +153,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(wpc_dmd_device::scanline_timer)
base++;
}
}
-
+
cur_scanline = (cur_scanline+1) & 0x1f;
scanline_cb(cur_scanline == (firq_scanline & 0x1f));
}
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c
index 6bc798501a3..a165be50b88 100644
--- a/src/mess/drivers/a2600.c
+++ b/src/mess/drivers/a2600.c
@@ -1949,7 +1949,7 @@ static MACHINE_CONFIG_START( a2600, a2600_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(a26_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
- MCFG_CASSETTE_INTERFACE("a2600_cass")
+ MCFG_CASSETTE_INTERFACE("a2600_cass")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/a310.c b/src/mess/drivers/a310.c
index 98e9d59e85d..f53a91ddb04 100644
--- a/src/mess/drivers/a310.c
+++ b/src/mess/drivers/a310.c
@@ -88,7 +88,7 @@ public:
DECLARE_DRIVER_INIT(a310);
virtual void machine_start();
virtual void machine_reset();
- DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
+ DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
DECLARE_FLOPPY_FORMATS( floppy_formats );
@@ -166,8 +166,8 @@ ADDRESS_MAP_END
INPUT_CHANGED_MEMBER(a310_state::key_stroke)
{
- UINT8 row_val = (UINT8)(FPTR)(param) >> 4;
- UINT8 col_val = (UINT8)(FPTR)(param) & 0xf;
+ UINT8 row_val = (UINT8)(FPTR)(param) >> 4;
+ UINT8 col_val = (UINT8)(FPTR)(param) & 0xf;
if(newval && !oldval)
m_kart->send_keycode_down(row_val,col_val);
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( a310 )
PORT_BIT(0x80, 0x00, IPT_KEYBOARD) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x26) PORT_IMPULSE(1)
PORT_START("key2") /* KEY ROW 2 */
- PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("q Q") PORT_CODE(KEYCODE_Q) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x27) PORT_IMPULSE(1)
+ PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("q Q") PORT_CODE(KEYCODE_Q) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x27) PORT_IMPULSE(1)
PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("w W") PORT_CODE(KEYCODE_W) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x28) PORT_IMPULSE(1)
PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("e E") PORT_CODE(KEYCODE_E) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x29) PORT_IMPULSE(1)
PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME("r R") PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x2a) PORT_IMPULSE(1)
@@ -266,43 +266,43 @@ static INPUT_PORTS_START( a310 )
PORT_START("key7") /* KEY ROW 7 */
PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("LINE FEED")
PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x5f) PORT_IMPULSE(1)
- PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("- (KP)") PORT_CODE(KEYCODE_MINUS_PAD)
- PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME(", (KP)") PORT_CODE(KEYCODE_PLUS_PAD)
+ PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("- (KP)") PORT_CODE(KEYCODE_MINUS_PAD)
+ PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME(", (KP)") PORT_CODE(KEYCODE_PLUS_PAD)
PORT_BIT(0x10, 0x00, IPT_KEYBOARD) PORT_NAME("ENTER (KP)") PORT_CODE(KEYCODE_ENTER_PAD)
PORT_BIT(0x20, 0x00, IPT_KEYBOARD) PORT_NAME(". (KP)") PORT_CODE(KEYCODE_DEL_PAD)
PORT_BIT(0x40, 0x00, IPT_KEYBOARD) PORT_NAME("0 (KP)") PORT_CODE(KEYCODE_0_PAD)
PORT_BIT(0x80, 0x00, IPT_KEYBOARD) PORT_NAME("1 (KP)") PORT_CODE(KEYCODE_1_PAD)
PORT_START("key8") /* KEY ROW 8 */
- PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("2 (KP)") PORT_CODE(KEYCODE_2_PAD)
- PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("3 (KP)") PORT_CODE(KEYCODE_3_PAD)
- PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("4 (KP)") PORT_CODE(KEYCODE_4_PAD)
- PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME("5 (KP)") PORT_CODE(KEYCODE_5_PAD)
- PORT_BIT(0x10, 0x00, IPT_KEYBOARD) PORT_NAME("6 (KP)") PORT_CODE(KEYCODE_6_PAD)
- PORT_BIT(0x20, 0x00, IPT_KEYBOARD) PORT_NAME("7 (KP)") PORT_CODE(KEYCODE_7_PAD)
- PORT_BIT(0x40, 0x00, IPT_KEYBOARD) PORT_NAME("8 (KP)") PORT_CODE(KEYCODE_8_PAD)
- PORT_BIT(0x80, 0x00, IPT_KEYBOARD) PORT_NAME("9 (KP)") PORT_CODE(KEYCODE_9_PAD)
-
- PORT_START("key9")
- PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("HOME") PORT_CODE(KEYCODE_HOME) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x20) PORT_IMPULSE(1)
- PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("*") PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x24) PORT_IMPULSE(1) // (KP?)
- PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("#") PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x25) PORT_IMPULSE(1) // (KP?)
-
- PORT_START("keya")
- PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x01) PORT_IMPULSE(1)
- PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x02) PORT_IMPULSE(1)
- PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x03) PORT_IMPULSE(1)
- PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x04) PORT_IMPULSE(1)
- PORT_BIT(0x10, 0x00, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x05) PORT_IMPULSE(1)
- PORT_BIT(0x20, 0x00, IPT_KEYBOARD) PORT_NAME("F6") PORT_CODE(KEYCODE_F6) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x06) PORT_IMPULSE(1)
- PORT_BIT(0x40, 0x00, IPT_KEYBOARD) PORT_NAME("F7") PORT_CODE(KEYCODE_F7) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x07) PORT_IMPULSE(1)
- PORT_BIT(0x80, 0x00, IPT_KEYBOARD) PORT_NAME("F8") PORT_CODE(KEYCODE_F8) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x08) PORT_IMPULSE(1)
-
- PORT_START("keyb")
- PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("F9") PORT_CODE(KEYCODE_F9) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x09) PORT_IMPULSE(1)
- PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("F10") PORT_CODE(KEYCODE_F10) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x0a) PORT_IMPULSE(1)
- PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("F11") PORT_CODE(KEYCODE_F11) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x0b) PORT_IMPULSE(1)
- PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME("F12") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x0c) PORT_IMPULSE(1)
+ PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("2 (KP)") PORT_CODE(KEYCODE_2_PAD)
+ PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("3 (KP)") PORT_CODE(KEYCODE_3_PAD)
+ PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("4 (KP)") PORT_CODE(KEYCODE_4_PAD)
+ PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME("5 (KP)") PORT_CODE(KEYCODE_5_PAD)
+ PORT_BIT(0x10, 0x00, IPT_KEYBOARD) PORT_NAME("6 (KP)") PORT_CODE(KEYCODE_6_PAD)
+ PORT_BIT(0x20, 0x00, IPT_KEYBOARD) PORT_NAME("7 (KP)") PORT_CODE(KEYCODE_7_PAD)
+ PORT_BIT(0x40, 0x00, IPT_KEYBOARD) PORT_NAME("8 (KP)") PORT_CODE(KEYCODE_8_PAD)
+ PORT_BIT(0x80, 0x00, IPT_KEYBOARD) PORT_NAME("9 (KP)") PORT_CODE(KEYCODE_9_PAD)
+
+ PORT_START("key9")
+ PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("HOME") PORT_CODE(KEYCODE_HOME) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x20) PORT_IMPULSE(1)
+ PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("*") PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x24) PORT_IMPULSE(1) // (KP?)
+ PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("#") PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x25) PORT_IMPULSE(1) // (KP?)
+
+ PORT_START("keya")
+ PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x01) PORT_IMPULSE(1)
+ PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x02) PORT_IMPULSE(1)
+ PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x03) PORT_IMPULSE(1)
+ PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x04) PORT_IMPULSE(1)
+ PORT_BIT(0x10, 0x00, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x05) PORT_IMPULSE(1)
+ PORT_BIT(0x20, 0x00, IPT_KEYBOARD) PORT_NAME("F6") PORT_CODE(KEYCODE_F6) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x06) PORT_IMPULSE(1)
+ PORT_BIT(0x40, 0x00, IPT_KEYBOARD) PORT_NAME("F7") PORT_CODE(KEYCODE_F7) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x07) PORT_IMPULSE(1)
+ PORT_BIT(0x80, 0x00, IPT_KEYBOARD) PORT_NAME("F8") PORT_CODE(KEYCODE_F8) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x08) PORT_IMPULSE(1)
+
+ PORT_START("keyb")
+ PORT_BIT(0x01, 0x00, IPT_KEYBOARD) PORT_NAME("F9") PORT_CODE(KEYCODE_F9) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x09) PORT_IMPULSE(1)
+ PORT_BIT(0x02, 0x00, IPT_KEYBOARD) PORT_NAME("F10") PORT_CODE(KEYCODE_F10) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x0a) PORT_IMPULSE(1)
+ PORT_BIT(0x04, 0x00, IPT_KEYBOARD) PORT_NAME("F11") PORT_CODE(KEYCODE_F11) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x0b) PORT_IMPULSE(1)
+ PORT_BIT(0x08, 0x00, IPT_KEYBOARD) PORT_NAME("F12") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x0c) PORT_IMPULSE(1)
// PORT_BIT(0x10, 0x00, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x05) PORT_IMPULSE(1)
// PORT_BIT(0x20, 0x00, IPT_KEYBOARD) PORT_NAME("F6") PORT_CODE(KEYCODE_F6) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x06) PORT_IMPULSE(1)
// PORT_BIT(0x40, 0x00, IPT_KEYBOARD) PORT_NAME("F7") PORT_CODE(KEYCODE_F7) PORT_CHANGED_MEMBER(DEVICE_SELF, a310_state, key_stroke, 0x07) PORT_IMPULSE(1)
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index 33c6fc3da3b..745ff35c87c 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -83,8 +83,8 @@
2014/03/25 Mike Saarna Fixed Riot Timer
- 2014/05/06 Mike Saarna/Robert Tuccitto Brought initial Maria cycle counts
-+ inline from measurements taken with logic analyzer and tests.
+ 2014/05/06 Mike Saarna/Robert Tuccitto Brought initial Maria cycle counts
++ inline from measurements taken with logic analyzer and tests.
***************************************************************************/
#include "emu.h"
diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c
index 4cb4ab2b9ca..2279a3019c1 100644
--- a/src/mess/drivers/abc1600.c
+++ b/src/mess/drivers/abc1600.c
@@ -880,7 +880,7 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state )
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
- MCFG_Z80DART_OUT_INT_CB(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5)) // shared with SCC
+ MCFG_Z80DART_OUT_INT_CB(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5)) // shared with SCC
MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, XTAL_64MHz/16)
MCFG_Z8530_INTRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5))
diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c
index 3ac63f9f023..d721fc9bb2f 100644
--- a/src/mess/drivers/abc80x.c
+++ b/src/mess/drivers/abc80x.c
@@ -1447,36 +1447,36 @@ ROM_START( abc806 )
ROM_REGION( 0x200, "v50", 0 )
ROM_LOAD( "60 90242-01.7e", 0x000, 0x200, CRC(788a56d8) SHA1(d81e55cdddc36f5d41bf0a33104c75fac590b764) ) // "V50" 7621 (82S131), HR vertical timing 50Hz
-
+
//ROM_REGION( 0x200, "v60", 0 )
//ROM_LOAD( "60 90319-01.7e", 0x000, 0x200, NO_DUMP ) // "V60" 7621 (82S131), HR vertical timing 60Hz
ROM_REGION( 0x400, "att_hand", 0 )
/*
- 1 E6P (RAD A8)
- 2 THP (chargen A12)
- 3 CCLK
- 4 B0 (TX ATT 6)
- 5 B1 (TX ATT 7)
- 6 CONDP (40/80)
- 7 B2 (TX ATT 0)
- 8 B3 (TX ATT 1)
- 9 ULP (RAD A5)
- 10 FLP (RAD A6)
- 11 F2P (RTF)
- 12 GND
- 13 F3P (GTF)
- 14 F4P (BTF)
- 15 B5P (RTB)
- 16 B4 (TX ATT 2)
- 17 B5 (TX ATT 3)
- 18 B6 (TX ATT 4)
- 19 B7 (TX ATT 5)
- 20 LP (*DEN+3)
- 21 B6P (GTB)
- 22 B7P (BTB)
- 23 E5P (RAD A7)
- 24 Vcc
+ 1 E6P (RAD A8)
+ 2 THP (chargen A12)
+ 3 CCLK
+ 4 B0 (TX ATT 6)
+ 5 B1 (TX ATT 7)
+ 6 CONDP (40/80)
+ 7 B2 (TX ATT 0)
+ 8 B3 (TX ATT 1)
+ 9 ULP (RAD A5)
+ 10 FLP (RAD A6)
+ 11 F2P (RTF)
+ 12 GND
+ 13 F3P (GTF)
+ 14 F4P (BTF)
+ 15 B5P (RTB)
+ 16 B4 (TX ATT 2)
+ 17 B5 (TX ATT 3)
+ 18 B6 (TX ATT 4)
+ 19 B7 (TX ATT 5)
+ 20 LP (*DEN+3)
+ 21 B6P (GTB)
+ 22 B7P (BTB)
+ 23 E5P (RAD A7)
+ 24 Vcc
*/
ROM_LOAD( "60 90225-01.11c", 0x000, 0x400, NO_DUMP ) // "VIDEO ATTRIBUTE" 40033A (?)
diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c
index 226417c2fbe..249e243ad7e 100644
--- a/src/mess/drivers/ace.c
+++ b/src/mess/drivers/ace.c
@@ -698,7 +698,7 @@ static MACHINE_CONFIG_START( ace, ace_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(ace_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
-
+
MCFG_SNAPSHOT_ADD("snapshot", ace_state, ace, "ace", 1)
MCFG_DEVICE_ADD(I8255_TAG, I8255A, 0)
diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c
index acc2fcc9f88..bfce849a8b3 100644
--- a/src/mess/drivers/alphatro.c
+++ b/src/mess/drivers/alphatro.c
@@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( alphatro, alphatro_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("alphatro_cass")
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_c", alphatro_state, timer_c, attotime::from_hz(4800))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_p", alphatro_state, timer_p, attotime::from_hz(40000))
diff --git a/src/mess/drivers/altos5.c b/src/mess/drivers/altos5.c
index cc9e306ea8d..6f852ed583d 100644
--- a/src/mess/drivers/altos5.c
+++ b/src/mess/drivers/altos5.c
@@ -419,9 +419,9 @@ static MACHINE_CONFIG_START( altos5, altos5_state )
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_8MHz / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80sio", z80dart_device, rxtxcb_w)) // SIO Ch B
- MCFG_Z80CTC_ZC1_CB(WRITELINE(altos5_state, ctc_z1_w)) // Z80DART Ch A, SIO Ch A
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80dart", z80dart_device, rxtxcb_w)) // Z80DART Ch B
+ MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80sio", z80dart_device, rxtxcb_w)) // SIO Ch B
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(altos5_state, ctc_z1_w)) // Z80DART Ch A, SIO Ch A
+ MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80dart", z80dart_device, rxtxcb_w)) // Z80DART Ch B
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("z80sio", z80dart_device, rxb_w))
diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c
index 4a9516eda80..a0ea915b153 100644
--- a/src/mess/drivers/amiga.c
+++ b/src/mess/drivers/amiga.c
@@ -405,87 +405,87 @@ WRITE_LINE_MEMBER( cdtv_state::tpi_int_w )
// ocs chipset (agnus with support for 512k or 1mb chip ram, denise)
DRIVER_INIT_MEMBER( a1000_state, pal )
{
- m_agnus_id = AGNUS_PAL; // 8367
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_PAL; // 8367
+ m_denise_id = DENISE; // 8362
}
DRIVER_INIT_MEMBER( a1000_state, ntsc )
{
- m_agnus_id = AGNUS_NTSC; // 8361
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_NTSC; // 8361
+ m_denise_id = DENISE; // 8362
}
DRIVER_INIT_MEMBER( a2000_state, pal )
{
- m_agnus_id = AGNUS_PAL; // 8371 (later versions 8372A)
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_PAL; // 8371 (later versions 8372A)
+ m_denise_id = DENISE; // 8362
}
DRIVER_INIT_MEMBER( a2000_state, ntsc )
{
- m_agnus_id = AGNUS_NTSC; // 8370 (later versions 8372A)
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_NTSC; // 8370 (later versions 8372A)
+ m_denise_id = DENISE; // 8362
}
DRIVER_INIT_MEMBER( a500_state, pal )
{
- m_agnus_id = AGNUS_PAL; // 8371 (later versions 8372A)
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_PAL; // 8371 (later versions 8372A)
+ m_denise_id = DENISE; // 8362
}
DRIVER_INIT_MEMBER( a500_state, ntsc )
{
- m_agnus_id = AGNUS_NTSC; // 8370 (later versions 8372A)
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_NTSC; // 8370 (later versions 8372A)
+ m_denise_id = DENISE; // 8362
}
DRIVER_INIT_MEMBER( cdtv_state, pal )
{
- m_agnus_id = AGNUS_HR_PAL; // 8372A
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_HR_PAL; // 8372A
+ m_denise_id = DENISE; // 8362
}
DRIVER_INIT_MEMBER( cdtv_state, ntsc )
{
- m_agnus_id = AGNUS_HR_NTSC; // 8372A
- m_denise_id = DENISE; // 8362
+ m_agnus_id = AGNUS_HR_NTSC; // 8372A
+ m_denise_id = DENISE; // 8362
}
// ecs chipset (agnus with support for 2mb chip ram, super denise)
DRIVER_INIT_MEMBER( a3000_state, pal )
{
- m_agnus_id = AGNUS_HR_PAL_NEW; // 8372B (early versions: 8372AB)
- m_denise_id = DENISE_HR; // 8373
+ m_agnus_id = AGNUS_HR_PAL_NEW; // 8372B (early versions: 8372AB)
+ m_denise_id = DENISE_HR; // 8373
}
DRIVER_INIT_MEMBER( a3000_state, ntsc )
{
- m_agnus_id = AGNUS_HR_NTSC_NEW; // 8372B (early versions: 8372AB)
- m_denise_id = DENISE_HR; // 8373
+ m_agnus_id = AGNUS_HR_NTSC_NEW; // 8372B (early versions: 8372AB)
+ m_denise_id = DENISE_HR; // 8373
}
DRIVER_INIT_MEMBER( a500p_state, pal )
{
- m_agnus_id = AGNUS_HR_PAL; // 8375 (390544-01)
- m_denise_id = DENISE_HR; // 8373
+ m_agnus_id = AGNUS_HR_PAL; // 8375 (390544-01)
+ m_denise_id = DENISE_HR; // 8373
}
DRIVER_INIT_MEMBER( a500p_state, ntsc )
{
- m_agnus_id = AGNUS_HR_NTSC; // 8375 (390544-02)
- m_denise_id = DENISE_HR; // 8373
+ m_agnus_id = AGNUS_HR_NTSC; // 8375 (390544-02)
+ m_denise_id = DENISE_HR; // 8373
}
DRIVER_INIT_MEMBER( a600_state, pal )
{
- m_agnus_id = AGNUS_HR_PAL; // 8375 (390544-01)
- m_denise_id = DENISE_HR; // 8373
+ m_agnus_id = AGNUS_HR_PAL; // 8375 (390544-01)
+ m_denise_id = DENISE_HR; // 8373
}
DRIVER_INIT_MEMBER( a600_state, ntsc )
{
- m_agnus_id = AGNUS_HR_NTSC; // 8375 (390544-02)
- m_denise_id = DENISE_HR; // 8373
+ m_agnus_id = AGNUS_HR_NTSC; // 8375 (390544-02)
+ m_denise_id = DENISE_HR; // 8373
}
// aga chipset (alice and lisa)
@@ -2029,7 +2029,7 @@ ROM_END
ROM_START( cd32 )
ROM_REGION32_BE(0x100000, "kickstart", 0)
-// ROM_LOAD16_WORD("391640-03.u6a", 0x000000, 0x100000, CRC(a4fbc94a) SHA1(816ce6c5077875850c7d43452230a9ba3a2902db)) // todo: this is the real dump
+// ROM_LOAD16_WORD("391640-03.u6a", 0x000000, 0x100000, CRC(a4fbc94a) SHA1(816ce6c5077875850c7d43452230a9ba3a2902db)) // todo: this is the real dump
ROM_LOAD16_WORD("391640-03.u6a", 0x000000, 0x100000, CRC(d3837ae4) SHA1(06807db3181637455f4d46582d9972afec8956d9))
ROM_END
diff --git a/src/mess/drivers/ampro.c b/src/mess/drivers/ampro.c
index 0036d40cef4..1ddb33d25bb 100644
--- a/src/mess/drivers/ampro.c
+++ b/src/mess/drivers/ampro.c
@@ -166,8 +166,8 @@ static MACHINE_CONFIG_START( ampro, ampro_state )
/* Devices */
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_16MHz / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(ampro_state, ctc_z0_w)) // Z80DART Ch A, SIO Ch A
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80dart", z80dart_device, rxtxcb_w)) // SIO Ch B
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(ampro_state, ctc_z0_w)) // Z80DART Ch A, SIO Ch A
+ MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80dart", z80dart_device, rxtxcb_w)) // SIO Ch B
MCFG_Z80DART_ADD("z80dart", XTAL_16MHz / 4, 0, 0, 0, 0 )
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c
index 869de0aa5e4..814dd3098b0 100644
--- a/src/mess/drivers/amstrad.c
+++ b/src/mess/drivers/amstrad.c
@@ -883,7 +883,7 @@ static MACHINE_CONFIG_START( amstrad_nofdc, amstrad_state )
MCFG_CASSETTE_FORMATS(cdt_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("cpc_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","cpc_cass")
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
@@ -991,7 +991,7 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(amstrad_state, cpc_romdis)) // ROMDIS
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMEN_CB(WRITELINE(amstrad_state, cpc_romen)) // /ROMEN
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMEN_CB(WRITELINE(amstrad_state, cpc_romen)) // /ROMEN
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c
index 6f1b910eab4..62829b6b1c2 100644
--- a/src/mess/drivers/apf.c
+++ b/src/mess/drivers/apf.c
@@ -491,7 +491,7 @@ DEVICE_IMAGE_LOAD_MEMBER( apf_state, apf_cart )
{
UINT8 *ROM = memregion("cart")->base();
UINT32 cart_size;
-
+
if (image.software_entry() == NULL)
{
cart_size = image.length();
@@ -502,7 +502,7 @@ DEVICE_IMAGE_LOAD_MEMBER( apf_state, apf_cart )
}
image.fread(ROM, cart_size);
-
+
// attempt to identify Space Destroyer, which needs 1K of additional RAM
if (cart_size == 0x1800)
{
@@ -527,7 +527,7 @@ DEVICE_IMAGE_LOAD_MEMBER( apf_state, apf_cart )
m_cart_ram.resize(image.get_software_region_length("ram"));
}
}
-
+
return IMAGE_INIT_PASS;
}
@@ -611,7 +611,7 @@ static MACHINE_CONFIG_DERIVED( apfimag, apfm1000 )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(apf_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
-
+
MCFG_FD1771x_ADD("fdc", 1000000) // guess
MCFG_FLOPPY_DRIVE_ADD("fdc:0", apf_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", apf_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mess/drivers/apogee.c b/src/mess/drivers/apogee.c
index eb2d43256b0..1891079bf02 100644
--- a/src/mess/drivers/apogee.c
+++ b/src/mess/drivers/apogee.c
@@ -266,7 +266,7 @@ static MACHINE_CONFIG_START( apogee, apogee_state )
MCFG_CASSETTE_FORMATS(rka_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("apogee_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","apogee")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index b28a3896c5f..75412f39155 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -981,7 +981,7 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("corvus", A2BUS_CORVUS) /* Corvus flat-cable HDD interface (must go in slot 6) */
SLOT_INTERFACE("mcms1", A2BUS_MCMS1) /* Mountain Computer Music System, card 1 of 2 */
SLOT_INTERFACE("mcms2", A2BUS_MCMS2) /* Mountain Computer Music System, card 2 of 2. must be in card 1's slot + 1! */
- SLOT_INTERFACE("dx1", A2BUS_DX1) /* Decillonix DX-1 sampler card */
+ SLOT_INTERFACE("dx1", A2BUS_DX1) /* Decillonix DX-1 sampler card */
SLOT_INTERFACE_END
static SLOT_INTERFACE_START(apple2eaux_cards)
@@ -1062,7 +1062,7 @@ static MACHINE_CONFIG_DERIVED( apple2, apple2_common )
/* default configuration: on real machine is present also in configurations */
/* with less memory, provided that the language card is installed */
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
+ MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( apple2p, apple2_common )
@@ -1078,7 +1078,7 @@ static MACHINE_CONFIG_DERIVED( apple2p, apple2_common )
/* default configuration: on real machine is present also in configurations */
/* with less memory, provided that the language card is installed */
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
+ MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( apple2e, apple2_common )
@@ -1162,11 +1162,11 @@ static MACHINE_CONFIG_DERIVED( apple2c, apple2ee )
MCFG_A2BUS_SLOT_REMOVE("sl7")
MCFG_DEVICE_ADD(IIC_ACIA1_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_14_31818MHz / 8) // ~1.789 MHz
+ MCFG_MOS6551_XTAL(XTAL_14_31818MHz / 8) // ~1.789 MHz
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd))
MCFG_DEVICE_ADD(IIC_ACIA2_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // matches SSC so modem software is compatible
+ MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // matches SSC so modem software is compatible
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("modem", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, NULL)
diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c
index 9a0e5bf696b..c6a130a046f 100644
--- a/src/mess/drivers/applix.c
+++ b/src/mess/drivers/applix.c
@@ -885,7 +885,7 @@ static MACHINE_CONFIG_START( applix, applix_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_WD1772x_ADD("fdc", XTAL_16MHz / 2) //connected to Z80H clock pin
MCFG_FLOPPY_DRIVE_ADD("fdc:0", applix_floppies, "35dd", applix_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", applix_floppies, "35dd", applix_state::floppy_formats)
diff --git a/src/mess/drivers/at.c b/src/mess/drivers/at.c
index 1639ea2ee1b..0e259c1b56e 100644
--- a/src/mess/drivers/at.c
+++ b/src/mess/drivers/at.c
@@ -706,7 +706,7 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_START( at586, at586_state )
MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
MCFG_CPU_PROGRAM_MAP(at586_map)
- MCFG_CPU_IO_MAP(at586_io)
+ MCFG_CPU_IO_MAP(at586_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pcibus:1:i82371ab:pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_ADD(RAM_TAG)
@@ -730,7 +730,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( at586x3, at586_state )
MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
MCFG_CPU_PROGRAM_MAP(at586_map)
- MCFG_CPU_IO_MAP(at586_io)
+ MCFG_CPU_IO_MAP(at586_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pcibus:1:i82371sb:pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c
index cd347c7c4c7..2b526f69205 100644
--- a/src/mess/drivers/atom.c
+++ b/src/mess/drivers/atom.c
@@ -811,7 +811,7 @@ static MACHINE_CONFIG_START( atom, atom_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(atom_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_QUICKLOAD_ADD("quickload", atom_state, atom_atm, "atm", 0)
/* cartridge */
@@ -897,7 +897,7 @@ static MACHINE_CONFIG_START( atombb, atom_state )
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_CASSETTE_ADD("cassette")
+ MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(atom_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mess/drivers/bebox.c b/src/mess/drivers/bebox.c
index e1894165e47..d118016a664 100644
--- a/src/mess/drivers/bebox.c
+++ b/src/mess/drivers/bebox.c
@@ -231,7 +231,7 @@ static MACHINE_CONFIG_START( bebox, bebox_state )
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_STANDARD)
MCFG_KBDC8042_SYSTEM_RESET_CB(INPUTLINE("ppc1", INPUT_LINE_RESET))
MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE(bebox_state, bebox_keyboard_interrupt))
-
+
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("32M")
diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c
index 474230353de..38739368ce6 100644
--- a/src/mess/drivers/bml3.c
+++ b/src/mess/drivers/bml3.c
@@ -1019,7 +1019,7 @@ static MACHINE_CONFIG_START( bml3_common, bml3_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* slot devices */
- MCFG_DEVICE_ADD("bml3bus", BML3BUS, 0)
+ MCFG_DEVICE_ADD("bml3bus", BML3BUS, 0)
MCFG_BML3BUS_CPU("maincpu")
MCFG_BML3BUS_OUT_NMI_CB(WRITELINE(bml3_state, bml3bus_nmi_w))
MCFG_BML3BUS_OUT_IRQ_CB(WRITELINE(bml3_state, bml3bus_irq_w))
diff --git a/src/mess/drivers/bullet.c b/src/mess/drivers/bullet.c
index 0a815f252a9..a940eaaa8d4 100644
--- a/src/mess/drivers/bullet.c
+++ b/src/mess/drivers/bullet.c
@@ -1136,7 +1136,7 @@ static MACHINE_CONFIG_START( bullet, bullet_state )
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_IN_PB_CB(READ8(bullet_state, pio_pb_r))
-
+
MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bullet_state, fdc_drq_w))
diff --git a/src/mess/drivers/c80.c b/src/mess/drivers/c80.c
index ccde4c4fdb3..c6c0722611c 100644
--- a/src/mess/drivers/c80.c
+++ b/src/mess/drivers/c80.c
@@ -269,7 +269,7 @@ static MACHINE_CONFIG_START( c80, c80_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED )
-
+
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mess/drivers/cc40.c b/src/mess/drivers/cc40.c
index fab1b98df5a..8ca9bc455cf 100644
--- a/src/mess/drivers/cc40.c
+++ b/src/mess/drivers/cc40.c
@@ -42,14 +42,14 @@
AMI 1041036-1 - 68-pin QFP AMI Gate Array
HD44100H - 60-pin QFP Hitachi HD44100 LCD Driver
HD44780A00 - 80-pin TFP Hitachi HD44780 LCD Controller
-
+
* - indicates that it's on the other side of the PCB
-
-
+
+
CC-40 is powered by 4 AA batteries. These will also save internal RAM,
provided that the machine is turned off properly. If a program is running,
you may have to press [BREAK] before turning the CC-40 off.
-
+
To run a cartridge, usually the command RUN "DIR" shows which program(s)
can be loaded. Load a program by pressing the [RUN] key while viewing the list,
or manually with the command RUN "<shortname of program in list>"
@@ -90,14 +90,14 @@ public:
required_device<tms70c20_device> m_maincpu;
required_device<dac_device> m_dac;
-
+
ioport_port *m_key_matrix[8];
UINT8 m_power;
UINT8 m_banks;
UINT8 m_clock_control;
UINT8 m_key_select;
-
+
void update_lcd_indicator(UINT8 y, UINT8 x, int state);
DECLARE_READ8_MEMBER(bus_control_r);
@@ -215,7 +215,7 @@ WRITE8_MEMBER(cc40_state::power_w)
{
// d0: power-on hold latch
m_power = data & 1;
-
+
// stop running
if (!m_power)
m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
@@ -242,7 +242,7 @@ WRITE8_MEMBER(cc40_state::bankswitch_w)
{
// d0-d1: system rom bankswitch
membank("sysbank")->set_entry(data & 3);
-
+
// d2-d3: cartridge rom bankswitch
membank("cartbank")->set_entry(data >> 2 & 3);
@@ -271,7 +271,7 @@ WRITE8_MEMBER(cc40_state::clock_w)
// high to low
m_maincpu->set_clock_scale(1);
}
-
+
m_clock_control = data & 0x0f;
}
@@ -285,7 +285,7 @@ READ8_MEMBER(cc40_state::keyboard_r)
if (m_key_select >> i & 1)
ret |= m_key_matrix[i]->read();
}
-
+
return ret;
}
@@ -427,7 +427,7 @@ INPUT_PORTS_END
void cc40_state::machine_reset()
{
m_power = 1;
-
+
address_space &space = m_maincpu->space(AS_PROGRAM);
bankswitch_w(space, 0, 0);
}
@@ -437,7 +437,7 @@ void cc40_state::machine_start()
static const char *const tags[] = { "IN0", "IN1", "IN2", "IN3", "IN4", "IN5", "IN6", "IN7" };
for (int i = 0; i < 8; i++)
m_key_matrix[i] = ioport(tags[i]);
-
+
membank("sysbank")->configure_entries(0, 4, memregion("system")->base(), 0x2000);
membank("cartbank")->configure_entries(0, 4, memregion("user1")->base(), 0x8000);
@@ -446,7 +446,7 @@ void cc40_state::machine_start()
m_banks = 0;
m_clock_control = 0;
m_key_select = 0;
-
+
// register for savestates
save_item(NAME(m_power));
save_item(NAME(m_banks));
@@ -511,7 +511,7 @@ ROM_START( cc40 )
ROM_REGION( 0x8000, "system", 0 )
ROM_LOAD( "cc40.bin", 0x0000, 0x8000, CRC(f5322fab) SHA1(1b5c4052a53654363c458f75eac7a27f0752def6) ) // system rom, banked
-
+
ROM_REGION( 0x20000, "user1", ROMREGION_ERASEFF ) // cartridge area, max 4*32KB
ROM_END
diff --git a/src/mess/drivers/coco12.c b/src/mess/drivers/coco12.c
index c1853213e96..0463c34c32b 100644
--- a/src/mess/drivers/coco12.c
+++ b/src/mess/drivers/coco12.c
@@ -312,7 +312,7 @@ static MACHINE_CONFIG_START( coco, coco12_state )
MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
-
+
// video hardware
MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, VDG_TAG)
diff --git a/src/mess/drivers/coco3.c b/src/mess/drivers/coco3.c
index ddb8e6a3bf7..9e8ec4ec562 100644
--- a/src/mess/drivers/coco3.c
+++ b/src/mess/drivers/coco3.c
@@ -273,7 +273,7 @@ static MACHINE_CONFIG_START( coco3, coco3_state )
MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
-
+
MCFG_COCO_VHD_ADD(VHD0_TAG)
MCFG_COCO_VHD_ADD(VHD1_TAG)
diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c
index 8bf21a5171c..688304fa45a 100644
--- a/src/mess/drivers/compis.c
+++ b/src/mess/drivers/compis.c
@@ -697,7 +697,7 @@ static MACHINE_CONFIG_START( compis, compis_state )
MCFG_CASSETTE_ADD(CASSETTE_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("tape", compis_state, tape_tick, attotime::from_hz(44100))
MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, NULL)
diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c
index b2d71fed116..1acab4cb555 100644
--- a/src/mess/drivers/crvision.c
+++ b/src/mess/drivers/crvision.c
@@ -851,7 +851,7 @@ static MACHINE_CONFIG_START( creativision, crvision_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
-
+
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
diff --git a/src/mess/drivers/cybiko.c b/src/mess/drivers/cybiko.c
index 2657ad47de6..b2b6fc1b4ab 100644
--- a/src/mess/drivers/cybiko.c
+++ b/src/mess/drivers/cybiko.c
@@ -154,7 +154,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cybikoxt_io, AS_IO, 16, cybiko_state )
AM_RANGE(h8_device::PORT_A, h8_device::PORT_A) AM_READ(xtpower_r)
AM_RANGE(h8_device::PORT_F, h8_device::PORT_F) AM_READWRITE(xtclock_r, xtclock_w)
-ADDRESS_MAP_END
+ADDRESS_MAP_END
/////////////////
// INPUT PORTS //
@@ -360,7 +360,7 @@ static MACHINE_CONFIG_START( cybikov1, cybiko_state )
MCFG_AT45DBXXX_SO_CALLBACK(DEVWRITELINE("maincpu:sci1", h8_sci_device, rx_w))
MCFG_NVRAM_ADD_0FILL("nvram")
-
+
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("512K")
@@ -397,7 +397,7 @@ static MACHINE_CONFIG_DERIVED( cybikoxt, cybikov1)
// machine
MCFG_DEVICE_REMOVE("flash1")
- MCFG_SST_39VF400A_ADD("flashxt")
+ MCFG_SST_39VF400A_ADD("flashxt")
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c
index d51f52e2ad6..ded15918508 100644
--- a/src/mess/drivers/d6800.c
+++ b/src/mess/drivers/d6800.c
@@ -412,7 +412,7 @@ static MACHINE_CONFIG_START( d6800, d6800_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("d6800_c", d6800_state, d6800_c, attotime::from_hz(4800))
MCFG_TIMER_DRIVER_ADD_PERIODIC("d6800_p", d6800_state, d6800_p, attotime::from_hz(40000))
diff --git a/src/mess/drivers/dragon.c b/src/mess/drivers/dragon.c
index 0677aa6ec3f..314b6e82556 100644
--- a/src/mess/drivers/dragon.c
+++ b/src/mess/drivers/dragon.c
@@ -159,7 +159,7 @@ static MACHINE_CONFIG_START( dragon_base, dragon_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(coco_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_DEVICE_ADD(PRINTER_TAG, PRINTER, 0)
// video hardware
diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c
index c7bfa8c20a6..b02be808ab0 100644
--- a/src/mess/drivers/einstein.c
+++ b/src/mess/drivers/einstein.c
@@ -717,7 +717,7 @@ static MACHINE_CONFIG_START( einstein, einstein_state )
/* video hardware */
MCFG_DEVICE_ADD( "tms9929a", TMS9929A, XTAL_10_738635MHz / 2 )
- MCFG_TMS9928A_VRAM_SIZE(0x4000) /* 16k RAM, provided by IC i040 and i041 */
+ MCFG_TMS9928A_VRAM_SIZE(0x4000) /* 16k RAM, provided by IC i040 and i041 */
MCFG_TMS9928A_SET_SCREEN( "screen" )
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9929a", tms9929a_device, screen_update )
diff --git a/src/mess/drivers/ep64.c b/src/mess/drivers/ep64.c
index 69c21ba7643..9529aca36c3 100644
--- a/src/mess/drivers/ep64.c
+++ b/src/mess/drivers/ep64.c
@@ -528,7 +528,7 @@ static MACHINE_CONFIG_START( ep64, ep64_state )
MCFG_CASSETTE_ADD(CASSETTE1_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
MCFG_CASSETTE_INTERFACE("ep64_cass")
-
+
MCFG_CASSETTE_ADD(CASSETTE2_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
MCFG_CASSETTE_INTERFACE("ep64_cass")
diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c
index 785ca56d479..207fbbbbacb 100644
--- a/src/mess/drivers/esq5505.c
+++ b/src/mess/drivers/esq5505.c
@@ -659,7 +659,7 @@ static MACHINE_CONFIG_DERIVED(eps, vfx)
MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats)
MCFG_DEVICE_ADD("mc68450", HD63450, 0) // MC68450 compatible
- MCFG_HD63450_CPU("maincpu") // CPU - 68000
+ MCFG_HD63450_CPU("maincpu") // CPU - 68000
MCFG_HD63450_CLOCKS(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_usec(4), attotime::from_hz(15625/2))
MCFG_HD63450_BURST_CLOCKS(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50))
MCFG_HD63450_DMA_END_CB(WRITE8(esq5505_state, dma_end))
diff --git a/src/mess/drivers/exelv.c b/src/mess/drivers/exelv.c
index 6761c49804f..ce6cb16c7d8 100644
--- a/src/mess/drivers/exelv.c
+++ b/src/mess/drivers/exelv.c
@@ -99,9 +99,9 @@ public:
UINT8 m_wx319; /* data of 74sl374 labeled wx319 */
DECLARE_PALETTE_INIT(exelv);
TIMER_DEVICE_CALLBACK_MEMBER(exelv_hblank_interrupt);
-
+
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( exelvision_cartridge );
-
+
};
@@ -223,7 +223,7 @@ static DEVICE_IMAGE_UNLOAD( exelv_cart )
READ8_MEMBER(exelv_state::mailbox_wx319_r)
{
- logerror("[TMS7220] reading mailbox %d\n", m_wx319);
+ logerror("[TMS7220] reading mailbox %d\n", m_wx319);
return m_wx319;
}
@@ -285,23 +285,23 @@ WRITE8_MEMBER(exelv_state::tms7020_portb_w)
READ8_MEMBER(exelv_state::tms7041_porta_r)
{
UINT8 data = 0x00;
- static UINT8 data_last=0;
+ static UINT8 data_last=0;
- // TMS5220 OK
+ // TMS5220 OK
data |= m_tms5220c->intq_r() ? 0x08 : 0x00; // A3
data |= m_tms5220c->readyq_r() ? 0x80 : 0x00; // A7
- // TMS7220
+ // TMS7220
data |= (m_tms7020_portb & 0x01 ) ? 0x04 : 0x00; // A2
data |= (m_tms7020_portb & 0x02) ? 0x10 : 0x00; // A4
-
+
// SERIAL PORT
- if (data!=data_last) {
- logerror("tms7041_porta_r %x\n",data);
- }
- data_last=data;
-
+ if (data!=data_last) {
+ logerror("tms7041_porta_r %x\n",data);
+ }
+ data_last=data;
+
return data;
}
@@ -324,7 +324,7 @@ WRITE8_MEMBER(exelv_state::tms7041_portb_w)
m_tms5220c->wsq_w((data & 0x01) ? 1 : 0);
m_tms5220c->rsq_w((data & 0x02) ? 1 : 0);
- logerror("TMS7020 %s int1\n",((data & 0x04) ? "clear" : "assert"));
+ logerror("TMS7020 %s int1\n",((data & 0x04) ? "clear" : "assert"));
m_maincpu->set_input_line(TMS7000_INT1_LINE, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
/* Check for low->high transition on B6 */
@@ -375,7 +375,7 @@ WRITE8_MEMBER(exelv_state::tms7041_portc_w)
READ8_MEMBER(exelv_state::tms7041_portd_r)
{
UINT8 data = 0xff;
- data=m_tms5220c->status_r(space, 0, data);
+ data=m_tms5220c->status_r(space, 0, data);
logerror("tms7041_portd_r\n");
return data;
}
@@ -416,11 +416,11 @@ WRITE8_MEMBER(exelv_state::tms7041_portd_w)
static ADDRESS_MAP_START(tms7020_mem, AS_PROGRAM, 8, exelv_state)
AM_RANGE(0x0080, 0x00ff) AM_NOP
- AM_RANGE(0x0124, 0x0124) AM_DEVREAD("tms3556", tms3556_device, vram_r)
- AM_RANGE(0x0125, 0x0125) AM_DEVREAD("tms3556", tms3556_device, reg_r)
- AM_RANGE(0x0128, 0x0128) AM_DEVREAD("tms3556", tms3556_device, initptr_r)
- AM_RANGE(0x012d, 0x012d) AM_DEVWRITE("tms3556", tms3556_device, reg_w)
- AM_RANGE(0x012e, 0x012e) AM_DEVWRITE("tms3556", tms3556_device, vram_w)
+ AM_RANGE(0x0124, 0x0124) AM_DEVREAD("tms3556", tms3556_device, vram_r)
+ AM_RANGE(0x0125, 0x0125) AM_DEVREAD("tms3556", tms3556_device, reg_r)
+ AM_RANGE(0x0128, 0x0128) AM_DEVREAD("tms3556", tms3556_device, initptr_r)
+ AM_RANGE(0x012d, 0x012d) AM_DEVWRITE("tms3556", tms3556_device, reg_w)
+ AM_RANGE(0x012e, 0x012e) AM_DEVWRITE("tms3556", tms3556_device, vram_w)
AM_RANGE(0x0130, 0x0130) AM_READWRITE(mailbox_wx319_r, mailbox_wx318_w)
AM_RANGE(0x0200, 0x7fff) AM_ROMBANK("bank1") /* system ROM */
@@ -444,11 +444,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(tms7040_mem, AS_PROGRAM, 8, exelv_state)
AM_RANGE(0x0080, 0x00ff) AM_NOP
- AM_RANGE(0x0124, 0x0124) AM_DEVREAD("tms3556", tms3556_device, vram_r)
- AM_RANGE(0x0125, 0x0125) AM_DEVREAD("tms3556", tms3556_device, reg_r)
- AM_RANGE(0x0128, 0x0128) AM_DEVREAD("tms3556", tms3556_device, initptr_r)
- AM_RANGE(0x012d, 0x012d) AM_DEVWRITE("tms3556", tms3556_device, reg_w)
- AM_RANGE(0x012e, 0x012e) AM_DEVWRITE("tms3556", tms3556_device, vram_w)
+ AM_RANGE(0x0124, 0x0124) AM_DEVREAD("tms3556", tms3556_device, vram_r)
+ AM_RANGE(0x0125, 0x0125) AM_DEVREAD("tms3556", tms3556_device, reg_r)
+ AM_RANGE(0x0128, 0x0128) AM_DEVREAD("tms3556", tms3556_device, initptr_r)
+ AM_RANGE(0x012d, 0x012d) AM_DEVWRITE("tms3556", tms3556_device, reg_w)
+ AM_RANGE(0x012e, 0x012e) AM_DEVWRITE("tms3556", tms3556_device, vram_w)
AM_RANGE(0x0130, 0x0130) AM_READWRITE(mailbox_wx319_r, mailbox_wx318_w)
AM_RANGE(0x0200, 0x7fff) AM_ROMBANK("bank1") /* system ROM */
AM_RANGE(0x8000, 0xbfff) AM_NOP
@@ -537,7 +537,7 @@ static MACHINE_CONFIG_START( exl100, exelv_state )
MCFG_SOUND_ADD("tms5220c", TMS5220C, 640000)
// MCFG_TMS52XX_SPEECHROM("vsm")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
-
+
/* cartridge */
MCFG_CARTSLOT_ADD("cart")
MCFG_CARTSLOT_EXTENSION_LIST("bin,rom")
@@ -600,7 +600,7 @@ ROM_START(exl100)
ROM_REGION(0x10000, "tms7041", 0)
ROM_LOAD("exl100_7041.bin", 0xf000, 0x1000, CRC(38f6fc7a) SHA1(b71d545664a974d8ad39bdf600c5b9884c3efab6)) /* TMS7041 internal ROM, correct */
-// ROM_REGION(0x8000, "vsm", 0)
+// ROM_REGION(0x8000, "vsm", 0)
ROM_REGION(0x10000, "user1", ROMREGION_ERASEFF) /* cartridge area */
ROM_END
@@ -627,4 +627,3 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
COMP(1984, exl100, 0, 0, exl100, exelv, driver_device, 0, "Exelvision", "EXL 100", GAME_NOT_WORKING)
COMP(1986, exeltel, exl100, 0, exeltel, exelv, driver_device, 0, "Exelvision", "Exeltel", GAME_NOT_WORKING)
-
diff --git a/src/mess/drivers/fanucspmg.c b/src/mess/drivers/fanucspmg.c
index 8afa6384f8a..0053eee666a 100644
--- a/src/mess/drivers/fanucspmg.c
+++ b/src/mess/drivers/fanucspmg.c
@@ -456,14 +456,14 @@ The arrows denote direction of data flow.
| /-->| Graphic memory|------| |
| | |---------------| | | |----------------|
| | | |--------| |<--->|RS232C interface|---CN2
- | | | | BOOT |<-------->| |----------------|
+ | | | | BOOT |<-------->| |----------------|
| | | | EPROM | |
| | |----------------| | |--------| | |----------------|
|<-----|-->|Character memory|--| | |<--->|RS232C interface|---CN3
| |-->|----------------| | | |--------| | |----------------|
| | | | |Main RAM|<-------->|
| | | | |--------| | |----------------|
- | | | | |<--->|RS232C interface|---CN4
+ | | | | |<--->|RS232C interface|---CN4
| | | | | |----------------|
|---------| | | \/ \/ |
|Keyboard | \/ \---|---------------------------| | |-----------------| CN9 |--------|
@@ -485,15 +485,15 @@ The arrows denote direction of data flow.
- Shared RAM is 8k, but there are 2 6264s on the sub board. Is shared RAM
banked?
- To boot a floppy put "bp fc5fa,1,{ip=c682;g}" and "bp fc6d7,1,{ip=c755;g}"
- into the debugger.
+ To boot a floppy put "bp fc5fa,1,{ip=c682;g}" and "bp fc6d7,1,{ip=c755;g}"
+ into the debugger.
- At NMI: f8008 must have bit 7 clear and bit 6 set (e008 on 8085)
- f8009 must not equal 0x01 (e009 on 8085)
+ At NMI: f8008 must have bit 7 clear and bit 6 set (e008 on 8085)
+ f8009 must not equal 0x01 (e009 on 8085)
+
+ 8085 sets f8008 to keyboard row 0 AND 0xf3
+ " " f8009 to keyboard row 1
- 8085 sets f8008 to keyboard row 0 AND 0xf3
- " " f8009 to keyboard row 1
-
****************************************************************************/
#include "emu.h"
@@ -671,14 +671,14 @@ WRITE8_MEMBER(fanucspmg_state::dma_page_w)
READ16_MEMBER(fanucspmg_state::magic_r)
{
- return 0x0041; // 31 = memory error
+ return 0x0041; // 31 = memory error
}
static ADDRESS_MAP_START(maincpu_mem, AS_PROGRAM, 16, fanucspmg_state)
AM_RANGE(0x00000, 0x7ffff) AM_RAM // main RAM
- AM_RANGE(0x80000, 0x81fff) AM_RAM // believed to be shared RAM with a CPU inside the Program File
- AM_RANGE(0x88000, 0x88001) AM_NOP // Program File "ready" bit
+ AM_RANGE(0x80000, 0x81fff) AM_RAM // believed to be shared RAM with a CPU inside the Program File
+ AM_RANGE(0x88000, 0x88001) AM_NOP // Program File "ready" bit
AM_RANGE(0xf0000, 0xf0003) AM_DEVREADWRITE8(PIC0_TAG, pic8259_device, read, write, 0x00ff)
AM_RANGE(0xf0004, 0xf0007) AM_DEVICE8(FDC_TAG, upd765a_device, map, 0x00ff)
@@ -831,7 +831,7 @@ MC6845_UPDATE_ROW( fanucspmg_state::crtc_update_row )
if (m_video_ctrl & 0x02)
{
if (offset <= 0x5ff)
- {
+ {
UINT8 chr = m_vram[offset + 0x600];
UINT8 attr = m_vram[offset];
UINT8 data = chargen[ chr + (ra * 256) ];
@@ -879,9 +879,9 @@ MC6845_UPDATE_ROW( fanucspmg_state::crtc_update_row_mono )
if (m_video_ctrl & 0x02)
{
if (offset <= 0x5ff)
- {
+ {
UINT8 chr = m_vram[offset + 0x600];
-// UINT8 attr = m_vram[offset];
+// UINT8 attr = m_vram[offset];
UINT8 data = chargen[ chr + (ra * 256) ];
UINT32 fg = 0xff00;
UINT32 bg = 0;
@@ -995,14 +995,14 @@ ROM_END
ROM_START( fanucspgm )
ROM_REGION(0x4000, MAINCPU_TAG, 0)
- ROM_LOAD16_BYTE( "a25_001a.33e", 0x000000, 0x002000, CRC(81159267) SHA1(f5d53cc6e929f57e8c3747f80fc74d4b1643222d) )
- ROM_LOAD16_BYTE( "a25_002a.35e", 0x000001, 0x002000, CRC(4fb82c4d) SHA1(eb75e9a2d3c8e4ad56a74624ee8c52c785bd0da6) )
+ ROM_LOAD16_BYTE( "a25_001a.33e", 0x000000, 0x002000, CRC(81159267) SHA1(f5d53cc6e929f57e8c3747f80fc74d4b1643222d) )
+ ROM_LOAD16_BYTE( "a25_002a.35e", 0x000001, 0x002000, CRC(4fb82c4d) SHA1(eb75e9a2d3c8e4ad56a74624ee8c52c785bd0da6) )
ROM_REGION(0x4000, SUBCPU_TAG, 0)
- ROM_LOAD( "a21_010f.17d", 0x000000, 0x002000, CRC(ef192717) SHA1(7fb3f7ca290d2437ae5956700f88c801018ce1cc) )
+ ROM_LOAD( "a21_010f.17d", 0x000000, 0x002000, CRC(ef192717) SHA1(7fb3f7ca290d2437ae5956700f88c801018ce1cc) )
ROM_REGION(0x8000, CHARGEN_TAG, 0)
- ROM_LOAD( "a22_020b.5g", 0x000000, 0x002000, CRC(7b5f8e20) SHA1(9de607e541d8aad2d1ea56321270bb8466b16e3d) )
+ ROM_LOAD( "a22_020b.5g", 0x000000, 0x002000, CRC(7b5f8e20) SHA1(9de607e541d8aad2d1ea56321270bb8466b16e3d) )
ROM_END
/* Driver */
diff --git a/src/mess/drivers/fb01.c b/src/mess/drivers/fb01.c
index ac0a8b2953b..155b4f53a20 100644
--- a/src/mess/drivers/fb01.c
+++ b/src/mess/drivers/fb01.c
@@ -65,7 +65,7 @@ static ADDRESS_MAP_START(fb01_io, AS_IO, 8, fb01_state)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("ym2164", ym2151_device, register_w)
AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("ym2164", ym2151_device, status_r, data_w)
- // 10-11 USART uPD71051C 4MHz & 4MHz / 8
+ // 10-11 USART uPD71051C 4MHz & 4MHz / 8
AM_RANGE(0x10, 0x10) AM_DEVREADWRITE("upd71051", i8251_device, data_r, data_w)
AM_RANGE(0x11, 0x11) AM_DEVREADWRITE("upd71051", i8251_device, status_r, control_w)
@@ -224,4 +224,3 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
CONS( 1986, fb01, 0, 0, fb01, fb01, driver_device, 0, "Yamaha", "FB-01", GAME_SUPPORTS_SAVE )
-
diff --git a/src/mess/drivers/fc100.c b/src/mess/drivers/fc100.c
index ad9211fba1d..6bb650da543 100644
--- a/src/mess/drivers/fc100.c
+++ b/src/mess/drivers/fc100.c
@@ -535,7 +535,7 @@ static MACHINE_CONFIG_START( fc100, fc100_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(fc100_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
-
+
MCFG_DEVICE_ADD("uart", I8251, 0)
MCFG_I8251_TXD_HANDLER(WRITELINE(fc100_state, txdata_callback))
MCFG_DEVICE_ADD("uart_clock", CLOCK, XTAL_4_9152MHz/16/16) // gives 19200
diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c
index fcc1e8e2de7..849d172301b 100644
--- a/src/mess/drivers/fmtowns.c
+++ b/src/mess/drivers/fmtowns.c
@@ -2749,7 +2749,7 @@ static MACHINE_CONFIG_FRAGMENT( towns_base )
MCFG_UPD71071_DMA_READ_1_CB(READ16(towns_state, towns_scsi_dma_r))
MCFG_UPD71071_DMA_READ_3_CB(READ16(towns_state, towns_cdrom_dma_r))
MCFG_UPD71071_DMA_WRITE_0_CB(WRITE16(towns_state, towns_fdc_dma_w))
- MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(towns_state, towns_scsi_dma_w))
+ MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(towns_state, towns_scsi_dma_w))
MCFG_DEVICE_ADD("dma_2", UPD71071, 0)
MCFG_UPD71071_CPU("maincpu")
MCFG_UPD71071_CLOCK(4000000)
@@ -2757,7 +2757,7 @@ static MACHINE_CONFIG_FRAGMENT( towns_base )
MCFG_UPD71071_DMA_READ_1_CB(READ16(towns_state, towns_scsi_dma_r))
MCFG_UPD71071_DMA_READ_3_CB(READ16(towns_state, towns_cdrom_dma_r))
MCFG_UPD71071_DMA_WRITE_0_CB(WRITE16(towns_state, towns_fdc_dma_w))
- MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(towns_state, towns_scsi_dma_w))
+ MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(towns_state, towns_scsi_dma_w))
//MCFG_VIDEO_START_OVERRIDE(towns_state,towns)
diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c
index 39275471f9e..a75fc49eec4 100644
--- a/src/mess/drivers/fp1100.c
+++ b/src/mess/drivers/fp1100.c
@@ -192,16 +192,16 @@ WRITE8_MEMBER( fp1100_state::irq_mask_w )
WRITE8_MEMBER( fp1100_state::main_to_sub_w )
{
-// machine().scheduler().synchronize(); // force resync
-// m_subcpu->set_input_line(UPD7810_INTF2, ASSERT_LINE);
+// machine().scheduler().synchronize(); // force resync
+// m_subcpu->set_input_line(UPD7810_INTF2, ASSERT_LINE);
m_sub_latch = data;
- if (LOG) printf("%s: From main:%X\n",machine().describe_context(),data);
+ if (LOG) printf("%s: From main:%X\n",machine().describe_context(),data);
}
READ8_MEMBER( fp1100_state::sub_to_main_r )
{
-// machine().scheduler().synchronize(); // force resync
-// m_maincpu->set_input_line(0, CLEAR_LINE);
+// machine().scheduler().synchronize(); // force resync
+// m_maincpu->set_input_line(0, CLEAR_LINE);
if (LOG) printf("%s: To main:%X\n",machine().describe_context(),m_main_latch);
return m_main_latch;
}
@@ -235,16 +235,16 @@ ADDRESS_MAP_END
READ8_MEMBER( fp1100_state::main_to_sub_r )
{
-// machine().scheduler().synchronize(); // force resync
-// m_subcpu->set_input_line(UPD7810_INTF2, CLEAR_LINE);
+// machine().scheduler().synchronize(); // force resync
+// m_subcpu->set_input_line(UPD7810_INTF2, CLEAR_LINE);
if (LOG) printf("%s: To sub:%X\n",machine().describe_context(),m_sub_latch);
return m_sub_latch;
}
WRITE8_MEMBER( fp1100_state::sub_to_main_w )
{
-// machine().scheduler().synchronize(); // force resync
-// m_maincpu->set_input_line_and_vector(0, ASSERT_LINE, 0xf0);
+// machine().scheduler().synchronize(); // force resync
+// m_maincpu->set_input_line_and_vector(0, ASSERT_LINE, 0xf0);
m_main_latch = data;
if (LOG) printf("%s: From sub:%X\n",machine().describe_context(),data);
}
@@ -594,8 +594,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( fp1100_state::timer_c )
INTERRUPT_GEN_MEMBER(fp1100_state::fp1100_vblank_irq)
{
-// if BIT(m_irq_mask, 4)
-// m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xf8);
+// if BIT(m_irq_mask, 4)
+// m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xf8);
}
MACHINE_RESET_MEMBER( fp1100_state, fp1100 )
diff --git a/src/mess/drivers/galaxy.c b/src/mess/drivers/galaxy.c
index c6f6c168a35..42553a765cf 100644
--- a/src/mess/drivers/galaxy.c
+++ b/src/mess/drivers/galaxy.c
@@ -171,7 +171,7 @@ static MACHINE_CONFIG_START( galaxy, galaxy_state )
MCFG_CPU_PROGRAM_MAP(galaxy_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
-
+
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_PALETTE("palette")
@@ -198,7 +198,7 @@ static MACHINE_CONFIG_START( galaxy, galaxy_state )
MCFG_CASSETTE_FORMATS(gtp_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("galaxy_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","galaxy")
/* internal ram */
@@ -214,7 +214,7 @@ static MACHINE_CONFIG_START( galaxyp, galaxy_state )
MCFG_CPU_IO_MAP(galaxyp_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
-
+
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_PALETTE("palette")
@@ -242,7 +242,7 @@ static MACHINE_CONFIG_START( galaxyp, galaxy_state )
MCFG_CASSETTE_FORMATS(gtp_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("galaxy_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","galaxy")
/* internal ram */
diff --git a/src/mess/drivers/gimix.c b/src/mess/drivers/gimix.c
index 4a7b51a653d..6a7f21c434f 100644
--- a/src/mess/drivers/gimix.c
+++ b/src/mess/drivers/gimix.c
@@ -434,13 +434,13 @@ WRITE_LINE_MEMBER(gimix_state::fdc_drq_w)
{
// write to disk
m_fdc->data_w(m_ram->read(m_dma_current_addr));
-// logerror("DMA: read from RAM %05x\n",m_dma_current_addr);
+// logerror("DMA: read from RAM %05x\n",m_dma_current_addr);
}
else
{
// read from disk
m_ram->write(m_dma_current_addr,m_fdc->data_r());
-// logerror("DMA: write to RAM %05x\n",m_dma_current_addr);
+// logerror("DMA: write to RAM %05x\n",m_dma_current_addr);
}
m_dma_current_addr++;
}
@@ -621,15 +621,15 @@ ROM_START( gimix )
/* CPU board U4: gimixf8.bin - checksum 68DB - 2716 - GMXBUG09 V2.1 | (c)1981 GIMIX | $F800 I2716 */
ROM_LOAD( "gimixf8.u4", 0x000000, 0x000800, CRC(7d60f838) SHA1(eb7546e8bbf50d33e181f3e86c3e4c5c9032cab2) )
/* CPU board U5: gimixv14.bin - checksum 97E2 - 2716 - GIMIX 6809 | AUTOBOOT | V1.4 I2716 */
- ROM_LOAD( "gimixv14.u5", 0x000800, 0x000800, CRC(f795b8b9) SHA1(eda2de51cc298d94b36605437d900ce971b3b276) )
+ ROM_LOAD( "gimixv14.u5", 0x000800, 0x000800, CRC(f795b8b9) SHA1(eda2de51cc298d94b36605437d900ce971b3b276) )
/* CPU board U6: os9l1v11.bin - checksum 2C84 - 2716 - OS-9tmL1 V1 | GIMIX P1 " (c)1982 MSC
CPU board U7: os9l1v12.bin - checksum 7694 - 2716 - OS-9tmL1 V1 | GIMIX P2-68 | (c)1982 MSC */
- ROM_LOAD( "os9l1v11.u6", 0x001000, 0x000800, CRC(0d6527a0) SHA1(1435a22581c6e9e0ae338071a72eed646f429530) )
- ROM_LOAD( "os9l1v12.u7", 0x001800, 0x000800, CRC(b3c65feb) SHA1(19d1ea1e84473b25c95cbb8449e6b9828567e998) )
+ ROM_LOAD( "os9l1v11.u6", 0x001000, 0x000800, CRC(0d6527a0) SHA1(1435a22581c6e9e0ae338071a72eed646f429530) )
+ ROM_LOAD( "os9l1v12.u7", 0x001800, 0x000800, CRC(b3c65feb) SHA1(19d1ea1e84473b25c95cbb8449e6b9828567e998) )
/* Hard drive controller board 2 (XEBEC board) 11H: gimixhd.bin - checksum 2436 - 2732 - 104521D */
- ROM_REGION( 0x10000, "xebec", 0)
- ROM_LOAD( "gimixhd.h11", 0x000000, 0x001000, CRC(35c12201) SHA1(51ac9052f9757d79c7f5bd3aa5d8421e98cfcc37) )
+ ROM_REGION( 0x10000, "xebec", 0)
+ ROM_LOAD( "gimixhd.h11", 0x000000, 0x001000, CRC(35c12201) SHA1(51ac9052f9757d79c7f5bd3aa5d8421e98cfcc37) )
ROM_END
COMP( 1980, gimix, 0, 0, gimix, gimix, driver_device, 0, "Gimix", "Gimix 6809 System", GAME_IS_SKELETON | GAME_NOT_WORKING | GAME_NO_SOUND )
diff --git a/src/mess/drivers/hprot1.c b/src/mess/drivers/hprot1.c
index 6eacb2b4a2b..a51d9dc5e38 100644
--- a/src/mess/drivers/hprot1.c
+++ b/src/mess/drivers/hprot1.c
@@ -15,7 +15,7 @@
* new derivative "CARD II PCB rev.6"
* fixed LCD rendering (now both lines are displayed properly)
* inverted logic of the inputs so that now we can navigate the menu
-
+
2014 JAN 03 [Felipe Sanches]:
* Initial driver skeleton
* Address lines bitswaping
@@ -126,7 +126,7 @@ static ADDRESS_MAP_START(i80c31_io, AS_IO, 8, hprot1_state)
AM_RANGE(0xc020,0xc020) AM_MIRROR(0x13cf) AM_DEVREAD("hd44780", hd44780_device, control_read)
AM_RANGE(0xc030,0xc030) AM_MIRROR(0x13cf) AM_DEVREAD("hd44780", hd44780_device, data_read)
/*TODO: attach the watchdog/brownout reset device:
- AM_RANGE(0xe000,0xe0??) AM_MIRROR(?) AM_DEVREAD("adm965an", adm965an_device, data_read) */
+ AM_RANGE(0xe000,0xe0??) AM_MIRROR(?) AM_DEVREAD("adm965an", adm965an_device, data_read) */
//AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(henry_io_r, henry_io_w)
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READ(henry_io_r)
@@ -147,24 +147,24 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hprot_jumpers )
/*
-There is a set of 3 jumpers that switch the communications circuitry between a
+There is a set of 3 jumpers that switch the communications circuitry between a
RS232 chip (U8: MAX232AN) and a differential bus transceiver (U7: SN65176BP)
-It seems that all three jumpers must select the same configuration:
+It seems that all three jumpers must select the same configuration:
eighter differential bus or RS232.
And I don't see yet how this could affect the emulation of the device, so, for now, I'll
simply leave this note here but not actually include this details in the driver code.
- PORT_START("jumpers")
- PORT_DIPNAME( 0x01, 0x01, "TX")
- PORT_DIPSETTING( 0x01, "differential bus")
- PORT_DIPSETTING( 0x00, "RS232")
- PORT_DIPNAME( 0x02, 0x02, "RX")
- PORT_DIPSETTING( 0x02, "differential bus")
- PORT_DIPSETTING( 0x00, "RS232")
- PORT_DIPNAME( 0x04, 0x04, "CPU-TX")
- PORT_DIPSETTING( 0x04, "differential bus")
- PORT_DIPSETTING( 0x00, "RS232")
+ PORT_START("jumpers")
+ PORT_DIPNAME( 0x01, 0x01, "TX")
+ PORT_DIPSETTING( 0x01, "differential bus")
+ PORT_DIPSETTING( 0x00, "RS232")
+ PORT_DIPNAME( 0x02, 0x02, "RX")
+ PORT_DIPSETTING( 0x02, "differential bus")
+ PORT_DIPSETTING( 0x00, "RS232")
+ PORT_DIPNAME( 0x04, 0x04, "CPU-TX")
+ PORT_DIPSETTING( 0x04, "differential bus")
+ PORT_DIPSETTING( 0x00, "RS232")
*/
INPUT_PORTS_END
@@ -337,7 +337,7 @@ static MACHINE_CONFIG_DERIVED( hprotr8a, hprot1 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* TODO: add an RS232 interface (emulate MAX232N chip)
- (the board has GND/VCC/RX/TX pins available in a connector) */
+ (the board has GND/VCC/RX/TX pins available in a connector) */
/* TODO: add an I2C interface (the board has GND/VCC/SDA/SCL pins available in a connector) */
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/interact.c b/src/mess/drivers/interact.c
index 57fc76a70df..6db268795e8 100644
--- a/src/mess/drivers/interact.c
+++ b/src/mess/drivers/interact.c
@@ -160,7 +160,7 @@ static MACHINE_CONFIG_START( interact, interact_state )
MCFG_CASSETTE_FORMATS(hector_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MASK_SPEAKER)
MCFG_CASSETTE_INTERFACE("interact_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","interact")
/* printer */
diff --git a/src/mess/drivers/iq151.c b/src/mess/drivers/iq151.c
index 09e22589fd4..f6acd08bdd4 100644
--- a/src/mess/drivers/iq151.c
+++ b/src/mess/drivers/iq151.c
@@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( iq151, iq151_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
MCFG_CASSETTE_INTERFACE("iq151_cass")
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("cassette_timer", iq151_state, cassette_timer, attotime::from_hz(2000))
/* cartridge */
diff --git a/src/mess/drivers/isbc.c b/src/mess/drivers/isbc.c
index 91821010745..64d6c57c5a7 100644
--- a/src/mess/drivers/isbc.c
+++ b/src/mess/drivers/isbc.c
@@ -199,7 +199,7 @@ static MACHINE_CONFIG_START( isbc86, isbc_state )
MCFG_CPU_PROGRAM_MAP(isbc86_mem)
MCFG_CPU_IO_MAP(isbc_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
-
+
MCFG_PIC8259_ADD("pic_0", INPUTLINE(":maincpu", 0), VCC, NULL)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
@@ -231,7 +231,7 @@ static MACHINE_CONFIG_START( rpc86, isbc_state )
MCFG_CPU_PROGRAM_MAP(rpc86_mem)
MCFG_CPU_IO_MAP(rpc86_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
-
+
MCFG_PIC8259_ADD("pic_0", INPUTLINE(":maincpu", 0), VCC, NULL)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
@@ -266,7 +266,7 @@ static MACHINE_CONFIG_START( isbc286, isbc_state )
MCFG_CPU_PROGRAM_MAP(isbc286_mem)
MCFG_CPU_IO_MAP(isbc286_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
-
+
MCFG_PIC8259_ADD("pic_0", INPUTLINE(":maincpu", 0), VCC, READ8(isbc_state, get_slave_ack))
MCFG_PIC8259_ADD("pic_1", DEVWRITELINE("pic_0", pic8259_device, ir7_w), GND, NULL)
diff --git a/src/mess/drivers/kim1.c b/src/mess/drivers/kim1.c
index de24b86d026..97ea902bdcd 100644
--- a/src/mess/drivers/kim1.c
+++ b/src/mess/drivers/kim1.c
@@ -340,7 +340,7 @@ static MACHINE_CONFIG_START( kim1, kim1_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(kim1_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("led_timer", kim1_state, kim1_update_leds, attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("cassette_timer", kim1_state, kim1_cassette_input, attotime::from_hz(44100))
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/lviv.c b/src/mess/drivers/lviv.c
index b1368f650f9..1d46246facc 100644
--- a/src/mess/drivers/lviv.c
+++ b/src/mess/drivers/lviv.c
@@ -466,7 +466,7 @@ static MACHINE_CONFIG_START( lviv, lviv_state )
MCFG_CASSETTE_FORMATS(lviv_lvt_format)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("lviv_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","lviv")
/* internal ram */
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index c694bd8a7df..9cadd4d57cb 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -2192,8 +2192,8 @@ INPUT_PORTS_END
/*
ROM_START( mactw )
- ROM_REGION16_BE(0x20000, "bootrom", 0)
- ROM_LOAD( "rom4.3t_07-04-83.bin", 0x0000, 0x10000, CRC(d2c42f18) SHA1(f868c09ca70383a69751c37a5a3110a9597462a4) )
+ ROM_REGION16_BE(0x20000, "bootrom", 0)
+ ROM_LOAD( "rom4.3t_07-04-83.bin", 0x0000, 0x10000, CRC(d2c42f18) SHA1(f868c09ca70383a69751c37a5a3110a9597462a4) )
ROM_END
*/
diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c
index 95550612393..83799f85b06 100644
--- a/src/mess/drivers/mbc200.c
+++ b/src/mess/drivers/mbc200.c
@@ -140,13 +140,13 @@ INPUT_PORTS_END
void mbc200_state::machine_start()
{
-// floppy_image_device *floppy = NULL;
-// floppy = m_floppy0->get_device();
+// floppy_image_device *floppy = NULL;
+// floppy = m_floppy0->get_device();
// floppy1 not supported currently
-// m_fdc->set_floppy(floppy);
+// m_fdc->set_floppy(floppy);
-// if (floppy)
-// floppy->mon_w(0);
+// if (floppy)
+// floppy->mon_w(0);
m_floppy0->floppy_mon_w(0);
m_floppy1->floppy_mon_w(0);
@@ -169,7 +169,7 @@ static const floppy_interface mbc200_floppy_interface =
};
//static SLOT_INTERFACE_START( mbc200_floppies )
-// SLOT_INTERFACE( "525dd", FLOPPY_525_SSDD )
+// SLOT_INTERFACE( "525dd", FLOPPY_525_SSDD )
//SLOT_INTERFACE_END
MC6845_UPDATE_ROW( mbc200_state::update_row )
diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c
index bf713df5aca..406b4f42e73 100644
--- a/src/mess/drivers/mbee.c
+++ b/src/mess/drivers/mbee.c
@@ -705,7 +705,7 @@ static MACHINE_CONFIG_START( mbee, mbee_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(mbee_cassette_formats)
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
+ MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MACHINE_CONFIG_END
@@ -763,7 +763,7 @@ static MACHINE_CONFIG_START( mbeeic, mbee_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(mbee_cassette_formats)
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
+ MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mbeepc, mbeeic )
diff --git a/src/mess/drivers/mc1000.c b/src/mess/drivers/mc1000.c
index 0dd3fcdd0f5..665935c669d 100644
--- a/src/mess/drivers/mc1000.c
+++ b/src/mess/drivers/mc1000.c
@@ -449,7 +449,7 @@ static MACHINE_CONFIG_START( mc1000, mc1000_state )
/* devices */
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
-
+
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(mc1000_state, write_centronics_busy))
diff --git a/src/mess/drivers/mikro80.c b/src/mess/drivers/mikro80.c
index 0b5ab473f50..3229e091987 100644
--- a/src/mess/drivers/mikro80.c
+++ b/src/mess/drivers/mikro80.c
@@ -186,7 +186,7 @@ static MACHINE_CONFIG_START( mikro80, mikro80_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(rk8_cassette_formats)
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
+ MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( radio99, mikro80 )
diff --git a/src/mess/drivers/mikrosha.c b/src/mess/drivers/mikrosha.c
index ab8bb394308..7e565963cf6 100644
--- a/src/mess/drivers/mikrosha.c
+++ b/src/mess/drivers/mikrosha.c
@@ -237,7 +237,7 @@ static MACHINE_CONFIG_START( mikrosha, mikrosha_state )
MCFG_CASSETTE_FORMATS(rkm_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("mikrosha_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","mikrosha")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/minicom.c b/src/mess/drivers/minicom.c
index 84da9b0a354..6d93e5a8182 100644
--- a/src/mess/drivers/minicom.c
+++ b/src/mess/drivers/minicom.c
@@ -2,8 +2,8 @@
// copyright-holders: Felipe Sanches
/***************************************************************************
- Ultratec Minicom IV
- http://www.ultratec.com/ttys/non-printing/minicom.php
+ Ultratec Minicom IV
+ http://www.ultratec.com/ttys/non-printing/minicom.php
Driver by Felipe Sanches
@@ -26,7 +26,7 @@ Segment data is sent to each 14seg digit by first writing half of the data to po
toggling T0 and then the other half of data is written to P0 again but toggling T1 afterwards.
Changelog:
-
+
2014 JUL 19 [Felipe Sanches]:
* Got the display working except for a few glitches
@@ -71,7 +71,7 @@ void minicom_state::machine_start()
memset(m_p, 0, 4);
m_digit_index = 0;
m_display_data = 0;
-
+
// register for savestates
save_item(NAME(m_p));
save_item(NAME(m_digit_index));
@@ -89,15 +89,15 @@ void minicom_state::machine_reset()
READ8_MEMBER(minicom_state::minicom_io_r)
{
- switch (offset)
- {
+ switch (offset)
+ {
case 1:
//P1.3 seems to be an indicator of whether or not we have a printer device attached.
// at address 0xABF the code checks this flag in order to decide which string to display:
// "MINIPRINT IS RESET" or "MINICOM IS RESET"
return PRINTER_ATTACHED << 3;
- case 2:
-// return 0; //para a palestra no Garoa... :-)
+ case 2:
+// return 0; //para a palestra no Garoa... :-)
return 1; //to skip the "NO POWER" warning. I'm not sure why.
default:
#if LOG_IO_PORTS
@@ -122,22 +122,22 @@ static void printbits(UINT8 v) {
#define P3_UNKNOWN_BITS (0xFF & ~((1 << 4)|(1 << 5)))
WRITE8_MEMBER(minicom_state::minicom_io_w)
{
- switch (offset)
- {
- case 0x00:
- {
- m_p[offset]=data;
- break;
- }
- case 0x01:
- {
- if (data != m_p[offset])
- {
+ switch (offset)
+ {
+ case 0x00:
+ {
+ m_p[offset]=data;
+ break;
+ }
+ case 0x01:
+ {
+ if (data != m_p[offset])
+ {
#if LOG_IO_PORTS
UINT8 changed = m_p[offset] ^ data;
if (changed ^ P1_UNKNOWN_BITS)
{
- printf("Write to P1: %02X changed: ( ) (", data);
+ printf("Write to P1: %02X changed: ( ) (", data);
printbits(changed);
printf(") ( ) ( )\n");
}
@@ -147,36 +147,36 @@ WRITE8_MEMBER(minicom_state::minicom_io_w)
m_digit_index--;
if (m_digit_index<0) m_digit_index = 19;
}
- m_p[offset]=data;
- }
- break;
- }
- case 0x02:
- {
- if (data != m_p[offset])
- {
+ m_p[offset]=data;
+ }
+ break;
+ }
+ case 0x02:
+ {
+ if (data != m_p[offset])
+ {
#if LOG_IO_PORTS
UINT8 changed = m_p[offset] ^ data;
if (changed ^ P2_UNKNOWN_BITS)
{
- printf("Write to P2: %02X changed: ( ) ( ) (", data);
+ printf("Write to P2: %02X changed: ( ) ( ) (", data);
printbits(changed);
printf(") ( )\n");
}
#endif
- m_p[offset]=data;
- }
- break;
- }
- case 0x03:
- {
- if (data != m_p[offset])
- {
+ m_p[offset]=data;
+ }
+ break;
+ }
+ case 0x03:
+ {
+ if (data != m_p[offset])
+ {
UINT8 changed = m_p[offset] ^ data;
#if LOG_IO_PORTS
if (changed ^ P3_UNKNOWN_BITS)
{
- printf("Write to P3: %02X changed: ( ) ( ) ( ) (", data);
+ printf("Write to P3: %02X changed: ( ) ( ) ( ) (", data);
printbits(changed);
printf(")\n");
}
@@ -198,11 +198,11 @@ WRITE8_MEMBER(minicom_state::minicom_io_w)
{
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;
- }
- break;
- }
- }
+ m_p[offset]=data;
+ }
+ break;
+ }
+ }
}
DRIVER_INIT_MEMBER( minicom_state, minicom )
@@ -216,7 +216,7 @@ static MACHINE_CONFIG_START( minicom, minicom_state )
/* video hardware */
/* fluorescent 14-segment display forming a row of 20 characters */
- MCFG_DEFAULT_LAYOUT(layout_minicom)
+ MCFG_DEFAULT_LAYOUT(layout_minicom)
/* TODO: Map the keyboard rows/cols inputs (43-key, 4-row keyboard) */
@@ -230,4 +230,4 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
COMP( 1997, minicom, 0, 0, minicom, 0, minicom_state, minicom, "Ultratec", "Minicom IV", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS | GAME_NO_SOUND) /* fw release data: 11th Aug 1997 */
-//COMP( 2002, minicom, 0, 0, minicom, 0, minicom_state, minicom, "Ultratec", "Minicom IV", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS | GAME_NO_SOUND) /* fw release data: 19th Apr 2002 - Seen at a subway station in São Paulo, Brazil (Metrô Trianon MASP) */
+//COMP( 2002, minicom, 0, 0, minicom, 0, minicom_state, minicom, "Ultratec", "Minicom IV", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS | GAME_NO_SOUND) /* fw release data: 19th Apr 2002 - Seen at a subway station in S??o Paulo, Brazil (Metr?? Trianon MASP) */
diff --git a/src/mess/drivers/mmd1.c b/src/mess/drivers/mmd1.c
index e607001db2c..9ba8d15f758 100644
--- a/src/mess/drivers/mmd1.c
+++ b/src/mess/drivers/mmd1.c
@@ -502,10 +502,10 @@ static MACHINE_CONFIG_START( mmd2, mmd1_state )
/* Devices */
MCFG_DEVICE_ADD("i8279", I8279, 400000) // based on divider
- MCFG_I8279_OUT_SL_CB(WRITE8(mmd1_state, mmd2_scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(mmd1_state, mmd2_digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(mmd1_state, mmd2_kbd_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
+ MCFG_I8279_OUT_SL_CB(WRITE8(mmd1_state, mmd2_scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(mmd1_state, mmd2_digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(mmd1_state, mmd2_kbd_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
MCFG_I8279_IN_CTRL_CB(VCC)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c
index 37bab7fdc0f..493b15a43fd 100644
--- a/src/mess/drivers/ms0515.c
+++ b/src/mess/drivers/ms0515.c
@@ -134,12 +134,12 @@ static INPUT_PORTS_START( ms0515 )
INPUT_PORTS_END
/*
static LEGACY_FLOPPY_OPTIONS_START(ms0515)
- LEGACY_FLOPPY_OPTION(ms0515, "dsk", "MS0515 disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([80])
- SECTORS([10])
- SECTOR_LENGTH([512])
- FIRST_SECTOR_ID([0]))
+ LEGACY_FLOPPY_OPTION(ms0515, "dsk", "MS0515 disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
+ HEADS([1])
+ TRACKS([80])
+ SECTORS([10])
+ SECTOR_LENGTH([512])
+ FIRST_SECTOR_ID([0]))
LEGACY_FLOPPY_OPTIONS_END
*/
diff --git a/src/mess/drivers/ms9540.c b/src/mess/drivers/ms9540.c
index 91331dd9393..b5fd4dca4a6 100644
--- a/src/mess/drivers/ms9540.c
+++ b/src/mess/drivers/ms9540.c
@@ -85,7 +85,7 @@ static MACHINE_CONFIG_START( ms9540, ms9540_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ms9540_state, kbd_put))
-
+
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c
index 20e1b11509e..81e758fd953 100644
--- a/src/mess/drivers/msx.c
+++ b/src/mess/drivers/msx.c
@@ -1224,7 +1224,7 @@ static MACHINE_CONFIG_START( msx, msx_state )
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_FORMATS(fmsx_cassette_formats)
+ MCFG_CASSETTE_FORMATS(fmsx_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
MCFG_CASSETTE_INTERFACE("msx_cass")
@@ -1236,7 +1236,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( msx_ntsc, msx )
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
- MCFG_TMS9928A_VRAM_SIZE(0x4000)
+ MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
@@ -1246,7 +1246,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( msx_pal, msx )
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
- MCFG_TMS9928A_VRAM_SIZE(0x4000)
+ MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
@@ -1316,7 +1316,7 @@ static MACHINE_CONFIG_START( msx2, msx_state )
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_FORMATS(fmsx_cassette_formats)
+ MCFG_CASSETTE_FORMATS(fmsx_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
MCFG_CASSETTE_INTERFACE("msx_cass")
@@ -1384,7 +1384,7 @@ static MACHINE_CONFIG_START( msx2p, msx_state )
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_FORMATS(fmsx_cassette_formats)
+ MCFG_CASSETTE_FORMATS(fmsx_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
MCFG_CASSETTE_INTERFACE("msx_cass")
@@ -1462,9 +1462,9 @@ static MACHINE_CONFIG_DERIVED( canonv10, msx_pal )
// FDC: None, 0 drives
// 2 Cartridge slots
- MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
+ MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
- MCFG_MSX_LAYOUT_RAM("ram", 2, 0, 3, 1) /* 16KB RAM */
+ MCFG_MSX_LAYOUT_RAM("ram", 2, 0, 3, 1) /* 16KB RAM */
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot12", 3, 0)
MCFG_FRAGMENT_ADD( msx1_cartlist )
@@ -1481,7 +1481,7 @@ static MACHINE_CONFIG_DERIVED( canonv20, msx_pal )
// FDC: None, 0 drives
// 2 Cartridge slots
- MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
+ MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
MCFG_MSX_LAYOUT_RAM("ram", 2, 0, 0, 4) /* 64KB RAM */
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot2", 3, 0)
@@ -1497,7 +1497,7 @@ ROM_START (pv16)
ROM_END
static MACHINE_CONFIG_DERIVED( pv16, msx_ntsc )
- // AY8910
+ // AY8910
// FDC: None, 0 drives
// 1 Cartridge slot
// No printer port
@@ -2540,7 +2540,7 @@ MACHINE_CONFIG_END
ROM_START (svi728)
ROM_REGION (0xc000, "maincpu", 0)
ROM_LOAD ("728bios.rom", 0x0000, 0x8000, CRC(1ce9246c) SHA1(ea6a82cf8c6e65eb30b98755c8577cde8d9186c0))
-// ROM_LOAD ("707disk.rom", 0x8000, 0x4000, CRC(f9978853) SHA1(6aa856cc56eb98863c9da7a566571605682b5c6b))
+// ROM_LOAD ("707disk.rom", 0x8000, 0x4000, CRC(f9978853) SHA1(6aa856cc56eb98863c9da7a566571605682b5c6b))
ROM_END
static MACHINE_CONFIG_DERIVED( svi728, msx_pal )
@@ -4573,7 +4573,7 @@ static MACHINE_CONFIG_DERIVED( hbf500p, msx2_pal )
MCFG_MSX_LAYOUT_RAM("ram2", 0, 2, 0, 2) /* 32KB RAM */
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot2", 2, 0)
- MCFG_MSX_LAYOUT_ROM("empty", 3, 0, 0, 4, "maincpu", 0x10000) // Empty? or is this the 3rd cartridge/expansion slot ? 0x10000 used to be the "special" loading spot for the fmpac rom
+ MCFG_MSX_LAYOUT_ROM("empty", 3, 0, 0, 4, "maincpu", 0x10000) // Empty? or is this the 3rd cartridge/expansion slot ? 0x10000 used to be the "special" loading spot for the fmpac rom
MCFG_FRAGMENT_ADD( msx2_cartlist )
MACHINE_CONFIG_END
@@ -4730,7 +4730,7 @@ static MACHINE_CONFIG_DERIVED( hbf900, msx2 )
MCFG_MSX_LAYOUT_DISK1("disk", 3, 0, 1, 1, "maincpu", 0xc000)
MCFG_MSX_LAYOUT_RAM_MM("ram_mm", 3, 1, 0x40000) /* 256KB Mapper RAM */
MCFG_MSX_RAMIO_SET_BITS(0x80)
- MCFG_MSX_LAYOUT_ROM("empty", 3, 3, 1, 1, "maincpu", 0x10000) // Empty/unknown, optional fmpac rom used to be loaded here, or should the util rom be loaded?
+ MCFG_MSX_LAYOUT_ROM("empty", 3, 3, 1, 1, "maincpu", 0x10000) // Empty/unknown, optional fmpac rom used to be loaded here, or should the util rom be loaded?
MCFG_FRAGMENT_ADD( msx_wd2793_force_ready )
MCFG_FRAGMENT_ADD( msx_2_35_dd_drive )
@@ -4844,7 +4844,7 @@ static MACHINE_CONFIG_DERIVED( hbf9s, msx2_pal )
// YM2149 (in S-1985 MSX Engine)
// FDC: None, 0 drives
// 2 Cartridge slots
- // S-1985 MSX Engine
+ // S-1985 MSX Engine
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
@@ -4955,7 +4955,7 @@ static MACHINE_CONFIG_DERIVED( tpc310, msx2_pal )
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_RAM_MM("ram_mm", 1, 0, 0x20000) /* 128KB Mapper RAM */
- MCFG_MSX_RAMIO_SET_BITS(0x80)
+ MCFG_MSX_RAMIO_SET_BITS(0x80)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot", 2, 0)
MCFG_MSX_LAYOUT_ROM("ext", 3, 0, 0, 1, "maincpu", 0x8000)
MCFG_MSX_LAYOUT_ROM("turbo", 3, 0, 1, 1, "maincpu", 0x20000)
@@ -5210,8 +5210,8 @@ ROM_END
static MACHINE_CONFIG_DERIVED( expert3t, msx2p )
// AY8910
// FDC: wd2793?, 1 or 2? drives
- // 4 Cartridge/Expansion slots?
- // FM/YM2413 built-in
+ // 4 Cartridge/Expansion slots?
+ // FM/YM2413 built-in
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
@@ -5750,9 +5750,9 @@ ROM_END
static MACHINE_CONFIG_DERIVED( fsa1gt, msx2 )
// AY8910/YM2149?
// FDC: tc8566af, 1 3.5" DSDD drive
- // 2 Cartridge slots
- // FM built-in
- // MIDI
+ // 2 Cartridge slots
+ // FM built-in
+ // MIDI
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_MUSIC("mus", 0, 2, 1, 1, "maincpu", 0x38000)
@@ -5793,8 +5793,8 @@ ROM_END
static MACHINE_CONFIG_DERIVED( fsa1st, msx2 )
// AY8910/YM2149?
// FDC: tc8566af, 1 3.5" DSDD drive
- // 2 Cartridge slots
- // FM built-in
+ // 2 Cartridge slots
+ // FM built-in
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_MUSIC("mus", 0, 2, 1, 1, "maincpu", 0x38000)
diff --git a/src/mess/drivers/mtx.c b/src/mess/drivers/mtx.c
index 39c5fafdb3c..73fcaa93082 100644
--- a/src/mess/drivers/mtx.c
+++ b/src/mess/drivers/mtx.c
@@ -323,7 +323,7 @@ static MACHINE_CONFIG_START( mtx512, mtx_state )
MCFG_SNAPSHOT_ADD("snapshot", mtx_state, mtx, "mtx", 1)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("cassette_timer", mtx_state, cassette_tick, attotime::from_hz(44100))
/* internal ram */
diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c
index 7b391132004..7a456ea380c 100644
--- a/src/mess/drivers/myb3k.c
+++ b/src/mess/drivers/myb3k.c
@@ -269,7 +269,7 @@ static MACHINE_CONFIG_START( myb3k, myb3k_state )
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_DEVICE_ADD("fdc", MB8877x, 2000000) // unknown type
+ MCFG_DEVICE_ADD("fdc", MB8877x, 2000000) // unknown type
MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", myb3k_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c
index 528ca67e2c4..b9feb43c83a 100644
--- a/src/mess/drivers/mz2000.c
+++ b/src/mess/drivers/mz2000.c
@@ -829,7 +829,7 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state )
MCFG_CASSETTE_FORMATS(mz700_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("mz_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","mz2000_cass")
/* video hardware */
diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c
index f29e57bda44..636f2f9b066 100644
--- a/src/mess/drivers/mz700.c
+++ b/src/mess/drivers/mz700.c
@@ -367,7 +367,7 @@ static MACHINE_CONFIG_START( mz700, mz_state )
MCFG_CASSETTE_FORMATS(mz700_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("mz_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","mz700_cass")
/* internal ram */
diff --git a/src/mess/drivers/nascom1.c b/src/mess/drivers/nascom1.c
index 768a1acb83b..3f0978b14f0 100644
--- a/src/mess/drivers/nascom1.c
+++ b/src/mess/drivers/nascom1.c
@@ -281,7 +281,7 @@ static MACHINE_CONFIG_START( nascom1, nascom1_state )
MCFG_AY31015_RX_CLOCK(( XTAL_16MHz / 16 ) / 256)
MCFG_AY51013_READ_SI_CB(READ8(nascom1_state, nascom1_hd6402_si))
MCFG_AY51013_WRITE_SO_CB(WRITE8(nascom1_state, nascom1_hd6402_so))
-
+
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_16MHz/8)
/* devices */
diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c
index 7e263c472b5..9c3183e24ca 100644
--- a/src/mess/drivers/nes.c
+++ b/src/mess/drivers/nes.c
@@ -749,7 +749,7 @@ static MACHINE_CONFIG_DERIVED( famicom, nes )
MCFG_CASSETTE_ADD( "tape" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("fc_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list", "famicom_cass")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/newbrain.c b/src/mess/drivers/newbrain.c
index 87641f6c55a..47c165d7343 100644
--- a/src/mess/drivers/newbrain.c
+++ b/src/mess/drivers/newbrain.c
@@ -1334,7 +1334,7 @@ static MACHINE_CONFIG_START( newbrain_a, newbrain_state )
// devices
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_CASSETTE_ADD("cassette2")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mess/drivers/next.c b/src/mess/drivers/next.c
index dc6eabb6e7b..ce7f1fcd2d2 100644
--- a/src/mess/drivers/next.c
+++ b/src/mess/drivers/next.c
@@ -13,7 +13,7 @@
- Really implement the MO, it's only faking it for the startup test right now
- - Fix the networking
+ - Fix the networking
- Find out why netbsd goes to hell even before loading the kernel
diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c
index 7da28235707..7462cea87b0 100644
--- a/src/mess/drivers/ng_aes.c
+++ b/src/mess/drivers/ng_aes.c
@@ -1122,7 +1122,7 @@ MACHINE_RESET_MEMBER(ng_aes_state,neocd)
*************************************/
static ADDRESS_MAP_START( aes_main_map, AS_PROGRAM, 16, ng_aes_state )
-// AM_RANGE(0x000000, 0x00007f) AM_ROMBANK("vectors")
+// AM_RANGE(0x000000, 0x00007f) AM_ROMBANK("vectors")
AM_RANGE(0x000000, 0x00007f) AM_READ(neogeo_slot_rom_low_bectors_r)
AM_RANGE(0x000080, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x0f0000) AM_RAM
@@ -1149,8 +1149,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( neocd_main_map, AS_PROGRAM, 16, ng_aes_state )
-// AM_RANGE(0x000000, 0x00007f) AM_READ_BANK("vectors") // writes will fall through to area below
- AM_RANGE(0x000000, 0x00007f) AM_READ(banked_vectors_r)
+// AM_RANGE(0x000000, 0x00007f) AM_READ_BANK("vectors") // writes will fall through to area below
+ AM_RANGE(0x000000, 0x00007f) AM_READ(banked_vectors_r)
AM_RANGE(0x000000, 0x1fffff) AM_RAM AM_REGION("maincpu", 0x00000)
AM_RANGE(0x300000, 0x300001) AM_MIRROR(0x01fffe) AM_READ(aes_in0_r)
diff --git a/src/mess/drivers/ondra.c b/src/mess/drivers/ondra.c
index fe88d3e595b..899e13514b6 100644
--- a/src/mess/drivers/ondra.c
+++ b/src/mess/drivers/ondra.c
@@ -139,7 +139,7 @@ static MACHINE_CONFIG_START( ondra, ondra_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("ondra_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","ondra")
/* internal ram */
diff --git a/src/mess/drivers/orao.c b/src/mess/drivers/orao.c
index 92055df0489..ca9bd1aeb8c 100644
--- a/src/mess/drivers/orao.c
+++ b/src/mess/drivers/orao.c
@@ -190,7 +190,7 @@ static MACHINE_CONFIG_START( orao, orao_state )
MCFG_CASSETTE_FORMATS(orao_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("orao_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","orao")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/oric.c b/src/mess/drivers/oric.c
index 6299fc972b7..ffc1af80048 100644
--- a/src/mess/drivers/oric.c
+++ b/src/mess/drivers/oric.c
@@ -13,7 +13,7 @@
Apple 2 disc drives for storage.
This driver originally by Paul Cook, rewritten by Kevin Thacker,
- re-rewritten by Olivier Galibert.
+ re-rewritten by Olivier Galibert.
*********************************************************************/
@@ -46,21 +46,21 @@ public:
oric_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_psg(*this, "ay8912"),
- m_centronics(*this, "centronics"),
- m_cent_data_out(*this, "cent_data_out"),
- m_cassette(*this, "cassette"),
- m_via(*this, "via6522"),
- m_ram(*this, "ram"),
- m_rom(*this, "maincpu"),
- m_bank_c000_r(*this, "bank_c000_r"),
- m_bank_e000_r(*this, "bank_e000_r"),
- m_bank_f800_r(*this, "bank_f800_r"),
- m_bank_c000_w(*this, "bank_c000_w"),
- m_bank_e000_w(*this, "bank_e000_w"),
- m_bank_f800_w(*this, "bank_f800_w"),
- m_config(*this, "CONFIG") { }
+ m_maincpu(*this, "maincpu"),
+ m_psg(*this, "ay8912"),
+ m_centronics(*this, "centronics"),
+ m_cent_data_out(*this, "cent_data_out"),
+ m_cassette(*this, "cassette"),
+ m_via(*this, "via6522"),
+ m_ram(*this, "ram"),
+ m_rom(*this, "maincpu"),
+ m_bank_c000_r(*this, "bank_c000_r"),
+ m_bank_e000_r(*this, "bank_e000_r"),
+ m_bank_f800_r(*this, "bank_f800_r"),
+ m_bank_c000_w(*this, "bank_c000_w"),
+ m_bank_e000_w(*this, "bank_e000_w"),
+ m_bank_f800_w(*this, "bank_f800_w"),
+ m_config(*this, "CONFIG") { }
DECLARE_INPUT_CHANGED_MEMBER(nmi_pressed);
DECLARE_WRITE8_MEMBER(via_a_w);
@@ -120,7 +120,7 @@ public:
m_telmon24(*this, "telmon24"),
m_joy1(*this, "JOY1"),
m_joy2(*this, "JOY2")
- { }
+ { }
DECLARE_WRITE8_MEMBER(via2_a_w);
DECLARE_WRITE8_MEMBER(via2_b_w);
@@ -307,7 +307,7 @@ void oric_state::update_irq()
INPUT_CHANGED_MEMBER(oric_state::nmi_pressed)
{
- m_maincpu->set_input_line(m6502_device::NMI_LINE, newval ? ASSERT_LINE : CLEAR_LINE);
+ m_maincpu->set_input_line(m6502_device::NMI_LINE, newval ? ASSERT_LINE : CLEAR_LINE);
}
WRITE8_MEMBER(oric_state::via_a_w)
@@ -323,7 +323,7 @@ WRITE8_MEMBER(oric_state::via_b_w)
update_keyboard();
m_centronics->write_strobe(data & 0x10 ? 1 : 0);
m_cassette->change_state(data & 0x40 ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,
- CASSETTE_MOTOR_DISABLED);
+ CASSETTE_MOTOR_DISABLED);
m_cassette->output(data & 0x80 ? -1.0 : +1.0);
}
@@ -426,11 +426,11 @@ void telestrat_state::machine_reset()
void telestrat_state::update_irq()
{
m_maincpu->set_input_line(m6502_device::IRQ_LINE,
- m_via_irq ||
- m_ext_irq ||
- (m_fdc_irq && (m_port_314 & P_IRQEN)) ||
- m_via2_irq ||
- m_acia_irq ? ASSERT_LINE : CLEAR_LINE);
+ m_via_irq ||
+ m_ext_irq ||
+ (m_fdc_irq && (m_port_314 & P_IRQEN)) ||
+ m_via2_irq ||
+ m_acia_irq ? ASSERT_LINE : CLEAR_LINE);
}
WRITE8_MEMBER(telestrat_state::via2_a_w)
@@ -801,7 +801,7 @@ static MACHINE_CONFIG_START( oric, oric_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(oric_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED)
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("tape_timer", oric_state, update_tape, attotime::from_hz(4800))
/* via */
@@ -933,8 +933,8 @@ ROM_END
ROM_START(prav8d)
ROM_REGION(0x4000, "maincpu", 0) /* 0x10000 + 0x04000 + 0x00100 + 0x00200 */
ROM_LOAD( "pravetzt.rom", 0, 0x4000, CRC(58079502) SHA1(7afc276cb118adff72e4f16698f94bf3b2c64146) )
-// ROM_LOAD_OPTIONAL( "8ddoslo.rom", 0x014000, 0x0100, CRC(0c82f636) SHA1(b29d151a0dfa3c7cd50439b51d0a8f95559bc2b6) )
-// ROM_LOAD_OPTIONAL( "8ddoshi.rom", 0x014100, 0x0200, CRC(66309641) SHA1(9c2e82b3c4d385ade6215fcb89f8b92e6fd2bf4b) )
+// ROM_LOAD_OPTIONAL( "8ddoslo.rom", 0x014000, 0x0100, CRC(0c82f636) SHA1(b29d151a0dfa3c7cd50439b51d0a8f95559bc2b6) )
+// ROM_LOAD_OPTIONAL( "8ddoshi.rom", 0x014100, 0x0200, CRC(66309641) SHA1(9c2e82b3c4d385ade6215fcb89f8b92e6fd2bf4b) )
ROM_END
ROM_START(prav8dd)
@@ -943,8 +943,8 @@ ROM_START(prav8dd)
ROMX_LOAD( "8d.rom", 0, 0x4000, CRC(b48973ef) SHA1(fd47c977fc215a3b577596a7483df53e8a1e9c83), ROM_BIOS(1) )
ROM_SYSTEM_BIOS( 1, "radosoft", "RadoSoft Disk ROM, 1992")
ROMX_LOAD( "pravetzd.rom", 0, 0x4000, CRC(f8d23821) SHA1(f87ad3c5832773b6e0614905552a80c98dc8e2a5), ROM_BIOS(2) )
-// ROM_LOAD_OPTIONAL( "8ddoslo.rom", 0x014000, 0x0100, CRC(0c82f636) SHA1(b29d151a0dfa3c7cd50439b51d0a8f95559bc2b6) )
-// ROM_LOAD_OPTIONAL( "8ddoshi.rom", 0x014100, 0x0200, CRC(66309641) SHA1(9c2e82b3c4d385ade6215fcb89f8b92e6fd2bf4b) )
+// ROM_LOAD_OPTIONAL( "8ddoslo.rom", 0x014000, 0x0100, CRC(0c82f636) SHA1(b29d151a0dfa3c7cd50439b51d0a8f95559bc2b6) )
+// ROM_LOAD_OPTIONAL( "8ddoshi.rom", 0x014100, 0x0200, CRC(66309641) SHA1(9c2e82b3c4d385ade6215fcb89f8b92e6fd2bf4b) )
ROM_END
diff --git a/src/mess/drivers/orion.c b/src/mess/drivers/orion.c
index 7382e2083d9..3516d311a77 100644
--- a/src/mess/drivers/orion.c
+++ b/src/mess/drivers/orion.c
@@ -123,7 +123,7 @@ static MACHINE_CONFIG_START( orion128, orion_state )
MCFG_CASSETTE_FORMATS(rko_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("orion_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
@@ -202,7 +202,7 @@ static MACHINE_CONFIG_START( orionz80, orion_state )
MCFG_CASSETTE_FORMATS(rko_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("orion_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
@@ -277,7 +277,7 @@ static MACHINE_CONFIG_START( orionpro, orion_state )
MCFG_CASSETTE_FORMATS(rko_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("orion_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c
index 4dcd8d92e9b..05a92102742 100644
--- a/src/mess/drivers/osbexec.c
+++ b/src/mess/drivers/osbexec.c
@@ -437,38 +437,38 @@ WRITE_LINE_MEMBER(osbexec_state::osbexec_pia1_irq)
* - DEC 1820 double density: 40 tracks, 9 sectors per track, 512-byte sectors (180 KByte)
*
*/
- /*
+ /*
static LEGACY_FLOPPY_OPTIONS_START(osbexec )
LEGACY_FLOPPY_OPTION( osd, "img", "Osborne single density", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([10])
- SECTOR_LENGTH([256])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([10])
+ SECTOR_LENGTH([256])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( odd, "img", "Osborne double density", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([5])
- SECTOR_LENGTH([1024])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([5])
+ SECTOR_LENGTH([1024])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( ibm, "img", "IBM Personal Computer", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([8])
- SECTOR_LENGTH([512])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([8])
+ SECTOR_LENGTH([512])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( xerox, "img", "Xerox 820 Computer", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([18])
- SECTOR_LENGTH([128])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([18])
+ SECTOR_LENGTH([128])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( dec, "img", "DEC 1820 double density", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([9])
- SECTOR_LENGTH([512])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([9])
+ SECTOR_LENGTH([512])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTIONS_END
*/
diff --git a/src/mess/drivers/osborne1.c b/src/mess/drivers/osborne1.c
index e9e159b12d0..6f94cec2044 100644
--- a/src/mess/drivers/osborne1.c
+++ b/src/mess/drivers/osborne1.c
@@ -166,38 +166,38 @@ static const z80_daisy_config osborne1_daisy_chain[] =
* - DEC 1820 double density: 40 tracks, 9 sectors per track, 512-byte sectors (180 KByte)
*
*/
- /*
+ /*
static LEGACY_FLOPPY_OPTIONS_START(osborne1 )
LEGACY_FLOPPY_OPTION( osd, "img", "Osborne single density", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([10])
- SECTOR_LENGTH([256])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([10])
+ SECTOR_LENGTH([256])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( odd, "img", "Osborne double density", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([5])
- SECTOR_LENGTH([1024])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([5])
+ SECTOR_LENGTH([1024])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( ibm, "img", "IBM Personal Computer", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([8])
- SECTOR_LENGTH([512])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([8])
+ SECTOR_LENGTH([512])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( xerox, "img", "Xerox 820 Computer", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([18])
- SECTOR_LENGTH([128])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([18])
+ SECTOR_LENGTH([128])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( dec, "img", "DEC 1820 double density", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([40])
- SECTORS([9])
- SECTOR_LENGTH([512])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([40])
+ SECTORS([9])
+ SECTOR_LENGTH([512])
+ FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTIONS_END
*/
diff --git a/src/mess/drivers/partner.c b/src/mess/drivers/partner.c
index 0104900bb59..77bc9137783 100644
--- a/src/mess/drivers/partner.c
+++ b/src/mess/drivers/partner.c
@@ -207,7 +207,7 @@ static MACHINE_CONFIG_START( partner, partner_state )
MCFG_CASSETTE_FORMATS(rkp_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("partner_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","partner_cass")
MCFG_FD1793x_ADD("wd1793", XTAL_16MHz / 16)
diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c
index 77e4de73dc7..d0dfd7926f9 100644
--- a/src/mess/drivers/pasopia7.c
+++ b/src/mess/drivers/pasopia7.c
@@ -938,7 +938,7 @@ static MACHINE_CONFIG_START( p7_base, pasopia7_state )
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_4MHz)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2)) // beep interface
+ MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2)) // beep interface
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_4MHz)
diff --git a/src/mess/drivers/pc1500.c b/src/mess/drivers/pc1500.c
index 68fa62f51e4..449927a40a9 100644
--- a/src/mess/drivers/pc1500.c
+++ b/src/mess/drivers/pc1500.c
@@ -36,7 +36,7 @@ public:
required_shared_ptr<UINT8> m_lcd_data;
required_ioport_array<8> m_keyboard;
required_ioport m_io_on;
-
+
UINT8 m_kb_matrix;
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -72,7 +72,7 @@ READ8_MEMBER( pc1500_state::pc1500_kb_r )
UINT8 data = 0xff;
if (!started()) return 0;
-
+
for (int i = 0; i < 8; i++)
{
if (!BIT(m_kb_matrix, i))
diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c
index b2afb83e76b..95f3d16b82a 100644
--- a/src/mess/drivers/pc1512.c
+++ b/src/mess/drivers/pc1512.c
@@ -1230,7 +1230,7 @@ static MACHINE_CONFIG_START( pc1512, pc1512_state )
MCFG_I8237_OUT_IOW_0_CB(WRITE8(pc1512_state, iow0_w))
MCFG_I8237_OUT_IOW_1_CB(WRITE8(pc1512_state, iow1_w))
MCFG_I8237_OUT_IOW_2_CB(WRITE8(pc1512_state, iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(pc1512_state, iow3_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(pc1512_state, iow3_w))
MCFG_I8237_OUT_DACK_0_CB(WRITELINE(pc1512_state, dack0_w))
MCFG_I8237_OUT_DACK_1_CB(WRITELINE(pc1512_state, dack1_w))
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(pc1512_state, dack2_w))
@@ -1257,7 +1257,7 @@ static MACHINE_CONFIG_START( pc1512, pc1512_state )
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
-
+
MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer")
MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc1512_state, write_centronics_ack))
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pc1512_state, write_centronics_busy))
@@ -1350,7 +1350,7 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state )
MCFG_I8237_OUT_IOW_0_CB(WRITE8(pc1512_state, iow0_w))
MCFG_I8237_OUT_IOW_1_CB(WRITE8(pc1512_state, iow1_w))
MCFG_I8237_OUT_IOW_2_CB(WRITE8(pc1512_state, iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(pc1512_state, iow3_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(pc1512_state, iow3_w))
MCFG_I8237_OUT_DACK_0_CB(WRITELINE(pc1512_state, dack0_w))
MCFG_I8237_OUT_DACK_1_CB(WRITELINE(pc1512_state, dack1_w))
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(pc1512_state, dack2_w))
@@ -1377,7 +1377,7 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state )
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
-
+
MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer")
MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc1512_state, write_centronics_ack))
diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c
index b37e67b43d6..a066caedd3b 100644
--- a/src/mess/drivers/pc8801.c
+++ b/src/mess/drivers/pc8801.c
@@ -2608,7 +2608,7 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state )
//MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer")
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_SOFTWARE_LIST_ADD("tape_list","pc8801_cass")
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
diff --git a/src/mess/drivers/pcm.c b/src/mess/drivers/pcm.c
index 9e4bbd6b652..1f27cbb5136 100644
--- a/src/mess/drivers/pcm.c
+++ b/src/mess/drivers/pcm.c
@@ -298,7 +298,7 @@ static MACHINE_CONFIG_START( pcm, pcm_state )
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// ZC0 : SIO channel A clock
// ZC1 : SIO channel B clock
- MCFG_Z80CTC_ZC2_CB(WRITELINE(pcm_state, pcm_82_w)) // speaker
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(pcm_state, pcm_82_w)) // speaker
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mess/drivers/pecom.c b/src/mess/drivers/pecom.c
index cfb9aedff9a..8509dd03681 100644
--- a/src/mess/drivers/pecom.c
+++ b/src/mess/drivers/pecom.c
@@ -185,7 +185,7 @@ static MACHINE_CONFIG_START( pecom64, pecom_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("pecom_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","pecom_cass")
/* internal ram */
diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c
index 9edd25e5fec..4ec2d912c2f 100644
--- a/src/mess/drivers/pet.c
+++ b/src/mess/drivers/pet.c
@@ -1761,7 +1761,7 @@ static MACHINE_CONFIG_DERIVED( cbm4032f, cbm4000 )
MCFG_SCREEN_VISIBLE_AREA(0, 320 - 1, 0, 250 - 1)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
MCFG_DEVICE_REMOVE("sync_timer")
-
+
MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
diff --git a/src/mess/drivers/phc25.c b/src/mess/drivers/phc25.c
index 6f6f44b4a8e..bb0a1d1f113 100644
--- a/src/mess/drivers/phc25.c
+++ b/src/mess/drivers/phc25.c
@@ -321,7 +321,7 @@ static MACHINE_CONFIG_START( phc25, phc25_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(phc25_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
-
+
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(phc25_state, write_centronics_busy))
diff --git a/src/mess/drivers/poisk1.c b/src/mess/drivers/poisk1.c
index ad4a98cbb95..fee8029ddfa 100644
--- a/src/mess/drivers/poisk1.c
+++ b/src/mess/drivers/poisk1.c
@@ -239,16 +239,16 @@ static MACHINE_CONFIG_START( poisk1, p1_state )
MCFG_PIC8259_ADD( "pic8259", INPUTLINE(":maincpu", 0), VCC, NULL )
MCFG_DEVICE_ADD("ppi8255n1", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(p1_state, p1_ppi_porta_r)) /*60H*/
+ MCFG_I8255_IN_PORTA_CB(READ8(p1_state, p1_ppi_porta_r)) /*60H*/
MCFG_I8255_OUT_PORTA_CB(WRITE8(p1_state, p1_ppi_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(p1_state, p1_ppi_portb_r)) /*69H*/
+ MCFG_I8255_IN_PORTB_CB(READ8(p1_state, p1_ppi_portb_r)) /*69H*/
MCFG_I8255_IN_PORTC_CB(READ8(p1_state, p1_ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(p1_state, p1_ppi_portc_w)) /*6AH*/
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(p1_state, p1_ppi_portc_w)) /*6AH*/
MCFG_DEVICE_ADD("ppi8255n2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(p1_state, p1_ppi2_porta_w)) /*68H*/
- MCFG_I8255_OUT_PORTB_CB(WRITE8(p1_state, p1_ppi2_portb_w)) /*61H*/
- MCFG_I8255_IN_PORTC_CB(READ8(p1_state, p1_ppi2_portc_r)) /*62H*/
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(p1_state, p1_ppi2_porta_w)) /*68H*/
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(p1_state, p1_ppi2_portb_w)) /*61H*/
+ MCFG_I8255_IN_PORTC_CB(READ8(p1_state, p1_ppi2_portc_r)) /*62H*/
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU(":maincpu")
diff --git a/src/mess/drivers/ptcsol.c b/src/mess/drivers/ptcsol.c
index 7899b33004a..3d679182474 100644
--- a/src/mess/drivers/ptcsol.c
+++ b/src/mess/drivers/ptcsol.c
@@ -750,11 +750,11 @@ static MACHINE_CONFIG_START( sol20, sol20_state )
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(sol20_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
-
+
MCFG_CASSETTE_ADD( "cassette2" )
MCFG_CASSETTE_FORMATS(sol20_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
-
+
MCFG_DEVICE_ADD( "uart", AY31015, 0 )
MCFG_AY31015_TX_CLOCK(4800.0)
MCFG_AY31015_RX_CLOCK(4800.0)
diff --git a/src/mess/drivers/pve500.c b/src/mess/drivers/pve500.c
index 3367357be03..4a2a8562a2f 100644
--- a/src/mess/drivers/pve500.c
+++ b/src/mess/drivers/pve500.c
@@ -11,9 +11,9 @@
Notes:
One can induce the self-diagnose by booting the device holding LEARN and P2-RESET buttons togheter
With the default keyboard map, this can be done by holding keys L and S while pressing F3.
- (Don't forget to unlock the keyboard by using the UI TOGGLE key)
+ (Don't forget to unlock the keyboard by using the UI TOGGLE key)
- This self-diagnose routine displays the value C817, which is the checksum value of the subcpu ROM
+ This self-diagnose routine displays the value C817, which is the checksum value of the subcpu ROM
and afterwards it displays the following message:
SELFdIAG Error___ _F3 F3_CtC3c
@@ -21,17 +21,17 @@
which means it detected an error in the CTC circuitry (it means we're emulating it wrong!)
F3 is the coordinate of the subcpu EEPROM chip in the PCB.
- According to the service manual, this error code means: "ICF3 CTC CH-3 counter operation failure (No interruption)"
+ According to the service manual, this error code means: "ICF3 CTC CH-3 counter operation failure (No interruption)"
Known issues:
There's still an annoying blinking in the 7-seg display.
Changelog:
- 2014 JUN 24 [Felipe Sanches]:
+ 2014 JUN 24 [Felipe Sanches]:
* figured out the multiplexing signals for the 7seg display
- 2014 JUN 23 [Felipe Sanches]:
+ 2014 JUN 23 [Felipe Sanches]:
* hooked-up the RS422 ports
2014 JAN 14 [Felipe Sanches]:
@@ -269,7 +269,7 @@ WRITE8_MEMBER(pve500_state::dualport_ram_right_w)
READ8_MEMBER(pve500_state::io_expander_r)
{
-// printf("READ IO_EXPANDER_PORT%c\n", 'A'+offset);
+// printf("READ IO_EXPANDER_PORT%c\n", 'A'+offset);
switch (offset){
case IO_EXPANDER_PORTA:
return io_SC;
@@ -351,7 +351,7 @@ printf("io_expander_w: PORTA (io_SC=%02X)\n", data);
}
static MACHINE_CONFIG_START( pve500, pve500_state )
- /* Main CPU */
+ /* Main CPU */
MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL_12MHz / 2) /* TMPZ84C015BF-6 */
MCFG_CPU_PROGRAM_MAP(maincpu_prg)
MCFG_CPU_IO_MAP(maincpu_io)
@@ -369,7 +369,7 @@ static MACHINE_CONFIG_START( pve500, pve500_state )
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("player2", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("edl_inout", rs232_port_device, write_txd))
- /* Secondary CPU */
+ /* Secondary CPU */
MCFG_CPU_ADD("subcpu", TMPZ84C015, XTAL_12MHz / 2) /* TMPZ84C015BF-6 */
MCFG_CPU_PROGRAM_MAP(subcpu_prg)
MCFG_CPU_IO_MAP(subcpu_io)
diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c
index 0c7f949246a..f6dcff36473 100644
--- a/src/mess/drivers/px4.c
+++ b/src/mess/drivers/px4.c
@@ -1400,7 +1400,7 @@ static MACHINE_CONFIG_START( px4, px4_state )
// external cassette
MCFG_CASSETTE_ADD("extcas")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED)
-
+
MCFG_TIMER_DRIVER_ADD("extcas_timer", px4_state, ext_cassette_read)
// sio port
diff --git a/src/mess/drivers/pyl601.c b/src/mess/drivers/pyl601.c
index 005928fd647..b5c1e50812a 100644
--- a/src/mess/drivers/pyl601.c
+++ b/src/mess/drivers/pyl601.c
@@ -547,7 +547,7 @@ static MACHINE_CONFIG_START( pyl601, pyl601_state )
/* Devices */
MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_2MHz)
MCFG_MC6845_SHOW_BORDER_AREA(false)
- MCFG_MC6845_CHAR_WIDTH(8) /* ? */
+ MCFG_MC6845_CHAR_WIDTH(8) /* ? */
MCFG_MC6845_UPDATE_ROW_CB(pyl601_state, pyl601_update_row)
MCFG_UPD765A_ADD("upd765", true, true)
@@ -569,7 +569,7 @@ static MACHINE_CONFIG_DERIVED( pyl601a, pyl601 )
MCFG_DEVICE_REMOVE("crtc")
MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_2MHz)
MCFG_MC6845_SHOW_BORDER_AREA(false)
- MCFG_MC6845_CHAR_WIDTH(8) /* ? */
+ MCFG_MC6845_CHAR_WIDTH(8) /* ? */
MCFG_MC6845_UPDATE_ROW_CB(pyl601_state, pyl601a_update_row)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c
index f234779fe38..dfb19dbecb7 100644
--- a/src/mess/drivers/ql.c
+++ b/src/mess/drivers/ql.c
@@ -176,7 +176,7 @@ WRITE8_MEMBER( ql_state::write )
}
if (offset >= 0x20000 && offset < 0x40000)
{
- m_zx8301->data_w(space, offset & 0x1ffff, data);
+ m_zx8301->data_w(space, offset & 0x1ffff, data);
}
if (m_qimi_enabled)
{
diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c
index b1a974b3090..a76a0bdfb8c 100644
--- a/src/mess/drivers/qx10.c
+++ b/src/mess/drivers/qx10.c
@@ -776,7 +776,7 @@ static MACHINE_CONFIG_START( qx10, qx10_state )
MCFG_PIC8259_ADD("pic8259_master", INPUTLINE("maincpu", 0), VCC, READ8(qx10_state, get_slave_ack))
MCFG_PIC8259_ADD("pic8259_slave", DEVWRITELINE("pic8259_master", pic8259_device, ir7_w), GND, NULL)
- MCFG_UPD7201_ADD("upd7201", MAIN_CLK/4, 0, 0, 0, 0) // channel b clock set by pit2 channel 2
+ MCFG_UPD7201_ADD("upd7201", MAIN_CLK/4, 0, 0, 0, 0) // channel b clock set by pit2 channel 2
// Channel A: Keyboard
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("kbd", rs232_port_device, write_txd))
// Channel B: RS232
diff --git a/src/mess/drivers/radio86.c b/src/mess/drivers/radio86.c
index 42897b3d2fb..cf7a45102a0 100644
--- a/src/mess/drivers/radio86.c
+++ b/src/mess/drivers/radio86.c
@@ -378,7 +378,7 @@ static MACHINE_CONFIG_START( radio86, radio86_state )
MCFG_CASSETTE_FORMATS(rkr_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("radio86_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","radio86")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c
index 4b0df8f2498..73a3264b8c0 100644
--- a/src/mess/drivers/rainbow.c
+++ b/src/mess/drivers/rainbow.c
@@ -13,10 +13,10 @@ RBCONVERT.ZIP has details on how model 'A' differs from version B.
Issues with this driver:
(1) Keyboard emulation incomplete (inhibits the system from booting with ERROR 50).
-(2) IRQ / DMA / arbitration logic should be verified
- DMA (needed for 'Extended communication option') or Z80-8088 arbitration is non-existent (E11/E13 dumps anyone?).
+(2) IRQ / DMA / arbitration logic should be verified
+ DMA (needed for 'Extended communication option') or Z80-8088 arbitration is non-existent (E11/E13 dumps anyone?).
-(3) Read errors when booting CPM 2 / DOS 2.x / DOS 3 (secondary boot loader finds errors on tracks >= 2).
+(3) Read errors when booting CPM 2 / DOS 2.x / DOS 3 (secondary boot loader finds errors on tracks >= 2).
Seek (+ verify) and a number of signals (TRACK > 43 TG43, INDEX etc.) appear to be incorrect (-> diag.disk aborts drive test).
UCSD systems (fort_sys, pas_sys) and diag disks boot!
@@ -28,10 +28,10 @@ UCSD systems (fort_sys, pas_sys) and diag disks boot!
MHFU gets active if the 8088 has not acknowledged a video processor interrupt within approx. 108 milliseconds
- TO BE IMPLEMENTED AS SLOT DEVICES (for now, DIP settings affect 'system_parameter_r' only and are disabled):
- * Color graphics option (uses NEC upd7220 GDC). REFERENCE: Programmer's Reference: AA-AE36A-TV.
- Either 384 x 240 x 16 or 800 x 240 x 4 colors (out of 4096). 8 × 64 K video RAM. Pallette limited to 4 colors on 100-A.
+ * Color graphics option (uses NEC upd7220 GDC). REFERENCE: Programmer's Reference: AA-AE36A-TV.
+ Either 384 x 240 x 16 or 800 x 240 x 4 colors (out of 4096). 8 ? 64 K video RAM. Pallette limited to 4 colors on 100-A.
- * Extended communication option (occupies BUNDLE_OPTION ports) REFERENCE: AA-V172A-TV + Addendum AV-Y890A-TV.
+ * Extended communication option (occupies BUNDLE_OPTION ports) REFERENCE: AA-V172A-TV + Addendum AV-Y890A-TV.
See also NEWCOM1.DOC in RBETECDOC.ZIP. Board connected to the front rightmost expansion slot (1 of the expansion
ports used by the hard disk controller). Thus can't be added to a system that includes the DEC RD50/51.
=> 2 ports, a high-speed RS-422 half-duplex interface (port A) + lower-speed RS-423 full/half-duplex interface
@@ -42,11 +42,11 @@ UCSD systems (fort_sys, pas_sys) and diag disks boot!
Plugs into the NVM chip socket on a 100-A and into the Boot ROM on the 100-B (there is a socket
on the ClikClok for the NVM / ROM chip). Came with software for 'all versions of MS-DOS'.
- * 8087 Numerical Data Coprocessor daughterboard. REFERENCE: EK-PCNDP-IN-PRE
+ * 8087 Numerical Data Coprocessor daughterboard. REFERENCE: EK-PCNDP-IN-PRE
Daughterboard, to be plugged into the expansion port where the memory expansion card usually sits.
If a memory adapter board is present, it has to be plugged into a connector atop the 8087 copro board.
The 8088 is put into the CPU socket on the coprocessor board.
- => see MATH test on 'Design Maturity Diagnostics' disk <=
+ => see MATH test on 'Design Maturity Diagnostics' disk <=
* Suitable Solutions TURBOW286: 12 Mhz, 68-pin, low power AMD N80L286-12 and WAYLAND/EDSUN EL286-88-10-B ( 80286 to 8088 Processor Signal Converter )
plus DC 7174 or DT 7174 (barely readable). Add-on card, replaces main 8088 cpu (via ribbon cable). Patched V5.03 BOOT ROM labeled 'TBSS1.3 - 3ED4'.
@@ -207,8 +207,8 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND).
#include "video/vtvideo.h"
#include "machine/wd_fdc.h"
-#include "formats/rx50_dsk.h"
-#include "imagedev/flopdrv.h"
+#include "formats/rx50_dsk.h"
+#include "imagedev/flopdrv.h"
#include "machine/i8251.h"
#include "machine/clock.h"
@@ -218,7 +218,7 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND).
#include "rainbow.lh" // BEZEL - LAYOUT with LEDs for diag 1-7, keyboard 8-11 and floppy 20-23
#define LK201_TAG "lk201"
-#define FD1793_TAG "fd1793x"
+#define FD1793_TAG "fd1793x"
#define INVALID_DRIVE 255
class rainbow_state : public driver_device
@@ -243,7 +243,7 @@ public:
m_crtc(*this, "vt100_video"),
m_i8088(*this, "maincpu"),
m_z80(*this, "subcpu"),
- m_fdc(*this, FD1793_TAG),
+ m_fdc(*this, FD1793_TAG),
m_kbd8251(*this, "kbdser"),
m_lk201(*this, LK201_TAG),
m_p_ram(*this, "p_ram"),
@@ -299,21 +299,21 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock);
TIMER_DEVICE_CALLBACK_MEMBER(motor_tick);
- DECLARE_FLOPPY_FORMATS( floppy_formats );
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
virtual void machine_start();
private:
enum
{
- IRQ_8088_MAILBOX = 0, // vector 0x27/a7 (lowest priority)
- IRQ_8088_KBD, // vector 0x26/a6 KEYBOARD (8251A) Interrupt
-// IRQ_EXT_COMM, // vector 0x25 [OPTION BOARD] Interrupt from external COMM.BOARD (non DMA)
-// IRQ_COMM_PRN_7201, // vector 0x24 COMM./PRINTER (7201) IRQ
-// IRQ_EXT_DMAC, // vector 0x23 [OPTION BOARD] : from external COMM.BOARD (DMA Control IRQ)
-// IRQ_GRF, // vector 0x22 GRAPHICS IRQ
-// IRQ_SH_10_BDL, // vector 0x21 BUNDLE IRQ (hard disc / COMM.BOARD) : Pin 23 of expansion connector J4
- IRQ_8088_VBL, // vector 0x20/a0 (highest priority)
+ IRQ_8088_MAILBOX = 0, // vector 0x27/a7 (lowest priority)
+ IRQ_8088_KBD, // vector 0x26/a6 KEYBOARD (8251A) Interrupt
+// IRQ_EXT_COMM, // vector 0x25 [OPTION BOARD] Interrupt from external COMM.BOARD (non DMA)
+// IRQ_COMM_PRN_7201, // vector 0x24 COMM./PRINTER (7201) IRQ
+// IRQ_EXT_DMAC, // vector 0x23 [OPTION BOARD] : from external COMM.BOARD (DMA Control IRQ)
+// IRQ_GRF, // vector 0x22 GRAPHICS IRQ
+// IRQ_SH_10_BDL, // vector 0x21 BUNDLE IRQ (hard disc / COMM.BOARD) : Pin 23 of expansion connector J4
+ IRQ_8088_VBL, // vector 0x20/a0 (highest priority)
IRQ_8088_MAX
};
@@ -381,8 +381,8 @@ FLOPPY_FORMATS_MEMBER( rainbow_state::floppy_formats )
FLOPPY_RX50IMG_FORMAT
FLOPPY_FORMATS_END
-static SLOT_INTERFACE_START( rainbow_floppies )
- SLOT_INTERFACE("525qd", FLOPPY_525_SSQD)
+static SLOT_INTERFACE_START( rainbow_floppies )
+ SLOT_INTERFACE("525qd", FLOPPY_525_SSQD)
SLOT_INTERFACE_END
@@ -417,17 +417,17 @@ void rainbow_state::machine_start()
rom[0xf4000 + 0x363b]= 0xeb; // COND => JMPS
- if (rom[0xf4174] == 0x75)
+ if (rom[0xf4174] == 0x75)
{
rom[0xf4174] = 0xeb; // jmps RAINBOW100_LOGO__loc_33D
- rom[0xf4175] = 0x08;
- }
+ rom[0xf4175] = 0x08;
+ }
- if (rom[0xf4000 + 0x3ffc] == 0x31) // 100-B
- rom[0xf4384] = 0xeb; // JMPS => BOOT80
+ if (rom[0xf4000 + 0x3ffc] == 0x31) // 100-B
+ rom[0xf4384] = 0xeb; // JMPS => BOOT80
- if (rom[0xf4000 + 0x3ffc] == 0x35) // v5.05
- rom[0xf437b] = 0xeb;
+ if (rom[0xf4000 + 0x3ffc] == 0x35) // v5.05
+ rom[0xf437b] = 0xeb;
#endif
#ifdef KEYBOARD_WORKAROUND
@@ -482,37 +482,37 @@ static ADDRESS_MAP_START( rainbow8088_io , AS_IO, 8, rainbow_state)
AM_RANGE(0x11, 0x11) AM_DEVREADWRITE("kbdser", i8251_device, status_r, control_w)
// UNMAPPED:
- // 0x20 -> 0x2f ***** EXTENDED COMM. OPTION / Option Select 1.
- // See boot rom @1EA6: 0x27 (<- RESET EXTENDED COMM OPTION )
- // ===========================================================
+ // 0x20 -> 0x2f ***** EXTENDED COMM. OPTION / Option Select 1.
+ // See boot rom @1EA6: 0x27 (<- RESET EXTENDED COMM OPTION )
+ // ===========================================================
// 0x30 -> 0x3f ***** EXTENDED COMM. OPTION / Option Select 3.
// ===========================================================
- // 0x40 COMMUNICATIONS DATA REGISTER (MPSC)
+ // 0x40 COMMUNICATIONS DATA REGISTER (MPSC)
// 0x41 PRINTER DATA REGISTER (MPSC)
// 0x42 COMMUNICATIONS CONTROL / STATUS REGISTER (MPSC)
// 0x43 PRINTER CONTROL / STATUS REGISTER (MPSC)
- // ===========================================================
- // 0x50 - 0x57 ***** COLOR GRAPHICS OPTION:
- // 50h Graphics option software reset. Any write to this
- // port also resynchronizes the read/modify/write memory
- // cycles of the Graphics Option to those of the GDC (*)
+ // ===========================================================
+ // 0x50 - 0x57 ***** COLOR GRAPHICS OPTION:
+ // 50h Graphics option software reset. Any write to this
+ // port also resynchronizes the read/modify/write memory
+ // cycles of the Graphics Option to those of the GDC (*)
// * see boot ROM @1EB4/8
- // 51h Data written to this port is loaded into the area
- // selected by the previous write to port 53h.
+ // 51h Data written to this port is loaded into the area
+ // selected by the previous write to port 53h.
- // 52h Data written to this port is loaded into the Write Buffer.
+ // 52h Data written to this port is loaded into the Write Buffer.
- // 53h Data written to this port provides address selection
- // for indirect addressing (see Indirect Register).
+ // 53h Data written to this port provides address selection
+ // for indirect addressing (see Indirect Register).
- // 54h Data written to this port is loaded into the low-order
- // byte of the Write Mask.
+ // 54h Data written to this port is loaded into the low-order
+ // byte of the Write Mask.
- // 55h Data written to this port is loaded into the high-order
- // byte of the Write Mask.
+ // 55h Data written to this port is loaded into the high-order
+ // byte of the Write Mask.
- // 56h Data written to this port is loaded into the GDC's FIFO
- // Buffer and flagged as a parameter.
+ // 56h Data written to this port is loaded into the GDC's FIFO
+ // Buffer and flagged as a parameter.
// ===========================================================
// 0x60 -> 0x6f ***** EXTENDED COMM. OPTION / Option Select 2.
// ===========================================================
@@ -520,7 +520,7 @@ static ADDRESS_MAP_START( rainbow8088_io , AS_IO, 8, rainbow_state)
// ------ Rainbow uses 'WD 1010 AL' (Western Digital 1983)
// Register compatible to WD2010 (present in MESS)
// R/W REGISTERS 60 - 68 (?)
- AM_RANGE (0x68, 0x68) AM_READ(hd_status_68_r)
+ AM_RANGE (0x68, 0x68) AM_READ(hd_status_68_r)
// ===========================================================
// HARD DISC SIZES AND LIMITS
// HARDWARE:
@@ -551,7 +551,7 @@ static ADDRESS_MAP_START( rainbowz80_io, AS_IO, 8, rainbow_state)
AM_RANGE(0x20, 0x20) AM_READWRITE(z80_generalstat_r, z80_diskdiag_read_w) // read to port 0x20 used by MS-DOS 2.x diskette loader.
AM_RANGE(0x21, 0x21) AM_READWRITE(z80_generalstat_r, z80_diskdiag_write_w)
AM_RANGE(0x40, 0x40) AM_READWRITE(z80_diskstatus_r, z80_diskcontrol_w)
- AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(FD1793_TAG, fd1793_t, read, write)
+ AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(FD1793_TAG, fd1793_t, read, write)
ADDRESS_MAP_END
/* Input ports */
@@ -572,7 +572,7 @@ PORT_DIPSETTING(0x01, "WHITE")
PORT_START("MEMORY PRESENT")
PORT_DIPNAME( 0xF0000, 0x20000, "MEMORY PRESENT")
PORT_DIPSETTING( 0x10000, "64 K (MINIMUM ON 100-A)" ) // see BOARD_RAM
- PORT_DIPSETTING( 0x20000, "128 K (MINIMUM ON 100-B)" )
+ PORT_DIPSETTING( 0x20000, "128 K (MINIMUM ON 100-B)" )
PORT_DIPSETTING( 0x30000, "192 K (MEMORY OPTION)" )
PORT_DIPSETTING( 0x40000, "256 K (MEMORY OPTION)" )
PORT_DIPSETTING( 0x50000, "320 K (MEMORY OPTION)" )
@@ -589,11 +589,11 @@ PORT_DIPSETTING(0x01, "WHITE")
// Floppy is always 'on', BUNDLE + GRAPHICS are not implemented yet:
PORT_START("FLOPPY CONTROLLER")
PORT_DIPNAME( 0x01, 0x01, "FLOPPY CONTROLLER") PORT_TOGGLE
- PORT_DIPSETTING( 0x01, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- // BUNDLE_OPTION: EXT.COMM.card -or- hard disk controller (marketed later).
- // - hard disc and COMM.extension exclude each other!
- // - connector J4 has 4 select lines (Option Select 1-4)
+ // BUNDLE_OPTION: EXT.COMM.card -or- hard disk controller (marketed later).
+ // - hard disc and COMM.extension exclude each other!
+ // - connector J4 has 4 select lines (Option Select 1-4)
PORT_START("BUNDLE OPTION")
PORT_DIPNAME( 0x00, 0x00, "BUNDLE OPTION") PORT_TOGGLE
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -604,8 +604,8 @@ PORT_DIPSETTING(0x01, "WHITE")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- // W13 - W18 are used for factory tests and affect the boot process -
- PORT_START("W13")
+ // W13 - W18 are used for factory tests and affect the boot process -
+ PORT_START("W13")
PORT_DIPNAME( 0x02, 0x02, "W13 (FACTORY TEST A, LEAVE OFF)") PORT_TOGGLE
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -644,7 +644,7 @@ void rainbow_state::machine_reset()
/* configure RAM */
address_space &program = m_maincpu->space(AS_PROGRAM);
- if (m_inp8->read() < END_OF_RAM)
+ if (m_inp8->read() < END_OF_RAM)
{
program.unmap_readwrite(m_inp8->read(), END_OF_RAM);
}
@@ -713,7 +713,7 @@ UINT32 rainbow_state::screen_update_rainbow(screen_device &screen, bitmap_ind16
// Interrupt handling and arbitration. See 3.1.3.8 OF PC-100 spec.
void rainbow_state::update_8088_irqs()
{
- static const int vectors[] = { 0x27, 0x26, 0x20 };
+ static const int vectors[] = { 0x27, 0x26, 0x20 };
if (m_irq_mask != 0)
{
@@ -820,11 +820,11 @@ READ8_MEMBER(rainbow_state::system_parameter_r)
B F G M
( 1 means NOT present; 4-7 reserved )
*/
- return ( ((m_inp5->read() == 1) ? 0 : 1) |
- ((m_inp6->read() == 1) ? 0 : 2) |
- ((m_inp7->read() == 1) ? 0 : 4) |
- ((m_inp8->read() > BOARD_RAM) ? 0 : 8) |
- 16 | 32 | 64 | 128 // to be verified.
+ return ( ((m_inp5->read() == 1) ? 0 : 1) |
+ ((m_inp6->read() == 1) ? 0 : 2) |
+ ((m_inp7->read() == 1) ? 0 : 4) |
+ ((m_inp8->read() > BOARD_RAM) ? 0 : 8) |
+ 16 | 32 | 64 | 128 // to be verified.
);
}
@@ -842,9 +842,9 @@ READ8_MEMBER(rainbow_state::comm_control_r)
int data;
if (COLD_BOOT == 2)
data = 0;
- else
+ else
data = m_crtc->MHFU(1);
-
+
return ( ( (data > 0) ? 0x00 : 0x20) |// (L): status of MHFU flag => bit pos.5
( (INT88) ? 0x00 : 0x40 ) | // (L)
( (INTZ80) ? 0x00 : 0x80 ) // (L)
@@ -935,11 +935,11 @@ D2 : INT88 L: (bit reads the INT88 bit sent by Z80 to interrupt 8088)
D1 : INTZ80 L: (bit reads the INTZ80 bit sent by 8088 to interrupt Z80)
D0 : ZFLIP L: (read from the diagnostic control register of Z80A)
*/
- static int last_track;
+ static int last_track;
int track = m_fdc->track_r( space, 0);
int fdc_step = 0;
- int fdc_ready = 0;
- int tk00 = 0;
+ int fdc_ready = 0;
+ int tk00 = 0;
if(m_unit != INVALID_DRIVE)
{
@@ -947,20 +947,20 @@ D0 : ZFLIP L: (read from the diagnostic control register of Z80A)
fdc_step = 1;
last_track = track;
- fdc_ready = m_floppy->ready_r();
- tk00 = ( m_floppy->trk00_r() != CLEAR_LINE );
+ fdc_ready = m_floppy->ready_r();
+ tk00 = ( m_floppy->trk00_r() != CLEAR_LINE );
}
int last_dir = 0; // FAKE LAST_DIR + WRITE_GATE FOR NOW.
int fdc_write_gate = 1;
- // ***** ALL LOW ACTIVE - EXCEPT tk00 :
+ // ***** ALL LOW ACTIVE - EXCEPT tk00 :
int data=(
- ( (fdc_step) ? 0x00 : 0x80 ) |
- ( (fdc_write_gate == 1) ? 0x00 : 0x40 ) |
- ( (tk00) ? 0x20 : 0x00 ) |
- ( (last_dir == 1) ? 0x00 : 0x10 ) |
- ( (fdc_ready) ? 0x00 : 0x08 ) |
+ ( (fdc_step) ? 0x00 : 0x80 ) |
+ ( (fdc_write_gate == 1) ? 0x00 : 0x40 ) |
+ ( (tk00) ? 0x20 : 0x00 ) |
+ ( (last_dir == 1) ? 0x00 : 0x10 ) |
+ ( (fdc_ready) ? 0x00 : 0x08 ) |
( (INT88) ? 0x00 : 0x04 ) |
( (INTZ80) ? 0x00 : 0x02 ) |
( (m_zflip) ? 0x00 : 0x01 )
@@ -1052,16 +1052,16 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w)
{
m_floppy = con->get_device();
if (m_floppy)
- {
- selected_drive = drive;
+ {
+ selected_drive = drive;
m_fdc->set_floppy(m_floppy); // Sets new _image device_
m_floppy->set_rpm(300.);
// RX50 board has additional 'side select' - ignored by WD emulation?
m_floppy->ss_w((data & 20) ? 1 : 0);
- }
- }
+ }
+ }
output_set_value("driveled0", (selected_drive == 0) ? 1 : 0 );
output_set_value("driveled1", (selected_drive == 1) ? 1 : 0 );
@@ -1074,25 +1074,25 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w)
m_unit = selected_drive;
if (MOTOR_DISABLE_counter == 0) // "one shot"
- MOTOR_DISABLE_counter = 4800; // 2400 = 500 ms
+ MOTOR_DISABLE_counter = 4800; // 2400 = 500 ms
-// m_fdc->set_force_ready(force_ready);
+// m_fdc->set_force_ready(force_ready);
}
else
{
-// m_fdc->set_force_ready(false);
- }
+// m_fdc->set_force_ready(false);
+ }
for(int f_num=0; f_num <= 3; f_num++)
{
floppy_connector *con = machine().device<floppy_connector>(names[f_num]);
- floppy_image_device *tmp_floppy = con->get_device();
- tmp_floppy->mon_w( (f_num == m_unit) ? CLEAR_LINE : ASSERT_LINE );
+ floppy_image_device *tmp_floppy = con->get_device();
+ tmp_floppy->mon_w( (f_num == m_unit) ? CLEAR_LINE : ASSERT_LINE );
}
if(m_unit == INVALID_DRIVE)
- {
- data = data & (255 -3);
+ {
+ data = data & (255 -3);
data = data | 8; // MOTOR 0 OFF
data = data | 16; // MOTOR 1 OFF
}
@@ -1100,7 +1100,7 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w)
{
data = (data & (255 - 3)) | m_unit;
- if(m_unit < 2)
+ if(m_unit < 2)
data = data & (255 - 8); // MOTOR 0 (for A or B)
if(m_unit > 1)
@@ -1159,19 +1159,19 @@ WRITE8_MEMBER( rainbow_state::diagnostic_w ) // 8088 (port 0A WRITTEN). Fig.4-28
if(m_unit != INVALID_DRIVE)
{
- if ( (m_diagnostic & 1) && !(data & 1) )
- {
+ if ( (m_diagnostic & 1) && !(data & 1) )
+ {
m_fdc->soft_reset();
- }
+ }
- if ( !(m_diagnostic & 1) && (data & 1) )
- {
+ if ( !(m_diagnostic & 1) && (data & 1) )
+ {
m_fdc->soft_reset(); // See formatter description p.197 or 5-13
}
}
// MISSING BITS (* not vital for normal operation, see diag.disk) -
// BIT 2: GRF VID SEL (0 = system module; 1 = graphics option)
- // BIT 3: PARITY TEST (1 = enables parity test on memory option board)
+ // BIT 3: PARITY TEST (1 = enables parity test on memory option board)
// * BIT 4: DIAG LOOPBACK (0 at power-up; 1 directs RX50 and DC12 output to printer port)
// * BIT 5: PORT LOOPBACK (1 enables loopback for COMM, PRINTER, KEYBOARD ports)
@@ -1308,12 +1308,12 @@ static MACHINE_CONFIG_START( rainbow, rainbow_state )
MCFG_VT_VIDEO_RAM_CALLBACK(READ8(rainbow_state, read_video_ram_r))
MCFG_VT_VIDEO_CLEAR_VIDEO_INTERRUPT_CALLBACK(WRITELINE(rainbow_state, clear_video_interrupt))
- MCFG_FD1793x_ADD(FD1793_TAG, XTAL_24_0734MHz / 24) // no separate 1 Mhz quartz
+ MCFG_FD1793x_ADD(FD1793_TAG, XTAL_24_0734MHz / 24) // no separate 1 Mhz quartz
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":0", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":1", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":3", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":3", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","rainbow")
MCFG_DEVICE_ADD("kbdser", I8251, 0)
diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c
index 05cd93a6d45..216949cf53f 100644
--- a/src/mess/drivers/samcoupe.c
+++ b/src/mess/drivers/samcoupe.c
@@ -558,7 +558,7 @@ static MACHINE_CONFIG_START( samcoupe, samcoupe_state )
MCFG_CASSETTE_FORMATS(tzx_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("samcoupe_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","samcoupe_cass")
MCFG_WD1772x_ADD("wd1772", SAMCOUPE_XTAL_X1/3)
diff --git a/src/mess/drivers/saturn.c b/src/mess/drivers/saturn.c
index 293786347c1..eb2a5c4fcbd 100644
--- a/src/mess/drivers/saturn.c
+++ b/src/mess/drivers/saturn.c
@@ -9,7 +9,7 @@
Many thanks to Guru, Fabien, Runik and Charles MacDonald for the help given.
===================================================================================================
-
+
Notes:
-To enter into an Advanced Test Mode,keep pressed the Test Button (F2) on the start-up.
-Memo: Some tests done on the original & working PCB,to be implemented:
diff --git a/src/mess/drivers/sdk85.c b/src/mess/drivers/sdk85.c
index 63db29ef63f..0c03ae1423b 100644
--- a/src/mess/drivers/sdk85.c
+++ b/src/mess/drivers/sdk85.c
@@ -125,11 +125,11 @@ static MACHINE_CONFIG_START( sdk85, sdk85_state )
/* Devices */
MCFG_DEVICE_ADD("i8279", I8279, 3100000) // based on divider
- MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq
- MCFG_I8279_OUT_SL_CB(WRITE8(sdk85_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(sdk85_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(sdk85_state, kbd_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
+ MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq
+ MCFG_I8279_OUT_SL_CB(WRITE8(sdk85_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(sdk85_state, digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(sdk85_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
MCFG_I8279_IN_CTRL_CB(VCC)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/sdk86.c b/src/mess/drivers/sdk86.c
index f993fb8157a..51bcbd4c954 100644
--- a/src/mess/drivers/sdk86.c
+++ b/src/mess/drivers/sdk86.c
@@ -170,10 +170,10 @@ static MACHINE_CONFIG_START( sdk86, sdk86_state )
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(sdk86_state, write_usart_clock))
MCFG_DEVICE_ADD("i8279", I8279, 2500000) // based on divider
- MCFG_I8279_OUT_SL_CB(WRITE8(sdk86_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(sdk86_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(sdk86_state, kbd_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(GND) // Shift key
+ MCFG_I8279_OUT_SL_CB(WRITE8(sdk86_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(sdk86_state, digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(sdk86_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(GND) // Shift key
MCFG_I8279_IN_CTRL_CB(GND)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/selz80.c b/src/mess/drivers/selz80.c
index d56b13899c4..996c86f05d8 100644
--- a/src/mess/drivers/selz80.c
+++ b/src/mess/drivers/selz80.c
@@ -164,10 +164,10 @@ static MACHINE_CONFIG_START( selz80, selz80_state )
/* Devices */
MCFG_DEVICE_ADD("i8279", I8279, 2500000) // based on divider
- MCFG_I8279_OUT_SL_CB(WRITE8(selz80_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(selz80_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(selz80_state, kbd_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
+ MCFG_I8279_OUT_SL_CB(WRITE8(selz80_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(selz80_state, digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(selz80_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
MCFG_I8279_IN_CTRL_CB(VCC)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c
index 52a8a525d43..a7bc232af58 100644
--- a/src/mess/drivers/sg1000.c
+++ b/src/mess/drivers/sg1000.c
@@ -731,7 +731,7 @@ static MACHINE_CONFIG_START( sg1000, sg1000_state )
/* video hardware */
MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(sg1000_state, sg1000_vdp_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(sg1000_state, sg1000_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TMS9918A_TAG, tms9918a_device, screen_update )
diff --git a/src/mess/drivers/sorcerer.c b/src/mess/drivers/sorcerer.c
index 3cfd198cf2d..789479ed52d 100644
--- a/src/mess/drivers/sorcerer.c
+++ b/src/mess/drivers/sorcerer.c
@@ -423,7 +423,7 @@ static MACHINE_CONFIG_START( sorcerer, sorcerer_state )
MCFG_DEVICE_ADD( "uart", AY31015, 0 )
MCFG_AY31015_TX_CLOCK(4800.0)
MCFG_AY31015_RX_CLOCK(4800.0)
-
+
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_printers, "covox")
MCFG_SLOT_OPTION_ADD( "covox", CENTRONICS_COVOX )
@@ -442,7 +442,7 @@ static MACHINE_CONFIG_START( sorcerer, sorcerer_state )
MCFG_CASSETTE_FORMATS(sorcerer_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("sorcerer_cass")
-
+
MCFG_CASSETTE_ADD( "cassette2" )
MCFG_CASSETTE_FORMATS(sorcerer_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
diff --git a/src/mess/drivers/special.c b/src/mess/drivers/special.c
index ddd387ace34..50f7cfb05dc 100644
--- a/src/mess/drivers/special.c
+++ b/src/mess/drivers/special.c
@@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( special, special_state )
MCFG_CASSETTE_FORMATS(rks_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("special_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","special_cass")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/spectrum.c b/src/mess/drivers/spectrum.c
index 04dfda56b9c..3a7479eb71a 100644
--- a/src/mess/drivers/spectrum.c
+++ b/src/mess/drivers/spectrum.c
@@ -716,7 +716,7 @@ MACHINE_CONFIG_START( spectrum_common, spectrum_state )
MCFG_CASSETTE_FORMATS(tzx_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("spectrum_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","spectrum_cass")
/* cartridge */
diff --git a/src/mess/drivers/sun3.c b/src/mess/drivers/sun3.c
index d2db7af7277..28255a78e67 100644
--- a/src/mess/drivers/sun3.c
+++ b/src/mess/drivers/sun3.c
@@ -1,9 +1,9 @@
/***************************************************************************
-
+
sun3.c: preliminary driver for Sun 3 and Sun 3x models.
-
+
status: 3/80 POSTs, 3/460 needs its unique RTC chip (also used by non-3x Sun 3s).
-
+
TODO:
- Z8530 SCC needs to actually speak serial so we can hook up the mouse and keyboard.
- Improve interrupt controller emulation.
@@ -13,8 +13,8 @@
- AM7990 LANCE chip support for everyone.
- Figure out how the parallel printer port maps to Centronics and make it so.
- Much more...
-
-
+
+
Sun-3 Models
------------
@@ -218,7 +218,7 @@
factor. Serial and keyboard ports. External RAM,
framebuffer, and SCSI/ethernet boards
available.
-
+
Sun3X notes from NetBSD and Linux:
RAM_END 0x40000000
@@ -234,7 +234,7 @@
IDPROM1 0x61000c00 (3/470)
MEMREG 0x61001000
INTERREG 0x61001400
- SCC1 0x62000000 (keyboard/mouse)
+ SCC1 0x62000000 (keyboard/mouse)
SCC2 0x62002000 (serial console)
EEPROM 0x64000000
IDPROM2 0x640007d8 (3/80)
@@ -261,7 +261,7 @@
+---+---+---+---+---+---+---+---+---+---+---+---+---+---.---.---+
|BT |FPP|DMA| 0 |VID|RES|FPA|DIA| 0 |CCH|IOC|LBK|DCH| UNUSED |
+---+---+---+---+---+---+---+---+---+---+---+---+---+---.---.---+
-
+
Where: DCH = debug mode for system cache
LBK = VME loopback
IOC = I/O cache enable
@@ -273,9 +273,9 @@
DMA = enable system DVMA
FPP = enable 68881/2 FPU
BT = 0 for boot state, 1 for normal state
-
+
bad '030 MMU mapping: L fef82000 -> P 00000000
-
+
****************************************************************************/
#include "emu.h"
@@ -291,16 +291,16 @@
#include "formats/mfi_dsk.h"
#define TIMEKEEPER_TAG "timekpr"
-#define SCC1_TAG "scc1"
-#define SCC2_TAG "scc2"
-#define ESP_TAG "esp"
-#define FDC_TAG "fdc"
+#define SCC1_TAG "scc1"
+#define SCC2_TAG "scc2"
+#define ESP_TAG "esp"
+#define FDC_TAG "fdc"
class sun3_state : public driver_device
{
public:
sun3_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_scc1(*this, SCC1_TAG),
m_scc2(*this, SCC2_TAG),
@@ -376,7 +376,7 @@ static ADDRESS_MAP_START(sun3_80_mem, AS_PROGRAM, 32, sun3_state)
AM_RANGE(0x61000800, 0x61000803) AM_READWRITE(diag_r, diag_w)
AM_RANGE(0x61001000, 0x61001003) AM_READWRITE(memreg_r, memreg_w)
AM_RANGE(0x61001004, 0x61001007) AM_READWRITE(memrerraddr_r, memrerraddr_w)
- AM_RANGE(0x61001400, 0x61001403) AM_READWRITE(irqctrl_r, irqctrl_w)
+ AM_RANGE(0x61001400, 0x61001403) AM_READWRITE(irqctrl_r, irqctrl_w)
AM_RANGE(0x62000000, 0x6200000f) AM_READWRITE8(scc1_r, scc1_w, 0xff00ff00)
AM_RANGE(0x62002000, 0x6200200f) AM_READWRITE8(scc2_r, scc2_w, 0xff00ff00)
AM_RANGE(0x63000000, 0x6301ffff) AM_ROM AM_REGION("user1",0)
@@ -400,7 +400,7 @@ static ADDRESS_MAP_START(sun3_460_mem, AS_PROGRAM, 32, sun3_state)
AM_RANGE(0x61000800, 0x61000803) AM_READWRITE(diag_r, diag_w)
AM_RANGE(0x61001000, 0x61001003) AM_READWRITE(memreg_r, memreg_w)
AM_RANGE(0x61001004, 0x61001007) AM_READWRITE(memrerraddr_r, memrerraddr_w)
- AM_RANGE(0x61001400, 0x61001403) AM_READWRITE(irqctrl_r, irqctrl_w)
+ AM_RANGE(0x61001400, 0x61001403) AM_READWRITE(irqctrl_r, irqctrl_w)
AM_RANGE(0x62000000, 0x6200000f) AM_READWRITE8(scc1_r, scc1_w, 0xff00ff00)
AM_RANGE(0x62002000, 0x6200200f) AM_READWRITE8(scc2_r, scc2_w, 0xff00ff00)
AM_RANGE(0x63000000, 0x6301ffff) AM_ROM AM_REGION("user1",0)
@@ -411,7 +411,7 @@ ADDRESS_MAP_END
READ32_MEMBER( sun3_state::p4id_r )
{
- return (1<<24); // 0 = hires bw2 1600x1280, 1 = bw2 1152x900, 0x45 is "Ibis" color, blt 0x68 is "Lego" color
+ return (1<<24); // 0 = hires bw2 1600x1280, 1 = bw2 1152x900, 0x45 is "Ibis" color, blt 0x68 is "Lego" color
}
WRITE32_MEMBER( sun3_state::fdc_control_w )
@@ -491,11 +491,11 @@ WRITE32_MEMBER(sun3_state::ramwrite_w)
m_memreg &= ~0x0c;
break;
- case 0xffffffff: // no address adjust, show all 4 lanes as problematic
+ case 0xffffffff: // no address adjust, show all 4 lanes as problematic
break;
}
- m_bInBusErr = true; // prevent recursion
+ m_bInBusErr = true; // prevent recursion
m_maincpu->set_input_line_and_vector(M68K_IRQ_7, ASSERT_LINE, 2);
}
@@ -535,7 +535,7 @@ READ32_MEMBER(sun3_state::enable_r)
WRITE32_MEMBER(sun3_state::enable_w)
{
-// printf("sun3x: %08x to enable (mask %08x)\n", data, mem_mask);
+// printf("sun3x: %08x to enable (mask %08x)\n", data, mem_mask);
COMBINE_DATA(&m_enable);
}
@@ -548,7 +548,7 @@ READ32_MEMBER(sun3_state::buserr_r)
WRITE32_MEMBER(sun3_state::buserr_w)
{
-// printf("sun3x: %08x to buserr (mask %08x)\n", data, mem_mask);
+// printf("sun3x: %08x to buserr (mask %08x)\n", data, mem_mask);
COMBINE_DATA(&m_buserr);
}
@@ -559,7 +559,7 @@ READ32_MEMBER(sun3_state::diag_r)
WRITE32_MEMBER(sun3_state::diag_w)
{
-// printf("sun3x: %08x to diag (mask %08x)\n", data, mem_mask);
+// printf("sun3x: %08x to diag (mask %08x)\n", data, mem_mask);
COMBINE_DATA(&m_diag);
}
@@ -570,7 +570,7 @@ READ32_MEMBER(sun3_state::printer_r)
WRITE32_MEMBER(sun3_state::printer_w)
{
-// printf("sun3x: %08x to printer (mask %08x)\n", data, mem_mask);
+// printf("sun3x: %08x to printer (mask %08x)\n", data, mem_mask);
COMBINE_DATA(&m_printer);
}
@@ -581,7 +581,7 @@ READ32_MEMBER(sun3_state::irqctrl_r)
WRITE32_MEMBER(sun3_state::irqctrl_w)
{
-// printf("sun3x: %08x to interrupt control (mask %08x)\n", data, mem_mask);
+// printf("sun3x: %08x to interrupt control (mask %08x)\n", data, mem_mask);
COMBINE_DATA(&m_irqctrl);
if (data & 0x01000000)
@@ -603,7 +603,7 @@ WRITE32_MEMBER(sun3_state::irqctrl_w)
m_maincpu->set_input_line(M68K_IRQ_7, CLEAR_LINE);
}
}
- else // master enable clear, clear all interrupts
+ else // master enable clear, clear all interrupts
{
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE);
@@ -622,7 +622,7 @@ READ32_MEMBER(sun3_state::memreg_r)
WRITE32_MEMBER(sun3_state::memreg_w)
{
-// printf("sun3x: %08x to memory control (mask %08x)\n", data, mem_mask);
+// printf("sun3x: %08x to memory control (mask %08x)\n", data, mem_mask);
COMBINE_DATA(&m_memreg);
}
@@ -635,7 +635,7 @@ READ32_MEMBER(sun3_state::memrerraddr_r)
WRITE32_MEMBER(sun3_state::memrerraddr_w)
{
-// printf("sun3x: %08x to memory error address (mask %08x)\n", data, mem_mask);
+// printf("sun3x: %08x to memory error address (mask %08x)\n", data, mem_mask);
COMBINE_DATA(&m_memerraddr);
}
@@ -941,7 +941,7 @@ Sun 3/80 V3.0.3 Bootprom
// default NVRAM: includes valid settings for console on framebuffer, boot from SCSI disk, Ethernet ID, more
ROM_REGION( 0x800, TIMEKEEPER_TAG, 0 )
- ROM_LOAD( "timekpr_380.bin", 0x000000, 0x000800, CRC(e76f1aae) SHA1(8e7c36e3928887a94a8133e8416ee4126c31edd7) )
+ ROM_LOAD( "timekpr_380.bin", 0x000000, 0x000800, CRC(e76f1aae) SHA1(8e7c36e3928887a94a8133e8416ee4126c31edd7) )
ROM_END
ROM_START( sun3_460 )
diff --git a/src/mess/drivers/super80.c b/src/mess/drivers/super80.c
index 353ea9003c9..64e1f53d250 100644
--- a/src/mess/drivers/super80.c
+++ b/src/mess/drivers/super80.c
@@ -732,7 +732,7 @@ static MACHINE_CONFIG_START( super80, super80_state )
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_p", super80_state, timer_p, attotime::from_hz(40000)) // cass read
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_k", super80_state, timer_k, attotime::from_hz(300)) // keyb scan
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_h", super80_state, timer_h, attotime::from_hz(100)) // half-speed
diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c
index df1f350315d..a64d4bbe043 100644
--- a/src/mess/drivers/svi318.c
+++ b/src/mess/drivers/svi318.c
@@ -433,7 +433,7 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state )
MCFG_MC6845_ADD("crtc", MC6845, "svi806", XTAL_12MHz / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
- MCFG_MC6845_CHAR_WIDTH(8) /* ? */
+ MCFG_MC6845_CHAR_WIDTH(8) /* ? */
MCFG_MC6845_UPDATE_ROW_CB(svi318_state, crtc_update_row)
MCFG_VIDEO_START_OVERRIDE(svi318_state, svi328_806 )
diff --git a/src/mess/drivers/tecnbras.c b/src/mess/drivers/tecnbras.c
index e34a925a1bc..3a0fed674fe 100644
--- a/src/mess/drivers/tecnbras.c
+++ b/src/mess/drivers/tecnbras.c
@@ -5,11 +5,11 @@
TECNBRAS dot matrix display (70x7 pixels)
Driver by Felipe Correa da Silva Sanches <juca@members.fsf.org>
- The display is composed of 14 blocks of 5x7 LEDs
+ The display is composed of 14 blocks of 5x7 LEDs
- These LEDs are driven by several 74xx chips:
- * one 74138
- * several 74164 and ULN2003 chips
+ These LEDs are driven by several 74xx chips:
+ * one 74138
+ * several 74164 and ULN2003 chips
Changelog:
@@ -34,11 +34,11 @@ public:
DECLARE_WRITE8_MEMBER(set_x_position_w);
DECLARE_WRITE8_MEMBER(print_column_w);
-// DECLARE_WRITE8_MEMBER(tecnbras_io_w);
-// DECLARE_READ8_MEMBER(tecnbras_io_r);
+// DECLARE_WRITE8_MEMBER(tecnbras_io_w);
+// DECLARE_READ8_MEMBER(tecnbras_io_r);
DECLARE_DRIVER_INIT(tecnbras);
private:
- int m_xcoord;
+ int m_xcoord;
char m_digit[14][7];
virtual void machine_start();
virtual void machine_reset();
@@ -84,11 +84,11 @@ WRITE8_MEMBER(tecnbras_state::print_column_w)
void tecnbras_state::machine_start()
{
/*
- for (int x=0; x<14; x++){
- for (int y=0; y<7; y++){
- output_set_indexed_value("dmd_", x*7 + y, y);
- }
- }
+ for (int x=0; x<14; x++){
+ for (int y=0; y<7; y++){
+ output_set_indexed_value("dmd_", x*7 + y, y);
+ }
+ }
*/
}
@@ -103,17 +103,17 @@ static MACHINE_CONFIG_START( tecnbras, tecnbras_state )
MCFG_CPU_IO_MAP(i80c31_io)
/* TODO: Add an I2C RTC (Phillips PCF8583P)
- pin 6 (SCL): cpu T0/P3.4 (pin 14)
+ pin 6 (SCL): cpu T0/P3.4 (pin 14)
pin 5 (SDA): cpu T1/P3.5 (pin 15)
*/
/*
- TODO: Add a speaker
- CPU P1.0 (pin 1)
+ TODO: Add a speaker
+ CPU P1.0 (pin 1)
*/
/*
- TODO: Add a communications port to receive commands from the remote control
+ TODO: Add a communications port to receive commands from the remote control
*/
/* video hardware */
diff --git a/src/mess/drivers/ti630.c b/src/mess/drivers/ti630.c
index 2668fcfa71d..62291fca119 100644
--- a/src/mess/drivers/ti630.c
+++ b/src/mess/drivers/ti630.c
@@ -14,18 +14,18 @@
* LCD works
================
- Messages displayed on screen are in brazilian portuguese.
- During boot, it says:
+ Messages displayed on screen are in brazilian portuguese.
+ During boot, it says:
"TI auto-test."
"Wait!"
- Then it says:
+ Then it says:
"Initializing..."
"Wait!"
- And finally:
+ And finally:
"TI did not receive"
"the dial tone"
@@ -108,54 +108,54 @@ READ8_MEMBER(ti630_state::ti630_io_r)
WRITE8_MEMBER(ti630_state::ti630_io_w)
{
- static UINT8 p0=0, p1=0, p2=0, p3=0;
- switch (offset)
- {
- case 0x00:
- {
- if (data != p0)
- {
- p0=data;
+ static UINT8 p0=0, p1=0, p2=0, p3=0;
+ switch (offset)
+ {
+ case 0x00:
+ {
+ if (data != p0)
+ {
+ p0=data;
#if LOG_IO_PORTS
- printf("Write to P0: %02X\n", data);
+ printf("Write to P0: %02X\n", data);
#endif
- }
- break;
- }
- case 0x01:
- {
- if (data != p1)
- {
- p1=data;
+ }
+ break;
+ }
+ case 0x01:
+ {
+ if (data != p1)
+ {
+ p1=data;
#if LOG_IO_PORTS
- printf("Write to P1: %02X\n", data);
+ printf("Write to P1: %02X\n", data);
#endif
- }
- break;
- }
- case 0x02:
- {
- if (data != p2)
- {
- p2=data;
+ }
+ break;
+ }
+ case 0x02:
+ {
+ if (data != p2)
+ {
+ p2=data;
#if LOG_IO_PORTS
- printf("Write to P2: %02X\n", data);
+ printf("Write to P2: %02X\n", data);
#endif
- }
- break;
- }
- case 0x03:
- {
- if (data != p3)
- {
- p3=data;
+ }
+ break;
+ }
+ case 0x03:
+ {
+ if (data != p3)
+ {
+ p3=data;
#if LOG_IO_PORTS
- printf("Write to P3: %02X\n", data);
+ printf("Write to P3: %02X\n", data);
#endif
- }
- break;
- }
- }
+ }
+ break;
+ }
+ }
}
PALETTE_INIT_MEMBER(ti630_state, ti630)
diff --git a/src/mess/drivers/tiki100.c b/src/mess/drivers/tiki100.c
index d357130cabb..05dba98142a 100644
--- a/src/mess/drivers/tiki100.c
+++ b/src/mess/drivers/tiki100.c
@@ -697,7 +697,7 @@ static MACHINE_CONFIG_START( tiki100, tiki100_state )
MCFG_CASSETTE_ADD(CASSETTE_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
-
+
MCFG_TIMER_DRIVER_ADD_PERIODIC("tape", tiki100_state, tape_tick, attotime::from_hz(44100))
/* sound hardware */
diff --git a/src/mess/drivers/trs80.c b/src/mess/drivers/trs80.c
index 5c6959463ae..56b42ee6376 100644
--- a/src/mess/drivers/trs80.c
+++ b/src/mess/drivers/trs80.c
@@ -592,7 +592,7 @@ static MACHINE_CONFIG_DERIVED( model1, trs80 ) // model I, level II
MCFG_CASSETTE_MODIFY( "cassette" )
MCFG_CASSETTE_FORMATS(trs80l2_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
-
+
MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", 0.5)
MCFG_DEVICE_ADD("wd179x", FD1793, 0) // should be FD1771 or FD1791 but inverted data lines are too tricky to fix now
diff --git a/src/mess/drivers/ut88.c b/src/mess/drivers/ut88.c
index b79fb2e4472..362edb04717 100644
--- a/src/mess/drivers/ut88.c
+++ b/src/mess/drivers/ut88.c
@@ -213,7 +213,7 @@ static MACHINE_CONFIG_START( ut88, ut88_state )
MCFG_CASSETTE_FORMATS(rku_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("ut88_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","ut88")
MACHINE_CONFIG_END
@@ -237,7 +237,7 @@ static MACHINE_CONFIG_START( ut88mini, ut88_state )
MCFG_CASSETTE_FORMATS(rku_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("ut88_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","ut88")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c
index cf76256432b..0feca234696 100644
--- a/src/mess/drivers/vt100.c
+++ b/src/mess/drivers/vt100.c
@@ -454,7 +454,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vt102, vt100 )
MCFG_CPU_REPLACE("maincpu",I8085A, XTAL_24_8832MHz / 9)
MCFG_CPU_PROGRAM_MAP(vt100_mem)
- MCFG_CPU_IO_MAP(vt100_io)
+ MCFG_CPU_IO_MAP(vt100_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vt100_state, vt100_vertical_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vt100_state,vt100_irq_callback)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c
index ad97dc7c3e5..56c517349aa 100644
--- a/src/mess/drivers/vtech1.c
+++ b/src/mess/drivers/vtech1.c
@@ -512,7 +512,7 @@ ROM_START( vz200de )
ROM_END
#define rom_laser200 rom_laser110
-#define rom_fellow rom_laser110
+#define rom_fellow rom_laser110
// It's possible that the Texet TX-8000 came with BASIC V1.0, but this needs to be verified
#define rom_tx8000 rom_laser110
@@ -541,7 +541,7 @@ ROM_START( laser310 )
ROMX_LOAD("vtechv21.u12", 0x0000, 0x4000, CRC(f7df980f) SHA1(5ba14a7a2eedca331b033901080fa5d205e245ea), ROM_BIOS(2))
ROM_END
-#define rom_vz300 rom_laser310
+#define rom_vz300 rom_laser310
#define rom_laser310h rom_laser310
diff --git a/src/mess/drivers/wicat.c b/src/mess/drivers/wicat.c
index a1aedf41df7..10f9aa9a023 100644
--- a/src/mess/drivers/wicat.c
+++ b/src/mess/drivers/wicat.c
@@ -10,9 +10,9 @@ Wicat - various systems.
/*
- TODO:
+ TODO:
- - video DMA is done line by line and needs to be in perfect sync
+ - video DMA is done line by line and needs to be in perfect sync
*/
diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c
index 9d667d90420..888b9c429dc 100644
--- a/src/mess/drivers/x1.c
+++ b/src/mess/drivers/x1.c
@@ -2499,8 +2499,8 @@ static MACHINE_CONFIG_START( x1, x1_state )
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(x1_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
- MCFG_CASSETTE_INTERFACE("x1_cass")
-
+ MCFG_CASSETTE_INTERFACE("x1_cass")
+
MCFG_SOFTWARE_LIST_ADD("cass_list","x1_cass")
MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(x1_floppy_interface)
@@ -2531,7 +2531,7 @@ static MACHINE_CONFIG_DERIVED( x1turbo, x1 )
MCFG_DEVICE_REMOVE("fdc")
MCFG_DEVICE_ADD("fdc", MB8877, 0)
MCFG_WD17XX_DEFAULT_DRIVE4_TAGS
- MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(x1_state,fdc_drq_w))
+ MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(x1_state,fdc_drq_w))
MCFG_YM2151_ADD("ym", MAIN_CLOCK/8) //option board
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
@@ -2647,4 +2647,4 @@ COMP( 1982, x1, 0, 0, x1, x1, driver_device, 0,
// x1twin in x1twin.c
COMP( 1984, x1turbo, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 Turbo (CZ-850C)", GAME_NOT_WORKING ) //model 10
COMP( 1985, x1turbo40, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 Turbo (CZ-862C)", 0 ) //model 40
-//COMP( 1986, x1turboz, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 TurboZ", GAME_NOT_WORKING ) \ No newline at end of file
+//COMP( 1986, x1turboz, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 TurboZ", GAME_NOT_WORKING )
diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c
index 8505959262f..42a362a2fa8 100644
--- a/src/mess/drivers/x1twin.c
+++ b/src/mess/drivers/x1twin.c
@@ -501,7 +501,7 @@ static MACHINE_CONFIG_START( x1twin, x1twin_state )
MCFG_CASSETTE_FORMATS(x1_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("x1_cass")
-
+
MCFG_SOFTWARE_LIST_ADD("cass_list","x1_cass")
MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(x1_floppy_interface)
diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c
index 5d17498d86e..ade8ac624ae 100644
--- a/src/mess/drivers/x68k.c
+++ b/src/mess/drivers/x68k.c
@@ -1636,7 +1636,7 @@ static MACHINE_CONFIG_START( x68000, x68k_state )
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
MCFG_CPU_PROGRAM_MAP(x68k_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
-
+
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_MACHINE_START_OVERRIDE(x68k_state, x68000 )
@@ -1661,7 +1661,7 @@ static MACHINE_CONFIG_START( x68000, x68k_state )
MCFG_I8255_OUT_PORTC_CB(WRITE8(x68k_state, ppi_port_c_w))
MCFG_DEVICE_ADD("hd63450", HD63450, 0)
- MCFG_HD63450_CPU("maincpu") // CPU - 68000
+ MCFG_HD63450_CPU("maincpu") // CPU - 68000
MCFG_HD63450_CLOCKS(attotime::from_usec(2), attotime::from_nsec(450), attotime::from_usec(4), attotime::from_hz(15625/2))
MCFG_HD63450_BURST_CLOCKS(attotime::from_usec(2), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50))
MCFG_HD63450_DMA_END_CB(WRITE8(x68k_state, dma_end))
diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c
index f25722b20f2..23e9c534aa1 100644
--- a/src/mess/drivers/xerox820.c
+++ b/src/mess/drivers/xerox820.c
@@ -328,7 +328,7 @@ WRITE8_MEMBER( xerox820ii_state::rdpio_pb_w )
bit description
- 0 NBSY
+ 0 NBSY
1 NMSG
2 NC/D
3 NREQ
diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c
index e1ccc82c7b8..b25c966fea5 100644
--- a/src/mess/drivers/z9001.c
+++ b/src/mess/drivers/z9001.c
@@ -236,7 +236,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state )
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(z9001_state, port88_w))
- MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_9_8304MHz / 4) // keyboard PIO
+ MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_9_8304MHz / 4) // keyboard PIO
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_9_8304MHz / 4)
diff --git a/src/mess/drivers/zorba.c b/src/mess/drivers/zorba.c
index 059943cda74..2e4e8b224c6 100644
--- a/src/mess/drivers/zorba.c
+++ b/src/mess/drivers/zorba.c
@@ -322,8 +322,8 @@ static MACHINE_CONFIG_START( zorba, zorba_state )
/* devices */
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_24MHz/6)
// busack on cpu connects to bai pin
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(zorba_state, busreq_w)) //connects to busreq on cpu
- MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // connects to IRQ0 on cpu
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(zorba_state, busreq_w)) //connects to busreq on cpu
+ MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // connects to IRQ0 on cpu
//ba0 - not connected
MCFG_Z80DMA_IN_MREQ_CB(READ8(zorba_state, memory_read_byte))
MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(zorba_state, memory_write_byte))
diff --git a/src/mess/drivers/zx.c b/src/mess/drivers/zx.c
index f6ce222a3b9..48db70d4f2e 100644
--- a/src/mess/drivers/zx.c
+++ b/src/mess/drivers/zx.c
@@ -403,7 +403,7 @@ static MACHINE_CONFIG_DERIVED( zx81, zx80 )
MCFG_GFXDECODE_MODIFY("gfxdecode", zx81)
MCFG_CASSETTE_MODIFY( "cassette" )
- MCFG_CASSETTE_FORMATS(zx81_p_format)
+ MCFG_CASSETTE_FORMATS(zx81_p_format)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ts1000, zx81 )
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c
index 00eb19cd089..0040187ec6e 100644
--- a/src/mess/machine/amstrad.c
+++ b/src/mess/machine/amstrad.c
@@ -2822,7 +2822,7 @@ static const UINT8 amstrad_cycle_table_ex[256]=
8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0
};
-#define NEXT_ROM_SLOT m_rom_count++; \
+#define NEXT_ROM_SLOT m_rom_count++; \
if(slot3 && m_rom_count == 3) m_rom_count++; \
if(slot7 && m_rom_count == 7) m_rom_count++;
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index 805903146b6..03682652d25 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -97,13 +97,13 @@ INPUT_PORTS_START( apollo_config )
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
PORT_CONFSETTING(APOLLO_CONF_25_YEARS_AGO, DEF_STR ( On ) )
-// PORT_CONFNAME(APOLLO_CONF_NODE_ID, APOLLO_CONF_NODE_ID, "Node ID from Disk")
-// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
-// PORT_CONFSETTING(APOLLO_CONF_NODE_ID, DEF_STR ( On ) )
+// PORT_CONFNAME(APOLLO_CONF_NODE_ID, APOLLO_CONF_NODE_ID, "Node ID from Disk")
+// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
+// PORT_CONFSETTING(APOLLO_CONF_NODE_ID, DEF_STR ( On ) )
-// PORT_CONFNAME(APOLLO_CONF_IDLE_SLEEP, 0x00, "Idle Sleep")
-// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
-// PORT_CONFSETTING(APOLLO_CONF_IDLE_SLEEP, DEF_STR ( On ) )
+// PORT_CONFNAME(APOLLO_CONF_IDLE_SLEEP, 0x00, "Idle Sleep")
+// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
+// PORT_CONFSETTING(APOLLO_CONF_IDLE_SLEEP, DEF_STR ( On ) )
PORT_CONFNAME(APOLLO_CONF_TRAP_TRACE, 0x00, "Trap Trace")
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
@@ -113,13 +113,13 @@ INPUT_PORTS_START( apollo_config )
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
PORT_CONFSETTING(APOLLO_CONF_FPU_TRACE, DEF_STR ( On ) )
-// PORT_CONFNAME(APOLLO_CONF_DISK_TRACE, 0x00, "Disk Trace")
-// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
-// PORT_CONFSETTING(APOLLO_CONF_DISK_TRACE, DEF_STR ( On ) )
+// PORT_CONFNAME(APOLLO_CONF_DISK_TRACE, 0x00, "Disk Trace")
+// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
+// PORT_CONFSETTING(APOLLO_CONF_DISK_TRACE, DEF_STR ( On ) )
-// PORT_CONFNAME(APOLLO_CONF_NET_TRACE, 0x00, "Network Trace")
-// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
-// PORT_CONFSETTING(APOLLO_CONF_NET_TRACE, DEF_STR ( On ) )
+// PORT_CONFNAME(APOLLO_CONF_NET_TRACE, 0x00, "Network Trace")
+// PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
+// PORT_CONFSETTING(APOLLO_CONF_NET_TRACE, DEF_STR ( On ) )
INPUT_PORTS_END
@@ -740,7 +740,7 @@ void apollo_sio::device_reset()
ip3_w((input_data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
ip4_w((input_data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
ip5_w((input_data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
-// ip6_w((input_data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
+// ip6_w((input_data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
// MC2681 has IP[6] (instead of /IACK on MC68681)
m_ip6 = (input_data & 0x40) ? ASSERT_LINE : CLEAR_LINE;
@@ -829,7 +829,7 @@ WRITE_LINE_MEMBER(apollo_state::sio_irq_handler)
WRITE8_MEMBER(apollo_state::sio_output)
{
-// CLOG2(("apollo_sio - sio_output %02x", data));
+// CLOG2(("apollo_sio - sio_output %02x", data));
if ((data & 0x80) != (sio_output_data & 0x80))
{
diff --git a/src/mess/machine/apple1.c b/src/mess/machine/apple1.c
index 84268216947..4ffd0f563ae 100644
--- a/src/mess/machine/apple1.c
+++ b/src/mess/machine/apple1.c
@@ -400,5 +400,3 @@ TIMER_CALLBACK_MEMBER(apple1_state::apple1_dsp_ready_end)
another display write. */
pia->cb1_w(1);
}
-
-
diff --git a/src/mess/machine/apple2.c b/src/mess/machine/apple2.c
index c18cc1a8f7f..76105da903d 100644
--- a/src/mess/machine/apple2.c
+++ b/src/mess/machine/apple2.c
@@ -354,7 +354,7 @@ READ8_MEMBER(apple2_state::apple2_c080_r)
offset &= 0xf;
if (offset >= 8 && offset <= 0xb)
{
- return m_acia1->read(space, offset-8);
+ return m_acia1->read(space, offset-8);
}
}
else if (slot == 2)
@@ -362,7 +362,7 @@ READ8_MEMBER(apple2_state::apple2_c080_r)
offset &= 0xf;
if (offset >= 8 && offset <= 0xb)
{
- return m_acia2->read(space, offset-8);
+ return m_acia2->read(space, offset-8);
}
}
}
diff --git a/src/mess/machine/apple3.c b/src/mess/machine/apple3.c
index b48dabe8490..b6acd44537e 100644
--- a/src/mess/machine/apple3.c
+++ b/src/mess/machine/apple3.c
@@ -39,7 +39,7 @@
bits 0-5: 6-bit audio DAC output
bit 6: screen blank
bit 7: OR of NMI from slots
-
+
***************************************************************************/
#include "emu.h"
@@ -157,27 +157,27 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r)
pdl_handler(offset);
break;
- case 0x60: // joystick switch 0
+ case 0x60: // joystick switch 0
case 0x68:
result = (m_joybuttons->read() & 1) ? 0x80 : 0x00;
break;
- case 0x61: // joystick switch 1 (margin switch for Silentype)
+ case 0x61: // joystick switch 1 (margin switch for Silentype)
case 0x69:
result = (m_joybuttons->read() & 4) ? 0x80 : 0x00;
break;
- case 0x62: // joystick switch 2
+ case 0x62: // joystick switch 2
case 0x6a:
result = (m_joybuttons->read() & 2) ? 0x80 : 0x00;
break;
- case 0x63: // joystick switch 3 (serial clock for silentype)
+ case 0x63: // joystick switch 3 (serial clock for silentype)
case 0x6b:
result = (m_joybuttons->read() & 8) ? 0x80 : 0x00;
break;
- case 0x66: // paddle A/D conversion done (bit 7 = 1 while counting, 0 when done)
+ case 0x66: // paddle A/D conversion done (bit 7 = 1 while counting, 0 when done)
case 0x6e:
return m_ramp_active ? 0x80 : 0x00;
break;
@@ -1197,7 +1197,7 @@ void apple3_state::pdl_handler(int offset)
}
m_pdltimer->adjust(attotime::from_hz(1000000.0));
m_ramp_active = true;
- break;
+ break;
case 0x5e:
m_analog_sel &= ~2;
@@ -1231,4 +1231,3 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple3_state::paddle_timer)
m_pdltimer->adjust(attotime::from_hz(1000000.0));
}
}
-
diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c
index 998f0963a83..a0f6425618f 100644
--- a/src/mess/machine/beta.c
+++ b/src/mess/machine/beta.c
@@ -142,7 +142,7 @@ WRITE8_MEMBER(beta_disk_device::param_w)
{
const char *floppy_tags[4] = { FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3 };
- if (m_betadisk_active == 1)
+ if (m_betadisk_active == 1)
{
m_wd179x->set_drive(data & 3);
m_wd179x->set_side ((data & 0x10) ? 0 : 1 );
diff --git a/src/mess/machine/dec_lk201.c b/src/mess/machine/dec_lk201.c
index ee822b10b8f..c1537b31555 100644
--- a/src/mess/machine/dec_lk201.c
+++ b/src/mess/machine/dec_lk201.c
@@ -230,14 +230,14 @@ const rom_entry *lk201_device::device_rom_region() const
DEC omitted terms like 'Interrupt', 'Break' and 'Data / Talk' on some keyboards,
so Fn numbers are definitely important for end users.
-
+
=== CURRENT SPECIAL KEYS ===
- [PC-AT] ......=> [DEC]
- LEFT CONTROL..=> Control
- LEFT ALT .....=> Compose
-
- RIGHT ALT ....=> Help
- RIGHT CONTROL => Do
+ [PC-AT] ......=> [DEC]
+ LEFT CONTROL..=> Control
+ LEFT ALT .....=> Compose
+
+ RIGHT ALT ....=> Help
+ RIGHT CONTROL => Do
==============================================================================================
=== (PC - AT ) keys above cursor block ===
* KEYCODE_INSERT * KEYCODE_HOME * KEYCODE_PGUP
@@ -249,9 +249,9 @@ const rom_entry *lk201_device::device_rom_region() const
==============================================================================================
=== CURRENT NUM PAD ASSIGNMENTS ===
[PF1] to [PF4] are mapped to NUM LOCK, SLASH etc. (=> 4 keys on top on num pad).
- Num pad '+' gives ',' on the DEC.
+ Num pad '+' gives ',' on the DEC.
',' translates to '.' (=> more or less the layout of model 'LK-201-AG')
-
+
Switch between 'full' and 'partial keyboard emulation' with Scroll Lock.
*/
@@ -276,7 +276,7 @@ INPUT_PORTS_START( lk201 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Compose") PORT_CODE(KEYCODE_LALT)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK)
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL)
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL)
PORT_START("KBD2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
@@ -369,8 +369,8 @@ INPUT_PORTS_START( lk201 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START("KBD11")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("/") PORT_CODE(KEYCODE_SLASH)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(";") PORT_CODE(KEYCODE_COLON)
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("/") PORT_CODE(KEYCODE_SLASH)
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(";") PORT_CODE(KEYCODE_COLON)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) // FIXME - duplicate "Return"
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("P") PORT_CODE(KEYCODE_P)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("0") PORT_CODE(KEYCODE_0)
@@ -394,7 +394,7 @@ INPUT_PORTS_START( lk201 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("'") PORT_CODE(KEYCODE_QUOTE)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("[") PORT_CODE(KEYCODE_OPENBRACE)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Previous [^]") PORT_CODE(KEYCODE_END)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Do (F16) [Ausfuehren]") PORT_CODE(KEYCODE_RCONTROL)
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Do (F16) [Ausfuehren]") PORT_CODE(KEYCODE_RCONTROL)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("-") PORT_CODE(KEYCODE_MINUS)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Insert Here") PORT_CODE(KEYCODE_HOME)
@@ -433,7 +433,7 @@ INPUT_PORTS_START( lk201 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Num ,") PORT_CODE(KEYCODE_PLUS_PAD)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) // PORT_NAME("Num -") = duplicate...see KBD13
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PF4") PORT_CODE(KEYCODE_MINUS_PAD)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F20")
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F20")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F19")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -755,4 +755,3 @@ WRITE8_MEMBER( lk201_device::spi_w )
// printf("SPI %02x to %x (PC=%x)\n", data, offset, m_maincpu->pc());
}
-
diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c
index 7c5139b4d1d..c919cceb077 100644
--- a/src/mess/machine/genpc.c
+++ b/src/mess/machine/genpc.c
@@ -422,7 +422,7 @@ static MACHINE_CONFIG_FRAGMENT( ibm5160_mb_config )
MCFG_I8237_OUT_DACK_1_CB(WRITELINE(ibm5160_mb_device, pc_dack1_w))
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(ibm5160_mb_device, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(ibm5160_mb_device, pc_dack3_w))
-
+
MCFG_PIC8259_ADD( "pic8259", INPUTLINE(":maincpu", 0), VCC, NULL )
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
diff --git a/src/mess/machine/hp48.c b/src/mess/machine/hp48.c
index e966887c6b2..275d6a09a71 100644
--- a/src/mess/machine/hp48.c
+++ b/src/mess/machine/hp48.c
@@ -682,7 +682,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::hp48_timer2_cb)
NCE1 256KB ROM 512KB ROM 2MB flash ROM
- - NCE1 (ROM) cannot be configured, it is always visible at addresses
+ - NCE1 (ROM) cannot be configured, it is always visible at addresses
00000-7ffff not covered by higher priority modules.
- only the address of HDW (I/O) can be configured, its size is constant
@@ -712,7 +712,7 @@ void hp48_state::hp48_apply_modules()
LOG(( "hp48_apply_modules: high ROM bank is %i\n", bank_hi ));
space.install_read_bank( 0x00000, 0x3ffff, 0, 0x80000, "bank5" );
space.install_read_bank( 0x40000, 0x7ffff, 0, 0x80000, "bank6" );
- if ( m_rom )
+ if ( m_rom )
{
membank("bank5")->set_base( m_rom + bank_lo * 0x40000 );
membank("bank6")->set_base( m_rom + bank_hi * 0x40000 );
@@ -743,7 +743,7 @@ void hp48_state::hp48_apply_modules()
LOG(( "hp48_apply_modules: A19 disabled, NCE3 %s\n", nce3_enable ? "enabled" : "disabled" ));
space.install_read_bank( 0, 0x7ffff, 0, 0x80000, "bank5" );
}
- if ( m_rom )
+ if ( m_rom )
membank("bank5")->set_base( m_rom );
}
else
diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c
index 5cc78cfa073..1c4d2d10f31 100644
--- a/src/mess/machine/msx.c
+++ b/src/mess/machine/msx.c
@@ -527,4 +527,3 @@ WRITE8_MEMBER( msx_state::msx_switched_w )
this->space().write_byte( (m_current_switched_device << 8) | offset, data );
}
}
-
diff --git a/src/mess/machine/msx_matsushita.c b/src/mess/machine/msx_matsushita.c
index fc2540afa02..52c2ea201b1 100644
--- a/src/mess/machine/msx_matsushita.c
+++ b/src/mess/machine/msx_matsushita.c
@@ -165,4 +165,3 @@ WRITE8_MEMBER(msx_matsushita_device::io_write)
break;
}
}
-
diff --git a/src/mess/machine/msx_s1985.c b/src/mess/machine/msx_s1985.c
index 588fb668695..ab1ce03c297 100644
--- a/src/mess/machine/msx_s1985.c
+++ b/src/mess/machine/msx_s1985.c
@@ -62,4 +62,3 @@ WRITE8_MEMBER(msx_s1985_device::io_write)
break;
}
}
-
diff --git a/src/mess/machine/msx_switched.c b/src/mess/machine/msx_switched.c
index 9b416c7df7d..cf81126f94b 100644
--- a/src/mess/machine/msx_switched.c
+++ b/src/mess/machine/msx_switched.c
@@ -18,4 +18,3 @@ void msx_switched_device::device_start()
space.install_read_handler(start, end, read8_delegate(FUNC(msx_switched_device::io_read), this));
space.install_write_handler(start, end, write8_delegate(FUNC(msx_switched_device::io_write), this));
}
-
diff --git a/src/mess/machine/msx_systemflags.c b/src/mess/machine/msx_systemflags.c
index 6f6bb176af6..78b39a9335b 100644
--- a/src/mess/machine/msx_systemflags.c
+++ b/src/mess/machine/msx_systemflags.c
@@ -36,4 +36,3 @@ WRITE8_MEMBER(msx_systemflags_device::write)
{
m_system_flags = data;
}
-
diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c
index f0a299cb3e1..7dd99365950 100644
--- a/src/mess/machine/nes.c
+++ b/src/mess/machine/nes.c
@@ -158,7 +158,7 @@ void nes_state::machine_start()
m_ppu->set_latch(ppu2c0x_latch_delegate(FUNC(device_nes_cart_interface::ppu_latch),m_cartslot->m_cart));
// install additional handlers (read_h, read_ex, write_ex)
- if (m_cartslot->get_pcb_id() == STD_EXROM || m_cartslot->get_pcb_id() == STD_NROM368
+ if (m_cartslot->get_pcb_id() == STD_EXROM || m_cartslot->get_pcb_id() == STD_NROM368
|| m_cartslot->get_pcb_id() == GG_NROM || m_cartslot->get_pcb_id() == CAMERICA_ALADDIN || m_cartslot->get_pcb_id() == SUNSOFT_DCS
|| m_cartslot->get_pcb_id() == BANDAI_DATACH || m_cartslot->get_pcb_id() == BANDAI_KARAOKE || m_cartslot->get_pcb_id() == BTL_2A03_PURITANS || m_cartslot->get_pcb_id() == AVE_MAXI15
|| m_cartslot->get_pcb_id() == KAISER_KS7022 || m_cartslot->get_pcb_id() == KAISER_KS7031 || m_cartslot->get_pcb_id() == BMC_VT5201
diff --git a/src/mess/machine/radio86.c b/src/mess/machine/radio86.c
index 21b79efdb94..4e77c33ef15 100644
--- a/src/mess/machine/radio86.c
+++ b/src/mess/machine/radio86.c
@@ -221,4 +221,3 @@ void radio86_state::video_start()
{
m_charmap = memregion("gfx1")->base();
}
-
diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c
index 8a0bb42f457..2aad7a7ef2c 100644
--- a/src/mess/machine/rmnimbus.c
+++ b/src/mess/machine/rmnimbus.c
@@ -178,7 +178,6 @@ static void decode_dssi_f_rw_sectors(device_t *device,UINT16 ds, UINT16 si, UIN
void rmnimbus_state::external_int(UINT8 vector, bool state)
{
-
if(!state && (vector != m_vector))
return;
diff --git a/src/mess/machine/super80.c b/src/mess/machine/super80.c
index 56e91066006..10123313022 100644
--- a/src/mess/machine/super80.c
+++ b/src/mess/machine/super80.c
@@ -57,15 +57,15 @@ TIMER_DEVICE_CALLBACK_MEMBER( super80_state::timer_k )
}
/* cassette load circuit
- This "emulates" U79 CD4046BCN PLL chip and U1 LM311P op-amp. U79 converts a frequency to a voltage,
- and U1 amplifies that voltage to digital levels. U1 has a trimpot connected, to set the midpoint.
+ This "emulates" U79 CD4046BCN PLL chip and U1 LM311P op-amp. U79 converts a frequency to a voltage,
+ and U1 amplifies that voltage to digital levels. U1 has a trimpot connected, to set the midpoint.
- The MDS homebrew input circuit consists of 2 op-amps followed by a D-flipflop.
- The "read-any-system" cassette circuit is a CA3140 op-amp, the smarts being done in software.
+ The MDS homebrew input circuit consists of 2 op-amps followed by a D-flipflop.
+ The "read-any-system" cassette circuit is a CA3140 op-amp, the smarts being done in software.
- bit 0 = original system (U79 and U1)
- bit 1 = MDS fast system
- bit 2 = CA3140 */
+ bit 0 = original system (U79 and U1)
+ bit 1 = MDS fast system
+ bit 2 = CA3140 */
TIMER_DEVICE_CALLBACK_MEMBER( super80_state::timer_p )
{
UINT8 cass_ws=0;
diff --git a/src/mess/tools/castool/main.c b/src/mess/tools/castool/main.c
index 410a4f6a3ca..3223a69328f 100644
--- a/src/mess/tools/castool/main.c
+++ b/src/mess/tools/castool/main.c
@@ -88,7 +88,7 @@ const struct SupportedCassetteFormats formats[] = {
{"rka", rka_cassette_formats ,"Apogee"},
{"rkm", rkm_cassette_formats ,"Mikrosha"},
{"rkp", rkp_cassette_formats ,"Partner"},
- {"sc3000", sc3000_cassette_formats ,"Sega SC-3000"},
+ {"sc3000", sc3000_cassette_formats ,"Sega SC-3000"},
{"sordm5", sordm5_cassette_formats ,"Sord M5"},
{"svi", svi_cassette_formats ,"SVI"},
{"to7", to7_cassette_formats ,"Thomson TO"},
diff --git a/src/mess/tools/imgtool/modules/hp48.c b/src/mess/tools/imgtool/modules/hp48.c
index 126f389093f..9e0492191ab 100644
--- a/src/mess/tools/imgtool/modules/hp48.c
+++ b/src/mess/tools/imgtool/modules/hp48.c
@@ -21,15 +21,15 @@
Currently, we only support storing host files into backup objects and
retreiving backup objects into files.
- For attached library objects in the memory card, we only show their name, but
+ For attached library objects in the memory card, we only show their name, but
cannot retrieve their contents.
To install a library contained in a host file, copy it with imgtool to
the card; it creates a backup object visible in the "PORTS" menu;
- then evalue the object, store it into some port (e.g, 0 STO),
- turn off the HP48 and back on; the library should now be attached and
- visible in the "LIBRARY" menu.
- (The process is similar to installing a library from a file you get
+ then evalue the object, store it into some port (e.g, 0 STO),
+ turn off the HP48 and back on; the library should now be attached and
+ visible in the "LIBRARY" menu.
+ (The process is similar to installing a library from a file you get
from the serial interface.)
*/
@@ -60,16 +60,16 @@
total length: len+4
- i.e., the backup object is a container containing the object name
- and two objects: the backuped object itself and a system integer
+ i.e., the backup object is a container containing the object name
+ and two objects: the backuped object itself and a system integer
that contains the CRC.
- HP48 host files start with a "HPHP48-X" header (where X can be any
- single letter, which denotes a ROM revision and, implicitly, whether
+ HP48 host files start with a "HPHP48-X" header (where X can be any
+ single letter, which denotes a ROM revision and, implicitly, whether
the program is for the S/SX or the G/GX family).
- When storing a file to the memory card, we strip the header and
+ When storing a file to the memory card, we strip the header and
embed the object into a backup object with the correct CRC.
- When copying from the memory card to a host file, we extract the object
+ When copying from the memory card to a host file, we extract the object
from the backup container, stripping its CRC, and add the HPHP48-X header.
*/
@@ -91,34 +91,34 @@
*****************************************************************************/
-struct hp48_card
+struct hp48_card
{
imgtool_stream *stream;
- int modified;
-
- /* size, in bytes of card data: from 32 KB to 4 MB */
- int size;
-
- /* we store each nibble (4-bit) into its own byte, for simpler addressing;
- hence, data has 2*size
- */
- UINT8* data;
-
+ int modified;
+
+ /* size, in bytes of card data: from 32 KB to 4 MB */
+ int size;
+
+ /* we store each nibble (4-bit) into its own byte, for simpler addressing;
+ hence, data has 2*size
+ */
+ UINT8* data;
+
};
struct hp48_partition
{
- /* pointer to the begining of the partition inside the hp48_card */
- UINT8* data;
+ /* pointer to the begining of the partition inside the hp48_card */
+ UINT8* data;
+
+ /* size, in bytes (128 KB or less) */
+ int size;
- /* size, in bytes (128 KB or less) */
- int size;
-
};
-struct hp48_directory
+struct hp48_directory
{
- int pos;
+ int pos;
};
@@ -146,175 +146,175 @@ static const char hp48_create_optionspec[] = "S32/64/[128]/256/512/1024/2048/409
/*****************************************************************************
Utility functions
*****************************************************************************/
-
+
/* byes to nibbles */
static void unpack(UINT8* dst, UINT8* src, int nsize)
{
- int i;
-
- if ( nsize & 1 )
- {
- dst[nsize-1] = src[nsize/2] & 0xf;
- }
-
- for ( i = nsize/2-1; i >= 0; i-- )
- {
- dst[2*i+1] = src[i] >> 4;
- dst[2*i ] = src[i] & 0xf;
- }
+ int i;
+
+ if ( nsize & 1 )
+ {
+ dst[nsize-1] = src[nsize/2] & 0xf;
+ }
+
+ for ( i = nsize/2-1; i >= 0; i-- )
+ {
+ dst[2*i+1] = src[i] >> 4;
+ dst[2*i ] = src[i] & 0xf;
+ }
}
/* nibbles to bytes */
static void pack(UINT8* dst, UINT8* src, int nsize)
{
- int i;
+ int i;
- for ( i = 0 ; i < nsize/2; i++ )
- {
- dst[i] = (src[2*i] & 0xf) | (src[2*i+1] << 4);
- }
+ for ( i = 0 ; i < nsize/2; i++ )
+ {
+ dst[i] = (src[2*i] & 0xf) | (src[2*i+1] << 4);
+ }
- if ( nsize & 1 )
- {
- dst[nsize/2] = src[nsize-1] & 0xf;
- }
- }
+ if ( nsize & 1 )
+ {
+ dst[nsize/2] = src[nsize-1] & 0xf;
+ }
+ }
static int read20(UINT8* data)
{
- return data[0] | (data[1] << 4) | (data[2] << 8) | (data[3] << 12) | (data[4] << 16);
+ return data[0] | (data[1] << 4) | (data[2] << 8) | (data[3] << 12) | (data[4] << 16);
}
static int read8(UINT8* data)
{
- return data[0] | (data[1] << 4);
+ return data[0] | (data[1] << 4);
}
static void readstring(char* dst, UINT8* data, int nb)
{
- int i;
- for ( i = 0; i < nb; i++ )
- {
- dst[i] = read8( data + 2*i );
- }
- dst[nb] = 0;
+ int i;
+ for ( i = 0; i < nb; i++ )
+ {
+ dst[i] = read8( data + 2*i );
+ }
+ dst[nb] = 0;
}
static void write20(UINT8* data, int v)
{
- data[0] = v & 0xf;
- data[1] = (v >> 4) & 0xf;
- data[2] = (v >> 8) & 0xf;
- data[3] = (v >> 12) & 0xf;
- data[4] = (v >> 16) & 0xf;
+ data[0] = v & 0xf;
+ data[1] = (v >> 4) & 0xf;
+ data[2] = (v >> 8) & 0xf;
+ data[3] = (v >> 12) & 0xf;
+ data[4] = (v >> 16) & 0xf;
}
static void write8(UINT8* data, int v)
{
- data[0] = v & 0xf;
- data[1] = (v >> 4) & 0xf;
+ data[0] = v & 0xf;
+ data[1] = (v >> 4) & 0xf;
}
static void writestring(UINT8* data, const char* str, int nb)
{
- int i;
- for ( i = 0; i < nb; i++ )
- {
- write8( data + 2*i, str[i] );
- }
+ int i;
+ for ( i = 0; i < nb; i++ )
+ {
+ write8( data + 2*i, str[i] );
+ }
}
/* go to the end, return its offset */
static int find_end(hp48_partition* p)
{
- int pos = 0;
- while (1)
- {
- if ( pos + 10 > 2*p->size) break;
-
- int prolog = read20( p->data + pos );
- if ( !IS_OBJECT( prolog )) break;
-
- pos += read20( p->data + pos + 5 ) + 5;
- }
-
- if ( pos > 2*p->size ) pos = 2*p->size;
- return pos;
+ int pos = 0;
+ while (1)
+ {
+ if ( pos + 10 > 2*p->size) break;
+
+ int prolog = read20( p->data + pos );
+ if ( !IS_OBJECT( prolog )) break;
+
+ pos += read20( p->data + pos + 5 ) + 5;
+ }
+
+ if ( pos > 2*p->size ) pos = 2*p->size;
+ return pos;
}
/* find the backup object with the given name, returns its offset or -1 (not found) */
static int find_file(hp48_partition* p, const char* filename, int *ptotalsize, int* pstart, int* pcontentsize)
{
- UINT8* data = p->data;
- int pos = 0;
-
- /* find file */
- while (1)
- {
- if ( pos + 10 > 2*p->size) return -1;
-
- /* get prolog */
- int prolog = read20( data+pos );
- if ( !IS_OBJECT(prolog)) return -1;
-
- /* get size */
- int totalsize = read20( data+pos+5 );
- if ( totalsize < 14) return -1;
- if ( pos + 5 + totalsize > 2*p->size ) return -1;
-
- if ( prolog == PROLOG_BACKUP )
- {
- /* get name */
- int namelen = read8( data + pos + 10 );
- char name[257];
- if ( 9 + 2*namelen > totalsize ) return -1;
- readstring( name, data + pos + 12, namelen );
-
- /* check name */
- if ( !strcmp( name, filename ) )
- {
- /* found! */
- if ( ptotalsize ) *ptotalsize = totalsize;
- if ( pstart ) *pstart = pos + 14 + 2*namelen;
- if ( pcontentsize ) *pcontentsize = totalsize - (9 + 2*namelen);
- return pos;
- }
- else
- {
- /* skip */
- pos += totalsize + 5;
- }
- }
- else
- {
- /* skip */
- pos += totalsize + 5;
- }
-
- }
-
- return -1;
+ UINT8* data = p->data;
+ int pos = 0;
+
+ /* find file */
+ while (1)
+ {
+ if ( pos + 10 > 2*p->size) return -1;
+
+ /* get prolog */
+ int prolog = read20( data+pos );
+ if ( !IS_OBJECT(prolog)) return -1;
+
+ /* get size */
+ int totalsize = read20( data+pos+5 );
+ if ( totalsize < 14) return -1;
+ if ( pos + 5 + totalsize > 2*p->size ) return -1;
+
+ if ( prolog == PROLOG_BACKUP )
+ {
+ /* get name */
+ int namelen = read8( data + pos + 10 );
+ char name[257];
+ if ( 9 + 2*namelen > totalsize ) return -1;
+ readstring( name, data + pos + 12, namelen );
+
+ /* check name */
+ if ( !strcmp( name, filename ) )
+ {
+ /* found! */
+ if ( ptotalsize ) *ptotalsize = totalsize;
+ if ( pstart ) *pstart = pos + 14 + 2*namelen;
+ if ( pcontentsize ) *pcontentsize = totalsize - (9 + 2*namelen);
+ return pos;
+ }
+ else
+ {
+ /* skip */
+ pos += totalsize + 5;
+ }
+ }
+ else
+ {
+ /* skip */
+ pos += totalsize + 5;
+ }
+
+ }
+
+ return -1;
}
-/* CRC computing.
+/* CRC computing.
This is the same CRC that is computed by the HP48 hardware.
*/
static UINT16 crc(UINT8* data, int len)
{
- UINT16 crc = 0;
- int i;
-
- for ( i = 0; i < len; i++ )
- {
- crc = (crc >> 4) ^ (((crc ^ data[i]) & 0xf) * 0x1081);
- }
-
- return crc;
+ UINT16 crc = 0;
+ int i;
+
+ for ( i = 0; i < len; i++ )
+ {
+ crc = (crc >> 4) ^ (((crc ^ data[i]) & 0xf) * 0x1081);
+ }
+
+ return crc;
}
@@ -329,31 +329,31 @@ static imgtoolerr_t hp48_open(imgtool_image *img, imgtool_stream *stream)
hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
int size = stream_size( stream );
- /* check that size is a power of 2 between 32 KB and 4 MG */
- if ( (size < 32 * 1024) ||
- (size > 4 * 1024 * 1024) ||
- (size & (size-1)) )
- {
- return IMGTOOLERR_CORRUPTIMAGE;
- }
+ /* check that size is a power of 2 between 32 KB and 4 MG */
+ if ( (size < 32 * 1024) ||
+ (size > 4 * 1024 * 1024) ||
+ (size & (size-1)) )
+ {
+ return IMGTOOLERR_CORRUPTIMAGE;
+ }
- /* store info */
+ /* store info */
c->stream = stream;
c->modified = 0;
- c->size = size;
- c->data = (UINT8*) malloc( 2 * size );
- if ( !c->data )
- {
- return IMGTOOLERR_READERROR;
- }
-
- /* fully load image */
+ c->size = size;
+ c->data = (UINT8*) malloc( 2 * size );
+ if ( !c->data )
+ {
+ return IMGTOOLERR_READERROR;
+ }
+
+ /* fully load image */
stream_seek( stream, 0, SEEK_SET );
if ( stream_read( stream, c->data, size ) < size )
- {
- return IMGTOOLERR_READERROR;
- }
- unpack( c->data, c->data, 2 * size );
+ {
+ return IMGTOOLERR_READERROR;
+ }
+ unpack( c->data, c->data, 2 * size );
return IMGTOOLERR_SUCCESS;
}
@@ -367,19 +367,19 @@ static imgtoolerr_t hp48_create(imgtool_image* img,
hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
int size;
- size = option_resolution_lookup_int(opts, 'S');
+ size = option_resolution_lookup_int(opts, 'S');
- c->stream = stream;
- c->modified = 1;
- c->size = size * 1024;
- c->data = (UINT8*) malloc( 2 * c->size );
- if ( !c->data )
- {
- return IMGTOOLERR_READERROR;
- }
+ c->stream = stream;
+ c->modified = 1;
+ c->size = size * 1024;
+ c->data = (UINT8*) malloc( 2 * c->size );
+ if ( !c->data )
+ {
+ return IMGTOOLERR_READERROR;
+ }
- /* zeroing the image seems fine */
- memset( c->data, 0, 2 * c->size );
+ /* zeroing the image seems fine */
+ memset( c->data, 0, 2 * c->size );
return IMGTOOLERR_SUCCESS;
}
@@ -390,16 +390,16 @@ static void hp48_close(imgtool_image *img)
{
hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
- if ( c->modified )
- {
- /* save image */
- pack( c->data, c->data, 2 * c->size );
- stream_seek( c->stream, 0, SEEK_SET );
- stream_write( c->stream, c->data, c->size );
- }
+ if ( c->modified )
+ {
+ /* save image */
+ pack( c->data, c->data, 2 * c->size );
+ stream_seek( c->stream, 0, SEEK_SET );
+ stream_write( c->stream, c->data, c->size );
+ }
- /* clean up */
- free( c->data );
+ /* clean up */
+ free( c->data );
stream_close( c->stream );
}
@@ -411,24 +411,24 @@ static void hp48_close(imgtool_image *img)
void hp48_partition_get_info(const imgtool_class *imgclass, UINT32 state, union imgtoolinfo *info);
static imgtoolerr_t hp48_list_partitions(imgtool_image *img,
- imgtool_partition_info *partitions,
- size_t len)
-{
+ imgtool_partition_info *partitions,
+ size_t len)
+{
hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
- int i;
- for ( i = 0; i < len && i * MAX_PORT_SIZE < c->size ; i++ )
- {
- /* offset and size in bytes */
- partitions[i].base_block = i * MAX_PORT_SIZE;
- partitions[i].block_count = c->size - partitions[i].base_block;
- if ( partitions[i].block_count > MAX_PORT_SIZE )
- {
- partitions[i].block_count = MAX_PORT_SIZE;
- }
+ int i;
+ for ( i = 0; i < len && i * MAX_PORT_SIZE < c->size ; i++ )
+ {
+ /* offset and size in bytes */
+ partitions[i].base_block = i * MAX_PORT_SIZE;
+ partitions[i].block_count = c->size - partitions[i].base_block;
+ if ( partitions[i].block_count > MAX_PORT_SIZE )
+ {
+ partitions[i].block_count = MAX_PORT_SIZE;
+ }
- partitions[i].get_info = hp48_partition_get_info;
- }
+ partitions[i].get_info = hp48_partition_get_info;
+ }
return IMGTOOLERR_SUCCESS;
}
@@ -436,17 +436,16 @@ static imgtoolerr_t hp48_list_partitions(imgtool_image *img,
static imgtoolerr_t hp48_open_partition(imgtool_partition *part,
UINT64 first_block, UINT64 block_count)
{
-
imgtool_image* img = imgtool_partition_image( part );
hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
hp48_partition* p = (hp48_partition*) imgtool_partition_extra_bytes( part );
- if ( first_block + block_count > c->size )
- return IMGTOOLERR_INVALIDPARTITION;
+ if ( first_block + block_count > c->size )
+ return IMGTOOLERR_INVALIDPARTITION;
- /* store partition position */
- p->data = c->data + first_block;
- p->size = block_count;
+ /* store partition position */
+ p->data = c->data + first_block;
+ p->size = block_count;
return IMGTOOLERR_SUCCESS;
}
@@ -454,11 +453,11 @@ static imgtoolerr_t hp48_open_partition(imgtool_partition *part,
static imgtoolerr_t hp48_beginenum(imgtool_directory *enumeration,
- const char *path)
+ const char *path)
{
hp48_directory* d = (hp48_directory*) imgtool_directory_extrabytes( enumeration );
- d->pos = 0;
+ d->pos = 0;
return IMGTOOLERR_SUCCESS;
}
@@ -466,7 +465,7 @@ static imgtoolerr_t hp48_beginenum(imgtool_directory *enumeration,
static imgtoolerr_t hp48_nextenum(imgtool_directory *enumeration,
- imgtool_dirent *ent)
+ imgtool_dirent *ent)
{
imgtool_partition *part = imgtool_directory_partition( enumeration );
//imgtool_image* img = imgtool_partition_image( part );
@@ -474,63 +473,63 @@ static imgtoolerr_t hp48_nextenum(imgtool_directory *enumeration,
hp48_partition* p = (hp48_partition*) imgtool_partition_extra_bytes( part );
hp48_directory* d = (hp48_directory*) imgtool_directory_extrabytes( enumeration );
- UINT8* data = p->data;
- int pos = d->pos;
-
- if ( pos < 0 || pos+12 > 2*p->size )
- {
- ent->eof = 1;
- return IMGTOOLERR_SUCCESS;
- }
-
- int prolog = read20( data+pos );
-
- if ( IS_OBJECT(prolog) )
- {
- pos += 5;
- int totalsize = read20( data+pos );
- pos += 5;
-
- int namelen = read8( data+pos );
- pos += 2;
- if ( (pos + 2*namelen > 2*p->size) ||
- (namelen >= sizeof(ent->filename)) )
- {
- ent->eof = 1;
- return IMGTOOLERR_CORRUPTFILE;
- }
- readstring( ent->filename, data+pos, namelen );
-
- /* compute size in bytes, removing name, length & CRC fields */
+ UINT8* data = p->data;
+ int pos = d->pos;
+
+ if ( pos < 0 || pos+12 > 2*p->size )
+ {
+ ent->eof = 1;
+ return IMGTOOLERR_SUCCESS;
+ }
+
+ int prolog = read20( data+pos );
+
+ if ( IS_OBJECT(prolog) )
+ {
+ pos += 5;
+ int totalsize = read20( data+pos );
+ pos += 5;
+
+ int namelen = read8( data+pos );
+ pos += 2;
+ if ( (pos + 2*namelen > 2*p->size) ||
+ (namelen >= sizeof(ent->filename)) )
+ {
+ ent->eof = 1;
+ return IMGTOOLERR_CORRUPTFILE;
+ }
+ readstring( ent->filename, data+pos, namelen );
+
+ /* compute size in bytes, removing name, length & CRC fields */
ent->filesize = ((totalsize - 19 - 2*namelen) + 1) / 2;
- switch (prolog)
- {
- case PROLOG_LIBRARY: strncpy( ent->attr, "LIB", sizeof(ent->attr) ); break;
- case PROLOG_BACKUP: strncpy( ent->attr, "BAK", sizeof(ent->attr) ); break;
- default: strncpy( ent->attr, "?", sizeof(ent->attr) );
- }
-
- d->pos = d->pos + totalsize + 5;
- }
- else
- {
- /* 0 or unknown object => end */
- ent->eof = 1;
- }
+ switch (prolog)
+ {
+ case PROLOG_LIBRARY: strncpy( ent->attr, "LIB", sizeof(ent->attr) ); break;
+ case PROLOG_BACKUP: strncpy( ent->attr, "BAK", sizeof(ent->attr) ); break;
+ default: strncpy( ent->attr, "?", sizeof(ent->attr) );
+ }
+
+ d->pos = d->pos + totalsize + 5;
+ }
+ else
+ {
+ /* 0 or unknown object => end */
+ ent->eof = 1;
+ }
return IMGTOOLERR_SUCCESS;
}
-
+
static imgtoolerr_t hp48_freespace(imgtool_partition *part, UINT64 *size)
{
//imgtool_image* img = imgtool_partition_image( part );
- //hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
+ //hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
hp48_partition* p = (hp48_partition*) imgtool_partition_extra_bytes( part );
- *size = p->size - (find_end(p)+1)/2;
+ *size = p->size - (find_end(p)+1)/2;
return IMGTOOLERR_SUCCESS;
}
@@ -538,70 +537,70 @@ static imgtoolerr_t hp48_freespace(imgtool_partition *part, UINT64 *size)
static imgtoolerr_t hp48_readfile(imgtool_partition *part,
- const char *filename,
- const char *fork,
- imgtool_stream *destf)
+ const char *filename,
+ const char *fork,
+ imgtool_stream *destf)
{
//imgtool_image* img = imgtool_partition_image( part );
//hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
hp48_partition* p = (hp48_partition*) imgtool_partition_extra_bytes( part );
- /* find entry */
- int totalsize, start, size;
- int pos = find_file(p, filename, &totalsize, &start, &size);
- if ( pos == -1 )
- {
- return IMGTOOLERR_FILENOTFOUND;
- }
-
- /* CRC check */
- UINT16 objcrc = read20( p->data + pos + totalsize ) >> 4;
- UINT16 mycrc = crc( p->data + pos + 5, totalsize - 4);
- if ( objcrc != mycrc )
- {
- return IMGTOOLERR_CORRUPTIMAGE;
- }
- size -= 10;
-
- /* save header */
- stream_write( destf, hp48_prefix, 8);
-
- /* save contents to host file */
- int bytesize = (size + 1) / 2;
- UINT8* buf = (UINT8*) malloc( bytesize );
- if (!buf)
- {
- return IMGTOOLERR_FILENOTFOUND;
- }
- pack( buf, p->data + start, size );
- stream_write( destf, buf, bytesize );
- free( buf );
-
- return IMGTOOLERR_SUCCESS;
+ /* find entry */
+ int totalsize, start, size;
+ int pos = find_file(p, filename, &totalsize, &start, &size);
+ if ( pos == -1 )
+ {
+ return IMGTOOLERR_FILENOTFOUND;
+ }
+
+ /* CRC check */
+ UINT16 objcrc = read20( p->data + pos + totalsize ) >> 4;
+ UINT16 mycrc = crc( p->data + pos + 5, totalsize - 4);
+ if ( objcrc != mycrc )
+ {
+ return IMGTOOLERR_CORRUPTIMAGE;
+ }
+ size -= 10;
+
+ /* save header */
+ stream_write( destf, hp48_prefix, 8);
+
+ /* save contents to host file */
+ int bytesize = (size + 1) / 2;
+ UINT8* buf = (UINT8*) malloc( bytesize );
+ if (!buf)
+ {
+ return IMGTOOLERR_FILENOTFOUND;
+ }
+ pack( buf, p->data + start, size );
+ stream_write( destf, buf, bytesize );
+ free( buf );
+
+ return IMGTOOLERR_SUCCESS;
}
static imgtoolerr_t hp48_deletefile(imgtool_partition *part,
- const char *filename)
+ const char *filename)
{
imgtool_image* img = imgtool_partition_image( part );
- hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
+ hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
hp48_partition* p = (hp48_partition*) imgtool_partition_extra_bytes( part );
- /* find entry */
- int totalsize;
- int pos = find_file(p, filename, &totalsize, NULL, NULL );
- if ( pos == -1 )
- {
- return IMGTOOLERR_FILENOTFOUND;
- }
+ /* find entry */
+ int totalsize;
+ int pos = find_file(p, filename, &totalsize, NULL, NULL );
+ if ( pos == -1 )
+ {
+ return IMGTOOLERR_FILENOTFOUND;
+ }
- /* move */
- totalsize += 5;
- memmove( p->data+pos, p->data+pos+totalsize, 2*p->size-(pos+totalsize) );
- memset( p->data + 2*p->size-totalsize, 0, totalsize);
- c->modified = 1;
+ /* move */
+ totalsize += 5;
+ memmove( p->data+pos, p->data+pos+totalsize, 2*p->size-(pos+totalsize) );
+ memset( p->data + 2*p->size-totalsize, 0, totalsize);
+ c->modified = 1;
return IMGTOOLERR_SUCCESS;
}
@@ -609,71 +608,71 @@ static imgtoolerr_t hp48_deletefile(imgtool_partition *part,
static imgtoolerr_t hp48_writefile(imgtool_partition *part,
- const char *filename,
- const char *fork,
- imgtool_stream *sourcef,
- option_resolution *opts)
+ const char *filename,
+ const char *fork,
+ imgtool_stream *sourcef,
+ option_resolution *opts)
{
imgtool_image* img = imgtool_partition_image( part );
- hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
+ hp48_card* c = (hp48_card*) imgtool_image_extra_bytes( img );
hp48_partition* p = (hp48_partition*) imgtool_partition_extra_bytes( part );
- /* check header */
- char head[8];
- stream_read( sourcef, head, 8 );
- if ( memcmp( head, hp48_prefix, 7) )
- {
- return IMGTOOLERR_READERROR;
- }
+ /* check header */
+ char head[8];
+ stream_read( sourcef, head, 8 );
+ if ( memcmp( head, hp48_prefix, 7) )
+ {
+ return IMGTOOLERR_READERROR;
+ }
- /* ensure that the file does not exist */
- /* TODO: resize the existing file instead, to keep it in place? */
- hp48_deletefile( part, filename );
+ /* ensure that the file does not exist */
+ /* TODO: resize the existing file instead, to keep it in place? */
+ hp48_deletefile( part, filename );
- /* goto end */
- //UINT8* data = p->data;
- int pos = find_end(p);
+ /* goto end */
+ //UINT8* data = p->data;
+ int pos = find_end(p);
- int len = strlen( filename );
- if ( len > 255 ) len = 255;
+ int len = strlen( filename );
+ if ( len > 255 ) len = 255;
- /* check size */
+ /* check size */
int filesize = stream_size( sourcef ) - 8;
- if ( pos + 2*filesize + 24 + 2*len > 2 * p->size )
- {
- return IMGTOOLERR_NOSPACE;
- }
-
- /* load file */
- UINT8* buf = (UINT8*) malloc( filesize );
- if ( !buf ) return IMGTOOLERR_NOSPACE;
- stream_read( sourcef, buf, filesize );
-
- /* store backup object */
- int org = pos;
- int totalsize = 2*filesize + 19 + 2*len;
- write20( p->data+pos, PROLOG_BACKUP );
- pos +=5;
- write20( p->data+pos, totalsize );
- pos +=5;
- write8( p->data+pos, len );
- pos += 2;
- writestring( p->data+pos, filename, len );
- pos += 2*len;
- write8( p->data+pos, len );
- pos += 2;
- unpack( p->data+pos, buf, 2*filesize );
- pos += 2*filesize;
-
- /* store crc */
- write20( p->data+pos, PROLOG_SYSINT );
- pos += 5;
- p->data[pos] = 0;
- write20( p->data+pos, crc(p->data+org+5, totalsize-4) << 4 );
-
- free(buf);
-
- c->modified = 1;
+ if ( pos + 2*filesize + 24 + 2*len > 2 * p->size )
+ {
+ return IMGTOOLERR_NOSPACE;
+ }
+
+ /* load file */
+ UINT8* buf = (UINT8*) malloc( filesize );
+ if ( !buf ) return IMGTOOLERR_NOSPACE;
+ stream_read( sourcef, buf, filesize );
+
+ /* store backup object */
+ int org = pos;
+ int totalsize = 2*filesize + 19 + 2*len;
+ write20( p->data+pos, PROLOG_BACKUP );
+ pos +=5;
+ write20( p->data+pos, totalsize );
+ pos +=5;
+ write8( p->data+pos, len );
+ pos += 2;
+ writestring( p->data+pos, filename, len );
+ pos += 2*len;
+ write8( p->data+pos, len );
+ pos += 2;
+ unpack( p->data+pos, buf, 2*filesize );
+ pos += 2*filesize;
+
+ /* store crc */
+ write20( p->data+pos, PROLOG_SYSINT );
+ pos += 5;
+ p->data[pos] = 0;
+ write20( p->data+pos, crc(p->data+org+5, totalsize-4) << 4 );
+
+ free(buf);
+
+ c->modified = 1;
return IMGTOOLERR_SUCCESS;
}
@@ -705,7 +704,7 @@ void hp48_partition_get_info(const imgtool_class *imgclass, UINT32 state, union
case IMGTOOLINFO_PTR_FREE_SPACE: info->free_space = hp48_freespace; break;
case IMGTOOLINFO_PTR_READ_FILE: info->read_file = hp48_readfile; break;
case IMGTOOLINFO_PTR_WRITE_FILE: info->write_file = hp48_writefile; break;
- case IMGTOOLINFO_PTR_DELETE_FILE: info->delete_file = hp48_deletefile; break;
+ case IMGTOOLINFO_PTR_DELETE_FILE: info->delete_file = hp48_deletefile; break;
case IMGTOOLINFO_INT_PARTITION_EXTRA_BYTES: info->i = sizeof(hp48_partition); break;
case IMGTOOLINFO_INT_DIRECTORY_EXTRA_BYTES: info->i = sizeof(hp48_directory); break;
@@ -730,8 +729,8 @@ void hp48_get_info(const imgtool_class *imgclass, UINT32 state, union imgtoolinf
case IMGTOOLINFO_PTR_OPEN: info->open = hp48_open; break;
case IMGTOOLINFO_PTR_CREATE: info->create = hp48_create; break;
case IMGTOOLINFO_PTR_CLOSE: info->close = hp48_close; break;
- case IMGTOOLINFO_PTR_LIST_PARTITIONS: info->list_partitions = hp48_list_partitions; break;
+ case IMGTOOLINFO_PTR_LIST_PARTITIONS: info->list_partitions = hp48_list_partitions; break;
case IMGTOOLINFO_INT_IMAGE_EXTRA_BYTES: info->i = sizeof(hp48_card); break;
- }
+ }
}
diff --git a/src/mess/video/a7800.c b/src/mess/video/a7800.c
index 992fa6d0d66..c3480460d8f 100644
--- a/src/mess/video/a7800.c
+++ b/src/mess/video/a7800.c
@@ -4,8 +4,8 @@
Routines to control the Atari 7800 video hardware
- 2014-05-06 Mike Saarna Added interrupts to DMA cycle eating. Updates to
- LL, OL, and spin accounting for HALT behavior.
+ 2014-05-06 Mike Saarna Added interrupts to DMA cycle eating. Updates to
+ LL, OL, and spin accounting for HALT behavior.
2014-03-24 Mike Saarna Fixed DMA regarding startup, shutdown and
cycle stealing.
@@ -133,13 +133,13 @@ void a7800_state::maria_draw_scanline()
{
if(READ_MEM(m_maria_dll+3) & 0x80)
maria_cycles=40; // DMA + maria interrupt overhead
- else
+ else
maria_cycles=19; // DMA
- }
- else
- {
- maria_cycles = 16; // DMA
- }
+ }
+ else
+ {
+ maria_cycles = 16; // DMA
+ }
cells = 0;
@@ -215,7 +215,7 @@ void a7800_state::maria_draw_scanline()
// Spin the CPU for Maria DMA, if it's not already spinning for WSYNC.
// MARIA generates the 6502 clock by dividing its own clock by 4. It needs to HALT and unHALT
// the 6502 on ths same clock phase, so MARIA will wait until its clock divides evenly by 4.
- // To spin until an even divisor, we just round-up any would-be truncations by adding 3.
+ // To spin until an even divisor, we just round-up any would-be truncations by adding 3.
if ( ! m_maria_wsync )
m_maincpu->spin_until_time(m_maincpu->cycles_to_attotime((maria_cycles+3)/4));
diff --git a/src/mess/video/abc1600.c b/src/mess/video/abc1600.c
index 7f6faee78da..4d4bb6aa1cc 100644
--- a/src/mess/video/abc1600.c
+++ b/src/mess/video/abc1600.c
@@ -165,22 +165,22 @@ MC6845_UPDATE_ROW(abc1600_mover_device::crtc_update_row)
{
int x = 0;
const pen_t *pen = m_palette->pens();
-
+
for (int column = 0; column < x_count; column += 2)
{
UINT16 dma = get_crtca(ma, ra, column);
-
+
// data is read out of video RAM in nibble mode by strobing CAS 4 times
for (int cas = 0; cas < 4; cas++)
{
UINT16 data = read_videoram(dma + cas);
-
+
for (int bit = 0; bit < 16; bit++)
{
int color = ((BIT(data, 15) ^ PIX_POL) && !BLANK) && de;
-
+
bitmap.pix32(vbp + y, hbp + x++) = pen[color];
-
+
data <<= 1;
}
}
diff --git a/src/mess/video/abc806.c b/src/mess/video/abc806.c
index 673f16a586c..9d3f3944adb 100644
--- a/src/mess/video/abc806.c
+++ b/src/mess/video/abc806.c
@@ -10,7 +10,7 @@
TODO:
- - hook up RAD prom
+ - hook up RAD prom
- flashing
- double height
- underline
diff --git a/src/mess/video/bbc.c b/src/mess/video/bbc.c
index f504a1df513..483cd04caba 100644
--- a/src/mess/video/bbc.c
+++ b/src/mess/video/bbc.c
@@ -180,8 +180,8 @@ MC6845_UPDATE_ROW( bbc_state::crtc_update_row )
if (((ma>>13)&1)==0)
{
m_Teletext_Latch=0;
- }
- else
+ }
+ else
{
m_Teletext_Latch=(m_BBC_Video_RAM[calculate_video_address(ma+x_pos,ra)]);
}
diff --git a/src/mess/video/k1ge.c b/src/mess/video/k1ge.c
index b69d2444ff4..8e1c50d483a 100644
--- a/src/mess/video/k1ge.c
+++ b/src/mess/video/k1ge.c
@@ -44,7 +44,7 @@ PALETTE_INIT_MEMBER(k2ge_device, k2ge)
READ8_MEMBER( k1ge_device::read )
{
assert(offset < 0x4000);
-
+
UINT8 data = m_vram[offset];
switch( offset )
@@ -63,7 +63,7 @@ READ8_MEMBER( k1ge_device::read )
WRITE8_MEMBER( k1ge_device::write )
{
assert(offset < 0x4000);
-
+
switch( offset )
{
case 0x000:
diff --git a/src/mess/video/pc1512.c b/src/mess/video/pc1512.c
index 39ae133f0a7..fe13b003d63 100644
--- a/src/mess/video/pc1512.c
+++ b/src/mess/video/pc1512.c
@@ -360,7 +360,7 @@ WRITE8_MEMBER( pc1512_state::vdu_w )
//-------------------------------------------------
-// mc6845
+// mc6845
//-------------------------------------------------
int pc1512_state::get_display_mode(UINT8 mode)
diff --git a/src/mess/video/pc_t1t.c b/src/mess/video/pc_t1t.c
index 54c232e94d7..f9715358fac 100644
--- a/src/mess/video/pc_t1t.c
+++ b/src/mess/video/pc_t1t.c
@@ -427,7 +427,7 @@ MC6845_UPDATE_ROW( pc_t1t_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case T1000_TEXT_INTEN:
@@ -456,7 +456,7 @@ MC6845_UPDATE_ROW( pcvideo_pcjr_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case PCJX_TEXT:
diff --git a/src/mess/video/rmnimbus.c b/src/mess/video/rmnimbus.c
index f31080aa567..a5d48c4f97b 100644
--- a/src/mess/video/rmnimbus.c
+++ b/src/mess/video/rmnimbus.c
@@ -31,8 +31,8 @@
#define FG_COLOUR (m_colours&0x0F)
#define BG_COLOUR ((m_colours&0xF0)>>4)
-#define SELECT_COL(x,c) (IS_80COL ? ((((x) & 1) ? ((c) << 2) : (c)) & 0xC) : (c))
-#define FILL_WORD(c) (((c) << 12) | ((c) << 8) | ((c) << 4) | (c))
+#define SELECT_COL(x,c) (IS_80COL ? ((((x) & 1) ? ((c) << 2) : (c)) & 0xC) : (c))
+#define FILL_WORD(c) (((c) << 12) | ((c) << 8) | ((c) << 4) | (c))
#define IS_80COL (m_mode&0x10)
#define IS_XOR (m_op&8)
diff --git a/src/mess/video/vtvideo.c b/src/mess/video/vtvideo.c
index 3e93dc17063..13091deb1e5 100644
--- a/src/mess/video/vtvideo.c
+++ b/src/mess/video/vtvideo.c
@@ -21,27 +21,27 @@ FIXME: work out the differences and identify common code between VT and Rainbow.
- REQUIRED TODOS / TESTS :
* do line and character attributes (plus combinations) match real hardware?
* how does the AVO fit in?
-
+
- SCROLLING REGIONS / SPLIT SCREEN SCROLLING UNTESTED (if you open > 1 file with the VAX editor EDT)
See VT100 Technical Manual: 4.7.4 Address Shuffling to 4.7.9 Split Screen Smooth Scrolling.
More on scrolling regions: Rainbow 100 B technical documentation (QV069-GZ) April 1985 page 22
-
+
- NEW - INTERLACED MODE (Rainbow only):
Vertical resolution increases from 240 to 480, while the refresh rate halves (flickers on CRTs).
To accomplish this, the display controller repeats even lines in odd scans.
VTVIDEO activates line doubling in 24 line, interlaced mode only.
-
+
Although the DC12 has the ability to display 48 lines, most units are low on screen RAM and
- won't even show 80 x 48. -> REASON: (83 x 48 = 3984 Byte) > (screen RAM) minus 'scratch area'
+ won't even show 80 x 48. -> REASON: (83 x 48 = 3984 Byte) > (screen RAM) minus 'scratch area'
On a VT-180, BIOS scratch requires up to 700 bytes used for SETUP, flags, SILO, keyboard.
-
+
- POSSIBLE IMPROVEMENTS:
-
+
* exact colors for different VR201 monitors ('paper white', green and amber)
* ACCURATE VIDEO DELAYS:
- Position of the first visible scanline (relative to the vertical reset) depends on
- content of fill bytes at the beginning of screen RAM.
+ Position of the first visible scanline (relative to the vertical reset) depends on
+ content of fill bytes at the beginning of screen RAM.
Six invisible, linked lines are initially provided (at location $EE000+ on a Rainbow).
Real-world DC hardware parses the (circular) chain until interrupted by blanking.
@@ -185,10 +185,10 @@ void rainbow_video_device::device_reset()
m_basic_attribute = 0;
m_columns = 80;
-
- m_frequency = 60;
- m_interlaced = 1;
+ m_frequency = 60;
+
+ m_interlaced = 1;
m_fill_lines = 2; // for 60Hz (not in use any longer -> detected)
recompute_parameters();
}
@@ -210,8 +210,8 @@ void vt100_video_device::recompute_parameters()
int vert_pix_total = ((m_linedoubler == false) ? m_height : m_height_MAX) * 10;
- if (m_columns == 132)
- horiz_pix_total = m_columns * 9; // display 1 less filler pixel in 132 char. mode
+ if (m_columns == 132)
+ horiz_pix_total = m_columns * 9; // display 1 less filler pixel in 132 char. mode
else
horiz_pix_total = m_columns * 10; // normal 80 character mode.
@@ -239,7 +239,6 @@ READ8_MEMBER(vt100_video_device::lba7_r)
// Also used by Rainbow-100 ************
WRITE8_MEMBER(vt100_video_device::dc012_w)
{
-
// TODO: writes to 10C/0C should be treated differently (emulation disables the watchdog too often).
// - see 3.1.3.9.5 DC012 Programming Information (PC-100 spec)
if (data == 0) // MHFU is disabled by writing 00 to port 010C.
@@ -254,7 +253,7 @@ WRITE8_MEMBER(vt100_video_device::dc012_w)
}
}
else
- {
+ {
// RESET
MHFU_FLAG = true;
MHFU_counter = 0;
@@ -343,9 +342,9 @@ WRITE8_MEMBER(vt100_video_device::dc012_w)
// Writing to DC011 resets internal counters (& disturbs display) on real hardware.
WRITE8_MEMBER(vt100_video_device::dc011_w)
{
- if (!BIT(data, 5))
+ if (!BIT(data, 5))
{
- m_interlaced = 1;
+ m_interlaced = 1;
if (!BIT(data, 4))
m_columns = 80;
@@ -359,16 +358,16 @@ WRITE8_MEMBER(vt100_video_device::dc011_w)
if (!BIT(data, 4))
{
m_frequency = 60;
- m_fill_lines = 2;
+ m_fill_lines = 2;
}
else
{
m_frequency = 50;
- m_fill_lines = 5;
+ m_fill_lines = 5;
}
}
- recompute_parameters();
+ recompute_parameters();
}
WRITE8_MEMBER(vt100_video_device::brightness_w)
@@ -534,7 +533,7 @@ void rainbow_video_device::display_char(bitmap_ind16 &bitmap, UINT8 code, int x,
UINT16 y_preset;
- UINT16 CHARPOS_y_preset = y << 3; // CHARPOS_y_preset = y * 10;
+ UINT16 CHARPOS_y_preset = y << 3; // CHARPOS_y_preset = y * 10;
CHARPOS_y_preset += y;
CHARPOS_y_preset += y;
@@ -546,10 +545,10 @@ void rainbow_video_device::display_char(bitmap_ind16 &bitmap, UINT8 code, int x,
int back_intensity, back_default_intensity;
int invert = (display_type & 8) ? 1 : 0; // REVERSE
- int bold = (display_type & 16) ? 0 : 1; // BIT 4
+ int bold = (display_type & 16) ? 0 : 1; // BIT 4
int blink = (display_type & 32) ? 0 : 1; // BIT 5
- int underline = (display_type & 64) ? 0 : 1; // BIT 6
- bool blank = (display_type & 128) ? true : false; // BIT 7
+ int underline = (display_type & 64) ? 0 : 1; // BIT 6
+ bool blank = (display_type & 128) ? true : false; // BIT 7
display_type = display_type & 3;
@@ -730,7 +729,7 @@ void rainbow_video_device::video_update(bitmap_ind16 &bitmap, const rectangle &c
// Skip fill (0xFF) lines and put result in ADDR.
for (int xp = 1; xp <= 6; xp += 1) // beware of circular references
{
- // Fetch LINE ATTRIBUTE before it is gone
+ // Fetch LINE ATTRIBUTE before it is gone
attr_addr = 0x1000 | ((addr + 1) & 0x0fff);
temp = m_read_ram(addr + 2) * 256 + m_read_ram(addr + 1);
diff --git a/src/osd/modules/debugger/debugqt.c b/src/osd/modules/debugger/debugqt.c
index 06588854d83..55956500398 100644
--- a/src/osd/modules/debugger/debugqt.c
+++ b/src/osd/modules/debugger/debugqt.c
@@ -281,7 +281,7 @@ void debugger_qt::wait_for_debugger(device_t &device, bool firststop)
if (firststop)
{
- bring_main_window_to_front();
+ bring_main_window_to_front();
}
// Set the main window to display the proper cpu
@@ -338,4 +338,3 @@ void debugger_qt::debugger_update()
void debugger_qt::debugger_exit()
{
}
-
diff --git a/src/osd/modules/debugger/none.c b/src/osd/modules/debugger/none.c
index 255646551fc..fd6d55ca3dc 100644
--- a/src/osd/modules/debugger/none.c
+++ b/src/osd/modules/debugger/none.c
@@ -33,4 +33,3 @@ void debugger_none::debugger_update()
void debugger_none::debugger_exit()
{
}
-
diff --git a/src/osd/modules/sound/direct_sound.c b/src/osd/modules/sound/direct_sound.c
index 8aaeb4efe48..fc7909569e7 100644
--- a/src/osd/modules/sound/direct_sound.c
+++ b/src/osd/modules/sound/direct_sound.c
@@ -389,4 +389,3 @@ void sound_direct_sound::dsound_destroy_buffers(void)
IDirectSoundBuffer_Release(primary_buffer);
primary_buffer = NULL;
}
-
diff --git a/src/osd/modules/sound/js_sound.c b/src/osd/modules/sound/js_sound.c
index a2bc6086343..d92ca397278 100644
--- a/src/osd/modules/sound/js_sound.c
+++ b/src/osd/modules/sound/js_sound.c
@@ -22,18 +22,18 @@ sound_js::sound_js(const osd_interface &osd)
void sound_js::update_audio_stream(const INT16 *buffer, int samples_this_frame)
{
- EM_ASM_ARGS({
- // Forward audio stream update on to JS backend implementation.
- jsmess_update_audio_stream($0, $1);
- }, (unsigned int)buffer, samples_this_frame);
+ EM_ASM_ARGS({
+ // Forward audio stream update on to JS backend implementation.
+ jsmess_update_audio_stream($0, $1);
+ }, (unsigned int)buffer, samples_this_frame);
}
void sound_js::set_mastervolume(int attenuation)
{
- EM_ASM_ARGS({
- // Forward volume update on to JS backend implementation.
- jsmess_set_mastervolume($0);
- }, attenuation);
+ EM_ASM_ARGS({
+ // Forward volume update on to JS backend implementation.
+ jsmess_set_mastervolume($0);
+ }, attenuation);
}
const osd_sound_type OSD_SOUND_JS = &osd_sound_creator<sound_js>;
diff --git a/src/osd/modules/sound/none.c b/src/osd/modules/sound/none.c
index 1ae0a608016..6e776f03a78 100644
--- a/src/osd/modules/sound/none.c
+++ b/src/osd/modules/sound/none.c
@@ -20,4 +20,4 @@ sound_none::sound_none(const osd_interface &osd)
}
-const osd_sound_type OSD_SOUND_NONE = &osd_sound_creator<sound_none>; \ No newline at end of file
+const osd_sound_type OSD_SOUND_NONE = &osd_sound_creator<sound_none>;
diff --git a/src/osd/osdepend.c b/src/osd/osdepend.c
index db5e9b74b1e..39ef09218be 100644
--- a/src/osd/osdepend.c
+++ b/src/osd/osdepend.c
@@ -37,7 +37,7 @@ const options_entry osd_options::s_option_entries[] =
// video options
{ NULL, NULL, OPTION_HEADER, "OSD VIDEO OPTIONS" },
// OS X can be trusted to have working hardware OpenGL, so default to it on for the best user experience
- { OSDOPTION_VIDEO, OSDOPTVAL_AUTO, OPTION_STRING, "video output method: " },
+ { OSDOPTION_VIDEO, OSDOPTVAL_AUTO, OPTION_STRING, "video output method: " },
{ OSDOPTION_NUMSCREENS "(1-4)", "1", OPTION_INTEGER, "number of screens to create; usually, you want just one" },
{ OSDOPTION_WINDOW ";w", "0", OPTION_BOOLEAN, "enable window mode; otherwise, full screen mode is assumed" },
{ OSDOPTION_MAXIMIZE ";max", "1", OPTION_BOOLEAN, "default to maximized windows; otherwise, windows will be minimized" },
@@ -79,7 +79,7 @@ const options_entry osd_options::s_option_entries[] =
// sound options
{ NULL, NULL, OPTION_HEADER, "OSD SOUND OPTIONS" },
- { OSDOPTION_SOUND, OSDOPTVAL_AUTO, OPTION_STRING, "sound output method: " },
+ { OSDOPTION_SOUND, OSDOPTVAL_AUTO, OPTION_STRING, "sound output method: " },
{ OSDOPTION_AUDIO_LATENCY "(1-5)", "2", OPTION_INTEGER, "set audio latency (increase to reduce glitches, decrease for responsiveness)" },
// End of list
@@ -106,47 +106,47 @@ void osd_options::add_osd_options()
osd_interface::osd_interface()
: m_machine(NULL),
- m_sound(NULL),
- m_debugger(NULL)
+ m_sound(NULL),
+ m_debugger(NULL)
{
}
void osd_interface::update_option(osd_options &options, const char * key, dynamic_array<const char *> &values)
{
- astring current_value(options.description(key));
+ astring current_value(options.description(key));
astring new_option_value("");
for (int index = 0; index < values.count(); index++)
{
astring t(values[index]);
- if (new_option_value.len() > 0)
+ if (new_option_value.len() > 0)
{
if( index != (values.count()-1))
new_option_value.cat(", ");
else
- new_option_value.cat(" or ");
+ new_option_value.cat(" or ");
}
- new_option_value.cat(t);
+ new_option_value.cat(t);
}
// TODO: core_strdup() is leaked
- options.set_description(key, core_strdup(current_value.cat(new_option_value).cstr()));
+ options.set_description(key, core_strdup(current_value.cat(new_option_value).cstr()));
}
-
+
void osd_interface::register_options(osd_options &options)
{
// Register video options and update options
- video_options_add("none", NULL);
+ video_options_add("none", NULL);
video_register();
update_option(options, OSDOPTION_VIDEO, m_video_names);
-
+
// Register sound options and update options
- sound_options_add("none", OSD_SOUND_NONE);
+ sound_options_add("none", OSD_SOUND_NONE);
sound_register();
update_option(options, OSDOPTION_SOUND, m_sound_names);
-
+
// Register debugger options and update options
- debugger_options_add("none", OSD_DEBUGGER_NONE);
- debugger_options_add("internal", OSD_DEBUGGER_INTERNAL);
+ debugger_options_add("none", OSD_DEBUGGER_NONE);
+ debugger_options_add("internal", OSD_DEBUGGER_INTERNAL);
debugger_register();
update_option(options, OSDOPTION_DEBUGGER, m_debugger_names);
}
@@ -158,7 +158,6 @@ void osd_interface::register_options(osd_options &options)
osd_interface::~osd_interface()
{
-
for(int i= 0; i < m_video_names.count(); ++i)
osd_free(const_cast<char*>(m_video_names[i]));
//m_video_options,reset();
@@ -210,12 +209,12 @@ void osd_interface::init(running_machine &machine)
//
m_machine = &machine;
-
+
osd_options &options = downcast<osd_options &>(machine.options());
// extract the verbose printing option
if (options.verbose())
g_print_verbose = true;
-
+
// ensure we get called on the way out
machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(osd_interface::osd_exit), this));
}
@@ -251,13 +250,13 @@ void osd_interface::init_debugger()
// create all of its structures.
//
osd_debugger_type debugger = m_debugger_options.find(machine().options().debugger());
- if (debugger==NULL)
+ if (debugger==NULL)
{
osd_printf_warning("debugger_init: option %s not found switching to auto\n",machine().options().debugger());
debugger = m_debugger_options.find("auto");
}
m_debugger = (*debugger)(*this);
-
+
m_debugger->init_debugger();
}
@@ -397,7 +396,7 @@ void osd_interface::init_subsystems()
osd_printf_error("video_init: Initialization failed!\n\n\n");
fflush(stderr);
fflush(stdout);
- exit(-1);
+ exit(-1);
}
sound_init();
@@ -405,7 +404,7 @@ void osd_interface::init_subsystems()
// we need pause callbacks
machine().add_notifier(MACHINE_NOTIFY_PAUSE, machine_notify_delegate(FUNC(osd_interface::input_pause), this));
machine().add_notifier(MACHINE_NOTIFY_RESUME, machine_notify_delegate(FUNC(osd_interface::input_resume), this));
-
+
output_init();
#ifdef USE_NETWORK
network_init();
@@ -421,7 +420,7 @@ bool osd_interface::video_init()
bool osd_interface::sound_init()
{
osd_sound_type sound = m_sound_options.find(machine().options().sound());
- if (sound==NULL)
+ if (sound==NULL)
{
osd_printf_warning("sound_init: option %s not found switching to auto\n",machine().options().sound());
sound = m_sound_options.find("auto");
@@ -491,7 +490,7 @@ void osd_interface::exit_subsystems()
midi_exit();
debugger_exit();
}
-
+
void osd_interface::video_exit()
{
}
@@ -575,4 +574,3 @@ osd_debugger_interface::osd_debugger_interface(const osd_interface &osd)
osd_debugger_interface::~osd_debugger_interface()
{
}
-
diff --git a/src/osd/osdmini/minifile.c b/src/osd/osdmini/minifile.c
index 7633e155313..f2f899744fc 100644
--- a/src/osd/osdmini/minifile.c
+++ b/src/osd/osdmini/minifile.c
@@ -177,7 +177,7 @@ file_error osd_get_full_path(char **dst, const char *path)
*dst = (char *)osd_malloc_array(strlen(path) + 1);
if (*dst != NULL)
strcpy(*dst, path);
- }
+ }
return FILERR_NONE;
}
diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c
index 01b84fac8aa..812943420d2 100644
--- a/src/osd/sdl/drawogl.c
+++ b/src/osd/sdl/drawogl.c
@@ -1143,7 +1143,7 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update)
#else
if (!sdl->init_context)
{
- screen_device_iterator myiter(window->machine().root_device());
+ screen_device_iterator myiter(window->machine().root_device());
for (screen = myiter.first(); screen != NULL; screen = myiter.next())
{
if (window->index == 0)
@@ -1166,9 +1166,9 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update)
{
// do some one-time OpenGL setup
#if (SDLMAME_SDL2)
- // FIXME: SRGB conversion is working on SDL2, may be of use
- // when we eventually target gamma and monitor profiles.
- //glEnable(GL_FRAMEBUFFER_SRGB);
+ // FIXME: SRGB conversion is working on SDL2, may be of use
+ // when we eventually target gamma and monitor profiles.
+ //glEnable(GL_FRAMEBUFFER_SRGB);
#endif
glShadeModel(GL_SMOOTH);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
@@ -1644,13 +1644,13 @@ static void texture_compute_type_subroutine(sdl_info *sdl, const render_texinfo
}
if ( texture->type == TEXTURE_TYPE_NONE && sdl->useglsl &&
- texture->xprescale == 1 && texture->yprescale == 1 &&
- texsource->rowpixels <= sdl->texture_max_width )
- {
- texture->type = TEXTURE_TYPE_SHADER;
- texture->texTarget = GL_TEXTURE_2D;
- texture->texpow2 = sdl->texpoweroftwo;
- }
+ texture->xprescale == 1 && texture->yprescale == 1 &&
+ texsource->rowpixels <= sdl->texture_max_width )
+ {
+ texture->type = TEXTURE_TYPE_SHADER;
+ texture->texTarget = GL_TEXTURE_2D;
+ texture->texpow2 = sdl->texpoweroftwo;
+ }
// determine if we can skip the copy step
// if this was not already decided by the shader condition above
@@ -2312,7 +2312,7 @@ INLINE void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const
{
int srcpix = *src++;
for (int x2 = 0; x2 < xprescale; x2++)
- *dst++ = 0xff000000 | palette[srcpix];
+ *dst++ = 0xff000000 | palette[srcpix];
}
if (xborderpix)
*dst++ = 0xff000000 | palette[*--src];
@@ -2604,7 +2604,7 @@ static void texture_set_data(texture_info *texture, const render_texinfo *texsou
{
for (y2 = 0; y2 < texture->yprescale; y2++)
{
- dst = (UINT8 *)(texture->data + (y * texture->yprescale + texture->borderpix + y2) * texture->rawwidth);
+ dst = (UINT8 *)(texture->data + (y * texture->yprescale + texture->borderpix + y2) * texture->rawwidth);
switch (PRIMFLAG_GET_TEXFORMAT(flags))
{
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c
index f4b52598c20..50507604b1a 100644
--- a/src/osd/sdl/sdlmain.c
+++ b/src/osd/sdl/sdlmain.c
@@ -397,7 +397,6 @@ sdl_osd_interface::~sdl_osd_interface()
void sdl_osd_interface::osd_exit()
{
-
osd_interface::osd_exit();
if (!SDLMAME_INIT_IN_WORKER_THREAD)
diff --git a/src/osd/sdl/video.c b/src/osd/sdl/video.c
index f32a5393551..3737287848f 100644
--- a/src/osd/sdl/video.c
+++ b/src/osd/sdl/video.c
@@ -623,13 +623,13 @@ static void extract_video_config(running_machine &machine)
// d3d options: extract the data
stemp = options.video();
- if (strcmp(stemp, "auto") == 0)
+ if (strcmp(stemp, "auto") == 0)
{
#ifdef SDLMAME_MACOSX
stemp = "opengl";
#else
stemp = "soft";
-#endif
+#endif
}
if (strcmp(stemp, SDLOPTVAL_SOFT) == 0)
video_config.mode = VIDEO_MODE_SOFT;
diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c
index d8df2a36c5d..142488c3c15 100644
--- a/src/osd/windows/output.c
+++ b/src/osd/windows/output.c
@@ -128,7 +128,7 @@ bool windows_osd_interface::output_init()
// register a notifier for output changes
output_set_notifier(NULL, notifier_callback, NULL);
-
+
return true;
}
diff --git a/src/osd/windows/vconv.c b/src/osd/windows/vconv.c
index 188b33c041e..d2a24903d42 100644
--- a/src/osd/windows/vconv.c
+++ b/src/osd/windows/vconv.c
@@ -350,7 +350,7 @@ static void build_command_line(int argc, char *argv[])
// identify the version number of the EXE
if (!icl_compile)
exe_version = get_exe_version(executable);
- else
+ else
exe_version = 0x00110000; // assume this for ICL
// special cases
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 4f6a343c00d..55ac2ea0dbe 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -549,7 +549,7 @@ void windows_osd_interface::sound_register()
sound_options_add("dsound", OSD_SOUND_DIRECT_SOUND);
#if (USE_SDL)
sound_options_add("sdl", OSD_SOUND_SDL);
-#endif
+#endif
sound_options_add("auto", OSD_SOUND_DIRECT_SOUND); // making Direct Sound audio default one
}
@@ -622,7 +622,7 @@ void windows_osd_interface::init(running_machine &machine)
// initialize the subsystems
osd_interface::init_subsystems();
-
+
// notify listeners of screen configuration
astring tempstring;
for (win_window_info *info = win_window_list; info != NULL; info = info->next)
@@ -683,7 +683,7 @@ void windows_osd_interface::osd_exit()
win_cleanup_sockets();
osd_interface::osd_exit();
-
+
// take down the watchdog thread if it exists
if (watchdog_thread != NULL)
{
diff --git a/src/tools/chdman.c b/src/tools/chdman.c
index d85b40a85cb..976a0b7ba53 100644
--- a/src/tools/chdman.c
+++ b/src/tools/chdman.c
@@ -243,7 +243,7 @@ public:
UINT8 *_dest = reinterpret_cast<UINT8 *>(dest);
for (int chdlba = 0; chdlba < lenlba; chdlba++)
- {
+ {
// find current frame's track number
int tracknum = m_toc->numtrks;
for (int track = 0; track < m_toc->numtrks; track++)
diff --git a/src/tools/nltool.c b/src/tools/nltool.c
index a35ca7e5e0d..efb51b0dfbd 100644
--- a/src/tools/nltool.c
+++ b/src/tools/nltool.c
@@ -67,9 +67,9 @@ void CLIB_DECL logerror(const char *format, ...)
void report_bad_cast(const std::type_info &src_type, const std::type_info &dst_type)
{
- printf("Error: bad downcast<> or device<>. Tried to convert a %s to a %s, which are incompatible.\n",
- src_type.name(), dst_type.name());
- throw;
+ printf("Error: bad downcast<> or device<>. Tried to convert a %s to a %s, which are incompatible.\n",
+ src_type.name(), dst_type.name());
+ throw;
}
struct options_entry oplist[] =
diff --git a/src/version.c b/src/version.c
index b868eebb078..7e0ba63b3c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,4 +9,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.153 ("__DATE__")";
+const char build_version[] = "0.154 ("__DATE__")";