From fec65e0b5766ade69e086d1c5b859d97494fce56 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 7 Apr 2014 06:04:18 +0000 Subject: Cleanups and version bump --- hash/a7800.xml | 112 +-- hash/coco_flop.xml | 6 +- hash/msx1_cart.xml | 32 +- hash/msx1_flop.xml | 70 +- hash/pico.xml | 2 +- hash/psx.xml | 14 +- src/build/flags_gcc.mak | 2 +- src/build/png2bdc.c | 8 +- src/emu/bus/a2bus/a2cffa.c | 6 +- src/emu/bus/a2bus/a2corvus.c | 21 +- src/emu/bus/a2bus/a2pic.c | 26 +- src/emu/bus/a2bus/a2ssc.c | 2 +- src/emu/bus/a2bus/a2ultraterm.c | 64 +- src/emu/bus/a2bus/a2videoterm.c | 4 +- src/emu/bus/a2bus/a2videoterm.h | 2 +- src/emu/bus/a2bus/a2vulcan.c | 2 +- src/emu/bus/adam/exp.h | 4 +- src/emu/bus/adamnet/fdc.h | 2 +- src/emu/bus/adamnet/spi.c | 6 +- src/emu/bus/adamnet/spi.h | 2 +- src/emu/bus/bml3/bml3mp1805.h | 2 +- src/emu/bus/c64/magic_formel.c | 6 +- src/emu/bus/cbm2/hrg.c | 2 +- src/emu/bus/cbm2/hrg.h | 2 +- src/emu/bus/cbm2/user.h | 2 +- src/emu/bus/cbmiec/c1541.c | 8 +- src/emu/bus/cbmiec/c1541.h | 4 +- src/emu/bus/cbmiec/c1571.c | 4 +- src/emu/bus/cbmiec/c1571.h | 4 +- src/emu/bus/coco/coco_fdc.c | 4 +- src/emu/bus/coco/coco_fdc.h | 6 +- src/emu/bus/coleco/exp.h | 4 +- src/emu/bus/coleco/hand.h | 2 +- src/emu/bus/coleco/sac.h | 2 +- src/emu/bus/coleco/std.h | 2 +- src/emu/bus/compucolor/floppy.c | 2 +- src/emu/bus/comx35/exp.h | 2 +- src/emu/bus/comx35/printer.c | 2 +- src/emu/bus/ecbbus/ecbbus.h | 5 +- src/emu/bus/ecbbus/grip.c | 6 +- src/emu/bus/econet/e01.c | 2 +- src/emu/bus/econet/econet.c | 2 +- src/emu/bus/econet/econet.h | 3 +- src/emu/bus/ep64/exp.h | 5 +- src/emu/bus/gameboy/gb_slot.c | 4 +- src/emu/bus/ieee488/c2031.c | 2 +- src/emu/bus/ieee488/c2031.h | 2 +- src/emu/bus/ieee488/c2040.c | 22 +- src/emu/bus/ieee488/c2040.h | 2 +- src/emu/bus/ieee488/c2040fdc.c | 30 +- src/emu/bus/ieee488/c8050.c | 2 +- src/emu/bus/ieee488/hardbox.c | 8 +- src/emu/bus/ieee488/softbox.c | 2 +- src/emu/bus/imi7000/imi5000h.h | 2 +- src/emu/bus/isa/3c505.c | 7 +- src/emu/bus/isa/adlib.h | 2 +- src/emu/bus/isa/aga.c | 15 +- src/emu/bus/isa/aga.h | 20 +- src/emu/bus/isa/cga.c | 4 +- src/emu/bus/isa/cga.h | 2 +- src/emu/bus/isa/dectalk.c | 2 +- src/emu/bus/isa/ega.h | 2 +- src/emu/bus/isa/gblaster.h | 2 +- src/emu/bus/isa/isa.c | 10 +- src/emu/bus/isa/isa.h | 28 +- src/emu/bus/isa/mda.c | 2 +- src/emu/bus/isa/mda.h | 2 +- src/emu/bus/isa/mufdc.c | 2 +- src/emu/bus/isa/mufdc.h | 4 +- src/emu/bus/isa/omti8621.c | 59 +- src/emu/bus/isa/omti8621.h | 6 +- src/emu/bus/isa/pds.c | 3 - src/emu/bus/isa/sblaster.c | 2 +- src/emu/bus/isa/sblaster.h | 10 +- src/emu/bus/isa/sc499.c | 13 +- src/emu/bus/isa/side116.h | 2 +- src/emu/bus/megadrive/md_carts.c | 2 +- src/emu/bus/megadrive/md_slot.c | 2 +- src/emu/bus/nes/act53.c | 20 +- src/emu/bus/nes/aladdin.c | 36 +- src/emu/bus/nes/aladdin.h | 30 +- src/emu/bus/nes/bandai.c | 6 +- src/emu/bus/nes/bandai.h | 6 +- src/emu/bus/nes/camerica.c | 6 +- src/emu/bus/nes/datach.c | 38 +- src/emu/bus/nes/datach.h | 16 +- src/emu/bus/nes/jy.c | 20 +- src/emu/bus/nes/jy.h | 4 +- src/emu/bus/nes/karastudio.c | 41 +- src/emu/bus/nes/karastudio.h | 28 +- src/emu/bus/nes/mmc5.c | 34 +- src/emu/bus/nes/mmc5.h | 2 +- src/emu/bus/nes/nes_carts.c | 3 +- src/emu/bus/nes/nes_ines.inc | 14 +- src/emu/bus/nes/nes_slot.h | 4 +- src/emu/bus/nes/nxrom.c | 24 +- src/emu/bus/nes/sunsoft_dcs.c | 8 +- src/emu/bus/nes/sunsoft_dcs.h | 8 +- src/emu/bus/nubus/nubus_specpdq.c | 2 +- src/emu/bus/nubus/nubus_specpdq.h | 2 +- src/emu/bus/plus4/c1551.c | 2 +- src/emu/bus/plus4/c1551.h | 2 +- src/emu/bus/sms_exp/smsexp.h | 2 +- src/emu/bus/vidbrain/exp.h | 4 +- src/emu/bus/wangpc/tig.c | 6 +- src/emu/bus/wangpc/tig.h | 2 +- src/emu/bus/wangpc/wangpc.h | 2 +- src/emu/clifront.h | 2 +- src/emu/cpu/avr8/avr8.c | 828 ++++++++-------- src/emu/cpu/avr8/avr8.h | 294 +++--- src/emu/cpu/avr8/avr8dasm.c | 186 ++-- src/emu/cpu/cosmac/cosmac.h | 18 +- src/emu/cpu/cpu.mak | 50 +- src/emu/cpu/cubeqcpu/cubeqcpu.h | 8 +- src/emu/cpu/dsp32/dsp32.c | 2 +- src/emu/cpu/esrip/esrip.h | 6 +- src/emu/cpu/g65816/g65816.h | 4 +- src/emu/cpu/h8/h8.c | 76 +- src/emu/cpu/h8/h8.h | 2 +- src/emu/cpu/h8/h8.lst | 10 +- src/emu/cpu/h8/h83002.h | 2 +- src/emu/cpu/h8/h83006.h | 2 +- src/emu/cpu/h8/h83008.h | 2 +- src/emu/cpu/h8/h83048.h | 2 +- src/emu/cpu/h8/h83337.c | 4 +- src/emu/cpu/h8/h83337.h | 8 +- src/emu/cpu/h8/h8_adc.c | 6 +- src/emu/cpu/h8/h8_adc.h | 2 +- src/emu/cpu/h8/h8_intc.c | 12 +- src/emu/cpu/h8/h8_intc.h | 8 +- src/emu/cpu/h8/h8_port.c | 10 +- src/emu/cpu/h8/h8_port.h | 2 +- src/emu/cpu/h8/h8_sci.c | 61 +- src/emu/cpu/h8/h8_sci.h | 2 +- src/emu/cpu/h8/h8_timer16.c | 34 +- src/emu/cpu/h8/h8_timer16.h | 14 +- src/emu/cpu/h8/h8_timer8.c | 12 +- src/emu/cpu/h8/h8_timer8.h | 6 +- src/emu/cpu/h8/h8s2245.c | 48 +- src/emu/cpu/h8/h8s2245.h | 2 +- src/emu/cpu/h8/h8s2320.c | 96 +- src/emu/cpu/h8/h8s2320.h | 2 +- src/emu/cpu/h8/h8s2357.c | 96 +- src/emu/cpu/h8/h8s2357.h | 2 +- src/emu/cpu/h8/h8s2655.c | 96 +- src/emu/cpu/h8/h8s2655.h | 2 +- src/emu/cpu/i386/i386.c | 1 - src/emu/cpu/i86/i186.c | 2 +- src/emu/cpu/mn10200/mn10200.c | 56 +- src/emu/cpu/mn10200/mn10200.h | 6 +- src/emu/cpu/pdp1/pdp1.c | 1 - src/emu/cpu/pdp1/pdp1.h | 2 +- src/emu/cpu/pdp1/tx0.c | 1 - src/emu/cpu/pdp1/tx0.h | 4 +- src/emu/cpu/powerpc/ppccom.c | 4 +- src/emu/cpu/rsp/rsp.h | 2 +- src/emu/cpu/rsp/rspdrc.c | 174 ++-- src/emu/cpu/sc61860/sc61860.c | 1 - src/emu/cpu/scmp/scmp.c | 1 - src/emu/cpu/se3208/se3208.c | 2 - src/emu/cpu/se3208/se3208.h | 1 - src/emu/cpu/sh2/sh2comn.c | 2 +- src/emu/cpu/sharc/sharc.c | 9 +- src/emu/cpu/sharc/sharc.h | 2 +- src/emu/cpu/ssp1601/ssp1601.c | 1 - src/emu/cpu/superfx/superfx.c | 11 +- src/emu/cpu/tlcs90/tlcs90.c | 1 - src/emu/cpu/tms32010/tms32010.c | 13 +- src/emu/cpu/tms32025/tms32025.c | 1 - src/emu/cpu/tms32025/tms32025.h | 4 +- src/emu/cpu/tms32051/tms32051.c | 1 - src/emu/cpu/tms32051/tms32051.h | 2 +- src/emu/cpu/tms34010/34010gfx.c | 2 +- src/emu/cpu/tms34010/tms34010.c | 2 +- src/emu/cpu/tms34010/tms34010.h | 2 +- src/emu/cpu/tms7000/tms7000.c | 1 - src/emu/cpu/unsp/unsp.c | 11 +- src/emu/cpu/upd7810/upd7810.c | 3 +- src/emu/cpu/upd7810/upd7810.h | 2 +- src/emu/cpu/v60/v60.c | 1 - src/emu/cpu/v60/v60.h | 2 +- src/emu/cpu/v810/v810.c | 1 - src/emu/cpu/z180/z180.c | 1 - src/emu/cpu/z180/z180tbl.h | 1 - src/emu/cpu/z80/tlcs_z80.c | 11 +- src/emu/cpu/z80/z80.c | 4 +- src/emu/cpu/z8000/z8000.c | 1 - src/emu/cpu/z8000/z8000.h | 2 +- src/emu/cpu/z8000/z8000ops.inc | 4 +- src/emu/crsshair.c | 2 +- src/emu/delegate.h | 8 +- src/emu/devfind.c | 2 +- src/emu/digfx.c | 4 +- src/emu/digfx.h | 12 +- src/emu/diimage.c | 20 +- src/emu/diimage.h | 8 +- src/emu/dioutput.c | 2 +- src/emu/diserial.h | 2 +- src/emu/drawgfx.h | 2 +- src/emu/drivenum.c | 6 +- src/emu/drivers/xtal.h | 2 +- src/emu/emualloc.h | 2 +- src/emu/emuopts.c | 2 +- src/emu/emupal.c | 32 +- src/emu/emupal.h | 77 +- src/emu/imagedev/flopdrv.c | 7 +- src/emu/imagedev/harddriv.h | 10 +- src/emu/ioport.c | 2 +- src/emu/ioport.h | 10 +- src/emu/machine.h | 2 +- src/emu/machine/64h156.c | 12 +- src/emu/machine/6522via.c | 2 +- src/emu/machine/6526cia.h | 4 +- src/emu/machine/6850acia.c | 6 +- src/emu/machine/68561mpcc.c | 2 +- src/emu/machine/74145.h | 18 +- src/emu/machine/8042kbdc.h | 2 +- src/emu/machine/8530scc.c | 2 +- src/emu/machine/bcreader.c | 106 +- src/emu/machine/bcreader.h | 4 +- src/emu/machine/com8116.h | 2 +- src/emu/machine/ds75161a.h | 26 +- src/emu/machine/generic.c | 1 - src/emu/machine/hd63450.c | 8 +- src/emu/machine/hd63450.h | 18 +- src/emu/machine/hd64610.h | 6 +- src/emu/machine/i8251.c | 2 +- src/emu/machine/i8271.c | 14 +- src/emu/machine/i8271.h | 8 +- src/emu/machine/i8355.h | 8 +- src/emu/machine/im6402.h | 2 +- src/emu/machine/ins8154.h | 8 +- src/emu/machine/k053252.h | 4 +- src/emu/machine/kb3600.c | 4 +- src/emu/machine/kb3600.h | 26 +- src/emu/machine/kr2376.c | 2 +- src/emu/machine/kr2376.h | 8 +- src/emu/machine/laserdsc.c | 4 +- src/emu/machine/latch8.c | 16 +- src/emu/machine/latch8.h | 20 +- src/emu/machine/lh5810.h | 10 +- src/emu/machine/mb87078.c | 2 +- src/emu/machine/mb87078.h | 4 +- src/emu/machine/mc2661.h | 2 +- src/emu/machine/mc68328.h | 54 +- src/emu/machine/mc6843.c | 4 +- src/emu/machine/mc6843.h | 10 +- src/emu/machine/mc6846.h | 4 +- src/emu/machine/mc68681.c | 42 +- src/emu/machine/mc68681.h | 2 +- src/emu/machine/mc68901.c | 2 +- src/emu/machine/mc68901.h | 10 +- src/emu/machine/mm58167.c | 75 +- src/emu/machine/mm58167.h | 6 +- src/emu/machine/mm74c922.h | 12 +- src/emu/machine/mos6530.h | 14 +- src/emu/machine/mos6551.c | 2 +- src/emu/machine/msm6242.h | 4 +- src/emu/machine/ncr5380.h | 2 +- src/emu/machine/netlist.c | 377 ++++--- src/emu/machine/netlist.h | 534 +++++----- src/emu/machine/nsc810.c | 1 - src/emu/machine/pc_lpt.c | 1 - src/emu/machine/pci.c | 1 - src/emu/machine/pckeybrd.c | 2 +- src/emu/machine/pckeybrd.h | 6 +- src/emu/machine/rp5c01.h | 2 +- src/emu/machine/rp5c15.h | 2 +- src/emu/machine/rtc4543.c | 4 +- src/emu/machine/rtc65271.h | 2 +- src/emu/machine/s3c2400.c | 6 +- src/emu/machine/s3c2400.h | 12 +- src/emu/machine/s3c2410.c | 4 +- src/emu/machine/s3c2410.h | 16 +- src/emu/machine/s3c2440.c | 56 +- src/emu/machine/s3c2440.h | 14 +- src/emu/machine/s3c24xx.inc | 3 +- src/emu/machine/saturn.c | 4 +- src/emu/machine/seibu_cop.h | 8 +- src/emu/machine/smc91c9x.h | 4 +- src/emu/machine/smc92x4.c | 12 +- src/emu/machine/smc92x4.h | 2 +- src/emu/machine/tc009xlvc.h | 2 +- src/emu/machine/terminal.c | 1 - src/emu/machine/tmp68301.h | 4 +- src/emu/machine/tms5501.c | 8 +- src/emu/machine/upd1990a.c | 28 +- src/emu/machine/upd1990a.h | 2 +- src/emu/machine/upd7002.c | 2 +- src/emu/machine/upd7002.h | 10 +- src/emu/machine/upd765.c | 2 +- src/emu/machine/wd17xx.c | 2 +- src/emu/machine/wd17xx.h | 4 +- src/emu/machine/wd33c93.h | 2 +- src/emu/machine/z80dma.c | 1 - src/emu/machine/z8536.h | 2 +- src/emu/mame.c | 4 +- src/emu/memarray.h | 2 +- src/emu/netlist/analog/nld_bjt.c | 175 ++-- src/emu/netlist/analog/nld_bjt.h | 234 ++--- src/emu/netlist/analog/nld_fourterm.c | 95 +- src/emu/netlist/analog/nld_fourterm.h | 56 +- src/emu/netlist/analog/nld_solver.c | 1318 ++++++++++++------------- src/emu/netlist/analog/nld_solver.h | 112 +-- src/emu/netlist/analog/nld_switches.c | 50 +- src/emu/netlist/analog/nld_switches.h | 2 +- src/emu/netlist/analog/nld_twoterm.c | 60 +- src/emu/netlist/analog/nld_twoterm.h | 124 +-- src/emu/netlist/devices/net_lib.c | 86 +- src/emu/netlist/devices/nld_4066.c | 90 +- src/emu/netlist/devices/nld_4066.h | 18 +- src/emu/netlist/devices/nld_7400.c | 59 +- src/emu/netlist/devices/nld_7400.h | 2 +- src/emu/netlist/devices/nld_7402.c | 59 +- src/emu/netlist/devices/nld_7402.h | 10 +- src/emu/netlist/devices/nld_7404.c | 62 +- src/emu/netlist/devices/nld_7404.h | 14 +- src/emu/netlist/devices/nld_7410.c | 51 +- src/emu/netlist/devices/nld_7410.h | 8 +- src/emu/netlist/devices/nld_74107.c | 56 +- src/emu/netlist/devices/nld_74107.h | 6 +- src/emu/netlist/devices/nld_74153.c | 93 +- src/emu/netlist/devices/nld_74153.h | 20 +- src/emu/netlist/devices/nld_7420.c | 35 +- src/emu/netlist/devices/nld_7420.h | 6 +- src/emu/netlist/devices/nld_7425.c | 39 +- src/emu/netlist/devices/nld_7425.h | 6 +- src/emu/netlist/devices/nld_7427.c | 51 +- src/emu/netlist/devices/nld_7427.h | 8 +- src/emu/netlist/devices/nld_7430.c | 27 +- src/emu/netlist/devices/nld_7430.h | 4 +- src/emu/netlist/devices/nld_7448.c | 225 +++-- src/emu/netlist/devices/nld_7448.h | 54 +- src/emu/netlist/devices/nld_7450.c | 107 +- src/emu/netlist/devices/nld_7450.h | 22 +- src/emu/netlist/devices/nld_7474.c | 66 +- src/emu/netlist/devices/nld_7474.h | 6 +- src/emu/netlist/devices/nld_7483.c | 40 +- src/emu/netlist/devices/nld_7483.h | 2 +- src/emu/netlist/devices/nld_7486.c | 51 +- src/emu/netlist/devices/nld_7486.h | 10 +- src/emu/netlist/devices/nld_7490.c | 69 +- src/emu/netlist/devices/nld_7490.h | 6 +- src/emu/netlist/devices/nld_7493.c | 58 +- src/emu/netlist/devices/nld_7493.h | 2 +- src/emu/netlist/devices/nld_74ls629.c | 194 ++-- src/emu/netlist/devices/nld_74ls629.h | 26 +- src/emu/netlist/devices/nld_9316.c | 93 +- src/emu/netlist/devices/nld_9316.h | 14 +- src/emu/netlist/devices/nld_legacy.c | 4 +- src/emu/netlist/devices/nld_ne555.c | 40 +- src/emu/netlist/devices/nld_ne555.h | 2 +- src/emu/netlist/devices/nld_signal.h | 172 ++-- src/emu/netlist/devices/nld_system.c | 10 +- src/emu/netlist/devices/nld_system.h | 256 ++--- src/emu/netlist/nl_base.c | 590 +++++------ src/emu/netlist/nl_base.h | 1236 +++++++++++------------ src/emu/netlist/nl_dice_compat.h | 52 +- src/emu/netlist/nl_lists.h | 596 +++++------ src/emu/netlist/nl_parser.c | 600 ++++++----- src/emu/netlist/nl_parser.h | 424 ++++---- src/emu/netlist/nl_setup.c | 238 ++--- src/emu/netlist/nl_setup.h | 20 +- src/emu/netlist/pstate.c | 38 +- src/emu/netlist/pstate.h | 38 +- src/emu/netlist/pstring.h | 16 +- src/emu/output.c | 8 +- src/emu/render.c | 2 +- src/emu/rendfont.c | 4 +- src/emu/rendfont.h | 10 +- src/emu/rendlay.c | 14 +- src/emu/rendlay.h | 2 +- src/emu/screen.c | 8 +- src/emu/screen.h | 2 +- src/emu/softlist.c | 174 ++-- src/emu/softlist.h | 58 +- src/emu/sound/aica.c | 72 +- src/emu/sound/aica.h | 10 +- src/emu/sound/ay8910.c | 85 +- src/emu/sound/cdp1869.c | 2 +- src/emu/sound/cdp1869.h | 4 +- src/emu/sound/dmadac.c | 3 +- src/emu/sound/dmadac.h | 2 +- src/emu/sound/es5503.c | 2 +- src/emu/sound/es5503.h | 8 +- src/emu/sound/ics2115.c | 2 +- src/emu/sound/k007232.h | 4 +- src/emu/sound/mos6560.h | 2 +- src/emu/sound/msm5205.h | 4 +- src/emu/sound/msm5232.c | 2 +- src/emu/sound/msm5232.h | 4 +- src/emu/sound/qs1000.c | 2 +- src/emu/sound/qs1000.h | 8 +- src/emu/sound/qsound.c | 18 +- src/emu/sound/scsp.c | 12 +- src/emu/sound/scsp.h | 28 +- src/emu/sound/sp0256.h | 8 +- src/emu/sound/spu.c | 12 +- src/emu/sound/tc8830f.c | 8 +- src/emu/sound/upd7759.c | 4 +- src/emu/sound/upd7759.h | 4 +- src/emu/sound/votrax.h | 4 +- src/emu/sound/ymf278b.c | 2 +- src/emu/sound/ymz280b.c | 2 +- src/emu/sound/zsg2.c | 44 +- src/emu/sound/zsg2.h | 2 +- src/emu/tilemap.h | 2 +- src/emu/ui/barcode.c | 28 +- src/emu/ui/barcode.h | 2 +- src/emu/ui/devctrl.h | 6 +- src/emu/ui/filemngr.c | 2 - src/emu/ui/filesel.c | 24 +- src/emu/ui/filesel.h | 40 +- src/emu/ui/imgcntrl.c | 2 +- src/emu/ui/imginfo.c | 2 - src/emu/ui/mainmenu.c | 4 +- src/emu/ui/menu.c | 204 ++-- src/emu/ui/menu.h | 96 +- src/emu/ui/selgame.c | 6 +- src/emu/ui/selgame.h | 8 +- src/emu/ui/swlist.c | 2 +- src/emu/ui/swlist.h | 26 +- src/emu/ui/ui.c | 186 ++-- src/emu/ui/ui.h | 32 +- src/emu/ui/viewgfx.c | 54 +- src/emu/validity.c | 2 +- src/emu/validity.h | 6 +- src/emu/video.c | 4 +- src/emu/video/315_5124.h | 14 +- src/emu/video/315_5313.c | 12 +- src/emu/video/315_5313.h | 18 +- src/emu/video/crt9007.h | 4 +- src/emu/video/crt9021.h | 4 +- src/emu/video/crt9212.h | 4 +- src/emu/video/dl1416.h | 2 +- src/emu/video/ef9345.h | 6 +- src/emu/video/epic12.c | 70 +- src/emu/video/epic12.h | 47 +- src/emu/video/epic12_blit2.c | 2 +- src/emu/video/epic12_blit3.c | 2 +- src/emu/video/epic12_blit4.c | 2 +- src/emu/video/epic12_blit6.c | 2 - src/emu/video/epic12_blit7.c | 2 - src/emu/video/epic12_blit8.c | 3 - src/emu/video/epic12in.inc | 10 +- src/emu/video/epic12pixel.inc | 9 +- src/emu/video/fixfreq.c | 2 +- src/emu/video/hd44352.h | 2 +- src/emu/video/hd44780.h | 2 +- src/emu/video/hd61830.h | 2 +- src/emu/video/huc6260.h | 10 +- src/emu/video/huc6270.h | 6 +- src/emu/video/mb_vcu.h | 2 +- src/emu/video/mc6845.c | 2 +- src/emu/video/mc6847.c | 39 +- src/emu/video/mc6847.h | 6 +- src/emu/video/pc_vga.c | 6 +- src/emu/video/ramdac.h | 6 +- src/emu/video/tms34061.c | 2 +- src/emu/video/tms34061.h | 12 +- src/emu/video/upd3301.c | 1 - src/emu/video/upd7220.h | 4 +- src/emu/video/v9938.h | 2 +- src/emu/video/vic4567.h | 2 +- src/lib/formats/cassimg.c | 2 +- src/lib/formats/ccvf_dsk.c | 8 +- src/lib/formats/d64_dsk.c | 2 +- src/lib/formats/fmtowns_dsk.c | 2 +- src/lib/formats/g64_dsk.c | 12 +- src/lib/formats/mbee_cas.h | 1 - src/lib/formats/phc25_cas.c | 4 +- src/lib/formats/phc25_cas.h | 1 - src/lib/formats/sol_cas.c | 6 +- src/lib/formats/sol_cas.h | 1 - src/lib/formats/sorc_cas.h | 1 - src/lib/formats/spc1000_cas.h | 1 - src/lib/formats/z80ne_dsk.c | 2 +- src/lib/libflac/include/FLAC/export.h | 4 +- src/lib/libflac/include/FLAC/format.h | 7 +- src/lib/libflac/include/FLAC/metadata.h | 3 +- src/lib/libflac/include/FLAC/stream_decoder.h | 8 - src/lib/libflac/include/FLAC/stream_encoder.h | 6 - src/lib/libflac/include/private/fixed.h | 48 +- src/lib/libflac/include/private/float.h | 22 +- src/lib/libflac/include/private/lpc.h | 172 ++-- src/lib/libflac/include/private/window.h | 12 +- src/lib/libflac/libFLAC/bitreader.c | 16 +- src/lib/libflac/libFLAC/float.c | 2 +- src/lib/libflac/libFLAC/lpc.c | 112 +-- src/lib/libflac/libFLAC/md5.c | 16 +- src/lib/libflac/libFLAC/metadata_iterators.c | 4 +- src/lib/libflac/libFLAC/metadata_object.c | 2 +- src/lib/libflac/libFLAC/stream_decoder.c | 8 +- src/lib/libflac/libFLAC/stream_encoder.c | 14 +- src/lib/util/chd.h | 2 +- src/lib/util/corealloc.c | 10 +- src/lib/util/cstrpool.c | 12 +- src/lib/util/cstrpool.h | 16 +- src/lib/util/options.h | 2 +- src/lib/util/palette.c | 64 +- src/lib/util/palette.h | 28 +- src/lib/util/tagmap.c | 2 +- src/lib/util/tagmap.h | 4 +- src/mame/audio/cclimber.c | 5 +- src/mame/audio/cclimber.h | 10 +- src/mame/audio/cps3.c | 8 +- src/mame/audio/namco52.c | 2 +- src/mame/audio/namco52.h | 10 +- src/mame/audio/namco54.c | 2 +- src/mame/audio/namco54.h | 6 +- src/mame/audio/taito_en.h | 2 +- src/mame/audio/taito_zm.c | 6 +- src/mame/audio/taito_zm.h | 4 +- src/mame/drivers/1942.c | 194 ++-- src/mame/drivers/1945kiii.c | 8 +- src/mame/drivers/20pacgal.c | 6 +- src/mame/drivers/3x3puzzl.c | 2 +- src/mame/drivers/4enlinea.c | 20 +- src/mame/drivers/5clown.c | 2 +- src/mame/drivers/88games.c | 6 +- src/mame/drivers/a1supply.c | 32 +- src/mame/drivers/acefruit.c | 2 +- src/mame/drivers/aerofgt.c | 12 +- src/mame/drivers/albazc.c | 2 +- src/mame/drivers/aleisttl.c | 32 +- src/mame/drivers/amusco.c | 51 +- src/mame/drivers/arcadia.c | 16 +- src/mame/drivers/aristmk4.c | 26 +- src/mame/drivers/asteroid.c | 2 +- src/mame/drivers/astinvad.c | 2 +- src/mame/drivers/astrof.c | 1 - src/mame/drivers/asuka.c | 4 +- src/mame/drivers/atarigx2.c | 58 +- src/mame/drivers/atarittl.c | 132 +-- src/mame/drivers/atetris.c | 2 +- src/mame/drivers/backfire.c | 4 +- src/mame/drivers/bailey.c | 32 +- src/mame/drivers/battlnts.c | 2 +- src/mame/drivers/beathead.c | 2 +- src/mame/drivers/big10.c | 6 +- src/mame/drivers/blackt96.c | 2 +- src/mame/drivers/bladestl.c | 6 +- src/mame/drivers/blmbycar.c | 2 +- src/mame/drivers/blockhl.c | 2 +- src/mame/drivers/bloodbro.c | 2 +- src/mame/drivers/blstroid.c | 2 +- src/mame/drivers/bmcbowl.c | 4 +- src/mame/drivers/bmcpokr.c | 2 +- src/mame/drivers/bnstars.c | 4 +- src/mame/drivers/boogwing.c | 2 +- src/mame/drivers/bowltry.c | 30 +- src/mame/drivers/boxer.c | 8 +- src/mame/drivers/btime.c | 2 +- src/mame/drivers/bzone.c | 2 +- src/mame/drivers/cabal.c | 2 +- src/mame/drivers/calomega.c | 8 +- src/mame/drivers/carrera.c | 2 +- src/mame/drivers/cavepc.c | 8 +- src/mame/drivers/cball.c | 2 +- src/mame/drivers/cbuster.c | 2 +- src/mame/drivers/cd32.c | 2 +- src/mame/drivers/centiped.c | 2 +- src/mame/drivers/chanbara.c | 2 +- src/mame/drivers/chicago.c | 34 +- src/mame/drivers/chqflag.c | 2 +- src/mame/drivers/cliffhgr.c | 2 +- src/mame/drivers/cmmb.c | 2 +- src/mame/drivers/cninja.c | 12 +- src/mame/drivers/cntsteer.c | 2 +- src/mame/drivers/cobra.c | 2 +- src/mame/drivers/coinmstr.c | 74 +- src/mame/drivers/coolridr.c | 2 +- src/mame/drivers/cps1.c | 32 +- src/mame/drivers/cps3.c | 2 +- src/mame/drivers/crystal.c | 74 +- src/mame/drivers/cswat.c | 6 +- src/mame/drivers/cubeqst.c | 2 +- src/mame/drivers/cv1k.c | 48 +- src/mame/drivers/d9final.c | 2 +- src/mame/drivers/dacholer.c | 2 +- src/mame/drivers/dai3wksi.c | 6 +- src/mame/drivers/dassault.c | 2 +- src/mame/drivers/dblcrown.c | 16 +- src/mame/drivers/dblewing.c | 2 +- src/mame/drivers/ddealer.c | 8 +- src/mame/drivers/ddenlovr.c | 2 +- src/mame/drivers/ddragon3.c | 4 +- src/mame/drivers/dec0.c | 2 +- src/mame/drivers/deco32.c | 16 +- src/mame/drivers/deco_ld.c | 4 +- src/mame/drivers/deshoros.c | 2 +- src/mame/drivers/destroyr.c | 2 +- src/mame/drivers/dfruit.c | 4 +- src/mame/drivers/discoboy.c | 6 +- src/mame/drivers/dkong.c | 6 +- src/mame/drivers/docastle.c | 2 +- src/mame/drivers/dominob.c | 2 - src/mame/drivers/dooyong.c | 2 +- src/mame/drivers/dorachan.c | 2 +- src/mame/drivers/dotrikun.c | 2 +- src/mame/drivers/dreamwld.c | 8 +- src/mame/drivers/dunhuang.c | 2 +- src/mame/drivers/dwarfd.c | 4 +- src/mame/drivers/ecoinf2.c | 30 +- src/mame/drivers/electra.c | 32 +- src/mame/drivers/enigma2.c | 2 +- src/mame/drivers/exedexes.c | 2 +- src/mame/drivers/exerion.c | 2 +- src/mame/drivers/exidyttl.c | 52 +- src/mame/drivers/exprraid.c | 8 +- src/mame/drivers/f1gp.c | 4 +- src/mame/drivers/fantland.c | 2 +- src/mame/drivers/fcrash.c | 4 +- src/mame/drivers/feversoc.c | 2 +- src/mame/drivers/firefox.c | 2 +- src/mame/drivers/firetrk.c | 4 +- src/mame/drivers/flipjack.c | 6 +- src/mame/drivers/flkatck.c | 16 +- src/mame/drivers/flyball.c | 2 +- src/mame/drivers/fungames.c | 32 +- src/mame/drivers/funkyjet.c | 2 +- src/mame/drivers/funworld.c | 220 ++--- src/mame/drivers/gaelco3d.c | 2 +- src/mame/drivers/gaiden.c | 2 +- src/mame/drivers/galaga.c | 38 +- src/mame/drivers/galaxi.c | 2 +- src/mame/drivers/galaxian.c | 4 +- src/mame/drivers/galaxold.c | 4 +- src/mame/drivers/galivan.c | 2 +- src/mame/drivers/galpani2.c | 4 +- src/mame/drivers/gaplus.c | 10 +- src/mame/drivers/gatron.c | 15 +- src/mame/drivers/gbusters.c | 6 +- src/mame/drivers/gei.c | 2 +- src/mame/drivers/ggconnie.c | 2 +- src/mame/drivers/ghosteo.c | 2 +- src/mame/drivers/gladiatr.c | 2 +- src/mame/drivers/go2000.c | 2 +- src/mame/drivers/goldnpkr.c | 10 +- src/mame/drivers/goldstar.c | 86 +- src/mame/drivers/gstream.c | 43 +- src/mame/drivers/gsword.c | 2 +- src/mame/drivers/gticlub.c | 6 +- src/mame/drivers/gunpey.c | 2 +- src/mame/drivers/gunsmoke.c | 2 +- src/mame/drivers/halleys.c | 6 +- src/mame/drivers/highvdeo.c | 6 +- src/mame/drivers/hng64.c | 28 +- src/mame/drivers/hornet.c | 4 +- src/mame/drivers/hshavoc.c | 2 +- src/mame/drivers/hvyunit.c | 2 +- src/mame/drivers/hyperspt.c | 2 +- src/mame/drivers/igs017.c | 2 +- src/mame/drivers/igs_m027.c | 1 - src/mame/drivers/igspoker.c | 2 +- src/mame/drivers/ikki.c | 2 +- src/mame/drivers/intrscti.c | 2 +- src/mame/drivers/itgambl3.c | 13 +- src/mame/drivers/itgamble.c | 2 +- src/mame/drivers/jackie.c | 2 +- src/mame/drivers/jclub2.c | 199 ++-- src/mame/drivers/kaneko16.c | 12 +- src/mame/drivers/kingobox.c | 2 +- src/mame/drivers/koftball.c | 6 +- src/mame/drivers/konamigx.c | 2 +- src/mame/drivers/konendev.c | 2 +- src/mame/drivers/kopunch.c | 8 +- src/mame/drivers/lastbank.c | 2 +- src/mame/drivers/lethal.c | 84 +- src/mame/drivers/littlerb.c | 14 +- src/mame/drivers/ltcasino.c | 2 +- src/mame/drivers/m14.c | 4 +- src/mame/drivers/m62.c | 2 +- src/mame/drivers/m63.c | 3 +- src/mame/drivers/mappy.c | 16 +- src/mame/drivers/mazerbla.c | 2 +- src/mame/drivers/mcr3.c | 4 +- src/mame/drivers/mcr68.c | 8 +- src/mame/drivers/meadwttl.c | 32 +- src/mame/drivers/megaphx.c | 60 +- src/mame/drivers/megaplay.c | 32 +- src/mame/drivers/megatech.c | 54 +- src/mame/drivers/metalmx.c | 2 +- src/mame/drivers/metro.c | 10 +- src/mame/drivers/mgolf.c | 2 +- src/mame/drivers/mhavoc.c | 2 +- src/mame/drivers/micro3d.c | 2 +- src/mame/drivers/mil4000.c | 74 +- src/mame/drivers/mirage.c | 2 +- src/mame/drivers/mitchell.c | 2 +- src/mame/drivers/mlanding.c | 2 +- src/mame/drivers/model1.c | 4 +- src/mame/drivers/model2.c | 2 +- src/mame/drivers/model3.c | 6 +- src/mame/drivers/monacogp.c | 132 +-- src/mame/drivers/mpoker.c | 2 +- src/mame/drivers/mpu4.c | 4 +- src/mame/drivers/mpu4hw.c | 4 +- src/mame/drivers/mpu4misc.c | 10 +- src/mame/drivers/mugsmash.c | 2 +- src/mame/drivers/multfish.c | 14 +- src/mame/drivers/multfish_boot.c | 2 +- src/mame/drivers/multfish_ref.c | 2 - src/mame/drivers/murogmbl.c | 2 +- src/mame/drivers/mystwarr.c | 12 +- src/mame/drivers/namcos12.c | 6 +- src/mame/drivers/namcos22.c | 10 +- src/mame/drivers/naomi.c | 244 ++--- src/mame/drivers/nbmj8891.c | 4 +- src/mame/drivers/nbmj8900.c | 2 +- src/mame/drivers/neogeo.c | 7 +- src/mame/drivers/neptunp2.c | 2 +- src/mame/drivers/nightgal.c | 2 +- src/mame/drivers/ninjaw.c | 2 +- src/mame/drivers/nmg5.c | 2 +- src/mame/drivers/nss.c | 2 +- src/mame/drivers/nwk-tr.c | 2 +- src/mame/drivers/nycaptor.c | 4 +- src/mame/drivers/nyny.c | 2 +- src/mame/drivers/offtwall.c | 24 +- src/mame/drivers/ohmygod.c | 2 +- src/mame/drivers/olibochu.c | 4 +- src/mame/drivers/onetwo.c | 2 +- src/mame/drivers/othello.c | 2 +- src/mame/drivers/overdriv.c | 4 +- src/mame/drivers/pacman.c | 12 +- src/mame/drivers/panicr.c | 2 +- src/mame/drivers/pcxt.c | 12 +- src/mame/drivers/pengadvb.c | 12 +- src/mame/drivers/peplus.c | 4 +- src/mame/drivers/pgm.c | 1 - src/mame/drivers/pgm2.c | 75 +- src/mame/drivers/photon.c | 2 +- src/mame/drivers/pinkiri8.c | 2 +- src/mame/drivers/pkscram.c | 2 +- src/mame/drivers/pktgaldx.c | 2 +- src/mame/drivers/polepos.c | 8 +- src/mame/drivers/pong.c | 1254 +++++++++++------------ src/mame/drivers/popeye.c | 148 +-- src/mame/drivers/popobear.c | 4 +- src/mame/drivers/puckpkmn.c | 4 +- src/mame/drivers/pzletime.c | 4 +- src/mame/drivers/qdrmfgp.c | 4 +- src/mame/drivers/quantum.c | 2 +- src/mame/drivers/r2dx_v33.c | 2 +- src/mame/drivers/raiden2.c | 14 +- src/mame/drivers/ramtek.c | 44 +- src/mame/drivers/rcorsair.c | 2 +- src/mame/drivers/realbrk.c | 2 +- src/mame/drivers/rltennis.c | 2 +- src/mame/drivers/rockrage.c | 4 +- src/mame/drivers/rohga.c | 10 +- src/mame/drivers/rollerg.c | 6 +- src/mame/drivers/rungun.c | 2 +- src/mame/drivers/s7.c | 2 +- src/mame/drivers/safarir.c | 2 +- src/mame/drivers/scobra.c | 4 +- src/mame/drivers/scramble.c | 2 +- src/mame/drivers/seabattl.c | 2 +- src/mame/drivers/segac2.c | 26 +- src/mame/drivers/segaorun.c | 20 +- src/mame/drivers/segas16a.c | 12 +- src/mame/drivers/segas18.c | 2 +- src/mame/drivers/segaybd.c | 2 +- src/mame/drivers/seicross.c | 4 +- src/mame/drivers/seta.c | 10 +- src/mame/drivers/seta2.c | 4 +- src/mame/drivers/sf.c | 2 +- src/mame/drivers/sidearms.c | 2 +- src/mame/drivers/sigmab98.c | 4 +- src/mame/drivers/simpl156.c | 2 +- src/mame/drivers/skylncr.c | 20 +- src/mame/drivers/slapfght.c | 16 +- src/mame/drivers/slapshot.c | 2 +- src/mame/drivers/smsmcorp.c | 2 +- src/mame/drivers/spy.c | 2 +- src/mame/drivers/statriv2.c | 2 +- src/mame/drivers/stuntair.c | 2 +- src/mame/drivers/subs.c | 2 +- src/mame/drivers/subsino.c | 2 +- src/mame/drivers/subsino2.c | 6 +- src/mame/drivers/supbtime.c | 4 +- src/mame/drivers/supercrd.c | 2 +- src/mame/drivers/superwng.c | 2 +- src/mame/drivers/system16.c | 2 +- src/mame/drivers/taito_b.c | 10 +- src/mame/drivers/taito_f2.c | 12 +- src/mame/drivers/taitoair.c | 2 +- src/mame/drivers/taitogn.c | 14 +- src/mame/drivers/taitojc.c | 4 +- src/mame/drivers/taitottl.c | 66 +- src/mame/drivers/taotaido.c | 2 +- src/mame/drivers/tceptor.c | 2 +- src/mame/drivers/tecmo16.c | 2 +- src/mame/drivers/thunderx.c | 2 +- src/mame/drivers/toaplan1.c | 2 +- src/mame/drivers/toaplan2.c | 6 +- src/mame/drivers/tourtabl.c | 2 +- src/mame/drivers/toypop.c | 6 +- src/mame/drivers/triforce.c | 2 +- src/mame/drivers/truco.c | 2 +- src/mame/drivers/tugboat.c | 2 +- src/mame/drivers/tumbleb.c | 2 +- src/mame/drivers/tumblep.c | 2 +- src/mame/drivers/turrett.c | 2 +- src/mame/drivers/uapce.c | 2 +- src/mame/drivers/ultraman.c | 8 +- src/mame/drivers/vamphalf.c | 4 +- src/mame/drivers/vaportra.c | 2 +- src/mame/drivers/vball.c | 2 +- src/mame/drivers/vega.c | 6 +- src/mame/drivers/vendetta.c | 2 +- src/mame/drivers/vlc.c | 4 +- src/mame/drivers/volfied.c | 2 +- src/mame/drivers/vp101.c | 2 +- src/mame/drivers/wardner.c | 4 +- src/mame/drivers/warpwarp.c | 2 +- src/mame/drivers/wecleman.c | 2 +- src/mame/drivers/welltris.c | 2 +- src/mame/drivers/witch.c | 18 +- src/mame/drivers/wiz.c | 4 +- src/mame/drivers/wolfpack.c | 2 +- src/mame/drivers/xmen.c | 4 +- src/mame/drivers/xybots.c | 2 +- src/mame/drivers/xyonix.c | 2 +- src/mame/drivers/zaxxon.c | 2 +- src/mame/drivers/zr107.c | 5 +- src/mame/etc/template_driver.c | 8 +- src/mame/includes/1943.h | 2 +- src/mame/includes/airbustr.h | 2 +- src/mame/includes/amiga.h | 4 +- src/mame/includes/atari.h | 2 +- src/mame/includes/atarisy1.h | 2 +- src/mame/includes/aztarac.h | 2 +- src/mame/includes/balsente.h | 2 +- src/mame/includes/battlane.h | 2 +- src/mame/includes/battlera.h | 2 +- src/mame/includes/bfm_sc45.h | 6 +- src/mame/includes/bigevglf.h | 2 +- src/mame/includes/bladestl.h | 1 - src/mame/includes/btime.h | 2 +- src/mame/includes/bublbobl.h | 2 +- src/mame/includes/bwing.h | 2 +- src/mame/includes/calomega.h | 2 +- src/mame/includes/carpolo.h | 2 +- src/mame/includes/cave.h | 2 +- src/mame/includes/ccastles.h | 2 +- src/mame/includes/cchasm.h | 2 +- src/mame/includes/centiped.h | 2 +- src/mame/includes/cidelsa.h | 4 +- src/mame/includes/citycon.h | 2 +- src/mame/includes/cninja.h | 2 +- src/mame/includes/combatsc.h | 2 +- src/mame/includes/contra.h | 2 +- src/mame/includes/cop01.h | 2 +- src/mame/includes/copsnrob.h | 2 +- src/mame/includes/cps1.h | 4 +- src/mame/includes/crbaloon.h | 2 +- src/mame/includes/crimfght.h | 2 +- src/mame/includes/crshrace.h | 4 +- src/mame/includes/cvs.h | 4 +- src/mame/includes/darius.h | 2 +- src/mame/includes/dbz.h | 2 +- src/mame/includes/dcheese.h | 2 +- src/mame/includes/deadang.h | 2 +- src/mame/includes/dec8.h | 2 +- src/mame/includes/deco32.h | 4 +- src/mame/includes/djboy.h | 2 +- src/mame/includes/dkong.h | 2 +- src/mame/includes/docastle.h | 6 +- src/mame/includes/equites.h | 2 +- src/mame/includes/espial.h | 2 +- src/mame/includes/esripsys.h | 2 +- src/mame/includes/exerion.h | 4 +- src/mame/includes/exidy.h | 2 +- src/mame/includes/exidy440.h | 2 +- src/mame/includes/exprraid.h | 2 +- src/mame/includes/f1gp.h | 4 +- src/mame/includes/fastfred.h | 2 +- src/mame/includes/fcombat.h | 2 +- src/mame/includes/fgoal.h | 2 +- src/mame/includes/firetrap.h | 2 +- src/mame/includes/firetrk.h | 2 +- src/mame/includes/fuukifg2.h | 2 +- src/mame/includes/fuukifg3.h | 4 +- src/mame/includes/gaelco3d.h | 2 +- src/mame/includes/galaga.h | 2 +- src/mame/includes/galpanic.h | 2 +- src/mame/includes/gaplus.h | 2 +- src/mame/includes/gcpinbal.h | 2 +- src/mame/includes/gladiatr.h | 4 +- src/mame/includes/gottlieb.h | 4 +- src/mame/includes/gradius3.h | 2 +- src/mame/includes/grchamp.h | 2 +- src/mame/includes/gridlee.h | 2 +- src/mame/includes/gsword.h | 2 +- src/mame/includes/gyruss.h | 2 +- src/mame/includes/harddriv.h | 2 +- src/mame/includes/homedata.h | 2 +- src/mame/includes/homerun.h | 2 +- src/mame/includes/hyprduel.h | 2 +- src/mame/includes/ikki.h | 2 +- src/mame/includes/irobot.h | 2 +- src/mame/includes/ironhors.h | 2 +- src/mame/includes/itech32.h | 2 +- src/mame/includes/jackal.h | 2 +- src/mame/includes/kaneko16.h | 8 +- src/mame/includes/karnov.h | 6 +- src/mame/includes/konamigx.h | 2 +- src/mame/includes/labyrunr.h | 2 +- src/mame/includes/ladybug.h | 2 +- src/mame/includes/laserbat.h | 2 +- src/mame/includes/lasso.h | 2 +- src/mame/includes/lastduel.h | 4 +- src/mame/includes/lazercmd.h | 2 +- src/mame/includes/liberate.h | 2 +- src/mame/includes/lkage.h | 2 +- src/mame/includes/lockon.h | 2 +- src/mame/includes/lsasquad.h | 2 +- src/mame/includes/m10.h | 4 +- src/mame/includes/m107.h | 2 +- src/mame/includes/m52.h | 2 +- src/mame/includes/m72.h | 2 +- src/mame/includes/m92.h | 2 +- src/mame/includes/macrossp.h | 2 +- src/mame/includes/matmania.h | 2 +- src/mame/includes/mcatadv.h | 2 +- src/mame/includes/mcr68.h | 2 +- src/mame/includes/meadows.h | 2 +- src/mame/includes/metlclsh.h | 2 +- src/mame/includes/micro3d.h | 2 +- src/mame/includes/model3.h | 2 +- src/mame/includes/mouser.h | 4 +- src/mame/includes/mrflea.h | 2 +- src/mame/includes/ms32.h | 2 +- src/mame/includes/mugsmash.h | 2 +- src/mame/includes/multfish.h | 4 - src/mame/includes/munchmo.h | 2 +- src/mame/includes/n8080.h | 2 +- src/mame/includes/namcona1.h | 6 +- src/mame/includes/namcos1.h | 2 +- src/mame/includes/namcos2.h | 2 +- src/mame/includes/naughtyb.h | 2 +- src/mame/includes/nemesis.h | 2 +- src/mame/includes/ninjaw.h | 2 +- src/mame/includes/nitedrvr.h | 2 +- src/mame/includes/nycaptor.h | 2 +- src/mame/includes/ojankohs.h | 2 +- src/mame/includes/orbit.h | 2 +- src/mame/includes/othunder.h | 2 +- src/mame/includes/pandoras.h | 2 +- src/mame/includes/paradise.h | 2 +- src/mame/includes/pcktgal.h | 2 +- src/mame/includes/pktgaldx.h | 2 +- src/mame/includes/playch10.h | 2 +- src/mame/includes/pooyan.h | 2 +- src/mame/includes/popeye.h | 2 +- src/mame/includes/portrait.h | 2 +- src/mame/includes/powerins.h | 2 +- src/mame/includes/psikyo4.h | 2 +- src/mame/includes/pushman.h | 2 +- src/mame/includes/rainbow.h | 2 +- src/mame/includes/rockrage.h | 3 +- src/mame/includes/rohga.h | 2 +- src/mame/includes/rungun.h | 2 +- src/mame/includes/sbasketb.h | 2 +- src/mame/includes/scramble.h | 2 +- src/mame/includes/segas16b.h | 2 +- src/mame/includes/segas18.h | 2 +- src/mame/includes/seicross.h | 2 +- src/mame/includes/seta.h | 2 +- src/mame/includes/skyfox.h | 4 +- src/mame/includes/slapfght.h | 4 +- src/mame/includes/slapshot.h | 2 +- src/mame/includes/snes.h | 4 +- src/mame/includes/snowbros.h | 2 +- src/mame/includes/spacefb.h | 2 +- src/mame/includes/sprcros2.h | 4 +- src/mame/includes/ssv.h | 2 +- src/mame/includes/stadhero.h | 2 +- src/mame/includes/stv.h | 6 +- src/mame/includes/system16.h | 2 +- src/mame/includes/tail2nos.h | 2 +- src/mame/includes/taito_f2.h | 2 +- src/mame/includes/taito_h.h | 2 +- src/mame/includes/taito_o.h | 2 +- src/mame/includes/taitojc.h | 2 +- src/mame/includes/taitosj.h | 2 +- src/mame/includes/tceptor.h | 2 +- src/mame/includes/thedeep.h | 2 +- src/mame/includes/thunderx.h | 2 +- src/mame/includes/timeplt.h | 2 +- src/mame/includes/toki.h | 2 +- src/mame/includes/topspeed.h | 2 +- src/mame/includes/tp84.h | 2 +- src/mame/includes/tubep.h | 2 +- src/mame/includes/tumbleb.h | 2 +- src/mame/includes/tunhunt.h | 2 +- src/mame/includes/turbo.h | 2 +- src/mame/includes/twin16.h | 2 +- src/mame/includes/undrfire.h | 2 +- src/mame/includes/vaportra.h | 2 +- src/mame/includes/volfied.h | 2 +- src/mame/includes/warriorb.h | 2 +- src/mame/includes/wecleman.h | 2 +- src/mame/includes/wgp.h | 2 +- src/mame/includes/wiz.h | 2 +- src/mame/includes/zac2650.h | 2 +- src/mame/includes/zodiack.h | 2 +- src/mame/layout/cherryb3.lay | 4 +- src/mame/layout/dblcrown.lay | 4 +- src/mame/layout/gamball.lay | 4 +- src/mame/layout/goldstar.lay | 4 +- src/mame/machine/asteroid.c | 2 +- src/mame/machine/atari.c | 1 - src/mame/machine/atarigen.h | 2 +- src/mame/machine/cdi070.h | 2 +- src/mame/machine/gaelco3d.h | 2 +- src/mame/machine/igs036crypt.c | 100 +- src/mame/machine/igs036crypt.h | 4 +- src/mame/machine/inder_sb.c | 64 +- src/mame/machine/inder_sb.h | 2 +- src/mame/machine/inder_vid.c | 7 +- src/mame/machine/inder_vid.h | 6 +- src/mame/machine/megadriv.c | 12 +- src/mame/machine/namco06.c | 14 +- src/mame/machine/namco06.h | 24 +- src/mame/machine/namco50.c | 2 +- src/mame/machine/namco50.h | 8 +- src/mame/machine/namco51.h | 8 +- src/mame/machine/namco53.c | 10 +- src/mame/machine/namco53.h | 16 +- src/mame/machine/namco62.h | 4 +- src/mame/machine/namcoio.h | 18 +- src/mame/machine/namcos1.c | 5 +- src/mame/machine/naomim4.c | 6 +- src/mame/machine/pcecommn.c | 1 - src/mame/machine/pcecommn.h | 2 +- src/mame/machine/slapfght.c | 2 +- src/mame/machine/tait8741.c | 7 +- src/mame/machine/tait8741.h | 52 +- src/mame/machine/taitoio.h | 32 +- src/mame/mame.lst | 132 +-- src/mame/video/alpha68k.c | 2 +- src/mame/video/amspdwy.c | 2 +- src/mame/video/angelkds.c | 6 +- src/mame/video/appoooh.c | 4 +- src/mame/video/argus.c | 2 +- src/mame/video/atarimo.c | 4 +- src/mame/video/avgdvg.c | 50 +- src/mame/video/avgdvg.h | 124 +-- src/mame/video/baraduke.c | 2 +- src/mame/video/battlane.c | 4 +- src/mame/video/battlex.c | 2 +- src/mame/video/bfm_adr2.c | 2 +- src/mame/video/bfm_adr2.h | 2 +- src/mame/video/bfm_dm01.c | 4 +- src/mame/video/bfm_dm01.h | 4 +- src/mame/video/bogeyman.c | 5 +- src/mame/video/bwing.c | 4 +- src/mame/video/c45.c | 1 - src/mame/video/c45.h | 8 +- src/mame/video/canyon.c | 2 +- src/mame/video/carpolo.c | 2 +- src/mame/video/cclimber.c | 6 +- src/mame/video/chaknpop.c | 2 +- src/mame/video/champbas.c | 8 +- src/mame/video/cheekyms.c | 10 +- src/mame/video/combatsc.c | 2 +- src/mame/video/cps1.c | 2 +- src/mame/video/crimfght.c | 2 +- src/mame/video/darkmist.c | 2 +- src/mame/video/ddribble.c | 2 +- src/mame/video/dec8.c | 2 - src/mame/video/decbac06.h | 2 +- src/mame/video/deckarn.h | 2 +- src/mame/video/decmxc06.c | 4 +- src/mame/video/decmxc06.h | 4 +- src/mame/video/deco16ic.h | 4 +- src/mame/video/decocomn.h | 4 +- src/mame/video/decospr.h | 3 +- src/mame/video/djmain.c | 4 +- src/mame/video/drgnmst.c | 2 +- src/mame/video/exerion.c | 4 +- src/mame/video/fcombat.c | 10 +- src/mame/video/firetrk.c | 8 +- src/mame/video/fitfight.c | 2 +- src/mame/video/gaelco2.c | 2 +- src/mame/video/galaxian.c | 2 +- src/mame/video/goindol.c | 4 +- src/mame/video/gottlieb.c | 2 +- src/mame/video/gotya.c | 4 +- src/mame/video/gp9001.h | 1 - src/mame/video/grchamp.c | 4 +- src/mame/video/gticlub.c | 2 +- src/mame/video/gyruss.c | 2 +- src/mame/video/hyperspt.c | 4 +- src/mame/video/jalblend.c | 2 +- src/mame/video/k001005.h | 2 +- src/mame/video/k001604.h | 2 +- src/mame/video/k007121.h | 2 +- src/mame/video/k007342.c | 10 +- src/mame/video/k007342.h | 11 +- src/mame/video/k007420.c | 4 +- src/mame/video/k007420.h | 4 +- src/mame/video/k051316.h | 2 +- src/mame/video/k053244_k053245.h | 2 +- src/mame/video/k053246_k053247_k055673.h | 2 +- src/mame/video/k053250.h | 2 +- src/mame/video/k054338.c | 2 +- src/mame/video/kaneko16.c | 6 +- src/mame/video/kaneko_spr.c | 1 - src/mame/video/kaneko_spr.h | 2 +- src/mame/video/kopunch.c | 2 +- src/mame/video/ladyfrog.c | 4 +- src/mame/video/lastduel.c | 2 +- src/mame/video/m10.c | 4 +- src/mame/video/m52.c | 4 +- src/mame/video/mermaid.c | 2 +- src/mame/video/mikie.c | 2 +- src/mame/video/mrflea.c | 2 +- src/mame/video/ms32.c | 2 +- src/mame/video/mugsmash.c | 2 +- src/mame/video/munchmo.c | 5 +- src/mame/video/mystston.c | 2 +- src/mame/video/namcona1.c | 2 +- src/mame/video/namcos22.c | 2 +- src/mame/video/ninjakd2.c | 2 +- src/mame/video/nova2001.c | 6 +- src/mame/video/oneshot.c | 3 +- src/mame/video/pooyan.c | 2 +- src/mame/video/popeye.c | 38 +- src/mame/video/ppu2c0x.c | 4 +- src/mame/video/ppu2c0x.h | 10 +- src/mame/video/psikyo4.c | 2 +- src/mame/video/raiden.c | 2 +- src/mame/video/sbasketb.c | 2 +- src/mame/video/segaic16.h | 2 +- src/mame/video/segaic24.h | 4 +- src/mame/video/seibu_crtc.h | 8 +- src/mame/video/shangkid.c | 8 +- src/mame/video/sidearms.c | 2 +- src/mame/video/slapfght.c | 44 +- src/mame/video/solomon.c | 2 +- src/mame/video/sonson.c | 2 +- src/mame/video/ssozumo.c | 2 +- src/mame/video/sspeedr.c | 4 +- src/mame/video/stadhero.c | 2 +- src/mame/video/starcrus.c | 28 +- src/mame/video/stlforce.c | 2 +- src/mame/video/strnskil.c | 2 +- src/mame/video/tagteam.c | 4 +- src/mame/video/taito_h.c | 6 +- src/mame/video/taito_o.c | 2 +- src/mame/video/taitoair.c | 2 +- src/mame/video/taitosj.c | 4 +- src/mame/video/tc0080vco.h | 2 +- src/mame/video/tc0110pcr.c | 1 - src/mame/video/tc0110pcr.h | 9 +- src/mame/video/tc0480scp.h | 2 +- src/mame/video/tceptor.c | 2 +- src/mame/video/tecmo_spr.c | 2 +- src/mame/video/thepit.c | 4 +- src/mame/video/tia.h | 4 +- src/mame/video/tigeroad.c | 2 +- src/mame/video/trackfld.c | 4 +- src/mame/video/tunhunt.c | 3 +- src/mame/video/twincobr.c | 2 +- src/mame/video/wecleman.c | 1 - src/mame/video/wiz.c | 10 +- src/mame/video/wolfpack.c | 10 +- src/mame/video/ygv608.c | 6 +- src/mame/video/ygv608.h | 2 +- src/mame/video/yiear.c | 2 +- src/mame/video/zaxxon.c | 8 +- src/mess/audio/upd1771.h | 2 +- src/mess/drivers/a2600.c | 4 +- src/mess/drivers/a7000.c | 2 +- src/mess/drivers/a7800.c | 318 +++--- src/mess/drivers/abc1600.c | 2 +- src/mess/drivers/ace.c | 2 +- src/mess/drivers/adam.c | 6 +- src/mess/drivers/alphasma.c | 2 +- src/mess/drivers/alphatro.c | 4 +- src/mess/drivers/amiga.c | 2 +- src/mess/drivers/amstr_pc.c | 2 +- src/mess/drivers/amstrad.c | 6 +- src/mess/drivers/amust.c | 38 +- src/mess/drivers/apc.c | 10 +- src/mess/drivers/apf.c | 28 +- src/mess/drivers/apollo.c | 47 +- src/mess/drivers/apple2.c | 38 +- src/mess/drivers/apple2gs.c | 2 +- src/mess/drivers/apple3.c | 37 +- src/mess/drivers/applix.c | 2 +- src/mess/drivers/apricot.c | 4 +- src/mess/drivers/apricotf.c | 2 +- src/mess/drivers/apricotp.c | 2 +- src/mess/drivers/argo.c | 2 +- src/mess/drivers/asst128.c | 4 +- src/mess/drivers/at.c | 10 +- src/mess/drivers/atari400.c | 2 +- src/mess/drivers/atarist.c | 2 +- src/mess/drivers/atm.c | 2 +- src/mess/drivers/avigo.c | 2 +- src/mess/drivers/bcs3.c | 2 +- src/mess/drivers/beehive.c | 2 +- src/mess/drivers/bigbord2.c | 2 +- src/mess/drivers/binbug.c | 4 +- src/mess/drivers/bmjr.c | 2 +- src/mess/drivers/bml3.c | 2 +- src/mess/drivers/c128.c | 4 +- src/mess/drivers/casloopy.c | 2 +- src/mess/drivers/cat.c | 14 +- src/mess/drivers/coco12.c | 2 +- src/mess/drivers/compis.c | 6 +- src/mess/drivers/compucolor.c | 76 +- src/mess/drivers/d6800.c | 2 +- src/mess/drivers/dct11em.c | 2 +- src/mess/drivers/dm7000.c | 2 +- src/mess/drivers/dms5000.c | 2 +- src/mess/drivers/esq1.c | 2 +- src/mess/drivers/esq5505.c | 2 +- src/mess/drivers/esqasr.c | 4 +- src/mess/drivers/esqkt.c | 134 +-- src/mess/drivers/esqmr.c | 376 +++---- src/mess/drivers/europc.c | 20 +- src/mess/drivers/fanucs15.c | 680 +++++++------ src/mess/drivers/fanucspmg.c | 110 +-- src/mess/drivers/fk1.c | 2 +- src/mess/drivers/fmtowns.c | 2 +- src/mess/drivers/fp6000.c | 2 +- src/mess/drivers/gb.c | 10 +- src/mess/drivers/geniusiq.c | 4 +- src/mess/drivers/grfd2301.c | 2 +- src/mess/drivers/hec2hrp.c | 2 +- src/mess/drivers/homelab.c | 6 +- src/mess/drivers/homez80.c | 2 +- src/mess/drivers/hp48.c | 88 +- src/mess/drivers/hp9k.c | 2 +- src/mess/drivers/hprot1.c | 84 +- src/mess/drivers/hunter2.c | 18 +- src/mess/drivers/hx20.c | 4 +- src/mess/drivers/ibm6580.c | 2 +- src/mess/drivers/ibmpcjr.c | 10 +- src/mess/drivers/ie15.c | 4 +- src/mess/drivers/indiana.c | 12 +- src/mess/drivers/intv.c | 4 +- src/mess/drivers/ip20.c | 2 +- src/mess/drivers/ip22.c | 4 +- src/mess/drivers/iq151.c | 2 +- src/mess/drivers/irisha.c | 2 +- src/mess/drivers/itt3030.c | 2 +- src/mess/drivers/jonos.c | 2 +- src/mess/drivers/jupiter.c | 4 +- src/mess/drivers/k8915.c | 2 +- src/mess/drivers/kaypro.c | 6 +- src/mess/drivers/konin.c | 2 +- src/mess/drivers/kyocera.c | 2 +- src/mess/drivers/lcmate2.c | 2 +- src/mess/drivers/llc.c | 4 +- src/mess/drivers/lola8a.c | 2 +- src/mess/drivers/m20.c | 13 +- src/mess/drivers/mac.c | 10 +- src/mess/drivers/mbc200.c | 2 +- src/mess/drivers/mbee.c | 2 +- src/mess/drivers/mc80.c | 4 +- src/mess/drivers/megadriv.c | 26 +- src/mess/drivers/mes.c | 2 +- src/mess/drivers/micronic.c | 4 +- src/mess/drivers/mirage.c | 2 +- src/mess/drivers/mk85.c | 2 +- src/mess/drivers/mk90.c | 2 +- src/mess/drivers/modellot.c | 4 +- src/mess/drivers/molecular.c | 2 +- src/mess/drivers/msx.c | 4 +- src/mess/drivers/multi16.c | 4 +- src/mess/drivers/multi8.c | 2 +- src/mess/drivers/mx2178.c | 2 +- src/mess/drivers/myb3k.c | 2 +- src/mess/drivers/mycom.c | 4 +- src/mess/drivers/mz2500.c | 4 +- src/mess/drivers/mz3500.c | 4 +- src/mess/drivers/mz700.c | 2 +- src/mess/drivers/mz80.c | 2 +- src/mess/drivers/nakajies.c | 2 +- src/mess/drivers/nanos.c | 2 +- src/mess/drivers/nc.c | 4 +- src/mess/drivers/ng_aes.c | 2 +- src/mess/drivers/ngp.c | 4 +- src/mess/drivers/octopus.c | 2 +- src/mess/drivers/odyssey2.c | 2 +- src/mess/drivers/p2000t.c | 2 +- src/mess/drivers/palm.c | 2 +- src/mess/drivers/paso1600.c | 2 +- src/mess/drivers/pasopia7.c | 8 +- src/mess/drivers/pb1000.c | 2 +- src/mess/drivers/pc.c | 2 +- src/mess/drivers/pc100.c | 4 +- src/mess/drivers/pc1500.c | 2 +- src/mess/drivers/pc4.c | 2 +- src/mess/drivers/pc6001.c | 2 +- src/mess/drivers/pc8001.c | 2 +- src/mess/drivers/pc8801.c | 6 +- src/mess/drivers/pc9801.c | 72 +- src/mess/drivers/pcm.c | 2 +- src/mess/drivers/pcw16.c | 2 +- src/mess/drivers/pda600.c | 2 +- src/mess/drivers/pentagon.c | 2 +- src/mess/drivers/phc25.c | 2 +- src/mess/drivers/phunsy.c | 6 +- src/mess/drivers/pipbug.c | 2 +- src/mess/drivers/plan80.c | 2 +- src/mess/drivers/plus4.c | 2 +- src/mess/drivers/pocketc.c | 2 +- src/mess/drivers/portfoli.c | 2 +- src/mess/drivers/pp01.c | 2 +- src/mess/drivers/psion.c | 6 +- src/mess/drivers/psx.c | 2 +- src/mess/drivers/pt68k4.c | 35 +- src/mess/drivers/ptcsol.c | 2 +- src/mess/drivers/pv1000.c | 2 +- src/mess/drivers/pve500.c | 6 +- src/mess/drivers/px4.c | 4 +- src/mess/drivers/ql.c | 70 +- src/mess/drivers/qx10.c | 4 +- src/mess/drivers/rainbow.c | 37 +- src/mess/drivers/rd110.c | 2 +- src/mess/drivers/replicator.c | 318 +++--- src/mess/drivers/rex6000.c | 2 +- src/mess/drivers/rm380z.c | 2 +- src/mess/drivers/rmt32.c | 2 +- src/mess/drivers/rsc55.c | 28 +- src/mess/drivers/rx78.c | 4 +- src/mess/drivers/sapi1.c | 4 +- src/mess/drivers/saturn.c | 8 +- src/mess/drivers/sbrain.c | 4 +- src/mess/drivers/sgi_ip2.c | 8 +- src/mess/drivers/sitcom.c | 2 +- src/mess/drivers/sm1800.c | 2 +- src/mess/drivers/smc777.c | 4 +- src/mess/drivers/socrates.c | 4 +- src/mess/drivers/softbox.c | 2 +- src/mess/drivers/sorcerer.c | 2 +- src/mess/drivers/special.c | 8 +- src/mess/drivers/spectrum.c | 2 +- src/mess/drivers/ssem.c | 2 +- src/mess/drivers/stratos.c | 18 +- src/mess/drivers/super80.c | 4 +- src/mess/drivers/supracan.c | 4 +- src/mess/drivers/sv8000.c | 15 +- src/mess/drivers/svmu.c | 2 +- src/mess/drivers/swtpc09.c | 136 +-- src/mess/drivers/sym1.c | 4 +- src/mess/drivers/tandy1t.c | 11 +- src/mess/drivers/tandy2k.c | 20 +- src/mess/drivers/tavernie.c | 2 +- src/mess/drivers/thomson.c | 20 +- src/mess/drivers/ti85.c | 6 +- src/mess/drivers/ti89.c | 2 +- src/mess/drivers/tim011.c | 2 +- src/mess/drivers/tim100.c | 2 +- src/mess/drivers/tk80bs.c | 4 +- src/mess/drivers/trs80.c | 4 +- src/mess/drivers/uknc.c | 2 +- src/mess/drivers/unior.c | 2 +- src/mess/drivers/unistar.c | 2 +- src/mess/drivers/univac.c | 2 +- src/mess/drivers/ut88.c | 2 +- src/mess/drivers/v6809.c | 2 +- src/mess/drivers/vboy.c | 2 +- src/mess/drivers/vector06.c | 2 +- src/mess/drivers/victor9k.c | 20 +- src/mess/drivers/vip.c | 40 +- src/mess/drivers/vt100.c | 2 +- src/mess/drivers/vt220.c | 2 +- src/mess/drivers/vt320.c | 2 +- src/mess/drivers/vt520.c | 2 +- src/mess/drivers/vta2000.c | 4 +- src/mess/drivers/vtech1.c | 8 +- src/mess/drivers/wangpc.c | 2 +- src/mess/drivers/wswan.c | 4 +- src/mess/drivers/x07.c | 12 +- src/mess/drivers/x68k.c | 4 +- src/mess/drivers/xerox820.c | 4 +- src/mess/drivers/ymmu100.c | 6 +- src/mess/drivers/z100.c | 6 +- src/mess/drivers/z1013.c | 2 +- src/mess/drivers/z80ne.c | 4 +- src/mess/drivers/z9001.c | 2 +- src/mess/drivers/zorba.c | 4 +- src/mess/drivers/zrt80.c | 2 +- src/mess/includes/a7800.h | 2 +- src/mess/includes/advision.h | 2 +- src/mess/includes/amstrad.h | 2 +- src/mess/includes/apollo.h | 8 +- src/mess/includes/apple2gs.h | 2 +- src/mess/includes/apple3.h | 6 +- src/mess/includes/apricotf.h | 2 +- src/mess/includes/aquarius.h | 2 +- src/mess/includes/atarist.h | 2 +- src/mess/includes/avigo.h | 2 +- src/mess/includes/b2m.h | 2 +- src/mess/includes/bbc.h | 2 +- src/mess/includes/dm7000.h | 6 +- src/mess/includes/einstein.h | 2 +- src/mess/includes/fm7.h | 2 +- src/mess/includes/genpc.h | 4 +- src/mess/includes/intv.h | 2 +- src/mess/includes/kaypro.h | 2 +- src/mess/includes/lisa.h | 4 +- src/mess/includes/mc1502.h | 4 +- src/mess/includes/mikromik.h | 2 +- src/mess/includes/nascom1.h | 2 +- src/mess/includes/p2000t.h | 2 +- src/mess/includes/partner.h | 4 +- src/mess/includes/pcw.h | 2 +- src/mess/includes/pocketc.h | 2 +- src/mess/includes/ql.h | 132 +-- src/mess/includes/rmnimbus.h | 2 +- src/mess/includes/softbox.h | 2 +- src/mess/includes/special.h | 4 +- src/mess/includes/studio2.h | 2 +- src/mess/includes/super80.h | 2 +- src/mess/includes/svi318.h | 2 +- src/mess/includes/swtpc09.h | 77 +- src/mess/includes/thomson.h | 2 +- src/mess/includes/tiki100.h | 2 +- src/mess/includes/tvc.h | 2 +- src/mess/includes/vc4000.h | 2 +- src/mess/includes/vector06.h | 2 +- src/mess/includes/x68k.h | 2 +- src/mess/includes/z88.h | 2 +- src/mess/includes/zx.h | 2 +- src/mess/layout/pve500.lay | 10 +- src/mess/layout/rainbow.lay | 2 +- src/mess/machine/6883sam.h | 2 +- src/mess/machine/a7800.c | 8 +- src/mess/machine/amstrad.c | 2 +- src/mess/machine/apollo.c | 24 +- src/mess/machine/apollo_kbd.c | 2 +- src/mess/machine/apple2.c | 20 +- src/mess/machine/apple2gs.c | 10 +- src/mess/machine/apple3.c | 153 ++- src/mess/machine/apricotkb.c | 18 +- src/mess/machine/apricotkb.h | 2 +- src/mess/machine/atarifdc.c | 2 +- src/mess/machine/atarifdc.h | 2 +- src/mess/machine/bbc.c | 12 +- src/mess/machine/beta.h | 10 +- src/mess/machine/dec_lk201.c | 147 ++- src/mess/machine/dgn_beta.c | 2 +- src/mess/machine/hp48.c | 12 +- src/mess/machine/mac.c | 8 +- src/mess/machine/mackbd.h | 6 +- src/mess/machine/mega32x.c | 6 +- src/mess/machine/mega32x.h | 8 +- src/mess/machine/megacd.h | 4 +- src/mess/machine/micropolis.h | 2 +- src/mess/machine/nes.c | 2 +- src/mess/machine/oric.c | 2 +- src/mess/machine/partner.c | 2 +- src/mess/machine/pecom.c | 2 +- src/mess/machine/sgi.c | 2 +- src/mess/machine/sgi.h | 2 +- src/mess/machine/smartmed.c | 4 +- src/mess/machine/sms.c | 14 +- src/mess/machine/svi318.c | 4 +- src/mess/machine/swtpc09.c | 624 ++++++------ src/mess/machine/thomson.c | 46 +- src/mess/machine/ti99/990_hd.h | 4 +- src/mess/machine/ti99/grom.c | 2 +- src/mess/machine/ti99/grom.h | 4 +- src/mess/machine/ti99/gromport.c | 14 +- src/mess/machine/ti99/speech8.h | 2 +- src/mess/machine/x68k_kbd.c | 6 +- src/mess/machine/zx8302.h | 12 +- src/mess/mess.lst | 4 +- src/mess/mess.mak | 4 +- src/mess/video/a7800.c | 18 +- src/mess/video/abc80.c | 2 +- src/mess/video/abc800.c | 4 +- src/mess/video/apollo.c | 5 +- src/mess/video/apple3.c | 4 +- src/mess/video/gb_lcd.c | 2 +- src/mess/video/gime.h | 4 +- src/mess/video/intv.c | 4 +- src/mess/video/mikromik.c | 2 +- src/mess/video/nascom1.c | 4 - src/mess/video/osi.c | 2 +- src/mess/video/pc1251.c | 70 +- src/mess/video/pc1350.c | 90 +- src/mess/video/pc1401.c | 50 +- src/mess/video/tmc600.c | 4 +- src/mess/video/v1050.c | 2 +- src/mess/video/vtvideo.c | 52 +- src/mess/video/vtvideo.h | 2 +- src/mess/video/zx8301.h | 2 +- src/osd/osdcomm.h | 4 +- src/osd/osdcore.h | 2 +- src/osd/sdl/blit13.h | 4 +- src/osd/sdl/drawogl.c | 1 - src/osd/sdl/gl_shader_mgr.c | 12 +- src/osd/sdl/window.c | 4 +- src/tools/nltool.c | 211 ++-- src/tools/srcclean.c | 94 +- src/tools/unidasm.c | 6 +- src/version.c | 2 +- 1508 files changed, 14344 insertions(+), 14565 deletions(-) diff --git a/hash/a7800.xml b/hash/a7800.xml index 6f52b829aa3..fb6e78c546c 100644 --- a/hash/a7800.xml +++ b/hash/a7800.xml @@ -2264,60 +2264,60 @@ almost nothing like the prototype. - - - - - - Donkey Kong (homebrew, XM enhanced, HSC support) (Demo) - 2012 - <homebrew> - - - - - - - - - - - Donkey Kong (homebrew, XM enhanced, HSC support) (Demo) (NTSC) - 2012 - <homebrew> - - - - - - - - - - - Donkey Kong (homebrew, XM enhanced) (Demo) - 2012 - <homebrew> - - - - - - - - - - - Donkey Kong (homebrew, XM enhanced) (Demo) (NTSC) - 2012 - <homebrew> - - - - - - - - + + + + + + Donkey Kong (homebrew, XM enhanced, HSC support) (Demo) + 2012 + <homebrew> + + + + + + + + + + + Donkey Kong (homebrew, XM enhanced, HSC support) (Demo) (NTSC) + 2012 + <homebrew> + + + + + + + + + + + Donkey Kong (homebrew, XM enhanced) (Demo) + 2012 + <homebrew> + + + + + + + + + + + Donkey Kong (homebrew, XM enhanced) (Demo) (NTSC) + 2012 + <homebrew> + + + + + + + + diff --git a/hash/coco_flop.xml b/hash/coco_flop.xml index 590c7571600..8b65e83ada6 100644 --- a/hash/coco_flop.xml +++ b/hash/coco_flop.xml @@ -3,9 +3,9 @@ - - - + + + Donkey Kong (Sock Master's Donkey Kong Emulator for CoCo 3) (512Kb) 2007 Sock Master diff --git a/hash/msx1_cart.xml b/hash/msx1_cart.xml index f98cbbadf83..3c4f8704342 100644 --- a/hash/msx1_cart.xml +++ b/hash/msx1_cart.xml @@ -16845,22 +16845,22 @@ kept for now until finding out what those bytes affect... - - - - - Disk BASIC v1.0 for FS-FD1 (Japan) - 1987 - Matsushita - - - - - - - - - + + + + + Disk BASIC v1.0 for FS-FD1 (Japan) + 1987 + Matsushita + + + + + + + + + diff --git a/hash/msx1_flop.xml b/hash/msx1_flop.xml index 05802f60520..a899c6b6e02 100644 --- a/hash/msx1_flop.xml +++ b/hash/msx1_flop.xml @@ -6,12 +6,12 @@ Things listed here should have a requirement of BASIC 1.0 + Disk Basic 1.0 (ie a Standard MSX1 type system with FDD) I've noticed some 'MSX1' floppy images in TOSEC seem to require a higher BASIC version? Some also require more RAM? the driver currently isn't very flexible. - + This for now is just a skeleton list for quick testing. - + To use the floppy drive the disk basic ROM must be mounted, example use case. msx -cart1 diskbas -flop1 ohshit - + --> @@ -25,38 +25,38 @@ - - Oh Mummy!! - 1984 - Longman Software - - - - - - - - - Oh Shit! - 1986 - Aackosoft - - - - - - - - - Oh No! - 1986 - Eaglesoft - - - - - - + + Oh Mummy!! + 1984 + Longman Software + + + + + + + + + Oh Shit! + 1986 + Aackosoft + + + + + + + + + Oh No! + 1986 + Eaglesoft + + + + + + diff --git a/hash/pico.xml b/hash/pico.xml index 78bae852ed4..17cbfa034fd 100644 --- a/hash/pico.xml +++ b/hash/pico.xml @@ -2354,7 +2354,7 @@ But how do later protos fit with this theory? Maybe the later protos were from t - + NHK Okaasan to Issho Do Re Mi Fa Do~nuts! Oekaki Daisuki! Omoshiro Oekaki Daishuugou! (Jpn) 1998 diff --git a/hash/psx.xml b/hash/psx.xml index c5635f4ef2c..93d5544e5a9 100644 --- a/hash/psx.xml +++ b/hash/psx.xml @@ -2,8 +2,8 @@ - - + + - + Bubble Bobble II (prototype) 1995 @@ -65,8 +65,8 @@ A few comments on these: - - + + VCC - register_subalias("6", m_S2); - register_subalias("7", m_B2); - register_subalias("8", m_A2); + NETLIB_NAME(7483)::start(); + register_subalias("1", m_A4); + register_subalias("2", m_S3); + register_subalias("3", m_A3); + register_subalias("4", m_B3); + // register_subalias("5", ); --> VCC + register_subalias("6", m_S2); + register_subalias("7", m_B2); + register_subalias("8", m_A2); - register_subalias("9", m_S1); - register_subalias("10", m_A1); - register_subalias("11", m_B1); - // register_subalias("12", ); --> GND - register_subalias("13", m_C0); - register_subalias("14", m_C4); - register_subalias("15", m_S4); - register_subalias("16", m_B4); + register_subalias("9", m_S1); + register_subalias("10", m_A1); + register_subalias("11", m_B1); + // register_subalias("12", ); --> GND + register_subalias("13", m_C0); + register_subalias("14", m_C4); + register_subalias("15", m_S4); + register_subalias("16", m_B4); } NETLIB_UPDATE(7483_dip) { - NETLIB_NAME(7483)::update(); + NETLIB_NAME(7483)::update(); } NETLIB_RESET(7483_dip) { - NETLIB_NAME(7483)::reset(); + NETLIB_NAME(7483)::reset(); } diff --git a/src/emu/netlist/devices/nld_7483.h b/src/emu/netlist/devices/nld_7483.h index b76c68efbbc..d2da6ecc517 100644 --- a/src/emu/netlist/devices/nld_7483.h +++ b/src/emu/netlist/devices/nld_7483.h @@ -42,7 +42,7 @@ NET_CONNECT(_name, C0, _CI) #define TTL_7483_DIP(_name) \ - NET_REGISTER_DEV(7483_dip, _name) + NET_REGISTER_DEV(7483_dip, _name) NETLIB_DEVICE(7483, netlist_ttl_input_t m_C0; diff --git a/src/emu/netlist/devices/nld_7486.c b/src/emu/netlist/devices/nld_7486.c index 4234e1e5400..4eddfb828ef 100644 --- a/src/emu/netlist/devices/nld_7486.c +++ b/src/emu/netlist/devices/nld_7486.c @@ -25,42 +25,41 @@ NETLIB_UPDATE(7486) NETLIB_START(7486_dip) { - register_sub(m_1, "1"); - register_sub(m_2, "2"); - register_sub(m_3, "3"); - register_sub(m_4, "4"); + register_sub(m_1, "1"); + register_sub(m_2, "2"); + register_sub(m_3, "3"); + register_sub(m_4, "4"); - register_subalias("1", m_1.m_A); - register_subalias("2", m_1.m_B); - register_subalias("3", m_1.m_Q); + register_subalias("1", m_1.m_A); + register_subalias("2", m_1.m_B); + register_subalias("3", m_1.m_Q); - register_subalias("4", m_2.m_A); - register_subalias("5", m_2.m_B); - register_subalias("6", m_2.m_Q); + register_subalias("4", m_2.m_A); + register_subalias("5", m_2.m_B); + register_subalias("6", m_2.m_Q); - register_subalias("9", m_3.m_A); - register_subalias("10", m_3.m_B); - register_subalias("8", m_3.m_Q); + register_subalias("9", m_3.m_A); + register_subalias("10", m_3.m_B); + register_subalias("8", m_3.m_Q); - register_subalias("12", m_4.m_A); - register_subalias("13", m_4.m_B); - register_subalias("11", m_4.m_Q); + register_subalias("12", m_4.m_A); + register_subalias("13", m_4.m_B); + register_subalias("11", m_4.m_Q); } NETLIB_UPDATE(7486_dip) { - /* only called during startup */ - m_1.update_dev(); - m_2.update_dev(); - m_3.update_dev(); - m_4.update_dev(); + /* only called during startup */ + m_1.update_dev(); + m_2.update_dev(); + m_3.update_dev(); + m_4.update_dev(); } NETLIB_RESET(7486_dip) { - m_1.do_reset(); - m_2.do_reset(); - m_3.do_reset(); - m_4.do_reset(); + m_1.do_reset(); + m_2.do_reset(); + m_3.do_reset(); + m_4.do_reset(); } - diff --git a/src/emu/netlist/devices/nld_7486.h b/src/emu/netlist/devices/nld_7486.h index ed8bdbf37b4..d9f8608be6f 100644 --- a/src/emu/netlist/devices/nld_7486.h +++ b/src/emu/netlist/devices/nld_7486.h @@ -47,14 +47,14 @@ public: ); #define TTL_7486_DIP(_name) \ - NET_REGISTER_DEV(7486_dip, _name) + NET_REGISTER_DEV(7486_dip, _name) NETLIB_DEVICE(7486_dip, - NETLIB_NAME(7486) m_1; - NETLIB_NAME(7486) m_2; - NETLIB_NAME(7486) m_3; - NETLIB_NAME(7486) m_4; + NETLIB_NAME(7486) m_1; + NETLIB_NAME(7486) m_2; + NETLIB_NAME(7486) m_3; + NETLIB_NAME(7486) m_4; ); #endif /* NLD_7486_H_ */ diff --git a/src/emu/netlist/devices/nld_7490.c b/src/emu/netlist/devices/nld_7490.c index 00a4b1e3c6a..623ee0bf982 100644 --- a/src/emu/netlist/devices/nld_7490.c +++ b/src/emu/netlist/devices/nld_7490.c @@ -7,8 +7,8 @@ NETLIB_START(7490) { - register_input("A", m_A); - register_input("B", m_B); + register_input("A", m_A); + register_input("B", m_B); register_input("R1", m_R1); register_input("R2", m_R2); register_input("R91", m_R91); @@ -25,15 +25,15 @@ NETLIB_START(7490) NETLIB_RESET(7490) { - m_cnt = 0; + m_cnt = 0; } static const netlist_time delay[4] = { - NLTIME_FROM_NS(18), - NLTIME_FROM_NS(36) - NLTIME_FROM_NS(18), - NLTIME_FROM_NS(54) - NLTIME_FROM_NS(18), - NLTIME_FROM_NS(72) - NLTIME_FROM_NS(18)}; + NLTIME_FROM_NS(18), + NLTIME_FROM_NS(36) - NLTIME_FROM_NS(18), + NLTIME_FROM_NS(54) - NLTIME_FROM_NS(18), + NLTIME_FROM_NS(72) - NLTIME_FROM_NS(18)}; NETLIB_UPDATE(7490) { @@ -50,52 +50,51 @@ NETLIB_UPDATE(7490) else if (INP_HL(m_A)) { m_cnt ^= 1; - OUTLOGIC(m_Q[0], m_cnt & 1, delay[0]); + OUTLOGIC(m_Q[0], m_cnt & 1, delay[0]); + } + else if (INP_HL(m_B)) + { + m_cnt += 2; + if (m_cnt >= 10) + m_cnt = 0; + update_outputs(); } - else if (INP_HL(m_B)) - { - m_cnt += 2; - if (m_cnt >= 10) - m_cnt = 0; - update_outputs(); - } } NETLIB_FUNC_VOID(7490, update_outputs, (void)) { - for (int i=0; i<4; i++) OUTLOGIC(m_Q[i], (m_cnt >> i) & 1, delay[i]); } NETLIB_START(7490_dip) { - NETLIB_NAME(7490)::start(); - register_subalias("1", m_B); - register_subalias("2", m_R1); - register_subalias("3", m_R2); - - // register_subalias("4", ); --> NC - // register_subalias("5", ); --> VCC - register_subalias("6", m_R91); - register_subalias("7", m_R92); - - register_subalias("8", m_Q[2]); - register_subalias("9", m_Q[1]); - // register_subalias("10", ); --> GND - register_subalias("11", m_Q[3]); - register_subalias("12", m_Q[0]); - // register_subalias("13", ); --> NC - register_subalias("14", m_A); + NETLIB_NAME(7490)::start(); + register_subalias("1", m_B); + register_subalias("2", m_R1); + register_subalias("3", m_R2); + + // register_subalias("4", ); --> NC + // register_subalias("5", ); --> VCC + register_subalias("6", m_R91); + register_subalias("7", m_R92); + + register_subalias("8", m_Q[2]); + register_subalias("9", m_Q[1]); + // register_subalias("10", ); --> GND + register_subalias("11", m_Q[3]); + register_subalias("12", m_Q[0]); + // register_subalias("13", ); --> NC + register_subalias("14", m_A); } NETLIB_UPDATE(7490_dip) { - NETLIB_NAME(7490)::update(); + NETLIB_NAME(7490)::update(); } NETLIB_RESET(7490_dip) { - NETLIB_NAME(7490)::reset(); + NETLIB_NAME(7490)::reset(); } diff --git a/src/emu/netlist/devices/nld_7490.h b/src/emu/netlist/devices/nld_7490.h index 29ca2a19716..f54c299fe8b 100644 --- a/src/emu/netlist/devices/nld_7490.h +++ b/src/emu/netlist/devices/nld_7490.h @@ -60,14 +60,14 @@ #define TTL_7490(_name, _A, _B, _R1, _R2, _R91, _R92) \ NET_REGISTER_DEV(7490, _name) \ NET_CONNECT(_name, A, _A) \ - NET_CONNECT(_name, B, _B) \ + NET_CONNECT(_name, B, _B) \ NET_CONNECT(_name, R1, _R1) \ NET_CONNECT(_name, R2, _R2) \ NET_CONNECT(_name, R91, _R91) \ NET_CONNECT(_name, R92, _R92) #define TTL_7490_DIP(_name) \ - NET_REGISTER_DEV(7490_dip, _name) + NET_REGISTER_DEV(7490_dip, _name) NETLIB_DEVICE(7490, @@ -78,7 +78,7 @@ NETLIB_DEVICE(7490, netlist_ttl_input_t m_R91; netlist_ttl_input_t m_R92; netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; + netlist_ttl_input_t m_B; UINT8 m_cnt; diff --git a/src/emu/netlist/devices/nld_7493.c b/src/emu/netlist/devices/nld_7493.c index dcc08776cff..c2b51558c4b 100644 --- a/src/emu/netlist/devices/nld_7493.c +++ b/src/emu/netlist/devices/nld_7493.c @@ -29,10 +29,10 @@ NETLIB_START(7493) NETLIB_RESET(7493) { - A.do_reset(); - B.do_reset(); - C.do_reset(); - D.do_reset(); + A.do_reset(); + B.do_reset(); + C.do_reset(); + D.do_reset(); } NETLIB_START(7493ff) @@ -45,13 +45,13 @@ NETLIB_START(7493ff) NETLIB_RESET(7493ff) { - m_reset = 1; - m_I.set_state(netlist_input_t::STATE_INP_HL); + m_reset = 1; + m_I.set_state(netlist_input_t::STATE_INP_HL); } NETLIB_UPDATE(7493ff) { - const netlist_time out_delay = NLTIME_FROM_NS(18); + const netlist_time out_delay = NLTIME_FROM_NS(18); //if (m_reset == 0) OUTLOGIC(m_Q, (!m_Q.net().new_Q()) & m_reset, out_delay); } @@ -68,45 +68,45 @@ NETLIB_UPDATE(7493) OUTLOGIC(B.m_Q, 0, NLTIME_FROM_NS(40)); OUTLOGIC(C.m_Q, 0, NLTIME_FROM_NS(40)); OUTLOGIC(D.m_Q, 0, NLTIME_FROM_NS(40)); - A.m_reset = B.m_reset = C.m_reset = D.m_reset = 0; + A.m_reset = B.m_reset = C.m_reset = D.m_reset = 0; } else { A.m_I.activate_hl(); B.m_I.activate_hl(); - A.m_reset = B.m_reset = C.m_reset = D.m_reset = 1; + A.m_reset = B.m_reset = C.m_reset = D.m_reset = 1; } } NETLIB_START(7493_dip) { - NETLIB_NAME(7493)::start(); - - register_subalias("1", B.m_I); - register_subalias("2", m_R1); - register_subalias("3", m_R2); - - // register_subalias("4", ); --> NC - // register_subalias("5", ); --> VCC - // register_subalias("6", ); --> NC - // register_subalias("7", ); --> NC - - register_subalias("8", C.m_Q); - register_subalias("9", B.m_Q); - // register_subalias("10", ); --> GND - register_subalias("11", D.m_Q); - register_subalias("12", A.m_Q); - // register_subalias("13", ); --> NC - register_subalias("14", A.m_I); + NETLIB_NAME(7493)::start(); + + register_subalias("1", B.m_I); + register_subalias("2", m_R1); + register_subalias("3", m_R2); + + // register_subalias("4", ); --> NC + // register_subalias("5", ); --> VCC + // register_subalias("6", ); --> NC + // register_subalias("7", ); --> NC + + register_subalias("8", C.m_Q); + register_subalias("9", B.m_Q); + // register_subalias("10", ); --> GND + register_subalias("11", D.m_Q); + register_subalias("12", A.m_Q); + // register_subalias("13", ); --> NC + register_subalias("14", A.m_I); } NETLIB_UPDATE(7493_dip) { - NETLIB_NAME(7493)::update(); + NETLIB_NAME(7493)::update(); } NETLIB_RESET(7493_dip) { - NETLIB_NAME(7493)::reset(); + NETLIB_NAME(7493)::reset(); } diff --git a/src/emu/netlist/devices/nld_7493.h b/src/emu/netlist/devices/nld_7493.h index 0bf182e27c0..8c856048a7c 100644 --- a/src/emu/netlist/devices/nld_7493.h +++ b/src/emu/netlist/devices/nld_7493.h @@ -67,7 +67,7 @@ NET_CONNECT(_name, R2, _R2) #define TTL_7493_DIP(_name) \ - NET_REGISTER_DEV(7493_dip, _name) + NET_REGISTER_DEV(7493_dip, _name) NETLIB_SUBDEVICE(7493ff, netlist_ttl_input_t m_I; diff --git a/src/emu/netlist/devices/nld_74ls629.c b/src/emu/netlist/devices/nld_74ls629.c index 09c12d2d98c..42d10263858 100644 --- a/src/emu/netlist/devices/nld_74ls629.c +++ b/src/emu/netlist/devices/nld_74ls629.c @@ -50,139 +50,139 @@ NETLIB_START(SN74LS629clk) reset(); save(NAME(m_enableq)); - save(NAME(m_inc)); + save(NAME(m_inc)); } NETLIB_RESET(SN74LS629clk) { - m_enableq = 1; - m_inc = netlist_time::zero; + m_enableq = 1; + m_inc = netlist_time::zero; } NETLIB_UPDATE(SN74LS629clk) { - if (!m_enableq) - { - OUTLOGIC(m_Y, !m_Y.net().new_Q(), m_inc); - } - else - { - OUTLOGIC(m_Y, 1, m_inc); - } + if (!m_enableq) + { + OUTLOGIC(m_Y, !m_Y.net().new_Q(), m_inc); + } + else + { + OUTLOGIC(m_Y, 1, m_inc); + } } NETLIB_START(SN74LS629) { - register_sub(m_clock, "OSC"); - register_sub(m_R_FC, "R_FC"); - register_sub(m_R_RNG, "R_RNG"); + register_sub(m_clock, "OSC"); + register_sub(m_R_FC, "R_FC"); + register_sub(m_R_RNG, "R_RNG"); - register_input("ENQ", m_ENQ); - register_input("RNG", m_RNG); - register_input("FC", m_FC); - register_subalias("GND", m_R_FC.m_N); + register_input("ENQ", m_ENQ); + register_input("RNG", m_RNG); + register_input("FC", m_FC); + register_subalias("GND", m_R_FC.m_N); - connect(m_FC, m_R_FC.m_P); - connect(m_RNG, m_R_RNG.m_P); - connect(m_R_FC.m_N, m_R_RNG.m_N); + connect(m_FC, m_R_FC.m_P); + connect(m_RNG, m_R_RNG.m_P); + connect(m_R_FC.m_N, m_R_RNG.m_N); - register_subalias("Y", m_clock.m_Y); - register_param("CAP", m_CAP, 1e-6); + register_subalias("Y", m_clock.m_Y); + register_param("CAP", m_CAP, 1e-6); } NETLIB_RESET(SN74LS629) { - m_R_FC.set_R(90000.0); - m_R_RNG.set_R(90000.0); - m_clock.reset(); + m_R_FC.set_R(90000.0); + m_R_RNG.set_R(90000.0); + m_clock.reset(); } NETLIB_UPDATE(SN74LS629) { - { - // recompute - double freq; - double v_freq_2, v_freq_3, v_freq_4; - double v_freq = INPANALOG(m_FC); - double v_rng = INPANALOG(m_RNG); - - /* coefficients */ - const double k1 = 1.9904769024796283E+03; - const double k2 = 1.2070059213983407E+03; - const double k3 = 1.3266985579561108E+03; - const double k4 = -1.5500979825922698E+02; - const double k5 = 2.8184536266938172E+00; - const double k6 = -2.3503421582744556E+02; - const double k7 = -3.3836786704527788E+02; - const double k8 = -1.3569136703258670E+02; - const double k9 = 2.9914575453819188E+00; - const double k10 = 1.6855569086173170E+00; - - /* scale due to input resistance */ - - /* Polyfunctional3D_model created by zunzun.com using sum of squared absolute error */ - v_freq_2 = v_freq * v_freq; - v_freq_3 = v_freq_2 * v_freq; - v_freq_4 = v_freq_3 * v_freq; - freq = k1; - freq += k2 * v_freq; - freq += k3 * v_freq_2; - freq += k4 * v_freq_3; - freq += k5 * v_freq_4; - freq += k6 * v_rng; - freq += k7 * v_rng * v_freq; - freq += k8 * v_rng * v_freq_2; - freq += k9 * v_rng * v_freq_3; - freq += k10 * v_rng * v_freq_4; - - freq *= 0.1e-6 / m_CAP.Value(); - - // FIXME: we need a possibility to remove entries from queue ... - // or an exact model ... - m_clock.m_inc = netlist_time::from_double(0.5 / freq); - //m_clock.update(); - } - - if (!m_clock.m_enableq && INPLOGIC(m_ENQ)) - { - m_clock.m_enableq = 1; - OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1)); - } - else if (m_clock.m_enableq && !INPLOGIC(m_ENQ)) - { - m_clock.m_enableq = 0; - OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1)); - } + { + // recompute + double freq; + double v_freq_2, v_freq_3, v_freq_4; + double v_freq = INPANALOG(m_FC); + double v_rng = INPANALOG(m_RNG); + + /* coefficients */ + const double k1 = 1.9904769024796283E+03; + const double k2 = 1.2070059213983407E+03; + const double k3 = 1.3266985579561108E+03; + const double k4 = -1.5500979825922698E+02; + const double k5 = 2.8184536266938172E+00; + const double k6 = -2.3503421582744556E+02; + const double k7 = -3.3836786704527788E+02; + const double k8 = -1.3569136703258670E+02; + const double k9 = 2.9914575453819188E+00; + const double k10 = 1.6855569086173170E+00; + + /* scale due to input resistance */ + + /* Polyfunctional3D_model created by zunzun.com using sum of squared absolute error */ + v_freq_2 = v_freq * v_freq; + v_freq_3 = v_freq_2 * v_freq; + v_freq_4 = v_freq_3 * v_freq; + freq = k1; + freq += k2 * v_freq; + freq += k3 * v_freq_2; + freq += k4 * v_freq_3; + freq += k5 * v_freq_4; + freq += k6 * v_rng; + freq += k7 * v_rng * v_freq; + freq += k8 * v_rng * v_freq_2; + freq += k9 * v_rng * v_freq_3; + freq += k10 * v_rng * v_freq_4; + + freq *= 0.1e-6 / m_CAP.Value(); + + // FIXME: we need a possibility to remove entries from queue ... + // or an exact model ... + m_clock.m_inc = netlist_time::from_double(0.5 / freq); + //m_clock.update(); + } + + if (!m_clock.m_enableq && INPLOGIC(m_ENQ)) + { + m_clock.m_enableq = 1; + OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1)); + } + else if (m_clock.m_enableq && !INPLOGIC(m_ENQ)) + { + m_clock.m_enableq = 0; + OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1)); + } } NETLIB_UPDATE_PARAM(SN74LS629) { - //printf("updating %s to %f\n", name().cstr(), m_R.Value()); - update_dev(); + //printf("updating %s to %f\n", name().cstr(), m_R.Value()); + update_dev(); } NETLIB_START(SN74LS629_dip) { - register_sub(m_1, "1"); - register_sub(m_2, "2"); + register_sub(m_1, "1"); + register_sub(m_2, "2"); - register_subalias("1", m_2.m_FC); - register_subalias("2", m_1.m_FC); - register_subalias("3", m_1.m_RNG); + register_subalias("1", m_2.m_FC); + register_subalias("2", m_1.m_FC); + register_subalias("3", m_1.m_RNG); - register_subalias("6", m_1.m_ENQ); - register_subalias("7", m_1.m_clock.m_Y); + register_subalias("6", m_1.m_ENQ); + register_subalias("7", m_1.m_clock.m_Y); - register_subalias("8", m_1.m_R_FC.m_N); - register_subalias("9", m_1.m_R_FC.m_N); - connect(m_1.m_R_FC.m_N, m_2.m_R_FC.m_N); + register_subalias("8", m_1.m_R_FC.m_N); + register_subalias("9", m_1.m_R_FC.m_N); + connect(m_1.m_R_FC.m_N, m_2.m_R_FC.m_N); - register_subalias("10", m_2.m_clock.m_Y); + register_subalias("10", m_2.m_clock.m_Y); - register_subalias("11", m_2.m_ENQ); - register_subalias("14", m_2.m_RNG); + register_subalias("11", m_2.m_ENQ); + register_subalias("14", m_2.m_RNG); } @@ -192,6 +192,6 @@ NETLIB_UPDATE(SN74LS629_dip) NETLIB_RESET(SN74LS629_dip) { - m_1.do_reset(); - m_2.do_reset(); + m_1.do_reset(); + m_2.do_reset(); } diff --git a/src/emu/netlist/devices/nld_74ls629.h b/src/emu/netlist/devices/nld_74ls629.h index 31ecf340902..b4f011cf337 100644 --- a/src/emu/netlist/devices/nld_74ls629.h +++ b/src/emu/netlist/devices/nld_74ls629.h @@ -33,23 +33,23 @@ #define SN74LS629(_name, _cap) \ NET_REGISTER_DEV(SN74LS629, _name) \ - NETDEV_PARAMI(_name, CAP, _cap) + NETDEV_PARAMI(_name, CAP, _cap) NETLIB_SUBDEVICE(SN74LS629clk, - netlist_logic_input_t m_FB; - netlist_logic_output_t m_Y; + netlist_logic_input_t m_FB; + netlist_logic_output_t m_Y; - netlist_time m_inc; - netlist_sig_t m_enableq; + netlist_time m_inc; + netlist_sig_t m_enableq; ); NETLIB_DEVICE_WITH_PARAMS(SN74LS629, public: NETLIB_NAME(SN74LS629clk) m_clock; - NETLIB_NAME(R_base) m_R_FC; - NETLIB_NAME(R_base) m_R_RNG; + NETLIB_NAME(R_base) m_R_FC; + NETLIB_NAME(R_base) m_R_RNG; - netlist_logic_input_t m_ENQ; + netlist_logic_input_t m_ENQ; netlist_analog_input_t m_RNG; netlist_analog_input_t m_FC; @@ -57,13 +57,13 @@ public: ); #define SN74LS629_DIP(_name, _cap1, _cap2) \ - NET_REGISTER_DEV(SN74LS629_dip, _name) \ - NETDEV_PARAMI(_name, 1.CAP, _cap1) \ - NETDEV_PARAMI(_name, 2.CAP, _cap2) + NET_REGISTER_DEV(SN74LS629_dip, _name) \ + NETDEV_PARAMI(_name, 1.CAP, _cap1) \ + NETDEV_PARAMI(_name, 2.CAP, _cap2) NETLIB_DEVICE(SN74LS629_dip, - NETLIB_NAME(SN74LS629) m_1; - NETLIB_NAME(SN74LS629) m_2; + NETLIB_NAME(SN74LS629) m_1; + NETLIB_NAME(SN74LS629) m_2; ); diff --git a/src/emu/netlist/devices/nld_9316.c b/src/emu/netlist/devices/nld_9316.c index 14a691c4481..6445611fd06 100644 --- a/src/emu/netlist/devices/nld_9316.c +++ b/src/emu/netlist/devices/nld_9316.c @@ -7,8 +7,8 @@ NETLIB_START(9316) { - register_sub(subABCD, "subABCD"); - sub.m_ABCD = &subABCD; + register_sub(subABCD, "subABCD"); + sub.m_ABCD = &subABCD; register_sub(sub, "sub"); register_subalias("CLK", sub.m_CLK); @@ -33,36 +33,36 @@ NETLIB_START(9316) NETLIB_RESET(9316) { - sub.do_reset(); - subABCD.do_reset(); + sub.do_reset(); + subABCD.do_reset(); } NETLIB_START(9316_subABCD) { - register_input("A", m_A); - register_input("B", m_B); - register_input("C", m_C); - register_input("D", m_D); + register_input("A", m_A); + register_input("B", m_B); + register_input("C", m_C); + register_input("D", m_D); } NETLIB_RESET(9316_subABCD) { - if (1 || !USE_ADD_REMOVE_LIST) - { - m_A.inactivate(); - m_B.inactivate(); - m_C.inactivate(); - m_D.inactivate(); - } + if (1 || !USE_ADD_REMOVE_LIST) + { + m_A.inactivate(); + m_B.inactivate(); + m_C.inactivate(); + m_D.inactivate(); + } } ATTR_HOT inline UINT8 NETLIB_NAME(9316_subABCD::read_ABCD)() { - if (1 || !USE_ADD_REMOVE_LIST) - return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0); - else - return (INPLOGIC(m_D) << 3) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_A) << 0); + if (1 || !USE_ADD_REMOVE_LIST) + return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0); + else + return (INPLOGIC(m_D) << 3) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_A) << 0); } NETLIB_UPDATE(9316_subABCD) @@ -86,10 +86,10 @@ NETLIB_START(9316_sub) NETLIB_RESET(9316_sub) { - m_CLK.set_state(netlist_input_t::STATE_INP_LH); - m_cnt = 0; - m_loadq = 1; - m_ent = 1; + m_CLK.set_state(netlist_input_t::STATE_INP_LH); + m_cnt = 0; + m_loadq = 1; + m_ent = 1; } NETLIB_UPDATE(9316_sub) @@ -99,7 +99,7 @@ NETLIB_UPDATE(9316_sub) { cnt = ( cnt + 1) & 0x0f; update_outputs(cnt); - OUTLOGIC(m_RC, m_ent & (cnt == 0x0f), NLTIME_FROM_NS(20)); + OUTLOGIC(m_RC, m_ent & (cnt == 0x0f), NLTIME_FROM_NS(20)); #if 0 if (cnt == 0x0f) OUTLOGIC(m_RC, m_ent, NLTIME_FROM_NS(20)); @@ -128,7 +128,7 @@ NETLIB_UPDATE(9316) } else { - UINT8 cnt = sub.m_cnt; + UINT8 cnt = sub.m_cnt; sub.m_CLK.inactivate(); if (!clrq & (cnt>0)) { @@ -198,34 +198,33 @@ inline NETLIB_FUNC_VOID(9316_sub, update_outputs, (const UINT8 cnt)) NETLIB_START(9316_dip) { - NETLIB_NAME(9316)::start(); - - register_subalias("1", m_CLRQ); - register_subalias("2", sub.m_CLK); - register_subalias("3", subABCD.m_A); - register_subalias("4", subABCD.m_B); - register_subalias("5", subABCD.m_C); - register_subalias("6", subABCD.m_D); - register_subalias("7", m_ENP); - // register_subalias("8", ); --> GND - - register_subalias("9", m_LOADQ); - register_subalias("10", m_ENT); - register_subalias("11", sub.m_QD); - register_subalias("12", sub.m_QC); - register_subalias("13", sub.m_QB); - register_subalias("14", sub.m_QA); - register_subalias("15", sub.m_RC); - // register_subalias("16", ); --> VCC + NETLIB_NAME(9316)::start(); + + register_subalias("1", m_CLRQ); + register_subalias("2", sub.m_CLK); + register_subalias("3", subABCD.m_A); + register_subalias("4", subABCD.m_B); + register_subalias("5", subABCD.m_C); + register_subalias("6", subABCD.m_D); + register_subalias("7", m_ENP); + // register_subalias("8", ); --> GND + + register_subalias("9", m_LOADQ); + register_subalias("10", m_ENT); + register_subalias("11", sub.m_QD); + register_subalias("12", sub.m_QC); + register_subalias("13", sub.m_QB); + register_subalias("14", sub.m_QA); + register_subalias("15", sub.m_RC); + // register_subalias("16", ); --> VCC } NETLIB_UPDATE(9316_dip) { - NETLIB_NAME(9316)::update(); + NETLIB_NAME(9316)::update(); } NETLIB_RESET(9316_dip) { - NETLIB_NAME(9316)::reset(); + NETLIB_NAME(9316)::reset(); } - diff --git a/src/emu/netlist/devices/nld_9316.h b/src/emu/netlist/devices/nld_9316.h index a9e7a37df5f..524871d8ea5 100644 --- a/src/emu/netlist/devices/nld_9316.h +++ b/src/emu/netlist/devices/nld_9316.h @@ -64,15 +64,15 @@ NET_CONNECT(_name, D, _D) #define TTL_9316_DIP(_name) \ - NET_REGISTER_DEV(9316_dip, _name) + NET_REGISTER_DEV(9316_dip, _name) NETLIB_SUBDEVICE(9316_subABCD, - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_C; - netlist_ttl_input_t m_D; + netlist_ttl_input_t m_A; + netlist_ttl_input_t m_B; + netlist_ttl_input_t m_C; + netlist_ttl_input_t m_D; - ATTR_HOT inline UINT8 read_ABCD(); + ATTR_HOT inline UINT8 read_ABCD(); ); NETLIB_SUBDEVICE(9316_sub, @@ -95,7 +95,7 @@ NETLIB_SUBDEVICE(9316_sub, NETLIB_DEVICE(9316, NETLIB_NAME(9316_sub) sub; - NETLIB_NAME(9316_subABCD) subABCD; + NETLIB_NAME(9316_subABCD) subABCD; netlist_ttl_input_t m_ENP; netlist_ttl_input_t m_ENT; netlist_ttl_input_t m_CLRQ; diff --git a/src/emu/netlist/devices/nld_legacy.c b/src/emu/netlist/devices/nld_legacy.c index 529d5325651..7c3faa58117 100644 --- a/src/emu/netlist/devices/nld_legacy.c +++ b/src/emu/netlist/devices/nld_legacy.c @@ -16,8 +16,8 @@ NETLIB_START(nicRSFF) NETLIB_RESET(nicRSFF) { - m_Q.initial(0); - m_QQ.initial(1); + m_Q.initial(0); + m_QQ.initial(1); } NETLIB_UPDATE(nicRSFF) diff --git a/src/emu/netlist/devices/nld_ne555.c b/src/emu/netlist/devices/nld_ne555.c index 580c76d3787..b8f4e4b5fc7 100644 --- a/src/emu/netlist/devices/nld_ne555.c +++ b/src/emu/netlist/devices/nld_ne555.c @@ -46,17 +46,17 @@ NETLIB_START(NE555) NETLIB_RESET(NE555) { - m_R1.do_reset(); - m_R2.do_reset(); - m_R3.do_reset(); - m_RDIS.do_reset(); + m_R1.do_reset(); + m_R2.do_reset(); + m_R3.do_reset(); + m_RDIS.do_reset(); - m_R1.set_R(5000); - m_R2.set_R(5000); - m_R3.set_R(5000); - m_RDIS.set_R(R_OFF); + m_R1.set_R(5000); + m_R2.set_R(5000); + m_R3.set_R(5000); + m_RDIS.set_R(R_OFF); - m_last_out = false; + m_last_out = false; } NETLIB_UPDATE(NE555) @@ -93,25 +93,25 @@ NETLIB_UPDATE(NE555) NETLIB_START(NE555_dip) { - NETLIB_NAME(NE555)::start(); + NETLIB_NAME(NE555)::start(); - register_subalias("1", m_R3.m_N); // Pin 1 - register_subalias("2", m_TRIG); // Pin 2 - register_subalias("3", m_OUT); // Pin 3 - register_subalias("4", m_RESET); // Pin 4 - register_subalias("5", m_R1.m_N); // Pin 5 - register_subalias("6", m_THRES); // Pin 6 - register_subalias("7", m_RDIS.m_P); // Pin 7 - register_subalias("8", m_R1.m_P); // Pin 8 + register_subalias("1", m_R3.m_N); // Pin 1 + register_subalias("2", m_TRIG); // Pin 2 + register_subalias("3", m_OUT); // Pin 3 + register_subalias("4", m_RESET); // Pin 4 + register_subalias("5", m_R1.m_N); // Pin 5 + register_subalias("6", m_THRES); // Pin 6 + register_subalias("7", m_RDIS.m_P); // Pin 7 + register_subalias("8", m_R1.m_P); // Pin 8 } NETLIB_UPDATE(NE555_dip) { - NETLIB_NAME(NE555)::update(); + NETLIB_NAME(NE555)::update(); } NETLIB_RESET(NE555_dip) { - NETLIB_NAME(NE555)::reset(); + NETLIB_NAME(NE555)::reset(); } diff --git a/src/emu/netlist/devices/nld_ne555.h b/src/emu/netlist/devices/nld_ne555.h index 50fccf8486a..8c9c1baa420 100644 --- a/src/emu/netlist/devices/nld_ne555.h +++ b/src/emu/netlist/devices/nld_ne555.h @@ -44,7 +44,7 @@ NETLIB_DEVICE(NE555, ); #define NE555_DIP(_name) \ - NET_REGISTER_DEV(NE555_dip, _name) + NET_REGISTER_DEV(NE555_dip, _name) NETLIB_DEVICE_DERIVED(NE555_dip, NE555, ); diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h index 24c3854a07d..6580ec0818c 100644 --- a/src/emu/netlist/devices/nld_signal.h +++ b/src/emu/netlist/devices/nld_signal.h @@ -47,8 +47,8 @@ public: ATTR_COLD void reset() { - m_Q.initial(1); - m_active = 1; + m_Q.initial(1); + m_active = 1; } #if (USE_DEACTIVE_DEVICE) @@ -98,55 +98,55 @@ public: save(NAME(m_active)); } - ATTR_COLD void reset() - { - m_Q.initial(1); - m_active = 1; - } + ATTR_COLD void reset() + { + m_Q.initial(1); + m_active = 1; + } #if (USE_DEACTIVE_DEVICE) - ATTR_HOT void inc_active() - { - if (++m_active == 1) - { - update(); - } - } - - ATTR_HOT void dec_active() - { - if (--m_active == 0) - { - for (int i = 0; i< _numdev; i++) - m_i[i].inactivate(); - } - } + ATTR_HOT void inc_active() + { + if (++m_active == 1) + { + update(); + } + } + + ATTR_HOT void dec_active() + { + if (--m_active == 0) + { + for (int i = 0; i< _numdev; i++) + m_i[i].inactivate(); + } + } #endif - virtual void update() - { - const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) }; - - // FIXME: this check is needed because update is called during startup as well - if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0)) - return; - - for (int i = 0; i< _numdev; i++) - { - this->m_i[i].activate(); - if (INPLOGIC(this->m_i[i]) == _check) - { - for (int j = 0; j < i; j++) - this->m_i[j].inactivate(); - for (int j = i + 1; j < _numdev; j++) - this->m_i[j].inactivate(); - - OUTLOGIC(this->m_Q, _check ^ (1 ^ _invert), times[_check]);// ? 15000 : 22000); - return; - } - } - OUTLOGIC(this->m_Q,_check ^ (_invert), times[1-_check]);// ? 22000 : 15000); - } + virtual void update() + { + const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) }; + + // FIXME: this check is needed because update is called during startup as well + if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0)) + return; + + for (int i = 0; i< _numdev; i++) + { + this->m_i[i].activate(); + if (INPLOGIC(this->m_i[i]) == _check) + { + for (int j = 0; j < i; j++) + this->m_i[j].inactivate(); + for (int j = i + 1; j < _numdev; j++) + this->m_i[j].inactivate(); + + OUTLOGIC(this->m_Q, _check ^ (1 ^ _invert), times[_check]);// ? 15000 : 22000); + return; + } + } + OUTLOGIC(this->m_Q,_check ^ (_invert), times[1-_check]);// ? 22000 : 15000); + } public: netlist_ttl_input_t m_i[_numdev]; @@ -166,35 +166,35 @@ public: ATTR_COLD void start() { register_output("Q", m_Q); - register_input("A", m_i[0]); - register_input("B", m_i[1]); + register_input("A", m_i[0]); + register_input("B", m_i[1]); - save(NAME(m_active)); + save(NAME(m_active)); } - ATTR_COLD void reset() - { - m_Q.initial(1); - m_active = 1; - } + ATTR_COLD void reset() + { + m_Q.initial(1); + m_active = 1; + } #if (USE_DEACTIVE_DEVICE) - ATTR_HOT virtual void inc_active() - { - if (++m_active == 1) - { - update(); - } - } - - ATTR_HOT virtual void dec_active() - { - if (--m_active == 0) - { - m_i[0].inactivate(); - m_i[1].inactivate(); - } - } + ATTR_HOT virtual void inc_active() + { + if (++m_active == 1) + { + update(); + } + } + + ATTR_HOT virtual void dec_active() + { + if (--m_active == 0) + { + m_i[0].inactivate(); + m_i[1].inactivate(); + } + } #endif ATTR_HOT ATTR_ALIGN void update() @@ -202,13 +202,13 @@ public: const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)}; // FIXME: this check is needed because update is called during startup as well - if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0)) - return; + if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0)) + return; m_i[0].activate(); m_i[1].activate(); #if 0 - UINT8 res = _invert ^ 1 ^_check; + UINT8 res = _invert ^ 1 ^_check; if (INPLOGIC(m_i[0]) ^ _check) { if (INPLOGIC(m_i[1]) ^ _check) @@ -221,23 +221,23 @@ public: if (INPLOGIC(m_i[1]) ^ _check) m_i[1].inactivate(); } - OUTLOGIC(m_Q, res, times[res & 1]);// ? 22000 : 15000); + OUTLOGIC(m_Q, res, times[res & 1]);// ? 22000 : 15000); #else const UINT8 val = (INPLOGIC(m_i[0]) ^ _check) | ((INPLOGIC(m_i[1]) ^ _check) << 1); - UINT8 res = _invert ^ 1 ^_check; + UINT8 res = _invert ^ 1 ^_check; switch (val) { - case 1: - m_i[0].inactivate(); - break; - case 2: - m_i[1].inactivate(); - break; - case 3: - res = _invert ^ _check; - break; + case 1: + m_i[0].inactivate(); + break; + case 2: + m_i[1].inactivate(); + break; + case 3: + res = _invert ^ _check; + break; } - OUTLOGIC(m_Q, res, times[res]);// ? 22000 : 15000); + OUTLOGIC(m_Q, res, times[res]);// ? 22000 : 15000); #endif } diff --git a/src/emu/netlist/devices/nld_system.c b/src/emu/netlist/devices/nld_system.c index 7e37bef8e19..e6cd2485603 100644 --- a/src/emu/netlist/devices/nld_system.c +++ b/src/emu/netlist/devices/nld_system.c @@ -51,12 +51,12 @@ NETLIB_RESET(ttl_input) NETLIB_UPDATE(ttl_input) { - OUTLOGIC(m_Q, m_IN.Value() & 1, netlist_time::from_nsec(1)); + OUTLOGIC(m_Q, m_IN.Value() & 1, netlist_time::from_nsec(1)); } NETLIB_UPDATE_PARAM(ttl_input) { - update(); + update(); } // ---------------------------------------------------------------------------------------- @@ -66,7 +66,7 @@ NETLIB_UPDATE_PARAM(ttl_input) NETLIB_START(analog_input) { register_output("Q", m_Q); - register_param("IN", m_IN, 0.0); + register_param("IN", m_IN, 0.0); } NETLIB_RESET(analog_input) @@ -75,10 +75,10 @@ NETLIB_RESET(analog_input) NETLIB_UPDATE(analog_input) { - OUTANALOG(m_Q, m_IN.Value(), NLTIME_IMMEDIATE); + OUTANALOG(m_Q, m_IN.Value(), NLTIME_IMMEDIATE); } NETLIB_UPDATE_PARAM(analog_input) { - update(); + update(); } diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h index ca5f9b70316..2c214ed352a 100644 --- a/src/emu/netlist/devices/nld_system.h +++ b/src/emu/netlist/devices/nld_system.h @@ -27,14 +27,14 @@ #define MAINCLOCK(_name, _freq) \ NET_REGISTER_DEV(mainclock, _name) \ - PARAM(_name.FREQ, _freq) + PARAM(_name.FREQ, _freq) #define CLOCK(_name, _freq) \ NET_REGISTER_DEV(clock, _name) \ - PARAM(_name.FREQ, _freq) + PARAM(_name.FREQ, _freq) #define GNDA() \ - NET_REGISTER_DEV(gnd, GND) + NET_REGISTER_DEV(gnd, GND) // ---------------------------------------------------------------------------------------- // mainclock @@ -47,7 +47,7 @@ public: netlist_param_double_t m_freq; netlist_time m_inc; - ATTR_HOT inline static void mc_update(netlist_net_t &net); + ATTR_HOT inline static void mc_update(netlist_net_t &net); ); // ---------------------------------------------------------------------------------------- @@ -76,7 +76,7 @@ NETLIB_DEVICE_WITH_PARAMS(ttl_input, NETLIB_DEVICE_WITH_PARAMS(analog_input, netlist_analog_output_t m_Q; - netlist_param_double_t m_IN; + netlist_param_double_t m_IN; ); // ---------------------------------------------------------------------------------------- @@ -86,29 +86,29 @@ NETLIB_DEVICE_WITH_PARAMS(analog_input, class nld_gnd : public netlist_device_t { public: - ATTR_COLD nld_gnd() - : netlist_device_t(GND) { } + ATTR_COLD nld_gnd() + : netlist_device_t(GND) { } - ATTR_COLD virtual ~nld_gnd() {} + ATTR_COLD virtual ~nld_gnd() {} protected: - ATTR_COLD void start() - { - register_output("Q", m_Q); - } + ATTR_COLD void start() + { + register_output("Q", m_Q); + } - ATTR_COLD void reset() - { - } + ATTR_COLD void reset() + { + } - ATTR_HOT ATTR_ALIGN void update() - { - OUTANALOG(m_Q, 0.0, NLTIME_IMMEDIATE); - } + ATTR_HOT ATTR_ALIGN void update() + { + OUTANALOG(m_Q, 0.0, NLTIME_IMMEDIATE); + } private: - netlist_analog_output_t m_Q; + netlist_analog_output_t m_Q; }; @@ -120,38 +120,38 @@ private: class nld_a_to_d_proxy : public netlist_device_t { public: - ATTR_COLD nld_a_to_d_proxy(netlist_input_t &in_proxied) - : netlist_device_t() - { - assert(in_proxied.family() == LOGIC); - m_I.m_family_desc = in_proxied.m_family_desc; - } + ATTR_COLD nld_a_to_d_proxy(netlist_input_t &in_proxied) + : netlist_device_t() + { + assert(in_proxied.family() == LOGIC); + m_I.m_family_desc = in_proxied.m_family_desc; + } - ATTR_COLD virtual ~nld_a_to_d_proxy() {} + ATTR_COLD virtual ~nld_a_to_d_proxy() {} - netlist_analog_input_t m_I; - netlist_ttl_output_t m_Q; + netlist_analog_input_t m_I; + netlist_ttl_output_t m_Q; protected: - ATTR_COLD void start() - { - register_input("I", m_I); - register_output("Q", m_Q); - } - - ATTR_COLD void reset() - { - } - - ATTR_HOT ATTR_ALIGN void update() - { - if (m_I.Q_Analog() > m_I.m_family_desc->m_high_thresh_V) - OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(1)); - else if (m_I.Q_Analog() < m_I.m_family_desc->m_low_thresh_V) - OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(1)); - //else - // OUTLOGIC(m_Q, m_Q.net().last_Q(), NLTIME_FROM_NS(1)); - } + ATTR_COLD void start() + { + register_input("I", m_I); + register_output("Q", m_Q); + } + + ATTR_COLD void reset() + { + } + + ATTR_HOT ATTR_ALIGN void update() + { + if (m_I.Q_Analog() > m_I.m_family_desc->m_high_thresh_V) + OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(1)); + else if (m_I.Q_Analog() < m_I.m_family_desc->m_low_thresh_V) + OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(1)); + //else + // OUTLOGIC(m_Q, m_Q.net().last_Q(), NLTIME_FROM_NS(1)); + } }; @@ -162,24 +162,24 @@ protected: class nld_base_d_to_a_proxy : public netlist_device_t { public: - ATTR_COLD nld_base_d_to_a_proxy(netlist_output_t &out_proxied) - : netlist_device_t() - { - assert(out_proxied.family() == LOGIC); - m_family_desc = out_proxied.m_family_desc; - } + ATTR_COLD nld_base_d_to_a_proxy(netlist_output_t &out_proxied) + : netlist_device_t() + { + assert(out_proxied.family() == LOGIC); + m_family_desc = out_proxied.m_family_desc; + } - ATTR_COLD virtual ~nld_base_d_to_a_proxy() {} + ATTR_COLD virtual ~nld_base_d_to_a_proxy() {} - ATTR_COLD virtual netlist_core_terminal_t &out() = 0; + ATTR_COLD virtual netlist_core_terminal_t &out() = 0; - netlist_ttl_input_t m_I; + netlist_ttl_input_t m_I; protected: - ATTR_COLD void start() - { - register_input("I", m_I); - } + ATTR_COLD void start() + { + register_input("I", m_I); + } private: }; @@ -188,88 +188,88 @@ private: class nld_d_to_a_proxy : public nld_base_d_to_a_proxy { public: - ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied) - : nld_base_d_to_a_proxy(out_proxied) - { - } + ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied) + : nld_base_d_to_a_proxy(out_proxied) + { + } - ATTR_COLD virtual ~nld_d_to_a_proxy() {} + ATTR_COLD virtual ~nld_d_to_a_proxy() {} protected: - ATTR_COLD void start() - { - nld_base_d_to_a_proxy::start(); - register_output("Q", m_Q); - } - - ATTR_COLD void reset() - { - //m_Q.initial(0); - } - - ATTR_COLD virtual netlist_core_terminal_t &out() - { - return m_Q; - } - - ATTR_HOT ATTR_ALIGN void update() - { - OUTANALOG(m_Q, INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V, NLTIME_FROM_NS(1)); - } + ATTR_COLD void start() + { + nld_base_d_to_a_proxy::start(); + register_output("Q", m_Q); + } + + ATTR_COLD void reset() + { + //m_Q.initial(0); + } + + ATTR_COLD virtual netlist_core_terminal_t &out() + { + return m_Q; + } + + ATTR_HOT ATTR_ALIGN void update() + { + OUTANALOG(m_Q, INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V, NLTIME_FROM_NS(1)); + } private: - netlist_analog_output_t m_Q; + netlist_analog_output_t m_Q; }; #else class nld_d_to_a_proxy : public nld_base_d_to_a_proxy { public: - ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied) - : nld_base_d_to_a_proxy(out_proxied) - { - } + ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied) + : nld_base_d_to_a_proxy(out_proxied) + { + } - ATTR_COLD virtual ~nld_d_to_a_proxy() {} + ATTR_COLD virtual ~nld_d_to_a_proxy() {} protected: - ATTR_COLD void start() - { - nld_base_d_to_a_proxy::start(); - - register_sub(m_R, "R"); - register_output("_Q", m_Q); - register_subalias("Q", m_R.m_N); - - connect(m_R.m_P, m_Q); - - //m_Q.initial(m_family_desc->m_low_V); - //m_R.set_R(m_family_desc->m_R_low); - } - - ATTR_COLD void reset() - { - //m_Q.initial(m_family_desc->m_low_V); - //m_R.set_R(m_family_desc->m_R_low); - m_R.do_reset(); - } - - ATTR_COLD virtual netlist_core_terminal_t &out() - { - return m_R.m_N; - } - - ATTR_HOT ATTR_ALIGN void update() - { - double R = INPLOGIC(m_I) ? m_family_desc->m_R_high : m_family_desc->m_R_low; - double V = INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V; - //printf("%f %f\n", R, V); - m_R.set_R(R); - OUTANALOG(m_Q, V, NLTIME_FROM_NS(0)); - } + ATTR_COLD void start() + { + nld_base_d_to_a_proxy::start(); + + register_sub(m_R, "R"); + register_output("_Q", m_Q); + register_subalias("Q", m_R.m_N); + + connect(m_R.m_P, m_Q); + + //m_Q.initial(m_family_desc->m_low_V); + //m_R.set_R(m_family_desc->m_R_low); + } + + ATTR_COLD void reset() + { + //m_Q.initial(m_family_desc->m_low_V); + //m_R.set_R(m_family_desc->m_R_low); + m_R.do_reset(); + } + + ATTR_COLD virtual netlist_core_terminal_t &out() + { + return m_R.m_N; + } + + ATTR_HOT ATTR_ALIGN void update() + { + double R = INPLOGIC(m_I) ? m_family_desc->m_R_high : m_family_desc->m_R_low; + double V = INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V; + //printf("%f %f\n", R, V); + m_R.set_R(R); + OUTANALOG(m_Q, V, NLTIME_FROM_NS(0)); + } private: - netlist_analog_output_t m_Q; - nld_R_base m_R; + netlist_analog_output_t m_Q; + nld_R_base m_R; }; #endif diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index 55ef0f80073..8f1e6c9dfcf 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -13,12 +13,12 @@ const netlist_time netlist_time::zero = netlist_time::from_raw(0); netlist_logic_family_desc_t netlist_family_ttl = { - 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; }; // ---------------------------------------------------------------------------------------- @@ -94,7 +94,7 @@ ATTR_COLD const pstring netlist_object_t::name() const { if (m_name == "") netlist().error("object not initialized"); - return m_name; + return m_name; } // ---------------------------------------------------------------------------------------- @@ -142,10 +142,10 @@ netlist_base_t::~netlist_base_t() { for (int i=0; i < m_nets.count(); i++) { - if (!m_nets[i]->isRailNet()) - { - delete m_nets[i]; - } + if (!m_nets[i]->isRailNet()) + { + delete m_nets[i]; + } } m_nets.clear(); @@ -157,36 +157,36 @@ netlist_base_t::~netlist_base_t() ATTR_COLD void netlist_base_t::save_register() { - save(NAME(m_queue.callback())); - save(NAME(m_time)); - netlist_object_t::save_register(); + save(NAME(m_queue.callback())); + save(NAME(m_time)); + netlist_object_t::save_register(); } ATTR_HOT const double netlist_base_t::gmin() const { - return solver()->gmin(); + return solver()->gmin(); } ATTR_COLD void netlist_base_t::start() { - /* find the main clock and solver ... */ + /* find the main clock and solver ... */ - m_mainclock = get_single_device("mainclock"); - m_solver = get_single_device("solver"); - m_gnd = get_single_device("gnd"); + m_mainclock = get_single_device("mainclock"); + m_solver = get_single_device("solver"); + m_gnd = get_single_device("gnd"); - /* make sure the solver is started first! */ + /* make sure the solver is started first! */ - if (m_solver != NULL) - m_solver->start_dev(); + if (m_solver != NULL) + m_solver->start_dev(); - NL_VERBOSE_OUT(("Initializing devices ...\n")); - for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) - { - netlist_device_t *dev = entry->object(); - if (dev != m_solver) - dev->start_dev(); - } + NL_VERBOSE_OUT(("Initializing devices ...\n")); + for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) + { + netlist_device_t *dev = entry->object(); + if (dev != m_solver) + dev->start_dev(); + } } @@ -202,8 +202,8 @@ ATTR_COLD netlist_net_t *netlist_base_t::find_net(const pstring &name) ATTR_COLD void netlist_base_t::rebuild_lists() { - for (int i = 0; i < m_nets.count(); i++) - m_nets[i]->rebuild_list(); + for (int i = 0; i < m_nets.count(); i++) + m_nets[i]->rebuild_list(); } @@ -213,19 +213,19 @@ ATTR_COLD void netlist_base_t::reset() m_queue.clear(); if (m_mainclock != NULL) m_mainclock->m_Q.net().set_time(netlist_time::zero); - if (m_solver != NULL) - m_solver->do_reset(); + if (m_solver != NULL) + m_solver->do_reset(); - // Reset all nets once ! - for (int i = 0; i < m_nets.count(); i++) - m_nets[i]->do_reset(); + // Reset all nets once ! + for (int i = 0; i < m_nets.count(); i++) + m_nets[i]->do_reset(); - // Reset all devices once ! - for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) - { - netlist_device_t *dev = entry->object(); - dev->do_reset(); - } + // Reset all devices once ! + for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) + { + netlist_device_t *dev = entry->object(); + dev->do_reset(); + } // Step all devices once ! for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) @@ -235,67 +235,67 @@ ATTR_COLD void netlist_base_t::reset() } // FIXME: some const devices rely on this - /* make sure params are set now .. */ - for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) - { - entry->object()->update_param(); - } + /* make sure params are set now .. */ + for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) + { + entry->object()->update_param(); + } } ATTR_HOT ATTR_ALIGN void netlist_base_t::process_queue(const netlist_time delta) { - m_stop = m_time + delta; - - if (m_mainclock == NULL) - { - while ( (m_time < m_stop) && (m_queue.is_not_empty())) - { - const netlist_queue_t::entry_t *e = m_queue.pop(); - m_time = e->exec_time(); - e->object()->update_devs(); - - add_to_stat(m_perf_out_processed, 1); - if (FATAL_ERROR_AFTER_NS) - if (time() > NLTIME_FROM_NS(FATAL_ERROR_AFTER_NS)) - error("Stopped"); - } - if (m_queue.is_empty()) - m_time = m_stop; - - } else { - netlist_net_t &mc_net = m_mainclock->m_Q.net(); - const netlist_time inc = m_mainclock->m_inc; - netlist_time mc_time = mc_net.time(); - - while (m_time < m_stop) - { - if (m_queue.is_not_empty()) - { - while (m_queue.peek()->exec_time() > mc_time) - { - m_time = mc_time; - mc_time += inc; - NETLIB_NAME(mainclock)::mc_update(mc_net); - } - - const netlist_queue_t::entry_t *e = m_queue.pop(); - m_time = e->exec_time(); - e->object()->update_devs(); - - } else { - m_time = mc_time; - mc_time += inc; - NETLIB_NAME(mainclock)::mc_update(mc_net); - } - if (FATAL_ERROR_AFTER_NS) - if (time() > NLTIME_FROM_NS(FATAL_ERROR_AFTER_NS)) - error("Stopped"); - - add_to_stat(m_perf_out_processed, 1); - } - mc_net.set_time(mc_time); - } + m_stop = m_time + delta; + + if (m_mainclock == NULL) + { + while ( (m_time < m_stop) && (m_queue.is_not_empty())) + { + const netlist_queue_t::entry_t *e = m_queue.pop(); + m_time = e->exec_time(); + e->object()->update_devs(); + + add_to_stat(m_perf_out_processed, 1); + if (FATAL_ERROR_AFTER_NS) + if (time() > NLTIME_FROM_NS(FATAL_ERROR_AFTER_NS)) + error("Stopped"); + } + if (m_queue.is_empty()) + m_time = m_stop; + + } else { + netlist_net_t &mc_net = m_mainclock->m_Q.net(); + const netlist_time inc = m_mainclock->m_inc; + netlist_time mc_time = mc_net.time(); + + while (m_time < m_stop) + { + if (m_queue.is_not_empty()) + { + while (m_queue.peek()->exec_time() > mc_time) + { + m_time = mc_time; + mc_time += inc; + NETLIB_NAME(mainclock)::mc_update(mc_net); + } + + const netlist_queue_t::entry_t *e = m_queue.pop(); + m_time = e->exec_time(); + e->object()->update_devs(); + + } else { + m_time = mc_time; + mc_time += inc; + NETLIB_NAME(mainclock)::mc_update(mc_net); + } + if (FATAL_ERROR_AFTER_NS) + if (time() > NLTIME_FROM_NS(FATAL_ERROR_AFTER_NS)) + error("Stopped"); + + add_to_stat(m_perf_out_processed, 1); + } + mc_net.set_time(mc_time); + } } ATTR_COLD void netlist_base_t::error(const char *format, ...) const @@ -308,18 +308,18 @@ ATTR_COLD void netlist_base_t::error(const char *format, ...) const ATTR_COLD void netlist_base_t::warning(const char *format, ...) const { - va_list ap; - va_start(ap, format); - verror(NL_WARNING, format, ap); - va_end(ap); + va_list ap; + va_start(ap, format); + verror(NL_WARNING, format, ap); + va_end(ap); } ATTR_COLD void netlist_base_t::log(const char *format, ...) const { - va_list ap; - va_start(ap, format); - verror(NL_LOG, format, ap); - va_end(ap); + va_list ap; + va_start(ap, format); + verror(NL_LOG, format, ap); + va_end(ap); } @@ -361,14 +361,14 @@ ATTR_COLD netlist_core_device_t::~netlist_core_device_t() ATTR_HOT ATTR_ALIGN const netlist_sig_t netlist_core_device_t::INPLOGIC_PASSIVE(netlist_logic_input_t &inp) { if (inp.state() != netlist_input_t::STATE_INP_PASSIVE) - return inp.Q(); + return inp.Q(); else - { - inp.activate(); - const netlist_sig_t ret = inp.Q(); - inp.inactivate(); - return ret; - } + { + inp.activate(); + const netlist_sig_t ret = inp.Q(); + inp.inactivate(); + return ret; + } } @@ -424,26 +424,26 @@ ATTR_COLD void netlist_device_t::register_subalias(const pstring &name, netlist_ ATTR_COLD void netlist_device_t::register_terminal(const pstring &name, netlist_terminal_t &port) { setup().register_object(*this, name, port); - if (port.isType(netlist_terminal_t::INPUT) || port.isType(netlist_terminal_t::TERMINAL)) - m_terminals.add(port.name()); + if (port.isType(netlist_terminal_t::INPUT) || port.isType(netlist_terminal_t::TERMINAL)) + m_terminals.add(port.name()); } ATTR_COLD void netlist_device_t::register_output(const pstring &name, netlist_output_t &port) { - port.m_family_desc = this->m_family_desc; + port.m_family_desc = this->m_family_desc; setup().register_object(*this, name, port); } ATTR_COLD void netlist_device_t::register_input(const pstring &name, netlist_input_t &inp) { - inp.m_family_desc = this->m_family_desc; + inp.m_family_desc = this->m_family_desc; setup().register_object(*this, name, inp); - m_terminals.add(inp.name()); + m_terminals.add(inp.name()); } ATTR_COLD void netlist_device_t::connect(netlist_core_terminal_t &t1, netlist_core_terminal_t &t2) { - setup().connect(t1, t2); + setup().connect(t1, t2); } @@ -470,117 +470,117 @@ template ATTR_COLD void netlist_device_t::register_param(const pstring &sname, n ATTR_COLD netlist_net_t::netlist_net_t(const type_t atype, const family_t afamily) : netlist_object_t(atype, afamily) - , m_solver(NULL) - , m_railterminal(NULL) + , m_solver(NULL) + , m_railterminal(NULL) , m_num_cons(0) , m_time(netlist_time::zero) , m_active(0) , m_in_queue(2) { - m_last_Q = 0; - m_new_Q = 0; - m_cur_Q = 0; - m_last_Analog = 0.0; - m_new_Analog = 0.0; - m_cur_Analog = 0.0; + m_last_Q = 0; + m_new_Q = 0; + m_cur_Q = 0; + m_last_Analog = 0.0; + m_new_Analog = 0.0; + m_cur_Analog = 0.0; }; ATTR_COLD netlist_net_t::~netlist_net_t() { - netlist().remove_save_items(this); + netlist().remove_save_items(this); } ATTR_HOT void netlist_net_t::inc_active(netlist_core_terminal_t &term) { - m_active++; - - if (USE_ADD_REMOVE_LIST) - { - m_list.insert(term); - //m_list.add(term); - } - - if (USE_DEACTIVE_DEVICE) - { - if (m_active == 1 && m_in_queue > 0) - { - m_last_Q = m_cur_Q; - m_last_Analog = m_cur_Analog; // FIXME: Needed here ? - railterminal().netdev().inc_active(); - m_cur_Q = m_new_Q; - m_cur_Analog = m_new_Analog; - } - } - - if (m_active == 1 && m_in_queue == 0) - { - if (m_time > netlist().time()) - { - m_in_queue = 1; /* pending */ - netlist().push_to_queue(this, m_time); - } - else - { - m_cur_Q = m_last_Q = m_new_Q; - m_cur_Analog = m_last_Analog = m_new_Analog; // FIXME: Needed here? - m_in_queue = 2; - } - } + m_active++; + + if (USE_ADD_REMOVE_LIST) + { + m_list.insert(term); + //m_list.add(term); + } + + if (USE_DEACTIVE_DEVICE) + { + if (m_active == 1 && m_in_queue > 0) + { + m_last_Q = m_cur_Q; + m_last_Analog = m_cur_Analog; // FIXME: Needed here ? + railterminal().netdev().inc_active(); + m_cur_Q = m_new_Q; + m_cur_Analog = m_new_Analog; + } + } + + if (m_active == 1 && m_in_queue == 0) + { + if (m_time > netlist().time()) + { + m_in_queue = 1; /* pending */ + netlist().push_to_queue(this, m_time); + } + else + { + m_cur_Q = m_last_Q = m_new_Q; + m_cur_Analog = m_last_Analog = m_new_Analog; // FIXME: Needed here? + m_in_queue = 2; + } + } } ATTR_HOT void netlist_net_t::dec_active(netlist_core_terminal_t &term) { - m_active--; + m_active--; - if (USE_ADD_REMOVE_LIST) - { - m_list.remove(term); - } + if (USE_ADD_REMOVE_LIST) + { + m_list.remove(term); + } - if (USE_DEACTIVE_DEVICE) - { - if (m_active == 0) - railterminal().netdev().dec_active(); - } + if (USE_DEACTIVE_DEVICE) + { + if (m_active == 0) + railterminal().netdev().dec_active(); + } } ATTR_COLD void netlist_net_t::rebuild_list() { - /* rebuild m_list */ + /* rebuild m_list */ - m_list.clear(); - for (int i=0; i < m_registered.count(); i++) - if (m_registered[i]->state() != netlist_input_t::STATE_INP_PASSIVE) - m_list.add(*m_registered[i]); + m_list.clear(); + for (int i=0; i < m_registered.count(); i++) + if (m_registered[i]->state() != netlist_input_t::STATE_INP_PASSIVE) + m_list.add(*m_registered[i]); } ATTR_COLD void netlist_net_t::reset() { - m_last_Analog = 0.0; - m_cur_Analog = 0.0; - m_new_Analog = 0.0; - m_last_Q = 0; // set to something we will never hit. - m_new_Q = 0; - m_cur_Q = 0; - m_time = netlist_time::zero; - m_active = 0; - m_in_queue = 2; - - /* rebuild m_list */ - - m_list.clear(); - for (int i=0; i < m_registered.count(); i++) - m_list.add(*m_registered[i]); - - for (netlist_core_terminal_t *t = m_list.first(); t != NULL; t = m_list.next(t)) - { - t->do_reset(); - } - for (netlist_core_terminal_t *t = m_list.first(); t != NULL; t = m_list.next(t)) - { - if (t->state() != netlist_input_t::STATE_INP_PASSIVE) - m_active++; - } + m_last_Analog = 0.0; + m_cur_Analog = 0.0; + m_new_Analog = 0.0; + m_last_Q = 0; // set to something we will never hit. + m_new_Q = 0; + m_cur_Q = 0; + m_time = netlist_time::zero; + m_active = 0; + m_in_queue = 2; + + /* rebuild m_list */ + + m_list.clear(); + for (int i=0; i < m_registered.count(); i++) + m_list.add(*m_registered[i]); + + for (netlist_core_terminal_t *t = m_list.first(); t != NULL; t = m_list.next(t)) + { + t->do_reset(); + } + for (netlist_core_terminal_t *t = m_list.first(); t != NULL; t = m_list.next(t)) + { + if (t->state() != netlist_input_t::STATE_INP_PASSIVE) + m_active++; + } } ATTR_COLD void netlist_net_t::init_object(netlist_base_t &nl, const pstring &aname) @@ -591,16 +591,16 @@ ATTR_COLD void netlist_net_t::init_object(netlist_base_t &nl, const pstring &ana ATTR_COLD void netlist_net_t::save_register() { - save(NAME(m_last_Analog)); - save(NAME(m_cur_Analog)); - save(NAME(m_new_Analog)); - save(NAME(m_last_Q)); - save(NAME(m_cur_Q)); - save(NAME(m_new_Q)); - save(NAME(m_time)); - save(NAME(m_active)); - save(NAME(m_in_queue)); - netlist_object_t::save_register(); + save(NAME(m_last_Analog)); + save(NAME(m_cur_Analog)); + save(NAME(m_new_Analog)); + save(NAME(m_last_Q)); + save(NAME(m_cur_Q)); + save(NAME(m_new_Q)); + save(NAME(m_time)); + save(NAME(m_active)); + save(NAME(m_in_queue)); + netlist_object_t::save_register(); } ATTR_COLD void netlist_net_t::register_railterminal(netlist_output_t &mr) @@ -666,61 +666,61 @@ 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_last_Q << 1) | m_new_Q ]; - netlist_core_terminal_t *p = m_list.first(); - - m_in_queue = 2; /* mark as taken ... */ - m_cur_Q = m_new_Q; - - m_cur_Analog = m_new_Analog; - - if (USE_ADD_REMOVE_LIST) - { - switch (m_active) - { - case 2: - update_dev(p, mask); - p = m_list.next(p); - if (p == NULL) break; - case 1: - update_dev(p, mask); - break; - default: - while (p != NULL) - { - update_dev(p, mask); - p = m_list.next(p); - } - break; - } - } - else - { - switch (m_num_cons) - { - case 2: - update_dev(p, mask); - p = m_list.next(p); - case 1: - update_dev(p, mask); - break; - default: - do - { - update_dev(p, mask); - p = m_list.next(p); - } while (p != NULL); - break; - } - } - m_last_Q = m_cur_Q; - m_last_Analog = m_cur_Analog; + const UINT32 mask = masks[ (m_last_Q << 1) | m_new_Q ]; + netlist_core_terminal_t *p = m_list.first(); + + m_in_queue = 2; /* mark as taken ... */ + m_cur_Q = m_new_Q; + + m_cur_Analog = m_new_Analog; + + if (USE_ADD_REMOVE_LIST) + { + switch (m_active) + { + case 2: + update_dev(p, mask); + p = m_list.next(p); + if (p == NULL) break; + case 1: + update_dev(p, mask); + break; + default: + while (p != NULL) + { + update_dev(p, mask); + p = m_list.next(p); + } + break; + } + } + else + { + switch (m_num_cons) + { + case 2: + update_dev(p, mask); + p = m_list.next(p); + case 1: + update_dev(p, mask); + break; + default: + do + { + update_dev(p, mask); + p = m_list.next(p); + } while (p != NULL); + break; + } + } + m_last_Q = m_cur_Q; + m_last_Analog = m_cur_Analog; } ATTR_HOT void netlist_net_t::solve() { - if (m_solver != NULL) - m_solver->schedule(); + if (m_solver != NULL) + m_solver->schedule(); } // ---------------------------------------------------------------------------------------- @@ -748,19 +748,19 @@ ATTR_COLD netlist_terminal_t::netlist_terminal_t() ATTR_COLD void netlist_terminal_t::reset() { - //netlist_terminal_core_terminal_t::reset(); - set_state(STATE_INP_ACTIVE); - m_Idr = 0.0; - m_go = netlist().gmin(); - m_gt = netlist().gmin(); + //netlist_terminal_core_terminal_t::reset(); + set_state(STATE_INP_ACTIVE); + m_Idr = 0.0; + m_go = netlist().gmin(); + m_gt = netlist().gmin(); } ATTR_COLD void netlist_terminal_t::save_register() { - save(NAME(m_Idr)); - save(NAME(m_go)); - save(NAME(m_gt)); - netlist_core_terminal_t::save_register(); + save(NAME(m_Idr)); + save(NAME(m_go)); + save(NAME(m_gt)); + netlist_core_terminal_t::save_register(); } @@ -782,7 +782,7 @@ netlist_output_t::netlist_output_t(const type_t atype, const family_t afamily) , m_my_net(NET, afamily) { //m_net = new net_net_t(NET_DIGITAL); - set_state(STATE_OUT); + set_state(STATE_OUT); this->set_net(m_my_net); } @@ -798,7 +798,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) + : netlist_output_t(OUTPUT, LOGIC), m_proxy(NULL) { } @@ -806,7 +806,7 @@ ATTR_COLD void netlist_logic_output_t::initial(const netlist_sig_t val) { net().m_cur_Q = val; net().m_new_Q = val; - net().m_last_Q = val; + net().m_last_Q = val; } // ---------------------------------------------------------------------------------------- @@ -825,14 +825,14 @@ 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) { - net().m_last_Analog = 0.97; + net().m_last_Analog = 0.97; net().m_cur_Analog = 0.98; net().m_new_Analog = 0.99; } ATTR_COLD void netlist_analog_output_t::initial(const double val) { - net().m_cur_Analog = val * 0.98; + net().m_cur_Analog = val * 0.98; net().m_cur_Analog = val * 0.99; net().m_new_Analog = val * 1.0; } @@ -878,14 +878,14 @@ ATTR_COLD netlist_param_model_t::netlist_param_model_t() ATTR_COLD const pstring netlist_param_model_t::model_type() const { - pstring tmp = this->Value(); - // .model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon) - int p = tmp.find("("); - int p1 = p; - while (--p >= 0 && tmp[p] != ' ') - ; + pstring tmp = this->Value(); + // .model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon) + int p = tmp.find("("); + int p1 = p; + while (--p >= 0 && tmp[p] != ' ') + ; - return tmp.substr(p+1, p1-p-1).ucase(); + return tmp.substr(p+1, p1-p-1).ucase(); } @@ -929,8 +929,8 @@ ATTR_COLD double netlist_param_model_t::model_value(const pstring &entity, const ATTR_HOT inline void NETLIB_NAME(mainclock)::mc_update(netlist_net_t &net) { - net.m_new_Q ^= 1; - net.update_devs(); + net.m_new_Q ^= 1; + net.update_devs(); } NETLIB_START(mainclock) @@ -943,7 +943,7 @@ NETLIB_START(mainclock) NETLIB_RESET(mainclock) { - m_Q.net().set_time(netlist_time::zero); + m_Q.net().set_time(netlist_time::zero); } NETLIB_UPDATE_PARAM(mainclock) @@ -965,16 +965,16 @@ NETLIB_UPDATE(mainclock) ATTR_COLD const nl_util::pstring_list net_device_t_base_factory::term_param_list() { - if (m_def_param.startsWith("+")) - return nl_util::split(m_def_param.substr(1), ","); - else - return nl_util::pstring_list(); + if (m_def_param.startsWith("+")) + return nl_util::split(m_def_param.substr(1), ","); + else + return nl_util::pstring_list(); } ATTR_COLD const nl_util::pstring_list net_device_t_base_factory::def_params() { - if (m_def_param.startsWith("+") || m_def_param.equals("-")) - return nl_util::pstring_list(); - else - return nl_util::split(m_def_param, ","); + if (m_def_param.startsWith("+") || m_def_param.equals("-")) + return nl_util::pstring_list(); + else + return nl_util::split(m_def_param, ","); } diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index 97c229e0dd2..f6a768040d4 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -190,49 +190,49 @@ typedef void (*net_update_delegate)(netlist_core_device_t *); #define NETLIB_UPDATEI() ATTR_HOT ATTR_ALIGN inline void update(void) #define NETLIB_DEVICE_BASE(_name, _pclass, _extra, _priv) \ - class _name : public _pclass \ - { \ - public: \ - _name() \ - : _pclass() { } \ - protected: \ - _extra \ - ATTR_HOT void update(); \ - ATTR_HOT void start(); \ - ATTR_HOT void reset(); \ - _priv \ - } + class _name : public _pclass \ + { \ + public: \ + _name() \ + : _pclass() { } \ + protected: \ + _extra \ + ATTR_HOT void update(); \ + ATTR_HOT void start(); \ + ATTR_HOT void reset(); \ + _priv \ + } #define NETLIB_DEVICE_DERIVED(_name, _pclass, _priv) \ - NETLIB_DEVICE_BASE(NETLIB_NAME(_name), NETLIB_NAME(_pclass), , _priv) + NETLIB_DEVICE_BASE(NETLIB_NAME(_name), NETLIB_NAME(_pclass), , _priv) #define NETLIB_DEVICE(_name, _priv) \ - NETLIB_DEVICE_BASE(NETLIB_NAME(_name), netlist_device_t, , _priv) + NETLIB_DEVICE_BASE(NETLIB_NAME(_name), netlist_device_t, , _priv) #define NETLIB_SUBDEVICE(_name, _priv) \ - class NETLIB_NAME(_name) : public netlist_device_t \ - { \ - public: \ - NETLIB_NAME(_name) () \ - : netlist_device_t() \ - { } \ - /*protected:*/ \ - ATTR_HOT void update(); \ - ATTR_HOT void start(); \ - ATTR_HOT void reset(); \ - public: \ - _priv \ - } + class NETLIB_NAME(_name) : public netlist_device_t \ + { \ + public: \ + NETLIB_NAME(_name) () \ + : netlist_device_t() \ + { } \ + /*protected:*/ \ + ATTR_HOT void update(); \ + ATTR_HOT void start(); \ + ATTR_HOT void reset(); \ + public: \ + _priv \ + } #define NETLIB_DEVICE_WITH_PARAMS(_name, _priv) \ - NETLIB_DEVICE_BASE(NETLIB_NAME(_name), netlist_device_t, \ - ATTR_HOT void update_param(); \ - , _priv) + NETLIB_DEVICE_BASE(NETLIB_NAME(_name), netlist_device_t, \ + ATTR_HOT void update_param(); \ + , _priv) #define NETLIB_DEVICE_WITH_PARAMS_DERIVED(_name, _pclass, _priv) \ - NETLIB_DEVICE_BASE(NETLIB_NAME(_name), NETLIB_NAME(_pclass), \ - ATTR_HOT void update_param(); \ - , _priv) + NETLIB_DEVICE_BASE(NETLIB_NAME(_name), NETLIB_NAME(_pclass), \ + ATTR_HOT void update_param(); \ + , _priv) // ---------------------------------------------------------------------------------------- // forward definitions @@ -255,12 +255,12 @@ class NETLIB_NAME(base_d_to_a_proxy); struct netlist_logic_family_desc_t { - double m_low_thresh_V; - double m_high_thresh_V; - double m_low_V; - double m_high_V; - double m_R_low; - double m_R_high; + double m_low_thresh_V; + double m_high_thresh_V; + double m_low_V; + double m_high_V; + double m_R_low; + double m_R_high; }; /* Terminals inherit the family description from the netlist_device @@ -278,69 +278,69 @@ extern netlist_logic_family_desc_t netlist_family_ttl; class netlist_object_t { - NETLIST_PREVENT_COPYING(netlist_object_t) + NETLIST_PREVENT_COPYING(netlist_object_t) public: - enum type_t { - TERMINAL = 0, - INPUT = 1, - OUTPUT = 2, - PARAM = 3, - NET = 4, - DEVICE = 5, - NETLIST = 6, - }; - enum family_t { - // Terminal families - LOGIC = 1, - ANALOG = 2, - // Device families - GENERIC = 3, // <== devices usually fall into this category - RESISTOR = 4, // Resistor - CAPACITOR = 5, // Capacitor - DIODE = 6, // Diode - BJT_SWITCH = 7, // BJT(Switch) - VCVS = 8, // Voltage controlled voltage source - VCCS = 9, // Voltage controlled voltage source - BJT_EB = 10, // BJT(Ebers-Moll) - GND = 11, // BJT(Ebers-Moll) - }; - - ATTR_COLD netlist_object_t(const type_t atype, const family_t afamily); - - virtual ~netlist_object_t(); - - ATTR_COLD void init_object(netlist_base_t &nl, const pstring &aname); - ATTR_COLD bool isInitalized() { return (m_netlist != NULL); } - - ATTR_COLD const pstring name() const; - - PSTATE_INTERFACE_DECL() - - ATTR_HOT inline const type_t type() const { return m_objtype; } - ATTR_HOT inline const family_t family() const { return m_family; } - - ATTR_HOT inline const bool isType(const type_t atype) const { return (m_objtype == atype); } - ATTR_HOT inline const bool isFamily(const family_t afamily) const { return (m_family == afamily); } - - ATTR_HOT inline netlist_base_t & RESTRICT netlist() { return *m_netlist; } - ATTR_HOT inline const netlist_base_t & RESTRICT netlist() const { return *m_netlist; } - - ATTR_COLD void inline do_reset() - { - reset(); - } + enum type_t { + TERMINAL = 0, + INPUT = 1, + OUTPUT = 2, + PARAM = 3, + NET = 4, + DEVICE = 5, + NETLIST = 6, + }; + enum family_t { + // Terminal families + LOGIC = 1, + ANALOG = 2, + // Device families + GENERIC = 3, // <== devices usually fall into this category + RESISTOR = 4, // Resistor + CAPACITOR = 5, // Capacitor + DIODE = 6, // Diode + BJT_SWITCH = 7, // BJT(Switch) + VCVS = 8, // Voltage controlled voltage source + VCCS = 9, // Voltage controlled voltage source + BJT_EB = 10, // BJT(Ebers-Moll) + GND = 11, // BJT(Ebers-Moll) + }; + + ATTR_COLD netlist_object_t(const type_t atype, const family_t afamily); + + virtual ~netlist_object_t(); + + ATTR_COLD void init_object(netlist_base_t &nl, const pstring &aname); + ATTR_COLD bool isInitalized() { return (m_netlist != NULL); } + + ATTR_COLD const pstring name() const; + + PSTATE_INTERFACE_DECL() + + ATTR_HOT inline const type_t type() const { return m_objtype; } + ATTR_HOT inline const family_t family() const { return m_family; } + + ATTR_HOT inline const bool isType(const type_t atype) const { return (m_objtype == atype); } + ATTR_HOT inline const bool isFamily(const family_t afamily) const { return (m_family == afamily); } + + ATTR_HOT inline netlist_base_t & RESTRICT netlist() { return *m_netlist; } + ATTR_HOT inline const netlist_base_t & RESTRICT netlist() const { return *m_netlist; } + + ATTR_COLD void inline do_reset() + { + reset(); + } protected: - ATTR_COLD virtual void reset() = 0; - // must call parent save_register ! - ATTR_COLD virtual void save_register() { }; + ATTR_COLD virtual void reset() = 0; + // must call parent save_register ! + ATTR_COLD virtual void save_register() { }; private: - pstring m_name; - const type_t m_objtype; - const family_t m_family; - netlist_base_t * RESTRICT m_netlist; + pstring m_name; + const type_t m_objtype; + const family_t m_family; + netlist_base_t * RESTRICT m_netlist; }; // ---------------------------------------------------------------------------------------- @@ -349,15 +349,15 @@ private: class netlist_owned_object_t : public netlist_object_t { - NETLIST_PREVENT_COPYING(netlist_owned_object_t) + NETLIST_PREVENT_COPYING(netlist_owned_object_t) public: - ATTR_COLD netlist_owned_object_t(const type_t atype, const family_t afamily); + ATTR_COLD netlist_owned_object_t(const type_t atype, const family_t afamily); - ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname); + ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname); - ATTR_HOT inline netlist_core_device_t & RESTRICT netdev() const { return *m_netdev; } + ATTR_HOT inline netlist_core_device_t & RESTRICT netdev() const { return *m_netdev; } private: - netlist_core_device_t * RESTRICT m_netdev; + netlist_core_device_t * RESTRICT m_netdev; }; // ---------------------------------------------------------------------------------------- @@ -366,53 +366,53 @@ private: class netlist_core_terminal_t : public netlist_owned_object_t, public plinked_list_element { - NETLIST_PREVENT_COPYING(netlist_core_terminal_t) + NETLIST_PREVENT_COPYING(netlist_core_terminal_t) public: - typedef netlist_list_t list_t; + typedef netlist_list_t list_t; - /* needed here ... */ + /* needed here ... */ - enum state_e { - STATE_INP_PASSIVE = 0, - STATE_INP_ACTIVE = 1, - STATE_INP_HL = 2, - STATE_INP_LH = 4, - STATE_OUT = 128, - STATE_NONEX = 256 - }; + enum state_e { + STATE_INP_PASSIVE = 0, + STATE_INP_ACTIVE = 1, + STATE_INP_HL = 2, + STATE_INP_LH = 4, + STATE_OUT = 128, + STATE_NONEX = 256 + }; - ATTR_COLD netlist_core_terminal_t(const type_t atype, const family_t afamily); + ATTR_COLD netlist_core_terminal_t(const type_t atype, const family_t afamily); - //ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname); + //ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname); - ATTR_COLD void set_net(netlist_net_t &anet); - ATTR_COLD inline void clear_net() { m_net = NULL; } - ATTR_HOT inline bool has_net() const { return (m_net != NULL); } - ATTR_HOT inline const netlist_net_t & RESTRICT net() const { return *m_net;} - ATTR_HOT inline netlist_net_t & RESTRICT net() { return *m_net;} + ATTR_COLD void set_net(netlist_net_t &anet); + ATTR_COLD inline void clear_net() { m_net = NULL; } + ATTR_HOT inline bool has_net() const { return (m_net != NULL); } + ATTR_HOT inline const netlist_net_t & RESTRICT net() const { return *m_net;} + ATTR_HOT inline netlist_net_t & RESTRICT net() { return *m_net;} - ATTR_HOT inline const bool is_state(const state_e astate) const { return (m_state == astate); } - ATTR_HOT inline const state_e state() const { return m_state; } - ATTR_HOT inline void set_state(const state_e astate) - { - assert(astate != STATE_NONEX); - m_state = astate; - } + ATTR_HOT inline const bool is_state(const state_e astate) const { return (m_state == astate); } + ATTR_HOT inline const state_e state() const { return m_state; } + ATTR_HOT inline void set_state(const state_e astate) + { + assert(astate != STATE_NONEX); + m_state = astate; + } - const netlist_logic_family_desc_t *m_family_desc; + const netlist_logic_family_desc_t *m_family_desc; protected: - ATTR_COLD virtual void save_register() - { - save(NAME(m_state)); - netlist_owned_object_t::save_register(); - } + ATTR_COLD virtual void save_register() + { + save(NAME(m_state)); + netlist_owned_object_t::save_register(); + } private: - netlist_net_t * RESTRICT m_net; - state_e m_state; + netlist_net_t * RESTRICT m_net; + state_e m_state; }; NETLIST_SAVE_TYPE(netlist_core_terminal_t::state_e, DT_INT); @@ -420,41 +420,41 @@ NETLIST_SAVE_TYPE(netlist_core_terminal_t::state_e, DT_INT); class netlist_terminal_t : public netlist_core_terminal_t { - NETLIST_PREVENT_COPYING(netlist_terminal_t) + NETLIST_PREVENT_COPYING(netlist_terminal_t) public: - ATTR_COLD netlist_terminal_t(); + ATTR_COLD netlist_terminal_t(); - double m_Idr; // drive current - double m_go; // conductance for Voltage from other term - double m_gt; // conductance for total conductance + double m_Idr; // drive current + double m_go; // conductance for Voltage from other term + double m_gt; // conductance for total conductance - ATTR_HOT inline void set(const double G) - { - m_Idr = 0; - m_go = m_gt = G; - } + ATTR_HOT inline void set(const double G) + { + m_Idr = 0; + m_go = m_gt = G; + } - ATTR_HOT inline void set(const double GO, const double GT) - { - m_Idr = 0; - m_go = GO; - m_gt = GT; - } + ATTR_HOT inline void set(const double GO, const double GT) + { + m_Idr = 0; + m_go = GO; + m_gt = GT; + } - ATTR_HOT inline void set(const double GO, const double GT, const double I) - { - m_Idr = I; - m_go = GO; - m_gt = GT; - } + ATTR_HOT inline void set(const double GO, const double GT, const double I) + { + m_Idr = I; + m_go = GO; + m_gt = GT; + } - netlist_terminal_t *m_otherterm; + netlist_terminal_t *m_otherterm; protected: - ATTR_COLD virtual void save_register(); + ATTR_COLD virtual void save_register(); - ATTR_COLD virtual void reset(); + ATTR_COLD virtual void reset(); }; @@ -467,23 +467,23 @@ class netlist_input_t : public netlist_core_terminal_t public: - ATTR_COLD netlist_input_t(const type_t atype, const family_t afamily) - : netlist_core_terminal_t(atype, afamily) - { - set_state(STATE_INP_ACTIVE); - } + ATTR_COLD netlist_input_t(const type_t atype, const family_t afamily) + : netlist_core_terminal_t(atype, afamily) + { + set_state(STATE_INP_ACTIVE); + } - ATTR_HOT inline void inactivate(); - ATTR_HOT inline void activate(); - ATTR_HOT inline void activate_hl(); - ATTR_HOT inline void activate_lh(); + ATTR_HOT inline void inactivate(); + ATTR_HOT inline void activate(); + ATTR_HOT inline void activate_hl(); + ATTR_HOT inline void activate_lh(); protected: - ATTR_COLD virtual void reset() - { - //netlist_core_terminal_t::reset(); - set_state(STATE_INP_ACTIVE); - } + ATTR_COLD virtual void reset() + { + //netlist_core_terminal_t::reset(); + set_state(STATE_INP_ACTIVE); + } private: }; @@ -495,13 +495,13 @@ private: class netlist_logic_input_t : public netlist_input_t { public: - ATTR_COLD netlist_logic_input_t() - : netlist_input_t(INPUT, LOGIC) - { - } + ATTR_COLD netlist_logic_input_t() + : netlist_input_t(INPUT, LOGIC) + { + } - ATTR_HOT inline const netlist_sig_t Q() const; - ATTR_HOT inline const netlist_sig_t last_Q() const; + ATTR_HOT inline const netlist_sig_t Q() const; + ATTR_HOT inline const netlist_sig_t last_Q() const; }; @@ -512,8 +512,8 @@ public: class netlist_ttl_input_t : public netlist_logic_input_t { public: - ATTR_COLD netlist_ttl_input_t() - : netlist_logic_input_t() { } + ATTR_COLD netlist_ttl_input_t() + : netlist_logic_input_t() { } }; // ---------------------------------------------------------------------------------------- @@ -523,10 +523,10 @@ public: class netlist_analog_input_t : public netlist_input_t { public: - ATTR_COLD netlist_analog_input_t() - : netlist_input_t(INPUT, ANALOG) { } + ATTR_COLD netlist_analog_input_t() + : netlist_input_t(INPUT, ANALOG) { } - ATTR_HOT inline const double Q_Analog() const; + ATTR_HOT inline const double Q_Analog() const; }; //#define INPVAL(_x) (_x).Q() @@ -537,120 +537,120 @@ public: class netlist_net_t : public netlist_object_t { - NETLIST_PREVENT_COPYING(netlist_net_t) + NETLIST_PREVENT_COPYING(netlist_net_t) public: - typedef netlist_list_t list_t; + typedef netlist_list_t list_t; - friend class NETLIB_NAME(mainclock); - friend class netlist_matrix_solver_t; - friend class netlist_logic_output_t; - friend class netlist_analog_output_t; - friend class netlist_setup_t; + friend class NETLIB_NAME(mainclock); + friend class netlist_matrix_solver_t; + friend class netlist_logic_output_t; + friend class netlist_analog_output_t; + friend class netlist_setup_t; - ATTR_COLD netlist_net_t(const type_t atype, const family_t afamily); - ATTR_COLD virtual ~netlist_net_t(); + ATTR_COLD netlist_net_t(const type_t atype, const family_t afamily); + ATTR_COLD virtual ~netlist_net_t(); - ATTR_COLD void init_object(netlist_base_t &nl, const pstring &aname); + ATTR_COLD void init_object(netlist_base_t &nl, const pstring &aname); - ATTR_COLD void register_con(netlist_core_terminal_t &terminal); - ATTR_COLD void merge_net(netlist_net_t *othernet); - ATTR_COLD void register_railterminal(netlist_output_t &mr); + ATTR_COLD void register_con(netlist_core_terminal_t &terminal); + ATTR_COLD void merge_net(netlist_net_t *othernet); + ATTR_COLD void register_railterminal(netlist_output_t &mr); - ATTR_HOT inline void update_devs(); + ATTR_HOT inline void update_devs(); - ATTR_HOT inline const netlist_time time() const { return m_time; } - ATTR_HOT inline void set_time(const netlist_time ntime) { m_time = ntime; } + ATTR_HOT inline const netlist_time time() const { return m_time; } + ATTR_HOT inline void set_time(const netlist_time ntime) { m_time = ntime; } - ATTR_HOT inline bool isRailNet() const { return !(m_railterminal == NULL); } - ATTR_HOT inline const netlist_core_terminal_t & RESTRICT railterminal() const { return *m_railterminal; } + ATTR_HOT inline bool isRailNet() const { return !(m_railterminal == NULL); } + ATTR_HOT inline const netlist_core_terminal_t & RESTRICT railterminal() const { return *m_railterminal; } - /* Everything below is used by the logic subsystem */ - ATTR_HOT void inc_active(netlist_core_terminal_t &term); - ATTR_HOT void dec_active(netlist_core_terminal_t &term); + /* Everything below is used by the logic subsystem */ + ATTR_HOT void inc_active(netlist_core_terminal_t &term); + ATTR_HOT void dec_active(netlist_core_terminal_t &term); - ATTR_HOT inline const netlist_sig_t Q() const - { - assert(family() == LOGIC); - return m_cur_Q; - } + ATTR_HOT inline const netlist_sig_t Q() const + { + assert(family() == LOGIC); + return m_cur_Q; + } - ATTR_HOT inline const netlist_sig_t last_Q() const - { - assert(family() == LOGIC); - return m_last_Q; - } + ATTR_HOT inline const netlist_sig_t last_Q() const + { + assert(family() == LOGIC); + return m_last_Q; + } - ATTR_HOT inline const netlist_sig_t new_Q() const - { - assert(family() == LOGIC); - return m_new_Q; - } + ATTR_HOT inline const netlist_sig_t new_Q() const + { + assert(family() == LOGIC); + return m_new_Q; + } - ATTR_HOT inline const double Q_Analog() const - { - //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG); - assert(family() == ANALOG); - return m_cur_Analog; - } + ATTR_HOT inline const double Q_Analog() const + { + //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG); + assert(family() == ANALOG); + return m_cur_Analog; + } - ATTR_HOT inline void push_to_queue(const netlist_time delay); - ATTR_HOT bool inline is_queued() const { return m_in_queue == 1; } + ATTR_HOT inline void push_to_queue(const netlist_time delay); + ATTR_HOT bool inline is_queued() const { return m_in_queue == 1; } - /* internal state support - * FIXME: get rid of this and implement export/import in MAME - */ - ATTR_COLD inline netlist_sig_t &Q_state_ptr() - { - assert(family() == LOGIC); - return m_cur_Q; - } + /* internal state support + * FIXME: get rid of this and implement export/import in MAME + */ + ATTR_COLD inline netlist_sig_t &Q_state_ptr() + { + assert(family() == LOGIC); + return m_cur_Q; + } - ATTR_COLD inline double &Q_Analog_state_ptr() - { - //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG); - assert(family() == ANALOG); - return m_cur_Analog; - } + ATTR_COLD inline double &Q_Analog_state_ptr() + { + //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG); + assert(family() == ANALOG); + return m_cur_Analog; + } - ATTR_HOT inline int num_cons() const { return m_num_cons; } + ATTR_HOT inline int num_cons() const { return m_num_cons; } - // m_terms is only used by analog subsystem - typedef netlist_list_t terminal_list_t; + // m_terms is only used by analog subsystem + typedef netlist_list_t terminal_list_t; - terminal_list_t m_terms; - terminal_list_t m_rails; - netlist_matrix_solver_t *m_solver; - netlist_core_terminal_t * RESTRICT m_railterminal; + terminal_list_t m_terms; + terminal_list_t m_rails; + netlist_matrix_solver_t *m_solver; + netlist_core_terminal_t * RESTRICT m_railterminal; - ATTR_HOT void solve(); + ATTR_HOT void solve(); - netlist_list_t m_registered; // save post-start m_list ... - plinked_list m_list; + netlist_list_t m_registered; // save post-start m_list ... + plinked_list m_list; - ATTR_COLD void rebuild_list(); /* rebuild m_list after a load */ + ATTR_COLD void rebuild_list(); /* rebuild m_list after a load */ protected: //FIXME: needed by current solver code - UINT16 m_num_cons; + UINT16 m_num_cons; - ATTR_COLD virtual void save_register(); - ATTR_COLD virtual void reset(); + ATTR_COLD virtual void save_register(); + ATTR_COLD virtual void reset(); private: - netlist_sig_t m_new_Q; - netlist_sig_t m_cur_Q; - netlist_sig_t m_last_Q; + netlist_sig_t m_new_Q; + netlist_sig_t m_cur_Q; + netlist_sig_t m_last_Q; - netlist_time m_time; - INT32 m_active; - UINT8 m_in_queue; /* 0: not in queue, 1: in queue, 2: last was taken */ + netlist_time m_time; + INT32 m_active; + UINT8 m_in_queue; /* 0: not in queue, 1: in queue, 2: last was taken */ public: - double m_last_Analog; - double m_cur_Analog; - double m_new_Analog; + double m_last_Analog; + double m_cur_Analog; + double m_new_Analog; }; @@ -661,74 +661,74 @@ public: class netlist_output_t : public netlist_core_terminal_t { - NETLIST_PREVENT_COPYING(netlist_output_t) + NETLIST_PREVENT_COPYING(netlist_output_t) public: - ATTR_COLD netlist_output_t(const type_t atype, const family_t afamily); - ATTR_COLD virtual ~netlist_output_t() {} + ATTR_COLD netlist_output_t(const type_t atype, const family_t afamily); + ATTR_COLD virtual ~netlist_output_t() {} - ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname); - ATTR_COLD virtual void reset() - { - //netlist_core_terminal_t::reset(); - set_state(STATE_OUT); - } + ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname); + ATTR_COLD virtual void reset() + { + //netlist_core_terminal_t::reset(); + set_state(STATE_OUT); + } private: - netlist_net_t m_my_net; + netlist_net_t m_my_net; }; class netlist_logic_output_t : public netlist_output_t { - NETLIST_PREVENT_COPYING(netlist_logic_output_t) + NETLIST_PREVENT_COPYING(netlist_logic_output_t) public: - ATTR_COLD netlist_logic_output_t(); + ATTR_COLD netlist_logic_output_t(); - ATTR_COLD void initial(const netlist_sig_t val); + ATTR_COLD void initial(const netlist_sig_t val); - ATTR_COLD bool has_proxy() const { return (m_proxy != NULL); } - ATTR_COLD nld_base_d_to_a_proxy *get_proxy() const { return m_proxy; } - ATTR_COLD void set_proxy(nld_base_d_to_a_proxy *proxy) { m_proxy = proxy; } + ATTR_COLD bool has_proxy() const { return (m_proxy != NULL); } + ATTR_COLD nld_base_d_to_a_proxy *get_proxy() const { return m_proxy; } + ATTR_COLD void set_proxy(nld_base_d_to_a_proxy *proxy) { m_proxy = proxy; } - ATTR_HOT inline void set_Q(const netlist_sig_t newQ, const netlist_time delay) - { - if (EXPECTED(newQ != net().m_new_Q)) - { - net().m_new_Q = newQ; - net().push_to_queue(delay); - } - } + ATTR_HOT inline void set_Q(const netlist_sig_t newQ, const netlist_time delay) + { + if (EXPECTED(newQ != net().m_new_Q)) + { + net().m_new_Q = newQ; + net().push_to_queue(delay); + } + } private: - nld_base_d_to_a_proxy *m_proxy; + nld_base_d_to_a_proxy *m_proxy; }; class netlist_ttl_output_t : public netlist_logic_output_t { public: - ATTR_COLD netlist_ttl_output_t(); + ATTR_COLD netlist_ttl_output_t(); }; class netlist_analog_output_t : public netlist_output_t { - NETLIST_PREVENT_COPYING(netlist_analog_output_t) + NETLIST_PREVENT_COPYING(netlist_analog_output_t) public: - ATTR_COLD netlist_analog_output_t(); + ATTR_COLD netlist_analog_output_t(); - ATTR_COLD void initial(const double val); + ATTR_COLD void initial(const double val); - ATTR_HOT inline void set_Q(const double newQ, const netlist_time delay) - { - if (newQ != net().m_new_Analog) - { - net().m_new_Analog = newQ; - net().push_to_queue(delay); - } - } + ATTR_HOT inline void set_Q(const double newQ, const netlist_time delay) + { + if (newQ != net().m_new_Analog) + { + net().m_new_Analog = newQ; + net().push_to_queue(delay); + } + } }; @@ -738,110 +738,110 @@ public: class netlist_param_t : public netlist_owned_object_t { - NETLIST_PREVENT_COPYING(netlist_param_t) + NETLIST_PREVENT_COPYING(netlist_param_t) public: - enum param_type_t { - MODEL, - STRING, - DOUBLE, - INTEGER, - LOGIC - }; + enum param_type_t { + MODEL, + STRING, + DOUBLE, + INTEGER, + LOGIC + }; - ATTR_COLD netlist_param_t(const param_type_t atype); + ATTR_COLD netlist_param_t(const param_type_t atype); - ATTR_HOT inline const param_type_t param_type() const { return m_param_type; } + ATTR_HOT inline const param_type_t param_type() const { return m_param_type; } protected: - ATTR_COLD virtual void reset() { } + ATTR_COLD virtual void reset() { } private: - const param_type_t m_param_type; + const param_type_t m_param_type; }; class netlist_param_double_t : public netlist_param_t { - NETLIST_PREVENT_COPYING(netlist_param_double_t) + NETLIST_PREVENT_COPYING(netlist_param_double_t) public: - ATTR_COLD netlist_param_double_t(); + ATTR_COLD netlist_param_double_t(); - ATTR_HOT inline void setTo(const double param); - ATTR_COLD inline void initial(const double val) { m_param = val; } - ATTR_HOT inline const double Value() const { return m_param; } + ATTR_HOT inline void setTo(const double param); + ATTR_COLD inline void initial(const double val) { m_param = val; } + ATTR_HOT inline const double Value() const { return m_param; } protected: - ATTR_COLD virtual void save_register() - { - save(NAME(m_param)); - netlist_param_t::save_register(); - } + ATTR_COLD virtual void save_register() + { + save(NAME(m_param)); + netlist_param_t::save_register(); + } private: - double m_param; + double m_param; }; class netlist_param_int_t : public netlist_param_t { - NETLIST_PREVENT_COPYING(netlist_param_int_t) + NETLIST_PREVENT_COPYING(netlist_param_int_t) public: - ATTR_COLD netlist_param_int_t(); + ATTR_COLD netlist_param_int_t(); - ATTR_HOT inline void setTo(const int param); - ATTR_COLD inline void initial(const int val) { m_param = val; } + ATTR_HOT inline void setTo(const int param); + ATTR_COLD inline void initial(const int val) { m_param = val; } - ATTR_HOT inline const int Value() const { return m_param; } + ATTR_HOT inline const int Value() const { return m_param; } protected: - ATTR_COLD virtual void save_register() - { - save(NAME(m_param)); - netlist_param_t::save_register(); - } + ATTR_COLD virtual void save_register() + { + save(NAME(m_param)); + netlist_param_t::save_register(); + } private: - int m_param; + int m_param; }; class netlist_param_logic_t : public netlist_param_int_t { - NETLIST_PREVENT_COPYING(netlist_param_logic_t) + NETLIST_PREVENT_COPYING(netlist_param_logic_t) public: - ATTR_COLD netlist_param_logic_t(); + ATTR_COLD netlist_param_logic_t(); }; class netlist_param_str_t : public netlist_param_t { - NETLIST_PREVENT_COPYING(netlist_param_str_t) + NETLIST_PREVENT_COPYING(netlist_param_str_t) public: - ATTR_COLD netlist_param_str_t(); + ATTR_COLD netlist_param_str_t(); - ATTR_HOT inline void setTo(const pstring ¶m); - ATTR_COLD inline void initial(const pstring &val) { m_param = val; } + ATTR_HOT inline void setTo(const pstring ¶m); + ATTR_COLD inline void initial(const pstring &val) { m_param = val; } - ATTR_HOT inline const pstring &Value() const { return m_param; } + ATTR_HOT inline const pstring &Value() const { return m_param; } private: - pstring m_param; + pstring m_param; }; class netlist_param_model_t : public netlist_param_t { - NETLIST_PREVENT_COPYING(netlist_param_model_t) + NETLIST_PREVENT_COPYING(netlist_param_model_t) public: - ATTR_COLD netlist_param_model_t(); + ATTR_COLD netlist_param_model_t(); - ATTR_COLD inline void initial(const pstring &val) { m_param = val; } + ATTR_COLD inline void initial(const pstring &val) { m_param = val; } - ATTR_HOT inline const pstring &Value() const { return m_param; } + ATTR_HOT inline const pstring &Value() const { return m_param; } - /* these should be cached! */ - ATTR_COLD double model_value(const pstring &entity, const double defval = 0.0) const; - ATTR_COLD const pstring model_type() const; + /* these should be cached! */ + ATTR_COLD double model_value(const pstring &entity, const double defval = 0.0) const; + ATTR_COLD const pstring model_type() const; private: - pstring m_param; + pstring m_param; }; // ---------------------------------------------------------------------------------------- @@ -850,90 +850,90 @@ private: class netlist_core_device_t : public netlist_object_t { - NETLIST_PREVENT_COPYING(netlist_core_device_t) + NETLIST_PREVENT_COPYING(netlist_core_device_t) public: - typedef netlist_list_t list_t; + typedef netlist_list_t list_t; - //ATTR_COLD netlist_core_device_t(); - ATTR_COLD netlist_core_device_t(const family_t afamily); - ATTR_COLD netlist_core_device_t(const netlist_logic_family_desc_t *family_desc); + //ATTR_COLD netlist_core_device_t(); + ATTR_COLD netlist_core_device_t(const family_t afamily); + ATTR_COLD netlist_core_device_t(const netlist_logic_family_desc_t *family_desc); - ATTR_COLD virtual ~netlist_core_device_t(); + ATTR_COLD virtual ~netlist_core_device_t(); - ATTR_COLD virtual void init(netlist_base_t &anetlist, const pstring &name); - ATTR_HOT virtual void update_param() {} + ATTR_COLD virtual void init(netlist_base_t &anetlist, const pstring &name); + ATTR_HOT virtual void update_param() {} - ATTR_HOT inline void update_dev() - { + ATTR_HOT inline void update_dev() + { #if USE_PMFDELEGATES - static_update(this); + static_update(this); #else - update(); + update(); #endif - } - ATTR_HOT inline void start_dev() - { - start(); - } + } + ATTR_HOT inline void start_dev() + { + start(); + } - ATTR_HOT const netlist_sig_t INPLOGIC_PASSIVE(netlist_logic_input_t &inp); + ATTR_HOT const netlist_sig_t INPLOGIC_PASSIVE(netlist_logic_input_t &inp); - ATTR_HOT inline const netlist_sig_t INPLOGIC(const netlist_logic_input_t &inp) const - { - assert(inp.state() != netlist_input_t::STATE_INP_PASSIVE); - return inp.Q(); - } + ATTR_HOT inline const netlist_sig_t INPLOGIC(const netlist_logic_input_t &inp) const + { + assert(inp.state() != netlist_input_t::STATE_INP_PASSIVE); + return inp.Q(); + } - ATTR_HOT inline void OUTLOGIC(netlist_logic_output_t &out, const netlist_sig_t val, const netlist_time delay) - { - out.set_Q(val, delay); - } + ATTR_HOT inline void OUTLOGIC(netlist_logic_output_t &out, const netlist_sig_t val, const netlist_time delay) + { + out.set_Q(val, delay); + } - ATTR_HOT inline bool INP_HL(const netlist_logic_input_t &inp) const - { - return ((inp.last_Q() & !inp.Q()) == 1); - } + ATTR_HOT inline bool INP_HL(const netlist_logic_input_t &inp) const + { + return ((inp.last_Q() & !inp.Q()) == 1); + } - ATTR_HOT inline bool INP_LH(const netlist_logic_input_t &inp) const - { - return ((!inp.last_Q() & inp.Q()) == 1); - } + ATTR_HOT inline bool INP_LH(const netlist_logic_input_t &inp) const + { + return ((!inp.last_Q() & inp.Q()) == 1); + } - ATTR_HOT inline const double INPANALOG(const netlist_analog_input_t &inp) const { return inp.Q_Analog(); } + ATTR_HOT inline const double INPANALOG(const netlist_analog_input_t &inp) const { return inp.Q_Analog(); } - ATTR_HOT inline const double TERMANALOG(const netlist_terminal_t &term) const { return term.net().Q_Analog(); } + ATTR_HOT inline const double TERMANALOG(const netlist_terminal_t &term) const { return term.net().Q_Analog(); } - ATTR_HOT inline void OUTANALOG(netlist_analog_output_t &out, const double val, const netlist_time delay) - { - out.set_Q(val, delay); - } + ATTR_HOT inline void OUTANALOG(netlist_analog_output_t &out, const double val, const netlist_time delay) + { + out.set_Q(val, delay); + } - ATTR_HOT virtual void inc_active() { } + ATTR_HOT virtual void inc_active() { } - ATTR_HOT virtual void dec_active() { } + ATTR_HOT virtual void dec_active() { } - ATTR_HOT virtual void step_time(const double st) { } - ATTR_HOT virtual void update_terminals() { } + ATTR_HOT virtual void step_time(const double st) { } + ATTR_HOT virtual void update_terminals() { } #if (NL_KEEP_STATISTICS) - /* stats */ - osd_ticks_t total_time; - INT32 stat_count; + /* stats */ + osd_ticks_t total_time; + INT32 stat_count; #endif #if USE_PMFDELEGATES - net_update_delegate static_update; + net_update_delegate static_update; #endif - const netlist_logic_family_desc_t *m_family_desc; + const netlist_logic_family_desc_t *m_family_desc; protected: - ATTR_HOT virtual void update() { } - ATTR_COLD virtual void start() { } + ATTR_HOT virtual void update() { } + ATTR_COLD virtual void start() { } private: }; @@ -941,36 +941,36 @@ private: class netlist_device_t : public netlist_core_device_t { - NETLIST_PREVENT_COPYING(netlist_device_t) + NETLIST_PREVENT_COPYING(netlist_device_t) public: - ATTR_COLD netlist_device_t(); - ATTR_COLD netlist_device_t(const family_t afamily); + ATTR_COLD netlist_device_t(); + ATTR_COLD netlist_device_t(const family_t afamily); - ATTR_COLD virtual ~netlist_device_t(); + ATTR_COLD virtual ~netlist_device_t(); - ATTR_COLD virtual void init(netlist_base_t &anetlist, const pstring &name); + ATTR_COLD virtual void init(netlist_base_t &anetlist, const pstring &name); - ATTR_COLD netlist_setup_t &setup(); + ATTR_COLD netlist_setup_t &setup(); - ATTR_COLD void register_sub(netlist_device_t &dev, const pstring &name); - ATTR_COLD void register_subalias(const pstring &name, netlist_core_terminal_t &term); - ATTR_COLD void register_terminal(const pstring &name, netlist_terminal_t &port); - ATTR_COLD void register_output(const pstring &name, netlist_output_t &out); - ATTR_COLD void register_input(const pstring &name, netlist_input_t &in); + ATTR_COLD void register_sub(netlist_device_t &dev, const pstring &name); + ATTR_COLD void register_subalias(const pstring &name, netlist_core_terminal_t &term); + ATTR_COLD void register_terminal(const pstring &name, netlist_terminal_t &port); + ATTR_COLD void register_output(const pstring &name, netlist_output_t &out); + ATTR_COLD void register_input(const pstring &name, netlist_input_t &in); - ATTR_COLD void connect(netlist_core_terminal_t &t1, netlist_core_terminal_t &t2); + ATTR_COLD void connect(netlist_core_terminal_t &t1, netlist_core_terminal_t &t2); - netlist_list_t m_terminals; + netlist_list_t m_terminals; protected: - ATTR_HOT virtual void update() { } - ATTR_HOT virtual void start() { } - ATTR_HOT virtual void update_terminals() { } + ATTR_HOT virtual void update() { } + ATTR_HOT virtual void start() { } + ATTR_HOT virtual void update_terminals() { } - template - ATTR_COLD void register_param(const pstring &sname, C ¶m, const T initialVal); + template + ATTR_COLD void register_param(const pstring &sname, C ¶m, const T initialVal); private: }; @@ -981,23 +981,23 @@ private: // ---------------------------------------------------------------------------------------- class netlist_queue_t : public netlist_timed_queue, - public pstate_callback_t + public pstate_callback_t { public: - netlist_queue_t(netlist_base_t &nl); + netlist_queue_t(netlist_base_t &nl); - void register_state(pstate_manager_t &manager, const pstring &module); - void on_pre_save(); - void on_post_load(); + void register_state(pstate_manager_t &manager, const pstring &module); + void on_pre_save(); + void on_post_load(); - pstate_callback_t &callback() { return *this; } + pstate_callback_t &callback() { return *this; } private: - netlist_base_t &m_netlist; - int m_qsize; - netlist_time::INTERNALTYPE m_times[512]; - char m_name[512][64]; + netlist_base_t &m_netlist; + int m_qsize; + netlist_time::INTERNALTYPE m_times[512]; + char m_name[512][64]; }; // ---------------------------------------------------------------------------------------- @@ -1009,121 +1009,121 @@ typedef tagmap_t tagmap_devices_t; class netlist_base_t : public netlist_object_t, public pstate_manager_t { - NETLIST_PREVENT_COPYING(netlist_base_t) + NETLIST_PREVENT_COPYING(netlist_base_t) public: - netlist_base_t(); - virtual ~netlist_base_t(); - - ATTR_COLD void start(); - - ATTR_HOT inline const netlist_queue_t &queue() const { return m_queue; } - ATTR_HOT inline netlist_queue_t &queue() { return m_queue; } - ATTR_HOT inline const netlist_time time() const { return m_time; } - ATTR_HOT inline NETLIB_NAME(solver) *solver() const { return m_solver; } - ATTR_HOT inline NETLIB_NAME(gnd) *gnd() const { return m_gnd; } - ATTR_HOT const double gmin() const; - - ATTR_HOT inline void push_to_queue(netlist_net_t *out, const netlist_time attime) - { - m_queue.push(netlist_queue_t::entry_t(attime, out)); - } - - ATTR_HOT void process_queue(const netlist_time delta); - ATTR_HOT inline void abort_current_queue_slice() { m_stop = netlist_time::zero; } - - ATTR_COLD void rebuild_lists(); /* must be called after post_load ! */ - - ATTR_COLD void set_setup(netlist_setup_t *asetup) { m_setup = asetup; } - ATTR_COLD netlist_setup_t &setup() { return *m_setup; } - - ATTR_COLD netlist_net_t *find_net(const pstring &name); - - ATTR_COLD void error(const char *format, ...) const ATTR_PRINTF(2,3); - ATTR_COLD void warning(const char *format, ...) const ATTR_PRINTF(2,3); - ATTR_COLD void log(const char *format, ...) const ATTR_PRINTF(2,3); - - template - netlist_list_t<_C *> get_device_list() - { - netlist_list_t<_C *> tmp; - for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) - { - _C *dev = dynamic_cast<_C *>(entry->object()); - if (dev != NULL) - tmp.add(dev); - } - return tmp; - } - - template - _C *get_first_device() - { - for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) - { - _C *dev = dynamic_cast<_C *>(entry->object()); - if (dev != NULL) - return dev; - } - return NULL; - } - - template - _C *get_single_device(const char *classname) - { - _C *ret = NULL; - for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) - { - _C *dev = dynamic_cast<_C *>(entry->object()); - if (dev != NULL) - { - if (ret != NULL) - this->error("more than one %s device found", classname); - else - ret = dev; - } - } - return ret; - } - - tagmap_devices_t m_devices; - netlist_net_t::list_t m_nets; + netlist_base_t(); + virtual ~netlist_base_t(); + + ATTR_COLD void start(); + + ATTR_HOT inline const netlist_queue_t &queue() const { return m_queue; } + ATTR_HOT inline netlist_queue_t &queue() { return m_queue; } + ATTR_HOT inline const netlist_time time() const { return m_time; } + ATTR_HOT inline NETLIB_NAME(solver) *solver() const { return m_solver; } + ATTR_HOT inline NETLIB_NAME(gnd) *gnd() const { return m_gnd; } + ATTR_HOT const double gmin() const; + + ATTR_HOT inline void push_to_queue(netlist_net_t *out, const netlist_time attime) + { + m_queue.push(netlist_queue_t::entry_t(attime, out)); + } + + ATTR_HOT void process_queue(const netlist_time delta); + ATTR_HOT inline void abort_current_queue_slice() { m_stop = netlist_time::zero; } + + ATTR_COLD void rebuild_lists(); /* must be called after post_load ! */ + + ATTR_COLD void set_setup(netlist_setup_t *asetup) { m_setup = asetup; } + ATTR_COLD netlist_setup_t &setup() { return *m_setup; } + + ATTR_COLD netlist_net_t *find_net(const pstring &name); + + ATTR_COLD void error(const char *format, ...) const ATTR_PRINTF(2,3); + ATTR_COLD void warning(const char *format, ...) const ATTR_PRINTF(2,3); + ATTR_COLD void log(const char *format, ...) const ATTR_PRINTF(2,3); + + template + netlist_list_t<_C *> get_device_list() + { + netlist_list_t<_C *> tmp; + for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) + { + _C *dev = dynamic_cast<_C *>(entry->object()); + if (dev != NULL) + tmp.add(dev); + } + return tmp; + } + + template + _C *get_first_device() + { + for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) + { + _C *dev = dynamic_cast<_C *>(entry->object()); + if (dev != NULL) + return dev; + } + return NULL; + } + + template + _C *get_single_device(const char *classname) + { + _C *ret = NULL; + for (tagmap_devices_t::entry_t *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry)) + { + _C *dev = dynamic_cast<_C *>(entry->object()); + if (dev != NULL) + { + if (ret != NULL) + this->error("more than one %s device found", classname); + else + ret = dev; + } + } + return ret; + } + + tagmap_devices_t m_devices; + netlist_net_t::list_t m_nets; protected: - enum loglevel_e - { - NL_ERROR, - NL_WARNING, - NL_LOG, - }; + enum loglevel_e + { + NL_ERROR, + NL_WARNING, + NL_LOG, + }; - // any derived netlist must override this ... - ATTR_COLD virtual void verror(const loglevel_e level, - const char *format, va_list ap) const = 0; + // any derived netlist must override this ... + ATTR_COLD virtual void verror(const loglevel_e level, + const char *format, va_list ap) const = 0; - /* from netlist_object */ - ATTR_COLD virtual void reset(); - ATTR_COLD virtual void save_register(); + /* from netlist_object */ + ATTR_COLD virtual void reset(); + ATTR_COLD virtual void save_register(); #if (NL_KEEP_STATISTICS) - // performance - int m_perf_out_processed; - int m_perf_inp_processed; - int m_perf_inp_active; + // performance + int m_perf_out_processed; + int m_perf_inp_processed; + int m_perf_inp_active; #endif private: - netlist_time m_stop; // target time for current queue processing + netlist_time m_stop; // target time for current queue processing - netlist_time m_time; - netlist_queue_t m_queue; + netlist_time m_time; + netlist_queue_t m_queue; - NETLIB_NAME(mainclock) * m_mainclock; - NETLIB_NAME(solver) * m_solver; - NETLIB_NAME(gnd) * m_gnd; + NETLIB_NAME(mainclock) * m_mainclock; + NETLIB_NAME(solver) * m_solver; + NETLIB_NAME(gnd) * m_gnd; - netlist_setup_t *m_setup; + netlist_setup_t *m_setup; }; // ---------------------------------------------------------------------------------------- @@ -1134,94 +1134,94 @@ PSTATE_INTERFACE(netlist_object_t, m_netlist, name()) ATTR_HOT inline void netlist_param_str_t::setTo(const pstring ¶m) { - m_param = param; - netdev().update_param(); + m_param = param; + netdev().update_param(); } ATTR_HOT inline void netlist_param_int_t::setTo(const int param) { - if (m_param != param) - { - m_param = param; - netdev().update_param(); - } + if (m_param != param) + { + m_param = param; + netdev().update_param(); + } } ATTR_HOT inline void netlist_param_double_t::setTo(const double param) { - if (m_param != param) - { - m_param = param; - netdev().update_param(); - } + if (m_param != param) + { + m_param = param; + netdev().update_param(); + } } ATTR_HOT inline void netlist_input_t::inactivate() { - if (EXPECTED(!is_state(STATE_INP_PASSIVE))) - { - set_state(STATE_INP_PASSIVE); - net().dec_active(*this); - } + if (EXPECTED(!is_state(STATE_INP_PASSIVE))) + { + set_state(STATE_INP_PASSIVE); + net().dec_active(*this); + } } ATTR_HOT inline void netlist_input_t::activate() { - if (is_state(STATE_INP_PASSIVE)) - { - net().inc_active(*this); - set_state(STATE_INP_ACTIVE); - } + if (is_state(STATE_INP_PASSIVE)) + { + net().inc_active(*this); + set_state(STATE_INP_ACTIVE); + } } ATTR_HOT inline void netlist_input_t::activate_hl() { - if (is_state(STATE_INP_PASSIVE)) - { - net().inc_active(*this); - set_state(STATE_INP_HL); - } + if (is_state(STATE_INP_PASSIVE)) + { + net().inc_active(*this); + set_state(STATE_INP_HL); + } } ATTR_HOT inline void netlist_input_t::activate_lh() { - if (is_state(STATE_INP_PASSIVE)) - { - net().inc_active(*this); - set_state(STATE_INP_LH); - } + if (is_state(STATE_INP_PASSIVE)) + { + net().inc_active(*this); + set_state(STATE_INP_LH); + } } ATTR_HOT inline void netlist_net_t::push_to_queue(const netlist_time delay) { - //if (UNEXPECTED(m_num_cons == 0 || is_queued())) - if (!is_queued()) - { - m_time = netlist().time() + delay; - m_in_queue = (m_active > 0); /* queued ? */ - if (EXPECTED(m_in_queue)) - { - netlist().push_to_queue(this, m_time); - } - } + //if (UNEXPECTED(m_num_cons == 0 || is_queued())) + if (!is_queued()) + { + m_time = netlist().time() + delay; + m_in_queue = (m_active > 0); /* queued ? */ + if (EXPECTED(m_in_queue)) + { + netlist().push_to_queue(this, m_time); + } + } } ATTR_HOT inline const netlist_sig_t netlist_logic_input_t::Q() const { - return net().Q(); + return net().Q(); } ATTR_HOT inline const netlist_sig_t netlist_logic_input_t::last_Q() const { - return net().last_Q(); + return net().last_Q(); } ATTR_HOT inline const double netlist_analog_input_t::Q_Analog() const { - return net().Q_Analog(); + return net().Q_Analog(); } @@ -1231,71 +1231,71 @@ ATTR_HOT inline const double netlist_analog_input_t::Q_Analog() const class net_device_t_base_factory { - NETLIST_PREVENT_COPYING(net_device_t_base_factory) + NETLIST_PREVENT_COPYING(net_device_t_base_factory) public: - ATTR_COLD net_device_t_base_factory(const pstring &name, const pstring &classname, - const pstring &def_param) - : m_name(name), m_classname(classname), m_def_param(def_param) - {} + ATTR_COLD net_device_t_base_factory(const pstring &name, const pstring &classname, + const pstring &def_param) + : m_name(name), m_classname(classname), m_def_param(def_param) + {} - ATTR_COLD virtual ~net_device_t_base_factory() {} + ATTR_COLD virtual ~net_device_t_base_factory() {} - ATTR_COLD virtual netlist_device_t *Create() const = 0; + ATTR_COLD virtual netlist_device_t *Create() const = 0; - ATTR_COLD const pstring &name() const { return m_name; } - ATTR_COLD const pstring &classname() const { return m_classname; } - ATTR_COLD const pstring ¶m_desc() const { return m_def_param; } - ATTR_COLD const nl_util::pstring_list term_param_list(); - ATTR_COLD const nl_util::pstring_list def_params(); + ATTR_COLD const pstring &name() const { return m_name; } + ATTR_COLD const pstring &classname() const { return m_classname; } + ATTR_COLD const pstring ¶m_desc() const { return m_def_param; } + ATTR_COLD const nl_util::pstring_list term_param_list(); + ATTR_COLD const nl_util::pstring_list def_params(); protected: - pstring m_name; /* device name */ - pstring m_classname; /* device class name */ - pstring m_def_param; /* default parameter */ + pstring m_name; /* device name */ + pstring m_classname; /* device class name */ + pstring m_def_param; /* default parameter */ }; template class net_device_t_factory : public net_device_t_base_factory { - NETLIST_PREVENT_COPYING(net_device_t_factory) + NETLIST_PREVENT_COPYING(net_device_t_factory) public: - ATTR_COLD net_device_t_factory(const pstring &name, const pstring &classname, - const pstring &def_param) - : net_device_t_base_factory(name, classname, def_param) { } - - ATTR_COLD netlist_device_t *Create() const - { - netlist_device_t *r = new C(); - //r->init(setup, name); - return r; - } + ATTR_COLD net_device_t_factory(const pstring &name, const pstring &classname, + const pstring &def_param) + : net_device_t_base_factory(name, classname, def_param) { } + + ATTR_COLD netlist_device_t *Create() const + { + netlist_device_t *r = new C(); + //r->init(setup, name); + return r; + } }; class netlist_factory_t { public: - typedef netlist_list_t list_t; + typedef netlist_list_t list_t; - ATTR_COLD netlist_factory_t(); - ATTR_COLD ~netlist_factory_t(); + ATTR_COLD netlist_factory_t(); + ATTR_COLD ~netlist_factory_t(); - ATTR_COLD void initialize(); + ATTR_COLD void initialize(); - template - ATTR_COLD void register_device(const pstring &name, const pstring &classname, - const pstring &def_param) - { - m_list.add(new net_device_t_factory< _C >(name, classname, def_param) ); - } + template + ATTR_COLD void register_device(const pstring &name, const pstring &classname, + const pstring &def_param) + { + m_list.add(new net_device_t_factory< _C >(name, classname, def_param) ); + } - ATTR_COLD netlist_device_t *new_device_by_classname(const pstring &classname, netlist_setup_t &setup) const; - ATTR_COLD netlist_device_t *new_device_by_name(const pstring &name, netlist_setup_t &setup) const; - ATTR_COLD net_device_t_base_factory * factory_by_name(const pstring &name, netlist_setup_t &setup) const; + ATTR_COLD netlist_device_t *new_device_by_classname(const pstring &classname, netlist_setup_t &setup) const; + ATTR_COLD netlist_device_t *new_device_by_name(const pstring &name, netlist_setup_t &setup) const; + ATTR_COLD net_device_t_base_factory * factory_by_name(const pstring &name, netlist_setup_t &setup) const; - const list_t &list() { return m_list; } + const list_t &list() { return m_list; } private: - list_t m_list; + list_t m_list; }; diff --git a/src/emu/netlist/nl_dice_compat.h b/src/emu/netlist/nl_dice_compat.h index c6ea2ef5860..a63ac5b1b9a 100644 --- a/src/emu/netlist/nl_dice_compat.h +++ b/src/emu/netlist/nl_dice_compat.h @@ -29,50 +29,50 @@ struct Mono555Desc { public: - double r, c; + double r, c; - Mono555Desc(double res, double cap) : r(res), c(cap) { } + Mono555Desc(double res, double cap) : r(res), c(cap) { } }; struct SeriesRCDesc { public: - double r, c; + double r, c; - SeriesRCDesc(double res, double cap) : r(res), c(cap) { } + SeriesRCDesc(double res, double cap) : r(res), c(cap) { } }; #define CHIP_555_Mono(_name, _pdesc) \ - CHIP(# _name, NE555) \ - NET_C(_name.6, _name.7) \ - RES(_name ## _R, (_pdesc)->r) \ - CAP(_name ## _C, (_pdesc)->c) \ - NET_C(_name.6, _name ## _R.1) \ - NET_C(_name.6, _name ## _C.1) \ - NET_C(_name ## _R.2, V5) \ - NET_CSTR(# _name "_C.2", "GND") \ - NET_C(_name.8, V5) \ - NET_CSTR(# _name ".1", "GND") + CHIP(# _name, NE555) \ + NET_C(_name.6, _name.7) \ + RES(_name ## _R, (_pdesc)->r) \ + CAP(_name ## _C, (_pdesc)->c) \ + NET_C(_name.6, _name ## _R.1) \ + NET_C(_name.6, _name ## _C.1) \ + NET_C(_name ## _R.2, V5) \ + NET_CSTR(# _name "_C.2", "GND") \ + NET_C(_name.8, V5) \ + NET_CSTR(# _name ".1", "GND") #define CHIP_SERIES_RC(_name, _pdesc) \ - RES(_name ## _R, (_pdesc)->r) \ - CAP(_name ## _C, (_pdesc)->c) \ - NET_C(_name ## _R.1, _name ## _C.2) \ - ALIAS(_name.3, _name ## _R.1) \ - ALIAS(_name.2, _name ## _R.2) \ - ALIAS(_name.1, _name ## _C.1) + RES(_name ## _R, (_pdesc)->r) \ + CAP(_name ## _C, (_pdesc)->c) \ + NET_C(_name ## _R.1, _name ## _C.2) \ + ALIAS(_name.3, _name ## _R.1) \ + ALIAS(_name.2, _name ## _R.2) \ + ALIAS(_name.1, _name ## _C.1) #define CHIP_INPUT(_name) \ SWITCH2(_name ## _SW) \ - NET_C(_name ## _SW.2, V5) \ - NET_CSTR(# _name "_SW.1", "GND") \ - ALIAS(_name.1, _name ## _SW.Q) + NET_C(_name ## _SW.2, V5) \ + NET_CSTR(# _name "_SW.1", "GND") \ + ALIAS(_name.1, _name ## _SW.Q) #define CHIP_LATCH(_name) \ NETDEV_RSFF(_name) \ - ALIAS(_name.1, _name.S) \ - ALIAS(_name.2, _name.R) \ - ALIAS(_name.3, _name.QQ) + ALIAS(_name.1, _name.S) \ + ALIAS(_name.2, _name.R) \ + ALIAS(_name.3, _name.QQ) diff --git a/src/emu/netlist/nl_lists.h b/src/emu/netlist/nl_lists.h index 685081d941a..0de20ea55ab 100644 --- a/src/emu/netlist/nl_lists.h +++ b/src/emu/netlist/nl_lists.h @@ -22,133 +22,133 @@ class netlist_list_t { public: - ATTR_COLD netlist_list_t(int numElements = _NumElem) - { - m_num_elements = numElements; - m_list = new _ListClass[m_num_elements]; - m_count = 0; - } - - ATTR_COLD netlist_list_t(const netlist_list_t &rhs) - { - m_num_elements = rhs.capacity(); - m_list = new _ListClass[m_num_elements]; - m_count = 0; - for (int i=0; iadd(rhs[i]); - } - } - - ATTR_COLD netlist_list_t &operator=(const netlist_list_t &rhs) - { - this->reset(); - for (int i=0; iadd(rhs[i]); - } - return *this; - } - - - ATTR_COLD ~netlist_list_t() - { - delete[] m_list; - } - - ATTR_HOT inline void add(const _ListClass &elem) - { - if (m_count >= m_num_elements) - resize(m_num_elements * 2); - - m_list[m_count++] = elem; - } - - ATTR_HOT inline void resize(const int new_size) - { - int cnt = count(); - _ListClass *m_new = new _ListClass[new_size]; - _ListClass *pd = m_new; - - for (_ListClass *ps = m_list; ps < m_list + cnt; ps++, pd++) - *pd = *ps; - delete[] m_list; - m_list = m_new; - m_count = cnt; - m_num_elements = new_size; - } - - ATTR_HOT inline void remove(const _ListClass &elem) - { - for (int i = 0; i < m_count; i++) - { - if (m_list[i] == elem) - { - m_count --; - while (i < m_count) - { - m_list[i] = m_list[i+1]; - i++; - } - return; - } - } - } - - ATTR_HOT inline void remove_at(const int pos) - { - assert((pos>=0) && (pos 0) ? &m_list[0] : NULL ); } - ATTR_HOT inline const _ListClass *next(const _ListClass *lc) const { return ((lc < last()) ? lc + 1 : NULL ); } - ATTR_HOT inline const _ListClass *last() const { return &m_list[m_count -1]; } - ATTR_HOT inline int count() const { return m_count; } - ATTR_HOT inline bool empty() const { return (m_count == 0); } - ATTR_HOT inline void clear() { m_count = 0; } - ATTR_HOT inline int capacity() const { return m_num_elements; } - - ATTR_COLD void clear_and_free() - { - for (_ListClass *i = m_list; i < m_list + m_count; i++) - { - delete *i; - } - clear(); - } - - ATTR_HOT inline _ListClass& operator[](const int & index) { return m_list[index]; } - ATTR_HOT inline const _ListClass& operator[](const int & index) const { return m_list[index]; } + ATTR_COLD netlist_list_t(int numElements = _NumElem) + { + m_num_elements = numElements; + m_list = new _ListClass[m_num_elements]; + m_count = 0; + } + + ATTR_COLD netlist_list_t(const netlist_list_t &rhs) + { + m_num_elements = rhs.capacity(); + m_list = new _ListClass[m_num_elements]; + m_count = 0; + for (int i=0; iadd(rhs[i]); + } + } + + ATTR_COLD netlist_list_t &operator=(const netlist_list_t &rhs) + { + this->reset(); + for (int i=0; iadd(rhs[i]); + } + return *this; + } + + + ATTR_COLD ~netlist_list_t() + { + delete[] m_list; + } + + ATTR_HOT inline void add(const _ListClass &elem) + { + if (m_count >= m_num_elements) + resize(m_num_elements * 2); + + m_list[m_count++] = elem; + } + + ATTR_HOT inline void resize(const int new_size) + { + int cnt = count(); + _ListClass *m_new = new _ListClass[new_size]; + _ListClass *pd = m_new; + + for (_ListClass *ps = m_list; ps < m_list + cnt; ps++, pd++) + *pd = *ps; + delete[] m_list; + m_list = m_new; + m_count = cnt; + m_num_elements = new_size; + } + + ATTR_HOT inline void remove(const _ListClass &elem) + { + for (int i = 0; i < m_count; i++) + { + if (m_list[i] == elem) + { + m_count --; + while (i < m_count) + { + m_list[i] = m_list[i+1]; + i++; + } + return; + } + } + } + + ATTR_HOT inline void remove_at(const int pos) + { + assert((pos>=0) && (pos 0) ? &m_list[0] : NULL ); } + ATTR_HOT inline const _ListClass *next(const _ListClass *lc) const { return ((lc < last()) ? lc + 1 : NULL ); } + ATTR_HOT inline const _ListClass *last() const { return &m_list[m_count -1]; } + ATTR_HOT inline int count() const { return m_count; } + ATTR_HOT inline bool empty() const { return (m_count == 0); } + ATTR_HOT inline void clear() { m_count = 0; } + ATTR_HOT inline int capacity() const { return m_num_elements; } + + ATTR_COLD void clear_and_free() + { + for (_ListClass *i = m_list; i < m_list + m_count; i++) + { + delete *i; + } + clear(); + } + + ATTR_HOT inline _ListClass& operator[](const int & index) { return m_list[index]; } + ATTR_HOT inline const _ListClass& operator[](const int & index) const { return m_list[index]; } private: - int m_count; - _ListClass * m_list; - int m_num_elements; + int m_count; + _ListClass * m_list; + int m_num_elements; }; // ---------------------------------------------------------------------------------------- @@ -158,81 +158,81 @@ private: template class netlist_timed_queue { - NETLIST_PREVENT_COPYING(netlist_timed_queue) + NETLIST_PREVENT_COPYING(netlist_timed_queue) public: - class entry_t - { - public: - ATTR_HOT inline entry_t() - : m_exec_time(), m_object() {} - ATTR_HOT inline entry_t(const _Time atime, const _Element elem) : m_exec_time(atime), m_object(elem) {} - ATTR_HOT inline const _Time exec_time() const { return m_exec_time; } - ATTR_HOT inline const _Element object() const { return m_object; } - - private: - _Time m_exec_time; - _Element m_object; - }; - - netlist_timed_queue() - { - //m_list = global_alloc_array(entry_t, SIZE); - clear(); - } - - ATTR_HOT inline int capacity() const { return _Size; } - ATTR_HOT inline bool is_empty() const { return (m_end == &m_list[0]); } - ATTR_HOT inline bool is_not_empty() const { return (m_end > &m_list[0]); } - - ATTR_HOT ATTR_ALIGN void push(const entry_t &e) - { - entry_t * i = m_end++; - const _Time e_time = e.exec_time(); - while ((i > &m_list[0]) && (e_time > (i - 1)->exec_time()) ) - { - *(i) = *(i-1); - i--; - inc_stat(m_prof_sortmove); - } - *i = e; - inc_stat(m_prof_sort); - assert(m_end - m_list < _Size); - } - - ATTR_HOT inline const entry_t *pop() - { - return --m_end; - } - - ATTR_HOT inline const entry_t *peek() const - { - return (m_end-1); - } - - ATTR_COLD void clear() - { - m_end = &m_list[0]; - } - - // save state support & mame disasm - - ATTR_COLD inline const entry_t *listptr() const { return &m_list[0]; } - ATTR_HOT inline int count() const { return m_end - m_list; } - ATTR_HOT inline const entry_t & operator[](const int & index) const { return m_list[index]; } + class entry_t + { + public: + ATTR_HOT inline entry_t() + : m_exec_time(), m_object() {} + ATTR_HOT inline entry_t(const _Time atime, const _Element elem) : m_exec_time(atime), m_object(elem) {} + ATTR_HOT inline const _Time exec_time() const { return m_exec_time; } + ATTR_HOT inline const _Element object() const { return m_object; } + + private: + _Time m_exec_time; + _Element m_object; + }; + + netlist_timed_queue() + { + //m_list = global_alloc_array(entry_t, SIZE); + clear(); + } + + ATTR_HOT inline int capacity() const { return _Size; } + ATTR_HOT inline bool is_empty() const { return (m_end == &m_list[0]); } + ATTR_HOT inline bool is_not_empty() const { return (m_end > &m_list[0]); } + + ATTR_HOT ATTR_ALIGN void push(const entry_t &e) + { + entry_t * i = m_end++; + const _Time e_time = e.exec_time(); + while ((i > &m_list[0]) && (e_time > (i - 1)->exec_time()) ) + { + *(i) = *(i-1); + i--; + inc_stat(m_prof_sortmove); + } + *i = e; + inc_stat(m_prof_sort); + assert(m_end - m_list < _Size); + } + + ATTR_HOT inline const entry_t *pop() + { + return --m_end; + } + + ATTR_HOT inline const entry_t *peek() const + { + return (m_end-1); + } + + ATTR_COLD void clear() + { + m_end = &m_list[0]; + } + + // save state support & mame disasm + + ATTR_COLD inline const entry_t *listptr() const { return &m_list[0]; } + ATTR_HOT inline int count() const { return m_end - m_list; } + ATTR_HOT inline const entry_t & operator[](const int & index) const { return m_list[index]; } #if (NL_KEEP_STATISTICS) - // profiling - INT32 m_prof_start; - INT32 m_prof_end; - INT32 m_prof_sortmove; - INT32 m_prof_sort; + // profiling + INT32 m_prof_start; + INT32 m_prof_end; + INT32 m_prof_sortmove; + INT32 m_prof_sort; #endif private: - entry_t * m_end; - entry_t m_list[_Size]; + entry_t * m_end; + entry_t m_list[_Size]; }; @@ -246,58 +246,58 @@ class netlist_stack_t { public: - ATTR_COLD netlist_stack_t(int numElements = _NumElem) - : m_list(numElements) - { - } - - ATTR_COLD netlist_stack_t(const netlist_stack_t &rhs) - : m_list(rhs.m_list) - { - } - - ATTR_COLD netlist_stack_t &operator=(const netlist_stack_t &rhs) - { - m_list = rhs.m_list; - return *this; - } - - - ATTR_COLD ~netlist_stack_t() - { - } - - ATTR_HOT inline void push(const _StackClass &elem) - { - m_list.add(elem); - } - - ATTR_HOT inline _StackClass peek() const - { - return m_list[m_list.count() - 1]; - } - - ATTR_HOT inline _StackClass pop() - { - _StackClass ret = peek(); - m_list.remove_at(m_list.count() - 1); - return ret; - } - - ATTR_HOT inline int count() const { return m_list.count(); } - ATTR_HOT inline bool empty() const { return (m_list.count() == 0); } - ATTR_HOT inline void reset() { m_list.reset(); } - ATTR_HOT inline int capacity() const { return m_list.capacity(); } + ATTR_COLD netlist_stack_t(int numElements = _NumElem) + : m_list(numElements) + { + } + + ATTR_COLD netlist_stack_t(const netlist_stack_t &rhs) + : m_list(rhs.m_list) + { + } + + ATTR_COLD netlist_stack_t &operator=(const netlist_stack_t &rhs) + { + m_list = rhs.m_list; + return *this; + } + + + ATTR_COLD ~netlist_stack_t() + { + } + + ATTR_HOT inline void push(const _StackClass &elem) + { + m_list.add(elem); + } + + ATTR_HOT inline _StackClass peek() const + { + return m_list[m_list.count() - 1]; + } + + ATTR_HOT inline _StackClass pop() + { + _StackClass ret = peek(); + m_list.remove_at(m_list.count() - 1); + return ret; + } + + ATTR_HOT inline int count() const { return m_list.count(); } + ATTR_HOT inline bool empty() const { return (m_list.count() == 0); } + ATTR_HOT inline void reset() { m_list.reset(); } + ATTR_HOT inline int capacity() const { return m_list.capacity(); } private: - netlist_list_t<_StackClass, _NumElem> m_list; + netlist_list_t<_StackClass, _NumElem> m_list; }; template struct plinked_list_element { - plinked_list_element() : m_next(NULL) {} - _ListClass * m_next; + plinked_list_element() : m_next(NULL) {} + _ListClass * m_next; }; @@ -306,69 +306,69 @@ class plinked_list { public: - plinked_list() : m_head(NULL) {} - - ATTR_HOT inline void insert(const _ListClass &before, _ListClass &elem) - { - if (m_head == &before) - { - elem.m_next = m_head; - m_head = elem; - } - else - { - _ListClass *p = m_head; - while (p != NULL) - { - if (p->m_next == &before) - { - elem->m_next = &before; - p->m_next = &elem; - return; - } - p = p->m_next; - } - assert_always(false, "element not found"); - } - } - - ATTR_HOT inline void insert(_ListClass &elem) - { - elem.m_next = m_head; - m_head = &elem; - } - - ATTR_HOT inline void add(_ListClass &elem) - { - _ListClass **p = &m_head; - while (*p != NULL) - { - p = &((*p)->m_next); - } - *p = &elem; - elem.m_next = NULL; - } - - ATTR_HOT inline void remove(const _ListClass &elem) - { - _ListClass **p = &m_head; - while (*p != &elem) - { - assert(*p != NULL); - p = &((*p)->m_next); - } - (*p) = elem.m_next; - } - - - ATTR_HOT static inline _ListClass *next(const _ListClass &elem) { return elem.m_next; } - ATTR_HOT static inline _ListClass *next(const _ListClass *elem) { return elem->m_next; } - ATTR_HOT inline _ListClass *first() const { return m_head; } - ATTR_HOT inline void clear() { m_head = NULL; } - ATTR_HOT inline bool is_empty() const { return (m_head == NULL); } + plinked_list() : m_head(NULL) {} + + ATTR_HOT inline void insert(const _ListClass &before, _ListClass &elem) + { + if (m_head == &before) + { + elem.m_next = m_head; + m_head = elem; + } + else + { + _ListClass *p = m_head; + while (p != NULL) + { + if (p->m_next == &before) + { + elem->m_next = &before; + p->m_next = &elem; + return; + } + p = p->m_next; + } + assert_always(false, "element not found"); + } + } + + ATTR_HOT inline void insert(_ListClass &elem) + { + elem.m_next = m_head; + m_head = &elem; + } + + ATTR_HOT inline void add(_ListClass &elem) + { + _ListClass **p = &m_head; + while (*p != NULL) + { + p = &((*p)->m_next); + } + *p = &elem; + elem.m_next = NULL; + } + + ATTR_HOT inline void remove(const _ListClass &elem) + { + _ListClass **p = &m_head; + while (*p != &elem) + { + assert(*p != NULL); + p = &((*p)->m_next); + } + (*p) = elem.m_next; + } + + + ATTR_HOT static inline _ListClass *next(const _ListClass &elem) { return elem.m_next; } + ATTR_HOT static inline _ListClass *next(const _ListClass *elem) { return elem->m_next; } + ATTR_HOT inline _ListClass *first() const { return m_head; } + ATTR_HOT inline void clear() { m_head = NULL; } + ATTR_HOT inline bool is_empty() const { return (m_head == NULL); } private: - _ListClass *m_head; + _ListClass *m_head; }; #endif /* NLLISTS_H_ */ diff --git a/src/emu/netlist/nl_parser.c b/src/emu/netlist/nl_parser.c index e28d43901c2..06017975824 100644 --- a/src/emu/netlist/nl_parser.c +++ b/src/emu/netlist/nl_parser.c @@ -16,189 +16,189 @@ pstring ptokenizer::currentline_str() { - char buf[300]; - int bufp = 0; - const char *p = m_line_ptr; - while (*p && *p != 10) - buf[bufp++] = *p++; - buf[bufp] = 0; - return pstring(buf); + char buf[300]; + int bufp = 0; + const char *p = m_line_ptr; + while (*p && *p != 10) + buf[bufp++] = *p++; + buf[bufp] = 0; + return pstring(buf); } void ptokenizer::skipeol() { - char c = getc(); - while (c) - { - if (c == 10) - { - c = getc(); - if (c != 13) - ungetc(); - return; - } - c = getc(); - } + char c = getc(); + while (c) + { + if (c == 10) + { + c = getc(); + if (c != 13) + ungetc(); + return; + } + c = getc(); + } } unsigned char ptokenizer::getc() { - if (*m_px == 10) - { - m_line++; - m_line_ptr = m_px + 1; - } - if (*m_px) - return *(m_px++); - else - return *m_px; + if (*m_px == 10) + { + m_line++; + m_line_ptr = m_px + 1; + } + if (*m_px) + return *(m_px++); + else + return *m_px; } void ptokenizer::ungetc() { - m_px--; + m_px--; } void ptokenizer::require_token(const token_id_t &token_num) { - require_token(get_token(), token_num); + require_token(get_token(), token_num); } void ptokenizer::require_token(const token_t tok, const token_id_t &token_num) { - if (!tok.is(token_num)) - { - error("Error: expected token <%s> got <%s>\n", m_tokens[token_num.id()].cstr(), tok.str().cstr()); - } + if (!tok.is(token_num)) + { + error("Error: expected token <%s> got <%s>\n", m_tokens[token_num.id()].cstr(), tok.str().cstr()); + } } pstring ptokenizer::get_string() { - token_t tok = get_token(); - if (!tok.is_type(STRING)) - { - error("Error: expected a string, got <%s>\n", tok.str().cstr()); - } - return tok.str(); + token_t tok = get_token(); + if (!tok.is_type(STRING)) + { + error("Error: expected a string, got <%s>\n", tok.str().cstr()); + } + return tok.str(); } pstring ptokenizer::get_identifier() { - token_t tok = get_token(); - if (!tok.is_type(IDENTIFIER)) - { - error("Error: expected an identifier, got <%s>\n", tok.str().cstr()); - } - return tok.str(); + token_t tok = get_token(); + if (!tok.is_type(IDENTIFIER)) + { + error("Error: expected an identifier, got <%s>\n", tok.str().cstr()); + } + return tok.str(); } ptokenizer::token_t ptokenizer::get_token() { - while (true) - { - token_t ret = get_token_internal(); - if (ret.is_type(ENDOFFILE)) - return ret; - - if (ret.is(m_tok_comment_start)) - { - do { - ret = get_token_internal(); - } while (ret.is_not(m_tok_comment_end)); - } - else if (ret.is(m_tok_line_comment)) - { - skipeol(); - } - else if (ret.str() == "#") - { - skipeol(); - } - else - return ret; - } + while (true) + { + token_t ret = get_token_internal(); + if (ret.is_type(ENDOFFILE)) + return ret; + + if (ret.is(m_tok_comment_start)) + { + do { + ret = get_token_internal(); + } while (ret.is_not(m_tok_comment_end)); + } + else if (ret.is(m_tok_line_comment)) + { + skipeol(); + } + else if (ret.str() == "#") + { + skipeol(); + } + else + return ret; + } } ptokenizer::token_t ptokenizer::get_token_internal() { - /* skip ws */ - char c = getc(); - while (m_whitespace.find(c)>=0) - { - c = getc(); - if (eof()) - { - return token_t(ENDOFFILE); - } - } - if (m_identifier_chars.find(c)>=0) - { - /* read identifier till non identifier char */ - pstring tokstr = ""; - while (m_identifier_chars.find(c)>=0) { - tokstr += c; - c = getc(); - } - ungetc(); - token_id_t id = token_id_t(m_tokens.indexof(tokstr)); - if (id.id() >= 0) - return token_t(id, tokstr); - else - { - return token_t(IDENTIFIER, tokstr); - } - } - else if (c == m_string) - { - pstring tokstr = ""; - c = getc(); - while (c != m_string) - { - tokstr += c; - c = getc(); - } - return token_t(STRING, tokstr); - } - else - { - /* read identifier till first identifier char or ws */ - pstring tokstr = ""; - while ((m_identifier_chars.find(c)) < 0 && (m_whitespace.find(c) < 0)) { - tokstr += c; - /* expensive, check for single char tokens */ - if (tokstr.len() == 1) - { - token_id_t id = token_id_t(m_tokens.indexof(tokstr)); - if (id.id() >= 0) - return token_t(id, tokstr); - } - c = getc(); - } - ungetc(); - token_id_t id = token_id_t(m_tokens.indexof(tokstr)); - if (id.id() >= 0) - return token_t(id, tokstr); - else - { - return token_t(UNKNOWN, tokstr); - } - } + /* skip ws */ + char c = getc(); + while (m_whitespace.find(c)>=0) + { + c = getc(); + if (eof()) + { + return token_t(ENDOFFILE); + } + } + if (m_identifier_chars.find(c)>=0) + { + /* read identifier till non identifier char */ + pstring tokstr = ""; + while (m_identifier_chars.find(c)>=0) { + tokstr += c; + c = getc(); + } + ungetc(); + token_id_t id = token_id_t(m_tokens.indexof(tokstr)); + if (id.id() >= 0) + return token_t(id, tokstr); + else + { + return token_t(IDENTIFIER, tokstr); + } + } + else if (c == m_string) + { + pstring tokstr = ""; + c = getc(); + while (c != m_string) + { + tokstr += c; + c = getc(); + } + return token_t(STRING, tokstr); + } + else + { + /* read identifier till first identifier char or ws */ + pstring tokstr = ""; + while ((m_identifier_chars.find(c)) < 0 && (m_whitespace.find(c) < 0)) { + tokstr += c; + /* expensive, check for single char tokens */ + if (tokstr.len() == 1) + { + token_id_t id = token_id_t(m_tokens.indexof(tokstr)); + if (id.id() >= 0) + return token_t(id, tokstr); + } + c = getc(); + } + ungetc(); + token_id_t id = token_id_t(m_tokens.indexof(tokstr)); + if (id.id() >= 0) + return token_t(id, tokstr); + else + { + return token_t(UNKNOWN, tokstr); + } + } } ATTR_COLD void ptokenizer::error(const char *format, ...) { - va_list ap; - va_start(ap, format); + va_list ap; + va_start(ap, format); - pstring errmsg1 =pstring(format).vprintf(ap); - va_end(ap); + pstring errmsg1 =pstring(format).vprintf(ap); + va_end(ap); - verror(errmsg1, currentline_no(), currentline_str()); + verror(errmsg1, currentline_no(), currentline_str()); - //throw error; + //throw error; } // ---------------------------------------------------------------------------------------- @@ -207,160 +207,159 @@ ATTR_COLD void ptokenizer::error(const char *format, ...) ATTR_COLD void netlist_parser::verror(pstring msg, int line_num, pstring line) { - m_setup.netlist().error("line %d: error: %s\n\t\t%s\n", line_num, - msg.cstr(), line.cstr()); + m_setup.netlist().error("line %d: error: %s\n\t\t%s\n", line_num, + msg.cstr(), line.cstr()); - //throw error; + //throw error; } bool netlist_parser::parse(const char *buf, const pstring nlname) { - m_buf = buf; - - reset(buf); - set_identifier_chars("abcdefghijklmnopqrstuvwvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-"); - set_number_chars("01234567890eE-."); //FIXME: processing of numbers - char ws[5]; - ws[0] = ' '; - ws[1] = 9; - ws[2] = 10; - ws[3] = 13; - ws[4] = 0; - set_whitespace(ws); - set_comment("/*", "*/", "//"); - m_tok_param_left = register_token("("); - m_tok_param_right = register_token(")"); - m_tok_comma = register_token(","); - - m_tok_ALIAS = register_token("ALIAS"); - m_tok_NET_C = register_token("NET_C"); - m_tok_PARAM = register_token("PARAM"); - m_tok_NET_MODEL = register_token("NET_MODEL"); - m_tok_INCLUDE = register_token("INCLUDE"); - m_tok_SUBMODEL = register_token("SUBMODEL"); - m_tok_NETLIST_START = register_token("NETLIST_START"); - m_tok_NETLIST_END = register_token("NETLIST_END"); - - bool in_nl = false; - - while (true) + m_buf = buf; + + reset(buf); + set_identifier_chars("abcdefghijklmnopqrstuvwvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-"); + set_number_chars("01234567890eE-."); //FIXME: processing of numbers + char ws[5]; + ws[0] = ' '; + ws[1] = 9; + ws[2] = 10; + ws[3] = 13; + ws[4] = 0; + set_whitespace(ws); + set_comment("/*", "*/", "//"); + m_tok_param_left = register_token("("); + m_tok_param_right = register_token(")"); + m_tok_comma = register_token(","); + + m_tok_ALIAS = register_token("ALIAS"); + m_tok_NET_C = register_token("NET_C"); + m_tok_PARAM = register_token("PARAM"); + m_tok_NET_MODEL = register_token("NET_MODEL"); + m_tok_INCLUDE = register_token("INCLUDE"); + m_tok_SUBMODEL = register_token("SUBMODEL"); + m_tok_NETLIST_START = register_token("NETLIST_START"); + m_tok_NETLIST_END = register_token("NETLIST_END"); + + bool in_nl = false; + + while (true) { - token_t token = get_token(); - - if (token.is_type(ENDOFFILE)) - { - return false; - //error("EOF while searching for <%s>", nlname.cstr()); - } - - if (token.is(m_tok_NETLIST_END)) - { - require_token(m_tok_param_left); - if (!in_nl) - error("Unexpected NETLIST_END"); - else - { - in_nl = false; - } - require_token(m_tok_param_right); - } - else if (token.is(m_tok_NETLIST_START)) - { - if (in_nl) - error("Unexpected NETLIST_START"); - require_token(m_tok_param_left); - token_t name = get_token(); - require_token(m_tok_param_right); - if (name.str() == nlname || nlname == "") - { - parse_netlist(name.str()); - return true; - } else - in_nl = true; - } + token_t token = get_token(); + + if (token.is_type(ENDOFFILE)) + { + return false; + //error("EOF while searching for <%s>", nlname.cstr()); + } + + if (token.is(m_tok_NETLIST_END)) + { + require_token(m_tok_param_left); + if (!in_nl) + error("Unexpected NETLIST_END"); + else + { + in_nl = false; + } + require_token(m_tok_param_right); + } + else if (token.is(m_tok_NETLIST_START)) + { + if (in_nl) + error("Unexpected NETLIST_START"); + require_token(m_tok_param_left); + token_t name = get_token(); + require_token(m_tok_param_right); + if (name.str() == nlname || nlname == "") + { + parse_netlist(name.str()); + return true; + } else + in_nl = true; + } } } void netlist_parser::parse_netlist(const pstring &nlname) { - - while (true) - { - token_t token = get_token(); - - if (token.is_type(ENDOFFILE)) - return; - - require_token(m_tok_param_left); - NL_VERBOSE_OUT(("Parser: Device: %s\n", token.str().cstr())); - - if (token.is(m_tok_ALIAS)) - net_alias(); - else if (token.is(m_tok_NET_C)) - net_c(); - else if (token.is(m_tok_PARAM)) - netdev_param(); - else if (token.is(m_tok_NET_MODEL)) - net_model(); - else if (token.is(m_tok_SUBMODEL)) - net_submodel(); - else if (token.is(m_tok_INCLUDE)) - net_include(); - else if (token.is(m_tok_NETLIST_END)) - { - netdev_netlist_end(); - return; - } - else - device(token.str()); - } + while (true) + { + token_t token = get_token(); + + if (token.is_type(ENDOFFILE)) + return; + + require_token(m_tok_param_left); + NL_VERBOSE_OUT(("Parser: Device: %s\n", token.str().cstr())); + + if (token.is(m_tok_ALIAS)) + net_alias(); + else if (token.is(m_tok_NET_C)) + net_c(); + else if (token.is(m_tok_PARAM)) + netdev_param(); + else if (token.is(m_tok_NET_MODEL)) + net_model(); + else if (token.is(m_tok_SUBMODEL)) + net_submodel(); + else if (token.is(m_tok_INCLUDE)) + net_include(); + else if (token.is(m_tok_NETLIST_END)) + { + netdev_netlist_end(); + return; + } + else + device(token.str()); + } } void netlist_parser::netdev_netlist_start() { - // don't do much - token_t name = get_token(); - require_token(m_tok_param_right); + // don't do much + token_t name = get_token(); + require_token(m_tok_param_right); } void netlist_parser::netdev_netlist_end() { - // don't do much - require_token(m_tok_param_right); + // don't do much + require_token(m_tok_param_right); } void netlist_parser::net_model() { - // don't do much - pstring model = get_string(); - m_setup.register_model(model); - require_token(m_tok_param_right); + // don't do much + pstring model = get_string(); + m_setup.register_model(model); + require_token(m_tok_param_right); } void netlist_parser::net_submodel() { - // don't do much - pstring name = get_identifier(); - require_token(m_tok_comma); - pstring model = get_identifier(); - require_token(m_tok_param_right); - - m_setup.namespace_push(name); - netlist_parser subparser(m_setup); - subparser.parse(m_buf, model); - m_setup.namespace_pop(); + // don't do much + pstring name = get_identifier(); + require_token(m_tok_comma); + pstring model = get_identifier(); + require_token(m_tok_param_right); + + m_setup.namespace_push(name); + netlist_parser subparser(m_setup); + subparser.parse(m_buf, model); + m_setup.namespace_pop(); } void netlist_parser::net_include() { - // don't do much - pstring name = get_identifier(); - require_token(m_tok_param_right); + // don't do much + pstring name = get_identifier(); + require_token(m_tok_param_right); - netlist_parser subparser(m_setup); - subparser.parse(m_buf, name); + netlist_parser subparser(m_setup); + subparser.parse(m_buf, name); } void netlist_parser::net_alias() @@ -380,18 +379,18 @@ void netlist_parser::net_alias() void netlist_parser::net_c() { pstring last = get_identifier(); - require_token(m_tok_comma); + require_token(m_tok_comma); while (true) { - pstring t1 = get_identifier(); - m_setup.register_link(last , t1); - token_t n = get_token(); - if (n.is(m_tok_param_right)) - break; - if (!n.is(m_tok_comma)) - error("expected a comma, found <%s>", n.str().cstr()); - last = t1; + pstring t1 = get_identifier(); + m_setup.register_link(last , t1); + token_t n = get_token(); + if (n.is(m_tok_param_right)) + break; + if (!n.is(m_tok_comma)) + error("expected a comma, found <%s>", n.str().cstr()); + last = t1; } NL_VERBOSE_OUT(("Parser: Connect: %s %s\n", t1.cstr(), t2.cstr())); @@ -406,7 +405,7 @@ void netlist_parser::netdev_param() val = eval_param(get_token()); NL_VERBOSE_OUT(("Parser: Param: %s %f\n", param.cstr(), val)); m_setup.register_param(param, val); - require_token(m_tok_param_right); + require_token(m_tok_param_right); } void netlist_parser::device(const pstring &dev_type) @@ -427,25 +426,25 @@ void netlist_parser::device(const pstring &dev_type) NL_VERBOSE_OUT(("Parser: IC: %s\n", devname.cstr())); - cnt = 0; - while (cnt < def_params.count()) - { - pstring paramfq = devname + "." + def_params[cnt]; - - NL_VERBOSE_OUT(("Defparam: %s\n", paramfq.cstr())); - require_token(m_tok_comma); - tok = get_token(); - if (tok.is_type(STRING)) - { - m_setup.register_param(paramfq, tok.str()); - } - else - { - double val = eval_param(tok); - m_setup.register_param(paramfq, val); - } - cnt++; - } + cnt = 0; + while (cnt < def_params.count()) + { + pstring paramfq = devname + "." + def_params[cnt]; + + NL_VERBOSE_OUT(("Defparam: %s\n", paramfq.cstr())); + require_token(m_tok_comma); + tok = get_token(); + if (tok.is_type(STRING)) + { + m_setup.register_param(paramfq, tok.str()); + } + else + { + double val = eval_param(tok); + m_setup.register_param(paramfq, val); + } + cnt++; + } tok = get_token(); cnt = 0; @@ -456,11 +455,11 @@ void netlist_parser::device(const pstring &dev_type) m_setup.register_link(devname + "." + termlist[cnt], output_name); cnt++; - tok = get_token(); + tok = get_token(); } - if (cnt != termlist.count()) - fatalerror("netlist: input count mismatch for %s - expected %d found %d\n", devname.cstr(), termlist.count(), cnt); - require_token(tok, m_tok_param_right); + if (cnt != termlist.count()) + fatalerror("netlist: input count mismatch for %s - expected %d found %d\n", devname.cstr(), termlist.count(), cnt); + require_token(tok, m_tok_param_right); } @@ -483,20 +482,19 @@ double netlist_parser::eval_param(const token_t tok) for (i=1; i<6;i++) if (tok.str().equals(macs[i])) f = i; - if (f>0) - { - require_token(m_tok_param_left); - val = get_identifier(); - } - else - val = tok.str(); + if (f>0) + { + require_token(m_tok_param_left); + val = get_identifier(); + } + else + val = tok.str(); - ret = val.as_double(&e); + ret = val.as_double(&e); - if (e) + if (e) error("Error with parameter ...\n"); if (f>0) - require_token(m_tok_param_right); + require_token(m_tok_param_right); return ret * facs[f]; } - diff --git a/src/emu/netlist/nl_parser.h b/src/emu/netlist/nl_parser.h index 1f0905bfbdf..c9e0608d4ba 100644 --- a/src/emu/netlist/nl_parser.h +++ b/src/emu/netlist/nl_parser.h @@ -12,129 +12,129 @@ class ptokenizer { - NETLIST_PREVENT_COPYING(ptokenizer) + NETLIST_PREVENT_COPYING(ptokenizer) public: - virtual ~ptokenizer() {} - - ptokenizer() - : m_line(1), m_line_ptr(NULL), m_px(NULL) - {} - - enum token_type - { - IDENTIFIER, - NUMBER, - TOKEN, - STRING, - COMMENT, - UNKNOWN, - ENDOFFILE, - }; - - struct token_id_t - { - public: - token_id_t() : m_id(-2) {} - token_id_t(const int id) : m_id(id) {} - const int id() const { return m_id; } - private: - int m_id; - }; - - struct token_t - { - token_t() {}; - token_t(token_type type) - { - m_type = type; - m_id = token_id_t(-1); - m_token =""; - } - token_t(token_type type, const pstring str) - { - m_type = type; - m_id = token_id_t(-1); - m_token = str; - } - token_t(const token_id_t id, const pstring str) - { - m_type = TOKEN; - m_id = id; - m_token = str; - } - - bool is(const token_id_t &tok_id) const { return m_id.id() == tok_id.id(); } - bool is_not(const token_id_t &tok_id) const { return !is(tok_id); } - - bool is_type(const token_type type) const { return m_type == type; } - - pstring str() const { return m_token; } - - private: - token_type m_type; - token_id_t m_id; - pstring m_token; - }; - - - int currentline_no() { return m_line; } - pstring currentline_str(); - - /* tokenizer stuff follows ... */ - - token_t get_token(); - pstring get_string(); - pstring get_identifier(); - - void require_token(const token_id_t &token_num); - void require_token(const token_t tok, const token_id_t &token_num); - - token_id_t register_token(pstring token) - { - m_tokens.add(token); - return token_id_t(m_tokens.count() - 1); - } - - void set_identifier_chars(pstring s) { m_identifier_chars = s; } - void set_number_chars(pstring s) { m_number_chars = s; } - void set_whitespace(pstring s) { m_whitespace = s; } - void set_comment(pstring start, pstring end, pstring line) - { - m_tok_comment_start = register_token(start); - m_tok_comment_end = register_token(end); - m_tok_line_comment = register_token(line); - m_string = '"'; - } - - token_t get_token_internal(); - void error(const char *format, ...) ATTR_PRINTF(2,3); + virtual ~ptokenizer() {} + + ptokenizer() + : m_line(1), m_line_ptr(NULL), m_px(NULL) + {} + + enum token_type + { + IDENTIFIER, + NUMBER, + TOKEN, + STRING, + COMMENT, + UNKNOWN, + ENDOFFILE, + }; + + struct token_id_t + { + public: + token_id_t() : m_id(-2) {} + token_id_t(const int id) : m_id(id) {} + const int id() const { return m_id; } + private: + int m_id; + }; + + struct token_t + { + token_t() {}; + token_t(token_type type) + { + m_type = type; + m_id = token_id_t(-1); + m_token =""; + } + token_t(token_type type, const pstring str) + { + m_type = type; + m_id = token_id_t(-1); + m_token = str; + } + token_t(const token_id_t id, const pstring str) + { + m_type = TOKEN; + m_id = id; + m_token = str; + } + + bool is(const token_id_t &tok_id) const { return m_id.id() == tok_id.id(); } + bool is_not(const token_id_t &tok_id) const { return !is(tok_id); } + + bool is_type(const token_type type) const { return m_type == type; } + + pstring str() const { return m_token; } + + private: + token_type m_type; + token_id_t m_id; + pstring m_token; + }; + + + int currentline_no() { return m_line; } + pstring currentline_str(); + + /* tokenizer stuff follows ... */ + + token_t get_token(); + pstring get_string(); + pstring get_identifier(); + + void require_token(const token_id_t &token_num); + void require_token(const token_t tok, const token_id_t &token_num); + + token_id_t register_token(pstring token) + { + m_tokens.add(token); + return token_id_t(m_tokens.count() - 1); + } + + void set_identifier_chars(pstring s) { m_identifier_chars = s; } + void set_number_chars(pstring s) { m_number_chars = s; } + void set_whitespace(pstring s) { m_whitespace = s; } + void set_comment(pstring start, pstring end, pstring line) + { + m_tok_comment_start = register_token(start); + m_tok_comment_end = register_token(end); + m_tok_line_comment = register_token(line); + m_string = '"'; + } + + token_t get_token_internal(); + void error(const char *format, ...) ATTR_PRINTF(2,3); protected: - void reset(const char *p) { m_px = p; m_line = 1; m_line_ptr = p; } - virtual void verror(pstring msg, int line_num, pstring line) = 0; + void reset(const char *p) { m_px = p; m_line = 1; m_line_ptr = p; } + virtual void verror(pstring msg, int line_num, pstring line) = 0; private: - void skipeol(); + void skipeol(); - unsigned char getc(); - void ungetc(); - bool eof() { return *m_px == 0; } + unsigned char getc(); + void ungetc(); + bool eof() { return *m_px == 0; } - int m_line; - const char * m_line_ptr; - const char * m_px; + int m_line; + const char * m_line_ptr; + const char * m_px; - /* tokenizer stuff follows ... */ + /* tokenizer stuff follows ... */ - pstring m_identifier_chars; - pstring m_number_chars; - netlist_list_t m_tokens; - pstring m_whitespace; - char m_string; + pstring m_identifier_chars; + pstring m_number_chars; + netlist_list_t m_tokens; + pstring m_whitespace; + char m_string; - token_id_t m_tok_comment_start; - token_id_t m_tok_comment_end; - token_id_t m_tok_line_comment; + token_id_t m_tok_comment_start; + token_id_t m_tok_comment_end; + token_id_t m_tok_line_comment; }; class netlist_parser : public ptokenizer @@ -146,131 +146,131 @@ public: bool parse(const char *buf, const pstring nlname = ""); - void parse_netlist(const pstring &nlname); + void parse_netlist(const pstring &nlname); void net_alias(); void netdev_param(); void net_c(); void device(const pstring &dev_type); - void netdev_netlist_start(); - void netdev_netlist_end(); - void net_model(); - void net_submodel(); - void net_include(); + void netdev_netlist_start(); + void netdev_netlist_end(); + void net_model(); + void net_submodel(); + void net_include(); protected: - virtual void verror(pstring msg, int line_num, pstring line); + virtual void verror(pstring msg, int line_num, pstring line); private: - double eval_param(const token_t tok); + double eval_param(const token_t tok); - token_id_t m_tok_param_left; - token_id_t m_tok_param_right; - token_id_t m_tok_comma; - token_id_t m_tok_ALIAS; - token_id_t m_tok_NET_C; - token_id_t m_tok_PARAM; - token_id_t m_tok_NET_MODEL; - token_id_t m_tok_NETLIST_START; - token_id_t m_tok_NETLIST_END; - token_id_t m_tok_SUBMODEL; - token_id_t m_tok_INCLUDE; + token_id_t m_tok_param_left; + token_id_t m_tok_param_right; + token_id_t m_tok_comma; + token_id_t m_tok_ALIAS; + token_id_t m_tok_NET_C; + token_id_t m_tok_PARAM; + token_id_t m_tok_NET_MODEL; + token_id_t m_tok_NETLIST_START; + token_id_t m_tok_NETLIST_END; + token_id_t m_tok_SUBMODEL; + token_id_t m_tok_INCLUDE; - netlist_setup_t &m_setup; + netlist_setup_t &m_setup; - const char *m_buf; + const char *m_buf; }; class netlist_source_t { public: - typedef netlist_list_t list_t; - - enum source_e - { - EMPTY, - STRING, - PROC, - MEMORY - }; - - netlist_source_t() - : m_type(EMPTY), - m_setup_func(NULL), - m_setup_func_name(""), - m_mem(NULL) - { - } - - netlist_source_t(pstring name, void (*setup_func)(netlist_setup_t &)) - : m_type(PROC), - m_setup_func(setup_func), - m_setup_func_name(name), - m_mem(NULL) - { - } - - netlist_source_t(const char *mem) - : m_type(MEMORY), - m_setup_func(NULL), - m_setup_func_name(""), - m_mem(mem) - { - } - - ~netlist_source_t() { } - - bool parse(netlist_setup_t &setup, const pstring name) - { - switch (m_type) - { - case PROC: - if (name == m_setup_func_name) - { - m_setup_func(setup); - return true; - } - break; - case MEMORY: - { - netlist_parser p(setup); - return p.parse(m_mem, name); - } - break; - case STRING: - case EMPTY: - break; - } - return false; - } + typedef netlist_list_t list_t; + + enum source_e + { + EMPTY, + STRING, + PROC, + MEMORY + }; + + netlist_source_t() + : m_type(EMPTY), + m_setup_func(NULL), + m_setup_func_name(""), + m_mem(NULL) + { + } + + netlist_source_t(pstring name, void (*setup_func)(netlist_setup_t &)) + : m_type(PROC), + m_setup_func(setup_func), + m_setup_func_name(name), + m_mem(NULL) + { + } + + netlist_source_t(const char *mem) + : m_type(MEMORY), + m_setup_func(NULL), + m_setup_func_name(""), + m_mem(mem) + { + } + + ~netlist_source_t() { } + + bool parse(netlist_setup_t &setup, const pstring name) + { + switch (m_type) + { + case PROC: + if (name == m_setup_func_name) + { + m_setup_func(setup); + return true; + } + break; + case MEMORY: + { + netlist_parser p(setup); + return p.parse(m_mem, name); + } + break; + case STRING: + case EMPTY: + break; + } + return false; + } private: - source_e m_type; + source_e m_type; - void (*m_setup_func)(netlist_setup_t &); - pstring m_setup_func_name; - const char *m_mem; + void (*m_setup_func)(netlist_setup_t &); + pstring m_setup_func_name; + const char *m_mem; }; class netlist_sources_t { public: - void add(netlist_source_t src) - { - m_list.add(src); - } - - void parse(netlist_setup_t &setup, const pstring name) - { - for (int i=0; i < m_list.count(); i++) - { - if (m_list[i].parse(setup, name)) - return; - } - setup.netlist().error("unable to find %s in source collection", name.cstr()); - } + void add(netlist_source_t src) + { + m_list.add(src); + } + + void parse(netlist_setup_t &setup, const pstring name) + { + for (int i=0; i < m_list.count(); i++) + { + if (m_list[i].parse(setup, name)) + return; + } + setup.netlist().error("unable to find %s in source collection", name.cstr()); + } private: - netlist_source_t::list_t m_list; + netlist_source_t::list_t m_list; }; #endif /* NL_PARSER_H_ */ diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c index b8d93b2f865..0644a73b38d 100644 --- a/src/emu/netlist/nl_setup.c +++ b/src/emu/netlist/nl_setup.c @@ -19,8 +19,8 @@ static NETLIST_START(base) TTL_INPUT(ttllow, 0) NET_REGISTER_DEV(gnd, GND) - INCLUDE(diode_models); - INCLUDE(bjt_models); + INCLUDE(diode_models); + INCLUDE(bjt_models); NETLIST_END() @@ -58,31 +58,31 @@ netlist_setup_t::~netlist_setup_t() ATTR_COLD pstring netlist_setup_t::build_fqn(const pstring &obj_name) const { - if (m_stack.empty()) - return netlist().name() + "." + obj_name; - else - return m_stack.peek() + "." + obj_name; + if (m_stack.empty()) + return netlist().name() + "." + obj_name; + else + return m_stack.peek() + "." + obj_name; } void netlist_setup_t::namespace_push(const pstring &aname) { - if (m_stack.empty()) - m_stack.push(netlist().name() + "." + aname); - else - m_stack.push(m_stack.peek() + "." + aname); + if (m_stack.empty()) + m_stack.push(netlist().name() + "." + aname); + else + m_stack.push(m_stack.peek() + "." + aname); } void netlist_setup_t::namespace_pop() { - m_stack.pop(); + m_stack.pop(); } netlist_device_t *netlist_setup_t::register_dev(netlist_device_t *dev, const pstring &name) { - pstring fqn = build_fqn(name); + pstring fqn = build_fqn(name); - dev->init(netlist(), fqn); + dev->init(netlist(), fqn); if (!(netlist().m_devices.add(fqn, dev, false)==TMERR_NONE)) netlist().error("Error adding %s to device list\n", name.cstr()); @@ -120,7 +120,7 @@ void netlist_setup_t::remove_dev(const pstring &name) const link_t *p = m_links.first(); while (p != NULL) { - const link_t *n = m_links.next(p); + const link_t *n = m_links.next(p); if (temp.equals(p->e1.substr(0,temp.len())) || temp.equals(p->e2.substr(0,temp.len()))) m_links.remove(*p); p = n; @@ -135,15 +135,15 @@ void netlist_setup_t::register_model(const pstring &model) void netlist_setup_t::register_alias_nofqn(const pstring &alias, const pstring &out) { - if (!(m_alias.add(alias, out, false)==TMERR_NONE)) - netlist().error("Error adding alias %s to alias list\n", alias.cstr()); + if (!(m_alias.add(alias, out, false)==TMERR_NONE)) + netlist().error("Error adding alias %s to alias list\n", alias.cstr()); } void netlist_setup_t::register_alias(const pstring &alias, const pstring &out) { - pstring alias_fqn = build_fqn(alias); - pstring out_fqn = build_fqn(out); - register_alias_nofqn(alias_fqn, out_fqn); + pstring alias_fqn = build_fqn(alias); + pstring out_fqn = build_fqn(out); + register_alias_nofqn(alias_fqn, out_fqn); } pstring netlist_setup_t::objtype_as_astr(netlist_object_t &in) const @@ -241,7 +241,7 @@ void netlist_setup_t::register_object(netlist_device_t &dev, const pstring &name //int pl=m_models[i].find("("); //int pr=m_models[i].find(")"); //dynamic_cast(param).initial(m_models[i].substr(pl+1,pr-pl-1)); - dynamic_cast(param).initial(m_models[i]); + dynamic_cast(param).initial(m_models[i]); found = true; break; } @@ -269,15 +269,15 @@ void netlist_setup_t::register_object(netlist_device_t &dev, const pstring &name void netlist_setup_t::register_link_arr(const pstring &terms) { - nl_util::pstring_list list = nl_util::split(terms,", "); - if (list.count() < 2) - netlist().error("You must pass at least 2 terminals to NET_C"); - pstring last = list[0]; - for (int i = 1; i < list.count(); i++) - { - register_link(last, list[i]); - last = list[i]; - } + nl_util::pstring_list list = nl_util::split(terms,", "); + if (list.count() < 2) + netlist().error("You must pass at least 2 terminals to NET_C"); + pstring last = list[0]; + for (int i = 1; i < list.count(); i++) + { + register_link(last, list[i]); + last = list[i]; + } } @@ -298,7 +298,7 @@ void netlist_setup_t::register_param(const pstring ¶m, const double value) void netlist_setup_t::register_param(const pstring ¶m, const pstring &value) { - pstring fqn = build_fqn(param); + pstring fqn = build_fqn(param); if (!(m_params_temp.add(fqn, value, false)==TMERR_NONE)) netlist().error("Error adding parameter %s to parameter list\n", param.cstr()); @@ -368,7 +368,7 @@ netlist_core_terminal_t *netlist_setup_t::find_terminal(const pstring &terminal_ netlist_param_t *netlist_setup_t::find_param(const pstring ¶m_in, bool required) { - const pstring param_in_fqn = build_fqn(param_in); + const pstring param_in_fqn = build_fqn(param_in); const pstring &outname = resolve_alias(param_in_fqn); netlist_param_t *ret; @@ -383,41 +383,41 @@ netlist_param_t *netlist_setup_t::find_param(const pstring ¶m_in, bool requi nld_base_d_to_a_proxy *netlist_setup_t::get_d_a_proxy(netlist_output_t &out) { - assert(out.isFamily(netlist_terminal_t::LOGIC)); + assert(out.isFamily(netlist_terminal_t::LOGIC)); - //printf("proxy for %s\n", out.name().cstr());; - netlist_logic_output_t &out_cast = dynamic_cast(out); - nld_base_d_to_a_proxy *proxy = out_cast.get_proxy(); + //printf("proxy for %s\n", out.name().cstr());; + netlist_logic_output_t &out_cast = dynamic_cast(out); + nld_base_d_to_a_proxy *proxy = out_cast.get_proxy(); - if (proxy == NULL) - { - // create a new one ... - proxy = new nld_d_to_a_proxy(out); - pstring x = pstring::sprintf("proxy_da_%d", m_proxy_cnt); - m_proxy_cnt++; + if (proxy == NULL) + { + // create a new one ... + proxy = new nld_d_to_a_proxy(out); + pstring x = pstring::sprintf("proxy_da_%d", m_proxy_cnt); + m_proxy_cnt++; - register_dev(proxy, x); - proxy->start_dev(); + register_dev(proxy, x); + proxy->start_dev(); #if 1 - /* connect all existing terminals to new net */ - - netlist_core_terminal_t *p = out.net().m_list.first(); - while (p != NULL) - { - netlist_core_terminal_t *np = out.net().m_list.next(p); - p->clear_net(); // de-link from all nets ... - connect(proxy->out(), *p); - p = np; - } - out.net().m_list.clear(); // clear the list - out.net().m_num_cons = 0; + /* connect all existing terminals to new net */ + + netlist_core_terminal_t *p = out.net().m_list.first(); + while (p != NULL) + { + netlist_core_terminal_t *np = out.net().m_list.next(p); + p->clear_net(); // de-link from all nets ... + connect(proxy->out(), *p); + p = np; + } + out.net().m_list.clear(); // clear the list + out.net().m_num_cons = 0; #endif - out.net().register_con(proxy->m_I); - out_cast.set_proxy(proxy); + out.net().register_con(proxy->m_I); + out_cast.set_proxy(proxy); - } - return proxy; + } + return proxy; } void netlist_setup_t::connect_input_output(netlist_input_t &in, netlist_output_t &out) @@ -429,7 +429,7 @@ void netlist_setup_t::connect_input_output(netlist_input_t &in, netlist_output_t m_proxy_cnt++; register_dev(proxy, x); - proxy->start_dev(); + proxy->start_dev(); proxy->m_Q.net().register_con(in); out.net().register_con(proxy->m_I); @@ -437,10 +437,10 @@ void netlist_setup_t::connect_input_output(netlist_input_t &in, netlist_output_t } else if (out.isFamily(netlist_terminal_t::LOGIC) && in.isFamily(netlist_terminal_t::ANALOG)) { - nld_base_d_to_a_proxy *proxy = get_d_a_proxy(out); + nld_base_d_to_a_proxy *proxy = get_d_a_proxy(out); - connect_terminals(proxy->out(), in); - //proxy->out().net().register_con(in); + connect_terminals(proxy->out(), in); + //proxy->out().net().register_con(in); } else { @@ -462,7 +462,7 @@ void netlist_setup_t::connect_terminal_input(netlist_terminal_t &term, netlist_i m_proxy_cnt++; register_dev(proxy, x); - proxy->start_dev(); + proxy->start_dev(); connect_terminals(term, proxy->m_I); @@ -536,13 +536,13 @@ void netlist_setup_t::connect_terminals(netlist_core_terminal_t &t1, netlist_cor static netlist_core_terminal_t &resolve_proxy(netlist_core_terminal_t &term) { - if (term.isType(netlist_core_terminal_t::OUTPUT) && term.isFamily(netlist_core_terminal_t::LOGIC)) - { - netlist_logic_output_t &out = dynamic_cast(term); - if (out.has_proxy()) - return out.get_proxy()->out(); - } - return term; + if (term.isType(netlist_core_terminal_t::OUTPUT) && term.isFamily(netlist_core_terminal_t::LOGIC)) + { + netlist_logic_output_t &out = dynamic_cast(term); + if (out.has_proxy()) + return out.get_proxy()->out(); + } + return term; } void netlist_setup_t::connect(netlist_core_terminal_t &t1_in, netlist_core_terminal_t &t2_in) @@ -560,7 +560,7 @@ void netlist_setup_t::connect(netlist_core_terminal_t &t1_in, netlist_core_termi else if (t1.isType(netlist_core_terminal_t::INPUT) && t2.isType(netlist_core_terminal_t::OUTPUT)) { if (t1.has_net() && t1.net().isRailNet()) - netlist().error("Input %s already connected\n", t1.name().cstr()); + netlist().error("Input %s already connected\n", t1.name().cstr()); connect_input_output(dynamic_cast(t1), dynamic_cast(t2)); } else if (t1.isType(netlist_core_terminal_t::OUTPUT) && t2.isType(netlist_core_terminal_t::TERMINAL)) @@ -589,9 +589,9 @@ void netlist_setup_t::connect(netlist_core_terminal_t &t1_in, netlist_core_termi void netlist_setup_t::resolve_inputs() { - bool has_twoterms = false; + bool has_twoterms = false; - netlist().log("Resolving inputs ..."); + netlist().log("Resolving inputs ..."); for (const link_t *entry = m_links.first(); entry != NULL; entry = m_links.next(entry)) { @@ -612,68 +612,68 @@ void netlist_setup_t::resolve_inputs() //VERBOSE_OUT(("%s %d\n", out->netdev()->name(), *out->Q_ptr())); } - netlist().log("deleting empty nets ..."); + netlist().log("deleting empty nets ..."); // delete empty nets ... and save m_list ... - netlist_net_t::list_t todelete; + netlist_net_t::list_t todelete; for (netlist_net_t *const *pn = netlist().m_nets.first(); pn != NULL; pn = netlist().m_nets.next(pn)) { if ((*pn)->m_list.is_empty()) { - todelete.add(*pn); + todelete.add(*pn); } else { - for (netlist_core_terminal_t *p = (*pn)->m_list.first(); p != NULL; p = (*pn)->m_list.next(p)) - (*pn)->m_registered.add(p); + for (netlist_core_terminal_t *p = (*pn)->m_list.first(); p != NULL; p = (*pn)->m_list.next(p)) + (*pn)->m_registered.add(p); + } + } + + for (int i=0; i < todelete.count(); i++) + { + netlist().log("Deleting net %s ...", todelete[i]->name().cstr()); + netlist().m_nets.remove(todelete[i]); + if (!todelete[i]->isRailNet()) + delete todelete[i]; + } + + pstring errstr(""); + + netlist().log("looking for terminals not connected ..."); + for (tagmap_terminal_t::entry_t *entry = m_terminals.first(); entry != NULL; entry = m_terminals.next(entry)) + { + if (!entry->object()->has_net()) + errstr += pstring::sprintf("Found terminal %s without a net\n", + entry->object()->name().cstr()); + else if (entry->object()->net().num_cons() == 0) + netlist().warning("Found terminal %s without connections", + entry->object()->name().cstr()); + } + if (errstr != "") + netlist().error("%s", errstr.cstr()); + + + netlist().log("looking for two terms connected to rail nets ...\n"); + for (tagmap_devices_t::entry_t *entry = netlist().m_devices.first(); entry != NULL; entry = netlist().m_devices.next(entry)) + { + NETLIB_NAME(twoterm) *t = dynamic_cast(entry->object()); + if (t != NULL) + { + has_twoterms = true; + if (t->m_N.net().isRailNet() && t->m_P.net().isRailNet()) + netlist().error("Found device %s connected only to railterminals %s/%s\n", + t->name().cstr(), t->m_N.net().name().cstr(), t->m_P.net().name().cstr()); } } - for (int i=0; i < todelete.count(); i++) - { - netlist().log("Deleting net %s ...", todelete[i]->name().cstr()); - netlist().m_nets.remove(todelete[i]); - if (!todelete[i]->isRailNet()) - delete todelete[i]; - } - - pstring errstr(""); - - netlist().log("looking for terminals not connected ..."); - for (tagmap_terminal_t::entry_t *entry = m_terminals.first(); entry != NULL; entry = m_terminals.next(entry)) - { - if (!entry->object()->has_net()) - errstr += pstring::sprintf("Found terminal %s without a net\n", - entry->object()->name().cstr()); - else if (entry->object()->net().num_cons() == 0) - netlist().warning("Found terminal %s without connections", - entry->object()->name().cstr()); - } - if (errstr != "") - netlist().error("%s", errstr.cstr()); - - - netlist().log("looking for two terms connected to rail nets ...\n"); - for (tagmap_devices_t::entry_t *entry = netlist().m_devices.first(); entry != NULL; entry = netlist().m_devices.next(entry)) - { - NETLIB_NAME(twoterm) *t = dynamic_cast(entry->object()); - if (t != NULL) - { - has_twoterms = true; - if (t->m_N.net().isRailNet() && t->m_P.net().isRailNet()) - netlist().error("Found device %s connected only to railterminals %s/%s\n", - t->name().cstr(), t->m_N.net().name().cstr(), t->m_P.net().name().cstr()); - } - } - - netlist().log("initialize solver ...\n"); + netlist().log("initialize solver ...\n"); if (m_netlist.solver() == NULL) { - if (has_twoterms) - netlist().error("No solver found for this net although analog elements are present\n"); + if (has_twoterms) + netlist().error("No solver found for this net although analog elements are present\n"); } else m_netlist.solver()->post_start(); diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h index b6f474cde94..0c2546afff2 100644 --- a/src/emu/netlist/nl_setup.h +++ b/src/emu/netlist/nl_setup.h @@ -39,7 +39,7 @@ setup.register_link(# _name "." # _input, # _output); #define NET_C(_term1, ...) \ - setup.register_link_arr( #_term1 ", " # __VA_ARGS__); + setup.register_link_arr( #_term1 ", " # __VA_ARGS__); #define PARAM(_name, _val) \ setup.register_param(# _name, _val); @@ -55,17 +55,15 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &setup) #define NETLIST_START(_name) \ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &setup) \ { - - #define NETLIST_END() } #define INCLUDE(_name) \ NETLIST_NAME(_name)(setup); #define SUBMODEL(_name, _model) \ - setup.namespace_push(# _name); \ - NETLIST_NAME(_model)(setup); \ - setup.namespace_pop(); + setup.namespace_push(# _name); \ + NETLIST_NAME(_model)(setup); \ + setup.namespace_pop(); // ---------------------------------------------------------------------------------------- // FIXME: Clean this up @@ -117,9 +115,9 @@ public: netlist_base_t &netlist() { return m_netlist; } const netlist_base_t &netlist() const { return m_netlist; } netlist_factory_t &factory() { return m_factory; } - const netlist_factory_t &factory() const { return m_factory; } + const netlist_factory_t &factory() const { return m_factory; } - pstring build_fqn(const pstring &obj_name) const; + pstring build_fqn(const pstring &obj_name) const; netlist_device_t *register_dev(netlist_device_t *dev, const pstring &name); void remove_dev(const pstring &name); @@ -127,7 +125,7 @@ public: void register_model(const pstring &model); void register_alias(const pstring &alias, const pstring &out); void register_alias_nofqn(const pstring &alias, const pstring &out); - void register_link_arr(const pstring &terms); + void register_link_arr(const pstring &terms); void register_link(const pstring &sin, const pstring &sout); void register_param(const pstring ¶m, const pstring &value); void register_param(const pstring ¶m, const double value); @@ -148,7 +146,7 @@ public: /* handle namespace */ void namespace_push(const pstring &aname); - void namespace_pop(); + void namespace_pop(); /* not ideal, but needed for save_state */ tagmap_terminal_t m_terminals; @@ -172,7 +170,7 @@ private: int m_proxy_cnt; - netlist_stack_t m_stack; + netlist_stack_t m_stack; void connect_terminals(netlist_core_terminal_t &in, netlist_core_terminal_t &out); diff --git a/src/emu/netlist/pstate.c b/src/emu/netlist/pstate.c index 1bc08410a7f..5b07692e460 100644 --- a/src/emu/netlist/pstate.c +++ b/src/emu/netlist/pstate.c @@ -17,10 +17,10 @@ ATTR_COLD void pstate_manager_t::save_state_ptr(const pstring &stname, const pst pstring fullname = stname; ATTR_UNUSED pstring ts[] = { "NOT_SUPPORTED", - "DT_CUSTOM", + "DT_CUSTOM", "DT_DOUBLE", "DT_INT64", - "DT_INT16", + "DT_INT16", "DT_INT8", "DT_INT", "DT_BOOLEAN" @@ -33,30 +33,30 @@ ATTR_COLD void pstate_manager_t::save_state_ptr(const pstring &stname, const pst ATTR_COLD void pstate_manager_t::remove_save_items(const void *owner) { - pstate_entry_t::list_t todelete; - - for (int i=0; i < m_save.count(); i++) - { - if (m_save[i]->m_owner == owner) - todelete.add(m_save[i]); - } - for (int i=0; i < todelete.count(); i++) - { - m_save.remove(todelete[i]); - } - todelete.clear_and_free(); + pstate_entry_t::list_t todelete; + + for (int i=0; i < m_save.count(); i++) + { + if (m_save[i]->m_owner == owner) + todelete.add(m_save[i]); + } + for (int i=0; i < todelete.count(); i++) + { + m_save.remove(todelete[i]); + } + todelete.clear_and_free(); } ATTR_COLD void pstate_manager_t::pre_save() { for (int i=0; i < m_save.count(); i++) - if (m_save[i]->m_dt == DT_CUSTOM) - m_save[i]->m_callback->on_pre_save(); + if (m_save[i]->m_dt == DT_CUSTOM) + m_save[i]->m_callback->on_pre_save(); } ATTR_COLD void pstate_manager_t::post_load() { - for (int i=0; i < m_save.count(); i++) - if (m_save[i]->m_dt == DT_CUSTOM) - m_save[i]->m_callback->on_post_load(); + for (int i=0; i < m_save.count(); i++) + if (m_save[i]->m_dt == DT_CUSTOM) + m_save[i]->m_callback->on_post_load(); } diff --git a/src/emu/netlist/pstate.h b/src/emu/netlist/pstate.h index 4265da06b8d..3e1f73e7cc5 100644 --- a/src/emu/netlist/pstate.h +++ b/src/emu/netlist/pstate.h @@ -29,7 +29,7 @@ enum pstate_data_type_e { DT_CUSTOM, DT_DOUBLE, DT_INT64, - DT_INT16, + DT_INT16, DT_INT8, DT_INT, DT_BOOLEAN @@ -70,22 +70,22 @@ protected: struct pstate_entry_t { - typedef netlist_list_t list_t; - - pstate_entry_t(const pstring &stname, const pstate_data_type_e dt, const void *owner, - const int size, const int count, void *ptr) - : m_name(stname), m_dt(dt), m_owner(owner), m_callback(NULL), m_size(size), m_count(count), m_ptr(ptr) { } - - pstate_entry_t(const pstring &stname, const void *owner, pstate_callback_t *callback) - : m_name(stname), m_dt(DT_CUSTOM), m_owner(owner), m_callback(callback), m_size(0), m_count(0), m_ptr(NULL) { } - - pstring m_name; - const pstate_data_type_e m_dt; - const void *m_owner; - pstate_callback_t *m_callback; - const int m_size; - const int m_count; - void *m_ptr; + typedef netlist_list_t list_t; + + pstate_entry_t(const pstring &stname, const pstate_data_type_e dt, const void *owner, + const int size, const int count, void *ptr) + : m_name(stname), m_dt(dt), m_owner(owner), m_callback(NULL), m_size(size), m_count(count), m_ptr(ptr) { } + + pstate_entry_t(const pstring &stname, const void *owner, pstate_callback_t *callback) + : m_name(stname), m_dt(DT_CUSTOM), m_owner(owner), m_callback(callback), m_size(0), m_count(0), m_ptr(NULL) { } + + pstring m_name; + const pstate_data_type_e m_dt; + const void *m_owner; + pstate_callback_t *m_callback; + const int m_size; + const int m_count; + void *m_ptr; }; class pstate_manager_t @@ -125,8 +125,8 @@ private: template<> ATTR_COLD inline void pstate_manager_t::save_item(pstate_callback_t &state, const void *owner, const pstring &stname) { //save_state_ptr(stname, DT_CUSTOM, 0, 1, &state); - pstate_entry_t *p = new pstate_entry_t(stname, owner, &state); - m_save.add(p); + pstate_entry_t *p = new pstate_entry_t(stname, owner, &state); + m_save.add(p); state.register_state(*this, stname); } diff --git a/src/emu/netlist/pstring.h b/src/emu/netlist/pstring.h index d3bf7f61840..1928a580b01 100644 --- a/src/emu/netlist/pstring.h +++ b/src/emu/netlist/pstring.h @@ -97,7 +97,7 @@ public: inline const char *cstr() const { return m_ptr->str(); } // concatenation operators - pstring& operator+=(const char c) { char buf[2] = { c, 0 }; pcat(buf); return *this; } + pstring& operator+=(const char c) { char buf[2] = { c, 0 }; pcat(buf); return *this; } pstring& operator+=(const pstring &string) { pcat(string.cstr()); return *this; } friend pstring operator+(const pstring &lhs, const pstring &rhs) { return pstring(lhs) += rhs; } friend pstring operator+(const pstring &lhs, const char *rhs) { return pstring(lhs) += rhs; } @@ -133,12 +133,12 @@ public: return (result != NULL) ? (result - cstr()) : -1; } - inline int find(const char search, int start = 0) const - { - int alen = len(); - const char *result = strchr(cstr() + MIN(start, alen), search); - return (result != NULL) ? (result - cstr()) : -1; - } + inline int find(const char search, int start = 0) const + { + int alen = len(); + const char *result = strchr(cstr() + MIN(start, alen), search); + return (result != NULL) ? (result - cstr()) : -1; + } // various @@ -174,7 +174,7 @@ protected: struct str_t { - str_t() : m_ref_count(1), m_len(0) { m_str[0] = 0; } + str_t() : m_ref_count(1), m_len(0) { m_str[0] = 0; } str_t(int alen) : m_ref_count(1), m_len(alen) { m_str[0] = 0; } char *str() { return &m_str[0]; } diff --git a/src/emu/output.c b/src/emu/output.c index 39acdff9952..10bd135b4d1 100644 --- a/src/emu/output.c +++ b/src/emu/output.c @@ -31,14 +31,14 @@ class output_notify public: output_notify(output_notifier_func callback, void *param) : m_next(NULL), - m_notifier(callback), - m_param(param) { } + m_notifier(callback), + m_param(param) { } output_notify *next() const { return m_next; } - output_notify * m_next; /* link to next item */ + output_notify * m_next; /* link to next item */ output_notifier_func m_notifier; /* callback to call */ - void * m_param; /* parameter to pass the callback */ + void * m_param; /* parameter to pass the callback */ }; diff --git a/src/emu/render.c b/src/emu/render.c index 05ed18d3883..5e2ae35e26a 100644 --- a/src/emu/render.c +++ b/src/emu/render.c @@ -1212,7 +1212,7 @@ void render_target::compute_minimum_size(INT32 &minwidth, INT32 &minheight) // get visible area rectangle visarea = (screen->screen_type() == SCREEN_TYPE_VECTOR) - ? rectangle(0, 639, 0, 479) // use a hard-coded default visible area for vector screens + ? rectangle(0, 639, 0, 479) // use a hard-coded default visible area for vector screens : screen->visible_area(); // is our visible area too small? if so, we need to bump up the size diff --git a/src/emu/rendfont.c b/src/emu/rendfont.c index a186dd78ee3..27d183b88c7 100644 --- a/src/emu/rendfont.c +++ b/src/emu/rendfont.c @@ -392,8 +392,8 @@ bool render_font::load_cached_bdf(const char *filename) // if that worked, we're done if (result) { - // don't do that - glyphs data point into this array ... - // m_rawdata.reset(); + // don't do that - glyphs data point into this array ... + // m_rawdata.reset(); return true; } } diff --git a/src/emu/rendfont.h b/src/emu/rendfont.h index 31a0781bd59..62ce244d69a 100644 --- a/src/emu/rendfont.h +++ b/src/emu/rendfont.h @@ -52,11 +52,11 @@ private: public: glyph() : width(0), - xoffs(0), yoffs(0), - bmwidth(0), bmheight(0), - rawdata(NULL), - texture(NULL) { } - + xoffs(0), yoffs(0), + bmwidth(0), bmheight(0), + rawdata(NULL), + texture(NULL) { } + INT32 width; // width from this character to the next INT32 xoffs, yoffs; // X and Y offset from baseline to top,left of bitmap INT32 bmwidth, bmheight; // width and height of bitmap diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c index 8e549f0aef4..27e888df16c 100644 --- a/src/emu/rendlay.c +++ b/src/emu/rendlay.c @@ -667,7 +667,7 @@ layout_element::component::component(running_machine &machine, xml_data_node &co m_numsymbolsvisible = xml_get_attribute_int_with_subst(machine, compnode, "numsymbolsvisible", 3); m_reelreversed = xml_get_attribute_int_with_subst(machine, compnode, "reelreversed", 0); m_beltreel = xml_get_attribute_int_with_subst(machine, compnode, "beltreel", 0); - + } // led7seg nodes @@ -1004,7 +1004,7 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 render_font *font = machine.render().font_alloc("default"); float aspect = 1.0f; INT32 width; - + int curry = 0; int num_shown = m_numsymbolsvisible; @@ -1109,7 +1109,7 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 int effx = curx + x + chbounds.min_x; if (effx >= bounds.min_x && effx <= bounds.max_x) { - UINT32 spix = rgb_t(src[x]).a(); + UINT32 spix = rgb_t(src[x]).a(); if (spix != 0) { rgb_t dpix = d[effx]; @@ -1259,7 +1259,7 @@ void layout_element::component::draw_beltreel(running_machine &machine, bitmap_a int effx = basex + curx + x; if (effx >= bounds.min_x && effx <= bounds.max_x) { - UINT32 spix = rgb_t(src[x]).a(); + UINT32 spix = rgb_t(src[x]).a(); if (spix != 0) { rgb_t dpix = d[effx]; @@ -2309,9 +2309,9 @@ layout_view::item::~item() //------------------------------------------------- -render_container *layout_view::item::screen_container(running_machine &machine) const -{ - return (m_screen != NULL) ? &m_screen->container() : NULL; +render_container *layout_view::item::screen_container(running_machine &machine) const +{ + return (m_screen != NULL) ? &m_screen->container() : NULL; } //------------------------------------------------- diff --git a/src/emu/rendlay.h b/src/emu/rendlay.h index 8065685bcc2..acd4b4407ab 100644 --- a/src/emu/rendlay.h +++ b/src/emu/rendlay.h @@ -149,7 +149,7 @@ private: int m_stateoffset; int m_reelreversed; int m_numsymbolsvisible; - int m_beltreel; + int m_beltreel; }; // a texture encapsulates a texture for a given element in a given state diff --git a/src/emu/screen.c b/src/emu/screen.c index 4a21b87cfdd..496d152e19e 100644 --- a/src/emu/screen.c +++ b/src/emu/screen.c @@ -226,7 +226,7 @@ void screen_device::static_set_palette(device_t &device, const char *tag) //------------------------------------------------- -// static_set_video_attributes - set the screen +// static_set_video_attributes - set the screen // video attributes //------------------------------------------------- @@ -260,10 +260,10 @@ void screen_device::device_validity_check(validity_checker &valid) const // check for zero frame rate if (m_refresh == 0) mame_printf_error("Invalid (zero) refresh rate\n"); - + texture_format texformat = !m_screen_update_ind16.isnull() ? TEXFORMAT_PALETTE16 : TEXFORMAT_RGB32; if (m_palette == NULL && texformat == TEXFORMAT_PALETTE16) - mame_printf_error("Screen does not have palette defined\n"); + mame_printf_error("Screen does not have palette defined\n"); if (m_palette != NULL && texformat == TEXFORMAT_RGB32) mame_printf_warning("Screen does not need palette defined\n"); } @@ -279,7 +279,7 @@ void screen_device::device_start() m_screen_update_ind16.bind_relative_to(*owner()); m_screen_update_rgb32.bind_relative_to(*owner()); m_screen_vblank.bind_relative_to(*owner()); - + // if we have a palette and it's not started, wait for it if (m_palette != NULL && !m_palette->started()) throw device_missing_dependencies(); diff --git a/src/emu/screen.h b/src/emu/screen.h index 956a899b331..67d47902c96 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -261,7 +261,7 @@ private: screen_update_ind16_delegate m_screen_update_ind16; // screen update callback (16-bit palette) screen_update_rgb32_delegate m_screen_update_rgb32; // screen update callback (32-bit RGB) screen_vblank_delegate m_screen_vblank; // screen vblank callback - optional_device m_palette; // our palette + optional_device m_palette; // our palette UINT32 m_video_attributes; // flags describing the video system // internal state diff --git a/src/emu/softlist.c b/src/emu/softlist.c index 803e4a36f54..27c857a383c 100644 --- a/src/emu/softlist.c +++ b/src/emu/softlist.c @@ -40,7 +40,7 @@ private: POS_PART, POS_DATA }; - + // internal parsing helpers const char *filename() const { return m_list.filename(); } const char *infoname() const { return (m_current_info != NULL) ? m_current_info->shortname() : "???"; } @@ -74,15 +74,15 @@ private: void parse_soft_end(const char *name); // internal parsing state - software_list_device & m_list; - astring & m_errors; - XML_Parser m_parser; - bool m_done; - bool m_data_accum_expected; - astring m_data_accum; - software_info * m_current_info; - software_part * m_current_part; - parse_position m_pos; + software_list_device & m_list; + astring & m_errors; + XML_Parser m_parser; + bool m_done; + bool m_data_accum_expected; + astring m_data_accum; + software_info * m_current_info; + software_part * m_current_part; + parse_position m_pos; }; @@ -106,9 +106,9 @@ const device_type SOFTWARE_LIST = &device_creator; software_part::software_part(software_info &info, const char *name, const char *interface) : m_next(NULL), - m_info(info), - m_name(name), - m_interface(interface) + m_info(info), + m_name(name), + m_interface(interface) { // ensure strings we are passed are in the string pool assert(info.list().string_pool_contains(name)); @@ -117,8 +117,8 @@ software_part::software_part(software_info &info, const char *name, const char * //------------------------------------------------- -// feature - return the value of the given -// feature, if specified +// feature - return the value of the given +// feature, if specified //------------------------------------------------- const char *software_part::feature(const char *feature_name) const @@ -136,7 +136,7 @@ const char *software_part::feature(const char *feature_name) const //------------------------------------------------- // is_compatible - determine if we are compatible -// with the given software_list_device +// with the given software_list_device //------------------------------------------------- bool software_part::is_compatible(const software_list_device &swlistdev) const @@ -150,7 +150,7 @@ bool software_part::is_compatible(const software_list_device &swlistdev) const // copy the comma-delimited strings and ensure they end with a final comma astring comp(compatibility, ","); astring filt(filter, ","); - + // iterate over filter items and see if they exist in the compatibility list; if so, return true for (int start = 0, end = filt.chr(start, ','); end != -1; start = end + 1, end = filt.chr(start, ',')) { @@ -164,7 +164,7 @@ bool software_part::is_compatible(const software_list_device &swlistdev) const //------------------------------------------------- // matches_interface - determine if we match -// an interface in the provided list +// an interface in the provided list //------------------------------------------------- bool software_part::matches_interface(const char *interface_list) const @@ -175,7 +175,7 @@ bool software_part::matches_interface(const char *interface_list) const // copy the comma-delimited interface list and ensure it ends with a final comma astring interfaces(interface_list, ","); - + // then add a comma to the end of our interface and return true if we find it in the list string astring our_interface(m_interface, ","); return (interfaces.find(0, our_interface) != -1); @@ -193,10 +193,10 @@ bool software_part::matches_interface(const char *interface_list) const software_info::software_info(software_list_device &list, const char *name, const char *parent, const char *supported) : m_next(NULL), - m_list(list), - m_supported(SOFTWARE_SUPPORTED_YES), - m_shortname(name), - m_parentname(parent) + m_list(list), + m_supported(SOFTWARE_SUPPORTED_YES), + m_shortname(name), + m_parentname(parent) { // ensure strings we are passed are in the string pool assert(list.string_pool_contains(name)); @@ -215,7 +215,7 @@ software_info::software_info(software_list_device &list, const char *name, const //------------------------------------------------- // find_part - find a part by name with an -// optional interface match +// optional interface match //------------------------------------------------- software_part *software_info::find_part(const char *partname, const char *interface) @@ -225,14 +225,14 @@ software_part *software_info::find_part(const char *partname, const char *interf if (partname == NULL && interface == NULL) return m_partdata.first(); - + // look for the part by name and match against the interface if provided for (software_part *part = m_partdata.first(); part != NULL; part = part->next()) if (partname != NULL && strcmp(partname, part->name()) == 0) { if (interface == NULL || part->matches_interface(interface)) return part; - } + } else if (partname == NULL && part->matches_interface(interface)) return part; return NULL; @@ -241,20 +241,20 @@ software_part *software_info::find_part(const char *partname, const char *interf //------------------------------------------------- // has_multiple_parts - return true if we have -// more than one part matching the given -// interface +// more than one part matching the given +// interface //------------------------------------------------- bool software_info::has_multiple_parts(const char *interface) const { int count = 0; - + // increment the count for each match and stop if we hit more than 1 for (software_part *part = first_part(); part != NULL; part = part->next()) if (part->matches_interface(interface)) if (++count > 1) return true; - + return false; } @@ -290,7 +290,7 @@ const char *const_string_pool::add(const char *string) if (result != NULL) return result; } - + // no space anywhere, create a new pool and prepend it (so it gets used first) const char *result = m_chunklist.prepend(*global_alloc(pool_chunk)).add(string); assert(result != NULL); @@ -299,7 +299,7 @@ const char *const_string_pool::add(const char *string) //------------------------------------------------- -// contains - determine if the given string +// contains - determine if the given string // pointer lives in the pool //------------------------------------------------- @@ -313,7 +313,7 @@ bool const_string_pool::contains(const char *string) for (pool_chunk *chunk = m_chunklist.first(); chunk != NULL; chunk = chunk->next()) if (chunk->contains(string)) return true; - + return false; } @@ -323,8 +323,8 @@ bool const_string_pool::contains(const char *string) //------------------------------------------------- const_string_pool::pool_chunk::pool_chunk() - : m_next(NULL), - m_used(0) + : m_next(NULL), + m_used(0) { } @@ -338,7 +338,7 @@ const char *const_string_pool::pool_chunk::add(const char *string) // get the length of the string (no string can be longer than a full pool) int bytes = strlen(string) + 1; assert(bytes < POOL_SIZE); - + // if too big, return NULL if (m_used + bytes > POOL_SIZE) return NULL; @@ -405,8 +405,8 @@ void software_list_device::device_start() //------------------------------------------------- // find_approx_matches - search ourselves for -// a list of possible matches of the given name -// and optional interface +// a list of possible matches of the given name +// and optional interface //------------------------------------------------- void software_list_device::find_approx_matches(const char *name, int matches, software_info **list, const char *interface) @@ -456,7 +456,7 @@ void software_list_device::find_approx_matches(const char *name, int matches, so //------------------------------------------------- -// release - reset to a pre-parsed state +// release - reset to a pre-parsed state //------------------------------------------------- void software_list_device::release() @@ -471,8 +471,8 @@ void software_list_device::release() //------------------------------------------------- -// find_by_name - find a software list by name -// across all software list devices +// find_by_name - find a software list by name +// across all software list devices //------------------------------------------------- software_list_device *software_list_device::find_by_name(const machine_config &config, const char *name) @@ -488,8 +488,8 @@ software_list_device *software_list_device::find_by_name(const machine_config &c //------------------------------------------------- // software_display_matches - display a list of -// possible matches in the system to the given -// name, across all software list devices +// possible matches in the system to the given +// name, across all software list devices //------------------------------------------------- void software_list_device::display_matches(const machine_config &config, const char *interface, const char *name) @@ -528,9 +528,9 @@ void software_list_device::display_matches(const machine_config &config, const c //------------------------------------------------- -// find - find an item by name in the software +// find - find an item by name in the software // list, using wildcards and optionally starting -// from an intermediate point +// from an intermediate point //------------------------------------------------- software_info *software_list_device::find(const char *look_for, software_info *prev) @@ -566,12 +566,12 @@ void software_list_device::parse() if (filerr == FILERR_NONE) { // parse if no error - softlist_parser parser(*this, m_errors); + softlist_parser parser(*this, m_errors); m_file.close(); } else m_errors.printf("Error opening file: %s\n", filename()); - + // indicate that we've been parsed m_parsed = true; } @@ -579,7 +579,7 @@ void software_list_device::parse() //------------------------------------------------- // device_validity_check - validate the device -// configuration +// configuration //------------------------------------------------- void software_list_device::device_validity_check(validity_checker &valid) const @@ -592,7 +592,7 @@ void software_list_device::device_validity_check(validity_checker &valid) const // do device validation only in case of validate command if (strcmp(mconfig().options().command(), CLICOMMAND_VALIDATE) != 0) return; - + // actually do the validate const_cast(this)->internal_validity_check(valid); } @@ -600,7 +600,7 @@ void software_list_device::device_validity_check(validity_checker &valid) const //------------------------------------------------- // internal_validity_check - internal helper to -// check the list +// check the list //------------------------------------------------- void software_list_device::internal_validity_check(validity_checker &valid) @@ -734,12 +734,12 @@ void software_list_device::internal_validity_check(validity_checker &valid) softlist_parser::softlist_parser(software_list_device &list, astring &errors) : m_list(list), - m_errors(errors), - m_done(false), - m_data_accum_expected(false), - m_current_info(NULL), - m_current_part(NULL), - m_pos(POS_ROOT) + m_errors(errors), + m_done(false), + m_data_accum_expected(false), + m_current_info(NULL), + m_current_part(NULL), + m_pos(POS_ROOT) { mame_printf_verbose("Parsing %s\n", m_list.m_file.filename()); @@ -805,20 +805,20 @@ void softlist_parser::expat_free(void *ptr) //------------------------------------------------- // parse_error - append a parsing error with -// filename, line and column information +// filename, line and column information //------------------------------------------------- void ATTR_PRINTF(2,3) softlist_parser::parse_error(const char *fmt, ...) { - // always start with filename(line.column): + // always start with filename(line.column): m_errors.catprintf("%s(%d.%d): ", filename(), line(), column()); - + // append the remainder of the string va_list va; va_start(va, fmt); m_errors.catvprintf(fmt, va); va_end(va); - + // append a newline at the end m_errors.cat("\n"); } @@ -826,7 +826,7 @@ void ATTR_PRINTF(2,3) softlist_parser::parse_error(const char *fmt, ...) //------------------------------------------------- // parse_attributes - helper to parse a set of -// attributes into a list of strings +// attributes into a list of strings //------------------------------------------------- void softlist_parser::parse_attributes(const char **attributes, int numattrs, const char *attrlist[], const char *outlist[]) @@ -835,7 +835,7 @@ void softlist_parser::parse_attributes(const char **attributes, int numattrs, co for( ; attributes[0]; attributes += 2) { int index; - + // look for a match among the attributes provided for (index = 0; index < numattrs; index++) if (strcmp(attributes[0], attrlist[index]) == 0) @@ -844,7 +844,7 @@ void softlist_parser::parse_attributes(const char **attributes, int numattrs, co outlist[index] = attributes[1]; break; } - + // if not found, report an unknown attribute if (index == numattrs) unknown_attribute(attributes[0]); @@ -854,7 +854,7 @@ void softlist_parser::parse_attributes(const char **attributes, int numattrs, co //------------------------------------------------- // add_rom_entry - append a new ROM entry to the -// current part's list +// current part's list //------------------------------------------------- void softlist_parser::add_rom_entry(const char *name, const char *hashdata, UINT32 offset, UINT32 length, UINT32 flags) @@ -903,16 +903,16 @@ void softlist_parser::start_handler(void *data, const char *tagname, const char case POS_SOFT: state->parse_soft_start(tagname, attributes); break; - + case POS_PART: state->parse_part_start(tagname, attributes); break; - + case POS_DATA: state->parse_data_start(tagname, attributes); break; } - + // increment the state since this is a tag start state->m_pos = parse_position(state->m_pos + 1); } @@ -949,7 +949,7 @@ void softlist_parser::end_handler(void *data, const char *name) case POS_DATA: break; } - + // stop accumulating state->m_data_accum_expected = false; state->m_data_accum.reset(); @@ -991,7 +991,7 @@ void softlist_parser::parse_root_start(const char *tagname, const char **attribu static const char *attrnames[] = { "name", "description" }; const char *attrvalues[ARRAY_LENGTH(attrnames)] = { 0 }; parse_attributes(attributes, ARRAY_LENGTH(attrnames), attrnames, attrvalues); - + if (attrvalues[1] != NULL) m_list.m_description = m_list.add_string(attrvalues[1]); } @@ -1002,7 +1002,7 @@ void softlist_parser::parse_root_start(const char *tagname, const char **attribu //------------------------------------------------- // parse_main_start - handle tag start within -// a softwarelist tag +// a softwarelist tag //------------------------------------------------- void softlist_parser::parse_main_start(const char *tagname, const char **attributes) @@ -1026,7 +1026,7 @@ void softlist_parser::parse_main_start(const char *tagname, const char **attribu //------------------------------------------------- // parse_main_start - handle tag start within -// a software tag +// a software tag //------------------------------------------------- void softlist_parser::parse_soft_start(const char *tagname, const char **attributes) @@ -1062,20 +1062,20 @@ void softlist_parser::parse_soft_start(const char *tagname, const char **attribu else parse_error("Incomplete other_info definition"); } - + // else if (strcmp(tagname, "sharedfeat") == 0) { static const char *attrnames[] = { "name", "value" }; const char *attrvalues[ARRAY_LENGTH(attrnames)] = { 0 }; parse_attributes(attributes, ARRAY_LENGTH(attrnames), attrnames, attrvalues); - + if (attrvalues[0] != NULL && attrvalues[1] != NULL) m_current_info->m_shared_info.append(*global_alloc(feature_list_item(m_list.add_string(attrvalues[0]), m_list.add_string(attrvalues[1])))); else parse_error("Incomplete sharedfeat definition"); } - + // else if (strcmp(tagname, "part" ) == 0) { @@ -1095,7 +1095,7 @@ void softlist_parser::parse_soft_start(const char *tagname, const char **attribu //------------------------------------------------- // parse_part_start - handle tag start within -// a part tag +// a part tag //------------------------------------------------- void softlist_parser::parse_part_start(const char *tagname, const char **attributes) @@ -1113,13 +1113,13 @@ void softlist_parser::parse_part_start(const char *tagname, const char **attribu static const char *attrnames[] = { "name", "size" }; const char *attrvalues[ARRAY_LENGTH(attrnames)] = { 0 }; parse_attributes(attributes, ARRAY_LENGTH(attrnames), attrnames, attrvalues); - + if (attrvalues[0] != NULL && attrvalues[1] != NULL && strcmp(attrvalues[0], "") != 0 && strcmp(attrvalues[1], "") != 0) add_rom_entry(attrvalues[0], NULL, 0, strtol(attrvalues[1], NULL, 0), ROMENTRYTYPE_REGION); else parse_error("Incomplete dataarea definition"); } - + // else if (strcmp(tagname, "diskarea") == 0) { @@ -1132,20 +1132,20 @@ void softlist_parser::parse_part_start(const char *tagname, const char **attribu else parse_error("Incomplete diskarea definition"); } - + // else if (strcmp(tagname, "feature") == 0) { static const char *attrnames[] = { "name", "value" }; const char *attrvalues[ARRAY_LENGTH(attrnames)] = { 0 }; parse_attributes(attributes, ARRAY_LENGTH(attrnames), attrnames, attrvalues); - + if (attrvalues[0] != NULL) m_current_part->m_featurelist.append(*global_alloc(feature_list_item(m_list.add_string(attrvalues[0]), m_list.add_string(attrvalues[1])))); else parse_error("Incomplete feature definition"); } - + // else if (strcmp(tagname, "dipswitch") == 0) ; @@ -1156,7 +1156,7 @@ void softlist_parser::parse_part_start(const char *tagname, const char **attribu //------------------------------------------------- // parse_data_start - handle tag start within a -// dataarea or diskarea tag +// dataarea or diskarea tag //------------------------------------------------- void softlist_parser::parse_data_start(const char *tagname, const char **attributes) @@ -1174,7 +1174,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu static const char *attrnames[] = { "name", "size", "crc", "sha1", "offset", "value", "status", "loadflag" }; const char *attrvalues[ARRAY_LENGTH(attrnames)] = { 0 }; parse_attributes(attributes, ARRAY_LENGTH(attrnames), attrnames, attrvalues); - + const char *name = attrvalues[0]; const char *sizestr = attrvalues[1]; const char *crc = attrvalues[2]; @@ -1237,7 +1237,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu else parse_error("Incomplete rom definition"); } - + // else if (strcmp(tagname, "disk") == 0) { @@ -1262,7 +1262,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu else if (status == NULL || !strcmp(status, "nodump")) // a no_dump chd is not an incomplete entry parse_error("Incomplete disk definition"); } - + // else if (strcmp(tagname, "dipvalue") == 0) ; @@ -1273,7 +1273,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu //------------------------------------------------- // parse_soft_end - handle end-of-tag post- -// processing within the tag +// processing within the tag //------------------------------------------------- void softlist_parser::parse_soft_end(const char *tagname) @@ -1299,11 +1299,11 @@ void softlist_parser::parse_soft_end(const char *tagname) assert(m_current_part != NULL); if (m_current_part == NULL) return; - + // was any dataarea/rom information encountered? if so, add a terminator if (m_current_part->romdata() != NULL) add_rom_entry(NULL, NULL, 0, 0, ROMENTRYTYPE_END); - + // get the info; if present, copy shared data (we assume name/value strings live // in the string pool and don't need to be reallocated) if (m_current_info != NULL) diff --git a/src/emu/softlist.h b/src/emu/softlist.h index 5a32e67c1c8..b88fabafbf1 100644 --- a/src/emu/softlist.h +++ b/src/emu/softlist.h @@ -78,8 +78,8 @@ public: // construction/destruction feature_list_item(const char *name = NULL, const char *value = NULL) : m_next(NULL), - m_name(name), - m_value(value) { } + m_name(name), + m_value(value) { } // getters feature_list_item *next() const { return m_next; } @@ -87,10 +87,10 @@ public: const char *value() const { return m_value; } private: - // internal state + // internal state feature_list_item * m_next; - const char * m_name; - const char * m_value; + const char * m_name; + const char * m_value; }; @@ -101,7 +101,7 @@ class software_part { friend class softlist_parser; friend class simple_list; - + public: // construction/destruction software_part(software_info &info, const char *name = NULL, const char *interface = NULL); @@ -121,10 +121,10 @@ public: private: // internal state - software_part * m_next; - software_info & m_info; - const char * m_name; - const char * m_interface; + software_part * m_next; + software_info & m_info; + const char * m_name; + const char * m_interface; simple_list m_featurelist; dynamic_array m_romdata; }; @@ -137,11 +137,11 @@ class software_info { friend class softlist_parser; friend class simple_list; - + public: // construction/destruction software_info(software_list_device &list, const char *name, const char *parent, const char *supported); - + // getters software_info *next() const { return m_next; } software_list_device &list() const { return m_list; } @@ -156,24 +156,24 @@ public: int num_parts() const { return m_partdata.count(); } software_part *first_part() const { return m_partdata.first(); } software_part *last_part() const { return m_partdata.last(); } - + // additional operations software_part *find_part(const char *partname, const char *interface = NULL); bool has_multiple_parts(const char *interface) const; private: // internal state - software_info * m_next; - software_list_device & m_list; - UINT32 m_supported; - const char * m_shortname; - const char * m_longname; - const char * m_parentname; - const char * m_year; // Copyright year on title screen, actual release dates can be tracked in external resources - const char * m_publisher; + software_info * m_next; + software_list_device & m_list; + UINT32 m_supported; + const char * m_shortname; + const char * m_longname; + const char * m_parentname; + const char * m_year; // Copyright year on title screen, actual release dates can be tracked in external resources + const char * m_publisher; simple_list m_other_info; // Here we store info like developer, serial #, etc. which belong to the software entry as a whole simple_list m_shared_info; // Here we store info like TV standard compatibility, or add-on requirements, etc. which get inherited - // by each part of this software entry (after loading these are stored in partdata->featurelist) + // by each part of this software entry (after loading these are stored in partdata->featurelist) simple_list m_partdata; }; @@ -228,17 +228,17 @@ protected: virtual void device_validity_check(validity_checker &valid) const ATTR_COLD; // configuration state - astring m_list_name; + astring m_list_name; softlist_type m_list_type; const char * m_filter; // internal state - bool m_parsed; - emu_file m_file; - const char * m_description; - astring m_errors; - simple_list m_infolist; - const_string_pool m_stringpool; + bool m_parsed; + emu_file m_file; + const char * m_description; + astring m_errors; + simple_list m_infolist; + const_string_pool m_stringpool; }; diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c index 52c82e30187..9127251dc50 100644 --- a/src/emu/sound/aica.c +++ b/src/emu/sound/aica.c @@ -1400,10 +1400,10 @@ void aica_device::device_start() // set up the IRQ callbacks m_irq_cb.resolve_safe(); - m_main_irq_cb.resolve_safe(); + m_main_irq_cb.resolve_safe(); m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100); - + // save state save_item(NAME(m_IrqTimA)); save_item(NAME(m_IrqTimBC)); @@ -1416,7 +1416,7 @@ void aica_device::device_start() save_item(NAME(m_LPANTABLE),0x20000); save_item(NAME(m_RPANTABLE),0x20000); save_item(NAME(m_TimPris),3); - save_item(NAME(m_TimCnt),3); + save_item(NAME(m_TimCnt),3); } void aica_device::set_ram_base(void *base, int size) @@ -1489,40 +1489,40 @@ aica_device::aica_device(const machine_config &mconfig, const char *tag, device_ m_bufferr(NULL), m_length(0), m_RBUFDST(NULL) - + { - memset(&m_udata.data, 0, sizeof(m_udata.data)); - memset(m_EFSPAN, 0, sizeof(m_EFSPAN)); - memset(m_Slots, 0, sizeof(m_Slots)); - memset(m_RINGBUF, 0, sizeof(m_RINGBUF)); - memset(m_MidiStack, 0, sizeof(m_MidiStack)); - - memset(m_LPANTABLE, 0, sizeof(m_LPANTABLE)); - memset(m_RPANTABLE, 0, sizeof(m_RPANTABLE)); - - memset(m_TimPris, 0, sizeof(m_TimPris)); - memset(m_TimCnt, 0, sizeof(m_TimCnt)); - - memset(&m_dma, 0, sizeof(m_dma)); - - memset(m_ARTABLE, 0, sizeof(m_ARTABLE)); - memset(m_DRTABLE, 0, sizeof(m_DRTABLE)); - - memset(&m_DSP, 0, sizeof(m_DSP)); - - memset(m_EG_TABLE, 0, sizeof(m_EG_TABLE)); - memset(m_PLFO_TRI, 0, sizeof(m_PLFO_TRI)); - memset(m_PLFO_SQR, 0, sizeof(m_PLFO_SQR)); - memset(m_PLFO_SAW, 0, sizeof(m_PLFO_SAW)); - memset(m_PLFO_NOI, 0, sizeof(m_PLFO_NOI)); - - memset(m_ALFO_TRI, 0, sizeof(m_ALFO_TRI)); - memset(m_ALFO_SQR, 0, sizeof(m_ALFO_SQR)); - memset(m_ALFO_SAW, 0, sizeof(m_ALFO_SAW)); - memset(m_ALFO_NOI, 0, sizeof(m_ALFO_NOI)); - - memset(m_PSCALES, 0, sizeof(m_PSCALES)); - memset(m_ASCALES, 0, sizeof(m_ASCALES)); + memset(&m_udata.data, 0, sizeof(m_udata.data)); + memset(m_EFSPAN, 0, sizeof(m_EFSPAN)); + memset(m_Slots, 0, sizeof(m_Slots)); + memset(m_RINGBUF, 0, sizeof(m_RINGBUF)); + memset(m_MidiStack, 0, sizeof(m_MidiStack)); + + memset(m_LPANTABLE, 0, sizeof(m_LPANTABLE)); + memset(m_RPANTABLE, 0, sizeof(m_RPANTABLE)); + + memset(m_TimPris, 0, sizeof(m_TimPris)); + memset(m_TimCnt, 0, sizeof(m_TimCnt)); + + memset(&m_dma, 0, sizeof(m_dma)); + + memset(m_ARTABLE, 0, sizeof(m_ARTABLE)); + memset(m_DRTABLE, 0, sizeof(m_DRTABLE)); + + memset(&m_DSP, 0, sizeof(m_DSP)); + + memset(m_EG_TABLE, 0, sizeof(m_EG_TABLE)); + memset(m_PLFO_TRI, 0, sizeof(m_PLFO_TRI)); + memset(m_PLFO_SQR, 0, sizeof(m_PLFO_SQR)); + memset(m_PLFO_SAW, 0, sizeof(m_PLFO_SAW)); + memset(m_PLFO_NOI, 0, sizeof(m_PLFO_NOI)); + + memset(m_ALFO_TRI, 0, sizeof(m_ALFO_TRI)); + memset(m_ALFO_SQR, 0, sizeof(m_ALFO_SQR)); + memset(m_ALFO_SAW, 0, sizeof(m_ALFO_SAW)); + memset(m_ALFO_NOI, 0, sizeof(m_ALFO_NOI)); + + memset(m_PSCALES, 0, sizeof(m_PSCALES)); + memset(m_ASCALES, 0, sizeof(m_ASCALES)); } diff --git a/src/emu/sound/aica.h b/src/emu/sound/aica.h index 25bcc011155..321bc5257d1 100644 --- a/src/emu/sound/aica.h +++ b/src/emu/sound/aica.h @@ -82,7 +82,7 @@ public: static void set_roffset(device_t &device, int roffset) { downcast(device).m_roffset = roffset; } template static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb2_base &set_main_irq_callback(device_t &device, _Object object) { return downcast(device).m_main_irq_cb.set_callback(object); } - + // AICA register access DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); @@ -90,7 +90,7 @@ public: // MIDI I/O access DECLARE_WRITE16_MEMBER( midi_in ); DECLARE_READ16_MEMBER( midi_out_r ); - + void set_ram_base(void *base, int size); protected: @@ -146,7 +146,7 @@ private: UINT16 data[0xc0/2]; UINT8 datab[0xc0]; } m_udata; - + UINT16 m_IRQL, m_IRQR; UINT16 m_EFSPAN[0x48]; AICA_SLOT m_Slots[64]; @@ -193,9 +193,9 @@ private: stream_sample_t *m_bufferl; stream_sample_t *m_bufferr; - + int m_length; - + signed short *m_RBUFDST; //this points to where the sample will be stored in the RingBuf INT32 m_EG_TABLE[0x400]; int m_PLFO_TRI[256],m_PLFO_SQR[256],m_PLFO_SAW[256],m_PLFO_NOI[256]; diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index e42d04af8b8..bce6bad9f21 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -422,18 +422,17 @@ INLINE void build_single_table(double rl, const ay_ym_param *par, int normalize, INLINE void build_resisor_table(const ay_ym_param *par, INT32 *tab, int zero_is_off) { - int j; - - for (j=0; j < par->res_count; j++) - { - - if (zero_is_off && j == 0) - { - tab[j] = 1e6; - } - else - tab[j] = par->res[j]; - } + int j; + + for (j=0; j < par->res_count; j++) + { + if (zero_is_off && j == 0) + { + tab[j] = 1e6; + } + else + tab[j] = par->res[j]; + } } @@ -605,21 +604,21 @@ static STREAM_UPDATE( ay8910_update ) psg->count_noise++; if (psg->count_noise >= NOISE_PERIOD(psg)) { - /* toggle the prescaler output. Noise is no different to - * channels. - */ - psg->count_noise = 0; - psg->prescale_noise ^= 1; - - if ( psg->prescale_noise) - { - /* The Random Number Generator of the 8910 is a 17-bit shift */ - /* register. The input to the shift register is bit0 XOR bit3 */ - /* (bit0 is the output). This was verified on AY-3-8910 and YM2149 chips. */ - - psg->rng ^= (((psg->rng & 1) ^ ((psg->rng >> 3) & 1)) << 17); - psg->rng >>= 1; - } + /* toggle the prescaler output. Noise is no different to + * channels. + */ + psg->count_noise = 0; + psg->prescale_noise ^= 1; + + if ( psg->prescale_noise) + { + /* The Random Number Generator of the 8910 is a 17-bit shift */ + /* register. The input to the shift register is bit0 XOR bit3 */ + /* (bit0 is the output). This was verified on AY-3-8910 and YM2149 chips. */ + + psg->rng ^= (((psg->rng & 1) ^ ((psg->rng >> 3) & 1)) << 17); + psg->rng >>= 1; + } } for (chan = 0; chan < NUM_CHANNELS; chan++) @@ -704,22 +703,22 @@ static void build_mixer_table(ay8910_context *psg) normalize = 1; } - if ((psg->intf->flags & AY8910_RESISTOR_OUTPUT) != 0) - { - for (chan=0; chan < NUM_CHANNELS; chan++) - { - build_resisor_table(psg->par, psg->vol_table[chan], psg->zero_is_off); - build_resisor_table(psg->par_env, psg->env_table[chan], 0); - } - } - else - { - for (chan=0; chan < NUM_CHANNELS; chan++) - { - build_single_table(psg->intf->res_load[chan], psg->par, normalize, psg->vol_table[chan], psg->zero_is_off); - build_single_table(psg->intf->res_load[chan], psg->par_env, normalize, psg->env_table[chan], 0); - } - } + if ((psg->intf->flags & AY8910_RESISTOR_OUTPUT) != 0) + { + for (chan=0; chan < NUM_CHANNELS; chan++) + { + build_resisor_table(psg->par, psg->vol_table[chan], psg->zero_is_off); + build_resisor_table(psg->par_env, psg->env_table[chan], 0); + } + } + else + { + for (chan=0; chan < NUM_CHANNELS; chan++) + { + build_single_table(psg->intf->res_load[chan], psg->par, normalize, psg->vol_table[chan], psg->zero_is_off); + build_single_table(psg->intf->res_load[chan], psg->par_env, normalize, psg->env_table[chan], 0); + } + } /* * The previous implementation added all three channels up instead of averaging them. * The factor of 3 will force the same levels if normalizing is used. diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c index 7f924ebece0..2b8a42d0184 100644 --- a/src/emu/sound/cdp1869.c +++ b/src/emu/sound/cdp1869.c @@ -369,7 +369,7 @@ MACHINE_CONFIG_END machine_config_constructor cdp1869_device::device_mconfig_additions() const { - return MACHINE_CONFIG_NAME( cdp1869 ); + return MACHINE_CONFIG_NAME( cdp1869 ); } diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h index 39cefd391c7..0c9b1ee1155 100644 --- a/src/emu/sound/cdp1869.h +++ b/src/emu/sound/cdp1869.h @@ -202,7 +202,7 @@ public: static void static_set_char_ram_write(device_t &device, cdp1869_char_ram_write_delegate callback) { downcast(device).m_out_char_ram_func = callback; } static void static_set_pcb_read(device_t &device, cdp1869_pcb_read_delegate callback) { downcast(device).m_in_pcb_func = callback; } static void static_set_color_clock(device_t &device, int color_clock) { downcast(device).m_color_clock = color_clock; } - + DECLARE_PALETTE_INIT(cdp1869); virtual DECLARE_ADDRESS_MAP(io_map, 8); @@ -228,7 +228,7 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; virtual void device_start(); virtual void device_post_load(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/emu/sound/dmadac.c b/src/emu/sound/dmadac.c index 3b1f23dceda..7dab612ea64 100644 --- a/src/emu/sound/dmadac.c +++ b/src/emu/sound/dmadac.c @@ -46,7 +46,6 @@ void dmadac_sound_device::device_start() { - /* allocate a clear a buffer */ m_buffer = auto_alloc_array_clear(machine(), INT16, BUFFER_SIZE); @@ -186,7 +185,7 @@ void dmadac_set_volume(dmadac_sound_device **devlist, UINT8 num_channels, UINT16 /* flush out as much data as we can */ for (i = 0; i < num_channels; i++) - { + { devlist[i]->set_volume(volume); } } diff --git a/src/emu/sound/dmadac.h b/src/emu/sound/dmadac.h index 917f6fb5ce0..65bfe16b3ff 100644 --- a/src/emu/sound/dmadac.h +++ b/src/emu/sound/dmadac.h @@ -24,7 +24,7 @@ public: void enable(UINT8 enable); void set_frequency(double frequency); void set_volume(UINT16 volume); - + protected: // device-level overrides virtual void device_start(); diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c index 1bbf3cc411a..5b1433fdfd2 100644 --- a/src/emu/sound/es5503.c +++ b/src/emu/sound/es5503.c @@ -235,7 +235,7 @@ void es5503_device::device_start() m_irq_func.resolve_safe(); m_adc_func.resolve_safe(0); - + rege0 = 0xff; for (osc = 0; osc < 32; osc++) diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h index 17189eb19a6..1d649713b1d 100644 --- a/src/emu/sound/es5503.h +++ b/src/emu/sound/es5503.h @@ -13,7 +13,7 @@ #define MCFG_ES5503_IRQ_FUNC(_write) \ devcb = &es5503_device::static_set_irqf(*device, DEVCB2_##_write); - + #define MCFG_ES5503_ADC_FUNC(_read) \ devcb = &es5503_device::static_set_adcf(*device, DEVCB2_##_read); @@ -31,7 +31,7 @@ public: template static devcb2_base &static_set_irqf(device_t &device, _Object object) { return downcast(device).m_irq_func.set_callback(object); } template static devcb2_base &static_set_adcf(device_t &device, _Object object) { return downcast(device).m_adc_func.set_callback(object); } - + DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -53,8 +53,8 @@ protected: const address_space_config m_space_config; - devcb2_write_line m_irq_func; - devcb2_read8 m_adc_func; + devcb2_write_line m_irq_func; + devcb2_read8 m_adc_func; emu_timer *m_sync_timer; diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c index 12fe8c7e18a..1fc4e175c8a 100644 --- a/src/emu/sound/ics2115.c +++ b/src/emu/sound/ics2115.c @@ -30,7 +30,7 @@ void ics2115_device::device_start() m_timer[0].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_0),this), this); m_timer[1].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_1),this), this); m_stream = machine().sound().stream_alloc(*this, 0, 2, 33075); - + m_irq_cb.resolve_safe(); //Exact formula as per patent 5809466 diff --git a/src/emu/sound/k007232.h b/src/emu/sound/k007232.h index 17490780d80..6da2790a24b 100644 --- a/src/emu/sound/k007232.h +++ b/src/emu/sound/k007232.h @@ -12,14 +12,14 @@ #define MCFG_K007232_PORT_WRITE_HANDLER(_devcb) \ devcb = &k007232_device::set_port_write_handler(*device, DEVCB2_##_devcb); - + class k007232_device : public device_t, public device_sound_interface { public: k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k007232_device() {} - + template static devcb2_base &set_port_write_handler(device_t &device, _Object object) { return downcast(device).m_port_write_handler.set_callback(object); } DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h index 68dc107518e..53de3ba8a0c 100644 --- a/src/emu/sound/mos6560.h +++ b/src/emu/sound/mos6560.h @@ -138,7 +138,7 @@ class mos6560_device : public device_t, public: mos6560_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template static devcb2_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_potx.set_callback(object); } template static devcb2_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_poty.set_callback(object); } diff --git a/src/emu/sound/msm5205.h b/src/emu/sound/msm5205.h index 6d034da3de5..2b11592e39b 100644 --- a/src/emu/sound/msm5205.h +++ b/src/emu/sound/msm5205.h @@ -35,7 +35,7 @@ #define MCFG_MSM6585_VCLK_CB(_devcb) \ devcb = &msm6585_device::set_vclk_callback(*device, DEVCB2_##_devcb); - + class msm5205_device : public device_t, public device_sound_interface @@ -44,7 +44,7 @@ public: msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); msm5205_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~msm5205_device() {} - + static void set_prescaler_selector(device_t &device, int select) { downcast(device).m_select = select; } template static devcb2_base &set_vclk_callback(device_t &device, _Object object) { return downcast(device).m_vclk_cb.set_callback(object); } diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c index 71a9a89b875..fadae1a6ae7 100644 --- a/src/emu/sound/msm5232.c +++ b/src/emu/sound/msm5232.c @@ -26,7 +26,7 @@ void msm5232_device::device_start() { int rate = clock()/CLOCK_RATE_DIVIDER; int voicenum; - + m_gate_handler_cb.resolve(); init(clock(), rate); diff --git a/src/emu/sound/msm5232.h b/src/emu/sound/msm5232.h index ad5b3e92e2b..febcca4f1f2 100644 --- a/src/emu/sound/msm5232.h +++ b/src/emu/sound/msm5232.h @@ -6,7 +6,7 @@ #define MCFG_MSM5232_SET_CAPACITORS(_a, _b, _c, _d, _e, _f, _g, _h) \ msm5232_device::static_set_capacitors(*device, _a, _b, _c, _d, _e, _f, _g, _h); - + #define MCFG_MSM5232_GATE_HANDLER_CB(_devcb) \ devcb = &msm5232_device::set_gate_handler_callback(*device, DEVCB2_##_devcb); @@ -45,7 +45,7 @@ class msm5232_device : public device_t, public: msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~msm5232_device() {} - + static void static_set_capacitors(device_t &device, double cap1, double cap2, double cap3, double cap4, double cap5, double cap6, double cap7, double cap8); template static devcb2_base &set_gate_handler_callback(device_t &device, _Object object) { return downcast(device).m_gate_handler_cb.set_callback(object); } diff --git a/src/emu/sound/qs1000.c b/src/emu/sound/qs1000.c index 59a7be87f1e..4034e94e48f 100644 --- a/src/emu/sound/qs1000.c +++ b/src/emu/sound/qs1000.c @@ -239,7 +239,7 @@ void qs1000_device::device_start() m_out_p1_cb.resolve_safe(); m_out_p2_cb.resolve_safe(); m_out_p3_cb.resolve_safe(); - + //m_serial_w_cb.resolve_safe(); m_cpu->i8051_set_serial_rx_callback(read8_delegate(FUNC(qs1000_device::data_to_i8052),this)); diff --git a/src/emu/sound/qs1000.h b/src/emu/sound/qs1000.h index 5cf0623d5ae..6f8c1ac1977 100644 --- a/src/emu/sound/qs1000.h +++ b/src/emu/sound/qs1000.h @@ -38,9 +38,9 @@ #define MCFG_QS1000_OUT_P3_CB(_devcb) \ devcb = &qs1000_device::set_out_p3_callback(*device, DEVCB2_##_devcb); - + /*#define MCFG_QS1000_SERIAL_W_CB(_devcb) \ - devcb = &qs1000_device::set_serial_w_callback(*device, DEVCB2_##_devcb);*/ + devcb = &qs1000_device::set_serial_w_callback(*device, DEVCB2_##_devcb);*/ //************************************************************************** // TYPE DEFINITIONS @@ -67,7 +67,7 @@ public: template static devcb2_base &set_out_p2_callback(device_t &device, _Object object) { return downcast(device).m_out_p2_cb.set_callback(object); } template static devcb2_base &set_out_p3_callback(device_t &device, _Object object) { return downcast(device).m_out_p3_cb.set_callback(object); } //template static devcb2_base &set_serial_w_callback(device_t &device, _Object object) { return downcast(device).m_serial_w_cb.set_callback(object); } - + // external void serial_in(UINT8 data); void set_irq(int state); @@ -113,7 +113,7 @@ public: void set_voice_regs(int ch); bool m_external_rom; - + // Callbacks devcb2_read8 m_in_p1_cb; devcb2_read8 m_in_p2_cb; diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c index 2a2e8fb9c0b..51ac2e769b6 100644 --- a/src/emu/sound/qsound.c +++ b/src/emu/sound/qsound.c @@ -11,7 +11,7 @@ Many thanks to CAB (the author of Amuse), without whom this probably would never have been finished. - + TODO: - hook up the DSP! - is master volume really linear? @@ -116,7 +116,7 @@ void qsound_device::device_start() // create pan table for (int i = 0; i < 33; i++) m_pan_table[i] = (int)((256 / sqrt(32.0)) * sqrt((double)i)); - + // init sound regs memset(m_channel, 0, sizeof(m_channel)); @@ -165,18 +165,18 @@ void qsound_device::sound_stream_update(sound_stream &stream, stream_sample_t ** m_channel[ch].address += (m_channel[ch].step_ptr >> 12); m_channel[ch].step_ptr &= 0xfff; m_channel[ch].step_ptr += m_channel[ch].freq; - + if (m_channel[ch].address >= m_channel[ch].end) { if (m_channel[ch].loop) { // Reached the end, restart the loop m_channel[ch].address -= m_channel[ch].loop; - + // Make sure we don't overflow (what does the real chip do in this case?) if (m_channel[ch].address >= m_channel[ch].end) m_channel[ch].address = m_channel[ch].end - m_channel[ch].loop; - + m_channel[ch].address &= 0xffff; } else @@ -186,7 +186,7 @@ void qsound_device::sound_stream_update(sound_stream &stream, stream_sample_t ** break; } } - + INT8 sample = read_sample(m_channel[ch].bank | m_channel[ch].address); *lmix++ += ((sample * m_channel[ch].lvol * m_channel[ch].vol) >> 14); *rmix++ += ((sample * m_channel[ch].rvol * m_channel[ch].vol) >> 14); @@ -237,7 +237,7 @@ void qsound_device::write_data(UINT8 address, UINT16 data) ch = address >> 3; reg = address & 7; } - + // >= 0x80 is probably for the dsp? else if (address < 0x90) { @@ -312,12 +312,12 @@ void qsound_device::write_data(UINT8 address, UINT16 data) pan = 0x20; if (pan < 0) pan = 0; - + m_channel[ch].rvol = m_pan_table[pan]; m_channel[ch].lvol = m_pan_table[0x20 - pan]; break; } - + case 9: // unknown break; diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index 5d429d8442e..12553092b23 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -173,7 +173,7 @@ scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_ memset(m_MidiStack, 0, sizeof(m_MidiStack)); memset(m_LPANTABLE, 0, sizeof(m_LPANTABLE)); memset(m_RPANTABLE, 0, sizeof(m_RPANTABLE)); - memset(m_TimPris, 0, sizeof(m_TimPris)); + memset(m_TimPris, 0, sizeof(m_TimPris)); memset(m_ARTABLE, 0, sizeof(m_ARTABLE)); memset(m_DRTABLE, 0, sizeof(m_DRTABLE)); memset(m_EG_TABLE, 0, sizeof(m_EG_TABLE)); @@ -187,8 +187,8 @@ scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_ memset(m_ALFO_NOI, 0, sizeof(m_ALFO_NOI)); memset(m_PSCALES, 0, sizeof(m_PSCALES)); memset(m_ASCALES, 0, sizeof(m_ASCALES)); - memset(&m_Slots, 0, sizeof(m_Slots)); - memset(&m_udata.data, 0, sizeof(m_udata.data)); + memset(&m_Slots, 0, sizeof(m_Slots)); + memset(&m_udata.data, 0, sizeof(m_udata.data)); m_TimCnt[0] = 0; m_TimCnt[1] = 0; m_TimCnt[2] = 0; @@ -205,7 +205,7 @@ void scsp_device::device_start() // set up the IRQ callbacks m_irq_cb.resolve_safe(); - m_main_irq_cb.resolve_safe(); + m_main_irq_cb.resolve_safe(); m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100, this); } @@ -219,7 +219,7 @@ void scsp_device::sound_stream_update(sound_stream &stream, stream_sample_t **in m_bufferl = outputs[0]; m_bufferr = outputs[1]; m_length = samples; - DoMasterSamples(samples); + DoMasterSamples(samples); } unsigned char scsp_device::DecodeSCI(unsigned char irq) @@ -937,7 +937,7 @@ void scsp_device::w16(address_space &space,unsigned int addr,unsigned short val) *((unsigned short *) (m_DSP.COEF+(addr-0x700)/2))=val; else if(addr<0x7c0) *((unsigned short *) (m_DSP.MADRS+(addr-0x780)/2))=val; - else if(addr<0x800) // MADRS is mirrored twice + else if(addr<0x800) // MADRS is mirrored twice *((unsigned short *) (m_DSP.MADRS+(addr-0x7c0)/2))=val; else if(addr<0xC00) { diff --git a/src/emu/sound/scsp.h b/src/emu/sound/scsp.h index cd66eb8f6c8..7c7e200cf3f 100644 --- a/src/emu/sound/scsp.h +++ b/src/emu/sound/scsp.h @@ -21,10 +21,10 @@ #define MCFG_SCSP_MAIN_IRQ_CB(_devcb) \ devcb = &scsp_device::set_main_irq_callback(*device, DEVCB2_##_devcb); - + enum SCSP_STATE {SCSP_ATTACK,SCSP_DECAY1,SCSP_DECAY2,SCSP_RELEASE}; - + struct SCSP_EG_t { int volume; // @@ -56,7 +56,7 @@ struct SCSP_SLOT UINT16 data[0x10]; //only 0x1a bytes used UINT8 datab[0x20]; } udata; - + UINT8 Backwards; //the wave is playing backwards UINT8 active; //this slot is currently playing UINT8 *base; //samples base address @@ -76,7 +76,7 @@ class scsp_device : public device_t, { public: scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + static void set_roffset(device_t &device, int roffset) { downcast(device).m_roffset = roffset; } template static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb2_base &set_main_irq_callback(device_t &device, _Object object) { return downcast(device).m_main_irq_cb.set_callback(object); } @@ -88,7 +88,7 @@ public: // MIDI I/O access (used for comms on Model 2/3) DECLARE_WRITE16_MEMBER( midi_in ); DECLARE_READ16_MEMBER( midi_out_r ); - + void set_ram_base(void *base); protected: @@ -97,18 +97,18 @@ protected: // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); - + private: int m_roffset; /* offset in the region */ - devcb2_write8 m_irq_cb; /* irq callback */ + devcb2_write8 m_irq_cb; /* irq callback */ devcb2_write_line m_main_irq_cb; - + union { UINT16 data[0x30/2]; UINT8 datab[0x30]; } m_udata; - + SCSP_SLOT m_Slots[32]; signed short m_RINGBUF[128]; unsigned char m_BUFPTR; @@ -130,7 +130,7 @@ private: UINT8 m_MidiOutW, m_MidiOutR; UINT8 m_MidiStack[32]; UINT8 m_MidiW, m_MidiR; - + INT32 m_EG_TABLE[0x400]; int m_LPANTABLE[0x10000]; @@ -158,20 +158,20 @@ private: int m_ARTABLE[64], m_DRTABLE[64]; SCSPDSP m_DSP; - + stream_sample_t *m_bufferl; stream_sample_t *m_bufferr; int m_length; signed short *m_RBUFDST; //this points to where the sample will be stored in the RingBuf - + //LFO int m_PLFO_TRI[256], m_PLFO_SQR[256], m_PLFO_SAW[256], m_PLFO_NOI[256]; int m_ALFO_TRI[256], m_ALFO_SQR[256], m_ALFO_SAW[256], m_ALFO_NOI[256]; int m_PSCALES[8][256]; int m_ASCALES[8][256]; - + void exec_dma(address_space &space); /*state DMA transfer function*/ unsigned char DecodeSCI(unsigned char irq); void CheckPendingIRQ(); @@ -198,7 +198,7 @@ private: unsigned short r16(address_space &space, unsigned int addr); inline INT32 UpdateSlot(SCSP_SLOT *slot); void DoMasterSamples(int nsamples); - + //LFO void LFO_Init(); signed int PLFO_Step(SCSP_LFO_t *LFO); diff --git a/src/emu/sound/sp0256.h b/src/emu/sound/sp0256.h index 2ea19f29c65..2f93af5836b 100644 --- a/src/emu/sound/sp0256.h +++ b/src/emu/sound/sp0256.h @@ -74,10 +74,10 @@ class sp0256_device : public device_t, public: sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sp0256_device() { } - + template static devcb2_base &set_data_request_callback(device_t &device, _Object object) { return downcast(device).m_drq_cb.set_callback(object); } template static devcb2_base &set_standby_callback(device_t &device, _Object object) { return downcast(device).m_sby_cb.set_callback(object); } - + DECLARE_WRITE8_MEMBER(ald_w); DECLARE_READ_LINE_MEMBER(lrq_r); DECLARE_READ_LINE_MEMBER(sby_r); @@ -101,8 +101,8 @@ private: void micro(); sound_stream *m_stream; /* MAME core sound stream */ - devcb2_write_line m_drq_cb; /* Data request callback */ - devcb2_write_line m_sby_cb; /* Standby callback */ + devcb2_write_line m_drq_cb; /* Data request callback */ + devcb2_write_line m_sby_cb; /* Standby callback */ int m_sby_line; /* Standby line state */ int m_cur_len; /* Fullness of current sound buffer. */ diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c index 808b1180ae8..f6ee4e95a49 100644 --- a/src/emu/sound/spu.c +++ b/src/emu/sound/spu.c @@ -138,13 +138,13 @@ static const unsigned int /*sound_buffer_size=65536*4,*/ output_buffer_size=65536/8/*, - sample_loop_cache_pool_size=64, - sample_loop_cache_extend_size=64, - sample_cache_pool_size=64, - sample_cache_extend_size=64, + sample_loop_cache_pool_size=64, + sample_loop_cache_extend_size=64, + sample_cache_pool_size=64, + sample_cache_extend_size=64, - stream_marker_pool_size=64, - stream_marker_extend_size=64*/; + stream_marker_pool_size=64, + stream_marker_extend_size=64*/; // // diff --git a/src/emu/sound/tc8830f.c b/src/emu/sound/tc8830f.c index 07a8d9ca27c..3ef03fb8578 100644 --- a/src/emu/sound/tc8830f.c +++ b/src/emu/sound/tc8830f.c @@ -111,22 +111,22 @@ void tc8830f_device::sound_stream_update(sound_stream &stream, stream_sample_t * m_delta -= 8; if (m_delta <= 0) m_delta = 1; - + // determine direction if (bit) m_output += m_delta; else m_output -= m_delta; - + if (m_output > 32767) m_output = 32767; else if (m_output < -32768) m_output = -32768; - + m_prevbits = m_prevbits << 1 | bit; mix = m_output; } - + outputs[0][i] = mix; } } diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c index 68788ae5861..11305f49533 100644 --- a/src/emu/sound/upd7759.c +++ b/src/emu/sound/upd7759.c @@ -220,7 +220,7 @@ void upd775x_device::device_start() void upd7759_device::device_start() { m_drqcallback.resolve_safe(); - + /* chip configuration */ m_sample_offset_shift = (type() == UPD7759) ? 1 : 0; @@ -295,7 +295,7 @@ void upd7759_device::device_start() void upd7756_device::device_start() { m_drqcallback.resolve_safe(); - + /* chip configuration */ m_sample_offset_shift = (type() == UPD7759) ? 1 : 0; diff --git a/src/emu/sound/upd7759.h b/src/emu/sound/upd7759.h index ae315315bbb..a711df62a31 100644 --- a/src/emu/sound/upd7759.h +++ b/src/emu/sound/upd7759.h @@ -22,7 +22,7 @@ public: ~upd775x_device() {} template static devcb2_base &set_drq_callback(device_t &device, _Object object) { return downcast(device).m_drqcallback.set_callback(object); } - + void set_bank_base(offs_t base); void reset_w(UINT8 data); @@ -82,7 +82,7 @@ protected: UINT32 m_rommask; /* maximum address offset */ devcb2_write_line m_drqcallback; - + void update_adpcm(int data); void advance_state(); }; diff --git a/src/emu/sound/votrax.h b/src/emu/sound/votrax.h index 85acea086d2..38a31ae4d58 100644 --- a/src/emu/sound/votrax.h +++ b/src/emu/sound/votrax.h @@ -38,7 +38,7 @@ public: votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb2_base &set_request_callback(device_t &device, _Object object) { return downcast(device).m_request_cb.set_callback(object); } - + // writers DECLARE_WRITE8_MEMBER( write ); DECLARE_WRITE8_MEMBER( inflection_w ); @@ -73,7 +73,7 @@ private: UINT8 m_phoneme; // 6-bit phoneme value // outputs - devcb2_write_line m_request_cb; // callback for request + devcb2_write_line m_request_cb; // callback for request UINT8 m_request_state; // request as seen to the outside world UINT8 m_internal_request; // request managed by stream timing diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c index b2b7797a88a..c869a6f689a 100644 --- a/src/emu/sound/ymf278b.c +++ b/src/emu/sound/ymf278b.c @@ -267,7 +267,7 @@ void ymf278b_device::sound_stream_update(sound_stream &stream, stream_sample_t * if (slot->stepptr >= slot->endaddr) { slot->stepptr = slot->stepptr - slot->endaddr + slot->loopaddr; - + // NOTE: loop overflow is still possible here if (slot->stepptr >= slot->endaddr) // This glitch may be (ab)used to your advantage to create pseudorandom noise. } diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c index 597f9f5b64f..683937a3511 100644 --- a/src/emu/sound/ymz280b.c +++ b/src/emu/sound/ymz280b.c @@ -505,7 +505,7 @@ void ymz280b_device::sound_stream_update(sound_stream &stream, stream_sample_t * if (samples_left || voice->ended) { voice->ended = false; - + /* if there are leftovers, ramp back to 0 */ int base = new_samples - samples_left; int i, t = (base == 0) ? curr : m_scratch[base - 1]; diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c index 19766e0ecc6..b9dd8bd3272 100644 --- a/src/emu/sound/zsg2.c +++ b/src/emu/sound/zsg2.c @@ -89,10 +89,10 @@ void zsg2_device::device_start() m_mem_base = *region(); m_mem_size = region()->bytes(); m_mem_blocks = m_mem_size / 4; - + m_mem_copy = auto_alloc_array_clear(machine(), UINT32, m_mem_blocks); m_full_samples = auto_alloc_array_clear(machine(), INT16, m_mem_blocks * 4 + 4); // +4 is for empty block - + // register for savestates save_pointer(NAME(m_mem_copy), m_mem_blocks / sizeof(UINT32)); save_pointer(NAME(m_full_samples), (m_mem_blocks * 4 + 4) / sizeof(INT16)); @@ -129,7 +129,7 @@ void zsg2_device::device_reset() control_w(4, 0xffff); control_w(5, 0xffff); control_w(6, 0xffff); - + for (int ch = 0; ch < 48; ch++) for (int reg = 0; reg < 0x10; reg++) chan_w(ch, reg, 0); @@ -155,20 +155,20 @@ INT16 *zsg2_device::prepare_samples(UINT32 offset) if (block == 0) return &m_full_samples[m_mem_blocks]; // overflow or 0 - + if (block == m_mem_copy[offset]) return &m_full_samples[offset * 4]; // cached - + m_mem_copy[offset] = block; offset *= 4; - + // decompress 32 byte block to 4 16-bit samples // 42222222 51111111 60000000 ssss3333 m_full_samples[offset|0] = block >> 8 & 0x7f; m_full_samples[offset|1] = block >> 16 & 0x7f; m_full_samples[offset|2] = block >> 24 & 0x7f; m_full_samples[offset|3] = (block >> (8+1) & 0x40) | (block >> (16+2) & 0x20) | (block >> (24+3) & 0x10) | (block & 0xf); - + // sign-extend and shift UINT8 shift = block >> 4 & 0xf; for (int i = offset; i < (offset + 4); i++) @@ -176,7 +176,7 @@ INT16 *zsg2_device::prepare_samples(UINT32 offset) m_full_samples[i] <<= 9; m_full_samples[i] >>= shift; } - + return &m_full_samples[offset]; } @@ -197,7 +197,7 @@ void zsg2_device::sound_stream_update(sound_stream &stream, stream_sample_t **in { if (!m_chan[ch].is_playing) continue; - + m_chan[ch].step_ptr += m_chan[ch].step; if (m_chan[ch].step_ptr & 0x40000) { @@ -215,9 +215,9 @@ void zsg2_device::sound_stream_update(sound_stream &stream, stream_sample_t **in } m_chan[ch].samples = prepare_samples(m_chan[ch].page | m_chan[ch].cur_pos); } - + INT32 sample = (m_chan[ch].samples[m_chan[ch].step_ptr >> 16 & 3] * m_chan[ch].vol) >> 16; - + mix_l += (sample * m_chan[ch].panl + sample * (0x1f - m_chan[ch].panr)) >> 5; mix_r += (sample * m_chan[ch].panr + sample * (0x1f - m_chan[ch].panl)) >> 5; } @@ -246,15 +246,15 @@ void zsg2_device::chan_w(int ch, int reg, UINT16 data) m_chan[ch].start_pos = (m_chan[ch].start_pos & 0x00ff) | (data << 8 & 0xff00); m_chan[ch].page = data << 8 & 0xff0000; break; - + case 0x2: // no function? always 0 break; - + case 0x3: // unknown, always 0x0400 break; - + case 0x4: // frequency m_chan[ch].step = data + 1; @@ -266,7 +266,7 @@ void zsg2_device::chan_w(int ch, int reg, UINT16 data) m_chan[ch].loop_pos = (m_chan[ch].loop_pos & 0xff00) | (data & 0xff); m_chan[ch].panr = data >> 8 & 0x1f; break; - + case 0x6: // end address m_chan[ch].end_pos = data; @@ -278,26 +278,26 @@ void zsg2_device::chan_w(int ch, int reg, UINT16 data) m_chan[ch].loop_pos = (m_chan[ch].loop_pos & 0x00ff) | (data << 8 & 0xff00); m_chan[ch].panl = data >> 8 & 0x1f; break; - + case 0x9: // no function? always 0 break; - + case 0xb: // always writes 0 // this register is read-only break; - + case 0xe: // volume m_chan[ch].vol = data; break; - + case 0xf: // flags m_chan[ch].flags = data; break; - + default: break; } @@ -316,7 +316,7 @@ UINT16 zsg2_device::chan_r(int ch, int reg) default: break; } - + return m_chan[ch].v[reg]; } @@ -397,7 +397,7 @@ UINT16 zsg2_device::control_r(int reg) default: break; } - + return 0; } diff --git a/src/emu/sound/zsg2.h b/src/emu/sound/zsg2.h index 5040c5e5370..cf9450128a1 100644 --- a/src/emu/sound/zsg2.h +++ b/src/emu/sound/zsg2.h @@ -74,7 +74,7 @@ private: INT16 *m_full_samples; sound_stream *m_stream; - + devcb2_read32 m_ext_read_handler; UINT32 read_memory(UINT32 offset); diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index ba1f7bc26dd..0ff5f507f4d 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -438,7 +438,7 @@ struct tile_data UINT8 flags; // defaults to 0; one or more of TILE_* flags above UINT8 pen_mask; // defaults to 0xff; mask to apply to pen_data while rendering the tile UINT8 gfxnum; // defaults to 0xff; specify index of gfx for auto-invalidation on dirty - + void set(int _gfxnum, int rawcode, int rawcolor, int _flags) { gfx_element *gfx = decoder->gfx(_gfxnum); diff --git a/src/emu/ui/barcode.c b/src/emu/ui/barcode.c index a5c7db0c9dd..fcf1b06444a 100644 --- a/src/emu/ui/barcode.c +++ b/src/emu/ui/barcode.c @@ -1,9 +1,9 @@ /*************************************************************************** - ui/barcode.c - - MESS's "barcode reader" control - + ui/barcode.c + + MESS's "barcode reader" control + Copyright Nicola Salmoria and the MAME Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -21,9 +21,9 @@ /************************************************** - + BARCODE INPUT MENU - + **************************************************/ @@ -67,7 +67,7 @@ void ui_menu_barcode_code::populate() } item_append("New Barcode:", new_barcode, 0, ITEMREF_NEW_BARCODE); - + // finish up the menu item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL); item_append("Enter Code", NULL, 0, ITEMREF_ENTER); @@ -108,12 +108,12 @@ void ui_menu_barcode_code::handle() } } break; - + case IPT_SPECIAL: if (get_selection() == ITEMREF_NEW_BARCODE) { int buflen = strlen(m_barcode_buffer); - + // if it's a backspace and we can handle it, do so if ((event->unichar == 8 || event->unichar == 0x7f) && buflen > 0) *(char *)utf8_previous_char(&m_barcode_buffer[buflen]) = 0; @@ -140,7 +140,7 @@ void ui_menu_barcode_code::handle() /************************************************** READER MENU - + **************************************************/ //------------------------------------------------- @@ -168,14 +168,14 @@ ui_menu_barcode_reader::~ui_menu_barcode_reader() void ui_menu_barcode_reader::populate() { astring buffer; - + barcode_reader_device_iterator iter(machine().config().root_device()); for (const barcode_reader_device *bcreader = iter.first(); bcreader != NULL; bcreader = iter.next()) { char label[0x400]; sprintf(label,"[%s (%s)]",bcreader->name(),bcreader->basetag()); item_append(label, NULL, 0, (void *)bcreader); - } + } } @@ -187,7 +187,7 @@ void ui_menu_barcode_reader::handle() { // process the menu const ui_menu_event *event = process(0); - + // process the event if (event != NULL && event->iptkey == IPT_UI_SELECT) { @@ -195,6 +195,6 @@ void ui_menu_barcode_reader::handle() { ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_barcode_code(machine(), container, (barcode_reader_device *)event->itemref))); } - + } } diff --git a/src/emu/ui/barcode.h b/src/emu/ui/barcode.h index c467fff8f38..46dbe981ad0 100644 --- a/src/emu/ui/barcode.h +++ b/src/emu/ui/barcode.h @@ -22,7 +22,7 @@ public: virtual ~ui_menu_barcode_code(); virtual void populate(); virtual void handle(); - + private: barcode_reader_device *m_reader; char m_barcode_buffer[20]; diff --git a/src/emu/ui/devctrl.h b/src/emu/ui/devctrl.h index 5cc246cb567..24a7b743d8b 100644 --- a/src/emu/ui/devctrl.h +++ b/src/emu/ui/devctrl.h @@ -23,7 +23,7 @@ public: protected: _DeviceType *current_device() { return m_device; } int count() { return m_count; } - + int current_index(); void previous(); void next(); @@ -32,8 +32,8 @@ private: // device iterator typedef device_type_iterator<&device_creator<_DeviceType>, _DeviceType> iterator; - _DeviceType * m_device; - int m_count; + _DeviceType * m_device; + int m_count; }; diff --git a/src/emu/ui/filemngr.c b/src/emu/ui/filemngr.c index 1650145277d..ef7bb0838e1 100644 --- a/src/emu/ui/filemngr.c +++ b/src/emu/ui/filemngr.c @@ -134,5 +134,3 @@ void ui_menu_file_manager::handle() } } } - - diff --git a/src/emu/ui/filesel.c b/src/emu/ui/filesel.c index ed275f255a5..403ccb4268e 100644 --- a/src/emu/ui/filesel.c +++ b/src/emu/ui/filesel.c @@ -203,14 +203,14 @@ static int is_valid_filename_char(unicode_char unichar) // this should really be in the OSD layer static const char valid_filename_char[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00-0f - 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 10-1f - 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, // !"#$%&'()*+,-./ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, // 0123456789:;<=>? - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // @ABCDEFGHIJKLMNO - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, // PQRSTUVWXYZ[\]^_ - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // `abcdefghijklmno - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, // pqrstuvwxyz{|}~ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00-0f + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 10-1f + 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, // !"#$%&'()*+,-./ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, // 0123456789:;<=>? + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // @ABCDEFGHIJKLMNO + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, // PQRSTUVWXYZ[\]^_ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // `abcdefghijklmno + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, // pqrstuvwxyz{|}~ }; return (unichar < ARRAY_LENGTH(valid_filename_char)) && valid_filename_char[unichar]; } @@ -222,8 +222,8 @@ static int is_valid_filename_char(unicode_char unichar) ui_menu_file_create::ui_menu_file_create(running_machine &machine, render_container *container, device_image_interface *image, astring ¤t_directory, astring ¤t_file) : ui_menu(machine, container), - m_current_directory(current_directory), - m_current_file(current_file) + m_current_directory(current_directory), + m_current_file(current_file) { m_image = image; } @@ -344,8 +344,8 @@ void ui_menu_file_create::handle() ui_menu_file_selector::ui_menu_file_selector(running_machine &machine, render_container *container, device_image_interface *image, astring ¤t_directory, astring ¤t_file, bool has_empty, bool has_softlist, bool has_create, int *result) : ui_menu(machine, container), - m_current_directory(current_directory), - m_current_file(current_file) + m_current_directory(current_directory), + m_current_file(current_file) { m_image = image; m_has_empty = has_empty; diff --git a/src/emu/ui/filesel.h b/src/emu/ui/filesel.h index 4e741a8e4a3..f32e87cf7b7 100644 --- a/src/emu/ui/filesel.h +++ b/src/emu/ui/filesel.h @@ -41,11 +41,11 @@ public: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2); private: - device_image_interface * m_image; - astring & m_current_directory; - astring & m_current_file; - const image_device_format * m_current_format; - char m_filename_buffer[1024]; + device_image_interface * m_image; + astring & m_current_directory; + astring & m_current_file; + const image_device_format * m_current_format; + char m_filename_buffer[1024]; }; @@ -82,15 +82,15 @@ private: }; // internal state - device_image_interface * m_image; - astring & m_current_directory; - astring & m_current_file; - bool m_has_empty; - bool m_has_softlist; - bool m_has_create; - int * m_result; - file_selector_entry * m_entrylist; - char m_filename_buffer[1024]; + device_image_interface * m_image; + astring & m_current_directory; + astring & m_current_file; + bool m_has_empty; + bool m_has_softlist; + bool m_has_create; + int * m_result; + file_selector_entry * m_entrylist; + char m_filename_buffer[1024]; // methods int compare_entries(const file_selector_entry *e1, const file_selector_entry *e2); @@ -113,10 +113,10 @@ public: private: // internal state - floppy_image_format_t ** m_formats; - int m_ext_match; - int m_total_usable; - int * m_result; + floppy_image_format_t ** m_formats; + int m_ext_match; + int m_total_usable; + int * m_result; }; @@ -134,8 +134,8 @@ public: private: // internal state - bool m_can_in_place; - int * m_result; + bool m_can_in_place; + int * m_result; }; // helper diff --git a/src/emu/ui/imgcntrl.c b/src/emu/ui/imgcntrl.c index 82b37b376fb..7d451863d5f 100644 --- a/src/emu/ui/imgcntrl.c +++ b/src/emu/ui/imgcntrl.c @@ -119,7 +119,7 @@ void ui_menu_control_device_image::test_create(bool &can_create, bool &need_conf need_confirm = false; break; } - + if (entry != NULL) osd_free(entry); } diff --git a/src/emu/ui/imginfo.c b/src/emu/ui/imginfo.c index 2eaccfdaee6..9fc80b82a07 100644 --- a/src/emu/ui/imginfo.c +++ b/src/emu/ui/imginfo.c @@ -186,5 +186,3 @@ void ui_menu_image_info::image_info_astring(running_machine &machine, astring &s } } } - - diff --git a/src/emu/ui/mainmenu.c b/src/emu/ui/mainmenu.c index 5b48a80c153..341a3c1dc01 100644 --- a/src/emu/ui/mainmenu.c +++ b/src/emu/ui/mainmenu.c @@ -246,11 +246,11 @@ void ui_menu_main::handle() case BIOS_SELECTION: ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_bios_selection(machine(), container))); break; - + case BARCODE_READ: ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_barcode_reader(machine(), container))); break; - + default: fatalerror("ui_menu_main::handle - unknown reference\n"); } diff --git a/src/emu/ui/menu.c b/src/emu/ui/menu.c index 3e35ee3a6c5..6e5c8f09297 100644 --- a/src/emu/ui/menu.c +++ b/src/emu/ui/menu.c @@ -83,10 +83,10 @@ void ui_menu::init(running_machine &machine) { int x; - // initialize the menu stack + // initialize the menu stack ui_menu::stack_reset(machine); - // create a texture for hilighting items + // create a texture for hilighting items hilight_bitmap = auto_bitmap_rgb32_alloc(machine, 256, 1); for (x = 0; x < 256; x++) { @@ -98,10 +98,10 @@ void ui_menu::init(running_machine &machine) hilight_texture = machine.render().texture_alloc(); hilight_texture->set_bitmap(*hilight_bitmap, hilight_bitmap->cliprect(), TEXFORMAT_ARGB32); - // create a texture for arrow icons + // create a texture for arrow icons arrow_texture = machine.render().texture_alloc(render_triangle); - // add an exit callback to free memory + // add an exit callback to free memory machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(ui_menu::exit), &machine)); } @@ -112,11 +112,11 @@ void ui_menu::init(running_machine &machine) void ui_menu::exit(running_machine &machine) { - // free menus + // free menus ui_menu::stack_reset(machine); ui_menu::clear_free_list(machine); - // free textures + // free textures machine.render().texture_free(hilight_texture); machine.render().texture_free(arrow_texture); } @@ -146,7 +146,7 @@ ui_menu::ui_menu(running_machine &machine, render_container *_container) : m_mac ui_menu::~ui_menu() { - // free the pools + // free the pools while (pool) { ui_menu_pool *ppool = pool; @@ -154,7 +154,7 @@ ui_menu::~ui_menu() auto_free(machine(), ppool); } - // free the item array + // free the item array if (item) auto_free(machine(), item); } @@ -167,7 +167,7 @@ ui_menu::~ui_menu() void ui_menu::reset(ui_menu_reset_options options) { - // based on the reset option, set the reset info + // based on the reset option, set the reset info resetpos = 0; resetref = NULL; if (options == UI_MENU_RESET_REMEMBER_POSITION) @@ -175,7 +175,7 @@ void ui_menu::reset(ui_menu_reset_options options) else if (options == UI_MENU_RESET_REMEMBER_REF) resetref = item[selected].ref; - // reset all the pools and the numitems back to 0 + // reset all the pools and the numitems back to 0 for (ui_menu_pool *ppool = pool; ppool != NULL; ppool = ppool->next) ppool->top = (UINT8 *)(ppool + 1); numitems = 0; @@ -184,7 +184,7 @@ void ui_menu::reset(ui_menu_reset_options options) astring backtext; backtext.printf("Return to %s",emulator_info::get_capstartgamenoun()); - // add an item to return + // add an item to return if (parent == NULL) item_append(backtext.cstr(), NULL, 0, NULL); else if (parent->is_special_main_menu()) @@ -237,15 +237,15 @@ void ui_menu::item_append(const char *text, const char *subtext, UINT32 flags, v ui_menu_item *pitem; int index; - // only allow multiline as the first item + // only allow multiline as the first item if ((flags & MENU_FLAG_MULTILINE) != 0) assert(numitems == 1); - // only allow a single multi-line item + // only allow a single multi-line item else if (numitems >= 2) assert((item[0].flags & MENU_FLAG_MULTILINE) == 0); - // realloc the item array if necessary + // realloc the item array if necessary if (numitems >= allocitems) { int olditems = allocitems; @@ -258,21 +258,21 @@ void ui_menu::item_append(const char *text, const char *subtext, UINT32 flags, v } index = numitems++; - // copy the previous last item to the next one + // copy the previous last item to the next one if (index != 0) { index--; item[index + 1] = item[index]; } - // allocate a new item and populate it + // allocate a new item and populate it pitem = &item[index]; pitem->text = (text != NULL) ? pool_strdup(text) : NULL; pitem->subtext = (subtext != NULL) ? pool_strdup(subtext) : NULL; pitem->flags = flags; pitem->ref = ref; - // update the selection if we need to + // update the selection if we need to if (resetpos == index || (resetref != NULL && resetref == ref)) selected = index; if (resetpos == numitems - 1) @@ -287,30 +287,30 @@ void ui_menu::item_append(const char *text, const char *subtext, UINT32 flags, v const ui_menu_event *ui_menu::process(UINT32 flags) { - // reset the menu_event + // reset the menu_event menu_event.iptkey = IPT_INVALID; - // first make sure our selection is valid + // first make sure our selection is valid validate_selection(1); - // draw the menu + // draw the menu if (numitems > 1 && (item[0].flags & MENU_FLAG_MULTILINE) != 0) draw_text_box(); else draw(flags & UI_MENU_PROCESS_CUSTOM_ONLY); - // process input + // process input if (!(flags & UI_MENU_PROCESS_NOKEYS)) { - // read events + // read events handle_events(); - // handle the keys if we don't already have an menu_event + // handle the keys if we don't already have an menu_event if (menu_event.iptkey == IPT_INVALID) handle_keys(flags); } - // update the selected item in the menu_event + // update the selected item in the menu_event if (menu_event.iptkey != IPT_INVALID && selected >= 0 && selected < numitems) { menu_event.itemref = item[selected].ref; @@ -331,7 +331,7 @@ void *ui_menu::m_pool_alloc(size_t size) assert(size < UI_MENU_POOL_SIZE); - // find a pool with enough room + // find a pool with enough room for (ppool = pool; ppool != NULL; ppool = ppool->next) if (ppool->end - ppool->top >= size) { @@ -340,10 +340,10 @@ void *ui_menu::m_pool_alloc(size_t size) return result; } - // allocate a new pool + // allocate a new pool ppool = (ui_menu_pool *)auto_alloc_array_clear(machine(), UINT8, sizeof(*ppool) + UI_MENU_POOL_SIZE); - // wire it up + // wire it up ppool->next = pool; pool = ppool; ppool->top = (UINT8 *)(ppool + 1); @@ -423,7 +423,7 @@ void ui_menu::draw(bool customonly) INT32 mouse_target_x, mouse_target_y; float mouse_x = -1, mouse_y = -1; - // compute the width and height of the full menu + // compute the width and height of the full menu visible_width = 0; visible_main_menu_height = 0; for (itemnum = 0; itemnum < numitems; itemnum++) @@ -431,47 +431,47 @@ void ui_menu::draw(bool customonly) const ui_menu_item &pitem = item[itemnum]; float total_width; - // compute width of left hand side + // compute width of left hand side total_width = gutter_width + machine().ui().get_string_width(pitem.text) + gutter_width; - // add in width of right hand side + // add in width of right hand side if (pitem.subtext) total_width += 2.0f * gutter_width + machine().ui().get_string_width(pitem.subtext); - // track the maximum + // track the maximum if (total_width > visible_width) visible_width = total_width; - // track the height as well + // track the height as well visible_main_menu_height += line_height; } - // account for extra space at the top and bottom + // account for extra space at the top and bottom visible_extra_menu_height = customtop + custombottom; - // add a little bit of slop for rounding + // add a little bit of slop for rounding visible_width += 0.01f; visible_main_menu_height += 0.01f; - // if we are too wide or too tall, clamp it down + // if we are too wide or too tall, clamp it down if (visible_width + 2.0f * UI_BOX_LR_BORDER > 1.0f) visible_width = 1.0f - 2.0f * UI_BOX_LR_BORDER; - // if the menu and extra menu won't fit, take away part of the regular menu, it will scroll + // if the menu and extra menu won't fit, take away part of the regular menu, it will scroll if (visible_main_menu_height + visible_extra_menu_height + 2.0f * UI_BOX_TB_BORDER > 1.0f) visible_main_menu_height = 1.0f - 2.0f * UI_BOX_TB_BORDER - visible_extra_menu_height; visible_lines = floor(visible_main_menu_height / line_height); visible_main_menu_height = (float)visible_lines * line_height; - // compute top/left of inner menu area by centering + // compute top/left of inner menu area by centering visible_left = (1.0f - visible_width) * 0.5f; visible_top = (1.0f - (visible_main_menu_height + visible_extra_menu_height)) * 0.5f; - // if the menu is at the bottom of the extra, adjust + // if the menu is at the bottom of the extra, adjust visible_top += customtop; - // first add us a box + // first add us a box x1 = visible_left - UI_BOX_LR_BORDER; y1 = visible_top - UI_BOX_TB_BORDER; x2 = visible_left + visible_width + UI_BOX_LR_BORDER; @@ -479,18 +479,18 @@ void ui_menu::draw(bool customonly) if (!customonly) machine().ui().draw_outlined_box(container, x1, y1, x2, y2, UI_BACKGROUND_COLOR); - // determine the first visible line based on the current selection + // determine the first visible line based on the current selection top_line = selected - visible_lines / 2; if (top_line < 0) top_line = 0; if (top_line + visible_lines >= numitems) top_line = numitems - visible_lines; - // determine effective positions taking into account the hilighting arrows + // determine effective positions taking into account the hilighting arrows effective_width = visible_width - 2.0f * gutter_width; effective_left = visible_left + gutter_width; - // locate mouse + // locate mouse mouse_hit = false; mouse_button = false; if (!customonly) @@ -501,7 +501,7 @@ void ui_menu::draw(bool customonly) mouse_hit = true; } - // loop over visible lines + // loop over visible lines hover = numitems + 1; if (!customonly) for (linenum = 0; linenum < visible_lines; linenum++) @@ -519,11 +519,11 @@ void ui_menu::draw(bool customonly) float line_x1 = x2 - 0.5f * UI_LINE_WIDTH; float line_y1 = line_y + line_height; - // set the hover if this is our item + // set the hover if this is our item if (mouse_hit && line_x0 <= mouse_x && line_x1 > mouse_x && line_y0 <= mouse_y && line_y1 > mouse_y && pitem.is_selectable()) hover = itemnum; - // if we're selected, draw with a different background + // if we're selected, draw with a different background if (itemnum == selected) { fgcolor = UI_SELECTED_COLOR; @@ -532,7 +532,7 @@ void ui_menu::draw(bool customonly) fgcolor3 = UI_SELECTED_COLOR; } - // else if the mouse is over this item, draw with a different background + // else if the mouse is over this item, draw with a different background else if (itemnum == hover) { fgcolor = UI_MOUSEOVER_COLOR; @@ -541,11 +541,11 @@ void ui_menu::draw(bool customonly) fgcolor3 = UI_MOUSEOVER_COLOR; } - // if we have some background hilighting to do, add a quad behind everything else + // if we have some background hilighting to do, add a quad behind everything else if (bgcolor != UI_TEXT_BG_COLOR) highlight(container, line_x0, line_y0, line_x1, line_y1, bgcolor); - // if we're on the top line, display the up arrow + // if we're on the top line, display the up arrow if (linenum == 0 && top_line != 0) { draw_arrow( @@ -560,7 +560,7 @@ void ui_menu::draw(bool customonly) hover = -2; } - // if we're on the bottom line, display the down arrow + // if we're on the bottom line, display the down arrow else if (linenum == visible_lines - 1 && itemnum != numitems - 1) { draw_arrow( @@ -575,30 +575,30 @@ void ui_menu::draw(bool customonly) hover = -1; } - // if we're just a divider, draw a line + // if we're just a divider, draw a line else if (strcmp(itemtext, MENU_SEPARATOR_ITEM) == 0) container->add_line(visible_left, line_y + 0.5f * line_height, visible_left + visible_width, line_y + 0.5f * line_height, UI_LINE_WIDTH, UI_BORDER_COLOR, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); - // if we don't have a subitem, just draw the string centered + // if we don't have a subitem, just draw the string centered else if (pitem.subtext == NULL) machine().ui().draw_text_full(container, itemtext, effective_left, line_y, effective_width, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, fgcolor, bgcolor, NULL, NULL); - // otherwise, draw the item on the left and the subitem text on the right + // otherwise, draw the item on the left and the subitem text on the right else { int subitem_invert = pitem.flags & MENU_FLAG_INVERT; const char *subitem_text = pitem.subtext; float item_width, subitem_width; - // draw the left-side text + // draw the left-side text machine().ui().draw_text_full(container, itemtext, effective_left, line_y, effective_width, JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, fgcolor, bgcolor, &item_width, NULL); - // give 2 spaces worth of padding + // give 2 spaces worth of padding item_width += 2.0f * gutter_width; - // if the subitem doesn't fit here, display dots + // if the subitem doesn't fit here, display dots if (machine().ui().get_string_width(subitem_text) > effective_width - item_width) { subitem_text = "..."; @@ -606,11 +606,11 @@ void ui_menu::draw(bool customonly) selected_subitem_too_big = TRUE; } - // draw the subitem right-justified + // draw the subitem right-justified machine().ui().draw_text_full(container, subitem_text, effective_left + item_width, line_y, effective_width - item_width, JUSTIFY_RIGHT, WRAP_TRUNCATE, DRAW_NORMAL, subitem_invert ? fgcolor3 : fgcolor2, bgcolor, &subitem_width, NULL); - // apply arrows + // apply arrows if (itemnum == selected && (pitem.flags & MENU_FLAG_LEFT_ARROW)) { draw_arrow( @@ -636,7 +636,7 @@ void ui_menu::draw(bool customonly) } } - // if the selected subitem is too big, display it in a separate offset box + // if the selected subitem is too big, display it in a separate offset box if (selected_subitem_too_big) { const ui_menu_item &pitem = item[selected]; @@ -646,17 +646,17 @@ void ui_menu::draw(bool customonly) float target_width, target_height; float target_x, target_y; - // compute the multi-line target width/height + // compute the multi-line target width/height machine().ui().draw_text_full(container, pitem.subtext, 0, 0, visible_width * 0.75f, JUSTIFY_RIGHT, WRAP_WORD, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &target_width, &target_height); - // determine the target location + // determine the target location target_x = visible_left + visible_width - target_width - UI_BOX_LR_BORDER; target_y = line_y + line_height + UI_BOX_TB_BORDER; if (target_y + target_height + UI_BOX_TB_BORDER > visible_main_menu_height) target_y = line_y - target_height - UI_BOX_TB_BORDER; - // add a box around that + // add a box around that machine().ui().draw_outlined_box(container, target_x - UI_BOX_LR_BORDER, target_y - UI_BOX_TB_BORDER, target_x + target_width + UI_BOX_LR_BORDER, @@ -665,10 +665,10 @@ void ui_menu::draw(bool customonly) JUSTIFY_RIGHT, WRAP_WORD, DRAW_NORMAL, UI_SELECTED_COLOR, UI_SELECTED_BG_COLOR, NULL, NULL); } - // if there is something special to add, do it by calling the virtual method + // if there is something special to add, do it by calling the virtual method custom_render((selected >= 0 && selected < numitems) ? item[selected].ref : NULL, customtop, custombottom, x1, y1, x2, y2); - // return the number of visible lines, minus 1 for top arrow and 1 for bottom arrow + // return the number of visible lines, minus 1 for top arrow and 1 for bottom arrow visitems = visible_lines - (top_line != 0) - (top_line + visible_lines != numitems); } @@ -692,22 +692,22 @@ void ui_menu::draw_text_box() float target_width, target_height, prior_width; float target_x, target_y; - // compute the multi-line target width/height + // compute the multi-line target width/height machine().ui().draw_text_full(container, text, 0, 0, 1.0f - 2.0f * UI_BOX_LR_BORDER - 2.0f * gutter_width, JUSTIFY_LEFT, WRAP_WORD, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &target_width, &target_height); target_height += 2.0f * line_height; if (target_height > 1.0f - 2.0f * UI_BOX_TB_BORDER) target_height = floor((1.0f - 2.0f * UI_BOX_TB_BORDER) / line_height) * line_height; - // maximum against "return to prior menu" text + // maximum against "return to prior menu" text prior_width = machine().ui().get_string_width(backtext) + 2.0f * gutter_width; target_width = MAX(target_width, prior_width); - // determine the target location + // determine the target location target_x = 0.5f - 0.5f * target_width; target_y = 0.5f - 0.5f * target_height; - // make sure we stay on-screen + // make sure we stay on-screen if (target_x < UI_BOX_LR_BORDER + gutter_width) target_x = UI_BOX_LR_BORDER + gutter_width; if (target_x + target_width + gutter_width + UI_BOX_LR_BORDER > 1.0f) @@ -717,7 +717,7 @@ void ui_menu::draw_text_box() if (target_y + target_height + UI_BOX_TB_BORDER > 1.0f) target_y = 1.0f - UI_BOX_TB_BORDER - target_height; - // add a box around that + // add a box around that machine().ui().draw_outlined_box(container, target_x - UI_BOX_LR_BORDER - gutter_width, target_y - UI_BOX_TB_BORDER, target_x + target_width + gutter_width + UI_BOX_LR_BORDER, @@ -725,7 +725,7 @@ void ui_menu::draw_text_box() machine().ui().draw_text_full(container, text, target_x, target_y, target_width, JUSTIFY_LEFT, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, NULL, NULL); - // draw the "return to prior menu" text with a hilight behind it + // draw the "return to prior menu" text with a hilight behind it highlight( container, target_x + 0.5f * UI_LINE_WIDTH, @@ -736,7 +736,7 @@ void ui_menu::draw_text_box() machine().ui().draw_text_full(container, backtext, target_x, target_y + target_height - line_height, target_width, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_SELECTED_COLOR, UI_SELECTED_BG_COLOR, NULL, NULL); - // artificially set the hover to the last item so a double-click exits + // artificially set the hover to the last item so a double-click exits hover = numitems - 1; } @@ -751,12 +751,12 @@ void ui_menu::handle_events() int stop = FALSE; ui_event local_menu_event; - // loop while we have interesting events + // loop while we have interesting events while (!stop && ui_input_pop_event(machine(), &local_menu_event)) { switch (local_menu_event.event_type) { - // if we are hovering over a valid item, select it with a single click + // if we are hovering over a valid item, select it with a single click case UI_EVENT_MOUSE_DOWN: if (hover >= 0 && hover < numitems) selected = hover; @@ -772,7 +772,7 @@ void ui_menu::handle_events() } break; - // if we are hovering over a valid item, fake a UI_SELECT with a double-click + // if we are hovering over a valid item, fake a UI_SELECT with a double-click case UI_EVENT_MOUSE_DOUBLE_CLICK: if (hover >= 0 && hover < numitems) { @@ -790,14 +790,14 @@ void ui_menu::handle_events() } break; - // translate CHAR events into specials + // translate CHAR events into specials case UI_EVENT_CHAR: menu_event.iptkey = IPT_SPECIAL; menu_event.unichar = local_menu_event.ch; stop = TRUE; break; - // ignore everything else + // ignore everything else default: break; } @@ -817,11 +817,11 @@ void ui_menu::handle_keys(UINT32 flags) int ignoreleft = FALSE; int code; - // bail if no items + // bail if no items if (numitems == 0) return; - // if we hit select, return TRUE or pop the stack, depending on the item + // if we hit select, return TRUE or pop the stack, depending on the item if (exclusive_input_pressed(IPT_UI_SELECT, 0)) { if (selected == numitems - 1) @@ -832,69 +832,69 @@ void ui_menu::handle_keys(UINT32 flags) return; } - // hitting cancel also pops the stack + // hitting cancel also pops the stack if (exclusive_input_pressed(IPT_UI_CANCEL, 0)) { ui_menu::stack_pop(machine()); return; } - // validate the current selection + // validate the current selection validate_selection(1); - // swallow left/right keys if they are not appropriate + // swallow left/right keys if they are not appropriate ignoreleft = ((item[selected].flags & MENU_FLAG_LEFT_ARROW) == 0); ignoreright = ((item[selected].flags & MENU_FLAG_RIGHT_ARROW) == 0); - // accept left/right keys as-is with repeat + // accept left/right keys as-is with repeat if (!ignoreleft && exclusive_input_pressed(IPT_UI_LEFT, (flags & UI_MENU_PROCESS_LR_REPEAT) ? 6 : 0)) return; if (!ignoreright && exclusive_input_pressed(IPT_UI_RIGHT, (flags & UI_MENU_PROCESS_LR_REPEAT) ? 6 : 0)) return; - // up backs up by one item + // up backs up by one item if (exclusive_input_pressed(IPT_UI_UP, 6)) { selected = (selected + numitems - 1) % numitems; validate_selection(-1); } - // down advances by one item + // down advances by one item if (exclusive_input_pressed(IPT_UI_DOWN, 6)) { selected = (selected + 1) % numitems; validate_selection(1); } - // page up backs up by visitems + // page up backs up by visitems if (exclusive_input_pressed(IPT_UI_PAGE_UP, 6)) { selected -= visitems - 1; validate_selection(1); } - // page down advances by visitems + // page down advances by visitems if (exclusive_input_pressed(IPT_UI_PAGE_DOWN, 6)) { selected += visitems - 1; validate_selection(-1); } - // home goes to the start + // home goes to the start if (exclusive_input_pressed(IPT_UI_HOME, 0)) { selected = 0; validate_selection(1); } - // end goes to the last + // end goes to the last if (exclusive_input_pressed(IPT_UI_END, 0)) { selected = numitems - 1; validate_selection(-1); } - // pause enables/disables pause + // pause enables/disables pause if (!ignorepause && exclusive_input_pressed(IPT_UI_PAUSE, 0)) { if (machine().paused()) @@ -903,11 +903,11 @@ void ui_menu::handle_keys(UINT32 flags) machine().pause(); } - // handle a toggle cheats request + // handle a toggle cheats request if (ui_input_pressed_repeat(machine(), IPT_UI_TOGGLE_CHEAT, 0)) machine().cheat().set_enable(!machine().cheat().enabled()); - // see if any other UI keys are pressed + // see if any other UI keys are pressed if (menu_event.iptkey == IPT_INVALID) for (code = IPT_UI_FIRST + 1; code < IPT_UI_LAST; code++) { @@ -927,13 +927,13 @@ void ui_menu::handle_keys(UINT32 flags) void ui_menu::validate_selection(int scandir) { - // clamp to be in range + // clamp to be in range if (selected < 0) selected = 0; else if (selected >= numitems) selected = numitems - 1; - // skip past unselectable items + // skip past unselectable items while (!item[selected].is_selectable()) selected = (selected + numitems + scandir) % numitems; } @@ -1038,18 +1038,18 @@ void ui_menu::do_handle() UINT32 ui_menu::ui_handler(running_machine &machine, render_container *container, UINT32 state) { - // if we have no menus stacked up, start with the main menu + // if we have no menus stacked up, start with the main menu if (menu_stack == NULL) stack_push(auto_alloc_clear(machine, ui_menu_main(machine, container))); - // update the menu state + // update the menu state if (menu_stack != NULL) menu_stack->do_handle(); - // clear up anything pending to be released + // clear up anything pending to be released clear_free_list(machine); - // if the menus are to be hidden, return a cancel here + // if the menus are to be hidden, return a cancel here if (machine.ui().is_menu_active() && ((ui_input_pressed(machine, IPT_UI_CONFIGURE) && !stack_has_special_main_menu()) || menu_stack == NULL)) return UI_HANDLER_CANCEL; @@ -1072,16 +1072,16 @@ void ui_menu::render_triangle(bitmap_argb32 &dest, bitmap_argb32 &source, const int height = dest.height(); int x, y; - // start with all-transparent + // start with all-transparent dest.fill(rgb_t(0x00,0x00,0x00,0x00)); - // render from the tip to the bottom + // render from the tip to the bottom for (y = 0; y < height; y++) { int linewidth = (y * (halfwidth - 1) + (height / 2)) * 255 * 2 / height; UINT32 *target = &dest.pix32(y, halfwidth); - // don't antialias if height < 12 + // don't antialias if height < 12 if (dest.height() < 12) { int pixels = (linewidth + 254) / 255; @@ -1089,19 +1089,19 @@ void ui_menu::render_triangle(bitmap_argb32 &dest, bitmap_argb32 &source, const linewidth = pixels * 255; } - // loop while we still have data to generate + // loop while we still have data to generate for (x = 0; linewidth > 0; x++) { int dalpha; - // first column we only consume one pixel + // first column we only consume one pixel if (x == 0) { dalpha = MIN(0xff, linewidth); target[x] = rgb_t(dalpha,0xff,0xff,0xff); } - // remaining columns consume two pixels, one on each side + // remaining columns consume two pixels, one on each side else { dalpha = MIN(0x1fe, linewidth); diff --git a/src/emu/ui/menu.h b/src/emu/ui/menu.h index 6091bc3e3a7..253e3634ad7 100644 --- a/src/emu/ui/menu.h +++ b/src/emu/ui/menu.h @@ -21,7 +21,7 @@ CONSTANTS ***************************************************************************/ -// flags for menu items +// flags for menu items #define MENU_FLAG_LEFT_ARROW (1 << 0) #define MENU_FLAG_RIGHT_ARROW (1 << 1) #define MENU_FLAG_INVERT (1 << 2) @@ -29,15 +29,15 @@ #define MENU_FLAG_REDTEXT (1 << 4) #define MENU_FLAG_DISABLE (1 << 5) -// special menu item for separators +// special menu item for separators #define MENU_SEPARATOR_ITEM "---" -// flags to pass to ui_menu_process +// flags to pass to ui_menu_process #define UI_MENU_PROCESS_NOKEYS 1 #define UI_MENU_PROCESS_LR_REPEAT 2 #define UI_MENU_PROCESS_CUSTOM_ONLY 4 -// options for ui_menu_reset +// options for ui_menu_reset enum ui_menu_reset_options { UI_MENU_RESET_SELECT_FIRST, @@ -51,19 +51,19 @@ enum ui_menu_reset_options TYPE DEFINITIONS ***************************************************************************/ -// menu-related events +// menu-related events struct ui_menu_event { - void * itemref; // reference for the selected item - int iptkey; // one of the IPT_* values from inptport.h - unicode_char unichar; // unicode character if iptkey == IPT_SPECIAL + void * itemref; // reference for the selected item + int iptkey; // one of the IPT_* values from inptport.h + unicode_char unichar; // unicode character if iptkey == IPT_SPECIAL }; struct ui_menu_pool { - ui_menu_pool * next; // chain to next one - UINT8 * top; // top of the pool - UINT8 * end; // end of the pool + ui_menu_pool * next; // chain to next one + UINT8 * top; // top of the pool + UINT8 * end; // end of the pool }; @@ -86,87 +86,87 @@ public: running_machine &machine() const { return m_machine; } - render_container * container; // render_container we render to - ui_menu_event menu_event; // the UI menu_event that occurred - ui_menu * parent; // pointer to parent menu - int resetpos; // reset position - void * resetref; // reset reference - int selected; // which item is selected - int hover; // which item is being hovered over - int visitems; // number of visible items - int numitems; // number of items in the menu - int allocitems; // allocated size of array - ui_menu_item * item; // pointer to array of items - float customtop; // amount of extra height to add at the top - float custombottom; // amount of extra height to add at the bottom - ui_menu_pool * pool; // list of memory pools - - // free all items in the menu, and all memory allocated from the memory pool + render_container * container; // render_container we render to + ui_menu_event menu_event; // the UI menu_event that occurred + ui_menu * parent; // pointer to parent menu + int resetpos; // reset position + void * resetref; // reset reference + int selected; // which item is selected + int hover; // which item is being hovered over + int visitems; // number of visible items + int numitems; // number of items in the menu + int allocitems; // allocated size of array + ui_menu_item * item; // pointer to array of items + float customtop; // amount of extra height to add at the top + float custombottom; // amount of extra height to add at the bottom + ui_menu_pool * pool; // list of memory pools + + // free all items in the menu, and all memory allocated from the memory pool void reset(ui_menu_reset_options options); - // returns true if the menu has any non-default items in it + // returns true if the menu has any non-default items in it bool populated(); - // append a new item to the end of the menu + // append a new item to the end of the menu void item_append(const char *text, const char *subtext, UINT32 flags, void *ref); - // process a menu, drawing it and returning any interesting events + // process a menu, drawing it and returning any interesting events const ui_menu_event *process(UINT32 flags); - // configure the menu for custom rendering + // configure the menu for custom rendering virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2); - // allocate temporary memory from the menu's memory pool + // allocate temporary memory from the menu's memory pool void *m_pool_alloc(size_t size); - // make a temporary string copy in the menu's memory pool + // make a temporary string copy in the menu's memory pool const char *pool_strdup(const char *string); - // retrieves the index of the currently selected menu item + // retrieves the index of the currently selected menu item void *get_selection(); - // changes the index of the currently selected menu item + // changes the index of the currently selected menu item void set_selection(void *selected_itemref); - // request the specific handling of the game selection main menu + // request the specific handling of the game selection main menu bool is_special_main_menu() const; void set_special_main_menu(bool disable); - // Global initialization + // Global initialization static void init(running_machine &machine); static void exit(running_machine &machine); - // reset the menus, clearing everything + // reset the menus, clearing everything static void stack_reset(running_machine &machine); - // push a new menu onto the stack + // push a new menu onto the stack static void stack_push(ui_menu *menu); - // pop a menu from the stack + // pop a menu from the stack static void stack_pop(running_machine &machine); - // test if one of the menus in the stack requires hide disable + // test if one of the menus in the stack requires hide disable static bool stack_has_special_main_menu(); - // highlight + // highlight static void highlight(render_container *container, float x0, float y0, float x1, float y1, rgb_t bgcolor); - // draw arrow + // draw arrow static void draw_arrow(render_container *container, float x0, float y0, float x1, float y1, rgb_t fgcolor, UINT32 orientation); - // master handler + // master handler static UINT32 ui_handler(running_machine &machine, render_container *container, UINT32 state); - // Used by sliders + // Used by sliders void validate_selection(int scandir); static ui_menu *menu_stack; void do_handle(); - // To be reimplemented in the menu subclass + // To be reimplemented in the menu subclass virtual void populate() = 0; - // To be reimplemented in the menu subclass + // To be reimplemented in the menu subclass virtual void handle() = 0; private: @@ -188,4 +188,4 @@ private: static void render_triangle(bitmap_argb32 &dest, bitmap_argb32 &source, const rectangle &sbounds, void *param); }; -#endif // __UI_MENU_H__ +#endif // __UI_MENU_H__ diff --git a/src/emu/ui/selgame.c b/src/emu/ui/selgame.c index 87deeaabf0e..97dc05663ee 100644 --- a/src/emu/ui/selgame.c +++ b/src/emu/ui/selgame.c @@ -47,8 +47,8 @@ ui_menu_select_game::~ui_menu_select_game() //------------------------------------------------- -// build_driver_list - build a list of available -// drivers +// build_driver_list - build a list of available +// drivers //------------------------------------------------- void ui_menu_select_game::build_driver_list() @@ -108,7 +108,7 @@ void ui_menu_select_game::handle() m_error = false; // handle selections - else + else { switch(menu_event->iptkey) { diff --git a/src/emu/ui/selgame.h b/src/emu/ui/selgame.h index 94e6f37d43b..940a195721b 100644 --- a/src/emu/ui/selgame.h +++ b/src/emu/ui/selgame.h @@ -31,10 +31,10 @@ public: private: // internal state enum { VISIBLE_GAMES_IN_LIST = 15 }; - UINT8 m_error; - UINT8 m_rerandomize; - char m_search[40]; - int m_matchlist[VISIBLE_GAMES_IN_LIST]; + UINT8 m_error; + UINT8 m_rerandomize; + char m_search[40]; + int m_matchlist[VISIBLE_GAMES_IN_LIST]; dynamic_array m_driverlist; auto_pointer m_drivlist; diff --git a/src/emu/ui/swlist.c b/src/emu/ui/swlist.c index f18693d7049..c864ff560e5 100644 --- a/src/emu/ui/swlist.c +++ b/src/emu/ui/swlist.c @@ -360,7 +360,7 @@ void ui_menu_software_list::handle() /*************************************************************************** SOFTWARE MENU - list of available software lists - i.e. cartridges, - floppies + floppies ***************************************************************************/ //------------------------------------------------- diff --git a/src/emu/ui/swlist.h b/src/emu/ui/swlist.h index 98c5de0d860..1d0edc80d1e 100644 --- a/src/emu/ui/swlist.h +++ b/src/emu/ui/swlist.h @@ -29,11 +29,11 @@ private: }; // variables - const software_info * m_info; - const char * m_interface; - const software_part ** m_selected_part; - bool m_opt_fmgr; - int * m_result; + const software_info * m_info; + const char * m_interface; + const software_part ** m_selected_part; + bool m_opt_fmgr; + int * m_result; }; @@ -55,12 +55,12 @@ private: }; // variables - software_list_device * m_swlist; // currently selected list - const char * m_interface; - astring & m_result; - entry_info * m_entrylist; - char m_filename_buffer[1024]; - bool m_ordered_by_shortname; + software_list_device * m_swlist; // currently selected list + const char * m_interface; + astring & m_result; + entry_info * m_entrylist; + char m_filename_buffer[1024]; + bool m_ordered_by_shortname; // functions int compare_entries(const entry_info *e1, const entry_info *e2, bool shortname); @@ -78,8 +78,8 @@ public: virtual void handle(); private: - const char * m_interface; - software_list_device ** m_result; + const char * m_interface; + software_list_device ** m_result; }; #endif /* __UI_SWLIST_H__ */ diff --git a/src/emu/ui/ui.c b/src/emu/ui/ui.c index d957d8086af..45277e14b9a 100644 --- a/src/emu/ui/ui.c +++ b/src/emu/ui/ui.c @@ -40,7 +40,7 @@ enum LOCAL VARIABLES ***************************************************************************/ -// list of natural keyboard keys that are not associated with UI_EVENT_CHARs +// list of natural keyboard keys that are not associated with UI_EVENT_CHARs static const input_item_id non_char_keys[] = { ITEM_ID_ESC, @@ -88,11 +88,11 @@ static const input_item_id non_char_keys[] = GLOBAL VARIABLES ***************************************************************************/ -// messagebox buffer +// messagebox buffer static astring messagebox_text; static rgb_t messagebox_backcolor; -// slider info +// slider info static slider_state *slider_list; static slider_state *slider_current; @@ -101,7 +101,7 @@ static slider_state *slider_current; FUNCTION PROTOTYPES ***************************************************************************/ -// slider controls +// slider controls static slider_state *slider_alloc(running_machine &machine, const char *title, INT32 minval, INT32 defval, INT32 maxval, INT32 incval, slider_update update, void *arg); static slider_state *slider_init(running_machine &machine); static INT32 slider_volume(running_machine &machine, void *arg, astring *string, INT32 newval); @@ -221,11 +221,11 @@ static const UINT32 mouse_bitmap[] = { ui_manager::ui_manager(running_machine &machine) : m_machine(machine) { - // initialize the other UI bits + // initialize the other UI bits ui_menu::init(machine); ui_gfx_init(machine); - // reset instance variables + // reset instance variables m_font = NULL; m_handler_callback = NULL; m_handler_param = 0; @@ -245,7 +245,7 @@ ui_manager::ui_manager(running_machine &machine) // request a callback upon exiting machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(ui_manager::exit), this)); - // retrieve options + // retrieve options m_use_natural_keyboard = machine.options().natural_keyboard(); bitmap_argb32 *ui_mouse_bitmap = auto_alloc(machine, bitmap_argb32(32, 32)); UINT32 *dst = &ui_mouse_bitmap->pix32(0); @@ -265,7 +265,7 @@ void ui_manager::exit() machine().render().texture_free(m_mouse_arrow_texture); m_mouse_arrow_texture = NULL; - // free the font + // free the font if (m_font != NULL) { machine().render().font_free(m_font); @@ -280,7 +280,7 @@ void ui_manager::exit() void ui_manager::initialize(running_machine &machine) { - // initialize the on-screen display system + // initialize the on-screen display system slider_list = slider_current = slider_init(machine); } @@ -712,7 +712,7 @@ void ui_manager::draw_text_full(render_container *container, const char *origs, if (curwidth > maxwidth) maxwidth = curwidth; - // if opaque, add a black box + // if opaque, add a black box if (draw == DRAW_OPAQUE) container->add_rect(curx, cury, curx + curwidth, cury + lineheight, bgcolor, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); @@ -1131,7 +1131,7 @@ astring &ui_manager::game_info_astring(astring &string) // get cpu specific clock that takes internal multiplier/dividers into account int clock = exec->device().clock(); - // count how many identical CPUs we have + // count how many identical CPUs we have int count = 1; const char *name = exec->device().name(); execute_interface_iterator execinneriter(machine().root_device()); @@ -1142,19 +1142,19 @@ astring &ui_manager::game_info_astring(astring &string) count++; } - // if more than one, prepend a #x in front of the CPU name + // if more than one, prepend a #x in front of the CPU name if (count > 1) string.catprintf("%d" UTF8_MULTIPLY, count); string.cat(name); - // display clock in kHz or MHz + // display clock in kHz or MHz if (clock >= 1000000) string.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000); else string.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000); } - // loop over all sound chips + // loop over all sound chips sound_interface_iterator snditer(machine().root_device()); tagmap_t soundtags; bool found_sound = false; @@ -1163,12 +1163,12 @@ astring &ui_manager::game_info_astring(astring &string) if (soundtags.add(sound->device().tag(), 1, FALSE) == TMERR_DUPLICATE) continue; - // append the Sound: string + // append the Sound: string if (!found_sound) string.cat("\nSound:\n"); found_sound = true; - // count how many identical sound chips we have + // count how many identical sound chips we have int count = 1; sound_interface_iterator sndinneriter(machine().root_device()); for (device_sound_interface *scan = sndinneriter.first(); scan != NULL; scan = sndinneriter.next()) @@ -1177,12 +1177,12 @@ astring &ui_manager::game_info_astring(astring &string) if (soundtags.add(scan->device().tag(), 1, FALSE) != TMERR_DUPLICATE) count++; } - // if more than one, prepend a #x in front of the CPU name + // if more than one, prepend a #x in front of the CPU name if (count > 1) string.catprintf("%d" UTF8_MULTIPLY, count); string.cat(sound->device().name()); - // display clock in kHz or MHz + // display clock in kHz or MHz int clock = sound->device().clock(); if (clock >= 1000000) string.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000); @@ -1192,7 +1192,7 @@ astring &ui_manager::game_info_astring(astring &string) string.cat("\n"); } - // display screen information + // display screen information string.cat("\nVideo:\n"); screen_device_iterator scriter(machine().root_device()); int scrcount = scriter.count(); @@ -1250,18 +1250,18 @@ UINT32 ui_manager::handler_messagebox(running_machine &machine, render_container UINT32 ui_manager::handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state) { - // draw a standard message window + // draw a standard message window machine.ui().draw_text_box(container, messagebox_text, JUSTIFY_LEFT, 0.5f, 0.5f, messagebox_backcolor); - // an 'O' or left joystick kicks us to the next state + // an 'O' or left joystick kicks us to the next state if (state == 0 && (machine.input().code_pressed_once(KEYCODE_O) || ui_input_pressed(machine, IPT_UI_LEFT))) state++; - // a 'K' or right joystick exits the state + // a 'K' or right joystick exits the state else if (state == 1 && (machine.input().code_pressed_once(KEYCODE_K) || ui_input_pressed(machine, IPT_UI_RIGHT))) state = UI_HANDLER_CANCEL; - // if the user cancels, exit out completely + // if the user cancels, exit out completely else if (ui_input_pressed(machine, IPT_UI_CANCEL)) { machine.schedule_exit(); @@ -1280,17 +1280,17 @@ UINT32 ui_manager::handler_messagebox_ok(running_machine &machine, render_contai UINT32 ui_manager::handler_messagebox_anykey(running_machine &machine, render_container *container, UINT32 state) { - // draw a standard message window + // draw a standard message window machine.ui().draw_text_box(container, messagebox_text, JUSTIFY_LEFT, 0.5f, 0.5f, messagebox_backcolor); - // if the user cancels, exit out completely + // if the user cancels, exit out completely if (ui_input_pressed(machine, IPT_UI_CANCEL)) { machine.schedule_exit(); state = UI_HANDLER_CANCEL; } - // if any key is pressed, just exit + // if any key is pressed, just exit else if (machine.input().poll_switches() != INPUT_CODE_INVALID) state = UI_HANDLER_CANCEL; @@ -1312,39 +1312,39 @@ void ui_manager::process_natural_keyboard() UINT8 *key_down_ptr; UINT8 key_down_mask; - // loop while we have interesting events + // loop while we have interesting events while (ui_input_pop_event(machine(), &event)) { - // if this was a UI_EVENT_CHAR event, post it + // if this was a UI_EVENT_CHAR event, post it if (event.event_type == UI_EVENT_CHAR) machine().ioport().natkeyboard().post(event.ch); } - // process natural keyboard keys that don't get UI_EVENT_CHARs + // process natural keyboard keys that don't get UI_EVENT_CHARs for (i = 0; i < ARRAY_LENGTH(non_char_keys); i++) { - // identify this keycode + // identify this keycode itemid = non_char_keys[i]; code = machine().input().code_from_itemid(itemid); - // ...and determine if it is pressed + // ...and determine if it is pressed pressed = machine().input().code_pressed(code); - // figure out whey we are in the key_down map + // figure out whey we are in the key_down map key_down_ptr = &m_non_char_keys_down[i / 8]; key_down_mask = 1 << (i % 8); if (pressed && !(*key_down_ptr & key_down_mask)) { - // this key is now down + // this key is now down *key_down_ptr |= key_down_mask; - // post the key + // post the key machine().ioport().natkeyboard().post(UCHAR_MAMEKEY_BEGIN + code.item_id()); } else if (!pressed && (*key_down_ptr & key_down_mask)) { - // this key is now up + // this key is now up *key_down_ptr &= ~key_down_mask; } } @@ -1357,13 +1357,13 @@ void ui_manager::process_natural_keyboard() void ui_manager::increase_frameskip() { - // get the current value and increment it + // get the current value and increment it int newframeskip = machine().video().frameskip() + 1; if (newframeskip > MAX_FRAMESKIP) newframeskip = -1; machine().video().set_frameskip(newframeskip); - // display the FPS counter for 2 seconds + // display the FPS counter for 2 seconds machine().ui().show_fps_temp(2.0); } @@ -1374,13 +1374,13 @@ void ui_manager::increase_frameskip() void ui_manager::decrease_frameskip() { - // get the current value and decrement it + // get the current value and decrement it int newframeskip = machine().video().frameskip() - 1; if (newframeskip < -1) newframeskip = MAX_FRAMESKIP; machine().video().set_frameskip(newframeskip); - // display the FPS counter for 2 seconds + // display the FPS counter for 2 seconds machine().ui().show_fps_temp(2.0); } @@ -1391,7 +1391,7 @@ void ui_manager::decrease_frameskip() bool ui_manager::can_paste() { - // retrieve the clipboard text + // retrieve the clipboard text char *text = osd_get_clipboard_text(); // free the string if allocated @@ -1409,16 +1409,16 @@ bool ui_manager::can_paste() void ui_manager::paste() { - // retrieve the clipboard text + // retrieve the clipboard text char *text = osd_get_clipboard_text(); - // was a result returned? + // was a result returned? if (text != NULL) { - // post the text + // post the text machine().ioport().natkeyboard().post_utf8(text); - // free the string + // free the string osd_free(text); } } @@ -1431,7 +1431,7 @@ void ui_manager::paste() void ui_manager::image_handler_ingame() { - // run display routine for devices + // run display routine for devices if (machine().phase() == MACHINE_PHASE_RUNNING) { image_interface_iterator iter(machine().root_device()); @@ -1450,7 +1450,7 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co { bool is_paused = machine.paused(); - // first draw the FPS counter + // first draw the FPS counter if (machine.ui().show_fps_counter()) { astring tempstring; @@ -1458,33 +1458,33 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, NULL, NULL); } - // draw the profiler if visible + // draw the profiler if visible if (machine.ui().show_profiler()) { const char *text = g_profiler.text(machine); machine.ui().draw_text_full(container, text, 0.0f, 0.0f, 1.0f, JUSTIFY_LEFT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, NULL, NULL); } - // if we're single-stepping, pause now + // if we're single-stepping, pause now if (machine.ui().single_step()) { machine.pause(); machine.ui().set_single_step(false); } - // determine if we should disable the rest of the UI + // determine if we should disable the rest of the UI bool ui_disabled = (machine.ioport().has_keyboard() && !machine.ui_active()); - // is ScrLk UI toggling applicable here? + // is ScrLk UI toggling applicable here? if (machine.ioport().has_keyboard()) { - // are we toggling the UI with ScrLk? + // are we toggling the UI with ScrLk? if (ui_input_pressed(machine, IPT_UI_TOGGLE_UI)) { - // toggle the UI + // toggle the UI machine.set_ui_active(!machine.ui_active()); - // display a popup indicating the new status + // display a popup indicating the new status if (machine.ui_active()) { machine.ui().popup_time(2, "%s\n%s\n%s\n%s\n%s\n%s\n", @@ -1508,13 +1508,13 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co } } - // is the natural keyboard enabled? + // is the natural keyboard enabled? if (machine.ui().use_natural_keyboard() && (machine.phase() == MACHINE_PHASE_RUNNING)) machine.ui().process_natural_keyboard(); if (!ui_disabled) { - // paste command + // paste command if (ui_input_pressed(machine, IPT_UI_PASTE)) machine.ui().paste(); } @@ -1529,21 +1529,21 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co return 0; } - // turn on menus if requested + // turn on menus if requested if (ui_input_pressed(machine, IPT_UI_CONFIGURE)) return machine.ui().set_handler(ui_menu::ui_handler, 0); - // if the on-screen display isn't up and the user has toggled it, turn it on + // if the on-screen display isn't up and the user has toggled it, turn it on if ((machine.debug_flags & DEBUG_FLAG_ENABLED) == 0 && ui_input_pressed(machine, IPT_UI_ON_SCREEN_DISPLAY)) return machine.ui().set_handler(ui_menu_sliders::ui_handler, 1); - // handle a reset request + // handle a reset request if (ui_input_pressed(machine, IPT_UI_RESET_MACHINE)) machine.schedule_hard_reset(); if (ui_input_pressed(machine, IPT_UI_SOFT_RESET)) machine.schedule_soft_reset(); - // handle a request to display graphics/palette + // handle a request to display graphics/palette if (ui_input_pressed(machine, IPT_UI_SHOW_GFX)) { if (!is_paused) @@ -1551,28 +1551,28 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co return machine.ui().set_handler(ui_gfx_ui_handler, is_paused); } - // handle a save state request + // handle a save state request if (ui_input_pressed(machine, IPT_UI_SAVE_STATE)) { machine.pause(); return machine.ui().set_handler(handler_load_save, LOADSAVE_SAVE); } - // handle a load state request + // handle a load state request if (ui_input_pressed(machine, IPT_UI_LOAD_STATE)) { machine.pause(); return machine.ui().set_handler(handler_load_save, LOADSAVE_LOAD); } - // handle a save snapshot request + // handle a save snapshot request if (ui_input_pressed(machine, IPT_UI_SNAPSHOT)) machine.video().save_active_screen_snapshots(); - // toggle pause + // toggle pause if (ui_input_pressed(machine, IPT_UI_PAUSE)) { - // with a shift key, it is single step + // with a shift key, it is single step if (is_paused && (machine.input().code_pressed(KEYCODE_LSHIFT) || machine.input().code_pressed(KEYCODE_RSHIFT))) { machine.ui().set_single_step(true); @@ -1582,35 +1582,35 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co machine.toggle_pause(); } - // handle a toggle cheats request + // handle a toggle cheats request if (ui_input_pressed(machine, IPT_UI_TOGGLE_CHEAT)) machine.cheat().set_enable(!machine.cheat().enabled()); - // toggle movie recording + // toggle movie recording if (ui_input_pressed(machine, IPT_UI_RECORD_MOVIE)) machine.video().toggle_record_movie(); - // toggle profiler display + // toggle profiler display if (ui_input_pressed(machine, IPT_UI_SHOW_PROFILER)) machine.ui().set_show_profiler(!machine.ui().show_profiler()); - // toggle FPS display + // toggle FPS display if (ui_input_pressed(machine, IPT_UI_SHOW_FPS)) machine.ui().set_show_fps(!machine.ui().show_fps()); - // increment frameskip? + // increment frameskip? if (ui_input_pressed(machine, IPT_UI_FRAMESKIP_INC)) machine.ui().increase_frameskip(); - // decrement frameskip? + // decrement frameskip? if (ui_input_pressed(machine, IPT_UI_FRAMESKIP_DEC)) machine.ui().decrease_frameskip(); - // toggle throttle? + // toggle throttle? if (ui_input_pressed(machine, IPT_UI_THROTTLE)) machine.video().toggle_throttle(); - // check for fast forward + // check for fast forward if (machine.ioport().type_pressed(IPT_UI_FAST_FORWARD)) { machine.video().set_fastforward(true); @@ -1634,31 +1634,31 @@ UINT32 ui_manager::handler_load_save(running_machine &machine, render_container input_code code; char file = 0; - // if we're not in the middle of anything, skip + // if we're not in the middle of anything, skip if (state == LOADSAVE_NONE) return 0; - // okay, we're waiting for a key to select a slot; display a message + // okay, we're waiting for a key to select a slot; display a message if (state == LOADSAVE_SAVE) machine.ui().draw_message_window(container, "Select position to save to"); else machine.ui().draw_message_window(container, "Select position to load from"); - // check for cancel key + // check for cancel key if (ui_input_pressed(machine, IPT_UI_CANCEL)) { - // display a popup indicating things were cancelled + // display a popup indicating things were cancelled if (state == LOADSAVE_SAVE) popmessage("Save cancelled"); else popmessage("Load cancelled"); - // reset the state + // reset the state machine.resume(); return UI_HANDLER_CANCEL; } - // check for A-Z or 0-9 + // check for A-Z or 0-9 for (input_item_id id = ITEM_ID_A; id <= ITEM_ID_Z; id++) if (machine.input().code_pressed_once(input_code(DEVICE_CLASS_KEYBOARD, 0, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id))) file = id - ITEM_ID_A + 'a'; @@ -1673,7 +1673,7 @@ UINT32 ui_manager::handler_load_save(running_machine &machine, render_container if (file == 0) return state; - // display a popup indicating that the save will proceed + // display a popup indicating that the save will proceed sprintf(filename, "%c", file); if (state == LOADSAVE_SAVE) { @@ -1686,7 +1686,7 @@ UINT32 ui_manager::handler_load_save(running_machine &machine, render_container machine.schedule_load(filename); } - // remove the pause and reset the state + // remove the pause and reset the state machine.resume(); return UI_HANDLER_CANCEL; } @@ -1719,11 +1719,11 @@ UINT32 ui_manager::handler_confirm_quit(running_machine &machine, render_contain machine.ui().draw_text_box(container, quit_message, JUSTIFY_CENTER, 0.5f, 0.5f, UI_RED_COLOR); machine.pause(); - // if the user press ENTER, quit the game + // if the user press ENTER, quit the game if (ui_input_pressed(machine, IPT_UI_SELECT)) machine.schedule_exit(); - // if the user press ESC, just continue + // if the user press ESC, just continue else if (ui_input_pressed(machine, IPT_UI_CANCEL)) { machine.resume(); @@ -1783,11 +1783,11 @@ static slider_state *slider_init(running_machine &machine) astring string; int item; - // add overall volume + // add overall volume *tailptr = slider_alloc(machine, "Master Volume", -32, 0, 0, 1, slider_volume, NULL); tailptr = &(*tailptr)->next; - // add per-channel volume + // add per-channel volume mixer_input info; for (item = 0; machine.sound().indexed_mixer_input(item, info); item++) { @@ -1800,7 +1800,7 @@ static slider_state *slider_init(running_machine &machine) tailptr = &(*tailptr)->next; } - // add analog adjusters + // add analog adjusters for (port = machine.ioport().first_port(); port != NULL; port = port->next()) for (field = port->first_field(); field != NULL; field = field->next()) if (field->type() == IPT_ADJUSTER) @@ -1810,7 +1810,7 @@ static slider_state *slider_init(running_machine &machine) tailptr = &(*tailptr)->next; } - // add CPU overclocking (cheat only) + // add CPU overclocking (cheat only) if (machine.options().cheat()) { execute_interface_iterator iter(machine.root_device()); @@ -1823,7 +1823,7 @@ static slider_state *slider_init(running_machine &machine) } } - // add screen parameters + // add screen parameters screen_device_iterator scriter(machine.root_device()); for (screen_device *screen = scriter.first(); screen != NULL; screen = scriter.next()) { @@ -1833,7 +1833,7 @@ static slider_state *slider_init(running_machine &machine) int defyoffset = floor(screen->yoffset() * 1000.0f + 0.5f); void *param = (void *)screen; - // add refresh rate tweaker + // add refresh rate tweaker if (machine.options().cheat()) { string.printf("%s Refresh Rate", slider_get_screen_desc(*screen)); @@ -1841,7 +1841,7 @@ static slider_state *slider_init(running_machine &machine) tailptr = &(*tailptr)->next; } - // add standard brightness/contrast/gamma controls per-screen + // add standard brightness/contrast/gamma controls per-screen string.printf("%s Brightness", slider_get_screen_desc(*screen)); *tailptr = slider_alloc(machine, string, 100, 1000, 2000, 10, slider_brightness, param); tailptr = &(*tailptr)->next; @@ -1852,7 +1852,7 @@ static slider_state *slider_init(running_machine &machine) *tailptr = slider_alloc(machine, string, 100, 1000, 3000, 50, slider_gamma, param); tailptr = &(*tailptr)->next; - // add scale and offset controls per-screen + // add scale and offset controls per-screen string.printf("%s Horiz Stretch", slider_get_screen_desc(*screen)); *tailptr = slider_alloc(machine, string, 500, defxscale, 1500, 2, slider_xscale, param); tailptr = &(*tailptr)->next; @@ -1879,7 +1879,7 @@ static slider_state *slider_init(running_machine &machine) int defyoffset = floor(config.m_overposy * 1000.0f + 0.5f); void *param = (void *)laserdisc; - // add scale and offset controls per-overlay + // add scale and offset controls per-overlay string.printf("Laserdisc '%s' Horiz Stretch", laserdisc->tag()); *tailptr = slider_alloc(machine, string, 500, (defxscale == 0) ? 1000 : defxscale, 1500, 2, slider_overxscale, param); tailptr = &(*tailptr)->next; @@ -1897,7 +1897,7 @@ static slider_state *slider_init(running_machine &machine) for (screen_device *screen = scriter.first(); screen != NULL; screen = scriter.next()) if (screen->screen_type() == SCREEN_TYPE_VECTOR) { - // add flicker control + // add flicker control *tailptr = slider_alloc(machine, "Vector Flicker", 0, 0, 1000, 10, slider_flicker, NULL); tailptr = &(*tailptr)->next; *tailptr = slider_alloc(machine, "Beam Width", 10, 100, 1000, 10, slider_beam, NULL); @@ -1906,7 +1906,7 @@ static slider_state *slider_init(running_machine &machine) } #ifdef MAME_DEBUG - // add crosshair adjusters + // add crosshair adjusters for (port = machine.ioport().first_port(); port != NULL; port = port->next()) for (field = port->first_field(); field != NULL; field = field->next()) if (field->crosshair_axis() != CROSSHAIR_AXIS_NONE && field->player() == 0) diff --git a/src/emu/ui/ui.h b/src/emu/ui/ui.h index 4506555156f..fa6c4824d1a 100644 --- a/src/emu/ui/ui.h +++ b/src/emu/ui/ui.h @@ -170,25 +170,25 @@ public: private: // instance variables - running_machine & m_machine; - render_font * m_font; - ui_callback m_handler_callback; - UINT32 m_handler_param; - bool m_single_step; - bool m_showfps; - osd_ticks_t m_showfps_end; - bool m_show_profiler; - osd_ticks_t m_popup_text_end; - bool m_use_natural_keyboard; - UINT8 * m_non_char_keys_down; - render_texture * m_mouse_arrow_texture; - bool m_mouse_show; - - // text generators + running_machine & m_machine; + render_font * m_font; + ui_callback m_handler_callback; + UINT32 m_handler_param; + bool m_single_step; + bool m_showfps; + osd_ticks_t m_showfps_end; + bool m_show_profiler; + osd_ticks_t m_popup_text_end; + bool m_use_natural_keyboard; + UINT8 * m_non_char_keys_down; + render_texture * m_mouse_arrow_texture; + bool m_mouse_show; + + // text generators astring &disclaimer_string(astring &buffer); astring &warnings_string(astring &buffer); - // UI handlers + // UI handlers static UINT32 handler_messagebox(running_machine &machine, render_container *container, UINT32 state); static UINT32 handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state); static UINT32 handler_messagebox_anykey(running_machine &machine, render_container *container, UINT32 state); diff --git a/src/emu/ui/viewgfx.c b/src/emu/ui/viewgfx.c index c6410229121..feb084ca597 100644 --- a/src/emu/ui/viewgfx.c +++ b/src/emu/ui/viewgfx.c @@ -41,54 +41,54 @@ const int MAX_GFX_DECODERS = 8; // information about a single gfx device struct ui_gfx_info { - device_gfx_interface *interface; // pointer to device's gfx interface - UINT8 setcount; // how many gfx sets device has - UINT8 rotate[MAX_GFX_ELEMENTS]; // current rotation (orientation) value - UINT8 columns[MAX_GFX_ELEMENTS]; // number of items per row - int offset[MAX_GFX_ELEMENTS]; // current offset of top,left item - int color[MAX_GFX_ELEMENTS]; // current color selected + device_gfx_interface *interface; // pointer to device's gfx interface + UINT8 setcount; // how many gfx sets device has + UINT8 rotate[MAX_GFX_ELEMENTS]; // current rotation (orientation) value + UINT8 columns[MAX_GFX_ELEMENTS]; // number of items per row + int offset[MAX_GFX_ELEMENTS]; // current offset of top,left item + int color[MAX_GFX_ELEMENTS]; // current color selected }; struct ui_gfx_state { - bool started; // have we called ui_gfx_count_devices() yet? - UINT8 mode; // which mode are we in? + bool started; // have we called ui_gfx_count_devices() yet? + UINT8 mode; // which mode are we in? // intermediate bitmaps - bool bitmap_dirty; // is the bitmap dirty? - bitmap_rgb32 * bitmap; // bitmap for drawing gfx and tilemaps - render_texture *texture; // texture for rendering the above bitmap + bool bitmap_dirty; // is the bitmap dirty? + bitmap_rgb32 * bitmap; // bitmap for drawing gfx and tilemaps + render_texture *texture; // texture for rendering the above bitmap // palette-specific data struct { - palette_device *device; // pointer to current device - int devcount; // how many palette devices exist - int devindex; // which palette device is visible - UINT8 which; // which subset (pens or indirect colors)? - UINT8 columns; // number of items per row - int offset; // current offset of top left item + palette_device *device; // pointer to current device + int devcount; // how many palette devices exist + int devindex; // which palette device is visible + UINT8 which; // which subset (pens or indirect colors)? + UINT8 columns; // number of items per row + int offset; // current offset of top left item } palette; // graphics-specific data struct { - UINT8 devcount; // how many gfx devices exist - UINT8 devindex; // which device is visible - UINT8 set; // which set is visible + UINT8 devcount; // how many gfx devices exist + UINT8 devindex; // which device is visible + UINT8 set; // which set is visible } gfxset; - + // information about each gfx device ui_gfx_info gfxdev[MAX_GFX_DECODERS]; // tilemap-specific data struct { - int which; // which tilemap are we viewing? - int xoffs; // current X offset - int yoffs; // current Y offset - int zoom; // zoom factor - UINT8 rotate; // current rotation (orientation) value + int which; // which tilemap are we viewing? + int xoffs; // current X offset + int yoffs; // current Y offset + int zoom; // zoom factor + UINT8 rotate; // current rotation (orientation) value } tilemap; }; @@ -254,7 +254,7 @@ bool ui_gfx_is_relevant(running_machine &machine) UINT32 ui_gfx_ui_handler(running_machine &machine, render_container *container, UINT32 uistate) { ui_gfx_state &state = ui_gfx; - + // if we have nothing, implicitly cancel if (!ui_gfx_is_relevant(machine)) goto cancel; diff --git a/src/emu/validity.c b/src/emu/validity.c index 12be4401410..50b66778042 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -966,7 +966,7 @@ void validity_checker::validate_inputs() void validity_checker::validate_devices() { int_map device_map; - + device_iterator iter_find(m_current_config->root_device()); for (const device_t *device = iter_find.first(); device != NULL; device = iter_find.next()) { diff --git a/src/emu/validity.h b/src/emu/validity.h index b44fdaf364b..c6777ade775 100644 --- a/src/emu/validity.h +++ b/src/emu/validity.h @@ -47,10 +47,10 @@ public: // helpers for devices void validate_tag(const char *tag); int region_length(const char *tag) { return m_region_map.find(tag); } - + // generic registry of already-checked stuff bool already_checked(const char *string) { return (m_already_checked.add(string, 1, false) == TMERR_DUPLICATE); } - + private: // internal helpers const char *ioport_string_from_index(UINT32 index); @@ -99,7 +99,7 @@ private: const device_t * m_current_device; const char * m_current_ioport; int_map m_region_map; - tagmap_t m_already_checked; + tagmap_t m_already_checked; // callbacks output_delegate m_saved_error_output; diff --git a/src/emu/video.c b/src/emu/video.c index 8083a0fe2cc..aebf8cf5bff 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -1247,7 +1247,7 @@ void video_manager::record_frame() } //------------------------------------------------- -// toggle_throttle +// toggle_throttle //------------------------------------------------- void video_manager::toggle_throttle() @@ -1257,7 +1257,7 @@ void video_manager::toggle_throttle() //------------------------------------------------- -// toggle_record_movie +// toggle_record_movie //------------------------------------------------- void video_manager::toggle_record_movie() diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h index 02d5531dee4..0603c9ba0ff 100644 --- a/src/emu/video/315_5124.h +++ b/src/emu/video/315_5124.h @@ -64,7 +64,7 @@ public: static void set_signal_type(device_t &device, bool is_pal) { downcast(device).m_is_pal = is_pal; } template static devcb2_base &set_int_callback(device_t &device, _Object object) { return downcast(device).m_int_cb.set_callback(object); } template static devcb2_base &set_pause_callback(device_t &device, _Object object) { return downcast(device).m_pause_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( vram_read ); DECLARE_WRITE8_MEMBER( vram_write ); DECLARE_READ8_MEMBER( register_read ); @@ -164,7 +164,7 @@ protected: static const device_timer_id TIMER_DRAW = 1; static const device_timer_id TIMER_CHECK_HINT = 2; static const device_timer_id TIMER_CHECK_VINT = 3; - + required_device m_palette; }; @@ -209,31 +209,31 @@ protected: #define MCFG_SEGA315_5124_INT_CB(_devcb) \ devcb = &sega315_5124_device::set_int_callback(*device, DEVCB2_##_devcb); - + #define MCFG_SEGA315_5124_PAUSE_CB(_devcb) \ devcb = &sega315_5124_device::set_pause_callback(*device, DEVCB2_##_devcb); #define MCFG_SEGA315_5246_SET_SCREEN MCFG_VIDEO_SET_SCREEN - + #define MCFG_SEGA315_5246_IS_PAL(_bool) \ sega315_5246_device::set_signal_type(*device, _bool); #define MCFG_SEGA315_5246_INT_CB(_devcb) \ devcb = &sega315_5246_device::set_int_callback(*device, DEVCB2_##_devcb); - + #define MCFG_SEGA315_5246_PAUSE_CB(_devcb) \ devcb = &sega315_5246_device::set_pause_callback(*device, DEVCB2_##_devcb); #define MCFG_SEGA315_5378_SET_SCREEN MCFG_VIDEO_SET_SCREEN - + #define MCFG_SEGA315_5378_IS_PAL(_bool) \ sega315_5378_device::set_signal_type(*device, _bool); #define MCFG_SEGA315_5378_INT_CB(_devcb) \ devcb = &sega315_5378_device::set_int_callback(*device, DEVCB2_##_devcb); - + #define MCFG_SEGA315_5378_PAUSE_CB(_devcb) \ devcb = &sega315_5378_device::set_pause_callback(*device, DEVCB2_##_devcb); diff --git a/src/emu/video/315_5313.c b/src/emu/video/315_5313.c index 662792377e5..86ad88c8509 100644 --- a/src/emu/video/315_5313.c +++ b/src/emu/video/315_5313.c @@ -2530,7 +2530,7 @@ void sega315_5313_device::render_videobuffer_to_screenbuffer(int scanline) lineptr[x] = m_palette_lookup[(dat & 0x3f)]; m_render_line_raw[x] |= (dat & 0x3f) | 0x040; } - + } else { @@ -2546,26 +2546,26 @@ void sega315_5313_device::render_videobuffer_to_screenbuffer(int scanline) lineptr[x] = m_palette_lookup_shadow[(dat & 0x3f)]; m_render_line_raw[x] |= (dat & 0x3f) | 0x000; break; - + case 0x4000: // normal pri, no shadow sprite, no highlight = normal; case 0x8000: // low pri, highlight sprite = normal; lineptr[x] = m_palette_lookup[(dat & 0x3f)]; m_render_line_raw[x] |= (dat & 0x3f) | 0x040; break; - + case 0x14000: // (sprite) normal pri, no shadow sprite, no highlight = normal; case 0x18000: // (sprite) low pri, highlight sprite = normal; lineptr[x] = m_palette_lookup_sprite[(dat & 0x3f)]; m_render_line_raw[x] |= (dat & 0x3f) | 0x080; break; - - + + case 0x0c000: // normal pri, highlight set = highlight? case 0x1c000: // (sprite) normal pri, highlight set = highlight? lineptr[x] = m_palette_lookup_highlight[(dat & 0x3f)]; m_render_line_raw[x] |= (dat & 0x3f) | 0x0c0; break; - + case 0x0a000: // shadow set, highlight set - not possible case 0x0e000: // shadow set, highlight set, normal set, not possible case 0x1a000: // (sprite)shadow set, highlight set - not possible diff --git a/src/emu/video/315_5313.h b/src/emu/video/315_5313.h index 94694cfe1f4..9292a339df6 100644 --- a/src/emu/video/315_5313.h +++ b/src/emu/video/315_5313.h @@ -149,25 +149,25 @@ #define MCFG_SEGA315_5313_INT_CB(_devcb) \ devcb = &sega315_5313_device::set_int_callback(*device, DEVCB2_##_devcb); - + #define MCFG_SEGA315_5313_PAUSE_CB(_devcb) \ devcb = &sega315_5313_device::set_pause_callback(*device, DEVCB2_##_devcb); #define MCFG_SEGA315_5313_SND_IRQ_CALLBACK(_write) \ devcb = &sega315_5313_device::set_sndirqline_callback(*device, DEVCB2_##_write); - + #define MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(_write) \ devcb = &sega315_5313_device::set_lv6irqline_callback(*device, DEVCB2_##_write); - + #define MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(_write) \ devcb = &sega315_5313_device::set_lv4irqline_callback(*device, DEVCB2_##_write); - + #define MCFG_SEGA315_5313_ALT_TIMING(_data) \ sega315_5313_device::set_alt_timing(*device, _data); - + #define MCFG_SEGA315_5313_PAL_WRITE_BASE(_data) \ sega315_5313_device::set_palwrite_base(*device, _data); - + #define MCFG_SEGA315_5313_PALETTE(_palette_tag) \ sega315_5313_device::static_set_palette_tag(*device, "^" _palette_tag); @@ -257,11 +257,11 @@ protected: devcb2_write_line m_sndirqline_callback; devcb2_write_line m_lv6irqline_callback; devcb2_write_line m_lv4irqline_callback; - + md_32x_scanline_delegate m_32x_scanline_func; md_32x_interrupt_delegate m_32x_interrupt_func; md_32x_scanline_helper_delegate m_32x_scanline_helper_func; - + private: int m_command_pending; // 2nd half of command pending.. @@ -291,7 +291,7 @@ private: int m_framerate; int m_vdp_pal; int m_use_cram; // c2 uses it's own palette ram, so it sets this to 0 - int m_dma_delay; // SVP and SegaCD have some 'lag' in DMA transfers + int m_dma_delay; // SVP and SegaCD have some 'lag' in DMA transfers UINT16* m_regs; UINT16* m_vram; diff --git a/src/emu/video/crt9007.h b/src/emu/video/crt9007.h index ada3f8bccde..8ca81f06890 100644 --- a/src/emu/video/crt9007.h +++ b/src/emu/video/crt9007.h @@ -97,8 +97,8 @@ // ======================> crt9007_t class crt9007_t : public device_t, - public device_memory_interface, - public device_video_interface + public device_memory_interface, + public device_video_interface { public: // construction/destruction diff --git a/src/emu/video/crt9021.h b/src/emu/video/crt9021.h index c72c5d850e1..856e9718d45 100644 --- a/src/emu/video/crt9021.h +++ b/src/emu/video/crt9021.h @@ -56,12 +56,12 @@ typedef device_delegate crt9021_t class crt9021_t : public device_t, - public device_video_interface + public device_video_interface { public: // construction/destruction crt9021_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + static void static_set_display_callback(device_t &device, crt9021_draw_character_delegate callback) { downcast(device).m_display_cb = callback; } void write(UINT8 data) { m_data = data; } diff --git a/src/emu/video/crt9212.h b/src/emu/video/crt9212.h index eb17158c4eb..078429f4fd4 100644 --- a/src/emu/video/crt9212.h +++ b/src/emu/video/crt9212.h @@ -72,7 +72,7 @@ class crt9212_t : public device_t public: // construction/destruction crt9212_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + static void static_set_wen2(device_t &device, int state) { downcast(device).m_wen2 = state; } template static devcb2_base &set_dout_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_dout.set_callback(object); } @@ -94,7 +94,7 @@ protected: virtual void device_start(); private: - devcb2_write8 m_write_dout; + devcb2_write8 m_write_dout; devcb2_write_line m_write_rof; devcb2_write_line m_write_wof; diff --git a/src/emu/video/dl1416.h b/src/emu/video/dl1416.h index 6cc0db13899..80d0192e6f0 100644 --- a/src/emu/video/dl1416.h +++ b/src/emu/video/dl1416.h @@ -34,7 +34,7 @@ class dl1416_device : public device_t public: dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~dl1416_device() {} - + template static devcb2_base &set_update_handler(device_t &device, _Object object) { return downcast(device).m_update.set_callback(object); } /* inputs */ diff --git a/src/emu/video/ef9345.h b/src/emu/video/ef9345.h index 540d3e13c3b..e41dcbc6fe4 100644 --- a/src/emu/video/ef9345.h +++ b/src/emu/video/ef9345.h @@ -21,7 +21,7 @@ #define MCFG_EF9345_PALETTE(_palette_tag) \ ef9345_device::static_set_palette_tag(*device, "^" _palette_tag); - + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -38,7 +38,7 @@ public: // static configuration static void static_set_palette_tag(device_t &device, const char *tag); - + // device interface DECLARE_READ8_MEMBER( data_r ); DECLARE_WRITE8_MEMBER( data_w ); @@ -112,7 +112,7 @@ private: // timers emu_timer *m_busy_timer; emu_timer *m_blink_timer; - + required_device m_palette; }; diff --git a/src/emu/video/epic12.c b/src/emu/video/epic12.c index 8e927e1ade5..2c55e3655cf 100644 --- a/src/emu/video/epic12.c +++ b/src/emu/video/epic12.c @@ -42,7 +42,7 @@ TIMER_CALLBACK_MEMBER( epic12_device::epic12_device_blitter_delay_callback ) } // static - void epic12_device::set_rambase(device_t &device, UINT16* rambase) + void epic12_device::set_rambase(device_t &device, UINT16* rambase) { epic12_device &dev = downcast(device); dev.epic12_device_ram16 = rambase; @@ -87,7 +87,6 @@ void epic12_device::device_start() void epic12_device::device_reset() { - if (m_is_unsafe) { use_ram = epic12_device_ram16; @@ -138,7 +137,7 @@ inline UINT16 epic12_device::READ_NEXT_WORD(offs_t *addr) { // UINT16 data = space.read_word(*addr); // going through the memory system is 'more correct' but noticably slower UINT16 data = use_ram[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)]; - + *addr += 2; // printf("data %04x\n", data); @@ -229,7 +228,6 @@ inline void epic12_device::epic12_device_gfx_upload(offs_t *addr) epic12_device_blitfunction epic12_device_f0_ti1_tr1_blit_funcs[] = { - epic12_device::draw_sprite_f0_ti1_tr1_s0_d0, epic12_device::draw_sprite_f0_ti1_tr1_s1_d0, epic12_device::draw_sprite_f0_ti1_tr1_s2_d0, epic12_device::draw_sprite_f0_ti1_tr1_s3_d0, epic12_device::draw_sprite_f0_ti1_tr1_s4_d0, epic12_device::draw_sprite_f0_ti1_tr1_s5_d0, epic12_device::draw_sprite_f0_ti1_tr1_s6_d0, epic12_device::draw_sprite_f0_ti1_tr1_s7_d0, epic12_device::draw_sprite_f0_ti1_tr1_s0_d1, epic12_device::draw_sprite_f0_ti1_tr1_s1_d1, epic12_device::draw_sprite_f0_ti1_tr1_s2_d1, epic12_device::draw_sprite_f0_ti1_tr1_s3_d1, epic12_device::draw_sprite_f0_ti1_tr1_s4_d1, epic12_device::draw_sprite_f0_ti1_tr1_s5_d1, epic12_device::draw_sprite_f0_ti1_tr1_s6_d1, epic12_device::draw_sprite_f0_ti1_tr1_s7_d1, epic12_device::draw_sprite_f0_ti1_tr1_s0_d2, epic12_device::draw_sprite_f0_ti1_tr1_s1_d2, epic12_device::draw_sprite_f0_ti1_tr1_s2_d2, epic12_device::draw_sprite_f0_ti1_tr1_s3_d2, epic12_device::draw_sprite_f0_ti1_tr1_s4_d2, epic12_device::draw_sprite_f0_ti1_tr1_s5_d2, epic12_device::draw_sprite_f0_ti1_tr1_s6_d2, epic12_device::draw_sprite_f0_ti1_tr1_s7_d2, @@ -242,7 +240,6 @@ epic12_device_blitfunction epic12_device_f0_ti1_tr1_blit_funcs[] = epic12_device_blitfunction epic12_device_f0_ti1_tr0_blit_funcs[] = { - epic12_device::draw_sprite_f0_ti1_tr0_s0_d0, epic12_device::draw_sprite_f0_ti1_tr0_s1_d0, epic12_device::draw_sprite_f0_ti1_tr0_s2_d0, epic12_device::draw_sprite_f0_ti1_tr0_s3_d0, epic12_device::draw_sprite_f0_ti1_tr0_s4_d0, epic12_device::draw_sprite_f0_ti1_tr0_s5_d0, epic12_device::draw_sprite_f0_ti1_tr0_s6_d0, epic12_device::draw_sprite_f0_ti1_tr0_s7_d0, epic12_device::draw_sprite_f0_ti1_tr0_s0_d1, epic12_device::draw_sprite_f0_ti1_tr0_s1_d1, epic12_device::draw_sprite_f0_ti1_tr0_s2_d1, epic12_device::draw_sprite_f0_ti1_tr0_s3_d1, epic12_device::draw_sprite_f0_ti1_tr0_s4_d1, epic12_device::draw_sprite_f0_ti1_tr0_s5_d1, epic12_device::draw_sprite_f0_ti1_tr0_s6_d1, epic12_device::draw_sprite_f0_ti1_tr0_s7_d1, epic12_device::draw_sprite_f0_ti1_tr0_s0_d2, epic12_device::draw_sprite_f0_ti1_tr0_s1_d2, epic12_device::draw_sprite_f0_ti1_tr0_s2_d2, epic12_device::draw_sprite_f0_ti1_tr0_s3_d2, epic12_device::draw_sprite_f0_ti1_tr0_s4_d2, epic12_device::draw_sprite_f0_ti1_tr0_s5_d2, epic12_device::draw_sprite_f0_ti1_tr0_s6_d2, epic12_device::draw_sprite_f0_ti1_tr0_s7_d2, @@ -255,7 +252,6 @@ epic12_device_blitfunction epic12_device_f0_ti1_tr0_blit_funcs[] = epic12_device_blitfunction epic12_device_f1_ti1_tr1_blit_funcs[] = { - epic12_device::draw_sprite_f1_ti1_tr1_s0_d0, epic12_device::draw_sprite_f1_ti1_tr1_s1_d0, epic12_device::draw_sprite_f1_ti1_tr1_s2_d0, epic12_device::draw_sprite_f1_ti1_tr1_s3_d0, epic12_device::draw_sprite_f1_ti1_tr1_s4_d0, epic12_device::draw_sprite_f1_ti1_tr1_s5_d0, epic12_device::draw_sprite_f1_ti1_tr1_s6_d0, epic12_device::draw_sprite_f1_ti1_tr1_s7_d0, epic12_device::draw_sprite_f1_ti1_tr1_s0_d1, epic12_device::draw_sprite_f1_ti1_tr1_s1_d1, epic12_device::draw_sprite_f1_ti1_tr1_s2_d1, epic12_device::draw_sprite_f1_ti1_tr1_s3_d1, epic12_device::draw_sprite_f1_ti1_tr1_s4_d1, epic12_device::draw_sprite_f1_ti1_tr1_s5_d1, epic12_device::draw_sprite_f1_ti1_tr1_s6_d1, epic12_device::draw_sprite_f1_ti1_tr1_s7_d1, epic12_device::draw_sprite_f1_ti1_tr1_s0_d2, epic12_device::draw_sprite_f1_ti1_tr1_s1_d2, epic12_device::draw_sprite_f1_ti1_tr1_s2_d2, epic12_device::draw_sprite_f1_ti1_tr1_s3_d2, epic12_device::draw_sprite_f1_ti1_tr1_s4_d2, epic12_device::draw_sprite_f1_ti1_tr1_s5_d2, epic12_device::draw_sprite_f1_ti1_tr1_s6_d2, epic12_device::draw_sprite_f1_ti1_tr1_s7_d2, @@ -268,7 +264,6 @@ epic12_device_blitfunction epic12_device_f1_ti1_tr1_blit_funcs[] = epic12_device_blitfunction epic12_device_f1_ti1_tr0_blit_funcs[] = { - epic12_device::draw_sprite_f1_ti1_tr0_s0_d0, epic12_device::draw_sprite_f1_ti1_tr0_s1_d0, epic12_device::draw_sprite_f1_ti1_tr0_s2_d0, epic12_device::draw_sprite_f1_ti1_tr0_s3_d0, epic12_device::draw_sprite_f1_ti1_tr0_s4_d0, epic12_device::draw_sprite_f1_ti1_tr0_s5_d0, epic12_device::draw_sprite_f1_ti1_tr0_s6_d0, epic12_device::draw_sprite_f1_ti1_tr0_s7_d0, epic12_device::draw_sprite_f1_ti1_tr0_s0_d1, epic12_device::draw_sprite_f1_ti1_tr0_s1_d1, epic12_device::draw_sprite_f1_ti1_tr0_s2_d1, epic12_device::draw_sprite_f1_ti1_tr0_s3_d1, epic12_device::draw_sprite_f1_ti1_tr0_s4_d1, epic12_device::draw_sprite_f1_ti1_tr0_s5_d1, epic12_device::draw_sprite_f1_ti1_tr0_s6_d1, epic12_device::draw_sprite_f1_ti1_tr0_s7_d1, epic12_device::draw_sprite_f1_ti1_tr0_s0_d2, epic12_device::draw_sprite_f1_ti1_tr0_s1_d2, epic12_device::draw_sprite_f1_ti1_tr0_s2_d2, epic12_device::draw_sprite_f1_ti1_tr0_s3_d2, epic12_device::draw_sprite_f1_ti1_tr0_s4_d2, epic12_device::draw_sprite_f1_ti1_tr0_s5_d2, epic12_device::draw_sprite_f1_ti1_tr0_s6_d2, epic12_device::draw_sprite_f1_ti1_tr0_s7_d2, @@ -283,7 +278,6 @@ epic12_device_blitfunction epic12_device_f1_ti1_tr0_blit_funcs[] = epic12_device_blitfunction epic12_device_f0_ti0_tr1_blit_funcs[] = { - epic12_device::draw_sprite_f0_ti0_tr1_s0_d0, epic12_device::draw_sprite_f0_ti0_tr1_s1_d0, epic12_device::draw_sprite_f0_ti0_tr1_s2_d0, epic12_device::draw_sprite_f0_ti0_tr1_s3_d0, epic12_device::draw_sprite_f0_ti0_tr1_s4_d0, epic12_device::draw_sprite_f0_ti0_tr1_s5_d0, epic12_device::draw_sprite_f0_ti0_tr1_s6_d0, epic12_device::draw_sprite_f0_ti0_tr1_s7_d0, epic12_device::draw_sprite_f0_ti0_tr1_s0_d1, epic12_device::draw_sprite_f0_ti0_tr1_s1_d1, epic12_device::draw_sprite_f0_ti0_tr1_s2_d1, epic12_device::draw_sprite_f0_ti0_tr1_s3_d1, epic12_device::draw_sprite_f0_ti0_tr1_s4_d1, epic12_device::draw_sprite_f0_ti0_tr1_s5_d1, epic12_device::draw_sprite_f0_ti0_tr1_s6_d1, epic12_device::draw_sprite_f0_ti0_tr1_s7_d1, epic12_device::draw_sprite_f0_ti0_tr1_s0_d2, epic12_device::draw_sprite_f0_ti0_tr1_s1_d2, epic12_device::draw_sprite_f0_ti0_tr1_s2_d2, epic12_device::draw_sprite_f0_ti0_tr1_s3_d2, epic12_device::draw_sprite_f0_ti0_tr1_s4_d2, epic12_device::draw_sprite_f0_ti0_tr1_s5_d2, epic12_device::draw_sprite_f0_ti0_tr1_s6_d2, epic12_device::draw_sprite_f0_ti0_tr1_s7_d2, @@ -296,7 +290,6 @@ epic12_device_blitfunction epic12_device_f0_ti0_tr1_blit_funcs[] = epic12_device_blitfunction epic12_device_f0_ti0_tr0_blit_funcs[] = { - epic12_device::draw_sprite_f0_ti0_tr0_s0_d0, epic12_device::draw_sprite_f0_ti0_tr0_s1_d0, epic12_device::draw_sprite_f0_ti0_tr0_s2_d0, epic12_device::draw_sprite_f0_ti0_tr0_s3_d0, epic12_device::draw_sprite_f0_ti0_tr0_s4_d0, epic12_device::draw_sprite_f0_ti0_tr0_s5_d0, epic12_device::draw_sprite_f0_ti0_tr0_s6_d0, epic12_device::draw_sprite_f0_ti0_tr0_s7_d0, epic12_device::draw_sprite_f0_ti0_tr0_s0_d1, epic12_device::draw_sprite_f0_ti0_tr0_s1_d1, epic12_device::draw_sprite_f0_ti0_tr0_s2_d1, epic12_device::draw_sprite_f0_ti0_tr0_s3_d1, epic12_device::draw_sprite_f0_ti0_tr0_s4_d1, epic12_device::draw_sprite_f0_ti0_tr0_s5_d1, epic12_device::draw_sprite_f0_ti0_tr0_s6_d1, epic12_device::draw_sprite_f0_ti0_tr0_s7_d1, epic12_device::draw_sprite_f0_ti0_tr0_s0_d2, epic12_device::draw_sprite_f0_ti0_tr0_s1_d2, epic12_device::draw_sprite_f0_ti0_tr0_s2_d2, epic12_device::draw_sprite_f0_ti0_tr0_s3_d2, epic12_device::draw_sprite_f0_ti0_tr0_s4_d2, epic12_device::draw_sprite_f0_ti0_tr0_s5_d2, epic12_device::draw_sprite_f0_ti0_tr0_s6_d2, epic12_device::draw_sprite_f0_ti0_tr0_s7_d2, @@ -309,7 +302,6 @@ epic12_device_blitfunction epic12_device_f0_ti0_tr0_blit_funcs[] = epic12_device_blitfunction epic12_device_f1_ti0_tr1_blit_funcs[] = { - epic12_device::draw_sprite_f1_ti0_tr1_s0_d0, epic12_device::draw_sprite_f1_ti0_tr1_s1_d0, epic12_device::draw_sprite_f1_ti0_tr1_s2_d0, epic12_device::draw_sprite_f1_ti0_tr1_s3_d0, epic12_device::draw_sprite_f1_ti0_tr1_s4_d0, epic12_device::draw_sprite_f1_ti0_tr1_s5_d0, epic12_device::draw_sprite_f1_ti0_tr1_s6_d0, epic12_device::draw_sprite_f1_ti0_tr1_s7_d0, epic12_device::draw_sprite_f1_ti0_tr1_s0_d1, epic12_device::draw_sprite_f1_ti0_tr1_s1_d1, epic12_device::draw_sprite_f1_ti0_tr1_s2_d1, epic12_device::draw_sprite_f1_ti0_tr1_s3_d1, epic12_device::draw_sprite_f1_ti0_tr1_s4_d1, epic12_device::draw_sprite_f1_ti0_tr1_s5_d1, epic12_device::draw_sprite_f1_ti0_tr1_s6_d1, epic12_device::draw_sprite_f1_ti0_tr1_s7_d1, epic12_device::draw_sprite_f1_ti0_tr1_s0_d2, epic12_device::draw_sprite_f1_ti0_tr1_s1_d2, epic12_device::draw_sprite_f1_ti0_tr1_s2_d2, epic12_device::draw_sprite_f1_ti0_tr1_s3_d2, epic12_device::draw_sprite_f1_ti0_tr1_s4_d2, epic12_device::draw_sprite_f1_ti0_tr1_s5_d2, epic12_device::draw_sprite_f1_ti0_tr1_s6_d2, epic12_device::draw_sprite_f1_ti0_tr1_s7_d2, @@ -322,7 +314,6 @@ epic12_device_blitfunction epic12_device_f1_ti0_tr1_blit_funcs[] = epic12_device_blitfunction epic12_device_f1_ti0_tr0_blit_funcs[] = { - epic12_device::draw_sprite_f1_ti0_tr0_s0_d0, epic12_device::draw_sprite_f1_ti0_tr0_s1_d0, epic12_device::draw_sprite_f1_ti0_tr0_s2_d0, epic12_device::draw_sprite_f1_ti0_tr0_s3_d0, epic12_device::draw_sprite_f1_ti0_tr0_s4_d0, epic12_device::draw_sprite_f1_ti0_tr0_s5_d0, epic12_device::draw_sprite_f1_ti0_tr0_s6_d0, epic12_device::draw_sprite_f1_ti0_tr0_s7_d0, epic12_device::draw_sprite_f1_ti0_tr0_s0_d1, epic12_device::draw_sprite_f1_ti0_tr0_s1_d1, epic12_device::draw_sprite_f1_ti0_tr0_s2_d1, epic12_device::draw_sprite_f1_ti0_tr0_s3_d1, epic12_device::draw_sprite_f1_ti0_tr0_s4_d1, epic12_device::draw_sprite_f1_ti0_tr0_s5_d1, epic12_device::draw_sprite_f1_ti0_tr0_s6_d1, epic12_device::draw_sprite_f1_ti0_tr0_s7_d1, epic12_device::draw_sprite_f1_ti0_tr0_s0_d2, epic12_device::draw_sprite_f1_ti0_tr0_s1_d2, epic12_device::draw_sprite_f1_ti0_tr0_s2_d2, epic12_device::draw_sprite_f1_ti0_tr0_s3_d2, epic12_device::draw_sprite_f1_ti0_tr0_s4_d2, epic12_device::draw_sprite_f1_ti0_tr0_s5_d2, epic12_device::draw_sprite_f1_ti0_tr0_s6_d2, epic12_device::draw_sprite_f1_ti0_tr0_s7_d2, @@ -343,8 +334,8 @@ inline void epic12_device::epic12_device_gfx_draw_shadow_copy(address_space &spa COPY_NEXT_WORD(space, addr); COPY_NEXT_WORD(space, addr); // UINT16 dst_x_start = COPY_NEXT_WORD(space, addr); COPY_NEXT_WORD(space, addr); // UINT16 dst_y_start = COPY_NEXT_WORD(space, addr); - UINT16 w = COPY_NEXT_WORD(space, addr); - UINT16 h = COPY_NEXT_WORD(space, addr); + UINT16 w = COPY_NEXT_WORD(space, addr); + UINT16 h = COPY_NEXT_WORD(space, addr); COPY_NEXT_WORD(space, addr); COPY_NEXT_WORD(space, addr); @@ -359,21 +350,21 @@ inline void epic12_device::epic12_device_gfx_draw_shadow_copy(address_space &spa inline void epic12_device::epic12_device_gfx_draw(offs_t *addr) { - int x,y, dimx,dimy, flipx,flipy;//, src_p; + int x,y, dimx,dimy, flipx,flipy;//, src_p; int trans,blend, s_mode, d_mode; clr_t tint_clr; int tinted = 0; - UINT16 attr = READ_NEXT_WORD(addr); - UINT16 alpha = READ_NEXT_WORD(addr); - UINT16 src_x = READ_NEXT_WORD(addr); - UINT16 src_y = READ_NEXT_WORD(addr); - UINT16 dst_x_start = READ_NEXT_WORD(addr); - UINT16 dst_y_start = READ_NEXT_WORD(addr); - UINT16 w = READ_NEXT_WORD(addr); - UINT16 h = READ_NEXT_WORD(addr); - UINT16 tint_r = READ_NEXT_WORD(addr); - UINT16 tint_gb = READ_NEXT_WORD(addr); + UINT16 attr = READ_NEXT_WORD(addr); + UINT16 alpha = READ_NEXT_WORD(addr); + UINT16 src_x = READ_NEXT_WORD(addr); + UINT16 src_y = READ_NEXT_WORD(addr); + UINT16 dst_x_start = READ_NEXT_WORD(addr); + UINT16 dst_y_start = READ_NEXT_WORD(addr); + UINT16 w = READ_NEXT_WORD(addr); + UINT16 h = READ_NEXT_WORD(addr); + UINT16 tint_r = READ_NEXT_WORD(addr); + UINT16 tint_gb = READ_NEXT_WORD(addr); // 0: +alpha // 1: +source @@ -384,28 +375,28 @@ inline void epic12_device::epic12_device_gfx_draw(offs_t *addr) // 6: -dest // 7: * - d_mode = attr & 0x0007; - s_mode = (attr & 0x0070) >> 4; + d_mode = attr & 0x0007; + s_mode = (attr & 0x0070) >> 4; - trans = attr & 0x0100; - blend = attr & 0x0200; + trans = attr & 0x0100; + blend = attr & 0x0200; - flipy = attr & 0x0400; - flipx = attr & 0x0800; + flipy = attr & 0x0400; + flipx = attr & 0x0800; - const UINT8 d_alpha = ((alpha & 0x00ff) )>>3; - const UINT8 s_alpha = ((alpha & 0xff00) >> 8 )>>3; + const UINT8 d_alpha = ((alpha & 0x00ff) )>>3; + const UINT8 s_alpha = ((alpha & 0xff00) >> 8 )>>3; // src_p = 0; - src_x = src_x & 0x1fff; - src_y = src_y & 0x0fff; + src_x = src_x & 0x1fff; + src_y = src_y & 0x0fff; - x = (dst_x_start & 0x7fff) - (dst_x_start & 0x8000); - y = (dst_y_start & 0x7fff) - (dst_y_start & 0x8000); + x = (dst_x_start & 0x7fff) - (dst_x_start & 0x8000); + y = (dst_y_start & 0x7fff) - (dst_y_start & 0x8000); - dimx = (w & 0x1fff) + 1; - dimy = (h & 0x0fff) + 1; + dimx = (w & 0x1fff) + 1; + dimy = (h & 0x0fff) + 1; // convert parameters to clr @@ -483,7 +474,6 @@ inline void epic12_device::epic12_device_gfx_draw(offs_t *addr) } else { - if (blend==0 && tinted==0) { if (!flipx) @@ -903,7 +893,7 @@ void epic12_device::draw_screen(bitmap_rgb32 &bitmap, const rectangle &cliprect - + READ32_MEMBER( epic12_device::epic12_device_blitter_r ) { switch (offset*4) diff --git a/src/emu/video/epic12.h b/src/emu/video/epic12.h index 8ce6ef13b5e..0e341cae213 100644 --- a/src/emu/video/epic12.h +++ b/src/emu/video/epic12.h @@ -3,8 +3,8 @@ MCFG_DEVICE_ADD(_tag, EPIC12, 0) //#define MCFG_EP1C12_ADD(_tag,_config,_map) -// MCFG_DEVICE_CONFIG(_config) -// MCFG_DEVICE_ADDRESS_MAP(AS_0, _map) +// MCFG_DEVICE_CONFIG(_config) +// MCFG_DEVICE_ADDRESS_MAP(AS_0, _map) #define MCFG_EPIC12_SET_MAINRAMSIZE( _rgn ) \ epic12_device::set_mainramsize(*device, _rgn); @@ -29,19 +29,19 @@ union colour_t }; typedef const void (*epic12_device_blitfunction)(bitmap_rgb32 *, - const rectangle *, - UINT32 *, /* gfx */ - int , /* src_x */ - int , /* src_y */ - const int , /* dst_x_start */ - const int , /* dst_y_start */ - int , /* dimx */ - int , /* dimy */ - const int , /* flipy */ - const UINT8 , /* s_alpha */ - const UINT8 , /* d_alpha */ - //int , /* tint */ - const clr_t * ); + const rectangle *, + UINT32 *, /* gfx */ + int , /* src_x */ + int , /* src_y */ + const int , /* dst_x_start */ + const int , /* dst_y_start */ + int , /* dimx */ + int , /* dimy */ + const int , /* flipy */ + const UINT8 , /* s_alpha */ + const UINT8 , /* d_alpha */ + //int , /* tint */ + const clr_t * ); class epic12_device : public device_t, @@ -79,7 +79,7 @@ public: bitmap_rgb32 *epic12_device_bitmaps; rectangle epic12_device_clip; - + UINT16* use_ram; int m_main_ramsize; // type D has double the main ram int m_main_rammask; @@ -676,15 +676,14 @@ public: // convert separate r,g,b biases (0..80..ff) to clr_t (-1f..0..1f) static inline void tint_to_clr(UINT8 r, UINT8 g, UINT8 b, clr_t *clr) { - clr->r = r>>2; - clr->g = g>>2; - clr->b = b>>2; + clr->r = r>>2; + clr->g = g>>2; + clr->b = b>>2; }; // clr_t to r5g5b5 static inline UINT32 clr_to_pen(const clr_t *clr) { - // --t- ---- rrrr r--- gggg g--- bbbb b--- format return (clr->r << (16+3)) | (clr->g << (8+3)) | (clr->b << 3); @@ -739,9 +738,9 @@ public: static inline void clr_add(clr_t *clr, const clr_t *clr0, const clr_t *clr1) { /* - clr->r = clr0->r + clr1->r; - clr->g = clr0->g + clr1->g; - clr->b = clr0->b + clr1->b; + clr->r = clr0->r + clr1->r; + clr->g = clr0->g + clr1->g; + clr->b = clr0->b + clr1->b; */ // use pre-clamped lookup table clr->r = epic12_device_colrtable_add[clr0->r][clr1->r]; @@ -834,7 +833,7 @@ protected: - osd_work_queue * queue; /* work queue */ + osd_work_queue * queue; /* work queue */ osd_work_item * blitter_request; // blit timing diff --git a/src/emu/video/epic12_blit2.c b/src/emu/video/epic12_blit2.c index cff04448ff6..897dcad4db7 100644 --- a/src/emu/video/epic12_blit2.c +++ b/src/emu/video/epic12_blit2.c @@ -553,4 +553,4 @@ #undef FLIPX #undef TINT #undef TRANSPARENT -#undef REALLY_SIMPLE \ No newline at end of file +#undef REALLY_SIMPLE diff --git a/src/emu/video/epic12_blit3.c b/src/emu/video/epic12_blit3.c index 5729949ca50..32e7bdaf469 100644 --- a/src/emu/video/epic12_blit3.c +++ b/src/emu/video/epic12_blit3.c @@ -553,4 +553,4 @@ #undef FLIPX #undef TINT #undef TRANSPARENT -#undef REALLY_SIMPLE \ No newline at end of file +#undef REALLY_SIMPLE diff --git a/src/emu/video/epic12_blit4.c b/src/emu/video/epic12_blit4.c index 4d4bcc0853b..c431a401666 100644 --- a/src/emu/video/epic12_blit4.c +++ b/src/emu/video/epic12_blit4.c @@ -553,4 +553,4 @@ #undef FLIPX #undef TINT #undef TRANSPARENT -#undef REALLY_SIMPLE \ No newline at end of file +#undef REALLY_SIMPLE diff --git a/src/emu/video/epic12_blit6.c b/src/emu/video/epic12_blit6.c index 963d6f14ca5..7427c67f0c6 100644 --- a/src/emu/video/epic12_blit6.c +++ b/src/emu/video/epic12_blit6.c @@ -554,5 +554,3 @@ #undef TINT #undef TRANSPARENT #undef REALLY_SIMPLE - - diff --git a/src/emu/video/epic12_blit7.c b/src/emu/video/epic12_blit7.c index a7203492f10..a01fd84a5ff 100644 --- a/src/emu/video/epic12_blit7.c +++ b/src/emu/video/epic12_blit7.c @@ -554,5 +554,3 @@ #undef TINT #undef TRANSPARENT #undef REALLY_SIMPLE - - diff --git a/src/emu/video/epic12_blit8.c b/src/emu/video/epic12_blit8.c index 29bb6794e12..ed9de7c15ec 100644 --- a/src/emu/video/epic12_blit8.c +++ b/src/emu/video/epic12_blit8.c @@ -38,6 +38,3 @@ #undef BLENDED #undef REALLY_SIMPLE - - - diff --git a/src/emu/video/epic12in.inc b/src/emu/video/epic12in.inc index 7972485f2ed..d21eeac1b9c 100644 --- a/src/emu/video/epic12in.inc +++ b/src/emu/video/epic12in.inc @@ -3,8 +3,6 @@ const void epic12_device::FUNCNAME(BLIT_PARAMS) { - - UINT32* gfx2; int y, yf; @@ -47,8 +45,8 @@ const void epic12_device::FUNCNAME(BLIT_PARAMS) src_x += (dimx-1); #endif - if (flipy) { yf = -1; src_y += (dimy-1); } - else { yf = +1; } + if (flipy) { yf = -1; src_y += (dimy-1); } + else { yf = +1; } int starty = 0; const int dst_y_end = dst_y_start+dimy; @@ -64,13 +62,13 @@ const void epic12_device::FUNCNAME(BLIT_PARAMS) #if FLIPX == 1 if ((src_x &0x1fff) < ((src_x-(dimx-1))&0x1fff)) { - // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx); + // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx); return; } #else if ((src_x &0x1fff) > ((src_x+(dimx-1))&0x1fff)) { - // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx); + // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx); return; } #endif diff --git a/src/emu/video/epic12pixel.inc b/src/emu/video/epic12pixel.inc index 8dbc1046c28..3cb01cebbf4 100644 --- a/src/emu/video/epic12pixel.inc +++ b/src/emu/video/epic12pixel.inc @@ -3,14 +3,12 @@ #if FLIPX == 1 #define LOOP_INCREMENTS \ bmp++; \ - gfx2--; \ - + gfx2--; #else #define LOOP_INCREMENTS \ bmp++; \ - gfx2++; \ - + gfx2++; #endif @@ -49,7 +47,7 @@ // convert destination to clr pen_to_clr(*bmp, &d_clr.trgb); - //d_clr.u32 = *bmp >> 3; // using the union is actually significantly slower than our pen_to_clr to function! + //d_clr.u32 = *bmp >> 3; // using the union is actually significantly slower than our pen_to_clr to function! #if _SMODE == 0 //g_profiler.start(PROFILER_USER7); @@ -193,4 +191,3 @@ } #endif LOOP_INCREMENTS - diff --git a/src/emu/video/fixfreq.c b/src/emu/video/fixfreq.c index fcc9247ad66..dabc7c17524 100644 --- a/src/emu/video/fixfreq.c +++ b/src/emu/video/fixfreq.c @@ -268,7 +268,7 @@ NETDEV_ANALOG_CALLBACK_MEMBER(fixedfreq_device::update_vid) { int colv = (int) ((m_vid - m_sync_threshold) / 3.7 * 255.0); if (colv > 255) - colv = 255; + colv = 255; col = rgb_t(colv, colv, colv); } diff --git a/src/emu/video/hd44352.h b/src/emu/video/hd44352.h index 2ace6c258e0..195a74db1ed 100644 --- a/src/emu/video/hd44352.h +++ b/src/emu/video/hd44352.h @@ -30,7 +30,7 @@ public: hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb2_base &set_on_callback(device_t &device, _Object object) { return downcast(device).m_on_cb.set_callback(object); } - + // device interface UINT8 data_read(); void data_write(UINT8 data); diff --git a/src/emu/video/hd44780.h b/src/emu/video/hd44780.h index aaa34fcf7e9..f59f456f00b 100644 --- a/src/emu/video/hd44780.h +++ b/src/emu/video/hd44780.h @@ -125,7 +125,7 @@ private: int m_rw_state; bool m_nibble; int m_charset_type; - UINT8 m_render_buf[80*16]; + UINT8 m_render_buf[80*16]; enum { DDRAM, CGRAM }; }; diff --git a/src/emu/video/hd61830.h b/src/emu/video/hd61830.h index 01e6aaa5036..24de36df2c9 100644 --- a/src/emu/video/hd61830.h +++ b/src/emu/video/hd61830.h @@ -93,7 +93,7 @@ private: emu_timer *m_busy_timer; //address_space *m_data; - + bool m_bf; // busy flag UINT8 m_ir; // instruction register diff --git a/src/emu/video/huc6260.h b/src/emu/video/huc6260.h index 3527eb65407..89932fea284 100644 --- a/src/emu/video/huc6260.h +++ b/src/emu/video/huc6260.h @@ -20,16 +20,16 @@ #define MCFG_HUC6260_NEXT_PIXEL_DATA_CB(_devcb) \ devcb = &huc6260_device::set_next_pixel_data_callback(*device, DEVCB2_##_devcb); - + #define MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(_devcb) \ devcb = &huc6260_device::set_time_til_next_event_callback(*device, DEVCB2_##_devcb); - + #define MCFG_HUC6260_VSYNC_CHANGED_CB(_devcb) \ devcb = &huc6260_device::set_vsync_changed_callback(*device, DEVCB2_##_devcb); - + #define MCFG_HUC6260_HSYNC_CHANGED_CB(_devcb) \ devcb = &huc6260_device::set_hsync_changed_callback(*device, DEVCB2_##_devcb); - + class huc6260_device : public device_t, public device_video_interface @@ -42,7 +42,7 @@ public: template static devcb2_base &set_time_til_next_event_callback(device_t &device, _Object object) { return downcast(device).m_time_til_next_event_cb.set_callback(object); } template static devcb2_base &set_vsync_changed_callback(device_t &device, _Object object) { return downcast(device).m_vsync_changed_cb.set_callback(object); } template static devcb2_base &set_hsync_changed_callback(device_t &device, _Object object) { return downcast(device).m_hsync_changed_cb.set_callback(object); } - + void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h index 7cf6cb42857..99e370c5af5 100644 --- a/src/emu/video/huc6270.h +++ b/src/emu/video/huc6270.h @@ -20,7 +20,7 @@ class huc6270_device : public device_t public: // construction/destruction huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + static void set_vram_size(device_t &device, UINT32 vram_size) { downcast(device).m_vram_size = vram_size; } template static devcb2_base &set_irq_changed_callback(device_t &device, _Object object) { return downcast(device).m_irq_changed_cb.set_callback(object); } @@ -66,10 +66,10 @@ private: HUC6270_HSW }; - + /* Size of Video ram (mandatory) */ UINT32 m_vram_size; - + /* Callback for when the irq line may have changed (mandatory) */ devcb2_write_line m_irq_changed_cb; diff --git a/src/emu/video/mb_vcu.h b/src/emu/video/mb_vcu.h index 7c83689af13..6c079c2ff45 100644 --- a/src/emu/video/mb_vcu.h +++ b/src/emu/video/mb_vcu.h @@ -19,7 +19,7 @@ Template for skeleton device #define MCFG_MB_VCU_ADD(_tag,_freq,_config, _palette_tag) \ MCFG_DEVICE_ADD(_tag, MB_VCU, _freq) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_DEVICE_CONFIG(_config) \ mb_vcu_device::static_set_palette_tag(*device, "^" _palette_tag); //************************************************************************** diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c index eb553dd8157..20a31ff9ba4 100644 --- a/src/emu/video/mc6845.c +++ b/src/emu/video/mc6845.c @@ -1472,7 +1472,7 @@ MACHINE_CONFIG_END machine_config_constructor mos8563_device::device_mconfig_additions() const { - return MACHINE_CONFIG_NAME( mos8563 ); + return MACHINE_CONFIG_NAME( mos8563 ); } diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c index b1810cc3446..78a74c9f474 100644 --- a/src/emu/video/mc6847.c +++ b/src/emu/video/mc6847.c @@ -1858,7 +1858,7 @@ mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, const ch //------------------------------------------------- s68047_device::s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : mc6847_base_device(mconfig, S68047, "S68047", tag, owner, clock, s68047_fontdata8x12, 262.0, "s68047", __FILE__) + : mc6847_base_device(mconfig, S68047, "S68047", tag, owner, clock, s68047_fontdata8x12, 262.0, "s68047", __FILE__) { } @@ -1879,23 +1879,22 @@ void s68047_device::hack_black_becomes_blue(bool flag) const UINT32 s68047_device::s_s68047_hack_palette[16] = { - rgb_t(0x07, 0xff, 0x00), /* GREEN */ - rgb_t(0xff, 0xff, 0x00), /* YELLOW */ - rgb_t(0x3b, 0x08, 0xff), /* BLUE */ - rgb_t(0xcc, 0x00, 0x3b), /* RED */ - rgb_t(0xff, 0xff, 0xff), /* BUFF */ - rgb_t(0x07, 0xe3, 0x99), /* CYAN */ - rgb_t(0xff, 0x1c, 0xff), /* MAGENTA */ - rgb_t(0xff, 0x81, 0x00), /* ORANGE */ - - rgb_t(0x00, 0x00, 0x00), /* BLACK */ - rgb_t(0x07, 0xff, 0x00), /* GREEN */ - rgb_t(0x3b, 0x08, 0xff), /* BLUE */ - rgb_t(0xff, 0xff, 0xff), /* BUFF */ - - rgb_t(0x00, 0x7c, 0x00), /* ALPHANUMERIC DARK GREEN */ - rgb_t(0x07, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */ - rgb_t(0x91, 0x00, 0x00), /* ALPHANUMERIC DARK ORANGE */ - rgb_t(0xff, 0x81, 0x00) /* ALPHANUMERIC BRIGHT ORANGE */ -}; + rgb_t(0x07, 0xff, 0x00), /* GREEN */ + rgb_t(0xff, 0xff, 0x00), /* YELLOW */ + rgb_t(0x3b, 0x08, 0xff), /* BLUE */ + rgb_t(0xcc, 0x00, 0x3b), /* RED */ + rgb_t(0xff, 0xff, 0xff), /* BUFF */ + rgb_t(0x07, 0xe3, 0x99), /* CYAN */ + rgb_t(0xff, 0x1c, 0xff), /* MAGENTA */ + rgb_t(0xff, 0x81, 0x00), /* ORANGE */ + rgb_t(0x00, 0x00, 0x00), /* BLACK */ + rgb_t(0x07, 0xff, 0x00), /* GREEN */ + rgb_t(0x3b, 0x08, 0xff), /* BLUE */ + rgb_t(0xff, 0xff, 0xff), /* BUFF */ + + rgb_t(0x00, 0x7c, 0x00), /* ALPHANUMERIC DARK GREEN */ + rgb_t(0x07, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */ + rgb_t(0x91, 0x00, 0x00), /* ALPHANUMERIC DARK ORANGE */ + rgb_t(0xff, 0x81, 0x00) /* ALPHANUMERIC BRIGHT ORANGE */ +}; diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h index f93ca8dd338..372bc193131 100644 --- a/src/emu/video/mc6847.h +++ b/src/emu/video/mc6847.h @@ -44,7 +44,7 @@ #define MCFG_MC6847_FSYNC_CALLBACK(_write) \ devcb = &mc6847_friend_device::set_fsync_wr_callback(*device, DEVCB2_##_write); - + /* interface */ struct mc6847_interface { @@ -668,12 +668,12 @@ public: class s68047_device : public mc6847_base_device { public: - s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void hack_black_becomes_blue(bool flag); private: - static const UINT32 s_s68047_hack_palette[16]; + static const UINT32 s_s68047_hack_palette[16]; }; diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index cdd6e19a185..b61637b13ec 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -128,13 +128,13 @@ const device_type MACH8 = &device_creator; vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - m_palette(*this, "^palette") + m_palette(*this, "^palette") { } vga_device::vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__), - m_palette(*this, "^palette") + m_palette(*this, "^palette") { } @@ -2873,7 +2873,7 @@ void s3_vga_device::s3_define_video_mode() // DCLK calculation freq = ((double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r)))) * 14.318f; // clock between XIN and XOUT xtal = freq * 1000000; - } + } if((s3.ext_misc_ctrl_2) >> 4) { diff --git a/src/emu/video/ramdac.h b/src/emu/video/ramdac.h index 523b4ab64b3..b1630dc5658 100644 --- a/src/emu/video/ramdac.h +++ b/src/emu/video/ramdac.h @@ -19,8 +19,8 @@ #define MCFG_RAMDAC_ADD(_tag,_config,_map,_palette_tag) \ MCFG_DEVICE_ADD(_tag, RAMDAC, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_ADDRESS_MAP(AS_0, _map) \ - ramdac_device::static_set_palette_tag(*device, "^" _palette_tag); + MCFG_DEVICE_ADDRESS_MAP(AS_0, _map) \ + ramdac_device::static_set_palette_tag(*device, "^" _palette_tag); #define RAMDAC_INTERFACE(name) \ const ramdac_interface (name) = @@ -79,7 +79,7 @@ private: UINT8 m_int_index[2]; UINT8 *m_palram; - const address_space_config m_space_config; + const address_space_config m_space_config; required_device m_palette; }; diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c index 27e75ff67f2..c2b3a324ecf 100644 --- a/src/emu/video/tms34061.c +++ b/src/emu/video/tms34061.c @@ -54,7 +54,7 @@ void tms34061_device::device_start() { /* resolve callbak */ m_interrupt_cb.resolve(); - + /* reset the data */ m_vrammask = m_vramsize - 1; diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h index dfaf9e286f5..402a9e9de98 100644 --- a/src/emu/video/tms34061.h +++ b/src/emu/video/tms34061.h @@ -20,7 +20,7 @@ #define MCFG_TMS34061_INTERRUPT_CB(_devcb) \ devcb = &tms34061_device::set_interrupt_callback(*device, DEVCB2_##_devcb); - + /* register constants */ enum @@ -67,7 +67,7 @@ class tms34061_device : public device_t, public: // construction/destruction tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + static void set_rowshift(device_t &device, UINT8 rowshift) { downcast(device).m_rowshift = rowshift; } static void set_vram_size(device_t &device, UINT32 vramsize) { downcast(device).m_vramsize = vramsize; } template static devcb2_base &set_interrupt_callback(device_t &device, _Object object) { return downcast(device).m_interrupt_cb.set_callback(object); } @@ -91,10 +91,10 @@ protected: virtual void device_reset(); private: - UINT8 m_rowshift; /* VRAM address is (row << rowshift) | col */ - UINT32 m_vramsize; /* size of video RAM */ - devcb2_write_line m_interrupt_cb; /* interrupt gen callback */ - + UINT8 m_rowshift; /* VRAM address is (row << rowshift) | col */ + UINT32 m_vramsize; /* size of video RAM */ + devcb2_write_line m_interrupt_cb; /* interrupt gen callback */ + UINT16 m_regs[TMS34061_REGCOUNT]; UINT16 m_xmask; UINT8 m_yshift; diff --git a/src/emu/video/upd3301.c b/src/emu/video/upd3301.c index f59438a6e50..15885cc6896 100644 --- a/src/emu/video/upd3301.c +++ b/src/emu/video/upd3301.c @@ -636,4 +636,3 @@ void upd3301_device::recompute_parameters() update_hrtc_timer(0); update_vrtc_timer(0); } - diff --git a/src/emu/video/upd7220.h b/src/emu/video/upd7220.h index bb7a086542d..adeadaef495 100644 --- a/src/emu/video/upd7220.h +++ b/src/emu/video/upd7220.h @@ -153,8 +153,8 @@ private: void draw_graphics_line(bitmap_rgb32 &bitmap, UINT32 addr, int y, int wd); void update_graphics(bitmap_rgb32 &bitmap, const rectangle &cliprect, int force_bitmap); - upd7220_display_pixels_delegate m_display_cb; - upd7220_draw_text_delegate m_draw_text_cb; + upd7220_display_pixels_delegate m_display_cb; + upd7220_draw_text_delegate m_draw_text_cb; devcb2_write_line m_write_drq; devcb2_write_line m_write_hsync; diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h index 6f39a5d0eaf..665a8900c48 100644 --- a/src/emu/video/v9938.h +++ b/src/emu/video/v9938.h @@ -233,7 +233,7 @@ private: void (v99x8_device::*draw_sprite_16)(const pen_t *, UINT16*, UINT8*); void (v99x8_device::*draw_sprite_16s)(const pen_t *, UINT16*, UINT8*); } ; - static const v99x8_mode s_modes[]; + static const v99x8_mode s_modes[]; required_device m_palette; protected: static UINT16 s_pal_indYJK[0x20000]; diff --git a/src/emu/video/vic4567.h b/src/emu/video/vic4567.h index f065463e1ed..3dff4b41392 100644 --- a/src/emu/video/vic4567.h +++ b/src/emu/video/vic4567.h @@ -241,7 +241,7 @@ private: UINT8 m_palette_green[0x100]; UINT8 m_palette_blue[0x100]; int m_palette_dirty; - + required_device m_palette; }; diff --git a/src/lib/formats/cassimg.c b/src/lib/formats/cassimg.c index b7f1ea68ccd..20ccbc99407 100644 --- a/src/lib/formats/cassimg.c +++ b/src/lib/formats/cassimg.c @@ -379,7 +379,7 @@ static casserr_t lookup_sample(cassette_image *cassette, int channel, size_t sam /* is this block beyond the edge of our waveform? */ if (sample_blocknum >= cassette->blocks.count()) cassette->blocks.resize_keep_and_clear_new(sample_blocknum + 1); - + if (cassette->blocks[sample_blocknum] == NULL) cassette->blocks[sample_blocknum] = global_alloc(sample_block); diff --git a/src/lib/formats/ccvf_dsk.c b/src/lib/formats/ccvf_dsk.c index 75a4356c547..d8dc0117bd3 100644 --- a/src/lib/formats/ccvf_dsk.c +++ b/src/lib/formats/ccvf_dsk.c @@ -100,11 +100,11 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) astring line; offs_t byteoffs = 0; char hex[3] = {0}; - + do { end = ccvf.chr(start, 10); line.cpysubstr(ccvf, start, end); - if (line.find(0, "Compucolor Virtual Floppy Disk Image") && line.find(0, "Label") && line.find(0, "Track")) { + if (line.find(0, "Compucolor Virtual Floppy Disk Image") && line.find(0, "Label") && line.find(0, "Track")) { for (int byte = 0; byte < 32; byte++) { if (byteoffs==78720) break; hex[0]=line[byte * 2]; @@ -117,11 +117,11 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) UINT64 pos = 0; int total_size = 200000000/f.cell_size; - + for(int track=0; track < f.track_count; track++) { dynamic_array buffer(total_size); int offset = 0; - + for (int i=0; i<1920 && pos 4000) @@ -96,7 +96,7 @@ bool g64_format::save(io_generic *io, floppy_image *image) UINT8 header[] = { 'G', 'C', 'R', '-', '1', '5', '4', '1', 0x00, 0x54, TRACK_LENGTH & 0xff, TRACK_LENGTH >> 8 }; io_generic_write(io, header, SIGNATURE, sizeof(header)); - + int head = 0; int tracks_written = 0; @@ -137,7 +137,7 @@ bool g64_format::save(io_generic *io, floppy_image *image) io_generic_write_filler(io, 0xff, dpos, TRACK_LENGTH); io_generic_write(io, track_length, dpos, 2); io_generic_write(io, trackbuf, dpos + 2, track_size); - + tracks_written++; } diff --git a/src/lib/formats/mbee_cas.h b/src/lib/formats/mbee_cas.h index f80d4c15de3..ebca844c7ca 100644 --- a/src/lib/formats/mbee_cas.h +++ b/src/lib/formats/mbee_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(mbee_cassette_formats); - diff --git a/src/lib/formats/phc25_cas.c b/src/lib/formats/phc25_cas.c index 4efa419f3fd..a0d807a335c 100644 --- a/src/lib/formats/phc25_cas.c +++ b/src/lib/formats/phc25_cas.c @@ -97,10 +97,10 @@ static int phc25_handle_cassette(INT16 *buffer, const UINT8 *bytes) UINT32 i; // silence -// sample_count += phc25_put_samples(buffer, 6640, 2, WAVEENTRY_HIGH); +// sample_count += phc25_put_samples(buffer, 6640, 2, WAVEENTRY_HIGH); /* start */ -// for (i=0; i<12155; i++) +// for (i=0; i<12155; i++) for (i=0; i<2155; i++) sample_count += phc25_output_bit(buffer, sample_count, 1); diff --git a/src/lib/formats/phc25_cas.h b/src/lib/formats/phc25_cas.h index e4018911361..82ee5e2f297 100644 --- a/src/lib/formats/phc25_cas.h +++ b/src/lib/formats/phc25_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(phc25_cassette_formats); - diff --git a/src/lib/formats/sol_cas.c b/src/lib/formats/sol_cas.c index 67c7c4ba4dc..e5dc79cd21a 100644 --- a/src/lib/formats/sol_cas.c +++ b/src/lib/formats/sol_cas.c @@ -177,7 +177,7 @@ static int sol20_read_hex(const UINT8 *bytes, UINT8 numdigits) } return data; } - + // Turn digits into decimal static int sol20_read_dec(const UINT8 *bytes) { @@ -191,7 +191,7 @@ static int sol20_read_dec(const UINT8 *bytes) return data; } - + static int sol20_handle_cassette(INT16 *buffer, const UINT8 *bytes) { UINT32 sample_count = 0; @@ -283,7 +283,7 @@ static int sol20_handle_cassette(INT16 *buffer, const UINT8 *bytes) sample_count += sol20_output_byte(buffer, sample_count, sol20_header[i]); // write checksum sample_count += sol20_output_byte(buffer, sample_count, sol20_cksm_byte); - + sol20_cksm_byte = 0; process_d = 1; sol20_scan_to_eol(bytes); diff --git a/src/lib/formats/sol_cas.h b/src/lib/formats/sol_cas.h index 60388e012ab..add6743475d 100644 --- a/src/lib/formats/sol_cas.h +++ b/src/lib/formats/sol_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(sol20_cassette_formats); - diff --git a/src/lib/formats/sorc_cas.h b/src/lib/formats/sorc_cas.h index 1f021464339..b2716458a88 100644 --- a/src/lib/formats/sorc_cas.h +++ b/src/lib/formats/sorc_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(sorcerer_cassette_formats); - diff --git a/src/lib/formats/spc1000_cas.h b/src/lib/formats/spc1000_cas.h index ffdffab3074..b0dbc80f5dd 100644 --- a/src/lib/formats/spc1000_cas.h +++ b/src/lib/formats/spc1000_cas.h @@ -12,4 +12,3 @@ #include "cassimg.h" CASSETTE_FORMATLIST_EXTERN(spc1000_cassette_formats); - diff --git a/src/lib/formats/z80ne_dsk.c b/src/lib/formats/z80ne_dsk.c index 4445bcfcacf..6394e177f4f 100644 --- a/src/lib/formats/z80ne_dsk.c +++ b/src/lib/formats/z80ne_dsk.c @@ -208,7 +208,7 @@ static floperr_t z80ne_dmk_format_track(floppy_image_legacy *floppy, int head, i /* set up sector map */ sector_map.resize_and_clear(sectors, 0xFF); - + physical_sector = 0; for (logical_sector = 0; logical_sector < sectors; logical_sector++) { diff --git a/src/lib/libflac/include/FLAC/export.h b/src/lib/libflac/include/FLAC/export.h index a525f29c1e5..e8295b86eac 100644 --- a/src/lib/libflac/include/FLAC/export.h +++ b/src/lib/libflac/include/FLAC/export.h @@ -61,9 +61,9 @@ #else #ifdef FLAC_API_EXPORTS -#define FLAC_API _declspec(dllexport) +#define FLAC_API _declspec(dllexport) #else -#define FLAC_API _declspec(dllimport) +#define FLAC_API _declspec(dllimport) #endif #endif diff --git a/src/lib/libflac/include/FLAC/format.h b/src/lib/libflac/include/FLAC/format.h index 77e2d0130e5..2c838f34f8e 100644 --- a/src/lib/libflac/include/FLAC/format.h +++ b/src/lib/libflac/include/FLAC/format.h @@ -84,8 +84,8 @@ extern "C" { /* - Most of the values described in this file are defined by the FLAC - format specification. There is nothing to tune here. + Most of the values described in this file are defined by the FLAC + format specification. There is nothing to tune here. */ /** The largest legal metadata type code. */ @@ -211,7 +211,6 @@ extern FLAC_API const char * const FLAC__EntropyCodingMethodTypeString[]; /** Contents of a Rice partitioned residual */ typedef struct { - unsigned *parameters; /**< The Rice parameters for each context. */ @@ -230,7 +229,6 @@ typedef struct { /** Header for a Rice partitioned residual. (c.f. format specification) */ typedef struct { - unsigned order; /**< The partition order, i.e. # of contexts = 2 ^ \a order. */ @@ -486,7 +484,6 @@ typedef struct { /** An enumeration of the available metadata block types. */ typedef enum { - FLAC__METADATA_TYPE_STREAMINFO = 0, /**< STREAMINFO block */ diff --git a/src/lib/libflac/include/FLAC/metadata.h b/src/lib/libflac/include/FLAC/metadata.h index fff90b0bafd..879b0b40a63 100644 --- a/src/lib/libflac/include/FLAC/metadata.h +++ b/src/lib/libflac/include/FLAC/metadata.h @@ -306,7 +306,6 @@ typedef struct FLAC__Metadata_SimpleIterator FLAC__Metadata_SimpleIterator; * The iterator's current status can be obtained by calling FLAC__metadata_simple_iterator_status(). */ typedef enum { - FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK = 0, /**< The iterator is in the normal OK state */ @@ -763,7 +762,7 @@ typedef enum { FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH, /**< FLAC__metadata_chain_write() was called on a chain read by * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(), - * or + * or * FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile() * was called on a chain read by * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(). diff --git a/src/lib/libflac/include/FLAC/stream_decoder.h b/src/lib/libflac/include/FLAC/stream_decoder.h index 9ac159474af..1d44a36f204 100644 --- a/src/lib/libflac/include/FLAC/stream_decoder.h +++ b/src/lib/libflac/include/FLAC/stream_decoder.h @@ -199,7 +199,6 @@ extern "C" { * The decoder's state can be obtained by calling FLAC__stream_decoder_get_state(). */ typedef enum { - FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0, /**< The decoder is ready to search for metadata. */ @@ -253,7 +252,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderStateString[]; /** Possible return values for the FLAC__stream_decoder_init_*() functions. */ typedef enum { - FLAC__STREAM_DECODER_INIT_STATUS_OK = 0, /**< Initialization was successful. */ @@ -291,7 +289,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderInitStatusString[]; /** Return values for the FLAC__StreamDecoder read callback. */ typedef enum { - FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, /**< The read was OK and decoding can continue. */ @@ -322,7 +319,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderReadStatusString[]; /** Return values for the FLAC__StreamDecoder seek callback. */ typedef enum { - FLAC__STREAM_DECODER_SEEK_STATUS_OK, /**< The seek was OK and decoding can continue. */ @@ -345,7 +341,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderSeekStatusString[]; /** Return values for the FLAC__StreamDecoder tell callback. */ typedef enum { - FLAC__STREAM_DECODER_TELL_STATUS_OK, /**< The tell was OK and decoding can continue. */ @@ -368,7 +363,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderTellStatusString[]; /** Return values for the FLAC__StreamDecoder length callback. */ typedef enum { - FLAC__STREAM_DECODER_LENGTH_STATUS_OK, /**< The length call was OK and decoding can continue. */ @@ -391,7 +385,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderLengthStatusString[]; /** Return values for the FLAC__StreamDecoder write callback. */ typedef enum { - FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE, /**< The write was OK and decoding can continue. */ @@ -424,7 +417,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderWriteStatusString[]; * a future encoder. */ typedef enum { - FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC, /**< An error in the stream caused the decoder to lose synchronization. */ diff --git a/src/lib/libflac/include/FLAC/stream_encoder.h b/src/lib/libflac/include/FLAC/stream_encoder.h index dbbbb23ee11..f533d8c8430 100644 --- a/src/lib/libflac/include/FLAC/stream_encoder.h +++ b/src/lib/libflac/include/FLAC/stream_encoder.h @@ -238,7 +238,6 @@ extern "C" { * must be deleted with FLAC__stream_encoder_delete(). */ typedef enum { - FLAC__STREAM_ENCODER_OK = 0, /**< The encoder is in the normal OK state and samples can be processed. */ @@ -290,7 +289,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderStateString[]; /** Possible return values for the FLAC__stream_encoder_init_*() functions. */ typedef enum { - FLAC__STREAM_ENCODER_INIT_STATUS_OK = 0, /**< Initialization was successful. */ @@ -360,7 +358,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderInitStatusString[]; /** Return values for the FLAC__StreamEncoder read callback. */ typedef enum { - FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE, /**< The read was OK and decoding can continue. */ @@ -386,7 +383,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderReadStatusString[]; /** Return values for the FLAC__StreamEncoder write callback. */ typedef enum { - FLAC__STREAM_ENCODER_WRITE_STATUS_OK = 0, /**< The write was OK and encoding can continue. */ @@ -406,7 +402,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderWriteStatusString[]; /** Return values for the FLAC__StreamEncoder seek callback. */ typedef enum { - FLAC__STREAM_ENCODER_SEEK_STATUS_OK, /**< The seek was OK and encoding can continue. */ @@ -429,7 +424,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderSeekStatusString[]; /** Return values for the FLAC__StreamEncoder tell callback. */ typedef enum { - FLAC__STREAM_ENCODER_TELL_STATUS_OK, /**< The tell was OK and encoding can continue. */ diff --git a/src/lib/libflac/include/private/fixed.h b/src/lib/libflac/include/private/fixed.h index 6656b796bec..f2e0f4fb15a 100644 --- a/src/lib/libflac/include/private/fixed.h +++ b/src/lib/libflac/include/private/fixed.h @@ -40,16 +40,16 @@ #include "FLAC/format.h" /* - * FLAC__fixed_compute_best_predictor() - * -------------------------------------------------------------------- - * Compute the best fixed predictor and the expected bits-per-sample + * FLAC__fixed_compute_best_predictor() + * -------------------------------------------------------------------- + * Compute the best fixed predictor and the expected bits-per-sample * of the residual signal for each order. The _wide() version uses * 64-bit integers which is statistically necessary when bits-per- * sample + log2(blocksize) > 30 * - * IN data[0,data_len-1] - * IN data_len - * OUT residual_bits_per_sample[0,FLAC__MAX_FIXED_ORDER] + * IN data[0,data_len-1] + * IN data_len + * OUT residual_bits_per_sample[0,FLAC__MAX_FIXED_ORDER] */ #ifndef FLAC__INTEGER_ONLY_LIBRARY unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); @@ -67,30 +67,30 @@ unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsig #endif /* - * FLAC__fixed_compute_residual() - * -------------------------------------------------------------------- - * Compute the residual signal obtained from sutracting the predicted - * signal from the original. + * FLAC__fixed_compute_residual() + * -------------------------------------------------------------------- + * Compute the residual signal obtained from sutracting the predicted + * signal from the original. * - * IN data[-order,data_len-1] original signal (NOTE THE INDICES!) - * IN data_len length of original signal - * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order - * OUT residual[0,data_len-1] residual signal + * IN data[-order,data_len-1] original signal (NOTE THE INDICES!) + * IN data_len length of original signal + * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order + * OUT residual[0,data_len-1] residual signal */ void FLAC__fixed_compute_residual(const FLAC__int32 data[], unsigned data_len, unsigned order, FLAC__int32 residual[]); /* - * FLAC__fixed_restore_signal() - * -------------------------------------------------------------------- - * Restore the original signal by summing the residual and the - * predictor. + * FLAC__fixed_restore_signal() + * -------------------------------------------------------------------- + * Restore the original signal by summing the residual and the + * predictor. * - * IN residual[0,data_len-1] residual signal - * IN data_len length of original signal - * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order - * *** IMPORTANT: the caller must pass in the historical samples: - * IN data[-order,-1] previously-reconstructed historical samples - * OUT data[0,data_len-1] original signal + * IN residual[0,data_len-1] residual signal + * IN data_len length of original signal + * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order + * *** IMPORTANT: the caller must pass in the historical samples: + * IN data[-order,-1] previously-reconstructed historical samples + * OUT data[0,data_len-1] original signal */ void FLAC__fixed_restore_signal(const FLAC__int32 residual[], unsigned data_len, unsigned order, FLAC__int32 data[]); diff --git a/src/lib/libflac/include/private/float.h b/src/lib/libflac/include/private/float.h index 73313f6dbf8..6f7ae610f35 100644 --- a/src/lib/libflac/include/private/float.h +++ b/src/lib/libflac/include/private/float.h @@ -74,21 +74,21 @@ extern const FLAC__fixedpoint FLAC__FP_E; #define FLAC__fixedpoint_div(x, y) ( (FLAC__fixedpoint) ( ( ((FLAC__int64)(x)<<32) / (FLAC__int64)(y) ) >> 16 ) ) /* - * FLAC__fixedpoint_log2() - * -------------------------------------------------------------------- - * Returns the base-2 logarithm of the fixed-point number 'x' using an - * algorithm by Knuth for x >= 1.0 + * FLAC__fixedpoint_log2() + * -------------------------------------------------------------------- + * Returns the base-2 logarithm of the fixed-point number 'x' using an + * algorithm by Knuth for x >= 1.0 * - * 'fracbits' is the number of fractional bits of 'x'. 'fracbits' must - * be < 32 and evenly divisible by 4 (0 is OK but not very precise). + * 'fracbits' is the number of fractional bits of 'x'. 'fracbits' must + * be < 32 and evenly divisible by 4 (0 is OK but not very precise). * - * 'precision' roughly limits the number of iterations that are done; - * use (unsigned)(-1) for maximum precision. + * 'precision' roughly limits the number of iterations that are done; + * use (unsigned)(-1) for maximum precision. * - * If 'x' is less than one -- that is, x < (1< 0. + * FLAC__lpc_compute_autocorrelation() + * -------------------------------------------------------------------- + * Compute the autocorrelation for lags between 0 and lag-1. + * Assumes data[] outside of [0,data_len-1] == 0. + * Asserts that lag > 0. * - * IN data[0,data_len-1] - * IN data_len - * IN 0 < lag <= data_len - * OUT autoc[0,lag-1] + * IN data[0,data_len-1] + * IN data_len + * IN 0 < lag <= data_len + * OUT autoc[0,lag-1] */ void FLAC__lpc_compute_autocorrelation(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); #ifndef FLAC__NO_ASM @@ -80,44 +80,44 @@ void FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow(const FLAC__real data[], u #endif /* - * FLAC__lpc_compute_lp_coefficients() - * -------------------------------------------------------------------- - * Computes LP coefficients for orders 1..max_order. - * Do not call if autoc[0] == 0.0. This means the signal is zero - * and there is no point in calculating a predictor. + * FLAC__lpc_compute_lp_coefficients() + * -------------------------------------------------------------------- + * Computes LP coefficients for orders 1..max_order. + * Do not call if autoc[0] == 0.0. This means the signal is zero + * and there is no point in calculating a predictor. * - * IN autoc[0,max_order] autocorrelation values - * IN 0 < max_order <= FLAC__MAX_LPC_ORDER max LP order to compute - * OUT lp_coeff[0,max_order-1][0,max_order-1] LP coefficients for each order - * *** IMPORTANT: - * *** lp_coeff[0,max_order-1][max_order,FLAC__MAX_LPC_ORDER-1] are untouched - * OUT error[0,max_order-1] error for each order (more - * specifically, the variance of - * the error signal times # of - * samples in the signal) + * IN autoc[0,max_order] autocorrelation values + * IN 0 < max_order <= FLAC__MAX_LPC_ORDER max LP order to compute + * OUT lp_coeff[0,max_order-1][0,max_order-1] LP coefficients for each order + * *** IMPORTANT: + * *** lp_coeff[0,max_order-1][max_order,FLAC__MAX_LPC_ORDER-1] are untouched + * OUT error[0,max_order-1] error for each order (more + * specifically, the variance of + * the error signal times # of + * samples in the signal) * - * Example: if max_order is 9, the LP coefficients for order 9 will be - * in lp_coeff[8][0,8], the LP coefficients for order 8 will be - * in lp_coeff[7][0,7], etc. + * Example: if max_order is 9, the LP coefficients for order 9 will be + * in lp_coeff[8][0,8], the LP coefficients for order 8 will be + * in lp_coeff[7][0,7], etc. */ void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned *max_order, FLAC__real lp_coeff[][FLAC__MAX_LPC_ORDER], FLAC__double error[]); /* - * FLAC__lpc_quantize_coefficients() - * -------------------------------------------------------------------- - * Quantizes the LP coefficients. NOTE: precision + bits_per_sample - * must be less than 32 (sizeof(FLAC__int32)*8). + * FLAC__lpc_quantize_coefficients() + * -------------------------------------------------------------------- + * Quantizes the LP coefficients. NOTE: precision + bits_per_sample + * must be less than 32 (sizeof(FLAC__int32)*8). * - * IN lp_coeff[0,order-1] LP coefficients - * IN order LP order - * IN FLAC__MIN_QLP_COEFF_PRECISION < precision - * desired precision (in bits, including sign - * bit) of largest coefficient - * OUT qlp_coeff[0,order-1] quantized coefficients - * OUT shift # of bits to shift right to get approximated - * LP coefficients. NOTE: could be negative. - * RETURN 0 => quantization OK - * 1 => coefficients require too much shifting for *shift to + * IN lp_coeff[0,order-1] LP coefficients + * IN order LP order + * IN FLAC__MIN_QLP_COEFF_PRECISION < precision + * desired precision (in bits, including sign + * bit) of largest coefficient + * OUT qlp_coeff[0,order-1] quantized coefficients + * OUT shift # of bits to shift right to get approximated + * LP coefficients. NOTE: could be negative. + * RETURN 0 => quantization OK + * 1 => coefficients require too much shifting for *shift to * fit in the LPC subframe header. 'shift' is unset. * 2 => coefficients are all zero, which is bad. 'shift' is * unset. @@ -125,17 +125,17 @@ void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned *max_o int FLAC__lpc_quantize_coefficients(const FLAC__real lp_coeff[], unsigned order, unsigned precision, FLAC__int32 qlp_coeff[], int *shift); /* - * FLAC__lpc_compute_residual_from_qlp_coefficients() - * -------------------------------------------------------------------- - * Compute the residual signal obtained from sutracting the predicted - * signal from the original. + * FLAC__lpc_compute_residual_from_qlp_coefficients() + * -------------------------------------------------------------------- + * Compute the residual signal obtained from sutracting the predicted + * signal from the original. * - * IN data[-order,data_len-1] original signal (NOTE THE INDICES!) - * IN data_len length of original signal - * IN qlp_coeff[0,order-1] quantized LP coefficients - * IN order > 0 LP order - * IN lp_quantization quantization of LP coefficients in bits - * OUT residual[0,data_len-1] residual signal + * IN data[-order,data_len-1] original signal (NOTE THE INDICES!) + * IN data_len length of original signal + * IN qlp_coeff[0,order-1] quantized LP coefficients + * IN order > 0 LP order + * IN lp_quantization quantization of LP coefficients in bits + * OUT residual[0,data_len-1] residual signal */ void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); @@ -151,19 +151,19 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx(const FLAC__i #endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */ /* - * FLAC__lpc_restore_signal() - * -------------------------------------------------------------------- - * Restore the original signal by summing the residual and the - * predictor. + * FLAC__lpc_restore_signal() + * -------------------------------------------------------------------- + * Restore the original signal by summing the residual and the + * predictor. * - * IN residual[0,data_len-1] residual signal - * IN data_len length of original signal - * IN qlp_coeff[0,order-1] quantized LP coefficients - * IN order > 0 LP order - * IN lp_quantization quantization of LP coefficients in bits - * *** IMPORTANT: the caller must pass in the historical samples: - * IN data[-order,-1] previously-reconstructed historical samples - * OUT data[0,data_len-1] original signal + * IN residual[0,data_len-1] residual signal + * IN data_len length of original signal + * IN qlp_coeff[0,order-1] quantized LP coefficients + * IN order > 0 LP order + * IN lp_quantization quantization of LP coefficients in bits + * *** IMPORTANT: the caller must pass in the historical samples: + * IN data[-order,-1] previously-reconstructed historical samples + * OUT data[0,data_len-1] original signal */ void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); @@ -182,30 +182,30 @@ void FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residu #ifndef FLAC__INTEGER_ONLY_LIBRARY /* - * FLAC__lpc_compute_expected_bits_per_residual_sample() - * -------------------------------------------------------------------- - * Compute the expected number of bits per residual signal sample - * based on the LP error (which is related to the residual variance). + * FLAC__lpc_compute_expected_bits_per_residual_sample() + * -------------------------------------------------------------------- + * Compute the expected number of bits per residual signal sample + * based on the LP error (which is related to the residual variance). * - * IN lpc_error >= 0.0 error returned from calculating LP coefficients - * IN total_samples > 0 # of samples in residual signal - * RETURN expected bits per sample + * IN lpc_error >= 0.0 error returned from calculating LP coefficients + * IN total_samples > 0 # of samples in residual signal + * RETURN expected bits per sample */ FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__double lpc_error, unsigned total_samples); FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(FLAC__double lpc_error, FLAC__double error_scale); /* - * FLAC__lpc_compute_best_order() - * -------------------------------------------------------------------- - * Compute the best order from the array of signal errors returned - * during coefficient computation. + * FLAC__lpc_compute_best_order() + * -------------------------------------------------------------------- + * Compute the best order from the array of signal errors returned + * during coefficient computation. * - * IN lpc_error[0,max_order-1] >= 0.0 error returned from calculating LP coefficients - * IN max_order > 0 max LP order - * IN total_samples > 0 # of samples in residual signal - * IN overhead_bits_per_order # of bits overhead for each increased LP order - * (includes warmup sample size and quantized LP coefficient) - * RETURN [1,max_order] best order + * IN lpc_error[0,max_order-1] >= 0.0 error returned from calculating LP coefficients + * IN max_order > 0 max LP order + * IN total_samples > 0 # of samples in residual signal + * IN overhead_bits_per_order # of bits overhead for each increased LP order + * (includes warmup sample size and quantized LP coefficient) + * RETURN [1,max_order] best order */ unsigned FLAC__lpc_compute_best_order(const FLAC__double lpc_error[], unsigned max_order, unsigned total_samples, unsigned overhead_bits_per_order); diff --git a/src/lib/libflac/include/private/window.h b/src/lib/libflac/include/private/window.h index 01e0fc46c94..55a5bf29230 100644 --- a/src/lib/libflac/include/private/window.h +++ b/src/lib/libflac/include/private/window.h @@ -42,13 +42,13 @@ #ifndef FLAC__INTEGER_ONLY_LIBRARY /* - * FLAC__window_*() - * -------------------------------------------------------------------- - * Calculates window coefficients according to different apodization - * functions. + * FLAC__window_*() + * -------------------------------------------------------------------- + * Calculates window coefficients according to different apodization + * functions. * - * OUT window[0,L-1] - * IN L (number of points in window) + * OUT window[0,L-1] + * IN L (number of points in window) */ void FLAC__window_bartlett(FLAC__real *window, const FLAC__int32 L); void FLAC__window_bartlett_hann(FLAC__real *window, const FLAC__int32 L); diff --git a/src/lib/libflac/libFLAC/bitreader.c b/src/lib/libflac/libFLAC/bitreader.c index e2a4ba3bd16..c6b8fe3b53f 100644 --- a/src/lib/libflac/libFLAC/bitreader.c +++ b/src/lib/libflac/libFLAC/bitreader.c @@ -301,13 +301,13 @@ FLAC__BitReader *FLAC__bitreader_new(void) FLAC__BitReader *br = (FLAC__BitReader*)calloc(1, sizeof(FLAC__BitReader)); /* calloc() implies: - memset(br, 0, sizeof(FLAC__BitReader)); - br->buffer = 0; - br->capacity = 0; - br->words = br->bytes = 0; - br->consumed_words = br->consumed_bits = 0; - br->read_callback = 0; - br->client_data = 0; + memset(br, 0, sizeof(FLAC__BitReader)); + br->buffer = 0; + br->capacity = 0; + br->words = br->bytes = 0; + br->consumed_words = br->consumed_bits = 0; + br->read_callback = 0; + br->client_data = 0; */ return br; } @@ -835,7 +835,6 @@ FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[ cwords = br->consumed_words; while(1) { - /* read unary part */ while(1) { while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ @@ -1018,7 +1017,6 @@ break2: ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; while(1) { - /* read unary part */ while(1) { while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ diff --git a/src/lib/libflac/libFLAC/float.c b/src/lib/libflac/libFLAC/float.c index 60fa7e8371a..046fb1499a1 100644 --- a/src/lib/libflac/libFLAC/float.c +++ b/src/lib/libflac/libFLAC/float.c @@ -282,7 +282,7 @@ FLAC__uint32 FLAC__fixedpoint_log2(FLAC__uint32 x, unsigned fracbits, unsigned p if(x < ONE) return 0; - + if(precision > LOG2_LOOKUP_PRECISION) precision = LOG2_LOOKUP_PRECISION; diff --git a/src/lib/libflac/libFLAC/lpc.c b/src/lib/libflac/libFLAC/lpc.c index 00bbab44c1c..8e8332590a8 100644 --- a/src/lib/libflac/libFLAC/lpc.c +++ b/src/lib/libflac/libFLAC/lpc.c @@ -305,10 +305,10 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, u /* Here's a slower but clearer version: for(i = 0; i < data_len; i++) { - sum = 0; - for(j = 0; j < order; j++) - sum += qlp_coeff[j] * data[i-j-1]; - residual[i] = data[i] - (sum >> lp_quantization); + sum = 0; + for(j = 0; j < order; j++) + sum += qlp_coeff[j] * data[i-j-1]; + residual[i] = data[i] - (sum >> lp_quantization); } */ } @@ -516,18 +516,18 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, u case 15: sum += qlp_coeff[14] * data[i-15]; case 14: sum += qlp_coeff[13] * data[i-14]; case 13: sum += qlp_coeff[12] * data[i-13]; - sum += qlp_coeff[11] * data[i-12]; - sum += qlp_coeff[10] * data[i-11]; - sum += qlp_coeff[ 9] * data[i-10]; - sum += qlp_coeff[ 8] * data[i- 9]; - sum += qlp_coeff[ 7] * data[i- 8]; - sum += qlp_coeff[ 6] * data[i- 7]; - sum += qlp_coeff[ 5] * data[i- 6]; - sum += qlp_coeff[ 4] * data[i- 5]; - sum += qlp_coeff[ 3] * data[i- 4]; - sum += qlp_coeff[ 2] * data[i- 3]; - sum += qlp_coeff[ 1] * data[i- 2]; - sum += qlp_coeff[ 0] * data[i- 1]; + sum += qlp_coeff[11] * data[i-12]; + sum += qlp_coeff[10] * data[i-11]; + sum += qlp_coeff[ 9] * data[i-10]; + sum += qlp_coeff[ 8] * data[i- 9]; + sum += qlp_coeff[ 7] * data[i- 8]; + sum += qlp_coeff[ 6] * data[i- 7]; + sum += qlp_coeff[ 5] * data[i- 6]; + sum += qlp_coeff[ 4] * data[i- 5]; + sum += qlp_coeff[ 3] * data[i- 4]; + sum += qlp_coeff[ 2] * data[i- 3]; + sum += qlp_coeff[ 1] * data[i- 2]; + sum += qlp_coeff[ 0] * data[i- 1]; } residual[i] = data[i] - (sum >> lp_quantization); } @@ -778,18 +778,18 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da case 15: sum += qlp_coeff[14] * (FLAC__int64)data[i-15]; case 14: sum += qlp_coeff[13] * (FLAC__int64)data[i-14]; case 13: sum += qlp_coeff[12] * (FLAC__int64)data[i-13]; - sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; - sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; - sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; - sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; - sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; - sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; - sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; - sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; - sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; - sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; - sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; - sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; + sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; + sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; + sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; + sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; + sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; + sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; + sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; + sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; + sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; + sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; + sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; + sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; } residual[i] = data[i] - (FLAC__int32)(sum >> lp_quantization); } @@ -835,10 +835,10 @@ void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, c /* Here's a slower but clearer version: for(i = 0; i < data_len; i++) { - sum = 0; - for(j = 0; j < order; j++) - sum += qlp_coeff[j] * data[i-j-1]; - data[i] = residual[i] + (sum >> lp_quantization); + sum = 0; + for(j = 0; j < order; j++) + sum += qlp_coeff[j] * data[i-j-1]; + data[i] = residual[i] + (sum >> lp_quantization); } */ } @@ -1046,18 +1046,18 @@ void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, c case 15: sum += qlp_coeff[14] * data[i-15]; case 14: sum += qlp_coeff[13] * data[i-14]; case 13: sum += qlp_coeff[12] * data[i-13]; - sum += qlp_coeff[11] * data[i-12]; - sum += qlp_coeff[10] * data[i-11]; - sum += qlp_coeff[ 9] * data[i-10]; - sum += qlp_coeff[ 8] * data[i- 9]; - sum += qlp_coeff[ 7] * data[i- 8]; - sum += qlp_coeff[ 6] * data[i- 7]; - sum += qlp_coeff[ 5] * data[i- 6]; - sum += qlp_coeff[ 4] * data[i- 5]; - sum += qlp_coeff[ 3] * data[i- 4]; - sum += qlp_coeff[ 2] * data[i- 3]; - sum += qlp_coeff[ 1] * data[i- 2]; - sum += qlp_coeff[ 0] * data[i- 1]; + sum += qlp_coeff[11] * data[i-12]; + sum += qlp_coeff[10] * data[i-11]; + sum += qlp_coeff[ 9] * data[i-10]; + sum += qlp_coeff[ 8] * data[i- 9]; + sum += qlp_coeff[ 7] * data[i- 8]; + sum += qlp_coeff[ 6] * data[i- 7]; + sum += qlp_coeff[ 5] * data[i- 6]; + sum += qlp_coeff[ 4] * data[i- 5]; + sum += qlp_coeff[ 3] * data[i- 4]; + sum += qlp_coeff[ 2] * data[i- 3]; + sum += qlp_coeff[ 1] * data[i- 2]; + sum += qlp_coeff[ 0] * data[i- 1]; } data[i] = residual[i] + (sum >> lp_quantization); } @@ -1308,18 +1308,18 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l case 15: sum += qlp_coeff[14] * (FLAC__int64)data[i-15]; case 14: sum += qlp_coeff[13] * (FLAC__int64)data[i-14]; case 13: sum += qlp_coeff[12] * (FLAC__int64)data[i-13]; - sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; - sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; - sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; - sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; - sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; - sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; - sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; - sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; - sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; - sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; - sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; - sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; + sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; + sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; + sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; + sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; + sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; + sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; + sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; + sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; + sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; + sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; + sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; + sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; } data[i] = residual[i] + (FLAC__int32)(sum >> lp_quantization); } diff --git a/src/lib/libflac/libFLAC/md5.c b/src/lib/libflac/libFLAC/md5.c index 3cfebd23675..8e9b39fe127 100644 --- a/src/lib/libflac/libFLAC/md5.c +++ b/src/lib/libflac/libFLAC/md5.c @@ -2,8 +2,8 @@ # include #endif -#include /* for malloc() */ -#include /* for memcpy() */ +#include /* for malloc() */ +#include /* for memcpy() */ #include "private/md5.h" #include "share/alloc.h" @@ -47,7 +47,7 @@ /* This is the central step in the MD5 algorithm. */ #define MD5STEP(f,w,x,y,z,in,s) \ - (w += f(x,y,z) + in, w = (w<>(32-s)) + x) + (w += f(x,y,z) + in, w = (w<>(32-s)) + x) /* * The core of the MD5 algorithm, this alters an existing MD5 hash to @@ -143,7 +143,7 @@ static void byteSwap(FLAC__uint32 *buf, unsigned words) { register FLAC__uint32 x; do { - x = *buf; + x = *buf; x = ((x << 8) & 0xff00ff00) | ((x >> 8) & 0x00ff00ff); *buf++ = (x >> 16) | (x << 16); } while (--words); @@ -186,9 +186,9 @@ static void FLAC__MD5Update(FLAC__MD5Context *ctx, FLAC__byte const *buf, unsign t = ctx->bytes[0]; if ((ctx->bytes[0] = t + len) < t) - ctx->bytes[1]++; /* Carry from low to high */ + ctx->bytes[1]++; /* Carry from low to high */ - t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */ + t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */ if (t > len) { memcpy((FLAC__byte *)ctx->in + 64 - t, buf, len); return; @@ -237,7 +237,7 @@ void FLAC__MD5Init(FLAC__MD5Context *ctx) */ void FLAC__MD5Final(FLAC__byte digest[16], FLAC__MD5Context *ctx) { - int count = ctx->bytes[0] & 0x3f; /* Number of bytes in ctx->in */ + int count = ctx->bytes[0] & 0x3f; /* Number of bytes in ctx->in */ FLAC__byte *p = (FLAC__byte *)ctx->in + count; /* Set the first char of padding to 0x80. There is always room. */ @@ -246,7 +246,7 @@ void FLAC__MD5Final(FLAC__byte digest[16], FLAC__MD5Context *ctx) /* Bytes of padding needed to make 56 bytes (-8..55) */ count = 56 - 1 - count; - if (count < 0) { /* Padding forces an extra block */ + if (count < 0) { /* Padding forces an extra block */ memset(p, 0, count + 8); byteSwapX16(ctx->in); FLAC__MD5Transform(ctx->buf, ctx->in); diff --git a/src/lib/libflac/libFLAC/metadata_iterators.c b/src/lib/libflac/libFLAC/metadata_iterators.c index f88795bcf82..f24edc27631 100644 --- a/src/lib/libflac/libFLAC/metadata_iterators.c +++ b/src/lib/libflac/libFLAC/metadata_iterators.c @@ -1835,8 +1835,8 @@ FLAC_API FLAC__Metadata_Iterator *FLAC__metadata_iterator_new(void) FLAC__Metadata_Iterator *iterator = (FLAC__Metadata_Iterator*)calloc(1, sizeof(FLAC__Metadata_Iterator)); /* calloc() implies: - iterator->current = 0; - iterator->chain = 0; + iterator->current = 0; + iterator->chain = 0; */ return iterator; diff --git a/src/lib/libflac/libFLAC/metadata_object.c b/src/lib/libflac/libFLAC/metadata_object.c index 6f8bccf4563..dc366476e14 100644 --- a/src/lib/libflac/libFLAC/metadata_object.c +++ b/src/lib/libflac/libFLAC/metadata_object.c @@ -1330,7 +1330,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pa memcpy(entry->entry+nn+1, field_value, nv); entry->entry[entry->length] = '\0'; } - + return true; } diff --git a/src/lib/libflac/libFLAC/stream_decoder.c b/src/lib/libflac/libFLAC/stream_decoder.c index 198d5dcc883..29e1b4dc441 100644 --- a/src/lib/libflac/libFLAC/stream_decoder.c +++ b/src/lib/libflac/libFLAC/stream_decoder.c @@ -1290,7 +1290,7 @@ FILE *get_binary_stdin_(void) */ #if defined _MSC_VER || defined __MINGW32__ _setmode(_fileno(stdin), _O_BINARY); -#elif defined __CYGWIN__ +#elif defined __CYGWIN__ /* almost certainly not needed for any modern Cygwin, but let's be safe... */ setmode(_fileno(stdin), _O_BINARY); #elif defined __EMX__ @@ -3152,11 +3152,11 @@ FLAC__bool seek_to_absolute_sample_(FLAC__StreamDecoder *decoder, FLAC__uint64 s } /* our last move backwards wasn't big enough, try again */ approx_bytes_per_frame = approx_bytes_per_frame? approx_bytes_per_frame * 2 : 16; - continue; + continue; } /* allow one seek over upper bound, so we can get a correct upper_bound_sample for streams with unknown total_samples */ first_seek = false; - + /* make sure we are not seeking in corrupted stream */ if (this_frame_sample < lower_bound_sample) { decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR; @@ -3196,7 +3196,7 @@ FLAC__bool seek_to_absolute_sample_ogg_(FLAC__StreamDecoder *decoder, FLAC__uint FLAC__bool did_a_seek; unsigned iteration = 0; - /* In the first iterations, we will calculate the target byte position + /* In the first iterations, we will calculate the target byte position * by the distance from the target sample to left_sample and * right_sample (let's call it "proportional search"). After that, we * will switch to binary search. diff --git a/src/lib/libflac/libFLAC/stream_encoder.c b/src/lib/libflac/libFLAC/stream_encoder.c index afc79850096..8f139eb83e3 100644 --- a/src/lib/libflac/libFLAC/stream_encoder.c +++ b/src/lib/libflac/libFLAC/stream_encoder.c @@ -98,7 +98,7 @@ * parameter estimation in this encoder is very good, almost always * yielding compression within 0.1% of the optimal parameters. */ -#undef ENABLE_RICE_PARAMETER_SEARCH +#undef ENABLE_RICE_PARAMETER_SEARCH typedef struct { @@ -234,7 +234,7 @@ static unsigned evaluate_lpc_subframe_( #endif static unsigned evaluate_verbatim_subframe_( - FLAC__StreamEncoder *encoder, + FLAC__StreamEncoder *encoder, const FLAC__int32 signal[], unsigned blocksize, unsigned subframe_bps, @@ -835,7 +835,7 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( metadata_picture_has_type1 = true; /* standard icon must be 32x32 pixel PNG */ if( - m->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD && + m->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD && ( (strcmp(m->data.picture.mime_type, "image/png") && strcmp(m->data.picture.mime_type, "-->")) || m->data.picture.width != 32 || @@ -1182,7 +1182,7 @@ FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_stream( /*is_ogg=*/true ); } - + static FLAC__StreamEncoderInitStatus init_FILE_internal_( FLAC__StreamEncoder *encoder, FILE *file, @@ -1244,7 +1244,7 @@ static FLAC__StreamEncoderInitStatus init_FILE_internal_( return init_status; } - + FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE( FLAC__StreamEncoder *encoder, FILE *file, @@ -1254,7 +1254,7 @@ FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE( { return init_FILE_internal_(encoder, file, progress_callback, client_data, /*is_ogg=*/false); } - + FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE( FLAC__StreamEncoder *encoder, FILE *file, @@ -4134,7 +4134,7 @@ unsigned get_wasted_bits_(FLAC__int32 signal[], unsigned samples) if(shift > 0) { for(i = 0; i < samples; i++) - signal[i] >>= shift; + signal[i] >>= shift; } return shift; diff --git a/src/lib/util/chd.h b/src/lib/util/chd.h index 872c63d46f8..cc0f493cc0b 100644 --- a/src/lib/util/chd.h +++ b/src/lib/util/chd.h @@ -526,7 +526,7 @@ private: , m_compression(0) , m_codecs(NULL) { } - + osd_work_item * m_osd; // OSD work item running on this block chd_file_compressor *m_compressor; // pointer back to the compressor volatile work_status m_status; // current status of this item diff --git a/src/lib/util/corealloc.c b/src/lib/util/corealloc.c index 69535d8d495..c8a23b73f27 100644 --- a/src/lib/util/corealloc.c +++ b/src/lib/util/corealloc.c @@ -46,7 +46,7 @@ public: const char * m_file; // file the allocation was made from int m_line; // line number within that file UINT64 m_id; // unique id - bool m_array; // array? + bool m_array; // array? // hashing prime number static const int k_hash_prime = 6151; @@ -115,7 +115,7 @@ void *malloc_file_line(size_t size, const char *file, int line, bool array, bool if (clear) memset(result, 0, size); else - { + { #if !__has_feature(memory_sanitizer) && defined(INITIALIZE_ALLOCATED_MEMORY) memset(result, 0xdd, size); #endif @@ -145,7 +145,7 @@ void free_file_line(void *memory, const char *file, int line, bool array) osd_break_into_debugger("Error: attempt to free untracked memory"); return; } - + // warn about mismatched arrays if (!array && entry->m_array) { @@ -182,8 +182,8 @@ void track_memory(bool track) //------------------------------------------------- -// next_memory_id - return the ID of the next -// allocated block +// next_memory_id - return the ID of the next +// allocated block //------------------------------------------------- UINT64 next_memory_id() diff --git a/src/lib/util/cstrpool.c b/src/lib/util/cstrpool.c index 17b43b325a6..874e5192ea0 100644 --- a/src/lib/util/cstrpool.c +++ b/src/lib/util/cstrpool.c @@ -39,7 +39,7 @@ const char *const_string_pool::add(const char *string) if (result != NULL) return result; } - + // no space anywhere, create a new pool and prepend it (so it gets used first) const char *result = m_chunklist.prepend(*global_alloc(pool_chunk)).add(string); assert(result != NULL); @@ -48,7 +48,7 @@ const char *const_string_pool::add(const char *string) //------------------------------------------------- -// contains - determine if the given string +// contains - determine if the given string // pointer lives in the pool //------------------------------------------------- @@ -62,7 +62,7 @@ bool const_string_pool::contains(const char *string) for (pool_chunk *chunk = m_chunklist.first(); chunk != NULL; chunk = chunk->next()) if (chunk->contains(string)) return true; - + return false; } @@ -72,8 +72,8 @@ bool const_string_pool::contains(const char *string) //------------------------------------------------- const_string_pool::pool_chunk::pool_chunk() - : m_next(NULL), - m_used(0) + : m_next(NULL), + m_used(0) { } @@ -87,7 +87,7 @@ const char *const_string_pool::pool_chunk::add(const char *string) // get the length of the string (no string can be longer than a full pool) int bytes = strlen(string) + 1; assert(bytes < POOL_SIZE); - + // if too big, return NULL if (m_used + bytes > POOL_SIZE) return NULL; diff --git a/src/lib/util/cstrpool.h b/src/lib/util/cstrpool.h index c4b4805362d..6058cc43ffb 100644 --- a/src/lib/util/cstrpool.h +++ b/src/lib/util/cstrpool.h @@ -26,23 +26,23 @@ class const_string_pool public: // construction const_string_pool(); - + // operations void reset() { m_chunklist.reset(); } const char *add(const char *string); bool contains(const char *string); - + private: // shared string pool class pool_chunk { static const int POOL_SIZE = 4096; friend class simple_list; - + public: // construction pool_chunk(); - + // getters pool_chunk *next() const { return m_next; } @@ -52,11 +52,11 @@ private: private: // internal state - pool_chunk * m_next; - UINT32 m_used; - char m_buffer[POOL_SIZE]; + pool_chunk * m_next; + UINT32 m_used; + char m_buffer[POOL_SIZE]; }; - simple_list m_chunklist; + simple_list m_chunklist; }; diff --git a/src/lib/util/options.h b/src/lib/util/options.h index f90e56a0a23..573822b73b6 100644 --- a/src/lib/util/options.h +++ b/src/lib/util/options.h @@ -175,7 +175,7 @@ private: bool validate_and_set_data(entry &curentry, const char *newdata, int priority, astring &error_string); // internal state - simple_list m_entrylist; // head of list of entries + simple_list m_entrylist; // head of list of entries tagmap_t m_entrymap; // map for fast lookup astring m_command; // command found static const char *const s_option_unadorned[]; // array of unadorned option "names" diff --git a/src/lib/util/palette.c b/src/lib/util/palette.c index a516b3e4a32..6b3847f61da 100644 --- a/src/lib/util/palette.c +++ b/src/lib/util/palette.c @@ -47,14 +47,14 @@ inline rgb_t palette_t::adjust_palette_entry(rgb_t entry, float brightness, floa palette_client::dirty_state::dirty_state() : m_mindirty(0), - m_maxdirty(0) + m_maxdirty(0) { } //------------------------------------------------- // dirty_list - return the current list and -// min/max values +// min/max values //------------------------------------------------- const UINT32 *palette_client::dirty_state::dirty_list(UINT32 &mindirty, UINT32 &maxdirty) @@ -70,7 +70,7 @@ const UINT32 *palette_client::dirty_state::dirty_list(UINT32 &mindirty, UINT32 & //------------------------------------------------- // resize - resize the dirty array and mark all -// dirty +// dirty //------------------------------------------------- void palette_client::dirty_state::resize(UINT32 colors) @@ -82,7 +82,7 @@ void palette_client::dirty_state::resize(UINT32 colors) // mark all entries dirty m_dirty[dirty_dwords - 1] &= (1 << (colors % 32)) - 1; - // set min/max + // set min/max m_mindirty = 0; m_maxdirty = colors - 1; } @@ -102,7 +102,7 @@ void palette_client::dirty_state::mark_dirty(UINT32 index) //------------------------------------------------- // reset - clear the dirty array to mark all -// entries as clean +// entries as clean //------------------------------------------------- void palette_client::dirty_state::reset() @@ -125,9 +125,9 @@ void palette_client::dirty_state::reset() palette_client::palette_client(palette_t &palette) : m_palette(palette), - m_next(NULL), - m_live(&m_dirty[0]), - m_previous(&m_dirty[1]) + m_next(NULL), + m_live(&m_dirty[0]), + m_previous(&m_dirty[1]) { // add a reference to the palette palette.ref(); @@ -163,7 +163,7 @@ palette_client::~palette_client() //------------------------------------------------- -// dirty_list - atomically get the current dirty +// dirty_list - atomically get the current dirty // list for a client //------------------------------------------------- @@ -206,18 +206,18 @@ palette_t *palette_t::alloc(UINT32 numcolors, UINT32 numgroups) palette_t::palette_t(UINT32 numcolors, UINT32 numgroups) : m_refcount(1), - m_numcolors(numcolors), - m_numgroups(numgroups), - m_brightness(0.0f), - m_contrast(1.0f), - m_gamma(1.0f), - m_entry_color(numcolors), - m_entry_contrast(numcolors), - m_adjusted_color(numcolors * numgroups + 2), - m_adjusted_rgb15(numcolors * numgroups + 2), - m_group_bright(numgroups), - m_group_contrast(numgroups), - m_client_list(NULL) + m_numcolors(numcolors), + m_numgroups(numgroups), + m_brightness(0.0f), + m_contrast(1.0f), + m_gamma(1.0f), + m_entry_color(numcolors), + m_entry_contrast(numcolors), + m_adjusted_color(numcolors * numgroups + 2), + m_adjusted_rgb15(numcolors * numgroups + 2), + m_group_bright(numgroups), + m_group_contrast(numgroups), + m_client_list(NULL) { // initialize gamma map for (UINT32 index = 0; index < 256; index++) @@ -273,7 +273,7 @@ void palette_t::deref() //------------------------------------------------- -// set_brightness - set the overall brightness +// set_brightness - set the overall brightness // for the palette //------------------------------------------------- @@ -295,7 +295,7 @@ void palette_t::set_brightness(float brightness) //------------------------------------------------- -// set_contrast - set the overall contrast for +// set_contrast - set the overall contrast for // the palette //------------------------------------------------- @@ -314,7 +314,7 @@ void palette_t::set_contrast(float contrast) //------------------------------------------------- -// set_gamma - set the overall gamma for the +// set_gamma - set the overall gamma for the // palette //------------------------------------------------- @@ -342,7 +342,7 @@ void palette_t::set_gamma(float gamma) //------------------------------------------------- -// entry_set_color - set the raw RGB color for a +// entry_set_color - set the raw RGB color for a // given palette index //------------------------------------------------- @@ -362,7 +362,7 @@ void palette_t::entry_set_color(UINT32 index, rgb_t rgb) //------------------------------------------------- -// entry_set_contrast - set the contrast +// entry_set_contrast - set the contrast // adjustment for a single palette index //------------------------------------------------- @@ -382,7 +382,7 @@ void palette_t::entry_set_contrast(UINT32 index, float contrast) //------------------------------------------------- -// group_set_brightness - configure overall +// group_set_brightness - configure overall // brightness for a palette group //------------------------------------------------- @@ -405,7 +405,7 @@ void palette_t::group_set_brightness(UINT32 group, float brightness) //------------------------------------------------- -// group_set_contrast - configure overall +// group_set_contrast - configure overall // contrast for a palette group //------------------------------------------------- @@ -425,7 +425,7 @@ void palette_t::group_set_contrast(UINT32 group, float contrast) //------------------------------------------------- -// normalize_range - normalize a range of palette +// normalize_range - normalize a range of palette // entries //------------------------------------------------- @@ -474,9 +474,9 @@ void palette_t::update_adjusted_color(UINT32 group, UINT32 index) { // compute the adjusted value rgb_t adjusted = adjust_palette_entry(m_entry_color[index], - m_group_bright[group] + m_brightness, - m_group_contrast[group] * m_entry_contrast[index] * m_contrast, - m_gamma_map); + m_group_bright[group] + m_brightness, + m_group_contrast[group] * m_entry_contrast[index] * m_contrast, + m_gamma_map); // if not different, ignore UINT32 finalindex = group * m_numcolors + index; diff --git a/src/lib/util/palette.h b/src/lib/util/palette.h index 120da95f87a..30d5ba528e0 100644 --- a/src/lib/util/palette.h +++ b/src/lib/util/palette.h @@ -39,7 +39,7 @@ public: rgb_t(UINT32 data) { m_data = data; } rgb_t(UINT8 r, UINT8 g, UINT8 b) { m_data = (255 << 24) | (r << 16) | (g << 8) | b; } rgb_t(UINT8 a, UINT8 r, UINT8 g, UINT8 b) { m_data = (a << 24) | (r << 16) | (g << 8) | b; } - + // getters UINT8 a() const { return m_data >> 24; } UINT8 r() const { return m_data >> 16; } @@ -53,7 +53,7 @@ public: rgb_t &set_r(UINT8 r) { m_data &= ~0x00ff0000; m_data |= r << 16; return *this; } rgb_t &set_g(UINT8 g) { m_data &= ~0x0000ff00; m_data |= g << 8; return *this; } rgb_t &set_b(UINT8 b) { m_data &= ~0x000000ff; m_data |= b << 0; return *this; } - + // implicit conversion operators operator UINT32() const { return m_data; } @@ -64,11 +64,11 @@ public: rgb_t &operator=(UINT32 rhs) { m_data = rhs; return *this; } rgb_t &operator+=(const rgb_t &rhs) { m_data = rgb_t(clamphi(a() + rhs.a()), clamphi(r() + rhs.r()), clamphi(g() + rhs.g()), clamphi(b() + rhs.b())); return *this; } rgb_t &operator-=(const rgb_t &rhs) { m_data = rgb_t(clamplo(a() - rhs.a()), clamplo(r() - rhs.r()), clamplo(g() - rhs.g()), clamplo(b() - rhs.b())); return *this; } - + // arithmetic operators const rgb_t operator+(const rgb_t &rhs) const { rgb_t result = *this; result += rhs; return result; } const rgb_t operator-(const rgb_t &rhs) const { rgb_t result = *this; result -= rhs; return result; } - + // static helpers static UINT8 clamp(INT32 value) { return (value < 0) ? 0 : (value > 255) ? 255 : value; } static UINT8 clamphi(INT32 value) { return (value > 255) ? 255 : value; } @@ -79,7 +79,7 @@ public: static const rgb_t white; private: - UINT32 m_data; + UINT32 m_data; }; @@ -108,7 +108,7 @@ private: public: // construction dirty_state(); - + // operations const UINT32 *dirty_list(UINT32 &mindirty, UINT32 &maxdirty); void resize(UINT32 colors); @@ -127,7 +127,7 @@ private: palette_client *m_next; // pointer to next client dirty_state * m_live; // live dirty state dirty_state * m_previous; // previous dirty state - dirty_state m_dirty[2]; // two dirty states + dirty_state m_dirty[2]; // two dirty states }; @@ -141,7 +141,7 @@ class palette_t public: // static constructor: used to ensure same new/delete is used static palette_t *alloc(UINT32 numcolors, UINT32 numgroups = 1); - + // reference counting void ref() { m_refcount++; } void deref(); @@ -152,12 +152,12 @@ public: int max_index() const { return m_numcolors * m_numgroups + 2; } UINT32 black_entry() const { return m_numcolors * m_numgroups + 0; } UINT32 white_entry() const { return m_numcolors * m_numgroups + 1; } - + // overall adjustments void set_brightness(float brightness); void set_contrast(float contrast); void set_gamma(float gamma); - + // entry getters rgb_t entry_color(UINT32 index) const { return (index < m_numcolors) ? m_entry_color[index] : rgb_t::black; } rgb_t entry_adjusted_color(UINT32 index) const { return (index < m_numcolors * m_numgroups) ? m_adjusted_color[index] : rgb_t::black; } @@ -166,19 +166,19 @@ public: // entry setters void entry_set_color(UINT32 index, rgb_t rgb); void entry_set_contrast(UINT32 index, float contrast); - + // entry list getters const rgb_t *entry_list_raw() const { return m_entry_color; } const rgb_t *entry_list_adjusted() const { return m_adjusted_color; } const rgb_t *entry_list_adjusted_rgb15() const { return m_adjusted_rgb15; } - + // group adjustments void group_set_brightness(UINT32 group, float brightness); void group_set_contrast(UINT32 group, float contrast); - + // utilities void normalize_range(UINT32 start, UINT32 end, int lum_min = 0, int lum_max = 255); - + private: // construction/destruction palette_t(UINT32 numcolors, UINT32 numgroups = 1); diff --git a/src/lib/util/tagmap.c b/src/lib/util/tagmap.c index 5a447a49487..80218317993 100644 --- a/src/lib/util/tagmap.c +++ b/src/lib/util/tagmap.c @@ -12,4 +12,4 @@ #ifdef MAME_DEBUG INT32 g_tagmap_finds = 0; -#endif \ No newline at end of file +#endif diff --git a/src/lib/util/tagmap.h b/src/lib/util/tagmap.h index d35922a49b0..e31b6671108 100644 --- a/src/lib/util/tagmap.h +++ b/src/lib/util/tagmap.h @@ -203,7 +203,7 @@ class tagged_list tagged_list &operator=(const tagged_list &); public: - class add_exception + class add_exception { public: add_exception(const char *tag) : m_tag(tag) { } @@ -211,7 +211,7 @@ public: private: const char *m_tag; }; - + // construction tagged_list() { } diff --git a/src/mame/audio/cclimber.c b/src/mame/audio/cclimber.c index 0f5eee6ae98..42f080033b9 100644 --- a/src/mame/audio/cclimber.c +++ b/src/mame/audio/cclimber.c @@ -41,8 +41,8 @@ MACHINE_CONFIG_FRAGMENT( cclimber_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 0.50) MCFG_SAMPLES_ADD("samples", cclimber_samples_interface) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 0.5) -MACHINE_CONFIG_END + MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 0.5) +MACHINE_CONFIG_END //************************************************************************** // DEVICE DEFINITIONS @@ -136,4 +136,3 @@ void cclimber_audio_device::play_sample(int start,int freq,int volume) m_samples->start_raw(0,samplebuf,2 * len,freq); } - diff --git a/src/mame/audio/cclimber.h b/src/mame/audio/cclimber.h index 8c4e1d216e5..e771c5a2b5a 100644 --- a/src/mame/audio/cclimber.h +++ b/src/mame/audio/cclimber.h @@ -28,7 +28,7 @@ extern const device_type CCLIMBER_AUDIO; #define MCFG_CCLIMBER_AUDIO_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, CCLIMBER_AUDIO, 0) - + // ======================> cclimber_audio_device class cclimber_audio_device : public device_t @@ -41,14 +41,14 @@ public: DECLARE_WRITE8_MEMBER( sample_rate_w ); DECLARE_WRITE8_MEMBER( sample_volume_w ); DECLARE_WRITE8_MEMBER( sample_select_w ); - + protected: - // device level overrides - virtual void device_start(); + // device level overrides + virtual void device_start(); virtual machine_config_constructor device_mconfig_additions() const; void play_sample(int start,int freq,int volume); -private: +private: int m_sample_num; int m_sample_freq; int m_sample_volume; diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c index 82002cc9842..b8c6a1b47c9 100644 --- a/src/mame/audio/cps3.c +++ b/src/mame/audio/cps3.c @@ -73,7 +73,7 @@ void cps3_sound_device::sound_stream_update(sound_stream &stream, stream_sample_ -------- -------- xxxxxxxx xxxxxxxx end address high 7 xxxxxxxx xxxxxxxx -------- -------- volume right (signed?) -------- -------- xxxxxxxx xxxxxxxx volume left (signed?) - + (*) reg 5 and 6 are always the same. One of them probably means loop-end address, but we won't know which until we do tests on real hw. */ @@ -87,10 +87,10 @@ void cps3_sound_device::sound_stream_update(sound_stream &stream, stream_sample_ INT16 vol_l = (vptr->regs[7] & 0xffff); INT16 vol_r = (vptr->regs[7] >> 16 & 0xffff); - + UINT32 pos = vptr->pos; UINT32 frac = vptr->frac; - + /* TODO */ start -= 0x400000; end -= 0x400000; @@ -144,7 +144,7 @@ WRITE32_MEMBER( cps3_sound_device::cps3_sound_w ) else if (offset == 0x80) { assert((mem_mask & 0xffff0000) == 0xffff0000); // doesn't happen - + UINT16 key = data >> 16; for (int i = 0; i < CPS3_VOICES; i++) diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c index bf7397e7808..514bb893299 100644 --- a/src/mame/audio/namco52.c +++ b/src/mame/audio/namco52.c @@ -166,7 +166,7 @@ namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char * m_basenode(0), m_extclock(0), m_romread(*this), - m_si(*this) + m_si(*this) { } diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h index 8af8dbbac50..949c62de1e2 100644 --- a/src/mame/audio/namco52.h +++ b/src/mame/audio/namco52.h @@ -23,7 +23,7 @@ #define MCFG_NAMCO_52XX_SI_CB(_devcb) \ devcb = &namco_52xx_device::set_si_callback(*device, DEVCB2_##_devcb); - + class namco_52xx_device : public device_t { @@ -35,7 +35,7 @@ public: static void set_extclock(device_t &device, attoseconds_t clk) { downcast(device).m_extclock = clk; } template static devcb2_base &set_romread_callback(device_t &device, _Object object) { return downcast(device).m_romread.set_callback(object); } template static devcb2_base &set_si_callback(device_t &device, _Object object) { return downcast(device).m_si.set_callback(object); } - + DECLARE_WRITE8_MEMBER(write); DECLARE_READ8_MEMBER( K_r ); @@ -52,7 +52,7 @@ protected: virtual void device_start(); virtual const rom_entry *device_rom_region() const; virtual machine_config_constructor device_mconfig_additions() const; - + TIMER_CALLBACK_MEMBER( latch_callback ); TIMER_CALLBACK_MEMBER( irq_clear ); TIMER_CALLBACK_MEMBER( external_clock_pulse ); @@ -60,12 +60,12 @@ private: // internal state required_device m_cpu; required_device m_discrete; - + int m_basenode; attoseconds_t m_extclock; devcb2_read8 m_romread; devcb2_read8 m_si; - + UINT8 m_latched_cmd; UINT32 m_address; }; diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c index a8f14368685..6fce7cd8af6 100644 --- a/src/mame/audio/namco54.c +++ b/src/mame/audio/namco54.c @@ -58,7 +58,7 @@ TIMER_CALLBACK_MEMBER( namco_54xx_device::latch_callback ) } READ8_MEMBER( namco_54xx_device::K_r ) -{ +{ return m_latched_cmd >> 4; } diff --git a/src/mame/audio/namco54.h b/src/mame/audio/namco54.h index 3abe55cd749..9396436ca20 100644 --- a/src/mame/audio/namco54.h +++ b/src/mame/audio/namco54.h @@ -24,12 +24,12 @@ public: static void set_discrete(device_t &device, const char *tag) { downcast(device).m_discrete.set_tag(tag); } static void set_basenote(device_t &device, int node) { downcast(device).m_basenode = node; } - + DECLARE_READ8_MEMBER( K_r ); DECLARE_READ8_MEMBER( R0_r ); DECLARE_WRITE8_MEMBER( O_w ); DECLARE_WRITE8_MEMBER( R1_w ); - + DECLARE_WRITE8_MEMBER( write ); protected: // device-level overrides @@ -43,7 +43,7 @@ private: // internal state required_device m_cpu; required_device m_discrete; - + int m_basenode; UINT8 m_latched_cmd; }; diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h index 5864ab00180..973f750bd60 100644 --- a/src/mame/audio/taito_en.h +++ b/src/mame/audio/taito_en.h @@ -19,7 +19,7 @@ public: DECLARE_WRITE16_MEMBER( es5510_dsp_w ); DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); - + DECLARE_WRITE8_MEMBER(mb87078_gain_changed); protected: diff --git a/src/mame/audio/taito_zm.c b/src/mame/audio/taito_zm.c index d451029af87..1364a84509c 100644 --- a/src/mame/audio/taito_zm.c +++ b/src/mame/audio/taito_zm.c @@ -55,7 +55,7 @@ taito_zoom_device::taito_zoom_device(const machine_config &mconfig, const char * void taito_zoom_device::device_start() { m_snd_shared_ram = auto_alloc_array_clear(machine(), UINT8, 0x100); - + // register for savestates save_item(NAME(m_reg_address)); save_item(NAME(m_tms_ctrl)); @@ -69,7 +69,7 @@ void taito_zoom_device::device_start() void taito_zoom_device::device_reset() { m_reg_address = 0; - + m_zsg2->reset(); } @@ -150,7 +150,7 @@ WRITE16_MEMBER(taito_zoom_device::reg_data_w) popmessage("ZOOM gain L %04X, contact MAMEdev", data); m_zsg2->set_output_gain(0, (data & 0x3f) / 63.0); break; - + case 0x05: // zsg2+dsp global volume right if (data & 0xc0c0) diff --git a/src/mame/audio/taito_zm.h b/src/mame/audio/taito_zm.h index 9604f8319fe..b9d759b4c99 100644 --- a/src/mame/audio/taito_zm.h +++ b/src/mame/audio/taito_zm.h @@ -27,11 +27,11 @@ protected: virtual void device_reset(); private: - + // devices/pointers required_device m_soundcpu; required_device m_zsg2; - + // internal state UINT16 m_reg_address; UINT8 m_tms_ctrl; diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index f6c9ef1bd52..97104b72950 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -72,73 +72,73 @@ correctly. #include "includes/1942.h" #define NLFILT(RA, R1, C1, R2) \ - NET_C(RA.1, V5) \ - NET_C(RA.2, R1.1) \ - NET_C(R1.2, GND) \ - NET_C(R1.1, C1.1) \ - NET_C(C1.2, R2.1) + NET_C(RA.1, V5) \ + NET_C(RA.2, R1.1) \ + NET_C(R1.2, GND) \ + NET_C(R1.1, C1.1) \ + NET_C(C1.2, R2.1) static NETLIST_START(nl_1942) - /* Standard stuff */ - - SOLVER(Solver, 48000) - ANALOG_INPUT(V5, 5) - - /* AY 8910 internal resistors */ - - RES(R_AY1_1, 1000); - RES(R_AY1_2, 1000); - RES(R_AY1_3, 1000); - RES(R_AY2_1, 1000); - RES(R_AY2_2, 1000); - RES(R_AY2_3, 1000); - - RES(R2, 220000) - RES(R3, 220000) - RES(R4, 220000) - RES(R5, 220000) - RES(R6, 220000) - RES(R7, 220000) - - RES(R11, 10000) - RES(R12, 10000) - RES(R13, 10000) - RES(R14, 10000) - RES(R15, 10000) - RES(R16, 10000) - - CAP(CC7, 10e-6) - CAP(CC8, 10e-6) - CAP(CC9, 10e-6) - CAP(CC10, 10e-6) - CAP(CC11, 10e-6) - CAP(CC12, 10e-6) - - NLFILT(R_AY2_3, R13, CC7, R2) - NLFILT(R_AY2_2, R15, CC8, R3) - NLFILT(R_AY2_1, R11, CC9, R4) - - NLFILT(R_AY1_3, R12, CC10, R5) - NLFILT(R_AY1_2, R14, CC11, R6) - NLFILT(R_AY1_1, R16, CC12, R7) - - POT(VR, 2000) - NET_C(VR.3, GND) - - NET_C(R2.2, VR.1) - NET_C(R3.2, VR.1) - NET_C(R4.2, VR.1) - NET_C(R5.2, VR.1) - NET_C(R6.2, VR.1) - NET_C(R7.2, VR.1) - - CAP(CC6, 10e-6) - RES(R1, 100000) - - NET_C(CC6.1, VR.2) - NET_C(CC6.2, R1.1) - NET_C(R1.2, GND) + /* Standard stuff */ + + SOLVER(Solver, 48000) + ANALOG_INPUT(V5, 5) + + /* AY 8910 internal resistors */ + + RES(R_AY1_1, 1000); + RES(R_AY1_2, 1000); + RES(R_AY1_3, 1000); + RES(R_AY2_1, 1000); + RES(R_AY2_2, 1000); + RES(R_AY2_3, 1000); + + RES(R2, 220000) + RES(R3, 220000) + RES(R4, 220000) + RES(R5, 220000) + RES(R6, 220000) + RES(R7, 220000) + + RES(R11, 10000) + RES(R12, 10000) + RES(R13, 10000) + RES(R14, 10000) + RES(R15, 10000) + RES(R16, 10000) + + CAP(CC7, 10e-6) + CAP(CC8, 10e-6) + CAP(CC9, 10e-6) + CAP(CC10, 10e-6) + CAP(CC11, 10e-6) + CAP(CC12, 10e-6) + + NLFILT(R_AY2_3, R13, CC7, R2) + NLFILT(R_AY2_2, R15, CC8, R3) + NLFILT(R_AY2_1, R11, CC9, R4) + + NLFILT(R_AY1_3, R12, CC10, R5) + NLFILT(R_AY1_2, R14, CC11, R6) + NLFILT(R_AY1_1, R16, CC12, R7) + + POT(VR, 2000) + NET_C(VR.3, GND) + + NET_C(R2.2, VR.1) + NET_C(R3.2, VR.1) + NET_C(R4.2, VR.1) + NET_C(R5.2, VR.1) + NET_C(R6.2, VR.1) + NET_C(R7.2, VR.1) + + CAP(CC6, 10e-6) + RES(R1, 100000) + + NET_C(CC6.1, VR.2) + NET_C(CC6.2, R1.1) + NET_C(R1.2, GND) NETLIST_END() @@ -519,12 +519,12 @@ void _1942_state::machine_reset() static const ay8910_interface ay8910_config = { - AY8910_RESISTOR_OUTPUT, - AY8910_DEFAULT_LOADS, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL + AY8910_RESISTOR_OUTPUT, + AY8910_DEFAULT_LOADS, + DEVCB_NULL, + DEVCB_NULL, + DEVCB_NULL, + DEVCB_NULL }; static MACHINE_CONFIG_START( 1942, _1942_state ) @@ -541,7 +541,7 @@ static MACHINE_CONFIG_START( 1942, _1942_state ) /* video hardware */ MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1942) - + MCFG_PALETTE_ADD("palette", 64*4+4*32*8+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(_1942_state, 1942) @@ -557,32 +557,32 @@ static MACHINE_CONFIG_START( 1942, _1942_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */ - MCFG_SOUND_CONFIG(ay8910_config) - 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_SOUND_CONFIG(ay8910_config) - 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 */ - - MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000) - MCFG_NETLIST_SETUP(nl_1942) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.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", 3, "R_AY2_1.R") - MCFG_NETLIST_STREAM_INPUT("snd_nl", 4, "R_AY2_2.R") - MCFG_NETLIST_STREAM_INPUT("snd_nl", 5, "R_AY2_3.R") - - MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "R1.1") - MCFG_NETLIST_ANALOG_MULT_OFFSET(100000.0, 0.0) + MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */ + MCFG_SOUND_CONFIG(ay8910_config) + 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_SOUND_CONFIG(ay8910_config) + 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 */ + + MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000) + MCFG_NETLIST_SETUP(nl_1942) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.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", 3, "R_AY2_1.R") + MCFG_NETLIST_STREAM_INPUT("snd_nl", 4, "R_AY2_2.R") + MCFG_NETLIST_STREAM_INPUT("snd_nl", 5, "R_AY2_3.R") + + MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "R1.1") + MCFG_NETLIST_ANALOG_MULT_OFFSET(100000.0, 0.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index fee80fe7653..c7952fd91b4 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -120,10 +120,10 @@ void k3_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) ypos = (source[0] & 0x00ff) >> 0; tileno = (source2[0] & 0x7ffe) >> 1; xpos |= (source2[0] & 0x0001) << 8; - gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos, 0); - gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos - 0x100, 0); // wrap - gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos, 0); // wrap - gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos - 0x100, 0); // wrap + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos, 0); + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos - 0x100, 0); // wrap + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos, 0); // wrap + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos - 0x100, 0); // wrap source++; source2++; diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index e21b7974715..aef7026ce40 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -206,14 +206,14 @@ WRITE8_MEMBER(_20pacgal_state::sprite_lookup_w) // likewise the sound table.. is it being uploaded in a different format at 0x0c000? // we also need the palette data because there is only a single rom on this pcb? static ADDRESS_MAP_START( 25pacman_map, AS_PROGRAM, 8, _25pacman_state ) - + AM_RANGE(0x04000, 0x047ff) AM_RAM AM_SHARE("video_ram") AM_RANGE(0x04800, 0x05fff) AM_RAM AM_RANGE(0x06000, 0x06fff) AM_WRITEONLY AM_SHARE("char_gfx_ram") AM_RANGE(0x07000, 0x0717f) AM_WRITE(sprite_ram_w) -// AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE(ram_48000_w) +// AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE(ram_48000_w) AM_RANGE(0x08000, 0x09fff) AM_WRITENOP AM_RANGE(0x0a000, 0x0bfff) AM_WRITE(sprite_gfx_w) @@ -270,7 +270,7 @@ READ8_MEMBER( _25pacman_state::_25pacman_io_87_r ) AM_RANGE(0x85, 0x86) AM_WRITEONLY AM_SHARE("stars_seed") /* stars: rng seed (lo/hi) */ AM_RANGE(0x87, 0x87) AM_READ( _25pacman_io_87_r ) // not eeprom on this AM_RANGE(0x87, 0x87) AM_WRITENOP -// AM_RANGE(0x88, 0x88) AM_WRITE(ram_bank_select_w) +// AM_RANGE(0x88, 0x88) AM_WRITE(ram_bank_select_w) AM_RANGE(0x89, 0x89) AM_DEVWRITE("dac", dac_device, write_signed8) AM_RANGE(0x8a, 0x8a) AM_WRITEONLY AM_SHARE("stars_ctrl") /* stars: bits 3-4 = active set; bit 5 = enable */ AM_RANGE(0x8b, 0x8b) AM_WRITEONLY AM_SHARE("flip") diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c index ab3e0d7aa80..4410ba8a854 100644 --- a/src/mame/drivers/3x3puzzl.c +++ b/src/mame/drivers/3x3puzzl.c @@ -72,7 +72,7 @@ public: required_device m_oki; required_device m_gfxdecode; required_device m_screen; - + // screen updates UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/4enlinea.c b/src/mame/drivers/4enlinea.c index 94c543f7040..b6a3119eb22 100644 --- a/src/mame/drivers/4enlinea.c +++ b/src/mame/drivers/4enlinea.c @@ -188,7 +188,7 @@ #define SEC_CLOCK XTAL_8MHz #define HCGA_CLOCK XTAL_14_31818MHz -#define PRG_CPU_CLOCK MAIN_CLOCK /2 /* 8 MHz. (measured) */ +#define PRG_CPU_CLOCK MAIN_CLOCK /2 /* 8 MHz. (measured) */ #define SND_CPU_CLOCK SEC_CLOCK /2 /* 4 MHz. (measured) */ #define SND_AY_CLOCK SEC_CLOCK /4 /* 2 MHz. (measured) */ #define CRTC_CLOCK SEC_CLOCK /2 /* 8 MHz. (measured) */ @@ -321,9 +321,9 @@ void isa8_cga_4enlinea_device::device_start() } } -// astring tempstring; -// m_chr_gen_base = memregion(subtag(tempstring, "gfx1"))->base(); -// m_chr_gen = m_chr_gen_base + m_chr_gen_offset[1]; +// astring tempstring; +// m_chr_gen_base = memregion(subtag(tempstring, "gfx1"))->base(); +// m_chr_gen = m_chr_gen_base + m_chr_gen_offset[1]; } @@ -346,7 +346,7 @@ READ8_MEMBER(_4enlinea_state::serial_r) static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _4enlinea_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM -// AM_RANGE(0x8000, 0xbfff) AM_RAM // CGA VRAM +// AM_RANGE(0x8000, 0xbfff) AM_RAM // CGA VRAM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe001) AM_READ(serial_r) @@ -355,7 +355,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, AS_IO, 8, _4enlinea_state ) ADDRESS_MAP_GLOBAL_MASK(0x3ff) -// AM_RANGE(0x3d4, 0x3df) CGA regs +// AM_RANGE(0x3d4, 0x3df) CGA regs AM_RANGE(0x3bf, 0x3bf) AM_WRITENOP // CGA mode control, TODO ADDRESS_MAP_END @@ -455,12 +455,10 @@ INPUT_PORTS_END void _4enlinea_state::machine_start() { - } void _4enlinea_state::machine_reset() { - } @@ -535,7 +533,7 @@ static MACHINE_CONFIG_START( 4enlinea, _4enlinea_state ) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(main_portmap) MCFG_CPU_PERIODIC_INT_DRIVER(_4enlinea_state, _4enlinea_irq, 60) //TODO -// MCFG_CPU_PERIODIC_INT_DRIVER(_4enlinea_state, irq0_line_hold, 4*35) +// MCFG_CPU_PERIODIC_INT_DRIVER(_4enlinea_state, irq0_line_hold, 4*35) MCFG_CPU_ADD("audiocpu", Z80, SND_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(audio_map) @@ -550,8 +548,8 @@ static MACHINE_CONFIG_START( 4enlinea, _4enlinea_state ) CRTC_CLOCK is 8MHz, entering for pin 1 of UM487F. This clock is used only for UM6845R embedded mode. The frequency divisor is unknown. - CRTC_CLOCK / 4.0 = 66.961296 Hz. - CRTC_CLOCK / 4.5 = 59.521093 Hz. + CRTC_CLOCK / 4.0 = 66.961296 Hz. + CRTC_CLOCK / 4.5 = 59.521093 Hz. CRTC_CLOCK / 5.0 = 53.569037 Hz. */ diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index b5a32fd8633..8e013209269 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -462,7 +462,7 @@ public: m_audiocpu(*this, "audiocpu"), m_ay8910(*this, "ay8910"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 2354e4b3ff9..5c5bb8641a1 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -372,13 +372,13 @@ static MACHINE_CONFIG_START( 88games, _88games_state ) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K052109_ADD("k052109", _88games_k052109_intf) MCFG_K052109_GFXDECODE("gfxdecode") - MCFG_K052109_PALETTE("palette") + MCFG_K052109_PALETTE("palette") MCFG_K051960_ADD("k051960", _88games_k051960_intf) MCFG_K051960_GFXDECODE("gfxdecode") - MCFG_K051960_PALETTE("palette") + MCFG_K051960_PALETTE("palette") MCFG_K051316_ADD("k051316", _88games_k051316_intf) MCFG_K051316_GFXDECODE("gfxdecode") MCFG_K051316_PALETTE("palette") diff --git a/src/mame/drivers/a1supply.c b/src/mame/drivers/a1supply.c index fda864e2411..809ff5090b1 100644 --- a/src/mame/drivers/a1supply.c +++ b/src/mame/drivers/a1supply.c @@ -1,12 +1,12 @@ /*************************************************************************** - + A-1 Supply discrete hardware games - + TV 21 (197?) TV 21 III (197?) TV Poker (197?) - These actually seem to use Intel 4040 as a CPU + a lot of discrete circuitry... + These actually seem to use Intel 4040 as a CPU + a lot of discrete circuitry... to be checked! ***************************************************************************/ @@ -48,38 +48,38 @@ class a1supply_state : public driver_device public: a1supply_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(a1supply) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -109,9 +109,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 669d1260996..b259484c66f 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -34,7 +34,7 @@ public: required_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; emu_timer *m_refresh_timer; DECLARE_WRITE8_MEMBER(acefruit_colorram_w); DECLARE_WRITE8_MEMBER(acefruit_coin_w); diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index df4f65d5889..37f151a92f0 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1489,7 +1489,7 @@ static MACHINE_CONFIG_START( karatblz, aerofgt_state ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(2) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") MCFG_VSYSTEM_SPR2_PALETTE("palette") - + MCFG_DEVICE_ADD("vsystem_spr_ol2", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_ol2_tile_callback ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) @@ -1542,7 +1542,7 @@ static MACHINE_CONFIG_START( spinlbrk, aerofgt_state ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(2) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") MCFG_VSYSTEM_SPR2_PALETTE("palette") - + MCFG_DEVICE_ADD("vsystem_spr_ol2", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_ol2_tile_callback ) // rom lookup MCFG_VSYSTEM_SPR2_SET_PRITYPE(1) @@ -1596,7 +1596,7 @@ static MACHINE_CONFIG_START( turbofrc, aerofgt_state ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(2) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") MCFG_VSYSTEM_SPR2_PALETTE("palette") - + MCFG_DEVICE_ADD("vsystem_spr_ol2", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_ol2_tile_callback ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) @@ -1650,8 +1650,8 @@ static MACHINE_CONFIG_START( aerofgtb, aerofgt_state ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(2) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") MCFG_VSYSTEM_SPR2_PALETTE("palette") - - MCFG_DEVICE_ADD("vsystem_spr_ol2", VSYSTEM_SPR2, 0) + + MCFG_DEVICE_ADD("vsystem_spr_ol2", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_ol2_tile_callback ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") @@ -1806,7 +1806,7 @@ static MACHINE_CONFIG_START( wbbc97, aerofgt_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8+14, 44*8-1+4, 0*8, 30*8-1) - MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_wbbc97) + MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_wbbc97) MCFG_GFXDECODE_ADD("gfxdecode", "palette", wbbc97) MCFG_PALETTE_ADD("palette", 2048) diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index d0b1287360d..5d677127bd8 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -288,7 +288,7 @@ static MACHINE_CONFIG_START( hanaroku, albazc_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", hanaroku) - + MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(albazc_state, albazc) diff --git a/src/mame/drivers/aleisttl.c b/src/mame/drivers/aleisttl.c index c8753300936..976ce76fae6 100644 --- a/src/mame/drivers/aleisttl.c +++ b/src/mame/drivers/aleisttl.c @@ -1,7 +1,7 @@ /*************************************************************************** - + Allied Leisure discrete hardware games - + Hesitation (1974) AL-6500? Paddle Battle (1973) Robot (1975) AL-7500 @@ -10,7 +10,7 @@ Super Soccer (1973) Tennis Tourney (1973) Zap (1974) AL-6500 - + ***************************************************************************/ @@ -50,38 +50,38 @@ class sburners_state : public driver_device public: sburners_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(sburners) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -111,9 +111,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/amusco.c b/src/mame/drivers/amusco.c index e226f9e9d8e..ce14c156431 100644 --- a/src/mame/drivers/amusco.c +++ b/src/mame/drivers/amusco.c @@ -24,14 +24,14 @@ 1x MOS 6845 (U27) CRT Controller. 2x P8255 Programmable Peripheral Interface (I/O). - 2x SRM2264 8k X 8 CMOS Static RAM. + 2x SRM2264 8k X 8 CMOS Static RAM. - 1x 27128 (U35) ROM. Handwritten sticker: Char A U35. - 1x 27128 (U36) ROM. Handwritten sticker: Char B U36. - 1x 27128 (U37) ROM. Handwritten sticker: Char C U37. - 1x 27256 (U42) ROM. Handwritten sticker: PK V1.4 U42. + 1x 27128 (U35) ROM. Handwritten sticker: Char A U35. + 1x 27128 (U36) ROM. Handwritten sticker: Char B U36. + 1x 27128 (U37) ROM. Handwritten sticker: Char C U37. + 1x 27256 (U42) ROM. Handwritten sticker: PK V1.4 U42. - 1x TI SN76489 Digital Complex Sound Generator (DCSG). + 1x TI SN76489 Digital Complex Sound Generator (DCSG). 3x MMI PAL16L8ACN (U47, U48, U50) 1x MMI PAL16R4 (U49) <-- couldn't get a consistent read @@ -62,12 +62,12 @@ *******************************************************************************/ -#define MASTER_CLOCK XTAL_22_1184MHz /* confirmed */ -#define SECOND_CLOCK XTAL_15MHz /* confirmed */ +#define MASTER_CLOCK XTAL_22_1184MHz /* confirmed */ +#define SECOND_CLOCK XTAL_15MHz /* confirmed */ -#define CPU_CLOCK MASTER_CLOCK / 4 /* guess */ -#define CRTC_CLOCK SECOND_CLOCK / 8 /* guess */ -#define SND_CLOCK SECOND_CLOCK / 8 /* guess */ +#define CPU_CLOCK MASTER_CLOCK / 4 /* guess */ +#define CRTC_CLOCK SECOND_CLOCK / 8 /* guess */ +#define SND_CLOCK SECOND_CLOCK / 8 /* guess */ #include "emu.h" @@ -120,7 +120,6 @@ public: WRITE16_MEMBER(amusco_state::amusco_videoram_w) { - } PALETTE_INIT_MEMBER(amusco_state, amusco_palette_init) @@ -180,7 +179,7 @@ PALETTE_INIT_MEMBER(amusco_state, amusco) static ADDRESS_MAP_START( amusco_mem_map, AS_PROGRAM, 16, amusco_state ) AM_RANGE(0x00000, 0x0ffff) AM_RAM - AM_RANGE(0xec000, 0xecfff) AM_RAM AM_SHARE("videoram") // placeholder + AM_RANGE(0xec000, 0xecfff) AM_RAM AM_SHARE("videoram") // placeholder AM_RANGE(0xf8000, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -213,19 +212,19 @@ WRITE16_MEMBER( amusco_state::vram_w) { m_videoram[m_video_update_address] = data; m_bg_tilemap->mark_tile_dirty(m_video_update_address); -// printf("%04x %04x\n",m_video_update_address,data); +// printf("%04x %04x\n",m_video_update_address,data); } static ADDRESS_MAP_START( amusco_io_map, AS_IO, 16, amusco_state ) AM_RANGE(0x0000, 0x0001) AM_READWRITE8(mc6845_r, mc6845_w, 0xffff) -// AM_RANGE(0x0000, 0x0001) AM_DEVREADWRITE8("crtc", mc6845_device, status_r, address_w, 0x00ff) -// AM_RANGE(0x0000, 0x0001) AM_DEVREADWRITE8("crtc", mc6845_device, register_r, register_w, 0xff00) +// AM_RANGE(0x0000, 0x0001) AM_DEVREADWRITE8("crtc", mc6845_device, status_r, address_w, 0x00ff) +// AM_RANGE(0x0000, 0x0001) AM_DEVREADWRITE8("crtc", mc6845_device, register_r, register_w, 0xff00) AM_RANGE(0x0010, 0x0011) AM_DEVREADWRITE8("pic8259", pic8259_device, read, write, 0xffff ) //PPI 8255 - AM_RANGE(0x0060, 0x0061) AM_DEVWRITE8("sn", sn76489_device, write, 0x00ff) /* sound */ + AM_RANGE(0x0060, 0x0061) AM_DEVWRITE8("sn", sn76489_device, write, 0x00ff) /* sound */ AM_RANGE(0x0070, 0x0071) AM_WRITE(vram_w) -// AM_RANGE(0x0010, 0x0011) AM_READ_PORT("IN1") -// AM_RANGE(0x0012, 0x0013) AM_READ_PORT("IN3") +// AM_RANGE(0x0010, 0x0011) AM_READ_PORT("IN1") +// AM_RANGE(0x0012, 0x0013) AM_READ_PORT("IN3") AM_RANGE(0x0030, 0x0031) AM_READ_PORT("DSW1") AM_WRITENOP // lamps? AM_RANGE(0x0040, 0x0041) AM_READ_PORT("DSW2") ADDRESS_MAP_END @@ -485,8 +484,8 @@ GFXDECODE_END MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr) { -// amusco_state *state = device->machine().driver_data(); -// state->m_video_update_address = address; +// amusco_state *state = device->machine().driver_data(); +// state->m_video_update_address = address; } static MC6845_INTERFACE( mc6845_intf ) @@ -537,8 +536,8 @@ static MACHINE_CONFIG_START( amusco, amusco_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(88*8, 27*10) // screen size: 88*8 27*10 - MCFG_SCREEN_VISIBLE_AREA(0*8, 74*8-1, 0*10, 24*10-1) // visible scr: 74*8 24*10 + MCFG_SCREEN_SIZE(88*8, 27*10) // screen size: 88*8 27*10 + MCFG_SCREEN_VISIBLE_AREA(0*8, 74*8-1, 0*10, 24*10-1) // visible scr: 74*8 24*10 MCFG_SCREEN_UPDATE_DRIVER(amusco_state, screen_update_amusco) MCFG_SCREEN_PALETTE("palette") @@ -568,9 +567,9 @@ ROM_START( amusco ) ROM_LOAD( "char_a_u35.u35", 0x0000, 0x4000, CRC(ded67ef6) SHA1(da7326c190211e956e5a5f763d5045615bb8ffb3) ) ROM_LOAD( "char_b_u36.u36", 0x4000, 0x4000, CRC(55523513) SHA1(97fd221c298698628d4f6564389d96eb89e55927) ) ROM_LOAD( "char_c_u37.u37", 0x8000, 0x4000, CRC(d26f3b94) SHA1(e58af4f6f1a9091c23827997d03b91f02bb07856) ) -// ROM_LOAD( "char_a_u35.u35", 0x8000, 0x4000, CRC(ded67ef6) SHA1(da7326c190211e956e5a5f763d5045615bb8ffb3) ) -// ROM_LOAD( "char_b_u36.u36", 0x4000, 0x4000, CRC(55523513) SHA1(97fd221c298698628d4f6564389d96eb89e55927) ) -// ROM_LOAD( "char_c_u37.u37", 0x0000, 0x4000, CRC(d26f3b94) SHA1(e58af4f6f1a9091c23827997d03b91f02bb07856) ) +// ROM_LOAD( "char_a_u35.u35", 0x8000, 0x4000, CRC(ded67ef6) SHA1(da7326c190211e956e5a5f763d5045615bb8ffb3) ) +// ROM_LOAD( "char_b_u36.u36", 0x4000, 0x4000, CRC(55523513) SHA1(97fd221c298698628d4f6564389d96eb89e55927) ) +// ROM_LOAD( "char_c_u37.u37", 0x0000, 0x4000, CRC(d26f3b94) SHA1(e58af4f6f1a9091c23827997d03b91f02bb07856) ) ROM_REGION( 0x0800, "plds", 0 ) ROM_LOAD( "pal16l8a.u47", 0x0000, 0x0104, CRC(554b4286) SHA1(26bc991f2cc58644cd2d9ce5c1867a94455b95a8) ) diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index 2317b0c312c..381aa09d2d3 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -18,10 +18,10 @@ World Darts Xenon World Trophy Soccer - Delta Command (N.Y Warriors) - Blastaball - Aaargh - Pharaohs Match + Delta Command (N.Y Warriors) + Blastaball + Aaargh + Pharaohs Match Other Arcadia games (not dumped): @@ -218,7 +218,7 @@ static ADDRESS_MAP_START( amiga_map, AS_PROGRAM, 16, arcadia_amiga_state ) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_SHARE("custom_regs") AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w) AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* Kickstart BIOS */ - + AM_RANGE(0x800000, 0x97ffff) AM_ROMBANK("bank2") AM_REGION("user3", 0) AM_RANGE(0x980000, 0x9fbfff) AM_ROM AM_REGION("user2", 0) AM_RANGE(0x9fc000, 0x9ffffd) AM_RAM AM_SHARE("nvram") @@ -235,7 +235,7 @@ static ADDRESS_MAP_START( argh_map, AS_PROGRAM, 16, arcadia_amiga_state ) AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* Kickstart BIOS */ AM_RANGE(0x800000, 0x97ffff) AM_ROMBANK("bank2") AM_REGION("user3", 0) -// AM_RANGE(0x980000, 0x9fefff) AM_ROM AM_REGION("user3", 0) +// AM_RANGE(0x980000, 0x9fefff) AM_ROM AM_REGION("user3", 0) AM_RANGE(0x9ff000, 0x9fffff) AM_RAM AM_SHARE("nvram") AM_RANGE(0xf00000, 0xf7ffff) AM_ROM AM_REGION("user3", 0) ADDRESS_MAP_END @@ -915,7 +915,7 @@ void arcadia_amiga_state::generic_decode(const char *tag, int bit7, int bit6, in #if 0 { UINT8 *ROM = memregion(tag)->base(); - // int size = memregion(tag)->bytes(); + // int size = memregion(tag)->bytes(); FILE *fp; char filename[256]; @@ -962,7 +962,7 @@ void arcadia_amiga_state::arcadia_init() /* OnePlay bios is encrypted, TenPlay is not */ biosrom = (UINT16 *)memregion("user2")->base(); - + if (biosrom) if (biosrom[0] != 0x4afc) generic_decode("user2", 6, 1, 0, 2, 3, 4, 5, 7); diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index ff4ee3ee9f7..8af2d7a0d8f 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -17,7 +17,7 @@ * Press PB4, PB5 and PB6 keys simultaneously (Z+X+C keys by default) * A value (displayed below) will appear next to RF/AMT on the right of the screen * Key out both the Jackpot and Audit Keys - + This method works with the following games: 3bagflnz 200 @@ -68,7 +68,7 @@ eforest fhunter fhuntera - + Technical Notes: 68B09EP Motorola Processor @@ -303,11 +303,11 @@ public: required_device m_ay1; required_device m_ay2; required_device m_samples; - + required_shared_ptr m_mkiv_vram; required_device m_gfxdecode; required_device m_palette; - + int m_rtc_address_strobe; int m_rtc_data_strobe; UINT8 *m_shapeRomPtr; @@ -2381,25 +2381,25 @@ ROM_END ROM_START( gunnrose ) // MK2.5 ROM_REGION(0x10000, "maincpu", 0 ) /* VIDEO AND SOUND EPROM */ - ROM_LOAD("gnr.u7", 0x06000, 0x2000, CRC(fe7d0ea4) SHA1(3F3F4809534065C33ECA2CFFF0D1D2A3E3992406)) // 1VL/SH136 RED AND BLACK + ROM_LOAD("gnr.u7", 0x06000, 0x2000, CRC(fe7d0ea4) SHA1(3F3F4809534065C33ECA2CFFF0D1D2A3E3992406)) // 1VL/SH136 RED AND BLACK /* GAME EPROMS */ - ROM_LOAD("gnr.u9", 0x08000, 0x8000, CRC(4fb5f757) SHA1(A4129BCA7E573FAAC0D11DE41A9BF8EA144091EE)) // E/C606191SMP + ROM_LOAD("gnr.u9", 0x08000, 0x8000, CRC(4fb5f757) SHA1(A4129BCA7E573FAAC0D11DE41A9BF8EA144091EE)) // E/C606191SMP /* SHAPE EPROMS */ ROM_REGION(0xc000, "tile_gfx", 0 ) - ROM_LOAD("gnr.u8", 0x00000, 0x2000, CRC(dec9e695) SHA1(A596C4243D6D39E0611FF714E19E14188C90B6F1)) // 1VL/SH136 RED AND BLACK - ROM_LOAD("gnr.u10", 0x02000, 0x2000, CRC(e83b8e79) SHA1(595F41A5F59F938581A57B445370AA716C6B1409)) // 1VL/SH136 RED AND BLACK - ROM_LOAD("gnr.u12", 0x04000, 0x2000, CRC(9134d029) SHA1(D698FB91D8F5FA78FFD056149421008D3F12C456)) // 1VL/SH136 RED AND BLACK - ROM_LOAD("gnr.u9t", 0x06000, 0x2000, CRC(73a0c2cd) SHA1(662056D570EAA069483D378B77EFCFB42EFF6D0D)) // E/C606191SMP - ROM_LOAD("gnr.u11", 0x08000, 0x2000, CRC(c50adffe) SHA1(A7C4A3CDD4D5D31A1420E47859408CAA75CE2636)) // 1VL/SH136 RED AND BLACK - ROM_LOAD("gnr.u13", 0x0a000, 0x2000, CRC(e0a6bfc5) SHA1(07E4C8191503F0EA2DE4F7CE18FE6290D20EF80E)) // 1VL/SH136 RED AND BLACK + ROM_LOAD("gnr.u8", 0x00000, 0x2000, CRC(dec9e695) SHA1(A596C4243D6D39E0611FF714E19E14188C90B6F1)) // 1VL/SH136 RED AND BLACK + ROM_LOAD("gnr.u10", 0x02000, 0x2000, CRC(e83b8e79) SHA1(595F41A5F59F938581A57B445370AA716C6B1409)) // 1VL/SH136 RED AND BLACK + ROM_LOAD("gnr.u12", 0x04000, 0x2000, CRC(9134d029) SHA1(D698FB91D8F5FA78FFD056149421008D3F12C456)) // 1VL/SH136 RED AND BLACK + ROM_LOAD("gnr.u9t", 0x06000, 0x2000, CRC(73a0c2cd) SHA1(662056D570EAA069483D378B77EFCFB42EFF6D0D)) // E/C606191SMP + ROM_LOAD("gnr.u11", 0x08000, 0x2000, CRC(c50adffe) SHA1(A7C4A3CDD4D5D31A1420E47859408CAA75CE2636)) // 1VL/SH136 RED AND BLACK + ROM_LOAD("gnr.u13", 0x0a000, 0x2000, CRC(e0a6bfc5) SHA1(07E4C8191503F0EA2DE4F7CE18FE6290D20EF80E)) // 1VL/SH136 RED AND BLACK /* COLOR PROM */ ROM_REGION(0x200, "proms", 0 ) /* are either of these correct? They are taken from different games */ //ROM_LOAD("2cm07.u71", 0x0000, 0x0200, CRC(1e3f402a) SHA1(f38da1ad6607df38add10c69febf7f5f8cd21744)) // Using 2CM07 until a correct PROM is confirmed ROM_LOAD("1cm48.u71", 0x0000, 0x0200, BAD_DUMP CRC(81daeeb0) SHA1(7dfe198c6def5c4ae4ecac488d65c2911fb3a890)) - + ROM_END GAMEL( 1985, 86lions, 0, 86lions, aristmk4, aristmk4_state, aristmk4, ROT0, "Aristocrat", "86 Lions", GAME_NOT_WORKING, layout_topgear ) diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index 88e3aee1a1c..e9b47e10a0f 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -645,7 +645,7 @@ static MACHINE_CONFIG_START( asteroid, asteroid_state ) MCFG_DEVICE_ADD("dvg", DVG, 0) MCFG_AVGDVG_VECTOR("vector") - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 1f36053f7ad..0240a488745 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -74,7 +74,7 @@ public: required_device m_samples; required_device m_screen; - + DECLARE_WRITE8_MEMBER(color_latch_w); DECLARE_WRITE8_MEMBER(spaceint_videoram_w); DECLARE_READ8_MEMBER(kamikaze_ppi_r); diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index 5ad68a9e6cd..2390a1c7ae7 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -1311,7 +1311,6 @@ DRIVER_INIT_MEMBER(astrof_state,sstarbtl) DRIVER_INIT_MEMBER(astrof_state,acombat3) { - /* set up protection handlers */ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this)); machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::abattle_coin_prot_r),this)); diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 000f906e25f..742a006c494 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -888,7 +888,7 @@ static MACHINE_CONFIG_START( bonzeadv, asuka_state ) MCFG_TC0100SCN_PALETTE("palette") MCFG_TC0110PCR_ADD("tc0110pcr") MCFG_TC0110PCR_PALETTE("palette") - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -920,7 +920,7 @@ static MACHINE_CONFIG_START( asuka, asuka_state ) MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0")) MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1")) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index b98d83a91d9..de9aa82ab14 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -168,41 +168,41 @@ this should be generalized to cover other regions of the table, and the scarcity in those regions precludes applying the same kind of analysis. int parameters3[16][2] = { - {0x003a, 0x0032}, - {0x0076, 0x0064}, - {0x00ee, 0x00c8}, - {0x01dc, 0x0190}, - {0x01b0, 0x012A}, - {0x0168, 0x005C}, - {0x00d8, 0x00b8}, - {0x01b0, 0x0172}, - {0x016a, 0x00ee}, - {0x00de, 0x01de}, - {0x01be, 0x01b6}, - {0x0174, 0x0164}, - {0x00e2, 0x00c0}, - {0x01c6, 0x0180}, - {0x0186, 0x010a}, - {0x0104, 0x001c} + {0x003a, 0x0032}, + {0x0076, 0x0064}, + {0x00ee, 0x00c8}, + {0x01dc, 0x0190}, + {0x01b0, 0x012A}, + {0x0168, 0x005C}, + {0x00d8, 0x00b8}, + {0x01b0, 0x0172}, + {0x016a, 0x00ee}, + {0x00de, 0x01de}, + {0x01be, 0x01b6}, + {0x0174, 0x0164}, + {0x00e2, 0x00c0}, + {0x01c6, 0x0180}, + {0x0186, 0x010a}, + {0x0104, 0x001c} }; // every output bit is a linear function on the input bits except by // a quadratic term always involving bit #0 of the input UINT32 ftest4(UINT32 num) { - UINT32 accum = 0; - - for (int i=0; i<16; ++i) - { - int b1 = weight(num¶meters3[i][0])&1; // <- linear function (parameters3[i][0] acts as a mask determining which bits are added) - int b2 = weight(num¶meters3[i][1])&1; // <- idem - b2 &= BIT(num, 0); // quadratic term - int b3 = b1 ^ b2; - - accum ^= (b3 << i); - } - - return accum; + UINT32 accum = 0; + + for (int i=0; i<16; ++i) + { + int b1 = weight(num¶meters3[i][0])&1; // <- linear function (parameters3[i][0] acts as a mask determining which bits are added) + int b2 = weight(num¶meters3[i][1])&1; // <- idem + b2 &= BIT(num, 0); // quadratic term + int b3 = b1 ^ b2; + + accum ^= (b3 << i); + } + + return accum; } *********************/ diff --git a/src/mame/drivers/atarittl.c b/src/mame/drivers/atarittl.c index e21cbdf5fc3..159f3a0bb1a 100644 --- a/src/mame/drivers/atarittl.c +++ b/src/mame/drivers/atarittl.c @@ -2,23 +2,23 @@ Atari / Kee Games Driver - Discrete Games made in the 1970's - + Atari / Kee Games List and Data based, in part from: - + - Andy's collection of Bronzeage Atari Video Arcade PCB's" http://www.andysarcade.net/personal/bronzeage/index.htm - + - "Atari's Technical Manual Log" http://www.atarigames.com/manuals.txt - + Suspected "same games" are grouped together. These are usually the exact same game but different cabinet/name. - - + + Technical Manual #s Game Name(s) Atari Part #'s Data PROM/ROM Chip Numbers -------------------+----------------------------------------------------+----------------------------------+---------+--------------------------------------- TM-025 Anti-Aircraft (1975) A000951 YES 003127 TM-058 Breakout/Breakout Cocktail (1976) A004533 NO - TM-048 Crash 'N Score/Stock Car (1975) A004256 YES 003186(x2), 003187(x2), 004248, 004247 + TM-048 Crash 'N Score/Stock Car (1975) A004256 YES 003186(x2), 003187(x2), 004248, 004247 TM-030 Crossfire (1975) TM-003,005,011,020 Gran Trak 10/Trak 10/Formula K/Race Circuit (1974) A000872,A000872 K3RT YES 74186 Racetrack Prom (K5) TM-004,021 Gran Trak 20/Trak 20/Twin Racer (1974) A001791(RT20),A001793(A20-K4DRTA) YES 74186 Racetrack prom (K5) @@ -33,7 +33,7 @@ TM-040 Outlaw (1976) A003213 YES 003323 - ROM (8205 @ J4) TM-007 Pin Pong (1974) A001660 NO TM-013 Pong/Super Pong (1972) A001433,A000423 NO - TM-015 Pong Cocktail (1974) NO + TM-015 Pong Cocktail (1974) NO TM-014 Pong Doubles/Coupe Davis (1974) A000785 NO TM-018 Pursuit (1975) K8P-B 90128 NO TM-012,022,034 Quadrapong/Elimination (1974) A000845 NO @@ -46,13 +46,13 @@ TM-057 Stunt Cycle (1976) A004128 YES 004275 ROM Motorcycle/Bus (1F), 004811 ROM Score Translator (D7) TM-010,036,049 Tank/Tank Cocktail/Tank II (1974/1975) A003111 (K5T-F 90124) YES 90-2006 TM-002 Touch Me (1974) NO - + - Not Known to be released or produced, but at least announced. - + TM-024 Qwakers (Not Produced/Released) TM-017 World Cup Football (Not Produced/Released) - - + + ***************************************************************************/ @@ -94,39 +94,39 @@ class atarikee_state : public driver_device public: atarikee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(atarikee) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, atarikee_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, atarikee_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -147,7 +147,7 @@ void atarikee_state::video_start() static MACHINE_CONFIG_START( atarikee, atarikee_state ) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) + MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) MCFG_NETLIST_SETUP(atarikee) /* video hardware */ @@ -309,15 +309,15 @@ ROM_START( tank ) ROM_END -/* // NO DUMPED ROMS +/* // NO DUMPED ROMS // Astroturf ROM_START( astrotrf ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION( 0x0400, "gfx", ROMREGION_ERASE00 ) // Region Size unknown, dump size unknown - ROM_LOAD( "003774.c8", 0x0000, 0x0100, NO_DUMP ) // Bugle - ROM_LOAD( "003773-02.c4", 0x0100, 0x0100, NO_DUMP ) // Graphics (Astroturf - Rev.A) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION( 0x0400, "gfx", ROMREGION_ERASE00 ) // Region Size unknown, dump size unknown + ROM_LOAD( "003774.c8", 0x0000, 0x0100, NO_DUMP ) // Bugle + ROM_LOAD( "003773-02.c4", 0x0100, 0x0100, NO_DUMP ) // Graphics (Astroturf - Rev.A) ROM_END // Crossfire @@ -327,91 +327,91 @@ ROM_END // Gran Trak 10 ROM_START( gtrak10 ) // Unknown size, assumed 2K Bytes - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION( 0x0800, "racetrack", ROMREGION_ERASE00 ) - ROM_LOAD( "74168.k5", 0x0000, 0x0800, NO_DUMP) // Racetrack + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION( 0x0800, "racetrack", ROMREGION_ERASE00 ) + ROM_LOAD( "74168.k5", 0x0000, 0x0800, NO_DUMP) // Racetrack ROM_END - + // Gran Trak 20 ROM_START( gtrak20 ) // Unknown size, assumed 2K Bytes - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION( 0x0800, "racetrack", ROMREGION_ERASE00 ) - ROM_LOAD( "74168.k5", 0x0000, 0x0800, NO_DUMP) // Racetrack + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION( 0x0800, "racetrack", ROMREGION_ERASE00 ) + ROM_LOAD( "74168.k5", 0x0000, 0x0800, NO_DUMP) // Racetrack ROM_END // LeMans ROM_START( lemans ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION( 0x0400, "gfx", ROMREGION_ERASE00 ) // Region Size unknown, dump size unknown - ROM_LOAD( "005837-01.n5", 0x0000, 0x0100, NO_DUMP ) // Rom 1 - ROM_LOAD( "005838-01.n4", 0x0100, 0x0100, NO_DUMP ) // Rom 2 - ROM_LOAD( "005839-01.n6", 0x0200, 0x0100, NO_DUMP ) // Rom 3 + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION( 0x0400, "gfx", ROMREGION_ERASE00 ) // Region Size unknown, dump size unknown + ROM_LOAD( "005837-01.n5", 0x0000, 0x0100, NO_DUMP ) // Rom 1 + ROM_LOAD( "005838-01.n4", 0x0100, 0x0100, NO_DUMP ) // Rom 2 + ROM_LOAD( "005839-01.n6", 0x0200, 0x0100, NO_DUMP ) // Rom 3 ROM_END - -// Qwak! + +// Qwak! ROM_START( qwak ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION( 0x0200, "gfx", ROMREGION_ERASE00 ) // Region Size unknown, dump size unknown - ROM_LOAD( "37-2530n.k9", 0x0000, 0x0200, NO_DUMP ) // Custom Rom (2530 N) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION( 0x0200, "gfx", ROMREGION_ERASE00 ) // Region Size unknown, dump size unknown + ROM_LOAD( "37-2530n.k9", 0x0000, 0x0200, NO_DUMP ) // Custom Rom (2530 N) ROM_END - + */ -/* // 100% TTL - NO ROMS - +/* // 100% TTL - NO ROMS + ROM_START( breakout ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( goal4 ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( gotcha ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( gotchac ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( highway ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( pinpong ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( pongdbl ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( pursuit ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( quadpong ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( rebound ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( spacrace ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END ROM_START( touchme ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END - + */ diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 30a88288135..ed8cc5159a7 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -335,7 +335,7 @@ static MACHINE_CONFIG_START( atetris, atetris_state ) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(RRRGGGBB) - + MCFG_SCREEN_ADD("screen", RASTER) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 8629751d0f4..03ebcb3fe66 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -526,11 +526,11 @@ static MACHINE_CONFIG_START( backfire, backfire_state ) MCFG_SCREEN_PALETTE("palette") - MCFG_DECO16IC_ADD("tilegen1", backfire_deco16ic_tilegen1_intf) + MCFG_DECO16IC_ADD("tilegen1", backfire_deco16ic_tilegen1_intf) MCFG_DECO16IC_SET_SCREEN("lscreen") MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", backfire_deco16ic_tilegen2_intf) MCFG_DECO16IC_SET_SCREEN("lscreen") MCFG_DECO16IC_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/bailey.c b/src/mame/drivers/bailey.c index 952053b6cf2..37b2e53b712 100644 --- a/src/mame/drivers/bailey.c +++ b/src/mame/drivers/bailey.c @@ -1,9 +1,9 @@ /*************************************************************************** - + Bailey International discrete hardware games - + Fun Four (1976) - + ***************************************************************************/ @@ -43,38 +43,38 @@ class bailey_state : public driver_device public: bailey_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(bailey) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -104,9 +104,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 2471e476371..82a9c377b86 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -253,7 +253,7 @@ static MACHINE_CONFIG_START( battlnts, battlnts_state ) MCFG_K007342_GFXNUM(0) MCFG_K007342_CALLBACK_OWNER(battlnts_state, battlnts_tile_callback) MCFG_K007342_GFXDECODE("gfxdecode") - + MCFG_K007420_ADD("k007420") MCFG_K007420_BANK_LIMIT(0x3ff) MCFG_K007420_CALLBACK_OWNER(battlnts_state, battlnts_sprite_callback) diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c index d2319b6cb40..2699a76973b 100644 --- a/src/mame/drivers/beathead.c +++ b/src/mame/drivers/beathead.c @@ -377,7 +377,7 @@ static MACHINE_CONFIG_START( beathead, beathead_state ) MCFG_SCREEN_SIZE(42*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 0*8, 30*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 32768) /* sound hardware */ diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c index 0ba261cdaf7..a152b7dcfc6 100644 --- a/src/mame/drivers/big10.c +++ b/src/mame/drivers/big10.c @@ -159,12 +159,12 @@ ADDRESS_MAP_END static INPUT_PORTS_START( big10 ) PORT_START("SYSTEM") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_TOGGLE /* Service Mode */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_TOGGLE /* Service Mode */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_R) PORT_NAME("Reset") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W) PORT_NAME("Payout") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // in test mode, go to the game whilst keep pressed. - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // in test mode, go to the game whilst keep pressed. + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // in test mode, go to the game whilst keep pressed. + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // in test mode, go to the game whilst keep pressed. PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2) diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index d2a232904b8..6d1e8824792 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -329,7 +329,7 @@ static ADDRESS_MAP_START( blackt96_map, AS_PROGRAM, 16, blackt96_state ) AM_RANGE(0x207000, 0x207fff) AM_RAM_WRITE(bg_videoram7_w) AM_SHARE("spriteram7") - AM_RANGE(0x400000, 0x400fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") + AM_RANGE(0x400000, 0x400fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0xc00000, 0xc03fff) AM_RAM // main ram ADDRESS_MAP_END diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index a9f5ad84c77..997222c88f2 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -334,12 +334,12 @@ static MACHINE_CONFIG_START( bladestl, bladestl_state ) MCFG_K007342_GFXNUM(0) MCFG_K007342_CALLBACK_OWNER(bladestl_state, bladestl_tile_callback) MCFG_K007342_GFXDECODE("gfxdecode") - + MCFG_K007420_ADD("k007420") MCFG_K007420_BANK_LIMIT(0x3ff) - MCFG_K007420_CALLBACK_OWNER(bladestl_state, bladestl_sprite_callback) + MCFG_K007420_CALLBACK_OWNER(bladestl_state, bladestl_sprite_callback) MCFG_K007420_PALETTE("palette") - + MCFG_K051733_ADD("k051733") /* sound hardware */ diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 98bfb1b2600..0f33ea103e8 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -363,7 +363,7 @@ static MACHINE_CONFIG_START( blmbycar, blmbycar_state ) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0x100-1) MCFG_SCREEN_UPDATE_DRIVER(blmbycar_state, screen_update_blmbycar) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", blmbycar) MCFG_PALETTE_ADD("palette", 0x300) diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index a0f7c052eb0..fdec1f4d9fa 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -187,7 +187,7 @@ void blockhl_state::machine_start() m_paletteram.resize(m_palette->entries() * 2); m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - + save_item(NAME(m_paletteram)); save_item(NAME(m_palette_selected)); save_item(NAME(m_rombank)); diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c index ab826c5fd1f..1dd41ca3e63 100644 --- a/src/mame/drivers/bloodbro.c +++ b/src/mame/drivers/bloodbro.c @@ -472,7 +472,7 @@ static MACHINE_CONFIG_START( bloodbro, bloodbro_state ) MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(bloodbro_state, layer_en_w)) MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(bloodbro_state, layer_scroll_w)) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", bloodbro) MCFG_PALETTE_ADD("palette", 2048) diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index bd47378458e..f3931a93e5e 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -183,7 +183,7 @@ static MACHINE_CONFIG_START( blstroid, blstroid_state ) /* video hardware */ MCFG_GFXDECODE_ADD("gfxdecode", "palette", blstroid) - + MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 5bd7479990e..b6a1e0d74c5 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -326,7 +326,7 @@ static ADDRESS_MAP_START( bmcbowl_mem, AS_PROGRAM, 16, bmcbowl_state ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x090000, 0x090001) AM_WRITE(bmc_RAMDAC_offset_w) AM_SHARE("colorram") - AM_RANGE(0x090002, 0x090003) AM_WRITE(bmc_RAMDAC_color_w) + AM_RANGE(0x090002, 0x090003) AM_WRITE(bmc_RAMDAC_color_w) AM_RANGE(0x090004, 0x090005) AM_WRITENOP//RAMDAC AM_RANGE(0x090800, 0x090803) AM_WRITENOP @@ -489,7 +489,7 @@ static MACHINE_CONFIG_START( bmcbowl, bmcbowl_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - + MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz ) // guessed chip type, clock not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c index 970e150f9b9..4b4e3359823 100644 --- a/src/mame/drivers/bmcpokr.c +++ b/src/mame/drivers/bmcpokr.c @@ -242,7 +242,7 @@ static MACHINE_CONFIG_START( bmcpokr, bmcpokr_state ) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 256) MCFG_GFXDECODE_ADD("gfxdecode", "palette", bmcpokr) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index ac1dfb6ce00..3ae58ee313a 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -1259,7 +1259,7 @@ static ADDRESS_MAP_START( bnstars_map, AS_PROGRAM, 32, bnstars_state ) AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_RANGE(0xfc800000, 0xfc800003) AM_WRITE(ms32_sound_w) - + AM_RANGE(0xfcc00004, 0xfcc00007) AM_READ(bnstars1_r ) AM_RANGE(0xfcc00008, 0xfcc0000b) AM_READ_PORT("IN4") AM_RANGE(0xfcc00010, 0xfcc00013) AM_READ_PORT("IN5") @@ -1282,7 +1282,7 @@ static ADDRESS_MAP_START( bnstars_map, AS_PROGRAM, 32, bnstars_state ) AM_RANGE(0xfce00e00, 0xfce00e03) AM_WRITE(bnstars1_mahjong_select_w) // ? AM_RANGE(0xfd000000, 0xfd000003) AM_READ(ms32_sound_r) - + /* wrote together */ AM_RANGE(0xfd040000, 0xfd047fff) AM_RAM // priority ram AM_RANGE(0xfd080000, 0xfd087fff) AM_RAM diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 4e53f11b885..d08182e2603 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -364,7 +364,7 @@ static MACHINE_CONFIG_START( boogwing, boogwing_state ) MCFG_DECO16IC_ADD("tilegen1", boogwing_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", boogwing_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") diff --git a/src/mame/drivers/bowltry.c b/src/mame/drivers/bowltry.c index fc23c93b9c0..33269117ffb 100644 --- a/src/mame/drivers/bowltry.c +++ b/src/mame/drivers/bowltry.c @@ -1,27 +1,27 @@ /************************************************************************************************************ - Bowling Try + Bowling Try - (c)200? Atlus + (c)200? Atlus - TODO: - - Tight loops at 0x60e090-0x60e093, control status from video chip? - - YGV631-B ... what's that? + TODO: + - Tight loops at 0x60e090-0x60e093, control status from video chip? + - YGV631-B ... what's that? - ATLUS PCB BT-208001 - ------------------------ + ATLUS PCB BT-208001 + ------------------------ - At U12 the chip is Toshiba TA8428FG + At U12 the chip is Toshiba TA8428FG - At U1 the chip is H8/3008 + At U1 the chip is H8/3008 - At X1 on the crystal it is printed S753 + At X1 on the crystal it is printed S753 - big gfx chip marked + big gfx chip marked - YAMAHA JAPAN - YGV631-B - 0806LU004 + YAMAHA JAPAN + YGV631-B + 0806LU004 ************************************************************************************************************/ @@ -94,7 +94,7 @@ UINT32 bowltry_state::screen_update_bowltry(screen_device &screen, bitmap_rgb32 static MACHINE_CONFIG_START( bowltry, bowltry_state ) MCFG_CPU_ADD("maincpu", H83008, 16000000 ) MCFG_CPU_PROGRAM_MAP( bowltry_map ) -// MCFG_CPU_VBLANK_INT_DRIVER("screen", bowltry_state, irq0_line_hold) // uses vector $64, IMIAB according to the manual (timer/compare B, internal to the CPU) +// MCFG_CPU_VBLANK_INT_DRIVER("screen", bowltry_state, irq0_line_hold) // uses vector $64, IMIAB according to the manual (timer/compare B, internal to the CPU) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 6ad36a8363a..09518f12ec0 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -51,7 +51,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_READ8_MEMBER(boxer_input_r); DECLARE_READ8_MEMBER(boxer_misc_r); DECLARE_WRITE8_MEMBER(boxer_bell_w); @@ -180,7 +180,7 @@ void boxer_state::draw_boxer( bitmap_ind16 &bitmap, const rectangle &cliprect ) code = p[32 * l + 4 * i + j]; - + m_gfxdecode->gfx(n)->transpen(bitmap,cliprect, code, 0, @@ -190,7 +190,7 @@ void boxer_state::draw_boxer( bitmap_ind16 &bitmap, const rectangle &cliprect ) code = p[32 * r + 4 * i - j + 3]; - + m_gfxdecode->gfx(n)->transpen(bitmap,cliprect, code, 0, @@ -215,7 +215,7 @@ UINT32 boxer_state::screen_update_boxer(screen_device &screen, bitmap_ind16 &bit { UINT8 code = m_tile_ram[32 * i + j]; - + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, 0, diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index e4ed1ed99c0..a458e757e30 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -1319,7 +1319,7 @@ static MACHINE_CONFIG_START( btime, btime_state ) MCFG_MACHINE_RESET_OVERRIDE(btime_state,btime) MCFG_GFXDECODE_ADD("gfxdecode", "palette", btime) - + MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(btime_state,btime) MCFG_PALETTE_FORMAT(BBGGGRRR) diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index 1779fc2f6cc..2e5c8923b4c 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( bzone_base, bzone_state ) MCFG_SCREEN_VISIBLE_AREA(0, 580, 0, 400) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) - MCFG_DEVICE_ADD("avg", AVG_BZONE, 0) + MCFG_DEVICE_ADD("avg", AVG_BZONE, 0) MCFG_AVGDVG_VECTOR("vector") /* Drivers */ diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index 5c1ed9e68e4..39748ce1e2a 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -473,7 +473,7 @@ static MACHINE_CONFIG_START( cabal, cabal_state ) MCFG_SCREEN_REFRESH_RATE(59.60) /* verified on pcb */ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(256, 256) - MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(cabal_state, screen_update_cabal) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index 84255193866..dbd018c280a 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -2682,7 +2682,7 @@ static MACHINE_CONFIG_DERIVED( s903mod, sys903 ) MCFG_SOUND_CONFIG(sys905_ay8912_intf) MCFG_DEVICE_REMOVE("acia6850_0") - + MCFG_DEVICE_REMOVE("aciabaud") MACHINE_CONFIG_END @@ -2706,7 +2706,7 @@ static MACHINE_CONFIG_DERIVED( sys905, sys903 ) MCFG_SOUND_CONFIG(sys905_ay8912_intf) MCFG_DEVICE_REMOVE("acia6850_0") - + MCFG_DEVICE_REMOVE("aciabaud") MACHINE_CONFIG_END @@ -2738,7 +2738,7 @@ static MACHINE_CONFIG_DERIVED( sys906, sys903 ) MCFG_SOUND_CONFIG(sys906_ay8912_intf) MCFG_DEVICE_REMOVE("acia6850_0") - + MCFG_DEVICE_REMOVE("aciabaud") MACHINE_CONFIG_END @@ -3879,7 +3879,7 @@ DRIVER_INIT_MEMBER(calomega_state,comg080) BPR[x] = 0x04; /* blue background */ } m_palette->update(); - + /* Injecting missing Start and NMI vectors... Start = $2042; NMI = $26f8; Also a fake vector at $3ff8-$3ff9. The code checks these values to continue. diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index caa69b91674..e5221990640 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START( carrera, carrera_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", carrera) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(carrera_state, carrera) - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cavepc.c b/src/mame/drivers/cavepc.c index d47e21c302b..01caa590556 100644 --- a/src/mame/drivers/cavepc.c +++ b/src/mame/drivers/cavepc.c @@ -134,8 +134,8 @@ DRIVER_INIT_MEMBER(cavepc_state,cavepc) Deathshmiles II (2009/10/14 MASTER VER 4.00) -CAVE's venture into PC based hardware platforms. The game did not -sell that well and was plagued by BSODs and hardware issues. The +CAVE's venture into PC based hardware platforms. The game did not +sell that well and was plagued by BSODs and hardware issues. The motherboard bios version that shipped out with the game is F2 on a Gigabyte GA-MA78GPM-UD2H board ( http://www.gigabyte.com/products/product-page.aspx?pid=3016#ov ) @@ -143,13 +143,13 @@ a Gigabyte GA-MA78GPM-UD2H board The following versions are known to have existed. 1.00 - released 2009/05/14 -2.00 +2.00 3.00 - sometimes scrolls the text "2ND UPDATE MASTER VER 3.00" at the bottom of the title screen The archive contains the following: -./images, documentaiton +./images, documentaiton ./cf_card_2gb, a dd image of the 2GB CF FLASH card ./usb_drive, the game is updated using a USB drive and will not start if it is not present diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index c94235b1364..cfc79c03112 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -36,7 +36,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(cball_vram_w); DECLARE_READ8_MEMBER(cball_wram_r); DECLARE_WRITE8_MEMBER(cball_wram_w); diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 31ae2d875dd..7e797c4c8b1 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -322,7 +322,7 @@ static MACHINE_CONFIG_START( twocrude, cbuster_state ) MCFG_DECO16IC_ADD("tilegen1", twocrude_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", twocrude_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") diff --git a/src/mame/drivers/cd32.c b/src/mame/drivers/cd32.c index e63dce5964a..4cee7e3516c 100644 --- a/src/mame/drivers/cd32.c +++ b/src/mame/drivers/cd32.c @@ -864,7 +864,7 @@ CONS( 1993, cd32, 0, 0, cd32, cd32, cd32_state, cd32, "Commo Harem Challenge | | 1995 Laser Quiz | | 1995 Laser Quiz 2 "Italy" | 1.0 | 1995 - Laser Strixx | | 1995 + Laser Strixx | | 1995 Laser Strixx 2 | | 1995 Magic Premium | 1.1 | 1996 Laser Quiz France | 1.0 | 1995 diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 833d31b6694..a8ea4683b5a 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -2052,7 +2052,7 @@ ROM_START( magworm ) ROM_END -ROM_START( magworma ) +ROM_START( magworma ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "h41.1d", 0x2000, 0x0800, CRC(773a3da6) SHA1(577ae0578231df83a768d6a50b86dcaf715a32d7) ) ROM_LOAD( "h42.1e", 0x2800, 0x0800, CRC(482c7808) SHA1(6d274a988e603d33131cb6ffbfe2cdd22fabf25b) ) diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 1def5112668..7c4d7b4f272 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -84,7 +84,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(chanbara_videoram_w); DECLARE_WRITE8_MEMBER(chanbara_colorram_w); DECLARE_WRITE8_MEMBER(chanbara_videoram2_w); diff --git a/src/mame/drivers/chicago.c b/src/mame/drivers/chicago.c index 7b96653d05b..e5525a483c2 100644 --- a/src/mame/drivers/chicago.c +++ b/src/mame/drivers/chicago.c @@ -1,9 +1,9 @@ /*************************************************************************** - + Chicago Coin discrete hardware games - + Game Name Model # - ----------------------------------------- + ----------------------------------------- Demolition Derby (1976) #466 Super Flipper (1975) #458 Olympic TV Football (1973) #429-A @@ -12,7 +12,7 @@ TV Ping Pong (1973) #424 TV Pin Game (1975) #451 TV Tennis (1973) #427 - + ***************************************************************************/ @@ -52,38 +52,38 @@ class chicago_state : public driver_device public: chicago_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(chicago) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -113,9 +113,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 8a58a59295e..ad3381ed22d 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -300,7 +300,7 @@ void chqflag_state::machine_start() m_paletteram.resize(m_palette->entries() * 2); m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - + save_item(NAME(m_paletteram)); save_item(NAME(m_k051316_readroms)); save_item(NAME(m_last_vreg)); diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 60308e0c971..c085769f87e 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -120,7 +120,7 @@ public: TIMER_CALLBACK_MEMBER(cliff_irq_callback); required_device m_maincpu; required_device m_discrete; - required_device m_screen; + required_device m_screen; }; diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index 8a2573f64ac..159cf242085 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( cmmb, cmmb_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cmmb) - + MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRGGGBB) diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index f4ea22b00bb..73b32d5ee27 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -960,7 +960,7 @@ static MACHINE_CONFIG_START( cninja, cninja_state ) MCFG_DECO16IC_ADD("tilegen1", cninja_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", cninja_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1028,7 +1028,7 @@ static MACHINE_CONFIG_START( stoneage, cninja_state ) MCFG_DECO16IC_ADD("tilegen1", cninja_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", cninja_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1091,7 +1091,7 @@ static MACHINE_CONFIG_START( cninjabl, cninja_state ) MCFG_DECO16IC_ADD("tilegen1", cninja_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", cninja_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1141,7 +1141,7 @@ static MACHINE_CONFIG_START( edrandy, cninja_state ) MCFG_DECO16IC_ADD("tilegen1", edrandy_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", edrandy_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1206,7 +1206,7 @@ static MACHINE_CONFIG_START( robocop2, cninja_state ) MCFG_DECO16IC_ADD("tilegen1", robocop2_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", robocop2_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1276,7 +1276,7 @@ static MACHINE_CONFIG_START( mutantf, cninja_state ) MCFG_DECO16IC_ADD("tilegen1", mutantf_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", mutantf_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index cb3824b6a20..066df5cf216 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -73,7 +73,7 @@ public: required_device m_subcpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(zerotrgt_vregs_w); DECLARE_WRITE8_MEMBER(cntsteer_vregs_w); DECLARE_WRITE8_MEMBER(cntsteer_foreground_vram_w); diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c index 4cdd2d1a108..82e32af7553 100644 --- a/src/mame/drivers/cobra.c +++ b/src/mame/drivers/cobra.c @@ -624,7 +624,7 @@ public: required_device m_ata; required_device m_screen; required_device m_palette; - + DECLARE_READ64_MEMBER(main_comram_r); DECLARE_WRITE64_MEMBER(main_comram_w); DECLARE_READ64_MEMBER(main_fifo_r); diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index b0fcf0650d1..dfa72df9db2 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -18,9 +18,9 @@ Technical notes.... - + There are at least 2 different boards. - + A) Unknown, with 2x 6264 RAM, mapped $C000-$DFFF and $E000-$FFFF. B) 'PCB-001-POK', with 3x 6116 RAM, mapped $E000-$E7FF, $E800-$EFFF, and $F000-$F7FF. @@ -40,7 +40,7 @@ AY-3-8912 --------- - + - IO pins connected to DIP switches bank. - Data pin connected to CPU data pin. - BC1 goes to PAL IC12 pin 12 @@ -50,7 +50,7 @@ PIAs ---- - + PIA0 (IC24) Port A --> Input. PIA0 (IC24) Port B --> Output. @@ -58,15 +58,15 @@ PB0 to PB6 go to ULN2003 (IC19) then on PCB connector. PB7 goes to ULM2003 (IC40) pin 1 then on PCB connector. - + PIA1 (IC39) Port A --> Output. PIA1 (IC39) Port B --> Output. PA0-PA7 go to 22 KOhm resistor, then a "pull up" capacitor, and then into the base of a transistor. - Collector connected to +5V, emitter is the output (1 KOhm pulldown), it goes into an ULN2803 - and then to PCB connector. 3 of that transistors outputs (input of the ULN) are connected - together and connected to another circuit that generate 2 more outputs on PCB connector. - (them seem unused no solder on the pcb connector) + Collector connected to +5V, emitter is the output (1 KOhm pulldown), it goes into an ULN2803 + and then to PCB connector. 3 of that transistors outputs (input of the ULN) are connected + together and connected to another circuit that generate 2 more outputs on PCB connector. + (them seem unused no solder on the pcb connector) PB0 to PB6 goes to ULN2003 (IC34) then on PCB connector. PB7 goes to ULM2003 (IC40) pin 2 then on PCB connector. @@ -78,7 +78,7 @@ PB0 to PB6 go to ULN2003 (IC31) then on PCB connector. PB7 goes to ULM2003 (IC40) pin 3 then on PCB connector. - + ==================================================================================== Notes by game.... @@ -91,7 +91,7 @@ DIP switch #1 changes the minimal hand between "Jacks or Better" and "Pair of Aces". - + There are two bookkeeping modes. I think these are for different levels like operator and manager/supervisor. With the DIP switch #4 you can switch between them. Is possible that this input would be meant to be @@ -114,7 +114,7 @@ Pressing DEAL/START, you can get the winning hands, occurence of spades, diamonds, clubs and hearts. also number of jokers dealt. - + With DIP switch #8 ON, you can enter a sort of test mode, where you can set the cards using the HOLD buttons, and test the winning hands. @@ -335,7 +335,7 @@ ADDRESS_MAP_END /* 2x 6462 hardware C000-DFFF & E000-FFFF */ static ADDRESS_MAP_START( jpcoin_map, AS_PROGRAM, 8, coinmstr_state ) AM_RANGE(0x0000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xdfff) AM_RAM /* 2x 6462 hardware */ + AM_RANGE(0xc000, 0xdfff) AM_RAM /* 2x 6462 hardware */ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(quizmstr_bg_w) AM_SHARE("videoram") AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(quizmstr_attr1_w) AM_SHARE("attr_ram1") AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(quizmstr_attr2_w) AM_SHARE("attr_ram2") @@ -345,7 +345,7 @@ ADDRESS_MAP_END /* 3x 6116 hardware E000-E800, E800-EFFF & F000-F7FF */ static ADDRESS_MAP_START( jpcoin2_map, AS_PROGRAM, 8, coinmstr_state ) AM_RANGE(0x0000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xdfff) AM_RAM /* only for the 2x 6462 hardware */ + AM_RANGE(0xc000, 0xdfff) AM_RAM /* only for the 2x 6462 hardware */ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(quizmstr_bg_w) AM_SHARE("videoram") AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(quizmstr_attr1_w) AM_SHARE("attr_ram1") AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(quizmstr_attr2_w) AM_SHARE("attr_ram2") @@ -486,7 +486,7 @@ E0-E1 CRTC AM_RANGE(0xc8, 0xcb) AM_DEVREADWRITE("pia0", pia6821_device, read, write) /* confirmed */ AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE("pia1", pia6821_device, read, write) AM_RANGE(0xd8, 0xdb) AM_DEVREADWRITE("pia2", pia6821_device, read, write) /* confirmed */ -// AM_RANGE(0xc0, 0xc1) AM_READ(ff_r) /* needed to boot */ +// AM_RANGE(0xc0, 0xc1) AM_READ(ff_r) /* needed to boot */ AM_RANGE(0xc4, 0xc4) AM_READ(ff_r) /* needed to boot */ ADDRESS_MAP_END @@ -820,12 +820,12 @@ static INPUT_PORTS_START( trailblz ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static INPUT_PORTS_START( supnudg2 ) /* need to find the button 'B' to be playable */ +static INPUT_PORTS_START( supnudg2 ) /* need to find the button 'B' to be playable */ PORT_START("PIA0.A") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("1 Pound (5 credits)") // coin x 5 - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("50 Pence (2.5 credits)") // coin x 2.5 - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("20 Pence (1 credit)") // coin x 1 - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_NAME("10 Pence (0.5 credit)") // coin x 0.5 + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("1 Pound (5 credits)") // coin x 5 + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("50 Pence (2.5 credits)") // coin x 2.5 + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("20 Pence (1 credit)") // coin x 1 + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_NAME("10 Pence (0.5 credit)") // coin x 0.5 PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("PIA0.A_0x10") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("PIA0.A_0x20") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D) PORT_NAME("PIA0.A_0x40") @@ -992,14 +992,14 @@ static INPUT_PORTS_START( pokeroul ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) -/* PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) +/* PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) */ PORT_START("PIA2.B") PORT_DIPNAME( 0x01, 0x01, "PIA2.B" ) @@ -1525,14 +1525,14 @@ static MACHINE_CONFIG_DERIVED( jpcoin, coinmstr ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jpcoin_map) MCFG_CPU_IO_MAP(jpcoin_io_map) -// MCFG_NVRAM_ADD_0FILL("attr_ram3") +// MCFG_NVRAM_ADD_0FILL("attr_ram3") MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( jpcoin2, coinmstr ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jpcoin2_map) MCFG_CPU_IO_MAP(jpcoin2_io_map) -// MCFG_NVRAM_ADD_0FILL("attr_ram3") +// MCFG_NVRAM_ADD_0FILL("attr_ram3") MACHINE_CONFIG_END /* @@ -1691,23 +1691,23 @@ ROM_END /* Looks like the 2x 6264, since checks C000-DFFF - + BP 1D0 (PIAS init) BP 1102 (calls) - + Output C0 Input C1 - + Input C8 Output C9 (masked) Output CA - + Input D0 Output D1 Output D2 Input D3 Output DA - + Output E0 CRTC Output E1 CRTC @@ -1753,8 +1753,8 @@ ROM_START( jpcoin2 ) ROM_LOAD( "jp88-1.ic9", 0x0000, 0x4000, CRC(60d31daf) SHA1(204537887388f1a174d1a09331186182be31e8ee) ) ROM_REGION( 0x4000, "gfx1", 0 ) - ROM_LOAD( "jp88-3.ic45", 0x0000, 0x2000, CRC(f2f92a7e) SHA1(ce6f6fd5af0049269357527650b51a1016caf636) ) - ROM_LOAD( "jp88-2.ic41", 0x2000, 0x2000, CRC(57db61b2) SHA1(a3bc2056866cbb9fdca52e62f2ff4a952d1d7484) ) + ROM_LOAD( "jp88-3.ic45", 0x0000, 0x2000, CRC(f2f92a7e) SHA1(ce6f6fd5af0049269357527650b51a1016caf636) ) + ROM_LOAD( "jp88-2.ic41", 0x2000, 0x2000, CRC(57db61b2) SHA1(a3bc2056866cbb9fdca52e62f2ff4a952d1d7484) ) ROM_END diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index ff475a3819a..fc5e80a9138 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -3546,7 +3546,7 @@ void coolridr_state::machine_reset() WRITE8_MEMBER(coolridr_state::scsp_irq) { - m_soundcpu->set_input_line(offset, data); + m_soundcpu->set_input_line(offset, data); } WRITE_LINE_MEMBER(coolridr_state::scsp1_to_sh1_irq) diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index da8b0a78beb..cc7624d910b 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -951,10 +951,10 @@ static INPUT_PORTS_START( ghoulsu ) PORT_DIPSETTING( 0x30, "30K, 60K and every 70K" ) PORT_DIPSETTING( 0x00, "40K, 70K and every 80K" ) /* Manuals states the following bonus settings - PORT_DIPSETTING( 0x20, "20K, 50K and every 70K" ) - PORT_DIPSETTING( 0x10, "10K, 30K and every 30K" ) - PORT_DIPSETTING( 0x30, "40K, 70K and every 80K" ) - PORT_DIPSETTING( 0x00, "30K, 60K and every 70K" ) + PORT_DIPSETTING( 0x20, "20K, 50K and every 70K" ) + PORT_DIPSETTING( 0x10, "10K, 30K and every 30K" ) + PORT_DIPSETTING( 0x30, "40K, 70K and every 80K" ) + PORT_DIPSETTING( 0x00, "30K, 60K and every 70K" ) */ /* Debug Dip Switches */ PORT_DIPNAME( 0x07, 0x07, "Starting Weapon" ) PORT_CONDITION("DSWC", 0x80, EQUALS, 0x00) PORT_DIPLOCATION("SW(B):1,2,3") @@ -1077,11 +1077,11 @@ static INPUT_PORTS_START( strider ) PORT_DIPSETTING( 0x20, "30K, 50K then every 70K" ) PORT_DIPSETTING( 0x10, "20K & 60K only" ) PORT_DIPSETTING( 0x00, "30K & 60K only" ) -/* According to manual, these are the proper settings - PORT_DIPSETTING( 0x30, "40K, 70K then every 80K" ) - PORT_DIPSETTING( 0x20, "20K, 50K then every 70K" ) - PORT_DIPSETTING( 0x10, "10k, 30k then every 30k" ) - PORT_DIPSETTING( 0x00, "30K, 60k then every 70k" ) +/* According to manual, these are the proper settings + PORT_DIPSETTING( 0x30, "40K, 70K then every 80K" ) + PORT_DIPSETTING( 0x20, "20K, 50K then every 70K" ) + PORT_DIPSETTING( 0x10, "10k, 30k then every 30k" ) + PORT_DIPSETTING( 0x00, "30K, 60k then every 70k" ) */ PORT_DIPNAME( 0xc0, 0x80, "Internal Diff. on Life Loss" ) PORT_DIPLOCATION("SW(B):7,8") @@ -8633,10 +8633,10 @@ CPS1 motherboard (no dash) Original 88622-c-2 C board Bootleg B board with - PIC16c55 near PRG roms seem protected - 8 dipswith near both sound roms and gfx roms - 1,4,5,8 ON - 2,3,6,7 OFF + PIC16c55 near PRG roms seem protected + 8 dipswith near both sound roms and gfx roms + 1,4,5,8 ON + 2,3,6,7 OFF Sound rom match various romset */ @@ -8652,7 +8652,7 @@ ROM_START( sf2ceblp ) ROM_LOAD16_BYTE( "prg34.bin", 0x80001, 0x20000, CRC(f06a12f2) SHA1(ddc431ce01392d4a7562760743abd9ea73b06cf3) ) ROM_LOAD16_BYTE( "prg28.bin", 0xc0000, 0x40000, CRC(b7ad5214) SHA1(17b05e0aa9a4eb5f1aaafe35fa029d2a9aea530d) ) ROM_LOAD16_BYTE( "prg33.bin", 0xc0001, 0x40000, CRC(6340b914) SHA1(443e37a06058548c8ce7a15ecd10a6635e69d09f) ) - + ROM_REGION( 0x600000, "gfx", 0 ) ROMX_LOAD( "24.bin", 0x000000, 0x40000, CRC(a8b5633a) SHA1(6548a89d616910d06db126eb1a9c6b5979baff03) , ROM_SKIP(7) ) ROMX_LOAD( "14.bin", 0x000001, 0x40000, CRC(5db24ca7) SHA1(0543e89174fecc866a08e0ecc7c31a6efca15da5) , ROM_SKIP(7) ) @@ -8688,8 +8688,8 @@ ROM_START( sf2ceblp ) ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ ROM_LOAD( "s92_18.bin", 0x00000, 0x20000, CRC(7f162009) SHA1(346bf42992b4c36c593e21901e22c87ae4a7d86d) ) ROM_LOAD( "s92_19.bin", 0x20000, 0x20000, CRC(beade53f) SHA1(277c397dc12752719ec6b47d2224750bd1c07f79) ) - - ROM_REGION( 0x2000, "protectin_pic", 0 ) + + ROM_REGION( 0x2000, "protectin_pic", 0 ) ROM_LOAD( "pic16c55", 0x00000, 0x2000, BAD_DUMP CRC(f22e2311) SHA1(320edfba140728599e91c01e863a8b6d071e4bbf) ) ROM_END diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index 70a901637be..3a922f2f448 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -2583,7 +2583,7 @@ static MACHINE_CONFIG_START( cps3, cps3_state ) MCFG_PALETTE_ADD("palette", 0x10000) // actually 0x20000 ... MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index dcad22be4d0..1ea3af3a366 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -1076,26 +1076,26 @@ DRIVER_INIT_MEMBER(crystal_state,topbladv) { // patches based on analysis of PIC dump UINT16 *Rom = (UINT16*) memregion("user1")->base(); - /* - PIC Protection data: - - RAM ADDR - --PATCH-- - 62 0f 02 02 fc 90 01 90 - 68 6a 02 02 04 90 01 90 - 2c cf 03 02 e9 df c2 c3 - 00 e0 03 02 01 90 00 92 + /* + PIC Protection data: + - RAM ADDR - --PATCH-- + 62 0f 02 02 fc 90 01 90 + 68 6a 02 02 04 90 01 90 + 2c cf 03 02 e9 df c2 c3 + 00 e0 03 02 01 90 00 92 */ - Rom[WORD_XOR_LE(0x12d7a/2)]=0x90FC; //PUSH R7-R6-R5-R4-R3-R2 - Rom[WORD_XOR_LE(0x12d7c/2)]=0x9001; //PUSH R0 + Rom[WORD_XOR_LE(0x12d7a/2)]=0x90FC; //PUSH R7-R6-R5-R4-R3-R2 + Rom[WORD_XOR_LE(0x12d7c/2)]=0x9001; //PUSH R0 - Rom[WORD_XOR_LE(0x18880/2)]=0x9004; //PUSH R2 - Rom[WORD_XOR_LE(0x18882/2)]=0x9001; //PUSH R0 + Rom[WORD_XOR_LE(0x18880/2)]=0x9004; //PUSH R2 + Rom[WORD_XOR_LE(0x18882/2)]=0x9001; //PUSH R0 - Rom[WORD_XOR_LE(0x2fe18/2)]=0x9001; //PUSH R0 - Rom[WORD_XOR_LE(0x2fe1a/2)]=0x9200; //PUSH SR + Rom[WORD_XOR_LE(0x2fe18/2)]=0x9001; //PUSH R0 + Rom[WORD_XOR_LE(0x2fe1a/2)]=0x9200; //PUSH SR - Rom[WORD_XOR_LE(0x2ED44/2)]=0xDFE9; //CALL 0x3cf00 - Rom[WORD_XOR_LE(0x2ED46/2)]=0xC3C2; //MOV %SR0,%DR1 + Rom[WORD_XOR_LE(0x2ED44/2)]=0xDFE9; //CALL 0x3cf00 + Rom[WORD_XOR_LE(0x2ED46/2)]=0xC3C2; //MOV %SR0,%DR1 } @@ -1105,42 +1105,42 @@ DRIVER_INIT_MEMBER(crystal_state,officeye) UINT16 *Rom = (UINT16*) memregion("user1")->base(); /* - PIC Protection data: - - RAM ADDR - --PATCH-- - 0a 83 01 02 1c 90 01 90 - 50 85 01 02 7c 90 01 90 - 4c 99 05 02 04 90 01 90 - 3a c1 01 02 1c 90 01 90 + PIC Protection data: + - RAM ADDR - --PATCH-- + 0a 83 01 02 1c 90 01 90 + 50 85 01 02 7c 90 01 90 + 4c 99 05 02 04 90 01 90 + 3a c1 01 02 1c 90 01 90 */ - Rom[WORD_XOR_LE(0x9c9e/2)]=0x901C; //PUSH R4-R3-R2 - Rom[WORD_XOR_LE(0x9ca0/2)]=0x9001; //PUSH R0 + Rom[WORD_XOR_LE(0x9c9e/2)]=0x901C; //PUSH R4-R3-R2 + Rom[WORD_XOR_LE(0x9ca0/2)]=0x9001; //PUSH R0 - Rom[WORD_XOR_LE(0x9EE4/2)]=0x907C; //PUSH R6-R5-R4-R3-R2 - Rom[WORD_XOR_LE(0x9EE6/2)]=0x9001; //PUSH R0 + Rom[WORD_XOR_LE(0x9EE4/2)]=0x907C; //PUSH R6-R5-R4-R3-R2 + Rom[WORD_XOR_LE(0x9EE6/2)]=0x9001; //PUSH R0 - Rom[WORD_XOR_LE(0x4B2E0/2)]=0x9004; //PUSH R2 - Rom[WORD_XOR_LE(0x4B2E2/2)]=0x9001; //PUSH R0 + Rom[WORD_XOR_LE(0x4B2E0/2)]=0x9004; //PUSH R2 + Rom[WORD_XOR_LE(0x4B2E2/2)]=0x9001; //PUSH R0 - Rom[WORD_XOR_LE(0xDACE/2)]=0x901c; //PUSH R4-R3-R2 - Rom[WORD_XOR_LE(0xDAD0/2)]=0x9001; //PUSH R0 + Rom[WORD_XOR_LE(0xDACE/2)]=0x901c; //PUSH R4-R3-R2 + Rom[WORD_XOR_LE(0xDAD0/2)]=0x9001; //PUSH R0 } DRIVER_INIT_MEMBER(crystal_state, donghaer) { UINT16 *Rom = (UINT16*)memregion("user1")->base(); - Rom[WORD_XOR_LE(0x037A2 / 2)] = 0x9004; // PUSH %R2 - Rom[WORD_XOR_LE(0x037A4 / 2)] = 0x8202; // LD (%SP,0x8),%R2 + Rom[WORD_XOR_LE(0x037A2 / 2)] = 0x9004; // PUSH %R2 + Rom[WORD_XOR_LE(0x037A4 / 2)] = 0x8202; // LD (%SP,0x8),%R2 - Rom[WORD_XOR_LE(0x03834 / 2)] = 0x9001; // PUSH %R0 - Rom[WORD_XOR_LE(0x03836 / 2)] = 0x9200; // PUSH %SR + Rom[WORD_XOR_LE(0x03834 / 2)] = 0x9001; // PUSH %R0 + Rom[WORD_XOR_LE(0x03836 / 2)] = 0x9200; // PUSH %SR - Rom[WORD_XOR_LE(0x0AC9E / 2)] = 0x9004; // PUSH %R2 - Rom[WORD_XOR_LE(0x0ACA0 / 2)] = 0x4081; // LERI 0x81 + Rom[WORD_XOR_LE(0x0AC9E / 2)] = 0x9004; // PUSH %R2 + Rom[WORD_XOR_LE(0x0ACA0 / 2)] = 0x4081; // LERI 0x81 - Rom[WORD_XOR_LE(0x19C70 / 2)] = 0x900C; // PUSH %R2-%R3 - Rom[WORD_XOR_LE(0x19C72 / 2)] = 0x9001; // PUSH %R0 + Rom[WORD_XOR_LE(0x19C70 / 2)] = 0x900C; // PUSH %R2-%R3 + Rom[WORD_XOR_LE(0x19C72 / 2)] = 0x9001; // PUSH %R0 } diff --git a/src/mame/drivers/cswat.c b/src/mame/drivers/cswat.c index 87d3c316ff6..08bd4d8bf83 100644 --- a/src/mame/drivers/cswat.c +++ b/src/mame/drivers/cswat.c @@ -4,7 +4,7 @@ mirrors and motors to move a spotlight(s) on a large projection screen, similar to Namco Shoot Away/Shoot Away II. The CRT is just used for showing status and keeping scores. - + X1 18.432MHz HD68A09EP - Hitachi M6809 CPU 2 * M58725P - Mitsubishi 2KB SRAM @@ -134,13 +134,13 @@ READ8_MEMBER(cswat_state::sensors_r) static ADDRESS_MAP_START( cswat_map, AS_PROGRAM, 8, cswat_state ) AM_RANGE(0x0000, 0x0bff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram") AM_RANGE(0x0c00, 0x0fff) AM_RAM -// AM_RANGE(0x1800, 0x1800) AM_READNOP // ? reads here after writing to $4000 +// AM_RANGE(0x1800, 0x1800) AM_READNOP // ? reads here after writing to $4000 AM_RANGE(0x2000, 0x2000) AM_WRITE(irq_ack_w) // writes 1 at end of vblank irq, 0 at gamestart AM_RANGE(0x2000, 0x2001) AM_READ(dipswitch_r) AM_RANGE(0x2002, 0x2002) AM_WRITE(irq_ack_w) // writes 0 at start of vblank irq AM_RANGE(0x2002, 0x2002) AM_READ(sensors_r) AM_RANGE(0x2003, 0x2003) AM_READ_PORT("IN0") -// AM_RANGE(0x4000, 0x4009) AM_NOP // ? +// AM_RANGE(0x4000, 0x4009) AM_NOP // ? AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c index db436c49732..86cfcb3c9af 100644 --- a/src/mame/drivers/cubeqst.c +++ b/src/mame/drivers/cubeqst.c @@ -44,7 +44,7 @@ public: required_device m_rotatecpu; required_device m_linecpu; required_device m_soundcpu; - required_device m_screen; + required_device m_screen; rgb_t *m_colormap; DECLARE_WRITE16_MEMBER(palette_w); DECLARE_READ16_MEMBER(line_r); diff --git a/src/mame/drivers/cv1k.c b/src/mame/drivers/cv1k.c index c8d732de29c..8e81459533d 100644 --- a/src/mame/drivers/cv1k.c +++ b/src/mame/drivers/cv1k.c @@ -163,7 +163,7 @@ Speedups Blitter Timing - Correct slowdown emulation and flags (depends on blit mode, and speed of RAM) - could do with the recompiler or alt idle skips on the busy flag wait looops - - End of Blit IRQ? (one game has a valid irq routine that looks like it was used for profiling, but nothing depends on it) + - End of Blit IRQ? (one game has a valid irq routine that looks like it was used for profiling, but nothing depends on it) */ @@ -204,16 +204,16 @@ public: INTERRUPT_GEN_MEMBER(cv1k_interrupt); UINT32 screen_update_cv1k(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - + DECLARE_MACHINE_RESET( cv1k ); /* game specific */ - DECLARE_READ64_MEMBER(mushisam_speedup_r); - DECLARE_READ64_MEMBER(mushisama_speedup_r); - DECLARE_READ64_MEMBER(espgal2_speedup_r); - DECLARE_DRIVER_INIT(mushisam); - DECLARE_DRIVER_INIT(mushisama); - DECLARE_DRIVER_INIT(espgal2); + DECLARE_READ64_MEMBER(mushisam_speedup_r); + DECLARE_READ64_MEMBER(mushisama_speedup_r); + DECLARE_READ64_MEMBER(espgal2_speedup_r); + DECLARE_DRIVER_INIT(mushisam); + DECLARE_DRIVER_INIT(mushisama); + DECLARE_DRIVER_INIT(espgal2); }; @@ -237,7 +237,7 @@ UINT32 cv1k_state::screen_update_cv1k(screen_device &screen, bitmap_rgb32 &bitma READ64_MEMBER( cv1k_state::cv1k_flash_port_e_r ) { - return ((m_serflash->flash_ready_r(space, offset) ? 0x20 : 0x00)) | 0xdf; + return ((m_serflash->flash_ready_r(space, offset) ? 0x20 : 0x00)) | 0xdf; } @@ -324,7 +324,7 @@ static ADDRESS_MAP_START( cv1k_map, AS_PROGRAM, 64, cv1k_state ) AM_RANGE(0x10000000, 0x10000007) AM_READWRITE8(cv1k_flash_io_r, cv1k_flash_io_w, U64(0xffffffffffffffff)) AM_RANGE(0x10400000, 0x10400007) AM_DEVWRITE8("ymz770", ymz770_device, write, U64(0xffffffffffffffff)) AM_RANGE(0x10C00000, 0x10C00007) AM_READWRITE8(serial_rtc_eeprom_r, serial_rtc_eeprom_w, U64(0xffffffffffffffff)) -// AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset +// AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset AM_RANGE(0xf0000000, 0xf0ffffff) AM_RAM // mem mapped cache (sh3 internal?) ADDRESS_MAP_END @@ -334,7 +334,7 @@ static ADDRESS_MAP_START( cv1k_d_map, AS_PROGRAM, 64, cv1k_state ) AM_RANGE(0x10000000, 0x10000007) AM_READWRITE8(cv1k_flash_io_r, cv1k_flash_io_w, U64(0xffffffffffffffff)) AM_RANGE(0x10400000, 0x10400007) AM_DEVWRITE8("ymz770", ymz770_device, write, U64(0xffffffffffffffff)) AM_RANGE(0x10C00000, 0x10C00007) AM_READWRITE8(serial_rtc_eeprom_r, serial_rtc_eeprom_w, U64(0xffffffffffffffff)) -// AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset +// AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset AM_RANGE(0xf0000000, 0xf0ffffff) AM_RAM // mem mapped cache (sh3 internal?) ADDRESS_MAP_END @@ -349,7 +349,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( cv1k ) - PORT_START("DSW") // 18000050.l (18000050.b + 3 i.e. MSB + 3, is shown as DIPSW) + PORT_START("DSW") // 18000050.l (18000050.b + 3 i.e. MSB + 3, is shown as DIPSW) // PORT_BIT( 0xfcfffffc, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_DIPNAME( 0x00000002, 0x00000000, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( Off ) ) @@ -357,9 +357,9 @@ static INPUT_PORTS_START( cv1k ) PORT_SERVICE( 0x00000001, IP_ACTIVE_HIGH ) PORT_START("PORT_C") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) // Service coin - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // Test button copied here - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) // IMPLEMENT COIN ERROR! + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) // Service coin + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // Test button copied here + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) // IMPLEMENT COIN ERROR! PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) @@ -376,10 +376,10 @@ static INPUT_PORTS_START( cv1k ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_START("PORT_F") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) // Test Push Button + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) // Test Push Button PORT_BIT( 0xfd, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START("PORT_L") // 4000134.b, 4000136.b + PORT_START("PORT_L") // 4000134.b, 4000136.b PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) @@ -528,7 +528,7 @@ ROM_START( mushisamb ) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) ROM_LOAD("mushisamb_u2", 0x000000, 0x8400000, CRC(6cc9d1a9) SHA1(17907798dce1defadd10354cec6c8d364e045570) ) /* (2004/10/12 MASTER VER) */ - + ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(138e2050) SHA1(9e86489a4e65af5efb5495adf6d4b3e01d5b2816) ) ROM_LOAD16_WORD_SWAP("u24", 0x400000, 0x400000, CRC(e3d05c9f) SHA1(130c3d62317da1729c85bd178bd51500edd73ada) ) @@ -798,25 +798,25 @@ READ64_MEMBER( cv1k_state::mushisam_speedup_r ) int pc = m_maincpu->pc(); if ( pc == 0xc04a0aa ) m_maincpu->spin_until_time( attotime::from_usec(10)); // mushisam else if (pc == 0xc04a0da) m_maincpu->spin_until_time( attotime::from_usec(10)); // mushitam -// else printf("read %08x\n", m_maincpu->pc()); +// else printf("read %08x\n", m_maincpu->pc()); return cv1k_ram[0x0022f0/8]; } DRIVER_INIT_MEMBER(cv1k_state,mushisam) { - m_maincpu->space(AS_PROGRAM).install_read_handler(0xc0022f0, 0xc0022f7, read64_delegate(FUNC(cv1k_state::mushisam_speedup_r),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xc0022f0, 0xc0022f7, read64_delegate(FUNC(cv1k_state::mushisam_speedup_r),this)); } READ64_MEMBER( cv1k_state::mushisama_speedup_r ) { if (m_maincpu->pc()== 0xc04a2aa ) m_maincpu->spin_until_time( attotime::from_usec(10)); // mushisam -// else printf("read %08x\n", m_maincpu->pc()); +// else printf("read %08x\n", m_maincpu->pc()); return cv1k_ram[0x00024d8/8]; } DRIVER_INIT_MEMBER(cv1k_state,mushisama) { - m_maincpu->space(AS_PROGRAM).install_read_handler(0xc0024d8, 0xc0024df, read64_delegate(FUNC(cv1k_state::mushisama_speedup_r),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xc0024d8, 0xc0024df, read64_delegate(FUNC(cv1k_state::mushisama_speedup_r),this)); } READ64_MEMBER( cv1k_state::espgal2_speedup_r ) @@ -827,13 +827,13 @@ READ64_MEMBER( cv1k_state::espgal2_speedup_r ) if ( pc == 0xc05176a ) m_maincpu->spin_until_time( attotime::from_usec(10)); // futari15 / futari15a / futari10 / futariblk / ibarablk / ibarablka / mmpork / mmmbanc if ( pc == 0xc0519a2 ) m_maincpu->spin_until_time( attotime::from_usec(10)); // deathsml if ( pc == 0xc1d1346 ) m_maincpu->spin_until_time( attotime::from_usec(10)); // dpddfk / dsmbl -// else printf("read %08x\n", m_maincpu->pc()); +// else printf("read %08x\n", m_maincpu->pc()); return cv1k_ram[0x002310/8]; } DRIVER_INIT_MEMBER(cv1k_state,espgal2) { - m_maincpu->space(AS_PROGRAM).install_read_handler(0xc002310, 0xc002317, read64_delegate(FUNC(cv1k_state::espgal2_speedup_r),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xc002310, 0xc002317, read64_delegate(FUNC(cv1k_state::espgal2_speedup_r),this)); } diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index 8e0ad993928..a3932426608 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -297,7 +297,7 @@ static MACHINE_CONFIG_START( d9final, d9final_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 256) - MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-16-1) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-16-1) MCFG_SCREEN_UPDATE_DRIVER(d9final_state, screen_update_d9final) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index dfbd930e800..b7f17a46d98 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -62,7 +62,7 @@ public: optional_device m_msm; required_device m_gfxdecode; required_device m_palette; - + /* video-related */ tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c index 56e2f0f1aeb..b75edcb0ed2 100644 --- a/src/mame/drivers/dai3wksi.c +++ b/src/mame/drivers/dai3wksi.c @@ -67,7 +67,7 @@ public: optional_device m_ic79; optional_device m_ic80; optional_device m_ic81; - + /* video */ required_shared_ptr m_dai3wksi_videoram; int m_dai3wksi_flipscreen; @@ -83,10 +83,10 @@ public: DECLARE_WRITE8_MEMBER(dai3wksi_audio_1_w); DECLARE_WRITE8_MEMBER(dai3wksi_audio_2_w); DECLARE_WRITE8_MEMBER(dai3wksi_audio_3_w); - + /* i/o ports */ required_ioport m_in2; - + virtual void machine_start(); virtual void machine_reset(); }; diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 15276ea5824..1d6c9f4b2d2 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -516,7 +516,7 @@ static MACHINE_CONFIG_START( dassault, dassault_state ) MCFG_DECO16IC_ADD("tilegen1", dassault_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", dassault_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") diff --git a/src/mame/drivers/dblcrown.c b/src/mame/drivers/dblcrown.c index 14b7d6be17e..812215f5bac 100644 --- a/src/mame/drivers/dblcrown.c +++ b/src/mame/drivers/dblcrown.c @@ -5,7 +5,7 @@ Double Crown (c) 1997 Cadence Technology / Dyna Driver by Angelo Salese - Additional work by Roberto Fresca. + Additional work by Roberto Fresca. TODO: - Bogus "Hole" in main screen display; @@ -35,14 +35,14 @@ 4 * dipsw 8pos YMZ284-D (ay8910, but without i/o ports) MAXIM MAX693ACPE is a "Microprocessor Supervisory Circuit", for watchdog - and for nvram functions. + and for nvram functions. ***************************************************************************/ -#define MAIN_CLOCK XTAL_28_63636MHz -#define CPU_CLOCK MAIN_CLOCK / 6 -#define SND_CLOCK MAIN_CLOCK / 12 +#define MAIN_CLOCK XTAL_28_63636MHz +#define CPU_CLOCK MAIN_CLOCK / 6 +#define SND_CLOCK MAIN_CLOCK / 12 #include "emu.h" #include "cpu/z80/z80.h" @@ -298,9 +298,9 @@ WRITE8_MEMBER( dblcrown_state::output_w ) x-x- --xx unknown */ - coin_counter_w(machine(), 0, data & 0x10); /* Coin In counter pulse */ - coin_counter_w(machine(), 1 ,data & 0x08); /* Payout counter pulse */ -// popmessage("out: %02x", data); + coin_counter_w(machine(), 0, data & 0x10); /* Coin In counter pulse */ + coin_counter_w(machine(), 1 ,data & 0x08); /* Payout counter pulse */ +// popmessage("out: %02x", data); } diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index 94ffd1a6b0d..e45e6d5ce4f 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -394,7 +394,7 @@ static MACHINE_CONFIG_START( dblewing, dblewing_state ) MCFG_DECO16IC_ADD("tilegen1", dblewing_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) decospr_device::set_gfx_region(*device, 2); decospr_device::set_pri_callback(*device, dblwings_pri_callback); diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 72529699f56..ea9ca55bd54 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -225,7 +225,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); } } count = 0; @@ -238,7 +238,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); } } } @@ -257,7 +257,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); } } count = 0; @@ -270,7 +270,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); } } } diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 477a633d25f..c265ca3ebd9 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -9785,7 +9785,7 @@ static MACHINE_CONFIG_START( kotbinyo, ddenlovr_state ) /* devices */ // MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) -// MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq)) +// MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( kotbinsp, kotbinyo ) diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index 667f1f86c08..d62287b94ff 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -802,7 +802,7 @@ void ddragon3_state::machine_start() { m_paletteram.resize(m_palette->entries()); m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - + save_item(NAME(m_vreg)); save_item(NAME(m_bg_scrollx)); save_item(NAME(m_bg_scrolly)); @@ -879,7 +879,7 @@ static MACHINE_CONFIG_DERIVED( ctribe, ddragon3 ) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - + MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(ddragon3_state, screen_update_ctribe) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index e6fab911123..37d39a0e9a4 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -1487,7 +1487,7 @@ static MACHINE_CONFIG_START( secretab, dec0_automat_state ) deco_mxc06_device::set_gfx_region(*device, 3); MCFG_DECO_MXC06_GFXDECODE("gfxdecode") MCFG_DECO_MXC06_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 5e6003ddb4a..b8fbb032852 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -1759,7 +1759,7 @@ static MACHINE_CONFIG_START( captaven, deco32_state ) MCFG_DECO16IC_ADD("tilegen1", captaven_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", captaven_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1834,7 +1834,7 @@ static MACHINE_CONFIG_START( fghthist, deco32_state ) /* DE-0380-2 PCB */ MCFG_DECO16IC_ADD("tilegen1", fghthist_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", fghthist_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1896,7 +1896,7 @@ static MACHINE_CONFIG_START( fghthsta, deco32_state ) /* DE-0395-1 PCB */ MCFG_DECO16IC_ADD("tilegen1", fghthist_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", fghthist_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -2021,7 +2021,7 @@ static MACHINE_CONFIG_START( dragngun, dragngun_state ) MCFG_DECO16IC_ADD("tilegen1", dragngun_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", dragngun_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -2108,7 +2108,7 @@ static MACHINE_CONFIG_START( lockload, dragngun_state ) MCFG_DECO16IC_ADD("tilegen1", lockload_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", lockload_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -2197,7 +2197,7 @@ static MACHINE_CONFIG_START( tattass, deco32_state ) MCFG_DECO16IC_ADD("tilegen1", tattass_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", tattass_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -2245,12 +2245,12 @@ static MACHINE_CONFIG_START( nslasher, deco32_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) - MCFG_SCREEN_UPDATE_DRIVER(deco32_state, screen_update_nslasher) + MCFG_SCREEN_UPDATE_DRIVER(deco32_state, screen_update_nslasher) MCFG_DECO16IC_ADD("tilegen1", tattass_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", tattass_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c index 115f838460d..58a214ec83f 100644 --- a/src/mame/drivers/deco_ld.c +++ b/src/mame/drivers/deco_ld.c @@ -141,7 +141,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT8 m_laserdisc_data; int m_nmimask; DECLARE_WRITE8_MEMBER(rblaster_sound_w); @@ -266,7 +266,7 @@ WRITE8_MEMBER(deco_ld_state::decold_sound_cmd_w) /* same as Burger Time HW */ WRITE8_MEMBER(deco_ld_state::decold_palette_w) { - m_palette->write(space, offset, UINT8(~data)); + m_palette->write(space, offset, UINT8(~data)); } /* unknown, but certainly related to audiocpu somehow */ diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c index d411386955c..20dfafee093 100644 --- a/src/mame/drivers/deshoros.c +++ b/src/mame/drivers/deshoros.c @@ -275,7 +275,7 @@ static MACHINE_CONFIG_START( destiny, destiny_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*8-1) MCFG_SCREEN_UPDATE_DRIVER(destiny_state, screen_update_destiny) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 16) diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 465431a3416..046d862dc9e 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -56,7 +56,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(destroyr_misc_w); DECLARE_WRITE8_MEMBER(destroyr_cursor_load_w); DECLARE_WRITE8_MEMBER(destroyr_interrupt_ack_w); diff --git a/src/mame/drivers/dfruit.c b/src/mame/drivers/dfruit.c index 59bf94ca7cf..16e1df8c116 100644 --- a/src/mame/drivers/dfruit.c +++ b/src/mame/drivers/dfruit.c @@ -403,11 +403,11 @@ static MACHINE_CONFIG_START( dfruit, dfruit_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", dfruit ) MCFG_PALETTE_ADD("palette", 0x100) - + MCFG_DEVICE_ADD("tc0091lvc", TC0091LVC, 0) MCFG_TC0091LVC_GFXDECODE("gfxdecode") MCFG_TC0091LVC_PALETTE("palette") - + MCFG_I8255A_ADD( "ppi8255_0", ppi8255_intf ) /* sound hardware */ diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index e5a2a98795f..e60bbe4fb10 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -487,12 +487,12 @@ WRITE_LINE_MEMBER(discoboy_state::yunsung8_adpcm_int) static MACHINE_CONFIG_START( discoboy, discoboy_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */ + MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */ MCFG_CPU_PROGRAM_MAP(discoboy_map) MCFG_CPU_IO_MAP(io_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", discoboy_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL_10MHz/2) /* 5 MHz? */ + MCFG_CPU_ADD("audiocpu", Z80, XTAL_10MHz/2) /* 5 MHz? */ MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_PERIODIC_INT_DRIVER(discoboy_state, nmi_line_pulse, 32*60) @@ -513,7 +513,7 @@ static MACHINE_CONFIG_START( discoboy, discoboy_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_10MHz/4) /* 2.5 MHz? */ + MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_10MHz/4) /* 2.5 MHz? */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 6921d4cfa7c..74057de0e6a 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -752,7 +752,7 @@ READ8_MEMBER(dkong_state::strtheat_inputport_1_r) } WRITE8_MEMBER(dkong_state::dkong_z80dma_rdy_w) -{ +{ m_z80dma->rdy_w(data & 0x01); } @@ -1731,7 +1731,7 @@ static MACHINE_CONFIG_START( dkong3, dkong_state ) MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_dkong) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", dkong) + MCFG_GFXDECODE_ADD("gfxdecode", "palette", dkong) MCFG_PALETTE_ADD("palette", DK3_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(dkong_state,dkong3) @@ -1763,7 +1763,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( dkong3b, dkongjr ) - /* basic machine hardware */ + /* basic machine hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(dkong_state,dkong3) MACHINE_CONFIG_END diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index af5edc0924d..6c4fac61f8e 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -626,7 +626,7 @@ static MACHINE_CONFIG_START( docastle, docastle_state ) /* video hardware */ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_9_828MHz / 16, crtc_intf) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_9_828MHz/2, 0x138, 8, 0x100-8, 0x108, 0, 0xc0) // from crtc MCFG_SCREEN_UPDATE_DRIVER(docastle_state, screen_update_docastle) diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index af471ccaba8..6ffee9346d9 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -139,7 +139,6 @@ UINT32 dominob_state::screen_update_dominob(screen_device &screen, bitmap_ind16 { for (x = 0; x < 256 / 32; x++) { - m_gfxdecode->gfx(1)->opaque(bitmap, cliprect, m_bgram[index] + 256 * (m_bgram[index + 1] & 0xf), @@ -154,7 +153,6 @@ UINT32 dominob_state::screen_update_dominob(screen_device &screen, bitmap_ind16 { for (x = 0; x < 32; x++) { - m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, m_videoram[(y * 32 + x) * 2 + 1] + (m_videoram[(y * 32 + x) * 2] & 7) * 256, diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 7f46cbc9e35..cc36740343b 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -1661,7 +1661,7 @@ ROM_START( flytigera ) // alt pcb type ROM_LOAD( "ftiger_2.4h", 0x08000, 0x08000, CRC(ca9d6713) SHA1(645cccc06c7f6744b25e7917f414956856419b8a) ) ROM_CONTINUE( 0x00000, 0x8000 ) - ROM_REGION( 0x80000, "gfx2", 0 ) /* sprites */ + ROM_REGION( 0x80000, "gfx2", 0 ) /* sprites */ ROM_LOAD16_BYTE( "ftiger_16.4h", 0x00000, 0x20000, CRC(8a158b95) SHA1(ed09d9c40b76a27e06601381e463a00b16555f1e) ) ROM_LOAD16_BYTE( "ftiger_15.2h", 0x00001, 0x20000, CRC(399f6043) SHA1(ea0debd6d0f8c61f0078809c2828734fc15e891d) ) ROM_LOAD16_BYTE( "ftiger_14.4k", 0x40000, 0x20000, CRC(df66b6f3) SHA1(3a29ae69a09306c5a2a2786acbf227832b408152) ) diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index 5d8f46f3311..b618e54233f 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -38,7 +38,7 @@ public: virtual void machine_reset(); UINT32 screen_update_dorachan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; - required_device m_screen; + required_device m_screen; }; diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index 98e0c4b4308..49ed44d8890 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -43,7 +43,7 @@ public: virtual void machine_reset(); UINT32 screen_update_dotrikun(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; - required_device m_screen; + required_device m_screen; }; diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 0f66957c59b..bf2f8c81cf1 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -223,10 +223,10 @@ void dreamwld_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { for (xct = 0; xct < xsize; xct++) { - gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, ypos + yct * yinc, 0); - gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, ypos + yct * yinc, 0); - gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, (ypos + yct * yinc) - 0x200, 0); - gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, (ypos + yct * yinc) - 0x200 , 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, ypos + yct * yinc, 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, ypos + yct * yinc, 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, (ypos + yct * yinc) - 0x200, 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, (ypos + yct * yinc) - 0x200 , 0); tileno++; } diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 0af7c0c6f19..736d4a5d834 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -130,7 +130,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index f6a20e5734f..00fdc877e0c 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -307,7 +307,7 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } /* video-related */ @@ -337,7 +337,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(i8275_preg_w); DECLARE_READ8_MEMBER(i8275_preg_r); DECLARE_WRITE8_MEMBER(i8275_creg_w); diff --git a/src/mame/drivers/ecoinf2.c b/src/mame/drivers/ecoinf2.c index 05d60f41358..0df6d52d88a 100644 --- a/src/mame/drivers/ecoinf2.c +++ b/src/mame/drivers/ecoinf2.c @@ -21,7 +21,7 @@ class ecoinf2_state : public driver_device public: ecoinf2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), + m_maincpu(*this, "maincpu"), m_coins(*this, "COINS"), m_key(*this, "PERKEY"), m_panel(*this, "PANEL") @@ -38,7 +38,7 @@ public: UINT16 m_lamps[16]; UINT16 m_leds[16]; //UINT16 m_chars[14]; -// void update_display(); +// void update_display(); int m_optic_pattern; int strobe_addr; int strobe_amount; @@ -89,7 +89,7 @@ public: } DECLARE_WRITE8_MEMBER(ppi8255_ic10_write_c_strobe) { -// if (data>=0xf0) +// if (data>=0xf0) { strobe_addr = data & 0xf; @@ -100,7 +100,7 @@ public: update_lamps(); update_leds(); } - // else logerror("%04x - ppi8255_ic10_(used)write_c %02x (UNUSUAL?)\n", m_maincpu->pcbase(), data); + // else logerror("%04x - ppi8255_ic10_(used)write_c %02x (UNUSUAL?)\n", m_maincpu->pcbase(), data); } @@ -149,7 +149,7 @@ public: return 0x00; } -// return m_misc->read(); +// return m_misc->read(); } @@ -177,11 +177,11 @@ public: coin_lockout_w(machine(), 1, (data & 0x02) ); coin_lockout_w(machine(), 2, (data & 0x04) ); coin_lockout_w(machine(), 3, (data & 0x08) ); - coin_lockout_w(machine(), 4, (data & 0x10) ); - + coin_lockout_w(machine(), 4, (data & 0x10) ); + //int wdog = (data& 0x80); } - + @@ -254,7 +254,7 @@ static I8255_INTERFACE (ppi8255_ic22_intf)//inputs DEVCB_DRIVER_MEMBER(ecoinf2_state,ppi8255_ic22_read_c_misc), /* Port C read (0x20 appears to be meter power)*/ DEVCB_NULL }; - + // IC24 is the workhorse of the Phoenix, it seems to handle meters, payslides, coin lamps, inhibits and the watchdog! */ static I8255_INTERFACE (ppi8255_ic24_intf)//coins and related { @@ -295,10 +295,10 @@ static ADDRESS_MAP_START( oxo_portmap, AS_IO, 8, ecoinf2_state ) AM_RANGE(0x48, 0x4b) AM_DEVREADWRITE("ic22_inpt", i8255_device, read, write) //* AM_RANGE(0x4c, 0x4f) AM_DEVREADWRITE("ic23_reel", i8255_device, read, write) AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("ic13_leds", i8255_device, read, write) //* -// AM_RANGE(0x54, 0x57) AM_DEVREADWRITE("ic25_dips", i8255_device, read, write) // is this an 8255, or a mirrored byte read? +// AM_RANGE(0x54, 0x57) AM_DEVREADWRITE("ic25_dips", i8255_device, read, write) // is this an 8255, or a mirrored byte read? - -// AM_RANGE(0x5c, 0x5c) AM_WRITE(ox_port5c_out_w) + +// AM_RANGE(0x5c, 0x5c) AM_WRITE(ox_port5c_out_w) ADDRESS_MAP_END @@ -494,7 +494,7 @@ static INPUT_PORTS_START( ecoinf2 ) PORT_DIPNAME( 0x80, 0x80, "IN7:80" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - + PORT_START("PANEL") PORT_DIPNAME( 0x01, 0x01, "IN8:01" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) @@ -561,7 +561,7 @@ static MACHINE_CONFIG_START( ecoinf2_oxo, ecoinf2_state ) MCFG_CPU_ADD("maincpu", Z180,4000000) // some of these hit invalid opcodes with a plain z80, some don't? MCFG_CPU_PROGRAM_MAP(oxo_memmap) MCFG_CPU_IO_MAP(oxo_portmap) - + MCFG_DEFAULT_LAYOUT(layout_ecoinf2) MCFG_MACHINE_START_OVERRIDE(ecoinf2_state, ecoinf2 ) @@ -571,7 +571,7 @@ static MACHINE_CONFIG_START( ecoinf2_oxo, ecoinf2_state ) MCFG_I8255_ADD( "ic22_inpt", ppi8255_ic22_intf ) MCFG_I8255_ADD( "ic23_reel", ppi8255_ic23_intf ) MCFG_I8255_ADD( "ic13_leds", ppi8255_ic13_intf ) -// MCFG_I8255_ADD( "ic25_dips", ppi8255_ic25_intf ) +// MCFG_I8255_ADD( "ic25_dips", ppi8255_ic25_intf ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/electra.c b/src/mame/drivers/electra.c index 69c802d9809..89dfae26052 100644 --- a/src/mame/drivers/electra.c +++ b/src/mame/drivers/electra.c @@ -1,7 +1,7 @@ /*************************************************************************** - + Electra discrete hardware games - + Game Name Avenger (1975) EG-1020 Eliminator IV (1976) @@ -9,7 +9,7 @@ Pace Car Pro (1975) EG-1000 UFO Chase (1975) EG-1010 Wings (1976) - + ***************************************************************************/ @@ -49,38 +49,38 @@ class electra_state : public driver_device public: electra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(electra) SOLVER(Solve, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -110,9 +110,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index fbf9b9c7b4d..b19f9db34d8 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -82,7 +82,7 @@ public: /* devices */ required_device m_maincpu; required_device m_audiocpu; - required_device m_screen; + required_device m_screen; DECLARE_READ8_MEMBER(dip_switch_r); DECLARE_WRITE8_MEMBER(sound_data_w); DECLARE_WRITE8_MEMBER(enigma2_flip_screen_w); diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index 9be1bd7f551..96adad8fba3 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -236,7 +236,7 @@ static MACHINE_CONFIG_START( exedexes, exedexes_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", exedexes) - + MCFG_PALETTE_ADD("palette", 64*4+64*4+16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(exedexes_state, exedexes) diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index bdd771bc2e3..5097a1f6be6 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -400,7 +400,7 @@ static MACHINE_CONFIG_START( exerion, exerion_state ) MCFG_SCREEN_RAW_PARAMS(EXERION_PIXEL_CLOCK, EXERION_HTOTAL, EXERION_HBEND, EXERION_HBSTART, EXERION_VTOTAL, EXERION_VBEND, EXERION_VBSTART) MCFG_SCREEN_UPDATE_DRIVER(exerion_state, screen_update_exerion) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", exerion) MCFG_PALETTE_ADD("palette", 256*3) MCFG_PALETTE_INDIRECT_ENTRIES(32) diff --git a/src/mame/drivers/exidyttl.c b/src/mame/drivers/exidyttl.c index dd45ea2de50..6a6244c16dc 100644 --- a/src/mame/drivers/exidyttl.c +++ b/src/mame/drivers/exidyttl.c @@ -13,7 +13,7 @@ Exidy discrete hardware games Super Death Chase (1977) Table Football (1975) Tv Pinball (1974) - + ***************************************************************************/ @@ -53,15 +53,15 @@ class exidyttl_state : public driver_device public: exidyttl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } // devices required_device m_maincpu; required_device m_video; - + protected: // driver_device overrides @@ -77,14 +77,14 @@ private: static NETLIST_START(attack) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -105,7 +105,7 @@ void exidyttl_state::video_start() static MACHINE_CONFIG_START( attack, exidyttl_state ) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) + MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) MCFG_NETLIST_SETUP(attack) /* video hardware */ @@ -147,32 +147,32 @@ ROM_END /*********** Exidy Death Race 1976 - + Drawing Name ------------ - 6331-36.E7 32x8 Right Gremlin - 6301-91.J10 256x4 - - 6331-36.R7 32x8 Left Gremlin - 6301-91.V10 256x4 - - 6301-92.V5 P1 (left car) + 6331-36.E7 32x8 Right Gremlin + 6301-91.J10 256x4 + + 6331-36.R7 32x8 Left Gremlin + 6301-91.V10 256x4 + + 6301-92.V5 P1 (left car) 6331-35.T7 - - 6301-92.J5 P2 (right car) + + 6301-92.J5 P2 (right car) 6331-35.G7 - - 6301-97.M11 Image Generation + + 6301-97.M11 Image Generation 6301-98.L11 6301-99.K11 6301-100.J11 - - 6331-33.P14 Score & Timer - - 6331-31.A11 Timing / Sync + + 6331-33.P14 Score & Timer + + 6331-31.A11 Timing / Sync 6331-32.C12 - -***********/ + +***********/ ROM_START( deathrac ) diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index d277395872d..cf596f2a4d8 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -509,10 +509,10 @@ static MACHINE_CONFIG_START( exprraid, exprraid_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 384, 0, 256, 262, 8, 256-8) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(exprraid_state, screen_update_exprraid) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 6c4d1155481..475eb1a05c1 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -186,7 +186,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpb_cpu2_map, AS_PROGRAM, 16, f1gp_state ) AM_RANGE(0x000000, 0x01ffff) AM_ROM - AM_RANGE(0xff8000, 0xffbfff) AM_RAM + AM_RANGE(0xff8000, 0xffbfff) AM_RAM AM_RANGE(0xffc000, 0xffcfff) AM_RAM AM_SHARE("sharedram") AM_RANGE(0xfff030, 0xfff031) AM_NOP //? ADDRESS_MAP_END @@ -442,7 +442,7 @@ static MACHINE_CONFIG_START( f1gp, f1gp_state ) MCFG_VSYSTEM_SPR2_SET_PRITYPE(2) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") MCFG_VSYSTEM_SPR2_PALETTE("palette") - + MCFG_DEVICE_ADD("vsystem_spr_ol2", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( f1gp_state, f1gp_ol2_tile_callback ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(2) diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index b4ab05d2608..406f74c6abc 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -996,7 +996,7 @@ static MACHINE_CONFIG_START( borntofi, fantland_state ) MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_0)) /* IRQ handler */ MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz, 4 Bits */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - + MCFG_SOUND_ADD("msm2", MSM5205, 384000) MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_1)) /* IRQ handler */ MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz, 4 Bits */ diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index 2c24494e49a..d312f9da4a4 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -1301,7 +1301,7 @@ static INPUT_PORTS_START( sf2mdtb ) PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" ) //sort of debug mode... + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" ) //sort of debug mode... //depnding (???) of other DSW setting get different //"game" mode, autoplay, bonus round, ecc... PORT_START("DSWB") @@ -2482,7 +2482,7 @@ static MACHINE_CONFIG_START( sf2m1, cps_state ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) MCFG_SCREEN_VBLANK_DRIVER(cps_state, screen_eof_cps1) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) MCFG_PALETTE_ADD("palette", 0xc00) MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index e476291c82a..986ae80c1a9 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -256,7 +256,7 @@ static MACHINE_CONFIG_START( feversoc, feversoc_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) //dynamic resolution? + MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) //dynamic resolution? MCFG_SCREEN_UPDATE_DRIVER(feversoc_state, screen_update_feversoc) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 91e2872d0ed..305599f5bb0 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -730,7 +730,7 @@ static MACHINE_CONFIG_START( firefox, firefox_state ) MCFG_LASERDISC_22VP931_ADD("laserdisc") - MCFG_LASERDISC_OVERLAY_DRIVER(64*8, 525, firefox_state, screen_update_firefox) + MCFG_LASERDISC_OVERLAY_DRIVER(64*8, 525, firefox_state, screen_update_firefox) MCFG_LASERDISC_OVERLAY_CLIP(7*8, 53*8-1, 44, 480+44) MCFG_LASERDISC_OVERLAY_PALETTE("palette") diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index db545314853..5c84fd1ea8e 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -49,11 +49,11 @@ INPUT_CHANGED_MEMBER(firetrk_state::gear_changed) TIMER_DEVICE_CALLBACK_MEMBER(firetrk_state::firetrk_scanline) { int scanline = param; - + // periodic IRQs are generated by inverse 16V signal if ((scanline & 0x1f) == 0) generic_pulse_irq_line(m_maincpu, 0, 1); - + // vblank interrupt // NMIs are disabled during service mode if (!m_in_service_mode && scanline == 240) diff --git a/src/mame/drivers/flipjack.c b/src/mame/drivers/flipjack.c index 39037d2a6fb..3dfcbbb9ff9 100644 --- a/src/mame/drivers/flipjack.c +++ b/src/mame/drivers/flipjack.c @@ -98,7 +98,7 @@ public: m_vram(*this, "vram"), m_cram(*this, "cram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { m_soundlatch = 0; m_bank = 0; @@ -112,7 +112,7 @@ public: required_shared_ptr m_fbram; required_shared_ptr m_vram; required_shared_ptr m_cram; - + required_device m_gfxdecode; required_device m_palette; @@ -204,7 +204,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3 int tile = m_bank << 8 | m_vram[x+y*0x100]; int color = m_cram[x+y*0x100] & 0x3f; - gfx->transpen(bitmap,cliprect, tile, color, 0, 0, x*8, y*8, 0); + gfx->transpen(bitmap,cliprect, tile, color, 0, 0, x*8, y*8, 0); } } diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 3adf4b5f16f..77050aaf3b1 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -289,14 +289,14 @@ ROM_START( flkatcka ) ROM_LOAD( "669_m02.16b", 0x000000, 0x008000, CRC(7e11e6b9) SHA1(7a7d65a458b15842a6345388007c8f682aec20a7) ) ROM_REGION( 0x080000, "gfx1", 0 ) /* tiles + sprites */ // same data as above set, on PWB 450593 sub-board instead. - ROM_LOAD16_BYTE( "669_f03a.4b", 0x000001, 0x010000, CRC(f0ed4c1e) SHA1(58efe3cd81054d22de54a7d195aa3b865bde4a01) ) - ROM_LOAD16_BYTE( "669_f03e.4d", 0x000000, 0x010000, CRC(95a57a26) SHA1(c8aa30c2c734c0740630b1b04ae43c69931cc7c1) ) - ROM_LOAD16_BYTE( "669_f03b.5b", 0x020001, 0x010000, CRC(e2593f3c) SHA1(aa0f6d04015650eaef17c4a39f228eaccf9a2948) ) - ROM_LOAD16_BYTE( "669_f03f.5d", 0x020000, 0x010000, CRC(c6c9903e) SHA1(432ad6d03992499cc533273226944a666b40fa58) ) - ROM_LOAD16_BYTE( "669_f03c.6b", 0x040001, 0x010000, CRC(47be92dd) SHA1(9ccc62d7d42fccbd5ad60e35e3a0478a04405cf1) ) - ROM_LOAD16_BYTE( "669_f03g.6d", 0x040000, 0x010000, CRC(70d35fbd) SHA1(21384f738684c5da4a7a84a1c9aa173fffddf47a) ) - ROM_LOAD16_BYTE( "669_f03d.7b", 0x060001, 0x010000, CRC(18d48f9e) SHA1(b95e38aa813e0f3a0dc6bd45fdb4bf71f7e2066c) ) - ROM_LOAD16_BYTE( "669_f03h.7d", 0x060000, 0x010000, CRC(abfe76e7) SHA1(f8661f189308e83056ec442fa6c936efff67ba0a) ) + ROM_LOAD16_BYTE( "669_f03a.4b", 0x000001, 0x010000, CRC(f0ed4c1e) SHA1(58efe3cd81054d22de54a7d195aa3b865bde4a01) ) + ROM_LOAD16_BYTE( "669_f03e.4d", 0x000000, 0x010000, CRC(95a57a26) SHA1(c8aa30c2c734c0740630b1b04ae43c69931cc7c1) ) + ROM_LOAD16_BYTE( "669_f03b.5b", 0x020001, 0x010000, CRC(e2593f3c) SHA1(aa0f6d04015650eaef17c4a39f228eaccf9a2948) ) + ROM_LOAD16_BYTE( "669_f03f.5d", 0x020000, 0x010000, CRC(c6c9903e) SHA1(432ad6d03992499cc533273226944a666b40fa58) ) + ROM_LOAD16_BYTE( "669_f03c.6b", 0x040001, 0x010000, CRC(47be92dd) SHA1(9ccc62d7d42fccbd5ad60e35e3a0478a04405cf1) ) + ROM_LOAD16_BYTE( "669_f03g.6d", 0x040000, 0x010000, CRC(70d35fbd) SHA1(21384f738684c5da4a7a84a1c9aa173fffddf47a) ) + ROM_LOAD16_BYTE( "669_f03d.7b", 0x060001, 0x010000, CRC(18d48f9e) SHA1(b95e38aa813e0f3a0dc6bd45fdb4bf71f7e2066c) ) + ROM_LOAD16_BYTE( "669_f03h.7d", 0x060000, 0x010000, CRC(abfe76e7) SHA1(f8661f189308e83056ec442fa6c936efff67ba0a) ) ROM_REGION( 0x040000, "k007232", 0 ) /* 007232 data (chip 1) */ ROM_LOAD( "mask2m.11a", 0x000000, 0x040000, CRC(6d1ea61c) SHA1(9e6eb9ac61838df6e1f74e74bb72f3edf1274aed) ) diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index bae7da01d88..ccbd7f2ec76 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -57,7 +57,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_READ8_MEMBER(flyball_input_r); DECLARE_READ8_MEMBER(flyball_scanline_r); DECLARE_READ8_MEMBER(flyball_potsense_r); diff --git a/src/mame/drivers/fungames.c b/src/mame/drivers/fungames.c index e4566a0ccab..b0bd63e466b 100644 --- a/src/mame/drivers/fungames.c +++ b/src/mame/drivers/fungames.c @@ -1,7 +1,7 @@ /*************************************************************************** - + Fun Games discrete hardware games - + Biplane (1975) Biplane 4 (1976) King @@ -9,7 +9,7 @@ Take 5 (1975) Take 7 (1975) Tankers (1975) - + ***************************************************************************/ @@ -49,38 +49,38 @@ class fungames_state : public driver_device public: fungames_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(fungames) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -110,9 +110,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 6ead868c6b5..3a33702024e 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -345,7 +345,7 @@ static MACHINE_CONFIG_START( funkyjet, funkyjet_state ) MCFG_DECO16IC_ADD("tilegen1", funkyjet_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) decospr_device::set_gfx_region(*device, 2); MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index f8d2ebdd5c3..47d83bf3e46 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -6,7 +6,7 @@ 65C02 + 2x PIAs + M6845 CRTC + AY8910 Also from Amatic, CMC, Dino4 encrypted, and Leopard 4. - + Driver by Roberto Fresca. Based on a preliminary work of Curt Coder & Peter Trauner. @@ -159,11 +159,11 @@ complex operations for each byte nibble. See DRIVER_INIT for the final algorithm. - Saloon (french) use bitswaps to address & data in program, graphics and color PROM. - Dino4 hardware games have address/data bitswap in program, and data bitswap (sometimes - with extra boolean XOR operations) in graphics. + with extra boolean XOR operations) in graphics. - Microcontroller. Some games (like Soccer New and Mongolfier New are using an extra MCU mainly for protection. - + - Mirrored video and color RAM. A derivative of CMC hardware uses this trick to avoid ROM swaps. If you run Luna Park in a regular CMC board, you'll get an unplayable mess of graphics. @@ -226,7 +226,7 @@ Also PRG rom higher address line is connected to DIP switch #1 so it should have 2 games in the same PCB (2 revisions?). - + There is at least one missing game in the family... 'Hyppo Family', also from C.M.C. This game should be located and dumped. @@ -416,15 +416,15 @@ Press DEAL/DRAW to exit the mode. - + * Unknown Royal Card on Dino4 hardware.... - + This one is really strange. The game is running in a Dino4 hardware, plus a daughterboard with a mexican Rockwell R65C02 + an unknown PLCC. The program/gfx are totally decrypted. The game vectors are $C122 (RESET) and $C20F (IRQ) - + The code starts... - + C122: A2 FF LDX #$FF ; load 0xFF to reg X C124: 9A TXS ; transfer to the stack C125: 78 SEI ; set interrupts @@ -437,7 +437,7 @@ C132: A9 C2 LDA #$C2 ; / C134: 8D 02 00 STA $0002 ;/ C137: 4C DC 48 JMP $48DC ; jump to $48DC... - + 48DC: 93 NOP ;\ 48DD: 00 BRK ; \ 48DE: B7 4B SMB3 $4B ; \ @@ -446,13 +446,13 @@ 48E3: B7 4D SMB3 $4B ; / 48E5: 05 B7 ORA $B7 ;/ 48E7: 4C 05 76 JMP $7605 ; jump to $7605 (no code there) - + And the IRQ vector pointed code... does nothing! - + C20F: 40 RTI ; return from interrupt - + And the code pointed from $0000... - + C210: 48 PHA ; transfer accumulator to stack C211: AD 01 0A LDA $0A01 ; read the PIA #2 input C214: 29 F7 AND #$F7 ; \ compare with 0xF7 @@ -472,11 +472,11 @@ Maybe mnemonic 93 is AXA (ab),Y (93 ab) instead of NOP (as seen in some sources)??... Tooo much obscure/darkness here - + So... No idea what's wrong here. If someone could figure a possible transform, please let me know. - - + + *********************************************************************************** @@ -530,7 +530,7 @@ rcdino4: 0x7C 0x60 0x65 0x08 0x21 0x08 0x1F 0x1F 0x00 0x07 0x01 0x01 0x00 0x00 0x00 0x00 0x00 0x00. chinatow: 0x7C 0x60 0x65 0x08 0x21 0x08 0x1F 0x1F 0x00 0x07 0x01 0x01 0x00 0x00 0x00 0x00 0x00 0x00. - + *********************************************************************************** @@ -1147,7 +1147,7 @@ static ADDRESS_MAP_START( cuoreuno_map, AS_PROGRAM, 8, funworld_state ) AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads */ AM_RANGE(0x3e00, 0x3fff) AM_RAM /* some games use $3e03-05 range for protection */ - AM_RANGE(0x4000, 0x5fff) AM_ROM /* used by rcdino4 (dino4 hw ) */ + AM_RANGE(0x4000, 0x5fff) AM_ROM /* used by rcdino4 (dino4 hw ) */ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_SHARE("videoram") AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_SHARE("colorram") AM_RANGE(0x8000, 0xffff) AM_ROM @@ -1158,10 +1158,10 @@ READ8_MEMBER(funworld_state::chinatow_r_32f0) { logerror("read from 0x32f0 at offset %02X\n",offset); switch (offset) - { - case 0: return 0xfe; - - } + { + case 0: return 0xfe; + + } return 0xff; } @@ -1175,13 +1175,13 @@ static ADDRESS_MAP_START( chinatow_map, AS_PROGRAM, 8, funworld_state ) AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads */ AM_RANGE(0x32f0, 0x32ff) AM_READ(chinatow_r_32f0) - AM_RANGE(0x4000, 0x5fff) AM_ROM /* used by rcdino4 (dino4 hw ) */ + AM_RANGE(0x4000, 0x5fff) AM_ROM /* used by rcdino4 (dino4 hw ) */ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_SHARE("videoram") AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_SHARE("colorram") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( lunapark_map, AS_PROGRAM, 8, funworld_state ) // mirrored video RAM 4000/5000 to 6000/7000 +static ADDRESS_MAP_START( lunapark_map, AS_PROGRAM, 8, funworld_state ) // mirrored video RAM 4000/5000 to 6000/7000 AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_device, read, write) AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_device, read, write) @@ -2024,12 +2024,12 @@ static INPUT_PORTS_START( lunapark ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) /* the following one seems to be disconnected - to avoid the use of remote credits or direct payout */ + to avoid the use of remote credits or direct payout */ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* the following one is connected to 1st DSW and is meant - for switch between different programs stored in different - halves of the program ROM */ + for switch between different programs stored in different + halves of the program ROM */ PORT_START("SELDSW") PORT_DIPNAME( 0x01, 0x00, "Game Selector" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x00, "PROGRAM 1, (5 TIRI LIRE 500, ABILITA VINTE)" ) @@ -2622,60 +2622,60 @@ static INPUT_PORTS_START( novoplay ) INPUT_PORTS_END static INPUT_PORTS_START( chinatow ) - PORT_START("IN0") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* no remote credits */ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME("Stop 1 / Switch Bet (1-Max)") - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL ) PORT_NAME("Clear / Bet / Prendi (Take)") - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start / Gioca (Play) / Gmable") - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME("Stop 5 / Half Gamble / Super Game") - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_POKER_HOLD4 ) PORT_NAME("Stop 4 / Alta (High)") - - PORT_START("IN1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_HOLD2 ) PORT_NAME("Stop 2 / Bassa (Low)") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) PORT_NAME("Stop 3") - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Ticket") PORT_CODE(KEYCODE_8) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper") PORT_CODE(KEYCODE_H) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) - - PORT_START("IN2") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW") - 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, "Counter" ) PORT_DIPLOCATION("SW1:7") - PORT_DIPSETTING( 0x02, "X10" ) - PORT_DIPSETTING( 0x00, "X1" ) - PORT_DIPNAME( 0x04, 0x04, "Royal Flush" ) PORT_DIPLOCATION("SW1:6") - PORT_DIPSETTING( 0x04, "With" ) - PORT_DIPSETTING( 0x00, "Without" ) - PORT_DIPNAME( 0x08, 0x08, "5 of a kind" ) PORT_DIPLOCATION("SW1:5") - PORT_DIPSETTING( 0x08, "With" ) - PORT_DIPSETTING( 0x00, "Without" ) - PORT_DIPNAME( 0x60, 0x60, "Payout 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( 0x90, 0x90, "Coin/Credit ratio" ) PORT_DIPLOCATION("SW1:1,4") - PORT_DIPSETTING( 0x00, "1 coin 1 credit" ) - PORT_DIPSETTING( 0x10, "1 coin 1 credit" ) - PORT_DIPSETTING( 0x80, "1 coin 5 credits" ) - PORT_DIPSETTING( 0x90, "1 coin 10 credits" ) - INPUT_PORTS_END + PORT_START("IN0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* no remote credits */ + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME("Stop 1 / Switch Bet (1-Max)") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL ) PORT_NAME("Clear / Bet / Prendi (Take)") + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start / Gioca (Play) / Gmable") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME("Stop 5 / Half Gamble / Super Game") + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_POKER_HOLD4 ) PORT_NAME("Stop 4 / Alta (High)") + + PORT_START("IN1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_HOLD2 ) PORT_NAME("Stop 2 / Bassa (Low)") + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) PORT_NAME("Stop 3") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Ticket") PORT_CODE(KEYCODE_8) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper") PORT_CODE(KEYCODE_H) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) + + PORT_START("IN2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW") + 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, "Counter" ) PORT_DIPLOCATION("SW1:7") + PORT_DIPSETTING( 0x02, "X10" ) + PORT_DIPSETTING( 0x00, "X1" ) + PORT_DIPNAME( 0x04, 0x04, "Royal Flush" ) PORT_DIPLOCATION("SW1:6") + PORT_DIPSETTING( 0x04, "With" ) + PORT_DIPSETTING( 0x00, "Without" ) + PORT_DIPNAME( 0x08, 0x08, "5 of a kind" ) PORT_DIPLOCATION("SW1:5") + PORT_DIPSETTING( 0x08, "With" ) + PORT_DIPSETTING( 0x00, "Without" ) + PORT_DIPNAME( 0x60, 0x60, "Payout 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( 0x90, 0x90, "Coin/Credit ratio" ) PORT_DIPLOCATION("SW1:1,4") + PORT_DIPSETTING( 0x00, "1 coin 1 credit" ) + PORT_DIPSETTING( 0x10, "1 coin 1 credit" ) + PORT_DIPSETTING( 0x80, "1 coin 5 credits" ) + PORT_DIPSETTING( 0x90, "1 coin 10 credits" ) + INPUT_PORTS_END static INPUT_PORTS_START( royal ) PORT_START("IN0") @@ -2993,7 +2993,7 @@ static MACHINE_CONFIG_DERIVED( magicrd2, fw1stpal ) MCFG_CPU_PROGRAM_MAP(magicrd2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MCFG_VIDEO_START_OVERRIDE(funworld_state, magicrd2) - + MCFG_DEVICE_REMOVE("crtc") MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK, magicrd2_mc6845_intf) @@ -3048,7 +3048,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( lunapark, fw1stpal ) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ - MCFG_CPU_PROGRAM_MAP(lunapark_map) // mirrored video RAM (4000/5000 to 6000/7000). + MCFG_CPU_PROGRAM_MAP(lunapark_map) // mirrored video RAM (4000/5000 to 6000/7000). MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MCFG_MACHINE_START_OVERRIDE(funworld_state, lunapark) MCFG_MACHINE_RESET_OVERRIDE(funworld_state, lunapark) @@ -3460,7 +3460,7 @@ ROM_END then service1+service2 and reset, then another reset. - + Q is remote (x100) W is payout. */ @@ -3489,10 +3489,10 @@ ROM_END then service1+service2 and reset, then another reset. - + This set has spam graphics, but seems used by another program. - + */ ROM_START( jolycdie ) /* Bootleg PCB, NON encrypted graphics */ ROM_REGION( 0x10000, "maincpu", 0 ) @@ -4114,7 +4114,7 @@ ROM_END ROM_START( pool10f ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "cmc-pool10+a+.u2", 0x8000, 0x8000, CRC(e8087fb8) SHA1(c012a81f561978bd97708a52f656e7b13e41a3e2) ) - + ROM_REGION( 0x10000, "gfx1", 0 ) ROM_LOAD( "cmc-pool10-b.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) ) ROM_LOAD( "cmc-pool10-c.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) ) @@ -4168,13 +4168,13 @@ ROM_START( pool10i ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "a.u2", 0x8000, 0x8000, CRC(566bc05d) SHA1(eec88c8ba6cb664f38ebf8b71f99b4e7d04a9601) ) ROM_IGNORE( 0x8000 ) /* Identical halves. Discarding 2nd half */ - + ROM_REGION( 0x10000, "gfx1", 0 ) ROM_LOAD( "b.u21", 0x0000, 0x8000, CRC(581c4878) SHA1(5ae61af090feea1745e22f46b33b2c01e6013fbe) ) ROM_IGNORE( 0x8000 ) /* Identical halves. Discarding 2nd half */ ROM_LOAD( "c.u20", 0x8000, 0x8000, CRC(3bdf1106) SHA1(fa21cbd49bb27ea4a784cf4e4b3fbd52650a285b) ) ROM_IGNORE( 0x8000 ) /* Identical halves. Discarding 2nd half */ - + ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */ ROM_LOAD( "pool10l_nvram.bin", 0x0000, 0x0800, CRC(89cbee4b) SHA1(ff8031a96ee40e1e62abbae7a0b3d9dc2122759f) ) @@ -4338,18 +4338,18 @@ ROM_END The second set, has the same programs, but the strings on the first half were changed to match the second program. - + */ /* The following two have mirrored video RAM 4000/5000 to 6000/7000. */ ROM_START( lunapark ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* Two different programs. Selectable through a DIP switch */ + ROM_REGION( 0x10000, "maincpu", 0 ) /* Two different programs. Selectable through a DIP switch */ ROM_LOAD( "lunapark-425-95n003.u2", 0x0000, 0x10000, CRC(b3a620ee) SHA1(67b3498edf7b536e22c4d97c1f6ad5a71521e68f) ) ROM_REGION( 0x10000, "gfx1", 0 ) ROM_LOAD( "lunapark-425-95n002.u21", 0x0000, 0x8000, CRC(2bededb7) SHA1(b8d7e6fe307d347d762adf35d361ade620aab37b) ) - ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 0xff filled*/ + ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 0xff filled*/ ROM_LOAD( "lunapark-425-95n001.u20", 0x8000, 0x8000, CRC(7d91ce1f) SHA1(7e9bfad76f305d5787faffe3a07b218beb37fda8) ) - ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 0xff filled*/ + ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 0xff filled*/ ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */ ROM_LOAD( "lunapark_nvram.bin", 0x0000, 0x0800, CRC(f99e749b) SHA1(fafd4205dfaacb4c21215af6997d06ab419c9281) ) @@ -4359,14 +4359,14 @@ ROM_START( lunapark ) ROM_END ROM_START( lunaparkb ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* Two different programs. Selectable through a DIP switch */ + ROM_REGION( 0x10000, "maincpu", 0 ) /* Two different programs. Selectable through a DIP switch */ ROM_LOAD( "lunapark-number-03_lunaparkb.u2", 0x0000, 0x10000, CRC(cb819bb7) SHA1(c7fb25eab093de2f644445a713d99ee8024d8499) ) ROM_REGION( 0x10000, "gfx1", 0 ) - ROM_LOAD( "27512.u21", 0x0000, 0x8000, CRC(d64ac315) SHA1(c67d9e67a988036844efd4f980d47a90c022ba18) ) /* only the first 2 bytes different */ - ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 0xff filled*/ + ROM_LOAD( "27512.u21", 0x0000, 0x8000, CRC(d64ac315) SHA1(c67d9e67a988036844efd4f980d47a90c022ba18) ) /* only the first 2 bytes different */ + ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 0xff filled*/ ROM_LOAD( "27512.u20", 0x8000, 0x8000, CRC(7d91ce1f) SHA1(7e9bfad76f305d5787faffe3a07b218beb37fda8 ) ) - ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 0xff filled*/ + ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 0xff filled*/ ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */ ROM_LOAD( "lunaparkb_nvram.bin", 0x0000, 0x0800, CRC(f99e749b) SHA1(fafd4205dfaacb4c21215af6997d06ab419c9281) ) @@ -5684,10 +5684,10 @@ ROM_START( chinatow ) ROM_REGION( 0x10000, "gfx1", 0 ) ROM_LOAD( "27c512.u2", 0x0000, 0x8000, CRC(6ace221f) SHA1(d35a6621d9d9231a844d7043da78035855ebf572) ) - ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 0xff filled*/ + ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 0xff filled*/ ROM_LOAD( "27c512.u20", 0x8000, 0x8000, CRC(efb7f1ec) SHA1(260005526fc9b4087ca03f7cc585e40b6fa007fb) ) - ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 0xff filled*/ - + ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 0xff filled*/ + ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */ ROM_LOAD( "chinatow_nvram.bin", 0x0000, 0x0800, CRC(eef4c5e7) SHA1(a2d9a9f617d35ccb99236114e5ce3257ad572f49) ) @@ -5787,7 +5787,7 @@ DRIVER_INIT_MEMBER(funworld_state, mongolnw) UINT8 *ROM = memregion("maincpu")->base(); ROM[0x9115] = 0xa5; - + /* prevent one test from triggering hardware error */ ROM[0xb8f3] = 0xff; } @@ -5801,7 +5801,7 @@ DRIVER_INIT_MEMBER(funworld_state, soccernw) ROM[0x80b2] = 0xa9; ROM[0x80b3] = 0x00; ROM[0x9115] = 0xa5; - + /* prevent one test from triggering hardware error */ ROM[0xb8f3] = 0xff; } @@ -5867,7 +5867,7 @@ DRIVER_INIT_MEMBER(funworld_state, saloon) rom[a] = buffer[i]; } } - + /****************************** * Graphics ROM decryption * @@ -6171,7 +6171,7 @@ DRIVER_INIT_MEMBER(funworld_state, rcdino4) } } - + /****************************** * Graphics ROM decryption * ******************************/ @@ -6190,7 +6190,7 @@ DRIVER_INIT_MEMBER(funworld_state, rcdino4) } /* d4-d5 data lines swap, plus a XOR with 0x81, implemented in two steps for an easy view */ - + int x; UINT8 *src = memregion( "gfx1" )->base(); @@ -6199,7 +6199,7 @@ DRIVER_INIT_MEMBER(funworld_state, rcdino4) src[x] = BITSWAP8(src[x], 7, 6, 4, 5, 3, 2, 1, 0); src[x] = src[x] ^ 0x81; } - + } /********************************************** @@ -6219,7 +6219,7 @@ GAMEL( 1993, jolyccrb, jollycrd, cuoreuno, jolycdcr, driver_device, 0, GAMEL( 1985, sjcd2kx3, jollycrd, fw1stpal, funworld, driver_device, 0, ROT0, "M.P.", "Super Joly 2000 - 3x", 0, layout_jollycrd ) GAME( 1986, jolycdab, jollycrd, fw1stpal, funworld, driver_device, 0, ROT0, "Inter Games", "Jolly Card (Austrian, Fun World, bootleg)", GAME_NOT_WORKING ) GAMEL( 1992, jolycdsp, jollycrd, cuoreuno, jolycdit, funworld_state, ctunk, ROT0, "TAB Austria", "Jolly Card (Spanish, blue TAB board, encrypted)", 0, layout_royalcrd ) -GAMEL( 1990, jolycdid, jollycrd, cuoreuno, jolycdcr, driver_device, 0, ROT0, "bootleg", "Jolly Card (Italian, different colors, set 1)", 0, layout_jollycrd ) // italian, CPLD, different colors. +GAMEL( 1990, jolycdid, jollycrd, cuoreuno, jolycdcr, driver_device, 0, ROT0, "bootleg", "Jolly Card (Italian, different colors, set 1)", 0, layout_jollycrd ) // italian, CPLD, different colors. GAMEL( 1990, jolycdie, jollycrd, cuoreuno, jolycdib, driver_device, 0, ROT0, "bootleg", "Jolly Card (Italian, different colors, set 2)", 0, layout_jollycrd ) // not from TAB blue PCB // Bonus Card based... @@ -6246,9 +6246,9 @@ GAMEL( 1997, tortufam, 0, cuoreuno, cuoreuno, driver_device, 0, GAMEL( 1996, potgame, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Pot Game (Italian)", 0, layout_jollycrd ) GAMEL( 1996, bottle10, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Bottle 10 (Italian, set 1)", 0, layout_jollycrd ) GAMEL( 1996, bottl10b, bottle10, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Bottle 10 (Italian, set 2)", 0, layout_jollycrd ) -GAMEL( 1998, lunapark, 0, lunapark, lunapark, driver_device, 0, ROT0, "", "Luna Park (set 1, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000). -GAMEL( 1998, lunaparkb, lunapark, lunapark, lunapark, driver_device, 0, ROT0, "", "Luna Park (set 2, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000). -GAMEL( 1998, lunaparkc, lunapark, cuoreuno, cuoreuno, driver_device, 0, ROT0, "", "Luna Park (set 3)", 0, layout_jollycrd ) // regular video RAM 6000/7000. +GAMEL( 1998, lunapark, 0, lunapark, lunapark, driver_device, 0, ROT0, "", "Luna Park (set 1, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000). +GAMEL( 1998, lunaparkb, lunapark, lunapark, lunapark, driver_device, 0, ROT0, "", "Luna Park (set 2, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000). +GAMEL( 1998, lunaparkc, lunapark, cuoreuno, cuoreuno, driver_device, 0, ROT0, "", "Luna Park (set 3)", 0, layout_jollycrd ) // regular video RAM 6000/7000. GAMEL( 1998, crystal, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "J.C.D. srl", "Crystal Colours (CMC hardware)", 0, layout_jollycrd ) // Royal Card based... diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 1f0c5de0a26..10e6a64597a 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -991,7 +991,7 @@ static MACHINE_CONFIG_START( gaelco3d, gaelco3d_state ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) MCFG_TIMER_DRIVER_ADD("adsp_timer", gaelco3d_state, adsp_autobuffer_irq) - + MCFG_DEVICE_ADD("serial", GAELCO_SERIAL, 0) MCFG_GAELCO_SERIAL_IRQ_HANDLER(WRITELINE(gaelco3d_state, ser_irq)) diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index 0976a1a096c..460f4b53ca5 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -1511,7 +1511,7 @@ void gaiden_state::descramble_drgnbowl_gfx() int i; UINT8 *ROM = memregion("maincpu")->base(); size_t size = memregion("maincpu")->bytes(); - + { dynamic_buffer buffer(size); diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index 7f5ffe31d74..2022b72ec9d 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -1623,15 +1623,15 @@ static MACHINE_CONFIG_START( bosco, bosco_state ) MCFG_NAMCO_50XX_ADD("50xx_1", MASTER_CLOCK/6/2) /* 1.536 MHz */ MCFG_NAMCO_50XX_ADD("50xx_2", MASTER_CLOCK/6/2) /* 1.536 MHz */ - MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2) /* 1.536 MHz */ + MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2) /* 1.536 MHz */ MCFG_NAMCO_51XX_INPUT_0_CB(IOPORT("IN0L")) MCFG_NAMCO_51XX_INPUT_1_CB(IOPORT("IN0H")) MCFG_NAMCO_51XX_INPUT_2_CB(IOPORT("IN1L")) MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H")) MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0)) MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1)) - - + + MCFG_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/6/2) /* 1.536 MHz */ MCFG_NAMCO_52XX_DISCRETE("discrete") MCFG_NAMCO_52XX_BASENODE(NODE_04) @@ -1642,21 +1642,21 @@ static MACHINE_CONFIG_START( bosco, bosco_state ) MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2) /* 1.536 MHz */ MCFG_NAMCO_54XX_DISCRETE("discrete") MCFG_NAMCO_54XX_BASENODE(NODE_01) - + MCFG_NAMCO_06XX_ADD("06xx_0", MASTER_CLOCK/6/64) MCFG_NAMCO_06XX_MAINCPU("maincpu") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read)) - MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) + MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) MCFG_NAMCO_06XX_READ_2_CB(DEVREAD8("50xx_1", namco_50xx_device, read)) MCFG_NAMCO_06XX_READ_REQUEST_2_CB(DEVWRITELINE("50xx_1", namco_50xx_device, read_request)) - MCFG_NAMCO_06XX_WRITE_2_CB(DEVWRITE8("50xx_1", namco_50xx_device, write)) + MCFG_NAMCO_06XX_WRITE_2_CB(DEVWRITE8("50xx_1", namco_50xx_device, write)) MCFG_NAMCO_06XX_WRITE_3_CB(DEVWRITE8("54xx", namco_54xx_device, write)) - + MCFG_NAMCO_06XX_ADD("06xx_1", MASTER_CLOCK/6/64) MCFG_NAMCO_06XX_MAINCPU("sub") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("50xx_2", namco_50xx_device, read)) MCFG_NAMCO_06XX_READ_REQUEST_0_CB(DEVWRITELINE("50xx_2", namco_50xx_device, read_request)) - MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("50xx_2", namco_50xx_device, write)) + MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("50xx_2", namco_50xx_device, write)) MCFG_NAMCO_06XX_WRITE_1_CB(DEVWRITE8("52xx", namco_52xx_device, write)) MCFG_WATCHDOG_VBLANK_INIT(8) @@ -1712,7 +1712,7 @@ static MACHINE_CONFIG_START( galaga, galaga_state ) MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H")) MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0)) MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1)) - + MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2) /* 1.536 MHz */ MCFG_NAMCO_54XX_DISCRETE("discrete") MCFG_NAMCO_54XX_BASENODE(NODE_01) @@ -1720,9 +1720,9 @@ static MACHINE_CONFIG_START( galaga, galaga_state ) MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64) MCFG_NAMCO_06XX_MAINCPU("maincpu") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read)) - MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) + MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) MCFG_NAMCO_06XX_WRITE_3_CB(DEVWRITE8("54xx", namco_54xx_device, write)) - + MCFG_WATCHDOG_VBLANK_INIT(8) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ @@ -1766,8 +1766,8 @@ static MACHINE_CONFIG_DERIVED( galagab, galaga ) MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64) MCFG_NAMCO_06XX_MAINCPU("maincpu") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read)) - MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) - + MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) + MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(galaga_mem4) @@ -1798,7 +1798,7 @@ static MACHINE_CONFIG_START( xevious, xevious_state ) MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H")) MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0)) MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1)) - + MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2) /* 1.536 MHz */ MCFG_NAMCO_54XX_DISCRETE("discrete") MCFG_NAMCO_54XX_BASENODE(NODE_01) @@ -1806,10 +1806,10 @@ static MACHINE_CONFIG_START( xevious, xevious_state ) MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64) MCFG_NAMCO_06XX_MAINCPU("maincpu") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read)) - MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) + MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) MCFG_NAMCO_06XX_READ_2_CB(DEVREAD8("50xx", namco_50xx_device, read)) MCFG_NAMCO_06XX_READ_REQUEST_2_CB(DEVWRITELINE("50xx", namco_50xx_device, read_request)) - MCFG_NAMCO_06XX_WRITE_2_CB(DEVWRITE8("50xx", namco_50xx_device, write)) + MCFG_NAMCO_06XX_WRITE_2_CB(DEVWRITE8("50xx", namco_50xx_device, write)) MCFG_NAMCO_06XX_WRITE_3_CB(DEVWRITE8("54xx", namco_54xx_device, write)) MCFG_WATCHDOG_VBLANK_INIT(8) @@ -1855,7 +1855,7 @@ static MACHINE_CONFIG_DERIVED( battles, xevious ) MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64) MCFG_NAMCO_06XX_MAINCPU("maincpu") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read)) - MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) + MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(battles_mem4) @@ -1897,7 +1897,7 @@ static MACHINE_CONFIG_START( digdug, digdug_state ) MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H")) MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0)) MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1)) - + MCFG_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/6/2) /* 1.536 MHz */ MCFG_NAMCO_53XX_K_CB(READ8(galaga_state,custom_mod_r)) MCFG_NAMCO_53XX_INPUT_0_CB(IOPORT("DSWA")) @@ -1908,7 +1908,7 @@ static MACHINE_CONFIG_START( digdug, digdug_state ) MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64) MCFG_NAMCO_06XX_MAINCPU("maincpu") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read)) - MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) + MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write)) MCFG_NAMCO_06XX_READ_1_CB(DEVREAD8("53xx", namco_53xx_device, read)) MCFG_NAMCO_06XX_READ_REQUEST_1_CB(DEVWRITELINE("53xx", namco_53xx_device, read_request)) diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index 91889621814..cccce066a9c 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -103,7 +103,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index c0986b5aa1a..0ff118988ce 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -7001,8 +7001,8 @@ ROM_START( galaxbsf2 ) ROM_LOAD( "gal09.ic13", 0x2400, 0x0400, CRC(5876f695) SHA1(e8c0d13066cfe4a409293b9e1380513099b35330) ) ROM_REGION( 0x0400, "unknown", 0 ) - ROM_LOAD( "gal00eg.ic4", 0x0000, 0x0400, CRC(1038467f) SHA1(e34cc53a1203335cf9c9a94c3f96cab5a444a34a) ) // the first 0x100 bytes of this is ic41, the rest is different? should it bank in somehow to give extra features?? - + ROM_LOAD( "gal00eg.ic4", 0x0000, 0x0400, CRC(1038467f) SHA1(e34cc53a1203335cf9c9a94c3f96cab5a444a34a) ) // the first 0x100 bytes of this is ic41, the rest is different? should it bank in somehow to give extra features?? + ROM_REGION( 0x1000, "gfx1", 0 ) ROM_LOAD( "galaxian.1h", 0x0000, 0x0800, CRC(39fb43a4) SHA1(4755609bd974976f04855d51e08ec0d62ab4bc07) ) ROM_LOAD( "galaxian.1k", 0x0800, 0x0800, CRC(7e3f56a2) SHA1(a9795d8b7388f404f3b0e2c6ce15d713a4c5bafa) ) diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index 14eff3bd087..0c70b68e3cd 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -2550,7 +2550,7 @@ static MACHINE_CONFIG_START( drivfrcg, galaxold_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(galaxold_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim) @@ -2622,7 +2622,7 @@ static MACHINE_CONFIG_START( racknrol, galaxold_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxian) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) MCFG_SCREEN_UPDATE_DRIVER(galaxold_state, screen_update_galaxold) diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 429da6985a5..ee767622687 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -441,7 +441,7 @@ static MACHINE_CONFIG_START( galivan, galivan_state ) MCFG_PALETTE_ADD("palette", 8*16+16*16+256*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(galivan_state, galivan) - + MCFG_VIDEO_START_OVERRIDE(galivan_state,galivan) /* sound hardware */ diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index cd9e0abdb03..cfc02cd65c8 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -966,8 +966,8 @@ ROM_END ROM_START( galpani2e2 ) ROM_REGION( 0x100000, "maincpu", 0 ) /* CPU#1 Code */ - ROM_LOAD16_BYTE( "g000i1-u133-0.u133", 0x000000, 0x080000, CRC(7df7b759) SHA1(2479a6389649ee6042b175b71d7ed54bc116add5) ) //english version specific - ROM_LOAD16_BYTE( "g001i1-u134-0.u134", 0x000001, 0x080000, CRC(c92937c3) SHA1(0c9e894c0e23e319bd2d01ec573f02ed510e3ed6) ) //same as german version + ROM_LOAD16_BYTE( "g000i1-u133-0.u133", 0x000000, 0x080000, CRC(7df7b759) SHA1(2479a6389649ee6042b175b71d7ed54bc116add5) ) //english version specific + ROM_LOAD16_BYTE( "g001i1-u134-0.u134", 0x000001, 0x080000, CRC(c92937c3) SHA1(0c9e894c0e23e319bd2d01ec573f02ed510e3ed6) ) //same as german version ROM_REGION( 0x40000, "sub", 0 ) /* CPU#2 Code */ ROM_LOAD16_BYTE( "g002i1.125", 0x000000, 0x020000, CRC(a3034e1c) SHA1(493e4be36f2aea0083d5d37e16486ed66dab952e) ) diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index ad8bf7730cc..b8e6e72e01f 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -549,13 +549,13 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state ) MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS")) MCFG_NAMCO56XX_OUT_0_CB(WRITE8(gaplus_state, out_lamps0)) MCFG_NAMCO56XX_OUT_1_CB(WRITE8(gaplus_state, out_lamps1)) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO58XX, 0) MCFG_NAMCO58XX_IN_0_CB(IOPORT("DSWA_HIGH")) MCFG_NAMCO58XX_IN_1_CB(IOPORT("DSWB_LOW")) MCFG_NAMCO58XX_IN_2_CB(IOPORT("DSWB_HIGH")) MCFG_NAMCO58XX_IN_3_CB(IOPORT("DSWA_LOW")) - + MCFG_NAMCO_62XX_ADD("62xx", 24576000/6/2) /* totally made up - TODO: fix */ //MCFG_NAMCO_62XX_INPUT_0_CB(IOPORT("IN0L")) //MCFG_NAMCO_62XX_INPUT_1_CB(IOPORT("IN0H")) @@ -563,7 +563,7 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state ) //MCFG_NAMCO_62XX_INPUT_3_CB(IOPORT("IN1H")) //MCFG_NAMCO_62XX_OUTPUT_0_CB(WRITE8(gaplus_state,out_0)) //MCFG_NAMCO_62XX_OUTPUT_1_CB(WRITE8(gaplus_state,out_1)) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60.606060) @@ -597,7 +597,7 @@ static MACHINE_CONFIG_DERIVED( gaplusd, gaplus ) MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1")) MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_REPLACE("namcoio_2", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_0_CB(IOPORT("DSWA_HIGH")) MCFG_NAMCO56XX_IN_1_CB(IOPORT("DSWB_LOW")) @@ -616,7 +616,7 @@ static MACHINE_CONFIG_DERIVED( gapluso, gaplusd ) MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1")) MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_REPLACE("namcoio_2", NAMCO58XX, 0) MCFG_NAMCO58XX_IN_0_CB(IOPORT("DSWA_HIGH")) MCFG_NAMCO58XX_IN_1_CB(IOPORT("DSWB_LOW")) diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c index 46a4b2d9246..f3779db3ea0 100644 --- a/src/mame/drivers/gatron.c +++ b/src/mame/drivers/gatron.c @@ -19,7 +19,7 @@ * PCB1: PULL TABS. - + Board silkscreend: GAME-A-TRON CORP. @@ -72,7 +72,7 @@ Identified the unknown writes as a init sequence for 1x PSG sound device. The type/class is unknown due to almost all devices are plastic covered. - + * PCB 3: BINGO. The PCB doesn't looks like an official Game-A-Tron board. Maybe it's a bootleg, @@ -190,7 +190,7 @@ Press "LADY LUCK TICKET" (key X) to play with Lady Luck (center) Ticket. Press "BIG BAR TICKET" (key C) to play with Big Bar (right) Ticket. - + * Bingo: Pressing SERVICE 1 (key 9) you enter the Test/Settings Mode. You can test @@ -213,8 +213,8 @@ Press "CHANGE CARD" (key Z) to change for another card with a different set of numbers. Press "START" (key X) to start the game. Press "CHANGE GAME" (key C) to switch between games X-L-T-C-N-U. - - Note that letters in games X-L-T-C-N-U are just references to the shape of the special + + Note that letters in games X-L-T-C-N-U are just references to the shape of the special numbers group inside the card, which will play. You must setup double-ups to something different of 0 (default), to play with these @@ -253,9 +253,9 @@ [2014-02-04] - Added Bingo (1983). PCB seems bootleg, but the game looks legit. - - Worked from the scratch a whole set of inputs and button-lamps support for this game. + - Worked from the scratch a whole set of inputs and button-lamps support for this game. - Changed the poker41 description to Four in One Poker (as seen in the official brochure). - - Added game and technical notes. + - Added game and technical notes. [2008-10-14] - Improved the button-lamps layouts to look more realistic. @@ -625,4 +625,3 @@ ROM_END GAMEL( 1983, poker41, 0, gat, poker41, driver_device, 0, ROT0, "Game-A-Tron", "Four in One Poker", 0, layout_poker41 ) GAMEL( 1983, pulltabs, 0, gat, pulltabs, driver_device, 0, ROT0, "Game-A-Tron", "Pull Tabs", 0, layout_pulltabs ) GAMEL( 1983, bingo, 0, gat, bingo, driver_device, 0, ROT0, "Game-A-Tron?", "Bingo", 0, layout_bingo ) - diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 7431516fbe2..539ef48ed2b 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -257,10 +257,10 @@ void gbusters_state::machine_start() membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x2000); membank("bank1")->set_entry(0); - + m_paletteram.resize(0x800); m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - + save_item(NAME(m_paletteram)); save_item(NAME(m_palette_selected)); save_item(NAME(m_priority)); @@ -298,7 +298,7 @@ static MACHINE_CONFIG_START( gbusters, gbusters_state ) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(gbusters_state, screen_update_gbusters) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 654e90bcc44..af55244c708 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -1196,7 +1196,7 @@ static MACHINE_CONFIG_DERIVED( quizvid, findout ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(quizvid_map) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(gei_state,quizvid) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c index bfa46d205c2..68b7242b8d8 100644 --- a/src/mame/drivers/ggconnie.c +++ b/src/mame/drivers/ggconnie.c @@ -31,7 +31,7 @@ class ggconnie_state : public pce_common_state { public: ggconnie_state(const machine_config &mconfig, device_type type, const char *tag) - : pce_common_state(mconfig, type, tag), + : pce_common_state(mconfig, type, tag), m_rtc(*this, "rtc"), m_oki(*this, "oki") { } diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index 4c578e6a6a8..9ee64d97c83 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -273,7 +273,7 @@ WRITE8_MEMBER(ghosteo_state::s3c2410_nand_command_w ) case 0xFF : { nand.mode = NAND_M_INIT; - m_s3c2410->frnb_w(1); + m_s3c2410->frnb_w(1); } break; case 0x00 : diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 0c828b2c2f9..c79aa852c07 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -711,7 +711,7 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state ) MCFG_TAITO8741_MODES(TAITO8741_MASTER,TAITO8741_SLAVE,TAITO8741_PORT,TAITO8741_PORT) MCFG_TAITO8741_CONNECT(1,0,0,0) MCFG_TAITO8741_PORT_HANDLERS(READ8(gladiatr_state,gladiator_dsw1_r),READ8(gladiatr_state,gladiator_dsw2_r),READ8(gladiatr_state,gladiator_button3_r),READ8(gladiatr_state,gladiator_controls_r)) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index a342168bb0f..2fdc83e0ce9 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -62,7 +62,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index a331da037fa..539e38714b0 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -3410,8 +3410,8 @@ static INPUT_PORTS_START( mondial ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) /* the following one is connected to DIP switches and is meant - for switch between different programs stored in different - halves of the program ROM */ + for switch between different programs stored in different + halves of the program ROM */ PORT_START("SELDSW") PORT_DIPNAME( 0x01, 0x00, "Game Selector" ) PORT_DIPSETTING( 0x00, "Game 1 (Italian" ) @@ -4048,7 +4048,7 @@ ROM_START( videtron ) ROM_END ROM_START( videtron2 ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* different from videtron */ + ROM_REGION( 0x10000, "maincpu", 0 ) /* different from videtron */ ROM_LOAD( "4.bin", 0x5000, 0x1000, CRC(4a7dab42) SHA1(7fcdab985b783d90879a99b2a53a6814ca4278eb) ) ROM_LOAD( "5.bin", 0x6000, 0x1000, CRC(c70e8127) SHA1(7db2d4a29cba7c336f254393955fad71f30a539a) ) ROM_LOAD( "6.bin", 0x7000, 0x1000, CRC(490c7304) SHA1(1a6c6112571fd0e35b640ed58f66582a2d99c58b) ) @@ -10335,5 +10335,5 @@ GAME( 198?, pokerdub, 0, pottnpkr, goldnpkr, driver_device, 0, GAME( 198?, pokerduc, 0, goldnpkr, goldnpkr, goldnpkr_state, icp1db, ROT0, "", "unknown encrypted poker game", GAME_NOT_WORKING ) // encrypted. GAMEL( 198?, bchancep, 0, bchancep, goldnpkr, goldnpkr_state, bchancep, ROT0, "", "Bonne Chance! (Golden Poker prequel HW)", GAME_NOT_WORKING, layout_goldnpkr ) -GAME( 1987, pokermon, 0, mondial, mondial, driver_device, 0, ROT0, "", "Mundial/Mondial (Italian/French)", 0 ) // banked selectable program -GAME( 198?, pokersis, 0, bchancep, goldnpkr, driver_device, 0, ROT0, "Sisteme France", "unknown Sisteme France Poker", GAME_NOT_WORKING ) // fix banking (4 prgs?)... +GAME( 1987, pokermon, 0, mondial, mondial, driver_device, 0, ROT0, "", "Mundial/Mondial (Italian/French)", 0 ) // banked selectable program +GAME( 198?, pokersis, 0, bchancep, goldnpkr, driver_device, 0, ROT0, "Sisteme France", "unknown Sisteme France Poker", GAME_NOT_WORKING ) // fix banking (4 prgs?)... diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index f29b86563d1..b2c9cf34c23 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -155,7 +155,7 @@ WRITE8_MEMBER(goldstar_state::goldstar_lamps_w) output_set_lamp_value(4, (data >> 4) & 1); /* Stop 2 / Big / Bonus */ output_set_lamp_value(5, (data >> 5) & 1); /* Start / Stop All / Card 4 */ -// popmessage("lamps: %02X", data); +// popmessage("lamps: %02X", data); } WRITE8_MEMBER(goldstar_state::cb3_lamps_w) @@ -176,7 +176,7 @@ WRITE8_MEMBER(goldstar_state::cb3_lamps_w) output_set_lamp_value(4, (data >> 4) & 1); /* Stop 3 / Small / Info */ output_set_lamp_value(5, (data >> 5) & 1); /* Start / Stop All */ -// popmessage("lamps: %02X", data); +// popmessage("lamps: %02X", data); } @@ -244,8 +244,8 @@ static ADDRESS_MAP_START( ncb3_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE("aysnd", ay8910_device, data_r, data_w) AM_RANGE(0xf840, 0xf840) AM_DEVWRITE("aysnd", ay8910_device, address_w) - AM_RANGE(0xf850, 0xf850) AM_WRITE(cb3_lamps_w) /* Control Set 1 lamps */ - AM_RANGE(0xf860, 0xf860) AM_WRITE(cb3_lamps_w) /* Control Set 2 lamps */ + AM_RANGE(0xf850, 0xf850) AM_WRITE(cb3_lamps_w) /* Control Set 1 lamps */ + AM_RANGE(0xf860, 0xf860) AM_WRITE(cb3_lamps_w) /* Control Set 2 lamps */ AM_RANGE(0xf870, 0xf870) AM_DEVWRITE("snsnd", sn76489_device, write) /* guess... device is initialized, but doesn't seems to be used.*/ ADDRESS_MAP_END @@ -296,7 +296,7 @@ static ADDRESS_MAP_START( wcherry_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0x0000, 0xb7ff) AM_ROM AM_RANGE(0xb800, 0xbfff) AM_RAM AM_SHARE("nvram") AM_RANGE(0xc000, 0xc7ff) AM_ROM - + /* Video RAM and reels stuff are there just as placeholder, and obviously in wrong offset */ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(goldstar_fg_vidram_w ) AM_SHARE("fg_vidram") AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(goldstar_fg_atrram_w ) AM_SHARE("fg_atrram") @@ -307,15 +307,15 @@ static ADDRESS_MAP_START( wcherry_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xf080, 0xf0bf) AM_RAM AM_SHARE("reel2_scroll") AM_RANGE(0xf0c0, 0xf0ff) AM_RAM AM_SHARE("reel3_scroll") - /* Not really PPI's... They are emulated/simulated inside the CPLDs */ + /* Not really PPI's... They are emulated/simulated inside the CPLDs */ AM_RANGE(0xf600, 0xf603) AM_DEVREADWRITE("ppi8255_0", i8255_device, read, write) /* Input Ports */ AM_RANGE(0xf610, 0xf613) AM_DEVREADWRITE("ppi8255_1", i8255_device, read, write) /* Input Ports */ AM_RANGE(0xf620, 0xf623) AM_DEVREADWRITE("ppi8255_2", i8255_device, read, write) /* Input/Output Ports */ AM_RANGE(0xf630, 0xf630) AM_DEVREADWRITE("aysnd", ay8910_device, data_r, data_w) AM_RANGE(0xf640, 0xf640) AM_DEVWRITE("aysnd", ay8910_device, address_w) - AM_RANGE(0xf650, 0xf650) AM_WRITENOP // AM_WRITE(output_w) // unknown register: 0x3e - AM_RANGE(0xf660, 0xf660) AM_WRITENOP // AM_WRITE(output_w) // unknown register: 0x3e + AM_RANGE(0xf650, 0xf650) AM_WRITENOP // AM_WRITE(output_w) // unknown register: 0x3e + AM_RANGE(0xf660, 0xf660) AM_WRITENOP // AM_WRITE(output_w) // unknown register: 0x3e AM_RANGE(0xf670, 0xf670) AM_DEVWRITE("snsnd", sn76489_device, write) /* guess... device is initialized, but doesn't seems to be used.*/ AM_RANGE(0xf800, 0xffff) AM_RAM @@ -1714,8 +1714,8 @@ INPUT_PORTS_END static INPUT_PORTS_START( goldstar ) PORT_START("IN0") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // appear in the input test but seems that lack of functions. - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // appear in the input test but seems that lack of functions. + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // appear in the input test but seems that lack of functions. + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // appear in the input test but seems that lack of functions. PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_V) PORT_NAME("Bet Red / 2") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_CODE(KEYCODE_C) PORT_NAME("Stop 3 / Small / 1 / Info") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_B) PORT_NAME("Bet Blue / D-UP / 3") @@ -6507,9 +6507,9 @@ static MACHINE_CONFIG_START( super9, goldstar_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(goldstar_map) -// MCFG_CPU_PROGRAM_MAP(nfm_map) +// MCFG_CPU_PROGRAM_MAP(nfm_map) MCFG_CPU_IO_MAP(goldstar_readport) -// MCFG_CPU_IO_MAP(unkch_portmap) +// MCFG_CPU_IO_MAP(unkch_portmap) MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) /* video hardware */ @@ -7703,27 +7703,27 @@ ROM_START( goldfrui ) ROM_CONTINUE( 0x0000, 0x08000) /* Discarding 2nd quarter 0xff filled*/ ROM_CONTINUE( 0x0000, 0x08000) /* Discarding 3nd quarter 0xff filled*/ - ROM_REGION( 0x40000, "oki", 0 ) // Audio ADPCM + ROM_REGION( 0x40000, "oki", 0 ) // Audio ADPCM ROM_LOAD( "27c1000.u57", 0x0000, 0x20000, CRC(9d58960f) SHA1(c68edf95743e146398aabf6b9617d18e1f9bf25b) ) ROM_END /* - Super Nove by Playmark - - bp 2db - the next call ($0C33) hangs the game - since there are ascii strings there - instead of code. - + Super Nove by Playmark + + bp 2db + the next call ($0C33) hangs the game + since there are ascii strings there + instead of code. + */ ROM_START( super9 ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "27e010.30", 0x0000, 0x10000, CRC(1aaea8d3) SHA1(71395a6d74a7cd55606daa57d17ff4628aa5f577) ) - ROM_IGNORE( 0x10000) /* Discarding 2nd half */ -// ROM_LOAD( "27e010.30", 0x0000, 0x10000, CRC(1aaea8d3) SHA1(71395a6d74a7cd55606daa57d17ff4628aa5f577) ) -// ROM_CONTINUE( 0x0000, 0x10000) /* Discarding 1st half */ - + ROM_IGNORE( 0x10000) /* Discarding 2nd half */ +// ROM_LOAD( "27e010.30", 0x0000, 0x10000, CRC(1aaea8d3) SHA1(71395a6d74a7cd55606daa57d17ff4628aa5f577) ) +// ROM_CONTINUE( 0x0000, 0x10000) /* Discarding 1st half */ + ROM_REGION( 0x20000, "gfx1", 0 ) ROM_LOAD( "nearcpu.bin", 0x00000, 0x20000, CRC(643cff6f) SHA1(305ca9182c3f6d69e09be38b854b3d7bdfa75439) ) @@ -7732,7 +7732,7 @@ ROM_START( super9 ) ROM_CONTINUE( 0x0000, 0x08000) // Discarding 1nd quarter 0xff filled ROM_CONTINUE( 0x0000, 0x08000) // Discarding 2nd quarter 0xff filled ROM_CONTINUE( 0x0000, 0x08000) // Discarding 3nd quarter 0xff filled - + ROM_REGION( 0x40000, "oki", 0 ) /* Audio ADPCM */ ROM_LOAD( "27c1001.27", 0x0000, 0x20000, CRC(9d58960f) SHA1(c68edf95743e146398aabf6b9617d18e1f9bf25b) ) ROM_END @@ -7872,9 +7872,9 @@ ROM_START( cb3d ) ROM_LOAD( "4.5h", 0x06000, 0x02000, CRC(cbcc6bfb) SHA1(5bafc934fef1f50d8c182c39d3a7ce795c89d175) ) ROM_REGION( 0x0200, "proms", 0 ) - ROM_LOAD_NIB_LOW( "n82s129.13g", 0x0000, 0x0100, CRC(59ac98e4) SHA1(5fc0f1a48c49c956cdb8826e20663dc57a9175e4) ) // 1st bank colors, low 4 bits. - ROM_LOAD_NIB_HIGH( "n82s129.14g", 0x0000, 0x0100, CRC(0d8f35bd) SHA1(0c2a0145cdaaf9beabdce241731a36b0c65f18a2) ) // 1st bank colors, high 4 bits. - ROM_LOAD( "dm74s288.13d", 0x0080, 0x0020, CRC(77a85e21) SHA1(3b41e0ab7cc55c5d78914d23e8289383f5bd5654) ) // 2nd bank colors + ROM_LOAD_NIB_LOW( "n82s129.13g", 0x0000, 0x0100, CRC(59ac98e4) SHA1(5fc0f1a48c49c956cdb8826e20663dc57a9175e4) ) // 1st bank colors, low 4 bits. + ROM_LOAD_NIB_HIGH( "n82s129.14g", 0x0000, 0x0100, CRC(0d8f35bd) SHA1(0c2a0145cdaaf9beabdce241731a36b0c65f18a2) ) // 1st bank colors, high 4 bits. + ROM_LOAD( "dm74s288.13d", 0x0080, 0x0020, CRC(77a85e21) SHA1(3b41e0ab7cc55c5d78914d23e8289383f5bd5654) ) // 2nd bank colors ROM_END @@ -7885,7 +7885,7 @@ ROM_END 5x 8 DIP switches. 1x 12 MHz xtal. - ROM 3v202 is the prg. + ROM 3v202 is the prg. */ ROM_START( cb3e ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -7899,7 +7899,7 @@ ROM_START( cb3e ) ROM_REGION( 0x0200, "proms", 0 ) ROM_LOAD( "82s147.u1", 0x00000, 0x0100, CRC(d4eaa276) SHA1(b6598ee64ac3d41ca979c8667de8576cfb304451) ) - ROM_CONTINUE( 0x00000, 0x0100) // 2nd half has the data. + ROM_CONTINUE( 0x00000, 0x0100) // 2nd half has the data. ROM_END @@ -11614,7 +11614,7 @@ ROM_START( wcherry ) ROM_LOAD( "wincherrya.ic9", 0x00000, 0x08000, CRC(919bd692) SHA1(1aeb66f1e4555b731858833445000593e613f74d) ) ROM_REGION( 0x0200, "proms", 0 ) - ROM_LOAD( "am27c29pc", 0x00000, 0x0200, BAD_DUMP CRC(5c8f2b8f) SHA1(67d2121e75813dd85d83858c5fc5ec6ad9cc2a7d) ) // borrowed from other game. + ROM_LOAD( "am27c29pc", 0x00000, 0x0200, BAD_DUMP CRC(5c8f2b8f) SHA1(67d2121e75813dd85d83858c5fc5ec6ad9cc2a7d) ) // borrowed from other game. ROM_END @@ -12259,17 +12259,17 @@ DRIVER_INIT_MEMBER(goldstar_state, super9) UINT8 *src = memregion("gfx1")->base(); for (i = 0;i < 0x20000;i++) { -// src[i] = BITSWAP8(src[i], 7,4,2,1,6,5,3,0); -// src[i] = BITSWAP8(src[i], 7,3,2,6,1,5,4,0); +// src[i] = BITSWAP8(src[i], 7,4,2,1,6,5,3,0); +// src[i] = BITSWAP8(src[i], 7,3,2,6,1,5,4,0); src[i] = BITSWAP8(src[i], 7,3,2,6,5,1,4,0); } UINT8 *src2 = memregion("gfx2")->base(); for (i = 0;i < 0x8000;i++) { -// src2[i] = BITSWAP8(src2[i], 7,4,2,1,6,5,3,0); -// src2[i] = BITSWAP8(src2[i], 7,3,2,6,1,5,4,0); - src2[i] = BITSWAP8(src2[i], 3,7,6,2,5,1,0,4); // endianess +// src2[i] = BITSWAP8(src2[i], 7,4,2,1,6,5,3,0); +// src2[i] = BITSWAP8(src2[i], 7,3,2,6,1,5,4,0); + src2[i] = BITSWAP8(src2[i], 3,7,6,2,5,1,0,4); // endianess } } @@ -12289,18 +12289,18 @@ DRIVER_INIT_MEMBER(goldstar_state, cb3e) } /* bank 1 graphics */ -// int i; +// int i; UINT8 *src = memregion("gfx1")->base(); for (i = 0; i < 0x20000; i++) { - src[i] = BITSWAP8(src[i], 4, 3, 2, 5, 1, 6, 0, 7); // OK + src[i] = BITSWAP8(src[i], 4, 3, 2, 5, 1, 6, 0, 7); // OK } /* bank 2 graphics */ UINT8 *src2 = memregion("gfx2")->base(); for (i = 0; i < 0x8000; i++) { - src2[i] = BITSWAP8(src2[i], 3, 4, 2, 5, 1, 6, 0, 7); // OK + src2[i] = BITSWAP8(src2[i], 3, 4, 2, 5, 1, 6, 0, 7); // OK } } @@ -12311,14 +12311,14 @@ DRIVER_INIT_MEMBER(goldstar_state, wcherry) UINT8 *src = memregion("gfx1")->base(); for (i = 0; i < 0x20000; i++) { - src[i] = BITSWAP8(src[i], 4, 3, 2, 5, 1, 6, 0, 7); // OK + src[i] = BITSWAP8(src[i], 4, 3, 2, 5, 1, 6, 0, 7); // OK } /* bank 2 graphics */ UINT8 *src2 = memregion("gfx2")->base(); for (i = 0; i < 0x8000; i++) { - src2[i] = BITSWAP8(src2[i], 3, 4, 2, 5, 1, 6, 0, 7); // OK + src2[i] = BITSWAP8(src2[i], 3, 4, 2, 5, 1, 6, 0, 7); // OK } } @@ -12333,8 +12333,8 @@ GAMEL( 199?, goldstbl, goldstar, goldstbl, goldstar, driver_device, 0, GAME( 199?, moonlght, goldstar, moonlght, goldstar, driver_device, 0, ROT0, "bootleg", "Moon Light (bootleg of Golden Star)", 0 ) GAME( 199?, chrygld, 0, chrygld, chrygld, goldstar_state, chrygld, ROT0, "bootleg", "Cherry Gold I", 0 ) GAME( 199?, chry10, 0, chrygld, chry10, goldstar_state, chry10, ROT0, "bootleg", "Cherry 10 (bootleg with PIC16F84)", 0 ) -GAME( 199?, goldfrui, goldstar, goldfrui, goldstar, driver_device, 0, ROT0, "bootleg", "Gold Fruit", 0 ) // maybe fullname should be 'Gold Fruit (main 40%)' -GAME( 2001, super9, goldstar, super9, goldstar, goldstar_state, super9, ROT0, "Playmark", "Super Nove (Playmark)", GAME_NOT_WORKING) // need to decode gfx and see the program loops/reset... +GAME( 199?, goldfrui, goldstar, goldfrui, goldstar, driver_device, 0, ROT0, "bootleg", "Gold Fruit", 0 ) // maybe fullname should be 'Gold Fruit (main 40%)' +GAME( 2001, super9, goldstar, super9, goldstar, goldstar_state, super9, ROT0, "Playmark", "Super Nove (Playmark)", GAME_NOT_WORKING) // need to decode gfx and see the program loops/reset... GAME( 2001, wcherry, 0, wcherry, chrygld, goldstar_state, wcherry, ROT0, "bootleg", "Win Cherry (ver 0.16 - 19990219)", GAME_NOT_WORKING) diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index bd3f10c93b8..a0899f0ec8c 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -1,24 +1,24 @@ /******************************************************************** G-Stream (c)2002 Oriental Soft Japan - X2222 (prototype) (c)2000 Oriental Soft + X2222 (prototype) (c)2000 Oriental Soft - --- - X2222 has corrupt boss graphics because the program roms we use don't match the sprite roms. - -- + --- + X2222 has corrupt boss graphics because the program roms we use don't match the sprite roms. + -- Hyperstone based hardware Simple Sprites (16x16x8bpp tiles) 3 Simple Tilemaps (32x32x8bpp tiles) - X2222 uses raw 16bpp palette data instead of 8bpp indexed colours. + X2222 uses raw 16bpp palette data instead of 8bpp indexed colours. todo: sprite lag (sprites need buffering?) sprite wraparound is imperfect The following is confirmed on G-Stream only - --- + --- CPU: E1-32XT Sound: 2x AD-65 (OKIM6295 clone) @@ -41,7 +41,7 @@ --- Dump Notes::: - + G-Stream 2020, 2002 Oriental Soft Japan Shooter from Oriental soft, heavy influence from XII Stag @@ -146,7 +146,7 @@ public: m_workram(*this, "workram"), m_vram(*this, "vram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { m_toggle = 0; } @@ -172,8 +172,8 @@ public: /* misc */ int m_oki_bank_1; int m_oki_bank_2; - int m_toggle; - int m_xoffset; + int m_toggle; + int m_xoffset; DECLARE_WRITE32_MEMBER(gstream_vram_w); DECLARE_WRITE32_MEMBER(gstream_tilemap1_scrollx_w); @@ -201,7 +201,7 @@ public: void rearrange_sprite_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2); void rearrange_tile_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2); - + required_device m_gfxdecode; required_device m_palette; }; @@ -599,11 +599,10 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e code %= gfx->elements(); // render - + do { g_profiler.start(PROFILER_DRAWGFX); do { - const UINT8 *srcdata, *srcdata2; INT32 destendx, destendy; INT32 srcx, srcy; @@ -695,7 +694,7 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e { UINT32 srcdata = (srcptr[0]); UINT32 srcdata2 = (srcptr2[0]); - + UINT32 fullval = (srcdata | (srcdata2 << 8)); UINT32 r = ((fullval >> 0) & 0x1f) << 3; UINT32 g = ((fullval >> 5) & 0x3f) << 2; @@ -703,7 +702,7 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e UINT32 full = (r << 16) | (g << 8) | (b << 0); if (full != 0) destptr[0] = full; - + srcptr++; srcptr2++; destptr++; @@ -729,7 +728,7 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e { UINT32 srcdata = (srcptr[0]); UINT32 srcdata2 = (srcptr2[0]); - + UINT32 fullval = (srcdata | (srcdata2 << 8)); UINT32 r = ((fullval >> 0) & 0x1f) << 3; UINT32 g = ((fullval >> 5) & 0x3f) << 2; @@ -737,7 +736,7 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e UINT32 full = (r << 16) | (g << 8) | (b << 0); if (full != 0) destptr[0] = full; - + srcptr--; srcptr2--; destptr++; @@ -766,7 +765,7 @@ void gstream_state::draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &clipr int vram_data = (ram[(basex&0x0f)+((basey&0x0f)*0x10)]); int pal = (vram_data & 0xc0000000) >> 30; int code = (vram_data & 0x0fff0000) >> 16; - + pal += palbase; if (m_gfxdecode->gfx(map+5)) @@ -806,7 +805,7 @@ UINT32 gstream_state::screen_update_gstream(screen_device &screen, bitmap_rgb32 draw_bg_gstream(bitmap, cliprect, m_tmap3_scrollx >> 16, m_tmap3_scrolly >> 16, 2, m_vram + 0x800/4, 0x18); - draw_bg_gstream(bitmap, cliprect, m_tmap2_scrollx >> 16, m_tmap2_scrolly >> 16, 1, m_vram + 0x400/4, 0x14); + draw_bg_gstream(bitmap, cliprect, m_tmap2_scrollx >> 16, m_tmap2_scrolly >> 16, 1, m_vram + 0x400/4, 0x14); draw_bg_gstream(bitmap, cliprect, m_tmap1_scrollx >> 16, m_tmap1_scrolly >> 16, 0, m_vram + 0x000/4, 0x10); // move on top for x2222 , check @@ -907,7 +906,7 @@ static MACHINE_CONFIG_START( x2222, gstream_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", gstream_state, irq0_line_hold) -// MCFG_NVRAM_ADD_1FILL("nvram") +// MCFG_NVRAM_ADD_1FILL("nvram") /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -979,7 +978,7 @@ ROM_START( x2222 ) ROM_REGION32_BE( 0x0200000, "misc", 0 ) /* other code */ ROM_LOAD( "test.hye", 0x000000, 0x0112dda, CRC(c1142b2f) SHA1(5807930820a53604013a6ac66e4d4ebe3628e1fc) ) // the above binary was built from this - + /* x2222 uses raw rgb16 data rather than 8bpp indexed, in order to use the same gfx decodes with a custom draw routine we arrange the data into 2 8bpp regions on init */ ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) /* sprite tiles (16x16x8) */ /* filled in at init*/ @@ -1041,7 +1040,7 @@ ROM_START( x2222o ) ROM_REGION32_BE( 0x0200000, "misc", 0 ) /* other code */ ROM_LOAD( "older.hye", 0x000000, 0x010892f, CRC(cf3a004e) SHA1(1cba64cfa235b9540f33a5ee0cc02dfd267e00fc) ) // this corresponds to the older.bin we're using, for reference - + /* x2222 uses raw rgb16 data rather than 8bpp indexed, in order to use the same gfx decodes with a custom draw routine we arrange the data into 2 8bpp regions on init */ ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) /* sprite tiles (16x16x8) */ /* filled in at init*/ diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index f131dba361c..51d5c10f396 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -703,7 +703,7 @@ static MACHINE_CONFIG_START( josvolly, gsword_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", gsword_state, irq0_line_hold) MCFG_MACHINE_RESET_OVERRIDE(gsword_state,josvolly) - + MCFG_JOSVOLLY8741_ADD("josvolly_8741") MCFG_JOSVOLLY8741_CONNECT(1,0,0,0) MCFG_JOSVOLLY8741_PORT_HANDLERS(IOPORT("DSW1"),IOPORT("DSW2"),IOPORT("DSW1"),IOPORT("DSW2")) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 173aa55958c..dcb8deb7588 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -260,7 +260,7 @@ public: required_device m_dsp; optional_device m_dsp2; required_device m_k056800; - required_device m_adc1038; + required_device m_adc1038; required_device m_eeprom; required_device m_palette; @@ -1108,11 +1108,11 @@ static MACHINE_CONFIG_START( hangplt, gticlub_state ) MCFG_SCREEN_UPDATE_DRIVER(gticlub_state, screen_update_hangplt) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K001604_ADD("k001604_1", hangplt_k001604_intf_l) MCFG_K001604_GFXDECODE("gfxdecode") MCFG_K001604_PALETTE("palette") - + MCFG_K001604_ADD("k001604_2", hangplt_k001604_intf_r) MCFG_K001604_GFXDECODE("gfxdecode") MCFG_K001604_PALETTE("palette") diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c index 09581f5e5ce..0b3d6405e5f 100644 --- a/src/mame/drivers/gunpey.c +++ b/src/mame/drivers/gunpey.c @@ -202,7 +202,7 @@ public: m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), m_wram(*this, "wram"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index 48c1f16435d..aff853a873c 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -313,7 +313,7 @@ static MACHINE_CONFIG_START( gunsmoke, gunsmoke_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", gunsmoke) - + MCFG_PALETTE_ADD("palette", 32*4+16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(gunsmoke_state, gunsmoke) diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 3345fc56f9d..f0952306428 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -247,7 +247,7 @@ public: offs_t m_collision_detection; int m_latch_delay; dynamic_array m_paletteram; - + DECLARE_WRITE8_MEMBER(bgtile_w); DECLARE_READ8_MEMBER(blitter_status_r); DECLARE_READ8_MEMBER(blitter_r); @@ -1282,10 +1282,10 @@ void halleys_state::video_start() m_alpha_table[(src<<8)+dst] = c | BG_RGB; } - + m_paletteram.resize(m_palette->entries()); m_palette->basemem().set(m_paletteram, ENDIANNESS_LITTLE, 1); - + m_bgcolor = m_palette->black_pen(); } diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index eec9bf14eb8..92a399284bc 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -1626,7 +1626,7 @@ ROM_START( magicbom ) ROM_LOAD( "sound-magic-bomb-hmb-vers1-memory-4m.ic16", 0x00000, 0x80000, CRC(45b2b53a) SHA1(983bcc5869d84938ba278f26339dd72c17ed1d00) ) ROM_END -ROM_START( record ) // do checks and expect something... pc=e8044 +ROM_START( record ) // do checks and expect something... pc=e8044 ROM_REGION( 0x100000, "user1", 0 ) /* V30 Code */ ROM_LOAD16_BYTE( "record-vrc-i17-vers1-video-map.ic7", 0x00000, 0x80000, CRC(d0e59a64) SHA1(5f51448a4cdefd335e19affa4b47df7b428b0e7c) ) ROM_LOAD16_BYTE( "record-vrc-i17-vers1-video-map.ic8", 0x00001, 0x80000, CRC(823d1c25) SHA1(3104567b2b05708d1b5218f9f0e64bfa3d0df46b) ) @@ -1644,9 +1644,9 @@ READ16_MEMBER(highvdeo_state::record_status_r) switch(offset*2) { case 0: - resetpulse^=0x15; // and 0x07, cmp with 0x05 + resetpulse^=0x15; // and 0x07, cmp with 0x05 return 0 | resetpulse; - case 2: return 0x15; // unknown + case 2: return 0x15; // unknown } return 0; diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index fbb27e4d3e6..dba03547db2 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -650,7 +650,7 @@ READ32_MEMBER(hng64_state::fight_io_r) switch (offset*4) { - case 0x000: return 0x00000400; + case 0x000: return 0x00000400; case 0x004: return ioport("SYSTEM")->read(); case 0x008: return ioport("P1_P2")->read(); case 0x600: return m_no_machine_error_code; @@ -919,12 +919,12 @@ WRITE32_MEMBER(hng64_state::dl_control_w) // This handles framebuffers { //if(data & 2) // swap buffers //{ - // clear3d(); + // clear3d(); //} -// printf("%02x\n",data); +// printf("%02x\n",data); -// if(data & 1) // process DMA from 3d FIFO to framebuffer +// if(data & 1) // process DMA from 3d FIFO to framebuffer // if(data & 4) // reset buffer count } @@ -984,11 +984,11 @@ READ32_MEMBER(hng64_state::tcram_r) */ READ32_MEMBER(hng64_state::unk_vreg_r) { -// m_unk_vreg_toggle^=0x8000; +// m_unk_vreg_toggle^=0x8000; return 0; -// return ++m_unk_vreg_toggle; +// return ++m_unk_vreg_toggle; } /***** I don't think there is a soundram2, having it NOT hooked up causes xrally to copy the sound program to the expected location, see memory map note *****/ @@ -1890,11 +1890,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(hng64_state::hng64_irq) switch(scanline) { - case 224*2: m_set_irq(0x0001); break; // lv 0 vblank irq -// case 0*2: m_set_irq(0x0002); break; // lv 1 -// case 32*2: m_set_irq(0x0008); break; // lv 2 -// case 64*2: m_set_irq(0x0008); break; // lv 2 - case 128*2: m_set_irq(0x0800); break; // lv 11 network irq? + case 224*2: m_set_irq(0x0001); break; // lv 0 vblank irq +// case 0*2: m_set_irq(0x0002); break; // lv 1 +// case 32*2: m_set_irq(0x0008); break; // lv 2 +// case 64*2: m_set_irq(0x0008); break; // lv 2 + case 128*2: m_set_irq(0x0800); break; // lv 11 network irq? } } @@ -1923,11 +1923,11 @@ void hng64_state::machine_reset() m_audiocpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); -// m_comm->set_input_line(INPUT_LINE_RESET, PULSE_LINE); // reset the CPU and let 'er rip +// m_comm->set_input_line(INPUT_LINE_RESET, PULSE_LINE); // reset the CPU and let 'er rip // m_comm->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); // hold on there pardner... // "Display List" init - ugly -// m_activeBuffer = 0; +// m_activeBuffer = 0; /* For simulate MCU stepping */ m_mcu_fake_time = 0; @@ -1955,7 +1955,7 @@ static MACHINE_CONFIG_START( hng64, hng64_state ) MCFG_CPU_IO_MAP(hng_comm_io_map) MCFG_NVRAM_ADD_0FILL("nvram") - + MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) MCFG_GFXDECODE_ADD("gfxdecode", "palette", hng64) diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 759eff2130b..53b63ee0d4d 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -1002,7 +1002,7 @@ static MACHINE_CONFIG_START( hornet, hornet_state ) MCFG_PALETTE_ADD("palette", 65536) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K037122_ADD("k037122_1", "screen", 0) MCFG_K037122_GFXDECODE("gfxdecode") MCFG_K037122_PALETTE("palette") @@ -1077,7 +1077,7 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet ) MCFG_K037122_ADD("k037122_1", "lscreen", 0) MCFG_K037122_GFXDECODE("gfxdecode") MCFG_K037122_PALETTE("palette") - + MCFG_K037122_ADD("k037122_2", "rscreen", 1) MCFG_K037122_GFXDECODE("gfxdecode") MCFG_K037122_PALETTE("palette") diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c index 22bc937e3b3..9b90247effd 100644 --- a/src/mame/drivers/hshavoc.c +++ b/src/mame/drivers/hshavoc.c @@ -222,7 +222,7 @@ DRIVER_INIT_MEMBER(md_boot_state,hshavoc) } DRIVER_INIT_CALL(megadriv); - + m_vdp->stop_timers(); } diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 5ed1dcc67ae..5c2581fbd45 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -111,7 +111,7 @@ public: required_device m_pandora; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(trigger_nmi_on_slave_cpu); DECLARE_WRITE8_MEMBER(master_bankswitch_w); DECLARE_WRITE8_MEMBER(mermaid_data_w); diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index f7f0d408189..4dca646c5f0 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -345,7 +345,7 @@ static MACHINE_CONFIG_DERIVED( roadf, hyperspt ) MCFG_CPU_PROGRAM_MAP(roadf_map) MCFG_GFXDECODE_MODIFY("gfxdecode", roadf) MCFG_VIDEO_START_OVERRIDE(hyperspt_state,roadf) - + MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(roadf_sound_map) MCFG_DEVICE_REMOVE("vlm") diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index edbc7a04c41..24e6ba481ed 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -79,7 +79,7 @@ public: optional_device m_igs022; // Mj Shuang Long Qiang Zhu 2 required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; void igs025_to_igs022_callback( void ); int m_toggle; diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 36b76fff74d..b480d8ac77c 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -203,7 +203,6 @@ void igs_m027_state::video_start() void igs_m027_state::video_start_fearless() { - } UINT32 igs_m027_state::screen_update_igs_majhong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index e494ba8c0a9..4582c5a70f0 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -90,7 +90,7 @@ public: required_shared_ptr m_fg_color_ram; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; int m_nmi_enable; int m_bg_enable; int m_hopper; diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index 3d2d8670335..eec997db616 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( ikki, ikki_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(32*8, 32*8+3*8) - MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(ikki_state, screen_update_ikki) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index 63e4cc02507..4f2220c434c 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -24,7 +24,7 @@ public: m_subcpu(*this,"subcpu"), m_vram(*this, "vram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c index 83938b333e4..0e2d0cd3728 100644 --- a/src/mame/drivers/itgambl3.c +++ b/src/mame/drivers/itgambl3.c @@ -483,26 +483,26 @@ ROM_START( x5jokers ) /* CPU and clock should be changed for this game */ ROM_LOAD( "xfivejs.u29", 0x00000, 0x80000, CRC(67d51cb4) SHA1(9182a63473a32a9ad91a7a6a47d5a5d965e3cb03) ) ROM_END -ROM_START( queenotg ) +ROM_START( queenotg ) ROM_REGION( 0x1000000, "maincpu", 0 ) /* all the program code is in here */ ROM_LOAD( "queenotg_m30624fgafp.mcu", 0x00000, 0x4000, NO_DUMP ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "gfx1", 0 ) ROM_LOAD( "u22.bin", 0x000000, 0x200000, CRC(b9bd0fac) SHA1(ce6a6d85e9ae47860cc6d270d8d563df58146b74) ) - ROM_REGION( 0x80000, "oki", 0 ) + ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "u3.bin", 0x00000, 0x20000, CRC(f318927e) SHA1(f47ec9eb995b28403066fb2b66aad98c044676bc) ) ROM_END -ROM_START( ejollyx9 ) +ROM_START( ejollyx9 ) ROM_REGION( 0x1000000, "maincpu", 0 ) /* all the program code is in here */ ROM_LOAD( "ejollyx9_m30624fgafp.mcu", 0x00000, 0x4000, NO_DUMP ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "gfx1", 0 ) ROM_LOAD( "nm.u22", 0x000000, 0x200000, CRC(86b86a98) SHA1(cff4e79aaacad79e17e4dc52f2c14755424a2567) ) - ROM_REGION( 0x80000, "oki", 0 ) + ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "nm.u3", 0x00000, 0x80000, CRC(0529696b) SHA1(7e182051baae0b7de1f5a2c18f1b68b695f339d8) ) ROM_END @@ -518,4 +518,3 @@ GAME( 200?, supjolly, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "", "Queen of the Games", GAME_IS_SKELETON ) GAME( 200?, ejollyx9, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "Solar Games", "Euro Jolly X9", GAME_IS_SKELETON ) - diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c index a780a3b362f..1c12997c2cf 100644 --- a/src/mame/drivers/itgamble.c +++ b/src/mame/drivers/itgamble.c @@ -65,7 +65,7 @@ public: itgamble_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 1f2ad39ea1b..6707dc4e02a 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -76,7 +76,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + int m_exp_bank; tilemap_t *m_fg_tilemap; tilemap_t *m_reel1_tilemap; diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c index 47be6834e07..fd198847bc2 100644 --- a/src/mame/drivers/jclub2.c +++ b/src/mame/drivers/jclub2.c @@ -293,14 +293,13 @@ UINT32 darkhors_state::screen_update_darkhors(screen_device &screen, bitmap_ind1 ***************************************************************************/ -WRITE32_MEMBER(darkhors_state::jclub2o_eeprom_w) //seiko s-2929 is used on old style pcb +WRITE32_MEMBER(darkhors_state::jclub2o_eeprom_w) //seiko s-2929 is used on old style pcb { if (data & ~0xff000000) logerror("%s: Unknown EEPROM bit written %08X\n",machine().describe_context(),data); - + if ( ACCESSING_BITS_24_31 ) { - // latch the bit m_eeprom->di_write((data & 0x01000000) >> 24); @@ -355,7 +354,6 @@ static int mask_to_bit( int mask ) READ32_MEMBER(darkhors_state::darkhors_input_sel_r) { - // from bit mask to bit number int bit_p1 = mask_to_bit((m_input_sel & 0x00ff0000) >> 16); int bit_p2 = mask_to_bit((m_input_sel & 0xff000000) >> 24); @@ -371,7 +369,6 @@ READ32_MEMBER(darkhors_state::p_580004) { UINT32 ret = ioport("580004")->read()& 0x00ffffff; switch (m_input_sel_jc_2p){ - case 0x01: return ret | (ioport("580004-01")->read()<<24); case 0x02: return ret | (ioport("580004-02")->read()<<24); case 0x04: return ret | (ioport("580004-04")->read()<<24); @@ -381,7 +378,7 @@ switch (m_input_sel_jc_2p){ case 0x40: return ret | (ioport("580004-40")->read()<<24); case 0x80: return ret | (ioport("580004-80")->read()<<24); } - + return ret; } @@ -390,7 +387,6 @@ READ32_MEMBER(darkhors_state::p_4e0000) { UINT32 ret = ioport("4E0000")->read()& 0x00ffffff; switch (m_input_sel_jc_2p){ - case 0x01: return ret | (ioport("4E0000-01")->read()<<24); case 0x02: return ret | (ioport("4E0000-02")->read()<<24); case 0x04: return ret | (ioport("4E0000-04")->read()<<24); @@ -456,24 +452,24 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jclub2_map, AS_PROGRAM, 32, darkhors_state ) AM_RANGE(0x000000, 0x1fffff) AM_ROM - AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_SHARE("nvram") //all 68k ram is battery backup + AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_SHARE("nvram") //all 68k ram is battery backup //AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_RANGE(0x490000, 0x490003) AM_WRITE(darkhors_eeprom_w) - AM_RANGE(0x4E0000, 0x4E0003) AM_READ(p_4e0000) //input 2p + AM_RANGE(0x4E0000, 0x4E0003) AM_READ(p_4e0000) //input 2p AM_RANGE(0x4E0000, 0x4E0003) AM_WRITE(jclub2_input_sel_w_p1) - AM_RANGE(0x580000, 0x580003) AM_READ_PORT("580000") //eeprom related? - AM_RANGE(0x580004, 0x580007) AM_READ(p_580004) //system + some 1p input here - AM_RANGE(0x580008, 0x58000b) AM_READ_PORT("580008") //input 1p + coins + AM_RANGE(0x580000, 0x580003) AM_READ_PORT("580000") //eeprom related? + AM_RANGE(0x580004, 0x580007) AM_READ(p_580004) //system + some 1p input here + AM_RANGE(0x580008, 0x58000b) AM_READ_PORT("580008") //input 1p + coins AM_RANGE(0x58000c, 0x58000f) AM_WRITE(jclub2_input_sel_w_p2) - AM_RANGE(0x580200, 0x580203) AM_READNOP //???? + AM_RANGE(0x580200, 0x580203) AM_READNOP //???? AM_RANGE(0x800000, 0x87ffff) AM_DEVREADWRITE16( "st0020_spr", st0020_device, st0020_sprram_r, st0020_sprram_w, 0xffffffff ); AM_RANGE(0x880000, 0x89ffff) AM_RAM AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x8a0000, 0x8bffff) AM_RAM // this should still be palette ram! -// AM_RANGE(0x8C0000, 0x8C00ff) AM_DEVREADWRITE16( "st0020_spr", st0020_device, st0020_blitram_r, st0020_blitram_w, 0xffffffff ); +// AM_RANGE(0x8C0000, 0x8C00ff) AM_DEVREADWRITE16( "st0020_spr", st0020_device, st0020_blitram_r, st0020_blitram_w, 0xffffffff ); AM_RANGE(0x8E0000, 0x8E01ff) AM_RAM AM_RANGE(0x900000, 0x9fffff) AM_DEVREADWRITE16( "st0020_spr", st0020_device, st0020_gfxram_r, st0020_gfxram_w, 0xffffffff ); @@ -483,20 +479,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jclub2o_map, AS_PROGRAM, 32, darkhors_state ) - + AM_RANGE(0x000000, 0x1fffff) AM_ROM - AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_SHARE("nvram") //all 68k ram is battery backup + AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_SHARE("nvram") //all 68k ram is battery backup //AM_RANGE(0x400000, 0x41ffff) AM_RAM - - AM_RANGE(0x490000, 0x490003) AM_WRITE(jclub2o_eeprom_w) //eeprom s2929 not 93c46 - AM_RANGE(0x4E0000, 0x4E0003) AM_READ(p_4e0000) //input 2p + + AM_RANGE(0x490000, 0x490003) AM_WRITE(jclub2o_eeprom_w) //eeprom s2929 not 93c46 + AM_RANGE(0x4E0000, 0x4E0003) AM_READ(p_4e0000) //input 2p AM_RANGE(0x4E0000, 0x4E0003) AM_WRITE(jclub2_input_sel_w_p1) - AM_RANGE(0x580000, 0x580003) AM_READ_PORT("580000") //eeprom read - AM_RANGE(0x580004, 0x580007) AM_READ(p_580004) //system + some 1p keyboard input here - AM_RANGE(0x580008, 0x58000b) AM_READ_PORT("580008") //input 1p + coins + AM_RANGE(0x580000, 0x580003) AM_READ_PORT("580000") //eeprom read + AM_RANGE(0x580004, 0x580007) AM_READ(p_580004) //system + some 1p keyboard input here + AM_RANGE(0x580008, 0x58000b) AM_READ_PORT("580008") //input 1p + coins AM_RANGE(0x58000c, 0x58000f) AM_WRITE(jclub2_input_sel_w_p2) - - AM_RANGE(0x580200, 0x580203) AM_READNOP //???? + + AM_RANGE(0x580200, 0x580203) AM_READNOP //???? AM_RANGE(0x600000, 0x67ffff) AM_DEVREADWRITE16( "st0020_spr", st0020_device, st0020_sprram_r, st0020_sprram_w, 0xffffffff ); AM_RANGE(0x680000, 0x69ffff) AM_RAM AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") @@ -722,50 +718,50 @@ INPUT_PORTS_END static INPUT_PORTS_START( jclub2 ) - + PORT_START("580000") PORT_BIT( 0x7fffffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read) PORT_START("580008") PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Payout") PORT_CODE(KEYCODE_LCONTROL) // payout 1p + PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Payout") PORT_CODE(KEYCODE_LCONTROL) // payout 1p PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? - PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_START1 ) // start 1p + PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_START1 ) // start 1p PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? - PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 coin out") PORT_CODE(KEYCODE_RSHIFT) //coin out 2p - PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 coin out") PORT_CODE(KEYCODE_LSHIFT) //coin out 1p + PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 coin out") PORT_CODE(KEYCODE_RSHIFT) //coin out 2p + PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 coin out") PORT_CODE(KEYCODE_LSHIFT) //coin out 1p PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? - PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_COIN1 ) //1p coin drop - PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_COIN3 ) //2p coin drop - PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_COIN1 ) //1p coin in s1 - PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_COIN2 ) //1p coin in s2 - PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_COIN3 ) //2p coin in s1 - PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_COIN4 ) //2p coin in s2 + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_COIN1 ) //1p coin drop + PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_COIN3 ) //2p coin drop + PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_COIN1 ) //1p coin in s1 + PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_COIN2 ) //1p coin in s2 + PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_COIN3 ) //2p coin in s1 + PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_COIN4 ) //2p coin in s2 PORT_START("580004") PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_SERVICE2 ) //reset - PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_SERVICE3 ) //meter - PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_SERVICE4 ) //last game + PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_SERVICE2 ) //reset + PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_SERVICE3 ) //meter + PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_SERVICE4 ) //last game PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Cancel") PORT_CODE(KEYCODE_LALT) // cancel 1p - PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) //test + PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) //test PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? - PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 hopper full") PORT_CODE(KEYCODE_CLOSEBRACE) //hopper full 2p - PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 hopper full") PORT_CODE(KEYCODE_OPENBRACE) //hopper full 1p - PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p - - PORT_START("580004-01") //1P + PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 hopper full") PORT_CODE(KEYCODE_CLOSEBRACE) //hopper full 2p + PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 hopper full") PORT_CODE(KEYCODE_OPENBRACE) //hopper full 1p + PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 1p + + PORT_START("580004-01") //1P PORT_BIT( 0x00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1") PORT_CODE(KEYCODE_1_PAD) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2") PORT_CODE(KEYCODE_2_PAD) @@ -776,7 +772,7 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 7") PORT_CODE(KEYCODE_7_PAD) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 8") PORT_CODE(KEYCODE_8_PAD) - PORT_START("580004-02") //1P + PORT_START("580004-02") //1P PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-2") PORT_CODE(KEYCODE_Q) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-3") PORT_CODE(KEYCODE_W) @@ -785,9 +781,9 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-6") PORT_CODE(KEYCODE_T) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-7") PORT_CODE(KEYCODE_Y) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-8") PORT_CODE(KEYCODE_U) - - PORT_START("580004-04") //1P + + PORT_START("580004-04") //1P PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-3") PORT_CODE(KEYCODE_I) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-4") PORT_CODE(KEYCODE_O) @@ -795,8 +791,8 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-6") PORT_CODE(KEYCODE_S) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-7") PORT_CODE(KEYCODE_D) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-8") PORT_CODE(KEYCODE_F) - - PORT_START("580004-08") //1P + + PORT_START("580004-08") //1P PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-4") PORT_CODE(KEYCODE_G) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-5") PORT_CODE(KEYCODE_H) @@ -804,52 +800,52 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-7") PORT_CODE(KEYCODE_K) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-8") PORT_CODE(KEYCODE_L) - PORT_START("580004-10") //1P + PORT_START("580004-10") //1P PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-5") PORT_CODE(KEYCODE_Z) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-6") PORT_CODE(KEYCODE_X) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-7") PORT_CODE(KEYCODE_C) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-8") PORT_CODE(KEYCODE_V) - - PORT_START("580004-20") //1P + + PORT_START("580004-20") //1P PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 5-6") PORT_CODE(KEYCODE_B) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 5-7") PORT_CODE(KEYCODE_N) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 5-8") PORT_CODE(KEYCODE_M) - - PORT_START("580004-40") //1P - PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("580004-40") //1P + PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 6-7") PORT_CODE(KEYCODE_COMMA) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 6-8") PORT_CODE(KEYCODE_STOP) - - PORT_START("580004-80") //1P + + PORT_START("580004-80") //1P PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 7-8") PORT_CODE(KEYCODE_SLASH) PORT_START("4E0000") // 4E0000 PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Payout") PORT_CODE(KEYCODE_RCONTROL) // payout 2p + PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Payout") PORT_CODE(KEYCODE_RCONTROL) // payout 2p PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? - PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_START2 ) // start 2p + PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_START2 ) // start 2p PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? - PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Cancel") PORT_CODE(KEYCODE_RALT) // cancel 2p + PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Cancel") PORT_CODE(KEYCODE_RALT) // cancel 2p PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //unused??? - PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p - - PORT_START("4E0000-01") //2P + PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) //keyboard input 2p + + PORT_START("4E0000-01") //2P PORT_BIT( 0x00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 1") PORT_CODE(KEYCODE_1_PAD) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 2") PORT_CODE(KEYCODE_2_PAD) @@ -860,7 +856,7 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 7") PORT_CODE(KEYCODE_7_PAD) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 8") PORT_CODE(KEYCODE_8_PAD) - PORT_START("4E0000-02") //2P + PORT_START("4E0000-02") //2P PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 1-2") PORT_CODE(KEYCODE_Q) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 1-3") PORT_CODE(KEYCODE_W) @@ -869,9 +865,9 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 1-6") PORT_CODE(KEYCODE_T) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 1-7") PORT_CODE(KEYCODE_Y) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 1-8") PORT_CODE(KEYCODE_U) - - PORT_START("4E0000-04") //2P + + PORT_START("4E0000-04") //2P PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 2-3") PORT_CODE(KEYCODE_I) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 2-4") PORT_CODE(KEYCODE_O) @@ -879,8 +875,8 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 2-6") PORT_CODE(KEYCODE_S) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 2-7") PORT_CODE(KEYCODE_D) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 2-8") PORT_CODE(KEYCODE_F) - - PORT_START("4E0000-08") //2P + + PORT_START("4E0000-08") //2P PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 3-4") PORT_CODE(KEYCODE_G) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 3-5") PORT_CODE(KEYCODE_H) @@ -888,26 +884,26 @@ static INPUT_PORTS_START( jclub2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 3-7") PORT_CODE(KEYCODE_K) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 3-8") PORT_CODE(KEYCODE_L) - PORT_START("4E0000-10") //2P + PORT_START("4E0000-10") //2P PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 4-5") PORT_CODE(KEYCODE_Z) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 4-6") PORT_CODE(KEYCODE_X) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 4-7") PORT_CODE(KEYCODE_C) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 4-8") PORT_CODE(KEYCODE_V) - - PORT_START("4E0000-20") //2P + + PORT_START("4E0000-20") //2P PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 5-6") PORT_CODE(KEYCODE_B) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 5-7") PORT_CODE(KEYCODE_N) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 5-8") PORT_CODE(KEYCODE_M) - - PORT_START("4E0000-40") //2P + + PORT_START("4E0000-40") //2P PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 6-7") PORT_CODE(KEYCODE_COMMA) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 6-8") PORT_CODE(KEYCODE_STOP) - - PORT_START("4E0000-80") //2P + + PORT_START("4E0000-80") //2P PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 7-8") PORT_CODE(KEYCODE_SLASH) INPUT_PORTS_END @@ -1023,7 +1019,7 @@ static MACHINE_CONFIG_START( jclub2, darkhors_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + // NOT an ST0020 but instead ST0032, ram format isn't compatible at least MCFG_DEVICE_ADD("st0020_spr", ST0020_SPRITES, 0) st0020_device::set_is_st0032(*device, 1); @@ -1085,8 +1081,8 @@ static MACHINE_CONFIG_START( jclub2o, darkhors_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", darkhors_state, irq0_line_hold) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_EEPROM_SERIAL_93C56_ADD("eeprom") //not correct - + MCFG_EEPROM_SERIAL_93C56_ADD("eeprom") //not correct + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1098,9 +1094,9 @@ static MACHINE_CONFIG_START( jclub2o, darkhors_state ) MCFG_PALETTE_ADD("palette", 0x10000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_DEVICE_ADD("st0020_spr", ST0020_SPRITES, 0) st0020_device::set_is_jclub2o(*device, 1); MCFG_ST0020_SPRITES_GFXDECODE("gfxdecode") @@ -1220,7 +1216,7 @@ ROM_START( jclub2 ) ROM_REGION( 0x80000, "misc", ROMREGION_ERASEFF ) ROM_LOAD( "gal16v8b-m88-03.bin", 0x000, 0x117, CRC(6d9c882e) SHA1(84cb95ab540290c2f8b740668360e9c643a67dcf) ) ROM_LOAD( "gal16v8b-m88-04.bin", 0x000, 0x117, CRC(5e79f292) SHA1(5e44c234e2b15d486a1af71fee986892aa245b4d) ) - + ROM_REGION( 0x80, "eeprom", 0 ) // EEPROM ROM_LOAD( "eeprom-jclub2.bin", 0x0000, 0x0080, CRC(1513cdc8) SHA1(22ff752f3e0f8f611c234a1dc4327aa360b4d6eb) ) ROM_END @@ -1271,16 +1267,16 @@ ROM_START( jclub2o ) ROM_REGION( 0x80000, "st0016", 0 ) // z80 core (used for sound?) ROM_LOAD( "sx006-04.u87", 0x00000, 0x80000, CRC(a87adedd) SHA1(1cd5af2d03738fff2230b46241659179467c828c) ) - + ROM_REGION( 0x100, "eeprom", 0 ) // eeprom 16 bit one!!! - ROM_LOAD( "eeprom-jclub2o.bin", 0x0000, 0x100, CRC(dd1c88ec) SHA1(acb67e41e832f203361e0f93afcd4eaf963fd13e) ) //jclub2ob ones + ROM_LOAD( "eeprom-jclub2o.bin", 0x0000, 0x100, CRC(dd1c88ec) SHA1(acb67e41e832f203361e0f93afcd4eaf963fd13e) ) //jclub2ob ones ROM_END /* Jockey Club II (26-mar-1997) 8 Horses, old style PCB. Maybe upgraded to a release candidate software revision. -*/ +*/ ROM_START( jclub2ob ) ROM_REGION( 0x200000, "maincpu", 0 ) // 68EC020 code + compressed gfx ROM_LOAD16_WORD_SWAP( "sx006a-01.u26",0x00000, 0x200000, CRC(55e249bc) SHA1(ed0f066ed17f047760b712cbbfba1a62d4b452ba) ) @@ -1292,7 +1288,7 @@ ROM_START( jclub2ob ) ROM_REGION( 0x80000, "st0016", 0 ) // z80 core (used for sound?) ROM_LOAD( "sx006-04.u87", 0x00000, 0x80000, CRC(a87adedd) SHA1(1cd5af2d03738fff2230b46241659179467c828c) ) - + ROM_REGION( 0x100, "eeprom", 0 ) // eeprom 16 bit one!!! ROM_LOAD( "eeprom-jclub2o.bin", 0x0000, 0x100, CRC(dd1c88ec) SHA1(acb67e41e832f203361e0f93afcd4eaf963fd13e) ) ROM_END @@ -1325,7 +1321,7 @@ DRIVER_INIT_MEMBER(darkhors_state,darkhors) temp[i] = eeprom[BITSWAP8(i,7,5,4,3,2,1,0,6)]; memcpy(eeprom, temp, len); - + } } @@ -1336,7 +1332,7 @@ GAME( 199?, jclub2ob, jclub2, jclub2o, jclub2, driver_device, 0, ROT0, "S GAME( 2001, darkhors, jclub2, darkhors,darkhors,darkhors_state, darkhors,ROT0, "bootleg", "Dark Horse (bootleg of Jockey Club II)", GAME_IMPERFECT_GRAPHICS ) -//test boot = test mode +//test boot = test mode //reset +start 1p at boot, when msg on screen press test without release other key = setup //reset +cancel 1p = backup all clear //reset, test, meter and last game are keys so once you turn them they stay "active" @@ -1347,4 +1343,3 @@ boot with - 0 + left alt (reset + p1 cancel) to clear data - 0 + 1 + f1 (IIRC) to write ID */ - diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index f829438be32..65fd7572807 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -1666,16 +1666,16 @@ static MACHINE_CONFIG_START( berlwall, kaneko16_berlwall_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) // mangled sprites otherwise +// MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) // mangled sprites otherwise MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) MCFG_SCREEN_UPDATE_DRIVER(kaneko16_berlwall_state, screen_update_berlwall) -// MCFG_SCREEN_PALETTE("palette") +// MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_1x4bit) - MCFG_PALETTE_ADD("palette", 2048 ) + MCFG_PALETTE_ADD("palette", 2048 ) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) MCFG_PALETTE_ADD("bgpalette", 32768) /* 32768 static colors for the bg */ @@ -1688,7 +1688,7 @@ static MACHINE_CONFIG_START( berlwall, kaneko16_berlwall_state ) MCFG_KANEKO_TMAP_GFXDECODE("gfxdecode") MCFG_DEVICE_ADD_VU002_SPRITES -// kaneko16_sprite_device::set_altspacing(*device, 1); +// kaneko16_sprite_device::set_altspacing(*device, 1); MCFG_KANEKO16_SPRITE_GFXDECODE("gfxdecode") MCFG_VIDEO_START_OVERRIDE(kaneko16_berlwall_state,berlwall) @@ -1741,7 +1741,7 @@ static MACHINE_CONFIG_START( bakubrkr, kaneko16_state ) kaneko_view2_tilemap_device::set_gfx_region(*device, 1); kaneko_view2_tilemap_device::set_offset(*device, 0x5b, -0x8, 256, 240); MCFG_KANEKO_TMAP_GFXDECODE("gfxdecode") - + MCFG_DEVICE_ADD("view2_1", KANEKO_TMAP, 0) kaneko_view2_tilemap_device::set_gfx_region(*device, 2); kaneko_view2_tilemap_device::set_offset(*device, 0x5b, -0x8, 256, 240); @@ -1809,7 +1809,7 @@ static MACHINE_CONFIG_START( blazeon, kaneko16_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_1x4bit) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) - + MCFG_DEVICE_ADD("view2_0", KANEKO_TMAP, 0) kaneko_view2_tilemap_device::set_gfx_region(*device, 1); kaneko_view2_tilemap_device::set_offset(*device, 0x33, 0x8, 320, 240); diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 10de29ec076..c1df39e9d66 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -490,7 +490,7 @@ static MACHINE_CONFIG_START( kingofb, kingofb_state ) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(kingofb_state, screen_update_kingofb) - MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", kingobox) MCFG_PALETTE_ADD("palette", 256+8*2) diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index f4ef0fc7d66..125ce88b5dd 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -179,7 +179,7 @@ static ADDRESS_MAP_START( koftball_mem, AS_PROGRAM, 16, koftball_state ) AM_RANGE(0x2da000, 0x2da003) AM_DEVWRITE8("ymsnd", ym2413_device, write, 0xff00) AM_RANGE(0x2db000, 0x2db001) AM_WRITE(bmc_RAMDAC_offset_w) AM_SHARE("colorram") - AM_RANGE(0x2db002, 0x2db003) AM_READWRITE(bmc_RAMDAC_color_r, bmc_RAMDAC_color_w) + AM_RANGE(0x2db002, 0x2db003) AM_READWRITE(bmc_RAMDAC_color_r, bmc_RAMDAC_color_w) AM_RANGE(0x2db004, 0x2db005) AM_WRITENOP AM_RANGE(0x2dc000, 0x2dc001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0xff00) AM_RANGE(0x2f0000, 0x2f0003) AM_READ_PORT("INPUTS") @@ -254,13 +254,13 @@ static MACHINE_CONFIG_START( koftball, koftball_state ) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 30*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 256) MCFG_GFXDECODE_ADD("gfxdecode", "palette", koftball) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - + MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) // guessed chip type, clock not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 73240f378bd..84deb27a9ae 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1728,7 +1728,7 @@ static MACHINE_CONFIG_DERIVED( gxtype3, konamigx ) MCFG_VIDEO_START_OVERRIDE(konamigx_state,konamigx_type3) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(16384) MCFG_PALETTE_ENABLE_SHADOWS() diff --git a/src/mame/drivers/konendev.c b/src/mame/drivers/konendev.c index 1a7b545345f..e3a7aa2d320 100644 --- a/src/mame/drivers/konendev.c +++ b/src/mame/drivers/konendev.c @@ -109,7 +109,7 @@ static MACHINE_CONFIG_START( konendev, konendev_state ) MCFG_CPU_PROGRAM_MAP(konendev_map) /* video hardware */ - MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") + MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c index d590fe5bf53..15372b3bb5c 100644 --- a/src/mame/drivers/kopunch.c +++ b/src/mame/drivers/kopunch.c @@ -1,7 +1,7 @@ /******************************************************** KO Punch (c) 1981 Sega - + XTAL: ? CPU: 8085 (proof: it uses SIM opcode) Other: 4 x i8255 for all I/O @@ -13,12 +13,12 @@ ********************************************************* - + This is a simple boxing bag game, but for visual feedback it has a small CRT instead of LEDs or a dial. - + Insert coin, select your weightclass (7 buttons on cab), and punch. - + Heavyweight - 300K Middleweight - 260K Welterweight - 230K diff --git a/src/mame/drivers/lastbank.c b/src/mame/drivers/lastbank.c index 68dceedda7b..fb34429c468 100644 --- a/src/mame/drivers/lastbank.c +++ b/src/mame/drivers/lastbank.c @@ -480,7 +480,7 @@ static MACHINE_CONFIG_START( lastbank, lastbank_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastbank ) MCFG_PALETTE_ADD("palette", 0x100) - + MCFG_DEVICE_ADD("tc0091lvc", TC0091LVC, 0) MCFG_TC0091LVC_GFXDECODE("gfxdecode") MCFG_TC0091LVC_PALETTE("palette") diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index e283472b696..db0206c04a5 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -598,20 +598,20 @@ static MACHINE_CONFIG_DERIVED( lethalej, lethalen ) MCFG_K053244_PALETTE("palette") MACHINE_CONFIG_END -ROM_START( lethalen ) // US version UAE - ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ +ROM_START( lethalen ) // US version UAE + ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ ROM_LOAD( "191uae01.u4", 0x00000, 0x40000, CRC(dca340e3) SHA1(8efbba0e3a459bcfe23c75c584bf3a4ce25148bb) ) - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) ROM_LOAD32_WORD( "191a09", 0x200000, 0x100000, CRC(e2028531) SHA1(63ccce7855d829763e9e248a6c3eb6ea89ab17ee) ) - ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ + ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ ROM_LOAD( "191a04", 0x000000, 0x100000, CRC(5c3eeb2b) SHA1(33ea8b3968b78806334b5a0aab3a2c24e45c604e) ) ROM_LOAD( "191a05", 0x100000, 0x100000, CRC(f2e3b58b) SHA1(0bbc2fe87a4fd00b5073a884bcfebcf9c2c402ad) ) ROM_LOAD( "191a06", 0x200000, 0x100000, CRC(ee11fc08) SHA1(ec6dd684e8261b181d65b8bf1b9e97da5c4468f7) ) @@ -622,27 +622,27 @@ ROM_START( lethalen ) // US version UAE ROM_REGION( 0x200000, "gfx4", ROMREGION_ERASE00 ) ROM_COPY("gfx2",0x200000,0, 0x200000) - ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ + ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ ROM_LOAD( "191a03", 0x000000, 0x200000, CRC(9b13fbe8) SHA1(19b02dbd9d6da54045b0ba4dfe7b282c72745c9c)) ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "lethalenue.nv", 0x0000, 0x0080, CRC(6e7224e6) SHA1(86dea9262d55e58b573d397d0fea437c58728707) ) ROM_END -ROM_START( lethalenub ) // US version UAB - ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ +ROM_START( lethalenub ) // US version UAB + ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ ROM_LOAD( "191uab01.u4", 0x00000, 0x40000, CRC(2afd7528) SHA1(65ce4a54fe96ad38d39d335b5d3a644a495c7e31) ) - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) ROM_LOAD32_WORD( "191a09", 0x200000, 0x100000, CRC(e2028531) SHA1(63ccce7855d829763e9e248a6c3eb6ea89ab17ee) ) - ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ + ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ ROM_LOAD( "191a04", 0x000000, 0x100000, CRC(5c3eeb2b) SHA1(33ea8b3968b78806334b5a0aab3a2c24e45c604e) ) ROM_LOAD( "191a05", 0x100000, 0x100000, CRC(f2e3b58b) SHA1(0bbc2fe87a4fd00b5073a884bcfebcf9c2c402ad) ) ROM_LOAD( "191a06", 0x200000, 0x100000, CRC(ee11fc08) SHA1(ec6dd684e8261b181d65b8bf1b9e97da5c4468f7) ) @@ -653,27 +653,27 @@ ROM_START( lethalenub ) // US version UAB ROM_REGION( 0x200000, "gfx4", ROMREGION_ERASE00 ) ROM_COPY("gfx2",0x200000,0, 0x200000) - ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ + ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ ROM_LOAD( "191a03", 0x000000, 0x200000, CRC(9b13fbe8) SHA1(19b02dbd9d6da54045b0ba4dfe7b282c72745c9c)) ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "lethalenub.nv", 0x0000, 0x0080, CRC(14c6c6e5) SHA1(8a498b5322266df25fb24d1b7bd7937de459d207) ) ROM_END -ROM_START( lethalenua ) // US version UAA - ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ +ROM_START( lethalenua ) // US version UAA + ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ ROM_LOAD( "191uaa01.u4", 0x00000, 0x40000, CRC(ab6b8f16) SHA1(8de6c429a6e71144270e79d18ad47b5aad13fe04) ) - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) ROM_LOAD32_WORD( "191a09", 0x200000, 0x100000, CRC(e2028531) SHA1(63ccce7855d829763e9e248a6c3eb6ea89ab17ee) ) - ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ + ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ ROM_LOAD( "191a04", 0x000000, 0x100000, CRC(5c3eeb2b) SHA1(33ea8b3968b78806334b5a0aab3a2c24e45c604e) ) ROM_LOAD( "191a05", 0x100000, 0x100000, CRC(f2e3b58b) SHA1(0bbc2fe87a4fd00b5073a884bcfebcf9c2c402ad) ) ROM_LOAD( "191a06", 0x200000, 0x100000, CRC(ee11fc08) SHA1(ec6dd684e8261b181d65b8bf1b9e97da5c4468f7) ) @@ -684,27 +684,27 @@ ROM_START( lethalenua ) // US version UAA ROM_REGION( 0x200000, "gfx4", ROMREGION_ERASE00 ) ROM_COPY("gfx2",0x200000,0, 0x200000) - ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ + ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ ROM_LOAD( "191a03", 0x000000, 0x200000, CRC(9b13fbe8) SHA1(19b02dbd9d6da54045b0ba4dfe7b282c72745c9c)) ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "lethalenua.nv", 0x0000, 0x0080, CRC(f71ad1c3) SHA1(04c7052d0895797af8a06183b8a877795bf2dbb3) ) ROM_END -ROM_START( lethalenux ) // US version ?, proto / hack?, very different to other sets - ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ +ROM_START( lethalenux ) // US version ?, proto / hack?, very different to other sets + ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ ROM_LOAD( "191xxx01.u4", 0x00000, 0x40000, CRC(a3b9e790) SHA1(868b422850be129952c8b11c3c4aa730d8ea1544) ) // hacked? fails rom test, verified on multiple boards - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) ROM_LOAD32_WORD( "191a09", 0x200000, 0x100000, CRC(e2028531) SHA1(63ccce7855d829763e9e248a6c3eb6ea89ab17ee) ) - ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ + ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ ROM_LOAD( "191a04", 0x000000, 0x100000, CRC(5c3eeb2b) SHA1(33ea8b3968b78806334b5a0aab3a2c24e45c604e) ) ROM_LOAD( "191a05", 0x100000, 0x100000, CRC(f2e3b58b) SHA1(0bbc2fe87a4fd00b5073a884bcfebcf9c2c402ad) ) ROM_LOAD( "191a06", 0x200000, 0x100000, CRC(ee11fc08) SHA1(ec6dd684e8261b181d65b8bf1b9e97da5c4468f7) ) @@ -715,27 +715,27 @@ ROM_START( lethalenux ) // US version ?, proto / hack?, very different to other ROM_REGION( 0x200000, "gfx4", ROMREGION_ERASE00 ) ROM_COPY("gfx2",0x200000,0, 0x200000) - ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ + ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ ROM_LOAD( "191a03", 0x000000, 0x200000, CRC(9b13fbe8) SHA1(19b02dbd9d6da54045b0ba4dfe7b282c72745c9c)) ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "lethalenux.nv", 0x0000, 0x0080, CRC(5d69c39d) SHA1(e468df829ee5094792289f9166d7e39b638ab70d) ) ROM_END -ROM_START( lethaleneab ) // Euro ver. EAB - ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ +ROM_START( lethaleneab ) // Euro ver. EAB + ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ ROM_LOAD( "191eab01.u4", 0x00000, 0x40000, CRC(d7ce111e) SHA1(e56137a0ba7664f09b5d05bb39ec6eb4d1e412c7) ) - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) ROM_LOAD32_WORD( "191a09", 0x200000, 0x100000, CRC(e2028531) SHA1(63ccce7855d829763e9e248a6c3eb6ea89ab17ee) ) - ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ + ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ ROM_LOAD( "191a04", 0x000000, 0x100000, CRC(5c3eeb2b) SHA1(33ea8b3968b78806334b5a0aab3a2c24e45c604e) ) ROM_LOAD( "191a05", 0x100000, 0x100000, CRC(f2e3b58b) SHA1(0bbc2fe87a4fd00b5073a884bcfebcf9c2c402ad) ) ROM_LOAD( "191a06", 0x200000, 0x100000, CRC(ee11fc08) SHA1(ec6dd684e8261b181d65b8bf1b9e97da5c4468f7) ) @@ -746,27 +746,27 @@ ROM_START( lethaleneab ) // Euro ver. EAB ROM_REGION( 0x200000, "gfx4", ROMREGION_ERASE00 ) ROM_COPY("gfx2",0x200000,0, 0x200000) - ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ + ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ ROM_LOAD( "191a03", 0x000000, 0x200000, CRC(9b13fbe8) SHA1(19b02dbd9d6da54045b0ba4dfe7b282c72745c9c)) ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "lethaleneab.nv", 0x0000, 0x0080, CRC(4e9bb34d) SHA1(9502583bc9f5f6fc5bba333869398b24bf154b73) ) ROM_END -ROM_START( lethaleneae ) // Euro ver. EAE - ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ +ROM_START( lethaleneae ) // Euro ver. EAE + ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ ROM_LOAD( "191eae01.u4", 0x00000, 0x40000, CRC(c6a3c6ac) SHA1(96a209a3a5b4af40af36bd7090c59a74f8c8df59) ) - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) ROM_LOAD32_WORD( "191a09", 0x200000, 0x100000, CRC(e2028531) SHA1(63ccce7855d829763e9e248a6c3eb6ea89ab17ee) ) - ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ + ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ ROM_LOAD( "191a04", 0x000000, 0x100000, CRC(5c3eeb2b) SHA1(33ea8b3968b78806334b5a0aab3a2c24e45c604e) ) ROM_LOAD( "191a05", 0x100000, 0x100000, CRC(f2e3b58b) SHA1(0bbc2fe87a4fd00b5073a884bcfebcf9c2c402ad) ) ROM_LOAD( "191a06", 0x200000, 0x100000, CRC(ee11fc08) SHA1(ec6dd684e8261b181d65b8bf1b9e97da5c4468f7) ) @@ -777,27 +777,27 @@ ROM_START( lethaleneae ) // Euro ver. EAE ROM_REGION( 0x200000, "gfx4", ROMREGION_ERASE00 ) ROM_COPY("gfx2",0x200000,0, 0x200000) - ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ + ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ ROM_LOAD( "191a03", 0x000000, 0x200000, CRC(9b13fbe8) SHA1(19b02dbd9d6da54045b0ba4dfe7b282c72745c9c)) ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "lethaleneae.nv", 0x0000, 0x0080, CRC(eb369a67) SHA1(6c67294669614e96de5efb38372dbed435ee04d3) ) ROM_END -ROM_START( lethalenj ) // Japan version JAD - ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ +ROM_START( lethalenj ) // Japan version JAD + ROM_REGION( 0x40000, "maincpu", 0 ) /* main program */ ROM_LOAD( "191jad01.u4", 0x00000, 0x40000, CRC(160a25c0) SHA1(1d3ed5a158e461a73c079fe24a8e9d5e2a87e126) ) - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) ROM_LOAD32_WORD( "191a09", 0x200000, 0x100000, CRC(e2028531) SHA1(63ccce7855d829763e9e248a6c3eb6ea89ab17ee) ) - ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ + ROM_REGION( 0x400000, "gfx2", ROMREGION_ERASE00 ) /* sprites - fake 6bpp decode is done from here */ ROM_LOAD( "191a04", 0x000000, 0x100000, CRC(5c3eeb2b) SHA1(33ea8b3968b78806334b5a0aab3a2c24e45c604e) ) ROM_LOAD( "191a05", 0x100000, 0x100000, CRC(f2e3b58b) SHA1(0bbc2fe87a4fd00b5073a884bcfebcf9c2c402ad) ) ROM_LOAD( "191a06", 0x200000, 0x100000, CRC(ee11fc08) SHA1(ec6dd684e8261b181d65b8bf1b9e97da5c4468f7) ) @@ -808,7 +808,7 @@ ROM_START( lethalenj ) // Japan version JAD ROM_REGION( 0x200000, "gfx4", ROMREGION_ERASE00 ) ROM_COPY("gfx2",0x200000,0, 0x200000) - ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ + ROM_REGION( 0x200000, "k054539", 0 ) /* K054539 samples */ ROM_LOAD( "191a03", 0x000000, 0x200000, CRC(9b13fbe8) SHA1(19b02dbd9d6da54045b0ba4dfe7b282c72745c9c)) ROM_REGION16_BE( 0x80, "eeprom", 0 ) diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index 334a1139faa..d9b849f65f5 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -155,12 +155,12 @@ CUSTOM_INPUT_MEMBER(littlerb_state::littlerb_frame_step_r) static INPUT_PORTS_START( littlerb ) PORT_START("DSW") /* 16bit */ - PORT_DIPNAME( 0x0003, 0x0001, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:8,7") + PORT_DIPNAME( 0x0003, 0x0001, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:8,7") PORT_DIPSETTING( 0x0003, "2" ) PORT_DIPSETTING( 0x0001, "3" ) PORT_DIPSETTING( 0x0002, "4" ) PORT_DIPSETTING( 0x0000, "5" ) - PORT_DIPNAME( 0x001c, 0x0004, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:6,5,4") + PORT_DIPNAME( 0x001c, 0x0004, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:6,5,4") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0010, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) @@ -169,7 +169,7 @@ static INPUT_PORTS_START( littlerb ) PORT_DIPSETTING( 0x0014, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x000c, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x001c, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x00e0, 0x0020, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:3,2,1") + PORT_DIPNAME( 0x00e0, 0x0020, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:3,2,1") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0080, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0040, DEF_STR( 3C_1C ) ) @@ -178,15 +178,15 @@ static INPUT_PORTS_START( littlerb ) PORT_DIPSETTING( 0x00a0, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0060, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x00e0, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0600, 0x0600, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7,6") + PORT_DIPNAME( 0x0600, 0x0600, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7,6") PORT_DIPSETTING( 0x0600, "Every 150,000" ) PORT_DIPSETTING( 0x0200, "Every 200,000" ) PORT_DIPSETTING( 0x0400, "Every 300,000" ) PORT_DIPSETTING( 0x0000, DEF_STR( None ) ) - PORT_DIPNAME( 0x3800, 0x2800, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,4,3") + PORT_DIPNAME( 0x3800, 0x2800, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,4,3") PORT_DIPSETTING( 0x3800, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x1800, DEF_STR( Medium_Easy ) ) PORT_DIPSETTING( 0x2800, DEF_STR( Normal ) ) @@ -196,7 +196,7 @@ static INPUT_PORTS_START( littlerb ) PORT_DIPSETTING( 0x2000, DEF_STR( Very_Hard ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) PORT_SERVICE_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW2:2" ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") + PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x8000, DEF_STR( On ) ) diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index e953ad9b7a4..12b12b10775 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -658,7 +658,7 @@ static MACHINE_CONFIG_START( ltcasino, ltcasino_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(6*8, 58*8-1, 0, 32*8-1) + MCFG_SCREEN_VISIBLE_AREA(6*8, 58*8-1, 0, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(ltcasino_state, screen_update_ltcasino) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index a0fd3c46e81..79492b48ab5 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -77,7 +77,7 @@ public: /* devices */ required_device m_maincpu; required_device m_gfxdecode; - + DECLARE_WRITE8_MEMBER(m14_vram_w); DECLARE_WRITE8_MEMBER(m14_cram_w); DECLARE_READ8_MEMBER(m14_rng_r); @@ -346,7 +346,7 @@ static MACHINE_CONFIG_START( m14, m14_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(m14_state, screen_update_m14) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", m14) MCFG_PALETTE_ADD("palette", 0x20) MCFG_PALETTE_INIT_OWNER(m14_state, m14) diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index f097e8bc09b..97f17066052 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -1045,7 +1045,7 @@ static MACHINE_CONFIG_DERIVED( lotlot, ldrun ) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", lotlot) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(768) diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index fefaf8e5a6c..e98a7cfb91e 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -347,7 +347,7 @@ void m63_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) flipy = !flipy; } - + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, @@ -356,7 +356,6 @@ void m63_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) /* sprite wrapping - verified on real hardware*/ if (sx > 0xf0) { - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index ca7a9d155e1..d33bb4030db 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -1723,7 +1723,7 @@ static MACHINE_CONFIG_START( superpac, mappy_state ) MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1")) MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux)) MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l)) @@ -1745,7 +1745,7 @@ static MACHINE_CONFIG_START( pacnpal, mappy_state ) MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS")) MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_lamps)) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO59XX, 0) MCFG_NAMCO59XX_IN_0_CB(READ8(mappy_state, dipB_mux)) MCFG_NAMCO59XX_IN_1_CB(READ8(mappy_state, dipA_l)) @@ -1767,7 +1767,7 @@ static MACHINE_CONFIG_START( grobda, mappy_state ) MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1")) MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux)) MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l)) @@ -1807,14 +1807,14 @@ static MACHINE_CONFIG_START( phozon, mappy_state ) MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1")) MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_muxi)) MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l)) MCFG_NAMCO56XX_IN_2_CB(READ8(mappy_state, dipA_h)) MCFG_NAMCO56XX_IN_3_CB(IOPORT("DSW0")) MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_mux)) - + /* video hardware */ MCFG_GFXDECODE_ADD("gfxdecode", "palette", phozon) MCFG_PALETTE_ADD("palette", 64*4+64*4) @@ -1884,7 +1884,7 @@ static MACHINE_CONFIG_START( mappy, mappy_state ) MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1")) MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO58XX, 0) MCFG_NAMCO58XX_IN_0_CB(READ8(mappy_state, dipB_mux)) MCFG_NAMCO58XX_IN_1_CB(READ8(mappy_state, dipA_l)) @@ -1907,7 +1907,7 @@ static MACHINE_CONFIG_START( digdug2, mappy_state ) MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1")) MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux)) MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l)) @@ -1937,7 +1937,7 @@ static MACHINE_CONFIG_START( motos, mappy_state ) MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2")) MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS")) MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_lamps)) - + MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux)) MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l)) diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index cc663caa597..7dc96cfac2a 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -1505,7 +1505,7 @@ static MACHINE_CONFIG_START( mazerbla, mazerbla_state ) MCFG_PALETTE_ADD("palette", 256+1) MCFG_PALETTE_INIT_OWNER(mazerbla_state, mazerbla) - + /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index f3585d4b39f..6d65c7f13fa 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -1636,11 +1636,11 @@ ROM_START( stargrds ) ROM_END -/* Spy Hunter labels look like this +/* Spy Hunter labels look like this SPY-HUNTER C.P.U. PG3 - 2/9/84 + 2/9/84 */ ROM_START( spyhunt ) diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index 92eadcdf2c3..a1fcb2a4d94 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -773,7 +773,7 @@ static INPUT_PORTS_START( archrivlb ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -1511,13 +1511,13 @@ ROM_END ROM_START( archrivlb ) /* Reports as rev 2.0 5/03/89 */ ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "4.bin", 0x00000, 0x10000, CRC(1d99cce6) SHA1(738d651de0bf1b4a1524a1d8835a060bfc4649a8) ) + ROM_LOAD16_BYTE( "4.bin", 0x00000, 0x10000, CRC(1d99cce6) SHA1(738d651de0bf1b4a1524a1d8835a060bfc4649a8) ) ROM_LOAD16_BYTE( "2.bin", 0x00001, 0x10000, CRC(5d58a77b) SHA1(9a42bb89acd4e6b603215b14b4d411d14615f412) ) ROM_LOAD16_BYTE( "3.bin", 0x20000, 0x10000, CRC(d6d08ff7) SHA1(bbbd4b5c3218c9bb461b17e536191d40ab39f67c) ) ROM_LOAD16_BYTE( "1.bin", 0x20001, 0x10000, CRC(92f3a43d) SHA1(45fdcbacd65f5898d54cc2ac95639b7ee2c097e6) ) ROM_REGION( 0x90000, "cvsd:cpu", 0 ) /* Audio System board */ - ROM_LOAD( "13.bin", 0x10000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) ) + ROM_LOAD( "13.bin", 0x10000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) ) ROM_RELOAD( 0x18000, 0x08000 ) ROM_RELOAD( 0x20000, 0x08000 ) ROM_RELOAD( 0x28000, 0x08000 ) @@ -1531,7 +1531,7 @@ ROM_START( archrivlb ) /* Reports as rev 2.0 5/03/89 */ ROM_RELOAD( 0x68000, 0x08000 ) ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT ) - ROM_LOAD( "5.bin", 0x00000, 0x10000, CRC(7eb3d7c6) SHA1(8544d04929cdb36fa7f0dcb67e0b7fd8c7b0fc2b) ) + ROM_LOAD( "5.bin", 0x00000, 0x10000, CRC(7eb3d7c6) SHA1(8544d04929cdb36fa7f0dcb67e0b7fd8c7b0fc2b) ) ROM_LOAD( "6.bin", 0x10000, 0x10000, CRC(31e68050) SHA1(e25871beb08a8706af70d277fa7305a1f4d7d3e2) ) ROM_REGION( 0x80000, "gfx2", 0 ) diff --git a/src/mame/drivers/meadwttl.c b/src/mame/drivers/meadwttl.c index 2082b5314eb..6da925479cf 100644 --- a/src/mame/drivers/meadwttl.c +++ b/src/mame/drivers/meadwttl.c @@ -1,14 +1,14 @@ /*************************************************************************** - + Meadows Discrete Game List - + Bombs Away (1976) Ckidzo (1976) Cobra Gunship (1976) Drop Zone 4 (1975) Flim Flam (1974) 4 in 1 Meadows (197?) - + ***************************************************************************/ @@ -48,38 +48,38 @@ class meadwttl_state : public driver_device public: meadwttl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(meadows) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -109,9 +109,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/megaphx.c b/src/mame/drivers/megaphx.c index b960654170c..3024c2651b8 100644 --- a/src/mame/drivers/megaphx.c +++ b/src/mame/drivers/megaphx.c @@ -1,8 +1,8 @@ -/* +/* Dinamic / Inder arcade hardware Mega Phoenix - + also known to exist on this hardware: Hammer Boy Nonamed 2 (ever finished? only code seen has 1991 date and is vastly incomplete) (versions exist for Amstrad CPC, MSX and Spectrum) @@ -22,7 +22,7 @@ I/O: - port_c_r / port_c_w should go through the 8255 but I don't see how to hook them up that way? various bits of the writes are lost? - + -- @@ -33,7 +33,7 @@ TS68000CP8 TMS34010FNL-40 TMP82C55AP-2 - + Bt478KPJ35 Palette / RAMDAC Actel A1010A-PL68C (custom blitter maybe?) @@ -45,11 +45,11 @@ ST Z8430AB1 custom INDER badged chip 40 pin? (probably just a z80 - it's in the sound section) - MODELO: MEGA PHOENIX - KIT NO. 1.034 - FECHA FABRICACION 08.10.91 - LA MANIPULCION DE LA ETIQUETA O DE LA PLACA ANULA SU SARANTIA - (this sticker is also present on the other PCB) + MODELO: MEGA PHOENIX + KIT NO. 1.034 + FECHA FABRICACION 08.10.91 + LA MANIPULCION DE LA ETIQUETA O DE LA PLACA ANULA SU SARANTIA + (this sticker is also present on the other PCB) */ @@ -77,8 +77,7 @@ public: m_indersb(*this, "inder_sb"), m_indervid(*this, "inder_vid") - { - + { } required_device m_maincpu; @@ -126,7 +125,7 @@ static ADDRESS_MAP_START( megaphx_68k_map, AS_PROGRAM, 16, megaphx_state ) AM_RANGE(0x060004, 0x060005) AM_READ8( port_c_r, 0x00ff ) AM_RANGE(0x060006, 0x060007) AM_WRITE8( port_c_w, 0x00ff ) AM_RANGE(0x060000, 0x060003) AM_DEVREADWRITE8("ppi8255_0", i8255_device, read, write, 0x00ff) - + AM_RANGE(0x800000, 0x83ffff) AM_ROM AM_REGION("roms01", 0x00000) // code + bg gfx are in here AM_RANGE(0x840000, 0x87ffff) AM_ROM AM_REGION("roms23", 0x00000) // bg gfx are in here AM_RANGE(0x880000, 0x8bffff) AM_ROM AM_REGION("roms45", 0x00000) // bg gfx + title screen in here @@ -210,7 +209,7 @@ static INPUT_PORTS_START( megaphx ) PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_SERVICE( 0x0002, IP_ACTIVE_HIGH ) + PORT_SERVICE( 0x0002, IP_ACTIVE_HIGH ) PORT_DIPNAME( 0x001c, 0x0010, "Difficulty?" ) // in hammer boy at least.. PORT_DIPSETTING( 0x0000, "0" ) PORT_DIPSETTING( 0x0004, "1" ) @@ -240,39 +239,35 @@ INPUT_PORTS_END READ8_MEMBER(megaphx_state::port_c_r) { - //printf("read port c - write value was %02x\n", port_c_value); -// int pc = machine().device("maincpu")->safe_pc(); +// int pc = machine().device("maincpu")->safe_pc(); UINT8 ret = 0; -// printf("(%06x) port_c_r (thru 8255)\n", pc); - +// printf("(%06x) port_c_r (thru 8255)\n", pc); + if (m_pic_clock == 1) ret |= 0x08; if (m_pic_readbit == 1) ret |= 0x02; -// return ioport("SYS")->read(); +// return ioport("SYS")->read(); return ret; } WRITE8_MEMBER(megaphx_state::port_c_w) { - - - -// int pc = machine().device("maincpu")->safe_pc(); +// int pc = machine().device("maincpu")->safe_pc(); port_c_value = (data & 0x0f); if (port_c_value == 0x9) { - // printf("Assert PIC reset line\n"); + // printf("Assert PIC reset line\n"); m_pic_is_reset = 1; } else if (port_c_value == 0x8) { - // printf("Clear PIC reset line\n"); + // printf("Clear PIC reset line\n"); m_pic_is_reset = 0; - + m_pic_shift_pos = 0; m_pic_data = 0; m_pic_data_bit = 0; @@ -282,31 +277,30 @@ WRITE8_MEMBER(megaphx_state::port_c_w) } else if (port_c_value == 0xd) { - // printf("Set PIC data line\n"); + // printf("Set PIC data line\n"); m_pic_data_bit = 1; } else if (port_c_value == 0xc) { - // printf("Clear PIC data line\n"); + // printf("Clear PIC data line\n"); m_pic_data_bit = 0; } else if (port_c_value == 0xf) { if (m_pic_clock == 0) { - // printf("Set PIC clock line | pos %d | bit %d\n", m_pic_shift_pos, m_pic_data_bit); - + // printf("Set PIC clock line | pos %d | bit %d\n", m_pic_shift_pos, m_pic_data_bit); + m_pic_clock = 1; - + } } else if (port_c_value == 0xe) { - if (m_pic_clock == 1) { m_pic_data |= m_pic_data_bit << m_pic_shift_pos; @@ -339,13 +333,13 @@ WRITE8_MEMBER(megaphx_state::port_c_w) m_pic_shift_pos++; - // printf("Clear PIC clock line\n"); + // printf("Clear PIC clock line\n"); m_pic_clock = 0; } } else { - // printf("Unknown write to PIC %02x (PC %06x)\n", port_c_value, pc); + // printf("Unknown write to PIC %02x (PC %06x)\n", port_c_value, pc); } diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index fbede6965f3..5f33a2b066a 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -70,7 +70,7 @@ public: m_vdp1(*this, "vdp1"), m_bioscpu(*this, "mtbios") { } - + DECLARE_READ16_MEMBER(extra_ram_r); DECLARE_WRITE16_MEMBER(extra_ram_w); DECLARE_READ8_MEMBER(bios_banksel_r); @@ -92,30 +92,30 @@ public: DECLARE_WRITE8_MEMBER(game_w); DECLARE_READ8_MEMBER(vdp_count_r); DECLARE_WRITE_LINE_MEMBER(bios_int_callback); - + DECLARE_DRIVER_INIT(megaplay); DECLARE_VIDEO_START(megplay); DECLARE_MACHINE_RESET(megaplay); UINT32 screen_update_megplay(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - + private: - + UINT32 m_bios_mode; // determines whether ROM banks or Game data is to read from 0x8000-0xffff - + UINT32 m_bios_bank; // ROM bank selection UINT16 m_game_banksel; // Game bank selection UINT32 m_readpos; // serial bank selection position (9-bit) UINT32 m_bios_bank_addr; - + UINT32 m_bios_width; // determines the way the game info ROM is read UINT8 m_bios_ctrl[6]; UINT8 m_bios_6600; UINT8 m_bios_6403; UINT8 m_bios_6404; - + UINT16 *m_ic36_ram; UINT8* m_ic37_ram; - + required_shared_ptr m_ic3_ram; optional_device m_vdp1; required_device m_bioscpu; @@ -616,22 +616,22 @@ UINT32 mplay_state::screen_update_megplay(screen_device &screen, bitmap_rgb32 &b { //printf("megplay vu\n"); screen_update_megadriv(screen, bitmap, cliprect); -// m_vdp->screen_update(screen, bitmap, cliprect); +// m_vdp->screen_update(screen, bitmap, cliprect); // overlay, only drawn for pixels != 0 for (int y = 0; y < 224; y++) { UINT32* lineptr = &bitmap.pix32(y); UINT32* srcptr = &m_vdp->get_bitmap().pix32(y + SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT); - + for (int x = 0; x < SEGA315_5124_WIDTH; x++) { UINT32 src = srcptr[x] & 0xffffff; - + if (src) lineptr[x] = src; } - } + } return 0; } @@ -855,15 +855,15 @@ WRITE16_MEMBER(mplay_state::extra_ram_w ) DRIVER_INIT_MEMBER(mplay_state,megaplay) { - // copy game instruction rom to main map. maybe this should just be accessed + // copy game instruction rom to main map. maybe this should just be accessed // through a handler instead? UINT8 *instruction_rom = memregion("user1")->base(); UINT8 *game_rom = memregion("maincpu")->base(); - + for (int offs = 0; offs < 0x8000; offs++) { UINT8 dat = instruction_rom[offs]; - + game_rom[0x300000 + offs * 2] = dat; game_rom[0x300001 + offs * 2] = dat; } @@ -875,7 +875,7 @@ DRIVER_INIT_MEMBER(mplay_state,megaplay) DRIVER_INIT_CALL(megadrij); m_megadrive_io_read_data_port_ptr = read8_delegate(FUNC(md_base_state::megadrive_io_read_data_port_3button),this); m_megadrive_io_write_data_port_ptr = write16_delegate(FUNC(md_base_state::megadrive_io_write_data_port_3button),this); - + // for now ... m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa10000, 0xa1001f, read16_delegate(FUNC(mplay_state::mp_io_read),this), write16_delegate(FUNC(mplay_state::mp_io_write),this)); diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 756e4914c6a..71e40685358 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -88,13 +88,13 @@ public: TIMER_Z80_RUN_STATE, TIMER_Z80_STOP_STATE }; - + mtech_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag), m_vdp1(*this, "vdp1"), m_bioscpu(*this, "mtbios") { } - + DECLARE_WRITE_LINE_MEMBER( snd_int_callback ); DECLARE_WRITE_LINE_MEMBER( bios_int_callback ); DECLARE_READ8_MEMBER(cart_select_r); @@ -113,8 +113,8 @@ public: DECLARE_READ8_MEMBER(sms_count_r); DECLARE_READ8_MEMBER(sms_ioport_dc_r); DECLARE_READ8_MEMBER(sms_ioport_dd_r); - DECLARE_WRITE8_MEMBER(mt_sms_standard_rom_bank_w); - + DECLARE_WRITE8_MEMBER(mt_sms_standard_rom_bank_w); + DECLARE_DRIVER_INIT(mt_crt); DECLARE_DRIVER_INIT(mt_slot); DECLARE_MACHINE_RESET(megatech); @@ -122,32 +122,32 @@ public: UINT32 screen_update_main(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); UINT32 screen_update_menu(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_main(screen_device &screen, bool state); - + protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - -private: + +private: UINT8 m_mt_cart_select_reg; UINT32 m_bios_port_ctrl; int m_current_game_is_sms; // is the current game SMS based (running on genesis z80, in VDP compatibility mode) UINT32 m_bios_ctrl_inputs; UINT8 m_bios_ctrl[6]; int m_mt_bank_addr; - + int m_cart_is_genesis[8]; - + void set_genz80_as_md(); void set_genz80_as_sms(); - + TIMER_CALLBACK_MEMBER(z80_run_state); TIMER_CALLBACK_MEMBER(z80_stop_state); - + UINT8* m_banked_ram; UINT8* sms_mainram; UINT8* sms_rom; - + required_device m_vdp1; - required_device m_bioscpu; + required_device m_bioscpu; }; @@ -328,7 +328,7 @@ WRITE8_MEMBER( mtech_state::mt_sms_standard_rom_bank_w ) { int bank = data & 0x1f; //logerror("bank w %02x %02x\n", offset, data); - + sms_mainram[0x1ffc + offset] = data; switch (offset) { @@ -347,7 +347,7 @@ WRITE8_MEMBER( mtech_state::mt_sms_standard_rom_bank_w ) case 3: memcpy(sms_rom+0x8000, space.machine().root_device().memregion("maincpu")->base()+bank*0x4000, 0x4000); break; - + } } @@ -356,26 +356,26 @@ void mtech_state::set_genz80_as_sms() address_space &prg = machine().device("genesis_snd_z80")->memory().space(AS_PROGRAM); address_space &io = machine().device("genesis_snd_z80")->memory().space(AS_IO); sn76496_base_device *sn = machine().device("snsnd"); - + // main ram area sms_mainram = (UINT8 *)prg.install_ram(0xc000, 0xdfff, 0, 0x2000); memset(sms_mainram,0x00,0x2000); - + // fixed rom bank area sms_rom = (UINT8 *)prg.install_rom(0x0000, 0xbfff, NULL); - + memcpy(sms_rom, machine().root_device().memregion("maincpu")->base(), 0xc000); - + prg.install_write_handler(0xfffc, 0xffff, write8_delegate(FUNC(mtech_state::mt_sms_standard_rom_bank_w),this)); - + // ports io.install_read_handler (0x40, 0x41, 0xff, 0x3e, read8_delegate(FUNC(mtech_state::sms_count_r),this)); io.install_write_handler (0x40, 0x41, 0xff, 0x3e, write8_delegate(FUNC(sn76496_device::write),sn)); io.install_readwrite_handler (0x80, 0x80, 0xff, 0x3e, read8_delegate(FUNC(sega315_5124_device::vram_read),(sega315_5124_device *)m_vdp), write8_delegate(FUNC(sega315_5124_device::vram_write),(sega315_5124_device *)m_vdp)); io.install_readwrite_handler (0x81, 0x81, 0xff, 0x3e, read8_delegate(FUNC(sega315_5124_device::register_read),(sega315_5124_device *)m_vdp), write8_delegate(FUNC(sega315_5124_device::register_write),(sega315_5124_device *)m_vdp)); - + io.install_read_handler (0x10, 0x10, read8_delegate(FUNC(mtech_state::sms_ioport_dd_r),this)); // super tetris - + io.install_read_handler (0xdc, 0xdc, read8_delegate(FUNC(mtech_state::sms_ioport_dc_r),this)); io.install_read_handler (0xdd, 0xdd, read8_delegate(FUNC(mtech_state::sms_ioport_dd_r),this)); io.install_read_handler (0xde, 0xde, read8_delegate(FUNC(mtech_state::sms_ioport_dd_r),this)); @@ -391,7 +391,7 @@ void mtech_state::set_genz80_as_md() prg.install_readwrite_bank(0x0000, 0x1fff, "bank1"); machine().root_device().membank("bank1")->set_base(m_genz80.z80_prgram); - + prg.install_ram(0x0000, 0x1fff, m_genz80.z80_prgram); prg.install_readwrite_handler(0x4000, 0x4003, read8_delegate(FUNC(ym2612_device::read),ym2612), write8_delegate(FUNC(ym2612_device::write),ym2612)); @@ -558,7 +558,7 @@ WRITE8_MEMBER(mtech_state::bios_port_ctrl_w ) READ8_MEMBER(mtech_state::bios_joypad_r ) { UINT8 retdata = 0; - + if (m_bios_port_ctrl == 0x55) { /* A keys */ @@ -570,7 +570,7 @@ READ8_MEMBER(mtech_state::bios_joypad_r ) retdata = (m_io_pad_3b[0]->read() & 0x3f) | ((m_io_pad_3b[1]->read() & 0x03) << 6); else retdata = ((m_io_pad_3b[1]->read() & 0x3c) >> 2) | 0xf0; - + } return retdata; } @@ -637,10 +637,10 @@ UINT32 mtech_state::screen_update_main(screen_device &screen, bitmap_rgb32 &bitm { UINT32* lineptr = &bitmap.pix32(y); UINT32* srcptr = &m_vdp->get_bitmap().pix32(y + SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT); - + for (int x = 0; x < SEGA315_5124_WIDTH; x++) lineptr[x] = srcptr[x]; - } + } #endif } return 0; diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c index 132250c0442..6241e3fac74 100644 --- a/src/mame/drivers/metalmx.c +++ b/src/mame/drivers/metalmx.c @@ -726,7 +726,7 @@ static MACHINE_CONFIG_START( metalmx, metalmx_state ) MCFG_CPU_CONFIG(gsp_config) MCFG_CPU_PROGRAM_MAP(gsp_map) - MCFG_CPU_ADD("dsp32c_1", DSP32C, 40000000) /* Unverified */ + MCFG_CPU_ADD("dsp32c_1", DSP32C, 40000000) /* Unverified */ MCFG_CPU_PROGRAM_MAP(dsp32c_1_map) MCFG_CPU_ADD("dsp32c_2", DSP32C, 40000000) /* Unverified */ diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 670ccebc300..4b5722332ba 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -1731,8 +1731,8 @@ const device_type PUZZLET_IO = &device_creator; puzzlet_io_device::puzzlet_io_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PUZZLET_IO, "Puzzlet Coin/Start I/O", tag, owner, clock, "puzzlet_io", __FILE__), - data_cb(*this), - port(*this, ":IN0") + data_cb(*this), + port(*this, ":IN0") { } @@ -5316,9 +5316,9 @@ ROM_END /* an 'Electronic Devices' manufactured board has been seen with the following roms. The data is 100% identical to the above set but due to lazy manufacturing larger ROMs were used and the first half filled with 0xff - ROM_LOAD16_BYTE( "ladyki_3.h9", 0x000000, 0x080000, CRC(c658f954) SHA1(d50043457e67a94feff1328fe9bf522aa3c124b6) ) // == e2.8g - ROM_LOAD16_BYTE( "ladyki_2.h10", 0x000001, 0x080000, CRC(bf58e4db) SHA1(9d7f74dc348b0ccb3bcf1b618d6092292b6945b8) ) // == e3.10g - ROM_LOAD( "ladyki_1.d1", 0x000000, 0x080000, CRC(3dca957c) SHA1(4b815b7cb124a38c639a4b425ed6e8b1f0946451) ) // == e8.1d + ROM_LOAD16_BYTE( "ladyki_3.h9", 0x000000, 0x080000, CRC(c658f954) SHA1(d50043457e67a94feff1328fe9bf522aa3c124b6) ) // == e2.8g + ROM_LOAD16_BYTE( "ladyki_2.h10", 0x000001, 0x080000, CRC(bf58e4db) SHA1(9d7f74dc348b0ccb3bcf1b618d6092292b6945b8) ) // == e3.10g + ROM_LOAD( "ladyki_1.d1", 0x000000, 0x080000, CRC(3dca957c) SHA1(4b815b7cb124a38c639a4b425ed6e8b1f0946451) ) // == e8.1d */ ROM_START( moegonta ) diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index cd4f18d3f0b..c4b9fbe43ad 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -40,7 +40,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(mgolf_vram_w); DECLARE_READ8_MEMBER(mgolf_wram_r); DECLARE_READ8_MEMBER(mgolf_dial_r); diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c index 34014214838..67b11989b13 100644 --- a/src/mame/drivers/mhavoc.c +++ b/src/mame/drivers/mhavoc.c @@ -516,7 +516,7 @@ static MACHINE_CONFIG_START( mhavoc, mhavoc_state ) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 300, 0, 260) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) - + MCFG_DEVICE_ADD("avg", AVG_MHAVOC, 0) MCFG_AVGDVG_VECTOR("vector") diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 62d6937beaf..419bb3bb68c 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -328,7 +328,7 @@ static MACHINE_CONFIG_START( micro3d, micro3d_state ) MCFG_MC68681_B_TX_CALLBACK(WRITELINE(micro3d_state, duart_txb)) MCFG_MC68681_INPORT_CALLBACK(READ8(micro3d_state, duart_input_r)) MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(micro3d_state, duart_output_w)) - + MCFG_DEVICE_ADD("mc68901", MC68901, 4000000) MCFG_MC68901_TIMER_CLOCK(4000000) MCFG_MC68901_RX_CLOCK(0) diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index eb408d46bad..ed8387fd4c4 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -314,29 +314,29 @@ READ16_MEMBER(mil4000_state::chewheel_mcu_r) { /* Damn thing! 708010-708011 communicate with the MCU. - The returned value is critical to the reels. - - Writes to MCU: - - 0x11 --> seems quiet or null. - 0x1A --> command for reels state/gfx. Two bytes (command + parameter). + The returned value is critical to the reels. + + Writes to MCU: + + 0x11 --> seems quiet or null. + 0x1A --> command for reels state/gfx. Two bytes (command + parameter). The second value will be the parameter to feed. The MCU will respond with one value (see table below). - bits: - 7654-3210 - ---- ---- = cherries. - ---- ---x = single bar. + bits: + 7654-3210 + ---- ---- = cherries. + ---- ---x = single bar. ---- --x- = double bars. ---- --xx = triple bars. - ---- -x-- = unknown (combinations produce reset). - ---- x--- = sevens. - ---- x--x = double plums. - ---- x-x- = plums. - ---- x-xx = bells. - ---x ---- = blanks. - -xx- ---- = some kind of gfx retrace. - x--- ---- = reset the game + ---- -x-- = unknown (combinations produce reset). + ---- x--- = sevens. + ---- x--x = double plums. + ---- x-x- = plums. + ---- x-xx = bells. + ---x ---- = blanks. + -xx- ---- = some kind of gfx retrace. + x--- ---- = reset the game There are other commands, like: 0x1B (+4 parameters) @@ -344,42 +344,42 @@ READ16_MEMBER(mil4000_state::chewheel_mcu_r) 0x1D (+2 parameters) 0x1E (+1 parameter) - You can find a 1E-18 at start. - + You can find a 1E-18 at start. + */ - switch( mcucomm ) /* MCU command */ + switch( mcucomm ) /* MCU command */ { - case 0x11: /* Idle - Null */ + case 0x11: /* Idle - Null */ { logerror("Writes idle command 0x11 to MCU"); - return (machine().rand() & 0x0b); // otherwise got corrupt gfx... + return (machine().rand() & 0x0b); // otherwise got corrupt gfx... } - case 0x1a: /* Reels state - Control */ + case 0x1a: /* Reels state - Control */ { logerror("MCU feedback to command 0x1a with data: %02x\n", mcudata); return (machine().rand() & 0x0b); } - case 0x1b: /* Unknown */ + case 0x1b: /* Unknown */ { logerror("MCU feedback to command 0x1b with data: %02x\n", mcudata); return 0x00; } - case 0x1c: /* Unknown. Always 00's? */ + case 0x1c: /* Unknown. Always 00's? */ { logerror("MCU feedback to command 0x1c with data: %02x\n", mcudata); return 0x00; } - case 0x1d: /* Unknown */ + case 0x1d: /* Unknown */ { logerror("MCU feedback to command 0x1d with data: %02x\n", mcudata); return 0x00; } - case 0x1e: /* Unknown, only one at boot (1e 18) */ + case 0x1e: /* Unknown, only one at boot (1e 18) */ { logerror("MCU feedback to command 0x1e with data: %02x\n", mcudata); return 0x00; @@ -387,7 +387,7 @@ READ16_MEMBER(mil4000_state::chewheel_mcu_r) } logerror("MCU feedback to unknown command: %02x\n", mcucomm); - return (machine().rand() & 0x0b); // otherwise got corrupt gfx... + return (machine().rand() & 0x0b); // otherwise got corrupt gfx... } WRITE16_MEMBER(mil4000_state::chewheel_mcu_w) @@ -407,14 +407,14 @@ WRITE16_MEMBER(mil4000_state::chewheel_mcu_w) READ16_MEMBER(mil4000_state::unk_r) { -// reads: 51000C-0E. touch screen? +// reads: 51000C-0E. touch screen? return 0xff; } WRITE16_MEMBER(mil4000_state::unk_w) { -// writes: 510000-02-04-06-08-0A-0C-0E -// logerror("unknown writes from address %04x\n", offset); +// writes: 510000-02-04-06-08-0A-0C-0E +// logerror("unknown writes from address %04x\n", offset); } @@ -444,8 +444,8 @@ static ADDRESS_MAP_START( chewheel_map, AS_PROGRAM, 16, mil4000_state ) AM_RANGE(0x508000, 0x50bfff) AM_RAM_WRITE(sc2_vram_w) AM_SHARE("sc2_vram") // V62C518256L-35P (U8). AM_RANGE(0x50c000, 0x50ffff) AM_RAM_WRITE(sc3_vram_w) AM_SHARE("sc3_vram") // V62C518256L-35P (U8). - AM_RANGE(0x51000c, 0x51000f) AM_READ(unk_r) // no idea what's mapped here. - AM_RANGE(0x510000, 0x51000f) AM_WRITE(unk_w) // no idea what's mapped here. + AM_RANGE(0x51000c, 0x51000f) AM_READ(unk_r) // no idea what's mapped here. + AM_RANGE(0x510000, 0x51000f) AM_WRITE(unk_w) // no idea what's mapped here. AM_RANGE(0x708000, 0x708001) AM_READ_PORT("IN0") AM_RANGE(0x708002, 0x708003) AM_READ_PORT("IN1") @@ -456,8 +456,8 @@ static ADDRESS_MAP_START( chewheel_map, AS_PROGRAM, 16, mil4000_state ) AM_RANGE(0x70801e, 0x70801f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) AM_RANGE(0x780000, 0x780fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") - AM_RANGE(0xff0000, 0xff3fff) AM_RAM AM_SHARE("nvram") // V62C51864L-70P (U77). - AM_RANGE(0xffc000, 0xffffff) AM_RAM // V62C51864L-70P (U78). + AM_RANGE(0xff0000, 0xff3fff) AM_RAM AM_SHARE("nvram") // V62C51864L-70P (U77). + AM_RANGE(0xffc000, 0xffffff) AM_RAM // V62C51864L-70P (U78). ADDRESS_MAP_END @@ -702,7 +702,7 @@ Cherry Wheel. Similar hardware to TOP XXI But... -2x V62C518256L-35P. 32K x 8 Static RAM. (U7-U8) +2x V62C518256L-35P. 32K x 8 Static RAM. (U7-U8) 2x V62C51864L-70P. 8K x 8 Static RAM. (U77-U78) Only U77 is tied to the battery. diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 4fcc2ee17f4..d524beb27f5 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -340,7 +340,7 @@ static MACHINE_CONFIG_START( mirage, miragemi_state ) MCFG_DECO16IC_ADD("tilegen1", mirage_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) decospr_device::set_gfx_region(*device, 2); MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 710a28c4969..7957105337a 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -1092,7 +1092,7 @@ static MACHINE_CONFIG_START( mgakuen, mitchell_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", mgakuen) - + MCFG_PALETTE_ADD("palette", 1024) /* less colors than the others */ MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 6beba68a659..6780bf950b8 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -108,7 +108,7 @@ public: required_shared_ptr m_cha_ram; required_shared_ptr m_dot_ram; required_shared_ptr m_power_ram; - + required_device m_palette; UINT16 *m_dma_ram; diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 28b8d454a87..2165f16f17f 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -1521,7 +1521,7 @@ static MACHINE_CONFIG_START( model1, model1_state ) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_S24TILE_DEVICE_ADD("tile", 0x3fff) MCFG_S24TILE_DEVICE_GFXDECODE("gfxdecode") MCFG_S24TILE_DEVICE_PALETTE("palette") @@ -1565,7 +1565,7 @@ static MACHINE_CONFIG_START( model1_vr, model1_state ) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_S24TILE_DEVICE_ADD("tile", 0x3fff) MCFG_S24TILE_DEVICE_GFXDECODE("gfxdecode") MCFG_S24TILE_DEVICE_PALETTE("palette") diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 1f70aca03d9..38f1b847033 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1955,7 +1955,7 @@ static MACHINE_CONFIG_START( model2o, model2_state ) MCFG_TIMER_PTR((FPTR)3) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_S24TILE_DEVICE_ADD("tile", 0x3fff) MCFG_S24TILE_DEVICE_GFXDECODE("gfxdecode") MCFG_S24TILE_DEVICE_PALETTE("palette") diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 5e9412ea7fb..c29c5c6e7b6 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -2941,13 +2941,13 @@ ROM_START( bassdx ) /* step 1.0, Sega game ID# is 833-13476 BSS DX JPN, ROM boar ROM_END /* -In Mame getbass is marked as GET BASS STD, while my pcb came from a DLX cab. +In Mame getbass is marked as GET BASS STD, while my pcb came from a DLX cab. Rom board 833-13317 834-13318 sticker is on rom board too. On cage the follow sticker are present BSS-4500-CVT2 833-13317 GAME BD BSS-CVT2 - + I/O board 837-13283 (GET BASS MEC CONT BD in manual) 171-7558c epr20690.ic11 is controller board prg @@ -5442,7 +5442,7 @@ static MACHINE_CONFIG_START( model3_10, model3_state ) MCFG_SCREEN_SIZE(512, 400) MCFG_SCREEN_UPDATE_DRIVER(model3_state, screen_update_model3) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") diff --git a/src/mame/drivers/monacogp.c b/src/mame/drivers/monacogp.c index d87783bae24..e4221834bc8 100644 --- a/src/mame/drivers/monacogp.c +++ b/src/mame/drivers/monacogp.c @@ -1,54 +1,54 @@ /*************************************************************************** - + Sega Monaco GP 1980 - + Board 96598-P is an oscillator board that generates the game sounds. It is activated by outputs from Board Assy A (96577X). - + Board Assy's A (96577X) and B (96578X) are the main guts of the gameplay and contain the roms (all sprites). - Board Assy A accepts all of the game inputs (Coin, wheel, shift, accelerator pedal), sends the signals for the sounds to the Oscillator board, outputs to the L.E.D. score display board, and directly interacts with Board Assy B + Board Assy A accepts all of the game inputs (Coin, wheel, shift, accelerator pedal), sends the signals for the sounds to the Oscillator board, outputs to the L.E.D. score display board, and directly interacts with Board Assy B Board Assy B outputs the video, outputs to the L.E.D. score display board. and directly interacts with Board Assy A. - - On the second set, boards A and B have different part numbers (97091X and 97092X) and two less roms. These boards were made later then the first set. + + On the second set, boards A and B have different part numbers (97091X and 97092X) and two less roms. These boards were made later then the first set. These boards seem to be interchangable, the only difference seems to be the rom size, which only 2 of the roms utilize the full 1024 bytes (second set). - - ROM SET A ROM SET B - Board 96577X Board 97091X - ROM ID IC# ROM ID - PRa125 (Light data) IC59 PRb-01 (identical to PRa125) - PRa126 (Explosion) IC65 PRb-02 (identical to PRa126) - PRa131 (????) IC71 PRb-04 (identical to PRa131) - PRa127 (car(2)) IC77 PRb-13 (identical to PRa127) - PRa128 (car(2)rotated) IC84 PRb-03 (identical to PRa128) - PRa129 (car) IC91 ----- - PRa130 (car(2) spinout) IC98 PRb-14 (contains PRa130 and half of PRa129) - PRa132 (car(2)(main)) IC111 PRb-15 (identical to PRa132) - - PRm-39 IC105 PRm-39 - PRm-38 IC115 PRm-38 - - Board 96578X Board 97092X - ROM ID IC# ROM ID - PRa140 (brdge-water) IC12 ----- - PRa141 (brdge-pillar) IC17 PRb-16 (contains both PRa140 and PRa141) - PRa138 (firetruck) IC30 PRb-10 (identical to PRa138) - PRa139 (car+bridge symb)IC51 PRb-11 (identical to PRa139) - PRa133 (text(4) IC64 PRb-05 (identical to PRa133) - PRa136 (house) IC99 PRb-08 (identical to PRa136) - PRa135 (shrub) IC106 PRb-07 (identical to PRa135) - PRa134 (tree, grass) IC113 PRb-06 (identical to PRa134) - PRa137 (tunnel,oil slip)IC120 PRb-09 (identical to PRa137) - + + ROM SET A ROM SET B + Board 96577X Board 97091X + ROM ID IC# ROM ID + PRa125 (Light data) IC59 PRb-01 (identical to PRa125) + PRa126 (Explosion) IC65 PRb-02 (identical to PRa126) + PRa131 (????) IC71 PRb-04 (identical to PRa131) + PRa127 (car(2)) IC77 PRb-13 (identical to PRa127) + PRa128 (car(2)rotated) IC84 PRb-03 (identical to PRa128) + PRa129 (car) IC91 ----- + PRa130 (car(2) spinout) IC98 PRb-14 (contains PRa130 and half of PRa129) + PRa132 (car(2)(main)) IC111 PRb-15 (identical to PRa132) + + PRm-39 IC105 PRm-39 + PRm-38 IC115 PRm-38 + + Board 96578X Board 97092X + ROM ID IC# ROM ID + PRa140 (brdge-water) IC12 ----- + PRa141 (brdge-pillar) IC17 PRb-16 (contains both PRa140 and PRa141) + PRa138 (firetruck) IC30 PRb-10 (identical to PRa138) + PRa139 (car+bridge symb)IC51 PRb-11 (identical to PRa139) + PRa133 (text(4) IC64 PRb-05 (identical to PRa133) + PRa136 (house) IC99 PRb-08 (identical to PRa136) + PRa135 (shrub) IC106 PRb-07 (identical to PRa135) + PRa134 (tree, grass) IC113 PRb-06 (identical to PRa134) + PRa137 (tunnel,oil slip)IC120 PRb-09 (identical to PRa137) + Oscillator Board 96598 - ROM ID IC# - PRm-40 IC21 PRm-40 - + ROM ID IC# + PRm-40 IC21 PRm-40 + -------------------------------------------------------- - + 7641 - + 512*8 +------+ A7 |1 24| Vcc @@ -63,13 +63,13 @@ D1 |10 15| D5 D2 |11 14| D4 GND|12 13| D3 - +------+ + +------+ ----------------------------------------------- - + 6331-1 PROM - - 32*8 - +------+ + + 32*8 + +------+ O1 |1 16| Vcc O2 |2 15| CE/ O3 |3 14| A4 @@ -78,14 +78,14 @@ O6 |6 11| A1 O7 |7 10| A0 GND |8 9| O8 - +------+ - + +------+ + ----------------------------------------------- - + 7132: - - 1024*8 - +------+ + + 1024*8 + +------+ A7 |1 24| Vcc A6 |2 23| A8 A5 |3 22| A9 @@ -98,9 +98,9 @@ D1 |10 15| D5 D2 |11 14| D4 GND|12 13| D3 - +------+ - - + +------+ + + ***************************************************************************/ @@ -140,38 +140,38 @@ class monacogp_state : public driver_device public: monacogp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(monacogp) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -201,9 +201,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c index d938d800fa8..104c748f496 100644 --- a/src/mame/drivers/mpoker.c +++ b/src/mame/drivers/mpoker.c @@ -205,7 +205,7 @@ public: UINT32 screen_update_mpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 1bf6494abf0..364da84d81b 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -34,7 +34,7 @@ ROM_START( m4clr ) ROM_END ROM_START( m4rltst ) - ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "rtv.p1", 0x08000, 0x08000, CRC(7b78f3f2) SHA1(07ef8e6a08fd70ee48e4463672a1230ecc669532) ) ROM_END @@ -2729,7 +2729,7 @@ GAME( 199?, m4goldnn , 0 , mod4oki , mpu4 , mpu4_state, m4 -GAME(198?, m4funh , 0 , mod4oki ,mpu4 , mpu4_state, m4default , 0, "", "Fun House (unknown) (MPU4)", GAME_FLAGS ) // TUNE ALARM (was in the SC1 Fun House set) +GAME(198?, m4funh , 0 , mod4oki ,mpu4 , mpu4_state, m4default , 0, "", "Fun House (unknown) (MPU4)", GAME_FLAGS ) // TUNE ALARM (was in the SC1 Fun House set) GAME(199?, m4sunseta ,m4sunset ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Sunset Boulevard (Barcrest) (MPU4) (B25 1.2, set 1)",GAME_FLAGS ) diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c index 50b4d582437..5aa22e052e9 100644 --- a/src/mame/drivers/mpu4hw.c +++ b/src/mame/drivers/mpu4hw.c @@ -2094,7 +2094,7 @@ READ8_MEMBER(mpu4_state::characteriser_r) LOG_CHR(("Characteriser read data %02X \n",m_current_chr_table[m_prot_col].response)); return m_current_chr_table[m_prot_col].response; } - + if (offset == 3) { LOG_CHR(("Characteriser read data off 3 %02X \n",m_current_chr_table[m_lamp_col+64].response)); @@ -2395,7 +2395,7 @@ static mpu4_chr_table blsbys_data[8] = { // 6 0 7 0 8 0 7 0 0 8 //request 36 42 27 42 09 42 27 42 42 09 //verify 00 04 04 0C 0C 1C 14 2C 5C 2C - + DRIVER_INIT_MEMBER(mpu4_state,m_oldtmr) { m_reel_mux=SIX_REEL_1TO8; diff --git a/src/mame/drivers/mpu4misc.c b/src/mame/drivers/mpu4misc.c index e421efd3ae7..0ee02bcddb7 100644 --- a/src/mame/drivers/mpu4misc.c +++ b/src/mame/drivers/mpu4misc.c @@ -373,11 +373,11 @@ GAME_CUSTOM( 199?, m4shkwav, 0, "swave_v210_1135_08dd_lv.bin", GAME_CUSTOM( 199?, m4shkwav__a, m4shkwav, "swave_v210_11376_0bb3_nlv.bin", 0x0000, 0x040000, CRC(3fcaf973) SHA1(28258c8c60e6b542e1789cd8a4cfd530d1ed6084), "Qps","Shockwave (Qps) (MPU4) (set 2)" ) GAME_CUSTOM( 199?, m4shkwav__b, m4shkwav, "swsplv.bin", 0x0000, 0x040000, CRC(1e33e93f) SHA1(3e87f8ed35da776e1968c9574c140cc3984ea8de), "Qps","Shockwave (Qps) (MPU4) (set 3)" ) //This rom is possibly bad, data content isn't multiple of 0x800, padding with low bits rather than high - ROM_START( m4shkwav__c ) - ROM_REGION( 0x080000, "maincpu", 0 ) - ROM_LOAD( "sho1_0lv.bin", 0x0000, 0x080000, BAD_DUMP CRC(a76d8544) SHA1(8277a2ce311840b8405a087d3dc0bbf97054ad87) ) - M4SHKWAV_EXTRA_ROMS - ROM_END + ROM_START( m4shkwav__c ) + ROM_REGION( 0x080000, "maincpu", 0 ) + ROM_LOAD( "sho1_0lv.bin", 0x0000, 0x080000, BAD_DUMP CRC(a76d8544) SHA1(8277a2ce311840b8405a087d3dc0bbf97054ad87) ) + M4SHKWAV_EXTRA_ROMS + ROM_END GAME(199?, m4shkwav__c, m4shkwav ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,"Qps","Shockwave (Qps) (MPU4) (set 4)",GAME_FLAGS ) GAME_CUSTOM( 199?, m4shkwav__d, m4shkwav, "swave_v300_1552_13ed_nlv.bin", 0x0000, 0x040000, CRC(b0e03f04) SHA1(fdd113af30fd9e87b171ecdf3be7e720366476b3), "Qps","Shockwave (Qps) (MPU4) (set 5)" ) GAME_CUSTOM( 199?, m4shkwav__e, m4shkwav, "swave_v300_1555_119d_lv.bin", 0x0000, 0x040000, CRC(45b786d4) SHA1(24fd4fdea684103334385ca329f384796b496e2c), "Qps","Shockwave (Qps) (MPU4) (set 6)" ) diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 32f814583cf..0a7f88aa056 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -408,7 +408,7 @@ static MACHINE_CONFIG_START( mugsmash, mugsmash_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(mugsmash_state, screen_update_mugsmash) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", mugsmash) MCFG_PALETTE_ADD("palette", 0x300) diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index a0a33429bb9..97b436e2e91 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -3,11 +3,11 @@ to make it clearer why all the sets with hacked bank setup existed in the wild - note: - this file contains the originals only - for bootlegs see multfish_boot.c - for reference information about undumped sets see multfish_Ref.c - if adding a new set ALWAYS check that, anything not listed in there is - almost certainly a bootleg. + note: + this file contains the originals only + for bootlegs see multfish_boot.c + for reference information about undumped sets see multfish_Ref.c - if adding a new set ALWAYS check that, anything not listed in there is + almost certainly a bootleg. */ @@ -1058,7 +1058,7 @@ MACHINE_CONFIG_START( igrosoft_gamble, igrosoft_gamble_state ) MCFG_SCREEN_VISIBLE_AREA(17*16, 1024-16*7-1, 1*16, 32*16-1*16-1) MCFG_SCREEN_UPDATE_DRIVER(igrosoft_gamble_state, screen_update_igrosoft_gamble) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", igrosoft_gamble) MCFG_PALETTE_ADD("palette", 0x1000) @@ -2807,5 +2807,3 @@ GAME( 2008, fcockt2_7, fcockt2_parent, igrosoft_gamble, igrosoft_gamble, igro GAME( 2010, crzmon2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,crzmon2, ROT0, "Igrosoft", "Crazy Monkey 2 (100310)", GAME_NOT_WORKING|GAME_SUPPORTS_SAVE ) /* World */ // xored and bitswapped palette and gfx roms GAME( 2010, crzmon2_2, crzmon2_parent, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,crzmon2lot,ROT0, "Igrosoft", "Crazy Monkey 2 (100311 Lottery)", GAME_NOT_WORKING|GAME_SUPPORTS_SAVE ) /* Lottery */ GAME( 2010, crzmon2_3, crzmon2_parent, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,crzmon2ent,ROT0, "Igrosoft", "Crazy Monkey 2 (100315 Entertainment)", GAME_NOT_WORKING|GAME_SUPPORTS_SAVE ) /* Entertainment */ - - diff --git a/src/mame/drivers/multfish_boot.c b/src/mame/drivers/multfish_boot.c index 05e9dba3725..c592dc14c80 100644 --- a/src/mame/drivers/multfish_boot.c +++ b/src/mame/drivers/multfish_boot.c @@ -11,7 +11,7 @@ Sets below are bootleg / hacked sets, descriptions of what has been modified are provided where known -- use of these sets may present a risk to the operator, you should always ensure you're using original Igrosoft program roms on your PCB! - -------------------------------- + -------------------------------- The sets which differs from the originals by 5-6 bytes are bootlegs that simply change the banking address. Usually to convert a Crazy Monkey PCB which use the address "F9". diff --git a/src/mame/drivers/multfish_ref.c b/src/mame/drivers/multfish_ref.c index 88cbfc862ce..34425859bf4 100644 --- a/src/mame/drivers/multfish_ref.c +++ b/src/mame/drivers/multfish_ref.c @@ -624,5 +624,3 @@ ROM_END //GAME( 2008, fcockt2_2, fcockt2_parent, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (080904 Russia)", GAME_SUPPORTS_SAVE ) /* Russia */ #endif - - diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index d065f49a421..8c1d3edaa52 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -114,7 +114,7 @@ UINT32 murogmbl_state::screen_update_murogmbl(screen_device &screen, bitmap_ind1 for (x = 0; x < 32; x++) { int tile = m_video[count]; - gfx->opaque(bitmap,cliprect, tile, 0, 0, 0, x * 8, y * 8); + gfx->opaque(bitmap,cliprect, tile, 0, 0, 0, x * 8, y * 8); count++; } diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index 5ab7ca2439d..71b3cf32dcb 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -987,10 +987,10 @@ static MACHINE_CONFIG_START( mystwarr, mystwarr_state ) MCFG_QUANTUM_TIME(attotime::from_hz(1920)) MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") - + MCFG_DEVICE_ADD("k053252", K053252, 6000000) // 6 MHz? MCFG_K053252_OFFSETS(24, 16) - + MCFG_MACHINE_START_OVERRIDE(mystwarr_state,mystwarr) MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,mystwarr) @@ -1009,7 +1009,7 @@ static MACHINE_CONFIG_START( mystwarr, mystwarr_state ) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) MCFG_K056832_ADD_NOINTF("k056832"/*, mystwarr_k056832_intf*/) MCFG_K056832_GFXDECODE("gfxdecode") @@ -1040,7 +1040,7 @@ static MACHINE_CONFIG_DERIVED( viostorm, mystwarr ) MCFG_DEVICE_REPLACE("k053252", K053252, 16000000/2) MCFG_K053252_OFFSETS(40, 16) - + /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(viostorm_map) @@ -1070,7 +1070,7 @@ static MACHINE_CONFIG_DERIVED( metamrph, mystwarr ) MCFG_DEVICE_MODIFY("k053252") MCFG_K053252_OFFSETS(24, 15) - + MCFG_K053250_ADD("k053250_1", "palette", "screen", -7, 0) /* video hardware */ @@ -1122,7 +1122,7 @@ static MACHINE_CONFIG_DERIVED( gaiapols, mystwarr ) MCFG_DEVICE_MODIFY("k053252") MCFG_K053252_OFFSETS(40, 16) - + MCFG_K054000_ADD("k054000") MCFG_GFXDECODE_MODIFY("gfxdecode", gaiapols) diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index d92e190d248..0dfce0c8af6 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1580,11 +1580,11 @@ static MACHINE_CONFIG_START( coh700, namcos12_state ) MCFG_LINE_DISPATCH_ADD("clk_dispatch", 2) MCFG_LINE_DISPATCH_FWD_CB(0, 2, DEVWRITELINE(":rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT MCFG_LINE_DISPATCH_FWD_CB(1, 2, DEVWRITELINE(":namco_settings", namco_settings_device, clk_w)) - + MCFG_DEVICE_MODIFY("sub:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) - + MCFG_AT28C16_ADD("at28c16", NULL) /* video hardware */ @@ -1964,7 +1964,7 @@ ROM_START( kartduel ) ROM_REGION32_LE( 0x00800000, "user2", 0 ) /* main data */ ROM_LOAD16_BYTE( "kdt1rom0l.ic12", 0x000000, 0x400000, BAD_DUMP CRC(8e2d5d9e) SHA1(6f703e27a19740af4094004b783b3cc2974c3de0) ) // These probably should be 64MBIT - ROM_LOAD16_BYTE( "kdt1rom0u.ic11", 0x000001, 0x400000, BAD_DUMP CRC(49ec5dbd) SHA1(336db6d3e361938850a9234b6b64070dbdc36d45) ) // + ROM_LOAD16_BYTE( "kdt1rom0u.ic11", 0x000001, 0x400000, BAD_DUMP CRC(49ec5dbd) SHA1(336db6d3e361938850a9234b6b64070dbdc36d45) ) // ROM_REGION( 0x0080000, "sub", 0 ) /* sound prg */ ROM_LOAD16_WORD_SWAP( "ktd1vera.11s", 0x000000, 0x080000, CRC(c2ff1971) SHA1(32ee2afe08e92049d8139c9324a0ea1a3b7ee5a1) ) diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 8c8b078b3a8..aef8b9a4936 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -1596,7 +1596,7 @@ READ16_MEMBER(namcos22_state::namcos22_keycus_r) // reading random values in some games for example in timecris to determine // where certain enemies will emerge. // It works in combination with keycus_w, but not yet understood how. - + // printf("Hit keycus offs %x mask %x PC=%x\n", offset, mem_mask, space.device().safe_pc()); // protection (not used for all games) @@ -1608,11 +1608,11 @@ READ16_MEMBER(namcos22_state::namcos22_keycus_r) case NAMCOS22_RIDGE_RACER2: if (offset == 0) return 0x0172; break; - + case NAMCOS22_ACE_DRIVER: if (offset == 3) return 0x0173; break; - + case NAMCOS22_CYBER_COMMANDO: if (offset == 1) return 0x0185; break; @@ -1640,11 +1640,11 @@ READ16_MEMBER(namcos22_state::namcos22_keycus_r) case NAMCOS22_TOKYO_WARS: if (offset == 4) return 0x01a8; break; - + default: break; } - + // pick a random number, but don't pick the same twice in a row UINT16 old_rng = m_keycus_rng; do diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 90a7f1a0472..2512ba97099 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -2516,7 +2516,7 @@ static MACHINE_CONFIG_START( naomi_aw_base, naomi_state ) MCFG_AICA_MASTER MCFG_AICA_IRQ_CB(WRITELINE(naomi_state, aica_irq)) MCFG_AICA_MAIN_IRQ_CB(WRITELINE(naomi_state, sh4_aica_irq)) - + MCFG_SOUND_ROUTE(0, "lspeaker", 2.0) MCFG_SOUND_ROUTE(1, "rspeaker", 2.0) @@ -3638,7 +3638,7 @@ ROM_END ROM_START( f355twin ) F355_BIOS NAOMI_DEFAULT_EEPROM - + ROM_REGION( 0xb000000, "rom_board", ROMREGION_ERASEFF) ROM_LOAD( "epr-22848.ic22", 0x0000000, 0x400000, CRC(a29edec2) SHA1(21ab3b5805e5aac20f51d0c468bcef1a655194bb) ) ROM_LOAD( "mpr-22827.ic1", 0x0800000, 0x800000, CRC(eeb1b975) SHA1(929f453eaf5565ae3e660dbbb8f406ff8aa7897d) ) @@ -5463,7 +5463,7 @@ ROM_START( mushik2e ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "mushik2e-key.bin", 0, 4, CRC(b32a0633) SHA1(984c01e43cf359d8e8a0c6cb1a04c5dc3da47d39) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x02)) ROM_END @@ -5478,7 +5478,7 @@ ROM_START( mushi2ea ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "mushik2e-key.bin", 0, 4, CRC(b32a0633) SHA1(984c01e43cf359d8e8a0c6cb1a04c5dc3da47d39) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x82)) ROM_END @@ -5492,7 +5492,7 @@ ROM_START( zunou ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "zunou-key.bin", 0, 4, CRC(cbe35afb) SHA1(78877655800aae27661bf720e1c37d6c6f2e3d1c) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x02)) ROM_END @@ -5508,7 +5508,7 @@ ROM_START( sl2007 ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "sl2007-key.bin", 0, 4, CRC(d5d1e807) SHA1(8a0cc371729c622bb05c5d26b3e39ec31d29ace1) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04)) ROM_END @@ -5524,7 +5524,7 @@ ROM_START( asndynmt ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "asndynmt-key.bin", 0, 4, CRC(bf5396a9) SHA1(0b27fdc800143fb977cb2f1e937078d7a7006939) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04)) ROM_END @@ -5540,7 +5540,7 @@ ROM_START( illvelo ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "illvelo-key.bin", 0, 4, CRC(e164952f) SHA1(6c0dfe567640e1e843a5d7bf858a24c101dfcf95) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04)) ROM_END @@ -5556,7 +5556,7 @@ ROM_START( mamonoro ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "mamonoro-key.bin", 0x000000, 0x000004, CRC(264ca27a) SHA1(3b81b9794d86697f8eac7ea6945d992564ad6199) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04)) ROM_END @@ -5574,7 +5574,7 @@ ROM_START( mbaa ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "mbaa-key.bin", 0x000000, 0x000004, CRC(f4ad909f) SHA1(27ba44592c2642b5862a24f68c755ad4115e6047) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x06)) ROM_END @@ -5593,7 +5593,7 @@ ROM_START( mbaaa ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "mbaa-key.bin", 0x000000, 0x000004, CRC(f4ad909f) SHA1(27ba44592c2642b5862a24f68c755ad4115e6047) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x86)) ROM_END @@ -5608,7 +5608,7 @@ ROM_START( radirgyn ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "radirgyn-key.bin", 0x000000, 0x000004, CRC(c158cf3b) SHA1(c128646d7fee79fc10bf7bbaa23121f347df77f4) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04)) ROM_END @@ -5623,7 +5623,7 @@ ROM_START( ausfache ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "ausfache-key.bin", 0, 4, CRC(93cdc793) SHA1(f0a0c321a3bdf8ca87cbd840a168a9057c08f16a) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04)) ROM_END @@ -5633,17 +5633,17 @@ ROM_START( manicpnc ) ROM_REGION( 0x14000000, "rom_board", ROMREGION_ERASEFF) ROM_LOAD( "fpr-24408.ic8", 0x00000000, 0x4000000, CRC(cc6c722d) SHA1(5a3deb5c4e3e0c518f71fe76d8c1f9ffdf6c527d) ) - ROM_LOAD( "fpr-24372.ic9", 0x04000000, 0x4000000, CRC(869eb096) SHA1(60135ecc2b48c748ba98c26a3a266e7f5622971a) ) - ROM_LOAD( "fpr-24373.ic10", 0x08000000, 0x4000000, CRC(60a1cf35) SHA1(35d0f6cc7f8d3c0330e3ee0e23a24c7f94c1b607) ) - ROM_LOAD( "fpr-24374.ic11", 0x0c000000, 0x4000000, CRC(57023e31) SHA1(5191728a9c717150d694e6709fe84ec800b0eac9) ) - ROM_LOAD( "fpr-24375.ic12", 0x10000000, 0x4000000, CRC(959c5396) SHA1(d0f5b96c0e20a7d91fcf6961a5eb9f36f143a590) ) + ROM_LOAD( "fpr-24372.ic9", 0x04000000, 0x4000000, CRC(869eb096) SHA1(60135ecc2b48c748ba98c26a3a266e7f5622971a) ) + ROM_LOAD( "fpr-24373.ic10", 0x08000000, 0x4000000, CRC(60a1cf35) SHA1(35d0f6cc7f8d3c0330e3ee0e23a24c7f94c1b607) ) + ROM_LOAD( "fpr-24374.ic11", 0x0c000000, 0x4000000, CRC(57023e31) SHA1(5191728a9c717150d694e6709fe84ec800b0eac9) ) + ROM_LOAD( "fpr-24375.ic12", 0x10000000, 0x4000000, CRC(959c5396) SHA1(d0f5b96c0e20a7d91fcf6961a5eb9f36f143a590) ) ROM_REGION( 0x200000, "ioboard", 0) // touch screen I/O board, program disassembles as little-endian SH-4 ROM_LOAD( "fpr24351.ic14", 0x000000, 0x200000, CRC(4d1b7b89) SHA1(965b8c6b5a2e7b3f1b1e2eac19c86000c3b66754) ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "pokasuka-key.bin", 0, 4, CRC(f00bcd61) SHA1(b8315b851656c2e0b7853979988d1c44eab0886b) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x05)) ROM_END @@ -5663,7 +5663,7 @@ ROM_START( pokasuka ) ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "pokasuka-key.bin", 0, 4, CRC(f00bcd61) SHA1(b8315b851656c2e0b7853979988d1c44eab0886b) ) - + ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x05)) ROM_END @@ -5761,7 +5761,7 @@ ROM_START( gunsur2 ) ROM_LOAD( "bhf1ma13.6n", 0xd000000, 0x1000000, CRC(055718ad) SHA1(355c4780231a4361aa6237dd34819b60d9df0fc7) ) ROM_LOAD( "bhf1ma14.6m", 0xe000000, 0x1000000, CRC(d06c9bd7) SHA1(54668a2fd31059976890da92709c18f308634887) ) ROM_LOAD( "bhf1ma15.6l", 0xf000000, 0x1000000, CRC(db3c396b) SHA1(da0e125d627ce890906ca100081ab0685e11c0ef) ) - + ROM_REGION( 4, "rom_key", 0 ) ROM_LOAD( "bhf1-key.bin", 0x0000000, 0x0000004, CRC(9899e931) SHA1(c0837262b9069b33d0e72b418e80b5f0da8b9251) ) ROM_END @@ -6280,16 +6280,16 @@ ROM_START( starhrse ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x4800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-23625.ic22", 0x000000, 0x0400000, CRC(7300bc6c) SHA1(f0bfff190c9f02895cc1f98eb695f327c948fca3) ) + ROM_LOAD( "epr-23625.ic22", 0x000000, 0x0400000, CRC(7300bc6c) SHA1(f0bfff190c9f02895cc1f98eb695f327c948fca3) ) ROM_RELOAD( 0x400000, 0x400000) - ROM_LOAD( "mpr-23231.ic1", 0x0800000, 0x1000000, CRC(e41ddc53) SHA1(f565d68d8ce4010a2181b0343fa49bfdc81ba4cf) ) - ROM_LOAD( "mpr-23232.ic2", 0x1800000, 0x1000000, CRC(30f963a0) SHA1(dc56203ceae20f7a7354e505dd7f27cbce5c70e0) ) - ROM_LOAD( "mpr-23233.ic3", 0x2800000, 0x1000000, CRC(d6451cab) SHA1(6508e27d0370b19df01150da7baf4875479c166a) ) - ROM_LOAD( "mpr-23234.ic4", 0x3800000, 0x1000000, CRC(44044c14) SHA1(4934cb8d5f9b4085ffb5ddc711343f488aae4c4d) ) + ROM_LOAD( "mpr-23231.ic1", 0x0800000, 0x1000000, CRC(e41ddc53) SHA1(f565d68d8ce4010a2181b0343fa49bfdc81ba4cf) ) + ROM_LOAD( "mpr-23232.ic2", 0x1800000, 0x1000000, CRC(30f963a0) SHA1(dc56203ceae20f7a7354e505dd7f27cbce5c70e0) ) + ROM_LOAD( "mpr-23233.ic3", 0x2800000, 0x1000000, CRC(d6451cab) SHA1(6508e27d0370b19df01150da7baf4875479c166a) ) + ROM_LOAD( "mpr-23234.ic4", 0x3800000, 0x1000000, CRC(44044c14) SHA1(4934cb8d5f9b4085ffb5ddc711343f488aae4c4d) ) // this dump can't be used as main_eeprom, because that's exactly 0x80 bytes ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(951684e4) SHA1(0beaf5827064252293223b946c04b8698e7207bb) ) + ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(951684e4) SHA1(0beaf5827064252293223b946c04b8698e7207bb) ) ROM_END ROM_START( starhrct ) @@ -6297,30 +6297,30 @@ ROM_START( starhrct ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x9800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-23626.ic22", 0x0000000, 0x200000, CRC(d5893a19) SHA1(861624ef3e5061b6ed9d6c4714e35fa508643b05) ) + ROM_LOAD( "epr-23626.ic22", 0x0000000, 0x200000, CRC(d5893a19) SHA1(861624ef3e5061b6ed9d6c4714e35fa508643b05) ) ROM_RELOAD( 0x400000, 0x200000) - ROM_LOAD( "ic1s.bin", 0x0800000, 0x800000, CRC(e45ab26f) SHA1(1e40ae9778a026b0f4c3c9681cf5d08397b72c48) ) - ROM_LOAD( "ic2s.bin", 0x1000000, 0x800000, CRC(4d0e4e64) SHA1(4fe1c35f4cf34391eb1e4486bde92bd6104f05f2) ) - ROM_LOAD( "ic3s.bin", 0x1800000, 0x800000, CRC(a18c7ce7) SHA1(1e4fb63c0d8f901b077590ccc0af4bba3135f56c) ) - ROM_LOAD( "ic4s.bin", 0x2000000, 0x800000, CRC(82001b50) SHA1(d06e70d2ae4cf0635872663c5b6f1dbbd12897e0) ) - ROM_LOAD( "ic5s.bin", 0x2800000, 0x800000, CRC(5e4af8b2) SHA1(98598a0f5932cf79f54ff79cfa03632550dee373) ) - ROM_LOAD( "ic6s.bin", 0x3000000, 0x800000, CRC(2950c543) SHA1(041548e79afcadc1b0e3524432ed52320f395f3e) ) - ROM_LOAD( "ic7s.bin", 0x3800000, 0x800000, CRC(a2bb8ebb) SHA1(c5329cedf5f746c0d684d8dea301a0786909ea1d) ) - ROM_LOAD( "ic8s.bin", 0x4000000, 0x800000, CRC(fde9b537) SHA1(b186da26bef43b483fd32c486bb018dc631bf485) ) - ROM_LOAD( "ic9s.bin", 0x4800000, 0x800000, CRC(4db3e79a) SHA1(de2480792e7dfc01195000607be90fd4b29fdcc0) ) - ROM_LOAD( "ic10s.bin", 0x5000000, 0x800000, CRC(37167167) SHA1(e379d20bcda84e6aaa0b930dce95d97812cd45d6) ) - ROM_LOAD( "ic11s.bin", 0x5800000, 0x800000, CRC(927f1edb) SHA1(64f2f2f4546cc6b45ee78aeae68ce829cb57a124) ) - ROM_LOAD( "ic12s.bin", 0x6000000, 0x800000, CRC(05de610d) SHA1(715124a3e7a23589c4ca9f0dccd55a21f7d48123) ) - ROM_LOAD( "ic13s.bin", 0x6800000, 0x800000, CRC(17ed44c3) SHA1(ec34276006c3be7bd6d23c11314b0369a082e1ef) ) - ROM_LOAD( "ic14s.bin", 0x7000000, 0x800000, CRC(66d7e2a1) SHA1(69178d4995ac3c2d73d953544101d23da1812f65) ) - ROM_LOAD( "ic15s.bin", 0x7800000, 0x800000, CRC(0c701416) SHA1(6c9e882e2a00768f5e0a28d38a5695c65594d8dd) ) - ROM_LOAD( "ic16s.bin", 0x8000000, 0x800000, CRC(5d8e6e8d) SHA1(03045f3a9257632c325eba9752855b42355dff6c) ) - ROM_LOAD( "ic17s.bin", 0x8800000, 0x800000, CRC(b4c40606) SHA1(4f187dfe44bd89c90b6fa4b90f16222bc0a74d22) ) + ROM_LOAD( "ic1s.bin", 0x0800000, 0x800000, CRC(e45ab26f) SHA1(1e40ae9778a026b0f4c3c9681cf5d08397b72c48) ) + ROM_LOAD( "ic2s.bin", 0x1000000, 0x800000, CRC(4d0e4e64) SHA1(4fe1c35f4cf34391eb1e4486bde92bd6104f05f2) ) + ROM_LOAD( "ic3s.bin", 0x1800000, 0x800000, CRC(a18c7ce7) SHA1(1e4fb63c0d8f901b077590ccc0af4bba3135f56c) ) + ROM_LOAD( "ic4s.bin", 0x2000000, 0x800000, CRC(82001b50) SHA1(d06e70d2ae4cf0635872663c5b6f1dbbd12897e0) ) + ROM_LOAD( "ic5s.bin", 0x2800000, 0x800000, CRC(5e4af8b2) SHA1(98598a0f5932cf79f54ff79cfa03632550dee373) ) + ROM_LOAD( "ic6s.bin", 0x3000000, 0x800000, CRC(2950c543) SHA1(041548e79afcadc1b0e3524432ed52320f395f3e) ) + ROM_LOAD( "ic7s.bin", 0x3800000, 0x800000, CRC(a2bb8ebb) SHA1(c5329cedf5f746c0d684d8dea301a0786909ea1d) ) + ROM_LOAD( "ic8s.bin", 0x4000000, 0x800000, CRC(fde9b537) SHA1(b186da26bef43b483fd32c486bb018dc631bf485) ) + ROM_LOAD( "ic9s.bin", 0x4800000, 0x800000, CRC(4db3e79a) SHA1(de2480792e7dfc01195000607be90fd4b29fdcc0) ) + ROM_LOAD( "ic10s.bin", 0x5000000, 0x800000, CRC(37167167) SHA1(e379d20bcda84e6aaa0b930dce95d97812cd45d6) ) + ROM_LOAD( "ic11s.bin", 0x5800000, 0x800000, CRC(927f1edb) SHA1(64f2f2f4546cc6b45ee78aeae68ce829cb57a124) ) + ROM_LOAD( "ic12s.bin", 0x6000000, 0x800000, CRC(05de610d) SHA1(715124a3e7a23589c4ca9f0dccd55a21f7d48123) ) + ROM_LOAD( "ic13s.bin", 0x6800000, 0x800000, CRC(17ed44c3) SHA1(ec34276006c3be7bd6d23c11314b0369a082e1ef) ) + ROM_LOAD( "ic14s.bin", 0x7000000, 0x800000, CRC(66d7e2a1) SHA1(69178d4995ac3c2d73d953544101d23da1812f65) ) + ROM_LOAD( "ic15s.bin", 0x7800000, 0x800000, CRC(0c701416) SHA1(6c9e882e2a00768f5e0a28d38a5695c65594d8dd) ) + ROM_LOAD( "ic16s.bin", 0x8000000, 0x800000, CRC(5d8e6e8d) SHA1(03045f3a9257632c325eba9752855b42355dff6c) ) + ROM_LOAD( "ic17s.bin", 0x8800000, 0x800000, CRC(b4c40606) SHA1(4f187dfe44bd89c90b6fa4b90f16222bc0a74d22) ) // .18s chip is not present but is tested for an FF fill (pull-up resistors on the PCB's data bus presumably accomplish this) // this dump can't be used as main_eeprom, because that's exactly 0x80 bytes ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(1557297e) SHA1(41e8a7a8eaf5076b124d378afdf97e328d100e72) ) + ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(1557297e) SHA1(41e8a7a8eaf5076b124d378afdf97e328d100e72) ) ROM_END ROM_START( starhrcl ) @@ -6328,18 +6328,18 @@ ROM_START( starhrcl ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x7000000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-23627.ic22", 0x0000000, 0x0400000, CRC(7caccc5e) SHA1(86bff30b76b4b02467b37341582062de5c507a39) ) - ROM_LOAD( "mpr-23275.ic1", 0x0800000, 0x1000000, CRC(ffc62eab) SHA1(bb9dd3cc6540de1c194df99d5629583216f4c557) ) - ROM_LOAD( "mpr-23276.ic2", 0x1800000, 0x1000000, CRC(8b7ce666) SHA1(2848786659349598e019fbb05c92ed3ce6e2ec11) ) - ROM_LOAD( "mpr-23277.ic3", 0x2800000, 0x1000000, CRC(47a6f9c5) SHA1(9af5c3129a44fcffb87b1b021d8812e0b695967f) ) - ROM_LOAD( "mpr-23278.ic4", 0x3800000, 0x1000000, CRC(c12b189c) SHA1(7743500400a4e23a5e97a53ee16775c32d9abd5d) ) - ROM_LOAD( "mpr-23279.ic5", 0x4800000, 0x1000000, CRC(b8b39559) SHA1(082c9b6926557654c3f3bf00d741f32c560b50ce) ) - ROM_LOAD( "mpr-23280.ic6", 0x5800000, 0x1000000, CRC(b1c8daa2) SHA1(a05fb374156ea013e35502abccc92f5117c39daa) ) - ROM_LOAD( "mpr-23281.ic7", 0x6800000, 0x0800000, CRC(c0378369) SHA1(c728a181eddb01b9f8574669d4550baed559a5a4) ) + ROM_LOAD( "epr-23627.ic22", 0x0000000, 0x0400000, CRC(7caccc5e) SHA1(86bff30b76b4b02467b37341582062de5c507a39) ) + ROM_LOAD( "mpr-23275.ic1", 0x0800000, 0x1000000, CRC(ffc62eab) SHA1(bb9dd3cc6540de1c194df99d5629583216f4c557) ) + ROM_LOAD( "mpr-23276.ic2", 0x1800000, 0x1000000, CRC(8b7ce666) SHA1(2848786659349598e019fbb05c92ed3ce6e2ec11) ) + ROM_LOAD( "mpr-23277.ic3", 0x2800000, 0x1000000, CRC(47a6f9c5) SHA1(9af5c3129a44fcffb87b1b021d8812e0b695967f) ) + ROM_LOAD( "mpr-23278.ic4", 0x3800000, 0x1000000, CRC(c12b189c) SHA1(7743500400a4e23a5e97a53ee16775c32d9abd5d) ) + ROM_LOAD( "mpr-23279.ic5", 0x4800000, 0x1000000, CRC(b8b39559) SHA1(082c9b6926557654c3f3bf00d741f32c560b50ce) ) + ROM_LOAD( "mpr-23280.ic6", 0x5800000, 0x1000000, CRC(b1c8daa2) SHA1(a05fb374156ea013e35502abccc92f5117c39daa) ) + ROM_LOAD( "mpr-23281.ic7", 0x6800000, 0x0800000, CRC(c0378369) SHA1(c728a181eddb01b9f8574669d4550baed559a5a4) ) // this dump can't be used as main_eeprom, because that's exactly 0x80 bytes ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(4929e940) SHA1(f8c4277ca0ae5e36b2eed033cc731b8fc4fccafc) ) + ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(4929e940) SHA1(f8c4277ca0ae5e36b2eed033cc731b8fc4fccafc) ) ROM_END ROM_START( starhrsp ) @@ -6364,28 +6364,28 @@ ROM_START( puyofevp ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0xc000000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD32_WORD( "ic17s.bin", 0x01000000, 0x800000, CRC(f51ce63b) SHA1(7642d5a78d103986ebe7bf9ecea7602490fcdfa2) ) - ROM_LOAD32_WORD( "ic18s.bin", 0x01000002, 0x800000, CRC(7109decc) SHA1(91481f427d4d28c3ff1805eb00b63deb9d691b27) ) - ROM_LOAD32_WORD( "ic19s.bin", 0x02000000, 0x800000, CRC(a58efa9c) SHA1(ff83c25ef4094c1033b906bd048569927b0828c2) ) - ROM_LOAD32_WORD( "ic20s.bin", 0x02000002, 0x800000, CRC(6dee24b2) SHA1(ef6eb8aa239af6b02169618dd2594fc9c62086dc) ) - ROM_LOAD32_WORD( "ic21s.bin", 0x03000000, 0x800000, CRC(9a0564c2) SHA1(71fa98fd4815a119ff2cbe07298fefc25a2cde79) ) - ROM_LOAD32_WORD( "ic22s.bin", 0x03000002, 0x800000, CRC(df692133) SHA1(9433010ca070003d59a18239cd2637e6f9bffeae) ) - ROM_LOAD32_WORD( "ic23s.bin", 0x04000000, 0x800000, CRC(61c98256) SHA1(a1e4e6fa7c2672d49ff6a0a5a239d9f405797248) ) - ROM_LOAD32_WORD( "ic24s.bin", 0x04000002, 0x800000, CRC(c7e8ec24) SHA1(7cf7fc4954caff3fe2bb14964889d79250e6e4db) ) - ROM_LOAD32_WORD( "ic25s.bin", 0x05000000, 0x800000, CRC(2cb47ef5) SHA1(3f6cea2ca7857bd441f9632cd295c5f57a3d59fc) ) - ROM_LOAD32_WORD( "ic26s.bin", 0x05000002, 0x800000, CRC(f5b477d5) SHA1(f79d65bee22800dce2964666278c285d15c059e7) ) - ROM_LOAD32_WORD( "ic27s.bin", 0x06000000, 0x800000, CRC(22c07470) SHA1(4e64b632a4dad2d6a565d90aa34a00739a2a4ad4) ) - ROM_LOAD32_WORD( "ic28s.bin", 0x06000002, 0x800000, CRC(018233e0) SHA1(168430d66c59db49d113b65ae6dac9ddb9919661) ) - ROM_LOAD32_WORD( "ic29s.bin", 0x07000000, 0x800000, CRC(96101b95) SHA1(b818f24b551eaf3a35d8eb23b7e7df2af5ceef5f) ) - ROM_LOAD32_WORD( "ic30s.bin", 0x07000002, 0x800000, CRC(16dff39b) SHA1(b3899ab22056015ed3fd4ee06f687d9dca540ece) ) - ROM_LOAD32_WORD( "ic31s.bin", 0x08000000, 0x800000, CRC(510c03dd) SHA1(1488a574590be8927bc8c403105b6fb72c829177) ) - ROM_LOAD32_WORD( "ic32s.bin", 0x08000002, 0x800000, CRC(b184e263) SHA1(5089b13c160708c4ddee36e4fb89110ab6281690) ) - ROM_LOAD32_WORD( "ic33s.bin", 0x09000000, 0x800000, CRC(be2a164b) SHA1(a1d93e84e7e35ec55e738dc27069295cd0610f27) ) - ROM_LOAD32_WORD( "ic34s.bin", 0x09000002, 0x800000, CRC(01e0a163) SHA1(7730ce21e9041c70d39700d4ea2ff3adf54a315e) ) - ROM_LOAD32_WORD( "ic35s.bin", 0x0a000000, 0x800000, CRC(ae0c1caa) SHA1(548c5e6cb0c99ba8f0a758bb66fb8d949b2da1a0) ) - ROM_LOAD32_WORD( "ic36s.bin", 0x0a000002, 0x800000, CRC(6de8d5c7) SHA1(896520ab7cf458fddeacdad7a535976445048d8f) ) - ROM_LOAD32_WORD( "ic37s.bin", 0x0b000000, 0x800000, CRC(fc89454c) SHA1(f0550e17930c71d81050f18eceb312fe82c084c2) ) - ROM_LOAD32_WORD( "ic38s.bin", 0x0b000002, 0x800000, CRC(86954476) SHA1(ba2b31032321abf5ddfe7cff7803ae4fa944812c) ) + ROM_LOAD32_WORD( "ic17s.bin", 0x01000000, 0x800000, CRC(f51ce63b) SHA1(7642d5a78d103986ebe7bf9ecea7602490fcdfa2) ) + ROM_LOAD32_WORD( "ic18s.bin", 0x01000002, 0x800000, CRC(7109decc) SHA1(91481f427d4d28c3ff1805eb00b63deb9d691b27) ) + ROM_LOAD32_WORD( "ic19s.bin", 0x02000000, 0x800000, CRC(a58efa9c) SHA1(ff83c25ef4094c1033b906bd048569927b0828c2) ) + ROM_LOAD32_WORD( "ic20s.bin", 0x02000002, 0x800000, CRC(6dee24b2) SHA1(ef6eb8aa239af6b02169618dd2594fc9c62086dc) ) + ROM_LOAD32_WORD( "ic21s.bin", 0x03000000, 0x800000, CRC(9a0564c2) SHA1(71fa98fd4815a119ff2cbe07298fefc25a2cde79) ) + ROM_LOAD32_WORD( "ic22s.bin", 0x03000002, 0x800000, CRC(df692133) SHA1(9433010ca070003d59a18239cd2637e6f9bffeae) ) + ROM_LOAD32_WORD( "ic23s.bin", 0x04000000, 0x800000, CRC(61c98256) SHA1(a1e4e6fa7c2672d49ff6a0a5a239d9f405797248) ) + ROM_LOAD32_WORD( "ic24s.bin", 0x04000002, 0x800000, CRC(c7e8ec24) SHA1(7cf7fc4954caff3fe2bb14964889d79250e6e4db) ) + ROM_LOAD32_WORD( "ic25s.bin", 0x05000000, 0x800000, CRC(2cb47ef5) SHA1(3f6cea2ca7857bd441f9632cd295c5f57a3d59fc) ) + ROM_LOAD32_WORD( "ic26s.bin", 0x05000002, 0x800000, CRC(f5b477d5) SHA1(f79d65bee22800dce2964666278c285d15c059e7) ) + ROM_LOAD32_WORD( "ic27s.bin", 0x06000000, 0x800000, CRC(22c07470) SHA1(4e64b632a4dad2d6a565d90aa34a00739a2a4ad4) ) + ROM_LOAD32_WORD( "ic28s.bin", 0x06000002, 0x800000, CRC(018233e0) SHA1(168430d66c59db49d113b65ae6dac9ddb9919661) ) + ROM_LOAD32_WORD( "ic29s.bin", 0x07000000, 0x800000, CRC(96101b95) SHA1(b818f24b551eaf3a35d8eb23b7e7df2af5ceef5f) ) + ROM_LOAD32_WORD( "ic30s.bin", 0x07000002, 0x800000, CRC(16dff39b) SHA1(b3899ab22056015ed3fd4ee06f687d9dca540ece) ) + ROM_LOAD32_WORD( "ic31s.bin", 0x08000000, 0x800000, CRC(510c03dd) SHA1(1488a574590be8927bc8c403105b6fb72c829177) ) + ROM_LOAD32_WORD( "ic32s.bin", 0x08000002, 0x800000, CRC(b184e263) SHA1(5089b13c160708c4ddee36e4fb89110ab6281690) ) + ROM_LOAD32_WORD( "ic33s.bin", 0x09000000, 0x800000, CRC(be2a164b) SHA1(a1d93e84e7e35ec55e738dc27069295cd0610f27) ) + ROM_LOAD32_WORD( "ic34s.bin", 0x09000002, 0x800000, CRC(01e0a163) SHA1(7730ce21e9041c70d39700d4ea2ff3adf54a315e) ) + ROM_LOAD32_WORD( "ic35s.bin", 0x0a000000, 0x800000, CRC(ae0c1caa) SHA1(548c5e6cb0c99ba8f0a758bb66fb8d949b2da1a0) ) + ROM_LOAD32_WORD( "ic36s.bin", 0x0a000002, 0x800000, CRC(6de8d5c7) SHA1(896520ab7cf458fddeacdad7a535976445048d8f) ) + ROM_LOAD32_WORD( "ic37s.bin", 0x0b000000, 0x800000, CRC(fc89454c) SHA1(f0550e17930c71d81050f18eceb312fe82c084c2) ) + ROM_LOAD32_WORD( "ic38s.bin", 0x0b000002, 0x800000, CRC(86954476) SHA1(ba2b31032321abf5ddfe7cff7803ae4fa944812c) ) ROM_COPY( "rom_board", 0x01000000, 0x400000, 0xc00000 ) @@ -6394,7 +6394,7 @@ ROM_START( puyofevp ) // this dump can't be used as main_eeprom, because that's exactly 0x80 bytes ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(17150bc9) SHA1(c3af7d91e12141938d2b9e67eb9f5ff961cd09ff) ) + ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(17150bc9) SHA1(c3af7d91e12141938d2b9e67eb9f5ff961cd09ff) ) ROM_END /* GD-ROM titles - a PIC supplies a decryption key @@ -7536,7 +7536,7 @@ ROM_START( ndcfboxa ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-0567-EXP) //(sticker 253-5508-0567) - ROM_LOAD("317-0567-exp.pic", 0x00, 0x4000, NO_DUMP ) + ROM_LOAD("317-0567-exp.pic", 0x00, 0x4000, NO_DUMP ) ROM_END @@ -7731,14 +7731,14 @@ ROM_START( hopper ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0xb000000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-24083.ic11", 0x000000, 0x400000, CRC(2733e65a) SHA1(4a5d109d0531bebd8e8f585789adce98cac2ab93) ) + ROM_LOAD( "epr-24083.ic11", 0x000000, 0x400000, CRC(2733e65a) SHA1(4a5d109d0531bebd8e8f585789adce98cac2ab93) ) ROM_REGION( 0x40000, "flash", ROMREGION_ERASEFF) - ROM_LOAD( "315-6358a.ic2", 0x000000, 0x020008, CRC(ef442e67) SHA1(70ac91e2ca1ff2dfba48d566e4de68bd8b82f282) ) + ROM_LOAD( "315-6358a.ic2", 0x000000, 0x020008, CRC(ef442e67) SHA1(70ac91e2ca1ff2dfba48d566e4de68bd8b82f282) ) // this dump can't be used as main_eeprom, because that's exactly 0x80 bytes ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(ddedf494) SHA1(f1529615711a9871051cd09c2a9b95c90d356874) ) + ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(ddedf494) SHA1(f1529615711a9871051cd09c2a9b95c90d356874) ) ROM_END ROM_START( clubkrte ) @@ -7790,32 +7790,32 @@ ROM_START( clubkprz ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x9000000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-24065.ic11", 0x000000, 0x400000, CRC(7c331cb8) SHA1(f7e1cffbad576482a91bc1dc9129c689f0bebb25) ) - ROM_LOAD32_WORD( "opr-24066.17s", 0x1000000, 0x800000, CRC(b22cfa7b) SHA1(e0f795dc9d3a2dd1869f85f3eedd0f8d703a1be8) ) - ROM_LOAD32_WORD( "opr-24067.18", 0x1000002, 0x800000, CRC(0d2d1290) SHA1(a26fa82fc87d6ed60095b2e778b649fcbb8bb1ee) ) - ROM_LOAD32_WORD( "opr-24068.19s", 0x2000000, 0x800000, CRC(d320009b) SHA1(76677eacd18770d091fc19e31be3d84410ed3256) ) - ROM_LOAD32_WORD( "opr-24069.20", 0x2000002, 0x800000, CRC(56145c73) SHA1(a74a97a431a315f86a1b25d1fc9cc1fb93146776) ) - ROM_LOAD32_WORD( "opr-24070.21s", 0x3000000, 0x800000, CRC(10a0c315) SHA1(337902393e215d94954f123c6b016925486c3374) ) - ROM_LOAD32_WORD( "opr-24071.22", 0x3000002, 0x800000, CRC(040e1329) SHA1(cebf8bc48a745811bcc6bce0ad880eca392428f9) ) - ROM_LOAD32_WORD( "opr-24072.23s", 0x4000000, 0x800000, CRC(1e9834e4) SHA1(a226689190739a39016b78c881f92b9bbb8d830e) ) - ROM_LOAD32_WORD( "opr-24073.24", 0x4000002, 0x800000, CRC(51fb7d42) SHA1(fb0bffeb181b1f3efcfa22aabda1bea926d9048b) ) - ROM_LOAD32_WORD( "opr-24074.25s", 0x5000000, 0x800000, CRC(636625fe) SHA1(fffd766cf14e66d10071a342573535ac708f87b7) ) - ROM_LOAD32_WORD( "opr-24075.26", 0x5000002, 0x800000, CRC(9eee9689) SHA1(831ac7713cc4f47679609361f0e1c67bb028e795) ) - ROM_LOAD32_WORD( "opr-24076.27s", 0x6000000, 0x800000, CRC(a89a5555) SHA1(c2c0eeb50f1afe6c7c3d978a99c6eaac96062bf0) ) - ROM_LOAD32_WORD( "opr-24077.28", 0x6000002, 0x800000, CRC(1e11d0aa) SHA1(1cc4dd05e1fbd0fde669b40aa49098c14eafd035) ) - ROM_LOAD32_WORD( "opr-24078.29", 0x7000000, 0x800000, CRC(a83f5f88) SHA1(ef0787cf84847e74fa3bb38d7133d87607df84fb) ) - ROM_LOAD32_WORD( "opr-24079.30s", 0x7000002, 0x800000, CRC(57efa68f) SHA1(5dd863dfb035489de3bbb3c3f72ee5d87ec322be) ) - ROM_LOAD32_WORD( "opr-24080.31", 0x8000000, 0x800000, CRC(307c480e) SHA1(6e52f252f557988e52c42d495713a374507b5895) ) - ROM_LOAD32_WORD( "opr-24081.32s", 0x8000002, 0x800000, CRC(61085bdc) SHA1(48fe7f34bb5f50825b3c77d587e07f3adab1cf86) ) + ROM_LOAD( "epr-24065.ic11", 0x000000, 0x400000, CRC(7c331cb8) SHA1(f7e1cffbad576482a91bc1dc9129c689f0bebb25) ) + ROM_LOAD32_WORD( "opr-24066.17s", 0x1000000, 0x800000, CRC(b22cfa7b) SHA1(e0f795dc9d3a2dd1869f85f3eedd0f8d703a1be8) ) + ROM_LOAD32_WORD( "opr-24067.18", 0x1000002, 0x800000, CRC(0d2d1290) SHA1(a26fa82fc87d6ed60095b2e778b649fcbb8bb1ee) ) + ROM_LOAD32_WORD( "opr-24068.19s", 0x2000000, 0x800000, CRC(d320009b) SHA1(76677eacd18770d091fc19e31be3d84410ed3256) ) + ROM_LOAD32_WORD( "opr-24069.20", 0x2000002, 0x800000, CRC(56145c73) SHA1(a74a97a431a315f86a1b25d1fc9cc1fb93146776) ) + ROM_LOAD32_WORD( "opr-24070.21s", 0x3000000, 0x800000, CRC(10a0c315) SHA1(337902393e215d94954f123c6b016925486c3374) ) + ROM_LOAD32_WORD( "opr-24071.22", 0x3000002, 0x800000, CRC(040e1329) SHA1(cebf8bc48a745811bcc6bce0ad880eca392428f9) ) + ROM_LOAD32_WORD( "opr-24072.23s", 0x4000000, 0x800000, CRC(1e9834e4) SHA1(a226689190739a39016b78c881f92b9bbb8d830e) ) + ROM_LOAD32_WORD( "opr-24073.24", 0x4000002, 0x800000, CRC(51fb7d42) SHA1(fb0bffeb181b1f3efcfa22aabda1bea926d9048b) ) + ROM_LOAD32_WORD( "opr-24074.25s", 0x5000000, 0x800000, CRC(636625fe) SHA1(fffd766cf14e66d10071a342573535ac708f87b7) ) + ROM_LOAD32_WORD( "opr-24075.26", 0x5000002, 0x800000, CRC(9eee9689) SHA1(831ac7713cc4f47679609361f0e1c67bb028e795) ) + ROM_LOAD32_WORD( "opr-24076.27s", 0x6000000, 0x800000, CRC(a89a5555) SHA1(c2c0eeb50f1afe6c7c3d978a99c6eaac96062bf0) ) + ROM_LOAD32_WORD( "opr-24077.28", 0x6000002, 0x800000, CRC(1e11d0aa) SHA1(1cc4dd05e1fbd0fde669b40aa49098c14eafd035) ) + ROM_LOAD32_WORD( "opr-24078.29", 0x7000000, 0x800000, CRC(a83f5f88) SHA1(ef0787cf84847e74fa3bb38d7133d87607df84fb) ) + ROM_LOAD32_WORD( "opr-24079.30s", 0x7000002, 0x800000, CRC(57efa68f) SHA1(5dd863dfb035489de3bbb3c3f72ee5d87ec322be) ) + ROM_LOAD32_WORD( "opr-24080.31", 0x8000000, 0x800000, CRC(307c480e) SHA1(6e52f252f557988e52c42d495713a374507b5895) ) + ROM_LOAD32_WORD( "opr-24081.32s", 0x8000002, 0x800000, CRC(61085bdc) SHA1(48fe7f34bb5f50825b3c77d587e07f3adab1cf86) ) ROM_COPY( "rom_board", 0x1000000, 0x400000, 0xc00000 ) // this dump can't be used as main_eeprom, because that's exactly 0x80 bytes ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "at25010.ic3s", 0x000000, 0x000084, CRC(0142d8be) SHA1(5922b6c47b12b19e1fa7bbe9aae391905038a7ff) ) + ROM_LOAD( "at25010.ic3s", 0x000000, 0x000084, CRC(0142d8be) SHA1(5922b6c47b12b19e1fa7bbe9aae391905038a7ff) ) - ROM_REGION( 4, "rom_key", 0 ) // 317-0368-COM - ROM_LOAD( "clubkprz-key.bin", 0x000000, 0x000004, CRC(c9ed13c1) SHA1(2907985375cd5b04846e7214d200926be64d06fd) ) + ROM_REGION( 4, "rom_key", 0 ) // 317-0368-COM + ROM_LOAD( "clubkprz-key.bin", 0x000000, 0x000004, CRC(c9ed13c1) SHA1(2907985375cd5b04846e7214d200926be64d06fd) ) ROM_END ROM_START( clubkpzb ) @@ -7823,32 +7823,32 @@ ROM_START( clubkpzb ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x9000000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-24149.ic11", 0x000000, 0x400000, CRC(175b57a5) SHA1(de8ddd140c39d62a10d90ec46060d84c3b226c6b) ) - ROM_LOAD32_WORD( "opr-24178.ic17s", 0x1000000, 0x800000, CRC(836764ca) SHA1(e91cf7abeb27013d33726029d060075fa6352610) ) - ROM_LOAD32_WORD( "opr-24179.ic18", 0x1000002, 0x800000, CRC(03a0eb5b) SHA1(3f377d5a13d54c40c521f0faf6d50dc4fc077bb7) ) - ROM_LOAD32_WORD( "opr-24180.ic19s", 0x2000000, 0x800000, CRC(6a6c41f4) SHA1(3b01476b0483ce5e2f7e208e618ad56769b5c064) ) - ROM_LOAD32_WORD( "opr-24181.ic20", 0x2000002, 0x800000, CRC(38fd96fd) SHA1(c26ffc01529b4533c5e1448a774fa6e5f7e08080) ) - ROM_LOAD32_WORD( "opr-24182.ic21s", 0x3000000, 0x800000, CRC(b1116d71) SHA1(c840ae3602055528e4282283e5bc99465c6b5d28) ) - ROM_LOAD32_WORD( "opr-24183.ic22", 0x3000002, 0x800000, CRC(c1aef164) SHA1(e9a830a3a4bac4f5b2b40615bc43036aa0dd0a56) ) - ROM_LOAD32_WORD( "opr-24184.ic23s", 0x4000000, 0x800000, CRC(4ce1b902) SHA1(41b2fb02e3b9a0bb6ea8c7d77a9fb92248d62bcc) ) - ROM_LOAD32_WORD( "opr-24185.ic24", 0x4000002, 0x800000, CRC(94a4e6ab) SHA1(8738fcc75becf2acd5bc2c1be75e9a5c35359973) ) - ROM_LOAD32_WORD( "opr-24186.ic25s", 0x5000000, 0x800000, CRC(6884d0e9) SHA1(74ef002a752fcd377c5e6e6c17334ca22e561c76) ) - ROM_LOAD32_WORD( "opr-24187.ic26", 0x5000002, 0x800000, CRC(87c79534) SHA1(ab6e5246c388d0839ea6a45c8d2db035b33cd1d2) ) - ROM_LOAD32_WORD( "opr-24188.ic27s", 0x6000000, 0x800000, CRC(cfe107a2) SHA1(2f98bc00aa2b2eea0a26452542098c389f5e836c) ) - ROM_LOAD32_WORD( "opr-24189.ic28", 0x6000002, 0x800000, CRC(302de147) SHA1(442204439c509a6aa7dd25156bf17fb3853ae632) ) - ROM_LOAD32_WORD( "opr-24190.ic29", 0x7000000, 0x800000, CRC(71551313) SHA1(4b43d754b9511ae2d73ec04d7baf0e466337a82f) ) - ROM_LOAD32_WORD( "opr-24191.ic30s", 0x7000002, 0x800000, CRC(200cbeaf) SHA1(ccca2b873177d148a391cfcc8b1632856bd0e3b4) ) - ROM_LOAD32_WORD( "opr-24192.ic31", 0x8000000, 0x800000, CRC(869ef0ce) SHA1(227189dedfa72c56d9eedf5faeed9a4fd0a8393f) ) - ROM_LOAD32_WORD( "opr-24193.ic32s", 0x8000002, 0x800000, CRC(fb39946d) SHA1(d9fa077869709c6fda640bd4be18cf3db7ebe1d1) ) + ROM_LOAD( "epr-24149.ic11", 0x000000, 0x400000, CRC(175b57a5) SHA1(de8ddd140c39d62a10d90ec46060d84c3b226c6b) ) + ROM_LOAD32_WORD( "opr-24178.ic17s", 0x1000000, 0x800000, CRC(836764ca) SHA1(e91cf7abeb27013d33726029d060075fa6352610) ) + ROM_LOAD32_WORD( "opr-24179.ic18", 0x1000002, 0x800000, CRC(03a0eb5b) SHA1(3f377d5a13d54c40c521f0faf6d50dc4fc077bb7) ) + ROM_LOAD32_WORD( "opr-24180.ic19s", 0x2000000, 0x800000, CRC(6a6c41f4) SHA1(3b01476b0483ce5e2f7e208e618ad56769b5c064) ) + ROM_LOAD32_WORD( "opr-24181.ic20", 0x2000002, 0x800000, CRC(38fd96fd) SHA1(c26ffc01529b4533c5e1448a774fa6e5f7e08080) ) + ROM_LOAD32_WORD( "opr-24182.ic21s", 0x3000000, 0x800000, CRC(b1116d71) SHA1(c840ae3602055528e4282283e5bc99465c6b5d28) ) + ROM_LOAD32_WORD( "opr-24183.ic22", 0x3000002, 0x800000, CRC(c1aef164) SHA1(e9a830a3a4bac4f5b2b40615bc43036aa0dd0a56) ) + ROM_LOAD32_WORD( "opr-24184.ic23s", 0x4000000, 0x800000, CRC(4ce1b902) SHA1(41b2fb02e3b9a0bb6ea8c7d77a9fb92248d62bcc) ) + ROM_LOAD32_WORD( "opr-24185.ic24", 0x4000002, 0x800000, CRC(94a4e6ab) SHA1(8738fcc75becf2acd5bc2c1be75e9a5c35359973) ) + ROM_LOAD32_WORD( "opr-24186.ic25s", 0x5000000, 0x800000, CRC(6884d0e9) SHA1(74ef002a752fcd377c5e6e6c17334ca22e561c76) ) + ROM_LOAD32_WORD( "opr-24187.ic26", 0x5000002, 0x800000, CRC(87c79534) SHA1(ab6e5246c388d0839ea6a45c8d2db035b33cd1d2) ) + ROM_LOAD32_WORD( "opr-24188.ic27s", 0x6000000, 0x800000, CRC(cfe107a2) SHA1(2f98bc00aa2b2eea0a26452542098c389f5e836c) ) + ROM_LOAD32_WORD( "opr-24189.ic28", 0x6000002, 0x800000, CRC(302de147) SHA1(442204439c509a6aa7dd25156bf17fb3853ae632) ) + ROM_LOAD32_WORD( "opr-24190.ic29", 0x7000000, 0x800000, CRC(71551313) SHA1(4b43d754b9511ae2d73ec04d7baf0e466337a82f) ) + ROM_LOAD32_WORD( "opr-24191.ic30s", 0x7000002, 0x800000, CRC(200cbeaf) SHA1(ccca2b873177d148a391cfcc8b1632856bd0e3b4) ) + ROM_LOAD32_WORD( "opr-24192.ic31", 0x8000000, 0x800000, CRC(869ef0ce) SHA1(227189dedfa72c56d9eedf5faeed9a4fd0a8393f) ) + ROM_LOAD32_WORD( "opr-24193.ic32s", 0x8000002, 0x800000, CRC(fb39946d) SHA1(d9fa077869709c6fda640bd4be18cf3db7ebe1d1) ) ROM_COPY( "rom_board", 0x1000000, 0x400000, 0xc00000 ) ROM_REGION( 4, "rom_key", ROMREGION_ERASE00 ) - ROM_LOAD( "clubkprz-key.bin", 0x000000, 0x000004, CRC(c9ed13c1) SHA1(2907985375cd5b04846e7214d200926be64d06fd) ) + ROM_LOAD( "clubkprz-key.bin", 0x000000, 0x000004, CRC(c9ed13c1) SHA1(2907985375cd5b04846e7214d200926be64d06fd) ) // this dump can't be used as main_eeprom, because that's exactly 0x80 bytes ROM_REGION(0x84, "some_eeprom", 0) - ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(afff6471) SHA1(c1e1d349ff25191eba09cd7d7186fbe2c6565b81) ) + ROM_LOAD( "sflash.bin", 0x000000, 0x000084, CRC(afff6471) SHA1(c1e1d349ff25191eba09cd7d7186fbe2c6565b81) ) ROM_END // needs verification is this dump really from 840-0139C cart, mask rom labels not known @@ -8188,7 +8188,7 @@ ROM_START( inidv3cy ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-0406-COM) - //(sticker 253-5508-0406) + //(sticker 253-5508-0406) ROM_LOAD("317-0406-com.pic", 0x00, 0x4000, NO_DUMP ) ROM_END @@ -8757,7 +8757,7 @@ GAME( 2003, puyofevp, naomi, naomim1, naomi, naomi_state, naomi, ROT0, "Sega", " /* 0087 */ GAME( 2002, kingrt66, naomi2, naomi2, naomi, naomi_state, naomi2, ROT0, "Sega", "King of Route 66 (Rev A)", GAME_FLAGS ) /* 0095 */ GAME( 2002, soulsurf, naomi2, naomi2, naomi, naomi_state, naomi2, ROT0, "Sega", "Soul Surfer (Rev A)", GAME_FLAGS ) /* 0106 */ GAME( 2002, vf4evoct, naomi2, naomi2m1, naomi, naomi_state, vf4evoct, ROT0, "Sega", "Virtua Fighter 4 Evolution (Cartridge)", GAME_FLAGS ) -/* 0129 */ GAME( 2003, clubkprz, naomi2, naomi2m1, naomi, naomi_state, naomi2, ROT0, "Sega", "Club Kart Prize", GAME_FLAGS ) +/* 0129 */ GAME( 2003, clubkprz, naomi2, naomi2m1, naomi, naomi_state, naomi2, ROT0, "Sega", "Club Kart Prize", GAME_FLAGS ) /* Note: the game's full name is exactly "Club Kart Prize Ver. B". The "Ver. B" does not denote a new revision of Club Kart Prize; the different 840- number confirms this. */ /* 0137 */ GAME( 2004, clubkpzb, naomi2, naomi2m1, naomi, naomi_state, naomi2, ROT0, "Sega", "Club Kart Prize Ver. B", GAME_FLAGS ) // needs verification is this dump really from 840-0139C cart diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 4b268ce634d..fac3fbf055b 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -13,8 +13,8 @@ Notes: two don't run on the same hardware. mjcamera is in nbmj8688.c. - In mjfocus(Medal Type), sometimes CPU's hands are forced out from the screen. - This is correct behaviour. - + This is correct behaviour. + TODO: - Telmajan cannot set to JAMMA type. I don't know why. diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c index 6d74d653b44..d59f28cbeb2 100644 --- a/src/mame/drivers/nbmj8900.c +++ b/src/mame/drivers/nbmj8900.c @@ -316,7 +316,7 @@ static MACHINE_CONFIG_START( ohpaipee, nbmj8900_state ) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 8, 248-1) MCFG_SCREEN_UPDATE_DRIVER(nbmj8900_state, screen_update_nbmj8900) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 94197ec380c..e6306d78714 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -210,7 +210,7 @@ . NEO-MVS PROGSS3 . NEO-MVS PROGTOP . NEO-MVS PROGSF1 (1998.6.17) - . NEO-MVS PROGSF1E (1998.6.18) + . NEO-MVS PROGSF1E (1998.6.18) . NEO-MVS PROGEOP (1999.2.2) . NEO-MVS PROGLBA (1999.4.12) - LBA-SUB (2000.2.24) . NEO-MVS PROGBK1 (1994) @@ -787,7 +787,7 @@ CUSTOM_INPUT_MEMBER(neogeo_state::get_memcard_status) READ16_MEMBER(neogeo_state::memcard_r) { m_maincpu->eat_cycles(2); // insert waitstate - + UINT16 ret; if (memcard_present(machine()) != -1) @@ -1810,7 +1810,7 @@ MACHINE_CONFIG_START( neogeo_base, neogeo_state ) MCFG_CPU_ADD("audiocpu", Z80, NEOGEO_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(audio_map) MCFG_CPU_IO_MAP(audio_io_map) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_neogeo) @@ -11558,4 +11558,3 @@ GAME( 2004, sbp, neogeo, neogeo, neogeo, neogeo_state, sbp, RO /* 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/neptunp2.c b/src/mame/drivers/neptunp2.c index 2eb8f49c64b..7b5f987590b 100644 --- a/src/mame/drivers/neptunp2.c +++ b/src/mame/drivers/neptunp2.c @@ -104,7 +104,7 @@ static MACHINE_CONFIG_START( neptunp2, neptunp2_state ) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", neptunp2) MCFG_PALETTE_ADD("palette", 512) diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 710f1d90d1f..493984e8909 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -129,7 +129,7 @@ protected: required_ioport m_io_dswb; required_ioport m_io_dswc; required_device m_palette; - + UINT8 nightgal_gfx_nibble( int niboffset ); void plot_nightgal_gfx_pixel( UINT8 pix, int x, int y ); }; diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 405caf88d63..7e812a37c39 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -854,7 +854,7 @@ static MACHINE_CONFIG_START( ninjaw, ninjaw_state ) MCFG_TC0110PCR_PALETTE("palette2") MCFG_TC0110PCR_ADD("tc0110pcr_3") MCFG_TC0110PCR_PALETTE("palette3") - + /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index aba1550f8f6..b66b90c9eae 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -267,7 +267,7 @@ public: required_device m_soundcpu; required_device m_oki; required_device m_gfxdecode; - + DECLARE_WRITE16_MEMBER(fg_videoram_w); DECLARE_WRITE16_MEMBER(bg_videoram_w); DECLARE_WRITE16_MEMBER(nmg5_soundlatch_w); diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index c846ab84772..6cb63b3d935 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -311,7 +311,7 @@ public: required_device m_rp5h01; required_device m_screen; optional_device m_palette; - + UINT8 m_wram_wp_flag; UINT8 *m_wram; UINT8 m_nmi_enable; diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index c2b890726e8..dd086b3c4fd 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -775,7 +775,7 @@ static MACHINE_CONFIG_START( nwktr, nwktr_state ) MCFG_PALETTE_ADD("palette", 65536) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K001604_ADD("k001604", racingj_k001604_intf) MCFG_K001604_GFXDECODE("gfxdecode") MCFG_K001604_PALETTE("palette") diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index 6bb71d84a31..dff1bfb4d34 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -922,7 +922,7 @@ static MACHINE_CONFIG_START( cyclshtg, nycaptor_state ) // pin 1 SOLO 8' not mapped // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - + MCFG_DAC_ADD("dac") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END @@ -981,7 +981,7 @@ static MACHINE_CONFIG_START( bronx, nycaptor_state ) // pin 1 SOLO 8' not mapped // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - + MCFG_DAC_ADD("dac") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index 2e05343eff7..27cc1e49d31 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -121,7 +121,7 @@ public: required_device m_mc6845; required_device m_pia1; required_device m_pia2; - + pen_t m_pens[NUM_PENS]; DECLARE_WRITE8_MEMBER(audio_1_command_w); DECLARE_WRITE8_MEMBER(audio_1_answer_w); diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index ed1cedefd39..ee070837a74 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -376,7 +376,7 @@ static MACHINE_CONFIG_START( offtwall, offtwall_state ) MCFG_ATARI_VAD_MOB(offtwall_state::s_mob_config, "gfxdecode") MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) + MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) /* note: these parameters are from published specs, not derived */ /* the board uses a VAD chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) @@ -422,17 +422,17 @@ ROM_START( offtwall ) ROM_REGION( 0x800, "eeprom:eeprom", 0 ) ROM_LOAD( "offtwall-eeprom.17l", 0x0000, 0x800, CRC(5eaf2d5b) SHA1(934a76a23960e6ed2cc33c359f9735caee762145) ) - ROM_REGION(0x022f, "jsa:plds", 0) - ROM_LOAD("136085-1038.17c.bin", 0x0000, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ - ROM_LOAD("136085-1039.20c.bin", 0x0118, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ - - ROM_REGION(0x2591, "main:plds", 0) - ROM_LOAD("136090-1001.14l.bin", 0x0000, 0x201d, NO_DUMP ) /* GAL6001-35P is read protected */ - ROM_LOAD("136090-1002.11r.bin", 0x201e, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ - ROM_LOAD("136090-1003.15f.bin", 0x2135, 0x0117, CRC(5e723b46) SHA1(e686920d0af342e33f836fec15b6e8b5ef1b8be5)) /* GAL16V8A-25LP */ - ROM_LOAD("136090-1005.5n.bin", 0x224c, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ - ROM_LOAD("136090-1006.5f.bin", 0x2363, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ - ROM_LOAD("136090-1007.3f.bin", 0x247a, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ + ROM_REGION(0x022f, "jsa:plds", 0) + ROM_LOAD("136085-1038.17c.bin", 0x0000, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ + ROM_LOAD("136085-1039.20c.bin", 0x0118, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ + + ROM_REGION(0x2591, "main:plds", 0) + ROM_LOAD("136090-1001.14l.bin", 0x0000, 0x201d, NO_DUMP ) /* GAL6001-35P is read protected */ + ROM_LOAD("136090-1002.11r.bin", 0x201e, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ + ROM_LOAD("136090-1003.15f.bin", 0x2135, 0x0117, CRC(5e723b46) SHA1(e686920d0af342e33f836fec15b6e8b5ef1b8be5)) /* GAL16V8A-25LP */ + ROM_LOAD("136090-1005.5n.bin", 0x224c, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ + ROM_LOAD("136090-1006.5f.bin", 0x2363, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ + ROM_LOAD("136090-1007.3f.bin", 0x247a, 0x0117, NO_DUMP ) /* GAL16V8A-25LP is read protected */ ROM_END diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index 0b993e22b94..832fc4fb897 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -332,7 +332,7 @@ static MACHINE_CONFIG_START( ohmygod, ohmygod_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ohmygod) - + MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 87e3956181d..f2f598f5541 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -200,7 +200,7 @@ void olibochu_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, @@ -226,7 +226,7 @@ void olibochu_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 8632dbe1a89..e33080bddcf 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -72,7 +72,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(onetwo_fgram_w); DECLARE_WRITE8_MEMBER(onetwo_cpubank_w); DECLARE_WRITE8_MEMBER(onetwo_coin_counters_w); diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c index 7453dfba6b9..03f2bfdb99a 100644 --- a/src/mame/drivers/othello.c +++ b/src/mame/drivers/othello.c @@ -81,7 +81,7 @@ public: mc6845_device *m_mc6845; device_t *m_n7751; required_device m_palette; - + DECLARE_READ8_MEMBER(unk_87_r); DECLARE_WRITE8_MEMBER(unk_8a_w); DECLARE_WRITE8_MEMBER(unk_8c_w); diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index d3804d13ee4..3a3214ed7c0 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -350,7 +350,7 @@ static MACHINE_CONFIG_START( overdriv, overdriv_state ) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K053246_ADD("k053246", overdriv_k053246_intf) MCFG_K053246_GFXDECODE("gfxdecode") MCFG_K053246_PALETTE("palette") @@ -363,7 +363,7 @@ static MACHINE_CONFIG_START( overdriv, overdriv_state ) MCFG_K053251_ADD("k053251") MCFG_K053250_ADD("k053250_1", "palette", "screen", 0, 0) MCFG_K053250_ADD("k053250_2", "palette", "screen", 0, 0) - + MCFG_DEVICE_ADD("k053252", K053252, 24000000/4) MCFG_K053252_OFFSETS(13*8, 2*8) diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 617c332f0bf..ef5a9ae90d0 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -4246,7 +4246,7 @@ ROM_START( mspacmancr ) /* Bootleg on Crush Roller Board - Midway Graphics and ROM_LOAD( "5f", 0x1000, 0x1000, CRC(615af909) SHA1(fd6a1dde780b39aea76bf1c4befa5882573c2ef4) ) // 6.5f ROM_REGION( 0x0120, "proms", 0 ) - ROM_LOAD( "mb7051.7f", 0x0000, 0x0020, CRC(ff344446) SHA1(45eb37533da8912645a089b014f3b3384702114a) ) + ROM_LOAD( "mb7051.7f", 0x0000, 0x0020, CRC(ff344446) SHA1(45eb37533da8912645a089b014f3b3384702114a) ) ROM_LOAD( "82s126.4a", 0x0020, 0x0100, CRC(3eb3a8e4) SHA1(19097b5f60d1030f8b82d9f1d3a241f93e5c75d6) ) // m82s129n.4a ROM_REGION( 0x0200, "namco", 0 ) /* sound PROMs */ @@ -4629,11 +4629,11 @@ ROM_START( crushbl3 ) ROM_LOAD( "cr4.5j", 0x1800, 0x0800, CRC(d35d1caf) SHA1(65dd7861e05651485626465dc97215fed58db551) ) // the set with the above 'crushbl3' program roms and these gfx roms just seems to be a bad dump (some bad maze tiles?) -// ROM_REGION( 0x2000, "gfx1", 0 ) -// ROM_LOAD( "cr1.bin", 0x0000, 0x0800, CRC(cc31c649) SHA1(a0640d2abc21872b0e680e8e31e3bcb7e7a07953) ) -// ROM_LOAD( "cr3.bin", 0x0800, 0x0800, CRC(14c121d8) SHA1(05f900a2e2a67401ab357340c1fb36153f365f1b) ) -// ROM_LOAD( "cr2.bin", 0x1000, 0x0800, CRC(882dc667) SHA1(5ea01d9c692b3061a0e39e2227fbc6af4baaab11) ) /* copyright sign was removed */ -// ROM_LOAD( "cr4.bin", 0x1800, 0x0800, CRC(0d3877c4) SHA1(0a6f4098181480aa85225324129e37bba375252d) ) +// ROM_REGION( 0x2000, "gfx1", 0 ) +// ROM_LOAD( "cr1.bin", 0x0000, 0x0800, CRC(cc31c649) SHA1(a0640d2abc21872b0e680e8e31e3bcb7e7a07953) ) +// ROM_LOAD( "cr3.bin", 0x0800, 0x0800, CRC(14c121d8) SHA1(05f900a2e2a67401ab357340c1fb36153f365f1b) ) +// ROM_LOAD( "cr2.bin", 0x1000, 0x0800, CRC(882dc667) SHA1(5ea01d9c692b3061a0e39e2227fbc6af4baaab11) ) /* copyright sign was removed */ +// ROM_LOAD( "cr4.bin", 0x1800, 0x0800, CRC(0d3877c4) SHA1(0a6f4098181480aa85225324129e37bba375252d) ) ROM_REGION( 0x0120, "proms", 0 ) ROM_LOAD( "74s288.8a", 0x0000, 0x0020, CRC(ff344446) SHA1(45eb37533da8912645a089b014f3b3384702114a) ) diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 95482776d78..3d207b79883 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -618,7 +618,7 @@ static MACHINE_CONFIG_START( panicr, panicr_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(32*8, 32*8) // MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) - MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(panicr_state, screen_update_panicr) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index 1c020eb36bb..bb6deee344e 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -137,7 +137,7 @@ class isa8_cga_filetto_device : public isa8_cga_device public: // construction/destruction isa8_cga_filetto_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual const rom_entry *device_rom_region() const; }; @@ -149,7 +149,7 @@ const device_type ISA8_CGA_FILETTO = &device_creator; isa8_cga_filetto_device::isa8_cga_filetto_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_FILETTO, "ISA8_CGA_FILETTO", tag, owner, clock, "filetto_cga", __FILE__) -{ +{ } ROM_START( filetto_cga ) @@ -169,11 +169,11 @@ class isa8_cga_tetriskr_device : public isa8_cga_superimpose_device public: // construction/destruction isa8_cga_tetriskr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void device_start(); virtual const rom_entry *device_rom_region() const; - + DECLARE_READ8_MEMBER(bg_bank_r); DECLARE_WRITE8_MEMBER(bg_bank_w); private: @@ -190,7 +190,7 @@ const device_type ISA8_CGA_TETRISKR = &device_creator; isa8_cga_tetriskr_device::isa8_cga_tetriskr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_superimpose_device( mconfig, ISA8_CGA_TETRISKR, "ISA8_CGA_TETRISKR", tag, owner, clock, "tetriskr_cga", __FILE__) -{ +{ } @@ -788,7 +788,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( tetriskr, pcxt_state ) MCFG_FRAGMENT_ADD( pcxt ) - + MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(tetriskr_io) diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c index 68e6eca0cd0..2f8e28ea6a8 100644 --- a/src/mame/drivers/pengadvb.c +++ b/src/mame/drivers/pengadvb.c @@ -39,7 +39,7 @@ public: { } required_device m_maincpu; - + address_map_bank_device *m_page[4]; memory_bank *m_bank[4]; UINT8 m_primary_slot_reg; @@ -48,7 +48,7 @@ public: DECLARE_READ8_MEMBER(mem_r); DECLARE_WRITE8_MEMBER(mem_w); DECLARE_WRITE8_MEMBER(megarom_bank_w); - + DECLARE_WRITE8_MEMBER(pengadvb_psg_port_b_w); DECLARE_READ8_MEMBER(pengadvb_ppi_port_a_r); DECLARE_WRITE8_MEMBER(pengadvb_ppi_port_a_w); @@ -91,7 +91,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bank_mem, AS_PROGRAM, 8, pengadvb_state ) // slot 0, MSX BIOS AM_RANGE(0x00000, 0x07fff) AM_ROM AM_REGION("maincpu", 0) - + // slot 1, MegaROM AM_RANGE(0x14000, 0x15fff) AM_ROMBANK("bank0") AM_RANGE(0x16000, 0x17fff) AM_ROMBANK("bank1") @@ -184,10 +184,10 @@ READ8_MEMBER(pengadvb_state::pengadvb_ppi_port_b_r) { case 0x0: return ioport("IN1")->read(); - + default: break; - } + } return 0xff; } @@ -327,7 +327,7 @@ DRIVER_INIT_MEMBER(pengadvb_state,pengadvb) { pengadvb_decrypt("maincpu"); pengadvb_decrypt("game"); - + // init banks static const char * const pagenames[] = { "page0", "page1", "page2", "page3" }; static const char * const banknames[] = { "bank0", "bank1", "bank2", "bank3" }; diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index 39ed9435d1d..4b3b7461960 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -204,7 +204,7 @@ public: m_maincpu(*this, "maincpu"), m_i2cmem(*this, "i2cmem"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -6846,7 +6846,7 @@ ROM_END ROM_START( pexmp030 ) /* Superboard : 5-in-1 Wingboard (XMP00030) */ ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "xmp00030.u67", 0x00000, 0x10000, CRC(da3fcb6f) SHA1(114e581e5ebb5c40c3f3da2784122d3281f269ee) ) /* 11/12/00 @ IGT L01-0197 */ + ROM_LOAD( "xmp00030.u67", 0x00000, 0x10000, CRC(da3fcb6f) SHA1(114e581e5ebb5c40c3f3da2784122d3281f269ee) ) /* 11/12/00 @ IGT L01-0197 */ ROM_REGION( 0x10000, "user1", 0 ) ROM_LOAD( "x002066p.u66", 0x00000, 0x10000, CRC(01236011) SHA1(3edfee014705b3540386c5e42026ab93628b2597) ) /* Double Double Bonus Poker */ diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index fa8cdda16f7..3ecd37903e3 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -4219,4 +4219,3 @@ GAME( 2004, kovlsqh, kovshp, pgm_arm_type1, kovsh, pgm_arm_type1_sta GAME( 2004, kovlsqh2, kovshp, pgm_arm_type1, kovsh, pgm_arm_type1_state, kovlsqh2, ROT0, "bootleg", "Knights of Valour: Luan Shi Quan Huang 2 / Sangoku Senki: Luan Shi Quan Huang 2 (ver. 200CN)", GAME_IMPERFECT_SOUND | GAME_UNEMULATED_PROTECTION | GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) /* need internal rom of IGS027A */ GAME( 2004, kovlsjb, kovshp, pgm_arm_type1, kovsh, pgm_arm_type1_state, kovlsqh2, ROT0, "bootleg", "Knights of Valour: Luan Shi Jie Ba / Sangoku Senki: Luan Shi Jie Ba (ver. 200CN, set 1)", GAME_IMPERFECT_SOUND | GAME_UNEMULATED_PROTECTION | GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) /* need internal rom of IGS027A */ GAME( 2004, kovlsjba, kovshp, pgm_arm_type1, kovsh, pgm_arm_type1_state, kovlsqh2, ROT0, "bootleg", "Knights of Valour: Luan Shi Jie Ba / Sangoku Senki: Luan Shi Jie Ba (ver. 200CN, set 2)", GAME_IMPERFECT_SOUND | GAME_UNEMULATED_PROTECTION | GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) /* need internal rom of IGS027A */ - diff --git a/src/mame/drivers/pgm2.c b/src/mame/drivers/pgm2.c index 64a8a860adc..4f224fe046e 100644 --- a/src/mame/drivers/pgm2.c +++ b/src/mame/drivers/pgm2.c @@ -1,55 +1,55 @@ /* PGM 2 hardware. - Motherboard is bare bones stuff, and does not contain any ROMs. - The IGS036 used by the games is an ARM based CPU, like IGS027A used on PGM1 it has internal ROM. - Decryption should be correct in most cases, but the ARM mode code at the start of the external - ROMs is a bit weird, with many BNV instructions rather than jumps. Maybe the ARM is customized, - the code has been 'NOPPED' out this way (BNV is Branch Never) or it's a different type of ARM? - - - Some of the THUMB code looks like THUMB2 code - eg - f004 BL (HI) 00004000 - e51f B #fffffa3e - 0434 LSL R4, R6, 16 - 0000 LSL R0, R0, 0 + Motherboard is bare bones stuff, and does not contain any ROMs. + The IGS036 used by the games is an ARM based CPU, like IGS027A used on PGM1 it has internal ROM. + Decryption should be correct in most cases, but the ARM mode code at the start of the external + ROMs is a bit weird, with many BNV instructions rather than jumps. Maybe the ARM is customized, + the code has been 'NOPPED' out this way (BNV is Branch Never) or it's a different type of ARM? - should be a 32-bit branch instruction with the 2nd dword used as data. + - Some of the THUMB code looks like THUMB2 code + eg + f004 BL (HI) 00004000 + e51f B #fffffa3e + 0434 LSL R4, R6, 16 + 0000 LSL R0, R0, 0 + should be a 32-bit branch instruction with the 2nd dword used as data. - We need to determine where VRAM etc. map in order to attempt tests on the PCBs. + We need to determine where VRAM etc. map in order to attempt tests on the PCBs. - PGM2 Motherboard Components: - IS61LV25616AL(SRAM) - IGS037(GFX PROCESSOR) - YMZ774-S(SOUND) - R5F21256SN(extra MCU for protection and ICcard communication) - - Appears to be refered to by the games as MPU + PGM2 Motherboard Components: - Cartridges - IGS036 (MAIN CPU) (differs per game, internal code) - ROMs - Custom program ROM module (KOV3 only) - - on some games ROM socket contains Flash ROM + SRAM + IS61LV25616AL(SRAM) + IGS037(GFX PROCESSOR) + YMZ774-S(SOUND) + R5F21256SN(extra MCU for protection and ICcard communication) + - Appears to be refered to by the games as MPU - QFP100 chip (Xlinx CPLD) + Cartridges + IGS036 (MAIN CPU) (differs per game, internal code) + ROMs + Custom program ROM module (KOV3 only) + - on some games ROM socket contains Flash ROM + SRAM - Single PCB versions of some of the titles were also available + QFP100 chip (Xlinx CPLD) - Only 5 Games were released for this platform, 3 of which are just updates / re-releases of older titles! - The platform has since been superseded by PGM3 (HD system uses flash cards etc.) + Single PCB versions of some of the titles were also available - Oriental Legend 2 - The King of Fighters '98 - Ultimate Match - Hero (NOT DUMPED) - Knights of Valour 2 New Legend - Dodonpachi Daioujou Tamashii - Knights of Valour 3 + Only 5 Games were released for this platform, 3 of which are just updates / re-releases of older titles! + The platform has since been superseded by PGM3 (HD system uses flash cards etc.) - These were only released as single board PGM2 based hardware, seen for sale in Japan for around $250-$300 + Oriental Legend 2 + The King of Fighters '98 - Ultimate Match - Hero (NOT DUMPED) + Knights of Valour 2 New Legend + Dodonpachi Daioujou Tamashii + Knights of Valour 3 - Jigsaw World Arena - Puzzle of Ocha / Ochainu No Pazuru + These were only released as single board PGM2 based hardware, seen for sale in Japan for around $250-$300 + + Jigsaw World Arena + Puzzle of Ocha / Ochainu No Pazuru */ @@ -511,4 +511,3 @@ GAME( 2011, kov3, 0, pgm2, pgm2, pgm2_state, kov3, ROT0, // The King of Fighters '98 - Ultimate Match - Hero // Jigsaw World Arena //Puzzle of Ocha / Ochainu No Pazuru - diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c index 57cb3521e03..74ea34eac51 100644 --- a/src/mame/drivers/photon.c +++ b/src/mame/drivers/photon.c @@ -216,7 +216,7 @@ static MACHINE_CONFIG_START( photon, photon_state ) MCFG_SCREEN_VISIBLE_AREA(0, 256+32-1, 0, 192+32-1) MCFG_SCREEN_UPDATE_DRIVER(photon_state, screen_update_photon) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(pk8000_base_state, pk8000) diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index 4a1740d3120..398ff7e2f93 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -169,7 +169,7 @@ void pinkiri8_state::draw_background(bitmap_ind16 &bitmap, const rectangle &clip attr = m_janshi_back_vram[count + 2] ^ 0xf0; col = (attr >> 4) | 0x10; - gfx->transpen(bitmap,cliprect, tile, col, 0, 0, x * 16, y * 8, 0); + gfx->transpen(bitmap,cliprect, tile, col, 0, 0, x * 16, y * 8, 0); count += 4; } diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 38bb645d6b4..e8c278afe06 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -52,7 +52,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device m_maincpu; required_device m_gfxdecode; - required_device m_screen; + required_device m_screen; }; diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index dd4a1ac35b4..e19cfdf3fe4 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -394,7 +394,7 @@ static MACHINE_CONFIG_START( pktgaldb, pktgaldx_state ) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(XBGR) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", bootleg) /* sound hardware */ diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 93a38e3e301..d2c130cc7d8 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -856,21 +856,21 @@ static MACHINE_CONFIG_START( polepos, polepos_state ) MCFG_NAMCO_51XX_INPUT_2_CB(IOPORT("DSWB")) MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("DSWB_HI")) MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(polepos_state,out_0)) - MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(polepos_state,out_1)) + MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(polepos_state,out_1)) MCFG_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/8/2) /* 1.536 MHz */ MCFG_NAMCO_52XX_DISCRETE("discrete") MCFG_NAMCO_52XX_BASENODE(NODE_04) MCFG_NAMCO_52XX_ROMREAD_CB(READ8(polepos_state,namco_52xx_rom_r)) MCFG_NAMCO_52XX_SI_CB(READ8(polepos_state,namco_52xx_si_r)) - + MCFG_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/8/2) /* 1.536 MHz */ MCFG_NAMCO_53XX_K_CB(READ8(polepos_state,namco_53xx_k_r)) MCFG_NAMCO_53XX_INPUT_0_CB(READ8(polepos_state,steering_changed_r)) MCFG_NAMCO_53XX_INPUT_1_CB(READ8(polepos_state,steering_delta_r)) MCFG_NAMCO_53XX_INPUT_2_CB(IOPORT("DSWA")) MCFG_NAMCO_53XX_INPUT_3_CB(IOPORT("DSWA_HI")) - + MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/8/2) /* 1.536 MHz */ MCFG_NAMCO_54XX_DISCRETE("discrete") MCFG_NAMCO_54XX_BASENODE(NODE_01) @@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( topracern, polepos_state ) they probably simulate some of the logic */ MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/8/2) /* 1.536 MHz */ MCFG_NAMCO_51XX_INPUT_1_CB(IOPORT("IN0H")) - + MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/8/64) MCFG_NAMCO_06XX_MAINCPU("maincpu") MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read)) diff --git a/src/mame/drivers/pong.c b/src/mame/drivers/pong.c index 3998b3c8cfe..6db5c38adf2 100644 --- a/src/mame/drivers/pong.c +++ b/src/mame/drivers/pong.c @@ -67,11 +67,11 @@ fixedfreq_interface fixedfreq_mode_pongd = { }; fixedfreq_interface fixedfreq_mode_pong = { - MASTER_CLOCK, - H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL, - V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL, - 1, /* non-interlaced */ - 0.31 + MASTER_CLOCK, + H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL, + V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL, + 1, /* non-interlaced */ + 0.31 }; fixedfreq_interface fixedfreq_mode_pongX2 = { @@ -102,10 +102,10 @@ enum input_changed_enum static NETLIST_START(pong_schematics) - SOLVER(Solver, 48000) - PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient + SOLVER(Solver, 48000) + PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient - ANALOG_INPUT(V5, 5) + ANALOG_INPUT(V5, 5) TTL_INPUT(high, 1) TTL_INPUT(low, 0) @@ -128,540 +128,540 @@ static NETLIST_START(pong_schematics) PARAM(xclk.FREQ, 7159000.0*2) #endif - /* 3V Logic - Just a resistor - the value is not given in schematics */ + /* 3V Logic - Just a resistor - the value is not given in schematics */ + + RES(R3V, 50) // Works ... + NET_C(R3V.1, V5) + ALIAS(V3, R3V.2) + + /* Coin, antenna and startup circuit */ + + ANALOG_INPUT(STOPG, 0) + + ALIAS(SRSTQ, c9f.Q) + ALIAS(SRST, c9c.Q) + + /* SRSTQ has a diode to +3V to protect against overvoltage - omitted */ + + TTL_INPUT(antenna, 0) - RES(R3V, 50) // Works ... - NET_C(R3V.1, V5) - ALIAS(V3, R3V.2) + ALIAS(runQ, Q1.C) - /* Coin, antenna and startup circuit */ + TTL_7404_INVERT(e4d, STOPG) - ANALOG_INPUT(STOPG, 0) - - ALIAS(SRSTQ, c9f.Q) - ALIAS(SRST, c9c.Q) + TTL_7404_INVERT(c9f, c9c.Q) + TTL_7404_INVERT(c9c, c9f.Q) - /* SRSTQ has a diode to +3V to protect against overvoltage - omitted */ + SWITCH2(coinsw) + NET_C(c9c.Q, coinsw.1) + NET_C(c9f.Q, coinsw.2) - TTL_INPUT(antenna, 0) + NET_C(coinsw.Q, GND) - ALIAS(runQ, Q1.C) + /* Antenna circuit */ + /* Has a diode to clamp negative voltages - omitted here */ - TTL_7404_INVERT(e4d, STOPG) + QBJT_SW(Q3, "BC237B") + NET_C(antenna, Q3.B) + NET_C(GND, Q3.E) + RES(RX5, 100) + CAP(CX1, CAP_U(0.1)) - TTL_7404_INVERT(c9f, c9c.Q) - TTL_7404_INVERT(c9c, c9f.Q) + NET_C(RX5.1, CX1.1) + NET_C(RX5.1, Q3.C) + NET_C(RX5.2, GND) + NET_C(CX1.2, GND) + QBJT_SW(Q1, "BC237B") + NET_C(Q1.B, RX5.1) + NET_C(Q1.E, GND) + + DIODE(D3, "1N914") + NET_C(D3.A, Q1.C) + NET_C(D3.K, SRSTQ) + + DIODE(D2, "1N914") + RES(RX4, 220) + NET_C(D2.K, e4d.Q) + NET_C(D2.A, RX4.1) + NET_C(RX4.2, Q3.C) - SWITCH2(coinsw) - NET_C(c9c.Q, coinsw.1) - NET_C(c9f.Q, coinsw.2) + RES(RX1, 100) + RES(RX2, 100) + RES(RX3, 330) + CAP(CX2, CAP_U(0.1)) - NET_C(coinsw.Q, GND) + NET_C(RX3.2, D3.A) + NET_C(RX3.1, RX1.2) + NET_C(RX1.1, V3) - /* Antenna circuit */ - /* Has a diode to clamp negative voltages - omitted here */ + NET_C(RX1.1, CX2.1) + NET_C(RX1.2, CX2.2) - QBJT_SW(Q3, "BC237B") - NET_C(antenna, Q3.B) - NET_C(GND, Q3.E) - RES(RX5, 100) - CAP(CX1, CAP_U(0.1)) - - NET_C(RX5.1, CX1.1) - NET_C(RX5.1, Q3.C) - NET_C(RX5.2, GND) - NET_C(CX1.2, GND) - QBJT_SW(Q1, "BC237B") - NET_C(Q1.B, RX5.1) - NET_C(Q1.E, GND) - - DIODE(D3, "1N914") - NET_C(D3.A, Q1.C) - NET_C(D3.K, SRSTQ) - - DIODE(D2, "1N914") - RES(RX4, 220) - NET_C(D2.K, e4d.Q) - NET_C(D2.A, RX4.1) - NET_C(RX4.2, Q3.C) - - RES(RX1, 100) - RES(RX2, 100) - RES(RX3, 330) - CAP(CX2, CAP_U(0.1)) + QBJT_SW(Q2, "BC556B") + NET_C(Q2.E, V3) + NET_C(Q2.B, RX1.2) + NET_C(Q2.C, RX2.2) - NET_C(RX3.2, D3.A) - NET_C(RX3.1, RX1.2) - NET_C(RX1.1, V3) - - NET_C(RX1.1, CX2.1) - NET_C(RX1.2, CX2.2) - - QBJT_SW(Q2, "BC556B") - NET_C(Q2.E, V3) - NET_C(Q2.B, RX1.2) - NET_C(Q2.C, RX2.2) - - NET_C(RX2.1, D2.A) - - /* hit logic */ - - TTL_7404_INVERT(hitQ, hit) - TTL_7400_NAND(hit, hit1Q, hit2Q) - - TTL_7402_NOR(attractQ, StopG, runQ) - TTL_7404_INVERT(attract, attractQ) - - TTL_7420_NAND(ic_h6a, hvidQ, hvidQ, hvidQ, hvidQ) - ALIAS(hvid, ic_h6a.Q) - - TTL_7400_NAND(ic_e6c, hvid, hblank) - ALIAS(MissQ, ic_e6c.Q) - - TTL_7404_INVERT(ic_d1e, MissQ) - TTL_7400_NAND(ic_e1a, ic_d1e.Q, attractQ) - ALIAS(Missed, ic_e1a.Q) + NET_C(RX2.1, D2.A) - TTL_7400_NAND(rstspeed, SRSTQ, MissQ) - TTL_7400_NAND(StopG, StopG1Q, StopG2Q) - ALIAS(L, ic_h3b.Q) - ALIAS(R, ic_h3b.QQ) - - TTL_7400_NAND(hit1Q, pad1, ic_g1b.Q) - TTL_7400_NAND(hit2Q, pad2, ic_g1b.Q) - - TTL_7400_NAND(ic_g3c, 128H, ic_h3a.QQ) - TTL_7427_NOR(ic_g2c, ic_g3c.Q, 256H, vpad1Q) - ALIAS(pad1, ic_g2c.Q) - TTL_7427_NOR(ic_g2a, ic_g3c.Q, 256HQ, vpad2Q) - ALIAS(pad2, ic_g2a.Q) - - // ---------------------------------------------------------------------------------------- - // horizontal counter - // ---------------------------------------------------------------------------------------- - TTL_7493(ic_f8, clk, ic_f8.QA, ic_e7b.QQ, ic_e7b.QQ) // f8, f9, f6b - TTL_7493(ic_f9, ic_f8.QD, ic_f9.QA, ic_e7b.QQ, ic_e7b.QQ) // f8, f9, f6b - TTL_74107(ic_f6b, ic_f9.QD, high, high, ic_e7b.Q) - TTL_7430_NAND(ic_f7, ic_f8.QB, ic_f8.QC, ic_f9.QC, ic_f9.QD, ic_f6b.Q, high, high, high) - TTL_7474(ic_e7b, clk, ic_f7, high, high) - - ALIAS(hreset, ic_e7b.QQ) - ALIAS(hresetQ, ic_e7b.Q) - ALIAS( 4H, ic_f8.QC) - ALIAS( 8H, ic_f8.QD) - ALIAS( 16H, ic_f9.QA) - ALIAS( 32H, ic_f9.QB) - ALIAS( 64H, ic_f9.QC) - ALIAS(128H, ic_f9.QD) - ALIAS(256H, ic_f6b.Q) - ALIAS(256HQ, ic_f6b.QQ) - - // ---------------------------------------------------------------------------------------- - // vertical counter - // ---------------------------------------------------------------------------------------- - TTL_7493(ic_e8, hreset, ic_e8.QA, ic_e7a.QQ, ic_e7a.QQ) // e8, e9, d9b - TTL_7493(ic_e9, ic_e8.QD,ic_e9.QA, ic_e7a.QQ, ic_e7a.QQ) // e8, e9, d9b - TTL_74107(ic_d9b, ic_e9.QD, high, high, ic_e7a.Q) - TTL_7474(ic_e7a, hreset, e7a_data, high, high) - TTL_7410_NAND(e7a_data, ic_e8.QA, ic_e8.QC, ic_d9b.Q) - - ALIAS(vreset, ic_e7a.QQ) - ALIAS( 4V, ic_e8.QC) - ALIAS( 8V, ic_e8.QD) - ALIAS( 16V, ic_e9.QA) - ALIAS( 32V, ic_e9.QB) - ALIAS( 64V, ic_e9.QC) - ALIAS(128V, ic_e9.QD) - ALIAS(256V, ic_d9b.Q) - ALIAS(256VQ, ic_d9b.QQ) - - - // ---------------------------------------------------------------------------------------- - // hblank flip flop - // ---------------------------------------------------------------------------------------- - - TTL_7400_NAND(ic_g5b, 16H, 64H) - - // the time critical one - TTL_7400_NAND(ic_h5c, ic_h5b.Q, hresetQ) - TTL_7400_NAND(ic_h5b, ic_h5c.Q, ic_g5b.Q) - - ALIAS(hblank, ic_h5c.Q) - ALIAS(hblankQ, ic_h5b.Q) - TTL_7400_NAND(hsyncQ, hblank, 32H) - - // ---------------------------------------------------------------------------------------- - // vblank flip flop - // ---------------------------------------------------------------------------------------- - TTL_7402_NOR(ic_f5c, ic_f5d.Q, vreset) - TTL_7402_NOR(ic_f5d, ic_f5c.Q, 16V) - - ALIAS(vblank, ic_f5d.Q) - ALIAS(vblankQ, ic_f5c.Q) - - TTL_7400_NAND(ic_h5a, 8V, 8V) - TTL_7410_NAND(ic_g5a, vblank, 4V, ic_h5a.Q) - ALIAS(vsyncQ, ic_g5a.Q) - - // ---------------------------------------------------------------------------------------- - // move logic - // ---------------------------------------------------------------------------------------- - - TTL_7400_NAND(ic_e1d, hit_sound, ic_e1c.Q) - TTL_7400_NAND(ic_e1c, ic_f1.QC, ic_f1.QD) - TTL_7493(ic_f1, ic_e1d.Q, ic_f1.QA, rstspeed, rstspeed) - - TTL_7402_NOR(ic_g1d, ic_f1.QC, ic_f1.QD) - TTL_7400_NAND(ic_h1a, ic_g1d.Q, ic_g1d.Q) - TTL_7400_NAND(ic_h1d, ic_e1c.Q, ic_h1a.Q) - - TTL_7400_NAND(ic_h1c, ic_h1d.Q, vreset) - TTL_7400_NAND(ic_h1b, ic_h1a.Q, vreset) - TTL_7402_NOR(ic_g1c, 256HQ, vreset) - - TTL_74107(ic_h2a, ic_g1c.Q, ic_h2b.Q, low, ic_h1b.Q) - TTL_74107(ic_h2b, ic_g1c.Q, high, move, ic_h1c.Q) - - TTL_7400_NAND(ic_h4a, ic_h2b.Q, ic_h2a.Q) - ALIAS(move, ic_h4a.Q) - - TTL_7400_NAND(ic_c1d, SC, attract) - TTL_7404_INVERT(ic_d1a, ic_c1d.Q) - TTL_7474(ic_h3b, ic_d1a.Q, ic_h3b.QQ, hit1Q, hit2Q) - - TTL_7400_NAND(ic_h4d, ic_h3b.Q, move) - TTL_7400_NAND(ic_h4b, ic_h3b.QQ, move) - TTL_7400_NAND(ic_h4c, ic_h4d.Q, ic_h4b.Q) - ALIAS(Aa, ic_h4c.Q) - ALIAS(Ba, ic_h4b.Q) - - // ---------------------------------------------------------------------------------------- - // hvid circuit - // ---------------------------------------------------------------------------------------- - - TTL_7400_NAND(hball_resetQ, Serve, attractQ) - - TTL_9316(ic_g7, clk, high, hblankQ, hball_resetQ, ic_g5c.Q, Aa, Ba, low, high) - TTL_9316(ic_h7, clk, ic_g7.RC, high, hball_resetQ, ic_g5c.Q, low, low, low, high) - TTL_74107(ic_g6b, ic_h7.RC, high, high, hball_resetQ) - TTL_7410_NAND(ic_g5c, ic_g6b.Q, ic_h7.RC, ic_g7.RC) - TTL_7420_NAND(ic_h6b, ic_g6b.Q, ic_h7.RC, ic_g7.QC, ic_g7.QD) - ALIAS(hvidQ, ic_h6b.Q) - - // ---------------------------------------------------------------------------------------- - // vvid circuit - // ---------------------------------------------------------------------------------------- - - TTL_9316(ic_b3, hsyncQ, high, vblankQ, high, ic_b2b.Q, a6, b6, c6, d6) - TTL_9316(ic_a3, hsyncQ, ic_b3.RC, high, high, ic_b2b.Q, low, low, low, low) - TTL_7400_NAND(ic_b2b, ic_a3.RC, ic_b3.RC) - TTL_7410_NAND(ic_e2b, ic_a3.RC, ic_b3.QC, ic_b3.QD) - ALIAS(vvidQ, ic_e2b.Q) - TTL_7404_INVERT(vvid, vvidQ) // D2D - ALIAS(vpos256, ic_a3.RC) - ALIAS(vpos32, ic_a3.QB) - ALIAS(vpos16, ic_a3.QA) - - // ---------------------------------------------------------------------------------------- - // vball ctrl circuit - // ---------------------------------------------------------------------------------------- - - TTL_7450_ANDORINVERT(ic_a6a, b1, 256HQ, b2, 256H) - TTL_7450_ANDORINVERT(ic_a6b, c1, 256HQ, c2, 256H) - TTL_7450_ANDORINVERT(ic_b6b, d1, 256HQ, d2, 256H) - - TTL_7474(ic_a5b, hit, ic_a6a, attractQ, high) - TTL_7474(ic_a5a, hit, ic_a6b, attractQ, high) - TTL_7474(ic_b5a, hit, ic_b6b, attractQ, high) - TTL_74107(ic_h2x, vblank, vvid, vvid, hitQ) // two marked at position h2a ==> this h2x - - TTL_7486_XOR(ic_a4c, ic_a5b.Q, ic_h2x.Q) - TTL_7486_XOR(ic_a4b, ic_a5a.Q, ic_h2x.Q) - - TTL_7450_ANDORINVERT(ic_b6a, ic_b5a.Q, ic_h2x.Q, ic_b5a.QQ, ic_h2x.QQ) - - TTL_7404_INVERT(ic_c4a, ic_b6a) - - TTL_7483(ic_b4, ic_a4c, ic_a4b, ic_b6a, low, ic_c4a, high, high, low, low) - ALIAS(a6, ic_b4.S1) - ALIAS(b6, ic_b4.S2) - ALIAS(c6, ic_b4.S3) - ALIAS(d6, ic_b4.S4) - - // ---------------------------------------------------------------------------------------- - // serve monoflop - // ---------------------------------------------------------------------------------------- - - TTL_7404_INVERT(f4_trig, rstspeed) - - RES(ic_f4_serve_R, RES_K(330)) - CAP(ic_f4_serve_C, CAP_U(4.7)) - NE555(ic_f4_serve) - - NET_C(ic_f4_serve.VCC, V5) - NET_C(ic_f4_serve.GND, GND) - NET_C(ic_f4_serve.RESET, V5) - NET_C(ic_f4_serve_R.1, V5) - NET_C(ic_f4_serve_R.2, ic_f4_serve.THRESH) - NET_C(ic_f4_serve_R.2, ic_f4_serve.DISCH) - NET_C(f4_trig, ic_f4_serve.TRIG) - NET_C(ic_f4_serve_R.2, ic_f4_serve_C.1) - NET_C(GND, ic_f4_serve_C.2) - - TTL_7427_NOR(ic_e5a, ic_f4_serve.OUT, StopG, runQ) - TTL_7474(ic_b5b_serve, pad1, ic_e5a, ic_e5a, high) - - ALIAS(Serve, ic_b5b_serve.QQ) - ALIAS(ServeQ, ic_b5b_serve.Q) - - // ---------------------------------------------------------------------------------------- - // score logic - // ---------------------------------------------------------------------------------------- - - TTL_7474(ic_h3a, 4H, 128H, high, attractQ) - - // ---------------------------------------------------------------------------------------- - // sound logic - // ---------------------------------------------------------------------------------------- - TTL_7474(ic_c2a, vpos256, high, hitQ, high) - TTL_74107(ic_f3_topbot, vblank, vvid, vvidQ, ServeQ) - - // ---------------------------------------------------------------------------------------- - // monoflop with NE555 determines duration of score sound - // ---------------------------------------------------------------------------------------- - - RES(ic_g4_R, RES_K(220)) - CAP(ic_g4_C, CAP_U(1)) - NE555(ic_g4_sc) - ALIAS(SC, ic_g4_sc.OUT) - - NET_C(ic_g4_sc.VCC, V5) - NET_C(ic_g4_sc.GND, GND) - NET_C(ic_g4_sc.RESET, V5) - NET_C(ic_g4_R.1, V5) - NET_C(ic_g4_R.2, ic_g4_sc.THRESH) - NET_C(ic_g4_R.2, ic_g4_sc.DISCH) - NET_C(MissQ, ic_g4_sc.TRIG) - NET_C(ic_g4_R.2, ic_g4_C.1) - NET_C(GND, ic_g4_C.2) - - ALIAS(hit_sound_en, ic_c2a.QQ) - TTL_7400_NAND(hit_sound, hit_sound_en, vpos16) - TTL_7400_NAND(score_sound, SC, vpos32) - TTL_7400_NAND(topbothitsound, ic_f3_topbot.Q, vpos32) - - TTL_7410_NAND(ic_c4b, topbothitsound, hit_sound, score_sound) - TTL_7400_NAND(ic_c1b, ic_c4b.Q, attractQ) - ALIAS(sound, ic_c1b.Q) - - - // ---------------------------------------------------------------------------------------- - // paddle1 logic 1 - // ---------------------------------------------------------------------------------------- - - POT(ic_b9_POT, RES_K(1)) // This is a guess!! - PARAM(ic_b9_POT.DIALLOG, 1) // Log Dial ... - RES(ic_b9_RPRE, 470) - - NET_C(ic_b9_POT.1, V5) - NET_C(ic_b9_POT.3, GND) - NET_C(ic_b9_POT.2, ic_b9_RPRE.1) - NET_C(ic_b9_RPRE.2, ic_b9.CONT) - - RES(ic_b9_R, RES_K(81)) // Adjustment pot - CAP(ic_b9_C, CAP_U(.1)) - DIODE(ic_b9_D, "1N914") - NE555(ic_b9) - - NET_C(ic_b9.VCC, V5) - NET_C(ic_b9.GND, GND) - NET_C(ic_b9.RESET, V5) - NET_C(ic_b9_R.1, V5) - NET_C(ic_b9_R.2, ic_b9.THRESH) - NET_C(ic_b9_R.2, ic_b9_D.A) - NET_C(ic_b9_D.K, ic_b9.DISCH) - NET_C(256VQ, ic_b9.TRIG) - NET_C(ic_b9_R.2, ic_b9_C.1) - NET_C(GND, ic_b9_C.2) - - TTL_7404_INVERT(ic_c9b, ic_b9.OUT) - TTL_7400_NAND(ic_b7b, ic_a7b.Q, hsyncQ) - TTL_7493(ic_b8, ic_b7b.Q, ic_b8.QA, ic_b9.OUT, ic_b9.OUT) - TTL_7400_NAND(ic_b7a, ic_c9b.Q, ic_a7b.Q) - TTL_7420_NAND(ic_a7b, ic_b8.QA, ic_b8.QB, ic_b8.QC, ic_b8.QD) - ALIAS(vpad1Q, ic_b7a.Q) - - ALIAS(b1, ic_b8.QB) - ALIAS(c1, ic_b8.QC) - ALIAS(d1, ic_b8.QD) - - // ---------------------------------------------------------------------------------------- - // paddle1 logic 2 - // ---------------------------------------------------------------------------------------- - - POT(ic_a9_POT, RES_K(1)) // This is a guess!! - PARAM(ic_a9_POT.DIALLOG, 1) // Log Dial ... - RES(ic_a9_RPRE, 470) - - NET_C(ic_a9_POT.1, V5) - NET_C(ic_a9_POT.3, GND) - NET_C(ic_a9_POT.2, ic_a9_RPRE.1) - NET_C(ic_a9_RPRE.2, ic_a9.CONT) - - RES(ic_a9_R, RES_K(81)) // Adjustment pot - CAP(ic_a9_C, CAP_U(.1)) - DIODE(ic_a9_D, "1N914") - NE555(ic_a9) - - NET_C(ic_a9.VCC, V5) - NET_C(ic_a9.GND, GND) - NET_C(ic_a9.RESET, V5) - NET_C(ic_a9_R.1, V5) - NET_C(ic_a9_R.2, ic_a9.THRESH) - NET_C(ic_a9_R.2, ic_a9_D.A) - NET_C(ic_a9_D.K, ic_a9.DISCH) - NET_C(256VQ, ic_a9.TRIG) - NET_C(ic_a9_R.2, ic_a9_C.1) - NET_C(GND, ic_a9_C.2) - - TTL_7404_INVERT(ic_c9a, ic_a9.OUT) - TTL_7400_NAND(ic_b7c, ic_a7a.Q, hsyncQ) - TTL_7493(ic_a8, ic_b7c.Q, ic_a8.QA, ic_a9.OUT, ic_a9.OUT) - TTL_7400_NAND(ic_b7d, ic_c9a.Q, ic_a7a.Q) - TTL_7420_NAND(ic_a7a, ic_a8.QA, ic_a8.QB, ic_a8.QC, ic_a8.QD) - ALIAS(vpad2Q, ic_b7d.Q) - - ALIAS(b2, ic_a8.QB) - ALIAS(c2, ic_a8.QC) - ALIAS(d2, ic_a8.QD) - - // ---------------------------------------------------------------------------------------- - // C5-EN Logic - // ---------------------------------------------------------------------------------------- - - TTL_7404_INVERT(ic_e3a, 128H) - TTL_7427_NOR( ic_e3b, 256H, 64H, ic_e3a.Q) - TTL_7410_NAND(ic_e2c, 256H, 64H, ic_e3a.Q) - TTL_7404_INVERT(ic_e3c, ic_e2c.Q) - TTL_7402_NOR(ic_d2c, ic_e3c.Q, ic_e3b.Q) - TTL_7404_INVERT(ic_g1a, 32V) - TTL_7425_NOR(ic_f2a, ic_g1a.Q, 64V, 128V, ic_d2c.Q) - ALIAS(c5_en, ic_f2a.Q) - - // ---------------------------------------------------------------------------------------- - // Score logic ... - // ---------------------------------------------------------------------------------------- - - TTL_7402_NOR(ic_f5b, L, Missed) - TTL_7490(ic_c7, ic_f5b, ic_c7.QA, SRST, SRST, low, low) - TTL_74107(ic_c8a, ic_c7.QD, high, high, SRSTQ) - SWITCH2(sw1a) - PARAM(sw1a.POS, 0) - - NET_C(sw1a.1, high) - //NET_C(sw1a.1, V5) - NET_C(sw1a.2, ic_c7.QC) - - TTL_7410_NAND(ic_d8a, ic_c7.QA, sw1a.Q, ic_c8a.Q) // would be nand2 for 11 instead of 15 points, need a switch dev! - - ALIAS(StopG1Q, ic_d8a.Q) - ALIAS(score1_1, ic_c7.QA) - ALIAS(score1_2, ic_c7.QB) - ALIAS(score1_4, ic_c7.QC) - ALIAS(score1_8, ic_c7.QD) - ALIAS(score1_10, ic_c8a.Q) - ALIAS(score1_10Q, ic_c8a.QQ) - - TTL_7402_NOR(ic_f5a, R, Missed) - TTL_7490(ic_d7, ic_f5a, ic_d7.QA, SRST, SRST, low, low) - TTL_74107(ic_c8b, ic_d7.QD, high, high, SRSTQ) - SWITCH2(sw1b) - PARAM(sw1b.POS, 0) - - NET_C(sw1b.1, high) - //NET_C(sw1b.1, V5) - NET_C(sw1b.2, ic_d7.QC) - - - TTL_7410_NAND(ic_d8b, ic_d7.QA, sw1b.Q, ic_c8b.Q) // would be nand2 for 11 instead of 15 points, need a switch dev! - - ALIAS(StopG2Q, ic_d8b.Q) - ALIAS(score2_1, ic_d7.QA) - ALIAS(score2_2, ic_d7.QB) - ALIAS(score2_4, ic_d7.QC) - ALIAS(score2_8, ic_d7.QD) - ALIAS(score2_10, ic_c8b.Q) - ALIAS(score2_10Q, ic_c8b.QQ) - - // ---------------------------------------------------------------------------------------- - // Score display - // ---------------------------------------------------------------------------------------- - - TTL_74153(ic_d6a, score1_10Q, score1_4, score2_10Q, score2_4, 32H, 64H, low) - TTL_74153(ic_d6b, score1_10Q, score1_8, score2_10Q, score2_8, 32H, 64H, low) - - TTL_74153(ic_c6a, high, score1_1, high, score2_1, 32H, 64H, low) - TTL_74153(ic_c6b, score1_10Q, score1_2, score2_10Q, score2_2, 32H, 64H, low) - - TTL_7448(ic_c5, ic_c6a.AY, ic_c6b.AY, ic_d6a.AY, ic_d6b.AY, high, c5_en, high) - - TTL_7404_INVERT(ic_e4b, 16H) - TTL_7427_NOR(ic_e5c, ic_e4b.Q, 8H, 4H) - ALIAS(scoreFE, ic_e5c.Q) - - TTL_7400_NAND(ic_c3d, 8H, 4H) - //TTL_7400_NAND(ic_c3d, 4H, 8H) - TTL_7402_NOR(ic_d2b, ic_e4b.Q, ic_c3d.Q) - ALIAS(scoreBC, ic_d2b.Q) - - TTL_7427_NOR(ic_e5b, ic_e4b.Q, 8V, 4V) - ALIAS(scoreA, ic_e5b.Q) - - TTL_7410_NAND(ic_e2a, 16H, 8V, 4V) - TTL_7404_INVERT(ic_e4a, ic_e2a.Q) - ALIAS(scoreGD, ic_e4a.Q) - - TTL_7404_INVERT(ic_e4c, 16V) - - TTL_7410_NAND(ic_d4a, ic_e4c.Q, ic_c5.f, scoreFE) - TTL_7410_NAND(ic_d5c, 16V, ic_c5.e, scoreFE) - TTL_7410_NAND(ic_c4c, ic_e4c.Q, ic_c5.b, scoreBC) - TTL_7410_NAND(ic_d5a, 16V, ic_c5.c, scoreBC) - TTL_7410_NAND(ic_d4c, ic_e4c.Q, ic_c5.a, scoreA) - TTL_7410_NAND(ic_d4b, ic_e4c.Q, ic_c5.g, scoreGD) - TTL_7410_NAND(ic_d5b, 16V, ic_c5.d, scoreGD) - - TTL_7430_NAND(ic_d3, ic_d4a, ic_d5c, ic_c4c, ic_d5a, ic_d4c, ic_d4b, ic_d5b, high) - ALIAS(score, ic_d3.Q) //FIXME - - // net - TTL_74107(ic_f3b, clk, 256H, 256HQ, high) - TTL_7400_NAND(ic_g3b, ic_f3b.QQ, 256H) - TTL_7427_NOR(ic_g2b, ic_g3b.Q, vblank, 4V) - ALIAS(net, ic_g2b.Q) - - // ---------------------------------------------------------------------------------------- - // video - // ---------------------------------------------------------------------------------------- - - TTL_7402_NOR(ic_g1b, hvidQ, vvidQ) - TTL_7425_NOR(ic_f2b, ic_g1b.Q, pad1, pad2, net) - TTL_7404_INVERT(ic_e4e, ic_f2b.Q) - ALIAS(video, ic_e4e.Q) - - TTL_7486_XOR(ic_a4d, hsyncQ, vsyncQ) - TTL_7404_INVERT(ic_e4f, ic_a4d.Q) - - RES(RV1, RES_K(1)) - RES(RV2, RES_K(1.2)) - RES(RV3, RES_K(22)) - NET_C(video, RV1.1) - NET_C(score, RV2.1) - NET_C(ic_e4f.Q, RV3.1) - NET_C(RV1.2, RV2.2) - NET_C(RV2.2, RV3.2) + /* hit logic */ - ALIAS(videomix, RV3.2) + TTL_7404_INVERT(hitQ, hit) + TTL_7400_NAND(hit, hit1Q, hit2Q) + + TTL_7402_NOR(attractQ, StopG, runQ) + TTL_7404_INVERT(attract, attractQ) + + TTL_7420_NAND(ic_h6a, hvidQ, hvidQ, hvidQ, hvidQ) + ALIAS(hvid, ic_h6a.Q) + + TTL_7400_NAND(ic_e6c, hvid, hblank) + ALIAS(MissQ, ic_e6c.Q) + + TTL_7404_INVERT(ic_d1e, MissQ) + TTL_7400_NAND(ic_e1a, ic_d1e.Q, attractQ) + ALIAS(Missed, ic_e1a.Q) + + TTL_7400_NAND(rstspeed, SRSTQ, MissQ) + TTL_7400_NAND(StopG, StopG1Q, StopG2Q) + ALIAS(L, ic_h3b.Q) + ALIAS(R, ic_h3b.QQ) + + TTL_7400_NAND(hit1Q, pad1, ic_g1b.Q) + TTL_7400_NAND(hit2Q, pad2, ic_g1b.Q) + + TTL_7400_NAND(ic_g3c, 128H, ic_h3a.QQ) + TTL_7427_NOR(ic_g2c, ic_g3c.Q, 256H, vpad1Q) + ALIAS(pad1, ic_g2c.Q) + TTL_7427_NOR(ic_g2a, ic_g3c.Q, 256HQ, vpad2Q) + ALIAS(pad2, ic_g2a.Q) + + // ---------------------------------------------------------------------------------------- + // horizontal counter + // ---------------------------------------------------------------------------------------- + TTL_7493(ic_f8, clk, ic_f8.QA, ic_e7b.QQ, ic_e7b.QQ) // f8, f9, f6b + TTL_7493(ic_f9, ic_f8.QD, ic_f9.QA, ic_e7b.QQ, ic_e7b.QQ) // f8, f9, f6b + TTL_74107(ic_f6b, ic_f9.QD, high, high, ic_e7b.Q) + TTL_7430_NAND(ic_f7, ic_f8.QB, ic_f8.QC, ic_f9.QC, ic_f9.QD, ic_f6b.Q, high, high, high) + TTL_7474(ic_e7b, clk, ic_f7, high, high) + + ALIAS(hreset, ic_e7b.QQ) + ALIAS(hresetQ, ic_e7b.Q) + ALIAS( 4H, ic_f8.QC) + ALIAS( 8H, ic_f8.QD) + ALIAS( 16H, ic_f9.QA) + ALIAS( 32H, ic_f9.QB) + ALIAS( 64H, ic_f9.QC) + ALIAS(128H, ic_f9.QD) + ALIAS(256H, ic_f6b.Q) + ALIAS(256HQ, ic_f6b.QQ) + + // ---------------------------------------------------------------------------------------- + // vertical counter + // ---------------------------------------------------------------------------------------- + TTL_7493(ic_e8, hreset, ic_e8.QA, ic_e7a.QQ, ic_e7a.QQ) // e8, e9, d9b + TTL_7493(ic_e9, ic_e8.QD,ic_e9.QA, ic_e7a.QQ, ic_e7a.QQ) // e8, e9, d9b + TTL_74107(ic_d9b, ic_e9.QD, high, high, ic_e7a.Q) + TTL_7474(ic_e7a, hreset, e7a_data, high, high) + TTL_7410_NAND(e7a_data, ic_e8.QA, ic_e8.QC, ic_d9b.Q) + + ALIAS(vreset, ic_e7a.QQ) + ALIAS( 4V, ic_e8.QC) + ALIAS( 8V, ic_e8.QD) + ALIAS( 16V, ic_e9.QA) + ALIAS( 32V, ic_e9.QB) + ALIAS( 64V, ic_e9.QC) + ALIAS(128V, ic_e9.QD) + ALIAS(256V, ic_d9b.Q) + ALIAS(256VQ, ic_d9b.QQ) + + + // ---------------------------------------------------------------------------------------- + // hblank flip flop + // ---------------------------------------------------------------------------------------- + + TTL_7400_NAND(ic_g5b, 16H, 64H) + + // the time critical one + TTL_7400_NAND(ic_h5c, ic_h5b.Q, hresetQ) + TTL_7400_NAND(ic_h5b, ic_h5c.Q, ic_g5b.Q) + + ALIAS(hblank, ic_h5c.Q) + ALIAS(hblankQ, ic_h5b.Q) + TTL_7400_NAND(hsyncQ, hblank, 32H) + + // ---------------------------------------------------------------------------------------- + // vblank flip flop + // ---------------------------------------------------------------------------------------- + TTL_7402_NOR(ic_f5c, ic_f5d.Q, vreset) + TTL_7402_NOR(ic_f5d, ic_f5c.Q, 16V) + + ALIAS(vblank, ic_f5d.Q) + ALIAS(vblankQ, ic_f5c.Q) + + TTL_7400_NAND(ic_h5a, 8V, 8V) + TTL_7410_NAND(ic_g5a, vblank, 4V, ic_h5a.Q) + ALIAS(vsyncQ, ic_g5a.Q) + + // ---------------------------------------------------------------------------------------- + // move logic + // ---------------------------------------------------------------------------------------- + + TTL_7400_NAND(ic_e1d, hit_sound, ic_e1c.Q) + TTL_7400_NAND(ic_e1c, ic_f1.QC, ic_f1.QD) + TTL_7493(ic_f1, ic_e1d.Q, ic_f1.QA, rstspeed, rstspeed) + + TTL_7402_NOR(ic_g1d, ic_f1.QC, ic_f1.QD) + TTL_7400_NAND(ic_h1a, ic_g1d.Q, ic_g1d.Q) + TTL_7400_NAND(ic_h1d, ic_e1c.Q, ic_h1a.Q) + + TTL_7400_NAND(ic_h1c, ic_h1d.Q, vreset) + TTL_7400_NAND(ic_h1b, ic_h1a.Q, vreset) + TTL_7402_NOR(ic_g1c, 256HQ, vreset) + + TTL_74107(ic_h2a, ic_g1c.Q, ic_h2b.Q, low, ic_h1b.Q) + TTL_74107(ic_h2b, ic_g1c.Q, high, move, ic_h1c.Q) + + TTL_7400_NAND(ic_h4a, ic_h2b.Q, ic_h2a.Q) + ALIAS(move, ic_h4a.Q) + + TTL_7400_NAND(ic_c1d, SC, attract) + TTL_7404_INVERT(ic_d1a, ic_c1d.Q) + TTL_7474(ic_h3b, ic_d1a.Q, ic_h3b.QQ, hit1Q, hit2Q) + + TTL_7400_NAND(ic_h4d, ic_h3b.Q, move) + TTL_7400_NAND(ic_h4b, ic_h3b.QQ, move) + TTL_7400_NAND(ic_h4c, ic_h4d.Q, ic_h4b.Q) + ALIAS(Aa, ic_h4c.Q) + ALIAS(Ba, ic_h4b.Q) + + // ---------------------------------------------------------------------------------------- + // hvid circuit + // ---------------------------------------------------------------------------------------- + + TTL_7400_NAND(hball_resetQ, Serve, attractQ) + + TTL_9316(ic_g7, clk, high, hblankQ, hball_resetQ, ic_g5c.Q, Aa, Ba, low, high) + TTL_9316(ic_h7, clk, ic_g7.RC, high, hball_resetQ, ic_g5c.Q, low, low, low, high) + TTL_74107(ic_g6b, ic_h7.RC, high, high, hball_resetQ) + TTL_7410_NAND(ic_g5c, ic_g6b.Q, ic_h7.RC, ic_g7.RC) + TTL_7420_NAND(ic_h6b, ic_g6b.Q, ic_h7.RC, ic_g7.QC, ic_g7.QD) + ALIAS(hvidQ, ic_h6b.Q) + + // ---------------------------------------------------------------------------------------- + // vvid circuit + // ---------------------------------------------------------------------------------------- + + TTL_9316(ic_b3, hsyncQ, high, vblankQ, high, ic_b2b.Q, a6, b6, c6, d6) + TTL_9316(ic_a3, hsyncQ, ic_b3.RC, high, high, ic_b2b.Q, low, low, low, low) + TTL_7400_NAND(ic_b2b, ic_a3.RC, ic_b3.RC) + TTL_7410_NAND(ic_e2b, ic_a3.RC, ic_b3.QC, ic_b3.QD) + ALIAS(vvidQ, ic_e2b.Q) + TTL_7404_INVERT(vvid, vvidQ) // D2D + ALIAS(vpos256, ic_a3.RC) + ALIAS(vpos32, ic_a3.QB) + ALIAS(vpos16, ic_a3.QA) + + // ---------------------------------------------------------------------------------------- + // vball ctrl circuit + // ---------------------------------------------------------------------------------------- + + TTL_7450_ANDORINVERT(ic_a6a, b1, 256HQ, b2, 256H) + TTL_7450_ANDORINVERT(ic_a6b, c1, 256HQ, c2, 256H) + TTL_7450_ANDORINVERT(ic_b6b, d1, 256HQ, d2, 256H) + + TTL_7474(ic_a5b, hit, ic_a6a, attractQ, high) + TTL_7474(ic_a5a, hit, ic_a6b, attractQ, high) + TTL_7474(ic_b5a, hit, ic_b6b, attractQ, high) + TTL_74107(ic_h2x, vblank, vvid, vvid, hitQ) // two marked at position h2a ==> this h2x + + TTL_7486_XOR(ic_a4c, ic_a5b.Q, ic_h2x.Q) + TTL_7486_XOR(ic_a4b, ic_a5a.Q, ic_h2x.Q) + + TTL_7450_ANDORINVERT(ic_b6a, ic_b5a.Q, ic_h2x.Q, ic_b5a.QQ, ic_h2x.QQ) + + TTL_7404_INVERT(ic_c4a, ic_b6a) + + TTL_7483(ic_b4, ic_a4c, ic_a4b, ic_b6a, low, ic_c4a, high, high, low, low) + ALIAS(a6, ic_b4.S1) + ALIAS(b6, ic_b4.S2) + ALIAS(c6, ic_b4.S3) + ALIAS(d6, ic_b4.S4) + + // ---------------------------------------------------------------------------------------- + // serve monoflop + // ---------------------------------------------------------------------------------------- + + TTL_7404_INVERT(f4_trig, rstspeed) + + RES(ic_f4_serve_R, RES_K(330)) + CAP(ic_f4_serve_C, CAP_U(4.7)) + NE555(ic_f4_serve) + + NET_C(ic_f4_serve.VCC, V5) + NET_C(ic_f4_serve.GND, GND) + NET_C(ic_f4_serve.RESET, V5) + NET_C(ic_f4_serve_R.1, V5) + NET_C(ic_f4_serve_R.2, ic_f4_serve.THRESH) + NET_C(ic_f4_serve_R.2, ic_f4_serve.DISCH) + NET_C(f4_trig, ic_f4_serve.TRIG) + NET_C(ic_f4_serve_R.2, ic_f4_serve_C.1) + NET_C(GND, ic_f4_serve_C.2) + + TTL_7427_NOR(ic_e5a, ic_f4_serve.OUT, StopG, runQ) + TTL_7474(ic_b5b_serve, pad1, ic_e5a, ic_e5a, high) + + ALIAS(Serve, ic_b5b_serve.QQ) + ALIAS(ServeQ, ic_b5b_serve.Q) + + // ---------------------------------------------------------------------------------------- + // score logic + // ---------------------------------------------------------------------------------------- + + TTL_7474(ic_h3a, 4H, 128H, high, attractQ) + + // ---------------------------------------------------------------------------------------- + // sound logic + // ---------------------------------------------------------------------------------------- + TTL_7474(ic_c2a, vpos256, high, hitQ, high) + TTL_74107(ic_f3_topbot, vblank, vvid, vvidQ, ServeQ) + + // ---------------------------------------------------------------------------------------- + // monoflop with NE555 determines duration of score sound + // ---------------------------------------------------------------------------------------- + + RES(ic_g4_R, RES_K(220)) + CAP(ic_g4_C, CAP_U(1)) + NE555(ic_g4_sc) + ALIAS(SC, ic_g4_sc.OUT) + + NET_C(ic_g4_sc.VCC, V5) + NET_C(ic_g4_sc.GND, GND) + NET_C(ic_g4_sc.RESET, V5) + NET_C(ic_g4_R.1, V5) + NET_C(ic_g4_R.2, ic_g4_sc.THRESH) + NET_C(ic_g4_R.2, ic_g4_sc.DISCH) + NET_C(MissQ, ic_g4_sc.TRIG) + NET_C(ic_g4_R.2, ic_g4_C.1) + NET_C(GND, ic_g4_C.2) + + ALIAS(hit_sound_en, ic_c2a.QQ) + TTL_7400_NAND(hit_sound, hit_sound_en, vpos16) + TTL_7400_NAND(score_sound, SC, vpos32) + TTL_7400_NAND(topbothitsound, ic_f3_topbot.Q, vpos32) + + TTL_7410_NAND(ic_c4b, topbothitsound, hit_sound, score_sound) + TTL_7400_NAND(ic_c1b, ic_c4b.Q, attractQ) + ALIAS(sound, ic_c1b.Q) + + + // ---------------------------------------------------------------------------------------- + // paddle1 logic 1 + // ---------------------------------------------------------------------------------------- + + POT(ic_b9_POT, RES_K(1)) // This is a guess!! + PARAM(ic_b9_POT.DIALLOG, 1) // Log Dial ... + RES(ic_b9_RPRE, 470) + + NET_C(ic_b9_POT.1, V5) + NET_C(ic_b9_POT.3, GND) + NET_C(ic_b9_POT.2, ic_b9_RPRE.1) + NET_C(ic_b9_RPRE.2, ic_b9.CONT) + + RES(ic_b9_R, RES_K(81)) // Adjustment pot + CAP(ic_b9_C, CAP_U(.1)) + DIODE(ic_b9_D, "1N914") + NE555(ic_b9) + + NET_C(ic_b9.VCC, V5) + NET_C(ic_b9.GND, GND) + NET_C(ic_b9.RESET, V5) + NET_C(ic_b9_R.1, V5) + NET_C(ic_b9_R.2, ic_b9.THRESH) + NET_C(ic_b9_R.2, ic_b9_D.A) + NET_C(ic_b9_D.K, ic_b9.DISCH) + NET_C(256VQ, ic_b9.TRIG) + NET_C(ic_b9_R.2, ic_b9_C.1) + NET_C(GND, ic_b9_C.2) + + TTL_7404_INVERT(ic_c9b, ic_b9.OUT) + TTL_7400_NAND(ic_b7b, ic_a7b.Q, hsyncQ) + TTL_7493(ic_b8, ic_b7b.Q, ic_b8.QA, ic_b9.OUT, ic_b9.OUT) + TTL_7400_NAND(ic_b7a, ic_c9b.Q, ic_a7b.Q) + TTL_7420_NAND(ic_a7b, ic_b8.QA, ic_b8.QB, ic_b8.QC, ic_b8.QD) + ALIAS(vpad1Q, ic_b7a.Q) + + ALIAS(b1, ic_b8.QB) + ALIAS(c1, ic_b8.QC) + ALIAS(d1, ic_b8.QD) + + // ---------------------------------------------------------------------------------------- + // paddle1 logic 2 + // ---------------------------------------------------------------------------------------- + + POT(ic_a9_POT, RES_K(1)) // This is a guess!! + PARAM(ic_a9_POT.DIALLOG, 1) // Log Dial ... + RES(ic_a9_RPRE, 470) + + NET_C(ic_a9_POT.1, V5) + NET_C(ic_a9_POT.3, GND) + NET_C(ic_a9_POT.2, ic_a9_RPRE.1) + NET_C(ic_a9_RPRE.2, ic_a9.CONT) + + RES(ic_a9_R, RES_K(81)) // Adjustment pot + CAP(ic_a9_C, CAP_U(.1)) + DIODE(ic_a9_D, "1N914") + NE555(ic_a9) + + NET_C(ic_a9.VCC, V5) + NET_C(ic_a9.GND, GND) + NET_C(ic_a9.RESET, V5) + NET_C(ic_a9_R.1, V5) + NET_C(ic_a9_R.2, ic_a9.THRESH) + NET_C(ic_a9_R.2, ic_a9_D.A) + NET_C(ic_a9_D.K, ic_a9.DISCH) + NET_C(256VQ, ic_a9.TRIG) + NET_C(ic_a9_R.2, ic_a9_C.1) + NET_C(GND, ic_a9_C.2) + + TTL_7404_INVERT(ic_c9a, ic_a9.OUT) + TTL_7400_NAND(ic_b7c, ic_a7a.Q, hsyncQ) + TTL_7493(ic_a8, ic_b7c.Q, ic_a8.QA, ic_a9.OUT, ic_a9.OUT) + TTL_7400_NAND(ic_b7d, ic_c9a.Q, ic_a7a.Q) + TTL_7420_NAND(ic_a7a, ic_a8.QA, ic_a8.QB, ic_a8.QC, ic_a8.QD) + ALIAS(vpad2Q, ic_b7d.Q) + + ALIAS(b2, ic_a8.QB) + ALIAS(c2, ic_a8.QC) + ALIAS(d2, ic_a8.QD) + + // ---------------------------------------------------------------------------------------- + // C5-EN Logic + // ---------------------------------------------------------------------------------------- + + TTL_7404_INVERT(ic_e3a, 128H) + TTL_7427_NOR( ic_e3b, 256H, 64H, ic_e3a.Q) + TTL_7410_NAND(ic_e2c, 256H, 64H, ic_e3a.Q) + TTL_7404_INVERT(ic_e3c, ic_e2c.Q) + TTL_7402_NOR(ic_d2c, ic_e3c.Q, ic_e3b.Q) + TTL_7404_INVERT(ic_g1a, 32V) + TTL_7425_NOR(ic_f2a, ic_g1a.Q, 64V, 128V, ic_d2c.Q) + ALIAS(c5_en, ic_f2a.Q) + + // ---------------------------------------------------------------------------------------- + // Score logic ... + // ---------------------------------------------------------------------------------------- + + TTL_7402_NOR(ic_f5b, L, Missed) + TTL_7490(ic_c7, ic_f5b, ic_c7.QA, SRST, SRST, low, low) + TTL_74107(ic_c8a, ic_c7.QD, high, high, SRSTQ) + SWITCH2(sw1a) + PARAM(sw1a.POS, 0) + + NET_C(sw1a.1, high) + //NET_C(sw1a.1, V5) + NET_C(sw1a.2, ic_c7.QC) + + TTL_7410_NAND(ic_d8a, ic_c7.QA, sw1a.Q, ic_c8a.Q) // would be nand2 for 11 instead of 15 points, need a switch dev! + + ALIAS(StopG1Q, ic_d8a.Q) + ALIAS(score1_1, ic_c7.QA) + ALIAS(score1_2, ic_c7.QB) + ALIAS(score1_4, ic_c7.QC) + ALIAS(score1_8, ic_c7.QD) + ALIAS(score1_10, ic_c8a.Q) + ALIAS(score1_10Q, ic_c8a.QQ) + + TTL_7402_NOR(ic_f5a, R, Missed) + TTL_7490(ic_d7, ic_f5a, ic_d7.QA, SRST, SRST, low, low) + TTL_74107(ic_c8b, ic_d7.QD, high, high, SRSTQ) + SWITCH2(sw1b) + PARAM(sw1b.POS, 0) + + NET_C(sw1b.1, high) + //NET_C(sw1b.1, V5) + NET_C(sw1b.2, ic_d7.QC) + + + TTL_7410_NAND(ic_d8b, ic_d7.QA, sw1b.Q, ic_c8b.Q) // would be nand2 for 11 instead of 15 points, need a switch dev! + + ALIAS(StopG2Q, ic_d8b.Q) + ALIAS(score2_1, ic_d7.QA) + ALIAS(score2_2, ic_d7.QB) + ALIAS(score2_4, ic_d7.QC) + ALIAS(score2_8, ic_d7.QD) + ALIAS(score2_10, ic_c8b.Q) + ALIAS(score2_10Q, ic_c8b.QQ) + + // ---------------------------------------------------------------------------------------- + // Score display + // ---------------------------------------------------------------------------------------- + + TTL_74153(ic_d6a, score1_10Q, score1_4, score2_10Q, score2_4, 32H, 64H, low) + TTL_74153(ic_d6b, score1_10Q, score1_8, score2_10Q, score2_8, 32H, 64H, low) + + TTL_74153(ic_c6a, high, score1_1, high, score2_1, 32H, 64H, low) + TTL_74153(ic_c6b, score1_10Q, score1_2, score2_10Q, score2_2, 32H, 64H, low) + + TTL_7448(ic_c5, ic_c6a.AY, ic_c6b.AY, ic_d6a.AY, ic_d6b.AY, high, c5_en, high) + + TTL_7404_INVERT(ic_e4b, 16H) + TTL_7427_NOR(ic_e5c, ic_e4b.Q, 8H, 4H) + ALIAS(scoreFE, ic_e5c.Q) + + TTL_7400_NAND(ic_c3d, 8H, 4H) + //TTL_7400_NAND(ic_c3d, 4H, 8H) + TTL_7402_NOR(ic_d2b, ic_e4b.Q, ic_c3d.Q) + ALIAS(scoreBC, ic_d2b.Q) + + TTL_7427_NOR(ic_e5b, ic_e4b.Q, 8V, 4V) + ALIAS(scoreA, ic_e5b.Q) + + TTL_7410_NAND(ic_e2a, 16H, 8V, 4V) + TTL_7404_INVERT(ic_e4a, ic_e2a.Q) + ALIAS(scoreGD, ic_e4a.Q) + + TTL_7404_INVERT(ic_e4c, 16V) + + TTL_7410_NAND(ic_d4a, ic_e4c.Q, ic_c5.f, scoreFE) + TTL_7410_NAND(ic_d5c, 16V, ic_c5.e, scoreFE) + TTL_7410_NAND(ic_c4c, ic_e4c.Q, ic_c5.b, scoreBC) + TTL_7410_NAND(ic_d5a, 16V, ic_c5.c, scoreBC) + TTL_7410_NAND(ic_d4c, ic_e4c.Q, ic_c5.a, scoreA) + TTL_7410_NAND(ic_d4b, ic_e4c.Q, ic_c5.g, scoreGD) + TTL_7410_NAND(ic_d5b, 16V, ic_c5.d, scoreGD) + + TTL_7430_NAND(ic_d3, ic_d4a, ic_d5c, ic_c4c, ic_d5a, ic_d4c, ic_d4b, ic_d5b, high) + ALIAS(score, ic_d3.Q) //FIXME + + // net + TTL_74107(ic_f3b, clk, 256H, 256HQ, high) + TTL_7400_NAND(ic_g3b, ic_f3b.QQ, 256H) + TTL_7427_NOR(ic_g2b, ic_g3b.Q, vblank, 4V) + ALIAS(net, ic_g2b.Q) + + // ---------------------------------------------------------------------------------------- + // video + // ---------------------------------------------------------------------------------------- + + TTL_7402_NOR(ic_g1b, hvidQ, vvidQ) + TTL_7425_NOR(ic_f2b, ic_g1b.Q, pad1, pad2, net) + TTL_7404_INVERT(ic_e4e, ic_f2b.Q) + ALIAS(video, ic_e4e.Q) + + TTL_7486_XOR(ic_a4d, hsyncQ, vsyncQ) + TTL_7404_INVERT(ic_e4f, ic_a4d.Q) + + RES(RV1, RES_K(1)) + RES(RV2, RES_K(1.2)) + RES(RV3, RES_K(22)) + NET_C(video, RV1.1) + NET_C(score, RV2.1) + NET_C(ic_e4f.Q, RV3.1) + NET_C(RV1.2, RV2.2) + NET_C(RV2.2, RV3.2) + + ALIAS(videomix, RV3.2) NETLIST_END() @@ -725,7 +725,7 @@ static NETLIST_START(pong_fast) INCLUDE(pong_schematics) //NETDEV_ANALOG_CALLBACK(sound_cb, sound, pong_state, sound_cb, "") - //NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") + //NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -733,10 +733,10 @@ NETLIST_END() static NETLIST_START(pongd) - INCLUDE(pongdoubles) + INCLUDE(pongdoubles) - //NETDEV_ANALOG_CALLBACK(sound_cb, AUDIO, pong_state, sound_cb, "") - //NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") + //NETDEV_ANALOG_CALLBACK(sound_cb, AUDIO, pong_state, sound_cb, "") + //NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() #endif @@ -744,37 +744,37 @@ NETLIST_END() #ifdef TEST_SOUND static NETLIST_START(test) - /* - * Astable multivibrator using two 7400 gates (or inverters) - * - */ + /* + * Astable multivibrator using two 7400 gates (or inverters) + * + */ - /* Standard stuff */ + /* Standard stuff */ - SOLVER(Solver) - PARAM(Solver.FREQ, 48000) + SOLVER(Solver) + PARAM(Solver.FREQ, 48000) - //NETDEV_SOUND_IN(SND_IN) - //PARAM(SND_IN.CHAN0, "tin.IN") + //NETDEV_SOUND_IN(SND_IN) + //PARAM(SND_IN.CHAN0, "tin.IN") - ANALOG_INPUT(tin, 0) + ANALOG_INPUT(tin, 0) - // astable NAND Multivibrator - RES(R1, 1000) - CAP(C1, 1e-6) - TTL_7400_NAND(n1,R1.1,R1.1) - TTL_7400_NAND(n2,R1.2,R1.2) - NET_C(n1.Q, R1.2) - NET_C(n2.Q, C1.1) - NET_C(C1.2, R1.1) - LOG(log1, n2.Q) + // astable NAND Multivibrator + RES(R1, 1000) + CAP(C1, 1e-6) + TTL_7400_NAND(n1,R1.1,R1.1) + TTL_7400_NAND(n2,R1.2,R1.2) + NET_C(n1.Q, R1.2) + NET_C(n2.Q, C1.1) + NET_C(C1.2, R1.1) + LOG(log1, n2.Q) #if 0 - NETDEV_SOUND_OUT(CH0, 0) - NET_C(CH0.IN, n2.Q) + NETDEV_SOUND_OUT(CH0, 0) + NET_C(CH0.IN, n2.Q) - NETDEV_SOUND_OUT(CH1, 1) - NET_C(CH1.IN, tin.Q) + NETDEV_SOUND_OUT(CH1, 1) + NET_C(CH1.IN, tin.Q) #endif NETLIST_END() @@ -809,10 +809,10 @@ INPUT_CHANGED_MEMBER(pong_state::input_changed) static INPUT_PORTS_START( pong ) PORT_START( "PADDLE0" ) /* fake input port for player 1 paddle */ - PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot0") + PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot0") 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_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("IN0") /* fake as well */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "coinsw") @@ -821,7 +821,7 @@ static INPUT_PORTS_START( pong ) PORT_DIPSETTING( 0x00, "11" ) PORT_DIPSETTING( 0x06, "15" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Antenna") NETLIST_LOGIC_PORT_CHANGED("maincpu", "antenna") + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Antenna") NETLIST_LOGIC_PORT_CHANGED("maincpu", "antenna") PORT_START("VR1") PORT_ADJUSTER( 50, "VR1 - 50k, Paddle 1 adjustment" ) NETLIST_ANALOG_PORT_CHANGED("maincpu", "vr0") @@ -833,28 +833,28 @@ INPUT_PORTS_END #if PONGD static INPUT_PORTS_START( pongd ) #if 0 - PORT_START( "PADDLE0" ) /* fake input port for player 1 paddle */ - PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot0") + PORT_START( "PADDLE0" ) /* fake input port for player 1 paddle */ + PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_CENTERDELTA(0) NETLIST_ANALOG_PORT_CHANGED("maincpu", "pot0") - 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( "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") #endif - PORT_START("IN0") /* fake as well */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "coinsw") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "startsw") + PORT_START("IN0") /* fake as well */ + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "coinsw") + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "startsw") #if 0 - PORT_DIPNAME( 0x06, 0x00, "Game Won" ) PORT_DIPLOCATION("SW1A:1,SW1B:1") PORT_CHANGED_MEMBER(DEVICE_SELF, pong_state, input_changed, IC_SWITCH) - PORT_DIPSETTING( 0x00, "11" ) - PORT_DIPSETTING( 0x06, "15" ) + PORT_DIPNAME( 0x06, 0x00, "Game Won" ) PORT_DIPLOCATION("SW1A:1,SW1B:1") PORT_CHANGED_MEMBER(DEVICE_SELF, pong_state, input_changed, IC_SWITCH) + PORT_DIPSETTING( 0x00, "11" ) + PORT_DIPSETTING( 0x06, "15" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Antenna") NETLIST_LOGIC_PORT_CHANGED("maincpu", "antenna") + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Antenna") NETLIST_LOGIC_PORT_CHANGED("maincpu", "antenna") - PORT_START("VR1") - PORT_ADJUSTER( 50, "VR1 - 50k, Paddle 1 adjustment" ) NETLIST_ANALOG_PORT_CHANGED("maincpu", "vr0") - PORT_START("VR2") - PORT_ADJUSTER( 50, "VR2 - 50k, Paddle 2 adjustment" ) NETLIST_ANALOG_PORT_CHANGED("maincpu", "vr1") + PORT_START("VR1") + PORT_ADJUSTER( 50, "VR1 - 50k, Paddle 1 adjustment" ) NETLIST_ANALOG_PORT_CHANGED("maincpu", "vr0") + PORT_START("VR2") + PORT_ADJUSTER( 50, "VR2 - 50k, Paddle 2 adjustment" ) NETLIST_ANALOG_PORT_CHANGED("maincpu", "vr1") #endif INPUT_PORTS_END @@ -863,22 +863,22 @@ INPUT_PORTS_END static MACHINE_CONFIG_START( pong, pong_state ) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) - MCFG_NETLIST_SETUP(pong) - - MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr0", "ic_b9_R.R") - MCFG_NETLIST_ANALOG_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) - MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr1", "ic_a9_R.R") - MCFG_NETLIST_ANALOG_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) - MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot0", "ic_b9_POT.DIAL") - MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "ic_a9_POT.DIAL") - MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1a", "sw1a.POS", 0, 0x01) - MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1b", "sw1b.POS", 0, 0x01) - MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw", "coinsw.POS", 0, 0x01) - MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0, 0x01) - - MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "snd0", "sound", pong_state, sound_cb, "") - MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_vid, "fixfreq") + MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) + MCFG_NETLIST_SETUP(pong) + + MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr0", "ic_b9_R.R") + MCFG_NETLIST_ANALOG_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) + MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr1", "ic_a9_R.R") + MCFG_NETLIST_ANALOG_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) + MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot0", "ic_b9_POT.DIAL") + MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "ic_a9_POT.DIAL") + MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1a", "sw1a.POS", 0, 0x01) + MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1b", "sw1b.POS", 0, 0x01) + MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw", "coinsw.POS", 0, 0x01) + MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0, 0x01) + + MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "snd0", "sound", pong_state, sound_cb, "") + MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_vid, "fixfreq") /* video hardware */ @@ -890,24 +890,24 @@ static MACHINE_CONFIG_START( pong, pong_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 48000) #ifdef TEST_SOUND - MCFG_SOUND_ROUTE_EX(0, "snd_test", 1.0, 0) + MCFG_SOUND_ROUTE_EX(0, "snd_test", 1.0, 0) #else - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) #endif #ifdef TEST_SOUND - MCFG_SOUND_ADD("snd_test", NETLIST_SOUND, 48000) - MCFG_NETLIST_SETUP(test) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_SOUND_ADD("snd_test", NETLIST_SOUND, 48000) + MCFG_NETLIST_SETUP(test) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_NETLIST_STREAM_INPUT("snd_test", 0, "tin.IN") - MCFG_NETLIST_ANALOG_MULT_OFFSET(0.001, 0.0) + MCFG_NETLIST_STREAM_INPUT("snd_test", 0, "tin.IN") + MCFG_NETLIST_ANALOG_MULT_OFFSET(0.001, 0.0) - //MCFG_NETLIST_STREAM_OUTPUT("snd_test", 0, "tin.Q", 100) - MCFG_NETLIST_STREAM_OUTPUT("snd_test", 0, "n2.Q") - MCFG_NETLIST_ANALOG_MULT_OFFSET(1000.0, 0.0) - MCFG_NETLIST_STREAM_OUTPUT("snd_test", 1, "tin.Q") - MCFG_NETLIST_ANALOG_MULT_OFFSET(1000.0, 0.0) + //MCFG_NETLIST_STREAM_OUTPUT("snd_test", 0, "tin.Q", 100) + MCFG_NETLIST_STREAM_OUTPUT("snd_test", 0, "n2.Q") + MCFG_NETLIST_ANALOG_MULT_OFFSET(1000.0, 0.0) + MCFG_NETLIST_STREAM_OUTPUT("snd_test", 1, "tin.Q") + MCFG_NETLIST_ANALOG_MULT_OFFSET(1000.0, 0.0) #endif @@ -916,7 +916,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( pongf, pong ) /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") MCFG_NETLIST_SETUP(pong_fast) MACHINE_CONFIG_END @@ -924,39 +924,39 @@ MACHINE_CONFIG_END #if PONGD static MACHINE_CONFIG_START( pongd, pong_state ) - /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) - MCFG_NETLIST_SETUP(pongd) + /* basic machine hardware */ + MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) + MCFG_NETLIST_SETUP(pongd) #if 0 - MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr0", "ic_b9_R.R") - MCFG_NETLIST_ANALOG_INPUT_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) - MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr1", "ic_a9_R.R") - MCFG_NETLIST_ANALOG_INPUT_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) - MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot0", "ic_b9_POT.DIAL") - MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "ic_a9_POT.DIAL") + MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr0", "ic_b9_R.R") + MCFG_NETLIST_ANALOG_INPUT_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) + MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr1", "ic_a9_R.R") + MCFG_NETLIST_ANALOG_INPUT_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) ) + MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot0", "ic_b9_POT.DIAL") + MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "ic_a9_POT.DIAL") #endif - 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) - MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw", "START_SW.POS", 0, 0x01) + 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) + MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw", "START_SW.POS", 0, 0x01) #if 0 - MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0, 0x01) + MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0, 0x01) #endif - MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "snd0", "AUDIO", pong_state, sound_cb, "") - MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_vid, "fixfreq") + MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "snd0", "AUDIO", pong_state, sound_cb, "") + MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_vid, "fixfreq") - /* video hardware */ + /* video hardware */ - //MCFG_FIXFREQ_ADD("fixfreq", "screen", fixedfreq_mode_ntsc720) - //MCFG_FIXFREQ_ADD("fixfreq", "screen", fixedfreq_mode_pongX2) - MCFG_FIXFREQ_ADD("fixfreq", "screen", fixedfreq_mode_pongd) + //MCFG_FIXFREQ_ADD("fixfreq", "screen", fixedfreq_mode_ntsc720) + //MCFG_FIXFREQ_ADD("fixfreq", "screen", fixedfreq_mode_pongX2) + MCFG_FIXFREQ_ADD("fixfreq", "screen", fixedfreq_mode_pongd) - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("dac", DAC, 48000) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SOUND_ADD("dac", DAC, 48000) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -970,7 +970,7 @@ MACHINE_CONFIG_END ROM_START( pong ) /* dummy to satisfy game entry*/ ROM_REGION( 0x10000, "maincpu", 0 ) /* enough for netlist */ - ROM_LOAD( "pong.netlist", 0x000000, 0x00457f, CRC(72d5e4fe) SHA1(7bb15828223c34915c5e2869dd7917532a4bb7b4) ) + ROM_LOAD( "pong.netlist", 0x000000, 0x00457f, CRC(72d5e4fe) SHA1(7bb15828223c34915c5e2869dd7917532a4bb7b4) ) ROM_END ROM_START( pongf ) /* dummy to satisfy game entry*/ @@ -979,7 +979,7 @@ ROM_END #if PONGD ROM_START( pongd ) /* dummy to satisfy game entry*/ - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END #endif diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index ebde326db1c..05b9f455295 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -29,80 +29,80 @@ Notes: */ static NETLIST_START(nl_popeye_imp_changer) - RES(R62, 510000) - RES(R63, 100) - RES(R64, 510000) - RES(R65, 2100) - RES(R66, 330) - RES(R67, 51) - - QBJT_EB(Q8, "2SC1815") - QBJT_EB(Q9, "2SA1015") - - NET_C(V5, R62.1, Q8.C, R66.1) - NET_C(R62.2, R64.1, R63.1, C7.2) - NET_C(R63.2, Q8.B) - NET_C(Q8.E, R65.1, Q9.B) - NET_C(R66.2, Q9.E, R67.1) - - NET_C(GND, Q9.C, R65.2, R64.2) + RES(R62, 510000) + RES(R63, 100) + RES(R64, 510000) + RES(R65, 2100) + RES(R66, 330) + RES(R67, 51) + + QBJT_EB(Q8, "2SC1815") + QBJT_EB(Q9, "2SA1015") + + NET_C(V5, R62.1, Q8.C, R66.1) + NET_C(R62.2, R64.1, R63.1, C7.2) + NET_C(R63.2, Q8.B) + NET_C(Q8.E, R65.1, Q9.B) + NET_C(R66.2, Q9.E, R67.1) + + NET_C(GND, Q9.C, R65.2, R64.2) NETLIST_END() static NETLIST_START(nl_popeye) - /* 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(R52, 2000) - RES(R55, 2000) - RES(R58, 2000) - RES(R53, 2000) - RES(R56, 2000) - RES(R59, 2000) - RES(R51, 20000) - RES(R57, 30000) - RES(R60, 30000) + RES(R52, 2000) + RES(R55, 2000) + RES(R58, 2000) + RES(R53, 2000) + RES(R56, 2000) + RES(R59, 2000) + RES(R51, 20000) + RES(R57, 30000) + RES(R60, 30000) - RES(R61, 120000) + RES(R61, 120000) - RES(ROUT, 5000) + RES(ROUT, 5000) - CAP(C4, 0.047e-6) - CAP(C5, 330e-12) - CAP(C6, 330e-12) - CAP(C7, 3.3e-6) - CAP(C40, 680e-12) + CAP(C4, 0.047e-6) + CAP(C5, 330e-12) + CAP(C6, 330e-12) + CAP(C7, 3.3e-6) + CAP(C40, 680e-12) - 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, R52.1, R53.1) - NET_C(R_AY1_2.2, R55.1, R56.1) - NET_C(R_AY1_3.2, R58.1, R59.1) + NET_C(R_AY1_1.2, R52.1, R53.1) + NET_C(R_AY1_2.2, R55.1, R56.1) + NET_C(R_AY1_3.2, R58.1, R59.1) - NET_C(R53.2, R51.1, C4.1) - NET_C(R56.2, R57.1, C5.1) - NET_C(R59.2, R60.1, C6.1) + NET_C(R53.2, R51.1, C4.1) + NET_C(R56.2, R57.1, C5.1) + NET_C(R59.2, R60.1, C6.1) - NET_C(R51.2, R57.2, R60.2, R61.1, C40.1, C7.1) + NET_C(R51.2, R57.2, R60.2, R61.1, C40.1, C7.1) - NET_C(GND, R52.2, R55.2, R58.2, C4.2, C5.2, C6.2, R61.2, C40.2) + NET_C(GND, R52.2, R55.2, R58.2, C4.2, C5.2, C6.2, R61.2, C40.2) - INCLUDE(nl_popeye_imp_changer) + INCLUDE(nl_popeye_imp_changer) - /* output resistor (actually located in TV */ + /* output resistor (actually located in TV */ - NET_C(R67.2, ROUT.1) + NET_C(R67.2, ROUT.1) - NET_C(GND, ROUT.2) + NET_C(GND, ROUT.2) NETLIST_END() @@ -112,7 +112,7 @@ INTERRUPT_GEN_MEMBER(popeye_state::popeye_interrupt) { m_field ^= 1; /* NMIs are enabled by the I register?? How can that be? */ - if (device.state().state_int(Z80_I) & 1) /* skyskipr: 0/1, popeye: 2/3 but also 0/1 */ + if (device.state().state_int(Z80_I) & 1) /* skyskipr: 0/1, popeye: 2/3 but also 0/1 */ device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -458,12 +458,12 @@ static const ay8910_interface ay8910_config = /* Does Sky Skipper have the same filtering? */ static const ay8910_interface ay8910_nl_config = { - AY8910_RESISTOR_OUTPUT, - AY8910_DEFAULT_LOADS, - DEVCB_INPUT_PORT("DSW0"), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_DRIVER_MEMBER(popeye_state,popeye_portB_w) + AY8910_RESISTOR_OUTPUT, + AY8910_DEFAULT_LOADS, + DEVCB_INPUT_PORT("DSW0"), + DEVCB_NULL, + DEVCB_NULL, + DEVCB_DRIVER_MEMBER(popeye_state,popeye_portB_w) }; static MACHINE_CONFIG_START( skyskipr, popeye_state ) @@ -501,23 +501,23 @@ static MACHINE_CONFIG_DERIVED( popeye, skyskipr ) MCFG_SOUND_MODIFY("aysnd") MCFG_SOUND_ROUTES_RESET() - MCFG_SOUND_CONFIG(ay8910_nl_config) - 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_CONFIG(ay8910_nl_config) + 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_popeye) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000) + MCFG_NETLIST_SETUP(nl_popeye) + 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, "ROUT.1") - MCFG_NETLIST_ANALOG_MULT_OFFSET(30000.0, -65000.0) + MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "ROUT.1") + MCFG_NETLIST_ANALOG_MULT_OFFSET(30000.0, -65000.0) MCFG_VIDEO_START_OVERRIDE(popeye_state,popeye) MACHINE_CONFIG_END diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c index 21d6745f238..380351115ee 100644 --- a/src/mame/drivers/popobear.c +++ b/src/mame/drivers/popobear.c @@ -110,7 +110,7 @@ public: required_shared_ptr m_vregs; optional_device m_gfxdecode; required_device m_palette; - + UINT16* m_vram; UINT16* m_vram_rearranged; @@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( popobear, popobear_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_42MHz/16) // XTAL CORRECT, DIVISOR GUESSED MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 75731c0c8d8..04286b0bee2 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -221,7 +221,7 @@ static ADDRESS_MAP_START( puckpkmn_map, AS_PROGRAM, 16, md_boot_state ) AM_RANGE(0x700022, 0x700023) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) AM_RANGE(0xa04000, 0xa04003) AM_READWRITE8(megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega315_5313_device, vdp_r, vdp_w) - + AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) /* Unknown reads/writes: */ @@ -453,7 +453,7 @@ ROM_START( puckpkmna ) /* Puckman Pockimon (c)2000 IBS Co. Ltd */ ROM_END -ROM_START( puckpkmnb ) +ROM_START( puckpkmnb ) ROM_REGION( 0x400000, "maincpu", 0 ) ROM_LOAD16_BYTE( "200061.u5", 0x000000, 0x080000, CRC(502a5093) SHA1(6dc1c79d52ebb653cb2e4388f74fd975ec323566) ) ROM_LOAD16_BYTE( "200060.u4", 0x000001, 0x080000, CRC(5f160c18) SHA1(5a5ce1b9a81afe836e435e9d6f16cf57b63cbd31) ) diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index dce063bdcef..118defd3dbe 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -342,12 +342,12 @@ static MACHINE_CONFIG_START( pzletime, pzletime_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(pzletime_state, screen_update_pzletime) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", pzletime) MCFG_PALETTE_ADD("palette", 0x300 + 32768) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_INIT_OWNER(pzletime_state, pzletime) - + MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index 40f53959ff0..602afcfcae1 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -625,7 +625,7 @@ static MACHINE_CONFIG_START( qdrmfgp, qdrmfgp_state ) MCFG_K056832_ADD("k056832", qdrmfgp_k056832_intf) MCFG_K056832_GFXDECODE("gfxdecode") MCFG_K056832_PALETTE("palette") - + MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4) MCFG_K053252_OFFSETS(40, 16) @@ -669,7 +669,7 @@ static MACHINE_CONFIG_START( qdrmfgp2, qdrmfgp_state ) MCFG_K056832_ADD("k056832", qdrmfgp2_k056832_intf) MCFG_K056832_GFXDECODE("gfxdecode") MCFG_K056832_PALETTE("palette") - + MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4) MCFG_K053252_OFFSETS(40, 16) diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c index e0fd32cc834..1c58a98793b 100644 --- a/src/mame/drivers/quantum.c +++ b/src/mame/drivers/quantum.c @@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( quantum, quantum_state ) MCFG_SCREEN_VISIBLE_AREA(0, 900, 0, 600) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) - MCFG_DEVICE_ADD("avg", AVG_QUANTUM, 0) + MCFG_DEVICE_ADD("avg", AVG_QUANTUM, 0) MCFG_AVGDVG_VECTOR("vector") /* sound hardware */ diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 8bdecde4b01..d2b901db128 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -743,7 +743,7 @@ static MACHINE_CONFIG_START( nzerotea, r2dx_v33_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(r2dx_v33_state, screen_update_rdx_v33) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", rdx_v33) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index c26e1ecfab1..89a84604c6e 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -797,7 +797,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, #define ZEROTEAM_MASK_Y (0x1ff) - + gfx->transpen( bitmap, cliprect, @@ -806,7 +806,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, yflip,xflip, (sx+xstep*xtiles)&ZEROTEAM_MASK_X,(sy+ystep*ytiles)&ZEROTEAM_MASK_Y,15); - + gfx->transpen( bitmap, cliprect, @@ -815,7 +815,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, yflip,xflip, ((sx+xstep*xtiles)&ZEROTEAM_MASK_X)-0x200,(sy+ystep*ytiles)&ZEROTEAM_MASK_Y,15); - + gfx->transpen( bitmap, cliprect, @@ -824,7 +824,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, yflip,xflip, (sx+xstep*xtiles)&ZEROTEAM_MASK_X,((sy+ystep*ytiles)&ZEROTEAM_MASK_Y)-0x200,15); - + gfx->transpen( bitmap, cliprect, @@ -1858,7 +1858,7 @@ static GFXDECODE_START( raiden2 ) GFXDECODE_ENTRY( "gfx3", 0x00000, raiden2_spritelayout, 0x000, 128 ) GFXDECODE_END - + /* MACHINE DRIVERS */ static MACHINE_CONFIG_START( raiden2, raiden2_state ) @@ -1881,7 +1881,7 @@ static MACHINE_CONFIG_START( raiden2, raiden2_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden2) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1939,7 +1939,7 @@ static MACHINE_CONFIG_START( zeroteam, raiden2_state ) MCFG_SCREEN_RAW_PARAMS(XTAL_32MHz/4,546,0,40*8,264,0,32*8) /* hand-tuned to match ~55.47 */ MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden2) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/ramtek.c b/src/mame/drivers/ramtek.c index fd9e8ed117a..3961aad3c78 100644 --- a/src/mame/drivers/ramtek.c +++ b/src/mame/drivers/ramtek.c @@ -1,7 +1,7 @@ /*************************************************************************** - + Ramtek Discrete Games List - + Game Name DATA Board # -------------------------------------------- (Deluxe) Baseball (1974) YES @@ -14,7 +14,7 @@ Trivia (1976) YES Volly/Volley (1973) YES Wipe Out (1974) YES - + ***************************************************************************/ @@ -54,38 +54,38 @@ class ramtek_state : public driver_device public: ramtek_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(ramtek) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... -// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") -// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") +// NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") +// NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -115,9 +115,9 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ @@ -138,20 +138,20 @@ ROM_START( bballrmt ) ROM_END -// The board number for Clean Sweep is 501082, and the letter to the right would be the revision letter (A, B, C, D). -// Ramtek had revisions A, B, C, D, noted with a sticker that shows the letter for each specific revision. +// The board number for Clean Sweep is 501082, and the letter to the right would be the revision letter (A, B, C, D). +// Ramtek had revisions A, B, C, D, noted with a sticker that shows the letter for each specific revision. // Revisions A,B,C have been dumped and rom content is the same (only diff is the location of some chips on the rev B pcb) ROM_START( cleanswp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_REGION( 0x0020, "roms", ROMREGION_ERASE00 ) - ROM_LOAD( "501075.c6", 0x0000, 0x0020, CRC(be02b5f5) SHA1(f1c616a73c6c2915ea3d0252543b0806704ab2e9) ) // shape of paddle - ROM_LOAD( "501076.d7", 0x0000, 0x0020, CRC(be40b153) SHA1(07fb64ea8caee601e3e3bd6c69beea619dd0489d) ) // ball control memory - ROM_LOAD( "501074.k3", 0x0000, 0x0020, CRC(515a34ba) SHA1(471ca9d99851591ff11a87d18b88871edd7fd268) ) // number character generation + ROM_LOAD( "501075.c6", 0x0000, 0x0020, CRC(be02b5f5) SHA1(f1c616a73c6c2915ea3d0252543b0806704ab2e9) ) // shape of paddle + ROM_LOAD( "501076.d7", 0x0000, 0x0020, CRC(be40b153) SHA1(07fb64ea8caee601e3e3bd6c69beea619dd0489d) ) // ball control memory + ROM_LOAD( "501074.k3", 0x0000, 0x0020, CRC(515a34ba) SHA1(471ca9d99851591ff11a87d18b88871edd7fd268) ) // number character generation ROM_END -ROM_START( ramtek3 ) // maybe Hockey? +ROM_START( ramtek3 ) // maybe Hockey? ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_REGION( 0x0020, "roms", ROMREGION_ERASE00 ) diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c index 3cfb6221e4c..a0255601eef 100644 --- a/src/mame/drivers/rcorsair.c +++ b/src/mame/drivers/rcorsair.c @@ -139,7 +139,7 @@ static MACHINE_CONFIG_START( rcorsair, rcorsair_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_UPDATE_DRIVER(rcorsair_state, screen_update) + MCFG_SCREEN_UPDATE_DRIVER(rcorsair_state, screen_update) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index fc27d29e61e..32344dea511 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -788,7 +788,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( pkgnsh, realbrk ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pkgnsh_mem) - + MCFG_DEVICE_MODIFY("tmp68301") MCFG_TMP68301_OUT_PARALLEL_CB(NULL) MACHINE_CONFIG_END diff --git a/src/mame/drivers/rltennis.c b/src/mame/drivers/rltennis.c index ba67d2b9556..dc267e2bfe2 100644 --- a/src/mame/drivers/rltennis.c +++ b/src/mame/drivers/rltennis.c @@ -185,7 +185,7 @@ static MACHINE_CONFIG_START( rltennis, rltennis_state ) MCFG_SCREEN_VISIBLE_AREA(0,319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(rltennis_state, screen_update_rltennis) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 256) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index 65da640ac6f..0738838b5a9 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -261,10 +261,10 @@ static MACHINE_CONFIG_START( rockrage, rockrage_state ) MCFG_K007342_GFXNUM(0) MCFG_K007342_CALLBACK_OWNER(rockrage_state, rockrage_tile_callback) MCFG_K007342_GFXDECODE("gfxdecode") - + MCFG_K007420_ADD("k007420") MCFG_K007420_BANK_LIMIT(0x3ff) - MCFG_K007420_CALLBACK_OWNER(rockrage_state, rockrage_sprite_callback) + MCFG_K007420_CALLBACK_OWNER(rockrage_state, rockrage_sprite_callback) MCFG_K007420_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", rockrage) diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index 1d791c4c2da..4584ddf7376 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -840,7 +840,7 @@ static MACHINE_CONFIG_START( rohga, rohga_state ) MCFG_DECO16IC_ADD("tilegen1", rohga_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", rohga_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -889,7 +889,7 @@ static MACHINE_CONFIG_START( wizdfire, rohga_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) - MCFG_SCREEN_UPDATE_DRIVER(rohga_state, screen_update_wizdfire) + MCFG_SCREEN_UPDATE_DRIVER(rohga_state, screen_update_wizdfire) MCFG_GFXDECODE_ADD("gfxdecode", "palette", wizdfire) MCFG_PALETTE_ADD("palette", 2048) @@ -900,7 +900,7 @@ static MACHINE_CONFIG_START( wizdfire, rohga_state ) MCFG_DECO16IC_ADD("tilegen1", rohga_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", rohga_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -968,7 +968,7 @@ static MACHINE_CONFIG_START( nitrobal, rohga_state ) MCFG_DECO16IC_ADD("tilegen1", nitrobal_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", nitrobal_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") @@ -1040,7 +1040,7 @@ static MACHINE_CONFIG_START( schmeisr, rohga_state ) MCFG_DECO16IC_ADD("tilegen1", rohga_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DECO16IC_ADD("tilegen2", rohga_deco16ic_tilegen2_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index 84fca266141..ab60ca9b45e 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -282,15 +282,15 @@ static MACHINE_CONFIG_START( rollerg, rollerg_state ) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K053244_ADD("k053244", rollerg_k05324x_intf) MCFG_K053244_GFXDECODE("gfxdecode") MCFG_K053244_PALETTE("palette") - + MCFG_K051316_ADD("k051316", rollerg_k051316_intf) MCFG_K051316_GFXDECODE("gfxdecode") MCFG_K051316_PALETTE("palette") - + MCFG_DEVICE_ADD("k053252", K053252, 3000000*2) MCFG_K053252_INT1_ACK_CB(WRITELINE(rollerg_state,rollerg_irq_ack_w)) MCFG_K053252_OFFSETS(14*8, 2*8) diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index ba0242f56d0..bfb6944a30f 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -402,7 +402,7 @@ static MACHINE_CONFIG_START( rng, rungun_state ) MCFG_K055673_ADD("k055673", rng_k055673_intf) MCFG_K055673_GFXDECODE("gfxdecode") MCFG_K055673_PALETTE("palette") - + MCFG_DEVICE_ADD("k053252", K053252, 16000000/2) MCFG_K053252_OFFSETS(9*8, 24) diff --git a/src/mame/drivers/s7.c b/src/mame/drivers/s7.c index d5a445f2886..cd1a4e5bf4c 100644 --- a/src/mame/drivers/s7.c +++ b/src/mame/drivers/s7.c @@ -442,7 +442,7 @@ static MACHINE_CONFIG_START( s7, s7_state ) MCFG_SPEAKER_STANDARD_MONO("speech") MCFG_SOUND_ADD("hc55516", HC55516, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50) - + MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPB_HANDLER(READ8(s7_state, dac_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, dac_w)) diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index c77dc70f8aa..c45ed35c092 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -410,7 +410,7 @@ static MACHINE_CONFIG_START( safarir, safarir_state ) /* video hardware */ MCFG_PALETTE_ADD("palette", 2*8) MCFG_PALETTE_INIT_OWNER(safarir_state, safarir) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", safarir) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c index eac2a94fae8..76e373e19df 100644 --- a/src/mame/drivers/scobra.c +++ b/src/mame/drivers/scobra.c @@ -1273,10 +1273,10 @@ ROM_START( hustlerb4 ) ROM_REGION( 0x0020, "proms", 0 ) ROM_LOAD( "mni6331.e6", 0x0000, 0x0020, CRC(aa1f7f5e) SHA1(311dd17aa11490a1173c76223e4ccccf8ea29850) ) - + ROM_REGION( 0x0800, "unk", 0 ) ROM_LOAD( "top.c5", 0x0000, 0x0800, CRC(88226086) SHA1(fe2da172313063e5b056fc8c8d8b2a5c64db5179) ) -ROM_END +ROM_END ROM_START( mimonkey ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "mm1.2e", 0x0000, 0x1000, CRC(9019f1b1) SHA1(0c45f64e39b9a182f6162ab520ced6ef0686466c) ) diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c index 7c2204b4002..0431594f818 100644 --- a/src/mame/drivers/scramble.c +++ b/src/mame/drivers/scramble.c @@ -2142,7 +2142,7 @@ ROM_END ROM_START( hunchbks2 ) ROM_REGION( 0x8000, "maincpu", 0 ) - ROM_LOAD( "hb01.bin", 0x0000, 0x0800, CRC(fec3466a) SHA1(d8ec3b432f7037e99bf1ac1ba7911a34eff6869d) ) + ROM_LOAD( "hb01.bin", 0x0000, 0x0800, CRC(fec3466a) SHA1(d8ec3b432f7037e99bf1ac1ba7911a34eff6869d) ) ROM_LOAD( "2e_hb02.bin", 0x0800, 0x0800, CRC(07de4229) SHA1(9f333509ae3d6c579f6d96caa172a0abe9eefb30) ) ROM_LOAD( "2f_hb03.bin", 0x2000, 0x0800, CRC(b75a0dfc) SHA1(c60c833f28c6de027d46f5a2a54ad5646ec58453) ) ROM_LOAD( "hb04.bin", 0x2800, 0x0800, CRC(731e349b) SHA1(cfa1ac322cdfe1d4d112b0a4dd85d3552a6e33d0) ) diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c index c24e8b2e9bc..502d3058baf 100644 --- a/src/mame/drivers/seabattl.c +++ b/src/mame/drivers/seabattl.c @@ -99,7 +99,7 @@ public: UINT8 m_collision; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 90b88393ffa..96387805b44 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -97,31 +97,31 @@ public: m_upd7759(*this, "upd"), m_screen(*this, "screen"), m_palette(*this, "palette") { } - + // for Print Club only int m_cam_data; - + int m_segac2_enable_display; - + required_shared_ptr m_paletteram; - + /* internal states */ UINT8 m_misc_io_data[0x10]; /* holds values written to the I/O chip */ - + /* protection-related tracking */ int (*m_prot_func)(int in); /* emulation of protection chip */ UINT8 m_prot_write_buf; /* remembers what was written */ UINT8 m_prot_read_buf; /* remembers what was returned */ - + /* palette-related variables */ UINT8 m_segac2_alt_palette_mode; UINT8 m_palbank; UINT8 m_bg_palbase; UINT8 m_sp_palbase; - + /* sound-related variables */ UINT8 m_sound_banks; /* number of sound banks */ - + DECLARE_DRIVER_INIT(c2boot); DECLARE_DRIVER_INIT(bloxeedc); DECLARE_DRIVER_INIT(columns); @@ -151,16 +151,16 @@ public: DECLARE_VIDEO_START(segac2_new); DECLARE_MACHINE_START(segac2); DECLARE_MACHINE_RESET(segac2); - + UINT32 screen_update_segac2_new(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); int m_segac2_bg_pal_lookup[4]; int m_segac2_sp_pal_lookup[4]; void recompute_palette_tables(); - + DECLARE_WRITE_LINE_MEMBER(vdp_sndirqline_callback_c2); DECLARE_WRITE_LINE_MEMBER(vdp_lv6irqline_callback_c2); DECLARE_WRITE_LINE_MEMBER(vdp_lv4irqline_callback_c2); - + DECLARE_WRITE16_MEMBER( segac2_upd7759_w ); DECLARE_READ16_MEMBER( palette_r ); DECLARE_WRITE16_MEMBER( palette_w ); @@ -177,7 +177,7 @@ public: optional_device m_upd7759; optional_device m_screen; required_device m_palette; - + }; @@ -195,7 +195,7 @@ MACHINE_START_MEMBER(segac2_state,segac2) save_item(NAME(m_misc_io_data)); save_item(NAME(m_prot_write_buf)); save_item(NAME(m_prot_read_buf)); - + m_vdp->stop_timers(); } diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 67b7989070a..accf82c6fc9 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -404,7 +404,7 @@ READ8_MEMBER( segaorun_state::bankmotor_limit_r ) const int center = 0x80; const int right_limit = 0xe0; const int tolerance = 2; - + if (pos <= left_limit + tolerance) ret ^= 0x20; else if (pos >= center - tolerance && pos <= center + tolerance) @@ -428,9 +428,9 @@ WRITE8_MEMBER( segaorun_state::bankmotor_control_w ) if (data == 0) return; - + m_bankmotor_delta = 8 - data; - + // convert to speed and direction for output if (data < 8) { @@ -662,7 +662,7 @@ void segaorun_state::device_timer(emu_timer &timer, device_timer_id id, int para next_scanline = 65; m_subcpu->set_input_line(4, CLEAR_LINE); break; - + default: break; } @@ -688,7 +688,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(segaorun_state::bankmotor_update) const int speed = 100; const int left_limit = 0x2000; const int right_limit = 0xe000; - + m_bankmotor_pos += speed * m_bankmotor_delta; if (m_bankmotor_pos <= left_limit) m_bankmotor_pos = left_limit; @@ -729,7 +729,7 @@ READ16_MEMBER( segaorun_state::outrun_custom_io_r ) case 0x60/2: return watchdog_reset_r(space, 0); - + default: break; } @@ -781,7 +781,7 @@ WRITE16_MEMBER( segaorun_state::outrun_custom_io_w ) case 0x70/2: m_sprites->draw_write(space, offset, data, mem_mask); return; - + default: break; } @@ -814,7 +814,7 @@ READ16_MEMBER( segaorun_state::shangon_custom_io_r ) static const char *const ports[] = { "ADC0", "ADC1", "ADC2", "ADC3" }; return ioport(ports[m_adc_select])->read_safe(0x0010); } - + default: break; } @@ -866,7 +866,7 @@ WRITE16_MEMBER( segaorun_state::shangon_custom_io_w ) case 0x3020/2: // ADC trigger return; - + default: break; } @@ -1210,7 +1210,7 @@ static MACHINE_CONFIG_START( outrun_base, segaorun_state ) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224) MCFG_SCREEN_UPDATE_DRIVER(segaorun_state, screen_update_outrun) MCFG_SCREEN_PALETTE("palette") - + MCFG_SEGAIC16VID_ADD("segaic16vid") MCFG_SEGAIC16VID_GFXDECODE("gfxdecode") MCFG_SEGAIC16_ROAD_ADD("segaic16road") diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 74be0e32acc..5c7201faf3e 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -1979,11 +1979,11 @@ MACHINE_CONFIG_END /* static MACHINE_CONFIG_DERIVED( system16a_i8751_no7751, system16a_i8751 ) - MCFG_DEVICE_REMOVE("n7751") - MCFG_DEVICE_REMOVE("dac") + MCFG_DEVICE_REMOVE("n7751") + MCFG_DEVICE_REMOVE("dac") - MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END */ @@ -2514,7 +2514,7 @@ ROM_START( fantzonep ) ROM_LOAD16_BYTE( "epr-7384.24", 0x020001, 0x8000, CRC(fd909341) SHA1(2f1e01eb7d7b330c9c0dd98e5f8ed4973f0e93fb) ) ROM_REGION( 0x18000, "gfx1", 0 ) // tiles - ROM_LOAD( "epr-7388.95", 0x00000, 0x08000, CRC(8eb02f6b) SHA1(80511b944b57541669010bd5a0ca52bc98eabd62) ) + ROM_LOAD( "epr-7388.95", 0x00000, 0x08000, CRC(8eb02f6b) SHA1(80511b944b57541669010bd5a0ca52bc98eabd62) ) ROM_LOAD( "epr-7389.94", 0x08000, 0x08000, CRC(2f4f71b8) SHA1(ceb39e95cd43904b8e4f89c7227491e139fb3ca6) ) ROM_LOAD( "epr-7390.93", 0x10000, 0x08000, CRC(d90609c6) SHA1(4232f6ecb21f242c0c8d81e06b88bc742668609f) ) @@ -2540,7 +2540,7 @@ ROM_START( fantzonepr ) ROM_LOAD16_BYTE( "epr-7387.41", 0x020000, 0x8000, CRC(0acd335d) SHA1(f39566a2069eefa7682c57c6521ea7a328738d06) ) // missing - assumed to be the same because the rom below is ROM_LOAD16_BYTE( "ic24-prg20-2f57.bin", 0x020001, 0x8000, CRC(fd909341) SHA1(2f1e01eb7d7b330c9c0dd98e5f8ed4973f0e93fb) ) // MATCH - ROM_REGION( 0x18000, "gfx1", 0 ) // tiles + ROM_REGION( 0x18000, "gfx1", 0 ) // tiles ROM_LOAD( "ic95-1413.bin", 0x00000, 0x08000, CRC(158af770) SHA1(a02c500920770a987c9d8c78e0313cb3434c1873) ) // 96.661377% ROM_LOAD( "ic94-3e96.bin", 0x08000, 0x08000, CRC(2fea4fe7) SHA1(891dbf163378e9ef55b97b4cb8ac02dab05f206c) ) // 96.710205% ROM_LOAD( "ic93-de1b.bin", 0x10000, 0x08000, BAD_DUMP CRC(335fe57a) SHA1(93cfcfd1d06daa03b1b000460c4e0ff54aa9f317) ) // 72.341919% diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index b061aa32a3e..e4f5333c8cf 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -145,7 +145,7 @@ void segas18_state::init_generic(segas18_rom_board rom_board) m_vdp->set_vdp_pal(FALSE); m_vdp->set_framerate(60); m_vdp->set_total_scanlines(262); - m_vdp->stop_timers(); // 315-5124 timers + m_vdp->stop_timers(); // 315-5124 timers // save state save_item(NAME(m_mcu_data)); diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index bb763b53e19..d27b4a37c07 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -1189,7 +1189,7 @@ static MACHINE_CONFIG_START( yboard, segaybd_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_SEGA_SYS16B_SPRITES_ADD("bsprites") MCFG_SEGA_YBOARD_SPRITES_ADD("ysprites") MCFG_SEGAIC16VID_ADD("segaic16vid") diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index e675a6eeccb..4295aeefe37 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -52,10 +52,10 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html void seicross_state::nvram_init(nvram_device &nvram, void *data, size_t size) { - static const UINT8 init[32] = { + static const UINT8 init[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 1, 0, 0, 0, 0, 0, 0, }; - + memset(data, 0x00, size); memcpy(data, init, sizeof(init)); } diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 7083a7f8f0c..651b8841ddd 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2208,7 +2208,7 @@ static ADDRESS_MAP_START( blockcarb_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins -// AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, word_r, word_w) // Sound - not on this bootleg +// AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, word_r, word_w) // Sound - not on this bootleg AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_SHARE("paletteram") // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE("spritegen", seta001_device, spritecode_r16, spritecode_w16) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -8036,8 +8036,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( blockcarb_sound_portmap, AS_IO, 8, seta_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) -// AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(wiggie_soundlatch_r) +// AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) +// AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(wiggie_soundlatch_r) ADDRESS_MAP_END static MACHINE_CONFIG_DERIVED( blockcarb, blockcar ) @@ -10101,10 +10101,10 @@ ROM_START( blockcarb ) ROM_LOAD16_BYTE( "tl5.bin", 0x080001, 0x040000, CRC(9369e8dc) SHA1(645ae72a8b49ec43c26cdee5b6cb8cca5f46e542) ) ROM_REGION( 0x100000, "oki", 0 ) /* 6295 samples */ - ROM_LOAD( "tl7.bin", 0x000000, 0x040000, CRC(41e899dc) SHA1(36c8161dcb68cdc312c7d1177dbcfb9b62b18f05) ) // == so2_09.12b mercs Mercs (World 900302) + ROM_LOAD( "tl7.bin", 0x000000, 0x040000, CRC(41e899dc) SHA1(36c8161dcb68cdc312c7d1177dbcfb9b62b18f05) ) // == so2_09.12b mercs Mercs (World 900302) ROM_REGION( 0x10000, "audiocpu", 0 ) - ROM_LOAD( "tl8.bin", 0x000000, 0x010000, CRC(d09d7c7a) SHA1(8e8532be08818c855d9c3ce45716eb07cfab5767) ) //cpu prg + ROM_LOAD( "tl8.bin", 0x000000, 0x010000, CRC(d09d7c7a) SHA1(8e8532be08818c855d9c3ce45716eb07cfab5767) ) //cpu prg ROM_END diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 14bf1a4b9f0..7b685c15624 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -518,7 +518,7 @@ ADDRESS_MAP_END devcb = &funcube_touchscreen_device::set_tx_cb(*device, DEVCB2_##_devcb); class funcube_touchscreen_device : public device_t, - public device_serial_interface + public device_serial_interface { public: funcube_touchscreen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -539,7 +539,7 @@ private: required_ioport m_x; required_ioport m_y; required_ioport m_btn; - + UINT8 m_button_state; int m_serial_pos; UINT8 m_serial[4]; diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index de6226e5541..f7a0b6b3411 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -835,7 +835,7 @@ static MACHINE_CONFIG_START( sf, sf_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", sf) - + MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index 80925d5e779..a527178265c 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -719,7 +719,7 @@ static MACHINE_CONFIG_START( whizz, sidearms_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", turtship) - + MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index 27f4391dfbe..5dc99048ff9 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -116,7 +116,7 @@ public: required_device m_gfxdecode; dynamic_array m_paletteram; required_device m_screen; - required_device m_palette; + required_device m_palette; UINT8 m_reg; UINT8 m_rombank; @@ -2150,7 +2150,7 @@ DRIVER_INIT_MEMBER(sigmab98_state,itazuram) // RAM banks m_paletteram.resize_and_clear(0x3000); - m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); + m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); membank("palbank")->set_base(m_paletteram); m_rambank = 0x64; diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 25531ab5a0a..b9f6a4d6acd 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -441,7 +441,7 @@ static MACHINE_CONFIG_START( chainrec, simpl156_state ) MCFG_DECO16IC_ADD("tilegen1", simpl156_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) decospr_device::set_gfx_region(*device, 2); decospr_device::set_pri_callback(*device, simpl156_pri_callback); diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 28f8faac7ce..0cd3f6b290d 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -29,7 +29,7 @@ **************************************************************************************************** Settings: - + Pressing F2, you can enter the DIP switches settings. Here the translated items: @@ -47,13 +47,13 @@ | | '---------------------------------------' - 'Special Bonus' and 'Super Star' appearance, are per 1000. + 'Special Bonus' and 'Super Star' appearance, are per 1000. You also can find the MAME DIP switches menu already translated. The items still need translation. Press START (key 1) to exit the mode. - + Bookkeeping: Pressing BOOKKEEPING (key 0), you enter the Record Mode. @@ -199,8 +199,8 @@ TILE_GET_INFO_MEMBER(skylncr_state::get_reel_1_tile_info) { UINT8 bank = 1; UINT16 code = m_reeltiles_1_ram[ tile_index ] + (m_reeltileshigh_1_ram[ tile_index ] << 8); -// if (code > 0x200) -// bank = 2; +// if (code > 0x200) +// bank = 2; SET_TILE_INFO_MEMBER(bank, code, 0, TILE_FLIPYX( 0 )); } @@ -516,7 +516,7 @@ static const gfx_layout layout8x8x8 = 8*8*4 }; -static const gfx_layout layout8x8x8_alt = /* for sstar97 */ +static const gfx_layout layout8x8x8_alt = /* for sstar97 */ { 8,8, RGN_FRAC(1,2), @@ -572,7 +572,7 @@ static const gfx_layout layout8x32x8_rot = 8*32*8/2 }; -static const gfx_layout layout8x32x8_alt = /* for sstar97 */ +static const gfx_layout layout8x32x8_alt = /* for sstar97 */ { 8,32, RGN_FRAC(1,2), @@ -1146,15 +1146,15 @@ ROM_END ROM_START( sstar97 ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "27256.u15", 0x0000, 0x8000, CRC(a5da4f92) SHA1(82ac70bd379649f130db017aa226d0247db0f3cd) ) - ROM_LOAD( "unknown.u48", 0x8000, 0x8000, BAD_DUMP CRC(9f4c02e3) SHA1(05975184130ea7dd3bb5d32eff77b585bd53e6b5) ) // palette borrowed from other game + ROM_LOAD( "unknown.u48", 0x8000, 0x8000, BAD_DUMP CRC(9f4c02e3) SHA1(05975184130ea7dd3bb5d32eff77b585bd53e6b5) ) // palette borrowed from other game - ROM_REGION( 0x40000, "gfx1", 0 ) // All ROMs are 28-pins mask ROMs dumped as 27512. Should be dumped as Fujitsu MB831000 or TC531000 (mask ROM). + ROM_REGION( 0x40000, "gfx1", 0 ) // All ROMs are 28-pins mask ROMs dumped as 27512. Should be dumped as Fujitsu MB831000 or TC531000 (mask ROM). ROM_LOAD16_BYTE( "bor_dun_4.u23", 0x00000, 0x10000, BAD_DUMP CRC(82c9db19) SHA1(3611fb59bb7c962c7fabe7a29fa72b632fa69bed) ) ROM_LOAD16_BYTE( "bor_dun_2.u25", 0x00001, 0x10000, BAD_DUMP CRC(42ee9b7a) SHA1(b39f677f58072ea7dcd7f49208be1a7b70bdc5e5) ) ROM_LOAD16_BYTE( "bor_dun_3.u24", 0x20000, 0x10000, BAD_DUMP CRC(6d70879b) SHA1(83cbe67cda95e5f3d95065015f6b1b2044b88989) ) ROM_LOAD16_BYTE( "bor_dun_1.u26", 0x20001, 0x10000, BAD_DUMP CRC(1b8b84ac) SHA1(b914bad0b1fb58cf581d1227e8127c6afb906fb7) ) - ROM_REGION( 0x40000, "gfx2", 0 ) // All ROMs are 28-pins mask ROMs dumped as 27512. Should be dumped as Fujitsu MB831000 or TC531000 (mask ROM). + ROM_REGION( 0x40000, "gfx2", 0 ) // All ROMs are 28-pins mask ROMs dumped as 27512. Should be dumped as Fujitsu MB831000 or TC531000 (mask ROM). ROM_LOAD16_BYTE( "bor_dun_8.u19", 0x00000, 0x10000, BAD_DUMP CRC(daf651a7) SHA1(d4e472aa90aa2b52c997b2f2272007b139e3cbc2) ) ROM_LOAD16_BYTE( "bor_dun_6.u21", 0x00001, 0x10000, BAD_DUMP CRC(1d88bc70) SHA1(49246d96a4ce2b8e9b10e928d7dd13973feac883) ) ROM_LOAD16_BYTE( "bor_dun_7.u20", 0x20000, 0x10000, BAD_DUMP CRC(7e28ba2f) SHA1(ac8d4e95efce87456f569a71650bd7afcb59095e) ) diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 5d0a3844bb4..7f10406a51c 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -9,7 +9,7 @@ Guardian / Get Star Performan Tiger Heli - + TODO: - proper MCU emulation (mame/machine/slapfght.c) - alcon cocktail/flipscreen, it doesn't write to the flipscreen reg @@ -358,7 +358,7 @@ INTERRUPT_GEN_MEMBER(slapfght_state::vblank_irq) WRITE8_MEMBER(slapfght_state::irq_enable_w) { m_main_irq_enabled = offset ? true : false; - + if (!m_main_irq_enabled) m_maincpu->set_input_line(0, CLEAR_LINE); } @@ -366,7 +366,7 @@ WRITE8_MEMBER(slapfght_state::irq_enable_w) WRITE8_MEMBER(slapfght_state::sound_reset_w) { m_audiocpu->set_input_line(INPUT_LINE_RESET, offset ? CLEAR_LINE : ASSERT_LINE); - + if (offset == 0) m_sound_nmi_enabled = false; } @@ -482,7 +482,7 @@ ADDRESS_MAP_END /*************************************************************************** MCU Memory Maps - + NOTE: handlers and simulation are in the src/mame/machine folder ***************************************************************************/ @@ -834,7 +834,7 @@ MACHINE_RESET_MEMBER(slapfght_state,getstar) { // don't boot the mcu since we don't have a dump yet m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - + machine_reset(); } @@ -844,7 +844,7 @@ void slapfght_state::init_banks() { UINT8 *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 2, &ROM[0x10000], 0x4000); - + membank("bank1")->set_entry(0); } @@ -1087,7 +1087,7 @@ static MACHINE_CONFIG_DERIVED( tigerhb1, tigerh ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tigerhb1_map) MCFG_CPU_IO_MAP(tigerhb_io_map) - + MCFG_DEVICE_REMOVE("mcu") MACHINE_CONFIG_END @@ -1167,7 +1167,7 @@ static MACHINE_CONFIG_DERIVED( getstar, slapfigh ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(getstar_map) MCFG_CPU_IO_MAP(getstar_io_map) - + MCFG_MACHINE_RESET_OVERRIDE(slapfght_state, getstar) MACHINE_CONFIG_END diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 57555aa747b..27adafe239c 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -533,7 +533,7 @@ static MACHINE_CONFIG_START( slapshot, slapshot_state ) MCFG_TC0640FIO_READ_2_CB(IOPORT("BUTTONS")) MCFG_TC0640FIO_READ_3_CB(IOPORT("SYSTEM")) MCFG_TC0640FIO_READ_7_CB(IOPORT("JOY")) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/smsmcorp.c b/src/mame/drivers/smsmcorp.c index 746d041d590..2539a6d7d62 100644 --- a/src/mame/drivers/smsmcorp.c +++ b/src/mame/drivers/smsmcorp.c @@ -249,7 +249,7 @@ public: DECLARE_MACHINE_START(sureshot); UINT32 screen_update_sms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; - required_device m_screen; + required_device m_screen; }; diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 413acf34ea7..4c0f77954e4 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -488,7 +488,7 @@ void spy_state::machine_start() m_paletteram.resize(0x800); m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - + memset(m_pmcram, 0, sizeof(m_pmcram)); save_item(NAME(m_paletteram)); diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index dc06aa2cdfc..ad69d664d60 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -88,7 +88,7 @@ public: m_videoram(*this, "videoram"), m_question_offset(*this, "question_offset"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mame/drivers/stuntair.c b/src/mame/drivers/stuntair.c index 7146805981e..eecf8d3157a 100644 --- a/src/mame/drivers/stuntair.c +++ b/src/mame/drivers/stuntair.c @@ -93,7 +93,7 @@ public: m_bgattrram(*this, "bgattrram"), m_sprram(*this, "sprram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index 3b73caa8bee..d6492568703 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -187,7 +187,7 @@ static MACHINE_CONFIG_START( subs, subs_state ) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(subs_state, subs) - + MCFG_DEFAULT_LAYOUT(layout_dualhsxs) MCFG_SCREEN_ADD("lscreen", RASTER) diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 8cb6b78ad57..e574c6bc091 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -3853,7 +3853,7 @@ DRIVER_INIT_MEMBER(subsino_state,tesorone) DRIVER_INIT_MEMBER(subsino_state,tesorone230) { #if 1 - UINT8 *rom = memregion( "maincpu" )->base(); //check this patch!!!! + UINT8 *rom = memregion( "maincpu" )->base(); //check this patch!!!! rom[0x10a8] = 0x18; //patch protection check ("ERROR 08073"): rom[0x10a9] = 0x11; rom[0x8ba] = 0x18; //patch "winning protection" check diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index 4eadd715cf8..870e6db256d 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -591,9 +591,9 @@ VIDEO_START_MEMBER(subsino2_state,subsino2) layer_t *l = &m_layers[i]; l->tmap = &machine().tilemap().create(m_gfxdecode, i ? - tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_1),this) : - tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_0),this), - TILEMAP_SCAN_ROWS, 8,8, 0x80,0x40); + tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_1),this) : + tilemap_get_info_delegate(FUNC(subsino2_state::ss9601_get_tile_info_0),this), + TILEMAP_SCAN_ROWS, 8,8, 0x80,0x40); l->tmap->set_transparent_pen(0); diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 2dd1ae10781..4408c968a7f 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -348,7 +348,7 @@ static MACHINE_CONFIG_START( supbtime, supbtime_state ) MCFG_DECO16IC_ADD("tilegen1", supbtime_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) decospr_device::set_gfx_region(*device, 2); MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") @@ -395,7 +395,7 @@ static MACHINE_CONFIG_START( chinatwn, supbtime_state ) MCFG_DECO16IC_ADD("tilegen1", supbtime_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) decospr_device::set_gfx_region(*device, 2); MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/supercrd.c b/src/mame/drivers/supercrd.c index 7d69af3a645..364af1f6e12 100644 --- a/src/mame/drivers/supercrd.c +++ b/src/mame/drivers/supercrd.c @@ -411,7 +411,7 @@ GFXDECODE_END //static MC6845_INTERFACE( mc6845_intf ) //{ // false, -// 0,0,0,0, /* visarea adjustment */ +// 0,0,0,0, /* visarea adjustment */ // 4, /* number of pixels per video memory address */ // NULL, /* before pixel update callback */ // NULL, /* row update callback */ diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c index c5f5fd0b808..89f898aab79 100644 --- a/src/mame/drivers/superwng.c +++ b/src/mame/drivers/superwng.c @@ -39,7 +39,7 @@ public: m_colorram_bg(*this, "colorrabg"), m_colorram_fg(*this, "colorrafg"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 0483431a8e4..9dbb141f8e2 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -2025,7 +2025,7 @@ static MACHINE_CONFIG_DERIVED( system16_7759, system16 ) /* sound hardware */ MCFG_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK) - MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(segas1x_bootleg_state,sound_cause_nmi)) + MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(segas1x_bootleg_state,sound_cause_nmi)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.48) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 8b5da779ba2..c5d9383d829 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -1983,7 +1983,7 @@ static MACHINE_CONFIG_START( rastsag2, taitob_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - + MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf) @@ -2059,7 +2059,7 @@ static MACHINE_CONFIG_DERIVED( tetrist, rastsag2 ) /* Nastar conversion kit with MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tetrist_map) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) MACHINE_CONFIG_END @@ -2354,7 +2354,7 @@ static MACHINE_CONFIG_START( pbobble, taitob_state ) MCFG_TC0640FIO_READ_2_CB(IOPORT("START")) MCFG_TC0640FIO_READ_3_CB(IOPORT("P1_P2_A")) MCFG_TC0640FIO_READ_7_CB(IOPORT("P1_P2_B")) - + MCFG_DEVICE_ADD("mb87078", MB87078, 0) MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taitob_state, mb87078_gain_changed)) @@ -2798,7 +2798,7 @@ static MACHINE_CONFIG_START( sbm, taitob_state ) MCFG_TC0510NIO_READ_2_CB(IOPORT("JOY")) MCFG_TC0510NIO_READ_3_CB(IOPORT("START")) MCFG_TC0510NIO_READ_7_CB(IOPORT("PHOTOSENSOR")) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -2854,7 +2854,7 @@ static MACHINE_CONFIG_START( realpunc, taitob_state ) MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0")) MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1")) MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2")) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 11a2b3d80fd..b4511ba0493 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -3260,7 +3260,7 @@ static MACHINE_CONFIG_DERIVED( gunfront, taito_f2_tc0510nio ) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - + /* video hardware */ MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_gunfront) MCFG_SCREEN_MODIFY("screen") @@ -3388,7 +3388,7 @@ static MACHINE_CONFIG_DERIVED( yuyugogo, taito_f2_tc0510nio ) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - + /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_yuyugogo) @@ -3585,7 +3585,7 @@ static MACHINE_CONFIG_DERIVED( dinorex, taito_f2_tc0510nio ) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dinorex) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -3607,7 +3607,7 @@ static MACHINE_CONFIG_DERIVED( qjinsei, taito_f2_tc0510nio ) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -3629,7 +3629,7 @@ static MACHINE_CONFIG_DERIVED( qcrayon, taito_f2_tc0510nio ) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -3651,7 +3651,7 @@ static MACHINE_CONFIG_DERIVED( qcrayon2, taito_f2_tc0510nio ) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index bd9faff8910..c306a5662ff 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -716,7 +716,7 @@ static MACHINE_CONFIG_START( airsys, taitoair_state ) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 28*16-1) MCFG_SCREEN_UPDATE_DRIVER(taitoair_state, screen_update_taitoair) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", airsys) MCFG_PALETTE_ADD_INIT_BLACK("palette", 512*16+512*16) diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c index 94e38f66260..0855e099d85 100644 --- a/src/mame/drivers/taitogn.c +++ b/src/mame/drivers/taitogn.c @@ -81,7 +81,7 @@ Notes: CAT702 - Protection chip labelled 'TT10' (DIP20) * - Unpopulated position for additional KM416V1204BT-L5 RAMs NEC_78081G503 - NEC uPD78081 MCU, 5MHz - + Video syncs are 59.8260Hz and 15.4333kHz @@ -420,7 +420,7 @@ WRITE8_MEMBER(taitogn_state::control_w) { // 20 = watchdog m_mb3773->write_line_ck((data & 0x20) >> 5); - + // 10 = sound hw reset, but make sure it's only booted on games that use it if (m_has_zoom) { @@ -429,7 +429,7 @@ WRITE8_MEMBER(taitogn_state::control_w) if (~data & m_control & 0x10) { logerror("control_w Zoom reset\n"); - + m_zoom->reset(); // assume that this also readys the sound flash chips @@ -489,7 +489,7 @@ READ16_MEMBER(taitogn_state::hack1_r) m_v = m_v ^ 8; // Probably something to do with MCU return m_v; - + default: break; } @@ -550,7 +550,7 @@ READ8_MEMBER(taitogn_state::gnet_mahjong_panel_r) case 0x08: return ioport("KEY1")->read(); case 0x40: return ioport("KEY2")->read(); case 0x80: return ioport("KEY3")->read(); - + default: break; } @@ -587,7 +587,7 @@ void taitogn_state::machine_reset() { // halt sound CPU since it has no valid program at start m_mn10200->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - + m_control = 0x10; } @@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( coh3002t, taitogn_state ) MCFG_DEVICE_ADD("maincpu:sio0:znsec1", ZNSEC, 0) MCFG_DEVICE_ADD("maincpu:sio0:zndip", ZNDIP, 0) MCFG_ZNDIP_DATA_HANDLER(IOPORT(":DSW")) - + MCFG_AT28C16_ADD( "at28c16", 0 ) MCFG_DEVICE_ADD("rf5c296", RF5C296, 0) MCFG_RF5C296_SLOT(":pccard") diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 23e26ed55d7..2126b9cc413 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -1269,9 +1269,9 @@ static MACHINE_CONFIG_START( taitojc, taitojc_state ) MCFG_TC0640FIO_READ_2_CB(IOPORT("START")) MCFG_TC0640FIO_READ_3_CB(IOPORT("UNUSED")) MCFG_TC0640FIO_READ_7_CB(IOPORT("BUTTONS")) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) diff --git a/src/mame/drivers/taitottl.c b/src/mame/drivers/taitottl.c index d63415673b8..ac0968bce07 100644 --- a/src/mame/drivers/taitottl.c +++ b/src/mame/drivers/taitottl.c @@ -1,11 +1,11 @@ /*************************************************************************** - + Taito Discrete Hardware Games - - + + Game Name(s) Part #'s Data PROM/ROM Chip Numbers ------------------------------------------+-----------+---------+--------------------------------------- - Acrobat (1978) UNKNOWN + Acrobat (1978) UNKNOWN Astro Race (1973) UNKNOWN Avenger (1976) - Vertical EG-1020 UNKNOWN Attack (1976) UNKNOWN @@ -37,7 +37,7 @@ Wall Block (1978) UNKNOWN Western Gun (1975) UNKNOWN Zun Zun Block (1979) YES 3 - (2 x 512bytes, 1 x 32bytes) - + ***************************************************************************/ @@ -77,38 +77,38 @@ class taitottl_state : public driver_device public: taitottl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_video(*this, "fixfreq") + m_maincpu(*this, "maincpu"), + m_video(*this, "fixfreq") { } - + // devices required_device m_maincpu; required_device m_video; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); - + private: - + }; static NETLIST_START(taitottl) SOLVER(Solver, 48000) -// PARAM(Solver.FREQ, 48000) +// PARAM(Solver.FREQ, 48000) PARAM(Solver.ACCURACY, 1e-4) // works and is sufficient // schematics //... - // NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") - // NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") + // NETDEV_ANALOG_CALLBACK(sound_cb, sound, exidyttl_state, sound_cb, "") + // NETDEV_ANALOG_CALLBACK(video_cb, videomix, fixedfreq_device, update_vid, "fixfreq") NETLIST_END() @@ -138,27 +138,27 @@ MACHINE_CONFIG_END /*************************************************************************** - + Game driver(s) - + ***************************************************************************/ /* - - label loc. Part # + + label loc. Part # ========================================================== - CR11 N5 74s287 yes, it says CRxx not GNxx - GN10 H5 5623 - GN09 N6 soldered in - GN08 J7 IM5200CJG - GN07 L9 soldered in - GN06 H6 7621 - GN05 G9 74s287 - GN04 F9 7643 - GN03 D9 7621 - GN02 C9 74s287 - GN01 B9 7643 - + CR11 N5 74s287 yes, it says CRxx not GNxx + GN10 H5 5623 + GN09 N6 soldered in + GN08 J7 IM5200CJG + GN07 L9 soldered in + GN06 H6 7621 + GN05 G9 74s287 + GN04 F9 7643 + GN03 D9 7621 + GN02 C9 74s287 + GN01 B9 7643 + */ ROM_START( gunman ) @@ -180,7 +180,7 @@ ROM_START( ttblock ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_REGION( 0x0800, "roms", ROMREGION_ERASE00 ) - ROM_LOAD( "tl01.4a", 0x0000, 0x0800, CRC(65b730f7) SHA1(f82931c9a128021c97d1d41b5eac05df55dd5994) ) // MMI 6353 + ROM_LOAD( "tl01.4a", 0x0000, 0x0800, CRC(65b730f7) SHA1(f82931c9a128021c97d1d41b5eac05df55dd5994) ) // MMI 6353 ROM_END diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index 44f1fae8ec3..33258cdfcf6 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -356,7 +356,7 @@ static MACHINE_CONFIG_START( taotaido, taotaido_state ) MCFG_VSYSTEM_SPR_SET_GFXREGION(0) MCFG_VSYSTEM_SPR_GFXDECODE("gfxdecode") MCFG_VSYSTEM_SPR_PALETTE("palette") - + /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index 57e9c01d4bb..8cdf6d1e1b2 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -383,7 +383,7 @@ static MACHINE_CONFIG_START( tceptor, tceptor_state ) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INDIRECT_ENTRIES(1024) MCFG_PALETTE_INIT_OWNER(tceptor_state, tceptor) - + MCFG_DEFAULT_LAYOUT(layout_horizont) MCFG_NAMCO_C45_ROAD_ADD("c45_road") diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c index a8878db6ef2..e8f0b4a3882 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -382,7 +382,7 @@ static MACHINE_CONFIG_START( fstarfrc, tecmo16_state ) MCFG_SCREEN_UPDATE_DRIVER(tecmo16_state, screen_update_tecmo16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", tecmo16) - MCFG_PALETTE_ADD_INIT_BLACK("palette", 4096) + MCFG_PALETTE_ADD_INIT_BLACK("palette", 4096) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 0ae5c88e281..2bfd7723a1d 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -597,7 +597,7 @@ MACHINE_START_MEMBER(thunderx_state,scontra) { m_paletteram.resize(0x800); m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - + save_item(NAME(m_paletteram)); save_item(NAME(m_priority)); save_item(NAME(m_1f98_data)); diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 6099b31c63f..1f36aa6d151 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -2035,7 +2035,7 @@ static MACHINE_CONFIG_START( outzone, toaplan1_state ) MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1) MCFG_SCREEN_VBLANK_DRIVER(toaplan1_state, screen_eof_toaplan1) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 3b062685307..70d132e2138 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -3275,7 +3275,7 @@ static MACHINE_CONFIG_START( dogyuun, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_GP9001_VDP_GFXDECODE("gfxdecode") MCFG_GP9001_VDP_PALETTE("palette") - + MCFG_DEVICE_ADD_VDP1 MCFG_GP9001_VDP_GFXDECODE("gfxdecode") MCFG_GP9001_VDP_PALETTE("palette") @@ -3713,7 +3713,7 @@ static MACHINE_CONFIG_START( batsugun, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_GP9001_VDP_GFXDECODE("gfxdecode") MCFG_GP9001_VDP_PALETTE("palette") - + MCFG_DEVICE_ADD_VDP1 MCFG_GP9001_VDP_GFXDECODE("gfxdecode") MCFG_GP9001_VDP_PALETTE("palette") @@ -4598,7 +4598,7 @@ ROM_START( batsugun ) ROM_REGION( 0x1000, "plds", 0 ) /* Logic for mixing output of both GP9001 GFX controllers */ ROM_LOAD( "tp030_u19_gal16v8b-15.bin", 0x0000, 0x117, CRC(f71669e8) SHA1(ec1fbe04605fee864af4b01f001af227938c9f21) ) -// ROM_LOAD( "tp030_u19_gal16v8b-15.jed", 0x0000, 0x991, CRC(31be54a2) SHA1(06278942a9a2ea858c0352b2ef5a65bf329b7b82) ) +// ROM_LOAD( "tp030_u19_gal16v8b-15.jed", 0x0000, 0x991, CRC(31be54a2) SHA1(06278942a9a2ea858c0352b2ef5a65bf329b7b82) ) ROM_END diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c index a335e4c1927..976b29cea6c 100644 --- a/src/mame/drivers/tourtabl.c +++ b/src/mame/drivers/tourtabl.c @@ -178,7 +178,7 @@ static MACHINE_CONFIG_START( tourtabl, tourtabl_state ) MCFG_DEVICE_ADD("tia_video", TIA_NTSC_VIDEO, 0) MCFG_TIA_READ_INPUT_PORT_CB(READ16(tourtabl_state, tourtabl_read_input_port)) MCFG_TIA_DATABUS_CONTENTS_CB(READ8(tourtabl_state, tourtabl_get_databus_contents)) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK, 228, 34, 34 + 160, 262, 46, 46 + 200 ) MCFG_SCREEN_UPDATE_DEVICE("tia_video", tia_video_device, screen_update) diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index e100b8e919b..899bc6a8531 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -532,19 +532,19 @@ static MACHINE_CONFIG_START( liblrabl, toypop_state ) MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1_RIGHT")) MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2_RIGHT")) MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS")) - + MCFG_DEVICE_ADD("56xx_1", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_0_CB(READ8(toypop_state, dipA_h)) MCFG_NAMCO56XX_IN_1_CB(READ8(toypop_state, dipB_l)) MCFG_NAMCO56XX_IN_2_CB(READ8(toypop_state, dipB_h)) MCFG_NAMCO56XX_IN_3_CB(READ8(toypop_state, dipA_l)) MCFG_NAMCO56XX_OUT_0_CB(WRITE8(toypop_state, flip)) - + MCFG_DEVICE_ADD("56xx_2", NAMCO56XX, 0) MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1_LEFT")) MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2_LEFT")) MCFG_NAMCO56XX_IN_3_CB(IOPORT("SERVICE")) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60.606060) diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c index c3dd21d8c01..c3350e07d08 100644 --- a/src/mame/drivers/triforce.c +++ b/src/mame/drivers/triforce.c @@ -194,7 +194,7 @@ Notes: DSW - 2-position DIP Switch, present only on Sega GDROM version PCB PIC16C621 - DIP18 socket and 4MHz OSC on a 90-degrees-mounted small PCB for Microchip PIC16C621A protection key chip - + ROM Board (attached to CN3 of Media Board, ONLY for use with Namco ROM cart version of the Media Board) --------- diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c index bf4d3dc6834..774387e2930 100644 --- a/src/mame/drivers/truco.c +++ b/src/mame/drivers/truco.c @@ -83,7 +83,7 @@ - U15: 20-pin IC YES PLD PALCE16V8H-25 EE CMOS Zero-Power 20-Pin Universal Programmable Array Logic. - U16: 20-pin IC YES PLD PALCE16V8H-25 EE CMOS Zero-Power 20-Pin Universal Programmable Array Logic. - U17: 14-pin IC YES TTL HD74LS00P Quadruple 2-Input NAND Gates. - - U18: 14-pin IC YES TTL KS74HCTLS86N Quad 2−Input Exclusive OR Gate. + - U18: 14-pin IC YES TTL KS74HCTLS86N Quad 2???Input Exclusive OR Gate. - U19: 16-pin IC YES WATCHDOG MAXIM MAX691 Microprocessor Supervisory Circuits. - U20: 16-pin IC YES DARLINGTON ULN2003 7 NPN Darlington transistor pairs with high voltage and current capability. diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index a5117149892..f574845d41e 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -49,7 +49,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT8 m_hd46505_0_reg[18]; UINT8 m_hd46505_1_reg[18]; int m_reg0; diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index d88ae113ec3..7c9a8ebaf30 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -2067,7 +2067,7 @@ static MACHINE_CONFIG_START( tumblepb, tumbleb_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", tumbleb) MCFG_PALETTE_ADD("palette", 1024) - MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) + MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) MCFG_VIDEO_START_OVERRIDE(tumbleb_state,tumblepb) diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 97f24da2f51..bd4d5686424 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -312,7 +312,7 @@ static MACHINE_CONFIG_START( tumblep, tumblep_state ) MCFG_DECO16IC_ADD("tilegen1", tumblep_deco16ic_tilegen1_intf) MCFG_DECO16IC_GFXDECODE("gfxdecode") MCFG_DECO16IC_PALETTE("palette") - + MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) decospr_device::set_gfx_region(*device, 2); MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c index 98263ad9edb..0ae1fa8c115 100644 --- a/src/mame/drivers/turrett.c +++ b/src/mame/drivers/turrett.c @@ -366,7 +366,7 @@ static MACHINE_CONFIG_START( turrett, turrett_state ) MCFG_SCREEN_RAW_PARAMS(4000000, 512, 0, 336, 259, 0, 244) MCFG_SCREEN_UPDATE_DRIVER(turrett_state, screen_update) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") /* sound hardware */ diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index a28f726fae2..cccf9e97505 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -321,7 +321,7 @@ static MACHINE_CONFIG_START( uapce, uapce_state ) MCFG_CPU_PROGRAM_MAP(z80_map) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242) diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 330b641277b..4c01a1d40b6 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -230,19 +230,19 @@ static MACHINE_CONFIG_START( ultraman, ultraman_state ) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K051960_ADD("k051960", ultraman_k051960_intf) MCFG_K051960_GFXDECODE("gfxdecode") MCFG_K051960_PALETTE("palette") - + MCFG_K051316_ADD("k051316_1", ultraman_k051316_intf_0) MCFG_K051316_GFXDECODE("gfxdecode") MCFG_K051316_PALETTE("palette") - + MCFG_K051316_ADD("k051316_2", ultraman_k051316_intf_1) MCFG_K051316_GFXDECODE("gfxdecode") MCFG_K051316_PALETTE("palette") - + MCFG_K051316_ADD("k051316_3", ultraman_k051316_intf_2) MCFG_K051316_GFXDECODE("gfxdecode") MCFG_K051316_PALETTE("palette") diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 5faadf700a9..98ea2a32450 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -90,7 +90,7 @@ public: optional_shared_ptr m_wram; optional_shared_ptr m_tiles32; optional_shared_ptr m_wram32; - + required_device m_maincpu; optional_device m_qs1000; optional_device m_oki; @@ -98,7 +98,7 @@ public: required_device m_eeprom; required_device m_gfxdecode; required_device m_palette; - + int m_flip_bit; int m_flipscreen; int m_palshift; diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index 2206d98c685..6d1eecddb16 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -256,7 +256,7 @@ static MACHINE_CONFIG_START( vaportra, vaportra_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(vaportra_state, screen_update_vaportra) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", vaportra) MCFG_PALETTE_ADD("palette", 1280) diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 92537a230f1..f70bf9902b8 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -409,7 +409,7 @@ static MACHINE_CONFIG_START( vball, vball_state ) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 8, 248) /* based on ddragon driver */ MCFG_SCREEN_UPDATE_DRIVER(vball_state, screen_update_vb) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", vb) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c index 32eb06d18ad..9ea44aeb954 100644 --- a/src/mame/drivers/vega.c +++ b/src/mame/drivers/vega.c @@ -582,7 +582,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma // if(color==0) color=0xf; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, character, color, 0, 0, x*7, y*10,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, character, color, 0, 0, x*7, y*10,0); ++idx; } @@ -603,7 +603,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma { //for(int x=0;x<4;++x) { - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, num, 0, 1, flip?1:0, x*4+x0, (flip?(3-y):y)*8+y0, 0); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, num, 0, 1, flip?1:0, x*4+x0, (flip?(3-y):y)*8+y0, 0); ++num; } } @@ -643,7 +643,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma for(int y=0;y<4;++y) { - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, strip_num, 0, !xor_line, 0, x*4+x0, y*8+y0, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, strip_num, 0, !xor_line, 0, x*4+x0, y*8+y0, 0); ++strip_num; } } diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 2ef76f88184..33cb75b04d7 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -443,7 +443,7 @@ void vendetta_state::machine_start() m_paletteram.resize(0x1000); m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - + save_item(NAME(m_paletteram)); save_item(NAME(m_irq_enabled)); save_item(NAME(m_sprite_colorbase)); diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c index 709520f10f3..5d678ca0d09 100644 --- a/src/mame/drivers/vlc.c +++ b/src/mame/drivers/vlc.c @@ -327,7 +327,7 @@ PALETTE_INIT_MEMBER(nevada_state, nevada) void nevada_state::nvram_init(nvram_device &nvram, void *data, size_t size) { memset(data, 0x00, size); - if (memregion("defaults")->base()) + if (memregion("defaults")->base()) memcpy(data, memregion("defaults")->base(), memregion("defaults")->bytes()); } @@ -649,7 +649,7 @@ static MACHINE_CONFIG_START( nevada, nevada_state ) MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW3")) MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart40_68681", mc68681_device, rx_a_w) ) - + /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(nevada_state, nevada_rtc_irq)) diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index 788410e7aa5..61795621478 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -274,7 +274,7 @@ static MACHINE_CONFIG_START( volfied, volfied_state ) MCFG_PC090OJ_ADD("pc090oj", volfied_pc090oj_intf) MCFG_PC090OJ_GFXDECODE("gfxdecode") MCFG_PC090OJ_PALETTE("palette") - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c index 1258fc2cf17..d9e7f2e133c 100644 --- a/src/mame/drivers/vp101.c +++ b/src/mame/drivers/vp101.c @@ -93,7 +93,7 @@ static MACHINE_CONFIG_START( vp101, vp10x_state ) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 32768) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index e5a0eff9446..2efed984aa5 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -164,8 +164,8 @@ WRITE8_MEMBER(wardner_state::wardner_bank_w) static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 8, wardner_state ) AM_RANGE(0x0000, 0x6fff) AM_ROM AM_RANGE(0x7000, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0x8fff) AM_WRITE(wardner_sprite_w) // AM_SHARE("spriteram8") - AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("palette", palette_device, write) // AM_SHARE("palette") + AM_RANGE(0x8000, 0x8fff) AM_WRITE(wardner_sprite_w) // AM_SHARE("spriteram8") + AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("palette", palette_device, write) // AM_SHARE("palette") AM_RANGE(0xc000, 0xc7ff) AM_WRITEONLY AM_SHARE("sharedram") AM_RANGE(0x8000, 0xffff) AM_DEVREAD("membank", address_map_bank_device, read8) ADDRESS_MAP_END diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 16471c13cca..1a8442de49d 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -772,7 +772,7 @@ static MACHINE_CONFIG_START( bombbee, warpwarp_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", color) - + MCFG_PALETTE_ADD("palette", 2*256+1) MCFG_PALETTE_INIT_OWNER(warpwarp_state,warpwarp) MCFG_VIDEO_START_OVERRIDE(warpwarp_state,warpwarp) diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index e46debb5a30..1f0b8e0abab 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -1157,7 +1157,7 @@ static MACHINE_CONFIG_START( hotchase, wecleman_state ) MCFG_K051316_ADD("k051316_1", hotchase_k051316_intf_0) MCFG_K051316_GFXDECODE("gfxdecode") MCFG_K051316_PALETTE("palette") - + MCFG_K051316_ADD("k051316_2", hotchase_k051316_intf_1) MCFG_K051316_GFXDECODE("gfxdecode") MCFG_K051316_PALETTE("palette") diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index d7b87cf988b..0a2f85af086 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -742,7 +742,7 @@ static MACHINE_CONFIG_DERIVED( quiz18k, welltris ) MCFG_SCREEN_VISIBLE_AREA(15, 335-1, 0, 224-1) MCFG_DEVICE_MODIFY("vsystem_spr_old") - MCFG_VSYSTEM_SPR2_SET_OFFSETS(6, 1) + MCFG_VSYSTEM_SPR2_SET_OFFSETS(6, 1) MACHINE_CONFIG_END diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 46e73096f4b..a1c98e52b53 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -221,7 +221,7 @@ TODO : #define MAIN_CLOCK XTAL_12MHz #define CPU_CLOCK MAIN_CLOCK / 4 #define YM2203_CLOCK MAIN_CLOCK / 4 -#define ES8712_CLOCK 8000 // 8Khz, it's the only clock for sure (pin13) it come from pin14 of M5205. +#define ES8712_CLOCK 8000 // 8Khz, it's the only clock for sure (pin13) it come from pin14 of M5205. #include "emu.h" @@ -249,18 +249,18 @@ public: tilemap_t *m_gfx0a_tilemap; tilemap_t *m_gfx0b_tilemap; tilemap_t *m_gfx1_tilemap; - + required_device m_maincpu; required_device m_subcpu; required_device m_gfxdecode; - + required_shared_ptr m_gfx0_vram; required_shared_ptr m_gfx0_cram; required_shared_ptr m_gfx1_vram; required_shared_ptr m_gfx1_cram; required_shared_ptr m_sprite_ram; required_device m_palette; - + int m_scrollx; int m_scrolly; UINT8 m_reg_a002; @@ -305,7 +305,7 @@ TILE_GET_INFO_MEMBER(witch_state::get_gfx0b_tile_info) } SET_TILE_INFO_MEMBER(1, - code, //tiles beyond 0x7ff only for sprites? + code, //tiles beyond 0x7ff only for sprites? color & 0x0f, 0); } @@ -833,7 +833,7 @@ static MACHINE_CONFIG_START( witch, witch_state ) MCFG_CPU_ADD("sub", Z80, CPU_CLOCK) /* 3 MHz */ MCFG_CPU_PROGRAM_MAP(map_sub) MCFG_CPU_VBLANK_INT_DRIVER("screen", witch_state, irq0_line_assert) - + MCFG_QUANTUM_TIME(attotime::from_hz(6000)) MCFG_NVRAM_ADD_0FILL("nvram") @@ -854,14 +854,14 @@ static MACHINE_CONFIG_START( witch, witch_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_ES8712_ADD("essnd", ES8712_CLOCK) /* 8Khz, it's the only clock for sure (pin13) it comes from pin14 of M5205 */ + MCFG_ES8712_ADD("essnd", ES8712_CLOCK) /* 8Khz, it's the only clock for sure (pin13) it comes from pin14 of M5205 */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_SOUND_ADD("ym1", YM2203, YM2203_CLOCK) /* 3 MHz */ + MCFG_SOUND_ADD("ym1", YM2203, YM2203_CLOCK) /* 3 MHz */ MCFG_YM2203_AY8910_INTF(&ay8910_config_1) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) - MCFG_SOUND_ADD("ym2", YM2203, YM2203_CLOCK) /* 3 MHz */ + MCFG_SOUND_ADD("ym2", YM2203, YM2203_CLOCK) /* 3 MHz */ MCFG_YM2203_AY8910_INTF(&ay8910_config_2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index c950fcefc1c..d5a8ecc1e8c 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -335,7 +335,7 @@ static ADDRESS_MAP_START( wiz_main_map, AS_PROGRAM, 8, wiz_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( stinger_main_map, AS_PROGRAM, 8, wiz_state ) -// AM_RANGE(0xf008, 0xf00f) AM_WRITENOP // ? +// AM_RANGE(0xf008, 0xf00f) AM_WRITENOP // ? AM_RANGE(0xf800, 0xf800) AM_READ(watchdog_reset_r) AM_RANGE(0xf808, 0xf808) AM_WRITE(stinger_explosion_w) AM_RANGE(0xf80a, 0xf80a) AM_WRITE(stinger_shot_w) @@ -751,7 +751,7 @@ void wiz_state::machine_start() save_item(NAME(m_sound_nmi_mask)); save_item(NAME(m_dsc0)); save_item(NAME(m_dsc1)); - + save_item(NAME(m_sprite_bank)); save_item(NAME(m_charbank)); save_item(NAME(m_palbank)); diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c index e4b2efea3d5..94d29122285 100644 --- a/src/mame/drivers/wolfpack.c +++ b/src/mame/drivers/wolfpack.c @@ -313,7 +313,7 @@ static MACHINE_CONFIG_START( wolfpack, wolfpack_state ) MCFG_SCREEN_UPDATE_DRIVER(wolfpack_state, screen_update_wolfpack) MCFG_SCREEN_VBLANK_DRIVER(wolfpack_state, screen_eof_wolfpack) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", wolfpack) MCFG_PALETTE_ADD("palette", 12) MCFG_PALETTE_INDIRECT_ENTRIES(8) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 58ab89a3a29..b8e224a1537 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -359,7 +359,7 @@ static MACHINE_CONFIG_START( xmen, xmen_state ) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* correct, same issue of TMNT2 */ MCFG_SCREEN_UPDATE_DRIVER(xmen_state, screen_update_xmen) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -436,7 +436,7 @@ static MACHINE_CONFIG_START( xmen6p, xmen_state ) MCFG_K052109_ADD("k052109", xmen_k052109_intf) MCFG_K052109_GFXDECODE("gfxdecode") MCFG_K052109_PALETTE("palette") - MCFG_K053246_ADD("k053246", xmen6p_k053246_intf) + MCFG_K053246_ADD("k053246", xmen6p_k053246_intf) MCFG_K053246_SET_SCREEN("screen") MCFG_K053246_GFXDECODE("gfxdecode") MCFG_K053246_PALETTE("palette") diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c index 5663a4c0e1b..9bfc3adee36 100644 --- a/src/mame/drivers/xybots.c +++ b/src/mame/drivers/xybots.c @@ -190,7 +190,7 @@ static MACHINE_CONFIG_START( xybots, xybots_state ) /* video hardware */ MCFG_GFXDECODE_ADD("gfxdecode", "palette", xybots) - + MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(IIIIRRRRGGGGBBBB) diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index 35d4f6c709b..e6ee7229bac 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -238,7 +238,7 @@ static MACHINE_CONFIG_START( xyonix, xyonix_state ) MCFG_SOUND_ADD("sn1", SN76496, 16000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - + MCFG_SOUND_ADD("sn2", SN76496, 16000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index 70226e09646..82b152111fb 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -1011,7 +1011,7 @@ static MACHINE_CONFIG_DERIVED( congo, root ) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(512) MCFG_PALETTE_INIT_OWNER(zaxxon_state, zaxxon) - + MCFG_VIDEO_START_OVERRIDE(zaxxon_state,congo) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(zaxxon_state, screen_update_congo) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 31d34782437..cd28d56a127 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -776,7 +776,7 @@ static MACHINE_CONFIG_START( zr107, zr107_state ) MCFG_VIDEO_START_OVERRIDE(zr107_state,zr107) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K056832_ADD("k056832", zr107_k056832_intf) MCFG_K056832_GFXDECODE("gfxdecode") MCFG_K056832_PALETTE("palette") @@ -840,7 +840,7 @@ static MACHINE_CONFIG_START( jetwave, zr107_state ) MCFG_VIDEO_START_OVERRIDE(zr107_state,jetwave) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_K001604_ADD("k001604", jetwave_k001604_intf) MCFG_K001604_GFXDECODE("gfxdecode") MCFG_K001604_PALETTE("palette") @@ -1107,4 +1107,3 @@ GAME( 1996, windheata,windheat, zr107, windheat, zr107_state, zr107, ROT0, " GAME( 1996, jetwave, 0, jetwave, jetwave, zr107_state, jetwave, ROT0, "Konami", "Jet Wave (EAB, Euro v1.04)", GAME_IMPERFECT_GRAPHICS ) GAME( 1996, waveshrk, jetwave, jetwave, jetwave, zr107_state, jetwave, ROT0, "Konami", "Wave Shark (UAB, USA v1.04)", GAME_IMPERFECT_GRAPHICS ) GAME( 1996, jetwavej, jetwave, jetwave, jetwave, zr107_state, jetwave, ROT0, "Konami", "Jet Wave (JAB, Japan v1.04)", GAME_IMPERFECT_GRAPHICS ) - diff --git a/src/mame/etc/template_driver.c b/src/mame/etc/template_driver.c index a48f269797f..40e949366fd 100644 --- a/src/mame/etc/template_driver.c +++ b/src/mame/etc/template_driver.c @@ -146,11 +146,11 @@ static MACHINE_CONFIG_START( xxx, xxx_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_UPDATE_DRIVER(xxx_state, screen_update) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 442, 0, 320, 264, 0, 240) /* generic video timing, change accordingly */ MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index b4dcaa36123..30a922032bb 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -30,7 +30,7 @@ public: required_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_palette; - + /* video-related */ tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 738252a876d..bdb9d9729cc 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -54,7 +54,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_READ8_MEMBER(devram_r); DECLARE_WRITE8_MEMBER(master_nmi_trigger_w); DECLARE_WRITE8_MEMBER(master_bankswitch_w); diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 825257bae13..3943f5379c3 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -432,7 +432,7 @@ public: required_device m_screen; optional_device m_palette; - + address_space* m_maincpu_program_space; const amiga_machine_interface *m_intf; @@ -499,7 +499,7 @@ public: DECLARE_WRITE_LINE_MEMBER(amiga_cia_1_irq); DECLARE_READ8_MEMBER( amiga_cia_0_portA_r ); DECLARE_WRITE8_MEMBER( amiga_cia_0_portA_w ); - + DECLARE_READ16_MEMBER( amiga_clock_r ); DECLARE_WRITE16_MEMBER( amiga_clock_w ); diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h index b8f0b372f83..88cd2797e9d 100644 --- a/src/mame/includes/atari.h +++ b/src/mame/includes/atari.h @@ -21,7 +21,7 @@ class atari_common_state : public driver_device public: atari_common_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - tv_artifacts(0) { } + tv_artifacts(0) { } void a600xl_mmu(UINT8 new_mmu); diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index 7471eb91fce..8263dd3cc05 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -48,7 +48,7 @@ public: int m_next_timer_scanline; required_device m_scanline_timer; required_device m_int3off_timer; - + /* speech */ required_device m_tms; diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 2ae80c39f74..0636d55bed1 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -23,7 +23,7 @@ public: required_device m_vector; required_shared_ptr m_nvram; required_shared_ptr m_vectorram; - required_device m_screen; + required_device m_screen; int m_sound_status; int m_xcenter; diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index ed30d2f9984..2bc4de8a0a9 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -219,7 +219,7 @@ public: required_device m_audiocpu; optional_device m_68k; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index 9ad94c4edd8..5fb7c0d7161 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -31,7 +31,7 @@ public: required_device m_subcpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(battlane_cpu_command_w); DECLARE_WRITE8_MEMBER(battlane_palette_w); DECLARE_WRITE8_MEMBER(battlane_scrollx_w); diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 1a9b12e6bab..225e5368cef 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -54,5 +54,5 @@ public: required_device m_msm; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h index efc6debfd86..cce6a0be8a3 100644 --- a/src/mame/includes/bfm_sc45.h +++ b/src/mame/includes/bfm_sc45.h @@ -102,7 +102,7 @@ public: DECLARE_WRITE_LINE_MEMBER(bfmdm01_busy); - + DECLARE_READ16_MEMBER(sc4_mem_r); DECLARE_WRITE16_MEMBER(sc4_mem_w); @@ -112,12 +112,12 @@ public: DECLARE_WRITE_LINE_MEMBER(bfm_sc4_duart_txa); DECLARE_READ8_MEMBER(bfm_sc4_duart_input_r); DECLARE_WRITE8_MEMBER(bfm_sc4_duart_output_w); - + DECLARE_WRITE_LINE_MEMBER(m68307_duart_irq_handler); DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa); DECLARE_READ8_MEMBER(m68307_duart_input_r); DECLARE_WRITE8_MEMBER(m68307_duart_output_w); - + DECLARE_DRIVER_INIT(sc4); DECLARE_DRIVER_INIT(sc4mbus); DECLARE_DRIVER_INIT(sc4cvani); diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 7536552ef5c..a3c09debd42 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -106,5 +106,5 @@ public: required_device m_msm; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 33e05dc6053..284ed3201c5 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -55,4 +55,3 @@ public: K007342_CALLBACK_MEMBER(bladestl_tile_callback); K007420_CALLBACK_MEMBER(bladestl_sprite_callback); }; - diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 8b274682877..7886a6b39b2 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -63,7 +63,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(audio_nmi_enable_w); DECLARE_WRITE8_MEMBER(lnc_w); DECLARE_WRITE8_MEMBER(mmonkey_w); diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index 24161903c79..e12def8338b 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -70,7 +70,7 @@ public: required_device m_slave; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(bublbobl_bankswitch_w); DECLARE_WRITE8_MEMBER(tokio_bankswitch_w); DECLARE_WRITE8_MEMBER(tokio_videoctrl_w); diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 72a083fce71..5fd1e777e11 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -58,7 +58,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(bwp12_sharedram1_w); DECLARE_WRITE8_MEMBER(bwp3_u8F_w); DECLARE_WRITE8_MEMBER(bwp3_nmimask_w); diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index d6e56e5ec47..ffa5dbd5d7f 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -12,7 +12,7 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index a88746c61c6..d60e6f8d69f 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -65,7 +65,7 @@ public: required_device m_ttl7474_1a_2; required_device m_gfxdecode; required_device m_palette; - + bitmap_ind16 *m_sprite_sprite_collision_bitmap1; bitmap_ind16 *m_sprite_sprite_collision_bitmap2; bitmap_ind16 *m_sprite_goal_collision_bitmap1; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 8f8d5a893b1..9136fcf4853 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -240,7 +240,7 @@ public: optional_device m_eeprom; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; void update_irq_state(); void unpack_sprites(const char *region); void ddonpach_unpack_sprites(const char *region); diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 49baba810b9..d02afea2db1 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -32,7 +32,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + /* video-related */ const UINT8 *m_syncprom; const UINT8 *m_wpprom; diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index 4ff7a980ff2..69537a5dc3c 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -35,7 +35,7 @@ public: required_device m_dac2; required_device m_vector; required_device m_screen; - + int m_sound_flags; int m_coin_flag; int m_channel_active[2]; diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 77a5f0ebe18..89cd6c47a94 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -94,5 +94,5 @@ public: optional_device m_eeprom; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h index 60b38a68645..c08214cd911 100644 --- a/src/mame/includes/cidelsa.h +++ b/src/mame/includes/cidelsa.h @@ -65,7 +65,7 @@ public: DECLARE_WRITE_LINE_MEMBER( q_w ); DECLARE_WRITE_LINE_MEMBER( prd_w ); DECLARE_READ_LINE_MEMBER( cdp1869_pcb_r ); - + CDP1869_CHAR_RAM_READ_MEMBER(cidelsa_charram_r); CDP1869_CHAR_RAM_WRITE_MEMBER(cidelsa_charram_w); CDP1869_PCB_READ_MEMBER(cidelsa_pcb_r); @@ -104,7 +104,7 @@ public: DECLARE_WRITE8_MEMBER( psg_w ); DECLARE_WRITE8_MEMBER( out1_w ); DECLARE_WRITE8_MEMBER( psg_pb_w ); - + CDP1869_CHAR_RAM_READ_MEMBER(draco_charram_r); CDP1869_CHAR_RAM_WRITE_MEMBER(draco_charram_w); CDP1869_PCB_READ_MEMBER(draco_pcb_r); diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 69a5addd8ea..6f57cc41f80 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -33,7 +33,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ8_MEMBER(citycon_in_r); DECLARE_READ8_MEMBER(citycon_irq_ack_r); DECLARE_WRITE8_MEMBER(citycon_videoram_w); diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index fd007e1ab0d..789d361fbeb 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -65,7 +65,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + /* misc */ int m_scanline; int m_irq_mask; diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index d05cde2c691..896495af03a 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -58,7 +58,7 @@ public: optional_device m_msm5205; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(combatsc_vreg_w); DECLARE_WRITE8_MEMBER(combatscb_sh_irqtrigger_w); DECLARE_READ8_MEMBER(combatscb_io_r); diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 2349622948e..2a6b06a15eb 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -76,5 +76,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index c7e6db1eeac..c78467b45f4 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -36,7 +36,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(cop01_sound_command_w); DECLARE_READ8_MEMBER(cop01_sound_command_r); DECLARE_WRITE8_MEMBER(cop01_irq_ack_w); diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index c8492c544d3..ee6a0c78366 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -44,7 +44,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; /*----------- defined in audio/copsnrob.c -----------*/ diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 5fcec05d7d4..ced32c25b4a 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -129,7 +129,7 @@ public: UINT16 * m_cps2_buffered_obj; // game-specific UINT16 * m_gigaman2_dummyqsound_ram; - UINT16 sf2ceblp_prot; + UINT16 sf2ceblp_prot; /* video-related */ tilemap_t *m_bg_tilemap[3]; @@ -202,7 +202,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_READ16_MEMBER(cps1_hack_dsw_r); DECLARE_READ16_MEMBER(cps1_in1_r); DECLARE_READ16_MEMBER(cps1_in2_r); diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 15fcfc15f89..fa2a26505a3 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -32,7 +32,7 @@ public: required_device m_sn; required_device m_discrete; required_device m_gfxdecode; - + UINT16 m_collision_address; UINT8 m_collision_address_clear; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index acb73f1857a..7a1317a0b02 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -34,7 +34,7 @@ public: required_device m_k052109; required_device m_k051960; required_device m_palette; - + DECLARE_WRITE8_MEMBER(crimfght_coin_w); DECLARE_WRITE8_MEMBER(crimfght_sh_irqtrigger_w); DECLARE_READ8_MEMBER(k052109_051960_r); diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 61f591f0bc2..e2b28af9b2e 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -23,9 +23,9 @@ public: /* memory pointers */ required_shared_ptr m_videoram1; required_shared_ptr m_videoram2; - + required_memory_bank m_z80bank; - + required_device m_audiocpu; required_device m_k053936; required_device m_spriteram; diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 1c03ee3fbb2..87de8a6f830 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -37,7 +37,7 @@ public: m_s2636_2(*this, "s2636_2"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -81,7 +81,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + /* memory */ UINT8 m_color_ram[0x400]; UINT8 m_palette_ram[0x10]; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 203f015fb43..fb62a64828c 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -93,7 +93,7 @@ public: required_device m_msm5205_r; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE16_MEMBER(darius_watchdog_w); DECLARE_READ16_MEMBER(darius_ioc_r); diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 0466372a94e..224afca1f8c 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -53,7 +53,7 @@ public: required_device m_k053936_1; required_device m_k053936_2; required_device m_gfxdecode; - + DECLARE_READ16_MEMBER(dbzcontrol_r); DECLARE_WRITE16_MEMBER(dbzcontrol_w); DECLARE_WRITE16_MEMBER(dbz_sound_command_w); diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index e507c109beb..f390c37473b 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -40,7 +40,7 @@ public: /* devices */ required_device m_maincpu; required_device m_audiocpu; - required_device m_screen; + required_device m_screen; device_t *m_bsmt; DECLARE_WRITE16_MEMBER(eeprom_control_w); DECLARE_WRITE16_MEMBER(sound_command_w); diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index eb4f7035a91..6aca0dbdcad 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -30,7 +30,7 @@ public: required_device m_gfxdecode; required_device m_palette; - + tilemap_t *m_pf3_layer; tilemap_t *m_pf2_layer; tilemap_t *m_pf1_layer; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 21342e70295..f5d8b2b6119 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -44,7 +44,7 @@ public: /* memory pointers */ required_shared_ptr m_videoram; optional_shared_ptr m_bg_data; - + required_device m_gfxdecode; required_device m_palette; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index cd32a4cd99e..32053d52164 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -91,11 +91,11 @@ public: required_device m_deco_tilegen1; required_device m_deco_tilegen2; - + required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT8 m_irq_source; DECLARE_WRITE_LINE_MEMBER(sound_irq_nslasher); DECLARE_READ32_MEMBER(deco32_irq_controller_r); diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index ef9398c5873..fed2344efae 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -56,7 +56,7 @@ public: required_device m_pandora; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(beast_data_w); DECLARE_READ8_MEMBER(beast_data_r); DECLARE_READ8_MEMBER(beast_status_r); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index fa1baebe8da..7c4bb059889 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -189,7 +189,7 @@ public: required_device m_screen; required_device m_palette; optional_device m_z80dma; - + /* radarscp_scanline */ int m_counter; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 16d7c057185..bd37ccd18c9 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -21,7 +21,7 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } /* devices */ @@ -35,10 +35,10 @@ public: required_shared_ptr m_videoram; required_shared_ptr m_colorram; required_shared_ptr m_spriteram; - + required_device m_gfxdecode; required_device m_palette; - + /* video-related */ tilemap_t *m_do_tilemap; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 593bbc59716..56360f4ae5c 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -74,7 +74,7 @@ public: required_device m_msm; required_device m_dac_1; required_device m_dac_2; - + DECLARE_WRITE8_MEMBER(equites_c0f8_w); DECLARE_WRITE8_MEMBER(equites_cymbal_ctrl_w); DECLARE_WRITE8_MEMBER(equites_dac_latch_w); diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 2810376c62a..18f62ed4df1 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -43,7 +43,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(espial_master_interrupt_mask_w); DECLARE_WRITE8_MEMBER(espial_master_soundlatch_w); DECLARE_WRITE8_MEMBER(espial_sound_nmi_mask_w); diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index b9ec16288c4..20aeda655c6 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -123,7 +123,7 @@ public: TIMER_CALLBACK_MEMBER(hblank_start_callback); TIMER_CALLBACK_MEMBER(hblank_end_callback); required_device m_dac; - required_device m_screen; + required_device m_screen; ESRIP_DRAW(esripsys_draw); }; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 322aa1515b1..e67dc2b88c7 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -55,8 +55,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; - + required_device m_palette; + DECLARE_READ8_MEMBER(exerion_protection_r); DECLARE_WRITE8_MEMBER(exerion_videoreg_w); DECLARE_WRITE8_MEMBER(exerion_video_latch_w); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index f7a77d05134..7b5c0d1bd7c 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -66,7 +66,7 @@ public: optional_device m_samples; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; UINT8 m_last_dial; UINT8 m_collision_mask; diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 8e97b849475..32dcaaa8952 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -32,7 +32,7 @@ public: required_device m_custom; required_device m_screen; required_device m_palette; - + UINT8 m_bank; const UINT8 *m_showdown_bank_data[2]; INT8 m_showdown_bank_select; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index c01cbde48ba..c9d46dfcea6 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -28,7 +28,7 @@ public: required_shared_ptr m_spriteram; required_shared_ptr m_videoram; required_shared_ptr m_colorram; - + required_device m_gfxdecode; required_device m_palette; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index f48637ac832..f2333962ecc 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -42,7 +42,7 @@ public: optional_shared_ptr m_spriteram; optional_shared_ptr m_fgregs; optional_shared_ptr m_rozregs; - + optional_memory_bank m_z80bank; /* devices referenced above */ @@ -74,7 +74,7 @@ public: optional_device m_audiocpu; optional_device m_k053936; required_device m_palette; - + DECLARE_WRITE8_MEMBER(f1gp_sh_bankswitch_w); DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_READ16_MEMBER(command_pending_r); diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index ae3db6923e3..096e9e4da15 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -31,7 +31,7 @@ public: optional_shared_ptr m_imago_fg_videoram; required_device m_gfxdecode; required_device m_palette; - + UINT16 m_charbank; UINT8 m_colorbank; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index fb54f5e61ed..761a27c1ac3 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -54,7 +54,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ8_MEMBER(fcombat_protection_r); DECLARE_READ8_MEMBER(fcombat_port01_r); DECLARE_WRITE8_MEMBER(e900_w); diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 84a31b8dfdc..46e31437fcf 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -40,7 +40,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_READ8_MEMBER(fgoal_analog_r); DECLARE_READ8_MEMBER(fgoal_nmi_reset_r); DECLARE_READ8_MEMBER(fgoal_irq_reset_r); diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index bd33c2b47d3..0afb6c5eb0c 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -51,7 +51,7 @@ public: required_device m_msm; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(firetrap_nmi_disable_w); DECLARE_WRITE8_MEMBER(firetrap_bankselect_w); DECLARE_READ8_MEMBER(firetrap_8751_bootleg_r); diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index c5388771e90..8ffe02f2352 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -64,7 +64,7 @@ public: optional_shared_ptr m_drone_rot; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; UINT8 m_in_service_mode; UINT32 m_dial[2]; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 0d4c1bc591f..210bbb95313 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -40,7 +40,7 @@ public: /* devices */ required_device m_maincpu; - required_device m_audiocpu; + required_device m_audiocpu; DECLARE_WRITE16_MEMBER(fuuki16_vregs_w); DECLARE_WRITE16_MEMBER(fuuki16_sound_command_w); DECLARE_WRITE8_MEMBER(fuuki16_sound_rombank_w); diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index b48fca20187..5a7631c94bf 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -55,8 +55,8 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - - + + DECLARE_READ32_MEMBER(snd_020_r); DECLARE_WRITE32_MEMBER(snd_020_w); DECLARE_WRITE32_MEMBER(fuuki32_vregs_w); diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index b775b953509..3692e02a043 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -79,7 +79,7 @@ public: required_device m_tms; required_device m_serial; required_device m_screen; - + UINT16 m_sound_data; UINT8 m_sound_status; offs_t m_tms_offset_xor; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 30f1fa44d4e..f54ea8cc587 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -32,7 +32,7 @@ public: required_device m_namco_sound; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; emu_timer *m_cpu3_interrupt_timer; UINT8 m_custom_mod; diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index e5584d0e79a..4c2c823b3df 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -20,7 +20,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE16_MEMBER(galpanic_6295_bankswitch_w); DECLARE_WRITE16_MEMBER(galpanica_6295_bankswitch_w); DECLARE_WRITE16_MEMBER(galpanica_misc_w); diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 56f5d9349a6..4f596232447 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -49,7 +49,7 @@ public: required_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; namco58xx_device *m_namco58xx; namco56xx_device *m_namco56xx; diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index c45c7b5f074..86904b1dfec 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -32,7 +32,7 @@ public: required_shared_ptr m_tilemapram; required_shared_ptr m_spriteram; required_shared_ptr m_ioc_ram; - + required_device m_gfxdecode; required_device m_palette; // UINT16 * m_paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index af3a16902c5..7ab8c54dc84 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -39,7 +39,7 @@ public: int m_fg_tile_bank; int m_bg_tile_bank; - + DECLARE_READ8_MEMBER( gladiator_dsw1_r ); DECLARE_READ8_MEMBER( gladiator_dsw2_r ); DECLARE_READ8_MEMBER( gladiator_controls_r ); @@ -70,7 +70,7 @@ public: DECLARE_WRITE8_MEMBER(glad_adpcm_w); DECLARE_READ8_MEMBER(f1_r); DECLARE_DRIVER_INIT(gladiatr); - DECLARE_DRIVER_INIT(ppking); + DECLARE_DRIVER_INIT(ppking); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(fg_get_tile_info); DECLARE_MACHINE_RESET(ppking); diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 15a71eabe62..70f91b34bf2 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -233,11 +233,11 @@ public: required_shared_ptr m_videoram; required_shared_ptr m_charram; required_shared_ptr m_spriteram; - + required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT8 m_knocker_prev; UINT8 m_joystick_select; UINT8 m_track[2]; diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index e1cf213e73e..5967dffdc07 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -43,7 +43,7 @@ public: required_device m_k052109; required_device m_k051960; required_device m_gfxdecode; - + DECLARE_READ16_MEMBER(k052109_halfword_r); DECLARE_WRITE16_MEMBER(k052109_halfword_w); DECLARE_READ16_MEMBER(k051937_halfword_r); diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 69481226c20..bebe1a2ca96 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -89,7 +89,7 @@ public: required_device m_discrete; required_device m_gfxdecode; required_device m_palette; - required_device m_screen; + required_device m_screen; }; /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index 440c8670997..8c10dc9ea23 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -38,7 +38,7 @@ public: required_device m_maincpu; required_device m_screen; required_device m_palette; - + UINT8 m_last_analog_input[2]; UINT8 m_last_analog_output[2]; UINT8 *m_poly17; diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 788528a7afd..95689d4d1ab 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -48,7 +48,7 @@ public: DECLARE_READ8_MEMBER( gsword_8741_3_r ); DECLARE_WRITE8_MEMBER(gsword_adpcm_data_w); DECLARE_DRIVER_INIT(gsword); - DECLARE_DRIVER_INIT(gsword2); + DECLARE_DRIVER_INIT(gsword2); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); DECLARE_MACHINE_RESET(gsword); diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index d615430aa7b..66c9130d652 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -38,7 +38,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + tilemap_t *m_tilemap; UINT8 m_master_nmi_mask; UINT8 m_slave_irq_mask; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index c1d6feb20cd..fb522339be0 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -379,7 +379,7 @@ public: DECLARE_WRITE16_MEMBER( hdds3_sdsp_control_w ); DECLARE_READ16_MEMBER( hdds3_xdsp_control_r ); DECLARE_WRITE16_MEMBER( hdds3_xdsp_control_w ); - + void hdds3sdsp_reset_timer(); void hdds3xdsp_reset_timer(); diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 9035b2b637b..99056ebde40 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -14,7 +14,7 @@ public: m_dac(*this, "dac"), m_ymsnd(*this, "ymsnd"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index a81dbee9a80..b6d1d181da8 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -32,7 +32,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT8 m_control; UINT8 m_sample; diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 24062ce78bd..b856eb8321a 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -69,7 +69,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_READ16_MEMBER(hyprduel_irq_cause_r); DECLARE_WRITE16_MEMBER(hyprduel_irq_cause_w); DECLARE_WRITE16_MEMBER(hyprduel_subcpu_control_w); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 93e80be4e5f..92af680ce90 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -24,7 +24,7 @@ public: required_shared_ptr m_videoram; required_shared_ptr m_scroll; required_shared_ptr m_spriteram; - + required_device m_gfxdecode; required_device m_screen; required_device m_palette; diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 892cf3c5030..97f73883d5f 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -98,5 +98,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 94fc23d298d..bdeb619bf1d 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -39,7 +39,7 @@ public: required_device m_soundcpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(ironhors_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(ironhors_videoram_w); DECLARE_WRITE8_MEMBER(ironhors_colorram_w); diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 42a8c5bb8ad..c166af08123 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -196,5 +196,5 @@ public: optional_device m_dsp1; optional_device m_dsp2; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 38365876a1f..fb1a833f60f 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -34,7 +34,7 @@ public: required_device m_slavecpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ8_MEMBER(jackalr_rotary_r); DECLARE_WRITE8_MEMBER(jackal_flipscreen_w); DECLARE_READ8_MEMBER(jackal_zram_r); diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index 25d1672d184..12997e5ac32 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -32,7 +32,7 @@ public: m_view2_1(*this, "view2_1"), m_kaneko_spr(*this, "kan_spr"), m_pandora(*this, "pandora"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; @@ -74,7 +74,7 @@ public: DECLARE_VIDEO_START(kaneko16); DECLARE_MACHINE_RESET(mgcrystl); UINT32 screen_update_kaneko16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - + template UINT32 screen_update_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect); @@ -82,7 +82,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(kaneko16_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(shogwarr_interrupt); - + template void kaneko16_fill_bitmap(palette_device* palette, _BitmapClass &bitmap, const rectangle &cliprect); @@ -123,7 +123,7 @@ public: : kaneko16_state(mconfig, type, tag), m_bg15_reg(*this, "bg15_reg"), m_bg15_select(*this, "bg15_select"), - m_bgpalette(*this, "bgpalette") + m_bgpalette(*this, "bgpalette") { } diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index bbbd046f58f..9e3a44b3e89 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -27,7 +27,7 @@ public: required_device m_audiocpu; required_device m_spriteram; required_device m_spritegen; - + /* memory pointers */ required_shared_ptr m_ram; required_shared_ptr m_videoram; @@ -35,7 +35,7 @@ public: required_device m_gfxdecode; required_device m_palette; - + /* video-related */ bitmap_ind16 *m_bitmap_f; tilemap_t *m_fix_tilemap; @@ -51,7 +51,7 @@ public: int m_microcontroller_id; int m_coin_mask; int m_latch; - + DECLARE_WRITE16_MEMBER(karnov_control_w); DECLARE_READ16_MEMBER(karnov_control_r); DECLARE_WRITE16_MEMBER(karnov_videoram_w); diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index edb5613b6d6..eaed3bb8f31 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -54,7 +54,7 @@ public: optional_device m_k054539_2; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; DECLARE_WRITE32_MEMBER(esc_w); DECLARE_WRITE32_MEMBER(eeprom_w); diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index b9f8781a9cc..32eeb08a147 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -33,7 +33,7 @@ public: required_shared_ptr m_spriteram; required_shared_ptr m_videoram1; required_shared_ptr m_videoram2; - + required_device m_gfxdecode; required_device m_screen; required_device m_palette; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 8e9334877ae..fea7726ba51 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -49,7 +49,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ8_MEMBER(sraider_sound_low_r); DECLARE_READ8_MEMBER(sraider_sound_high_r); DECLARE_WRITE8_MEMBER(sraider_sound_low_w); diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index bf5c1f113e3..37679f619bb 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -23,7 +23,7 @@ public: m_s2636_3(*this, "s2636_3"), m_sn(*this, "snsnd"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 871d62b7bba..8e02f434a50 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -49,7 +49,7 @@ public: optional_device m_sn_2; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_READ8_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(sound_select_w); diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 4655421a0f2..66bf04f10b1 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -30,10 +30,10 @@ public: required_shared_ptr m_scroll1; required_shared_ptr m_scroll2; required_shared_ptr m_paletteram; - + required_device m_gfxdecode; required_device m_palette; - + /* video-related */ tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index a01107007f5..af99739dbad 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -37,7 +37,7 @@ public: required_device m_dac; /* memory pointers */ required_shared_ptr m_videoram; - + required_device m_gfxdecode; required_device m_palette; diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index cfb66011060..1b8e0170b9a 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -36,7 +36,7 @@ public: required_device m_maincpu; required_device m_audiocpu; required_device m_gfxdecode; - required_device m_palette; + required_device m_palette; DECLARE_READ8_MEMBER(deco16_bank_r); DECLARE_READ8_MEMBER(deco16_io_r); diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index c3503f8d0ad..869c9626cf6 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -59,7 +59,7 @@ public: optional_device m_mcu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(lkage_sound_command_w); DECLARE_WRITE8_MEMBER(lkage_sh_nmi_disable_w); DECLARE_WRITE8_MEMBER(lkage_sh_nmi_enable_w); diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 25be0a76614..2b0bd2d020d 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -92,7 +92,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_READ16_MEMBER(lockon_crtc_r); DECLARE_WRITE16_MEMBER(lockon_crtc_w); DECLARE_WRITE16_MEMBER(lockon_char_w); diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 38994db6380..718488cfa47 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -43,7 +43,7 @@ public: optional_device m_mcu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(lsasquad_bankswitch_w); DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_disable_w); DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_enable_w); diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index ccd163cf770..42dfc6b7824 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -46,7 +46,7 @@ public: m_chargen(*this, "chargen"), m_maincpu(*this, "maincpu"), m_ic8j1(*this, "ic8j1"), - m_ic8j2(*this, "ic8j2"), + m_ic8j2(*this, "ic8j2"), m_samples(*this, "samples"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), @@ -81,7 +81,7 @@ public: optional_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(m10_ctrl_w); DECLARE_WRITE8_MEMBER(m11_ctrl_w); DECLARE_WRITE8_MEMBER(m15_ctrl_w); diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index fef19619426..5ede569f099 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -32,7 +32,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT8 m_irq_vectorbase; int m_sound_status; UINT8 m_spritesystem; diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index c406ee2187b..1d60a14d7f5 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -43,5 +43,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 1ebf48ba5ac..434e7100540 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -40,7 +40,7 @@ public: optional_device m_audio; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; UINT16 *m_protection_ram; emu_timer *m_scanline_timer; diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index ebe38bd575e..cc5fad9bbbe 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -45,7 +45,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT16 m_sound_status; UINT8 m_irq_vectorbase; UINT32 m_raster_irq_position; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 1a7b6879279..68b107ca9b4 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -71,7 +71,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE32_MEMBER(paletteram32_macrossp_w); DECLARE_READ32_MEMBER(macrossp_soundstatus_r); DECLARE_WRITE32_MEMBER(macrossp_soundcmd_w); diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index e9e2849e8de..b454076132b 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -60,7 +60,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(matmania_sh_command_w); DECLARE_WRITE8_MEMBER(maniach_sh_command_w); DECLARE_WRITE8_MEMBER(matmania_paletteram_w); diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 59b6f28465f..86b59994dfd 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -37,7 +37,7 @@ public: required_device m_soundcpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(mcat_soundlatch_w); DECLARE_WRITE16_MEMBER(mcat_coin_w); DECLARE_READ16_MEMBER(mcat_wd_r); diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index fa356593f79..4bf7e625a58 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -127,5 +127,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index ddae514e59d..cdef1ae0863 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -66,7 +66,7 @@ public: optional_device m_samples; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 97eb26ca5c8..242aea28823 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -38,7 +38,7 @@ public: required_device m_subcpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(metlclsh_cause_irq); DECLARE_WRITE8_MEMBER(metlclsh_ack_nmi); DECLARE_WRITE8_MEMBER(metlclsh_cause_nmi2); diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index 24318daa57b..f8948e1adbe 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -136,7 +136,7 @@ public: DECLARE_READ8_MEMBER(duart_input_r); DECLARE_WRITE8_MEMBER(duart_output_w); DECLARE_WRITE_LINE_MEMBER(duart_txb); - + required_device m_maincpu; required_device m_audiocpu; required_device m_upd7759; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 977937e13e0..7235d07e90a 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -36,7 +36,7 @@ public: required_device m_audiocpu; required_device m_scsp1; required_device m_eeprom; - required_device m_screen; + required_device m_screen; required_shared_ptr m_work_ram; required_shared_ptr m_paletteram64; diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index 73e7773b3fd..e820e8a9c86 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -20,7 +20,7 @@ public: /* memory pointers */ required_shared_ptr m_videoram; required_shared_ptr m_colorram; - required_shared_ptr m_spriteram; + required_shared_ptr m_spriteram; /* misc */ UINT8 m_sound_byte; @@ -31,7 +31,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(mouser_nmi_enable_w); DECLARE_WRITE8_MEMBER(mouser_sound_interrupt_w); DECLARE_READ8_MEMBER(mouser_sound_byte_r); diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 6b04eeac27a..da0100b3e9c 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -37,7 +37,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(mrflea_main_w); DECLARE_WRITE8_MEMBER(mrflea_io_w); DECLARE_READ8_MEMBER(mrflea_main_r); diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index d2c903402ee..00f6256d3da 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -113,5 +113,5 @@ public: required_device m_audiocpu; required_device m_gfxdecode; optional_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 65670cc0794..c3102167f71 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -27,7 +27,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(mugsmash_reg2_w); DECLARE_READ16_MEMBER(mugsmash_input_ports_r); DECLARE_WRITE16_MEMBER(mugsmash_videoram1_w); diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h index cccb5b0fc00..ddb422f503d 100644 --- a/src/mame/includes/multfish.h +++ b/src/mame/includes/multfish.h @@ -113,7 +113,3 @@ public: MACHINE_CONFIG_EXTERN( igrosoft_gamble ); MACHINE_CONFIG_EXTERN( rollfr ); INPUT_PORTS_EXTERN( igrosoft_gamble ); - - - - diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 446ffda735e..b6f4732c98f 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -41,7 +41,7 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(mnchmobl_nmi_enable_w); DECLARE_WRITE8_MEMBER(mnchmobl_soundlatch_w); DECLARE_WRITE8_MEMBER(sound_nmi_ack_w); diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index a043aa63090..838741c8bfe 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -54,7 +54,7 @@ public: optional_device m_sn; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(n8080_shift_bits_w); DECLARE_WRITE8_MEMBER(n8080_shift_data_w); DECLARE_READ8_MEMBER(n8080_shift_r); diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index dc30b62d323..f20c5069d5f 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -78,7 +78,7 @@ public: UINT8 m_mask_data[8]; UINT8 m_conv_data[9]; - + DECLARE_READ16_MEMBER(custom_key_r); DECLARE_WRITE16_MEMBER(custom_key_w); DECLARE_READ16_MEMBER(namcona1_vreg_r); @@ -111,8 +111,8 @@ public: DECLARE_WRITE16_MEMBER(namcona1_paletteram_w); DECLARE_READ16_MEMBER(namcona1_gfxram_r); DECLARE_WRITE16_MEMBER(namcona1_gfxram_w); - void pdraw_tile( screen_device &screen, bitmap_ind16 &dest_bmp, const rectangle &clip, UINT32 code, int color, - int sx, int sy, int flipx, int flipy, int priority, int bShadow, int bOpaque, int gfx_region ); + void pdraw_tile( screen_device &screen, bitmap_ind16 &dest_bmp, const rectangle &clip, UINT32 code, int color, + int sx, int sy, int flipx, int flipy, int priority, int bShadow, int bOpaque, int gfx_region ); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int primask ); DECLARE_READ16_MEMBER(snd_r); diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 6898efdc0a3..1b1373509cc 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -34,7 +34,7 @@ public: required_device m_dac; required_device m_gfxdecode; required_device m_palette; - + int m_dac0_value; int m_dac1_value; int m_dac0_gain; diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index e7ef3ee5f10..b1ffcf65879 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -227,7 +227,7 @@ public: optional_device m_mcu; required_device m_gfxdecode; optional_device m_screen; - required_device m_palette; + required_device m_palette; }; class namcos2_state : public namcos2_shared_state diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 8c37babd5db..3c60b16239c 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -25,7 +25,7 @@ public: required_device m_screen; required_device m_palette; - + UINT8 m_popflame_prot_seed; int m_r_index; int m_prot_count; diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index d6c6098387c..c9714c17553 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -80,7 +80,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE16_MEMBER(gx400_irq1_enable_word_w); DECLARE_WRITE16_MEMBER(gx400_irq2_enable_word_w); DECLARE_WRITE16_MEMBER(gx400_irq4_enable_word_w); diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 984a1797f3f..5942e1d7d83 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -61,7 +61,7 @@ public: required_device m_2610_2r; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(cpua_ctrl_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE16_MEMBER(ninjaw_sound_w); diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index f7a0489581c..1e09dafaba1 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -50,7 +50,7 @@ public: required_device m_discrete; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ8_MEMBER(nitedrvr_steering_reset_r); DECLARE_WRITE8_MEMBER(nitedrvr_steering_reset_w); DECLARE_READ8_MEMBER(nitedrvr_in0_r); diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index 10edca6b253..5b2342a74b6 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -63,7 +63,7 @@ public: required_device m_msm; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(sub_cpu_halt_w); DECLARE_READ8_MEMBER(from_snd_r); DECLARE_WRITE8_MEMBER(to_main_w); diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 8ea66c65e75..46501cc4ce3 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -46,7 +46,7 @@ public: optional_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(ojankohs_rombank_w); DECLARE_WRITE8_MEMBER(ojankoy_rombank_w); DECLARE_WRITE8_MEMBER(ojankohs_msm5205_w); diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 29524a483e7..39b3314a4fd 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -46,7 +46,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + DECLARE_WRITE8_MEMBER(orbit_misc_w); DECLARE_WRITE8_MEMBER(orbit_playfield_w); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 1bdb06aaea9..879afb5fb53 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -78,7 +78,7 @@ public: required_device m_2610_2r; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(irq_ack_w); DECLARE_WRITE16_MEMBER(othunder_tc0220ioc_w); DECLARE_READ16_MEMBER(othunder_tc0220ioc_r); diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 64fe6d09d86..f8f20cbc50a 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -41,7 +41,7 @@ public: required_device m_mcu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(pandoras_int_control_w); DECLARE_WRITE8_MEMBER(pandoras_cpua_irqtrigger_w); DECLARE_WRITE8_MEMBER(pandoras_cpub_irqtrigger_w); diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index d0da0d1a501..6c7e1fb95e3 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -67,5 +67,5 @@ public: optional_device m_oki2; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index d5930e21634..2dd3a65328d 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -21,7 +21,7 @@ public: required_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(pcktgal_bank_w); DECLARE_WRITE8_MEMBER(pcktgal_sound_bank_w); DECLARE_WRITE8_MEMBER(pcktgal_sound_w); diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index f6d50aaa36a..5a46a3f7844 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -47,7 +47,7 @@ public: optional_device m_decocomn; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ16_MEMBER(pckgaldx_unknown_r); DECLARE_READ16_MEMBER(pckgaldx_protection_r); DECLARE_WRITE16_MEMBER(pktgaldx_oki_bank_w); diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 455b6f5672d..881ed86a20e 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -34,7 +34,7 @@ public: required_shared_ptr m_timedata; required_shared_ptr m_work_ram; required_device m_gfxdecode; - + int m_up_8w; int m_pc10_nmi_enable; int m_pc10_dog_di; diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index fb606a2c06c..4ff2c53914d 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -28,7 +28,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(irq_enable_w); DECLARE_WRITE8_MEMBER(pooyan_videoram_w); DECLARE_WRITE8_MEMBER(pooyan_colorram_w); diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index c2f39bbfc28..39a075505a4 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -27,7 +27,7 @@ public: UINT8 m_bitmap_type; tilemap_t *m_fg_tilemap; UINT8 m_lastflip; - int m_field; + int m_field; DECLARE_READ8_MEMBER(protection_r); DECLARE_WRITE8_MEMBER(protection_w); diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index 952e03b892d..a348552c30a 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -32,7 +32,7 @@ public: UINT32 screen_update_portrait(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void get_tile_info( tile_data &tileinfo, int tile_index, const UINT8 *source ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - required_device m_maincpu; + required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; }; diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 960b906f4ee..1e2c377dd01 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -28,7 +28,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + UINT16 *m_vctrl_1; tilemap_t *m_tilemap_0; tilemap_t *m_tilemap_1; diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 97263fc3958..a147760b2bb 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -24,7 +24,7 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "lpalette"), m_palette2(*this, "rpalette"), - m_screen(*this, "screen") + m_screen(*this, "screen") { } /* memory pointers */ diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index 2dcec88f23e..1c000ed5925 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -37,7 +37,7 @@ public: optional_device m_mcu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(pushman_flipscreen_w); DECLARE_WRITE16_MEMBER(pushman_control_w); DECLARE_READ16_MEMBER(pushman_68705_r); diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index 12f5add080f..c130d45848f 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -43,7 +43,7 @@ public: optional_device m_pc090oj; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(jumping_sound_w); DECLARE_READ8_MEMBER(jumping_latch_r); DECLARE_WRITE16_MEMBER(rbisland_cchip_ctrl_w); diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 35a52946d8e..25d84b156de 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -37,7 +37,7 @@ public: required_device m_vlm; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(rockrage_bankswitch_w); DECLARE_WRITE8_MEMBER(rockrage_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(rockrage_vreg_w); @@ -53,4 +53,3 @@ public: K007420_CALLBACK_MEMBER(rockrage_sprite_callback); }; - diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index 330d4cf25bb..ca6ce674245 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -58,7 +58,7 @@ public: optional_device m_sprgen1; optional_device m_sprgen2; - + required_device m_palette; DECLARE_READ16_MEMBER(rohga_irq_ack_r); diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index a19faa9c0da..725b6b0e925 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -38,7 +38,7 @@ public: /* memory pointers */ required_shared_ptr m_sysreg; required_shared_ptr m_936_videoram; - + required_device m_gfxdecode; required_device m_palette; // UINT16 * m_paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 5b991e63be5..4a671bed6c2 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -35,7 +35,7 @@ public: required_device m_vlm; required_device m_gfxdecode; required_device m_palette; - + /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index be1e341f4a5..86182b45350 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -49,7 +49,7 @@ public: DECLARE_WRITE8_MEMBER(mars_ppi8255_0_w); DECLARE_WRITE8_MEMBER(mars_ppi8255_1_w); DECLARE_WRITE8_MEMBER(ad2083_tms5110_ctrl_w); - + DECLARE_WRITE8_MEMBER(harem_portA_w); DECLARE_WRITE8_MEMBER(harem_portB_w); diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h index 54ae6dcb0fc..7455734f712 100644 --- a/src/mame/includes/segas16b.h +++ b/src/mame/includes/segas16b.h @@ -200,7 +200,7 @@ protected: UINT8 m_hwc_input_value; UINT8 m_mj_input_num; UINT8 m_mj_last_val; - + required_device m_gfxdecode; }; diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h index 91cd6aa3645..d7b1bcffcc0 100644 --- a/src/mame/includes/segas18.h +++ b/src/mame/includes/segas18.h @@ -151,6 +151,6 @@ protected: UINT8 m_wwally_last_y[3]; UINT8 m_lghost_value; UINT8 m_lghost_select; - + required_device m_gfxdecode; }; diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 093b3c9e4d5..a2b48bac690 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -21,7 +21,7 @@ public: required_shared_ptr m_row_scroll; required_shared_ptr m_spriteram2; required_shared_ptr m_colorram; - + UINT8 m_portb; tilemap_t *m_bg_tilemap; void nvram_init(nvram_device &nvram, void *data, size_t size); diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 23a0c55d97e..8dd5eec589d 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -68,7 +68,7 @@ public: optional_shared_ptr m_kiwame_nvram; optional_shared_ptr m_inttoote_key_select; optional_shared_ptr m_inttoote_700000; - + required_device m_gfxdecode; required_device m_palette; diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 9989b8ff8da..f7ca2636252 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -30,8 +30,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; - + required_device m_palette; + DECLARE_READ8_MEMBER(skyfox_vregs_r); DECLARE_WRITE8_MEMBER(skyfox_vregs_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 817c06b3c76..701ad6f94de 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -25,7 +25,7 @@ public: m_fixvideoram(*this, "fixvideoram"), m_fixcolorram(*this, "fixcolorram") { } - + // devices, memory pointers required_device m_maincpu; required_device m_audiocpu; @@ -137,7 +137,7 @@ public: DECLARE_DRIVER_INIT(getstarb1); DECLARE_DRIVER_INIT(slapfigh); DECLARE_DRIVER_INIT(getstarb2); - + TILE_GET_INFO_MEMBER(get_pf_tile_info); TILE_GET_INFO_MEMBER(get_pf1_tile_info); TILE_GET_INFO_MEMBER(get_fix_tile_info); diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index d7815ce30c8..d6cdadbb190 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -73,7 +73,7 @@ public: required_device m_tc0640fio; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ16_MEMBER(color_ram_word_r); DECLARE_WRITE16_MEMBER(color_ram_word_w); DECLARE_READ16_MEMBER(slapshot_service_input_r); diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 83879075c6a..1e2371d3467 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -452,7 +452,7 @@ public: UINT16 ver_offset; UINT8 extbg; } m_mode7; - + struct OAM { UINT16 tile; @@ -577,7 +577,7 @@ public: UINT16 *m_oam_ram; /* Object Attribute Memory */ UINT16 *m_cgram; /* Palette RAM */ UINT8 *m_vram; /* Video RAM (TODO: Should be 16-bit, but it's easier this way) */ - + snes_state *m_state; }; diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index 22f5ce99d0a..732dea4cd09 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -25,7 +25,7 @@ public: optional_shared_ptr m_bootleg_spriteram16; required_device m_gfxdecode; required_device m_palette; - + int m_sb3_music_is_playing; int m_sb3_music; UINT8 m_semicom_prot_offset; diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index e86270d483e..c476484cd74 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -67,7 +67,7 @@ public: required_device m_maincpu; required_device m_audiocpu; required_device m_samples; - required_device m_screen; + required_device m_screen; }; /*----------- defined in audio/spacefb.c -----------*/ diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index a860c22df7e..c8fe4f05264 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -8,7 +8,7 @@ public: m_spriteram(*this, "spriteram"), m_master(*this,"master"), m_slave(*this,"slave"), - m_gfxdecode(*this, "gfxdecode"), + m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } UINT8 m_s_port3; @@ -23,7 +23,7 @@ public: required_device m_slave; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(sprcros2_m_port7_w); DECLARE_WRITE8_MEMBER(sprcros2_s_port3_w); DECLARE_WRITE8_MEMBER(sprcros2_fgvideoram_w); diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index c0457ce11ef..1128bfac293 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -182,5 +182,5 @@ protected: optional_ioport m_io_tracky; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index 5cafdcc98fc..15e212a5596 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -21,7 +21,7 @@ public: required_shared_ptr m_spriteram; required_shared_ptr m_pf1_data; required_device m_gfxdecode; - + tilemap_t *m_pf1_tilemap; int m_flipscreen; DECLARE_READ16_MEMBER(stadhero_control_r); diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 64b169e34a7..ce7769abb6c 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -24,7 +24,7 @@ public: m_scudsp(*this, "scudsp"), m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -644,7 +644,7 @@ public: DECLARE_WRITE_LINE_MEMBER(scudsp_end_w); DECLARE_READ16_MEMBER(scudsp_dma_r); DECLARE_WRITE16_MEMBER(scudsp_dma_w); - + // FROM smpc.c TIMER_CALLBACK_MEMBER( stv_bankswitch_state ); void stv_select_game(int gameno); @@ -671,7 +671,7 @@ public: void smpc_comreg_exec(address_space &space, UINT8 data, UINT8 is_stv); DECLARE_READ8_MEMBER( stv_SMPC_r ); DECLARE_WRITE8_MEMBER( stv_SMPC_w ); - + }; class stv_state : public saturn_state diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 4afdb614516..06ac5a50746 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -119,7 +119,7 @@ public: optional_device m_msm; optional_device m_upd7759; required_device m_gfxdecode; - + DECLARE_WRITE16_MEMBER(sound_command_nmi_w); DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(sys16_coinctrl_w); diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index 7c49b55b654..e8938caf05a 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -37,7 +37,7 @@ public: required_device m_k051316; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(tail2nos_bgvideoram_w); DECLARE_READ16_MEMBER(tail2nos_zoomdata_r); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 102967dbcf0..bea3ff9000b 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -111,7 +111,7 @@ public: optional_device m_tc0510nio; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(growl_coin_word_w); DECLARE_WRITE16_MEMBER(taitof2_4p_coin_word_w); DECLARE_WRITE16_MEMBER(ninjak_coin_word_w); diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index 0c8afb397cc..574b1e52102 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -34,7 +34,7 @@ public: required_device m_tc0220ioc; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ8_MEMBER(syvalion_input_bypass_r); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); virtual void machine_start(); diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 4e3a517fa33..0b14bf7fef3 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -24,7 +24,7 @@ public: required_device m_tc0080vco; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE16_MEMBER(io_w); DECLARE_READ16_MEMBER(io_r); virtual void machine_start(); diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index e3bab2e7fda..a44024dde6c 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -70,7 +70,7 @@ public: required_shared_ptr m_main_ram; required_shared_ptr m_dsp_shared_ram; required_shared_ptr m_palette_ram; - + required_device m_gfxdecode; required_device m_screen; required_device m_palette; diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 3f3771649b1..22a98f6c3bb 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -129,5 +129,5 @@ public: required_device m_dac; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 644045865f8..edb5eb5b83a 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -68,7 +68,7 @@ public: required_device m_2dscreen; required_device m_gfxdecode; required_device m_palette; - + TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index aeab102935d..1f77092a4ba 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -34,7 +34,7 @@ public: required_device m_mcu; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(thedeep_nmi_w); DECLARE_WRITE8_MEMBER(thedeep_sound_w); DECLARE_WRITE8_MEMBER(thedeep_protection_w); diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index c16ba5774a6..b59ca7ee59c 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -49,7 +49,7 @@ public: required_device m_k052109; required_device m_k051960; required_device m_palette; - + DECLARE_READ8_MEMBER(scontra_bankedram_r); DECLARE_WRITE8_MEMBER(scontra_bankedram_w); DECLARE_READ8_MEMBER(thunderx_bankedram_r); diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index bd703acb045..a72913e8d2b 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -34,7 +34,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 742b9c71082..6e90f35224b 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -32,7 +32,7 @@ public: optional_device m_msm; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; int m_msm5205next; int m_toggle; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index 2f1d27de590..d523e0b8d23 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -52,7 +52,7 @@ public: required_device m_filter3; required_device m_gfxdecode; required_device m_palette; - + // Misc UINT16 m_cpua_ctrl; INT32 m_ioc220_port; diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 2a304800364..75de691b9a3 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -31,7 +31,7 @@ public: required_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 672b7a78220..87ef347a334 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -106,7 +106,7 @@ public: required_device m_mcu; optional_device m_msm; required_device m_screen; - + protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index ad607e8b1ce..e0b4f73c54c 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -49,7 +49,7 @@ public: required_device m_oki; required_device m_gfxdecode; required_device m_palette; - + UINT8 m_semicom_prot_offset; UINT16 m_protbase; DECLARE_WRITE16_MEMBER(tumblepb_oki_w); diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index a86e637aab3..279e8710a8a 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -37,5 +37,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 07728d66057..f28dbd2862e 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -48,7 +48,7 @@ public: required_shared_ptr m_sprite_position; required_device m_samples; - + required_device m_gfxdecode; required_device m_screen; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 6aa39553b81..0de5c71a971 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -77,7 +77,7 @@ public: required_device m_upd7759; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; }; class cuebrickj_state : public twin16_state diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 5f2d6cb567f..2763e235b39 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -49,7 +49,7 @@ public: required_shared_ptr m_spriteram; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE32_MEMBER(color_ram_w); DECLARE_READ32_MEMBER(undrfire_input_r); DECLARE_WRITE32_MEMBER(undrfire_input_w); diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 84e34425b8d..763e4376713 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -38,7 +38,7 @@ public: required_device m_spritegen; required_device m_spriteram; required_device m_palette; - + DECLARE_WRITE16_MEMBER(vaportra_sound_w); DECLARE_READ16_MEMBER(vaportra_control_r); DECLARE_READ8_MEMBER(vaportra_soundlatch_r); diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 952ec228abf..830e2ac1ff2 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -41,7 +41,7 @@ public: required_device m_audiocpu; required_device m_pc090oj; required_device m_screen; - + DECLARE_WRITE16_MEMBER(volfied_cchip_ctrl_w); DECLARE_WRITE16_MEMBER(volfied_cchip_bank_w); DECLARE_WRITE16_MEMBER(volfied_cchip_ram_w); diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 7b6e3647563..fd81c7c2f30 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -56,7 +56,7 @@ public: required_device m_2610_2r; required_device m_gfxdecode; required_device m_palette; - + DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE16_MEMBER(warriorb_sound_w); DECLARE_READ16_MEMBER(warriorb_sound_r); diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index c47b1a504a8..3e399252d33 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -24,7 +24,7 @@ public: m_k007232_3(*this, "k007232_3"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") { } optional_shared_ptr m_videostatus; optional_shared_ptr m_protection_ram; diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 257ae9f5ce5..56fdfc747f4 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -68,7 +68,7 @@ public: required_device m_tc0220ioc; required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ16_MEMBER(sharedram_r); DECLARE_WRITE16_MEMBER(sharedram_w); DECLARE_WRITE16_MEMBER(cpua_ctrl_w); diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index d4ab5ddd197..06798fe74cb 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -49,7 +49,7 @@ public: UINT8 m_main_nmi_mask; UINT8 m_sound_nmi_mask; UINT8 m_sprite_bank; - + int m_dsc0; int m_dsc1; diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index ed7ae4c152c..69e0291feea 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -21,7 +21,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - + bitmap_ind16 m_bitmap; bitmap_ind16 m_spritebitmap; int m_CollisionBackground; diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 393e41b17f6..bf989760a1d 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -42,7 +42,7 @@ public: required_shared_ptr m_attributeram; required_shared_ptr m_spriteram; required_shared_ptr m_bulletsram; - + required_device m_gfxdecode; required_device m_palette; diff --git a/src/mame/layout/cherryb3.lay b/src/mame/layout/cherryb3.lay index a484edcada0..e6822b47a8e 100644 --- a/src/mame/layout/cherryb3.lay +++ b/src/mame/layout/cherryb3.lay @@ -1,8 +1,8 @@ diff --git a/src/mame/layout/dblcrown.lay b/src/mame/layout/dblcrown.lay index 3c715509bfa..f13472c5b68 100644 --- a/src/mame/layout/dblcrown.lay +++ b/src/mame/layout/dblcrown.lay @@ -1,8 +1,8 @@ diff --git a/src/mame/layout/gamball.lay b/src/mame/layout/gamball.lay index 58160a541c8..b029771f237 100644 --- a/src/mame/layout/gamball.lay +++ b/src/mame/layout/gamball.lay @@ -10,7 +10,7 @@ - + @@ -309,7 +309,7 @@ - + diff --git a/src/mame/layout/goldstar.lay b/src/mame/layout/goldstar.lay index ad35d8a9ee6..cf2ede71722 100644 --- a/src/mame/layout/goldstar.lay +++ b/src/mame/layout/goldstar.lay @@ -1,8 +1,8 @@ diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c index 09c5946fed1..3476410521c 100644 --- a/src/mame/machine/asteroid.c +++ b/src/mame/machine/asteroid.c @@ -140,4 +140,4 @@ void asteroid_state::machine_reset() MACHINE_RESET_MEMBER(asteroid_state, llander) { m_dvg->reset_w(m_maincpu->space(AS_PROGRAM), 0, 0); -} \ No newline at end of file +} diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index 76bcf8e425c..3f7053cc933 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -278,4 +278,3 @@ void atari_common_state::atari_machine_start() machine().save().save_pointer(NAME((UINT8 *) &antic.r), sizeof(antic.r)); machine().save().save_pointer(NAME((UINT8 *) &antic.w), sizeof(antic.w)); } - diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 0b23c42f79b..fbffdad9e10 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -79,7 +79,7 @@ { astring fulltag(device->tag(), ":mob"); device_t *device; \ MCFG_ATARI_MOTION_OBJECTS_ADD(fulltag, "^^screen", _config) \ MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("^" _gfxtag) } - + #define MCFG_ATARI_EEPROM_2804_ADD(_tag) \ diff --git a/src/mame/machine/cdi070.h b/src/mame/machine/cdi070.h index 4290c926875..c5f0f56c8a7 100644 --- a/src/mame/machine/cdi070.h +++ b/src/mame/machine/cdi070.h @@ -154,7 +154,7 @@ public: DECLARE_READ16_MEMBER(periphs_r); DECLARE_WRITE16_MEMBER(periphs_w); - + DECLARE_READ16_MEMBER(uart_loopback_enable); TIMER_CALLBACK_MEMBER( timer0_callback ); diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h index 477de2ef854..14269cf6942 100644 --- a/src/mame/machine/gaelco3d.h +++ b/src/mame/machine/gaelco3d.h @@ -64,7 +64,7 @@ class gaelco_serial_device : public device_t public: gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gaelco_serial_device() {} - + template static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( status_r); diff --git a/src/mame/machine/igs036crypt.c b/src/mame/machine/igs036crypt.c index 2c10945dc1d..7cf5140ad65 100644 --- a/src/mame/machine/igs036crypt.c +++ b/src/mame/machine/igs036crypt.c @@ -8,16 +8,16 @@ previous IGS encryption schemes. Basically, it consists on a rotation-based non-trivial obfuscation layered upon a simple address-based XOR encryption (similar to the ones found in previous IGS circuits). -The scheme works on 16-bits words and is probably designed to depend on 24 bits of -(word-) address; in what follows, we will refer to the 8 lowest ones simply as the +The scheme works on 16-bits words and is probably designed to depend on 24 bits of +(word-) address; in what follows, we will refer to the 8 lowest ones simply as the lowest bits of the address, and the other 16 as the highest bits the address. The address-based XOR is thought to be comprised of 16 one-bit XOR controlled by a certain combination of one or two of the highest address bits (but only -15 of them are observed, probably due to the fact that no game uses more than +15 of them are observed, probably due to the fact that no game uses more than 2^22 of the 2^24 address space). Every one of the one-bit XORs affects a different bit -of the word. The game key acts by masking on/off those XORs for every combination -of the lowest address bits. Thus, a complete key can be described by 256 16-bits values. +of the word. The game key acts by masking on/off those XORs for every combination +of the lowest address bits. Thus, a complete key can be described by 256 16-bits values. This use of the key is pretty similar to the one found in previous instantiations of IGS circuits. @@ -48,7 +48,7 @@ On a different note, the unused tail of the ROMs are pattern-filled and, more in that region appears to be hiding 20-bytes values (SHA-1 hashes?) located at positions which vary per set. See the table below. -driver 20-bytes value position in the ROM +driver 20-bytes value position in the ROM --------- ---------------------------------- orleg2o $763984-$763997 orleg2 $76C77C-$76C78F @@ -77,7 +77,7 @@ UINT16 igs036_decryptor::decrypt(UINT16 cipherword, int word_address)const { // key-independent manipulation int aux = deobfuscate(cipherword, word_address); - + // key-dependent manipulation for (int i=0; i<16; ++i) { @@ -87,7 +87,7 @@ UINT16 igs036_decryptor::decrypt(UINT16 cipherword, int word_address)const aux ^= (1<>(16-shift); - + return r|l; } @@ -175,10 +175,10 @@ const UINT16 igs036_decryptor::triggers[16][2] = { // of function on the 8 lowest word-address bits. Some comments: // * Bits #5 & #6 are unused so, in fact, they only depend on 6 address bits // * The functions are clearly low-complexity boolean functions on those 6 bits -// rather than, say, random lookup tables -// * There are quite a number of functionally equivalent ways to implement -// those boolean functions, so the given implementation (by multiplexing -// over some simple functions) shouldn't be taken too seriously: while it's +// rather than, say, random lookup tables +// * There are quite a number of functionally equivalent ways to implement +// those boolean functions, so the given implementation (by multiplexing +// over some simple functions) shouldn't be taken too seriously: while it's // functionally correct, it doesn't neccesarily represent the way the hardware // is calculating them. @@ -233,38 +233,38 @@ int (*igs036_decryptor::rot_direction[4][8])(int) = { // if any. The only exception is DDPDOJ (see below). const UINT16 orleg2_key[0x100] = { - 0x8100, 0x9202, 0x3000, 0x1200, 0x0100, 0x0800, 0x2100, 0xab05, - 0x130a, 0xba0a, 0x0308, 0x9200, 0x8306, 0xab0f, 0x200c, 0x0301, - 0x9010, 0x1b13, 0x1310, 0x1b11, 0x8104, 0x0212, 0x8204, 0x8214, - 0x8302, 0x1111, 0x8300, 0x1b19, 0x0110, 0x8202, 0x0310, 0x0301, - 0x8322, 0xb202, 0xb200, 0x9121, 0x8222, 0x0a26, 0x2000, 0x0321, - 0xb000, 0x0020, 0x9328, 0x3909, 0x230a, 0x8929, 0x8224, 0x2204, - 0x0322, 0x9b33, 0x0300, 0x9311, 0x8120, 0x8810, 0x0330, 0x0004, - 0x832a, 0x8a0a, 0x0100, 0x1131, 0x0138, 0x093d, 0x8128, 0x081c, - 0xe342, 0x8101, 0xf140, 0x0000, 0x6144, 0x2004, 0x8204, 0x4044, - 0xa302, 0xdb4b, 0x1000, 0xa200, 0xc044, 0xe044, 0x010c, 0x0204, - 0x1212, 0xdb53, 0xd050, 0xcb41, 0x4150, 0xc347, 0x4340, 0x0101, - 0x5252, 0xd959, 0x1310, 0xc040, 0xc252, 0xc959, 0x4340, 0x8919, - 0x2202, 0x3800, 0xe340, 0x2101, 0x0326, 0x2307, 0x4360, 0x8321, - 0x3000, 0xbb0b, 0x5068, 0xf848, 0x436a, 0xab0b, 0xa10c, 0xe240, - 0xc140, 0xc363, 0x8300, 0x4961, 0x0004, 0xc860, 0x0324, 0x0000, - 0xd070, 0x8101, 0xd070, 0x1331, 0x0104, 0x4a6e, 0x4348, 0x4a78, - 0xa282, 0xb282, 0x0200, 0x2200, 0x8180, 0x8080, 0x8080, 0x0800, - 0x1302, 0x9989, 0x2008, 0x2000, 0xa386, 0x0b0f, 0x828c, 0xa280, - 0x9392, 0x9292, 0x1010, 0x8080, 0x0206, 0x8383, 0x8294, 0x0911, - 0x8382, 0x0a0a, 0x9190, 0x1010, 0x0008, 0x0b0b, 0x8098, 0x8b9d, - 0x1120, 0x0820, 0x2200, 0xa080, 0x81a4, 0xa286, 0xa380, 0xaa80, - 0x0120, 0x1020, 0xb088, 0x1020, 0x2000, 0x0b2b, 0x2100, 0x2a0c, - 0x9292, 0x98b0, 0x1330, 0x8880, 0x8396, 0x0b17, 0x8080, 0x0325, - 0x0000, 0x99b9, 0x92b0, 0x82a0, 0x8184, 0x0020, 0x0330, 0x0818, - 0xe1c0, 0xa981, 0xd1c0, 0xd0c0, 0x6140, 0x4242, 0xc2c4, 0x6345, - 0xb088, 0x7141, 0x4040, 0xa181, 0x220e, 0xe0c4, 0x4144, 0x6a4c, - 0xd0d0, 0x9a92, 0x1310, 0xd9d1, 0x8392, 0xc0c4, 0x8284, 0x8890, - 0xc0c0, 0x8282, 0x8280, 0x9090, 0x4342, 0x0a0a, 0x4240, 0xc1d5, - 0xb080, 0xb282, 0xc1e0, 0x90a0, 0xa084, 0x4b63, 0x81a0, 0xeac0, - 0x7242, 0x5363, 0x7348, 0x0321, 0x022a, 0x6949, 0x4360, 0x8aa8, - 0x8282, 0x0303, 0x8180, 0x1331, 0x83a2, 0x4b53, 0x4364, 0x83b1, - 0x121a, 0x80a0, 0x1238, 0x0000, 0x82ba, 0x0030, 0xc0c0, 0x4264, + 0x8100, 0x9202, 0x3000, 0x1200, 0x0100, 0x0800, 0x2100, 0xab05, + 0x130a, 0xba0a, 0x0308, 0x9200, 0x8306, 0xab0f, 0x200c, 0x0301, + 0x9010, 0x1b13, 0x1310, 0x1b11, 0x8104, 0x0212, 0x8204, 0x8214, + 0x8302, 0x1111, 0x8300, 0x1b19, 0x0110, 0x8202, 0x0310, 0x0301, + 0x8322, 0xb202, 0xb200, 0x9121, 0x8222, 0x0a26, 0x2000, 0x0321, + 0xb000, 0x0020, 0x9328, 0x3909, 0x230a, 0x8929, 0x8224, 0x2204, + 0x0322, 0x9b33, 0x0300, 0x9311, 0x8120, 0x8810, 0x0330, 0x0004, + 0x832a, 0x8a0a, 0x0100, 0x1131, 0x0138, 0x093d, 0x8128, 0x081c, + 0xe342, 0x8101, 0xf140, 0x0000, 0x6144, 0x2004, 0x8204, 0x4044, + 0xa302, 0xdb4b, 0x1000, 0xa200, 0xc044, 0xe044, 0x010c, 0x0204, + 0x1212, 0xdb53, 0xd050, 0xcb41, 0x4150, 0xc347, 0x4340, 0x0101, + 0x5252, 0xd959, 0x1310, 0xc040, 0xc252, 0xc959, 0x4340, 0x8919, + 0x2202, 0x3800, 0xe340, 0x2101, 0x0326, 0x2307, 0x4360, 0x8321, + 0x3000, 0xbb0b, 0x5068, 0xf848, 0x436a, 0xab0b, 0xa10c, 0xe240, + 0xc140, 0xc363, 0x8300, 0x4961, 0x0004, 0xc860, 0x0324, 0x0000, + 0xd070, 0x8101, 0xd070, 0x1331, 0x0104, 0x4a6e, 0x4348, 0x4a78, + 0xa282, 0xb282, 0x0200, 0x2200, 0x8180, 0x8080, 0x8080, 0x0800, + 0x1302, 0x9989, 0x2008, 0x2000, 0xa386, 0x0b0f, 0x828c, 0xa280, + 0x9392, 0x9292, 0x1010, 0x8080, 0x0206, 0x8383, 0x8294, 0x0911, + 0x8382, 0x0a0a, 0x9190, 0x1010, 0x0008, 0x0b0b, 0x8098, 0x8b9d, + 0x1120, 0x0820, 0x2200, 0xa080, 0x81a4, 0xa286, 0xa380, 0xaa80, + 0x0120, 0x1020, 0xb088, 0x1020, 0x2000, 0x0b2b, 0x2100, 0x2a0c, + 0x9292, 0x98b0, 0x1330, 0x8880, 0x8396, 0x0b17, 0x8080, 0x0325, + 0x0000, 0x99b9, 0x92b0, 0x82a0, 0x8184, 0x0020, 0x0330, 0x0818, + 0xe1c0, 0xa981, 0xd1c0, 0xd0c0, 0x6140, 0x4242, 0xc2c4, 0x6345, + 0xb088, 0x7141, 0x4040, 0xa181, 0x220e, 0xe0c4, 0x4144, 0x6a4c, + 0xd0d0, 0x9a92, 0x1310, 0xd9d1, 0x8392, 0xc0c4, 0x8284, 0x8890, + 0xc0c0, 0x8282, 0x8280, 0x9090, 0x4342, 0x0a0a, 0x4240, 0xc1d5, + 0xb080, 0xb282, 0xc1e0, 0x90a0, 0xa084, 0x4b63, 0x81a0, 0xeac0, + 0x7242, 0x5363, 0x7348, 0x0321, 0x022a, 0x6949, 0x4360, 0x8aa8, + 0x8282, 0x0303, 0x8180, 0x1331, 0x83a2, 0x4b53, 0x4364, 0x83b1, + 0x121a, 0x80a0, 0x1238, 0x0000, 0x82ba, 0x0030, 0xc0c0, 0x4264, }; const UINT16 m312cn_key[0x100] = { diff --git a/src/mame/machine/igs036crypt.h b/src/mame/machine/igs036crypt.h index 47f89cc8831..5461530c61e 100644 --- a/src/mame/machine/igs036crypt.h +++ b/src/mame/machine/igs036crypt.h @@ -10,10 +10,10 @@ public: void decrypter_rom(memory_region* region); UINT16 decrypt(UINT16 cipherword, int word_address)const; UINT16 deobfuscate(UINT16 cipherword, int word_address)const; - + private: const UINT16* key; - + static int (*rot_enabling[16][4])(int); static int (*rot_direction[4][8])(int); static const UINT16 triggers[16][2]; diff --git a/src/mame/machine/inder_sb.c b/src/mame/machine/inder_sb.c index 2309b1d95dd..718833e0725 100644 --- a/src/mame/machine/inder_sb.c +++ b/src/mame/machine/inder_sb.c @@ -24,26 +24,26 @@ inder_sb_device::inder_sb_device(const machine_config &mconfig, const char *tag, // hacks for test purposes, these are installed over the program rom so we know when irqs are actually taken -READ8_MEMBER(inder_sb_device::megaphx_02cc_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02cc\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[0] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02cc]; }; -READ8_MEMBER(inder_sb_device::megaphx_02e6_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02e6\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[1] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02e6]; }; -READ8_MEMBER(inder_sb_device::megaphx_0309_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0309\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[2] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0309]; }; -READ8_MEMBER(inder_sb_device::megaphx_0323_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0323\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[3] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0323]; }; +READ8_MEMBER(inder_sb_device::megaphx_02cc_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02cc\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[0] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02cc]; }; +READ8_MEMBER(inder_sb_device::megaphx_02e6_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02e6\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[1] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02e6]; }; +READ8_MEMBER(inder_sb_device::megaphx_0309_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0309\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[2] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0309]; }; +READ8_MEMBER(inder_sb_device::megaphx_0323_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0323\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[3] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0323]; }; READ16_MEMBER(inder_sb_device::megaphx_0x050002_r) { space.machine().scheduler().synchronize(); -// int pc = machine().device("maincpu")->safe_pc(); +// int pc = machine().device("maincpu")->safe_pc(); int ret = m_soundback; m_soundback = 0; //logerror("(%06x) megaphx_0x050002_r (from z80?) %04x\n", pc, mem_mask); - return ret; + return ret; } WRITE16_MEMBER(inder_sb_device::megaphx_0x050000_w) { -// int pc = machine().device("maincpu")->safe_pc(); +// int pc = machine().device("maincpu")->safe_pc(); space.machine().scheduler().synchronize(); //logerror("(%06x) megaphx_0x050000_w (to z80?) %04x %04x\n", pc, data, mem_mask); @@ -69,8 +69,8 @@ void inder_sb_device::update_sound_irqs(void) WRITE_LINE_MEMBER(inder_sb_device::z80ctc_ch0) { -// int bank = m_soundbank[0] & 7; membank("snddata")->set_entry(bank); -// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); +// int bank = m_soundbank[0] & 7; membank("snddata")->set_entry(bank); +// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); if (state) m_soundirq |= 0x1; else m_soundirq &= ~0x1; @@ -80,8 +80,8 @@ WRITE_LINE_MEMBER(inder_sb_device::z80ctc_ch0) WRITE_LINE_MEMBER(inder_sb_device::z80ctc_ch1) { -// int bank = m_soundbank[1] & 7; membank("snddata")->set_entry(bank); -// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); +// int bank = m_soundbank[1] & 7; membank("snddata")->set_entry(bank); +// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); if (state) m_soundirq |= 0x2; else m_soundirq &= ~0x2; @@ -91,8 +91,8 @@ WRITE_LINE_MEMBER(inder_sb_device::z80ctc_ch1) WRITE_LINE_MEMBER(inder_sb_device::z80ctc_ch2) { -// int bank = m_soundbank[2] & 7; membank("snddata")->set_entry(bank); -// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); +// int bank = m_soundbank[2] & 7; membank("snddata")->set_entry(bank); +// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); if (state) m_soundirq |= 0x4; else m_soundirq &= ~0x4; @@ -104,15 +104,15 @@ WRITE_LINE_MEMBER(inder_sb_device::z80ctc_ch2) WRITE_LINE_MEMBER(inder_sb_device::z80ctc_ch3) { -// int bank = m_soundbank[3] & 7; membank("snddata")->set_entry(bank); -// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); +// int bank = m_soundbank[3] & 7; membank("snddata")->set_entry(bank); +// m_audiocpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); if (state) m_soundirq |= 0x8; else m_soundirq &= ~0x8; update_sound_irqs(); } - + static Z80CTC_INTERFACE( z80ctc_intf ) // runs in IM2 , vector set to 0x20 , values there are 0xCC, 0x02, 0xE6, 0x02, 0x09, 0x03, 0x23, 0x03 (so 02cc, 02e6, 0309, 0323, all of which are valid irq handlers) @@ -152,7 +152,7 @@ READ8_MEMBER(inder_sb_device::megaphx_sound_sent_r) WRITE8_MEMBER(inder_sb_device::megaphx_sound_to_68k_w) { -// int pc = machine().device("audiocpu")->safe_pc(); +// int pc = machine().device("audiocpu")->safe_pc(); space.machine().scheduler().synchronize(); //logerror("(%04x) megaphx_sound_to_68k_w (to 68k?) %02x\n", pc, data); @@ -161,49 +161,49 @@ WRITE8_MEMBER(inder_sb_device::megaphx_sound_to_68k_w) WRITE8_MEMBER(inder_sb_device::dac0_value_write) { -// printf("dac0_data_write %02x\n", data); +// printf("dac0_data_write %02x\n", data); m_dac0->write_unsigned8(data); } WRITE8_MEMBER(inder_sb_device::dac0_gain_write) { -// printf("dac0_gain_write %02x\n", data); +// printf("dac0_gain_write %02x\n", data); dac_gain[0] = data; } WRITE8_MEMBER(inder_sb_device::dac1_value_write) { -// printf("dac1_data_write %02x\n", data); +// printf("dac1_data_write %02x\n", data); m_dac1->write_unsigned8(data); } WRITE8_MEMBER(inder_sb_device::dac1_gain_write) { -// printf("dac1_gain_write %02x\n", data); +// printf("dac1_gain_write %02x\n", data); dac_gain[1] = data; } WRITE8_MEMBER(inder_sb_device::dac2_value_write) { -// printf("dac2_data_write %02x\n", data); +// printf("dac2_data_write %02x\n", data); m_dac2->write_unsigned8(data); } WRITE8_MEMBER(inder_sb_device::dac2_gain_write) { -// printf("dac2_gain_write %02x\n", data); +// printf("dac2_gain_write %02x\n", data); dac_gain[2] = data; } WRITE8_MEMBER(inder_sb_device::dac3_value_write) { -// printf("dac3_data_write %02x\n", data); +// printf("dac3_data_write %02x\n", data); m_dac3->write_unsigned8(data); } WRITE8_MEMBER(inder_sb_device::dac3_gain_write) { -// printf("dac3_gain_write %02x\n", data); +// printf("dac3_gain_write %02x\n", data); dac_gain[3] = data; } @@ -211,26 +211,26 @@ WRITE8_MEMBER(inder_sb_device::dac0_rombank_write) { m_soundbank[0] = data; -// printf("dac0_rombank_write %02x", data); +// printf("dac0_rombank_write %02x", data); } WRITE8_MEMBER(inder_sb_device::dac1_rombank_write) { m_soundbank[1] = data; -// printf("dac1_rombank_write %02x", data); +// printf("dac1_rombank_write %02x", data); } WRITE8_MEMBER(inder_sb_device::dac2_rombank_write) { m_soundbank[2] = data; -// printf("dac2_rombank_write %02x", data); +// printf("dac2_rombank_write %02x", data); } WRITE8_MEMBER(inder_sb_device::dac3_rombank_write) { m_soundbank[3] = data; -// printf("dac3_rombank_write %02x", data); +// printf("dac3_rombank_write %02x", data); } @@ -253,10 +253,10 @@ static ADDRESS_MAP_START( sound_io, AS_IO, 8, inder_sb_device ) AM_RANGE(0x13, 0x13) AM_WRITE(dac3_rombank_write) - + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) - + AM_RANGE(0x30, 0x30) AM_READWRITE(megaphx_sound_cmd_r, megaphx_sound_to_68k_w) AM_RANGE(0x31, 0x31) AM_READ(megaphx_sound_sent_r) ADDRESS_MAP_END @@ -271,7 +271,7 @@ static MACHINE_CONFIG_FRAGMENT( inder_sb ) MCFG_Z80CTC_ADD( "ctc", 4000000, z80ctc_intf ) // unk freq - MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_DAC_ADD("dac0") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_DAC_ADD("dac1") diff --git a/src/mame/machine/inder_sb.h b/src/mame/machine/inder_sb.h index 331ad9a4968..2dc684a7b19 100644 --- a/src/mame/machine/inder_sb.h +++ b/src/mame/machine/inder_sb.h @@ -89,4 +89,4 @@ private: }; -#endif \ No newline at end of file +#endif diff --git a/src/mame/machine/inder_vid.c b/src/mame/machine/inder_vid.c index 15c3ba3f614..ad672badddc 100644 --- a/src/mame/machine/inder_vid.c +++ b/src/mame/machine/inder_vid.c @@ -13,7 +13,7 @@ extern const device_type INDER_VIDEO = &device_creator; inder_vid_device::inder_vid_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, INDER_VIDEO, "Inder / Dinamic TMS Video", tag, owner, clock, "indervd", __FILE__), -/* device_video_interface(mconfig, *this, false), */ +/* device_video_interface(mconfig, *this, false), */ m_vram(*this, "vram"), m_palette(*this, "palette"), m_tms(*this, "tms") @@ -71,7 +71,7 @@ static void megaphx_to_shiftreg(address_space &space, UINT32 address, UINT16 *sh static void megaphx_from_shiftreg(address_space &space, UINT32 address, UINT16 *shiftreg) { -// printf("write from shift regs address %08x (%08x)\n", address, TOWORD(address) * 2); +// printf("write from shift regs address %08x (%08x)\n", address, TOWORD(address) * 2); inder_vid_device *state = (inder_vid_device*)space.machine().device("inder_vid"); @@ -125,7 +125,7 @@ static MACHINE_CONFIG_FRAGMENT( inder_vid ) MCFG_PALETTE_ADD("palette", 256) - + MCFG_RAMDAC_ADD("ramdac", ramdac_intf, ramdac_map, "palette") @@ -138,7 +138,6 @@ machine_config_constructor inder_vid_device::device_mconfig_additions() const void inder_vid_device::device_start() { - } void inder_vid_device::device_reset() diff --git a/src/mame/machine/inder_vid.h b/src/mame/machine/inder_vid.h index c903a7d8619..30033531a8a 100644 --- a/src/mame/machine/inder_vid.h +++ b/src/mame/machine/inder_vid.h @@ -20,7 +20,7 @@ extern const device_type INDER_VIDEO; class inder_vid_device : public device_t -/* public device_video_interface */ +/* public device_video_interface */ { public: // construction/destruction @@ -29,7 +29,7 @@ public: required_shared_ptr m_vram; required_device m_palette; required_device m_tms; - + int m_shiftfull; // this might be a driver specific hack for a TMS bug. protected: @@ -44,4 +44,4 @@ private: }; -#endif \ No newline at end of file +#endif diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c index 12a317e82ec..ce9af87f50b 100644 --- a/src/mame/machine/megadriv.c +++ b/src/mame/machine/megadriv.c @@ -1048,8 +1048,8 @@ DRIVER_INIT_MEMBER(md_base_state,megadriv_c2) m_vdp->set_vdp_pal(FALSE); m_vdp->set_framerate(60); m_vdp->set_total_scanlines(262); - - m_version_hi_nibble = 0x20; // JPN NTSC no-SCD + + m_version_hi_nibble = 0x20; // JPN NTSC no-SCD } @@ -1064,7 +1064,7 @@ DRIVER_INIT_MEMBER(md_base_state, megadriv) m_vdp->set_framerate(60); m_vdp->set_total_scanlines(262); - m_version_hi_nibble = 0xa0; // Export NTSC no-SCD + m_version_hi_nibble = 0xa0; // Export NTSC no-SCD } DRIVER_INIT_MEMBER(md_base_state, megadrij) @@ -1076,8 +1076,8 @@ DRIVER_INIT_MEMBER(md_base_state, megadrij) m_vdp->set_vdp_pal(FALSE); m_vdp->set_framerate(60); m_vdp->set_total_scanlines(262); - - m_version_hi_nibble = 0x20; // JPN NTSC no-SCD + + m_version_hi_nibble = 0x20; // JPN NTSC no-SCD } DRIVER_INIT_MEMBER(md_base_state, megadrie) @@ -1090,7 +1090,7 @@ DRIVER_INIT_MEMBER(md_base_state, megadrie) m_vdp->set_framerate(50); m_vdp->set_total_scanlines(313); - m_version_hi_nibble = 0xe0; // Export PAL no-SCD + m_version_hi_nibble = 0xe0; // Export PAL no-SCD } void md_base_state::screen_eof_megadriv(screen_device &screen, bool state) diff --git a/src/mame/machine/namco06.c b/src/mame/machine/namco06.c index fa09d7cb188..f8b6703f530 100644 --- a/src/mame/machine/namco06.c +++ b/src/mame/machine/namco06.c @@ -101,7 +101,7 @@ TIMER_CALLBACK_MEMBER( namco_06xx_device::nmi_generate ) READ8_MEMBER( namco_06xx_device::data_r ) -{ +{ UINT8 result = 0xff; LOG(("%s: 06XX '%s' read offset %d\n",machine().describe_context(),tag(),offset)); @@ -122,7 +122,7 @@ READ8_MEMBER( namco_06xx_device::data_r ) WRITE8_MEMBER( namco_06xx_device::data_w ) -{ +{ LOG(("%s: 06XX '%s' write offset %d = %02x\n",machine().describe_context(),tag(),offset,data)); if (m_control & 0x10) @@ -138,13 +138,13 @@ WRITE8_MEMBER( namco_06xx_device::data_w ) READ8_MEMBER( namco_06xx_device::ctrl_r ) -{ +{ LOG(("%s: 06XX '%s' ctrl_r\n",machine().describe_context(),tag())); return m_control; } WRITE8_MEMBER( namco_06xx_device::ctrl_w ) -{ +{ LOG(("%s: 06XX '%s' control %02x\n",space.machine().describe_context(),tag(),data)); m_control = data; @@ -183,11 +183,11 @@ namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char * m_read_0(*this), m_read_1(*this), m_read_2(*this), - m_read_3(*this), + m_read_3(*this), m_readreq_0(*this), m_readreq_1(*this), m_readreq_2(*this), - m_readreq_3(*this), + m_readreq_3(*this), m_write_0(*this), m_write_1(*this), m_write_2(*this), @@ -212,7 +212,7 @@ void namco_06xx_device::device_start() m_write_0.resolve(); m_write_1.resolve(); m_write_2.resolve(); - m_write_3.resolve(); + m_write_3.resolve(); /* allocate a timer */ m_nmi_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namco_06xx_device::nmi_generate),this)); diff --git a/src/mame/machine/namco06.h b/src/mame/machine/namco06.h index 94be8bfac2c..4a539566483 100644 --- a/src/mame/machine/namco06.h +++ b/src/mame/machine/namco06.h @@ -16,7 +16,7 @@ struct namco_06xx_config #define MCFG_NAMCO_06XX_ADD(_tag, _clock) \ MCFG_DEVICE_ADD(_tag, NAMCO_06XX, _clock) - + #define MCFG_NAMCO_06XX_MAINCPU(_tag) \ namco_06xx_device::set_maincpu(*device, "^" _tag); @@ -44,20 +44,20 @@ struct namco_06xx_config #define MCFG_NAMCO_06XX_READ_REQUEST_3_CB(_devcb) \ devcb = &namco_06xx_device::set_read_request_3_callback(*device, DEVCB2_##_devcb); - + #define MCFG_NAMCO_06XX_WRITE_0_CB(_devcb) \ devcb = &namco_06xx_device::set_write_0_callback(*device, DEVCB2_##_devcb); #define MCFG_NAMCO_06XX_WRITE_1_CB(_devcb) \ devcb = &namco_06xx_device::set_write_1_callback(*device, DEVCB2_##_devcb); - + #define MCFG_NAMCO_06XX_WRITE_2_CB(_devcb) \ devcb = &namco_06xx_device::set_write_2_callback(*device, DEVCB2_##_devcb); #define MCFG_NAMCO_06XX_WRITE_3_CB(_devcb) \ devcb = &namco_06xx_device::set_write_3_callback(*device, DEVCB2_##_devcb); - + /* device get info callback */ class namco_06xx_device : public device_t @@ -66,17 +66,17 @@ public: namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_maincpu(device_t &device, const char *tag) { downcast(device).m_nmicpu.set_tag(tag); } - + template static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast(device).m_read_0.set_callback(object); } template static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast(device).m_read_1.set_callback(object); } template static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast(device).m_read_2.set_callback(object); } template static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast(device).m_read_3.set_callback(object); } - + template static devcb2_base &set_read_request_0_callback(device_t &device, _Object object) { return downcast(device).m_readreq_0.set_callback(object); } template static devcb2_base &set_read_request_1_callback(device_t &device, _Object object) { return downcast(device).m_readreq_1.set_callback(object); } template static devcb2_base &set_read_request_2_callback(device_t &device, _Object object) { return downcast(device).m_readreq_2.set_callback(object); } template static devcb2_base &set_read_request_3_callback(device_t &device, _Object object) { return downcast(device).m_readreq_3.set_callback(object); } - + template static devcb2_base &set_write_0_callback(device_t &device, _Object object) { return downcast(device).m_write_0.set_callback(object); } template static devcb2_base &set_write_1_callback(device_t &device, _Object object) { return downcast(device).m_write_1.set_callback(object); } @@ -95,8 +95,8 @@ protected: private: TIMER_CALLBACK_MEMBER( nmi_generate ); - - // internal state + + // internal state UINT8 m_control; emu_timer *m_nmi_timer; @@ -106,16 +106,16 @@ private: devcb2_read8 m_read_1; devcb2_read8 m_read_2; devcb2_read8 m_read_3; - + devcb2_write_line m_readreq_0; devcb2_write_line m_readreq_1; devcb2_write_line m_readreq_2; devcb2_write_line m_readreq_3; - + devcb2_write8 m_write_0; devcb2_write8 m_write_1; devcb2_write8 m_write_2; - devcb2_write8 m_write_3; + devcb2_write8 m_write_3; }; extern const device_type NAMCO_06XX; diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c index ce1de7be109..8967806295a 100644 --- a/src/mame/machine/namco50.c +++ b/src/mame/machine/namco50.c @@ -176,7 +176,7 @@ TIMER_CALLBACK_MEMBER( namco_50xx_device::irq_clear ) } void namco_50xx_device::irq_set() -{ +{ m_cpu->set_input_line(0, ASSERT_LINE); // The execution time of one instruction is ~4us, so we must make sure to diff --git a/src/mame/machine/namco50.h b/src/mame/machine/namco50.h index 3d981bdd3e3..8ff9ff82492 100644 --- a/src/mame/machine/namco50.h +++ b/src/mame/machine/namco50.h @@ -14,11 +14,11 @@ class namco_50xx_device : public device_t { public: namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + WRITE8_MEMBER( write ); WRITE_LINE_MEMBER(read_request); READ8_MEMBER( read ); - + READ8_MEMBER( K_r ); READ8_MEMBER( R0_r ); READ8_MEMBER( R2_r ); @@ -29,11 +29,11 @@ protected: virtual void device_start(); virtual const rom_entry *device_rom_region() const; virtual machine_config_constructor device_mconfig_additions() const; - + TIMER_CALLBACK_MEMBER( latch_callback ); TIMER_CALLBACK_MEMBER( readrequest_callback ); TIMER_CALLBACK_MEMBER( irq_clear ); - void irq_set(); + void irq_set(); private: // internal state required_device m_cpu; diff --git a/src/mame/machine/namco51.h b/src/mame/machine/namco51.h index 1e5533df222..14fcef33a2c 100644 --- a/src/mame/machine/namco51.h +++ b/src/mame/machine/namco51.h @@ -7,7 +7,7 @@ #define MCFG_NAMCO_51XX_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, NAMCO_51XX, _clock) + MCFG_DEVICE_ADD(_tag, NAMCO_51XX, _clock) #define MCFG_NAMCO_51XX_INPUT_0_CB(_devcb) \ devcb = &namco_51xx_device::set_input_0_callback(*device, DEVCB2_##_devcb); @@ -36,13 +36,13 @@ public: template static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast(device).m_in_1.set_callback(object); } template static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast(device).m_in_2.set_callback(object); } template static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast(device).m_in_3.set_callback(object); } - + template static devcb2_base &set_output_0_callback(device_t &device, _Object object) { return downcast(device).m_out_0.set_callback(object); } template static devcb2_base &set_output_1_callback(device_t &device, _Object object) { return downcast(device).m_out_1.set_callback(object); } - + DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); - + protected: // device-level overrides virtual void device_start(); diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c index fbfa9083f29..e5e809ec465 100644 --- a/src/mame/machine/namco53.c +++ b/src/mame/machine/namco53.c @@ -69,13 +69,13 @@ READ8_MEMBER( namco_53xx_device::K_r ) READ8_MEMBER( namco_53xx_device::Rx_r ) { switch(offset) { - case 0 : return m_in_0(0); - case 1 : return m_in_1(0); - case 2 : return m_in_2(0); - case 3 : return m_in_3(0); + case 0 : return m_in_0(0); + case 1 : return m_in_1(0); + case 2 : return m_in_2(0); + case 3 : return m_in_3(0); default : return 0xff; } - + } WRITE8_MEMBER( namco_53xx_device::O_w ) diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h index 3c6eb0807c4..03a1324ef9a 100644 --- a/src/mame/machine/namco53.h +++ b/src/mame/machine/namco53.h @@ -26,7 +26,7 @@ #define MCFG_NAMCO_53XX_P_CB(_devcb) \ devcb = &namco_53xx_device::set_p_port_callback(*device, DEVCB2_##_devcb); - + class namco_53xx_device : public device_t { public: @@ -36,7 +36,7 @@ public: template static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast(device).m_in_1.set_callback(object); } template static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast(device).m_in_2.set_callback(object); } template static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast(device).m_in_3.set_callback(object); } - + template static devcb2_base &set_k_port_callback(device_t &device, _Object object) { return downcast(device).m_k.set_callback(object); } template static devcb2_base &set_p_port_callback(device_t &device, _Object object) { return downcast(device).m_p.set_callback(object); } @@ -44,7 +44,7 @@ public: DECLARE_READ8_MEMBER( Rx_r ); DECLARE_WRITE8_MEMBER( O_w ); DECLARE_WRITE8_MEMBER( P_w ); - + DECLARE_WRITE_LINE_MEMBER(read_request); DECLARE_READ8_MEMBER( read ); @@ -53,17 +53,17 @@ protected: virtual void device_start(); virtual const rom_entry *device_rom_region() const; virtual machine_config_constructor device_mconfig_additions() const; - + TIMER_CALLBACK_MEMBER( irq_clear ); private: // internal state required_device m_cpu; UINT8 m_portO; devcb2_read8 m_k; - devcb2_read8 m_in_0; - devcb2_read8 m_in_1; - devcb2_read8 m_in_2; - devcb2_read8 m_in_3; + devcb2_read8 m_in_0; + devcb2_read8 m_in_1; + devcb2_read8 m_in_2; + devcb2_read8 m_in_3; devcb2_write8 m_p; }; diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h index 01a1e7ab162..e6ff411b2cc 100644 --- a/src/mame/machine/namco62.h +++ b/src/mame/machine/namco62.h @@ -34,10 +34,10 @@ public: template static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast(device).m_in_1.set_callback(object); } template static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast(device).m_in_2.set_callback(object); } template static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast(device).m_in_3.set_callback(object); } - + template static devcb2_base &set_output_0_callback(device_t &device, _Object object) { return downcast(device).m_out_0.set_callback(object); } template static devcb2_base &set_output_1_callback(device_t &device, _Object object) { return downcast(device).m_out_1.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h index 9ab29641f0d..1e05b758ea4 100644 --- a/src/mame/machine/namcoio.h +++ b/src/mame/machine/namcoio.h @@ -17,8 +17,8 @@ public: template static devcb2_base &set_in_3_callback(device_t &device, _Object object) { return downcast(device).m_in_3_cb.set_callback(object); } template static devcb2_base &set_out_0_callback(device_t &device, _Object object) { return downcast(device).m_out_0_cb.set_callback(object); } template static devcb2_base &set_out_1_callback(device_t &device, _Object object) { return downcast(device).m_out_1_cb.set_callback(object); } - - + + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -104,7 +104,7 @@ extern const device_type NAMCO59XX; #define MCFG_NAMCO56XX_IN_2_CB(_devcb) \ devcb = &namco56xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); - + #define MCFG_NAMCO56XX_IN_3_CB(_devcb) \ devcb = &namco56xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); @@ -113,7 +113,7 @@ extern const device_type NAMCO59XX; #define MCFG_NAMCO56XX_OUT_1_CB(_devcb) \ devcb = &namco56xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); - + #define MCFG_NAMCO58XX_IN_0_CB(_devcb) \ devcb = &namco58xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); @@ -123,7 +123,7 @@ extern const device_type NAMCO59XX; #define MCFG_NAMCO58XX_IN_2_CB(_devcb) \ devcb = &namco58xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); - + #define MCFG_NAMCO58XX_IN_3_CB(_devcb) \ devcb = &namco58xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); @@ -132,8 +132,8 @@ extern const device_type NAMCO59XX; #define MCFG_NAMCO58XX_OUT_1_CB(_devcb) \ devcb = &namco58xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); - - + + #define MCFG_NAMCO59XX_IN_0_CB(_devcb) \ devcb = &namco59xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); @@ -142,7 +142,7 @@ extern const device_type NAMCO59XX; #define MCFG_NAMCO59XX_IN_2_CB(_devcb) \ devcb = &namco59xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); - + #define MCFG_NAMCO59XX_IN_3_CB(_devcb) \ devcb = &namco59xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); @@ -151,5 +151,5 @@ extern const device_type NAMCO59XX; #define MCFG_NAMCO59XX_OUT_1_CB(_devcb) \ devcb = &namco59xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); - + #endif /* __NAMCOIO_H__ */ diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index fce6c20a86c..6202fbec2b2 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -13,7 +13,6 @@ UINT8 namcos1_state::bank_r(address_space &space, offs_t offset, int bank) { - return m_active_bank[bank].bank_handler_r(space, offset + m_active_bank[bank].bank_offset, 0xff); } @@ -641,7 +640,7 @@ void namcos1_state::set_bank(int banknum, const bankhandler *handler) "bank1", "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8", "bank9", "bank10", "bank11", "bank12", "bank13", "bank14", "bank15", "bank16" }; - + static const struct { read8_delegate func; } io_bank_handler_r[16] = { { read8_delegate(FUNC(namcos1_state::bank1_r),this) }, { read8_delegate(FUNC(namcos1_state::bank2_r),this) }, { read8_delegate(FUNC(namcos1_state::bank3_r),this) }, { read8_delegate(FUNC(namcos1_state::bank4_r),this) }, @@ -660,7 +659,7 @@ void namcos1_state::set_bank(int banknum, const bankhandler *handler) static const char *const cputags[] = { "maincpu", "sub" }; - + address_space &space = machine().device(cputags[(banknum >> 3) & 1])->memory().space(AS_PROGRAM); int bankstart = (banknum & 7) * 0x2000; diff --git a/src/mame/machine/naomim4.c b/src/mame/machine/naomim4.c index c446fd0dd2e..fba238d509c 100644 --- a/src/mame/machine/naomim4.c +++ b/src/mame/machine/naomim4.c @@ -139,7 +139,7 @@ void naomi_m4_board::board_get_buffer(UINT8 *&base, UINT32 &limit) if (rombdid_tag && memregion(rombdid_tag) != NULL) { fpr_num = *memregion(rombdid_tag)->base() & 0x7f; - + } if (((rom_cur_address >> 26) & 0x07) < fpr_num) { @@ -210,7 +210,7 @@ READ16_MEMBER(naomi_m4_board::m4_id_r) if (rombdid_tag && memregion(rombdid_tag) != NULL) { epr_flag = *memregion(rombdid_tag)->base() & 0x80; - + } return 0x5500 | epr_flag; @@ -222,4 +222,4 @@ void naomi_m4_board::board_write(offs_t offset, UINT16 data) cfi_mode = true; if (((offset&0xffff) == 0x0000) && (data == 0x00f0)) cfi_mode = false; -} \ No newline at end of file +} diff --git a/src/mame/machine/pcecommn.c b/src/mame/machine/pcecommn.c index 73eb4672dd2..693f7b38a04 100644 --- a/src/mame/machine/pcecommn.c +++ b/src/mame/machine/pcecommn.c @@ -67,4 +67,3 @@ WRITE_LINE_MEMBER(pce_common_state::pce_irq_changed) { m_maincpu->set_input_line(0, state); } - diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h index fbf1b600ac7..ca36e7ce38e 100644 --- a/src/mame/machine/pcecommn.h +++ b/src/mame/machine/pcecommn.h @@ -31,7 +31,7 @@ public: virtual UINT8 joy_read(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_huc6260; - DECLARE_WRITE_LINE_MEMBER(pce_irq_changed); + DECLARE_WRITE_LINE_MEMBER(pce_irq_changed); private: UINT8 m_io_port_options; /*driver-specific options for the PCE*/ int m_joystick_port_select; /* internal index of joystick ports */ diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c index 86818ee1355..e64edb0fd7f 100644 --- a/src/mame/machine/slapfght.c +++ b/src/mame/machine/slapfght.c @@ -41,7 +41,7 @@ READ8_MEMBER(slapfght_state::tigerh_mcu_status_r) res |= 0x02; if (!m_mcu_sent) res |= 0x04; - + return res; } diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c index 3016c803fc6..86428a308ce 100644 --- a/src/mame/machine/tait8741.c +++ b/src/mame/machine/tait8741.c @@ -97,7 +97,7 @@ TIMER_CALLBACK_MEMBER( taito8741_4pack_device::serial_tx ) void taito8741_4pack_device::device_reset() { - for (int i=0;i<4;i++) + for (int i=0;i<4;i++) { I8741 *st = &m_taito8741[i]; st->number = i; @@ -305,7 +305,7 @@ void taito8741_4pack_device::command_w(int num, int data) UINT8 taito8741_4pack_device::port_read(int num, int offset) { - switch(num) + switch(num) { case 0 : return m_port_handler_0_r(offset); case 1 : return m_port_handler_1_r(offset); @@ -473,7 +473,7 @@ UINT8 josvolly8741_4pack_device::read(int num,int offset) UINT8 josvolly8741_4pack_device::port_read(int num) { - switch(num) + switch(num) { case 0 : return m_port_handler_0_r(0); case 1 : return m_port_handler_1_r(0); @@ -482,4 +482,3 @@ UINT8 josvolly8741_4pack_device::port_read(int num) default : return 0; } } - diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h index 7be855fc8c2..c487f6acf83 100644 --- a/src/mame/machine/tait8741.h +++ b/src/mame/machine/tait8741.h @@ -17,27 +17,27 @@ #define MCFG_TAITO8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ devcb = &taito8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ devcb = &taito8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ + devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ devcb = &taito8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); #define MCFG_TAITO8741_MODES(_mode0, _mode1, _mode2, _mode3) \ - taito8741_4pack_device::static_set_mode(*device, 0, _mode0); \ - taito8741_4pack_device::static_set_mode(*device, 1, _mode1); \ - taito8741_4pack_device::static_set_mode(*device, 2, _mode2); \ + taito8741_4pack_device::static_set_mode(*device, 0, _mode0); \ + taito8741_4pack_device::static_set_mode(*device, 1, _mode1); \ + taito8741_4pack_device::static_set_mode(*device, 2, _mode2); \ taito8741_4pack_device::static_set_mode(*device, 3, _mode3); #define MCFG_TAITO8741_CONNECT(_con0, _con1, _con2, _con3) \ - taito8741_4pack_device::static_set_connect(*device, 0, _con0); \ - taito8741_4pack_device::static_set_connect(*device, 1, _con1); \ - taito8741_4pack_device::static_set_connect(*device, 2, _con2); \ + taito8741_4pack_device::static_set_connect(*device, 0, _con0); \ + taito8741_4pack_device::static_set_connect(*device, 1, _con1); \ + taito8741_4pack_device::static_set_connect(*device, 2, _con2); \ taito8741_4pack_device::static_set_connect(*device, 3, _con3); - + class taito8741_4pack_device : public device_t { struct I8741 { - int number; + int number; UINT8 toData; /* to host data */ UINT8 fromData; /* from host data */ UINT8 fromCmd; /* from host command */ @@ -62,10 +62,10 @@ public: template static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_1_r.set_callback(object); } template static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_2_r.set_callback(object); } template static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_3_r.set_callback(object); } - - static void static_set_mode(device_t &device, int num, UINT8 mode) { downcast(device).m_taito8741[num].mode = mode; } - static void static_set_connect(device_t &device, int num, int conn) { downcast(device).m_taito8741[num].connect = conn; } - + + static void static_set_mode(device_t &device, int num, UINT8 mode) { downcast(device).m_taito8741[num].mode = mode; } + static void static_set_connect(device_t &device, int num, int conn) { downcast(device).m_taito8741[num].connect = conn; } + DECLARE_READ8_MEMBER( read_0 ) { if(offset&1) return status_r(0); else return data_r(0); } DECLARE_WRITE8_MEMBER( write_0 ) { if(offset&1) command_w(0,data); else data_w(0,data); } DECLARE_READ8_MEMBER( read_1 ) { if(offset&1) return status_r(1); else return data_r(1); } @@ -81,7 +81,7 @@ public: int data_r(int num); void data_w(int num, int data); void command_w(int num, int data); - + UINT8 port_read(int num, int offset); protected: @@ -96,7 +96,7 @@ private: void serial_rx(I8741 *st,UINT8 *data); // internal state - I8741 m_taito8741[4]; + I8741 m_taito8741[4]; devcb2_read8 m_port_handler_0_r; devcb2_read8 m_port_handler_1_r; @@ -118,16 +118,16 @@ extern const device_type TAITO8741_4PACK; #define MCFG_JOSVOLLY8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ devcb = &josvolly8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ devcb = &josvolly8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ + devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ devcb = &josvolly8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); #define MCFG_JOSVOLLY8741_CONNECT(_con0, _con1, _con2, _con3) \ - josvolly8741_4pack_device::static_set_connect(*device, 0, _con0); \ - josvolly8741_4pack_device::static_set_connect(*device, 1, _con1); \ - josvolly8741_4pack_device::static_set_connect(*device, 2, _con2); \ + josvolly8741_4pack_device::static_set_connect(*device, 0, _con0); \ + josvolly8741_4pack_device::static_set_connect(*device, 1, _con1); \ + josvolly8741_4pack_device::static_set_connect(*device, 2, _con2); \ josvolly8741_4pack_device::static_set_connect(*device, 3, _con3); - + class josvolly8741_4pack_device : public device_t { struct JV8741 { @@ -148,15 +148,15 @@ public: template static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_1_r.set_callback(object); } template static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_2_r.set_callback(object); } template static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_3_r.set_callback(object); } - - static void static_set_connect(device_t &device, int num, int conn) { downcast(device).m_i8741[num].connect = conn; } - + + static void static_set_connect(device_t &device, int num, int conn) { downcast(device).m_i8741[num].connect = conn; } + DECLARE_READ8_MEMBER( read_0 ) { return read(0,offset); } DECLARE_WRITE8_MEMBER( write_0 ) { write(0,offset,data); } DECLARE_READ8_MEMBER( read_1 ) { return read(1,offset); } DECLARE_WRITE8_MEMBER( write_1 ) { write(1,offset,data); } - - DECLARE_WRITE8_HANDLER( nmi_enable_w ) { m_nmi_enable = 1; } + + DECLARE_WRITE8_HANDLER( nmi_enable_w ) { m_nmi_enable = 1; } TIMER_CALLBACK_MEMBER( tx ); protected: @@ -173,7 +173,7 @@ private: // internal state JV8741 m_i8741[4]; int m_nmi_enable; - + devcb2_read8 m_port_handler_0_r; devcb2_read8 m_port_handler_1_r; devcb2_read8 m_port_handler_2_r; diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h index 67d060950cd..1a5204c8d69 100644 --- a/src/mame/machine/taitoio.h +++ b/src/mame/machine/taitoio.h @@ -21,7 +21,7 @@ public: template static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast(device).m_read_2_cb.set_callback(object); } template static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast(device).m_read_3_cb.set_callback(object); } template static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast(device).m_read_7_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( port_r ); @@ -59,7 +59,7 @@ public: template static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast(device).m_read_2_cb.set_callback(object); } template static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast(device).m_read_3_cb.set_callback(object); } template static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast(device).m_read_7_cb.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); DECLARE_READ16_MEMBER( halfword_r ); @@ -96,8 +96,8 @@ public: template static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast(device).m_read_2_cb.set_callback(object); } template static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast(device).m_read_3_cb.set_callback(object); } template static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast(device).m_read_7_cb.set_callback(object); } - - + + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); DECLARE_READ16_MEMBER( halfword_r ); @@ -133,29 +133,29 @@ extern const device_type TC0640FIO; #define MCFG_TC0220IOC_READ_1_CB(_devcb) \ devcb = &tc0220ioc_device::set_read_1_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0220IOC_READ_2_CB(_devcb) \ devcb = &tc0220ioc_device::set_read_2_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0220IOC_READ_3_CB(_devcb) \ devcb = &tc0220ioc_device::set_read_3_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0220IOC_READ_7_CB(_devcb) \ devcb = &tc0220ioc_device::set_read_7_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0510NIO_READ_0_CB(_devcb) \ devcb = &tc0510nio_device::set_read_0_callback(*device, DEVCB2_##_devcb); #define MCFG_TC0510NIO_READ_1_CB(_devcb) \ devcb = &tc0510nio_device::set_read_1_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0510NIO_READ_2_CB(_devcb) \ devcb = &tc0510nio_device::set_read_2_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0510NIO_READ_3_CB(_devcb) \ devcb = &tc0510nio_device::set_read_3_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0510NIO_READ_7_CB(_devcb) \ devcb = &tc0510nio_device::set_read_7_callback(*device, DEVCB2_##_devcb); @@ -165,15 +165,15 @@ extern const device_type TC0640FIO; #define MCFG_TC0640FIO_READ_1_CB(_devcb) \ devcb = &tc0640fio_device::set_read_1_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0640FIO_READ_2_CB(_devcb) \ devcb = &tc0640fio_device::set_read_2_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0640FIO_READ_3_CB(_devcb) \ devcb = &tc0640fio_device::set_read_3_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TC0640FIO_READ_7_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_7_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_7_callback(*device, DEVCB2_##_devcb); + - #endif /* __TAITOIO_H__ */ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 98c3ce71edb..6da13deee09 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -165,7 +165,7 @@ galaxianmo // (c) Midway galaxiant // (c) Taito galaxiani // (c) Irem galaxrf // bootleg (Recreativos Franco) -galaxrfgg // bootleg (Recreativos Franco) +galaxrfgg // bootleg (Recreativos Franco) superg // hack galapx // hack moonaln // [Nichibutsu] (Karateco license) or hack @@ -177,7 +177,7 @@ zerotime // hack starfght // hack galaxbsf // hack galaxianbl // bootleg -galaxbsf2 // bootleg +galaxbsf2 // bootleg kamakazi3 // Video Games (UK) Ltd., hack or bootleg? tst_galx // Galaxian Test ROM gmgalax // bootleg @@ -338,7 +338,7 @@ hotshock // (c) 1982 E.G. Felaco (Domino license) hotshockb // bootleg conquer // (c) 1982 ???? hunchbks // (c) 1983 Century -hunchbks2 // bootleg +hunchbks2 // bootleg hncholms // (c) 1984 Century cavelon // (c) 1983 Jetsoft sfx // (c) 1983 Nichibutsu @@ -380,7 +380,7 @@ billiard // bootleg hustlerb // bootleg hustlerb2 // bootleg hustlerb3 // bootleg -hustlerb4 // bootleg +hustlerb4 // bootleg frogger // GX392 (c) 1981 Konami froggers1 // (c) 1981 Sega froggers2 // 834-0068 (c) 1981 Sega @@ -1654,7 +1654,7 @@ intlaser // (c) 1987 blasted // (c) 1988 archrivl // (c) 1989 archrivla // (c) 1989 -archrivlb // bootleg +archrivlb // bootleg trisport // (c) 1989 pigskin // (c) 1990 pigskina // (c) 1990 @@ -1866,7 +1866,7 @@ dsoccr94j // (c) 1994 Irem (Japan) gunforc2 // (c) 1994 Irem geostorm // (c) 1994 Irem (Japan) // M107 -airass // (c) 1993 Irem (World) +airass // (c) 1993 Irem (World) firebarr // (c) 1993 Irem (Japan) dsoccr94 // (c) 1994 Irem (Data East Corporation license) kftgoal // (c) 1994 Jaleco @@ -2246,7 +2246,7 @@ tetristh // C26 (c) 1988 Sega Enterprises,Ltd. (Japan) masterw // B72 (c) 1989 Taito Corporation Japan (World) masterwu // B72 (c) 1989 Taito America Corporation (US) masterwj // B72 (c) 1989 Taito Corporation (Japan) -yukiwo // prototype +yukiwo // prototype nastar // B81 (c) 1988 Taito Corporation Japan (World) nastarw // B81 (c) 1988 Taito America Corporation (US) rastsag2 // B81 (c) 1988 Taito Corporation (Japan) @@ -2286,7 +2286,7 @@ contcircua // B33 (c) 1987 Taito America Corporation (US) contcircj // B33 (c) 1987 Taito Corporation (Japan) chasehq // B52 (c) 1988 Taito Corporation Japan (World) chasehqj // B52 (c) 1988 Taito Corporation (Japan) -chasehqju // B52 (c) 1988 Taito Corporation (Japan) +chasehqju // B52 (c) 1988 Taito Corporation (Japan) chasehqu // B52 (c) 1988 Taito America Corporation (US) enforce // B58 (c) 1988 Taito Corporation Japan (World) enforcej // B58 (c) 1988 Taito Corporation (Japan) @@ -2581,7 +2581,7 @@ twincobr // B30 / TP-011 (c) 1987 Taito Corporation (World) twincobru // B30 / TP-011 (c) 1987 Taito America Corporation + Romstar license (US) ktiger // B30 / TP-011 (c) 1987 Taito Corporation (Japan) gulfwar2 // (c) 1991 Comad -gulfwar2a // +gulfwar2a // rallybik // B45 / TP-O12 (c) 1988 Taito truxton // B65 / TP-O13B (c) 1988 Taito hellfire // B90 / TP-??? (c) 1989 Toaplan + Taito license @@ -2674,7 +2674,7 @@ batsugun // TP-030 (c) 1993 Toaplan batsuguna // TP-030 (c) 1993 Toaplan batsugunsp // TP-030 (c) 1993 Toaplan snowbro2 // TP-033 (c) 1994 Hanafram -snowbro2b // +snowbro2b // pwrkick // (c) 1994 Sunwise othldrby // (c) 1995 Sunwise sstriker // (c) 1993 Raizing @@ -2796,25 +2796,25 @@ korokoro // (c) 1999 Takumi crusherm // (c) 1999 Takumi tjumpman // (c) 1999 Namco -mushisam +mushisam mushisama mushisamb -espgal2 -ibara -ibarablk -ibarablka -mushitam +espgal2 +ibara +ibarablk +ibarablka +mushitam mushitama -futari15 -futari15a -futari10 -futaribl -pinkswts -pinkswtsa +futari15 +futari15a +futari10 +futaribl +pinkswts +pinkswtsa pinkswtsb -pinkswtsx -deathsml -mmpork +pinkswtsx +deathsml +mmpork mmmbanc ddpdfk ddpdfk10 @@ -2943,7 +2943,7 @@ trojan // 4/1986 (c) 1986 (US) trojana // 4/1986 (c) 1986 (US) trojanr // 4/1986 (c) 1986 + Romstar trojanj // 4/1986 (c) 1986 (Japan) -trojanb // bootleg +trojanb // bootleg srumbler // 9/1986 (c) 1986 srumbler2 // 9/1986 (c) 1986 srumbler3 // 9/1986 (c) 1986 + Tecfri @@ -3133,10 +3133,10 @@ sf2red // hack sf2v004 // hack sf2acc // hack sf2acca // hack -sf2ceblp // hack +sf2ceblp // hack sf2accp2 // hack sf2amf // bootleg -sf2amf2 // bootleg +sf2amf2 // bootleg sf2dkot2 // hack sf2m1 // hack sf2m2 // hack @@ -3151,7 +3151,7 @@ sf2koryu // hack sf2dongb // hack sf2mdt // bootleg sf2mdta // bootleg -sf2mdtb // bootleg +sf2mdtb // bootleg cworld2j // 11/06/1992 (c) 1992 (Japan) varth // 14/07/1992 (c) 1992 (World) varthr1 // 12/06/1992 (c) 1992 (World) @@ -3315,7 +3315,7 @@ msha // 24/10/1995 (c) 1995 (Asia) mshh // 17/11/1995 (c) 1995 (Hispanic) mshb // 17/11/1995 (c) 1995 (Brazil) 19xx // 07/12/1995 (c) 1996 (USA) -19xxj // 04/01/1996 (c) 1996 (Japan) +19xxj // 04/01/1996 (c) 1996 (Japan) 19xxjr1 // 25/12/1995 (c) 1996 (Japan) 19xxjr2 // 07/12/1995 (c) 1996 (Japan) 19xxa // 07/12/1995 (c) 1996 (Asia) @@ -3503,7 +3503,7 @@ warzard // 21/11/1996 (c) 1996 (Japan) warzardr1 // 23/10/1996 (c) 1996 (Japan) sfiii // 04/02/1997 (c) 1997 (Euro) sfiiiu // 04/02/1997 (c) 1997 (USA) -sfiiia // 04/02/1997 (c) 1997 (Asia) +sfiiia // 04/02/1997 (c) 1997 (Asia) sfiiij // 04/02/1997 (c) 1997 (Japan) sfiiih // 04/02/1997 (c) 1997 (Hispanic) sfiii2 // 30/09/1997 (c) 1997 (USA) @@ -3521,7 +3521,7 @@ sfiii3ur1 // 12/05/1999 (c) 1999 (USA) jojoba // 27/09/1999 (c) 1999 (Japan) jojobar1 // 13/09/1999 (c) 1999 (Japan) sfiiin // 04/02/1997 (c) 1997 (Asia) -sfiiina // 04/02/1997 (c) 1997 (Asia) +sfiiina // 04/02/1997 (c) 1997 (Asia) sfiii2n // 30/09/1997 (c) 1997 (Asia) jojon // 28/01/1999 (c) 1998 (Asia) jojonr1 // 08/01/1999 (c) 1998 (Asia) @@ -3534,8 +3534,8 @@ jojobane // 27/09/1999 (c) 1999 (Euro) jojobaner1 // 13/09/1999 (c) 1999 (Euro) cps3boot // bootleg cps3boota // bootleg -cps3bs32 // -cps3bs32a // +cps3bs32 // +cps3bs32a // // Capcom ZN1 cpzn1 @@ -3774,7 +3774,7 @@ aquarush // 2000.02 Aqua Rush (AQ1/VER.A1, Japan) golgo13 // 2000.03 Golgo 13 (GLG1/VER.A, Japan) sws2000 // 2000.03 Super World Stadium 2000 (SS01/VER.A, Japan) truckk // 2000.06 Truck Kyousoukyoku (Metro) -kartduel // 2000.07 Kart Duel +kartduel // 2000.07 Kart Duel // 2000.08 Teknowerk g13knd // 2000.10 Golgo 13 Kiseki no Dandou (GLS1/VER.A, Japan) sws2001 // 2001.04 Super World Stadium 2001 (SS11/VER.A, Japan) @@ -4465,7 +4465,7 @@ alexkidd1 // (c) 1986 (FD1089A, decrypted) fantzone // (c) 1986 (Unprotected Rev A) fantzone1 // (c) 1986 (Unprotected) fantzonep // (c) 1986 (NEC 0317-5000, encrypted) -fantzonepr // +fantzonepr // sdi // (c) 1987 (FD1089B, decrypted) shinobi // (c) 1987 (Unprotected) shinobi1 // (c) 1987 (FD1094, decrypted) @@ -4741,7 +4741,7 @@ radru // 1991.09 Rad Rally (US) radrj // 1991.07 Rad Rally (Japan) spidman // 1991.?? Spiderman (World) spidmanu // 1991.09 Spiderman (US) -spidmanj // 1991.09 Spiderman (Japan) +spidmanj // 1991.09 Spiderman (Japan) f1en // 1991.?? F-1 Exhaust Note (World) // 1992.01 F-1 Exhaust Note (US) // 1991.11 F-1 Exhaust Note (Japan) @@ -5419,7 +5419,7 @@ initdv2j // 2002.12 Initial D Arcade Stage Ver. 2 (Japan) (Rev B) initdv2jo // 2002.12 Initial D Arcade Stage Ver. 2 (Japan) initdv2e // 2002.12 Initial D Arcade Stage Ver. 2 (export) vf4evo // 2002.12 Virtua Fighter 4 Evolution Ver.B -clubk2k3 // 2003.?? Club Kart: European Session 2003 +clubk2k3 // 2003.?? Club Kart: European Session 2003 clubk2kf initdexp // 2002.?? Initial D Arcade Stage (Export) // 2002.?? Sega Driving Simulator @@ -5706,7 +5706,7 @@ abattle2 // Sidam afire // Rene Pierre acombat // bootleg acombato // bootleg -acombat3 // bootleg +acombat3 // bootleg sstarbtl // bootleg spfghmk2 // (c) [1979] Data East Corporation spfghmk22 // (c) [1979] Data East Corporation @@ -5770,7 +5770,7 @@ pcktgalb // bootleg pcktgal2 // (c) 1989 Data East Corporation (World?) pcktgal2j // (c) 1989 Data East Corporation (World?) pokechmp // Korean hack of Pocket Gal -billlist // +billlist // spool3 // (c) 1989 Data East Corporation (World?) spool3i // (c) 1990 Data East Corporation + I-Vics license battlera // (c) 1988 Data East Corporation (World) @@ -6199,7 +6199,7 @@ rockragea // GX620 (c) 1986 (Prototype?) rockragej // GX620 (c) 1986 (Japan) mx5000 // GX669 (c) 1987 flkatck // GX669 (c) 1987 (Japan) -flkatcka // GX669 (c) 1987 (Japan) +flkatcka // GX669 (c) 1987 (Japan) fastlane // GX752 (c) 1987 tricktrp // GX771 (c) 1987 labyrunr // GX771 (c) 1987 (Japan) @@ -6662,7 +6662,7 @@ teetert // (c) 1981 mtrap // (c) 1981 mtrap3 // (c) 1981 mtrap4 // (c) 1981 -mtrapb // bootleg +mtrapb // bootleg pepper2 // (c) 1982 pepper27 // (c) 1982 hardhat // (c) 1982 @@ -8255,14 +8255,14 @@ raiden2d // (c) 1993 Seibu Kaihatsu raiden2e // (c) 1993 Seibu Kaihatsu raiden2f // (c) 1993 Seibu Kaihatsu + Fabtek license raiden2g // (c) 1993 Seibu Kaihatsu -raiden2nl // (c) 1993 Seibu Kaihatsu +raiden2nl // (c) 1993 Seibu Kaihatsu raidendx // (c) 1994 Seibu Kaihatsu raidendxj // (c) 1994 Seibu Kaihatsu raidendxu // (c) 1994 Seibu Kaihatsu + Fabtek license raidendxa1 // (c) 1994 Seibu Kaihatsu + Metrotainment license raidendxa2 // (c) 1994 Seibu Kaihatsu + Metrotainment license raidendxg // (c) 1994 Seibu Kaihatsu + Tuning license -raidendxnl // (c) 1994 Seibu Kaihatsu +raidendxnl // (c) 1994 Seibu Kaihatsu zeroteam // (c) 1993 Seibu Kaihatsu + Fabtek license zeroteama // (c) 1993 Seibu Kaihatsu zeroteamb // (c) 1993 Seibu Kaihatsu @@ -8287,7 +8287,7 @@ batlballe // (c) 1995 Seibu Kaihatsu (Metrotainment License) batlballu // (c) 1995 Seibu Kaihatsu (Fabtek license) viprp1 // (c) 1995 Seibu Kaihatsu -viprp1k // (c) 1995 Seibu Kaihatsu (Dream Island license) +viprp1k // (c) 1995 Seibu Kaihatsu (Dream Island license) viprp1u // (c) 1995 Seibu Kaihatsu (Fabtek license) viprp1ua // (c) 1995 Seibu Kaihatsu (Fabtek license) viprp1j // (c) 1995 Seibu Kaihatsu @@ -8724,11 +8724,11 @@ galsnewj // (c) 1990 Kaneko galsnewk // (c) 1990 Kaneko galpani2 // (c) 1993 Kaneko galpani2e // (c) 1993 Kaneko -galpani2e2 // (c) 1993 Kaneko +galpani2e2 // (c) 1993 Kaneko galpani2g // (c) 1993 Kaneko galpani2t // (c) 1993 Kaneko galpani2i // (c) 1993 Kaneko -galpani2gs // (c) 1993 Kaneko +galpani2gs // (c) 1993 Kaneko galpani2j // (c) 1993 Kaneko gp2quiz // (c) 1993 Kaneko gp2se // (c) 1994 Kaneko @@ -8737,7 +8737,7 @@ jchan2 // (c) 1995 Kaneko galpani3 // (c) 1995 Kaneko (World) galpani3j // (c) 1995 Kaneko (Japan) galpani3k // (c) 1995 Kaneko (Korea) -galpani3hk // (c) 1995 Kaneko (Hong Kong) +galpani3hk // (c) 1995 Kaneko (Hong Kong) // Kaneko "AX System" games berlwall // (c) 1991 Kaneko @@ -8838,7 +8838,7 @@ pairlove // (c) 1991 Athena blandia // (c) 1992 Allumer blandiap // (c) 1992 Allumer blockcar // (c) 1992 Visco -blockcarb // bootleg +blockcarb // bootleg qzkklogy // (c) 1992 Tecmo neobattl // (c) 1992 Banpresto / Sotsu Agency. Sunrise umanclub // (c) 1992 Tsuburaya Prod. / Banpresto @@ -9066,13 +9066,13 @@ lastday // (c) 1990 Dooyong lastdaya // (c) 1990 Dooyong gulfstrm // (c) 1991 Dooyong gulfstrma // (c) 1991 Dooyong -gulfstrmb // (c) 1991 Dooyong +gulfstrmb // (c) 1991 Dooyong gulfstrmm // (c) 1991 Dooyong + distributed by Media Shoji pollux // (c) 1991 Dooyong polluxa // (c) 1991 Dooyong polluxa2 // (c) 1991 Dooyong flytiger // (c) 1992 Dooyong -flytigera // (c) 1992 Dooyong +flytigera // (c) 1992 Dooyong bluehawk // (c) 1993 Dooyong bluehawkn // (c) 1993 NTC sadari // (c) 1993 NTC @@ -9117,8 +9117,8 @@ missmw96 // (c) 1996 Comad fantsia2 // (c) 1997 Comad fantsia2a // (c) 1997 Comad wownfant // (c) 2002 Comad -pgalvip // (c) 1996 ACE International (Afega stickers on ROMs) -pgalvipa // +pgalvip // (c) 1996 ACE International (Afega stickers on ROMs) +pgalvipa // galhustl // (c) 1997 ACE International // Playmark games @@ -9245,7 +9245,7 @@ shockingk // (c) 1997 Yun Sung bombkick // (c) 1998 Yun Sung bombkicka // (c) 1998 Yun Sung nmg5 // (c) 1998 Yun Sung -nmg5a // (c) 1998 Yun Sung +nmg5a // (c) 1998 Yun Sung nmg5e // (c) 1998 Yun Sung searchey // (c) 1999 Yun Sung searchp2 // (c) 1999 Yun Sung @@ -9672,7 +9672,7 @@ kovlsjba // bootleg oldsplus // (c) 2004 Oriental Legend Super Plus killbldp // (c) 2004 Killing Blade Plus happy6 // (c) 2004 Happy 6 -happy6101 // +happy6101 // svg // (c) 2003 Spectral vs Generation svgpcb // ket // (c) 2002 Ketsui @@ -9690,8 +9690,8 @@ orleg2 // (c) 2007 orleg2o // kov2nl // (c) 2008 kov2nlo // -ddpdojh // -kov3 // +ddpdojh // +kov3 // // IGS PC based HW speeddrv // (c) 2004 @@ -10105,7 +10105,7 @@ nostj // (c) 1993 Face nostk // (c) 1993 Face 4enraya // (c) 1990 IDSA 4enrayaa // -4enlinea // (c) 1991 System Compumatic +4enlinea // (c) 1991 System Compumatic unkpacg // (c) 19?? ??? oneshot // no copyright notice maddonna // (c) 1995 Tuning @@ -10123,7 +10123,7 @@ coolpool // (c) 1992 Catalina Games 9ballsht2 // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" 9ballsht3 // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" 9ballshtc // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" -megaphx // (c) 1991 Dinamic / Inder +megaphx // (c) 1991 Dinamic / Inder gumbo // (c) 1994 Min Corp. mspuzzleg // (c) 1994 Min Corp. mspuzzle // (c) 1994 Min Corp. @@ -11081,7 +11081,7 @@ sstar97 // (c) 199? Bordun International livequiz // (c) 1999 Andamiro hammer // (c) 2000 Andamiro discoboy // (c) 1993 Soft Art Co. -discoboyp // (c) 1993 Soft Art Co. (Promat license?) +discoboyp // (c) 1993 Soft Art Co. (Promat license?) pangofun // (c) 1995 InfoCube koikoi // (c) 1983 Kiwako good // (c) 1998 @@ -11089,8 +11089,8 @@ filetto // (c) 1990 Novamatic quizo // (c) 1985 Seoul Coin Corp. quizoa // (c) 1985 Seoul Coin Corp. gstream // (c) 2002, Oriental Soft Japan -x2222 // (c) 2000, Oriental Soft -x2222o // (c) 2000, Oriental Soft +x2222 // (c) 2000, Oriental Soft +x2222o // (c) 2000, Oriental Soft miniboy7 // (c) 1983, Bonanza Enterprises miniboy7a // (c) 1983, Bonanza Enterprises miniboy7b // (c) 1983, Bonanza Enterprises @@ -11252,8 +11252,8 @@ ejollyx5 // (c) 200? Solar Games grandprx // (c) 200? 4fun supjolly // (c) 200? unknown x5jokers // (c) 200? Electronic Projects -queenotg // -ejollyx9 // +queenotg // +ejollyx9 // // Astro Corp. showhand // (c) 2000 Astro Corp. @@ -29477,7 +29477,7 @@ ec_multb // Multi Bar (Concept - Electrocoin) ec_casmb // Casino Multi Bar (Concept - Electrocoin) ec_supmb // Super Multi Bar (Concept - Electrocoin) ec_stkex // Stake X (Concept - Electrocoin) -ec_bar7 // Bar 7 (Concept) +ec_bar7 // Bar 7 (Concept) ec_fltr // Flutter (Concept) ec_gold7 // Golden 7 (Concept) ec_mgbel // Megabell (Concept) @@ -31258,4 +31258,4 @@ arac6000 number1 // 1996 San Remo Games gluck2 // 1992 Yung Yu / CYE -amusco // 1987, Amusco. \ No newline at end of file +amusco // 1987, Amusco. diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 567b4cf6b04..91280d83e40 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -345,7 +345,7 @@ void alpha68k_state::draw_sprites_I( bitmap_ind16 &bitmap, const rectangle &clip fy = data & 0x4000; color = color_prom[tile << 1 | data >> 15]; - gfx->transpen(bitmap,cliprect, tile, color, 0, fy, mx, my, 0); + gfx->transpen(bitmap,cliprect, tile, color, 0, fy, mx, my, 0); my = (my + 8) & 0xff; } diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index 6c85976ade5..06ade938ef1 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -18,7 +18,7 @@ WRITE8_MEMBER(amspdwy_state::amspdwy_paletteram_w) { - m_palette->write(space, offset, UINT8(~data)); + m_palette->write(space, offset, UINT8(~data)); } WRITE8_MEMBER(amspdwy_state::amspdwy_flipscreen_w) diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index ebff59daa3c..e42f3b510f6 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -161,7 +161,6 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if (enable & enable_n) { - gfx->transpen( bitmap, cliprect, @@ -172,7 +171,7 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec ); /* wraparound */ if (xpos > 240) - + gfx->transpen( bitmap, cliprect, @@ -184,7 +183,6 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec /* wraparound */ if (ypos > 240) { - gfx->transpen( bitmap, cliprect, @@ -195,7 +193,7 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec ); /* wraparound */ if (xpos > 240) - + gfx->transpen( bitmap, cliprect, diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index c776111e267..b70b6390ad3 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -219,7 +219,7 @@ void appoooh_state::appoooh_draw_sprites( bitmap_ind16 &dest_bmp, const rectangl sy = 239 - sy; flipx = !flipx; } - + gfx->transpen(dest_bmp,cliprect, code, color, @@ -250,7 +250,7 @@ void appoooh_state::robowres_draw_sprites( bitmap_ind16 &dest_bmp, const rectang sy = 239 - sy; flipx = !flipx; } - + gfx->transpen(dest_bmp,cliprect, code, color, diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index 5d0e548d47b..7f883469eab 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -1002,7 +1002,7 @@ void argus_state::butasan_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cl flipx = !flipx; flipy = !flipy; } - + fx = flipx; fy = flipy; diff --git a/src/mame/video/atarimo.c b/src/mame/video/atarimo.c index ad7707d6c47..5803f22f839 100644 --- a/src/mame/video/atarimo.c +++ b/src/mame/video/atarimo.c @@ -534,7 +534,7 @@ void atari_motion_objects_device::render_object(bitmap_ind16 &bitmap, const rect continue; // draw the sprite - gfx->transpen_raw(bitmap,cliprect, code, color, hflip, vflip, sx, sy, m_transpen); + gfx->transpen_raw(bitmap,cliprect, code, color, hflip, vflip, sx, sy, m_transpen); mark_dirty(sx, sx + m_tilewidth - 1, sy, sy + m_tileheight - 1); } } @@ -563,7 +563,7 @@ void atari_motion_objects_device::render_object(bitmap_ind16 &bitmap, const rect continue; // draw the sprite - gfx->transpen_raw(bitmap,cliprect, code, color, hflip, vflip, sx, sy, m_transpen); + gfx->transpen_raw(bitmap,cliprect, code, color, hflip, vflip, sx, sy, m_transpen); mark_dirty(sx, sx + m_tilewidth - 1, sy, sy + m_tileheight - 1); } } diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c index 39d83938a8b..716d26f37c6 100644 --- a/src/mame/video/avgdvg.c +++ b/src/mame/video/avgdvg.c @@ -681,14 +681,14 @@ void avg_tempest_device::vggo() // tempest_vggo nvect = 0; } - - /************************************* - * - * Mhavoc handler functions - * - *************************************/ - int avg_mhavoc_device::handler_1() // mhavoc_latch1 + /************************************* + * + * Mhavoc handler functions + * + *************************************/ + + int avg_mhavoc_device::handler_1() // mhavoc_latch1 { /* * Major Havoc just has ymin clipping @@ -860,7 +860,7 @@ void avg_starwars_device::update_databus() // starwars_data m_data = avgdvg_vectorram[m_pc]; } - + int avg_starwars_device::handler_6() // starwars_strobe2 { if ((OP2 == 0) && (m_dvy12 == 0)) @@ -887,11 +887,11 @@ int avg_starwars_device::handler_7() // starwars_strobe3 return cycles; } - /************************************* - * - * Quantum handler functions - * - *************************************/ + /************************************* + * + * Quantum handler functions + * + *************************************/ void avg_quantum_device::update_databus() // quantum_data { m_data = ((UINT16 *)avgdvg_vectorram)[m_pc >> 1]; @@ -1054,11 +1054,11 @@ int avg_quantum_device::handler_7() // quantum_strobe3 return cycles; } - /************************************* - * - * Bzone handler functions - * - *************************************/ + /************************************* + * + * Bzone handler functions + * + *************************************/ int avg_bzone_device::handler_1() // bzone_latch1 { /* @@ -1133,7 +1133,7 @@ int avg_bzone_device::handler_7() // bzone_strobe3 * Tomcat handler functions * *************************************/ - + int avg_tomcat_device::handler_6() // starwars_strobe2 { if ((OP2 == 0) && (m_dvy12 == 0)) @@ -1166,7 +1166,7 @@ int avg_tomcat_device::handler_7() // starwars_strobe3 * halt functions * *************************************/ - + void avgdvg_device::vg_set_halt(int dummy) { m_halt = dummy; @@ -1342,7 +1342,7 @@ void avg_device::device_start() avgdvg_vectorram_size = machine().root_device().memshare("vectorram")->bytes(); avgdvg_colorram = reinterpret_cast(machine().root_device().memshare("colorram")->ptr()); - + xmin = visarea.min_x; ymin = visarea.min_y; xmax = visarea.max_x; @@ -1371,7 +1371,7 @@ void dvg_device::device_start() { if(!m_vector->started()) throw device_missing_dependencies(); - + const rectangle &visarea = machine().first_screen()->visible_area(); avgdvg_vectorram = reinterpret_cast(machine().root_device().memshare("vectorram")->ptr()); @@ -1384,7 +1384,7 @@ void dvg_device::device_start() vg_halt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(avgdvg_device::vg_set_halt_callback),this)); vg_run_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(avgdvg_device::run_state_machine),this)); - + register_state(); } @@ -1437,7 +1437,7 @@ avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, co m_clipy_min = 0; m_clipx_max = 0; m_clipy_max = 0; - + xmin = 0; xmax = 0; ymin = 0; @@ -1446,7 +1446,7 @@ avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, co ycenter = 0; flip_x = 0; flip_y = 0; - nvect = 0; + nvect = 0; } dvg_device::dvg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : diff --git a/src/mame/video/avgdvg.h b/src/mame/video/avgdvg.h index 15afd994fc6..821c2f5c831 100644 --- a/src/mame/video/avgdvg.h +++ b/src/mame/video/avgdvg.h @@ -24,13 +24,13 @@ class avgdvg_device : public device_t public: // construction/destruction avgdvg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - + static void static_set_vector_tag(device_t &device, const char *tag); - + DECLARE_CUSTOM_INPUT_MEMBER(done_r); DECLARE_WRITE8_MEMBER(go_w); DECLARE_WRITE8_MEMBER(reset_w); - + DECLARE_WRITE16_MEMBER(go_word_w); DECLARE_WRITE16_MEMBER(reset_word_w); @@ -43,7 +43,7 @@ public: protected: void apply_flipping(int *x, int *y); void vg_set_halt(int dummy); - + void vg_flush(); void vg_add_point_buf(int x, int y, rgb_t color, int intensity); void vg_add_clip (int xmin, int ymin, int xmax, int ymax); @@ -52,10 +52,10 @@ protected: UINT8 *avgdvg_vectorram; size_t avgdvg_vectorram_size; - + UINT8 *avgdvg_colorram; - - + + int xmin, xmax, ymin, ymax; int xcenter, ycenter; emu_timer *vg_run_timer, *vg_halt_timer; @@ -64,7 +64,7 @@ protected: int nvect; vgvector vectbuf[MAXVECT]; - + UINT16 m_pc; UINT8 m_sp; @@ -103,21 +103,21 @@ protected: INT32 m_clipy_min; INT32 m_clipx_max; INT32 m_clipy_max; - - - virtual int handler_0() = 0; - virtual int handler_1() = 0; - virtual int handler_2() = 0; - virtual int handler_3() = 0; - virtual int handler_4() = 0; - virtual int handler_5() = 0; - virtual int handler_6() = 0; - virtual int handler_7() = 0; + + + virtual int handler_0() = 0; + virtual int handler_1() = 0; + virtual int handler_2() = 0; + virtual int handler_3() = 0; + virtual int handler_4() = 0; + virtual int handler_5() = 0; + virtual int handler_6() = 0; + virtual int handler_7() = 0; virtual UINT8 state_addr() = 0; virtual void update_databus() = 0; virtual void vggo() = 0; virtual void vgrst() = 0; - + required_device m_vector; }; @@ -126,22 +126,22 @@ class dvg_device : public avgdvg_device public: // construction/destruction dvg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + void dvg_draw_to(int x, int y, int intensity); - - virtual int handler_0(); - virtual int handler_1(); - virtual int handler_2(); - virtual int handler_3(); - virtual int handler_4(); - virtual int handler_5(); - virtual int handler_6(); - virtual int handler_7(); + + virtual int handler_0(); + virtual int handler_1(); + virtual int handler_2(); + virtual int handler_3(); + virtual int handler_4(); + virtual int handler_5(); + virtual int handler_6(); + virtual int handler_7(); virtual UINT8 state_addr(); virtual void update_databus(); virtual void vggo(); virtual void vgrst(); - + virtual void device_start(); }; @@ -158,20 +158,20 @@ public: int avg_common_strobe1(); int avg_common_strobe2(); int avg_common_strobe3(); - - virtual int handler_0(); - virtual int handler_1(); - virtual int handler_2(); - virtual int handler_3(); - virtual int handler_4(); - virtual int handler_5(); - virtual int handler_6(); - virtual int handler_7(); + + virtual int handler_0(); + virtual int handler_1(); + virtual int handler_2(); + virtual int handler_3(); + virtual int handler_4(); + virtual int handler_5(); + virtual int handler_6(); + virtual int handler_7(); virtual UINT8 state_addr(); virtual void update_databus(); virtual void vggo(); virtual void vgrst(); - + virtual void device_start(); void avg_start_common(); }; @@ -184,9 +184,9 @@ class avg_tempest_device : public avg_device public: // construction/destruction avg_tempest_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - - virtual int handler_6(); - virtual int handler_7(); + + virtual int handler_6(); + virtual int handler_7(); virtual void vggo(); }; @@ -199,9 +199,9 @@ public: // construction/destruction avg_mhavoc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual int handler_1(); - virtual int handler_6(); - virtual int handler_7(); + virtual int handler_1(); + virtual int handler_6(); + virtual int handler_7(); virtual void update_databus(); virtual void vgrst(); }; @@ -214,8 +214,8 @@ class avg_starwars_device : public avg_device public: // construction/destruction avg_starwars_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual int handler_6(); - virtual int handler_7(); + virtual int handler_6(); + virtual int handler_7(); virtual void update_databus(); }; @@ -227,14 +227,14 @@ class avg_quantum_device : public avg_device public: // construction/destruction avg_quantum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual int handler_0(); - virtual int handler_1(); - virtual int handler_2(); - virtual int handler_3(); - virtual int handler_4(); - virtual int handler_5(); - virtual int handler_6(); - virtual int handler_7(); + virtual int handler_0(); + virtual int handler_1(); + virtual int handler_2(); + virtual int handler_3(); + virtual int handler_4(); + virtual int handler_5(); + virtual int handler_6(); + virtual int handler_7(); virtual void update_databus(); virtual void vggo(); }; @@ -247,9 +247,9 @@ class avg_bzone_device : public avg_device public: // construction/destruction avg_bzone_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual int handler_1(); - virtual int handler_6(); - virtual int handler_7(); + virtual int handler_1(); + virtual int handler_6(); + virtual int handler_7(); }; // device type definition @@ -260,9 +260,9 @@ class avg_tomcat_device : public avg_device public: // construction/destruction avg_tomcat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - - virtual int handler_6(); - virtual int handler_7(); + + virtual int handler_6(); + virtual int handler_7(); }; // device type definition diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index 9c80ac30850..f16e1c7745d 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -123,7 +123,7 @@ void baraduke_state::video_start() m_bg_tilemap[0]->set_scrolldx(-26, -227+26); m_bg_tilemap[1]->set_scrolldx(-24, -227+24); m_bg_tilemap[0]->set_scrolldy(-9, 9); - m_bg_tilemap[1]->set_scrolldy(-9, 9); + m_bg_tilemap[1]->set_scrolldy(-9, 9); m_tx_tilemap->set_scrolldy(16,16); } diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 2067dcc7e9f..0d0367ad1a8 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -180,7 +180,7 @@ void battlane_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, @@ -191,7 +191,7 @@ void battlane_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { dy = flipy ? 16 : -16; - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code + 1, color, diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index 00769931847..c2b085f0952 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -81,7 +81,7 @@ void battlex_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, sx, sy, 0); + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, sx, sy, 0); source += 4; } diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index 887fbdbd148..c7099c7b9f5 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -228,7 +228,7 @@ void bfm_adder2_device::device_start() m_palette->set_pen_color(12,rgb_t(0x80,0x00,0x00)); m_palette->set_pen_color(13,rgb_t(0x80,0x00,0x80)); m_palette->set_pen_color(14,rgb_t(0x80,0x80,0x00)); - m_palette->set_pen_color(15,rgb_t(0x80,0x80,0x80)); + m_palette->set_pen_color(15,rgb_t(0x80,0x80,0x80)); } // video update /////////////////////////////////////////////////////////// diff --git a/src/mame/video/bfm_adr2.h b/src/mame/video/bfm_adr2.h index f5ea8b63b5e..8316f8a4b6a 100644 --- a/src/mame/video/bfm_adr2.h +++ b/src/mame/video/bfm_adr2.h @@ -8,7 +8,7 @@ public: bfm_adder2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_palette_tag(device_t &device, const char *tag); - + TILE_GET_INFO_MEMBER( get_tile0_info ); TILE_GET_INFO_MEMBER( get_tile1_info ); UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/video/bfm_dm01.c b/src/mame/video/bfm_dm01.c index ed0a3572f4e..46d40bd764a 100644 --- a/src/mame/video/bfm_dm01.c +++ b/src/mame/video/bfm_dm01.c @@ -76,7 +76,7 @@ bfmdm01_device::bfmdm01_device(const machine_config &mconfig, const char *tag, d void bfmdm01_device::device_start() { m_busy_cb.resolve_safe(); - + save_item(NAME(m_data_avail)); save_item(NAME(m_control)); save_item(NAME(m_xcounter)); @@ -100,7 +100,7 @@ void bfmdm01_device::device_reset() m_control = 0; m_xcounter = 0; m_data_avail = 0; - + m_busy_cb(m_busy); } diff --git a/src/mame/video/bfm_dm01.h b/src/mame/video/bfm_dm01.h index 0e73dfd19f5..dd6ace9f1fb 100644 --- a/src/mame/video/bfm_dm01.h +++ b/src/mame/video/bfm_dm01.h @@ -16,7 +16,7 @@ class bfmdm01_device : public device_t public: bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~bfmdm01_device() {} - + template static devcb2_base &set_busy_callback(device_t &device, _Object object) { return downcast(device).m_busy_cb.set_callback(object); } DECLARE_READ8_MEMBER( control_r ); @@ -46,7 +46,7 @@ private: UINT8 m_scanline[DM_BYTESPERROW]; UINT8 m_comdata; - + devcb2_write_line m_busy_cb; int read_data(void); diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index 5476ad3aa90..ea605ebb2c9 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -63,7 +63,7 @@ WRITE8_MEMBER(bogeyman_state::bogeyman_colorram2_w) WRITE8_MEMBER(bogeyman_state::bogeyman_paletteram_w) { /* RGB output is inverted */ - m_palette->write(space, offset, UINT8(~data)); + m_palette->write(space, offset, UINT8(~data)); } TILE_GET_INFO_MEMBER(bogeyman_state::get_bg_tile_info) @@ -122,7 +122,7 @@ void bogeyman_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, @@ -130,7 +130,6 @@ void bogeyman_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (multi) { - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code + 1, color, flipx, flipy, diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 20d72d58117..125e31f14a0 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -261,9 +261,9 @@ void bwing_state::draw_sprites( bitmap_ind16 &bmp, const rectangle &clip, UINT8 // single/double if (!(attrib & 0x10)) - gfx->transpen(bmp,clip, code, color, fx, fy, x, y, 0); + gfx->transpen(bmp,clip, code, color, fx, fy, x, y, 0); else - gfx->zoom_transpen(bmp,clip, code, color, fx, fy, x, y, 1<<16, 2<<16, 0); + gfx->zoom_transpen(bmp,clip, code, color, fx, fy, x, y, 1<<16, 2<<16, 0); } } diff --git a/src/mame/video/c45.c b/src/mame/video/c45.c index 9c08d58039b..131dfde1e8d 100644 --- a/src/mame/video/c45.c +++ b/src/mame/video/c45.c @@ -232,7 +232,6 @@ machine_config_constructor namco_c45_road_device::device_mconfig_additions() con void namco_c45_road_device::device_stop() { - } diff --git a/src/mame/video/c45.h b/src/mame/video/c45.h index f0c598902c8..1531e385251 100644 --- a/src/mame/video/c45.h +++ b/src/mame/video/c45.h @@ -38,13 +38,13 @@ public: namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_palette_tag(device_t &device, const char *tag); - + // read/write handlers DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); - + // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; // C45 Land (Road) Emulation void set_transparent_color(pen_t pen) { m_transparent_color = pen; } @@ -58,7 +58,7 @@ protected: // internal helpers TILE_GET_INFO_MEMBER( get_road_info ); - // internal state + // internal state pen_t m_transparent_color; tilemap_t * m_tilemap; UINT16 m_ram[0x20000/2]; // at 0x880000 in Final Lap; at 0xa00000 in Lucky&Wild diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index e8df61b1c31..b7182c8e841 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -39,7 +39,7 @@ void canyon_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect int y = m_videoram[0x3d0 + 2 * i + 0x8]; int c = m_videoram[0x3d0 + 2 * i + 0x9]; - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, c >> 3, i, diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c index 5a7813e3481..d35c8acf1ba 100644 --- a/src/mame/video/carpolo.c +++ b/src/mame/video/carpolo.c @@ -205,7 +205,7 @@ void carpolo_state::draw_sprite(bitmap_ind16 &bitmap, const rectangle &cliprect, x = 240 - x; y = 240 - y; - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, remapped_code, col, 0, flipy, diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index 41d2cc3945c..ee3741fafd5 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -569,7 +569,7 @@ void cclimber_state::cclimber_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } @@ -606,7 +606,7 @@ void cclimber_state::toprollr_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } @@ -643,7 +643,7 @@ void cclimber_state::swimmer_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index d683a917599..01b0dec70dd 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -198,7 +198,7 @@ void chaknpop_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile, color, diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index 86808c079ff..f941ed409b8 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -196,7 +196,7 @@ void champbas_state::champbas_draw_sprites( bitmap_ind16 &bitmap, const rectangl int sx = m_spriteram_2[offs + 1] - 16; int sy = 255 - m_spriteram_2[offs]; - + gfx->transmask(bitmap,cliprect, code, color, flipx, flipy, @@ -204,7 +204,7 @@ void champbas_state::champbas_draw_sprites( bitmap_ind16 &bitmap, const rectangl m_palette->transpen_mask(*gfx, color, 0)); // wraparound - + gfx->transmask(bitmap,cliprect, code, color, flipx, flipy, @@ -234,7 +234,7 @@ void champbas_state::exctsccr_draw_sprites( bitmap_ind16 &bitmap, const rectangl color = (obj1[offs + 1]) & 0x0f; bank = ((obj1[offs + 1] >> 4) & 1); - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + (bank << 6), color, @@ -257,7 +257,7 @@ void champbas_state::exctsccr_draw_sprites( bitmap_ind16 &bitmap, const rectangl flipy = (~obj1[offs]) & 0x02; color = (obj1[offs + 1]) & 0x0f; - + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, code, color, diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 0b501653d69..9d74f7de618 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -123,19 +123,19 @@ void cheekyms_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (!flip) code++; - gfx->transpen(bitmap,cliprect, code, color, 0, 0, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, 0, 0, x, y, 0); } else { if (m_spriteram[offs + 0] & 0x02) { - gfx->transpen(bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); - gfx->transpen(bitmap,cliprect, code | 0x21, color, 0, 0, 0x10 + x, y, 0); + gfx->transpen(bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); + gfx->transpen(bitmap,cliprect, code | 0x21, color, 0, 0, 0x10 + x, y, 0); } else { - gfx->transpen(bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); - gfx->transpen(bitmap,cliprect, code | 0x21, color, 0, 0, x, 0x10 + y, 0); + gfx->transpen(bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); + gfx->transpen(bitmap,cliprect, code | 0x21, color, 0, 0, x, 0x10 + y, 0); } } } diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index 7ea92abbe90..26f804a72ae 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -526,7 +526,7 @@ void combatsc_state::bootleg_draw_sprites( bitmap_ind16 &bitmap, const rectangle // if(m_vreg == 0x23 && (attributes & 0x02)) color += 1*16; // if(m_vreg == 0x66 ) color += 2*16; - gfx->transpen(bitmap,cliprect, + gfx->transpen(bitmap,cliprect, number, color, attributes & 0x10,0, /* flip */ x, y, 15 ); diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index 446abf2348b..2e903ee0bae 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1397,7 +1397,7 @@ static const struct CPS1config cps1_config_table[]= {"sf2acca", CPS_B_21_DEF, mapper_S9263B, 0x36 }, {"sf2accp2", CPS_B_21_DEF, mapper_S9263B, 0x36 }, {"sf2amf", CPS_B_21_DEF, mapper_S9263B, 0x36, 0, 0, 1 }, // probably wrong but this set is not completely dumped anyway - {"sf2amf2", CPS_B_21_DEF, mapper_S9263B, 0x36, 0, 0, 1 }, + {"sf2amf2", CPS_B_21_DEF, mapper_S9263B, 0x36, 0, 0, 1 }, {"sf2dkot2", CPS_B_21_DEF, mapper_S9263B, 0x36 }, {"sf2m1", CPS_B_21_DEF, mapper_S9263B, 0x36 }, {"sf2m2", CPS_B_21_DEF, mapper_S9263B, 0x36, 0, 0, 1 }, diff --git a/src/mame/video/crimfght.c b/src/mame/video/crimfght.c index cd83855e1dd..be7cdcdf7a2 100644 --- a/src/mame/video/crimfght.c +++ b/src/mame/video/crimfght.c @@ -64,7 +64,7 @@ void crimfght_state::video_start() m_layer_colorbase[1] = 4; m_layer_colorbase[2] = 8; m_sprite_colorbase = 16; - + save_item(NAME(m_paletteram)); } diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index 181b1e91a24..316789eb99b 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -172,7 +172,7 @@ UINT32 darkmist_state::screen_update_darkmist(screen_device &screen, bitmap_ind1 palette+=32; - + m_gfxdecode->gfx(2)->transpen( bitmap,cliprect, tile, diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c index 45968d1b30e..7b679a14399 100644 --- a/src/mame/video/ddribble.c +++ b/src/mame/video/ddribble.c @@ -218,7 +218,7 @@ void ddribble_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipr ex = flipx ? (width - 1 - x) : x; ey = flipy ? (height - 1 - y) : y; - + gfx->transpen(bitmap,cliprect, (number)+x_offset[ex]+y_offset[ey], color, diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 73f4a1ce85f..475d24a6604 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -298,8 +298,6 @@ VIDEO_START_MEMBER(dec8_state,cobracom) UINT32 dec8_state::screen_update_ghostb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - - m_tilegen1->deco_bac06_pf_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); m_spritegen_krn->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0); m_fix_tilemap->draw(screen, bitmap, cliprect, 0, 0); diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h index e515c8aea0c..e8bb6c644fc 100644 --- a/src/mame/video/decbac06.h +++ b/src/mame/video/decbac06.h @@ -108,7 +108,7 @@ private: TILEMAP_MAPPER_MEMBER(tile_shape2_8x8_scan); TILE_GET_INFO_MEMBER(get_pf8x8_tile_info); TILE_GET_INFO_MEMBER(get_pf16x16_tile_info); - required_device m_gfxdecode; + required_device m_gfxdecode; }; extern const device_type DECO_BAC06; diff --git a/src/mame/video/deckarn.h b/src/mame/video/deckarn.h index 6c0cb13b7f0..382f7f059b4 100644 --- a/src/mame/video/deckarn.h +++ b/src/mame/video/deckarn.h @@ -6,7 +6,7 @@ public: deco_karnovsprites_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_gfxregion(int region) { m_gfxregion = region; }; void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16* spriteram, int size, int priority ); - + // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_palette_tag(device_t &device, const char *tag); diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c index eb15a6261b1..68765e4a5ab 100644 --- a/src/mame/video/decmxc06.c +++ b/src/mame/video/decmxc06.c @@ -96,7 +96,7 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_ind16 &bi if (sy >= 256) sy -= 512; sx = 240 - sx; sy = 240 - sy; - + if (machine.driver_data()->flip_screen()) { sy = 240 - sy; @@ -122,7 +122,7 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_ind16 &bi code += h-1; incy = 1; } - + for (y = 0; y < h; y++) { if (spriteram[offs] & 0x8000) diff --git a/src/mame/video/decmxc06.h b/src/mame/video/decmxc06.h index 62bb9bb7a97..354c919cde7 100644 --- a/src/mame/video/decmxc06.h +++ b/src/mame/video/decmxc06.h @@ -5,12 +5,12 @@ class deco_mxc06_device : public device_t { public: deco_mxc06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_palette_tag(device_t &device, const char *tag); static void set_gfx_region(device_t &device, int region); - + void set_gfxregion(int region) { m_gfxregion = region; }; void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16* spriteram16, int pri_mask, int pri_val, int col_mask ); void draw_sprites_bootleg( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16* spriteram, int pri_mask, int pri_val, int col_mask ); diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h index 1eceb27d6aa..4f6fd7451f1 100644 --- a/src/mame/video/deco16ic.h +++ b/src/mame/video/deco16ic.h @@ -39,11 +39,11 @@ class deco16ic_device : public device_t, public: deco16ic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~deco16ic_device() {} - + // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_palette_tag(device_t &device, const char *tag); - + DECLARE_WRITE16_MEMBER( pf1_data_w ); DECLARE_WRITE16_MEMBER( pf2_data_w ); diff --git a/src/mame/video/decocomn.h b/src/mame/video/decocomn.h index 911f06aa6cb..47770b06714 100644 --- a/src/mame/video/decocomn.h +++ b/src/mame/video/decocomn.h @@ -23,7 +23,7 @@ public: // static configuration static void static_set_palette_tag(device_t &device, const char *tag); - + DECLARE_WRITE16_MEMBER( nonbuffered_palette_w ); DECLARE_WRITE16_MEMBER( buffered_palette_w ); DECLARE_WRITE16_MEMBER( palette_dma_w ); @@ -57,5 +57,5 @@ extern const device_type DECOCOMN; #define MCFG_DECOCOMN_PALETTE(_palette_tag) \ decocomn_device::static_set_palette_tag(*device, "^" _palette_tag); - + #endif diff --git a/src/mame/video/decospr.h b/src/mame/video/decospr.h index 29596bc0316..3ce8e63e06d 100644 --- a/src/mame/video/decospr.h +++ b/src/mame/video/decospr.h @@ -9,7 +9,7 @@ public: decospr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, const char *tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_palette_tag(device_t &device, const char *tag); static void set_gfx_region(device_t &device, int gfxregion); static void set_pri_callback(device_t &device, decospr_priority_callback_func callback); @@ -89,4 +89,3 @@ extern const device_type DECO_SPRITE; #define MCFG_DECO_SPRITE_PALETTE(_palette_tag) \ decospr_device::static_set_palette_tag(*device, "^" _palette_tag); - diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c index c66efa257e1..24f2bff0934 100644 --- a/src/mame/video/djmain.c +++ b/src/mame/video/djmain.c @@ -93,7 +93,7 @@ void djmain_state::draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect int zw = ox + (((x + 1) * xscale + (1 << 11)) >> 12) - sx; int zh = oy + (((y + 1) * yscale + (1 << 11)) >> 12) - sy; - + m_gfxdecode->gfx(0)->zoom_transpen(bitmap, cliprect, c, @@ -111,7 +111,7 @@ void djmain_state::draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect int sx = ox + (x << 4); int sy = oy + (y << 4); - + m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, c, diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index b51772bf76f..5d2a07d2729 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -93,7 +93,7 @@ void drgnmst_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect realy = ypos + incy * y; realnumber = number + x + y * 16; - gfx->transpen(bitmap,cliprect, realnumber, colr, flipx, flipy, realx, realy, 15); + gfx->transpen(bitmap,cliprect, realnumber, colr, flipx, flipy, realx, realy, 15); } } source += 4; diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 6abf243f155..9ec66724edd 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -385,11 +385,11 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16 else code &= ~0x10, code2 |= 0x10; - gfx->transmask(bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), + gfx->transmask(bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), m_palette->transpen_mask(*gfx, color, 0x10)); } - gfx->transmask(bitmap,cliprect, code, color, xflip, yflip, x, y, + gfx->transmask(bitmap,cliprect, code, color, xflip, yflip, x, y, m_palette->transpen_mask(*gfx, color, 0x10)); if (doubled) i += 4; diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 99555c9480a..1625b6fdfa3 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -174,18 +174,18 @@ UINT32 fcombat_state::screen_update_fcombat(screen_device &screen, bitmap_ind16 else code &= ~0x10, code2 |= 0x10; - gfx->transpen(bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), 0); } if(flags&0x10) { - gfx->transpen(bitmap,cliprect, code2 + 16, color, xflip, yflip, x, y + gfx->height(), 0); - gfx->transpen(bitmap,cliprect, code2 + 16 * 2, color, xflip, yflip, x, y + 2 * gfx->height(), 0); - gfx->transpen(bitmap,cliprect, code2 + 16 * 3, color, xflip, yflip, x, y + 3 * gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2 + 16, color, xflip, yflip, x, y + gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2 + 16 * 2, color, xflip, yflip, x, y + 2 * gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2 + 16 * 3, color, xflip, yflip, x, y + 3 * gfx->height(), 0); } - gfx->transpen(bitmap,cliprect, code, color, xflip, yflip, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, xflip, yflip, x, y, 0); if (doubled) i += 4; } diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index c5e839db549..fe7b4630494 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -262,7 +262,7 @@ void firetrk_state::firetrk_draw_car(bitmap_ind16 &bitmap, const rectangle &clip y = 104; } - m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); } @@ -274,7 +274,7 @@ void firetrk_state::superbug_draw_car(bitmap_ind16 &bitmap, const rectangle &cli int flip_x = *m_car_rot & 0x04; int flip_y = *m_car_rot & 0x08; - m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, 144, 104, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, 144, 104, 0); } @@ -303,7 +303,7 @@ void firetrk_state::montecar_draw_car(bitmap_ind16 &bitmap, const rectangle &cli y = 104; } - m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); } @@ -313,7 +313,7 @@ void firetrk_state::draw_text(bitmap_ind16 &bitmap, const rectangle &cliprect, U int i; for (i = 0; i < count; i++) - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, alpha_ram[i], 0, 0, 0, x, i * height); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, alpha_ram[i], 0, 0, 0, x, i * height); } diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index f456a76eaf9..dbaff995e27 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -34,7 +34,7 @@ void fitfight_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (end) break; if (prio == layer) - gfx->transpen(bitmap,cliprect, number, colr, xflip, yflip, xpos, ypos, 0); + gfx->transpen(bitmap,cliprect, number, colr, xflip, yflip, xpos, ypos, 0); source += 4; } diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 9a5834ae526..51f0926d524 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -377,7 +377,7 @@ void gaelco2_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co /* normal sprite, pen 0 transparent */ if (color_effect == 0){ - gfx->transpen(bitmap,cliprect, number, + gfx->transpen(bitmap,cliprect, number, color, xflip, yflip, ((sx + ex*16) & 0x3ff) + spr_x_adjust, ((sy + ey*16) & 0x1ff), 0); diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 78ffee37133..0e81ef57110 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -577,7 +577,7 @@ void galaxian_state::sprites_draw(bitmap_rgb32 &bitmap, const rectangle &cliprec } /* draw */ - + m_gfxdecode->gfx(1)->transpen(bitmap,clip, code, color, flipx, flipy, diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index 89e828d1ac7..fc61646b9dd 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -99,13 +99,13 @@ void goindol_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec tile += tile; palette = sprite_ram[offs + 2] >> 3; - + m_gfxdecode->gfx(gfxbank)->transpen(bitmap,cliprect, tile, palette, flip_screen(),flip_screen(), sx,sy, 0); - + m_gfxdecode->gfx(gfxbank)->transpen(bitmap,cliprect, tile+1, palette, diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index db79cf1fb7b..0208b7422fb 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -209,7 +209,7 @@ void gottlieb_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec if (flip_screen_x()) sx = 233 - sx; if (flip_screen_y()) sy = 228 - sy; - + m_gfxdecode->gfx(2)->transpen(bitmap,clip, code, 0, flip_screen_x(), flip_screen_y(), diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index fe0b99f69d1..6e5b1504e12 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -125,7 +125,7 @@ void gotya_state::draw_status_row( bitmap_ind16 &bitmap, const rectangle &clipre else sy = 31 - row; - + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram2[row * 32 + col], m_videoram2[row * 32 + col + 0x10] & 0x0f, @@ -149,7 +149,7 @@ void gotya_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect if (flip_screen()) sy = 240 - sy; - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flip_screen_x(), flip_screen_y(), diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h index c727c8344f7..f9d5bb2234e 100644 --- a/src/mame/video/gp9001.h +++ b/src/mame/video/gp9001.h @@ -141,4 +141,3 @@ extern const device_type GP9001_VDP; #define MCFG_GP9001_VDP_PALETTE(_palette_tag) \ gp9001vdp_device::static_set_palette_tag(*device, "^" _palette_tag); - diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 3c5b87f7f06..6a823a94ee5 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -121,7 +121,7 @@ int grchamp_state::collision_check(grchamp_state *state, bitmap_ind16 &bitmap, i if( which==0 ) { /* draw the current player sprite into a work bitmap */ - + m_gfxdecode->gfx(4)->opaque(m_work_bitmap, m_work_bitmap.cliprect(), m_cpu0_out[4]&0xf, @@ -187,7 +187,7 @@ void grchamp_state::draw_sprites(grchamp_state *state, bitmap_ind16 &bitmap, con int sy = 240-source[0]; int color = source[2]; int code = source[1); - + gfx->transpen(bitmap,cliprect, bank + (code & 0x3f), color, diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index 9763283d63b..fa35b42be6c 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -75,7 +75,7 @@ void K001006_init(running_machine &machine, palette_device *palette) K001006_addr[i] = 0; K001006_device_sel[i] = 0; K001006_palette[i] = auto_alloc_array(machine, UINT32, 0x800); - memset(K001006_palette[i], 0, 0x800*sizeof(UINT32)); + memset(K001006_palette[i], 0, 0x800*sizeof(UINT32)); } m_palette = palette; } diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index 3b5a0c9aff6..c4c32bca275 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -139,7 +139,7 @@ void gyruss_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect int flip_x = ~m_spriteram[offs + 2] & 0x40; int flip_y = m_spriteram[offs + 2] & 0x80; - m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); } } diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index 4531164fa19..b7629744c59 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -148,7 +148,7 @@ void hyperspt_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre sy += 1; - + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code, color, flipx, flipy, @@ -157,7 +157,7 @@ void hyperspt_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre /* redraw with wraparound */ - + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/jalblend.c b/src/mame/video/jalblend.c index 54591f9e2b5..43aa992af5c 100644 --- a/src/mame/video/jalblend.c +++ b/src/mame/video/jalblend.c @@ -110,7 +110,7 @@ void jal_blend_drawgfx_common(palette_device &palette,_BitmapClass &dest_bmp,con x_index_base = flipx ? gfx->width()-1 : 0; y_index = flipy ? gfx->height()-1 : 0; - // start coordinates + // start coordinates sx = offsx; sy = offsy; diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h index c012080c4de..6c2899d193f 100644 --- a/src/mame/video/k001005.h +++ b/src/mame/video/k001005.h @@ -28,7 +28,7 @@ public: ~k001005_device() {} static void static_set_palette_tag(device_t &device, const char *tag); - + void draw(bitmap_rgb32 &bitmap, const rectangle &cliprect); void swap_buffers(); void preprocess_texture_data(UINT8 *rom, int length, int gticlub); diff --git a/src/mame/video/k001604.h b/src/mame/video/k001604.h index 119972a37a8..32e6d9c4fb3 100644 --- a/src/mame/video/k001604.h +++ b/src/mame/video/k001604.h @@ -24,7 +24,7 @@ public: // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_palette_tag(device_t &device, const char *tag); - + void draw_back_layer( bitmap_rgb32 &bitmap, const rectangle &cliprect ); void draw_front_layer( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ); DECLARE_WRITE32_MEMBER( tile_w ); diff --git a/src/mame/video/k007121.h b/src/mame/video/k007121.h index 52b49ab5ba8..fa5d14076c3 100644 --- a/src/mame/video/k007121.h +++ b/src/mame/video/k007121.h @@ -9,7 +9,7 @@ public: ~k007121_device() {} static void static_set_palette_tag(device_t &device, const char *tag); - + DECLARE_READ8_MEMBER( ctrlram_r ); DECLARE_WRITE8_MEMBER( ctrl_w ); diff --git a/src/mame/video/k007342.c b/src/mame/video/k007342.c index 101f81c8f0e..b400c0ea8a9 100644 --- a/src/mame/video/k007342.c +++ b/src/mame/video/k007342.c @@ -49,7 +49,7 @@ k007342_device::k007342_device(const machine_config &mconfig, const char *tag, d //m_regs[8], //m_scrollx[2], //m_scrolly[2], - m_gfxdecode(*this), + m_gfxdecode(*this), m_gfxnum(0) { } @@ -74,8 +74,8 @@ void k007342_device::device_start() throw device_missing_dependencies(); // bind the init function - m_callback.bind_relative_to(*owner()); - + m_callback.bind_relative_to(*owner()); + m_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k007342_device::get_tile_info0),this), tilemap_mapper_delegate(FUNC(k007342_device::scan),this), 8, 8, 64, 32); m_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(k007342_device::get_tile_info1),this), tilemap_mapper_delegate(FUNC(k007342_device::scan),this), 8, 8, 64, 32); @@ -281,10 +281,10 @@ void k007342_device::get_tile_info( tile_data &tileinfo, int tile_index, int lay flags = TILE_FLIPYX((color & 0x30) >> 4); tileinfo.category = (color & 0x80) >> 7; - + if (!m_callback.isnull()) m_callback(layer, m_regs[1], &code, &color, &flags); - + SET_TILE_INFO_MEMBER(m_gfxnum, code, diff --git a/src/mame/video/k007342.h b/src/mame/video/k007342.h index 4b02fe91f2e..34bef6e39f1 100644 --- a/src/mame/video/k007342.h +++ b/src/mame/video/k007342.h @@ -12,9 +12,9 @@ public: // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); - static void static_set_gfxnum(device_t &device, int gfxnum) { downcast(device).m_gfxnum = gfxnum; } + static void static_set_gfxnum(device_t &device, int gfxnum) { downcast(device).m_gfxnum = gfxnum; } static void static_set_callback(device_t &device, k007342_delegate callback) { downcast(device).m_callback = callback; } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( scroll_r ); @@ -56,8 +56,7 @@ private: extern const device_type K007342; #define MCFG_K007342_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, K007342, 0) \ - + MCFG_DEVICE_ADD(_tag, K007342, 0) #define MCFG_K007342_GFXDECODE(_gfxtag) \ k007342_device::static_set_gfxdecode_tag(*device, "^" _gfxtag); @@ -68,9 +67,9 @@ extern const device_type K007342; k007342_device::static_set_callback(*device, k007342_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); #define MCFG_K007342_CALLBACK_DEVICE(_tag, _class, _method) \ - k007342_device::static_set_callback(*device, k007342_delegate(&_class::_method, #_class "::" #_method, _tag)); + k007342_device::static_set_callback(*device, k007342_delegate(&_class::_method, #_class "::" #_method, _tag)); // function definition for a callback -#define K007342_CALLBACK_MEMBER(_name) void _name(int layer, int bank, int *code, int *color, int *flags) +#define K007342_CALLBACK_MEMBER(_name) void _name(int layer, int bank, int *code, int *color, int *flags) #endif diff --git a/src/mame/video/k007420.c b/src/mame/video/k007420.c index 170def9759c..82fe02286c4 100644 --- a/src/mame/video/k007420.c +++ b/src/mame/video/k007420.c @@ -33,8 +33,8 @@ k007420_device::k007420_device(const machine_config &mconfig, const char *tag, d void k007420_device::device_start() { // bind the init function - m_callback.bind_relative_to(*owner()); - + m_callback.bind_relative_to(*owner()); + m_ram = auto_alloc_array_clear(machine(), UINT8, 0x200); save_pointer(NAME(m_ram), 0x200); diff --git a/src/mame/video/k007420.h b/src/mame/video/k007420.h index a1da00bd0d0..417230dec1a 100644 --- a/src/mame/video/k007420.h +++ b/src/mame/video/k007420.h @@ -11,7 +11,7 @@ public: ~k007420_device() {} static void static_set_palette_tag(device_t &device, const char *tag); - static void static_set_bank_limit(device_t &device, int limit) { downcast(device).m_banklimit = limit; } + static void static_set_bank_limit(device_t &device, int limit) { downcast(device).m_banklimit = limit; } static void static_set_callback(device_t &device, k007420_delegate callback) { downcast(device).m_callback = callback; } DECLARE_READ8_MEMBER( read ); @@ -48,7 +48,7 @@ extern const device_type K007420; k007420_device::static_set_callback(*device, k007420_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); // function definition for a callback -#define K007420_CALLBACK_MEMBER(_name) void _name(int *code, int *color) +#define K007420_CALLBACK_MEMBER(_name) void _name(int *code, int *color) #endif diff --git a/src/mame/video/k051316.h b/src/mame/video/k051316.h index e43acdcad20..885e8c65365 100644 --- a/src/mame/video/k051316.h +++ b/src/mame/video/k051316.h @@ -68,7 +68,7 @@ extern const device_type K051316; #define MCFG_K051316_GFXDECODE(_gfxtag) \ k051316_device::static_set_gfxdecode_tag(*device, "^" _gfxtag); - + #define MCFG_K051316_PALETTE(_palette_tag) \ k051316_device::static_set_palette_tag(*device, "^" _palette_tag); #endif diff --git a/src/mame/video/k053244_k053245.h b/src/mame/video/k053244_k053245.h index 3d9ef2d2ef8..3fafb69a5fd 100644 --- a/src/mame/video/k053244_k053245.h +++ b/src/mame/video/k053244_k053245.h @@ -70,7 +70,7 @@ private: required_device m_gfxdecode; required_device m_palette; - + DECLARE_READ16_MEMBER( k053244_reg_word_r ); // OBJSET0 debug handler }; diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h index 9ed1c3045c5..be4e0096f9c 100644 --- a/src/mame/video/k053246_k053247_k055673.h +++ b/src/mame/video/k053246_k053247_k055673.h @@ -119,7 +119,7 @@ public: const char *m_memory_region; required_device m_gfxdecode; required_device m_palette; - + /* alt implementation - to be collapsed */ void alt_k055673_vh_start(running_machine &machine, const char *gfx_memory_region, int alt_layout, int dx, int dy, void (*callback)(running_machine &machine, int *code,int *color,int *priority)); diff --git a/src/mame/video/k053250.h b/src/mame/video/k053250.h index 4bc4bc5b309..4e31ed0921f 100644 --- a/src/mame/video/k053250.h +++ b/src/mame/video/k053250.h @@ -13,7 +13,7 @@ MCFG_VIDEO_SET_SCREEN(_screen_tag) \ k053250_device::static_set_offsets(*device, offx, offy); -class k053250_device : public device_t, +class k053250_device : public device_t, public device_gfx_interface, public device_video_interface { diff --git a/src/mame/video/k054338.c b/src/mame/video/k054338.c index 1ea8e999731..b4350496632 100644 --- a/src/mame/video/k054338.c +++ b/src/mame/video/k054338.c @@ -309,7 +309,7 @@ int k054338_device::register_r( int reg ) } void k054338_device::update_all_shadows( int rushingheroes_hack, palette_device *palette ) -{ +{ int i, d; int noclip = m_regs[K338_REG_CONTROL] & K338_CTL_CLIPSL; diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index 5c1b6337b5e..63b87617bee 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -180,7 +180,7 @@ READ16_MEMBER(kaneko16_berlwall_state::kaneko16_bg15_reg_r) WRITE16_MEMBER(kaneko16_berlwall_state::kaneko16_bg15_reg_w) { COMBINE_DATA(&m_bg15_reg[0]); -// printf("kaneko16_bg15_reg_w %04x\n", m_bg15_reg[0]); +// printf("kaneko16_bg15_reg_w %04x\n", m_bg15_reg[0]); double brt1 = data & 0xff; brt1 = brt1 / 255.0; @@ -198,10 +198,10 @@ void kaneko16_berlwall_state::kaneko16_render_15bpp_bitmap(bitmap_rgb32 &bitmap, int flip = select & 0x20; int sx;//, sy; - // if (flip) select ^= 0x1f; + // if (flip) select ^= 0x1f; sx = (select & 0x1f) * 256; - // sy = 0; + // sy = 0; const pen_t *pal = m_bgpalette->pens(); UINT16* srcbitmap; diff --git a/src/mame/video/kaneko_spr.c b/src/mame/video/kaneko_spr.c index 01a66cc9cc9..d5660fe8af5 100644 --- a/src/mame/video/kaneko_spr.c +++ b/src/mame/video/kaneko_spr.c @@ -314,7 +314,6 @@ void kaneko16_sprite_device::kaneko16_draw_sprites_custom(_BitmapClass &dest_bmp { if (pri[x] < priority) { - if (!rgb) dest[x] = pen_base + c; else dest[x] = pal[pen_base + c]; diff --git a/src/mame/video/kaneko_spr.h b/src/mame/video/kaneko_spr.h index 416e43b7433..3614bcc5767 100644 --- a/src/mame/video/kaneko_spr.h +++ b/src/mame/video/kaneko_spr.h @@ -85,7 +85,7 @@ private: template void kaneko16_draw_sprites(running_machine &machine, _BitmapClass &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, UINT16* spriteram16, int spriteram16_bytes); - + template void kaneko16_draw_sprites_custom(_BitmapClass &dest_bmp,const rectangle &clip,gfx_element *gfx, UINT32 code,UINT32 color,int flipx,int flipy,int sx,int sy, diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c index cb1876a9163..5c358654f48 100644 --- a/src/mame/video/kopunch.c +++ b/src/mame/video/kopunch.c @@ -103,7 +103,7 @@ void kopunch_state::video_start() UINT32 kopunch_state::screen_update_kopunch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bitmap.fill(0, cliprect); - + // background does not wrap around horizontally rectangle bg_clip = cliprect; bg_clip.max_x = m_scrollx ^ 0xff; diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index 923a2db22b5..6b2f4505ca6 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -131,11 +131,11 @@ VIDEO_START_MEMBER(ladyfrog_state,ladyfrog_common) m_paletteram_ext.resize(0x200); m_palette->basemem().set(m_paletteram, ENDIANNESS_LITTLE, 1); m_palette->extmem().set(m_paletteram_ext, ENDIANNESS_LITTLE, 1); - + m_bg_tilemap->set_scroll_cols(32); m_bg_tilemap->set_scrolldy(15, 15); - save_pointer(NAME(m_spriteram), 160); + save_pointer(NAME(m_spriteram), 160); save_item(NAME(m_paletteram)); save_item(NAME(m_paletteram_ext)); } diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index 1cfa769fb1e..5cc6b4b9dd4 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -232,7 +232,7 @@ void lastduel_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 35b48e50b0a..45cc543cbd2 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -130,9 +130,9 @@ UINT32 m10_state::screen_update_m10(screen_device &screen, bitmap_ind16 &bitmap, for (i = 0; i < 4; i++) if (m_flip) - m_back_gfx->opaque(bitmap,cliprect, i, color[i], 1, 1, 31 * 8 - xpos[i], 0); + m_back_gfx->opaque(bitmap,cliprect, i, color[i], 1, 1, 31 * 8 - xpos[i], 0); else - m_back_gfx->opaque(bitmap,cliprect, i, color[i], 0, 0, xpos[i], 0); + m_back_gfx->opaque(bitmap,cliprect, i, color[i], 0, 0, xpos[i], 0); if (m_bottomline) { diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index 54e425b40b7..ae332ab8835 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -305,7 +305,7 @@ void m52_state::draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, /* this may not be correct */ ypos = ypos + (22 - 8); - + m_gfxdecode->gfx(image)->transpen(bitmap,cliprect, 0, 0, flip_screen(), @@ -313,7 +313,7 @@ void m52_state::draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, xpos, ypos, 0); - + m_gfxdecode->gfx(image)->transpen(bitmap,cliprect, 0, 0, flip_screen(), diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 8e76a1faabb..eaa8188d9b5 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -208,7 +208,7 @@ void mermaid_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec sy = 240 - sy; } - + m_gfxdecode->gfx(1)->transpen(bitmap,(flip_screen_x() ? flip_spritevisiblearea : spritevisiblearea), code, color, flipx, flipy, sx, sy, 0); } } diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index b4fb6693b9a..f1066c8cd0d 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -156,7 +156,7 @@ void mikie_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipy = !flipy; } - + m_gfxdecode->gfx(gfxbank)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c index 53b1d886f7f..bff9170ff4f 100644 --- a/src/mame/video/mrflea.c +++ b/src/mame/video/mrflea.c @@ -88,7 +88,7 @@ void mrflea_state::draw_background( bitmap_ind16 &bitmap, const rectangle &clipr { int tile_number = base + source[0] + source[0x400] * 0x100; source++; - + gfx->opaque(bitmap,cliprect, tile_number, 0, /* color */ diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index 4ee6a7c9c8f..11a8f101be4 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -97,7 +97,7 @@ void ms32_state::video_start() // tp2m32 doesn't set the brightness registers so we need sensible defaults m_brt[0] = m_brt[1] = 0xffff; - + save_item(NAME(m_irqreq)); save_item(NAME(m_temp_bitmap_tilemaps)); save_item(NAME(m_temp_bitmap_sprites)); diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index d41ddc1f27a..1388423ab0f 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -43,7 +43,7 @@ void mugsmash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec xpos -= 28; ypos -= 16; - + gfx->transpen( bitmap, cliprect, diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c index 0d8c6e4d404..e3cb071b0ea 100644 --- a/src/mame/video/munchmo.c +++ b/src/mame/video/munchmo.c @@ -63,7 +63,6 @@ void munchmo_state::draw_status( bitmap_ind16 &bitmap, const rectangle &cliprect for (sy = 0; sy < 256; sy += 8) { - gfx->opaque(bitmap,cliprect, *source++, 0, /* color */ @@ -94,7 +93,7 @@ void munchmo_state::draw_background( bitmap_ind16 &bitmap, const rectangle &clip { for (col = 0; col < 4; col++) { - gfx->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), + gfx->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), rom[col + tile_number * 4 + row * 0x400], m_palette_bank, 0,0, /* flip */ @@ -135,7 +134,7 @@ void munchmo_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { sx = (sx >> 1) | (tile_number & 0x80); sx = 2 * ((- 32 - scroll - sx) & 0xff) + xadjust; - gfx->transpen(bitmap,cliprect, + gfx->transpen(bitmap,cliprect, 0x7f - (tile_number & 0x7f), color_base - (attributes & 0x03), 0,0, /* no flip */ diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index 9a3475c1e80..67e4315bdbd 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -197,7 +197,7 @@ void mystston_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } } diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c index fd9d4551ba6..0942ea1f67b 100644 --- a/src/mame/video/namcona1.c +++ b/src/mame/video/namcona1.c @@ -278,7 +278,7 @@ void namcona1_state::video_start() { m_tilemap_palette_bank[i] = -1; } - + m_bg_tilemap[0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcona1_state::tilemap_get_info0),this), TILEMAP_SCAN_ROWS, 8,8,64,64 ); m_bg_tilemap[1] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcona1_state::tilemap_get_info1),this), TILEMAP_SCAN_ROWS, 8,8,64,64 ); m_bg_tilemap[2] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(namcona1_state::tilemap_get_info2),this), TILEMAP_SCAN_ROWS, 8,8,64,64 ); diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index fadf74a8e47..4ee5eb27bfe 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -1623,7 +1623,7 @@ void namcos22_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec int base = m_spriteram[0] & 0xffff; // alpinesa/alpinr2b int num_sprites = ((m_spriteram[1] >> 16) - base) + 1; - + // airco22b doesn't use spriteset #1 if (m_gametype == NAMCOS22_AIR_COMBAT22) num_sprites = 0; diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c index 5df49a810e5..373d0bc91f8 100644 --- a/src/mame/video/ninjakd2.c +++ b/src/mame/video/ninjakd2.c @@ -384,7 +384,7 @@ void ninjakd2_state::draw_sprites( bitmap_ind16 &bitmap) { int const tile = code ^ (x << big_xshift) ^ (y << big_yshift); - gfx->transpen(bitmap,bitmap.cliprect(), + gfx->transpen(bitmap,bitmap.cliprect(), tile, color, flipx,flipy, diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index 0b090150361..5243a612544 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -283,7 +283,7 @@ void nova2001_state::nova2001_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, @@ -320,14 +320,14 @@ void nova2001_state::pkunwar_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, sx, sy, 0); // there's no X MSB, so draw with wraparound (fixes title screen) - gfx->transpen(bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 7969cc1ecb2..bb874a096e9 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -122,7 +122,6 @@ void oneshot_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { for (blocky = 0; blocky < ysize; blocky++) { - gfx->transpen( bitmap, cliprect, @@ -131,7 +130,7 @@ void oneshot_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec 0,0, xpos + blockx * 8, ypos + blocky * 8, 0); - + gfx->transpen( bitmap, cliprect, diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index 06a48261b50..118db0b133c 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -167,7 +167,7 @@ void pooyan_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect int flipx = ~spriteram_2[offs] & 0x40; int flipy = spriteram_2[offs] & 0x80; - + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index f86c2314c15..e1b1a8bbba8 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -58,24 +58,24 @@ enum { TYPE_SKYSKIPR, TYPE_POPEYE }; static const res_net_decode_info popeye_7051_decode_info = { - 1, /* one prom 5 lines */ - 0, /* start at 0 */ - 15, /* end at 15 (banked) */ + 1, /* one prom 5 lines */ + 0, /* start at 0 */ + 15, /* end at 15 (banked) */ /* R, G, B, */ - { 0, 0, 0 }, /* offsets */ - { 0, 3, 6 }, /* shifts */ - {0x07,0x07,0x03 } /* masks */ + { 0, 0, 0 }, /* offsets */ + { 0, 3, 6 }, /* shifts */ + {0x07,0x07,0x03 } /* masks */ }; static const res_net_decode_info popeye_7052_decode_info = { - 2, /* there may be two proms needed to construct color */ - 0, /* start at 0 */ - 255, /* end at 255 */ + 2, /* there may be two proms needed to construct color */ + 0, /* start at 0 */ + 255, /* end at 255 */ /* R, G, B, R, G, B */ - { 0, 0, 0, 256, 256, 256}, /* offsets */ - { 0, 3, 0, 0, -1, 2}, /* shifts */ - {0x07,0x01,0x00,0x00,0x06,0x03} /* masks */ + { 0, 0, 0, 256, 256, 256}, /* offsets */ + { 0, 3, 0, 0, -1, 2}, /* shifts */ + {0x07,0x01,0x00,0x00,0x06,0x03} /* masks */ }; static const res_net_info popeye_7051_txt_net_info = @@ -122,7 +122,7 @@ void popeye_state::convert_color_prom(const UINT8 *color_prom) #if USE_NEW_COLOR for (i = 0; i < 16; i++) { - int prom_offs = i | ((i & 8) << 1); /* address bits 3 and 4 are tied together */ + int prom_offs = i | ((i & 8) << 1); /* address bits 3 and 4 are tied together */ int r, g, b; r = compute_res_net(((color_prom[prom_offs] ^ m_invertmask) >> 0) & 0x07, 0, popeye_7051_txt_net_info); g = compute_res_net(((color_prom[prom_offs] ^ m_invertmask) >> 3) & 0x07, 1, popeye_7051_txt_net_info); @@ -344,10 +344,10 @@ void popeye_state::video_start() m_fg_tilemap->set_transparent_pen(0); m_lastflip = 0; - m_field = 0; + m_field = 0; - save_item(NAME(m_field)); - save_item(NAME(m_lastflip)); + save_item(NAME(m_field)); + save_item(NAME(m_lastflip)); save_item(NAME(*m_tmpbitmap2)); save_pointer(NAME(m_bitmapram), popeye_bitmapram_size); } @@ -362,10 +362,10 @@ VIDEO_START_MEMBER(popeye_state,popeye) m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(popeye_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap->set_transparent_pen(0); - m_lastflip = 0; - m_field = 0; + m_lastflip = 0; + m_field = 0; - save_item(NAME(m_field)); + save_item(NAME(m_field)); save_item(NAME(m_lastflip)); save_item(NAME(*m_tmpbitmap2)); save_pointer(NAME(m_bitmapram), popeye_bitmapram_size); diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index d05bd0b24c4..a4fb902d1ad 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -930,12 +930,12 @@ void ppu2c0x_device::render_scanline( void ) } m_draw_phase = PPU_DRAW_OAM; - + /* if sprites are on, draw them, but we call always to process them */ draw_sprites(line_priority); m_draw_phase = PPU_DRAW_BG; - + /* done updating, whew */ g_profiler.stop(); } diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h index dafa18f9422..aab36ff6bdc 100644 --- a/src/mame/video/ppu2c0x.h +++ b/src/mame/video/ppu2c0x.h @@ -180,7 +180,7 @@ public: int is_sprite_8x16() { return m_regs[PPU_CONTROL0] & PPU_CONTROL0_SPRITE_SIZE; }; int get_draw_phase() { return m_draw_phase; }; int get_tilenum() { return m_tilecount; }; - + //27/12/2002 (HACK!) void set_latch( ppu2c0x_latch_delegate cb ) { m_latch = cb; m_latch.bind_relative_to(*owner()); }; @@ -213,8 +213,8 @@ public: int m_scan_scale; /* scan scale */ int m_scanlines_per_frame; /* number of scanlines per frame */ int m_security_value; /* 2C05 protection */ - int m_tilecount; /* MMC5 can change attributes to subsets of the 34 visibile tiles */ - int m_draw_phase; /* MMC5 uses different regs for BG and OAM */ + int m_tilecount; /* MMC5 can change attributes to subsets of the 34 visibile tiles */ + int m_draw_phase; /* MMC5 uses different regs for BG and OAM */ ppu2c0x_latch_delegate m_latch; // timers @@ -223,7 +223,7 @@ public: emu_timer *m_scanline_timer; /* scanline timer */ const char *m_cpu_tag; - + private: static const device_timer_id TIMER_HBLANK = 0; static const device_timer_id TIMER_NMI = 1; @@ -231,7 +231,7 @@ private: inline UINT8 readbyte(offs_t address); inline void writebyte(offs_t address, UINT8 data); - + }; class ppu2c02_device : public ppu2c0x_device { diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c index 90f5ee828d0..ce941069963 100644 --- a/src/mame/video/psikyo4.c +++ b/src/mame/video/psikyo4.c @@ -112,7 +112,7 @@ void psikyo4_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { for (i = xstart; i != xend; i += xinc) { - gfx->transpen(bitmap,cliprect, tnum + loopnum, colr, flipx, flipy, xpos + 16 * i, ypos + 16 * j, 0); + gfx->transpen(bitmap,cliprect, tnum + loopnum, colr, flipx, flipy, xpos + 16 * i, ypos + 16 * j, 0); loopnum++; } } diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index bb385c8c3a3..3d975604359 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -133,7 +133,7 @@ void raiden_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, flipx = !flipx; } - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 15); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 15); } } diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index 80597a553f5..46257f1d963 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -154,7 +154,7 @@ void sbasketb_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h index 3bc570b9b7a..df99e73a048 100644 --- a/src/mame/video/segaic16.h +++ b/src/mame/video/segaic16.h @@ -98,7 +98,7 @@ public: // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); - + UINT8 segaic16_display_enable; UINT16 *segaic16_tileram_0; UINT16 *segaic16_textram_0; diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h index 70b4c37d2f8..a3cf73de43e 100644 --- a/src/mame/video/segaic24.h +++ b/src/mame/video/segaic24.h @@ -14,10 +14,10 @@ #define MCFG_S24TILE_DEVICE_GFXDECODE(_gfxtag) \ segas24_tile::static_set_gfxdecode_tag(*device, "^" _gfxtag); - + #define MCFG_S24TILE_DEVICE_PALETTE(_palette_tag) \ segas24_tile::static_set_palette_tag(*device, "^" _palette_tag); - + class segas24_tile : public device_t { friend class segas24_tile_config; diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h index 54fb2ed50b8..eeac3b6d3d3 100644 --- a/src/mame/video/seibu_crtc.h +++ b/src/mame/video/seibu_crtc.h @@ -1,6 +1,6 @@ /*************************************************************************** - Seibu CRTC device + Seibu CRTC device ***************************************************************************/ @@ -16,7 +16,7 @@ #define MCFG_SEIBU_CRTC_LAYER_EN_CB(_devcb) \ devcb = &seibu_crtc_device::set_layer_en_callback(*device, DEVCB2_##_devcb); - + #define MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(_devcb) \ devcb = &seibu_crtc_device::set_layer_scroll_callback(*device, DEVCB2_##_devcb); @@ -37,7 +37,7 @@ public: template static devcb2_base &set_layer_en_callback(device_t &device, _Object object) { return downcast(device).m_layer_en_cb.set_callback(object); } template static devcb2_base &set_layer_scroll_callback(device_t &device, _Object object) { return downcast(device).m_layer_scroll_cb.set_callback(object); } - + // I/O operations DECLARE_WRITE16_MEMBER( write ); DECLARE_WRITE16_MEMBER( write_alt ); @@ -47,7 +47,7 @@ public: DECLARE_READ16_MEMBER( read_xor ); DECLARE_WRITE16_MEMBER(layer_en_w); DECLARE_WRITE16_MEMBER(layer_scroll_w); - + protected: // device-level overrides virtual void device_validity_check(validity_checker &valid) const; diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index 8aef4e440aa..5cd57e1d675 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -141,7 +141,7 @@ void shangkid_state::draw_sprite(const UINT8 *source, bitmap_ind16 &bitmap, cons { sx = xpos+(c^xflip)*width; sy = ypos+(r^yflip)*height; - + gfx->zoom_transpen( bitmap, cliprect, @@ -152,7 +152,7 @@ void shangkid_state::draw_sprite(const UINT8 *source, bitmap_ind16 &bitmap, cons (width<<16)/16, (height<<16)/16,transparent_pen ); // wrap around y - + gfx->zoom_transpen( bitmap, cliprect, @@ -264,7 +264,7 @@ void shangkid_state::dynamski_draw_background(bitmap_ind16 &bitmap, const rectan if( pri==0 || (attr>>7)==pri ) { tile += ((attr>>5)&0x3)*256; - + m_gfxdecode->gfx(0)->transpen( bitmap, cliprect, @@ -297,7 +297,7 @@ void shangkid_state::dynamski_draw_sprites(bitmap_ind16 &bitmap, const rectangle sx = videoram[0x1381+i]-64+8+16; if( attr&1 ) sx += 0x100; - + m_gfxdecode->gfx(1)->transpen( bitmap, cliprect, diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 7c224e7bd05..7d90466eea9 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -185,7 +185,7 @@ void sidearms_state::draw_sprites_region(bitmap_ind16 &bitmap, const rectangle & y = (30 * 8) - y; } - + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index add16556bee..8349cdc451d 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -60,7 +60,7 @@ VIDEO_START_MEMBER(slapfght_state, slapfight) { m_pf1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_pf1_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fix_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_fix_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - + m_fix_tilemap->set_scrolldy(0, 15); m_pf1_tilemap->set_scrolldy(0, 14); @@ -135,34 +135,34 @@ WRITE8_MEMBER(slapfght_state::palette_bank_w) void slapfght_state::draw_perfrman_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int layer) { UINT8 *src = m_spriteram->buffer(); - + for (int offs = 0; offs < m_spriteram->bytes(); offs += 4) { /* - 0: xxxxxxxx - code - 1: xxxxxxxx - x - 2: x....... - priority over backdrop - .x...... - sprite-sprite priority (see point-pop sprites) - ..x..... - ? - ...xx... - no function? - .....xxx - color - 3: xxxxxxxx - y + 0: xxxxxxxx - code + 1: xxxxxxxx - x + 2: x....... - priority over backdrop + .x...... - sprite-sprite priority (see point-pop sprites) + ..x..... - ? + ...xx... - no function? + .....xxx - color + 3: xxxxxxxx - y */ - + int code = src[offs + 0]; int sy = src[offs + 3] - 1; int sx = src[offs + 1] - 13; int pri = src[offs + 2] >> 6 & 3; int color = (src[offs + 2] >> 1 & 3) | (src[offs + 2] << 2 & 4) | (m_palette_bank << 3); int fx = 0, fy = 0; - + if (flip_screen()) { sy = 256 - sy; sx = 240 - sx; fx = fy = 1; } - + if (layer == pri) m_gfxdecode->gfx(1)->transpen(bitmap, cliprect, code, color, fx, fy, sx, sy, 0); } @@ -189,15 +189,15 @@ void slapfght_state::draw_slapfight_sprites(bitmap_ind16 &bitmap, const rectangl for (int offs = 0; offs < m_spriteram->bytes(); offs += 4) { /* - 0: xxxxxxxx - code low - 1: xxxxxxxx - x low - 2: xx...... - code high - ..x..... - no function? - ...xxxx. - color - .......x - x high - 3: xxxxxxxx - y + 0: xxxxxxxx - code low + 1: xxxxxxxx - x low + 2: xx...... - code high + ..x..... - no function? + ...xxxx. - color + .......x - x high + 3: xxxxxxxx - y */ - + int code = src[offs + 0] | ((src[offs + 2] & 0xc0) << 2); int sy = src[offs + 3]; int sx = (src[offs + 1] | (src[offs + 2] << 8 & 0x100)) - 13; @@ -210,7 +210,7 @@ void slapfght_state::draw_slapfight_sprites(bitmap_ind16 &bitmap, const rectangl sx = 284 - sx; fx = fy = 1; } - + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, code, color, fx, fy, sx, sy, 0); } } diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 4d70f21ef1c..ce30ac4da7b 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -86,7 +86,7 @@ void solomon_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index 8d21a933ad6..e0b3fe33464 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -154,7 +154,7 @@ void sonson_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index 67c38bd9eb7..b638d3d4d8d 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -160,7 +160,7 @@ void ssozumo_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c index cb80cb799b9..8e3c5f0bb58 100644 --- a/src/mame/video/sspeedr.c +++ b/src/mame/video/sspeedr.c @@ -196,7 +196,7 @@ void sspeedr_state::draw_drones(bitmap_ind16 &bitmap, const rectangle &cliprect) y = 0xf0 - m_drones_vert[i >> 1]; - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code[i] ^ m_toggle, 0, @@ -226,7 +226,7 @@ void sspeedr_state::draw_driver(bitmap_ind16 &bitmap, const rectangle &cliprect) y = 0xf0 - m_driver_vert; - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_driver_pic, 0, diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index 37315fa5f76..c0ddc2aaf64 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -23,7 +23,7 @@ UINT32 stadhero_state::screen_update_stadhero(screen_device &screen, bitmap_ind1 // machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); flip_screen_set(m_tilegen1->get_flip_state()); - + m_tilegen1->set_bppmultmask(0x8, 0x7); m_tilegen1->deco_bac06_pf_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_spriteram, 0x00, 0x00, 0x0f); diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c index 39b5ffcb0dc..6fb230a5f1e 100644 --- a/src/mame/video/starcrus.c +++ b/src/mame/video/starcrus.c @@ -164,7 +164,7 @@ int starcrus_state::collision_check_s1s2() org_y = m_s1_y; /* Draw ship 1 */ - + m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->opaque(*m_ship1_vid, clip, (m_s1_sprite&0x03)^0x03, @@ -173,7 +173,7 @@ int starcrus_state::collision_check_s1s2() m_s1_x-org_x, m_s1_y-org_y); /* Draw ship 2 */ - + m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->opaque(*m_ship2_vid, clip, (m_s2_sprite&0x03)^0x03, @@ -215,7 +215,7 @@ int starcrus_state::collision_check_p1p2() if (m_p1_sprite & 0x08) /* if p1 is a projectile */ { /* Draw score/projectile 1 */ - + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(*m_proj1_vid, clip, (m_p1_sprite&0x03)^0x03, @@ -227,7 +227,7 @@ int starcrus_state::collision_check_p1p2() if (m_p2_sprite & 0x08) /* if p2 is a projectile */ { /* Draw score/projectile 2 */ - + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(*m_proj2_vid, clip, (m_p2_sprite&0x03)^0x03, @@ -269,7 +269,7 @@ int starcrus_state::collision_check_s1p1p2() org_y = m_s1_y; /* Draw ship 1 */ - + m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->opaque(*m_ship1_vid, clip, (m_s1_sprite&0x03)^0x03, @@ -280,7 +280,7 @@ int starcrus_state::collision_check_s1p1p2() if (m_p1_sprite & 0x08) /* if p1 is a projectile */ { /* Draw projectile 1 */ - + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(*m_proj1_vid, clip, (m_p1_sprite&0x03)^0x03, @@ -292,7 +292,7 @@ int starcrus_state::collision_check_s1p1p2() if (m_p2_sprite & 0x08) /* if p2 is a projectile */ { /* Draw projectile 2 */ - + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(*m_proj2_vid, clip, (m_p2_sprite&0x03)^0x03, @@ -340,7 +340,7 @@ int starcrus_state::collision_check_s2p1p2() org_y = m_s2_y; /* Draw ship 2 */ - + m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->opaque(*m_ship2_vid, clip, (m_s2_sprite&0x03)^0x03, @@ -351,7 +351,7 @@ int starcrus_state::collision_check_s2p1p2() if (m_p1_sprite & 0x08) /* if p1 is a projectile */ { /* Draw projectile 1 */ - + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(*m_proj1_vid, clip, (m_p1_sprite&0x03)^0x03, @@ -363,7 +363,7 @@ int starcrus_state::collision_check_s2p1p2() if (m_p2_sprite & 0x08) /* if p2 is a projectile */ { /* Draw projectile 2 */ - + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(*m_proj2_vid, clip, (m_p2_sprite&0x03)^0x03, @@ -393,7 +393,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 bitmap.fill(0, cliprect); /* Draw ship 1 */ - + m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->transpen(bitmap, cliprect, (m_s1_sprite&0x03)^0x03, @@ -403,7 +403,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 0); /* Draw ship 2 */ - + m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->transpen(bitmap, cliprect, (m_s2_sprite&0x03)^0x03, @@ -413,7 +413,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 0); /* Draw score/projectile 1 */ - + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->transpen(bitmap, cliprect, (m_p1_sprite&0x03)^0x03, @@ -423,7 +423,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 0); /* Draw score/projectile 2 */ - + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->transpen(bitmap, cliprect, (m_p2_sprite&0x03)^0x03, diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 0dd2ffac9e0..9b5f24dd30c 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -105,7 +105,7 @@ void stlforce_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec ypos = 512-ypos; - + gfx->transpen(bitmap, cliprect, num, diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index e4e47b3356a..84c7743e5e4 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -107,7 +107,7 @@ void strnskil_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if (sx > 248) sx = sx - 256; - + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index 1a64821abad..db331d98d6a 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -163,7 +163,7 @@ void tagteam_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, @@ -175,7 +175,7 @@ void tagteam_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect color = m_palettebank; sy += (flip_screen() ? -256 : 256); - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c index 451e336f112..b4a18513f5d 100644 --- a/src/mame/video/taito_h.c +++ b/src/mame/video/taito_h.c @@ -144,7 +144,7 @@ void taitoh_state::syvalion_draw_sprites( bitmap_ind16 &bitmap, const rectangle flipy ^= 0x0080; } - + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, @@ -256,7 +256,7 @@ void taitoh_state::recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle flipy ^= 0x0080; } - + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, @@ -358,7 +358,7 @@ void taitoh_state::dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle & flipy ^= 0x0080; } - + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c index 4b085b800cb..44eb1e8e7aa 100644 --- a/src/mame/video/taito_o.c +++ b/src/mame/video/taito_o.c @@ -118,7 +118,7 @@ void taitoo_state::parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle & flipy ^= 0x0080; } - + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c index d03105d6190..74960b1a5d3 100644 --- a/src/mame/video/taitoair.c +++ b/src/mame/video/taitoair.c @@ -163,7 +163,7 @@ void taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy ^= 0x0080; } - + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c index cc277d358d0..a0edf710ff5 100644 --- a/src/mame/video/taitosj.c +++ b/src/mame/video/taitosj.c @@ -301,7 +301,7 @@ int taitosj_state::check_sprite_sprite_bitpattern(int sx1, int sy1, int which1,i /* draw the sprites into separate bitmaps and check overlapping region */ m_sprite_layer_collbitmap1.fill(TRANSPARENT_PEN); - get_sprite_gfx_element(which1)->transpen(m_sprite_sprite_collbitmap1,m_sprite_sprite_collbitmap1.cliprect(), + get_sprite_gfx_element(which1)->transpen(m_sprite_sprite_collbitmap1,m_sprite_sprite_collbitmap1.cliprect(), m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs1 + 3] & 0x3f, 0, m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs1 + 2] & 0x01, @@ -309,7 +309,7 @@ int taitosj_state::check_sprite_sprite_bitpattern(int sx1, int sy1, int which1,i sx1, sy1, 0); m_sprite_sprite_collbitmap2.fill(TRANSPARENT_PEN); - get_sprite_gfx_element(which2)->transpen(m_sprite_sprite_collbitmap2,m_sprite_sprite_collbitmap2.cliprect(), + get_sprite_gfx_element(which2)->transpen(m_sprite_sprite_collbitmap2,m_sprite_sprite_collbitmap2.cliprect(), m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs2 + 3] & 0x3f, 0, m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs2 + 2] & 0x01, diff --git a/src/mame/video/tc0080vco.h b/src/mame/video/tc0080vco.h index 9dbac441101..253d23bf43a 100644 --- a/src/mame/video/tc0080vco.h +++ b/src/mame/video/tc0080vco.h @@ -84,7 +84,7 @@ extern const device_type TC0080VCO; #define MCFG_TC0080VCO_ADD(_tag, _interface) \ MCFG_DEVICE_ADD(_tag, TC0080VCO, 0) \ MCFG_DEVICE_CONFIG(_interface) - + #define MCFG_TC0080VCO_GFXDECODE(_gfxtag) \ tc0080vco_device::static_set_gfxdecode_tag(*device, "^" _gfxtag); diff --git a/src/mame/video/tc0110pcr.c b/src/mame/video/tc0110pcr.c index bda9a1f9726..79938ed95a0 100644 --- a/src/mame/video/tc0110pcr.c +++ b/src/mame/video/tc0110pcr.c @@ -46,7 +46,6 @@ void tc0110pcr_device::static_set_palette_tag(device_t &device, const char *tag) void tc0110pcr_device::device_config_complete() { - } //------------------------------------------------- diff --git a/src/mame/video/tc0110pcr.h b/src/mame/video/tc0110pcr.h index ae2e173fa83..ebdd60ece25 100644 --- a/src/mame/video/tc0110pcr.h +++ b/src/mame/video/tc0110pcr.h @@ -15,9 +15,9 @@ public: DECLARE_WRITE16_MEMBER( step1_4bpg_word_w ); /* only 4 bits per color gun */ void restore_colors(); - + static void static_set_palette_tag(device_t &device, const char *tag); - + protected: // device-level overrides virtual void device_config_complete(); @@ -28,14 +28,13 @@ private: UINT16 * m_ram; int m_type; int m_addr; - required_device m_palette; + required_device m_palette; }; extern const device_type TC0110PCR; #define MCFG_TC0110PCR_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TC0110PCR, 0) \ - + MCFG_DEVICE_ADD(_tag, TC0110PCR, 0) #define MCFG_TC0110PCR_PALETTE(_palette_tag) \ tc0110pcr_device::static_set_palette_tag(*device, "^" _palette_tag); diff --git a/src/mame/video/tc0480scp.h b/src/mame/video/tc0480scp.h index e95a3cc68ee..e9bb7d8854d 100644 --- a/src/mame/video/tc0480scp.h +++ b/src/mame/video/tc0480scp.h @@ -25,7 +25,7 @@ public: // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_palette_tag(device_t &device, const char *tag); - + /* When writing a driver, pass zero for the text and flip offsets initially: then tweak them once you have the 4 bg layer positions correct. Col_base may be needed when tilemaps use a palette area from sprites. */ diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index 64a3d5391c0..9353f4ce519 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -474,7 +474,7 @@ void tceptor_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect x -= 64; y -= 78; - + m_gfxdecode->gfx(gfx)->zoom_transmask(bitmap, cliprect, code, diff --git a/src/mame/video/tecmo_spr.c b/src/mame/video/tecmo_spr.c index 3170692612d..3911c8ba013 100644 --- a/src/mame/video/tecmo_spr.c +++ b/src/mame/video/tecmo_spr.c @@ -120,7 +120,7 @@ int spbactn_draw_sprites(screen_device &screen, gfxdecode_device *gfxdecode, bit int x = sx + 8 * (flipx ? (size - 1 - col) : col); int y = sy + 8 * (flipy ? (size - 1 - row) : row); - gfxdecode->gfx(2)->transpen_raw(bitmap,cliprect, + gfxdecode->gfx(2)->transpen_raw(bitmap,cliprect, code + layout[row][col], gfxdecode->gfx(2)->colorbase() + color * gfxdecode->gfx(2)->granularity(), flipx, flipy, diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 940c3bb178d..ac3940ca594 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -266,13 +266,13 @@ static void draw_sprites(running_machine &machine, /* sprites 0-3 are drawn one pixel down */ if (offs < 16) y++; - + state->m_gfxdecode->gfx(2 * state->m_graphics_bank + 1)->transpen(bitmap,cliprect, state->m_spriteram[offs + 1] & 0x3f, state->m_spriteram[offs + 2], flipx, flipy, x, y, 0); - + state->m_gfxdecode->gfx(2 * state->m_graphics_bank + 1)->transpen(bitmap,cliprect, state->m_spriteram[offs + 1] & 0x3f, state->m_spriteram[offs + 2], diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h index 44f90ef0d20..cc544299e62 100644 --- a/src/mame/video/tia.h +++ b/src/mame/video/tia.h @@ -33,7 +33,7 @@ struct player_gfx { #define MCFG_TIA_DATABUS_CONTENTS_CB(_devcb) \ devcb = &tia_video_device::set_databus_contents_callback(*device, DEVCB2_##_devcb); - + #define MCFG_TIA_VSYNC_CB(_devcb) \ devcb = &tia_video_device::set_vsync_callback(*device, DEVCB2_##_devcb); @@ -49,7 +49,7 @@ class tia_video_device : public device_t, { public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - + template static devcb2_base &set_read_input_port_callback(device_t &device, _Object object) { return downcast(device).m_read_input_port_cb.set_callback(object); } template static devcb2_base &set_databus_contents_callback(device_t &device, _Object object) { return downcast(device).m_databus_contents_cb.set_callback(object); } template static devcb2_base &set_vsync_callback(device_t &device, _Object object) { return downcast(device).m_vsync_cb.set_callback(object); } diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index 08f6235a422..b92196b86d8 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -96,7 +96,7 @@ void tigeroad_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, tile_number, color, diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index 0407021f834..1eb074f3450 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -220,7 +220,7 @@ void trackfld_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre //} - + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code + m_sprite_bank1 + m_sprite_bank2, color, flipx, flipy, @@ -228,7 +228,7 @@ void trackfld_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre m_palette->transpen_mask(*m_gfxdecode->gfx(0), color, 0)); /* redraw with wraparound */ - + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code + m_sprite_bank1 + m_sprite_bank2, color, flipx, flipy, diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index 87475c56560..01827fe1b4f 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -333,7 +333,6 @@ void tunhunt_state::draw_shell(bitmap_ind16 &bitmap, { for( sy=0; sy<256; sy+=16 ) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, picture_code, 0, /* color */ @@ -358,7 +357,7 @@ void tunhunt_state::draw_shell(bitmap_ind16 &bitmap, vstop = 0x00 */ - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, picture_code, 0, /* color */ diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index 575f7c9b124..6999a0d7dbc 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -94,7 +94,7 @@ void twincobr_state::twincobr_create_tilemaps() m_bg_tilemap->set_scrolldy(-30, -243 ); m_fg_tilemap->set_scrolldy(-30, -243 ); m_tx_tilemap->set_scrolldy(-30, -243 ); - + m_fg_tilemap->set_transparent_pen(0); m_tx_tilemap->set_transparent_pen(0); } diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 475982071ba..8bfdb5bae6c 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -74,7 +74,6 @@ struct sprite void wecleman_state::get_sprite_info() { - const pen_t *base_pal = m_palette->pens(); UINT8 *base_gfx = memregion("gfx1")->base(); int gfx_max = memregion("gfx1")->bytes(); diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c index f9615bc9665..8d14691a43a 100644 --- a/src/mame/video/wiz.c +++ b/src/mame/video/wiz.c @@ -121,7 +121,7 @@ void wiz_state::draw_tiles(bitmap_ind16 &bitmap, const rectangle &cliprect, int UINT8 *cram = layer ? m_colorram2 : m_colorram; gfx_element *gfx = m_gfxdecode->gfx(charbank); int palbank = m_palbank[1] << 4 | m_palbank[0] << 3; - + /* draw the tiles. They are characters, but draw them as sprites. */ for (int offs = 0x400-1; offs >= 0; offs--) { @@ -129,7 +129,7 @@ void wiz_state::draw_tiles(bitmap_ind16 &bitmap, const rectangle &cliprect, int int sx = offs & 0x1f; int sy = offs >> 5; int color = aram[sx << 1 | 1] & 7; - + // wiz/kungfut hw allows more color variety on screen if (colortype) color = layer ? (cram[offs] & 7) : ((color & 4) | (code & 3)); @@ -154,16 +154,16 @@ void wiz_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, in UINT8 *sram = set ? m_spriteram2 : m_spriteram; gfx_element *gfx = m_gfxdecode->gfx(charbank); int palbank = m_palbank[1] << 4 | m_palbank[0] << 3; - + for (int offs = 0x20-4; offs >= 0; offs -= 4) { int code = sram[offs + 1]; int sx = sram[offs + 3]; int sy = sram[offs]; int color = sram[offs + 2] & 7; // high bits unused - + if (!sx || !sy) continue; - + // like on galaxian hw, the first three sprites match against y-1 (not on m_spriteram2) if (set == 0 && offs <= 8) sy += (m_flipy) ? 1 : -1; diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c index 950cc0cdc7b..b1a1d118502 100644 --- a/src/mame/video/wolfpack.c +++ b/src/mame/video/wolfpack.c @@ -139,7 +139,7 @@ void wolfpack_state::draw_ship(bitmap_ind16 &bitmap, const rectangle &cliprect) int chop = (scaler[m_ship_size >> 2] * m_ship_h_precess) >> 16; - + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,cliprect, m_ship_pic, 0, @@ -157,7 +157,7 @@ void wolfpack_state::draw_torpedo(bitmap_ind16 &bitmap, const rectangle &cliprec int x; int y; - + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, m_torpedo_pic, 0, @@ -193,7 +193,7 @@ void wolfpack_state::draw_pt(bitmap_ind16 &bitmap, const rectangle &cliprect) if (!(m_pt_pic & 0x10)) rect.max_x = 255; - + m_gfxdecode->gfx(2)->transpen(bitmap,rect, m_pt_pic, 0, @@ -201,7 +201,7 @@ void wolfpack_state::draw_pt(bitmap_ind16 &bitmap, const rectangle &cliprect) 2 * m_pt_horz, m_pt_pos_select ? 0x70 : 0xA0, 0); - + m_gfxdecode->gfx(2)->transpen(bitmap,rect, m_pt_pic, 0, @@ -254,7 +254,7 @@ UINT32 wolfpack_state::screen_update_wolfpack(screen_device &screen, bitmap_ind1 { int code = m_alpha_num_ram[32 * i + j]; - + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code, m_video_invert, diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 0406db88738..7766c7f2c09 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -73,7 +73,7 @@ void ygv608_device::static_set_palette_tag(device_t &device, const char *tag) void ygv608_device::set_gfxbank(UINT8 gfxbank) { - m_namcond1_gfxbank = gfxbank; + m_namcond1_gfxbank = gfxbank; } /* interrupt generated every 1ms second */ @@ -95,7 +95,7 @@ INTERRUPT_GEN_MEMBER(ygv608_device::timed_interrupt ) { m_ports.s.p6 |= p6_fv; if (m_regs.s.r14 & r14_iev) - device.execute().set_input_line(2, HOLD_LINE); + device.execute().set_input_line(2, HOLD_LINE); } /* once every 60Hz, set the position detection flag (somewhere) */ @@ -103,7 +103,7 @@ INTERRUPT_GEN_MEMBER(ygv608_device::timed_interrupt ) { m_ports.s.p6 |= p6_fp; if (m_regs.s.r14 & r14_iep) - device.execute().set_input_line(2, HOLD_LINE); + device.execute().set_input_line(2, HOLD_LINE); } } diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index 3dbd6b0e7f0..f847cd6edfc 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -289,7 +289,7 @@ public: // static configuration static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_palette_tag(device_t &device, const char *tag); - + DECLARE_WRITE16_MEMBER( write ); DECLARE_READ16_MEMBER( read ); diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 415da3e0ca1..058237e95df 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -129,7 +129,7 @@ void yiear_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect sy++; /* fix title screen & garbage at the bottom of the screen */ } - + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index 813db2b6864..951363344dc 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -428,10 +428,10 @@ void zaxxon_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sx = find_minimum_x(spriteram[offs + 3], flip); /* draw with 256 pixel offsets to ensure we wrap properly */ - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy - 0x100, 0); - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy, 0); - gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy - 0x100, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy - 0x100, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy - 0x100, 0); } } diff --git a/src/mess/audio/upd1771.h b/src/mess/audio/upd1771.h index c3f0fa2b04c..0395519bee7 100644 --- a/src/mess/audio/upd1771.h +++ b/src/mess/audio/upd1771.h @@ -27,7 +27,7 @@ public: ~upd1771c_device() {} template static devcb2_base &set_ack_handler(device_t &device, _Object object) { return downcast(device).m_ack_handler.set_callback(object); } - + DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); WRITE_LINE_MEMBER( pcm_write ); diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c index 2496c5570e4..20fce8f1b4a 100644 --- a/src/mess/drivers/a2600.c +++ b/src/mess/drivers/a2600.c @@ -1939,7 +1939,7 @@ static MACHINE_CONFIG_START( a2600, a2600_state ) MCFG_TIA_READ_INPUT_PORT_CB(READ16(a2600_state, a2600_read_input_port)) MCFG_TIA_DATABUS_CONTENTS_CB(READ8(a2600_state, a2600_get_databus_contents)) MCFG_TIA_VSYNC_CB(WRITE16(a2600_state, a2600_tia_vsync_callback)) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK_NTSC, 228, 26, 26 + 160 + 16, 262, 24 , 24 + 192 + 31 ) MCFG_SCREEN_UPDATE_DEVICE("tia_video", tia_video_device, screen_update) @@ -1977,7 +1977,7 @@ static MACHINE_CONFIG_START( a2600p, a2600_state ) MCFG_TIA_READ_INPUT_PORT_CB(READ16(a2600_state, a2600_read_input_port)) MCFG_TIA_DATABUS_CONTENTS_CB(READ8(a2600_state, a2600_get_databus_contents)) MCFG_TIA_VSYNC_CB(WRITE16(a2600_state, a2600_tia_vsync_callback_pal)) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK_PAL, 228, 26, 26 + 160 + 16, 312, 32, 32 + 228 + 31 ) diff --git a/src/mess/drivers/a7000.c b/src/mess/drivers/a7000.c index 094db2b6714..2d6f3b218f0 100644 --- a/src/mess/drivers/a7000.c +++ b/src/mess/drivers/a7000.c @@ -27,7 +27,7 @@ public: a7000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c index 930f49cd09d..61c9fb888b8 100644 --- a/src/mess/drivers/a7800.c +++ b/src/mess/drivers/a7800.c @@ -74,10 +74,10 @@ 2014/01/02 Robert Tuccitto Corrected joystick buttons assignment & minor palette notes cleanup. - + 2014/01/09 Robert Tuccitto Positional description for difficulty switches added. - + 2014/02/15 Robert Tuccitto Added more details and clarification regarding the potentiometer. @@ -177,45 +177,45 @@ depending on how poor or well it handles the signal conversion and its calibration) on a modern flat panel display, as opposed to 'gold' (~-33 degrees) on a CRT. -The potentiometer (pot adjustment) for the 7800 modifies the delay line -regarding colors it will exhibit and is extremely sensitive. The slightest -turn can have a significant impact. +The potentiometer (pot adjustment) for the 7800 modifies the delay line +regarding colors it will exhibit and is extremely sensitive. The slightest +turn can have a significant impact. -A system whose potentiometer is not properly calibrated via -'CPS 7800 Diagnostic Test Cartridge' or/and just slightly off from the -desired factory settings may exhibit consequences such as too much blue in -place of green (Pot adjusted slightly too far left) or washed out reddish -tones in place of where most other systems display a darker reddish tones -(Pot adjusted slightly too far right). +A system whose potentiometer is not properly calibrated via +'CPS 7800 Diagnostic Test Cartridge' or/and just slightly off from the +desired factory settings may exhibit consequences such as too much blue in +place of green (Pot adjusted slightly too far left) or washed out reddish +tones in place of where most other systems display a darker reddish tones +(Pot adjusted slightly too far right). -This is a result of the phase shifting of lesser degrees (Pot adjusted more -to the left) or phase shifting of greater degrees (Pot adjusted more to the -right). +This is a result of the phase shifting of lesser degrees (Pot adjusted more +to the left) or phase shifting of greater degrees (Pot adjusted more to the +right). -Turning the pot adjustment to the right, it can be observed that the values -of the higher end of the scale will match the lower end of the scale. -For example, after some turning to the right, the values of Dx, Ex, Fx, -can be set to match 1x, 2x, 3x. +Turning the pot adjustment to the right, it can be observed that the values +of the higher end of the scale will match the lower end of the scale. +For example, after some turning to the right, the values of Dx, Ex, Fx, +can be set to match 1x, 2x, 3x. -After further turning to the right, now the palette can be brought to make -Ax, Bx, Cx, Dx, Ex, Fx will match 1x, 2x, 3x, 4x, 5x, 6x. +After further turning to the right, now the palette can be brought to make +Ax, Bx, Cx, Dx, Ex, Fx will match 1x, 2x, 3x, 4x, 5x, 6x. -Ultimately though, too much turning to the right results in all colors being -wiped from the scale, excluding the hue begin point 1x (Which remains +Ultimately though, too much turning to the right results in all colors being +wiped from the scale, excluding the hue begin point 1x (Which remains unchanged while tweaking the potentiometer either left or right). -Continuously turning the pot adjustment to the left, red and blue become the -most dominant two colors encompassing the palette with only a slight -influence of green at the highest end of the palette (Fx), once turned all +Continuously turning the pot adjustment to the left, red and blue become the +most dominant two colors encompassing the palette with only a slight +influence of green at the highest end of the palette (Fx), once turned all the way leftward. -The degree range for adjustment of the phase shifting on the 7800 appears -to be as low as approximately 15 degrees when tuned all the way left, and -seems to be able to achieve as high as approximately 45 degrees when turned +The degree range for adjustment of the phase shifting on the 7800 appears +to be as low as approximately 15 degrees when tuned all the way left, and +seems to be able to achieve as high as approximately 45 degrees when turned right before losing all color (Excluding 1x) from the palette scale. -For even a properly calibrated system at power on, the system's phase -shift appears as low as ~23 degrees and after a considerable consistent +For even a properly calibrated system at power on, the system's phase +shift appears as low as ~23 degrees and after a considerable consistent runtime ('warm-up'), can be as high as ~28 degrees. In general, the low end of ~23 degrees lasts for maybe several seconds, @@ -224,7 +224,7 @@ system run time. 180 degrees colorburst takes place at ~25.7 degrees (A near exact match of Hue 1x and 15x - To the naked eye they appear to be the same). -However, consistent system run time causes Hue 15x (F$) to become +However, consistent system run time causes Hue 15x (F$) to become stronger/darker gold (More brown then ultimately red-brown); as well as leans Hue 14x (E$) more brown than green. Once achieving a phase shift of 27.7, Hue 14x (E$) and Hue 15x (F$) near-exact match Hue 1x and 2x @@ -265,100 +265,100 @@ upon display type. ***************************************************************************/ #define NTSC_GREY \ - rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \ - rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \ - rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \ - rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF ) + rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \ + rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \ + rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \ + rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF ) #define NTSC_GOLD \ - rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \ - rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \ - rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \ - rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 ) + rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \ + rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \ + rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \ + rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 ) #define NTSC_ORANGE \ - rgb_t(0x31,0x00,0x00), rgb_t(0x42,0x06,0x00), rgb_t(0x53,0x17,0x00), rgb_t(0x64,0x28,0x00), \ - rgb_t(0x75,0x39,0x00), rgb_t(0x86,0X4A,0x00), rgb_t(0x97,0x5B,0x0A), rgb_t(0xA8,0x6C,0x1B), \ - rgb_t(0xB9,0x7D,0x2C), rgb_t(0xCA,0x8E,0x3D), rgb_t(0xDB,0x9F,0x4E), rgb_t(0xEC,0xB0,0x5F), \ - rgb_t(0xFD,0xC1,0x70), rgb_t(0xFF,0xD2,0x85), rgb_t(0xFF,0xE3,0x9C), rgb_t(0xFF,0xF4,0xB2 ) + rgb_t(0x31,0x00,0x00), rgb_t(0x42,0x06,0x00), rgb_t(0x53,0x17,0x00), rgb_t(0x64,0x28,0x00), \ + rgb_t(0x75,0x39,0x00), rgb_t(0x86,0X4A,0x00), rgb_t(0x97,0x5B,0x0A), rgb_t(0xA8,0x6C,0x1B), \ + rgb_t(0xB9,0x7D,0x2C), rgb_t(0xCA,0x8E,0x3D), rgb_t(0xDB,0x9F,0x4E), rgb_t(0xEC,0xB0,0x5F), \ + rgb_t(0xFD,0xC1,0x70), rgb_t(0xFF,0xD2,0x85), rgb_t(0xFF,0xE3,0x9C), rgb_t(0xFF,0xF4,0xB2 ) #define NTSC_RED_ORANGE \ - rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x08,0x00), rgb_t(0x71,0x19,0x00), \ - rgb_t(0x82,0x2A,0x0D), rgb_t(0x93,0x3B,0x1E), rgb_t(0xA4,0x4C,0x2F), rgb_t(0xB5,0x5D,0x40), \ - rgb_t(0xC6,0x6E,0x51), rgb_t(0xD7,0x7F,0x62), rgb_t(0xE8,0x90,0x73), rgb_t(0xF9,0xA1,0x83), \ - rgb_t(0xFF,0xB2,0x98), rgb_t(0xFF,0xC3,0xAE), rgb_t(0xFF,0xD4,0xC4), rgb_t(0xFF,0xE5,0xDA ) + rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x08,0x00), rgb_t(0x71,0x19,0x00), \ + rgb_t(0x82,0x2A,0x0D), rgb_t(0x93,0x3B,0x1E), rgb_t(0xA4,0x4C,0x2F), rgb_t(0xB5,0x5D,0x40), \ + rgb_t(0xC6,0x6E,0x51), rgb_t(0xD7,0x7F,0x62), rgb_t(0xE8,0x90,0x73), rgb_t(0xF9,0xA1,0x83), \ + rgb_t(0xFF,0xB2,0x98), rgb_t(0xFF,0xC3,0xAE), rgb_t(0xFF,0xD4,0xC4), rgb_t(0xFF,0xE5,0xDA ) #define NTSC_PINK \ - rgb_t(0x3F,0x00,0x03), rgb_t(0x50,0x00,0x0F), rgb_t(0x61,0x00,0x1B), rgb_t(0x72,0x0F,0x2B), \ - rgb_t(0x83,0x20,0x3C), rgb_t(0x94,0x31,0x4D), rgb_t(0xA5,0x42,0x5E), rgb_t(0xB6,0x53,0x6F), \ - rgb_t(0xC7,0x64,0x80), rgb_t(0xD8,0x75,0x91), rgb_t(0xE9,0x86,0xA2), rgb_t(0xFA,0x97,0xB3), \ - rgb_t(0xFF,0xA8,0xC8), rgb_t(0xFF,0xB9,0xDE), rgb_t(0xFF,0xCA,0xEF), rgb_t(0xFF,0xDB,0xF4 ) + rgb_t(0x3F,0x00,0x03), rgb_t(0x50,0x00,0x0F), rgb_t(0x61,0x00,0x1B), rgb_t(0x72,0x0F,0x2B), \ + rgb_t(0x83,0x20,0x3C), rgb_t(0x94,0x31,0x4D), rgb_t(0xA5,0x42,0x5E), rgb_t(0xB6,0x53,0x6F), \ + rgb_t(0xC7,0x64,0x80), rgb_t(0xD8,0x75,0x91), rgb_t(0xE9,0x86,0xA2), rgb_t(0xFA,0x97,0xB3), \ + rgb_t(0xFF,0xA8,0xC8), rgb_t(0xFF,0xB9,0xDE), rgb_t(0xFF,0xCA,0xEF), rgb_t(0xFF,0xDB,0xF4 ) #define NTSC_PURPLE \ - rgb_t(0x33,0x00,0x35), rgb_t(0x44,0x00,0x41), rgb_t(0x55,0x00,0x4C), rgb_t(0x66,0x0C,0x5C), \ - rgb_t(0x77,0x1D,0x6D), rgb_t(0x88,0x2E,0x7E), rgb_t(0x99,0x3F,0x8F), rgb_t(0xAA,0x50,0xA0), \ - rgb_t(0xBB,0x61,0xB1), rgb_t(0xCC,0x72,0xC2), rgb_t(0xDD,0x83,0xD3), rgb_t(0xEE,0x94,0xE4), \ - rgb_t(0xFF,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 ) + rgb_t(0x33,0x00,0x35), rgb_t(0x44,0x00,0x41), rgb_t(0x55,0x00,0x4C), rgb_t(0x66,0x0C,0x5C), \ + rgb_t(0x77,0x1D,0x6D), rgb_t(0x88,0x2E,0x7E), rgb_t(0x99,0x3F,0x8F), rgb_t(0xAA,0x50,0xA0), \ + rgb_t(0xBB,0x61,0xB1), rgb_t(0xCC,0x72,0xC2), rgb_t(0xDD,0x83,0xD3), rgb_t(0xEE,0x94,0xE4), \ + rgb_t(0xFF,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 ) #define NTSC_PURPLE_BLUE \ - rgb_t(0x1D,0x00,0x5C), rgb_t(0x2E,0x00,0x68), rgb_t(0x40,0x00,0x74), rgb_t(0x51,0x10,0x84), \ - rgb_t(0x62,0x21,0x95), rgb_t(0x73,0x32,0xA6), rgb_t(0x84,0x43,0xB7), rgb_t(0x95,0x54,0xC8), \ - rgb_t(0xA6,0x65,0xD9), rgb_t(0xB7,0x76,0xEA), rgb_t(0xC8,0x87,0xEB), rgb_t(0xD9,0x98,0xEB), \ - rgb_t(0xE9,0xA9,0xEC), rgb_t(0xFB,0xBA,0xEB), rgb_t(0xFF,0xCB,0xEF), rgb_t(0xFF,0xDC,0xF4 ) + rgb_t(0x1D,0x00,0x5C), rgb_t(0x2E,0x00,0x68), rgb_t(0x40,0x00,0x74), rgb_t(0x51,0x10,0x84), \ + rgb_t(0x62,0x21,0x95), rgb_t(0x73,0x32,0xA6), rgb_t(0x84,0x43,0xB7), rgb_t(0x95,0x54,0xC8), \ + rgb_t(0xA6,0x65,0xD9), rgb_t(0xB7,0x76,0xEA), rgb_t(0xC8,0x87,0xEB), rgb_t(0xD9,0x98,0xEB), \ + rgb_t(0xE9,0xA9,0xEC), rgb_t(0xFB,0xBA,0xEB), rgb_t(0xFF,0xCB,0xEF), rgb_t(0xFF,0xDC,0xF4 ) #define NTSC_BLUE1 \ - rgb_t(0x02,0x00,0x71), rgb_t(0x13,0x00,0x7D), rgb_t(0x24,0x0B,0x8C), rgb_t(0x35,0x1C,0x9D), \ - rgb_t(0x46,0x2D,0xAE), rgb_t(0x57,0x3E,0xBF), rgb_t(0x68,0x4F,0xD0), rgb_t(0x79,0x60,0xE1), \ - rgb_t(0x8A,0x71,0xF2), rgb_t(0x9B,0x82,0xF7), rgb_t(0xAC,0x93,0xF7), rgb_t(0xBD,0xA4,0xF7), \ - rgb_t(0xCE,0xB5,0xF7), rgb_t(0xDF,0xC6,0xF7), rgb_t(0xF0,0xD7,0xF7), rgb_t(0xFF,0xE8,0xF8 ) + rgb_t(0x02,0x00,0x71), rgb_t(0x13,0x00,0x7D), rgb_t(0x24,0x0B,0x8C), rgb_t(0x35,0x1C,0x9D), \ + rgb_t(0x46,0x2D,0xAE), rgb_t(0x57,0x3E,0xBF), rgb_t(0x68,0x4F,0xD0), rgb_t(0x79,0x60,0xE1), \ + rgb_t(0x8A,0x71,0xF2), rgb_t(0x9B,0x82,0xF7), rgb_t(0xAC,0x93,0xF7), rgb_t(0xBD,0xA4,0xF7), \ + rgb_t(0xCE,0xB5,0xF7), rgb_t(0xDF,0xC6,0xF7), rgb_t(0xF0,0xD7,0xF7), rgb_t(0xFF,0xE8,0xF8 ) #define NTSC_BLUE2 \ - rgb_t(0x00,0x00,0x68), rgb_t(0x00,0x0A,0x7C), rgb_t(0x08,0x1B,0x90), rgb_t(0x19,0x2C,0xA1), \ - rgb_t(0x2A,0x3D,0xB2), rgb_t(0x3B,0x4E,0xC3), rgb_t(0x4C,0x5F,0xD4), rgb_t(0x5D,0x70,0xE5), \ - rgb_t(0x6E,0x81,0xF6), rgb_t(0x7F,0x92,0xFF), rgb_t(0x90,0xA3,0xFF), rgb_t(0xA1,0xB4,0xFF), \ - rgb_t(0xB2,0xC5,0xFF), rgb_t(0xC3,0xD6,0xFF), rgb_t(0xD4,0xE7,0xFF), rgb_t(0xE5,0xF8,0xFF ) + rgb_t(0x00,0x00,0x68), rgb_t(0x00,0x0A,0x7C), rgb_t(0x08,0x1B,0x90), rgb_t(0x19,0x2C,0xA1), \ + rgb_t(0x2A,0x3D,0xB2), rgb_t(0x3B,0x4E,0xC3), rgb_t(0x4C,0x5F,0xD4), rgb_t(0x5D,0x70,0xE5), \ + rgb_t(0x6E,0x81,0xF6), rgb_t(0x7F,0x92,0xFF), rgb_t(0x90,0xA3,0xFF), rgb_t(0xA1,0xB4,0xFF), \ + rgb_t(0xB2,0xC5,0xFF), rgb_t(0xC3,0xD6,0xFF), rgb_t(0xD4,0xE7,0xFF), rgb_t(0xE5,0xF8,0xFF ) #define NTSC_LIGHT_BLUE \ - rgb_t(0x00,0x0A,0x4D), rgb_t(0x00,0x1B,0x63), rgb_t(0x00,0x2C,0x79), rgb_t(0x02,0x3D,0x8F), \ - rgb_t(0x13,0x4E,0xA0), rgb_t(0x24,0x5F,0xB1), rgb_t(0x35,0x70,0xC2), rgb_t(0x46,0x81,0xD3), \ - rgb_t(0x57,0x92,0xE4), rgb_t(0x68,0xA3,0xF5), rgb_t(0x79,0xB4,0xFF), rgb_t(0x8A,0xC5,0xFF), \ - rgb_t(0x9B,0xD6,0xFF), rgb_t(0xAC,0xE7,0xFF), rgb_t(0xBD,0xF8,0xFF), rgb_t(0xCE,0xFF,0xFF ) + rgb_t(0x00,0x0A,0x4D), rgb_t(0x00,0x1B,0x63), rgb_t(0x00,0x2C,0x79), rgb_t(0x02,0x3D,0x8F), \ + rgb_t(0x13,0x4E,0xA0), rgb_t(0x24,0x5F,0xB1), rgb_t(0x35,0x70,0xC2), rgb_t(0x46,0x81,0xD3), \ + rgb_t(0x57,0x92,0xE4), rgb_t(0x68,0xA3,0xF5), rgb_t(0x79,0xB4,0xFF), rgb_t(0x8A,0xC5,0xFF), \ + rgb_t(0x9B,0xD6,0xFF), rgb_t(0xAC,0xE7,0xFF), rgb_t(0xBD,0xF8,0xFF), rgb_t(0xCE,0xFF,0xFF ) #define NTSC_TURQUOISE \ - rgb_t(0x00,0x1A,0x26), rgb_t(0x00,0x2B,0x3C), rgb_t(0x00,0x3C,0x52), rgb_t(0x00,0x4D,0x68), \ - rgb_t(0x06,0x5E,0x7C), rgb_t(0x17,0x6F,0x8D), rgb_t(0x28,0x80,0x9E), rgb_t(0x39,0x91,0xAF), \ - rgb_t(0x4A,0xA2,0xC0), rgb_t(0x5B,0xB3,0xD1), rgb_t(0x6C,0xC4,0xE2), rgb_t(0x7D,0xD5,0xF3), \ - rgb_t(0x8E,0xE6,0xFF), rgb_t(0x9F,0xF7,0xFF), rgb_t(0xB0,0xFF,0xFF), rgb_t(0xC1,0xFF,0xFF ) + rgb_t(0x00,0x1A,0x26), rgb_t(0x00,0x2B,0x3C), rgb_t(0x00,0x3C,0x52), rgb_t(0x00,0x4D,0x68), \ + rgb_t(0x06,0x5E,0x7C), rgb_t(0x17,0x6F,0x8D), rgb_t(0x28,0x80,0x9E), rgb_t(0x39,0x91,0xAF), \ + rgb_t(0x4A,0xA2,0xC0), rgb_t(0x5B,0xB3,0xD1), rgb_t(0x6C,0xC4,0xE2), rgb_t(0x7D,0xD5,0xF3), \ + rgb_t(0x8E,0xE6,0xFF), rgb_t(0x9F,0xF7,0xFF), rgb_t(0xB0,0xFF,0xFF), rgb_t(0xC1,0xFF,0xFF ) #define NTSC_GREEN_BLUE \ - rgb_t(0x00,0x24,0x0B), rgb_t(0x00,0x35,0x10), rgb_t(0x00,0x46,0x22), rgb_t(0x00,0x57,0x38), \ - rgb_t(0x05,0x68,0x4D), rgb_t(0x16,0x79,0x5E), rgb_t(0x27,0x8A,0x6F), rgb_t(0x38,0x9B,0x80), \ - rgb_t(0x49,0xAC,0x91), rgb_t(0x5A,0xBD,0xA2), rgb_t(0x6B,0xCE,0xB3), rgb_t(0x7C,0xDF,0xC4), \ - rgb_t(0x8D,0xF0,0xD5), rgb_t(0x9E,0xFF,0xE5), rgb_t(0xAF,0xFF,0xF1), rgb_t(0xC0,0xFF,0xFD ) + rgb_t(0x00,0x24,0x0B), rgb_t(0x00,0x35,0x10), rgb_t(0x00,0x46,0x22), rgb_t(0x00,0x57,0x38), \ + rgb_t(0x05,0x68,0x4D), rgb_t(0x16,0x79,0x5E), rgb_t(0x27,0x8A,0x6F), rgb_t(0x38,0x9B,0x80), \ + rgb_t(0x49,0xAC,0x91), rgb_t(0x5A,0xBD,0xA2), rgb_t(0x6B,0xCE,0xB3), rgb_t(0x7C,0xDF,0xC4), \ + rgb_t(0x8D,0xF0,0xD5), rgb_t(0x9E,0xFF,0xE5), rgb_t(0xAF,0xFF,0xF1), rgb_t(0xC0,0xFF,0xFD ) #define NTSC_GREEN \ - rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x00,0x5A,0x1B), \ - rgb_t(0x10,0x6B,0x1B), rgb_t(0x21,0x7C,0x2C), rgb_t(0x32,0x8D,0x3D), rgb_t(0x43,0x9E,0x4E), \ - rgb_t(0x54,0xAF,0x5F), rgb_t(0x65,0xC0,0x70), rgb_t(0x76,0xD1,0x81), rgb_t(0x87,0xE2,0x92), \ - rgb_t(0x98,0xF3,0xA3), rgb_t(0xA9,0xFF,0xB3), rgb_t(0xBA,0xFF,0xBF), rgb_t(0xCB,0xFF,0xCB ) + rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x00,0x5A,0x1B), \ + rgb_t(0x10,0x6B,0x1B), rgb_t(0x21,0x7C,0x2C), rgb_t(0x32,0x8D,0x3D), rgb_t(0x43,0x9E,0x4E), \ + rgb_t(0x54,0xAF,0x5F), rgb_t(0x65,0xC0,0x70), rgb_t(0x76,0xD1,0x81), rgb_t(0x87,0xE2,0x92), \ + rgb_t(0x98,0xF3,0xA3), rgb_t(0xA9,0xFF,0xB3), rgb_t(0xBA,0xFF,0xBF), rgb_t(0xCB,0xFF,0xCB ) #define NTSC_YELLOW_GREEN \ - rgb_t(0x00,0x23,0x0A), rgb_t(0x00,0x34,0x10), rgb_t(0x04,0x45,0x13), rgb_t(0x15,0x56,0x13), \ - rgb_t(0x26,0x67,0x13), rgb_t(0x37,0x78,0x13), rgb_t(0x48,0x89,0x14), rgb_t(0x59,0x9A,0x25), \ - rgb_t(0x6A,0xAB,0x36), rgb_t(0x7B,0xBC,0x47), rgb_t(0x8C,0xCD,0x58), rgb_t(0x9D,0xDE,0x69), \ - rgb_t(0xAE,0xEF,0x7A), rgb_t(0xBF,0xFF,0x8B), rgb_t(0xD0,0xFF,0x97), rgb_t(0xE1,0xFF,0xA3 ) + rgb_t(0x00,0x23,0x0A), rgb_t(0x00,0x34,0x10), rgb_t(0x04,0x45,0x13), rgb_t(0x15,0x56,0x13), \ + rgb_t(0x26,0x67,0x13), rgb_t(0x37,0x78,0x13), rgb_t(0x48,0x89,0x14), rgb_t(0x59,0x9A,0x25), \ + rgb_t(0x6A,0xAB,0x36), rgb_t(0x7B,0xBC,0x47), rgb_t(0x8C,0xCD,0x58), rgb_t(0x9D,0xDE,0x69), \ + rgb_t(0xAE,0xEF,0x7A), rgb_t(0xBF,0xFF,0x8B), rgb_t(0xD0,0xFF,0x97), rgb_t(0xE1,0xFF,0xA3 ) #define NTSC_ORANGE_GREEN \ - rgb_t(0x00,0x17,0x07), rgb_t(0x0E,0x28,0x08), rgb_t(0x1F,0x39,0x08), rgb_t(0x30,0x4A,0x08), \ - rgb_t(0x41,0x5B,0x08), rgb_t(0x52,0x6C,0x08), rgb_t(0x63,0x7D,0x08), rgb_t(0x74,0x8E,0x0D), \ - rgb_t(0x85,0x9F,0x1E), rgb_t(0x96,0xB0,0x2F), rgb_t(0xA7,0xC1,0x40), rgb_t(0xB8,0xD2,0x51), \ - rgb_t(0xC9,0xE3,0x62), rgb_t(0xDA,0xF4,0x73), rgb_t(0xEB,0xFF,0x82), rgb_t(0xFC,0xFF,0x8E ) + rgb_t(0x00,0x17,0x07), rgb_t(0x0E,0x28,0x08), rgb_t(0x1F,0x39,0x08), rgb_t(0x30,0x4A,0x08), \ + rgb_t(0x41,0x5B,0x08), rgb_t(0x52,0x6C,0x08), rgb_t(0x63,0x7D,0x08), rgb_t(0x74,0x8E,0x0D), \ + rgb_t(0x85,0x9F,0x1E), rgb_t(0x96,0xB0,0x2F), rgb_t(0xA7,0xC1,0x40), rgb_t(0xB8,0xD2,0x51), \ + rgb_t(0xC9,0xE3,0x62), rgb_t(0xDA,0xF4,0x73), rgb_t(0xEB,0xFF,0x82), rgb_t(0xFC,0xFF,0x8E ) #define NTSC_LIGHT_ORANGE \ - rgb_t(0x19,0x07,0x00), rgb_t(0x2A,0x18,0x00), rgb_t(0x3B,0x29,0x00), rgb_t(0x4C,0x3A,0x00), \ - rgb_t(0x5D,0x4B,0x00), rgb_t(0x6E,0x5C,0x00), rgb_t(0x7F,0x6D,0x00), rgb_t(0x90,0x7E,0x09), \ - rgb_t(0xA1,0x8F,0x1A), rgb_t(0xB2,0xA0,0x2B), rgb_t(0xC3,0xB1,0x3C), rgb_t(0xD4,0xC2,0x4D), \ - rgb_t(0xE5,0xD3,0x5E), rgb_t(0xF6,0xE4,0x6F), rgb_t(0xFF,0xF5,0x82), rgb_t(0xFF,0xFF,0x96 ) + rgb_t(0x19,0x07,0x00), rgb_t(0x2A,0x18,0x00), rgb_t(0x3B,0x29,0x00), rgb_t(0x4C,0x3A,0x00), \ + rgb_t(0x5D,0x4B,0x00), rgb_t(0x6E,0x5C,0x00), rgb_t(0x7F,0x6D,0x00), rgb_t(0x90,0x7E,0x09), \ + rgb_t(0xA1,0x8F,0x1A), rgb_t(0xB2,0xA0,0x2B), rgb_t(0xC3,0xB1,0x3C), rgb_t(0xD4,0xC2,0x4D), \ + rgb_t(0xE5,0xD3,0x5E), rgb_t(0xF6,0xE4,0x6F), rgb_t(0xFF,0xF5,0x82), rgb_t(0xFF,0xFF,0x96 ) static const rgb_t a7800_palette[256*3] = { @@ -711,100 +711,100 @@ define NTSC_LIGHT_ORANGE #define NTSC_GREY \ - rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \ - rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \ - rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \ - rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF ) + rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \ + rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \ + rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \ + rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF ) #define NTSC_GOLD \ - rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \ - rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \ - rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \ - rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 ) + rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \ + rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \ + rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \ + rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 ) #define NTSC_ORANGE \ - rgb_t(0x31,0x00,0x00), rgb_t(0x42,0x06,0x00), rgb_t(0x53,0x17,0x00), rgb_t(0x64,0x28,0x00), \ - rgb_t(0x75,0x39,0x00), rgb_t(0x86,0X4A,0x00), rgb_t(0x97,0x5B,0x0B), rgb_t(0xA8,0x6C,0x1C), \ - rgb_t(0xB9,0x7D,0x2D), rgb_t(0xCA,0x8E,0x3E), rgb_t(0xDB,0x9F,0x4F), rgb_t(0xEC,0xB0,0x60), \ - rgb_t(0xFD,0xC1,0x71), rgb_t(0xFF,0xD2,0x86), rgb_t(0xFF,0xE3,0x9D), rgb_t(0xFF,0xF4,0xB3 ) + rgb_t(0x31,0x00,0x00), rgb_t(0x42,0x06,0x00), rgb_t(0x53,0x17,0x00), rgb_t(0x64,0x28,0x00), \ + rgb_t(0x75,0x39,0x00), rgb_t(0x86,0X4A,0x00), rgb_t(0x97,0x5B,0x0B), rgb_t(0xA8,0x6C,0x1C), \ + rgb_t(0xB9,0x7D,0x2D), rgb_t(0xCA,0x8E,0x3E), rgb_t(0xDB,0x9F,0x4F), rgb_t(0xEC,0xB0,0x60), \ + rgb_t(0xFD,0xC1,0x71), rgb_t(0xFF,0xD2,0x86), rgb_t(0xFF,0xE3,0x9D), rgb_t(0xFF,0xF4,0xB3 ) #define NTSC_RED_ORANGE \ - rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x08,0x00), rgb_t(0x71,0x19,0x00), \ - rgb_t(0x82,0x2A,0x0F), rgb_t(0x93,0x3B,0x20), rgb_t(0xA4,0x4C,0x31), rgb_t(0xB5,0x5D,0x42), \ - rgb_t(0xC6,0x6E,0x53), rgb_t(0xD7,0x7F,0x64), rgb_t(0xE8,0x90,0x75), rgb_t(0xF9,0xA1,0x86), \ - rgb_t(0xFF,0xB2,0x9A), rgb_t(0xFF,0xC3,0xB0), rgb_t(0xFF,0xD4,0xC6), rgb_t(0xFF,0xE5,0xDC ) + rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x08,0x00), rgb_t(0x71,0x19,0x00), \ + rgb_t(0x82,0x2A,0x0F), rgb_t(0x93,0x3B,0x20), rgb_t(0xA4,0x4C,0x31), rgb_t(0xB5,0x5D,0x42), \ + rgb_t(0xC6,0x6E,0x53), rgb_t(0xD7,0x7F,0x64), rgb_t(0xE8,0x90,0x75), rgb_t(0xF9,0xA1,0x86), \ + rgb_t(0xFF,0xB2,0x9A), rgb_t(0xFF,0xC3,0xB0), rgb_t(0xFF,0xD4,0xC6), rgb_t(0xFF,0xE5,0xDC ) #define NTSC_PINK \ - rgb_t(0x3E,0x00,0x06), rgb_t(0x4F,0x00,0x12), rgb_t(0x60,0x00,0x1E), rgb_t(0x71,0x0E,0x2E), \ - rgb_t(0x82,0x1F,0x3F), rgb_t(0x93,0x30,0x50), rgb_t(0xA4,0x41,0x61), rgb_t(0xB5,0x52,0x72), \ - rgb_t(0xC6,0x63,0x83), rgb_t(0xD7,0x74,0x94), rgb_t(0xE8,0x85,0xA5), rgb_t(0xF9,0x96,0xB6), \ - rgb_t(0xFF,0xA7,0xCB), rgb_t(0xFF,0xB8,0xE1), rgb_t(0xFF,0xC9,0xEF), rgb_t(0xFF,0xDA,0xF4 ) + rgb_t(0x3E,0x00,0x06), rgb_t(0x4F,0x00,0x12), rgb_t(0x60,0x00,0x1E), rgb_t(0x71,0x0E,0x2E), \ + rgb_t(0x82,0x1F,0x3F), rgb_t(0x93,0x30,0x50), rgb_t(0xA4,0x41,0x61), rgb_t(0xB5,0x52,0x72), \ + rgb_t(0xC6,0x63,0x83), rgb_t(0xD7,0x74,0x94), rgb_t(0xE8,0x85,0xA5), rgb_t(0xF9,0x96,0xB6), \ + rgb_t(0xFF,0xA7,0xCB), rgb_t(0xFF,0xB8,0xE1), rgb_t(0xFF,0xC9,0xEF), rgb_t(0xFF,0xDA,0xF4 ) #define NTSC_PURPLE \ - rgb_t(0x32,0x00,0x38), rgb_t(0x43,0x00,0x44), rgb_t(0x54,0x00,0x50), rgb_t(0x65,0x0C,0x5F), \ - rgb_t(0x76,0x1D,0x70), rgb_t(0x87,0x2E,0x81), rgb_t(0x98,0x3F,0x92), rgb_t(0xA9,0x50,0xA3), \ - rgb_t(0xBA,0x61,0xB4), rgb_t(0xCB,0x72,0xC5), rgb_t(0xDC,0x83,0xD6), rgb_t(0xED,0x94,0xE4), \ - rgb_t(0xFE,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 ) + rgb_t(0x32,0x00,0x38), rgb_t(0x43,0x00,0x44), rgb_t(0x54,0x00,0x50), rgb_t(0x65,0x0C,0x5F), \ + rgb_t(0x76,0x1D,0x70), rgb_t(0x87,0x2E,0x81), rgb_t(0x98,0x3F,0x92), rgb_t(0xA9,0x50,0xA3), \ + rgb_t(0xBA,0x61,0xB4), rgb_t(0xCB,0x72,0xC5), rgb_t(0xDC,0x83,0xD6), rgb_t(0xED,0x94,0xE4), \ + rgb_t(0xFE,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 ) #define NTSC_PURPLE_BLUE \ - rgb_t(0x1B,0x00,0x5F), rgb_t(0x2C,0x00,0x6B), rgb_t(0x3D,0x00,0x77), rgb_t(0x4E,0x11,0x88), \ - rgb_t(0x5F,0x22,0x99), rgb_t(0x70,0x33,0xAA), rgb_t(0x81,0x44,0xBB), rgb_t(0x92,0x55,0xCC), \ - rgb_t(0xA3,0x66,0xDD), rgb_t(0xB4,0x77,0xED), rgb_t(0xC5,0x88,0xED), rgb_t(0xD6,0x99,0xED), \ - rgb_t(0xE7,0xAA,0xED), rgb_t(0xF8,0xBB,0xED), rgb_t(0xFF,0xCC,0xF0), rgb_t(0xFF,0xDD,0xF5 ) + rgb_t(0x1B,0x00,0x5F), rgb_t(0x2C,0x00,0x6B), rgb_t(0x3D,0x00,0x77), rgb_t(0x4E,0x11,0x88), \ + rgb_t(0x5F,0x22,0x99), rgb_t(0x70,0x33,0xAA), rgb_t(0x81,0x44,0xBB), rgb_t(0x92,0x55,0xCC), \ + rgb_t(0xA3,0x66,0xDD), rgb_t(0xB4,0x77,0xED), rgb_t(0xC5,0x88,0xED), rgb_t(0xD6,0x99,0xED), \ + rgb_t(0xE7,0xAA,0xED), rgb_t(0xF8,0xBB,0xED), rgb_t(0xFF,0xCC,0xF0), rgb_t(0xFF,0xDD,0xF5 ) #define NTSC_BLUE1 \ - rgb_t(0x00,0x00,0x72), rgb_t(0x10,0x00,0x7E), rgb_t(0x21,0x0D,0x8E), rgb_t(0x32,0x1E,0x9F), \ - rgb_t(0x43,0x2F,0xB0), rgb_t(0x54,0x40,0xC1), rgb_t(0x65,0x51,0xD2), rgb_t(0x76,0x62,0xE3), \ - rgb_t(0x87,0x73,0xF4), rgb_t(0x98,0x84,0xF9), rgb_t(0xA9,0x95,0xF9), rgb_t(0xBA,0xA6,0xF9), \ - rgb_t(0xCB,0xB7,0xF9), rgb_t(0xDC,0xC8,0xF9), rgb_t(0xED,0xD9,0xF9), rgb_t(0xFE,0xEA,0xF9 ) + rgb_t(0x00,0x00,0x72), rgb_t(0x10,0x00,0x7E), rgb_t(0x21,0x0D,0x8E), rgb_t(0x32,0x1E,0x9F), \ + rgb_t(0x43,0x2F,0xB0), rgb_t(0x54,0x40,0xC1), rgb_t(0x65,0x51,0xD2), rgb_t(0x76,0x62,0xE3), \ + rgb_t(0x87,0x73,0xF4), rgb_t(0x98,0x84,0xF9), rgb_t(0xA9,0x95,0xF9), rgb_t(0xBA,0xA6,0xF9), \ + rgb_t(0xCB,0xB7,0xF9), rgb_t(0xDC,0xC8,0xF9), rgb_t(0xED,0xD9,0xF9), rgb_t(0xFE,0xEA,0xF9 ) #define NTSC_BLUE2 \ - rgb_t(0x00,0x00,0x65), rgb_t(0x00,0x0C,0x7A), rgb_t(0x05,0x1D,0x8E), rgb_t(0x16,0x2E,0x9F), \ - rgb_t(0x27,0x3F,0xB0), rgb_t(0x38,0x50,0xC1), rgb_t(0x49,0x61,0xD2), rgb_t(0x5A,0x72,0xE3), \ - rgb_t(0x6B,0x83,0xF4), rgb_t(0x7C,0x94,0xFF), rgb_t(0x8D,0xA5,0xFF), rgb_t(0x9E,0xB6,0xFF), \ - rgb_t(0xAF,0xC7,0xFF), rgb_t(0xC0,0xD8,0xFF), rgb_t(0xD1,0xE9,0xFF), rgb_t(0xE2,0xFA,0xFF ) + rgb_t(0x00,0x00,0x65), rgb_t(0x00,0x0C,0x7A), rgb_t(0x05,0x1D,0x8E), rgb_t(0x16,0x2E,0x9F), \ + rgb_t(0x27,0x3F,0xB0), rgb_t(0x38,0x50,0xC1), rgb_t(0x49,0x61,0xD2), rgb_t(0x5A,0x72,0xE3), \ + rgb_t(0x6B,0x83,0xF4), rgb_t(0x7C,0x94,0xFF), rgb_t(0x8D,0xA5,0xFF), rgb_t(0x9E,0xB6,0xFF), \ + rgb_t(0xAF,0xC7,0xFF), rgb_t(0xC0,0xD8,0xFF), rgb_t(0xD1,0xE9,0xFF), rgb_t(0xE2,0xFA,0xFF ) #define NTSC_LIGHT_BLUE \ - rgb_t(0x00,0x0D,0x48), rgb_t(0x00,0x1E,0x5E), rgb_t(0x00,0x2F,0x74), rgb_t(0x00,0x40,0x8A), \ - rgb_t(0x11,0x51,0x9B), rgb_t(0x22,0x62,0xAC), rgb_t(0x33,0x73,0xBD), rgb_t(0x44,0x84,0xCE), \ - rgb_t(0x55,0x95,0xDF), rgb_t(0x66,0xA6,0xF0), rgb_t(0x77,0xB7,0xFF), rgb_t(0x88,0xC8,0xFF), \ - rgb_t(0x99,0xD9,0xFF), rgb_t(0xAA,0xEA,0xFF), rgb_t(0xBB,0xFB,0xFF), rgb_t(0xCC,0xFF,0xFF ) + rgb_t(0x00,0x0D,0x48), rgb_t(0x00,0x1E,0x5E), rgb_t(0x00,0x2F,0x74), rgb_t(0x00,0x40,0x8A), \ + rgb_t(0x11,0x51,0x9B), rgb_t(0x22,0x62,0xAC), rgb_t(0x33,0x73,0xBD), rgb_t(0x44,0x84,0xCE), \ + rgb_t(0x55,0x95,0xDF), rgb_t(0x66,0xA6,0xF0), rgb_t(0x77,0xB7,0xFF), rgb_t(0x88,0xC8,0xFF), \ + rgb_t(0x99,0xD9,0xFF), rgb_t(0xAA,0xEA,0xFF), rgb_t(0xBB,0xFB,0xFF), rgb_t(0xCC,0xFF,0xFF ) #define NTSC_TURQUOISE \ - rgb_t(0x00,0x1C,0x1C), rgb_t(0x00,0x2D,0x32), rgb_t(0x00,0x3E,0x49), rgb_t(0x00,0x4F,0x5F), \ - rgb_t(0x05,0x60,0x73), rgb_t(0x16,0x71,0x84), rgb_t(0x27,0x82,0x95), rgb_t(0x38,0x93,0xA6), \ - rgb_t(0x49,0xA4,0xB7), rgb_t(0x5A,0xB5,0xC8), rgb_t(0x6B,0xC6,0xD9), rgb_t(0x7C,0xD7,0xEA), \ - rgb_t(0x8D,0xE8,0xFB), rgb_t(0x9E,0xF9,0xFF), rgb_t(0xAF,0xFF,0xFF), rgb_t(0xC0,0xFF,0xFF ) + rgb_t(0x00,0x1C,0x1C), rgb_t(0x00,0x2D,0x32), rgb_t(0x00,0x3E,0x49), rgb_t(0x00,0x4F,0x5F), \ + rgb_t(0x05,0x60,0x73), rgb_t(0x16,0x71,0x84), rgb_t(0x27,0x82,0x95), rgb_t(0x38,0x93,0xA6), \ + rgb_t(0x49,0xA4,0xB7), rgb_t(0x5A,0xB5,0xC8), rgb_t(0x6B,0xC6,0xD9), rgb_t(0x7C,0xD7,0xEA), \ + rgb_t(0x8D,0xE8,0xFB), rgb_t(0x9E,0xF9,0xFF), rgb_t(0xAF,0xFF,0xFF), rgb_t(0xC0,0xFF,0xFF ) #define NTSC_GREEN_BLUE \ - rgb_t(0x00,0x25,0x0B), rgb_t(0x00,0x36,0x10), rgb_t(0x00,0x47,0x18), rgb_t(0x00,0x58,0x2E), \ - rgb_t(0x07,0x69,0x42), rgb_t(0x18,0x7A,0x53), rgb_t(0x29,0x8B,0x64), rgb_t(0x3A,0x9C,0x75), \ - rgb_t(0x4B,0xAD,0x86), rgb_t(0x5C,0xBE,0x97), rgb_t(0x6D,0xCF,0xA8), rgb_t(0x7E,0xE0,0xB9), \ - rgb_t(0x8F,0xF1,0xCA), rgb_t(0xA0,0xFF,0xDA), rgb_t(0xB1,0xFF,0xE6), rgb_t(0xC2,0xFF,0xF2 ) + rgb_t(0x00,0x25,0x0B), rgb_t(0x00,0x36,0x10), rgb_t(0x00,0x47,0x18), rgb_t(0x00,0x58,0x2E), \ + rgb_t(0x07,0x69,0x42), rgb_t(0x18,0x7A,0x53), rgb_t(0x29,0x8B,0x64), rgb_t(0x3A,0x9C,0x75), \ + rgb_t(0x4B,0xAD,0x86), rgb_t(0x5C,0xBE,0x97), rgb_t(0x6D,0xCF,0xA8), rgb_t(0x7E,0xE0,0xB9), \ + rgb_t(0x8F,0xF1,0xCA), rgb_t(0xA0,0xFF,0xDA), rgb_t(0xB1,0xFF,0xE6), rgb_t(0xC2,0xFF,0xF2 ) #define NTSC_GREEN \ - rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x04,0x5A,0x1A), \ - rgb_t(0x15,0x6B,0x1A), rgb_t(0x26,0x7C,0x22), rgb_t(0x37,0x8D,0x33), rgb_t(0x48,0x9E,0x44), \ - rgb_t(0x59,0xAF,0x55), rgb_t(0x6A,0xC0,0x66), rgb_t(0x7B,0xD1,0x77), rgb_t(0x8C,0xE2,0x88), \ - rgb_t(0x9D,0xF3,0x99), rgb_t(0xAE,0xFF,0xA8), rgb_t(0xBF,0xFF,0xB4), rgb_t(0xD0,0xFF,0xC0 ) + rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x04,0x5A,0x1A), \ + rgb_t(0x15,0x6B,0x1A), rgb_t(0x26,0x7C,0x22), rgb_t(0x37,0x8D,0x33), rgb_t(0x48,0x9E,0x44), \ + rgb_t(0x59,0xAF,0x55), rgb_t(0x6A,0xC0,0x66), rgb_t(0x7B,0xD1,0x77), rgb_t(0x8C,0xE2,0x88), \ + rgb_t(0x9D,0xF3,0x99), rgb_t(0xAE,0xFF,0xA8), rgb_t(0xBF,0xFF,0xB4), rgb_t(0xD0,0xFF,0xC0 ) #define NTSC_YELLOW_GREEN \ - rgb_t(0x00,0x21,0x0A), rgb_t(0x00,0x32,0x0F), rgb_t(0x0A,0x43,0x11), rgb_t(0x1B,0x54,0x11), \ - rgb_t(0x2C,0x65,0x11), rgb_t(0x3D,0x76,0x11), rgb_t(0x4E,0x87,0x11), rgb_t(0x5F,0x98,0x1E), \ - rgb_t(0x70,0xA9,0x2F), rgb_t(0x81,0xBA,0x40), rgb_t(0x92,0xCB,0x51), rgb_t(0xA3,0xDC,0x62), \ - rgb_t(0xB4,0xED,0x73), rgb_t(0xC5,0xFE,0x84), rgb_t(0xD6,0xFF,0x90), rgb_t(0xE7,0xFF,0x9C ) + rgb_t(0x00,0x21,0x0A), rgb_t(0x00,0x32,0x0F), rgb_t(0x0A,0x43,0x11), rgb_t(0x1B,0x54,0x11), \ + rgb_t(0x2C,0x65,0x11), rgb_t(0x3D,0x76,0x11), rgb_t(0x4E,0x87,0x11), rgb_t(0x5F,0x98,0x1E), \ + rgb_t(0x70,0xA9,0x2F), rgb_t(0x81,0xBA,0x40), rgb_t(0x92,0xCB,0x51), rgb_t(0xA3,0xDC,0x62), \ + rgb_t(0xB4,0xED,0x73), rgb_t(0xC5,0xFE,0x84), rgb_t(0xD6,0xFF,0x90), rgb_t(0xE7,0xFF,0x9C ) #define NTSC_ORANGE_GREEN \ - rgb_t(0x05,0x13,0x04), rgb_t(0x16,0x24,0x04), rgb_t(0x27,0x35,0x04), rgb_t(0x38,0x46,0x04), \ - rgb_t(0x49,0x57,0x04), rgb_t(0x5A,0x68,0x04), rgb_t(0x6B,0x79,0x04), rgb_t(0x7C,0x8A,0x09), \ - rgb_t(0x8D,0x9B,0x1A), rgb_t(0x9E,0xAC,0x2B), rgb_t(0xAF,0xBD,0x3C), rgb_t(0xC0,0xCE,0x4D), \ - rgb_t(0xD1,0xDF,0x5E), rgb_t(0xE2,0xF0,0x6F), rgb_t(0xF3,0xFF,0x80), rgb_t(0xFF,0xFF,0x8D ) + rgb_t(0x05,0x13,0x04), rgb_t(0x16,0x24,0x04), rgb_t(0x27,0x35,0x04), rgb_t(0x38,0x46,0x04), \ + rgb_t(0x49,0x57,0x04), rgb_t(0x5A,0x68,0x04), rgb_t(0x6B,0x79,0x04), rgb_t(0x7C,0x8A,0x09), \ + rgb_t(0x8D,0x9B,0x1A), rgb_t(0x9E,0xAC,0x2B), rgb_t(0xAF,0xBD,0x3C), rgb_t(0xC0,0xCE,0x4D), \ + rgb_t(0xD1,0xDF,0x5E), rgb_t(0xE2,0xF0,0x6F), rgb_t(0xF3,0xFF,0x80), rgb_t(0xFF,0xFF,0x8D ) #define NTSC_LIGHT_ORANGE \ - rgb_t(0x21,0x02,0x00), rgb_t(0x32,0x13,0x00), rgb_t(0x43,0x24,0x00), rgb_t(0x54,0x35,0x00), \ - rgb_t(0x65,0x46,0x00), rgb_t(0x76,0x57,0x00), rgb_t(0x87,0x68,0x00), rgb_t(0x98,0x79,0x0C), \ - rgb_t(0xA9,0x8A,0x1D), rgb_t(0xBA,0x9B,0x2E), rgb_t(0xCB,0xAC,0x3F), rgb_t(0xDC,0xBD,0x50), \ - rgb_t(0xED,0xCE,0x61), rgb_t(0xFE,0xDF,0x72), rgb_t(0xFF,0xF0,0x87), rgb_t(0xFF,0xFF,0x9D ) + rgb_t(0x21,0x02,0x00), rgb_t(0x32,0x13,0x00), rgb_t(0x43,0x24,0x00), rgb_t(0x54,0x35,0x00), \ + rgb_t(0x65,0x46,0x00), rgb_t(0x76,0x57,0x00), rgb_t(0x87,0x68,0x00), rgb_t(0x98,0x79,0x0C), \ + rgb_t(0xA9,0x8A,0x1D), rgb_t(0xBA,0x9B,0x2E), rgb_t(0xCB,0xAC,0x3F), rgb_t(0xDC,0xBD,0x50), \ + rgb_t(0xED,0xCE,0x61), rgb_t(0xFE,0xDF,0x72), rgb_t(0xFF,0xF0,0x87), rgb_t(0xFF,0xFF,0x9D ) ***************************************************************************/ diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index ec415f77014..f1b5eb190ed 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -936,7 +936,7 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state ) MCFG_FD1797x_ADD(SAB1797_02P_TAG, XTAL_64MHz/64) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pb7_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(abc1600_state, fdc_drq_w)) - + MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":0", abc1600_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":1", abc1600_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":2", abc1600_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c index f47f5bdf9ed..9145d6007e4 100644 --- a/src/mess/drivers/ace.c +++ b/src/mess/drivers/ace.c @@ -726,7 +726,7 @@ static MACHINE_CONFIG_START( ace, ace_state ) MCFG_SCREEN_UPDATE_DRIVER(ace_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_6_5MHz, 416, 0, 336, 312, 0, 304) MCFG_SCREEN_PALETTE("palette") - + MCFG_TIMER_DRIVER_ADD_SCANLINE("set_irq", ace_state, set_irq, SCREEN_TAG, 31*8, 264) MCFG_TIMER_DRIVER_ADD_SCANLINE("clear_irq", ace_state, clear_irq, SCREEN_TAG, 32*8, 264) diff --git a/src/mess/drivers/adam.c b/src/mess/drivers/adam.c index 0b52d3b7298..28e04aa69d4 100644 --- a/src/mess/drivers/adam.c +++ b/src/mess/drivers/adam.c @@ -289,7 +289,7 @@ Mark Gordon TODO: - - spinner INT + - spinner INT - printer - SPI @@ -443,11 +443,11 @@ READ8_MEMBER( adam_state::mreq_r ) case 5: cs2 = 0; break; - + case 6: cs3 = 0; break; - + case 7: cs4 = 0; break; diff --git a/src/mess/drivers/alphasma.c b/src/mess/drivers/alphasma.c index ae598cca6cc..304e1d811a3 100644 --- a/src/mess/drivers/alphasma.c +++ b/src/mess/drivers/alphasma.c @@ -398,7 +398,7 @@ static MACHINE_CONFIG_START( alphasmart, alphasmart_state ) MCFG_SCREEN_SIZE(6*40, 9*4) MCFG_SCREEN_VISIBLE_AREA(0, (6*40)-1, 0, (9*4)-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(alphasmart_state, alphasmart) MCFG_DEFAULT_LAYOUT(layout_lcd) diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c index 2372505b0a5..f585d235a51 100644 --- a/src/mess/drivers/alphatro.c +++ b/src/mess/drivers/alphatro.c @@ -85,7 +85,7 @@ public: private: UINT8 m_timer_bit; UINT8 m_cass_data[4]; - bool m_cass_state; + bool m_cass_state; emu_timer* m_sys_timer; virtual void video_start(); virtual void machine_start(); @@ -97,7 +97,7 @@ private: required_device m_cass; required_device m_beep; required_shared_ptr m_p_ram; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 5fb0f811ad4..69cea31c0de 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -799,7 +799,7 @@ static MACHINE_CONFIG_START( a1200n, a1200_state ) // MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_NTSC_CLOCK,512*2,(129-8-8)*2,(449+8-1+8)*2,312,44-8,300+8) MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_NTSC_CLOCK,228*4,214,228*4,262,34,262) - MCFG_SCREEN_UPDATE_DRIVER(a1200_state, screen_update_amiga_aga) + MCFG_SCREEN_UPDATE_DRIVER(a1200_state, screen_update_amiga_aga) MCFG_VIDEO_START_OVERRIDE(a1200_state,amiga_aga) diff --git a/src/mess/drivers/amstr_pc.c b/src/mess/drivers/amstr_pc.c index efe135602d4..a900ba7ae9e 100644 --- a/src/mess/drivers/amstr_pc.c +++ b/src/mess/drivers/amstr_pc.c @@ -531,7 +531,7 @@ static MACHINE_CONFIG_DERIVED( ppc512, pc200 ) MCFG_CPU_ADD("maincpu", V30, 8000000) MCFG_CPU_PROGRAM_MAP(ppc512_map) MCFG_CPU_IO_MAP(ppc512_io) - + MCFG_DEVICE_REMOVE("isa1") MCFG_DEVICE_REMOVE("isa2") diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c index 751d57fc774..e437c09fd7e 100644 --- a/src/mess/drivers/amstrad.c +++ b/src/mess/drivers/amstrad.c @@ -361,10 +361,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( amx_mouse ) PORT_START("mouse_input1") - PORT_BIT(0xff , 0, IPT_MOUSE_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01) + PORT_BIT(0xff , 0, IPT_MOUSE_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01) PORT_START("mouse_input2") - PORT_BIT(0xff , 0, IPT_MOUSE_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01) + PORT_BIT(0xff , 0, IPT_MOUSE_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01) PORT_START("mouse_input3") PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_NAME("Left mouse button") PORT_CODE(MOUSECODE_BUTTON1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01) @@ -1052,7 +1052,7 @@ static MACHINE_CONFIG_DERIVED( aleste, amstrad ) MCFG_SOUND_REPLACE("ay", AY8912, XTAL_16MHz / 16) MCFG_SOUND_CONFIG(ay8912_interface) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32+64) MCFG_PALETTE_INIT_OWNER(amstrad_state,aleste) diff --git a/src/mess/drivers/amust.c b/src/mess/drivers/amust.c index e6b3820caea..bf412277540 100644 --- a/src/mess/drivers/amust.c +++ b/src/mess/drivers/amust.c @@ -94,13 +94,13 @@ private: //WRITE8_MEMBER( amust_state::port00_w ) //{ -// membank("bankr0")->set_entry(BIT(data, 6)); -// m_fdc->dden_w(BIT(data, 5)); -// floppy_image_device *floppy = NULL; -// if (BIT(data, 0)) floppy = m_floppy0->get_device(); -// m_fdc->set_floppy(floppy); -// if (floppy) -// floppy->ss_w(BIT(data, 4)); +// membank("bankr0")->set_entry(BIT(data, 6)); +// m_fdc->dden_w(BIT(data, 5)); +// floppy_image_device *floppy = NULL; +// if (BIT(data, 0)) floppy = m_floppy0->get_device(); +// m_fdc->set_floppy(floppy); +// if (floppy) +// floppy->ss_w(BIT(data, 4)); //} static ADDRESS_MAP_START(amust_mem, AS_PROGRAM, 8, amust_state) @@ -179,22 +179,22 @@ INTERRUPT_GEN_MEMBER( amust_state::irq_vs ) //static I8255_INTERFACE( ppi1_intf ) //{ -// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pa_r), // Port A read -// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pa_w), // Port A write -// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pb_r), // Port B read -// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pb_w), // Port B write -// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pc_r), // Port C read -// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pc_w), // Port C write +// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pa_r), // Port A read +// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pa_w), // Port A write +// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pb_r), // Port B read +// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pb_w), // Port B write +// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pc_r), // Port C read +// DEVCB_DRIVER_MEMBER(amust_state, ppi1_pc_w), // Port C write //}; //static I8255_INTERFACE( ppi2_intf ) //{ -// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pa_r), // Port A read -// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pa_w), // Port A write -// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pb_r), // Port B read -// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pb_w), // Port B write -// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pc_r), // Port C read -// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pc_w), // Port C write +// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pa_r), // Port A read +// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pa_w), // Port A write +// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pb_r), // Port B read +// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pb_w), // Port B write +// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pc_r), // Port C read +// DEVCB_DRIVER_MEMBER(amust_state, ppi2_pc_w), // Port C write //}; WRITE8_MEMBER( amust_state::kbd_put ) diff --git a/src/mess/drivers/apc.c b/src/mess/drivers/apc.c index 87e82527877..05d5438e95c 100644 --- a/src/mess/drivers/apc.c +++ b/src/mess/drivers/apc.c @@ -83,7 +83,7 @@ public: m_pit(*this, "pit8253"), m_video_ram_1(*this, "video_ram_1"), m_video_ram_2(*this, "video_ram_2"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } // devices @@ -101,7 +101,7 @@ public: required_shared_ptr m_video_ram_1; required_shared_ptr m_video_ram_2; - + required_device m_palette; // screen updates @@ -151,7 +151,7 @@ public: UINT8 m_dma_offset[4]; IRQ_CALLBACK_MEMBER(irq_callback); - + UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); @@ -984,11 +984,11 @@ static MACHINE_CONFIG_START( apc, apc_state ) MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 3579545) // unk clock MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) - MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(apc_state, hgdc_draw_text) + MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(apc_state, hgdc_draw_text) MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 3579545) // unk clock MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) - MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(apc_state, hgdc_display_pixels) + MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(apc_state, hgdc_display_pixels) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(apc_state,apc) diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c index eecaa789820..d5ebb0add3d 100644 --- a/src/mess/drivers/apf.c +++ b/src/mess/drivers/apf.c @@ -318,25 +318,25 @@ ADDRESS_MAP_END static INPUT_PORTS_START( apfm1000 ) /* - This simple Basic program can be used to read the joysticks and the keyboard: + This simple Basic program can be used to read the joysticks and the keyboard: - 10 PRINT KEY$(n); - 20 GOTO 10 + 10 PRINT KEY$(n); + 20 GOTO 10 - where n = 0, 1 or 2 - 0 = keyboard, 1,2 = joysticks #1 and #2 + where n = 0, 1 or 2 - 0 = keyboard, 1,2 = joysticks #1 and #2 - When reading the keyboard KEY$(0) returns the character associated to the key, with the - following exceptions: + When reading the keyboard KEY$(0) returns the character associated to the key, with the + following exceptions: - Ctrl = CHR$(1) - Rept = CHR$(2) - Here Is = CHR$(4) - Rubout = CHR$(8) + Ctrl = CHR$(1) + Rept = CHR$(2) + Here Is = CHR$(4) + Rubout = CHR$(8) - When reading the joysticks, KEY$() = "N", "S", "E", "W" for the directions - "0" - "9" for the keypad digits - "?" for "Cl" - "!" for "En" + When reading the joysticks, KEY$() = "N", "S", "E", "W" for the directions + "0" - "9" for the keypad digits + "?" for "Cl" + "!" for "En" ? player right is player 1 diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c index 5f3b397ea85..04d9c04598a 100644 --- a/src/mess/drivers/apollo.c +++ b/src/mess/drivers/apollo.c @@ -44,7 +44,7 @@ #define APOLLO_MAX_NO_OF_LOG_LINES 1000000 // ISA/AT Bus notes -// I/O space: to get the Apollo address = take the PC I/O address, keep the low 3 bits how they are, and shift the rest left 7, inserting zeros. +// I/O space: to get the Apollo address = take the PC I/O address, keep the low 3 bits how they are, and shift the rest left 7, inserting zeros. // then add 0x40000 for the I/O base. // // example: 3c503 Ethernet is at I/O 300h on PC, which is (%1100000000 -> 1 1000 0000 0000 0000) + 0x40000 = 0x58000 @@ -719,9 +719,9 @@ static ADDRESS_MAP_START(dsp3500_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x010100, 0x0101ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) AM_RANGE(0x010200, 0x0102ff) AM_READWRITE8(cache_status_register_r, cache_control_register_w, 0xffffffff ) AM_RANGE(0x010300, 0x0103ff) AM_READWRITE8(task_alias_register_r , task_alias_register_w , 0xffffffff ) - AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, mc68681_device, read, write, 0x00ff00ff ) - AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x010900, 0x0109ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x010c00, 0x010cff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) AM_RANGE(0x010d00, 0x010dff) AM_READWRITE8(/*"dma2",*/apollo_dma_2_r, apollo_dma_2_w, 0xffffffff ) @@ -751,7 +751,7 @@ static ADDRESS_MAP_START(dn3000_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x000000, 0x007fff) AM_WRITE(apollo_rom_w) AM_RANGE(0x008000, 0x0080ff) AM_READWRITE16(apollo_csr_status_register_r, apollo_csr_status_register_w, 0xffffffff) AM_RANGE(0x008100, 0x0081ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) - AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x008800, 0x0088ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x008900, 0x0089ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x009000, 0x0090ff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) @@ -786,7 +786,7 @@ static ADDRESS_MAP_START(dsp3000_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x000000, 0x007fff) AM_WRITE(apollo_rom_w) AM_RANGE(0x008000, 0x0080ff) AM_READWRITE16(apollo_csr_status_register_r, apollo_csr_status_register_w, 0xffffffff) AM_RANGE(0x008100, 0x0081ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) - AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x008800, 0x0088ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x008900, 0x0089ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) @@ -819,9 +819,9 @@ static ADDRESS_MAP_START(dn5500_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x010100, 0x0101ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) AM_RANGE(0x010200, 0x0102ff) AM_READWRITE8(cache_status_register_r, cache_control_register_w, 0xffffffff ) AM_RANGE(0x010300, 0x0103ff) AM_READWRITE8(task_alias_register_r , task_alias_register_w , 0xffffffff ) - AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, mc68681_device, read, write, 0x00ff00ff ) - AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x010900, 0x0109ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x010c00, 0x010cff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) AM_RANGE(0x010d00, 0x010dff) AM_READWRITE8(/*"dma2",*/apollo_dma_2_r, apollo_dma_2_w, 0xffffffff ) @@ -868,9 +868,9 @@ static ADDRESS_MAP_START(dsp5500_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x010100, 0x0101ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) AM_RANGE(0x010200, 0x0102ff) AM_READWRITE8(cache_status_register_r, cache_control_register_w, 0xffffffff ) AM_RANGE(0x010300, 0x0103ff) AM_READWRITE8(task_alias_register_r , task_alias_register_w , 0xffffffff ) - AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, mc68681_device, read, write, 0x00ff00ff ) - AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x010900, 0x0109ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x010c00, 0x010cff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) AM_RANGE(0x010d00, 0x010dff) AM_READWRITE8(/*"dma2",*/apollo_dma_2_r, apollo_dma_2_w, 0xffffffff ) @@ -925,7 +925,7 @@ void apollo_state::machine_reset() // set node_id from UID of logical volume 1 of logical unit 0 node_id = (((db[0x49] << 8) | db[0x4a]) << 8) | db[0x4b]; - MLOG2(("machine_reset_dn3500: node ID is %06X (from disk)", node_id)); + MLOG2(("machine_reset_dn3500: node ID is %06X (from disk)", node_id)); } } #endif @@ -1047,7 +1047,7 @@ static INPUT_PORTS_START( dsp3500 ) PORT_INCLUDE(apollo_config) INPUT_PORTS_END -READ_LINE_MEMBER( apollo_state::apollo_kbd_is_german ) +READ_LINE_MEMBER( apollo_state::apollo_kbd_is_german ) { return (apollo_config(APOLLO_CONF_GERMAN_KBD) != 0) ? ASSERT_LINE : CLEAR_LINE; } @@ -1100,16 +1100,16 @@ static MACHINE_CONFIG_DERIVED( dn3500_19i, dn3500 ) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) - MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) + MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( dn3500_15i, dn3500 ) /* video hardware is 15" monochrome or color */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) - MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) + MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( dn3000, dn3500 ) @@ -1149,16 +1149,16 @@ static MACHINE_CONFIG_DERIVED( dn3000_19i, dn3000 ) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) - MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) + MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( dn3000_15i, dn3000 ) /* video hardware 15" monochrome */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) - MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) + MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( dn5500, dn3500 ) @@ -1186,16 +1186,16 @@ static MACHINE_CONFIG_DERIVED( dn5500_19i, dn5500 ) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) - MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) + MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( dn5500_15i, dn5500 ) /* video hardware 15" monochrome */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) - MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) + MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END /*************************************************************************** @@ -1265,4 +1265,3 @@ COMP( 1988, dn3000_19i, dn3500, 0, dn3000_19i, dn3500, apollo_state, dn3000 COMP( 1991, dn5500, dn3500, 0, dn5500_15i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500", GAME_NOT_WORKING ) COMP( 1991, dsp5500, dn3500, 0, dsp5500, dsp3500, apollo_state,dsp5500,"Apollo", "Apollo DSP5500", GAME_NOT_WORKING ) COMP( 1991, dn5500_19i, dn3500, 0, dn5500_19i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500 19\" Monochrome", GAME_NOT_WORKING ) - diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c index e724963ba5b..cb513257d72 100644 --- a/src/mess/drivers/apple2.c +++ b/src/mess/drivers/apple2.c @@ -358,7 +358,7 @@ INPUT_PORTS_END /* Apple IIe & IIc key matrix (from "Sams ComputerFacts: Apple IIe" and "Sams ComputerFacts: Apple IIc") - + | Y0 | Y1 | Y2 | Y3 | Y4 | Y5 | Y6 | Y7 | Y8 | Y9 | | | | | | | | | | | | ----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| @@ -382,7 +382,7 @@ INPUT_PORTS_END /* Apple IIe platinum key matrix - + | Y0 | Y1 | Y2 | Y3 | Y4 | Y5 | Y6 | Y7 | Y8 | Y9 | | | | | | | | | | | | ----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| @@ -617,11 +617,11 @@ static INPUT_PORTS_START( apple2e_common ) PORT_START("X6") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_UP) PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') @@ -671,7 +671,7 @@ static INPUT_PORTS_START( apple2euk ) PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27) PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"') - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR(0xa3) // a3 is Unicode for the pound sign + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR(0xa3) // a3 is Unicode for the pound sign PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') @@ -741,11 +741,11 @@ static INPUT_PORTS_START( apple2euk ) PORT_START("X6") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_UP) PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') @@ -862,7 +862,7 @@ INPUT_PORTS_START( apple2ep ) PORT_START("X6") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(UCHAR_MAMEKEY(ASTERISK)) - PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL_PAD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) @@ -997,8 +997,8 @@ static SLOT_INTERFACE_START(apple2_cards) SLOT_INTERFACE("ultraterm", A2BUS_ULTRATERM) /* Videx UltraTerm (original) */ SLOT_INTERFACE("ultratermenh", A2BUS_ULTRATERMENH) /* Videx UltraTerm (enhanced //e) */ SLOT_INTERFACE("aevm80", A2BUS_VTC2) /* Applied Engineering ViewMaster 80 */ - SLOT_INTERFACE("parallel", A2BUS_PIC) /* Apple Parallel Interface Card */ - SLOT_INTERFACE("corvus", A2BUS_CORVUS) /* Corvus flat-cable HDD interface (must go in slot 6) */ + SLOT_INTERFACE("parallel", A2BUS_PIC) /* Apple Parallel Interface Card */ + SLOT_INTERFACE("corvus", A2BUS_CORVUS) /* Corvus flat-cable HDD interface (must go in slot 6) */ SLOT_INTERFACE_END static SLOT_INTERFACE_START(apple2eaux_cards) @@ -1321,7 +1321,7 @@ ROM_END /* J-Plus ROM numbers confirmed by: - http://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Computers/Apple%20II/Apple%20II%20j-plus/Photos/Apple%20II%20j-plus%20-%20Motherboard.jpg + http://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Computers/Apple%20II/Apple%20II%20j-plus/Photos/Apple%20II%20j-plus%20-%20Motherboard.jpg */ ROM_START(apple2jp) @@ -1566,7 +1566,7 @@ ROM_START(ivelultr) ROM_CONTINUE(0x1000, 0x1000) ROM_LOAD( "ultra2.bin", 0x3000, 0x1000, CRC(1ac1e17e) SHA1(a5b8adec37da91970c303905b5e2c4d1b715ee4e)) - ROM_REGION(0x800, "kbmcu", 0) // 6802 code for keyboard MCU (very unlike real Apples, will require some reverse-engineering) + ROM_REGION(0x800, "kbmcu", 0) // 6802 code for keyboard MCU (very unlike real Apples, will require some reverse-engineering) ROM_LOAD( "ultra4.bin", 0x0000, 0x0800, CRC(3dce51ac) SHA1(676b6e775d5159049cae5b6143398ec7b2bf437a) ) ROM_END @@ -1627,7 +1627,7 @@ COMP( 1985, prav8m, apple2, 0, apple2p, apple2p, driver_device, COMP( 1980, apple2jp, apple2, 0, apple2p, apple2p, driver_device, 0, "Apple Computer", "Apple ][ J-Plus", GAME_SUPPORTS_SAVE ) COMP( 1982, ace100, apple2, 0, apple2, apple2e, driver_device, 0, "Franklin Computer", "Franklin Ace 100", GAME_SUPPORTS_SAVE ) COMP( 1983, apple2e, 0, apple2, apple2e, apple2e, driver_device, 0, "Apple Computer", "Apple //e", GAME_SUPPORTS_SAVE ) -COMP( 1983, apple2euk,apple2e, 0, apple2e, apple2euk,driver_device, 0, "Apple Computer", "Apple //e (UK)", GAME_SUPPORTS_SAVE ) +COMP( 1983, apple2euk,apple2e, 0, apple2e, apple2euk,driver_device, 0, "Apple Computer", "Apple //e (UK)", GAME_SUPPORTS_SAVE ) COMP( 1983, mprof3, apple2e, 0, mprof3, apple2e, driver_device, 0, "Multitech", "Microprofessor III", GAME_SUPPORTS_SAVE ) COMP( 1985, apple2ee, apple2e, 0, apple2ee, apple2e, driver_device, 0, "Apple Computer", "Apple //e (enhanced)", GAME_SUPPORTS_SAVE ) COMP( 1985, apple2eeuk,apple2e, 0, apple2ee, apple2euk, driver_device,0, "Apple Computer", "Apple //e (enhanced, UK)", GAME_SUPPORTS_SAVE ) diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c index 15aa0bac6df..8516c645094 100644 --- a/src/mess/drivers/apple2gs.c +++ b/src/mess/drivers/apple2gs.c @@ -380,7 +380,7 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state ) MCFG_ES5503_OUTPUT_CHANNELS(2) MCFG_ES5503_IRQ_FUNC(WRITELINE(apple2gs_state, apple2gs_doc_irq)) MCFG_ES5503_ADC_FUNC(READ8(apple2gs_state, apple2gs_adc_read)) - + MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mess/drivers/apple3.c b/src/mess/drivers/apple3.c index 0c11ffa3476..72a7457c815 100644 --- a/src/mess/drivers/apple3.c +++ b/src/mess/drivers/apple3.c @@ -3,12 +3,12 @@ drivers/apple3.c Apple /// - + driver by Nathan Woods and R. Belmont - + Special thanks to Chris Smolinski (author of the Sara emulator) for his input about this poorly known system. - + Also thanks to Washington Apple Pi for the "Apple III DVD" containing the technical manual, schematics, and software. @@ -176,24 +176,24 @@ static INPUT_PORTS_START( apple3 ) */ /* - Esc - 0x00 + Esc + 0x00 + + ` 1 2 3 4 5 6 7 8 9 0 - = BACKSPACE + 0x38 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x30 0x31 0x2f 0x104 - ` 1 2 3 4 5 6 7 8 9 0 - = BACKSPACE - 0x38 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x30 0x31 0x2f 0x104 + Tab Q W E R T Y U I O P [ ] \ + 0x0a 0x0b 0x0c 0x0d 0x0e 0x0f 0x10 0x11 0x12 0x13 0x3a 0x3b 0x39 0x2e - Tab Q W E R T Y U I O P [ ] \ - 0x0a 0x0b 0x0c 0x0d 0x0e 0x0f 0x10 0x11 0x12 0x13 0x3a 0x3b 0x39 0x2e + A S D F G H J K L ; ' ENTER + 0x14 0x15 0x16 0x17 0x19 0x18 0x1a 0x1b 0x1d 0x1c 0x105 0x102 - A S D F G H J K L ; ' ENTER - 0x14 0x15 0x16 0x17 0x19 0x18 0x1a 0x1b 0x1d 0x1c 0x105 0x102 - - Z X C V B N M , . / + Z X C V B N M , . / 0x1e 0x1f 0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27 - - SPACE UP LT DN RT KP- KP7 KP8 KP9 + + SPACE UP LT DN RT KP- KP7 KP8 KP9 0x109 0x103 0x10e 0x10d 0x10c 0x10b 0x2d 0x2b 0x29 - + KP4 KP5 KP6 KP1 KP2 KP3 KPEN KP0 KP. 0x37 0x35 0x33 0x101 0x3f 0x3d 0x108 0x100 0x3e */ @@ -310,8 +310,8 @@ static INPUT_PORTS_START( apple3 ) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right Shift") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Open Apple") PORT_CODE(KEYCODE_LALT) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Solid Apple") PORT_CODE(KEYCODE_RALT) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Open Apple") PORT_CODE(KEYCODE_LALT) + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Solid Apple") PORT_CODE(KEYCODE_RALT) PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RESET") PORT_CODE(KEYCODE_F12) INPUT_PORTS_END @@ -322,4 +322,3 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ COMP( 1980, apple3, 0, 0, apple3, apple3, apple3_state, apple3, "Apple Computer", "Apple ///", GAME_SUPPORTS_SAVE ) - diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c index 4eee548d15d..df982bd792e 100644 --- a/src/mess/drivers/applix.c +++ b/src/mess/drivers/applix.c @@ -195,7 +195,7 @@ private: required_ioport m_io_k3b0; required_ioport m_io_k0b; required_shared_ptr m_expansion; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 2e73aff1ec3..0da6f42a04a 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -170,9 +170,9 @@ WRITE8_MEMBER( apricot_state::i8255_portb_w ) WRITE8_MEMBER( apricot_state::i8255_portc_w ) { -// schematic page 294 says pc4 outputs to centronics pin 13, which is the "select" output from the printer. +// schematic page 294 says pc4 outputs to centronics pin 13, which is the "select" output from the printer. m_centronics->write_strobe(BIT(data, 5)); -// schematic page 294 says pc6 outputs to centronics pin 15, which is unused +// schematic page 294 says pc6 outputs to centronics pin 15, which is unused } static const i8255_interface apricot_i8255a_intf = diff --git a/src/mess/drivers/apricotf.c b/src/mess/drivers/apricotf.c index 46e8e5f0871..a532c4aa035 100644 --- a/src/mess/drivers/apricotf.c +++ b/src/mess/drivers/apricotf.c @@ -312,7 +312,7 @@ static MACHINE_CONFIG_START( act_f1, f1_state ) MCFG_SCREEN_SIZE(640, 256) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", act_f1) diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index 66069c7718a..de7307a4972 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -576,7 +576,7 @@ static MACHINE_CONFIG_START( fp, fp_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 256) - MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1) + MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1) MCFG_PALETTE_ADD("palette", 16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", act_f1) diff --git a/src/mess/drivers/argo.c b/src/mess/drivers/argo.c index 69b0d96c57a..6524e8cecad 100644 --- a/src/mess/drivers/argo.c +++ b/src/mess/drivers/argo.c @@ -359,7 +359,7 @@ static MACHINE_CONFIG_START( argo, argo_state ) MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/asst128.c b/src/mess/drivers/asst128.c index 981435bf8ef..d3f343e4266 100644 --- a/src/mess/drivers/asst128.c +++ b/src/mess/drivers/asst128.c @@ -104,7 +104,7 @@ static DEVICE_INPUT_DEFAULTS_START( asst128 ) DEVICE_INPUT_DEFAULTS_END static MACHINE_CONFIG_START( asst128, asst128_state ) - MCFG_CPU_ADD("maincpu", I8086, 4772720) + MCFG_CPU_ADD("maincpu", I8086, 4772720) MCFG_CPU_PROGRAM_MAP(asst128_map) MCFG_CPU_IO_MAP(asst128_io) @@ -148,4 +148,4 @@ ROM_START( asst128 ) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ -COMP( 198?, asst128, ibm5150, 0, asst128, 0, driver_device, 0, "Schetmash", "Assistent 128", GAME_NOT_WORKING) \ No newline at end of file +COMP( 198?, asst128, ibm5150, 0, asst128, 0, driver_device, 0, "Schetmash", "Assistent 128", GAME_NOT_WORKING) diff --git a/src/mess/drivers/at.c b/src/mess/drivers/at.c index 53ab2059c9c..8d0e444abbe 100644 --- a/src/mess/drivers/at.c +++ b/src/mess/drivers/at.c @@ -24,7 +24,7 @@ static ADDRESS_MAP_START( at16_map, AS_PROGRAM, 16, at_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( ps2m30286_map, AS_PROGRAM, 16, at_state) - AM_RANGE(0x000000, 0x09ffff) AM_RAMBANK("bank10") + AM_RANGE(0x000000, 0x09ffff) AM_RAMBANK("bank10") AM_RANGE(0x0c0000, 0x0c7fff) AM_ROM AM_RANGE(0x0c8000, 0x0cffff) AM_ROM AM_RANGE(0x0d0000, 0x0dffff) AM_RAM @@ -130,9 +130,9 @@ WRITE16_MEMBER( at_state::ps1_unk_w ) READ8_MEMBER( at_state::ps1_kbdc_r ) { - UINT8 ret; - if(offset == 0) ret = at_keybc_r(space, offset, mem_mask); - else ret = ps2_portb_r(space,offset, mem_mask); + UINT8 ret; + if(offset == 0) ret = at_keybc_r(space, offset, mem_mask); + else ret = ps2_portb_r(space,offset, mem_mask); return ret; } @@ -461,7 +461,7 @@ static MACHINE_CONFIG_START( ps2m30286, at_state ) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_FRAGMENT_ADD( pcvideo_vga ) - + MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c index 3b1967fe51e..9776ae91a00 100644 --- a/src/mess/drivers/atari400.c +++ b/src/mess/drivers/atari400.c @@ -325,7 +325,7 @@ public: void ms_atari800xl_machine_start(int type, int has_cart); DECLARE_WRITE8_MEMBER(a600xl_pia_pb_w) { a600xl_mmu(data); } - + DECLARE_READ8_MEMBER(atari_pia_pa_r); DECLARE_READ8_MEMBER(atari_pia_pb_r); diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c index 189ffdba991..a8b141a898b 100644 --- a/src/mess/drivers/atarist.c +++ b/src/mess/drivers/atarist.c @@ -2409,7 +2409,7 @@ static MACHINE_CONFIG_START( stbook, stbook_state ) MCFG_MC68901_OUT_IRQ_CB(INPUTLINE(M68000_TAG, M68K_IRQ_6)) MCFG_MC68901_OUT_TDO_CB(WRITELINE(st_state, mfp_tdo_w)) MCFG_MC68901_OUT_SO_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) - + MCFG_WD1772x_ADD(WD1772_TAG, U517/2) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w)) diff --git a/src/mess/drivers/atm.c b/src/mess/drivers/atm.c index 258c35c8a07..83a3a955b44 100644 --- a/src/mess/drivers/atm.c +++ b/src/mess/drivers/atm.c @@ -190,7 +190,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( atm, spectrum_128, atm_state ) MCFG_MACHINE_RESET_OVERRIDE(atm_state, atm ) MCFG_BETA_DISK_ADD(BETA_DISK_TAG) - + MCFG_GFXDECODE_MODIFY("gfxdecode", atm) MACHINE_CONFIG_END diff --git a/src/mess/drivers/avigo.c b/src/mess/drivers/avigo.c index a6fdb1d7773..4a0731357cc 100644 --- a/src/mess/drivers/avigo.c +++ b/src/mess/drivers/avigo.c @@ -893,7 +893,7 @@ static MACHINE_CONFIG_START( avigo, avigo_state ) MCFG_SCREEN_SIZE(AVIGO_SCREEN_WIDTH, AVIGO_SCREEN_HEIGHT + AVIGO_PANEL_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0, AVIGO_SCREEN_WIDTH-1, 0, AVIGO_SCREEN_HEIGHT + AVIGO_PANEL_HEIGHT -1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_avigo) MCFG_GFXDECODE_ADD("gfxdecode", "palette", avigo) diff --git a/src/mess/drivers/bcs3.c b/src/mess/drivers/bcs3.c index b52d48193cc..cf242b35c42 100644 --- a/src/mess/drivers/bcs3.c +++ b/src/mess/drivers/bcs3.c @@ -446,7 +446,7 @@ static MACHINE_CONFIG_START( bcs3, bcs3_state ) MCFG_SCREEN_VISIBLE_AREA(0,28*8-1,0,12*10-1) MCFG_SCREEN_UPDATE_DRIVER(bcs3_state, screen_update_bcs3) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/beehive.c b/src/mess/drivers/beehive.c index 16fe0dc7ea9..518abb2e06b 100644 --- a/src/mess/drivers/beehive.c +++ b/src/mess/drivers/beehive.c @@ -300,7 +300,7 @@ static MACHINE_CONFIG_START( beehive, beehive_state ) MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c index 17379541a79..7b57140edc3 100644 --- a/src/mess/drivers/bigbord2.c +++ b/src/mess/drivers/bigbord2.c @@ -163,7 +163,7 @@ private: required_memory_bank m_bankr; required_memory_bank m_bankv; required_memory_bank m_banka; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/binbug.c b/src/mess/drivers/binbug.c index bf76fa8ecec..ef9e847c564 100644 --- a/src/mess/drivers/binbug.c +++ b/src/mess/drivers/binbug.c @@ -301,7 +301,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state ) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", dg640) MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") @@ -561,7 +561,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state ) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", dg640) MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") diff --git a/src/mess/drivers/bmjr.c b/src/mess/drivers/bmjr.c index 46bf71c31c0..661b3361498 100644 --- a/src/mess/drivers/bmjr.c +++ b/src/mess/drivers/bmjr.c @@ -360,7 +360,7 @@ static MACHINE_CONFIG_START( bmjr, bmjr_state ) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1) MCFG_SCREEN_UPDATE_DRIVER(bmjr_state, screen_update_bmjr) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(bmjr_state, bmjr) MCFG_GFXDECODE_ADD("gfxdecode", "palette", bmjr) diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c index 8c69b5d78c6..f8bee9e5c1a 100644 --- a/src/mess/drivers/bml3.c +++ b/src/mess/drivers/bml3.c @@ -153,7 +153,7 @@ private: required_device m_speaker; optional_device m_ym2203; required_device m_acia6850; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c index 785d61d5262..a0e351cd67a 100644 --- a/src/mess/drivers/c128.c +++ b/src/mess/drivers/c128.c @@ -1468,7 +1468,7 @@ static MACHINE_CONFIG_START( ntsc, c128_state ) MCFG_SCREEN_SIZE(VIC6567_COLUMNS, VIC6567_LINES) MCFG_SCREEN_VISIBLE_AREA(0, VIC6567_VISIBLECOLUMNS - 1, 0, VIC6567_VISIBLELINES - 1) MCFG_SCREEN_UPDATE_DEVICE(MOS8564_TAG, mos8564_device, screen_update) - + MCFG_GFXDECODE_ADD("gfxdecode", MOS8563_TAG":palette", c128) // sound hardware @@ -1632,7 +1632,7 @@ static MACHINE_CONFIG_START( pal, c128_state ) MCFG_SCREEN_SIZE(VIC6569_COLUMNS, VIC6569_LINES) MCFG_SCREEN_VISIBLE_AREA(0, VIC6569_VISIBLECOLUMNS - 1, 0, VIC6569_VISIBLELINES - 1) MCFG_SCREEN_UPDATE_DEVICE(MOS8566_TAG, mos8566_device, screen_update) - + MCFG_GFXDECODE_ADD("gfxdecode", MOS8563_TAG":palette", c128) // sound hardware diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c index 09f0b21690a..5d7a39e579a 100644 --- a/src/mess/drivers/casloopy.c +++ b/src/mess/drivers/casloopy.c @@ -497,7 +497,7 @@ static MACHINE_CONFIG_START( casloopy, casloopy_state ) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 512) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) MCFG_CARTSLOT_ADD("cart") diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index 7a6de90ff0d..dee36511300 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -218,7 +218,7 @@ J2: unpopulated 8-pin sip header, serial/rs232-related? (vcc ? ? ? ? ? ? gnd) (random guess: txd, rxd, rts, cts, dsr, dtr, and one pin could be cd/ri though the modem circuit may do that separately?) J3: Floppy Connector (standard DIL 34 pin 2-row rectangular connector for mini-shugart/pc floppy cable; pin 2 IS connected somewhere and ?probably? is used for /DISKCHANGE like on an Amiga, with pin 34 being /TRUEREADY?) - (as opposed to normal ibm pc 3.5" drives where pin 2 is unconnected or is /DENSITY *input to drive*, and pin 34 is /DISKCHANGE) + (as opposed to normal ibm pc 3.5" drives where pin 2 is unconnected or is /DENSITY *input to drive*, and pin 34 is /DISKCHANGE) J4: 18-pin sip header for keyboard ribbon cable (needs tracing to see the VIA hookup order) J5: locking-tab-type "CONN HEADER VERT 4POS .100 TIN" connector for supplying power @@ -282,7 +282,7 @@ ToDo: data, though track 0 is just a disk "unique" identifier for the cat meaning 404480 usable bytes * (Once the floppy is working I'd declare the system working) -- WIP: Centronics port (not sure what is wrong right now, ip4 is never reading +- WIP: Centronics port (not sure what is wrong right now, ip4 is never reading as high meaning nothing works; does our centronics implementation correctly assert BUSY at all?) - RS232C port and Modem "port" connected to the DUART's two ports @@ -597,7 +597,7 @@ WRITE16_MEMBER( cat_state::cat_video_control_w ) * sync is active here for 7 cycles; manual claims 10 but is wrong * HST (96) is the horizontal count at which the HSYNC pin goes low * sync is inactive here for 7 cycles, manual claims 8 but is wrong?, this is the frontporch - * HSE (104) is the horizontal count at which the horizontal counter is reset to 0 (so counts 0-103 then back to 0) + * HSE (104) is the horizontal count at which the horizontal counter is reset to 0 (so counts 0-103 then back to 0) * * VERTICAL: * 0 is the first vertical line displayed to screen @@ -654,7 +654,7 @@ WRITE16_MEMBER( cat_state::cat_keyboard_w ) m_keyboard_line = data >> 8; } -// 0x800004-0x800005 'pr.data' write +// 0x800004-0x800005 'pr.data' write // /DSTB (centronics pin 1) is implied by the cat source code to be pulsed // low (for some unknown period of time) upon any write to this port. WRITE16_MEMBER( cat_state::cat_printer_data_w ) @@ -764,7 +764,7 @@ WRITE16_MEMBER( cat_state::cat_printer_control_w ) * |||||||\-- CC line enable (pin 34) (verified from cat source code) * ||||||\--- LEDE line enable (pin 33) (verified from cat source code) * |||||\---- ? - * ||||\----- ? may be IPP (pin 2) write (non-standard pin 34 of centronics port) or another watchdog reset bit; may also be /DSTB-enable-on-pr.data-write + * ||||\----- ? may be IPP (pin 2) write (non-standard pin 34 of centronics port) or another watchdog reset bit; may also be /DSTB-enable-on-pr.data-write * |||\------ ? * ||\------- ? * |\-------- ? @@ -835,7 +835,7 @@ WRITE16_MEMBER( cat_state::cat_opr_w ) * * 76543210 * ??????\\-- Watchdog count? (counts upward? if this reaches the watchdog fires? writing bit 3 set to opr above resets this) - * + * * FEDCBA98 * |||||||\-- PFAIL state (MB3771 comparator: 1: vcc = 5v; 0: vcc != 5v, hence do not write to svram!) * ||||||\--- (always 0?) @@ -847,7 +847,7 @@ WRITE16_MEMBER( cat_state::cat_opr_w ) * \--------- (always 0?) */ READ16_MEMBER( cat_state::cat_wdt_r ) -{ +{ uint16 Retval = 0x0100; // set pfail to 1; should this be a dipswitch? return Retval | m_wdt_counter; } diff --git a/src/mess/drivers/coco12.c b/src/mess/drivers/coco12.c index f3896028f64..43824e4b251 100644 --- a/src/mess/drivers/coco12.c +++ b/src/mess/drivers/coco12.c @@ -301,7 +301,7 @@ static MACHINE_CONFIG_START( coco, coco12_state ) MCFG_MC6847_ADD(VDG_TAG, MC6847_NTSC, XTAL_3_579545MHz, coco12_state::mc6847_config) MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync)) MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(coco12_state, field_sync)) - + // sound hardware MCFG_FRAGMENT_ADD( coco_sound ) diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c index f588c08b946..b8dc3dff8ae 100644 --- a/src/mess/drivers/compis.c +++ b/src/mess/drivers/compis.c @@ -712,12 +712,12 @@ static MACHINE_CONFIG_START( compis, compis_state ) MCFG_SCREEN_SIZE(640, 400) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1) MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update) - + MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_4_433619MHz/2) // unknown clock MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map) - MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(compis_state, hgdc_display_pixels) + MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(compis_state, hgdc_display_pixels) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) - + MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") // devices diff --git a/src/mess/drivers/compucolor.c b/src/mess/drivers/compucolor.c index 5c29e51a5af..c506caec38d 100644 --- a/src/mess/drivers/compucolor.c +++ b/src/mess/drivers/compucolor.c @@ -10,20 +10,20 @@ /* - TODO: + TODO: - - floppy - - interlaced video - - add-on ROM - - add-on RAM - - add-on unit + - floppy + - interlaced video + - add-on ROM + - add-on RAM + - add-on unit */ -#define I8080_TAG "ua2" -#define TMS5501_TAG "ud2" -#define CRT5027_TAG "uf9" -#define RS232_TAG "rs232" +#define I8080_TAG "ua2" +#define TMS5501_TAG "ud2" +#define CRT5027_TAG "uf9" +#define RS232_TAG "rs232" #include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" @@ -37,31 +37,31 @@ class compucolor2_state : public driver_device public: compucolor2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, I8080_TAG), - m_mioc(*this, TMS5501_TAG), - m_vtac(*this, CRT5027_TAG), - m_rs232(*this, RS232_TAG), - m_floppy0(*this, "cd0"), - m_floppy1(*this, "cd1"), - m_char_rom(*this, "chargen"), - m_video_ram(*this, "videoram"), - m_y0(*this, "Y0"), - m_y1(*this, "Y1"), - m_y2(*this, "Y2"), - m_y3(*this, "Y3"), - m_y4(*this, "Y4"), - m_y5(*this, "Y5"), - m_y6(*this, "Y6"), - m_y7(*this, "Y7"), - m_y8(*this, "Y8"), - m_y9(*this, "Y9"), - m_y10(*this, "Y10"), - m_y11(*this, "Y11"), - m_y12(*this, "Y12"), - m_y13(*this, "Y13"), - m_y14(*this, "Y14"), - m_y15(*this, "Y15"), - m_y128(*this, "Y128") + m_maincpu(*this, I8080_TAG), + m_mioc(*this, TMS5501_TAG), + m_vtac(*this, CRT5027_TAG), + m_rs232(*this, RS232_TAG), + m_floppy0(*this, "cd0"), + m_floppy1(*this, "cd1"), + m_char_rom(*this, "chargen"), + m_video_ram(*this, "videoram"), + m_y0(*this, "Y0"), + m_y1(*this, "Y1"), + m_y2(*this, "Y2"), + m_y3(*this, "Y3"), + m_y4(*this, "Y4"), + m_y5(*this, "Y5"), + m_y6(*this, "Y6"), + m_y7(*this, "Y7"), + m_y8(*this, "Y8"), + m_y9(*this, "Y9"), + m_y10(*this, "Y10"), + m_y11(*this, "Y11"), + m_y12(*this, "Y12"), + m_y13(*this, "Y13"), + m_y14(*this, "Y14"), + m_y15(*this, "Y15"), + m_y128(*this, "Y128") { } required_device m_maincpu; @@ -93,7 +93,7 @@ public: virtual void machine_start(); virtual void machine_reset(); DECLARE_PALETTE_INIT(compucolor2); - + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER( xi_r ); @@ -299,7 +299,7 @@ UINT32 compucolor2_state::screen_update(screen_device &screen, bitmap_rgb32 &bit { UINT8 code = m_video_ram[offset++]; UINT8 attr = m_video_ram[offset++]; - + offs_t char_offs = ((code & 0x7f) << 3) | (y & 0x07); if (BIT(code, 7)) char_offs = ((code & 0x7f) << 3) | ((y >> 1) & 0x07); @@ -458,7 +458,7 @@ static MACHINE_CONFIG_START( compucolor2, compucolor2_state ) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(compucolor2_state, compucolor2) - + // video hardware MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c index aeebe49e7ad..c19bc2100e1 100644 --- a/src/mess/drivers/d6800.c +++ b/src/mess/drivers/d6800.c @@ -392,7 +392,7 @@ static MACHINE_CONFIG_START( d6800, d6800_state ) MCFG_SCREEN_UPDATE_DRIVER(d6800_state, screen_update_d6800) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(25)) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* sound hardware */ diff --git a/src/mess/drivers/dct11em.c b/src/mess/drivers/dct11em.c index 5000ea1bee8..a1df16d0b61 100644 --- a/src/mess/drivers/dct11em.c +++ b/src/mess/drivers/dct11em.c @@ -62,7 +62,7 @@ static MACHINE_CONFIG_START( dct11em, dct11em_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(dct11em_state, screen_update_dct11em) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/dm7000.c b/src/mess/drivers/dm7000.c index b57f96f4c2c..9e10aa9f99f 100644 --- a/src/mess/drivers/dm7000.c +++ b/src/mess/drivers/dm7000.c @@ -256,7 +256,7 @@ void dm7000_state::machine_reset() dcr[DCRSTB045_DISP_MODE] = 0x00880000; dcr[DCRSTB045_FRAME_BUFR_BASE] = 0x0f000000; m_scc0_lsr = UART_LSR_THRE | UART_LSR_TEMT; - + ppc4xx_set_dcr_read_handler(m_maincpu, read32_delegate(FUNC(dm7000_state::dcr_r),this)); ppc4xx_set_dcr_write_handler(m_maincpu, write32_delegate(FUNC(dm7000_state::dcr_w),this)); } diff --git a/src/mess/drivers/dms5000.c b/src/mess/drivers/dms5000.c index 3ef5440ab42..11b310a536b 100644 --- a/src/mess/drivers/dms5000.c +++ b/src/mess/drivers/dms5000.c @@ -67,7 +67,7 @@ static MACHINE_CONFIG_START( dms5000, dms5000_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(dms5000_state, screen_update_dms5000) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c index 05579f3228b..2b4f4df4a11 100644 --- a/src/mess/drivers/esq1.c +++ b/src/mess/drivers/esq1.c @@ -608,7 +608,7 @@ static MACHINE_CONFIG_START( esq1, esq1_state ) MCFG_ES5503_OUTPUT_CHANNELS(8) MCFG_ES5503_IRQ_FUNC(WRITELINE(esq1_state, esq1_doc_irq)) MCFG_ES5503_ADC_FUNC(READ8(esq1_state, esq1_adc_read)) - + MCFG_SOUND_ROUTE_EX(0, "filters", 1.0, 0) MCFG_SOUND_ROUTE_EX(1, "filters", 1.0, 1) MCFG_SOUND_ROUTE_EX(2, "filters", 1.0, 2) diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index 70b2bfdf145..58c67cccfa4 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -222,7 +222,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(key_stroke); IRQ_CALLBACK_MEMBER(maincpu_irq_acknowledge_callback); DECLARE_WRITE_LINE_MEMBER(esq5505_otis_irq); - + //dmac DECLARE_WRITE8_MEMBER(dma_end); DECLARE_WRITE8_MEMBER(dma_error); diff --git a/src/mess/drivers/esqasr.c b/src/mess/drivers/esqasr.c index 31526450470..b483ffe09ac 100644 --- a/src/mess/drivers/esqasr.c +++ b/src/mess/drivers/esqasr.c @@ -59,9 +59,9 @@ public: virtual void machine_reset(); - DECLARE_DRIVER_INIT(asr); + DECLARE_DRIVER_INIT(asr); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); - DECLARE_READ16_MEMBER(esq5506_read_adc); + DECLARE_READ16_MEMBER(esq5506_read_adc); }; void esqasr_state::machine_reset() diff --git a/src/mess/drivers/esqkt.c b/src/mess/drivers/esqkt.c index e27a65113a1..32a1d050aac 100644 --- a/src/mess/drivers/esqkt.c +++ b/src/mess/drivers/esqkt.c @@ -18,71 +18,71 @@ 0x280000-0x2801FF ES5510 0x300000-0x30000F 68681 DUART 0xFF0000-0xFFFFFF OS RAM - + Ensoniq KT-76 - Ensoniq 1994 - - This is a wavetable-based synth keyboard made by Ensoniq in 1994 - - PCB Layout - ---------- - - KT-76 - |---------------------------------------------| - |J12 J3 J11 J10 | - | LM393 LM358| - | 74HC4051| - |ADM691 | - | 62256 | - | | - |3V_BATTERY KT76_0590_LO.U5 ROM0 | - | | - | 68EC020 62256 OTTOR2 ROM1 | - | | - | KT76_690B_HI.U6 ROM2 | - | PAL1 | - | HP_6N138 | - | PAL2 OTTOR2 J6| - | 7407 | - | | - | D41464 D41464 | - | | - | SCN2681 D41464 D41464 | - | 137000402 | - | | - | 18.432MHz | - | ESPR6 16MHz | - | POT | - | R1136-11 | - | | - | LM339 LM339 | - | J13 J5 J1 J2 J4 | - |---------------------------------------------| - Notes: - J1 - connector for digital jacks - J2 - connector for keyboard - J3 - connector for LCD display - J4 - connector for keyboard - J5 - connector for power input - J6 - connector for wave expansion - J10 - connector for wheels/pressure - J11 - connector for memory card - J12 - connector for headphones - J13 - connector for analog jacks - 68EC020 - Motorola MC68EC020FG16 CPU. Clock input 16MHz - 1370000402 - Unknown PLCC44 IC stamped with the Ensoniq logo. Likely CPLD or gate array. - ESPR6 - Ensoniq ESPR6 (ES5510) sound chip - OTTOR2 - Ensoniq OTTOR2 (ES5506) sound chip - POT - ESP adjustment pot - KT76* - 27C2048/27C210 EPROM - ROM* - 2M x8-bit SOP44 mask ROM - R1136-11 - DIP40 IC manufactured by Rockwell - believed to be some type of MCU. - D41464 - NEC D41464 64k x4-bit DRAM - 62256 - 32k x8-bit SRAM - SCN2681 - Philips SCN2681 Dual Universal Asynchronous Receiver/Transmitter (DUART) - HP_6N138 - HP/Agilent HP 6N138 Low Input Current High Gain Optocoupler - PAL1 - MMI PAL20L8ACN stamped 'KT-76 MMU 6A0A'. Printing is faint so 0 could be a B or a D. - PAL2 - MMI PAL20L8ACN stamped 'KT-76 BCU 73D6' + Ensoniq 1994 + + This is a wavetable-based synth keyboard made by Ensoniq in 1994 + + PCB Layout + ---------- + + KT-76 + |---------------------------------------------| + |J12 J3 J11 J10 | + | LM393 LM358| + | 74HC4051| + |ADM691 | + | 62256 | + | | + |3V_BATTERY KT76_0590_LO.U5 ROM0 | + | | + | 68EC020 62256 OTTOR2 ROM1 | + | | + | KT76_690B_HI.U6 ROM2 | + | PAL1 | + | HP_6N138 | + | PAL2 OTTOR2 J6| + | 7407 | + | | + | D41464 D41464 | + | | + | SCN2681 D41464 D41464 | + | 137000402 | + | | + | 18.432MHz | + | ESPR6 16MHz | + | POT | + | R1136-11 | + | | + | LM339 LM339 | + | J13 J5 J1 J2 J4 | + |---------------------------------------------| + Notes: + J1 - connector for digital jacks + J2 - connector for keyboard + J3 - connector for LCD display + J4 - connector for keyboard + J5 - connector for power input + J6 - connector for wave expansion + J10 - connector for wheels/pressure + J11 - connector for memory card + J12 - connector for headphones + J13 - connector for analog jacks + 68EC020 - Motorola MC68EC020FG16 CPU. Clock input 16MHz + 1370000402 - Unknown PLCC44 IC stamped with the Ensoniq logo. Likely CPLD or gate array. + ESPR6 - Ensoniq ESPR6 (ES5510) sound chip + OTTOR2 - Ensoniq OTTOR2 (ES5506) sound chip + POT - ESP adjustment pot + KT76* - 27C2048/27C210 EPROM + ROM* - 2M x8-bit SOP44 mask ROM + R1136-11 - DIP40 IC manufactured by Rockwell - believed to be some type of MCU. + D41464 - NEC D41464 64k x4-bit DRAM + 62256 - 32k x8-bit SRAM + SCN2681 - Philips SCN2681 Dual Universal Asynchronous Receiver/Transmitter (DUART) + HP_6N138 - HP/Agilent HP 6N138 Low Input Current High Gain Optocoupler + PAL1 - MMI PAL20L8ACN stamped 'KT-76 MMU 6A0A'. Printing is faint so 0 could be a B or a D. + PAL2 - MMI PAL20L8ACN stamped 'KT-76 BCU 73D6' ***************************************************************************/ @@ -263,13 +263,13 @@ ROM_START( kt76 ) ROM_LOAD32_WORD( "kt76_162_hi.bin", 0x000002, 0x040000, CRC(de16d236) SHA1(c55fca86453e90e8c34a048bed45817063237370) ) ROM_REGION(0x400000, "waverom", ROMREGION_ERASE00) - ROM_LOAD16_BYTE( "1351000401_rom0.u103", 0x000001, 0x200000, CRC(425047af) SHA1(9680d1fc222b29ba24f0fbf6136982bee87a60ef) ) + ROM_LOAD16_BYTE( "1351000401_rom0.u103", 0x000001, 0x200000, CRC(425047af) SHA1(9680d1fc222b29ba24f0fbf6136982bee87a60ef) ) ROM_REGION(0x400000, "waverom2", ROMREGION_ERASE00) - ROM_LOAD16_BYTE( "1351000402_rom1.u102", 0x000001, 0x200000, CRC(64459185) SHA1(0fa20b16847fc02a384057fc3d385226eb3e7527) ) + ROM_LOAD16_BYTE( "1351000402_rom1.u102", 0x000001, 0x200000, CRC(64459185) SHA1(0fa20b16847fc02a384057fc3d385226eb3e7527) ) ROM_REGION(0x400000, "waverom3", ROMREGION_ERASE00) - ROM_LOAD16_BYTE( "1351000403_rom2.u104", 0x000001, 0x200000, CRC(c2aacc5d) SHA1(7fab518ba92ddb23cdc4dcb04751b26d25c298c0) ) + ROM_LOAD16_BYTE( "1351000403_rom2.u104", 0x000001, 0x200000, CRC(c2aacc5d) SHA1(7fab518ba92ddb23cdc4dcb04751b26d25c298c0) ) ROM_REGION(0x200000, "waverom4", ROMREGION_ERASE00) ROM_END diff --git a/src/mess/drivers/esqmr.c b/src/mess/drivers/esqmr.c index d9b325a3ef2..685e14907d8 100644 --- a/src/mess/drivers/esqmr.c +++ b/src/mess/drivers/esqmr.c @@ -12,189 +12,189 @@ Memory map: 0x000000-0x0FFFFF OS ROM - + MR Rack - Ensoniq, 1995 - - This is a 64-voice expandable synth module made by Ensoniq in 1995. - It is shipped with 12MB of 16-bit 44.1kHz wave data and can be expanded - with up to 3 ENSONIQ EXP Series Wave Expansion Boards containing up to a - maximum of 84MB of additional wave data. - - - PCB Layout - ---------- - - PN: 4001028501 REV C - |--------------------------------------------------------| - | J6 J7 J12 J13 J21 J23 J22| - | J5| - | 4565 4565 HP_6N138 | - | | - | BATTERY 7407 | - | 4565 | - | | - | OTTOR2 OTTOR2 | - |AD1861 | - |AD1861 | - |AD1861 | - |AD1861 |--J3-----| | - | HC04 |EXPANSION| | - | |BOARD #3 | | - | | | | - | 1370001501 | | | - | | | | - | |--J8-----| | - | ESP2 ROM2 | - | |--J2-----| | - | |EXPANSION| | - | ROM0 |BOARD #2 | | - | | | | - | D43256 IDT7130 | | | - | D43256 35MHz 16MHz ROM1 | | | - | D43256 J14 |--J9-----| | - | D43256 22.5792MHz ADM691| - | D43256 MC68340 |--J1-----| | - | D43256 |EXPANSION| | - | 6MHz |BOARD #1 | | - | EPROM_UP | | | - | MC68HC705C4A KM681000 | | - |J4 EPROM_LO KM681000 |J11| - | J19 J18 |--J10----| | - |--------------------------------------------------------| - Notes: - J4/J18/J19 - Connectors to front panel buttons, LCD etc - J1/J10 - Connectors for expansion board #1 - J2/J9 - Connectors for expansion board #2 - J3/J8 - Connectors for expansion board #3 - J11 - Memory card connector - J14 - JTAG connector - J6 - Main left/mono jack - J7 - Main right jack - J12 - Aux left/mono jack - J13 - Aux right jack - J21 - MIDI in connector - J23 - MIDI out connector - J22 - MIDI thru connector - J5 - Power input connector - 1370001501 - Unknown TQFP144 IC stamped with the Ensoniq logo. Possibly CPLD? - ESP2 - Ensoniq ESP2 sound chip - OTTOR2 - Ensoniq OTTOR2 sound chip - ROM* - 4M x8-bit SOP44 mask ROM - D43256 - NEC D43256 32k x8-bit Static RAM - HP_6N138 - HP/Agilent HP 6N138 Low Input Current High Gain Optocoupler - 4565 - JRC4565 Dual Operational Amplifier - AD1861 - Analog Devices AD1861 16-bit/18-bit PCM Audio DAC - MC68HC705C4A - Motorola MC68HC705C4A Microcontroller. Clock input is tied to the TQFP CPLD - MC68340 - Motorola MC68340PV16E 68000-compatible 32-bit processor with on-board peripherals. Clock input 6.000MHz - EPROM* - 27C4001 EPROM - IDT7130 - IDT7130 High Speed 1k x8-bit Dual Port Static RAM - KM681000 - Samsung KM681000 128k x8-bit Static RAM - ADM691 - Analog Devices ADM691 Microprocessor Supervisory Circuit with Automatic Battery Backup Switching - - - Additional notes from the manual: - --------------------------------- - - The MR-Rack can play special demonstration songs to give you an idea of how terrific it sounds. - - To Play the MR-Rack Main Demo - 1. Press the Audition button, and hold it down. - 2. While still holding Audition, press the Save button. - 3. Let go of both buttons. - - In an unexpanded MR-Rack, the display shows: - - Hit ENTER to Play: - MAINDEMO:MR Internal - - If you've installed any Expansion boards or a ROM card containing MAINDEMO-type - demonstration songs, your display will differ. Turn the Value knob counter-clockwise - until the display looks as it does above. - - Note: When MR-Rack demos are being viewed or playing, MIDI In is disabled. - - 4. Press Enter to play the demo. - 5. Press Enter again to stop the demo. - 6. When you're done listening to the demo song, press Exit to return to normal MR-Rack - - - The Version Number of Your MR-Rack Operating System: - You can easily find out what operating system (or O.S.) your MR-Rack is currently using. - To Find the Operating System: - 1. Press the Save button and hold it down. - 2. While still holding the Save button, press the System button. - The display briefly shows your current Operating System: - - ENSONIQ MR-RACK - O.S. Version: #.## - - - - ENSONIQ EXP Series Wave Expansion Boards - ---------------------------------------- - - These are small plug-in boards containing a 256k x8-bit EPROM (27C020) and from 1 to 6 - SOP44 mask ROMs. These add additional digital sound waves. These can be used with the MR - Rack, the full-size MR Keyboards and a few other models. - - PCB Layout - ---------- - - PN: 4001033401 REV B - |------------------| - | | - | U6 U7 | - |- | - || | - || U1 | - || U2 -| - || || - || || - || U3 || - || || - || U8 || - || U4 || - || || - || || - || U5 || - |- -| - |------------------| - Notes: - U1 - AC138 logic chip - U2 to U7 - 4M x 8-bit or 2M x 8-bit SOP44 mask ROM - U8 - 27C020 EPROM - - The EXP boards dumped so far are.... - - MROM # of - Name Version Size MROMs - ----------------------------------- - Piano V1.00 4M 4 (multisampled pianos, aka "The Perfect Piano") - The Real World V1.01 4M 6 (non-Western percusson and other "world music" sounds) - Drum V1.00 2M 1 (additional drum kits that are built in to the MR keyboards) - - - Additional notes from the manual: - --------------------------------- - - The MR-Rack provides three displays which can identify any EXP Wave Expansion boards - you have installed. - - To Identify an Installed Expansion Board - 1. Press the System button. - 2. Turn the Parameter knob until the display shows: - - System parameters: - WaveEXP1:xxxxxxxxxxx - - When an Expansion Board is installed, this read-only display will show the name of the - Expansion Board located in the first slot. + Ensoniq, 1995 + + This is a 64-voice expandable synth module made by Ensoniq in 1995. + It is shipped with 12MB of 16-bit 44.1kHz wave data and can be expanded + with up to 3 ENSONIQ EXP Series Wave Expansion Boards containing up to a + maximum of 84MB of additional wave data. + + + PCB Layout + ---------- + + PN: 4001028501 REV C + |--------------------------------------------------------| + | J6 J7 J12 J13 J21 J23 J22| + | J5| + | 4565 4565 HP_6N138 | + | | + | BATTERY 7407 | + | 4565 | + | | + | OTTOR2 OTTOR2 | + |AD1861 | + |AD1861 | + |AD1861 | + |AD1861 |--J3-----| | + | HC04 |EXPANSION| | + | |BOARD #3 | | + | | | | + | 1370001501 | | | + | | | | + | |--J8-----| | + | ESP2 ROM2 | + | |--J2-----| | + | |EXPANSION| | + | ROM0 |BOARD #2 | | + | | | | + | D43256 IDT7130 | | | + | D43256 35MHz 16MHz ROM1 | | | + | D43256 J14 |--J9-----| | + | D43256 22.5792MHz ADM691| + | D43256 MC68340 |--J1-----| | + | D43256 |EXPANSION| | + | 6MHz |BOARD #1 | | + | EPROM_UP | | | + | MC68HC705C4A KM681000 | | + |J4 EPROM_LO KM681000 |J11| + | J19 J18 |--J10----| | + |--------------------------------------------------------| + Notes: + J4/J18/J19 - Connectors to front panel buttons, LCD etc + J1/J10 - Connectors for expansion board #1 + J2/J9 - Connectors for expansion board #2 + J3/J8 - Connectors for expansion board #3 + J11 - Memory card connector + J14 - JTAG connector + J6 - Main left/mono jack + J7 - Main right jack + J12 - Aux left/mono jack + J13 - Aux right jack + J21 - MIDI in connector + J23 - MIDI out connector + J22 - MIDI thru connector + J5 - Power input connector + 1370001501 - Unknown TQFP144 IC stamped with the Ensoniq logo. Possibly CPLD? + ESP2 - Ensoniq ESP2 sound chip + OTTOR2 - Ensoniq OTTOR2 sound chip + ROM* - 4M x8-bit SOP44 mask ROM + D43256 - NEC D43256 32k x8-bit Static RAM + HP_6N138 - HP/Agilent HP 6N138 Low Input Current High Gain Optocoupler + 4565 - JRC4565 Dual Operational Amplifier + AD1861 - Analog Devices AD1861 16-bit/18-bit PCM Audio DAC + MC68HC705C4A - Motorola MC68HC705C4A Microcontroller. Clock input is tied to the TQFP CPLD + MC68340 - Motorola MC68340PV16E 68000-compatible 32-bit processor with on-board peripherals. Clock input 6.000MHz + EPROM* - 27C4001 EPROM + IDT7130 - IDT7130 High Speed 1k x8-bit Dual Port Static RAM + KM681000 - Samsung KM681000 128k x8-bit Static RAM + ADM691 - Analog Devices ADM691 Microprocessor Supervisory Circuit with Automatic Battery Backup Switching + + + Additional notes from the manual: + --------------------------------- + + The MR-Rack can play special demonstration songs to give you an idea of how terrific it sounds. + + To Play the MR-Rack Main Demo + 1. Press the Audition button, and hold it down. + 2. While still holding Audition, press the Save button. + 3. Let go of both buttons. + + In an unexpanded MR-Rack, the display shows: + + Hit ENTER to Play: + MAINDEMO:MR Internal + + If you've installed any Expansion boards or a ROM card containing MAINDEMO-type + demonstration songs, your display will differ. Turn the Value knob counter-clockwise + until the display looks as it does above. + + Note: When MR-Rack demos are being viewed or playing, MIDI In is disabled. + + 4. Press Enter to play the demo. + 5. Press Enter again to stop the demo. + 6. When you're done listening to the demo song, press Exit to return to normal MR-Rack + + + The Version Number of Your MR-Rack Operating System: + You can easily find out what operating system (or O.S.) your MR-Rack is currently using. + To Find the Operating System: + 1. Press the Save button and hold it down. + 2. While still holding the Save button, press the System button. + The display briefly shows your current Operating System: + + ENSONIQ MR-RACK + O.S. Version: #.## + + + + ENSONIQ EXP Series Wave Expansion Boards + ---------------------------------------- + + These are small plug-in boards containing a 256k x8-bit EPROM (27C020) and from 1 to 6 + SOP44 mask ROMs. These add additional digital sound waves. These can be used with the MR + Rack, the full-size MR Keyboards and a few other models. + + PCB Layout + ---------- + + PN: 4001033401 REV B + |------------------| + | | + | U6 U7 | + |- | + || | + || U1 | + || U2 -| + || || + || || + || U3 || + || || + || U8 || + || U4 || + || || + || || + || U5 || + |- -| + |------------------| + Notes: + U1 - AC138 logic chip + U2 to U7 - 4M x 8-bit or 2M x 8-bit SOP44 mask ROM + U8 - 27C020 EPROM + + The EXP boards dumped so far are.... + + MROM # of + Name Version Size MROMs + ----------------------------------- + Piano V1.00 4M 4 (multisampled pianos, aka "The Perfect Piano") + The Real World V1.01 4M 6 (non-Western percusson and other "world music" sounds) + Drum V1.00 2M 1 (additional drum kits that are built in to the MR keyboards) + + + Additional notes from the manual: + --------------------------------- + + The MR-Rack provides three displays which can identify any EXP Wave Expansion boards + you have installed. + + To Identify an Installed Expansion Board + 1. Press the System button. + 2. Turn the Parameter knob until the display shows: + + System parameters: + WaveEXP1:xxxxxxxxxxx + + When an Expansion Board is installed, this read-only display will show the name of the + Expansion Board located in the first slot. + + 3. Turning the Parameter knob two more times will reveal two more displays which show + the names of the Expansion Boards in Wave EXP Slots 2 and 3 (if they're installed). + If there are no Expansion Boards installed, the display will show "WaveEXP1= **EMPTY**." - 3. Turning the Parameter knob two more times will reveal two more displays which show - the names of the Expansion Boards in Wave EXP Slots 2 and 3 (if they're installed). - If there are no Expansion Boards installed, the display will show "WaveEXP1= **EMPTY**." - ***************************************************************************/ #include "emu.h" @@ -220,7 +220,7 @@ public: public: DECLARE_DRIVER_INIT(mr); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); - DECLARE_READ16_MEMBER(esq5506_read_adc); + DECLARE_READ16_MEMBER(esq5506_read_adc); }; void esqmr_state::machine_reset() @@ -302,21 +302,21 @@ ROM_END ROM_START( mrrack ) // 68340 main MCU ROM_REGION(0x100000, "maincpu", 0) - ROM_LOAD16_BYTE( "mr_r_ec51_lo_1.50.u36", 0x000001, 0x080000, CRC(b29988a1) SHA1(986c2def11de27fa2b9be55ac32f7fec0c414bca) ) - ROM_LOAD16_BYTE( "mr_r_9dac_up_1.50.u35", 0x000000, 0x080000, CRC(71511692) SHA1(54744f16f1db1ac5abb2f70b6e04aebf1e0e029d) ) + ROM_LOAD16_BYTE( "mr_r_ec51_lo_1.50.u36", 0x000001, 0x080000, CRC(b29988a1) SHA1(986c2def11de27fa2b9be55ac32f7fec0c414bca) ) + ROM_LOAD16_BYTE( "mr_r_9dac_up_1.50.u35", 0x000000, 0x080000, CRC(71511692) SHA1(54744f16f1db1ac5abb2f70b6e04aebf1e0e029d) ) // 68705 display/front panel MCU ROM_REGION(0x2000, "mcu", 0) - ROM_LOAD( "68hc705.u40", 0x000000, 0x002000, CRC(7b0291a7) SHA1(c92c19ce9289b7b21dbc915475cdff8930e3c677) ) + ROM_LOAD( "68hc705.u40", 0x000000, 0x002000, CRC(7b0291a7) SHA1(c92c19ce9289b7b21dbc915475cdff8930e3c677) ) ROM_REGION(0x400000, "waverom", ROMREGION_ERASE00) - ROM_LOAD( "1351000901_h-rom0.u5", 0x000000, 0x400000, CRC(89654b42) SHA1(4bdffd8060eb20cdb01f6178222aeb32fdbfd703) ) + ROM_LOAD( "1351000901_h-rom0.u5", 0x000000, 0x400000, CRC(89654b42) SHA1(4bdffd8060eb20cdb01f6178222aeb32fdbfd703) ) ROM_REGION(0x400000, "waverom2", ROMREGION_ERASE00) - ROM_LOAD( "1351000902_h-rom1.u23", 0x000000, 0x400000, CRC(4a19e517) SHA1(e819f1e0b50c4911c4855ad95ed505998a2bbe86) ) + ROM_LOAD( "1351000902_h-rom1.u23", 0x000000, 0x400000, CRC(4a19e517) SHA1(e819f1e0b50c4911c4855ad95ed505998a2bbe86) ) ROM_REGION(0x400000, "waverom3", ROMREGION_ERASE00) - ROM_LOAD( "1351000903_h-rom2.u24", 0x000000, 0x400000, CRC(c9ab1214) SHA1(92f48b068bbe49eacbffd03e428599e3ab21b8ec) ) + ROM_LOAD( "1351000903_h-rom2.u24", 0x000000, 0x400000, CRC(c9ab1214) SHA1(92f48b068bbe49eacbffd03e428599e3ab21b8ec) ) ROM_REGION(0x200000, "waverom4", ROMREGION_ERASE00) ROM_END diff --git a/src/mess/drivers/europc.c b/src/mess/drivers/europc.c index e9c5e34d6b9..83be79fa7a1 100644 --- a/src/mess/drivers/europc.c +++ b/src/mess/drivers/europc.c @@ -32,7 +32,7 @@ public: DECLARE_READ8_MEMBER( europc_rtc_r ); DECLARE_WRITE8_MEMBER( europc_rtc_w ); - + DECLARE_DRIVER_INIT(europc); void europc_rtc_set_time(); @@ -47,7 +47,7 @@ public: void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); emu_timer* m_rtc_timer; - + enum { TIMER_RTC @@ -345,9 +345,9 @@ DRIVER_INIT_MEMBER(europc_pc_state,europc) m_rtc_timer = timer_alloc(); m_rtc_timer->adjust(attotime::zero, 0, attotime(1,0)); // europc_rtc_set_time(); - + machine().device("nvram")->set_base(m_rtc_data, sizeof(m_rtc_data)); - m_aga = machine().device("aga:aga"); + m_aga = machine().device("aga:aga"); } @@ -402,7 +402,7 @@ ALT,[SPACE], SPACE BAR,[SPACE],CAPS LOCK,[SPACE], KEYPAD 0, KEYPAD ., KEYPAD ENT \ and ~ had to be swapped i am not sure if keypad enter delivers the mf2 keycode */ - + static INPUT_PORTS_START( europc ) PORT_START("DSW0") /* IN1 */ @@ -476,21 +476,21 @@ static ADDRESS_MAP_START(europc_io, AS_IO, 8, europc_pc_state ) ADDRESS_MAP_END static MACHINE_CONFIG_START( europc, europc_pc_state ) - MCFG_CPU_ADD("maincpu", I8088, 4772720*2) + MCFG_CPU_ADD("maincpu", I8088, 4772720*2) MCFG_CPU_PROGRAM_MAP(europc_map) MCFG_CPU_IO_MAP(europc_io) MCFG_PCNOPPI_MOTHERBOARD_ADD("mb", "maincpu") - + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "aga", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "lpt", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "com", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "fdc_xt", false) - + MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) MCFG_NVRAM_ADD_0FILL("nvram"); - + /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") @@ -502,4 +502,4 @@ ROM_START( europc ) ROM_LOAD("50145", 0xf8000, 0x8000, CRC(1775a11d) SHA1(54430d4d0462860860397487c9c109e6f70db8e3)) // V2.07 ROM_END -COMP( 1988, europc, ibm5150, 0, europc, europc, europc_pc_state, europc, "Schneider Rdf. AG", "EURO PC", GAME_NOT_WORKING) \ No newline at end of file +COMP( 1988, europc, ibm5150, 0, europc, europc, europc_pc_state, europc, "Schneider Rdf. AG", "EURO PC", GAME_NOT_WORKING) diff --git a/src/mess/drivers/fanucs15.c b/src/mess/drivers/fanucs15.c index 8984fa3cf93..a2018291099 100644 --- a/src/mess/drivers/fanucs15.c +++ b/src/mess/drivers/fanucs15.c @@ -2,306 +2,306 @@ // copyright-holders:R. Belmont /*************************************************************************** - Fanuc System 15 - - 2014-01-04 Skeleton driver. - - This is a circa-1990 CNC machine with a very custom GUI, made of a - bunch of boards plugged into a passive backplane. - - Possible boards include: - A16B-2200-0020/04B : Base 2 Board (contains 12 MHz 68020 "CNC CPU" and 1 or 2 MB of DRAM) - A16B-2200-0090/07A : Digital Servo 4-Axis Controller Board (no ROMs on this board) - A16B-2200-0121/06C : Base 0 Board (1 ROM location but position is empty. -0120 has 6081 001A) - - A16B-2200-0131/11B : Base 1 Board (15 ROMs on this board, 4040, 9030, AB02) - See detailed layout and description below. - - A16B-2200-0150/03A : Conversational Board (4 ROMs on this board, 5A00, probably for Mill) - or - A16B-2200-0150/03A : Conversational Board (4 ROMs on this board, 5C30. 5C for 2 axis Lathe) - or - A16B-2200-0150/03A : Conversational Board (4 ROMs on this board, 5D30. 5D for 4 axis (twin Turret) lathe) - Fanuc FBI-A MB605111 (QFP100) - MB1422A (DIP42 - DRAM Controller) - 51256-10 (x18) - MB89259A (SOP28) - Intel 80286-8 - Intel 80287-8 - MBL82288-8 (DIP10) - uPB8284 (DIP18) - 24MHz & 32MHz OSC's - 4 EPROMs - - A16B-2200-0160/07B : Graphic Board (3 ROMs on this board, 6082 001A, 600B 001D, 600B 002D. 600B is for Mill) - or - A16B-2200-0160/07B : Graphic Board (3 ROMs on this board, 6082 001A, 600A 001C, 600A 001D. 600A is for Lathe) - Fanuc FBI-A MB605111 (QFP100) - HD68HC000P10 (68000 @10MHz, PLCC68) - HM62256-10 (x2) - HM53461-12 (x3) - HD63484 (PLCC68) - HD6445 (PLCC44) - Fanuc GBC MB652147 (PGA135) - MB81464-12 (x12) - 20MHz OSC - 3 EPROMs. 6082 is common to both mills and lathes. - 600A is a known EPROM version required for lathes with FAPT conversational graphics. - 600B is unknown. Possibly for mills with FAPT. - - A20B-1003-0230/09C : Motherboard (dumb backplane, contains only slots) - A20B-1003-0500/01A : Additional Graphic Board for 15TTF only (for TT, connects to A16B-2200-0160 Board. No info on this PCB) - A20B-1003-0240/07B : Connector Assembly Unit / IO Board - A20B-1003-0580/01A : PMC Cassette C (16000 Step + Pascal 128KB, small PCB in a yellow plastic box, contains just 2 EPROMs) - - - Fanuc System 15A Base 1 Board A16B-2200-013 - - PCB Layout - ---------- - - A16B-2200-0131/03B (note 1 and 03B have been added/printed later) - |--------------| |---| - |------| CA34 |-----|CA4|-------------------------------------| - | |--------------|75463|---| LL LL MB81C79A| - | (x6) LL LL |--------| | - | HM53461(x5)|MB605117| | - | FA8191 | | | - |4040002E.M27 4040001E.M23 FA8191 | | | - | |--------| | - | | - | MC-122-41256A9A-12 |--------| | - |AB02142A.K27 AB02141A.K23 MC-122-41256A9A-12 |MB661128| | - | 9030001E.J18 | | | - | | | | - | |--------| | - |AB02102A.H27 AB02101A.H23 | - | | - | | - | | - |AB020C2A.F27 AB020C1A.F23 24MHz | - | | - | | - | |--------| | - |AB02082A.E27 AB02081A.E23 |------| |MB605111| | - | |68000 | | | | - | | | | | | - | |---------| | | |--------| | - | |---------| |------| | - | CNM1 |-----------------------| | - |------------------------------------------| CNA |--| - |-----------------------| - Notes: - MC-122-41256- NEC MC-122-41256A9A-12 256k RAM SIP module (with parity) containing NEC D41256L-12 32k x8 SRAM - 2 SIP modules populated, 9 chips per module, 18 total RAMs, total 512k - 68000 - Hitachi HD68HC000-12 68000 CPU. Clock 24/2 (PLCC68) - MB661128 - Fujitsu Fanuc SLC01 MB661128 (Serial Data Link Controller, PLCC68) - MB605117 - Fujitsu Fanuc BOC MB605117U (DRAM/SRAM Interface Controller, QFP100) - MB605111 - Fujitsu Fanuc FBI-A MB605111 (Global/Local Interface Controller, QFP100) - HM53461 - Hitachi HM53461-12 64k x4-bit multiport CMOS video RAM (x5, SOJ24) - MB81C79A - Fujitsu MB81C79A-35 8k x 9-bit (72k) CMOS Static RAM (SOP28) - FA8191 - Fanuc FA8191 RV07 custom ceramic module (contains resistors and transistors, SIL16) - 75463 - Texas Instruments SN75463 Dual High-Voltage, High-Current Peripheral Driver (DIP8) - L - LED - CA34 - Connector for PMC Cassette C A02B-0094-C103 (holds 2 EPROMs containing the PMC Ladder) - The Ladder is specific and unique to each CNC machine, depending on capability and options. - CA4 - Connector for cable joined to Servo Control Board A16B-2200-0090 or 16B-2200-0091 - CNA - Connector plugs into motherboard slot CNA2 (BASE 1) - CNM1 - 40 pin flat cable joined to optional board A16B-1600-0280/02A - - Note about EPROMs: - Software Series is denoted by the first 4 digits - ROM # (possibly relating to the memory location in hex) is the next 3 digits - Software Revision is the last letter - Both IC locations and ROM # are printed on this board - - ROM IC Memory EPROM Used - Label Location Location Type For... - ----------------------------------------------------------------------------------------- - 9030001E J18 381 27256 Digital Servo Control Program Version 9030 Revision E - - 4040001E M23 001 27C1001 PMC Control Program Version 4040 Revision E - 4040002E M27 002 27C1001 - - AB02081A E23 081 27C1001 Boot Software Version AB02 Revision A - AB02082A E27 082 27C1001 - AB020C1A F23 0C1 27C1001 - AB020C2A F27 0C2 27C1001 - AB02101A H23 101 27C1001 - AB02102A H27 102 27C1001 - AB02141A K23 141 27C1001 - AB02142A K27 142 27C1001 - - - Another identical board from a different machine contains the following EPROMs.... - 9030001F (known revisions exist up to at least rev M) - 4040001D, 4040002D (known revisions exist up to at least rev I) - A202081G, A202082G - A2020C1G, A2020C2G - A202101G, A202102G - - The complete boot software series is listed below: - - 15TA SOFTWARE SERIES (Single Turret 2 Axis Lathe) - |------+----+---------+---+---+---+---| - |S/W |STEP| CRT |I/O|SER|SER|DNC| - |SERIES| | | | | | | - | |1 2| 9M 14 9C|LNK|SPN|FB |1 2| - +------+----+---------+---+---+---+---+ - |A201 |X | X | | | | | - |A202 |X | X | | | | | - |A211 | X| X | X | X | |X | - |A212 | X| X | X | X | |X | - |A219 | X| X | X | X | X | | - |A220 | X| X | X | X | X | | - |A215 | X| X | X | X | | X| - |A216 | X| X | X | X | | X| - |A217 | X| X | X | X | X | X| - |A218 | X| X | X | X | X | X| - |A221 | X| X | X | X | ? | ?| - |------+----+---------+---+---+---+---| - Notes: - 9M - 9" Monochrome - 9C - 9" Color - 14 - 14" Color - SER SPN - Serial Spindle - SER FB - Serial FB ? - DNC 1/2 - DNC (Direct NC) type 1 or type 2 for Direct PC to CNC program transfer operation - - - 15TTA SOFTWARE SERIES (Twin Turret 4 Axis Lathe) - |------+----+---------+---+---+---+---| - |S/W |STEP| CRT |I/O|SER|SER|DNC| - |SERIES| | | | | | | - | |1 2| 9M 14 9C|LNK|SPN|FB |1 2| - +------+----+---------+---+---+---+---+ - |A401 |X | X | | | | | - |A402 |X | X | | | | | - |A411 | X| X | X | X | |X | - |A412 | X| X | X | X | |X | - |A419 | X| X | X | X | X | | - |A420 | X| X | X | X | X | | - |------+----+---------+---+---+---+---| - - - 15TTF SOFTWARE SERIES (Twin Turret 4 Axis Lathe with FAPT) - |------+----+---------+---+---+---+---| - |S/W |STEP| CRT |I/O|SER|SER|DNC| - |SERIES| | | | | | | - | |1 2| 9M 14 9C|LNK|SPN|FB |1 2| - +------+----+---------+---+---+---+---+ - |A502 |X | X | | | | | - |A512 | X| X | X | X | |X | - |A520 | X| X | X | X | X | | - |------+----+---------+---+---+---+---| - - - 15MA SOFTWARE SERIES (Mill With 3 Axes minimum XYZ) - |------+----+---------+---+---+---+---|---| - |S/W |STEP| CRT |I/O|SER|SER|DNC|SUB| - |SERIES| | | | | | | | - | |1 2| 9M 14 9C|LNK|SPN|FB |1 2|CPU| - +------+----+---------+---+---+---+---+---| - |A001 |X | X | | | | | | - |A002 |X | X | | | | | | - |A00A |X | X | | | | | | - |A00B |X | X | | | | | | - |AA01 |X | X | | | | | X | - |AA02 |X | X | | | | | X | - |A011 | X| X | X | X | |X | | - |A012 | X| X | X | X | |X | | - |AA11 | X| X | X | X | |X | X | - |AA12 | X| X | X | X | |X | X | - |A017 | X| X | X | X | X | X| | - |A018 | X| X | X | X | X | X| | - |A019 | X| X | X | X | X | | | - |A01A | X| X | X | X | |X | | - |A01B | X| X | X | X | |X | | - |A020 | X| X | X | X | X | | | - |A021 | X| X| X | X | X | ?| | - |A027 (NEW STANDARD) | | | | | | - |A028 (NEW STANDARD) | | | | | | - |A041 (FOR OSI ONLY) | | | | | | - |A042 (FOR OSI ONLY) | | | | | | - |AA19 | X| X | X | X | X | | X | - |AA20 | X| X | X | X | X | | X | - |AA13 | X| X | X | X | X | X| X | - |AA14 | X| X | X | X | X | X| X | - |AA23 | X| X | X | X | X | | X | - |AA24 | X| X | X | X | X | | X | - |AA26 | X| X | X | X | X | ?| X | - |AA27 (NEW STD) | | | | | | - |AA28 (NEW STD) | | | | | | - |AA41 (FOR OSI ONLY) | | | | | | - |AA42 (FOR OSI ONLY) | | | | | | - |---------------------+---+---+---+---+---| - - - Optional PCB A16B-1600-0280/02A - ------------------------------- - - |---------------------------| - | 181 182 | - | | - | | - | | - | 1C1 1C2 | - | | - | | - | | - | 201 202 | - | | - | | - | | - | 241 242 | - | | - | | - | | - | 281 282 | - | | - | | - | | - | 2C1 2C2 | - | | - | | - | |---------| | - | |---------| | - | CNM1 | - |---------------------------| - Notes: - The A16B-1600-0280/02A board contains only 12 DIP32 sockets and some logic and - bolts to the back of the BASE 1 board. The board extends the boot software memory - storage space if additional EPROMS are required. Not all sockets are populated. - Connector CNM1 joins with a 40 pin flat cable to the BASE 1 board connector CNM1 - IC locations are not printed on this board. Only the ROM # is printed at each - socket location. - - ROM IC Memory EPROM Used For - Label Location Location Type - --------------------------------------------------------------------------------- - AB02281A N/A 281 27C1001 Boot Software Version AB02 Revision A - AB02282A N/A 282 27C1001 - AB022C1A N/A 2C1 27C1001 - AB022C2A N/A 2C2 27C1001 - - - 15A EPROM population and option type - ----------------+---------+------------------------------------------- - PCB NAME |ROM # | Option Type (Basic, Option A1/A2/A3 etc) - ----------------|---------+------------------------------------------- - BASE 1 main |081, 082 | B - BASE 1 main |0C1, 0C2 | B - BASE 1 main |101, 102 | A1 if step1 software, B if step2 software - BASE 1 main |141, 142 | A2 (only used for foreign language option) - BASE 1 daughter |181, 182 | A3 (if used) - BASE 1 daughter |1C1, 1C2 | not used - BASE 1 daughter |201, 202 | not used - BASE 1 daughter |241, 242 | A6 (if used) - BASE 1 daughter |281, 282 | B when subcpu used - BASE 1 daughter |2C1, 2C2 | B when subcpu used - --------------------------+------------------------------------------- - Note: 2 MEG DRAM is required on BASE2 PCB when A3 or A6 is used - + Fanuc System 15 + + 2014-01-04 Skeleton driver. + + This is a circa-1990 CNC machine with a very custom GUI, made of a + bunch of boards plugged into a passive backplane. + + Possible boards include: + A16B-2200-0020/04B : Base 2 Board (contains 12 MHz 68020 "CNC CPU" and 1 or 2 MB of DRAM) + A16B-2200-0090/07A : Digital Servo 4-Axis Controller Board (no ROMs on this board) + A16B-2200-0121/06C : Base 0 Board (1 ROM location but position is empty. -0120 has 6081 001A) + + A16B-2200-0131/11B : Base 1 Board (15 ROMs on this board, 4040, 9030, AB02) + See detailed layout and description below. + + A16B-2200-0150/03A : Conversational Board (4 ROMs on this board, 5A00, probably for Mill) + or + A16B-2200-0150/03A : Conversational Board (4 ROMs on this board, 5C30. 5C for 2 axis Lathe) + or + A16B-2200-0150/03A : Conversational Board (4 ROMs on this board, 5D30. 5D for 4 axis (twin Turret) lathe) + Fanuc FBI-A MB605111 (QFP100) + MB1422A (DIP42 - DRAM Controller) + 51256-10 (x18) + MB89259A (SOP28) + Intel 80286-8 + Intel 80287-8 + MBL82288-8 (DIP10) + uPB8284 (DIP18) + 24MHz & 32MHz OSC's + 4 EPROMs + + A16B-2200-0160/07B : Graphic Board (3 ROMs on this board, 6082 001A, 600B 001D, 600B 002D. 600B is for Mill) + or + A16B-2200-0160/07B : Graphic Board (3 ROMs on this board, 6082 001A, 600A 001C, 600A 001D. 600A is for Lathe) + Fanuc FBI-A MB605111 (QFP100) + HD68HC000P10 (68000 @10MHz, PLCC68) + HM62256-10 (x2) + HM53461-12 (x3) + HD63484 (PLCC68) + HD6445 (PLCC44) + Fanuc GBC MB652147 (PGA135) + MB81464-12 (x12) + 20MHz OSC + 3 EPROMs. 6082 is common to both mills and lathes. + 600A is a known EPROM version required for lathes with FAPT conversational graphics. + 600B is unknown. Possibly for mills with FAPT. + + A20B-1003-0230/09C : Motherboard (dumb backplane, contains only slots) + A20B-1003-0500/01A : Additional Graphic Board for 15TTF only (for TT, connects to A16B-2200-0160 Board. No info on this PCB) + A20B-1003-0240/07B : Connector Assembly Unit / IO Board + A20B-1003-0580/01A : PMC Cassette C (16000 Step + Pascal 128KB, small PCB in a yellow plastic box, contains just 2 EPROMs) + + + Fanuc System 15A Base 1 Board A16B-2200-013 + + PCB Layout + ---------- + + A16B-2200-0131/03B (note 1 and 03B have been added/printed later) + |--------------| |---| + |------| CA34 |-----|CA4|-------------------------------------| + | |--------------|75463|---| LL LL MB81C79A| + | (x6) LL LL |--------| | + | HM53461(x5)|MB605117| | + | FA8191 | | | + |4040002E.M27 4040001E.M23 FA8191 | | | + | |--------| | + | | + | MC-122-41256A9A-12 |--------| | + |AB02142A.K27 AB02141A.K23 MC-122-41256A9A-12 |MB661128| | + | 9030001E.J18 | | | + | | | | + | |--------| | + |AB02102A.H27 AB02101A.H23 | + | | + | | + | | + |AB020C2A.F27 AB020C1A.F23 24MHz | + | | + | | + | |--------| | + |AB02082A.E27 AB02081A.E23 |------| |MB605111| | + | |68000 | | | | + | | | | | | + | |---------| | | |--------| | + | |---------| |------| | + | CNM1 |-----------------------| | + |------------------------------------------| CNA |--| + |-----------------------| + Notes: + MC-122-41256- NEC MC-122-41256A9A-12 256k RAM SIP module (with parity) containing NEC D41256L-12 32k x8 SRAM + 2 SIP modules populated, 9 chips per module, 18 total RAMs, total 512k + 68000 - Hitachi HD68HC000-12 68000 CPU. Clock 24/2 (PLCC68) + MB661128 - Fujitsu Fanuc SLC01 MB661128 (Serial Data Link Controller, PLCC68) + MB605117 - Fujitsu Fanuc BOC MB605117U (DRAM/SRAM Interface Controller, QFP100) + MB605111 - Fujitsu Fanuc FBI-A MB605111 (Global/Local Interface Controller, QFP100) + HM53461 - Hitachi HM53461-12 64k x4-bit multiport CMOS video RAM (x5, SOJ24) + MB81C79A - Fujitsu MB81C79A-35 8k x 9-bit (72k) CMOS Static RAM (SOP28) + FA8191 - Fanuc FA8191 RV07 custom ceramic module (contains resistors and transistors, SIL16) + 75463 - Texas Instruments SN75463 Dual High-Voltage, High-Current Peripheral Driver (DIP8) + L - LED + CA34 - Connector for PMC Cassette C A02B-0094-C103 (holds 2 EPROMs containing the PMC Ladder) + The Ladder is specific and unique to each CNC machine, depending on capability and options. + CA4 - Connector for cable joined to Servo Control Board A16B-2200-0090 or 16B-2200-0091 + CNA - Connector plugs into motherboard slot CNA2 (BASE 1) + CNM1 - 40 pin flat cable joined to optional board A16B-1600-0280/02A + + Note about EPROMs: + Software Series is denoted by the first 4 digits + ROM # (possibly relating to the memory location in hex) is the next 3 digits + Software Revision is the last letter + Both IC locations and ROM # are printed on this board + + ROM IC Memory EPROM Used + Label Location Location Type For... + ----------------------------------------------------------------------------------------- + 9030001E J18 381 27256 Digital Servo Control Program Version 9030 Revision E + + 4040001E M23 001 27C1001 PMC Control Program Version 4040 Revision E + 4040002E M27 002 27C1001 + + AB02081A E23 081 27C1001 Boot Software Version AB02 Revision A + AB02082A E27 082 27C1001 + AB020C1A F23 0C1 27C1001 + AB020C2A F27 0C2 27C1001 + AB02101A H23 101 27C1001 + AB02102A H27 102 27C1001 + AB02141A K23 141 27C1001 + AB02142A K27 142 27C1001 + + + Another identical board from a different machine contains the following EPROMs.... + 9030001F (known revisions exist up to at least rev M) + 4040001D, 4040002D (known revisions exist up to at least rev I) + A202081G, A202082G + A2020C1G, A2020C2G + A202101G, A202102G + + The complete boot software series is listed below: + + 15TA SOFTWARE SERIES (Single Turret 2 Axis Lathe) + |------+----+---------+---+---+---+---| + |S/W |STEP| CRT |I/O|SER|SER|DNC| + |SERIES| | | | | | | + | |1 2| 9M 14 9C|LNK|SPN|FB |1 2| + +------+----+---------+---+---+---+---+ + |A201 |X | X | | | | | + |A202 |X | X | | | | | + |A211 | X| X | X | X | |X | + |A212 | X| X | X | X | |X | + |A219 | X| X | X | X | X | | + |A220 | X| X | X | X | X | | + |A215 | X| X | X | X | | X| + |A216 | X| X | X | X | | X| + |A217 | X| X | X | X | X | X| + |A218 | X| X | X | X | X | X| + |A221 | X| X | X | X | ? | ?| + |------+----+---------+---+---+---+---| + Notes: + 9M - 9" Monochrome + 9C - 9" Color + 14 - 14" Color + SER SPN - Serial Spindle + SER FB - Serial FB ? + DNC 1/2 - DNC (Direct NC) type 1 or type 2 for Direct PC to CNC program transfer operation + + + 15TTA SOFTWARE SERIES (Twin Turret 4 Axis Lathe) + |------+----+---------+---+---+---+---| + |S/W |STEP| CRT |I/O|SER|SER|DNC| + |SERIES| | | | | | | + | |1 2| 9M 14 9C|LNK|SPN|FB |1 2| + +------+----+---------+---+---+---+---+ + |A401 |X | X | | | | | + |A402 |X | X | | | | | + |A411 | X| X | X | X | |X | + |A412 | X| X | X | X | |X | + |A419 | X| X | X | X | X | | + |A420 | X| X | X | X | X | | + |------+----+---------+---+---+---+---| + + + 15TTF SOFTWARE SERIES (Twin Turret 4 Axis Lathe with FAPT) + |------+----+---------+---+---+---+---| + |S/W |STEP| CRT |I/O|SER|SER|DNC| + |SERIES| | | | | | | + | |1 2| 9M 14 9C|LNK|SPN|FB |1 2| + +------+----+---------+---+---+---+---+ + |A502 |X | X | | | | | + |A512 | X| X | X | X | |X | + |A520 | X| X | X | X | X | | + |------+----+---------+---+---+---+---| + + + 15MA SOFTWARE SERIES (Mill With 3 Axes minimum XYZ) + |------+----+---------+---+---+---+---|---| + |S/W |STEP| CRT |I/O|SER|SER|DNC|SUB| + |SERIES| | | | | | | | + | |1 2| 9M 14 9C|LNK|SPN|FB |1 2|CPU| + +------+----+---------+---+---+---+---+---| + |A001 |X | X | | | | | | + |A002 |X | X | | | | | | + |A00A |X | X | | | | | | + |A00B |X | X | | | | | | + |AA01 |X | X | | | | | X | + |AA02 |X | X | | | | | X | + |A011 | X| X | X | X | |X | | + |A012 | X| X | X | X | |X | | + |AA11 | X| X | X | X | |X | X | + |AA12 | X| X | X | X | |X | X | + |A017 | X| X | X | X | X | X| | + |A018 | X| X | X | X | X | X| | + |A019 | X| X | X | X | X | | | + |A01A | X| X | X | X | |X | | + |A01B | X| X | X | X | |X | | + |A020 | X| X | X | X | X | | | + |A021 | X| X| X | X | X | ?| | + |A027 (NEW STANDARD) | | | | | | + |A028 (NEW STANDARD) | | | | | | + |A041 (FOR OSI ONLY) | | | | | | + |A042 (FOR OSI ONLY) | | | | | | + |AA19 | X| X | X | X | X | | X | + |AA20 | X| X | X | X | X | | X | + |AA13 | X| X | X | X | X | X| X | + |AA14 | X| X | X | X | X | X| X | + |AA23 | X| X | X | X | X | | X | + |AA24 | X| X | X | X | X | | X | + |AA26 | X| X | X | X | X | ?| X | + |AA27 (NEW STD) | | | | | | + |AA28 (NEW STD) | | | | | | + |AA41 (FOR OSI ONLY) | | | | | | + |AA42 (FOR OSI ONLY) | | | | | | + |---------------------+---+---+---+---+---| + + + Optional PCB A16B-1600-0280/02A + ------------------------------- + + |---------------------------| + | 181 182 | + | | + | | + | | + | 1C1 1C2 | + | | + | | + | | + | 201 202 | + | | + | | + | | + | 241 242 | + | | + | | + | | + | 281 282 | + | | + | | + | | + | 2C1 2C2 | + | | + | | + | |---------| | + | |---------| | + | CNM1 | + |---------------------------| + Notes: + The A16B-1600-0280/02A board contains only 12 DIP32 sockets and some logic and + bolts to the back of the BASE 1 board. The board extends the boot software memory + storage space if additional EPROMS are required. Not all sockets are populated. + Connector CNM1 joins with a 40 pin flat cable to the BASE 1 board connector CNM1 + IC locations are not printed on this board. Only the ROM # is printed at each + socket location. + + ROM IC Memory EPROM Used For + Label Location Location Type + --------------------------------------------------------------------------------- + AB02281A N/A 281 27C1001 Boot Software Version AB02 Revision A + AB02282A N/A 282 27C1001 + AB022C1A N/A 2C1 27C1001 + AB022C2A N/A 2C2 27C1001 + + + 15A EPROM population and option type + ----------------+---------+------------------------------------------- + PCB NAME |ROM # | Option Type (Basic, Option A1/A2/A3 etc) + ----------------|---------+------------------------------------------- + BASE 1 main |081, 082 | B + BASE 1 main |0C1, 0C2 | B + BASE 1 main |101, 102 | A1 if step1 software, B if step2 software + BASE 1 main |141, 142 | A2 (only used for foreign language option) + BASE 1 daughter |181, 182 | A3 (if used) + BASE 1 daughter |1C1, 1C2 | not used + BASE 1 daughter |201, 202 | not used + BASE 1 daughter |241, 242 | A6 (if used) + BASE 1 daughter |281, 282 | B when subcpu used + BASE 1 daughter |2C1, 2C2 | B when subcpu used + --------------------------+------------------------------------------- + Note: 2 MEG DRAM is required on BASE2 PCB when A3 or A6 is used + ****************************************************************************/ #include "emu.h" @@ -313,10 +313,10 @@ class fanucs15_state : public driver_device public: fanucs15_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) - , m_maincpu(*this, "maincpu") // main 68020 - , m_pmccpu(*this, "pmccpu") // sub 68000-12 - , m_gfxcpu(*this, "gfxcpu") // gfx 68000-10 - , m_convcpu(*this, "convcpu") // conversational 80286-8 + , m_maincpu(*this, "maincpu") // main 68020 + , m_pmccpu(*this, "pmccpu") // sub 68000-12 + , m_gfxcpu(*this, "gfxcpu") // gfx 68000-10 + , m_convcpu(*this, "convcpu") // conversational 80286-8 { } required_device m_maincpu; @@ -330,8 +330,8 @@ private: static ADDRESS_MAP_START(maincpu_mem, AS_PROGRAM, 32, fanucs15_state) AM_RANGE(0x00000000, 0x0017ffff) AM_ROM AM_REGION("base1b", 0) - AM_RANGE(0x000f8000, 0x000fffff) AM_RAM // filled with 0x96 on boot - AM_RANGE(0xffff0000, 0xffffffff) AM_RAM // initial stack + AM_RANGE(0x000f8000, 0x000fffff) AM_RAM // filled with 0x96 on boot + AM_RANGE(0xffff0000, 0xffffffff) AM_RAM // initial stack ADDRESS_MAP_END static ADDRESS_MAP_START(pmccpu_mem, AS_PROGRAM, 16, fanucs15_state) @@ -369,57 +369,55 @@ static MACHINE_CONFIG_START( fanucs15, fanucs15_state ) MCFG_CPU_PROGRAM_MAP(pmccpu_mem) MCFG_DEVICE_DISABLE() - MCFG_CPU_ADD("gfxcpu", M68000, XTAL_10MHz) // wants bit 15 of 70500 to be set + MCFG_CPU_ADD("gfxcpu", M68000, XTAL_10MHz) // wants bit 15 of 70500 to be set MCFG_CPU_PROGRAM_MAP(gfxcpu_mem) MCFG_DEVICE_DISABLE() - MCFG_CPU_ADD("convcpu", I80286, XTAL_8MHz) // wants 70500 to return 0x8000 (same as what gfxcpu looks for, basically) + MCFG_CPU_ADD("convcpu", I80286, XTAL_8MHz) // wants 70500 to return 0x8000 (same as what gfxcpu looks for, basically) MCFG_CPU_PROGRAM_MAP(convcpu_mem) MACHINE_CONFIG_END /* ROM definition */ -ROM_START( fanucs15 ) - ROM_REGION16_BE( 0x50000, "base1a", 0 ) // 68000 sub CPU code and data on base 1 board (verified) - ROM_LOAD16_BYTE( "4040_001e_001.23m", 0x000001, 0x020000, CRC(2e12109f) SHA1(83ed846d3d59ab0d81b2e2e2231d1a444e462590) ) - ROM_LOAD16_BYTE( "4040_002e_002.27m", 0x000000, 0x020000, CRC(a5469692) SHA1(31c44edb36fb69d3d418a97e32e4a2769d1ec9e7) ) +ROM_START( fanucs15 ) + ROM_REGION16_BE( 0x50000, "base1a", 0 ) // 68000 sub CPU code and data on base 1 board (verified) + ROM_LOAD16_BYTE( "4040_001e_001.23m", 0x000001, 0x020000, CRC(2e12109f) SHA1(83ed846d3d59ab0d81b2e2e2231d1a444e462590) ) + ROM_LOAD16_BYTE( "4040_002e_002.27m", 0x000000, 0x020000, CRC(a5469692) SHA1(31c44edb36fb69d3d418a97e32e4a2769d1ec9e7) ) ROM_LOAD16_BYTE( "9030_001e_381.18j", 0x040001, 0x008000, CRC(9f10a022) SHA1(dc4a242f7611143cc2d9564993fd5fa52f0ac13a) ) - ROM_REGION32_BE( 0x180000, "base1b", 0 ) // 68020 main CPU code and data on base 1 board (verified) - ROM_LOAD16_BYTE( "ab02_081a_081.23e", 0x000001, 0x020000, CRC(5328b023) SHA1(661f2908f3287f7cd2b215cd29962f2789f7d99a) ) - ROM_LOAD16_BYTE( "ab02_082a_082.27e", 0x000000, 0x020000, CRC(ad37740f) SHA1(e65cc0a8b4e515fcf5fcefde99e95d100d310018) ) - ROM_LOAD16_BYTE( "ab02_0c1a_0c1.23f", 0x040001, 0x020000, CRC(62566569) SHA1(dd85b6e7875d996759b833552b00e1b3a0e3696b) ) - ROM_LOAD16_BYTE( "ab02_0c2a_0c2.27f", 0x040000, 0x020000, CRC(a4ade1fe) SHA1(44ef5358b34d3538fb061f235b8a14bac6b5faa8) ) - ROM_LOAD16_BYTE( "ab02_101a_101.23h", 0x080001, 0x020000, CRC(96f5d00e) SHA1(f5de3621df536435d27a0aac1c9d25e69601bd40) ) - ROM_LOAD16_BYTE( "ab02_102a_102.27h", 0x080000, 0x020000, CRC(e23a5414) SHA1(f6aff51dfd6d976b7cd33399c7aa3d06c7c06919) ) - ROM_LOAD16_BYTE( "ab02_141a_141.23k", 0x0c0001, 0x020000, CRC(3ceb6809) SHA1(7e37b18847b35f81c08b7b2ab62e99fa3a737c32) ) + ROM_REGION32_BE( 0x180000, "base1b", 0 ) // 68020 main CPU code and data on base 1 board (verified) + ROM_LOAD16_BYTE( "ab02_081a_081.23e", 0x000001, 0x020000, CRC(5328b023) SHA1(661f2908f3287f7cd2b215cd29962f2789f7d99a) ) + ROM_LOAD16_BYTE( "ab02_082a_082.27e", 0x000000, 0x020000, CRC(ad37740f) SHA1(e65cc0a8b4e515fcf5fcefde99e95d100d310018) ) + ROM_LOAD16_BYTE( "ab02_0c1a_0c1.23f", 0x040001, 0x020000, CRC(62566569) SHA1(dd85b6e7875d996759b833552b00e1b3a0e3696b) ) + ROM_LOAD16_BYTE( "ab02_0c2a_0c2.27f", 0x040000, 0x020000, CRC(a4ade1fe) SHA1(44ef5358b34d3538fb061f235b8a14bac6b5faa8) ) + ROM_LOAD16_BYTE( "ab02_101a_101.23h", 0x080001, 0x020000, CRC(96f5d00e) SHA1(f5de3621df536435d27a0aac1c9d25e69601bd40) ) + ROM_LOAD16_BYTE( "ab02_102a_102.27h", 0x080000, 0x020000, CRC(e23a5414) SHA1(f6aff51dfd6d976b7cd33399c7aa3d06c7c06919) ) + ROM_LOAD16_BYTE( "ab02_141a_141.23k", 0x0c0001, 0x020000, CRC(3ceb6809) SHA1(7e37b18847b35f81c08b7b2ab62e99fa3a737c32) ) ROM_LOAD16_BYTE( "ab02_142a_142.27k", 0x0c0000, 0x020000, CRC(1d8a4d7d) SHA1(580322e2927742bbcbf0bb2757730e2817b320e1) ) // this appears to be a different version of the 081a/0c1a ROM program. it's definitely for a 68020 (32-bit pointers everywhere) ROM_LOAD16_BYTE( "ab02_281a_281.8a", 0x100001, 0x020000, CRC(cec79742) SHA1(1233ff920d607206a80c8d187745e3d657a8635d) ) - ROM_LOAD16_BYTE( "ab02_282a_282.8d", 0x100000, 0x020000, CRC(63eacc0e) SHA1(1f25b99280112c720d778219b4610f556f33a7f1) ) - ROM_LOAD16_BYTE( "ab02_2c1a_2c1.10a", 0x140001, 0x020000, CRC(66eb74dd) SHA1(f256763cb15b4524c09bd09b88df46a1498846ef) ) - ROM_LOAD16_BYTE( "ab02_2c2a_2c2.10d", 0x140000, 0x020000, CRC(6edf4ff3) SHA1(9cbf7c6555cc27def3b580f5a7b0ff580984206d) ) - - ROM_REGION16_LE( 0x80000, "conversational", 0 ) // 80286 ROMs, 5a00 for Mill - ROM_LOAD16_BYTE( "5a00_041b.041", 0x000000, 0x020000, CRC(bf22c0a3) SHA1(56ab70bfd5794cb4db1d87c8becf7af522687564) ) - ROM_LOAD16_BYTE( "5a00_042b.042", 0x000001, 0x020000, CRC(7abc9d6b) SHA1(5cb6ad08ce93aa99391d1ce46ac8db8ba2e0f94a) ) - ROM_LOAD16_BYTE( "5a00_001b.001", 0x040000, 0x020000, CRC(cd2a2839) SHA1(bc20fd9ae9d071e1df835244aea85648d1bd1dbc) ) - ROM_LOAD16_BYTE( "5a00_002b.002", 0x040001, 0x020000, CRC(d9ebbb4a) SHA1(9c3d96e9b88848472210beacdf9d300ddd42d16e) ) - - ROM_REGION16_BE( 0x50000, "gfxboard", 0 ) // graphics board 68000 code/data. 600a for lathe, 600b for mill, 6082 common to both - ROM_LOAD16_BYTE( "600b_001d_low.3l", 0x000001, 0x010000, CRC(50566c5c) SHA1(966c8d90d09a9c50c5dedebe9c67f1755846b234) ) - ROM_LOAD16_BYTE( "600b_002d_high.3j", 0x000000, 0x010000, CRC(304e1ecb) SHA1(1e4b149b306550750fc03bd80bd399f239f68657) ) - ROM_LOAD16_BYTE( "600a_001c.bin", 0x020001, 0x010000, CRC(63d9fc2f) SHA1(280e825ba7b79e7c38282a4f4b762d2219fd873b) ) - ROM_LOAD16_BYTE( "600a_002c.bin", 0x020000, 0x010000, CRC(4d78e702) SHA1(a89bd07dc1ae030bdee5a541777825eaadbc2307) ) + ROM_LOAD16_BYTE( "ab02_282a_282.8d", 0x100000, 0x020000, CRC(63eacc0e) SHA1(1f25b99280112c720d778219b4610f556f33a7f1) ) + ROM_LOAD16_BYTE( "ab02_2c1a_2c1.10a", 0x140001, 0x020000, CRC(66eb74dd) SHA1(f256763cb15b4524c09bd09b88df46a1498846ef) ) + ROM_LOAD16_BYTE( "ab02_2c2a_2c2.10d", 0x140000, 0x020000, CRC(6edf4ff3) SHA1(9cbf7c6555cc27def3b580f5a7b0ff580984206d) ) + + ROM_REGION16_LE( 0x80000, "conversational", 0 ) // 80286 ROMs, 5a00 for Mill + ROM_LOAD16_BYTE( "5a00_041b.041", 0x000000, 0x020000, CRC(bf22c0a3) SHA1(56ab70bfd5794cb4db1d87c8becf7af522687564) ) + ROM_LOAD16_BYTE( "5a00_042b.042", 0x000001, 0x020000, CRC(7abc9d6b) SHA1(5cb6ad08ce93aa99391d1ce46ac8db8ba2e0f94a) ) + ROM_LOAD16_BYTE( "5a00_001b.001", 0x040000, 0x020000, CRC(cd2a2839) SHA1(bc20fd9ae9d071e1df835244aea85648d1bd1dbc) ) + ROM_LOAD16_BYTE( "5a00_002b.002", 0x040001, 0x020000, CRC(d9ebbb4a) SHA1(9c3d96e9b88848472210beacdf9d300ddd42d16e) ) + + ROM_REGION16_BE( 0x50000, "gfxboard", 0 ) // graphics board 68000 code/data. 600a for lathe, 600b for mill, 6082 common to both + ROM_LOAD16_BYTE( "600b_001d_low.3l", 0x000001, 0x010000, CRC(50566c5c) SHA1(966c8d90d09a9c50c5dedebe9c67f1755846b234) ) + ROM_LOAD16_BYTE( "600b_002d_high.3j", 0x000000, 0x010000, CRC(304e1ecb) SHA1(1e4b149b306550750fc03bd80bd399f239f68657) ) + ROM_LOAD16_BYTE( "600a_001c.bin", 0x020001, 0x010000, CRC(63d9fc2f) SHA1(280e825ba7b79e7c38282a4f4b762d2219fd873b) ) + ROM_LOAD16_BYTE( "600a_002c.bin", 0x020000, 0x010000, CRC(4d78e702) SHA1(a89bd07dc1ae030bdee5a541777825eaadbc2307) ) // font or tilemap data? - ROM_LOAD( "6082_001a_cg.12b", 0x040000, 0x010000, CRC(f3d10cf9) SHA1(bc5bc88dcb5f347e1442aa4a0897747958a53413) ) + ROM_LOAD( "6082_001a_cg.12b", 0x040000, 0x010000, CRC(f3d10cf9) SHA1(bc5bc88dcb5f347e1442aa4a0897747958a53413) ) - ROM_REGION16_BE( 0x40000, "cassette", 0 ) // "PMC Cassette C", ROM cartridge that plugs into the Base 1 board - ROM_LOAD16_BYTE( "pmc_high.a2", 0x000000, 0x020000, CRC(7b8f9a96) SHA1(08d828b612c45bb3f2f7a56df418cd8e34731bf4) ) - ROM_LOAD16_BYTE( "pmc_low.a1", 0x000001, 0x020000, CRC(3ab261f8) SHA1(20b7eef96deb91a3a867f9ac4165b0c188fbcff3) ) + ROM_REGION16_BE( 0x40000, "cassette", 0 ) // "PMC Cassette C", ROM cartridge that plugs into the Base 1 board + ROM_LOAD16_BYTE( "pmc_high.a2", 0x000000, 0x020000, CRC(7b8f9a96) SHA1(08d828b612c45bb3f2f7a56df418cd8e34731bf4) ) + ROM_LOAD16_BYTE( "pmc_low.a1", 0x000001, 0x020000, CRC(3ab261f8) SHA1(20b7eef96deb91a3a867f9ac4165b0c188fbcff3) ) ROM_END /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1990, fanucs15, 0, 0, fanucs15, fanucs15, driver_device, 0, "Fanuc", "System 15", GAME_NOT_WORKING | GAME_NO_SOUND) - - diff --git a/src/mess/drivers/fanucspmg.c b/src/mess/drivers/fanucspmg.c index 0ceaacc3981..8192f1f5455 100644 --- a/src/mess/drivers/fanucspmg.c +++ b/src/mess/drivers/fanucspmg.c @@ -400,14 +400,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 |--------| @@ -421,8 +421,8 @@ The arrows denote direction of data flow. |---|----| |----|----| |Keyboard| | Screen | |--------| |---------| - - + + TODO: - Is the VRAM hookup anything like correct? - Hookup enough keyboard to get it to boot a floppy, the FAPT DOCTOR @@ -430,25 +430,25 @@ The arrows denote direction of data flow. - Shared RAM is 8k, but there are 2 6264s on the sub board. Is shared RAM banked? - I/O is at F00xx: - ':maincpu' (FC15A): unmapped program memory write to F0012 = 00CE & 00FF - ':maincpu' (FC15D): unmapped program memory write to F0016 = 00CE & 00FF - ':maincpu' (FC160): unmapped program memory write to F001A = 00CE & 00FF - ':maincpu' (FC163): unmapped program memory write to F001E = 00CE & 00FF - ':maincpu' (FC16D): unmapped program memory write to F000E = 0034 & 00FF - ':maincpu' (FC172): unmapped program memory write to F0008 = 00D4 & 00FF - ':maincpu' (FC177): unmapped program memory write to F0008 = 0030 & 00FF - ':maincpu' (FC17C): unmapped program memory write to F000E = 0056 & 00FF - ':maincpu' (FC181): unmapped program memory write to F000A = 0010 & 00FF - ':maincpu' (FC186): unmapped program memory write to F000E = 0096 & 00FF - ':maincpu' (FC18B): unmapped program memory write to F000C = 0010 & 00FF - ':maincpu' (FC190): unmapped program memory write to F004E = 0034 & 00FF - ':maincpu' (FC195): unmapped program memory write to F0048 = 0020 & 00FF - ':maincpu' (FC19A): unmapped program memory write to F0048 = 004E & 00FF - ':maincpu' (FC19F): unmapped program memory write to F004E = 0056 & 00FF - ':maincpu' (FC1A4): unmapped program memory write to F004A = 0010 & 00FF - ':maincpu' (FC1A9): unmapped program memory write to F004E = 0096 & 00FF - ':maincpu' (FC1AE): unmapped program memory write to F004C = 0010 & 00FF - + ':maincpu' (FC15A): unmapped program memory write to F0012 = 00CE & 00FF + ':maincpu' (FC15D): unmapped program memory write to F0016 = 00CE & 00FF + ':maincpu' (FC160): unmapped program memory write to F001A = 00CE & 00FF + ':maincpu' (FC163): unmapped program memory write to F001E = 00CE & 00FF + ':maincpu' (FC16D): unmapped program memory write to F000E = 0034 & 00FF + ':maincpu' (FC172): unmapped program memory write to F0008 = 00D4 & 00FF + ':maincpu' (FC177): unmapped program memory write to F0008 = 0030 & 00FF + ':maincpu' (FC17C): unmapped program memory write to F000E = 0056 & 00FF + ':maincpu' (FC181): unmapped program memory write to F000A = 0010 & 00FF + ':maincpu' (FC186): unmapped program memory write to F000E = 0096 & 00FF + ':maincpu' (FC18B): unmapped program memory write to F000C = 0010 & 00FF + ':maincpu' (FC190): unmapped program memory write to F004E = 0034 & 00FF + ':maincpu' (FC195): unmapped program memory write to F0048 = 0020 & 00FF + ':maincpu' (FC19A): unmapped program memory write to F0048 = 004E & 00FF + ':maincpu' (FC19F): unmapped program memory write to F004E = 0056 & 00FF + ':maincpu' (FC1A4): unmapped program memory write to F004A = 0010 & 00FF + ':maincpu' (FC1A9): unmapped program memory write to F004E = 0096 & 00FF + ':maincpu' (FC1AE): unmapped program memory write to F004C = 0010 & 00FF + ****************************************************************************/ #include "emu.h" @@ -464,22 +464,22 @@ The arrows denote direction of data flow. #include "video/mc6845.h" #include "formats/imd_dsk.h" -#define MAINCPU_TAG "maincpu" -#define SUBCPU_TAG "subcpu" -#define USART0_TAG "usart0" -#define USART1_TAG "usart1" -#define USART2_TAG "usart2" -#define USART3_TAG "usart3" -#define PIT0_TAG "pit0" -#define PIT1_TAG "pit1" -#define PIC0_TAG "pic0" -#define PIC1_TAG "pic1" -#define DMAC_TAG "dmac" -#define CRTC_TAG "crtc" -#define FDC_TAG "fdc" -#define SCREEN_TAG "screen" -#define SHARED_TAG "shared" -#define CHARGEN_TAG "chargen" +#define MAINCPU_TAG "maincpu" +#define SUBCPU_TAG "subcpu" +#define USART0_TAG "usart0" +#define USART1_TAG "usart1" +#define USART2_TAG "usart2" +#define USART3_TAG "usart3" +#define PIT0_TAG "pit0" +#define PIT1_TAG "pit1" +#define PIC0_TAG "pic0" +#define PIC1_TAG "pic1" +#define DMAC_TAG "dmac" +#define CRTC_TAG "crtc" +#define FDC_TAG "fdc" +#define SCREEN_TAG "screen" +#define SHARED_TAG "shared" +#define CHARGEN_TAG "chargen" class fanucspmg_state : public driver_device { @@ -577,7 +577,7 @@ WRITE8_MEMBER(fanucspmg_state::shared_w) READ8_MEMBER(fanucspmg_state::test_r) { - return 0x00; // 0x80 to start weird not-sure-what process which may be FDC related + return 0x00; // 0x80 to start weird not-sure-what process which may be FDC related } READ8_MEMBER(fanucspmg_state::vbl_r) @@ -586,14 +586,14 @@ READ8_MEMBER(fanucspmg_state::vbl_r) } static ADDRESS_MAP_START(maincpu_mem, AS_PROGRAM, 16, fanucspmg_state) - AM_RANGE(0x00000, 0x7ffff) AM_RAM // main RAM + AM_RANGE(0x00000, 0x7ffff) AM_RAM // main RAM AM_RANGE(0x88000, 0x88001) AM_READ8(vbl_r, 0xffff) AM_RANGE(0xf0004, 0xf0005) AM_READ8(test_r, 0xffff) AM_RANGE(0xf8000, 0xf9fff) AM_READWRITE8(shared_r, shared_w, 0xffff) - AM_RANGE(0xfc000, 0xfffff) AM_ROM AM_REGION(MAINCPU_TAG, 0) + AM_RANGE(0xfc000, 0xfffff) AM_ROM AM_REGION(MAINCPU_TAG, 0) ADDRESS_MAP_END static ADDRESS_MAP_START(maincpu_io, AS_IO, 16, fanucspmg_state) @@ -603,7 +603,7 @@ WRITE_LINE_MEMBER(fanucspmg_state::vsync_w) { if ((m_vbl_ctrl & 0x08) == 0x08) { - if (state == ASSERT_LINE) + if (state == ASSERT_LINE) { m_subcpu->set_input_line(I8085_RST75_LINE, ASSERT_LINE); } @@ -672,19 +672,19 @@ static ADDRESS_MAP_START(subcpu_mem, AS_PROGRAM, 8, fanucspmg_state) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_REGION(SUBCPU_TAG, 0) AM_RANGE(0x4000, 0x45ff) AM_READWRITE(vram1_r, vram1_w) - AM_RANGE(0x4800, 0x4dff) AM_READWRITE(vram2_r, vram2_w) + AM_RANGE(0x4800, 0x4dff) AM_READWRITE(vram2_r, vram2_w) AM_RANGE(0x5000, 0x5000) AM_DEVREADWRITE(CRTC_TAG, mc6845_device, status_r, address_w) AM_RANGE(0x5001, 0x5001) AM_DEVREADWRITE(CRTC_TAG, mc6845_device, register_r, register_w) AM_RANGE(0x5008, 0x5008) AM_WRITE(keyboard_row_w) AM_RANGE(0x5009, 0x5009) AM_READ(keyboard_r) - AM_RANGE(0x500a, 0x500b) AM_WRITENOP // probably keyboard related, not sure how though + AM_RANGE(0x500a, 0x500b) AM_WRITENOP // probably keyboard related, not sure how though AM_RANGE(0x500c, 0x500c) AM_WRITE(vbl_ctrl_w) AM_RANGE(0x500d, 0x500d) AM_WRITE(vram_bank_w) AM_RANGE(0x500e, 0x500e) AM_READ(vblank_ack_r) - AM_RANGE(0x5018, 0x5018) AM_WRITE(video_ctrl_w) + AM_RANGE(0x5018, 0x5018) AM_WRITE(video_ctrl_w) - AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE(SHARED_TAG) // shared RAM + AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE(SHARED_TAG) // shared RAM ADDRESS_MAP_END /* Input ports */ @@ -752,8 +752,8 @@ static MC6845_UPDATE_ROW( fanuc_update_row ) *p++ = ( data & 0x01 ) ? fg : bg; *p++ = ( data & 0x02 ) ? fg : bg; *p++ = ( data & 0x04 ) ? fg : bg; - *p++ = ( data & 0x08 ) ? fg : bg; - *p++ = ( data & 0x10 ) ? fg : bg; + *p++ = ( data & 0x08 ) ? fg : bg; + *p++ = ( data & 0x10 ) ? fg : bg; *p++ = ( data & 0x20 ) ? fg : bg; *p++ = ( data & 0x40 ) ? fg : bg; *p++ = ( data & 0x80 ) ? fg : bg; @@ -784,7 +784,7 @@ static MC6845_INTERFACE( mc6845_fanuc_intf ) DEVCB_NULL, /* on_de_changed */ DEVCB_NULL, /* on_cur_changed */ DEVCB_NULL, /* on hsync changed */ - DEVCB_DRIVER_LINE_MEMBER(fanucspmg_state, vsync_w), /* on vsync changed */ + DEVCB_DRIVER_LINE_MEMBER(fanucspmg_state, vsync_w), /* on vsync changed */ NULL }; @@ -838,18 +838,16 @@ MACHINE_CONFIG_END /* ROM definition */ ROM_START( fanucspg ) ROM_REGION(0x4000, MAINCPU_TAG, 0) - ROM_LOAD16_BYTE( "a40_001a.13a", 0x000000, 0x002000, CRC(1b8ac8ef) SHA1(309c081d25270e082ebf846b4f73cef76b52d991) ) - ROM_LOAD16_BYTE( "a40_002a.15a", 0x000001, 0x002000, CRC(587ae652) SHA1(ebc5a4c3d64ab9d6dd4d5355f85bc894e7294e17) ) + ROM_LOAD16_BYTE( "a40_001a.13a", 0x000000, 0x002000, CRC(1b8ac8ef) SHA1(309c081d25270e082ebf846b4f73cef76b52d991) ) + ROM_LOAD16_BYTE( "a40_002a.15a", 0x000001, 0x002000, CRC(587ae652) SHA1(ebc5a4c3d64ab9d6dd4d5355f85bc894e7294e17) ) ROM_REGION(0x4000, SUBCPU_TAG, 0) - ROM_LOAD( "a41_010b.28b", 0x000000, 0x004000, CRC(35a9714f) SHA1(5697b6c4db5adb5702dc1290ecc98758d5fab221) ) + ROM_LOAD( "a41_010b.28b", 0x000000, 0x004000, CRC(35a9714f) SHA1(5697b6c4db5adb5702dc1290ecc98758d5fab221) ) ROM_REGION(0x8000, CHARGEN_TAG, 0) - ROM_LOAD( "a42_020a.30b", 0x000000, 0x008000, CRC(33eb5962) SHA1(1157a72089ff77e8db9a9a8fcd0f6c32a1374f56) ) + ROM_LOAD( "a42_020a.30b", 0x000000, 0x008000, CRC(33eb5962) SHA1(1157a72089ff77e8db9a9a8fcd0f6c32a1374f56) ) ROM_END /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1983, fanucspg, 0, 0, fanucspmg, fanucspmg, fanucspmg_state, fanucspmg, "Fanuc", "System P Model G", GAME_NOT_WORKING | GAME_NO_SOUND) - - diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c index ae0f5316cf1..44fabb17a95 100644 --- a/src/mess/drivers/fk1.c +++ b/src/mess/drivers/fk1.c @@ -447,7 +447,7 @@ static MACHINE_CONFIG_START( fk1, fk1_state ) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") MCFG_DEVICE_ADD("pit8253", PIT8253, 0) diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c index fb30344989a..0af8b3fdb74 100644 --- a/src/mess/drivers/fmtowns.c +++ b/src/mess/drivers/fmtowns.c @@ -624,7 +624,7 @@ WRITE8_MEMBER(towns_state::towns_floppy_w) } READ16_MEMBER(towns_state::towns_fdc_dma_r) -{ UINT16 data = m_fdc->data_r(generic_space(), 0); +{ UINT16 data = m_fdc->data_r(generic_space(), 0); return data; } diff --git a/src/mess/drivers/fp6000.c b/src/mess/drivers/fp6000.c index f1f8ada023f..203fd119961 100644 --- a/src/mess/drivers/fp6000.c +++ b/src/mess/drivers/fp6000.c @@ -33,7 +33,7 @@ public: m_maincpu(*this, "maincpu") , m_crtc(*this, "crtc"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } UINT8 *m_char_rom; diff --git a/src/mess/drivers/gb.c b/src/mess/drivers/gb.c index 3811600b9c0..9f931d70f17 100644 --- a/src/mess/drivers/gb.c +++ b/src/mess/drivers/gb.c @@ -756,7 +756,7 @@ static MACHINE_CONFIG_START( gameboy, gb_state ) MCFG_SCREEN_VBLANK_TIME(0) MCFG_SCREEN_UPDATE_DEVICE("lcd", gb_lcd_device, screen_update) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) // MCFG_SCREEN_SIZE(20*8, 18*8) MCFG_SCREEN_SIZE( 458, 154 ) @@ -797,7 +797,7 @@ static MACHINE_CONFIG_DERIVED( supergb, gameboy ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(32*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32768) MCFG_PALETTE_INIT_OWNER(gb_state,sgb) @@ -814,7 +814,7 @@ static MACHINE_CONFIG_DERIVED( gbpocket, gameboy ) MCFG_MACHINE_START_OVERRIDE(gb_state, gbpocket) MCFG_MACHINE_RESET_OVERRIDE(gb_state, gbpocket) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(gb_state,gbp) @@ -860,7 +860,7 @@ static MACHINE_CONFIG_START( megaduck, megaduck_state ) MCFG_SCREEN_REFRESH_RATE(DMG_FRAMES_PER_SECOND) MCFG_SCREEN_VBLANK_TIME(0) MCFG_SCREEN_PALETTE("palette") - + MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_MACHINE_START_OVERRIDE(megaduck_state, megaduck ) @@ -872,7 +872,7 @@ static MACHINE_CONFIG_START( megaduck, megaduck_state ) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_GFXDECODE_ADD("gfxdecode", "palette", gb) - + MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(megaduck_state,megaduck) diff --git a/src/mess/drivers/geniusiq.c b/src/mess/drivers/geniusiq.c index 3161200cece..a85277bf028 100644 --- a/src/mess/drivers/geniusiq.c +++ b/src/mess/drivers/geniusiq.c @@ -811,7 +811,7 @@ static MACHINE_CONFIG_START( iq128, geniusiq_state ) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_UPDATE_DRIVER( geniusiq_state, screen_update ) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(geniusiq_state, geniusiq) @@ -847,7 +847,7 @@ static MACHINE_CONFIG_START( gl8008cx, gl8008cx_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) - MCFG_SCREEN_UPDATE_DRIVER( gl8008cx_state, screen_update ) + MCFG_SCREEN_UPDATE_DRIVER( gl8008cx_state, screen_update ) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/grfd2301.c b/src/mess/drivers/grfd2301.c index 9dcd6451878..d6e1af1613b 100644 --- a/src/mess/drivers/grfd2301.c +++ b/src/mess/drivers/grfd2301.c @@ -123,7 +123,7 @@ static MACHINE_CONFIG_START( grfd2301, grfd2301_state ) MCFG_SCREEN_SIZE(640, 240) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c index 77882ea5c44..3762346ba04 100644 --- a/src/mess/drivers/hec2hrp.c +++ b/src/mess/drivers/hec2hrp.c @@ -648,7 +648,7 @@ static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state ) MCFG_SCREEN_VISIBLE_AREA(0, 243, 0, 227) MCFG_SCREEN_UPDATE_DRIVER(hec2hrp_state, screen_update_hec2hrp) MCFG_SCREEN_PALETTE("palette") - + MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) MCFG_PALETTE_ADD("palette", 16) MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) diff --git a/src/mess/drivers/homelab.c b/src/mess/drivers/homelab.c index 49224d12c0a..1fc86a2cc8b 100644 --- a/src/mess/drivers/homelab.c +++ b/src/mess/drivers/homelab.c @@ -745,7 +745,7 @@ static MACHINE_CONFIG_START( homelab, homelab_state ) MCFG_VIDEO_START_OVERRIDE(homelab_state,homelab2) MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab2) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") @@ -776,7 +776,7 @@ static MACHINE_CONFIG_START( homelab3, homelab_state ) MCFG_VIDEO_START_OVERRIDE(homelab_state,homelab3) MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") @@ -807,7 +807,7 @@ static MACHINE_CONFIG_START( brailab4, homelab_state ) MCFG_VIDEO_START_OVERRIDE(homelab_state,brailab4) MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") diff --git a/src/mess/drivers/homez80.c b/src/mess/drivers/homez80.c index 1a7f4077cfc..b68ee2b4694 100644 --- a/src/mess/drivers/homez80.c +++ b/src/mess/drivers/homez80.c @@ -293,7 +293,7 @@ static MACHINE_CONFIG_START( homez80, homez80_state ) MCFG_SCREEN_SIZE(344, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 344-1, 0, 32*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", homez80 ) MACHINE_CONFIG_END diff --git a/src/mess/drivers/hp48.c b/src/mess/drivers/hp48.c index 8c883216450..9f4f89da7d6 100644 --- a/src/mess/drivers/hp48.c +++ b/src/mess/drivers/hp48.c @@ -767,25 +767,25 @@ INPUT_PORTS_END keyboard layout for 49 G model ------------------------------------------------- - | F1 | F2 | F3 | F4 | F5 | F6 | + | F1 | F2 | F3 | F4 | F5 | F6 | |-----------------------------------------------| | APPS | MODE | TOOL | up | |---------+--------+--------| left right | | VAR | STO | NXT | down | |---------+--------+--------+-------------------| - | HIST | CAT | EQW | SYMB | <= | + | HIST | CAT | EQW | SYMB | <= | |---------+--------+--------+---------+---------| - | y^x | sqrt | SIN | COS | TAN | + | y^x | sqrt | SIN | COS | TAN | |---------+--------+--------+---------+---------| - | EEX | +/- | X | 1/x | / | + | EEX | +/- | X | 1/x | / | |---------+--------+--------+---------+---------| - | alpha | 7 | 8 | 9 | * | + | alpha | 7 | 8 | 9 | * | |---------+--------+--------+---------+---------| - | blue | 4 | 5 | 6 | - | + | blue | 4 | 5 | 6 | - | |---------+--------+--------+---------+---------| - | red | 1 | 2 | 3 | + | + | red | 1 | 2 | 3 | + | |---------+--------+--------+---------+---------| - | ON | 0 | . | SPC | ENTER | + | ON | 0 | . | SPC | ENTER | ------------------------------------------------- * 51 keys @@ -798,14 +798,14 @@ INPUT_PORTS_END static INPUT_PORTS_START( hp49g_kbd ) - PORT_START( "LINE0" ) /* OUT = 0x001 */ + PORT_START( "LINE0" ) /* OUT = 0x001 */ PORT_BIT ( 1, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( "ENTER ANS NUM") PORT_CODE ( KEYCODE_ENTER ) PORT_BIT ( 2, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "+ { } \xC2\xAB \xC2\xBB") /* << >> */ + PORT_NAME ( "+ { } \xC2\xAB \xC2\xBB") /* << >> */ PORT_CODE ( KEYCODE_EQUALS ) PORT_CODE ( KEYCODE_PLUS_PAD ) @@ -826,11 +826,11 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_CODE ( KEYCODE_Z) PORT_BIT ( 32, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "TAN ATAN \xE2\x88\xAB U") /* integral */ + PORT_NAME ( "TAN ATAN \xE2\x88\xAB U") /* integral */ PORT_CODE ( KEYCODE_U ) PORT_BIT ( 64, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "\xE2\x87\x90 DEL CLEAR") /* double left arrow */ + PORT_NAME ( "\xE2\x87\x90 DEL CLEAR") /* double left arrow */ PORT_CODE ( KEYCODE_BACKSPACE ) PORT_CODE ( KEYCODE_DEL ) PORT_CODE ( KEYCODE_DEL_PAD ) @@ -839,13 +839,13 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_NAME ( "NXT PREV PASTE L") PORT_CODE ( KEYCODE_L ) - PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) + PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) - PORT_START( "LINE1" ) /* OUT = 0x002 */ + PORT_START( "LINE1" ) /* OUT = 0x002 */ PORT_BIT ( 1, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "SPC \xCF\x80 ,") /* pi */ + PORT_NAME ( "SPC \xCF\x80 ,") /* pi */ PORT_CODE ( KEYCODE_SPACE ) PORT_BIT ( 2, IP_ACTIVE_HIGH, IPT_KEYBOARD ) @@ -864,11 +864,11 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_CODE ( KEYCODE_9_PAD ) PORT_BIT ( 16, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "1/x \xE2\x89\xA5 > Y") /* >= */ + PORT_NAME ( "1/x \xE2\x89\xA5 > Y") /* >= */ PORT_CODE ( KEYCODE_Y ) PORT_BIT ( 32, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "COS ACOS \xE2\x88\x82 T") /* delta */ + PORT_NAME ( "COS ACOS \xE2\x88\x82 T") /* delta */ PORT_CODE ( KEYCODE_T ) PORT_BIT ( 64, IP_ACTIVE_HIGH, IPT_KEYBOARD ) @@ -879,10 +879,10 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_NAME ( "STO\xE2\x8A\xB3 RCL CUT K") PORT_CODE ( KEYCODE_K ) - PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) + PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) - PORT_START( "LINE2" ) /* OUT = 0x004 */ + PORT_START( "LINE2" ) /* OUT = 0x004 */ PORT_BIT ( 1, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( ". : : \xE2\x86\xb5") /* return arrow */ @@ -904,7 +904,7 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_CODE ( KEYCODE_8_PAD ) PORT_BIT ( 16, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "X \xE2\x89\xA4 < X") /* <= */ + PORT_NAME ( "X \xE2\x89\xA4 < X") /* <= */ PORT_CODE ( KEYCODE_X ) PORT_BIT ( 32, IP_ACTIVE_HIGH, IPT_KEYBOARD ) @@ -919,13 +919,13 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_NAME ( "VAR UPDIR COPY J") PORT_CODE ( KEYCODE_J ) - PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) + PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) - PORT_START( "LINE3" ) /* OUT = 0x008 */ + PORT_START( "LINE3" ) /* OUT = 0x008 */ PORT_BIT ( 1, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "0 \xE2\x88\x9E \xE2\x86\x92") /* infinity, right arrow */ + PORT_NAME ( "0 \xE2\x88\x9E \xE2\x86\x92") /* infinity, right arrow */ PORT_CODE ( KEYCODE_0 ) PORT_CODE ( KEYCODE_0_PAD ) @@ -945,11 +945,11 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_CODE ( KEYCODE_7_PAD ) PORT_BIT ( 16, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "+/- \xE2\x89\xA0 = W") /* =/ */ + PORT_NAME ( "+/- \xE2\x89\xA0 = W") /* =/ */ PORT_CODE ( KEYCODE_W ) PORT_BIT ( 32, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "\xE2\x88\x9A x^2 sqrt(x,y) R") /* square root */ + PORT_NAME ( "\xE2\x88\x9A x^2 sqrt(x,y) R") /* square root */ PORT_CODE ( KEYCODE_R ) PORT_BIT ( 64, IP_ACTIVE_HIGH, IPT_KEYBOARD ) @@ -960,10 +960,10 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_NAME ( "TOOL i | I") PORT_CODE ( KEYCODE_I ) - PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) + PORT_BIT ( 0x7f00, 0, IPT_UNUSED ) - PORT_START( "LINE4" ) /* OUT = 0x010 */ + PORT_START( "LINE4" ) /* OUT = 0x010 */ PORT_BIT ( 16, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( "EEX 10^x LOG V") @@ -981,10 +981,10 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_NAME ( "MODE CUSTOM END H") PORT_CODE ( KEYCODE_H ) - PORT_BIT ( 0x7f0f, 0, IPT_UNUSED ) + PORT_BIT ( 0x7f0f, 0, IPT_UNUSED ) - PORT_START( "LINE5" ) /* OUT = 0x020 */ + PORT_START( "LINE5" ) /* OUT = 0x020 */ PORT_BIT ( 1, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( "F1 Y= A") @@ -1020,10 +1020,10 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_NAME ( "APPS FILES BEGIN G") PORT_CODE ( KEYCODE_G ) - PORT_BIT ( 0x7f40, 0, IPT_UNUSED ) + PORT_BIT ( 0x7f40, 0, IPT_UNUSED ) - PORT_START( "LINE6" ) /* OUT = 0x040 */ + PORT_START( "LINE6" ) /* OUT = 0x040 */ PORT_BIT ( 1, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( "\xE2\x86\x92") /* right arrow */ @@ -1034,17 +1034,17 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_CODE ( KEYCODE_DOWN ) PORT_BIT ( 4, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "\xE2\x86\x90") /* left arrow */ + PORT_NAME ( "\xE2\x86\x90") /* left arrow */ PORT_CODE ( KEYCODE_LEFT ) PORT_BIT ( 8, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( "\xE2\x86\x91") /* up arrow */ PORT_CODE ( KEYCODE_UP ) - PORT_BIT ( 0x7ff0, 0, IPT_UNUSED ) + PORT_BIT ( 0x7ff0, 0, IPT_UNUSED ) - PORT_START( "LINE7" ) /* OUT = 0x080 */ + PORT_START( "LINE7" ) /* OUT = 0x080 */ PORT_BIT ( 2, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( "right shift") @@ -1055,25 +1055,25 @@ static INPUT_PORTS_START( hp49g_kbd ) PORT_CODE ( KEYCODE_LSHIFT ) PORT_BIT ( 8, IP_ACTIVE_HIGH, IPT_KEYBOARD ) - PORT_NAME ( "\xCE\xB1 USER ENTRY") /* alpha */ + PORT_NAME ( "\xCE\xB1 USER ENTRY") /* alpha */ PORT_CODE ( KEYCODE_LALT ) - PORT_BIT ( 0x7ff1, 0, IPT_UNUSED ) + PORT_BIT ( 0x7ff1, 0, IPT_UNUSED ) - PORT_START( "LINE8" ) /* OUT = 0x100 */ + PORT_START( "LINE8" ) /* OUT = 0x100 */ - PORT_BIT ( 0xffff, 0, IPT_UNUSED ) + PORT_BIT ( 0xffff, 0, IPT_UNUSED ) - PORT_START( "ON" ) /* ON key, appears on all OUT lines */ + PORT_START( "ON" ) /* ON key, appears on all OUT lines */ PORT_BIT ( 0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME ( "ON CONT OFF CANCEL" ) PORT_CODE ( KEYCODE_ESC ) PORT_CODE ( KEYCODE_HOME ) - PORT_BIT ( 0x7fff, 0, IPT_UNUSED ) + PORT_BIT ( 0x7fff, 0, IPT_UNUSED ) INPUT_PORTS_END @@ -1109,8 +1109,8 @@ static INPUT_PORTS_START( hp48gx ) INPUT_PORTS_END static INPUT_PORTS_START( hp49g ) - PORT_INCLUDE( hp49g_kbd ) - PORT_INCLUDE( hp48_battery ) + PORT_INCLUDE( hp49g_kbd ) + PORT_INCLUDE( hp48_battery ) INPUT_PORTS_END @@ -1356,8 +1356,8 @@ static MACHINE_CONFIG_DERIVED( hp49g, hp48_common ) MCFG_DEFAULT_LAYOUT ( layout_hp49g ) /* serial I/O */ - //MCFG_XMODEM_ADD( "rs232_x", hp48_xmodem_rs232_conf ) - //MCFG_KERMIT_ADD( "rs232_k", hp48_kermit_rs232_conf ) + //MCFG_XMODEM_ADD( "rs232_x", hp48_xmodem_rs232_conf ) + //MCFG_KERMIT_ADD( "rs232_k", hp48_kermit_rs232_conf ) MACHINE_CONFIG_END diff --git a/src/mess/drivers/hp9k.c b/src/mess/drivers/hp9k.c index 2030f8c4867..7a634b1bbd2 100644 --- a/src/mess/drivers/hp9k.c +++ b/src/mess/drivers/hp9k.c @@ -161,7 +161,7 @@ public: DECLARE_WRITE8_MEMBER(kbd_put); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - + required_device m_gfxdecode; }; diff --git a/src/mess/drivers/hprot1.c b/src/mess/drivers/hprot1.c index 40a345dbed6..bcac37914d1 100644 --- a/src/mess/drivers/hprot1.c +++ b/src/mess/drivers/hprot1.c @@ -158,55 +158,55 @@ READ8_MEMBER(hprot1_state::henry_io_r) /* WRITE8_MEMBER(hprot1_state::henry_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; - if (data != 0xFF && data != 0xEF) + } + break; + } + case 0x01: + { + if (data != p1) + { + p1=data; + if (data != 0xFF && data != 0xEF) #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; + } + } } */ @@ -245,7 +245,7 @@ static MACHINE_CONFIG_START( hprot1, hprot1_state ) MCFG_SCREEN_SIZE(6*16, 9*2) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(hprot1_state, hprot1) diff --git a/src/mess/drivers/hunter2.c b/src/mess/drivers/hunter2.c index 055eae48567..4158df500a5 100644 --- a/src/mess/drivers/hunter2.c +++ b/src/mess/drivers/hunter2.c @@ -103,10 +103,10 @@ static ADDRESS_MAP_START(hunter2_io, AS_IO, 8, hunter2_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x1f) AM_DEVREADWRITE("iotimer", nsc810_device, read, write) // device not yet emulated -// AM_RANGE(0x00, 0x00) AM_READ(port00_r) -// AM_RANGE(0x01, 0x01) AM_WRITE(port01_w) -// AM_RANGE(0x02, 0x02) AM_READ(port02_r) -// AM_RANGE(0x03, 0x1F) AM_WRITENOP +// AM_RANGE(0x00, 0x00) AM_READ(port00_r) +// AM_RANGE(0x01, 0x01) AM_WRITE(port01_w) +// AM_RANGE(0x02, 0x02) AM_READ(port02_r) +// AM_RANGE(0x03, 0x1F) AM_WRITENOP AM_RANGE(0x20, 0x20) AM_DEVWRITE("lcdc", hd61830_device, data_w) AM_RANGE(0x21, 0x21) AM_DEVREADWRITE("lcdc", hd61830_device, status_r, control_w) AM_RANGE(0x3e, 0x3e) AM_DEVREAD("lcdc", hd61830_device, data_r) @@ -255,19 +255,19 @@ WRITE8_MEMBER( hunter2_state::port80_w ) WRITE8_MEMBER( hunter2_state::port81_w ) { m_rs232->write_txd(data & 0x01); -// logerror("TXD write %02x\n",data); +// logerror("TXD write %02x\n",data); } WRITE8_MEMBER( hunter2_state::port82_w ) { m_rs232->write_dtr(data & 0x01); -// logerror("DTR write %02x\n",data); +// logerror("DTR write %02x\n",data); } WRITE8_MEMBER( hunter2_state::port84_w ) { m_rs232->write_rts(data & 0x01); -// logerror("RTS write %02x\n",data); +// logerror("RTS write %02x\n",data); } WRITE8_MEMBER( hunter2_state::port86_w ) @@ -277,7 +277,7 @@ WRITE8_MEMBER( hunter2_state::port86_w ) /* Bit 0 = Enable normal interrupts -Bit 1 = Enable RSTC interrupts +Bit 1 = Enable RSTC interrupts Bit 2 = Enable RSTB interrupts Bit 3 = Enable RSTA interrupts */ @@ -399,7 +399,7 @@ static MACHINE_CONFIG_START( hunter2, hunter2_state ) MCFG_SCREEN_SIZE(240, 128) MCFG_SCREEN_VISIBLE_AREA(0, 239, 0, 63) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(hunter2_state, hunter2) diff --git a/src/mess/drivers/hx20.c b/src/mess/drivers/hx20.c index c003fd8d855..7908efa8399 100644 --- a/src/mess/drivers/hx20.c +++ b/src/mess/drivers/hx20.c @@ -833,10 +833,10 @@ static MACHINE_CONFIG_START( hx20, hx20_state ) MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 32-1) MCFG_SCREEN_UPDATE_DRIVER(hx20_state, screen_update) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(hx20_state, hx20) - + MCFG_UPD7227_ADD(UPD7227_0_TAG, 0, 0) MCFG_UPD7227_ADD(UPD7227_1_TAG, 40, 0) MCFG_UPD7227_ADD(UPD7227_2_TAG, 80, 0) diff --git a/src/mess/drivers/ibm6580.c b/src/mess/drivers/ibm6580.c index 9acd539cb6a..98d9f65c524 100644 --- a/src/mess/drivers/ibm6580.c +++ b/src/mess/drivers/ibm6580.c @@ -83,7 +83,7 @@ static MACHINE_CONFIG_START( ibm6580, ibm6580_state ) MCFG_SCREEN_SIZE(640, 240) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(ibm6580_state, ibm6580) MACHINE_CONFIG_END diff --git a/src/mess/drivers/ibmpcjr.c b/src/mess/drivers/ibmpcjr.c index 5386c5a17bb..0ebf6bad196 100644 --- a/src/mess/drivers/ibmpcjr.c +++ b/src/mess/drivers/ibmpcjr.c @@ -78,7 +78,7 @@ public: UINT32 m_raw_keyb_data; int m_signal_count; UINT8 m_nmi_enabled; - + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); emu_timer *m_pc_int_delay_timer; emu_timer *m_pcjr_watchdog; @@ -90,7 +90,7 @@ public: TIMER_WATCHDOG, TIMER_KB_SIGNAL }; - + void machine_reset(); DECLARE_DRIVER_INIT(pcjr); }; @@ -146,7 +146,7 @@ void pcjr_state::device_timer(emu_timer &timer, device_timer_id id, int param, v else m_pic8259->ir6_w(0); break; - + case TIMER_KB_SIGNAL: m_raw_keyb_data = m_raw_keyb_data >> 1; m_signal_count--; @@ -246,7 +246,7 @@ WRITE_LINE_MEMBER(pcjr_state::out2_changed) WRITE_LINE_MEMBER(pcjr_state::keyb_interrupt) { int data; - + if(state && (data = m_keyboard->read(machine().driver_data()->generic_space(), 0))) { UINT8 parity = 0; @@ -650,7 +650,7 @@ static MACHINE_CONFIG_START( ibmpcjr, pcjr_state) /* video hardware */ MCFG_PCVIDEO_PCJR_ADD("pcvideo_pcjr") - + MCFG_GFXDECODE_ADD("gfxdecode", "pcvideo_pcjr:palette", pcjr) /* sound hardware */ diff --git a/src/mess/drivers/ie15.c b/src/mess/drivers/ie15.c index 960f62e7a48..9fc1dab51e9 100644 --- a/src/mess/drivers/ie15.c +++ b/src/mess/drivers/ie15.c @@ -634,8 +634,8 @@ static MACHINE_CONFIG_START( ie15, ie15_state ) IE15_HORZ_START+IE15_DISP_HORZ,IE15_TOTAL_VERT,IE15_VERT_START, IE15_VERT_START+IE15_DISP_VERT); MCFG_SCREEN_PALETTE("palette") - - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ie15) + + MCFG_GFXDECODE_ADD("gfxdecode", "palette", ie15) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(ie15_state, ie15) diff --git a/src/mess/drivers/indiana.c b/src/mess/drivers/indiana.c index f8ea27330a6..6336f3cf455 100644 --- a/src/mess/drivers/indiana.c +++ b/src/mess/drivers/indiana.c @@ -2,11 +2,11 @@ Indiana University 68030 board - 08/12/2009 Skeleton driver. - 01/20/2014 Added ISA bus and peripherals - - TODO: Text appears in VGA f/b (0x6B8000), but doesn't display? - + 08/12/2009 Skeleton driver. + 01/20/2014 Added ISA bus and peripherals + + TODO: Text appears in VGA f/b (0x6B8000), but doesn't display? + System often reads/writes 6003D4/5, might be a cut-down 6845, as it only uses registers C,D,E,F. @@ -120,7 +120,7 @@ static MACHINE_CONFIG_START( indiana, indiana_state ) MCFG_MC68901_RX_CLOCK(0) MCFG_MC68901_TX_CLOCK(0) MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", serial_keyboard_device, input_txd)) - + MCFG_SERIAL_KEYBOARD_ADD("keyboard", keyboard_interface, 1200) MACHINE_CONFIG_END diff --git a/src/mess/drivers/intv.c b/src/mess/drivers/intv.c index 699dc12bd0a..603c5f40ede 100644 --- a/src/mess/drivers/intv.c +++ b/src/mess/drivers/intv.c @@ -817,7 +817,7 @@ static MACHINE_CONFIG_START( intv, intv_state ) MCFG_SCREEN_SIZE((STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTV_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTV_Y_SCALE) MCFG_SCREEN_VISIBLE_AREA(0, (STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTV_X_SCALE-1, 0, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTV_Y_SCALE-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(intv_state, intv) @@ -874,7 +874,7 @@ static MACHINE_CONFIG_DERIVED( intvkbd, intv ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", intvkbd) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(intv_state, intv) - + MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE((STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTVKBD_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTVKBD_Y_SCALE) MCFG_SCREEN_VISIBLE_AREA(0, (STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTVKBD_X_SCALE-1, 0, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTVKBD_Y_SCALE-1) diff --git a/src/mess/drivers/ip20.c b/src/mess/drivers/ip20.c index bc95aaa159c..0709163410a 100644 --- a/src/mess/drivers/ip20.c +++ b/src/mess/drivers/ip20.c @@ -601,7 +601,7 @@ static MACHINE_CONFIG_START( ip204415, ip20_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_DEVICE_ADD("scc", SCC8530, 7000000) - + MCFG_DEVICE_ADD("sgi_mc", SGI_MC, 0) MCFG_SCSIBUS_ADD("scsi") diff --git a/src/mess/drivers/ip22.c b/src/mess/drivers/ip22.c index 0f222797475..cadaa249d24 100644 --- a/src/mess/drivers/ip22.c +++ b/src/mess/drivers/ip22.c @@ -110,7 +110,7 @@ public: m_dac(*this, "dac"), m_kbdc8042(*this, "kbdc") { } - + required_device m_maincpu; required_device m_wd33c93; required_shared_ptr m_unkpbus0; @@ -1623,7 +1623,7 @@ static MACHINE_CONFIG_START( ip225015, ip22_state ) MCFG_PALETTE_ADD("palette", 65536) MCFG_NEWPORT_ADD("newport") - + MCFG_DEVICE_ADD("sgi_mc", SGI_MC, 0) MCFG_DEVICE_ADD("lpt_0", PC_LPT, 0) diff --git a/src/mess/drivers/iq151.c b/src/mess/drivers/iq151.c index 3c46d7bc48f..544619588e7 100644 --- a/src/mess/drivers/iq151.c +++ b/src/mess/drivers/iq151.c @@ -434,7 +434,7 @@ static MACHINE_CONFIG_START( iq151, iq151_state ) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") /* sound hardware */ diff --git a/src/mess/drivers/irisha.c b/src/mess/drivers/irisha.c index 1b0ff372d22..c4d4d0eb828 100644 --- a/src/mess/drivers/irisha.c +++ b/src/mess/drivers/irisha.c @@ -407,7 +407,7 @@ static MACHINE_CONFIG_START( irisha, irisha_state ) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) MCFG_SCREEN_UPDATE_DRIVER(irisha_state, screen_update_irisha) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", irisha) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c index 809098cbe2a..802ab5a9d2c 100644 --- a/src/mess/drivers/itt3030.c +++ b/src/mess/drivers/itt3030.c @@ -233,7 +233,7 @@ public: , m_keyrow16(*this, "ROW16") , m_vram(*this, "vram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } // devices diff --git a/src/mess/drivers/jonos.c b/src/mess/drivers/jonos.c index 57ec7a8e76b..aceae2fcd88 100644 --- a/src/mess/drivers/jonos.c +++ b/src/mess/drivers/jonos.c @@ -131,7 +131,7 @@ static MACHINE_CONFIG_START( jonos, jonos_state ) MCFG_SCREEN_SIZE(640, 300) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 299) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", jonos) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/jupiter.c b/src/mess/drivers/jupiter.c index 1ef238eced3..b7e8af32258 100644 --- a/src/mess/drivers/jupiter.c +++ b/src/mess/drivers/jupiter.c @@ -290,8 +290,8 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state ) MCFG_SCREEN_SIZE(512, 320) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 320-1) MCFG_SCREEN_PALETTE("palette") - - + + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") // devices diff --git a/src/mess/drivers/k8915.c b/src/mess/drivers/k8915.c index e6e06332e39..5ae99e208af 100644 --- a/src/mess/drivers/k8915.c +++ b/src/mess/drivers/k8915.c @@ -168,7 +168,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state ) MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf) diff --git a/src/mess/drivers/kaypro.c b/src/mess/drivers/kaypro.c index 302f96aa29d..aae03beb043 100644 --- a/src/mess/drivers/kaypro.c +++ b/src/mess/drivers/kaypro.c @@ -210,7 +210,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state ) MCFG_VIDEO_START_OVERRIDE(kaypro_state, kaypro ) MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kayproii) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", kayproii) MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") @@ -266,8 +266,8 @@ static MACHINE_CONFIG_START( kaypro2x, kaypro_state ) MCFG_SCREEN_SIZE(80*8, 25*16) MCFG_SCREEN_VISIBLE_AREA(0,80*8-1,0,25*16-1) MCFG_VIDEO_START_OVERRIDE(kaypro_state, kaypro ) - MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kaypro2x) - + MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kaypro2x) + MCFG_GFXDECODE_ADD("gfxdecode", "palette", kaypro2x) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(kaypro_state,kaypro) diff --git a/src/mess/drivers/konin.c b/src/mess/drivers/konin.c index 46ff0182510..5bd942ada78 100644 --- a/src/mess/drivers/konin.c +++ b/src/mess/drivers/konin.c @@ -90,7 +90,7 @@ static MACHINE_CONFIG_START( konin, konin_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(konin_state, screen_update_konin) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/kyocera.c b/src/mess/drivers/kyocera.c index b1db3ec8ee8..cd6df8220a8 100644 --- a/src/mess/drivers/kyocera.c +++ b/src/mess/drivers/kyocera.c @@ -30,7 +30,7 @@ TODO: - - bar code reader (!RxDB -> RST5.5, Hewlett-Packard HREDS-3050 interface) + - bar code reader (!RxDB -> RST5.5, Hewlett-Packard HREDS-3050 interface) - un-Y2K-hack tandy200 - keyboard is unresponsive for couple of seconds after boot - soft power on/off diff --git a/src/mess/drivers/lcmate2.c b/src/mess/drivers/lcmate2.c index 6091532c0b4..b4dc7d0b8b1 100644 --- a/src/mess/drivers/lcmate2.c +++ b/src/mess/drivers/lcmate2.c @@ -235,7 +235,7 @@ static MACHINE_CONFIG_START( lcmate2, lcmate2_state ) MCFG_SCREEN_SIZE(120, 18) MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 18-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(lcmate2_state, lcmate2) MCFG_DEFAULT_LAYOUT(layout_lcd) diff --git a/src/mess/drivers/llc.c b/src/mess/drivers/llc.c index ea8804f3776..7dc9c7d6a48 100644 --- a/src/mess/drivers/llc.c +++ b/src/mess/drivers/llc.c @@ -217,7 +217,7 @@ static MACHINE_CONFIG_START( llc1, llc_state ) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*8-1) MCFG_SCREEN_UPDATE_DRIVER(llc_state, screen_update_llc1) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", llc1) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MCFG_DEFAULT_LAYOUT(layout_llc1) @@ -245,7 +245,7 @@ static MACHINE_CONFIG_START( llc2, llc_state ) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(llc_state, screen_update_llc2) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", llc2) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/lola8a.c b/src/mess/drivers/lola8a.c index e9dd77448ed..f07c94246c4 100644 --- a/src/mess/drivers/lola8a.c +++ b/src/mess/drivers/lola8a.c @@ -56,7 +56,7 @@ public: private: UINT8 m_portb; required_device m_cass; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index f1fb71e2b30..6bade75b3dc 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -65,7 +65,7 @@ public: m_floppy0(*this, "fd1797:0:5dd"), m_floppy1(*this, "fd1797:1:5dd"), m_p_videoram(*this, "p_videoram"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -163,7 +163,7 @@ WRITE_LINE_MEMBER(m20_state::kbd_tx) m_kbrecv_data = (m_kbrecv_data >> 1) | (state ? (1<<10) : 0); if (m_kbrecv_bitcount == 11) { data = (m_kbrecv_data >> 1) & 0xff; -// printf ("0x%02X received by keyboard\n", data); +// printf ("0x%02X received by keyboard\n", data); switch (data) { case 0x03: m_kbdi8251->receive_character(2); printf ("sending 2 back from kb...\n"); break; case 0x0a: break; @@ -173,11 +173,11 @@ WRITE_LINE_MEMBER(m20_state::kbd_tx) m_kbrecv_in_progress = 0; } } - else + else { if (state == 0) { - m_kbrecv_in_progress = 1; + m_kbrecv_in_progress = 1; m_kbrecv_bitcount = 1; m_kbrecv_data = state ? (1<<10) : 0; } @@ -388,7 +388,6 @@ ADDRESS_MAP_END void m20_state::install_memory() { - m_memsize = m_ram->size(); UINT8 *memptr = m_ram->pointer(); address_space& pspace = m_maincpu->space(AS_PROGRAM); @@ -811,7 +810,6 @@ IRQ_CALLBACK_MEMBER(m20_state::m20_irq_callback) void m20_state::machine_start() { - install_memory(); } @@ -937,7 +935,7 @@ static MACHINE_CONFIG_START( m20, m20_state ) /* Devices */ MCFG_FD1797x_ADD("fd1797", 1000000) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("i8259", pic8259_device, ir0_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("i8259", pic8259_device, ir0_w)) MCFG_FLOPPY_DRIVE_ADD("fd1797:0", m20_floppies, "5dd", m20_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1797:1", m20_floppies, "5dd", m20_state::floppy_formats) MCFG_MC6845_ADD("crtc", MC6845, "screen", PIXEL_CLOCK/8, mc6845_intf) /* hand tuned to get ~50 fps */ @@ -991,4 +989,3 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ COMP( 1981, m20, 0, 0, m20, m20, m20_state, m20, "Olivetti", "Olivetti L1 M20", GAME_NOT_WORKING | GAME_NO_SOUND) COMP( 1981, m40, m20, 0, m20, m20, m20_state, m20, "Olivetti", "Olivetti L1 M40", GAME_NOT_WORKING | GAME_NO_SOUND) - diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c index 9f655cd7b55..844bdaad177 100644 --- a/src/mess/drivers/mac.c +++ b/src/mess/drivers/mac.c @@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( mac512ke, mac_state ) MCFG_DEVICE_ADD("scc", SCC8530, C7M) MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt)) - + MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000) MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a)) MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b)) @@ -955,7 +955,7 @@ static MACHINE_CONFIG_START( mac512ke, mac_state ) MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq)) - MCFG_MACKBD_ADD(MACKBD_TAG) + MCFG_MACKBD_ADD(MACKBD_TAG) #ifdef MAC_USE_EMULATED_KBD MCFG_MACKBD_DATAOUT_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb2)) MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(mac_state, mac_kbd_clk_in)) @@ -1565,7 +1565,7 @@ static MACHINE_CONFIG_START( macpb160, mac_state ) MCFG_SCREEN_SIZE(700, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 399) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macpb160) - MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(mac_state,macgsc) @@ -1697,7 +1697,7 @@ static MACHINE_CONFIG_DERIVED( maciici, macii ) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) MCFG_SCREEN_SIZE(640, 870) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) - MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv) + MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv) MCFG_DEFAULT_LAYOUT(layout_mac) /* internal ram */ @@ -1825,7 +1825,7 @@ static MACHINE_CONFIG_START( macqd700, mac_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1260)) MCFG_SCREEN_SIZE(1152, 870) MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 870-1) - MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macdafb) + MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macdafb) MCFG_VIDEO_START_OVERRIDE(mac_state,macdafb) MCFG_VIDEO_RESET_OVERRIDE(mac_state,macdafb) diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c index 707dab8f473..950cf72d37e 100644 --- a/src/mess/drivers/mbc200.c +++ b/src/mess/drivers/mbc200.c @@ -271,7 +271,7 @@ static MACHINE_CONFIG_START( mbc200, mbc200_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1) MCFG_SCREEN_UPDATE_DRIVER(mbc200_state, screen_update_mbc200) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", mbc200) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c index 3f878ee117d..76ea6a35020 100644 --- a/src/mess/drivers/mbee.c +++ b/src/mess/drivers/mbee.c @@ -793,7 +793,7 @@ static MACHINE_CONFIG_START( mbeeic, mbee_state ) MCFG_SCREEN_UPDATE_DRIVER(mbee_state, screen_update_mbee) MCFG_GFXDECODE_ADD("gfxdecode", "palette", mbeeic) - + MCFG_PALETTE_ADD("palette", 96) MCFG_PALETTE_INIT_OWNER(mbee_state,mbeeic) diff --git a/src/mess/drivers/mc80.c b/src/mess/drivers/mc80.c index 06f89648bf5..62aaa582ccd 100644 --- a/src/mess/drivers/mc80.c +++ b/src/mess/drivers/mc80.c @@ -174,7 +174,7 @@ static MACHINE_CONFIG_START( mc8020, mc80_state ) MCFG_VIDEO_START_OVERRIDE(mc80_state,mc8020) MCFG_SCREEN_UPDATE_DRIVER(mc80_state, screen_update_mc8020) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* Devices */ @@ -201,7 +201,7 @@ static MACHINE_CONFIG_START( mc8030, mc80_state ) MCFG_VIDEO_START_OVERRIDE(mc80_state,mc8030) MCFG_SCREEN_UPDATE_DRIVER(mc80_state, screen_update_mc8030) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* Devices */ diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index efe1fcfc327..8fd763c04e5 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -286,7 +286,7 @@ MACHINE_START_MEMBER(md_cons_state, ms_megacd) { MACHINE_START_CALL_MEMBER( md_common ); - // the segaCD introduces some kind of DMA 'lag', which we have to compensate for, + // the segaCD introduces some kind of DMA 'lag', which we have to compensate for, // at least when reading wordram? we might need to check what mode we're in the DMA... m_vdp->set_dma_delay(2); } @@ -295,7 +295,7 @@ MACHINE_RESET_MEMBER(md_cons_state, ms_megadriv) { m_maincpu->reset(); MACHINE_RESET_CALL_MEMBER( megadriv ); - + // if the system has a 32x, pause the extra CPUs until they are actually turned on if (m_32x) m_32x->pause_cpu(); @@ -306,7 +306,7 @@ void md_cons_state::screen_eof_console(screen_device &screen, bool state) { if (m_io_reset->read_safe(0x00) & 0x01) m_maincpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE); - + // rising edge if (state) { @@ -315,7 +315,7 @@ void md_cons_state::screen_eof_console(screen_device &screen, bool state) bool mode3 = (m_vdp->get_imode() == 3); m_vdp->vdp_handle_eof(); m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero); - + if (m_32x) { m_32x->m_32x_vblank_flag = 0; @@ -410,8 +410,8 @@ DRIVER_INIT_MEMBER(md_cons_state, genesis) m_segacd->set_framerate(60); m_segacd->set_total_scanlines(262); } - - m_version_hi_nibble = 0x80; // Export NTSC + + m_version_hi_nibble = 0x80; // Export NTSC if (!m_segacd) m_version_hi_nibble |= 0x20; } @@ -420,7 +420,7 @@ DRIVER_INIT_MEMBER(md_cons_state, md_eur) { DRIVER_INIT_CALL(megadrie); DRIVER_INIT_CALL(mess_md_common); - + if (m_32x) { m_32x->set_32x_pal(TRUE); @@ -432,8 +432,8 @@ DRIVER_INIT_MEMBER(md_cons_state, md_eur) m_segacd->set_framerate(50); m_segacd->set_total_scanlines(313); } - - m_version_hi_nibble = 0xc0; // Export PAL + + m_version_hi_nibble = 0xc0; // Export PAL if (!m_segacd) m_version_hi_nibble |= 0x20; } @@ -442,7 +442,7 @@ DRIVER_INIT_MEMBER(md_cons_state, md_jpn) { DRIVER_INIT_CALL(megadrij); DRIVER_INIT_CALL(mess_md_common); - + if (m_32x) { m_32x->set_32x_pal(FALSE); @@ -454,8 +454,8 @@ DRIVER_INIT_MEMBER(md_cons_state, md_jpn) m_segacd->set_framerate(60); m_segacd->set_total_scanlines(262); } - - m_version_hi_nibble = 0x00; // JPN NTSC + + m_version_hi_nibble = 0x00; // JPN NTSC if (!m_segacd) m_version_hi_nibble |= 0x20; } @@ -728,7 +728,7 @@ static MACHINE_CONFIG_START( mdj_scd, md_cons_state ) MCFG_SCREEN_VBLANK_DRIVER(md_cons_state, screen_eof_console) MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_JAPAN, 0) - + MCFG_CDROM_ADD( "cdrom",scd_cdrom ) MCFG_SOFTWARE_LIST_ADD("cd_list","megacdj") diff --git a/src/mess/drivers/mes.c b/src/mess/drivers/mes.c index f822ef2f88a..9674d45c1ec 100644 --- a/src/mess/drivers/mes.c +++ b/src/mess/drivers/mes.c @@ -117,7 +117,7 @@ static MACHINE_CONFIG_START( mes, mes_state ) MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/micronic.c b/src/mess/drivers/micronic.c index fa5799d0b16..7d7290897a4 100644 --- a/src/mess/drivers/micronic.c +++ b/src/mess/drivers/micronic.c @@ -376,8 +376,8 @@ static MACHINE_CONFIG_START( micronic, micronic_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("224K") - MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", micronic_state, nvram_init) // base ram - MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram2", micronic_state, nvram_init) // additional ram banks + MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", micronic_state, nvram_init) // base ram + MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram2", micronic_state, nvram_init) // additional ram banks MCFG_MC146818_ADD( MC146818_TAG, XTAL_32_768kHz ) MCFG_MC146818_IRQ_HANDLER(WRITELINE(micronic_state, mc146818_irq)) diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index 4a19c085271..b09a9ae217f 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -215,7 +215,7 @@ static MACHINE_CONFIG_START( mirage, mirage_state ) MCFG_ES5503_OUTPUT_CHANNELS(2) MCFG_ES5503_IRQ_FUNC(WRITELINE(mirage_state, mirage_doc_irq)) MCFG_ES5503_ADC_FUNC(READ8(mirage_state, mirage_adc_read)) - + MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mess/drivers/mk85.c b/src/mess/drivers/mk85.c index 36e5b6ce4bb..31c3c23d8e3 100644 --- a/src/mess/drivers/mk85.c +++ b/src/mess/drivers/mk85.c @@ -74,7 +74,7 @@ static MACHINE_CONFIG_START( mk85, mk85_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(mk85_state, screen_update_mk85) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/mk90.c b/src/mess/drivers/mk90.c index 5a561ebc3b8..c3309486fd2 100644 --- a/src/mess/drivers/mk90.c +++ b/src/mess/drivers/mk90.c @@ -79,7 +79,7 @@ static MACHINE_CONFIG_START( mk90, mk90_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(mk90_state, screen_update_mk90) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/modellot.c b/src/mess/drivers/modellot.c index 7fb4f04d2ba..229a4fa2c3a 100644 --- a/src/mess/drivers/modellot.c +++ b/src/mess/drivers/modellot.c @@ -167,10 +167,10 @@ static MACHINE_CONFIG_START( modellot, modellot_state ) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*16-1) MCFG_SCREEN_UPDATE_DRIVER(modellot_state, screen_update_modellot) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", modellot ) MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") - + /* Devices */ MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf) MACHINE_CONFIG_END diff --git a/src/mess/drivers/molecular.c b/src/mess/drivers/molecular.c index 59cc8de483d..6a6f47e954f 100644 --- a/src/mess/drivers/molecular.c +++ b/src/mess/drivers/molecular.c @@ -88,7 +88,7 @@ public: UINT8 app_ram_enable; UINT8 file_ram_enable; - + DECLARE_PALETTE_INIT(molecula); protected: diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c index d150ddbca3a..1c8aa6d1266 100644 --- a/src/mess/drivers/msx.c +++ b/src/mess/drivers/msx.c @@ -1029,7 +1029,7 @@ INPUT_PORTS_END static const ay8910_interface msx_ay8910_interface = { - AY8910_SINGLE_OUTPUT, + AY8910_SINGLE_OUTPUT, AY8910_DEFAULT_LOADS, DEVCB_DRIVER_MEMBER(msx_state, msx_psg_port_a_r), DEVCB_DRIVER_MEMBER(msx_state, msx_psg_port_b_r), @@ -1191,7 +1191,7 @@ static MACHINE_CONFIG_START( msx2, msx_state ) MCFG_SCREEN_UPDATE_DEVICE("v9938", v9938_device, screen_update) MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, 262*2) MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1) - MCFG_SCREEN_PALETTE("v9938:palette") + MCFG_SCREEN_PALETTE("v9938:palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mess/drivers/multi16.c b/src/mess/drivers/multi16.c index 213e1fb522c..2887d6972d0 100644 --- a/src/mess/drivers/multi16.c +++ b/src/mess/drivers/multi16.c @@ -18,7 +18,7 @@ public: m_maincpu(*this, "maincpu"), m_pic(*this, "pic8259"), m_crtc(*this, "crtc"), - m_palette(*this, "palette") + m_palette(*this, "palette") , m_p_vram(*this, "p_vram"){ } @@ -171,7 +171,7 @@ static MACHINE_CONFIG_START( multi16, multi16_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1) MCFG_SCREEN_UPDATE_DRIVER(multi16_state, screen_update_multi16) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 8) /* Devices */ diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c index 7add8866d0c..f8cbaf630fb 100644 --- a/src/mess/drivers/multi8.c +++ b/src/mess/drivers/multi8.c @@ -674,7 +674,7 @@ static MACHINE_CONFIG_START( multi8, multi8_state ) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) MCFG_SCREEN_UPDATE_DRIVER(multi8_state, screen_update_multi8) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(multi8_state, multi8) MCFG_GFXDECODE_ADD("gfxdecode", "palette", multi8) diff --git a/src/mess/drivers/mx2178.c b/src/mess/drivers/mx2178.c index 24b3b77a1be..0a809669419 100644 --- a/src/mess/drivers/mx2178.c +++ b/src/mess/drivers/mx2178.c @@ -52,7 +52,7 @@ private: UINT8 m_term_data; required_device m_maincpu; required_device m_acia; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c index b787756d52b..fd64e59cb91 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -286,7 +286,7 @@ static MACHINE_CONFIG_START( myb3k, myb3k_state ) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) MCFG_SCREEN_UPDATE_DRIVER(myb3k_state, screen_update_myb3k) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", myb3k) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index 4e720f0d2b9..e490cb7c91a 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -118,8 +118,8 @@ private: required_device m_floppy1; required_device m_audio; required_device m_rtc; -public: - required_device m_palette; +public: + required_device m_palette; }; diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index 96168b24fa5..75669834be4 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -71,7 +71,7 @@ public: m_pit(*this, "pit"), m_beeper(*this, "beeper"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; @@ -2127,7 +2127,7 @@ static MACHINE_CONFIG_START( mz2500, mz2500_state ) MCFG_Z80SIO0_ADD( "z80sio", 6000000, mz2500_sio_intf ) MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz) MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(mz2500_state, mz2500_rtc_alarm_irq)) - + MCFG_DEVICE_ADD("pit", PIT8253, 0) MCFG_PIT8253_CLK0(31250) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mz2500_state, pit8253_clk0_irq)) diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c index abc7d1423a4..a9635cdd920 100644 --- a/src/mess/drivers/mz3500.c +++ b/src/mess/drivers/mz3500.c @@ -50,7 +50,7 @@ public: m_fdc(*this, "upd765a"), m_video_ram(*this, "video_ram"), m_beeper(*this, "beeper"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } // devices @@ -837,7 +837,7 @@ static MACHINE_CONFIG_START( mz3500, mz3500_state ) MCFG_DEVICE_ADD("upd7220_chr", UPD7220, MAIN_CLOCK/5) MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(mz3500_state, hgdc_draw_text) - MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_gfx", upd7220_device, ext_sync_w)) + MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_gfx", upd7220_device, ext_sync_w)) MCFG_DEVICE_ADD("upd7220_gfx", UPD7220, MAIN_CLOCK/5) MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c index cde88d07e37..3b62320d44b 100644 --- a/src/mess/drivers/mz700.c +++ b/src/mess/drivers/mz700.c @@ -366,7 +366,7 @@ static MACHINE_CONFIG_START( mz700, mz_state ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mz_state, pit_irq_2)) MCFG_I8255_ADD("ppi8255", mz700_ppi8255_interface) - + MCFG_DEVICE_ADD("ls145", TTL74145, 0) MCFG_CASSETTE_ADD( "cassette", mz700_cassette_interface ) diff --git a/src/mess/drivers/mz80.c b/src/mess/drivers/mz80.c index ef729267c6c..b6dc56a39dc 100644 --- a/src/mess/drivers/mz80.c +++ b/src/mess/drivers/mz80.c @@ -290,7 +290,7 @@ static MACHINE_CONFIG_START( mz80k, mz80_state ) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199) MCFG_SCREEN_UPDATE_DRIVER(mz80_state, screen_update_mz80k) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", mz80k) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/nakajies.c b/src/mess/drivers/nakajies.c index 99a90295946..3d024d46a95 100644 --- a/src/mess/drivers/nakajies.c +++ b/src/mess/drivers/nakajies.c @@ -745,7 +745,7 @@ static MACHINE_CONFIG_START( nakajies210, nakajies_state ) MCFG_SCREEN_SIZE( 80 * 6, 8 * 8 ) MCFG_SCREEN_VISIBLE_AREA( 0, 6 * 80 - 1, 0, 8 * 8 - 1 ) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", wales210) MCFG_PALETTE_ADD( "palette", 2 ) MCFG_PALETTE_INIT_OWNER(nakajies_state, nakajies) diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c index bb69ecb615c..dff1106ef5d 100644 --- a/src/mess/drivers/nanos.c +++ b/src/mess/drivers/nanos.c @@ -570,7 +570,7 @@ static MACHINE_CONFIG_START( nanos, nanos_state ) MCFG_SCREEN_SIZE(80*8, 25*10) MCFG_SCREEN_VISIBLE_AREA(0,80*8-1,0,25*10-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", nanos) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c index 83bc8f021b2..c8c24c7043b 100644 --- a/src/mess/drivers/nc.c +++ b/src/mess/drivers/nc.c @@ -1417,7 +1417,7 @@ static MACHINE_CONFIG_START( nc100, nc_state ) MCFG_PALETTE_ADD("palette", NC_NUM_COLOURS) MCFG_PALETTE_INIT_OWNER(nc_state, nc) - + MCFG_DEFAULT_LAYOUT(layout_lcd) /* sound hardware */ @@ -1484,7 +1484,7 @@ static MACHINE_CONFIG_DERIVED( nc200, nc100 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(NC200_SCREEN_WIDTH, NC200_SCREEN_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0, NC200_SCREEN_WIDTH-1, 0, NC200_SCREEN_HEIGHT-1) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(NC200_NUM_COLOURS) MCFG_PALETTE_INIT_OWNER(nc_state, nc) diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c index b9a05604825..f57bca04e8f 100644 --- a/src/mess/drivers/ng_aes.c +++ b/src/mess/drivers/ng_aes.c @@ -1346,7 +1346,7 @@ static INPUT_PORTS_START( aes ) PORT_START("JP") // JP1 and JP2 are jumpers or solderpads depending on AES board revision, intended for use on the Development BIOS PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Short JP1 (Debug Monitor)") PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, ng_aes_state, aes_jp1, 0) -// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) // what is JP2 for? somehow related to system reset, disable watchdog? +// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) // what is JP2 for? somehow related to system reset, disable watchdog? INPUT_PORTS_END INPUT_CHANGED_MEMBER(ng_aes_state::aes_jp1) diff --git a/src/mess/drivers/ngp.c b/src/mess/drivers/ngp.c index 5ffcfb91fba..c50f2a18355 100644 --- a/src/mess/drivers/ngp.c +++ b/src/mess/drivers/ngp.c @@ -841,7 +841,7 @@ static MACHINE_CONFIG_DERIVED( ngp, ngp_common ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_PALETTE("k1ge:palette") - + MCFG_CARTSLOT_ADD("cart") MCFG_CARTSLOT_EXTENSION_LIST("bin,ngp,npc,ngc") MCFG_CARTSLOT_NOT_MANDATORY @@ -860,7 +860,7 @@ static MACHINE_CONFIG_DERIVED( ngpc, ngp_common ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_PALETTE("k1ge:palette") - + MCFG_CARTSLOT_ADD("cart") MCFG_CARTSLOT_EXTENSION_LIST("bin,ngp,npc,ngc") MCFG_CARTSLOT_NOT_MANDATORY diff --git a/src/mess/drivers/octopus.c b/src/mess/drivers/octopus.c index 3d26bd37456..8d82424ab46 100644 --- a/src/mess/drivers/octopus.c +++ b/src/mess/drivers/octopus.c @@ -178,7 +178,7 @@ static MACHINE_CONFIG_START( octopus, octopus_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(octopus_state, screen_update_octopus) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/odyssey2.c b/src/mess/drivers/odyssey2.c index e0e70cee1d2..ffaa160d930 100644 --- a/src/mess/drivers/odyssey2.c +++ b/src/mess/drivers/odyssey2.c @@ -867,7 +867,7 @@ static MACHINE_CONFIG_START( odyssey3, g7400_state ) MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", odyssey2 ) + MCFG_GFXDECODE_ADD("gfxdecode", "palette", odyssey2 ) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(g7400_state, g7400) diff --git a/src/mess/drivers/p2000t.c b/src/mess/drivers/p2000t.c index fa0f7fc2706..cab5c61b6aa 100644 --- a/src/mess/drivers/p2000t.c +++ b/src/mess/drivers/p2000t.c @@ -257,7 +257,7 @@ static MACHINE_CONFIG_START( p2000m, p2000t_state ) MCFG_VIDEO_START_OVERRIDE(p2000t_state,p2000m) MCFG_SCREEN_UPDATE_DRIVER(p2000t_state, screen_update_p2000m) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", p2000m ) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(p2000t_state,p2000m) diff --git a/src/mess/drivers/palm.c b/src/mess/drivers/palm.c index a4bad426687..46d60af64cb 100644 --- a/src/mess/drivers/palm.c +++ b/src/mess/drivers/palm.c @@ -201,7 +201,7 @@ static MACHINE_CONFIG_START( palm, palm_state ) MCFG_SCREEN_VISIBLE_AREA( 0, 159, 0, 219 ) MCFG_SCREEN_UPDATE_DEVICE(MC68328_TAG, mc68328_device, screen_update) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD( "palette", 2 ) MCFG_PALETTE_INIT_OWNER(palm_state, palm) MCFG_DEFAULT_LAYOUT(layout_lcd) diff --git a/src/mess/drivers/paso1600.c b/src/mess/drivers/paso1600.c index 1b0095168f4..0614d48370a 100644 --- a/src/mess/drivers/paso1600.c +++ b/src/mess/drivers/paso1600.c @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START( paso1600, paso1600_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(paso1600_state, screen_update_paso1600) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", paso1600) MCFG_PALETTE_ADD("palette", 8) // MCFG_PALETTE_INIT(black_and_white) diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c index 6112e454d6d..d5bcd3b90d5 100644 --- a/src/mess/drivers/pasopia7.c +++ b/src/mess/drivers/pasopia7.c @@ -45,7 +45,7 @@ public: m_floppy(*this, "fdc:0:525hd"), m_sn1(*this, "sn1"), m_sn2(*this, "sn2"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; @@ -60,7 +60,7 @@ public: required_device m_sn1; required_device m_sn2; required_device m_palette; - + DECLARE_READ8_MEMBER(vram_r); DECLARE_WRITE8_MEMBER(vram_w); DECLARE_WRITE8_MEMBER(pasopia7_memory_ctrl_w); @@ -1017,7 +1017,7 @@ static MACHINE_CONFIG_DERIVED( p7_raster, p7_base ) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 32-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_VIDEO_START_OVERRIDE(pasopia7_state,pasopia7) MCFG_SCREEN_UPDATE_DRIVER(pasopia7_state, screen_update_pasopia7) MCFG_PALETTE_ADD("palette", 8) @@ -1037,7 +1037,7 @@ static MACHINE_CONFIG_DERIVED( p7_lcd, p7_base ) MCFG_VIDEO_START_OVERRIDE(pasopia7_state,pasopia7) MCFG_SCREEN_UPDATE_DRIVER(pasopia7_state, screen_update_pasopia7) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(pasopia7_state,p7_lcd) MCFG_GFXDECODE_ADD("gfxdecode", "palette", pasopia7 ) diff --git a/src/mess/drivers/pb1000.c b/src/mess/drivers/pb1000.c index 2023eff95e2..00421f4093c 100644 --- a/src/mess/drivers/pb1000.c +++ b/src/mess/drivers/pb1000.c @@ -514,7 +514,7 @@ static MACHINE_CONFIG_START( pb1000, pb1000_state ) MCFG_SCREEN_SIZE(192, 32) MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 32-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pb1000_state, pb1000) diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 51e93f05786..3004e22d813 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -246,7 +246,7 @@ static MACHINE_CONFIG_START( zenith, pc_state ) MCFG_IBM5150_MOTHERBOARD_ADD("mb", "maincpu") MCFG_DEVICE_INPUT_DEFAULTS(pccga) - + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false) diff --git a/src/mess/drivers/pc100.c b/src/mess/drivers/pc100.c index 5c479ba0c63..164d69a6df1 100644 --- a/src/mess/drivers/pc100.c +++ b/src/mess/drivers/pc100.c @@ -73,7 +73,7 @@ public: m_maincpu(*this, "maincpu"), m_beeper(*this, "beeper"), m_rtc_portc(0), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -534,7 +534,7 @@ static MACHINE_CONFIG_START( pc100, pc100_state ) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*4, 1024, 0, 768, 264*2, 0, 512) MCFG_SCREEN_UPDATE_DRIVER(pc100_state, screen_update_pc100) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc100) MCFG_PALETTE_ADD("palette", 16) // MCFG_PALETTE_INIT(black_and_white) diff --git a/src/mess/drivers/pc1500.c b/src/mess/drivers/pc1500.c index 69bb6d67304..633b11c360c 100644 --- a/src/mess/drivers/pc1500.c +++ b/src/mess/drivers/pc1500.c @@ -277,7 +277,7 @@ static MACHINE_CONFIG_START( pc1500, pc1500_state ) MCFG_SCREEN_SIZE(156, 8) MCFG_SCREEN_VISIBLE_AREA(0, 156-1, 0, 7-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_pc1500) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc1500_state, pc1500) diff --git a/src/mess/drivers/pc4.c b/src/mess/drivers/pc4.c index 6fba9d6a566..dc993fa4e4b 100644 --- a/src/mess/drivers/pc4.c +++ b/src/mess/drivers/pc4.c @@ -225,7 +225,7 @@ static MACHINE_CONFIG_START( pc4, pc4_state ) MCFG_SCREEN_SIZE(240, 36) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 36-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc4_state, pc4) diff --git a/src/mess/drivers/pc6001.c b/src/mess/drivers/pc6001.c index 86fcd0febca..6537f161e8b 100644 --- a/src/mess/drivers/pc6001.c +++ b/src/mess/drivers/pc6001.c @@ -2367,7 +2367,7 @@ static MACHINE_CONFIG_DERIVED( pc6001m2, pc6001 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(pc6001_state, screen_update_pc6001m2) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(16+16) MCFG_PALETTE_INIT_OWNER(pc6001_state,pc6001m2) diff --git a/src/mess/drivers/pc8001.c b/src/mess/drivers/pc8001.c index 7bd0558209a..287b824de84 100644 --- a/src/mess/drivers/pc8001.c +++ b/src/mess/drivers/pc8001.c @@ -547,7 +547,7 @@ static MACHINE_CONFIG_START( pc8001, pc8001_state ) MCFG_I8255A_ADD(I8255A_TAG, ppi_intf) MCFG_I8257_ADD(I8257_TAG, 4000000, dmac_intf) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NULL, NULL) - + MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, 14318180) MCFG_UPD3301_CHARACTER_WIDTH(8) MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels) diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index fe6cb6d8fc2..813884feb60 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -310,7 +310,7 @@ public: m_beeper(*this, "beeper"), m_opna(*this, "opna"), m_opn(*this, "opn"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; @@ -322,7 +322,7 @@ public: required_device m_opna; required_device m_opn; required_device m_palette; - + UINT8 *m_work_ram; UINT8 *m_hi_work_ram; UINT8 *m_ext_work_ram; @@ -2644,7 +2644,7 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state ) MCFG_I8255_ADD( "d8255_slave", slave_fdd_intf ) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("fdccpu", INPUT_LINE_IRQ0)) + MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("fdccpu", INPUT_LINE_IRQ0)) #ifdef USE_PROPER_I8214 MCFG_I8214_ADD(I8214_TAG, MASTER_CLOCK, pic_intf) diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index 7b5c101a3a1..a4ac14489d7 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -452,7 +452,7 @@ public: m_beeper(*this, "beeper"), m_ram(*this, RAM_TAG), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -683,8 +683,8 @@ public: DECLARE_WRITE8_MEMBER(pc9821_ext2_video_ff_w); DECLARE_FLOPPY_FORMATS( floppy_formats ); - UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); - UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); + UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); + UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); private: UINT8 m_sdip_read(UINT16 port, UINT8 sdip_offset); @@ -726,8 +726,8 @@ public: DECLARE_WRITE8_MEMBER(ppi_fdd_portc_w); DECLARE_WRITE_LINE_MEMBER(fdc_2dd_irq); - DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_irq); - DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_drq); + DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_irq); + DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_drq); DECLARE_READ8_MEMBER(ppi_mouse_porta_r); DECLARE_WRITE8_MEMBER(ppi_mouse_porta_w); @@ -3566,8 +3566,8 @@ WRITE_LINE_MEMBER( pc9801_state::keyboard_irq ) } static MACHINE_CONFIG_FRAGMENT( pc9801_keyboard ) - MCFG_DEVICE_ADD("keyb", PC9801_KBD, 53) - MCFG_PC9801_KBD_IRQ_CALLBACK(WRITELINE(pc9801_state, keyboard_irq)) + MCFG_DEVICE_ADD("keyb", PC9801_KBD, 53) + MCFG_PC9801_KBD_IRQ_CALLBACK(WRITELINE(pc9801_state, keyboard_irq)) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( pc9801_mouse ) @@ -3627,11 +3627,11 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state ) MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0) MCFG_UPD765A_ADD("upd765_2hd", false, true) - MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w)) - MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq2_w)) MCFG_DEVCB_INVERT + MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w)) + MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq2_w)) MCFG_DEVCB_INVERT MCFG_UPD765A_ADD("upd765_2dd", false, true) - MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc9801_state, fdc_2dd_irq)) - MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq3_w)) MCFG_DEVCB_INVERT + MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc9801_state, fdc_2dd_irq)) + MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq3_w)) MCFG_DEVCB_INVERT MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) @@ -3654,14 +3654,14 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state ) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1) - MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 5000000/2) - MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) - MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text) - MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w)) + MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 5000000/2) + MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) + MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text) + MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w)) - MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 5000000/2) - MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) - MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(pc9801_state, hgdc_display_pixels) + MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 5000000/2) + MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) + MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(pc9801_state, hgdc_display_pixels) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(pc9801_state,pc9801) @@ -3711,8 +3711,8 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state ) MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0) MCFG_UPD765A_ADD("upd765_2hd", false, true) - MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc9801_state, pc9801rs_fdc_irq)) - MCFG_UPD765_DRQ_CALLBACK(WRITELINE(pc9801_state, pc9801rs_fdc_drq)) + MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc9801_state, pc9801rs_fdc_irq)) + MCFG_UPD765_DRQ_CALLBACK(WRITELINE(pc9801_state, pc9801rs_fdc_drq)) //"upd765_2dd" MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats) @@ -3732,14 +3732,14 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state ) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1) - MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 5000000/2) - MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) - MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text) - MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w)) + MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 5000000/2) + MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) + MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text) + MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w)) - MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 5000000/2) - MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) - MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(pc9801_state, hgdc_display_pixels) + MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 5000000/2) + MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) + MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(pc9801_state, hgdc_display_pixels) MCFG_PALETTE_ADD("palette", 16+16) MCFG_PALETTE_INIT_OWNER(pc9801_state,pc9801) @@ -3803,8 +3803,8 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state ) MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0) MCFG_UPD765A_ADD("upd765_2hd", false, true) - MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w)) - MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq2_w)) MCFG_DEVCB_INVERT + MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w)) + MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq2_w)) MCFG_DEVCB_INVERT //"upd765_2dd" MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats) @@ -3824,14 +3824,14 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state ) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1) - MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 5000000/2) - MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) - MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text) - MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w)) + MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 5000000/2) + MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map) + MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text) + MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w)) - MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 5000000/2) - MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) - MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(pc9801_state, hgdc_display_pixels) + MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 5000000/2) + MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map) + MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(pc9801_state, hgdc_display_pixels) MCFG_PALETTE_ADD("palette", 16+16+256) MCFG_PALETTE_INIT_OWNER(pc9801_state,pc9801) diff --git a/src/mess/drivers/pcm.c b/src/mess/drivers/pcm.c index d8316d26785..5df17f0ae78 100644 --- a/src/mess/drivers/pcm.c +++ b/src/mess/drivers/pcm.c @@ -327,7 +327,7 @@ static MACHINE_CONFIG_START( pcm, pcm_state ) MCFG_SCREEN_SIZE(64*8, 16*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcm) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c index f8d137705ec..f8663206498 100644 --- a/src/mess/drivers/pcw16.c +++ b/src/mess/drivers/pcw16.c @@ -1081,7 +1081,7 @@ static MACHINE_CONFIG_START( pcw16, pcw16_state ) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_INTEL_E28F008SA_ADD("flash0") MCFG_INTEL_E28F008SA_ADD("flash1") - + MCFG_AT_KEYB_ADD("at_keyboard", 3, WRITELINE(pcw16_state, pcw16_keyboard_callback)) /* video ints */ diff --git a/src/mess/drivers/pda600.c b/src/mess/drivers/pda600.c index 0c1b0ec2bf8..3dcb83840ba 100644 --- a/src/mess/drivers/pda600.c +++ b/src/mess/drivers/pda600.c @@ -209,7 +209,7 @@ static MACHINE_CONFIG_START( pda600, pda600_state ) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 320-1) MCFG_SCREEN_UPDATE_DRIVER( pda600_state, screen_update ) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", pda600) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/pentagon.c b/src/mess/drivers/pentagon.c index 0df2d18d731..525c55ec6bd 100644 --- a/src/mess/drivers/pentagon.c +++ b/src/mess/drivers/pentagon.c @@ -160,7 +160,7 @@ INTERRUPT_GEN_MEMBER(pentagon_state::pentagon_interrupt) } static ADDRESS_MAP_START (pentagon_io, AS_IO, 8, pentagon_state ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x0000) AM_WRITE(pentagon_port_7ffd_w) AM_MIRROR(0x7ffd) // (A15 | A1) == 0 + AM_RANGE(0x0000, 0x0000) AM_WRITE(pentagon_port_7ffd_w) AM_MIRROR(0x7ffd) // (A15 | A1) == 0 AM_RANGE(0x001f, 0x001f) AM_DEVREADWRITE(BETA_DISK_TAG, beta_disk_device, status_r, command_w) AM_MIRROR(0xff00) AM_RANGE(0x003f, 0x003f) AM_DEVREADWRITE(BETA_DISK_TAG, beta_disk_device, track_r, track_w) AM_MIRROR(0xff00) AM_RANGE(0x005f, 0x005f) AM_DEVREADWRITE(BETA_DISK_TAG, beta_disk_device, sector_r, sector_w) AM_MIRROR(0xff00) diff --git a/src/mess/drivers/phc25.c b/src/mess/drivers/phc25.c index 8d6542a8521..734e8d2e84c 100644 --- a/src/mess/drivers/phc25.c +++ b/src/mess/drivers/phc25.c @@ -266,7 +266,7 @@ READ8_MEMBER( phc25_state::video_ram_r ) { return m_video_ram[offset]; } - else // text + else // text { offset &= 0x7ff; m_vdg->inv_w(BIT(m_video_ram[offset | 0x800], 0)); // cursor attribute diff --git a/src/mess/drivers/phunsy.c b/src/mess/drivers/phunsy.c index adc44076f69..31d589908a7 100644 --- a/src/mess/drivers/phunsy.c +++ b/src/mess/drivers/phunsy.c @@ -15,7 +15,7 @@ The tape must already be playing the leader when you press the Enter key, or it errors immediately. - Rom banking (in U bank): + Rom banking (in U bank): 0U: RAM 1U: MDCR program 2U: Disassembler @@ -110,7 +110,7 @@ WRITE8_MEMBER( phunsy_state::phunsy_ctrl_w ) // U-bank data >>= 4; - if (data < 4) + if (data < 4) membank("bankru")->set_entry(data); } @@ -354,7 +354,7 @@ static MACHINE_CONFIG_START( phunsy, phunsy_state ) MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz, 480, 0, 64*6, 313, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(phunsy_state, screen_update) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", phunsy) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(phunsy_state, phunsy) diff --git a/src/mess/drivers/pipbug.c b/src/mess/drivers/pipbug.c index 1810c93f3cc..06e3452e406 100644 --- a/src/mess/drivers/pipbug.c +++ b/src/mess/drivers/pipbug.c @@ -71,7 +71,7 @@ static ADDRESS_MAP_START(pipbug_mem, AS_PROGRAM, 8, pipbug_state) ADDRESS_MAP_END static ADDRESS_MAP_START(pipbug_io, AS_IO, 8, pipbug_state) -// ADDRESS_MAP_UNMAP_HIGH +// ADDRESS_MAP_UNMAP_HIGH AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_WRITE(pipbug_ctrl_w) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READNOP // this has to return zero or the parameter to write_sense is ignored ADDRESS_MAP_END diff --git a/src/mess/drivers/plan80.c b/src/mess/drivers/plan80.c index 3c8857610eb..fcb206c2241 100644 --- a/src/mess/drivers/plan80.c +++ b/src/mess/drivers/plan80.c @@ -242,7 +242,7 @@ static MACHINE_CONFIG_START( plan80, plan80_state ) MCFG_SCREEN_SIZE(48*6, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 48*6-1, 0, 32*8-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", plan80) MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/plus4.c b/src/mess/drivers/plus4.c index b971905b08b..a259f8beb6a 100644 --- a/src/mess/drivers/plus4.c +++ b/src/mess/drivers/plus4.c @@ -690,7 +690,7 @@ void plus4_state::machine_start() { m_acia->write_cts(0); } - + m_spi_kb->write_p0(1); m_spi_kb->write_p1(1); m_spi_kb->write_p2(1); diff --git a/src/mess/drivers/pocketc.c b/src/mess/drivers/pocketc.c index a1312a1040f..01414be1f2b 100644 --- a/src/mess/drivers/pocketc.c +++ b/src/mess/drivers/pocketc.c @@ -769,7 +769,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( pc1250, pocketc, pc1251_state ) MCFG_SC61860_READ_B_HANDLER(READ8(pc1251_state,pc1251_inb)) MCFG_SC61860_WRITE_B_HANDLER(WRITE8(pc1251_state,pc1251_outb)) MCFG_SC61860_WRITE_C_HANDLER(WRITE8(pc1251_state,pc1251_outc)) - + /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(608, 300) diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index efd70d36ce5..6131e182ee9 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -844,7 +844,7 @@ static MACHINE_CONFIG_START( portfolio, portfolio_state ) MCFG_SCREEN_SIZE(240, 64) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 64-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) diff --git a/src/mess/drivers/pp01.c b/src/mess/drivers/pp01.c index e7945d0e07a..39e2a210c71 100644 --- a/src/mess/drivers/pp01.c +++ b/src/mess/drivers/pp01.c @@ -209,7 +209,7 @@ static MACHINE_CONFIG_START( pp01, pp01_state ) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) MCFG_SCREEN_UPDATE_DRIVER(pp01_state, screen_update_pp01) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(pp01_state, pp01) diff --git a/src/mess/drivers/psion.c b/src/mess/drivers/psion.c index e88adf55c95..4ee5413a0aa 100644 --- a/src/mess/drivers/psion.c +++ b/src/mess/drivers/psion.c @@ -388,7 +388,7 @@ void psion_state::machine_start() m_nvram2->set_base(m_ram, m_ram.bytes()); if (m_nvram3) m_nvram3->set_base(m_paged_ram, m_ram_bank_count * 0x4000); - + save_item(NAME(m_kb_counter)); save_item(NAME(m_enable_nmi)); save_item(NAME(m_tcsr_value)); @@ -467,7 +467,7 @@ static MACHINE_CONFIG_START( psion_2lines, psion_state ) MCFG_SCREEN_SIZE(6*16, 9*2) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(psion_state, psion) @@ -481,7 +481,7 @@ static MACHINE_CONFIG_START( psion_2lines, psion_state ) MCFG_SOUND_ADD( "beeper", BEEP, 0 ) MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) - MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", psion_state, nvram_init) // sys_regs + MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", psion_state, nvram_init) // sys_regs MCFG_NVRAM_ADD_0FILL("nvram2") // RAM MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", psion_state, nmi_timer, attotime::from_seconds(1)) diff --git a/src/mess/drivers/psx.c b/src/mess/drivers/psx.c index 81ad974a183..b248a8926d7 100644 --- a/src/mess/drivers/psx.c +++ b/src/mess/drivers/psx.c @@ -623,7 +623,7 @@ ROM_START( psu ) ROM_FILL( 0x0400, 0x0c00, 0xff ) ROM_LOAD( "scea.ic304", 0x001000, 0x004000, CRC(82729934) SHA1(7d5f52eb9df1243dcdab32cb763a9eb6a22706d7) ) ROM_FILL( 0x5000, 0xae00, 0xff ) - ROM_LOAD( "test.ic304", 0x00fe00, 0x000200, CRC(3b2f8041) SHA1(d7127cb4a9b5efe9deffab3b72ab4451cb30675b) ) + ROM_LOAD( "test.ic304", 0x00fe00, 0x000200, CRC(3b2f8041) SHA1(d7127cb4a9b5efe9deffab3b72ab4451cb30675b) ) ROM_END ROM_START( pse ) diff --git a/src/mess/drivers/pt68k4.c b/src/mess/drivers/pt68k4.c index b94f9ad3871..1f958142431 100644 --- a/src/mess/drivers/pt68k4.c +++ b/src/mess/drivers/pt68k4.c @@ -8,38 +8,38 @@ 2013-09-30 Connected to a terminal 2014-01-03 Connect real DUARTs, FDC, and TimeKeeper. Settings now save properly, floppies can be read. 2014-01-19 ISA bus and compatible cards, PC keyboard support, speaker support - + This has the appearance of a PC, including pc power supply, slots, etc on a conventional pc-like motherboard and case. Some pics: http://www.wormfood.net/old_computers/ -Chips: +Chips: 68230 Parallel Interface/Timer @ FE0081 68681 DUART/Timer (x2) @ FE0001 and FE0041 WD37C65 FDC (PC FDC compatible, even mapped as an ISA device) MK48T02 TimeKeeper @ odd bytes from FF0001 to FF0FFF. even bytes in that range are a standard SRAM chip which is not backed up. Keyboard at FE01C1 (status/IRQ clear)/FE01C3 (AT scan codes) WD1002 HDD controller @ FE0141-FE014F. "Monk" BIOS also supports an 8-bit ISA IDE card. - + Video: ISA MDA or CGA/EGA/VGA-style boards ISA memory is C00001-DFFFFF odd bytes only. So the MDA B0000 framebuffer becames (B0000*2) + C00001 = D60001. ISA I/O is at FA0001-FBFFFF odd bytes only, and the mapping is similar. - + HUMBUG BIOS tests MDA and CGA VRAM to determine existence, falls back to serial console if neither exists. If both exist, MDA is used. VRAM is every other byte for ISA cards. (Only 8 bit cards are supported). - + OP3 on DUART1 drives a speaker. IP2 on DUART1 signals if a new keyboard scan code is available. - -IRQs: + +IRQs: 2: 68230 PIT 4: DUART2 5: DUART1 6: PC FDC IRQ - + TODO: 68230 device. Better hardware documentation would be nice too, and working OS disks. - + ****************************************************************************/ #include "emu.h" @@ -55,9 +55,9 @@ TODO: 68230 device. Better hardware documentation would be nice too, and workin #include "sound/speaker.h" #define M68K_TAG "maincpu" -#define DUART1_TAG "duart1" -#define DUART2_TAG "duart2" -#define TIMEKEEPER_TAG "timekpr" +#define DUART1_TAG "duart1" +#define DUART2_TAG "duart2" +#define TIMEKEEPER_TAG "timekpr" #define ISABUS_TAG "isa" #define KBDC_TAG "pc_kbdc" #define SPEAKER_TAG "speaker" @@ -109,7 +109,7 @@ private: // XT keyboard interface - done in TTL instead of an 804x WRITE_LINE_MEMBER(pt68k4_state::keyboard_clock_w) { -// printf("KCLK: %d\n", state ? 1 : 0); +// printf("KCLK: %d\n", state ? 1 : 0); // rising edge? if ((state == ASSERT_LINE) && (!m_kclk)) @@ -123,7 +123,7 @@ WRITE_LINE_MEMBER(pt68k4_state::keyboard_clock_w) // stop bit? if (m_kbit == 9) { -// printf("scancode %02x\n", m_scancode); +// printf("scancode %02x\n", m_scancode); m_kbit = 0; m_kbdflag = 0x80; m_duart1->ip2_w(CLEAR_LINE); @@ -139,7 +139,7 @@ WRITE_LINE_MEMBER(pt68k4_state::keyboard_clock_w) WRITE_LINE_MEMBER(pt68k4_state::keyboard_data_w) { -// printf("KDATA: %d\n", state ? 1 : 0); +// printf("KDATA: %d\n", state ? 1 : 0); m_kdata = (state == ASSERT_LINE) ? 0x80 : 0x00; } @@ -228,11 +228,11 @@ SLOT_INTERFACE_START( pt68k4_isa8_cards ) SLOT_INTERFACE("mda", ISA8_MDA) SLOT_INTERFACE("cga", ISA8_CGA) SLOT_INTERFACE("ega", ISA8_EGA) // Monk only - SLOT_INTERFACE("vga", ISA8_VGA) // Monk only + SLOT_INTERFACE("vga", ISA8_VGA) // Monk only SLOT_INTERFACE("fdc_at", ISA8_FDC_AT) SLOT_INTERFACE("wdxt_gen", ISA8_WDXT_GEN) SLOT_INTERFACE("lpt", ISA8_LPT) - SLOT_INTERFACE("xtide", ISA8_XTIDE) // Monk only + SLOT_INTERFACE("xtide", ISA8_XTIDE) // Monk only SLOT_INTERFACE_END static const isa8bus_interface pt68k4_isabus_intf = @@ -309,4 +309,3 @@ ROM_END /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1990, pt68k4, 0, 0, pt68k4, pt68k4, driver_device, 0, "Peripheral Technology", "PT68K4", GAME_NOT_WORKING ) - diff --git a/src/mess/drivers/ptcsol.c b/src/mess/drivers/ptcsol.c index 707edc72ebc..9f8ef33c02d 100644 --- a/src/mess/drivers/ptcsol.c +++ b/src/mess/drivers/ptcsol.c @@ -758,7 +758,7 @@ static MACHINE_CONFIG_START( sol20, sol20_state ) MCFG_SCREEN_SIZE(576, 208) MCFG_SCREEN_VISIBLE_AREA(0, 575, 0, 207) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", sol20) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c index c3ace56fea7..99489da7efd 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -470,7 +470,7 @@ static MACHINE_CONFIG_START( pv1000, pv1000_state ) MCFG_PALETTE_ADD( "palette", 8 ) MCFG_PALETTE_INIT_OWNER(pv1000_state, pv1000) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", pv1000 ) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mess/drivers/pve500.c b/src/mess/drivers/pve500.c index f3157170c2f..ad5814a255f 100644 --- a/src/mess/drivers/pve500.c +++ b/src/mess/drivers/pve500.c @@ -73,7 +73,7 @@ static Z80CTC_INTERFACE( external_ctc_intf ) static const z80sio_interface external_sio_intf = { DEVCB_NULL, /* interrupt handler */ - DEVCB_NULL, /* DTR changed handler */ + DEVCB_NULL, /* DTR changed handler */ DEVCB_NULL, /* RTS changed handler */ DEVCB_NULL, /* BREAK changed handler */ DEVCB_NULL, /* transmit handler */ @@ -151,7 +151,7 @@ WRITE8_MEMBER(pve500_state::dualport_ram_right_w) { //printf("dualport_ram: Right WRITE\n"); dualport_7FE_data = data; - m_maincpu->ctc_trg1(0); //(INT_Left) + m_maincpu->ctc_trg1(0); //(INT_Left) } READ8_MEMBER(pve500_state::io_expander_r) @@ -203,7 +203,7 @@ WRITE8_MEMBER(pve500_state::io_expander_w) case 128: output_set_digit_value(8*i + 7, io_LD & 0x7F); break; default: /*software should not do it. - any idea how to emulate that in case it does? */ break; + any idea how to emulate that in case it does? */ break; } } } diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index 5114f2e355d..c10316aff21 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -66,7 +66,7 @@ //************************************************************************** class px4_state : public driver_device, - public device_serial_interface + public device_serial_interface { public: px4_state(const machine_config &mconfig, device_type type, const char *tag) : @@ -83,7 +83,7 @@ public: m_isr(0), m_ier(0), m_str(0), m_sior(0xbf), m_artdir(0xff), m_artdor(0xff), m_artsr(0), m_artcr(0), m_swr(0), - m_one_sec_int_enabled(true), m_alarm_int_enabled(true), m_key_int_enabled(true), + m_one_sec_int_enabled(true), m_alarm_int_enabled(true), m_key_int_enabled(true), m_ramdisk_address(0), m_ear_last_state(0) { } diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c index 3561bda5379..88e0f436576 100644 --- a/src/mess/drivers/ql.c +++ b/src/mess/drivers/ql.c @@ -289,9 +289,9 @@ READ8_MEMBER( ql_state::disk_io_r ) case 0x0002 : result=m_fdc->read(space, offset); break; case 0x0003 : result=m_fdc->read(space, offset); break; case 0x000C : if(IS_SANDY_DISK(m_disk_type)) - result = (m_mouse_int ^ MOUSE_DIRX) | m_mouseb->read() | 0x01; break; + result = (m_mouse_int ^ MOUSE_DIRX) | m_mouseb->read() | 0x01; break; case 0x0010 : if(IS_SANDY_DISK(m_disk_type)) - m_mouse_int &= ~MOUSE_INT_MASK; break; + m_mouse_int &= ~MOUSE_INT_MASK; break; default : logerror("%s DiskIO undefined read : from %08X\n",machine().describe_context(),m_disk_io_base+offset); break; } @@ -314,7 +314,7 @@ WRITE8_MEMBER( ql_state::disk_io_w ) case 0x0008 : if(IS_SANDY_DISK(m_disk_type)) sandy_print_char(data); break; case 0x0010 : if(IS_SANDY_DISK(m_disk_type)) - m_mouse_int &= ~MOUSE_INT_MASK; break; + m_mouse_int &= ~MOUSE_INT_MASK; break; case 0x2000 : if(m_disk_type==DISK_TYPE_TRUMP) trump_card_set_control(data);break; default : logerror("%s DiskIO undefined write : %02X to %08X\n",machine().describe_context(),data,m_disk_io_base+offset); break; @@ -382,7 +382,7 @@ void ql_state::sandy_set_control(UINT8 data) if(data & SANDY_PRINTER_INTMASK) m_zx8302->extint_w(ASSERT_LINE); } - + m_disk_io_byte=data; } @@ -390,8 +390,8 @@ void ql_state::sandy_print_char(UINT8 data) { // latch the data until it's strobed out m_printer_char=data; - -// m_centronics->write(data); + +// m_centronics->write(data); } WRITE_LINE_MEMBER( ql_state::sandy_printer_busy ) @@ -423,14 +423,14 @@ WRITE_LINE_MEMBER(ql_state::disk_io_drq_w) void ql_state::mouse_tick() { - UINT8 x = m_mousex->read(); - UINT8 y = m_mousey->read(); - UINT8 do_int = 0; + UINT8 x = m_mousex->read(); + UINT8 y = m_mousey->read(); + UINT8 do_int = 0; //m_mouse_int = 0; // Set X interupt flag and direction if x has changed - if (x > m_ql_mouse_x) + if (x > m_ql_mouse_x) { m_mouse_int |= MOUSE_INTX; m_mouse_int |= MOUSE_DIRX; @@ -442,7 +442,7 @@ void ql_state::mouse_tick() } // Set Y interupt flag and direction if y has changed - if (y > m_ql_mouse_y) + if (y > m_ql_mouse_y) { m_mouse_int |= MOUSE_INTY; m_mouse_int &= ~MOUSE_DIRY; @@ -463,9 +463,9 @@ void ql_state::mouse_tick() do_int = 1; else do_int = IS_SANDY_DISK(m_disk_type) && (m_disk_io_byte & SANDY_MOUSE_INTMASK); - + //logerror("m_mouse_int=%02X, MOUSE_INT_MASK=%02X, m_disk_io_byte=%02X, (m_disk_io_byte & SANDY_MOUSE_INTMASK)=%02x\n",m_mouse_int,MOUSE_INT_MASK,m_disk_io_byte,(m_disk_io_byte & SANDY_MOUSE_INTMASK)); - + // if mouse moved trigger external int if((m_mouse_int & MOUSE_INT_MASK) && do_int) { @@ -477,25 +477,25 @@ READ8_MEMBER( ql_state::qimi_io_r ) { UINT8 result = 0; UINT8 buttons; - + switch (offset) { // 0x1bf9c, button status - case 0x00 : + case 0x00 : buttons = m_mouseb->read(); result = ((buttons & MOUSE_RIGHT) << 2) | ((buttons & MOUSE_LEFT) << 2); break; - + // 0x1bfbc, direction status - case 0x20 : + case 0x20 : result = ((m_mouse_int & MOUSE_INTX) >> 5) | ((m_mouse_int & MOUSE_INTY) >> 1) | - ((m_mouse_int & MOUSE_DIRX) >> 1) | ((m_mouse_int & MOUSE_DIRY) >> 4); + ((m_mouse_int & MOUSE_DIRX) >> 1) | ((m_mouse_int & MOUSE_DIRY) >> 4); break; - case 0x22 : + case 0x22 : m_mouse_int &= ~MOUSE_INT_MASK; break; } - + return result; } @@ -664,24 +664,24 @@ static INPUT_PORTS_START( ql ) PORT_CONFNAME( QIMI_PORT_MASK, QIMI_NONE, "QIMI enabled") PORT_CONFSETTING( QIMI_NONE, "No" ) PORT_CONFSETTING( QIMI_MOUSE, "Yes" ) - + PORT_CONFNAME( DISK_TYPE_MASK, DISK_TYPE_NONE, "Disk interface select" ) PORT_CONFSETTING(DISK_TYPE_NONE, DEF_STR( None )) PORT_CONFSETTING(DISK_TYPE_TRUMP, "Miracle Trump card") PORT_CONFSETTING(DISK_TYPE_SANDY_SD, "Sandy Superdisk") PORT_CONFSETTING(DISK_TYPE_SANDY_SQB,"Sandy SuperQBoard") - + PORT_START(MOUSEX_TAG) - PORT_BIT( 0xff, 0x00, IPT_MOUSE_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1) + PORT_BIT( 0xff, 0x00, IPT_MOUSE_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1) PORT_START(MOUSEY_TAG) - PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1) + PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1) PORT_START(MOUSEB_TAG) /* Mouse buttons */ - PORT_BIT( MOUSE_RIGHT, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_NAME("Mouse Button 1") PORT_CODE(MOUSECODE_BUTTON1) - PORT_BIT( MOUSE_LEFT, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_NAME("Mouse Button 2") PORT_CODE(MOUSECODE_BUTTON2) - PORT_BIT( MOUSE_MIDDLE, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_NAME("Mouse Button 3") PORT_CODE(MOUSECODE_BUTTON3) + PORT_BIT( MOUSE_RIGHT, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_NAME("Mouse Button 1") PORT_CODE(MOUSECODE_BUTTON1) + PORT_BIT( MOUSE_LEFT, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_NAME("Mouse Button 2") PORT_CODE(MOUSECODE_BUTTON2) + PORT_BIT( MOUSE_MIDDLE, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_NAME("Mouse Button 3") PORT_CODE(MOUSECODE_BUTTON3) INPUT_PORTS_END @@ -1031,9 +1031,9 @@ void ql_state::machine_reset() m_printer_char=0; m_disk_io_byte=0; m_mouse_int = 0; - + logerror("Configuring RAM %d\n",m_ram->size() / 1024); - + // configure RAM switch (m_ram->size()) { @@ -1086,13 +1086,13 @@ void ql_state::machine_reset() break; } - + // QIMI QL Internal Mouse Interface if (m_config->read() & QIMI_MOUSE) - { + { logerror("QIMI enabled\n"); program.install_read_handler(QIMI_IO_BASE, QIMI_IO_END, 0, 0, read8_delegate(FUNC(ql_state::qimi_io_r), this)); - program.install_write_handler(QIMI_IO_BASE, QIMI_IO_END, 0, 0, write8_delegate(FUNC(ql_state::qimi_io_w), this)); + program.install_write_handler(QIMI_IO_BASE, QIMI_IO_END, 0, 0, write8_delegate(FUNC(ql_state::qimi_io_w), this)); } } @@ -1129,9 +1129,9 @@ static MACHINE_CONFIG_START( ql, ql_state ) MCFG_DEVICE_ADD(ZX8301_TAG, ZX8301, X1) MCFG_ZX8301_CPU(M68008_TAG) MCFG_ZX8301_VSYNC_CALLBACK(DEVWRITELINE(ZX8302_TAG, zx8302_device, vsync_w)) - + MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) - + MCFG_DEVICE_ADD(ZX8302_TAG, ZX8302, X1) MCFG_ZX8302_RTC_CLOCK(X2) MCFG_ZX8302_OUT_IPL1L_CB(INPUTLINE(M68008_TAG, M68K_IRQ_2)) @@ -1149,7 +1149,7 @@ static MACHINE_CONFIG_START( ql, ql_state ) MCFG_ZX8302_OUT_RAW2_CB(WRITELINE(ql_state, zx8302_raw2_w)) MCFG_ZX8302_IN_RAW2_CB(READLINE(ql_state, zx8302_raw2_r)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(ql_floppy_interface) - + MCFG_WD1772_ADD(WD1772_TAG,ql_wd17xx_interface) MCFG_MICRODRIVE_ADD(MDV_1, mdv1_config) MCFG_MICRODRIVE_COMMS_OUT_CALLBACK(DEVWRITELINE(MDV_2, microdrive_image_device, comms_in_w)) diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c index 2ea4f686424..f3ac3327ea2 100644 --- a/src/mess/drivers/qx10.c +++ b/src/mess/drivers/qx10.c @@ -70,7 +70,7 @@ public: m_vram_bank(0), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -849,7 +849,7 @@ static MACHINE_CONFIG_START( qx10, qx10_state ) MCFG_I8255_ADD("i8255", qx10_i8255_interface) MCFG_I8237_ADD("8237dma_1", MAIN_CLK/4, qx10_dma8237_1_interface) MCFG_I8237_ADD("8237dma_2", MAIN_CLK/4, qx10_dma8237_2_interface) - + MCFG_DEVICE_ADD("upd7220", UPD7220, MAIN_CLK/6) // unk clock MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map) MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(qx10_state, hgdc_display_pixels) diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index a618ec3b545..63d791d5686 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -6,11 +6,11 @@ STATE AS OF MARCH 2014 ---------------------- - Driver is based entirely on the DEC-100 'B' variant (DEC-190 and DEC-100 A models are treated as clones). - While this is OK for the compatible -190, it doesn't do justice to ancient '100 A' hardware. + Driver is based entirely on the DEC-100 'B' variant (DEC-190 and DEC-100 A models are treated as clones). + While this is OK for the compatible -190, it doesn't do justice to ancient '100 A' hardware. - Currently, there are 2 showstoppers: - (1) IRQ logic for 100-B needs further work (text in RBCONVERT.ZIP has details concerning -A versus -B) + Currently, there are 2 showstoppers: + (1) IRQ logic for 100-B needs further work (text in RBCONVERT.ZIP has details concerning -A versus -B) (2) Keyboard emulation incomplete (inhibits the system from booting with ERROR 50 on cold or ERROR 13 on warm boot). - FLOPPY TIMING: 'wd17xx_complete_command' * must * be hard wired to about 13 usecs. @@ -35,8 +35,8 @@ * Extended communication option (same as BUNDLE_OPTION ?) - OTHER HARDWARE UPGRADES: - * Suitable Solutions ClikClok (real time clock) - + * Suitable Solutions ClikClok (real time clock) + * 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). Altered BOOT ROM labeled 'TBSS1.3 - 3ED4'. @@ -269,9 +269,9 @@ protected: private: enum { - IRQ_8088_MAILBOX = 0, // vector 0x27/a7 - IRQ_8088_VBL, // vector 0x20/a0 - IRQ_8088_KBD, // vector 0x26/a6 + IRQ_8088_MAILBOX = 0, // vector 0x27/a7 + IRQ_8088_VBL, // vector 0x20/a0 + IRQ_8088_KBD, // vector 0x26/a6 IRQ_8088_MAX }; @@ -441,7 +441,7 @@ static ADDRESS_MAP_START( rainbow8088_io , AS_IO, 8, rainbow_state) // BOOT LOADERS: // - the DEC boot loader (and FDISK from DOS 3.10) initially allowed a maximum hard disc size of 20 MB. // - the custom boot loader that comes with 'WUTIL 3.2' allows 117 MB and 8 surfaces. - // SOFTWARE: + // SOFTWARE: // - MS-DOS 2 allows a maximum partition size of 16 MB (sizes > 15 MB are incompatible to DOS 3) // - MS-DOS 3 has a global 1024 cylinder limit (32 MB). AM_RANGE (0x68, 0x68) AM_READ(hd_status_68_r) @@ -528,15 +528,15 @@ static INPUT_PORTS_START( rainbow100b_in ) PORT_DIPSETTING( 0x02, DEF_STR( On ) ) INPUT_PORTS_END -// Native 400K format (80 T * 10 S * 512 bytes) on 'quad density' RX50 drives +// Native 400K format (80 T * 10 S * 512 bytes) on 'quad density' RX50 drives // ( 5.25" single sided; 300 rpm; MFM 250 kbps; 96 - 100 tpi ). -// +// // Additionally, the BIOS can *read* VT-180 disks and MS-DOS 160 k disks // - MS-DOS: FORMAT A: /F:160 and MEDIACHK ON // ( 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, + 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]) @@ -578,7 +578,7 @@ void rainbow_state::machine_reset() output_set_value("led7", 1); // GREEN KEYBOARD LEDs (1 = on, 0 = off): - output_set_value("led_wait", 0); // led8 + output_set_value("led_wait", 0); // led8 output_set_value("led_compose", 0); // led9 output_set_value("led_lock", 0); // led10 output_set_value("led_hold", 0); // led11 @@ -654,7 +654,7 @@ void rainbow_state::update_8088_irqs() } else { - m_i8088->set_input_line(INPUT_LINE_INT0, CLEAR_LINE); + m_i8088->set_input_line(INPUT_LINE_INT0, CLEAR_LINE); } } @@ -1210,7 +1210,7 @@ static MACHINE_CONFIG_START( rainbow, rainbow_state ) MCFG_SCREEN_UPDATE_DRIVER(rainbow_state, screen_update_rainbow) MCFG_SCREEN_PALETTE("vt100_video:palette") MCFG_GFXDECODE_ADD("gfxdecode", "vt100_video:palette", rainbow) - + MCFG_RAINBOW_VIDEO_ADD("vt100_video", "screen", video_interface) 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)) @@ -1236,7 +1236,7 @@ static MACHINE_CONFIG_START( rainbow, rainbow_state ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -// 'Rainbow 100-A' (introduced May 1982) is first-generation hardware with ROM 04.03.11 +// 'Rainbow 100-A' (introduced May 1982) is first-generation hardware with ROM 04.03.11 // - 64 K base RAM on board (instead of 128 K on 'B' model). 832 K RAM max. // - inability to boot from hard disc (mind the inadequate PSU) // - cannot control bit 7 of IRQ vector (prevents DOS 2.0x from booting on unmodified hardware) @@ -1298,7 +1298,6 @@ ROM_END /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ -COMP( 1982, rainbow100 , rainbow, 0, rainbow, rainbow100b_in, driver_device, 0, "Digital Equipment Corporation", "Rainbow 100-A", GAME_IS_SKELETON ) +COMP( 1982, rainbow100 , rainbow, 0, rainbow, rainbow100b_in, driver_device, 0, "Digital Equipment Corporation", "Rainbow 100-A", GAME_IS_SKELETON ) COMP( 1983, rainbow , 0 , 0, rainbow, rainbow100b_in, driver_device, 0, "Digital Equipment Corporation", "Rainbow 100-B", GAME_NOT_WORKING | GAME_IMPERFECT_COLORS) COMP( 1985, rainbow190 , rainbow, 0, rainbow, rainbow100b_in, driver_device, 0, "Digital Equipment Corporation", "Rainbow 190-B", GAME_NOT_WORKING | GAME_IMPERFECT_COLORS) - diff --git a/src/mess/drivers/rd110.c b/src/mess/drivers/rd110.c index 385dac2b8e4..0ad35df1eec 100644 --- a/src/mess/drivers/rd110.c +++ b/src/mess/drivers/rd110.c @@ -241,7 +241,7 @@ static MACHINE_CONFIG_START( d110, d110_state ) MCFG_SCREEN_SIZE(16*6-1, (16*6-1)*3/4) MCFG_SCREEN_VISIBLE_AREA(0, 16*6-2, 0, (16*6-1)*3/4-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(d110_state, d110) diff --git a/src/mess/drivers/replicator.c b/src/mess/drivers/replicator.c index 482a452ddcd..cee75cf1b4e 100644 --- a/src/mess/drivers/replicator.c +++ b/src/mess/drivers/replicator.c @@ -179,7 +179,7 @@ public: UINT8 m_port_k; UINT8 m_port_l; - UINT8 shift_register_value; + UINT8 shift_register_value; required_device m_maincpu; required_device m_lcdc; @@ -201,93 +201,93 @@ READ8_MEMBER(replicator_state::port_r) switch( offset ) { case AVR8_IO_PORTA: - { + { #if LOG_PORTS - printf("[%08X] Port A READ (A-axis signals + B-axis STEP&DIR)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port A READ (A-axis signals + B-axis STEP&DIR)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTB: - { + { #if LOG_PORTS - printf("[%08X] Port B READ (SD-CS; 1280-MISO/MOSI/SCK; EX2-FAN/HEAT/PWR-CHECK; BLINK)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port B READ (SD-CS; 1280-MISO/MOSI/SCK; EX2-FAN/HEAT/PWR-CHECK; BLINK)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTC: - { + { #if LOG_PORTS - printf("[%08X] Port C READ (1280-EX1/EX2; LCD-signals; R&G-LED; DETECT)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port C READ (1280-EX1/EX2; LCD-signals; R&G-LED; DETECT)\n", m_maincpu->m_shifted_pc); #endif - return DETECT; //indicated that the Interface board is present. - break; - } + return DETECT; //indicated that the Interface board is present. + break; + } case AVR8_IO_PORTD: - { + { #if LOG_PORTS - printf("[%08X] Port D READ (SDA/SCL; 1280-EX-TX/RX)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port D READ (SDA/SCL; 1280-EX-TX/RX)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTE: - { + { #if LOG_PORTS - printf("[%08X] Port E READ (1280-TX/RX; THERMO-signals)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port E READ (1280-TX/RX; THERMO-signals)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTF: - { + { #if LOG_PORTS - printf("[%08X] Port F READ (X-axis & Y-axis signals)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port F READ (X-axis & Y-axis signals)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTG: - { + { #if LOG_PORTS - printf("[%08X] Port G READ (BUZZ; Cutoff-sr-check; B-axis EN; 1280-EX3/EX4)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port G READ (BUZZ; Cutoff-sr-check; B-axis EN; 1280-EX3/EX4)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTH: - { + { #if LOG_PORTS - printf("[%08X] Port H READ (cuttoff-text/reset; EX1-FAN/HEAT/PWR-CHECK; SD-CD/SD-WP)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port H READ (cuttoff-text/reset; EX1-FAN/HEAT/PWR-CHECK; SD-CD/SD-WP)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTJ: - { + { #if LOG_PORTS - printf("[%08X] Port J READ (Interface buttons; POTS-SCL; B-axis-POT)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port J READ (Interface buttons; POTS-SCL; B-axis-POT)\n", m_maincpu->m_shifted_pc); #endif - return ioport("keypad")->read(); - break; - } + return ioport("keypad")->read(); + break; + } case AVR8_IO_PORTK: - { + { #if LOG_PORTS - printf("[%08X] Port K READ (Z-axis signals; HBP-THERM; 1280-EX5/6/7)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port K READ (Z-axis signals; HBP-THERM; 1280-EX5/6/7)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } case AVR8_IO_PORTL: - { + { #if LOG_PORTS - printf("[%08X] Port L READ (HBP; EXTRA-FET; X-MIN/MAX; Y-MIN/MAX; Z-MIN/MAX)\n", m_maincpu->m_shifted_pc); + printf("[%08X] Port L READ (HBP; EXTRA-FET; X-MIN/MAX; Y-MIN/MAX; Z-MIN/MAX)\n", m_maincpu->m_shifted_pc); #endif - return 0x00; - break; - } + return 0x00; + break; + } } return 0; } @@ -297,14 +297,14 @@ WRITE8_MEMBER(replicator_state::port_w) switch( offset ) { case AVR8_IO_PORTA: - { - if (data == m_port_a) break; + { + if (data == m_port_a) break; #if LOG_PORTS UINT8 old_port_a = m_port_a; UINT8 changed = data ^ old_port_a; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & A_AXIS_DIR) printf("[A] A_AXIS_DIR: %s\n", data & A_AXIS_DIR ? "HIGH" : "LOW"); if(changed & A_AXIS_STEP) printf("[A] A_AXIS_STEP: %s\n", data & A_AXIS_STEP ? "HIGH" : "LOW"); if(changed & A_AXIS_EN) printf("[A] A_AXIS_EN: %s\n", data & A_AXIS_EN ? "HIGH" : "LOW"); @@ -313,18 +313,18 @@ WRITE8_MEMBER(replicator_state::port_w) if(changed & B_AXIS_STEP) printf("[A] B_AXIS_STEP: %s\n", data & B_AXIS_STEP ? "HIGH" : "LOW"); #endif - m_port_a = data; - break; - } + m_port_a = data; + break; + } case AVR8_IO_PORTB: - { - if (data == m_port_b) break; + { + if (data == m_port_b) break; #if LOG_PORTS UINT8 old_port_b = m_port_b; UINT8 changed = data ^ old_port_b; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & SD_CS) printf("[B] SD Card Chip Select: %s\n", data & SD_CS ? "HIGH" : "LOW"); if(changed & SCK_1280) printf("[B] 1280-SCK: %s\n", data & SCK_1280 ? "HIGH" : "LOW"); if(changed & MOSI_1280) printf("[B] 1280-MOSI: %s\n", data & MOSI_1280 ? "HIGH" : "LOW"); @@ -335,17 +335,17 @@ WRITE8_MEMBER(replicator_state::port_w) if(changed & BLINK) printf("[B] BLINK: %s\n", data & BLINK ? "HIGH" : "LOW"); #endif - m_port_b = data; - break; - } + m_port_b = data; + break; + } case AVR8_IO_PORTC: - { - if (data == m_port_c) break; + { + if (data == m_port_c) break; UINT8 old_port_c = m_port_c; UINT8 changed = data ^ old_port_c; #if LOG_PORTS - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & EX2_1280) printf("[C] EX2_1280: %s\n", data & EX2_1280 ? "HIGH" : "LOW"); if(changed & EX1_1280) printf("[C] EX1_1280: %s\n", data & EX1_1280 ? "HIGH" : "LOW"); if(changed & LCD_CLK) printf("[C] LCD_CLK: %s\n", data & LCD_CLK ? "HIGH" : "LOW"); @@ -357,43 +357,43 @@ WRITE8_MEMBER(replicator_state::port_w) #endif if (changed & LCD_CLK){ - /* The LCD is interfaced by an 8-bit shift register (74HC4094). */ - if (data & LCD_CLK){//CLK positive edge - shift_register_value = (shift_register_value << 1) | ((data & LCD_DATA) >> 3); - //printf("[%08X] ", m_maincpu->m_shifted_pc); - //printf("[C] LCD CLK positive edge. shift_register=0x%02X\n", shift_register_value); - } - } + /* The LCD is interfaced by an 8-bit shift register (74HC4094). */ + if (data & LCD_CLK){//CLK positive edge + shift_register_value = (shift_register_value << 1) | ((data & LCD_DATA) >> 3); + //printf("[%08X] ", m_maincpu->m_shifted_pc); + //printf("[C] LCD CLK positive edge. shift_register=0x%02X\n", shift_register_value); + } + } if(changed & LCD_STROBE){ - if (data & LCD_STROBE){ //STROBE positive edge - bool RS = (shift_register_value >> 1) & 1; - bool RW = (shift_register_value >> 2) & 1; - bool enable = (shift_register_value >> 3) & 1; - UINT8 lcd_data = shift_register_value & 0xF0; - - if (enable && RW==0){ - if (RS==0){ - m_lcdc->control_write(space, 0, lcd_data); - } else { - m_lcdc->data_write(space, 0, lcd_data); - } - } - } - } + if (data & LCD_STROBE){ //STROBE positive edge + bool RS = (shift_register_value >> 1) & 1; + bool RW = (shift_register_value >> 2) & 1; + bool enable = (shift_register_value >> 3) & 1; + UINT8 lcd_data = shift_register_value & 0xF0; + + if (enable && RW==0){ + if (RS==0){ + m_lcdc->control_write(space, 0, lcd_data); + } else { + m_lcdc->data_write(space, 0, lcd_data); + } + } + } + } m_port_c = data; break; } case AVR8_IO_PORTD: - { - if (data == m_port_d) break; + { + if (data == m_port_d) break; #if LOG_PORTS UINT8 old_port_d = m_port_d; UINT8 changed = data ^ old_port_d; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & PORTD_SCL) printf("[D] PORTD_SCL: %s\n", data & PORTD_SCL ? "HIGH" : "LOW"); if(changed & PORTD_SDA) printf("[D] PORTD_SDA: %s\n", data & PORTD_SDA ? "HIGH" : "LOW"); if(changed & EX_RX_1280) printf("[D] EX_RX_1280: %s\n", data & EX_RX_1280 ? "HIGH" : "LOW"); @@ -401,17 +401,17 @@ WRITE8_MEMBER(replicator_state::port_w) #endif m_port_d = data; - break; - } + break; + } case AVR8_IO_PORTE: - { - if (data == m_port_e) break; + { + if (data == m_port_e) break; #if LOG_PORTS UINT8 old_port_e = m_port_e; UINT8 changed = data ^ old_port_e; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & RX_1280) printf("[E] 1280-RX: %s\n", data & RX_1280 ? "HIGH" : "LOW"); if(changed & TX_1280) printf("[E] 1280-TX: %s\n", data & TX_1280 ? "HIGH" : "LOW"); if(changed & THERMO_SCK) printf("[E] THERMO-SCK: %s\n", data & THERMO_SCK ? "HIGH" : "LOW"); @@ -421,17 +421,17 @@ WRITE8_MEMBER(replicator_state::port_w) #endif m_port_e = data; - break; - } + break; + } case AVR8_IO_PORTF: - { - if (data == m_port_f) break; + { + if (data == m_port_f) break; #if LOG_PORTS UINT8 old_port_f = m_port_f; UINT8 changed = data ^ old_port_f; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & X_AXIS_DIR) printf("[F] X_AXIS_DIR: %s\n", data & X_AXIS_DIR ? "HIGH" : "LOW"); if(changed & X_AXIS_STEP) printf("[F] X_AXIS_STEP: %s\n", data & X_AXIS_STEP ? "HIGH" : "LOW"); if(changed & X_AXIS_EN) printf("[F] X_AXIS_EN: %s\n", data & X_AXIS_EN ? "HIGH" : "LOW"); @@ -443,17 +443,17 @@ WRITE8_MEMBER(replicator_state::port_w) #endif m_port_f = data; - break; - } + break; + } case AVR8_IO_PORTG: - { - if (data == m_port_g) break; + { + if (data == m_port_g) break; UINT8 old_port_g = m_port_g; UINT8 changed = data ^ old_port_g; #if LOG_PORTS - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & EX4_1280) printf("[G] EX4_1280: %s\n", data & EX4_1280 ? "HIGH" : "LOW"); if(changed & EX3_1280) printf("[G] EX3_1280: %s\n", data & EX3_1280 ? "HIGH" : "LOW"); if(changed & B_AXIS_EN) printf("[G] B_AXIS_EN: %s\n", data & B_AXIS_EN ? "HIGH" : "LOW"); @@ -462,27 +462,27 @@ WRITE8_MEMBER(replicator_state::port_w) #endif if(changed & BUZZ){ - /* FIX-ME: What is the largest sample value allowed? - I'm using 0x3F based on what I see in src/mess/drivers/craft.c - But as the method is called "write_unsigned8", I guess we could have samples with values up to 0xFF, right? - Anyway... With the 0x3F value we'll get a sound that is not so loud, which may be less annoying... :-) - */ - UINT8 audio_sample = (data & BUZZ) ? 0x3F : 0; - m_dac->write_unsigned8(audio_sample << 1); - } + /* FIX-ME: What is the largest sample value allowed? + I'm using 0x3F based on what I see in src/mess/drivers/craft.c + But as the method is called "write_unsigned8", I guess we could have samples with values up to 0xFF, right? + Anyway... With the 0x3F value we'll get a sound that is not so loud, which may be less annoying... :-) + */ + UINT8 audio_sample = (data & BUZZ) ? 0x3F : 0; + m_dac->write_unsigned8(audio_sample << 1); + } m_port_g = data; - break; - } + break; + } case AVR8_IO_PORTH: - { - if (data == m_port_h) break; + { + if (data == m_port_h) break; #if LOG_PORTS UINT8 old_port_h = m_port_h; UINT8 changed = data ^ old_port_h; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & CUTOFF_TEST) printf("[H] CUTOFF_TEST: %s\n", data & CUTOFF_TEST ? "HIGH" : "LOW"); if(changed & CUTOFF_RESET) printf("[H] CUTOFF_RESET: %s\n", data & CUTOFF_RESET ? "HIGH" : "LOW"); if(changed & EX1_PWR_CHECK) printf("[H] EX1_PWR_CHECK: %s\n", data & EX1_PWR_CHECK ? "HIGH" : "LOW"); @@ -492,18 +492,18 @@ WRITE8_MEMBER(replicator_state::port_w) if(changed & SD_CD) printf("[H] SD_CD: %s\n", data & SD_CD ? "HIGH" : "LOW"); #endif - m_port_h = data; - break; - } + m_port_h = data; + break; + } case AVR8_IO_PORTJ: - { - if (data == m_port_j) break; + { + if (data == m_port_j) break; #if LOG_PORTS UINT8 old_port_j = m_port_j; UINT8 changed = data ^ old_port_j; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & BUTTON_CENTER) printf("[J] BUTTON_CENTER: %s\n", data & BUTTON_CENTER ? "HIGH" : "LOW"); if(changed & BUTTON_RIGHT) printf("[J] BUTTON_RIGHT: %s\n", data & BUTTON_RIGHT ? "HIGH" : "LOW"); @@ -514,18 +514,18 @@ WRITE8_MEMBER(replicator_state::port_w) if(changed & B_AXIS_POT) printf("[J] B_AXIS_POT: %s\n", data & B_AXIS_POT ? "HIGH" : "LOW"); #endif - m_port_j = data; - break; - } + m_port_j = data; + break; + } case AVR8_IO_PORTK: - { - if (data == m_port_k) break; + { + if (data == m_port_k) break; #if LOG_PORTS UINT8 old_port_k = m_port_k; UINT8 changed = data ^ old_port_k; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & Z_AXIS_DIR) printf("[K] Z_AXIS_DIR: %s\n", data & Z_AXIS_DIR ? "HIGH" : "LOW"); if(changed & Z_AXIS_STEP) printf("[K] Z_AXIS_STEP: %s\n", data & Z_AXIS_STEP ? "HIGH" : "LOW"); @@ -537,18 +537,18 @@ WRITE8_MEMBER(replicator_state::port_w) if(changed & HBP_THERM) printf("[K] HBP_THERM: %s\n", data & HBP_THERM ? "HIGH" : "LOW"); #endif - m_port_k = data; - break; - } + m_port_k = data; + break; + } case AVR8_IO_PORTL: - { - if (data == m_port_l) break; + { + if (data == m_port_l) break; #if LOG_PORTS UINT8 old_port_l = m_port_l; UINT8 changed = data ^ old_port_l; - printf("[%08X] ", m_maincpu->m_shifted_pc); + printf("[%08X] ", m_maincpu->m_shifted_pc); if(changed & X_MIN) printf("[L] X_MIN: %s\n", data & X_MIN ? "HIGH" : "LOW"); if(changed & X_MAX) printf("[L] X_MAX: %s\n", data & X_MAX ? "HIGH" : "LOW"); @@ -560,9 +560,9 @@ WRITE8_MEMBER(replicator_state::port_w) if(changed & Z_MAX) printf("[L] Z_MAX: %s\n", data & Z_MAX ? "HIGH" : "LOW"); #endif - m_port_l = data; - break; - } + m_port_l = data; + break; + } } } @@ -605,18 +605,18 @@ DRIVER_INIT_MEMBER(replicator_state, replicator) void replicator_state::machine_reset() { - shift_register_value = 0; - m_port_a = 0; - m_port_b = 0; - m_port_c = 0; - m_port_d = 0; - m_port_e = 0; - m_port_f = 0; - m_port_g = 0; - m_port_h = 0; - m_port_j = 0; - m_port_k = 0; - m_port_l = 0; + shift_register_value = 0; + m_port_a = 0; + m_port_b = 0; + m_port_c = 0; + m_port_d = 0; + m_port_e = 0; + m_port_f = 0; + m_port_g = 0; + m_port_h = 0; + m_port_j = 0; + m_port_k = 0; + m_port_l = 0; } const avr8_config atmega1280_config = @@ -659,7 +659,7 @@ static MACHINE_CONFIG_START( replicator, replicator_state ) MCFG_CPU_AVR8_EFUSE(0xF4) MCFG_CPU_AVR8_LOCK(0x0F) - /*TODO: Add an ATMEGA8U2 for USB-Serial communications */ + /*TODO: Add an ATMEGA8U2 for USB-Serial communications */ /* video hardware */ MCFG_SCREEN_ADD("screen", LCD) @@ -679,7 +679,7 @@ static MACHINE_CONFIG_START( replicator, replicator_state ) MCFG_HD44780_LCD_SIZE(4, 20) /* sound hardware */ - /* A piezo is connected to the PORT G bit 5 (OC0B pin driven by Timer/Counter #4) */ + /* A piezo is connected to the PORT G bit 5 (OC0B pin driven by Timer/Counter #4) */ MCFG_SPEAKER_STANDARD_MONO("buzzer") MCFG_SOUND_ADD("dac", DAC, 0) MCFG_SOUND_ROUTE(0, "buzzer", 1.00) diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c index 60617be4012..a716b74105a 100644 --- a/src/mess/drivers/rex6000.c +++ b/src/mess/drivers/rex6000.c @@ -652,7 +652,7 @@ static MACHINE_CONFIG_START( rex6000, rex6000_state ) MCFG_SCREEN_SIZE(240, 120) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 120-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(rex6000_state, rex6000) diff --git a/src/mess/drivers/rm380z.c b/src/mess/drivers/rm380z.c index df67e513211..f27a005e86c 100644 --- a/src/mess/drivers/rm380z.c +++ b/src/mess/drivers/rm380z.c @@ -158,7 +158,7 @@ static MACHINE_CONFIG_START( rm380z, rm380z_state ) MCFG_SCREEN_VISIBLE_AREA(0, (RM380Z_SCREENCOLS*(RM380Z_CHDIMX+1))-1, 0, (RM380Z_SCREENROWS*(RM380Z_CHDIMY+1))-1) MCFG_SCREEN_UPDATE_DRIVER(rm380z_state, screen_update_rm380z) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* RAM configurations */ diff --git a/src/mess/drivers/rmt32.c b/src/mess/drivers/rmt32.c index 33dbd6b0eaf..3b553829b63 100644 --- a/src/mess/drivers/rmt32.c +++ b/src/mess/drivers/rmt32.c @@ -360,7 +360,7 @@ static MACHINE_CONFIG_START( mt32, mt32_state ) MCFG_SCREEN_SIZE(20*6-1, (20*6-1)*3/4) MCFG_SCREEN_VISIBLE_AREA(0, 20*6-2, 0, (20*6-1)*3/4-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(mt32_state, mt32) diff --git a/src/mess/drivers/rsc55.c b/src/mess/drivers/rsc55.c index c13df32e491..e10fccfc104 100644 --- a/src/mess/drivers/rsc55.c +++ b/src/mess/drivers/rsc55.c @@ -3,24 +3,24 @@ Roland Sound Canvas SC-55 Skeleton by R. Belmont - + Reference and LCD photo: http://www.synthman.com/roland/Roland_SC-55.html http://en.wikipedia.org/wiki/Roland_SCC-1 - + The Roland SC55 is an expander (synthesizer without the keyboard) from 1991. It has 24 voice polyphony, is 16 part multitimbral, and outputs 16-bit stereo samples at 32 kHz. The synthesis engine uses a combination of Roland's LA and straight PCM playback. - + The front panel includes the power switch, a headphone jack with volume knob, a second MIDI IN port, a large LCD, ALL and MUTE buttons, and a group of up/down buttons for Part, Level, Reverb, Key Shift, Instrument, Pan, Chorus, and MIDI Channel. - + The SCC-1 is an ISA board variant of the SC55 with a MPU-401 frontend added to - communicate with the synth. - + communicate with the synth. + Main PCB: - + 20.0 MHz crystal Roland R15239147 HG62E11B23FS 1L1 Japan Roland R15199778 6435328A97F 1M1 R Japan @@ -30,7 +30,7 @@ HM62256ALFP-12T 32K by 8-bit RAM 65256BLFP-12T 32K by 8-bit high-speed pseudo-static RAM MB89251A - Serial data transceiver - + LCD controller (on front panel board) is a Toshiba T7934. */ @@ -51,7 +51,7 @@ public: sc55_state::sc55_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + m_maincpu(*this, "maincpu") { } @@ -63,19 +63,19 @@ static ADDRESS_MAP_START( sc55_io, AS_IO, 16, sc55_state ) ADDRESS_MAP_END static MACHINE_CONFIG_START( sc55, sc55_state ) - MCFG_CPU_ADD( "maincpu", P8098, XTAL_20MHz ) // probably not? + MCFG_CPU_ADD( "maincpu", P8098, XTAL_20MHz ) // probably not? MCFG_CPU_PROGRAM_MAP( sc55_map ) MCFG_CPU_IO_MAP( sc55_io ) MACHINE_CONFIG_END ROM_START( sc55 ) ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "roland_r15209363.ic23", 0x000000, 0x040000, CRC(2dc58549) SHA1(9c17f85e784dc1549ac1f98d457b353393331f6b) ) + ROM_LOAD( "roland_r15209363.ic23", 0x000000, 0x040000, CRC(2dc58549) SHA1(9c17f85e784dc1549ac1f98d457b353393331f6b) ) ROM_REGION( 0x300000, "la", 0 ) - ROM_LOAD( "roland-gss.a_r15209276.ic28", 0x000000, 0x100000, CRC(1ac774d3) SHA1(8cc3c0d7ec0993df81d4ca1970e01a4b0d8d3775) ) - ROM_LOAD( "roland-gss.b_r15209277.ic27", 0x100000, 0x100000, CRC(8dcc592a) SHA1(80e6eb130c18c09955551563f78906163c55cc11) ) - ROM_LOAD( "roland-gss.c_r15209281.ic26", 0x200000, 0x100000, CRC(e21ebc04) SHA1(7454b817778179806f3f9d1985b3a2ef67ace76f) ) + ROM_LOAD( "roland-gss.a_r15209276.ic28", 0x000000, 0x100000, CRC(1ac774d3) SHA1(8cc3c0d7ec0993df81d4ca1970e01a4b0d8d3775) ) + ROM_LOAD( "roland-gss.b_r15209277.ic27", 0x100000, 0x100000, CRC(8dcc592a) SHA1(80e6eb130c18c09955551563f78906163c55cc11) ) + ROM_LOAD( "roland-gss.c_r15209281.ic26", 0x200000, 0x100000, CRC(e21ebc04) SHA1(7454b817778179806f3f9d1985b3a2ef67ace76f) ) ROM_END CONS( 1991, sc55, 0, 0, sc55, sc55, driver_device, 0, "Roland", "Sound Canvas SC-55", GAME_NOT_WORKING|GAME_NO_SOUND ) diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c index 564df795342..e2950bca35e 100644 --- a/src/mess/drivers/rx78.c +++ b/src/mess/drivers/rx78.c @@ -57,7 +57,7 @@ public: m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), m_ram(*this, RAM_TAG), - m_palette(*this, "palette") + m_palette(*this, "palette") { } DECLARE_READ8_MEMBER( key_r ); @@ -472,7 +472,7 @@ static MACHINE_CONFIG_START( rx78, rx78_state ) MCFG_SCREEN_SIZE(192, 184) MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 184-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 16+1) //+1 for the background color MCFG_GFXDECODE_ADD("gfxdecode", "palette", rx78) diff --git a/src/mess/drivers/sapi1.c b/src/mess/drivers/sapi1.c index 20606d4dac8..e85d631eedb 100644 --- a/src/mess/drivers/sapi1.c +++ b/src/mess/drivers/sapi1.c @@ -87,7 +87,7 @@ private: required_ioport m_line3; required_ioport m_line4; required_device m_maincpu; -public: +public: optional_device m_palette; }; @@ -572,7 +572,7 @@ static MACHINE_CONFIG_START( sapi1, sapi1_state ) MCFG_SCREEN_VISIBLE_AREA(0, 40*6-1, 0, 24*9-1) MCFG_SCREEN_UPDATE_DRIVER(sapi1_state, screen_update_sapi1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* internal ram */ diff --git a/src/mess/drivers/saturn.c b/src/mess/drivers/saturn.c index 5922278eafa..956da98c673 100644 --- a/src/mess/drivers/saturn.c +++ b/src/mess/drivers/saturn.c @@ -87,7 +87,7 @@ public: required_device m_exp; required_device m_nvram; - required_device m_smpc_nv; // TODO: move this in the base class saturn_state and add it to stv in MAME + required_device m_smpc_nv; // TODO: move this in the base class saturn_state and add it to stv in MAME }; @@ -548,12 +548,12 @@ INPUT_PORTS_END /* TODO: if you change the driver configuration then NVRAM contents gets screwed, needs mods in MAME framework */ void sat_console_state::nvram_init(nvram_device &nvram, void *data, size_t size) { - static const UINT8 init[64] = { + static const UINT8 init[64] = { 'B', 'a', 'c', 'k', 'U', 'p', 'R', 'a', 'm', ' ', 'F', 'o', 'r', 'm', 'a', 't', 'B', 'a', 'c', 'k', 'U', 'p', 'R', 'a', 'm', ' ', 'F', 'o', 'r', 'm', 'a', 't', 'B', 'a', 'c', 'k', 'U', 'p', 'R', 'a', 'm', ' ', 'F', 'o', 'r', 'm', 'a', 't', 'B', 'a', 'c', 'k', 'U', 'p', 'R', 'a', 'm', ' ', 'F', 'o', 'r', 'm', 'a', 't', }; - + memset(data, 0x00, size); memcpy(data, init, sizeof(init)); } @@ -894,7 +894,7 @@ ROM_END ROM_START(hisaturn) ROM_REGION( 0x480000, "maincpu", ROMREGION_ERASEFF ) /* SH2 code */ ROM_SYSTEM_BIOS(0, "102", "v1.02 (950519)") - ROMX_LOAD( "mpr-18100.bin", 0x000000, 0x080000, CRC(3408dbf4) SHA1(8a22710e09ce75f39625894366cafe503ed1942d), ROM_BIOS(1)) + ROMX_LOAD( "mpr-18100.bin", 0x000000, 0x080000, CRC(3408dbf4) SHA1(8a22710e09ce75f39625894366cafe503ed1942d), ROM_BIOS(1)) ROM_SYSTEM_BIOS(1, "101", "v1.01 (950130)") ROMX_LOAD("hisaturn.bin", 0x00000000, 0x00080000, CRC(721e1b60) SHA1(49d8493008fa715ca0c94d99817a5439d6f2c796), ROM_BIOS(2)) ROM_REGION( 0x080000, "slave", 0 ) /* SH2 code */ diff --git a/src/mess/drivers/sbrain.c b/src/mess/drivers/sbrain.c index 58de817d6ce..ca24d33fa1d 100644 --- a/src/mess/drivers/sbrain.c +++ b/src/mess/drivers/sbrain.c @@ -61,7 +61,7 @@ public: m_vs(*this, "VS"), m_bankr0(*this, "bankr0"), m_bankw0(*this, "bankw0"), - m_bank2(*this, "bank2") {} + m_bank2(*this, "bank2") {} public: const UINT8 *m_p_chargen; @@ -340,7 +340,7 @@ static MACHINE_CONFIG_START( sbrain, sbrain_state ) MCFG_SCREEN_SIZE(640, 240) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") /* sound hardware */ diff --git a/src/mess/drivers/sgi_ip2.c b/src/mess/drivers/sgi_ip2.c index 5cf048493fc..24cdc3ea419 100644 --- a/src/mess/drivers/sgi_ip2.c +++ b/src/mess/drivers/sgi_ip2.c @@ -378,8 +378,8 @@ static ADDRESS_MAP_START(sgi_ip2_map, AS_PROGRAM, 32, sgi_ip2_state ) AM_RANGE(0x30800000, 0x30800003) AM_READWRITE8(sgi_ip2_m_but_r, sgi_ip2_m_but_w, 0xffffffff) AM_RANGE(0x31000000, 0x31000003) AM_READWRITE16(sgi_ip2_m_quad_r, sgi_ip2_m_quad_w, 0xffffffff) AM_RANGE(0x31800000, 0x31800003) AM_READ16(sgi_ip2_swtch_r, 0xffffffff) - AM_RANGE(0x32000000, 0x3200000f) AM_DEVREADWRITE8("duart68681a", mc68681_device, read, write, 0xffffffff) - AM_RANGE(0x32800000, 0x3280000f) AM_DEVREADWRITE8("duart68681b", mc68681_device, read, write, 0xffffffff) + AM_RANGE(0x32000000, 0x3200000f) AM_DEVREADWRITE8("duart68681a", mc68681_device, read, write, 0xffffffff) + AM_RANGE(0x32800000, 0x3280000f) AM_DEVREADWRITE8("duart68681b", mc68681_device, read, write, 0xffffffff) AM_RANGE(0x33000000, 0x330007ff) AM_RAM AM_RANGE(0x34000000, 0x34000003) AM_READWRITE8(sgi_ip2_clock_ctl_r, sgi_ip2_clock_ctl_w, 0xffffffff) AM_RANGE(0x35000000, 0x35000003) AM_READWRITE8(sgi_ip2_clock_data_r, sgi_ip2_clock_data_w, 0xffffffff) @@ -423,11 +423,11 @@ static MACHINE_CONFIG_START( sgi_ip2, sgi_ip2_state ) MCFG_CPU_PROGRAM_MAP(sgi_ip2_map) MCFG_MC68681_ADD( "duart68681a", XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */ - MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duarta_irq_handler)) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duarta_irq_handler)) MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_MC68681_ADD( "duart68681b", XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */ - MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duartb_irq_handler)) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duartb_irq_handler)) MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz ) diff --git a/src/mess/drivers/sitcom.c b/src/mess/drivers/sitcom.c index 376f6bfc028..869e794bec2 100644 --- a/src/mess/drivers/sitcom.c +++ b/src/mess/drivers/sitcom.c @@ -113,7 +113,7 @@ static MACHINE_CONFIG_START( sitcom, sitcom_state ) MCFG_CPU_IO_MAP(sitcom_io) MCFG_I8085A_SID(READLINE(sitcom_state, sid_line)) MCFG_I8085A_SOD(WRITELINE(sitcom_state, sod_led)) - + MCFG_DEFAULT_LAYOUT(layout_sitcom) /* video hardware */ diff --git a/src/mess/drivers/sm1800.c b/src/mess/drivers/sm1800.c index 2b9f47670fc..c058ff85f0a 100644 --- a/src/mess/drivers/sm1800.c +++ b/src/mess/drivers/sm1800.c @@ -189,7 +189,7 @@ static MACHINE_CONFIG_START( sm1800, sm1800_state ) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(sm1800_state, sm1800) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sm1800) + MCFG_GFXDECODE_ADD("gfxdecode", "palette", sm1800) /* Devices */ MCFG_I8255_ADD ("i8255", sm1800_ppi8255_interface ) diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index a2d9cb76558..199823d4dc3 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -57,7 +57,7 @@ public: m_sn(*this, "sn1"), m_beeper(*this, "beeper"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; @@ -1095,7 +1095,7 @@ static MACHINE_CONFIG_START( smc777, smc777_state ) MCFG_PALETTE_INIT_OWNER(smc777_state, smc777) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - + MCFG_MC6845_ADD("crtc", H46505, "screen", MASTER_CLOCK/2, mc6845_intf) /* unknown clock, hand tuned to get ~60 fps */ MCFG_MB8876_ADD("fdc",smc777_mb8876_interface) diff --git a/src/mess/drivers/socrates.c b/src/mess/drivers/socrates.c index 085b70adc3b..f6e8d199b94 100644 --- a/src/mess/drivers/socrates.c +++ b/src/mess/drivers/socrates.c @@ -127,7 +127,7 @@ public: required_device m_maincpu; required_device m_sound; required_device m_screen; - + rgb_t m_palette_val[256]; UINT8 m_data[8]; @@ -1459,7 +1459,7 @@ static MACHINE_CONFIG_START( iqunlimz, iqunlim_state ) MCFG_SCREEN_SIZE(256, 224) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(socrates_state, socrates) diff --git a/src/mess/drivers/softbox.c b/src/mess/drivers/softbox.c index dbfe856ebbd..31dcb6375ac 100644 --- a/src/mess/drivers/softbox.c +++ b/src/mess/drivers/softbox.c @@ -413,7 +413,7 @@ static MACHINE_CONFIG_START( softbox, softbox_state ) MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc)) MCFG_CBM_IEEE488_ADD("c8050") - + MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0) MCFG_HARDDISK_CONFIG_ADD("harddisk1", corvus_hdc_t::hd_intf) MCFG_HARDDISK_CONFIG_ADD("harddisk2", corvus_hdc_t::hd_intf) diff --git a/src/mess/drivers/sorcerer.c b/src/mess/drivers/sorcerer.c index 5cf1715802b..03565c83c19 100644 --- a/src/mess/drivers/sorcerer.c +++ b/src/mess/drivers/sorcerer.c @@ -434,7 +434,7 @@ static MACHINE_CONFIG_START( sorcerer, sorcerer_state ) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(sorcerer_state, screen_update) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", sorcerer) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/special.c b/src/mess/drivers/special.c index bb4a250af97..519df57da92 100644 --- a/src/mess/drivers/special.c +++ b/src/mess/drivers/special.c @@ -375,7 +375,7 @@ static MACHINE_CONFIG_START( special, special_state ) MCFG_VIDEO_START_OVERRIDE(special_state,special) MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_special) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) /* audio hardware */ @@ -419,7 +419,7 @@ static MACHINE_CONFIG_DERIVED( specimx, special ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_specimx) MCFG_VIDEO_START_OVERRIDE(special_state,specimx) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(special_state, specimx ) @@ -436,7 +436,7 @@ static MACHINE_CONFIG_DERIVED( specimx, special ) MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("custom", specimx_sound_device, set_input_ch1)) MCFG_PIT8253_CLK2(2000000) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("custom", specimx_sound_device, set_input_ch2)) - + MCFG_DEVICE_REMOVE("ppi8255") MCFG_I8255_ADD( "ppi8255", specimx_ppi8255_interface ) MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) @@ -467,7 +467,7 @@ static MACHINE_CONFIG_START( erik, special_state ) MCFG_VIDEO_START_OVERRIDE(special_state,erik) MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_erik) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(special_state,erik) diff --git a/src/mess/drivers/spectrum.c b/src/mess/drivers/spectrum.c index e7e0510fb63..f5e4eabd39e 100644 --- a/src/mess/drivers/spectrum.c +++ b/src/mess/drivers/spectrum.c @@ -707,7 +707,7 @@ MACHINE_CONFIG_START( spectrum_common, spectrum_state ) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(spectrum_state, spectrum ) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", spectrum) MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum ) diff --git a/src/mess/drivers/ssem.c b/src/mess/drivers/ssem.c index 0373cef9c05..fb014ec2829 100644 --- a/src/mess/drivers/ssem.c +++ b/src/mess/drivers/ssem.c @@ -22,7 +22,7 @@ public: required_device m_maincpu; required_shared_ptr m_store; required_device m_screen; - + UINT8 m_store_line; virtual void machine_reset(); UINT32 screen_update_ssem(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mess/drivers/stratos.c b/src/mess/drivers/stratos.c index 392693e78d3..321584cb48c 100644 --- a/src/mess/drivers/stratos.c +++ b/src/mess/drivers/stratos.c @@ -16,11 +16,11 @@ class stratos_state : public driver_device public: stratos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - maincpu(*this, "maincpu"), - nvram(*this, "nvram"), - bank_8000(*this, "bank_8000"), - bank_4000(*this, "bank_4000"), - nvram_bank(*this, "nvram_bank") + maincpu(*this, "maincpu"), + nvram(*this, "nvram"), + bank_8000(*this, "bank_8000"), + bank_4000(*this, "bank_4000"), + nvram_bank(*this, "nvram_bank") { } required_device maincpu; @@ -255,10 +255,10 @@ READ8_MEMBER(stratos_state::control_r) // 0f08 Bi // 1008 Kn // 1108 Pa - // 0108 - // 0208 - // 0308 - // 0408 + // 0108 + // 0208 + // 0308 + // 0408 // 0617 8 // 0016 7 // 0015 6 diff --git a/src/mess/drivers/super80.c b/src/mess/drivers/super80.c index 79710074056..9239649b3a6 100644 --- a/src/mess/drivers/super80.c +++ b/src/mess/drivers/super80.c @@ -697,7 +697,7 @@ static MACHINE_CONFIG_DERIVED( super80m, super80 ) MCFG_CPU_PROGRAM_MAP(super80m_map) MCFG_GFXDECODE_MODIFY("gfxdecode", super80m) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(super80_state,super80m) @@ -721,7 +721,7 @@ static MACHINE_CONFIG_START( super80v, super80_state ) MCFG_SCREEN_SIZE(SUPER80V_SCREEN_WIDTH, SUPER80V_SCREEN_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0, SUPER80V_SCREEN_WIDTH-1, 0, SUPER80V_SCREEN_HEIGHT-1) MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80v) - MCFG_SCREEN_VBLANK_DRIVER(super80_state, screen_eof_super80m) + MCFG_SCREEN_VBLANK_DRIVER(super80_state, screen_eof_super80m) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(super80_state,super80m) diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index b73f69ac2f4..4aeef158d22 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -1925,11 +1925,11 @@ static MACHINE_CONFIG_START( supracan, supracan_state ) MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, 348, 0, 256, 256, 0, 240 ) /* No idea if this is correct */ MCFG_SCREEN_UPDATE_DRIVER(supracan_state, screen_update_supracan) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD( "palette", 32768 ) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_INIT_OWNER(supracan_state, supracan) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", supracan) MCFG_CARTSLOT_ADD("cart") diff --git a/src/mess/drivers/sv8000.c b/src/mess/drivers/sv8000.c index ab6d81a03b6..672f883e9e8 100644 --- a/src/mess/drivers/sv8000.c +++ b/src/mess/drivers/sv8000.c @@ -274,12 +274,12 @@ WRITE8_MEMBER( sv8000_state::i8255_portc_w ) static I8255_INTERFACE( sv8000_i8255_interface ) { - DEVCB_DRIVER_MEMBER(sv8000_state, i8255_porta_r), /* port A read */ - DEVCB_DRIVER_MEMBER(sv8000_state, i8255_porta_w), /* port A write */ - DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portb_r), /* port B read */ - DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portb_w), /* port B write */ - DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portc_r), /* port C read */ - DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portc_w) /* port C write */ + DEVCB_DRIVER_MEMBER(sv8000_state, i8255_porta_r), /* port A read */ + DEVCB_DRIVER_MEMBER(sv8000_state, i8255_porta_w), /* port A write */ + DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portb_r), /* port B read */ + DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portb_w), /* port B write */ + DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portc_r), /* port C read */ + DEVCB_DRIVER_MEMBER(sv8000_state, i8255_portc_w) /* port C write */ }; @@ -379,7 +379,7 @@ READ8_MEMBER( sv8000_state::mc6847_videoram_r ) offset = ( ( offset & 0x1fc0 ) >> 1 ) | ( offset & 0x1f ); return m_videoram[offset % 0xc00]; } - else + else { // 256 x 96 / 3KB return m_videoram[offset % 0xc00]; @@ -455,4 +455,3 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ CONS( 1979, sv8000, 0, 0, sv8000, sv8000, driver_device, 0, "Bandai", "Super Vision 8000 (TV Jack 8000)", 0 ) - diff --git a/src/mess/drivers/svmu.c b/src/mess/drivers/svmu.c index e7ad33117f2..e7080aaba90 100644 --- a/src/mess/drivers/svmu.c +++ b/src/mess/drivers/svmu.c @@ -314,7 +314,7 @@ static MACHINE_CONFIG_START( svmu, svmu_state ) MCFG_SCREEN_VISIBLE_AREA(0, 48*(PIXEL_SIZE + PIXEL_DISTANCE) - 1, 0, 32*(PIXEL_SIZE + PIXEL_DISTANCE) - 1) MCFG_SCREEN_UPDATE_DEVICE("maincpu", lc8670_cpu_device, screen_update) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_svmu) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(svmu_state, svmu) diff --git a/src/mess/drivers/swtpc09.c b/src/mess/drivers/swtpc09.c index f637bf5d1be..7737b479308 100644 --- a/src/mess/drivers/swtpc09.c +++ b/src/mess/drivers/swtpc09.c @@ -1,24 +1,24 @@ /************************************************************************** - SWTPC S/09 Mess driver - Robert Justice ,2009-2014 - - Emulates four different fixed combinations of hardware - 1. swtpc09 - MP-09 with SBUG rom, MP-ID, MP-S2, DMF2. - Will boot Flex operating system - 2. swtpc09i - MP-09 with SBUG rom + HDrom, MP-ID, MP-S2, DMF2, PIAIDE. - Will boot Flex operating system - TODO: finish ide part and get this one working. - 3. swtpc09u - MP-09 with UniBUG rom, MP-ID, MP-S2, DMF2. - Will boot UniFlex operating system - 4. swtpc09d3 - MP-09 with UniBUG U3 rom, MP-ID, MP-S2, DMF3. - Will boot UniFlex operating system - TODO: add Harddisk support, DMF3 has WD1000 interface - + SWTPC S/09 Mess driver + Robert Justice ,2009-2014 + + Emulates four different fixed combinations of hardware + 1. swtpc09 + MP-09 with SBUG rom, MP-ID, MP-S2, DMF2. + Will boot Flex operating system + 2. swtpc09i + MP-09 with SBUG rom + HDrom, MP-ID, MP-S2, DMF2, PIAIDE. + Will boot Flex operating system + TODO: finish ide part and get this one working. + 3. swtpc09u + MP-09 with UniBUG rom, MP-ID, MP-S2, DMF2. + Will boot UniFlex operating system + 4. swtpc09d3 + MP-09 with UniBUG U3 rom, MP-ID, MP-S2, DMF3. + Will boot UniFlex operating system + TODO: add Harddisk support, DMF3 has WD1000 interface + ***************************************************************************/ #include "emu.h" @@ -52,15 +52,15 @@ F024 - F024 DMF3 Drive select register F025 - F025 DMF3 DMA Address register F040 - F04F DMF3 6522 VIA - + ***************************************************************************/ /* Address map is dynamically setup when DAT memory is written to */ /* only ROM from FF00-FFFF and DAT memory at FFF0-FFFF (write only) is guaranteed always*/ static ADDRESS_MAP_START(swtpc09_mem, AS_PROGRAM, 8, swtpc09_state) - AM_RANGE(0xff00, 0xffef) AM_ROM - AM_RANGE(0xfff0, 0xffff) AM_ROM AM_WRITE(dat_w) + AM_RANGE(0xff00, 0xffef) AM_ROM + AM_RANGE(0xfff0, 0xffff) AM_ROM AM_WRITE(dat_w) ADDRESS_MAP_END @@ -146,73 +146,73 @@ WRITE_LINE_MEMBER(swtpc09_state::write_acia_clock) /* Machine driver */ /* MPU09, MPID, MPS2 DMF2 */ static MACHINE_CONFIG_START( swtpc09, swtpc09_state ) - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809, 1000000) - MCFG_CPU_PROGRAM_MAP(swtpc09_mem) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", M6809, 1000000) + MCFG_CPU_PROGRAM_MAP(swtpc09_mem) /* video hardware */ MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) - - MCFG_PTM6840_ADD("ptm", swtpc09_6840_intf) - + + MCFG_PTM6840_ADD("ptm", swtpc09_6840_intf) + MCFG_DEVICE_ADD("pia", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_a_r)) MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_ca1_r)) MCFG_PIA_IRQA_HANDLER(WRITELINE(swtpc09_state, pia0_irq_a)) - MCFG_DEVICE_ADD("acia", ACIA6850, 0) + MCFG_DEVICE_ADD("acia", ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt)) + MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt)) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - - MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) + + MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) + MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) MACHINE_CONFIG_END /* MPU09, MPID, MPS2 DC4 PIAIDE*/ static MACHINE_CONFIG_START( swtpc09i, swtpc09_state ) - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809, 1000000) - MCFG_CPU_PROGRAM_MAP(swtpc09_mem) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", M6809, 1000000) + MCFG_CPU_PROGRAM_MAP(swtpc09_mem) /* video hardware */ MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) - MCFG_PTM6840_ADD("ptm", swtpc09_6840_intf) + MCFG_PTM6840_ADD("ptm", swtpc09_6840_intf) MCFG_DEVICE_ADD("pia", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_a_r)) MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_ca1_r)) MCFG_PIA_IRQA_HANDLER(WRITELINE(swtpc09_state, pia0_irq_a)) - MCFG_DEVICE_ADD("acia", ACIA6850, 0) + MCFG_DEVICE_ADD("acia", ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt)) + MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt)) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) + MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) + MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) - MCFG_DEVICE_ADD("piaide", PIA6821, 0) + MCFG_DEVICE_ADD("piaide", PIA6821, 0) /* old start to adding ide support, needs major updating */ /* this is to support an add on card driving IDE from a PIA */ -// MCFG_HARDDISK_ADD("harddisk") -// MCFG_IDE_CONTROLLER_ADD("ide", NULL) -// MCFG_IDE_CONTROLLER_REGIONS("harddisk", NULL) -// MCFG_IDE_CONTROLLER_ADD( "ide", ide_intf, "hdd", NULL, false ) /* FIXME */ bebox +// MCFG_HARDDISK_ADD("harddisk") +// MCFG_IDE_CONTROLLER_ADD("ide", NULL) +// MCFG_IDE_CONTROLLER_REGIONS("harddisk", NULL) +// MCFG_IDE_CONTROLLER_ADD( "ide", ide_intf, "hdd", NULL, false ) /* FIXME */ bebox MACHINE_CONFIG_END @@ -220,65 +220,65 @@ MACHINE_CONFIG_END /* MPU09, MPID, MPS2 DMF3 */ static MACHINE_CONFIG_START( swtpc09d3, swtpc09_state ) - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809, 2000000) - MCFG_CPU_PROGRAM_MAP(swtpc09_mem) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", M6809, 2000000) + MCFG_CPU_PROGRAM_MAP(swtpc09_mem) /* video hardware */ MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) - MCFG_PTM6840_ADD("ptm", swtpc09_6840_intf) - + MCFG_PTM6840_ADD("ptm", swtpc09_6840_intf) + MCFG_DEVICE_ADD("pia", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_a_r)) MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_ca1_r)) MCFG_PIA_IRQA_HANDLER(WRITELINE(swtpc09_state, pia0_irq_a)) - - MCFG_DEVICE_ADD("acia", ACIA6850, 0) + + MCFG_DEVICE_ADD("acia", ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt)) + MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt)) MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line)) - + MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) + MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) + MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) - MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4) + MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4) MCFG_VIA6522_READPA_HANDLER(READ8(swtpc09_state, dmf3_via_read_porta)) MCFG_VIA6522_READPB_HANDLER(READ8(swtpc09_state, dmf3_via_read_portb)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(swtpc09_state, dmf3_via_write_porta)) //MCFG_VIA6522_CA1_HANDLER(WRITELINE(swtpc09_state, dmf3_via_write_ca1)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(swtpc09_state, dmf3_via_irq)) - + MACHINE_CONFIG_END /* ROM definition */ ROM_START( swtpc09 ) - ROM_REGION( 0x100000, "maincpu", 0 ) - ROM_LOAD ( "sbugh1-8.bin", 0xf800, 0x0800, CRC(10a045a7) SHA1(de547b77653951c7424a069520d52c5b0432e98d) ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD ( "sbugh1-8.bin", 0xf800, 0x0800, CRC(10a045a7) SHA1(de547b77653951c7424a069520d52c5b0432e98d) ) ROM_END ROM_START( swtpc09i ) - ROM_REGION( 0x100000, "maincpu", 0 ) - ROM_LOAD ( "hd-rom.bin", 0xe800, 0x0800, CRC(b898b4d7) SHA1(2806633eda7da4e9a243fc534f15526ee928b6bc) ) - ROM_LOAD ( "sbugh1-8.bin", 0xf800, 0x0800, CRC(10a045a7) SHA1(de547b77653951c7424a069520d52c5b0432e98d) ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD ( "hd-rom.bin", 0xe800, 0x0800, CRC(b898b4d7) SHA1(2806633eda7da4e9a243fc534f15526ee928b6bc) ) + ROM_LOAD ( "sbugh1-8.bin", 0xf800, 0x0800, CRC(10a045a7) SHA1(de547b77653951c7424a069520d52c5b0432e98d) ) ROM_END ROM_START( swtpc09u ) - ROM_REGION( 0x100000, "maincpu", 0 ) - ROM_LOAD ( "unibug.bin", 0xf800, 0x0800, CRC(92e1cbf2) SHA1(db00f17ee9accdbfa1775fe0162d3556159b8e70) ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD ( "unibug.bin", 0xf800, 0x0800, CRC(92e1cbf2) SHA1(db00f17ee9accdbfa1775fe0162d3556159b8e70) ) ROM_END ROM_START( swtpc09d3 ) - ROM_REGION( 0x100000, "maincpu", 0 ) - ROM_LOAD ( "uos3.bin", 0xf800, 0x0800, CRC(e95eb3e0) SHA1(3e971d3b7e143bc87e4b506e18a8c928c089c25a) ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD ( "uos3.bin", 0xf800, 0x0800, CRC(e95eb3e0) SHA1(3e971d3b7e143bc87e4b506e18a8c928c089c25a) ) ROM_END /* Driver */ diff --git a/src/mess/drivers/sym1.c b/src/mess/drivers/sym1.c index 0e11e5587b6..be211424599 100644 --- a/src/mess/drivers/sym1.c +++ b/src/mess/drivers/sym1.c @@ -324,7 +324,7 @@ static MACHINE_CONFIG_START( sym1, sym1_state ) // devices MCFG_RIOT6532_ADD("riot", SYM1_CLOCK, sym1_r6532_interface) - + MCFG_DEVICE_ADD("ttl74145", TTL74145, 0) MCFG_TTL74145_OUTPUT_LINE_0_CB(WRITELINE(sym1_state, sym1_74145_output_0_w)) MCFG_TTL74145_OUTPUT_LINE_1_CB(WRITELINE(sym1_state, sym1_74145_output_1_w)) @@ -334,7 +334,7 @@ static MACHINE_CONFIG_START( sym1, sym1_state ) MCFG_TTL74145_OUTPUT_LINE_5_CB(WRITELINE(sym1_state, sym1_74145_output_5_w)) MCFG_TTL74145_OUTPUT_LINE_6_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w)) // lines 7-9 not connected - + MCFG_DEVICE_ADD("via6522_0", VIA6522, 0) MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6502_device, irq_line)) diff --git a/src/mess/drivers/tandy1t.c b/src/mess/drivers/tandy1t.c index 027d0c791bf..399f8705b8c 100644 --- a/src/mess/drivers/tandy1t.c +++ b/src/mess/drivers/tandy1t.c @@ -434,7 +434,7 @@ static INPUT_PORTS_START( tandy1t ) PORT_MODIFY("pc_keyboard_2") PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Cursor Up") PORT_CODE(KEYCODE_UP) /* 29 A9 */ PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Cursor Left") PORT_CODE(KEYCODE_LEFT) /* 2B AB */ - + PORT_MODIFY("pc_keyboard_3") PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Caps") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE /* Caps Lock 3A BA */ @@ -566,10 +566,10 @@ static MACHINE_CONFIG_FRAGMENT(tandy1000_common) MCFG_ISA8_SLOT_ADD("mb:isa", "isa_fdc", pc_isa8_cards, "fdc_xt", true) MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_fdc_35) - + MCFG_ISA8_SLOT_ADD("mb:isa", "isa_lpt", pc_isa8_cards, "lpt", true) MCFG_ISA8_SLOT_ADD("mb:isa", "isa_com", pc_isa8_cards, "com", true) - + MCFG_PC_JOY_ADD("pc_joy") MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) @@ -579,12 +579,12 @@ static MACHINE_CONFIG_FRAGMENT(tandy1000_common) MACHINE_CONFIG_END static MACHINE_CONFIG_START( t1000hx, tandy1000_state ) - MCFG_CPU_ADD("maincpu", I8088, 8000000) + MCFG_CPU_ADD("maincpu", I8088, 8000000) MCFG_CPU_PROGRAM_MAP(tandy1000_map) MCFG_CPU_IO_MAP(tandy1000_io) MCFG_FRAGMENT_ADD(tandy1000_common) - + // plus cards are isa with a nonstandard conntector MCFG_ISA8_SLOT_ADD("mb:isa", "plus1", pc_isa8_cards, NULL, false) MACHINE_CONFIG_END @@ -809,4 +809,3 @@ COMP( 1987, t1000tx, ibm5150, 0, t1000_286, tandy1t, tandy1000_s COMP( 1989, t1000rl, ibm5150, 0, t1000_16, tandy1t, tandy1000_state, t1000hx, "Tandy Radio Shack", "Tandy 1000 RL", 0) COMP( 1989, t1000tl2, ibm5150, 0, t1000_286, tandy1t, tandy1000_state, t1000hx, "Tandy Radio Shack", "Tandy 1000 TL/2", 0) COMP( 1988, t1000sl2, ibm5150, 0, t1000_16_8, tandy1t, tandy1000_state, t1000sl, "Tandy Radio Shack", "Tandy 1000 SL/2", 0) - diff --git a/src/mess/drivers/tandy2k.c b/src/mess/drivers/tandy2k.c index e251ffe0a5d..526a1d29af8 100644 --- a/src/mess/drivers/tandy2k.c +++ b/src/mess/drivers/tandy2k.c @@ -11,10 +11,10 @@ TODO: - floppy - - HDL is also connected to WP/TS input where TS is used to detect motor status - - 3 second motor off delay timer + - HDL is also connected to WP/TS input where TS is used to detect motor status + - 3 second motor off delay timer - DMA - - video (video RAM is at memory top - 0x1400, i.e. 0x1ec00) + - video (video RAM is at memory top - 0x1400, i.e. 0x1ec00) - keyboard ROM - hires graphics board - WD1010 @@ -187,7 +187,7 @@ WRITE8_MEMBER( tandy2k_state::dma_mux_w ) int dme = (drq0 > 2) || (drq1 > 2); m_pic1->ir6_w(dme); - + update_drq(); } @@ -339,7 +339,7 @@ UINT32 tandy2k_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, { const pen_t *pen = m_palette->pens(); address_space &program = m_maincpu->space(AS_PROGRAM); - + for (int y = 0; y < 400; y++) { UINT8 cgra = y % 16; @@ -355,7 +355,7 @@ UINT32 tandy2k_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, int color = BIT(data, 7); bitmap.pix32(y, (sx * 8) + x) = pen[color]; data <<= 1; - } + } } } @@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( tandy2k_state::vpac_slg_w ) WRITE_LINE_MEMBER( tandy2k_state::vpac_sld_w ) { m_sld = state; - + m_vac->sld_w(state); } @@ -758,7 +758,7 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1) //MCFG_SCREEN_UPDATE_DEVICE(CRT9021B_TAG, crt9021_t, screen_update) MCFG_SCREEN_UPDATE_DRIVER(tandy2k_state, screen_update) - + MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, XTAL_16MHz*28/20/8) @@ -816,9 +816,9 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(tandy2k_state, rfrqpulse_w)) MCFG_PIC8259_ADD(I8259A_0_TAG, DEVWRITELINE(I80186_TAG, i80186_cpu_device, int0_w), VCC, NULL) - + MCFG_PIC8259_ADD(I8259A_1_TAG, DEVWRITELINE(I80186_TAG, i80186_cpu_device, int1_w), VCC, NULL) - + MCFG_I8272A_ADD(I8272A_TAG, true) downcast(device)->set_select_lines_connected(true); MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE(I8259A_0_TAG, pic8259_device, ir4_w)) diff --git a/src/mess/drivers/tavernie.c b/src/mess/drivers/tavernie.c index affce7f5a07..48e39c68da7 100644 --- a/src/mess/drivers/tavernie.c +++ b/src/mess/drivers/tavernie.c @@ -106,7 +106,7 @@ private: optional_device m_beep; required_device m_maincpu; required_device m_acia; -public: +public: optional_device m_palette; }; diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c index 2ddad236297..cfba620d8de 100644 --- a/src/mess/drivers/thomson.c +++ b/src/mess/drivers/thomson.c @@ -566,22 +566,22 @@ INPUT_PORTS_END WRITE_LINE_MEMBER( thomson_state::fdc_index_0_w ) { - thomson_index_callback(machine().device(FLOPPY_0), state); + thomson_index_callback(machine().device(FLOPPY_0), state); } WRITE_LINE_MEMBER( thomson_state::fdc_index_1_w ) { - thomson_index_callback(machine().device(FLOPPY_1), state); + thomson_index_callback(machine().device(FLOPPY_1), state); } WRITE_LINE_MEMBER( thomson_state::fdc_index_2_w ) { - thomson_index_callback(machine().device(FLOPPY_2), state); + thomson_index_callback(machine().device(FLOPPY_2), state); } WRITE_LINE_MEMBER( thomson_state::fdc_index_3_w ) { - thomson_index_callback(machine().device(FLOPPY_3), state); + thomson_index_callback(machine().device(FLOPPY_3), state); } static const floppy_interface thomson_floppy_interface_0 = @@ -956,7 +956,7 @@ static MACHINE_CONFIG_DERIVED( to770, to7 ) MCFG_DEVICE_MODIFY("mc6846") MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to770_timer_port_out)) - + MCFG_CARTSLOT_MODIFY("cart") MCFG_CARTSLOT_INTERFACE("to770_cart") MCFG_DEVICE_REMOVE("cart_list") @@ -1878,7 +1878,7 @@ static MACHINE_CONFIG_DERIVED( to9p, to7 ) MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to9p_timer_port_out)) MCFG_MC6846_OUT_CP2_CB(WRITE8(thomson_state, to8_timer_cp2_out)) MCFG_MC6846_IN_PORT_CB(READ8(thomson_state, to9p_timer_port_in)) - + /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") @@ -1965,9 +1965,9 @@ static ADDRESS_MAP_START ( mo6, AS_PROGRAM, 8, thomson_state ) AM_RANGE ( 0xa7f2, 0xa7f3 ) AM_READWRITE(to7_midi_r, to7_midi_w ) AM_RANGE ( 0xa7fe, 0xa7ff ) AM_DEVREADWRITE("mea8000", mea8000_device, read, write) AM_RANGE ( 0xb000, 0xbfff ) AM_ROMBANK ( MO6_CART_LO ) - AM_WRITE ( mo6_cartridge_w ) + AM_WRITE ( mo6_cartridge_w ) AM_RANGE ( 0xc000, 0xefff ) AM_ROMBANK ( MO6_CART_HI ) - AM_WRITE ( mo6_cartridge_w ) + AM_WRITE ( mo6_cartridge_w ) AM_RANGE ( 0xf000, 0xffff ) AM_ROMBANK ( TO8_BIOS_BANK ) /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -2295,9 +2295,9 @@ static ADDRESS_MAP_START ( mo5nr, AS_PROGRAM, 8, thomson_state ) AM_RANGE ( 0xa7f8, 0xa7fb ) AM_DEVREADWRITE( "pia_3", pia6821_device, read_alt, write_alt) AM_RANGE ( 0xa7fe, 0xa7ff ) AM_DEVREADWRITE("mea8000", mea8000_device, read, write) AM_RANGE ( 0xb000, 0xbfff ) AM_ROMBANK ( MO6_CART_LO ) - AM_WRITE ( mo6_cartridge_w ) + AM_WRITE ( mo6_cartridge_w ) AM_RANGE ( 0xc000, 0xefff ) AM_ROMBANK ( MO6_CART_HI ) - AM_WRITE ( mo6_cartridge_w ) + AM_WRITE ( mo6_cartridge_w ) AM_RANGE ( 0xf000, 0xffff ) AM_ROMBANK ( TO8_BIOS_BANK ) /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ diff --git a/src/mess/drivers/ti85.c b/src/mess/drivers/ti85.c index 8b209fa5ab1..c83b4a9b77f 100644 --- a/src/mess/drivers/ti85.c +++ b/src/mess/drivers/ti85.c @@ -552,7 +552,7 @@ static MACHINE_CONFIG_DERIVED( ti82, ti81 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DEVICE("t6a04", t6a04_device, screen_update) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(2) MCFG_PALETTE_INIT_OWNER(ti85_state, ti82 ) @@ -582,7 +582,7 @@ static MACHINE_CONFIG_DERIVED( ti83, ti81 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DEVICE("t6a04", t6a04_device, screen_update) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(2) MCFG_PALETTE_INIT_OWNER(ti85_state, ti82 ) @@ -616,7 +616,7 @@ static MACHINE_CONFIG_DERIVED( ti83p, ti81 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DEVICE("t6a04", t6a04_device, screen_update) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(2) MCFG_PALETTE_INIT_OWNER(ti85_state, ti82 ) diff --git a/src/mess/drivers/ti89.c b/src/mess/drivers/ti89.c index 00c5a3f6e03..4cdb3837188 100644 --- a/src/mess/drivers/ti89.c +++ b/src/mess/drivers/ti89.c @@ -529,7 +529,7 @@ static MACHINE_CONFIG_START( ti89, ti68k_state ) MCFG_SCREEN_SIZE(240, 128) MCFG_SCREEN_VISIBLE_AREA(0, 160-1, 0, 100-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(ti68k_state, ti68k) MCFG_DEFAULT_LAYOUT(layout_lcd) diff --git a/src/mess/drivers/tim011.c b/src/mess/drivers/tim011.c index 4e6a2e39cdc..352e514bf32 100644 --- a/src/mess/drivers/tim011.c +++ b/src/mess/drivers/tim011.c @@ -145,7 +145,7 @@ static MACHINE_CONFIG_START( tim011,tim011_state ) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_UPDATE_DRIVER(tim011_state, screen_update_tim011) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/tim100.c b/src/mess/drivers/tim100.c index 6f3e5a02671..f0be9195a9e 100644 --- a/src/mess/drivers/tim100.c +++ b/src/mess/drivers/tim100.c @@ -18,7 +18,7 @@ public: tim100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c index 34eef386212..da879ca943f 100644 --- a/src/mess/drivers/tk80bs.c +++ b/src/mess/drivers/tk80bs.c @@ -38,7 +38,7 @@ public: m_maincpu(*this, "maincpu"), m_ppi(*this, "ppi"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } @@ -196,7 +196,7 @@ static MACHINE_CONFIG_START( tk80bs, tk80bs_state ) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 128-1) MCFG_SCREEN_UPDATE_DRIVER(tk80bs_state, screen_update_tk80bs) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", tk80bs) diff --git a/src/mess/drivers/trs80.c b/src/mess/drivers/trs80.c index ee753556302..b988fb4cd54 100644 --- a/src/mess/drivers/trs80.c +++ b/src/mess/drivers/trs80.c @@ -641,7 +641,7 @@ static MACHINE_CONFIG_DERIVED( model3, model1 ) MCFG_MACHINE_RESET_OVERRIDE(trs80_state, trs80m4 ) MCFG_GFXDECODE_MODIFY("gfxdecode",trs80m4) - + MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_trs80m4) MCFG_SCREEN_SIZE(80*8, 240) @@ -676,7 +676,7 @@ static MACHINE_CONFIG_DERIVED( lnw80, model1 ) MCFG_MACHINE_RESET_OVERRIDE(trs80_state, lnw80 ) MCFG_GFXDECODE_MODIFY("gfxdecode",lnw80) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(8) MCFG_PALETTE_INIT_OWNER(trs80_state,lnw80) diff --git a/src/mess/drivers/uknc.c b/src/mess/drivers/uknc.c index e64a776ddb0..48de862ff86 100644 --- a/src/mess/drivers/uknc.c +++ b/src/mess/drivers/uknc.c @@ -73,7 +73,7 @@ static MACHINE_CONFIG_START( uknc, uknc_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(uknc_state, screen_update_uknc) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/unior.c b/src/mess/drivers/unior.c index 7d3a90d98e4..61a80ba1217 100644 --- a/src/mess/drivers/unior.c +++ b/src/mess/drivers/unior.c @@ -83,7 +83,7 @@ private: required_device m_pit; required_device m_dma; required_device m_uart; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/unistar.c b/src/mess/drivers/unistar.c index b9adcb4f0ba..4eac9465199 100644 --- a/src/mess/drivers/unistar.c +++ b/src/mess/drivers/unistar.c @@ -100,7 +100,7 @@ static MACHINE_CONFIG_START( unistar, unistar_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(unistar_state, screen_update_unistar) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", unistar) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(unistar_state, unistar) diff --git a/src/mess/drivers/univac.c b/src/mess/drivers/univac.c index ae8e13f8944..cc50188df77 100644 --- a/src/mess/drivers/univac.c +++ b/src/mess/drivers/univac.c @@ -149,7 +149,7 @@ static MACHINE_CONFIG_START( uts20, univac_state ) MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/drivers/ut88.c b/src/mess/drivers/ut88.c index e35cfb58a70..9394fe98529 100644 --- a/src/mess/drivers/ut88.c +++ b/src/mess/drivers/ut88.c @@ -201,7 +201,7 @@ static MACHINE_CONFIG_START( ut88, ut88_state ) MCFG_VIDEO_START_OVERRIDE(ut88_state,ut88) MCFG_SCREEN_UPDATE_DRIVER(ut88_state, screen_update_ut88) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ut88 ) diff --git a/src/mess/drivers/v6809.c b/src/mess/drivers/v6809.c index 53294df30da..d68ae539ce6 100644 --- a/src/mess/drivers/v6809.c +++ b/src/mess/drivers/v6809.c @@ -108,7 +108,7 @@ private: required_device m_speaker; required_device m_acia0; required_device m_acia1; -public: +public: required_device m_palette; }; diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c index e1c1124b0ea..19b236fe3f2 100644 --- a/src/mess/drivers/vboy.c +++ b/src/mess/drivers/vboy.c @@ -106,7 +106,7 @@ public: : driver_device(mconfig, type, tag), m_maintimer(*this, "timer_main"), m_maincpu(*this, "maincpu"), - m_palette(*this, "palette") + m_palette(*this, "palette") { m_vip_regs.INTPND = 0; m_vip_regs.INTENB = 0; diff --git a/src/mess/drivers/vector06.c b/src/mess/drivers/vector06.c index 9b811e74bc3..fdf41a9104a 100644 --- a/src/mess/drivers/vector06.c +++ b/src/mess/drivers/vector06.c @@ -176,7 +176,7 @@ static MACHINE_CONFIG_START( vector06, vector06_state ) MCFG_SCREEN_VISIBLE_AREA(0, 256+64-1, 0, 256+64-1) MCFG_SCREEN_UPDATE_DRIVER(vector06_state, screen_update_vector06) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(vector06_state, vector06) diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c index 6b5b8577226..3afd53500d3 100644 --- a/src/mess/drivers/victor9k.c +++ b/src/mess/drivers/victor9k.c @@ -629,16 +629,16 @@ WRITE_LINE_MEMBER( victor9k_state::via4_irq_w ) /* - bit description - - PA0 E0 - PA1 E1 - PA2 I1 - PA3 E2 - PA4 E4 - PA5 E5 - PA6 I7 - PA7 E6 + bit description + + PA0 E0 + PA1 E1 + PA2 I1 + PA3 E2 + PA4 E4 + PA5 E5 + PA6 I7 + PA7 E6 */ diff --git a/src/mess/drivers/vip.c b/src/mess/drivers/vip.c index 3fb99e69a3a..fbd275fd54e 100644 --- a/src/mess/drivers/vip.c +++ b/src/mess/drivers/vip.c @@ -503,7 +503,7 @@ WRITE8_MEMBER( vip_state::dma_w ) WRITE8_MEMBER( vip_state::sc_w ) { - m_exp->sc_w(data); + m_exp->sc_w(data); } @@ -726,24 +726,24 @@ static MACHINE_CONFIG_START( vip, vip_state ) MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_52128MHz/2) MCFG_CPU_PROGRAM_MAP(vip_mem) MCFG_CPU_IO_MAP(vip_io) - MCFG_COSMAC_WAIT_CALLBACK(VCC) - MCFG_COSMAC_CLEAR_CALLBACK(READLINE(vip_state, clear_r)) - MCFG_COSMAC_EF1_CALLBACK(READLINE(vip_state, ef1_r)) - MCFG_COSMAC_EF2_CALLBACK(READLINE(vip_state, ef2_r)) - MCFG_COSMAC_EF3_CALLBACK(READLINE(vip_state, ef3_r)) - MCFG_COSMAC_EF4_CALLBACK(READLINE(vip_state, ef4_r)) - MCFG_COSMAC_Q_CALLBACK(WRITELINE(vip_state, q_w)) - MCFG_COSMAC_DMAR_CALLBACK(READ8(vip_state, dma_r)) - MCFG_COSMAC_DMAW_CALLBACK(WRITE8(vip_state, dma_w)) - MCFG_COSMAC_SC_CALLBACK(WRITE8(vip_state, sc_w)) + MCFG_COSMAC_WAIT_CALLBACK(VCC) + MCFG_COSMAC_CLEAR_CALLBACK(READLINE(vip_state, clear_r)) + MCFG_COSMAC_EF1_CALLBACK(READLINE(vip_state, ef1_r)) + MCFG_COSMAC_EF2_CALLBACK(READLINE(vip_state, ef2_r)) + MCFG_COSMAC_EF3_CALLBACK(READLINE(vip_state, ef3_r)) + MCFG_COSMAC_EF4_CALLBACK(READLINE(vip_state, ef4_r)) + MCFG_COSMAC_Q_CALLBACK(WRITELINE(vip_state, q_w)) + MCFG_COSMAC_DMAR_CALLBACK(READ8(vip_state, dma_r)) + MCFG_COSMAC_DMAW_CALLBACK(WRITE8(vip_state, dma_w)) + MCFG_COSMAC_SC_CALLBACK(WRITE8(vip_state, sc_w)) // video hardware - MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_3_52128MHz/2) - MCFG_CDP1861_IRQ_CALLBACK(WRITELINE(vip_state, vdc_int_w)) - MCFG_CDP1861_DMA_OUT_CALLBACK(WRITELINE(vip_state, vdc_dma_out_w)) - MCFG_CDP1861_EFX_CALLBACK(WRITELINE(vip_state, vdc_ef1_w)) - MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_3_52128MHz/2) - MCFG_SCREEN_UPDATE_DRIVER(vip_state, screen_update) + MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_3_52128MHz/2) + MCFG_CDP1861_IRQ_CALLBACK(WRITELINE(vip_state, vdc_int_w)) + MCFG_CDP1861_DMA_OUT_CALLBACK(WRITELINE(vip_state, vdc_dma_out_w)) + MCFG_CDP1861_EFX_CALLBACK(WRITELINE(vip_state, vdc_ef1_w)) + MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_3_52128MHz/2) + MCFG_SCREEN_UPDATE_DRIVER(vip_state, screen_update) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -754,9 +754,9 @@ static MACHINE_CONFIG_START( vip, vip_state ) MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, vip_byteio_cards, NULL, WRITELINE(vip_state, byteio_inst_w)) MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, XTAL_3_52128MHz/2, vip_expansion_cards, NULL) - MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vip_state, exp_int_w)) - MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vip_state, exp_dma_out_w)) - MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vip_state, exp_dma_in_w)) + MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vip_state, exp_int_w)) + MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vip_state, exp_dma_out_w)) + MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vip_state, exp_dma_in_w)) // devices MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x", 0) diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c index e1ff3dc057f..8d39c3ebb39 100644 --- a/src/mess/drivers/vt100.c +++ b/src/mess/drivers/vt100.c @@ -421,7 +421,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state ) MCFG_SCREEN_PALETTE("vt100_video:palette") MCFG_GFXDECODE_ADD("gfxdecode", "vt100_video:palette", vt100) -// MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") +// MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") MCFG_DEFAULT_LAYOUT( layout_vt100 ) diff --git a/src/mess/drivers/vt220.c b/src/mess/drivers/vt220.c index 29f62f67732..417dd6f6405 100644 --- a/src/mess/drivers/vt220.c +++ b/src/mess/drivers/vt220.c @@ -68,7 +68,7 @@ static MACHINE_CONFIG_START( vt220, vt220_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(vt220_state, screen_update_vt220) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* internal ram */ diff --git a/src/mess/drivers/vt320.c b/src/mess/drivers/vt320.c index 8ddab90488f..31e63f7e4c4 100644 --- a/src/mess/drivers/vt320.c +++ b/src/mess/drivers/vt320.c @@ -94,7 +94,7 @@ static MACHINE_CONFIG_START( vt320, vt320_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(vt320_state, screen_update_vt320) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* internal ram */ diff --git a/src/mess/drivers/vt520.c b/src/mess/drivers/vt520.c index 9cee1d95e64..850b0895487 100644 --- a/src/mess/drivers/vt520.c +++ b/src/mess/drivers/vt520.c @@ -85,7 +85,7 @@ static MACHINE_CONFIG_START( vt520, vt520_state ) MCFG_SCREEN_VISIBLE_AREA(0, 802-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(vt520_state, screen_update_vt520) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") // On the board there are two M5M44256BJ-7 chips diff --git a/src/mess/drivers/vta2000.c b/src/mess/drivers/vta2000.c index 6da21346870..cbc7cea9ac0 100644 --- a/src/mess/drivers/vta2000.c +++ b/src/mess/drivers/vta2000.c @@ -171,8 +171,8 @@ static MACHINE_CONFIG_START( vta2000, vta2000_state ) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 25*12-1) MCFG_SCREEN_UPDATE_DRIVER(vta2000_state, screen_update_vta2000) MCFG_SCREEN_PALETTE("palette") - - MCFG_PALETTE_ADD("palette", 3) + + MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(vta2000_state, vta2000) MCFG_GFXDECODE_ADD("gfxdecode", "palette", vta2000) MACHINE_CONFIG_END diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index 7c0d10b3691..b91a5fa528e 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -923,7 +923,7 @@ static const mc6847_interface vtech1_mc6847_bw_intf = static const mc6847_interface vtech1_mc6847_intf = { "screen", - DEVCB_DRIVER_MEMBER(vtech1_state,vtech1_mc6847_videoram_r), + DEVCB_DRIVER_MEMBER(vtech1_state,vtech1_mc6847_videoram_r), DEVCB_NULL, /* AG */ DEVCB_LINE_GND, /* GM2 */ @@ -963,7 +963,7 @@ static MACHINE_CONFIG_START( laser110, vtech1_state ) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("screen", "mc6847") MCFG_MC6847_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz, vtech1_mc6847_bw_intf) - MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) + MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -999,7 +999,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( laser200, laser110 ) MCFG_DEVICE_REMOVE("mc6847") MCFG_MC6847_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz, vtech1_mc6847_intf) - MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) + MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( laser210, laser200 ) @@ -1028,7 +1028,7 @@ static MACHINE_CONFIG_DERIVED( laser310h, laser310 ) MCFG_CPU_IO_MAP(vtech1_shrg_io) MCFG_DEVICE_REMOVE("mc6847") MCFG_MC6847_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz, vtech1_shrg_mc6847_intf) - MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) + MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MACHINE_CONFIG_END diff --git a/src/mess/drivers/wangpc.c b/src/mess/drivers/wangpc.c index 529c25a1b6b..f228c55f066 100644 --- a/src/mess/drivers/wangpc.c +++ b/src/mess/drivers/wangpc.c @@ -1133,7 +1133,7 @@ static MACHINE_CONFIG_START( wangpc, wangpc_state ) MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(WANGPC_KEYBOARD_TAG, wangpc_keyboard_device, write_rxd)) MCFG_IM6402_DR_CALLBACK(WRITELINE(wangpc_state, uart_dr_w)) MCFG_IM6402_TBRE_CALLBACK(WRITELINE(wangpc_state, uart_tbre_w)) - + MCFG_DEVICE_ADD(SCN2661_TAG, MC2661, 0) MCFG_MC2661_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) MCFG_MC2661_RXRDY_HANDLER(WRITELINE(wangpc_state, epci_irq_w)) diff --git a/src/mess/drivers/wswan.c b/src/mess/drivers/wswan.c index 2cb949043b5..9961219ad07 100644 --- a/src/mess/drivers/wswan.c +++ b/src/mess/drivers/wswan.c @@ -135,7 +135,7 @@ static MACHINE_CONFIG_START( wswan, wswan_state ) MCFG_SCREEN_SIZE( WSWAN_X_PIXELS, WSWAN_Y_PIXELS ) MCFG_SCREEN_VISIBLE_AREA(0*8, WSWAN_X_PIXELS - 1, 0, WSWAN_Y_PIXELS - 1) MCFG_SCREEN_PALETTE("palette") - + MCFG_DEFAULT_LAYOUT(layout_wswan) MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -169,7 +169,7 @@ static MACHINE_CONFIG_DERIVED( wscolor, wswan ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(wscolor_mem) MCFG_MACHINE_START_OVERRIDE(wswan_state, wscolor ) - + MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4096) MCFG_PALETTE_INIT_OWNER(wswan_state, wscolor ) diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c index 5c5a6151411..1fff1614aec 100644 --- a/src/mess/drivers/x07.c +++ b/src/mess/drivers/x07.c @@ -1481,7 +1481,7 @@ static MACHINE_CONFIG_START( x07, x07_state ) MCFG_SCREEN_SIZE(120, 32) MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 32-1) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(x07_state, x07) MCFG_DEFAULT_LAYOUT(layout_lcd) @@ -1499,7 +1499,7 @@ static MACHINE_CONFIG_START( x07, x07_state ) MCFG_TIMER_DRIVER_ADD_PERIODIC("blink_timer", x07_state, blink_timer, attotime::from_msec(300)) - MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", x07_state, nvram_init) // t6834 RAM + MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", x07_state, nvram_init) // t6834 RAM MCFG_NVRAM_ADD_0FILL("nvram2") // RAM banks /* internal ram */ @@ -1540,14 +1540,14 @@ ROM_START( x07 ) ROM_REGION( 0x0800, "default", ROMREGION_ERASE00 ) ROM_END -DRIVER_INIT_MEMBER(x07_state, x07) -{ +DRIVER_INIT_MEMBER(x07_state, x07) +{ UINT8 *RAM = memregion("default")->base(); UINT8 *GFX = memregion("gfx1")->base(); - + for (int i = 0; i < 12; i++) strcpy((char *)RAM + udk_offset[i], udk_ini[i]); - + //copy default chars in the UDC memcpy(RAM + 0x200, GFX + 0x400, 0x100); memcpy(RAM + 0x300, GFX + 0x700, 0x100); diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index f1ee83a0710..689c835c05f 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -1057,7 +1057,7 @@ void x68k_state::set_bus_error(UINT32 address, bool write, UINT16 mem_mask) m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE); timer_set(m_maincpu->cycles_to_attotime(16), TIMER_X68K_BUS_ERROR); // let rmw cycles complete - logerror("%s: Bus error: Unused RAM access [%08x]\n", machine().describe_context(), address); + logerror("%s: Bus error: Unused RAM access [%08x]\n", machine().describe_context(), address); } READ16_MEMBER(x68k_state::x68k_rom0_r) @@ -1873,7 +1873,7 @@ static MACHINE_CONFIG_FRAGMENT( x68000_base ) MCFG_SCREEN_VISIBLE_AREA(0, 767, 0, 511) MCFG_SCREEN_UPDATE_DRIVER(x68k_state, screen_update_x68000) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) MCFG_PALETTE_ADD("palette", 65536) diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c index 6d9b27c996d..8efade6de9b 100644 --- a/src/mess/drivers/xerox820.c +++ b/src/mess/drivers/xerox820.c @@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( xerox820, xerox820_state ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(xerox820_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") @@ -747,7 +747,7 @@ static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(xerox820ii_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820ii) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/ymmu100.c b/src/mess/drivers/ymmu100.c index e81fc4ac0db..b775012d8c9 100644 --- a/src/mess/drivers/ymmu100.c +++ b/src/mess/drivers/ymmu100.c @@ -79,7 +79,7 @@ 16 7 mode 15 7 eq 14 7 exit - 10 7 value - + 10 7 value - 11 7 value + 2 led play 3 led edit @@ -452,10 +452,10 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED_CLASS( mu100r, mu100, mu100r_state ) MACHINE_CONFIG_END - + #define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \ ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(bios+1)) /* Note '+1' */ - + ROM_START( mu100 ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_SYSTEM_BIOS( 0, "bios0", "xu50720 (v1.11, Aug. 3, 1999)" ) diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index 706e38c813f..95a38083adf 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -163,7 +163,7 @@ public: m_pics(*this, "pic8259_slave"), m_fdc(*this, "z207_fdc"), m_crtc(*this, "crtc"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; @@ -174,7 +174,7 @@ public: required_device m_fdc; required_device m_crtc; required_device m_palette; - + DECLARE_READ8_MEMBER(z100_vram_r); DECLARE_WRITE8_MEMBER(z100_vram_w); DECLARE_READ8_MEMBER(keyb_data_r); @@ -737,7 +737,7 @@ static MACHINE_CONFIG_START( z100, z100_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(z100_state, screen_update_z100) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 8) /* Devices */ diff --git a/src/mess/drivers/z1013.c b/src/mess/drivers/z1013.c index 825edb30f75..24dc2dfd89e 100644 --- a/src/mess/drivers/z1013.c +++ b/src/mess/drivers/z1013.c @@ -409,7 +409,7 @@ static MACHINE_CONFIG_START( z1013, z1013_state ) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(z1013_state, screen_update_z1013) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", z1013) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") diff --git a/src/mess/drivers/z80ne.c b/src/mess/drivers/z80ne.c index 68f2aabf6af..7c4f743bb06 100644 --- a/src/mess/drivers/z80ne.c +++ b/src/mess/drivers/z80ne.c @@ -513,7 +513,7 @@ static MACHINE_CONFIG_START( z80netb, z80ne_state ) MCFG_CASSETTE_ADD( "cassette", z80ne_cassettea_config ) MCFG_CASSETTE_ADD( "cassette2", z80ne_cassetteb_config ) - MCFG_DEVICE_ADD("lx388_kr2376", KR2376, 50000) + MCFG_DEVICE_ADD("lx388_kr2376", KR2376, 50000) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") @@ -541,7 +541,7 @@ static MACHINE_CONFIG_START( z80netf, z80ne_state ) MCFG_CASSETTE_ADD( "cassette", z80ne_cassettea_config ) MCFG_CASSETTE_ADD( "cassette2", z80ne_cassetteb_config ) - MCFG_DEVICE_ADD("lx388_kr2376", KR2376, 50000) + MCFG_DEVICE_ADD("lx388_kr2376", KR2376, 50000) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c index e4018ae72f0..f51b8e21ae1 100644 --- a/src/mess/drivers/z9001.c +++ b/src/mess/drivers/z9001.c @@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state ) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 24*8-1) MCFG_SCREEN_UPDATE_DRIVER(z9001_state, screen_update_z9001) MCFG_SCREEN_PALETTE("palette") - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", z9001) MCFG_PALETTE_ADD("palette", 16) diff --git a/src/mess/drivers/zorba.c b/src/mess/drivers/zorba.c index b4000f794ee..dbede75b64a 100644 --- a/src/mess/drivers/zorba.c +++ b/src/mess/drivers/zorba.c @@ -98,7 +98,7 @@ private: required_device m_fdc; required_device m_floppy0; required_device m_floppy1; -public: +public: required_device m_palette; }; @@ -361,7 +361,7 @@ static MACHINE_CONFIG_START( zorba, zorba_state ) MCFG_SCREEN_SIZE(640, 276) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 275) MCFG_SCREEN_PALETTE("palette") - + MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(zorba_state, zorba) diff --git a/src/mess/drivers/zrt80.c b/src/mess/drivers/zrt80.c index 8ede71de5d3..8057674ee1a 100644 --- a/src/mess/drivers/zrt80.c +++ b/src/mess/drivers/zrt80.c @@ -60,7 +60,7 @@ private: required_device m_crtc; required_device m_8250; required_device m_beep; -public: +public: required_device m_palette; }; diff --git a/src/mess/includes/a7800.h b/src/mess/includes/a7800.h index c08e895f4fa..6df0af95831 100644 --- a/src/mess/includes/a7800.h +++ b/src/mess/includes/a7800.h @@ -114,7 +114,7 @@ protected: required_ioport m_io_console_buttons; memory_bank *m_bank10; memory_bank *m_bank11; - required_device m_screen; + required_device m_screen; void maria_draw_scanline(); int is_holey(unsigned int addr); diff --git a/src/mess/includes/advision.h b/src/mess/includes/advision.h index eed7605f69c..42c0e73b44e 100644 --- a/src/mess/includes/advision.h +++ b/src/mess/includes/advision.h @@ -21,7 +21,7 @@ public: m_maincpu(*this, I8048_TAG), m_soundcpu(*this, COP411_TAG), m_dac(*this, "dac"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h index 2f83a92dec6..39c89a0c99a 100644 --- a/src/mess/includes/amstrad.h +++ b/src/mess/includes/amstrad.h @@ -288,7 +288,7 @@ protected: optional_ioport m_io_analog4; required_device m_screen; required_device m_palette; - + void amstrad_init_lookups(); void amstrad_vh_update_mode(); void amstrad_plus_dma_parse(int channel); diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h index 479c8a483ba..79c59145fbf 100644 --- a/src/mess/includes/apollo.h +++ b/src/mess/includes/apollo.h @@ -301,7 +301,7 @@ public: apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *name, const char *shortname, const char *source); ~apollo_graphics_15i(); - UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); // monochrome control DECLARE_READ8_MEMBER( apollo_mcr_r ); @@ -314,13 +314,13 @@ public: // color control DECLARE_READ8_MEMBER( apollo_ccr_r ); DECLARE_WRITE8_MEMBER( apollo_ccr_w ); - + DECLARE_READ16_MEMBER( apollo_mgm_r ); DECLARE_WRITE16_MEMBER( apollo_mgm_w ); DECLARE_READ16_MEMBER( apollo_cgm_r ); DECLARE_WRITE16_MEMBER( apollo_cgm_w ); - + void vblank_state_changed(screen_device &screen, bool vblank_state); int is_mono() { return m_n_planes == 1; } @@ -347,7 +347,7 @@ protected: void set_lut_cr(UINT8 data); void register_vblank_callback(); - + UINT32 set_msb0(UINT32 value, UINT8 data) { return (value & 0xffffff00) | data; diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h index 078a8621041..8922cb11a60 100644 --- a/src/mess/includes/apple2gs.h +++ b/src/mess/includes/apple2gs.h @@ -99,7 +99,7 @@ public: #endif m_adb_mousex(*this, "adb_mouse_x"), m_adb_mousey(*this, "adb_mouse_y"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/apple3.h b/src/mess/includes/apple3.h index 8cc31205120..257f39b5f90 100644 --- a/src/mess/includes/apple3.h +++ b/src/mess/includes/apple3.h @@ -30,8 +30,8 @@ #define VAR_EXTPOWER 0x0040 #define VAR_EXTSIDE 0x0080 -#define SPEAKER_TAG "a3spkr" -#define DAC_TAG "a3dac" +#define SPEAKER_TAG "a3spkr" +#define DAC_TAG "a3dac" class apple3_state : public driver_device { @@ -50,7 +50,7 @@ public: m_speaker(*this, SPEAKER_TAG), m_dac(*this, DAC_TAG), m_kbspecial(*this, "keyb_special"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } diff --git a/src/mess/includes/apricotf.h b/src/mess/includes/apricotf.h index 542ca49bcb3..55ed2999a64 100644 --- a/src/mess/includes/apricotf.h +++ b/src/mess/includes/apricotf.h @@ -55,7 +55,7 @@ public: m_sio_int(CLEAR_LINE), m_p_scrollram(*this, "p_scrollram"), m_p_paletteram(*this, "p_paletteram"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } virtual void machine_start(); diff --git a/src/mess/includes/aquarius.h b/src/mess/includes/aquarius.h index 685e5c424da..0da6ce971e1 100644 --- a/src/mess/includes/aquarius.h +++ b/src/mess/includes/aquarius.h @@ -57,7 +57,7 @@ public: required_ioport m_y7; required_device m_gfxdecode; required_device m_screen; - required_device m_palette; + required_device m_palette; UINT8 m_scrambler; tilemap_t *m_tilemap; diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h index 9cdfd9fd975..2d4eafefaa3 100644 --- a/src/mess/includes/atarist.h +++ b/src/mess/includes/atarist.h @@ -118,7 +118,7 @@ public: m_ikbd_mouse_pc(0), m_ikbd_joy(1), m_monochrome(1), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/avigo.h b/src/mess/includes/avigo.h index 4099a72bdfe..3fbafa843d2 100644 --- a/src/mess/includes/avigo.h +++ b/src/mess/includes/avigo.h @@ -36,7 +36,7 @@ public: m_speaker(*this, "speaker"), m_uart(*this, "ns16550"), m_serport(*this, "serport"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/b2m.h b/src/mess/includes/b2m.h index 7e6b52cbf72..27d9f9bac6e 100644 --- a/src/mess/includes/b2m.h +++ b/src/mess/includes/b2m.h @@ -45,7 +45,7 @@ public: required_device m_pit; required_device m_ram; required_device m_palette; - + /* devices */ fd1793_t *m_fdc; pic8259_device *m_pic; diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h index 0a2de809fb9..ee7a5865426 100644 --- a/src/mess/includes/bbc.h +++ b/src/mess/includes/bbc.h @@ -152,7 +152,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_dcd_serial); DECLARE_WRITE_LINE_MEMBER(write_cts_serial); DECLARE_INPUT_CHANGED_MEMBER( trigger_reset ); - + DECLARE_WRITE_LINE_MEMBER(bbc_i8271_interrupt); int exp_rom_load(device_image_interface &image, int index); diff --git a/src/mess/includes/dm7000.h b/src/mess/includes/dm7000.h index 4fc8dbdf353..ed7276c4f8a 100644 --- a/src/mess/includes/dm7000.h +++ b/src/mess/includes/dm7000.h @@ -41,11 +41,11 @@ public: DECLARE_WRITE16_MEMBER ( dm7000_enet_w ); DECLARE_READ16_MEMBER ( dm7000_enet_r ); - + DECLARE_READ32_MEMBER( dcr_r ); DECLARE_WRITE32_MEMBER( dcr_w ); - - + + UINT16 m_enet_regs[32]; UINT32 dcr[1024]; diff --git a/src/mess/includes/einstein.h b/src/mess/includes/einstein.h index c92cfe8e853..d0a60d6008f 100644 --- a/src/mess/includes/einstein.h +++ b/src/mess/includes/einstein.h @@ -151,7 +151,7 @@ protected: required_ioport m_buttons; required_ioport m_config; optional_ioport m_80column_dips; -public: +public: optional_device m_palette; void einstein_scan_keyboard(); diff --git a/src/mess/includes/fm7.h b/src/mess/includes/fm7.h index 393a5a57e02..2fac366bab5 100644 --- a/src/mess/includes/fm7.h +++ b/src/mess/includes/fm7.h @@ -141,7 +141,7 @@ public: m_joy1(*this, "joy1"), m_joy2(*this, "joy2"), m_dsw(*this, "DSW"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } diff --git a/src/mess/includes/genpc.h b/src/mess/includes/genpc.h index 73a73868b43..f71c3edca5b 100644 --- a/src/mess/includes/genpc.h +++ b/src/mess/includes/genpc.h @@ -103,7 +103,7 @@ public: DECLARE_WRITE_LINE_MEMBER( pc_dack3_w ); DECLARE_WRITE_LINE_MEMBER( pc_speaker_set_spkrdata ); - + DECLARE_READ8_MEMBER(pc_page_r); DECLARE_WRITE8_MEMBER(pc_page_w); DECLARE_WRITE8_MEMBER(nmi_enable_w); @@ -175,7 +175,7 @@ protected: public: virtual DECLARE_READ8_MEMBER ( pc_ppi_portc_r ); virtual DECLARE_WRITE8_MEMBER( pc_ppi_portb_w ); - + virtual DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); }; diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h index bb8800cd9a4..8355595b483 100644 --- a/src/mess/includes/intv.h +++ b/src/mess/includes/intv.h @@ -142,7 +142,7 @@ protected: required_ioport m_io_options; optional_ioport m_io_ecs_cntrlsel; optional_ioport m_io_test; - + optional_device m_gfxdecode; required_device m_palette; diff --git a/src/mess/includes/kaypro.h b/src/mess/includes/kaypro.h index 5003bc66709..00e26dbd2e8 100644 --- a/src/mess/includes/kaypro.h +++ b/src/mess/includes/kaypro.h @@ -101,7 +101,7 @@ private: required_device m_floppy1; optional_device m_crtc; required_device m_beep; -public: +public: required_device m_palette; }; diff --git a/src/mess/includes/lisa.h b/src/mess/includes/lisa.h index d5c65ab7496..cb9be226f52 100644 --- a/src/mess/includes/lisa.h +++ b/src/mess/includes/lisa.h @@ -120,7 +120,7 @@ public: m_io_line7(*this, "LINE7"), m_io_mouse_x(*this, "MOUSE_X"), m_io_mouse_y(*this, "MOUSE_Y"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; @@ -144,7 +144,7 @@ public: required_ioport m_io_line7; required_ioport m_io_mouse_x; required_ioport m_io_mouse_y; - + required_device m_palette; UINT8 *m_ram_ptr; diff --git a/src/mess/includes/mc1502.h b/src/mess/includes/mc1502.h index d90ffddaf3a..1576dbc313f 100644 --- a/src/mess/includes/mc1502.h +++ b/src/mess/includes/mc1502.h @@ -36,7 +36,7 @@ public: m_ram(*this, RAM_TAG) { } required_device m_maincpu; - required_device m_upd8251; + required_device m_upd8251; required_device m_pic8259; required_device m_pit8253; required_device m_ppi8255n1; @@ -86,7 +86,7 @@ private: int fdc_motor_on; emu_timer *fdc_motor_timer; } m_motor; - const char *m_cputag; + const char *m_cputag; */ }; diff --git a/src/mess/includes/mikromik.h b/src/mess/includes/mikromik.h index 0bb328e264d..2bfa322e649 100644 --- a/src/mess/includes/mikromik.h +++ b/src/mess/includes/mikromik.h @@ -30,7 +30,7 @@ #define RS232_A_TAG "rs232a" #define RS232_B_TAG "rs232b" #define RS232_C_TAG "rs232c" -#define KB_TAG "kb" +#define KB_TAG "kb" class mm1_state : public driver_device { diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h index 9b5d80066bb..859079a1a34 100644 --- a/src/mess/includes/nascom1.h +++ b/src/mess/includes/nascom1.h @@ -41,7 +41,7 @@ public: m_ram(*this, RAM_TAG), m_videoram(*this, "videoram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/p2000t.h b/src/mess/includes/p2000t.h index 3c8e13c9985..66146426f9e 100644 --- a/src/mess/includes/p2000t.h +++ b/src/mess/includes/p2000t.h @@ -22,7 +22,7 @@ public: m_speaker(*this, "speaker"), m_videoram(*this, "videoram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/partner.h b/src/mess/includes/partner.h index 2d28dbb3818..9d34642b0b0 100644 --- a/src/mess/includes/partner.h +++ b/src/mess/includes/partner.h @@ -31,11 +31,11 @@ public: DECLARE_MACHINE_RESET(partner); DECLARE_WRITE_LINE_MEMBER(partner_wd17xx_drq_w); DECLARE_WRITE_LINE_MEMBER(hrq_w); - + //to remove trampoline once it use new wd17xx core DECLARE_READ8_MEMBER(partner_fdc_r); DECLARE_WRITE8_MEMBER(partner_fdc_w); - + void partner_window_1(UINT8 bank_num, UINT16 offset,UINT8 *rom); void partner_window_2(UINT8 bank_num, UINT16 offset,UINT8 *rom); void partner_iomap_bank(UINT8 *rom); diff --git a/src/mess/includes/pcw.h b/src/mess/includes/pcw.h index 3ee7844ac41..780b41957f2 100644 --- a/src/mess/includes/pcw.h +++ b/src/mess/includes/pcw.h @@ -124,7 +124,7 @@ public: required_device m_beeper; required_device m_screen; required_device m_palette; - + inline void pcw_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color); void pcw_update_interrupt_counter(); void pcw_update_irqs(); diff --git a/src/mess/includes/pocketc.h b/src/mess/includes/pocketc.h index bb9193ec36e..442ad41939e 100644 --- a/src/mess/includes/pocketc.h +++ b/src/mess/includes/pocketc.h @@ -16,7 +16,7 @@ public: : driver_device(mconfig, type, tag) { } DECLARE_PALETTE_INIT(pocketc); - + static const unsigned short pocketc_colortable[8][2]; void pocketc_draw_special(bitmap_ind16 &bitmap,int x, int y, const POCKETC_FIGURE fig, int color); }; diff --git a/src/mess/includes/ql.h b/src/mess/includes/ql.h index e3248037467..b1d1b319d28 100644 --- a/src/mess/includes/ql.h +++ b/src/mess/includes/ql.h @@ -32,40 +32,40 @@ #define X3 XTAL_4_436MHz #define X4 XTAL_11MHz -#define QL_CONFIG_PORT "config" -#define QIMI_PORT_MASK 0x01 -#define QIMI_NONE 0x00 -#define QIMI_MOUSE 0x01 -#define DISK_TYPE_MASK 0x06 -#define DISK_TYPE_NONE 0x00 -#define DISK_TYPE_TRUMP 0x02 -#define DISK_TYPE_SANDY_SD 0x04 -#define DISK_TYPE_SANDY_SQB 0x06 -#define IS_SANDY_DISK(__dtype__) ((__dtype__ == DISK_TYPE_SANDY_SD) || (__dtype__ == DISK_TYPE_SANDY_SQB)) - -#define TRUMP_DRIVE1_MASK 0x01 -#define TRUMP_DRIVE0_MASK 0x02 -#define TRUMP_MOTOR_MASK 0x04 -#define TRUMP_SIDE_SHIFT 3 -#define TRUMP_SIDE_MASK (1 << TRUMP_SIDE_SHIFT) - -#define CART_ROM_BASE 0x0c000 -#define CART_ROM_END 0x0ffff - -#define TRUMP_ROM_MBASE 0x10000 -#define TRUMP_ROM_BASE 0x14000 -#define TRUMP_ROM_LEN 0x08000 -#define TRUMP_ROM_END (TRUMP_ROM_MBASE+(TRUMP_ROM_LEN-1)) - -#define TRUMP_IO_BASE 0x1c000 -#define TRUMP_IO_LEN 0x04000 -#define TRUMP_IO_END (TRUMP_IO_BASE+(TRUMP_IO_LEN-1)) - -#define SANDY_ROM_BASE_SD 0x1c000 -#define SANDY_ROM_BASE_SQB 0x20000 -#define SANDY_IO_BASE 0xc3fc0 -#define SANDY_IO_LEN 0x00040 -#define SANDY_IO_END (SANDY_IO_BASE+(SANDY_IO_LEN-1)) +#define QL_CONFIG_PORT "config" +#define QIMI_PORT_MASK 0x01 +#define QIMI_NONE 0x00 +#define QIMI_MOUSE 0x01 +#define DISK_TYPE_MASK 0x06 +#define DISK_TYPE_NONE 0x00 +#define DISK_TYPE_TRUMP 0x02 +#define DISK_TYPE_SANDY_SD 0x04 +#define DISK_TYPE_SANDY_SQB 0x06 +#define IS_SANDY_DISK(__dtype__) ((__dtype__ == DISK_TYPE_SANDY_SD) || (__dtype__ == DISK_TYPE_SANDY_SQB)) + +#define TRUMP_DRIVE1_MASK 0x01 +#define TRUMP_DRIVE0_MASK 0x02 +#define TRUMP_MOTOR_MASK 0x04 +#define TRUMP_SIDE_SHIFT 3 +#define TRUMP_SIDE_MASK (1 << TRUMP_SIDE_SHIFT) + +#define CART_ROM_BASE 0x0c000 +#define CART_ROM_END 0x0ffff + +#define TRUMP_ROM_MBASE 0x10000 +#define TRUMP_ROM_BASE 0x14000 +#define TRUMP_ROM_LEN 0x08000 +#define TRUMP_ROM_END (TRUMP_ROM_MBASE+(TRUMP_ROM_LEN-1)) + +#define TRUMP_IO_BASE 0x1c000 +#define TRUMP_IO_LEN 0x04000 +#define TRUMP_IO_END (TRUMP_IO_BASE+(TRUMP_IO_LEN-1)) + +#define SANDY_ROM_BASE_SD 0x1c000 +#define SANDY_ROM_BASE_SQB 0x20000 +#define SANDY_IO_BASE 0xc3fc0 +#define SANDY_IO_LEN 0x00040 +#define SANDY_IO_END (SANDY_IO_BASE+(SANDY_IO_LEN-1)) #define SANDY_DRIVE0_MASK 0x02 #define SANDY_DRIVE1_MASK 0x04 @@ -76,33 +76,33 @@ #define SANDY_DDEN_MASK (1 << SANDY_DDEN_SHIFT) #define SANDY_PRINTER_STROBE 0x20 #define SANDY_PRINTER_INTMASK 0x40 -#define SANDY_MOUSE_INTMASK 0x80 +#define SANDY_MOUSE_INTMASK 0x80 -#define MOUSEX_TAG "MOUSEX" -#define MOUSEY_TAG "MOUSEY" -#define MOUSEB_TAG "MOUSEB" +#define MOUSEX_TAG "MOUSEX" +#define MOUSEY_TAG "MOUSEY" +#define MOUSEB_TAG "MOUSEB" // Mouse bits in Sandy port order -#define MOUSE_MIDDLE 0x02 -#define MOUSE_RIGHT 0x04 -#define MOUSE_LEFT 0x08 -#define MOUSE_DIRY 0x10 -#define MOUSE_DIRX 0x20 -#define MOUSE_INTY 0x40 -#define MOUSE_INTX 0x80 -#define MOUSE_INT_MASK (MOUSE_INTX | MOUSE_INTY) - -#define QIMI_IO_BASE 0x1bf9c -#define QIMI_IO_LEN 0x22 -#define QIMI_IO_END (QIMI_IO_BASE + QIMI_IO_LEN ) - -#define QIMI_INTX 0x04 -#define QIMI_INTY 0x20 -#define QIMI_DIRX 0x10 -#define QIMI_DIRY 0x01 -#define QIMI_LEFT 0x20 -#define QIMI_RIGHT 0x10 -#define QIMI_INT_MASK (QIMI_INTX | QIMI_INTY) +#define MOUSE_MIDDLE 0x02 +#define MOUSE_RIGHT 0x04 +#define MOUSE_LEFT 0x08 +#define MOUSE_DIRY 0x10 +#define MOUSE_DIRX 0x20 +#define MOUSE_INTY 0x40 +#define MOUSE_INTX 0x80 +#define MOUSE_INT_MASK (MOUSE_INTX | MOUSE_INTY) + +#define QIMI_IO_BASE 0x1bf9c +#define QIMI_IO_LEN 0x22 +#define QIMI_IO_END (QIMI_IO_BASE + QIMI_IO_LEN ) + +#define QIMI_INTX 0x04 +#define QIMI_INTY 0x20 +#define QIMI_DIRX 0x10 +#define QIMI_DIRY 0x01 +#define QIMI_LEFT 0x20 +#define QIMI_RIGHT 0x10 +#define QIMI_INT_MASK (QIMI_INTX | QIMI_INTY) class ql_state : public driver_device @@ -206,7 +206,7 @@ public: void trump_card_set_control(UINT8 data); void sandy_set_control(UINT8 data); void sandy_print_char(UINT8 data); - + UINT8 m_disk_type; int m_disk_io_base; UINT8 m_disk_io_byte; @@ -214,24 +214,24 @@ public: DECLARE_READ_LINE_MEMBER(disk_io_dden_r); DECLARE_WRITE_LINE_MEMBER(disk_io_intrq_w); DECLARE_WRITE_LINE_MEMBER(disk_io_drq_w); - + DECLARE_WRITE_LINE_MEMBER( sandy_printer_busy ); // QIMI or Sandy mouse void mouse_tick(); - + DECLARE_READ8_MEMBER( qimi_io_r ); DECLARE_WRITE8_MEMBER( qimi_io_w ); - - UINT8 m_mouse_int; - + + UINT8 m_mouse_int; + emu_timer *m_mouse_timer; - + UINT8 m_ql_mouse_x; UINT8 m_ql_mouse_y; protected: - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h index 5c04bba99d4..378800d4ab1 100644 --- a/src/mess/includes/rmnimbus.h +++ b/src/mess/includes/rmnimbus.h @@ -398,7 +398,7 @@ public: m_eeprom(*this, ER59256_TAG), m_via(*this, VIA_TAG), m_centronics(*this, CENTRONICS_TAG), - m_palette(*this, "palette") + m_palette(*this, "palette") { } diff --git a/src/mess/includes/softbox.h b/src/mess/includes/softbox.h index de14f94812c..2ad510fa682 100644 --- a/src/mess/includes/softbox.h +++ b/src/mess/includes/softbox.h @@ -21,7 +21,7 @@ #define I8255_1_TAG "ic16" #define COM8116_TAG "ic14" #define RS232_TAG "rs232" -#define CORVUS_HDC_TAG "corvus" +#define CORVUS_HDC_TAG "corvus" class softbox_state : public driver_device { diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h index c79a275fa12..d341c7ebc32 100644 --- a/src/mess/includes/special.h +++ b/src/mess/includes/special.h @@ -169,11 +169,11 @@ class specimx_sound_device : public device_t, public: specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~specimx_sound_device() { } - + DECLARE_WRITE_LINE_MEMBER(set_input_ch0); DECLARE_WRITE_LINE_MEMBER(set_input_ch1); DECLARE_WRITE_LINE_MEMBER(set_input_ch2); - + protected: // device-level overrides virtual void device_start(); diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h index f2e003d6710..6703d6faa05 100644 --- a/src/mess/includes/studio2.h +++ b/src/mess/includes/studio2.h @@ -45,7 +45,7 @@ public: required_ioport m_a; required_ioport m_b; required_device m_screen; - + virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h index 09774f43e5b..5cf0b9d0e99 100644 --- a/src/mess/includes/super80.h +++ b/src/mess/includes/super80.h @@ -42,7 +42,7 @@ public: m_io_x6(*this, "X6"), m_io_x7(*this, "X7"), m_io_config(*this, "CONFIG"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } DECLARE_READ8_MEMBER( super80v_low_r ); diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h index fd1349aa844..a82afd77ed9 100644 --- a/src/mess/includes/svi318.h +++ b/src/mess/includes/svi318.h @@ -142,7 +142,7 @@ protected: required_ioport m_line10; required_ioport m_joysticks; required_ioport m_buttons; -public: +public: optional_device m_palette; protected: void svi318_set_banks(); diff --git a/src/mess/includes/swtpc09.h b/src/mess/includes/swtpc09.h index 3d41e4557e9..ecba88b6812 100644 --- a/src/mess/includes/swtpc09.h +++ b/src/mess/includes/swtpc09.h @@ -1,6 +1,6 @@ /*************************************************************************** - swtpc09 include file - Robert Justice ,2009-2014 + swtpc09 include file + Robert Justice ,2009-2014 ****************************************************************************/ @@ -32,14 +32,14 @@ public: swtpc09_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_pia(*this, "pia"), - m_ptm(*this, "ptm"), + m_pia(*this, "pia"), + m_ptm(*this, "ptm"), m_acia(*this, "acia"), m_fdc(*this, "fdc"), m_via(*this, "via"), - m_piaide(*this, "piaide"), - m_harddisk(*this, "harddisk"), - m_ide(*this, "ide") + m_piaide(*this, "piaide"), + m_harddisk(*this, "harddisk"), + m_ide(*this, "ide") { } required_device m_maincpu; @@ -56,15 +56,15 @@ public: DECLARE_READ8_MEMBER(pia0_ca1_r); DECLARE_WRITE_LINE_MEMBER( pia0_irq_a ); - DECLARE_WRITE8_MEMBER( ptm_o1_callback ); - DECLARE_WRITE8_MEMBER( ptm_o3_callback ); - DECLARE_WRITE_LINE_MEMBER( ptm_irq ); + DECLARE_WRITE8_MEMBER( ptm_o1_callback ); + DECLARE_WRITE8_MEMBER( ptm_o3_callback ); + DECLARE_WRITE_LINE_MEMBER( ptm_irq ); DECLARE_WRITE_LINE_MEMBER( acia_interrupt ); DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); + DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); DECLARE_READ8_MEMBER( dmf3_via_read_porta ); DECLARE_READ8_MEMBER( dmf3_via_read_portb ); @@ -74,32 +74,32 @@ public: DECLARE_READ8_MEMBER(piaide_a_r); DECLARE_READ8_MEMBER(piaide_b_r); - DECLARE_WRITE8_MEMBER(piaide_a_w); - DECLARE_WRITE8_MEMBER(piaide_b_w); + DECLARE_WRITE8_MEMBER(piaide_a_w); + DECLARE_WRITE8_MEMBER(piaide_b_w); DECLARE_WRITE8_MEMBER(swtpc09_kbd_put); - DECLARE_READ8_MEMBER ( dmf2_dma_address_reg_r ); - DECLARE_WRITE8_MEMBER ( dmf2_dma_address_reg_w ); - DECLARE_READ8_MEMBER ( dmf2_control_reg_r ); - DECLARE_WRITE8_MEMBER ( dmf2_control_reg_w ); - - DECLARE_READ8_MEMBER ( dmf3_dma_address_reg_r ); - DECLARE_WRITE8_MEMBER ( dmf3_dma_address_reg_w ); - DECLARE_READ8_MEMBER ( dmf3_control_reg_r ); - DECLARE_WRITE8_MEMBER ( dmf3_control_reg_w ); - - DECLARE_WRITE8_MEMBER ( dc4_control_reg_w ); - - DECLARE_WRITE8_MEMBER(dat_w); - - DECLARE_DRIVER_INIT( swtpc09 ); - DECLARE_DRIVER_INIT( swtpc09i ); - DECLARE_DRIVER_INIT( swtpc09u ); - DECLARE_DRIVER_INIT( swtpc09d3 ); - + DECLARE_READ8_MEMBER ( dmf2_dma_address_reg_r ); + DECLARE_WRITE8_MEMBER ( dmf2_dma_address_reg_w ); + DECLARE_READ8_MEMBER ( dmf2_control_reg_r ); + DECLARE_WRITE8_MEMBER ( dmf2_control_reg_w ); + + DECLARE_READ8_MEMBER ( dmf3_dma_address_reg_r ); + DECLARE_WRITE8_MEMBER ( dmf3_dma_address_reg_w ); + DECLARE_READ8_MEMBER ( dmf3_control_reg_r ); + DECLARE_WRITE8_MEMBER ( dmf3_control_reg_w ); + + DECLARE_WRITE8_MEMBER ( dc4_control_reg_w ); + + DECLARE_WRITE8_MEMBER(dat_w); + + DECLARE_DRIVER_INIT( swtpc09 ); + DECLARE_DRIVER_INIT( swtpc09i ); + DECLARE_DRIVER_INIT( swtpc09u ); + DECLARE_DRIVER_INIT( swtpc09d3 ); + void swtpc09_fdc_dma_transfer(); - void swtpc09_irq_handler(UINT8 peripheral, UINT8 state); + void swtpc09_irq_handler(UINT8 peripheral, UINT8 state); UINT8 m_term_data; // terminal keyboard value UINT8 m_pia_counter; // this is the counter on pia porta @@ -112,10 +112,10 @@ public: UINT8 m_piaide_portb; UINT8 m_active_interrupt; UINT8 m_interrupt; - - + + // TODO: move this in proper device - + /* channel_data structure holds info about each 6844 DMA channel */ typedef struct m6844_channel_data { @@ -143,6 +143,3 @@ extern const wd17xx_interface swtpc09_wd17xx_interface; extern const ptm6840_interface swtpc09_6840_intf; #endif /* swtpc09_H_ */ - - - diff --git a/src/mess/includes/thomson.h b/src/mess/includes/thomson.h index 92966ae125a..bf0bbce6027 100644 --- a/src/mess/includes/thomson.h +++ b/src/mess/includes/thomson.h @@ -306,7 +306,7 @@ public: WRITE_LINE_MEMBER( fdc_index_3_w ); void thomson_index_callback(legacy_floppy_image_device *device, int state); DECLARE_PALETTE_INIT(thom); - + optional_device m_mc6854; DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); diff --git a/src/mess/includes/tiki100.h b/src/mess/includes/tiki100.h index 7e036058528..e66d1a6ff65 100644 --- a/src/mess/includes/tiki100.h +++ b/src/mess/includes/tiki100.h @@ -67,7 +67,7 @@ public: m_y10(*this, "Y10"), m_y11(*this, "Y11"), m_y12(*this, "Y12"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/tvc.h b/src/mess/includes/tvc.h index eb3ff957cf2..66486027e9c 100644 --- a/src/mess/includes/tvc.h +++ b/src/mess/includes/tvc.h @@ -38,7 +38,7 @@ // ======================> tvc_sound_device class tvc_sound_device : public device_t, - public device_sound_interface + public device_sound_interface { public: // construction/destruction diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h index ca91a7cc7f2..c6f79cb2d48 100644 --- a/src/mess/includes/vc4000.h +++ b/src/mess/includes/vc4000.h @@ -136,7 +136,7 @@ protected: #else required_ioport m_joys; required_ioport m_config; -#endif +#endif inline UINT8 vc4000_joystick_return_to_centre(UINT8 joy); void vc4000_draw_digit(bitmap_ind16 &bitmap, int x, int y, int d, int line); inline void vc4000_collision_plot(UINT8 *collision, UINT8 data, UINT8 color, int scale); diff --git a/src/mess/includes/vector06.h b/src/mess/includes/vector06.h index 07d00508a17..2eaab4b6826 100644 --- a/src/mess/includes/vector06.h +++ b/src/mess/includes/vector06.h @@ -31,7 +31,7 @@ public: m_ppi(*this, "ppi8255"), m_ppi2(*this, "ppi8255_2"), m_ram(*this, RAM_TAG), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h index 0d5b2050f79..df0ffd53c51 100644 --- a/src/mess/includes/x68k.h +++ b/src/mess/includes/x68k.h @@ -248,7 +248,7 @@ public: DECLARE_WRITE_LINE_MEMBER(mfp_irq_callback); DECLARE_WRITE_LINE_MEMBER(x68k_scsi_irq); DECLARE_WRITE_LINE_MEMBER(x68k_scsi_drq); - + //dmac void dma_irq(int channel); DECLARE_WRITE8_MEMBER(dma_end); diff --git a/src/mess/includes/z88.h b/src/mess/includes/z88.h index f51cca800f8..a4f266cbdc1 100644 --- a/src/mess/includes/z88.h +++ b/src/mess/includes/z88.h @@ -49,7 +49,7 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), - m_palette(*this, "palette") + m_palette(*this, "palette") { } required_device m_maincpu; diff --git a/src/mess/includes/zx.h b/src/mess/includes/zx.h index 7d58d0632ba..874386a853d 100644 --- a/src/mess/includes/zx.h +++ b/src/mess/includes/zx.h @@ -102,7 +102,7 @@ protected: required_ioport m_io_row7; optional_ioport m_io_config; required_device m_screen; - + void zx_ula_r(int offs, memory_region *region, const UINT8 param); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/layout/pve500.lay b/src/mess/layout/pve500.lay index c1b9f28be32..e7c9fbef38b 100644 --- a/src/mess/layout/pve500.lay +++ b/src/mess/layout/pve500.lay @@ -5,7 +5,7 @@ - + @@ -14,12 +14,12 @@ - + - + - + @@ -126,6 +126,6 @@ - + diff --git a/src/mess/layout/rainbow.lay b/src/mess/layout/rainbow.lay index e2f682c1524..c282f5df126 100644 --- a/src/mess/layout/rainbow.lay +++ b/src/mess/layout/rainbow.lay @@ -94,7 +94,7 @@ - + diff --git a/src/mess/machine/6883sam.h b/src/mess/machine/6883sam.h index 395585e59ec..ca637c5fa72 100644 --- a/src/mess/machine/6883sam.h +++ b/src/mess/machine/6883sam.h @@ -170,7 +170,7 @@ private: // incidentals address_space * m_cpu_space; - devcb2_read8 m_read_res; + devcb2_read8 m_read_res; sam_bank m_banks[8]; sam_space<0x0000, 0x7FFF> m_space_0000; sam_space<0x8000, 0x9FFF> m_space_8000; diff --git a/src/mess/machine/a7800.c b/src/mess/machine/a7800.c index 82af304b259..45e7db18a1b 100644 --- a/src/mess/machine/a7800.c +++ b/src/mess/machine/a7800.c @@ -19,8 +19,8 @@ added Activision bank select type 19-Feb-2010 DanB Added return values for TIA collision registers - 04-Apr-2014 Mike Saarna Fix to controller button RIOT behavior and - expanded cart handling (bit 05). + 04-Apr-2014 Mike Saarna Fix to controller button RIOT behavior and + expanded cart handling (bit 05). ***************************************************************************/ #include "emu.h" @@ -406,7 +406,7 @@ WRITE8_MEMBER(a7800_state::a7800_cart_w) if(m_cart_type & 0x04) { //adjust write location if supercart bankram is in use - if(m_cart_type & 0x20) + if(m_cart_type & 0x20) { UINT8 *currentbank1 = (UINT8 *)m_bank1->base(); currentbank1[offset] = data; @@ -435,7 +435,7 @@ WRITE8_MEMBER(a7800_state::a7800_cart_w) if( m_cart_size == 0x10000 ) { data &= 0x03; - } + } else if( m_cart_size == 0x40000 ) { data &= 0x0f; diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c index c9e19eed4a5..36dd1fe3de2 100644 --- a/src/mess/machine/amstrad.c +++ b/src/mess/machine/amstrad.c @@ -2669,7 +2669,7 @@ READ8_MEMBER(amstrad_state::amstrad_psg_porta_read) return (keyrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read_safe(0) & 0x80) | 0x7f; } } - + return keyrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read_safe(0) & 0xFF; } return 0xFF; diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index f30bee58d07..47168890569 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -23,8 +23,8 @@ * - http://www.freescale.com/files/32bit/doc/inactive/MC68681UM.pdf * * SIO usage: - * SIO: ch A keyboard, ch B serial console - * SIO2: modem/printer? + * SIO: ch A keyboard, ch B serial console + * SIO2: modem/printer? * */ @@ -190,7 +190,7 @@ static UINT16 cpu_control_register = 0x0000; /*static int apollo_csr_get_servicemode() { - return cpu_status_register & APOLLO_CSR_SR_SERVICE ? 0 : 1; + return cpu_status_register & APOLLO_CSR_SR_SERVICE ? 0 : 1; }*/ static void apollo_csr_set_servicemode(int mode) @@ -569,7 +569,7 @@ void apollo_state::select_dma_channel(int channel, bool state) #undef VERBOSE #define VERBOSE 0 -void apollo_state::apollo_pic_set_irq_line(int irq, int state) +void apollo_state::apollo_pic_set_irq_line(int irq, int state) { switch (irq) { case 0: m_pic8259_master->ir0_w(state); break; @@ -665,7 +665,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_ptm_timer_tick) { if ((state) && (m_ptm->started())) { - ptm_counter++; + ptm_counter++; m_ptm->set_c1( 1); m_ptm->set_c1( 0); m_ptm->set_c2(ptm_counter & 1); @@ -751,7 +751,7 @@ WRITE_LINE_MEMBER(apollo_state::sio_irq_handler) WRITE8_MEMBER(apollo_state::sio_output) { - if ((data & 0x80) != (sio_output_data & 0x80)) + if ((data & 0x80) != (sio_output_data & 0x80)) { apollo_pic_set_irq_line(APOLLO_IRQ_DIAG, (data & 0x80) ? 1 : 0); sio_output_data = data; @@ -762,7 +762,7 @@ WRITE8_MEMBER(apollo_state::sio_output) // The period of the output is 15 microseconds. // toggle memory refresh counter -// sio_input_data ^= 0x01; +// sio_input_data ^= 0x01; //########################################################################## // machine/apollo_sio2.c - APOLLO DS3500 SIO2 @@ -808,9 +808,9 @@ static const isa16bus_interface isabus_intf = }; static SLOT_INTERFACE_START(apollo_isa_cards) - SLOT_INTERFACE("wdc", ISA16_OMTI8621) // Combo ESDI/AT floppy controller - SLOT_INTERFACE("ctape", ISA8_SC499) // Archive SC499 cartridge tape - SLOT_INTERFACE("3c505", ISA16_3C505) // 3Com 3C505 Ethernet card + SLOT_INTERFACE("wdc", ISA16_OMTI8621) // Combo ESDI/AT floppy controller + SLOT_INTERFACE("ctape", ISA8_SC499) // Archive SC499 cartridge tape + SLOT_INTERFACE("3c505", ISA16_3C505) // 3Com 3C505 Ethernet card SLOT_INTERFACE_END MACHINE_CONFIG_FRAGMENT( common ) @@ -849,7 +849,7 @@ MACHINE_CONFIG_FRAGMENT( apollo ) MCFG_MC68681_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_MC68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) - MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE(APOLLO_KBD_TAG, apollo_kbd_device, rx_w)) MACHINE_CONFIG_END @@ -868,7 +868,7 @@ MACHINE_CONFIG_FRAGMENT( apollo_terminal ) MCFG_MC68681_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_MC68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) - MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") diff --git a/src/mess/machine/apollo_kbd.c b/src/mess/machine/apollo_kbd.c index 07b5a150da4..4c6c7501b66 100644 --- a/src/mess/machine/apollo_kbd.c +++ b/src/mess/machine/apollo_kbd.c @@ -201,7 +201,7 @@ void apollo_kbd_device::beeper::on() int apollo_kbd_device::beeper::keyboard_has_beeper() { - return true; // driver has no facility to return false here, so go with it + return true; // driver has no facility to return false here, so go with it } void apollo_kbd_device::beeper::beeper_callback() diff --git a/src/mess/machine/apple2.c b/src/mess/machine/apple2.c index 7128a80da32..22e6db8fec0 100644 --- a/src/mess/machine/apple2.c +++ b/src/mess/machine/apple2.c @@ -2374,7 +2374,7 @@ READ_LINE_MEMBER(apple2_state::ay3600_control_r) static const UINT8 a2_key_remap[0x32][4] = { -/* norm shft ctrl both */ +/* norm shft ctrl both */ { 0x33,0x23,0x33,0x23 }, /* 3 # 00 */ { 0x34,0x24,0x34,0x24 }, /* 4 $ 01 */ { 0x35,0x25,0x35,0x25 }, /* 5 % 02 */ @@ -2432,7 +2432,7 @@ WRITE_LINE_MEMBER(apple2_state::ay3600_data_ready_w) if (state == ASSERT_LINE) { int mod = 0; - m_lastchar = m_ay3600->b_r(); + m_lastchar = m_ay3600->b_r(); mod = (m_kbspecial->read() & 0x06) ? 0x01 : 0x00; mod |= (m_kbspecial->read() & 0x08) ? 0x02 : 0x00; @@ -2442,7 +2442,7 @@ WRITE_LINE_MEMBER(apple2_state::ay3600_data_ready_w) if (m_transchar != 0) { m_strobe = 0x80; -// printf("new char = %04x (%02x)\n", m_lastchar&0x3f, m_transchar); +// printf("new char = %04x (%02x)\n", m_lastchar&0x3f, m_transchar); } } } @@ -2456,16 +2456,16 @@ WRITE_LINE_MEMBER(apple2_state::ay3600_iie_data_ready_w) m_lastchar = m_ay3600->b_r(); - trans = m_lastchar & ~(0x1c0); // clear the 3600's control/shift stuff - trans |= (m_lastchar & 0x100)>>2; // bring the 0x100 bit down to the 0x40 place - trans <<= 2; // 4 entries per key - trans |= (m_kbspecial->read() & 0x06) ? 0x00 : 0x01; // shift is bit 1 (active low) - trans |= (m_kbspecial->read() & 0x08) ? 0x00 : 0x02; // control is bit 2 (active low) - trans |= (m_kbspecial->read() & 0x01) ? 0x0000 : 0x0200; // caps lock is bit 9 (active low) + trans = m_lastchar & ~(0x1c0); // clear the 3600's control/shift stuff + trans |= (m_lastchar & 0x100)>>2; // bring the 0x100 bit down to the 0x40 place + trans <<= 2; // 4 entries per key + trans |= (m_kbspecial->read() & 0x06) ? 0x00 : 0x01; // shift is bit 1 (active low) + trans |= (m_kbspecial->read() & 0x08) ? 0x00 : 0x02; // control is bit 2 (active low) + trans |= (m_kbspecial->read() & 0x01) ? 0x0000 : 0x0200; // caps lock is bit 9 (active low) m_transchar = decode[trans]; m_strobe = 0x80; -// printf("new char = %04x (%02x)\n", m_lastchar, m_transchar); +// printf("new char = %04x (%02x)\n", m_lastchar, m_transchar); } } diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c index 28d77ef9808..2b051dc4a65 100644 --- a/src/mess/machine/apple2gs.c +++ b/src/mess/machine/apple2gs.c @@ -946,23 +946,23 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r ) result = 0; { UINT8 temp = m_kbspecial->read(); - if (temp & 1) // capslock + if (temp & 1) // capslock { result |= 4; } - if (temp & 6) // shift + if (temp & 6) // shift { result |= 1; } - if (temp & 8) // control + if (temp & 8) // control { result |= 2; } - if (temp & 0x10) // open apple/command + if (temp & 0x10) // open apple/command { result |= 0x40; } - if (temp & 0x20) // option + if (temp & 0x20) // option { result |= 0x80; } diff --git a/src/mess/machine/apple3.c b/src/mess/machine/apple3.c index 2a77176e220..e169a9788cf 100644 --- a/src/mess/machine/apple3.c +++ b/src/mess/machine/apple3.c @@ -3,43 +3,43 @@ machine/apple3.c Apple /// - + VIA #0 (D VIA) - CA1: IRQ from the MM58167 RTC - CA2: 1 if key pressed, 0 otherwise - CB1/CB2: connected to VBL - - Port A: Environment register (all bits out) - bit 7: 1 for 1 MHz, 0 for 2 MHz - bit 6: 1 for I/O at C000-CFFF - bit 5: 1 to enable video - bit 4: 1 to enable NMI/Reset - bit 3: 1 to write-protect RAM in system bank C000-FFFF - bit 2: 1 to force primary stack at 0100-01FF - bit 1: 1 for primary ROM, 0 for secondary (Apple III doesn't have a secondary ROM, so this should always be '1' when bit 0 is) - bit 0: 1 to enable ROM in F000-FFFF - - Port B: Zero page high 8 address bits, also MM58167 RTC register select (all bits out) - + CA1: IRQ from the MM58167 RTC + CA2: 1 if key pressed, 0 otherwise + CB1/CB2: connected to VBL + + Port A: Environment register (all bits out) + bit 7: 1 for 1 MHz, 0 for 2 MHz + bit 6: 1 for I/O at C000-CFFF + bit 5: 1 to enable video + bit 4: 1 to enable NMI/Reset + bit 3: 1 to write-protect RAM in system bank C000-FFFF + bit 2: 1 to force primary stack at 0100-01FF + bit 1: 1 for primary ROM, 0 for secondary (Apple III doesn't have a secondary ROM, so this should always be '1' when bit 0 is) + bit 0: 1 to enable ROM in F000-FFFF + + Port B: Zero page high 8 address bits, also MM58167 RTC register select (all bits out) + VIA #1 (E VIA) - CA1: OR of all 4 slots' IRQ status - CA2: SW1 (Open Apple key?) - CB1: SW3/SCO - CB2: SER - - Port A: - bits 0-2: bank select for $2000-$9FFF range - bit 3: n/c - bit 4: slot 4 IRQ (in) - bit 5: slot 3 IRQ (in) - bit 6: Apple II mode trap output (out) - bit 7: IRQ status (in) (0 = IRQ, 1 = no IRQ) - - Port B: - bits 0-5: 6-bit audio DAC output - bit 6: screen blank - bit 7: OR of NMI from slots - + CA1: OR of all 4 slots' IRQ status + CA2: SW1 (Open Apple key?) + CB1: SW3/SCO + CB2: SER + + Port A: + bits 0-2: bank select for $2000-$9FFF range + bit 3: n/c + bit 4: slot 4 IRQ (in) + bit 5: slot 3 IRQ (in) + bit 6: Apple II mode trap output (out) + bit 7: IRQ status (in) (0 = IRQ, 1 = no IRQ) + + Port B: + bits 0-5: 6-bit audio DAC output + bit 6: screen blank + bit 7: OR of NMI from slots + ***************************************************************************/ #include "emu.h" @@ -53,14 +53,14 @@ static void apple3_update_drives(device_t *device); #define LOG_MEMORY 1 #define LOG_INDXADDR 1 -#define ENV_SLOWSPEED (0x80) -#define ENV_IOENABLE (0x40) -#define ENV_VIDENABLE (0x20) -#define ENV_NMIENABLE (0x10) -#define ENV_WRITEPROT (0x08) -#define ENV_STACK1XX (0x04) -#define ENV_PRIMARYROM (0x02) -#define ENV_ROMENABLE (0x01) +#define ENV_SLOWSPEED (0x80) +#define ENV_IOENABLE (0x40) +#define ENV_VIDENABLE (0x20) +#define ENV_NMIENABLE (0x10) +#define ENV_WRITEPROT (0x08) +#define ENV_STACK1XX (0x04) +#define ENV_PRIMARYROM (0x02) +#define ENV_ROMENABLE (0x01) READ8_MEMBER(apple3_state::apple3_c0xx_r) { @@ -109,7 +109,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) result &= ~0x20; } } -// printf("modifier = %02x\n", result); +// printf("modifier = %02x\n", result); break; case 0x10: case 0x11: case 0x12: case 0x13: @@ -174,7 +174,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) { result = slotdevice->read_c0nx(space, offset&0xf); } - break; + break; case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: @@ -185,7 +185,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) { result = slotdevice->read_c0nx(space, offset&0xf); } - break; + break; case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: @@ -196,7 +196,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) { result = slotdevice->read_c0nx(space, offset&0xf); } - break; + break; case 0xc0: case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7: @@ -207,7 +207,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) { result = slotdevice->read_c0nx(space, offset&0xf); } - break; + break; case 0xD0: case 0xD1: case 0xD2: case 0xD3: case 0xD4: case 0xD5: case 0xD6: case 0xD7: @@ -305,7 +305,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) { slotdevice->write_c0nx(space, offset&0xf, data); } - break; + break; case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: @@ -316,7 +316,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) { slotdevice->write_c0nx(space, offset&0xf, data); } - break; + break; case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: @@ -327,7 +327,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) { slotdevice->write_c0nx(space, offset&0xf, data); } - break; + break; case 0xc0: case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7: @@ -338,7 +338,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) { slotdevice->write_c0nx(space, offset&0xf, data); } - break; + break; case 0xD0: case 0xD1: case 0xD2: case 0xD3: case 0xD4: case 0xD5: case 0xD6: case 0xD7: @@ -372,7 +372,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) TIMER_DEVICE_CALLBACK_MEMBER(apple3_state::apple3_interrupt) { - m_via_1->write_cb1(machine().first_screen()->vblank()); + m_via_1->write_cb1(machine().first_screen()->vblank()); m_via_1->write_cb2(machine().first_screen()->vblank()); } @@ -437,31 +437,31 @@ void apple3_state::apple3_update_memory() bank = ~0; page = 0x01; } - m_bank2 = apple3_bankaddr(bank, ((offs_t) page) * 0x100); + m_bank2 = apple3_bankaddr(bank, ((offs_t) page) * 0x100); /* bank 3 (0200-1FFF) */ - m_bank3 = apple3_bankaddr(~0, 0x0200); + m_bank3 = apple3_bankaddr(~0, 0x0200); /* bank 4 (2000-9FFF) */ - m_bank4 = apple3_bankaddr(m_via_1_a, 0x0000); + m_bank4 = apple3_bankaddr(m_via_1_a, 0x0000); /* bank 5 (A000-BFFF) */ - m_bank5 = apple3_bankaddr(~0, 0x2000); + m_bank5 = apple3_bankaddr(~0, 0x2000); /* bank 8 (C000-C0FF) */ if (!(m_via_0_a & ENV_IOENABLE)) { - m_bank8 = apple3_bankaddr(~0, 0x4000); + m_bank8 = apple3_bankaddr(~0, 0x4000); } /* bank 9 (C100-C4FF) */ if (!(m_via_0_a & ENV_IOENABLE)) { - m_bank9 = apple3_bankaddr(~0, 0x4100); + m_bank9 = apple3_bankaddr(~0, 0x4100); } /* bank 10 (C500-C7FF) */ - m_bank10 = apple3_bankaddr(~0, 0x4500); + m_bank10 = apple3_bankaddr(~0, 0x4500); /* bank 11 (C800-CFFF) */ if (!(m_via_0_a & ENV_IOENABLE)) @@ -507,7 +507,7 @@ WRITE8_MEMBER(apple3_state::apple3_via_0_out_a) WRITE8_MEMBER(apple3_state::apple3_via_0_out_b) { -// printf("ZP to %02x\n", data); +// printf("ZP to %02x\n", data); apple3_via_out(&m_via_0_b, data); } @@ -529,7 +529,7 @@ void apple3_state::apple3_irq_update() // HACK: SOS floppy driver enables ROM at Fxxx *before* trying to // suppress IRQs. IRQ hits at inopportune time -> bad vector -> system crash. // This breaks the Confidence Test, but the Confidence Test - // never disables the ROM so checking for that gets us + // never disables the ROM so checking for that gets us // working in all cases. // Bonus points: for some reason this isn't a problem with -debug. // m6502 heisenbug maybe? @@ -537,13 +537,13 @@ void apple3_state::apple3_irq_update() { return; } -// printf(" setting IRQ\n"); +// printf(" setting IRQ\n"); m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); - m_via_1->write_pa7(0); // this is active low + m_via_1->write_pa7(0); // this is active low } else { -// printf(" clearing IRQ\n"); +// printf(" clearing IRQ\n"); m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); m_via_1->write_pa7(1); } @@ -551,14 +551,14 @@ void apple3_state::apple3_irq_update() WRITE_LINE_MEMBER(apple3_state::apple3_acia_irq_func) { -// printf("acia IRQ: %d\n", state); +// printf("acia IRQ: %d\n", state); m_acia_irq = state; apple3_irq_update(); } WRITE_LINE_MEMBER(apple3_state::apple3_via_1_irq_func) { -// printf("via 1 IRQ: %d\n", state); +// printf("via 1 IRQ: %d\n", state); m_via_1_irq = state; apple3_irq_update(); } @@ -566,7 +566,7 @@ WRITE_LINE_MEMBER(apple3_state::apple3_via_1_irq_func) WRITE_LINE_MEMBER(apple3_state::apple3_via_0_irq_func) { -// printf("via 0 IRQ: %d\n", state); +// printf("via 0 IRQ: %d\n", state); m_via_0_irq = state; apple3_irq_update(); } @@ -745,7 +745,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) if (offset < 0x100) { - rv = *apple3_get_zpa_addr(offset); + rv = *apple3_get_zpa_addr(offset); if ((!m_sync) && (m_via_0_b >= 0x18) && (m_via_0_b <= 0x1F)) { @@ -849,7 +849,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) } else { - rv = m_bank7rd[offset - 0xf000]; + rv = m_bank7rd[offset - 0xf000]; } } @@ -1002,7 +1002,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w) WRITE_LINE_MEMBER(apple3_state::apple3_sync_w) { -// printf("sync: %d\n", state); +// printf("sync: %d\n", state); m_sync = (state == ASSERT_LINE) ? true : false; if (m_sync) @@ -1044,7 +1044,7 @@ READ_LINE_MEMBER(apple3_state::ay3600_control_r) static const UINT8 key_remap[0x50][4] = { -/* norm shft ctrl both */ +/* norm shft ctrl both */ { 0x9b,0x9b,0x9b,0x9b }, /* Escape 00 */ { 0x31,0x21,0x31,0x31 }, /* 1 ! 01 */ { 0x32,0x40,0x32,0x00 }, /* 2 @ 02 */ @@ -1135,10 +1135,10 @@ WRITE_LINE_MEMBER(apple3_state::ay3600_data_ready_w) { UINT16 trans; int mod = 0; - m_lastchar = m_ay3600->b_r(); + m_lastchar = m_ay3600->b_r(); - trans = m_lastchar & ~(0x1c0); // clear the 3600's control/shift stuff - trans |= (m_lastchar & 0x100)>>2; // bring the 0x100 bit down to the 0x40 place + trans = m_lastchar & ~(0x1c0); // clear the 3600's control/shift stuff + trans |= (m_lastchar & 0x100)>>2; // bring the 0x100 bit down to the 0x40 place mod = (m_kbspecial->read() & 0x06) ? 0x01 : 0x00; mod |= (m_kbspecial->read() & 0x08) ? 0x02 : 0x00; @@ -1148,8 +1148,7 @@ WRITE_LINE_MEMBER(apple3_state::ay3600_data_ready_w) if (m_transchar != 0) { m_strobe = 0x80; -// printf("new char = %04x (%02x)\n", trans, m_transchar); +// printf("new char = %04x (%02x)\n", trans, m_transchar); } } } - diff --git a/src/mess/machine/apricotkb.c b/src/mess/machine/apricotkb.c index d8b538ec836..683a7ce3b53 100644 --- a/src/mess/machine/apricotkb.c +++ b/src/mess/machine/apricotkb.c @@ -52,13 +52,13 @@ const rom_entry *apricot_keyboard_device::device_rom_region() const #ifdef UPD7507_EMULATED static ADDRESS_MAP_START( apricot_keyboard_io, AS_IO, 8, apricot_keyboard_device ) - AM_RANGE(0x00, 0x00) AM_READ(kb_lo_r) - AM_RANGE(0x01, 0x01) AM_READ(kb_hi_r) - AM_RANGE(0x03, 0x03) AM_WRITE(kb_p3_w) - AM_RANGE(0x04, 0x04) AM_WRITE(kb_y0_w) - AM_RANGE(0x05, 0x05) AM_WRITE(kb_y4_w) - AM_RANGE(0x06, 0x06) AM_READWRITE(kb_p6_r, kb_yc_w) - AM_RANGE(0x07, 0x07) AM_WRITE(kb_y8_w) + AM_RANGE(0x00, 0x00) AM_READ(kb_lo_r) + AM_RANGE(0x01, 0x01) AM_READ(kb_hi_r) + AM_RANGE(0x03, 0x03) AM_WRITE(kb_p3_w) + AM_RANGE(0x04, 0x04) AM_WRITE(kb_y0_w) + AM_RANGE(0x05, 0x05) AM_WRITE(kb_y4_w) + AM_RANGE(0x06, 0x06) AM_READWRITE(kb_p6_r, kb_yc_w) + AM_RANGE(0x07, 0x07) AM_WRITE(kb_y8_w) ADDRESS_MAP_END #endif @@ -69,8 +69,8 @@ ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( apricot_keyboard ) #ifdef UPD7507_EMULATED - MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz) - MCFG_CPU_IO_MAP(apricot_keyboard_io) + MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz) + MCFG_CPU_IO_MAP(apricot_keyboard_io) #endif MACHINE_CONFIG_END diff --git a/src/mess/machine/apricotkb.h b/src/mess/machine/apricotkb.h index db781b788bd..bf12f70c664 100644 --- a/src/mess/machine/apricotkb.h +++ b/src/mess/machine/apricotkb.h @@ -46,7 +46,7 @@ public: apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb2_base &set_txd_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_txd.set_callback(object); } - + // optional information overrides virtual const rom_entry *device_rom_region() const; virtual machine_config_constructor device_mconfig_additions() const; diff --git a/src/mess/machine/atarifdc.c b/src/mess/machine/atarifdc.c index 4e2cee018fb..9b07cd20e5e 100644 --- a/src/mess/machine/atarifdc.c +++ b/src/mess/machine/atarifdc.c @@ -763,7 +763,7 @@ atari_fdc_device::atari_fdc_device(const machine_config &mconfig, const char *ta m_serout_count(0), m_serout_offs(0), m_serout_chksum(0), -// m_serout_delay(0), +// m_serout_delay(0), m_serin_count(0), m_serin_offs(0), m_serin_chksum(0), diff --git a/src/mess/machine/atarifdc.h b/src/mess/machine/atarifdc.h index a6bb687de25..4d1f544a129 100644 --- a/src/mess/machine/atarifdc.h +++ b/src/mess/machine/atarifdc.h @@ -51,7 +51,7 @@ private: int m_serout_offs; UINT8 m_serout_buff[512]; UINT8 m_serout_chksum; -// int m_serout_delay; +// int m_serout_delay; int m_serin_count; int m_serin_offs; diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index 27b342d9a95..87c392cb6df 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -1445,7 +1445,7 @@ WRITE8_MEMBER(bbc_state::bbc_SerialULA_w) WRITE_LINE_MEMBER(bbc_state::write_acia_clock) { m_acia->write_txc(state); - + if (m_serproc_data & 0x40) m_acia->write_rxc(state); } @@ -1965,12 +1965,12 @@ int bbc_state::exp_rom_load(device_image_interface &image, int index) UINT8 *RAM = m_region_user1->base(); int size, read_; int addr = 0x8000 + (0x4000 * index); - + if (image.software_entry() == NULL) { size = image.length(); logerror("loading rom %s, at %.4x size:%.4x\n", image.filename(), addr, size); - + switch (size) { case 0x2000: @@ -1988,7 +1988,7 @@ int bbc_state::exp_rom_load(device_image_interface &image, int index) logerror("bad rom file size of %.4x\n", size); break; } - + if (read_ != size) return IMAGE_INIT_FAIL; } @@ -2005,7 +2005,7 @@ DEVICE_IMAGE_LOAD_MEMBER( bbc_state, bbc_exp_rom ) if (strcmp(image.device().tag(),":exp_rom3") == 0) return exp_rom_load(image, 2); - + if (strcmp(image.device().tag(),":exp_rom4") == 0) return exp_rom_load(image, 3); @@ -2038,7 +2038,7 @@ DEVICE_IMAGE_LOAD_MEMBER( bbc_state, bbcm_cart ) image.seterror(IMAGE_ERROR_UNSUPPORTED, "Invalid rom file size"); return IMAGE_INIT_FAIL; } - + image.fread(RAM + addr, size); } else diff --git a/src/mess/machine/beta.h b/src/mess/machine/beta.h index 5ffe06f822d..fa82244eb11 100644 --- a/src/mess/machine/beta.h +++ b/src/mess/machine/beta.h @@ -20,7 +20,7 @@ class beta_disk_device : public device_t public: beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~beta_disk_device() {} - + DECLARE_READ8_MEMBER(status_r); DECLARE_READ8_MEMBER(track_r); DECLARE_READ8_MEMBER(sector_r); @@ -32,18 +32,18 @@ public: DECLARE_WRITE8_MEMBER(track_w); DECLARE_WRITE8_MEMBER(sector_w); DECLARE_WRITE8_MEMBER(data_w); - + DECLARE_WRITE_LINE_MEMBER(wd179x_intrq_w); DECLARE_WRITE_LINE_MEMBER(wd179x_drq_w); - + int is_active(); void enable(); void disable(); void clear_status(); - + UINT8 m_betadisk_status; UINT8 m_betadisk_active; - + protected: // device-level overrides virtual void device_start(); diff --git a/src/mess/machine/dec_lk201.c b/src/mess/machine/dec_lk201.c index af94303dcc7..aa0b98e1a7e 100644 --- a/src/mess/machine/dec_lk201.c +++ b/src/mess/machine/dec_lk201.c @@ -116,58 +116,58 @@ ________|D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0 // SERIAL COMMUNICATIONS INTERFACE //------------------------------------------------- -#define SCI_BAUD 0 // Baud rate register -#define BAUD_SCR 0x07 // SCI baud rate select -#define BAUD_SCP 0x30 // SCI prescaler select - -#define SCI_SCCR1 1 // Control register 1 -#define SCCR1_WAKE 0x08 // Wakeup method -#define SCCR1_M 0x10 // Character length -#define SCCR1_T8 0x40 // Transmit bit 8 -#define SCCR1_R8 0x80 // Receive bit 8 - -#define SCI_SCCR2 2 // Control register 2 -#define SCCR2_SBK 0x01 // Send break -#define SCCR2_RWU 0x02 // Receiver wakeup enable -#define SCCR2_RE 0x04 // Receiver enable -#define SCCR2_TE 0x08 // Transmitter enable -#define SCCR2_ILIE 0x10 // Idle line interrupt enable -#define SCCR2_RIE 0x20 // Receiver interrupt enable -#define SCCR2_TCIE 0x40 // Transmit complete interrupt enable -#define SCCR2_TIE 0x80 // Transmit interrupt enable - -#define SCI_SCSR 3 // Status register -#define SCSR_FE 0x02 // Receiver framing error -#define SCSR_NF 0x04 // Receiver noise -#define SCSR_OR 0x08 // Receiver overrun -#define SCSR_IDLE 0x10 // Receiver idle -#define SCSR_RDRF 0x20 // Receive data register full -#define SCSR_TC 0x40 // Transmit complete -#define SCSR_TDRE 0x80 // Transmit data register empty -#define SCSR_INT (SCSR_IDLE | SCSR_RDRF| \ - SCSR_TC | SCSR_TDRE) // Interrupt sources - -#define SCI_SCDR 4 // Data register +#define SCI_BAUD 0 // Baud rate register +#define BAUD_SCR 0x07 // SCI baud rate select +#define BAUD_SCP 0x30 // SCI prescaler select + +#define SCI_SCCR1 1 // Control register 1 +#define SCCR1_WAKE 0x08 // Wakeup method +#define SCCR1_M 0x10 // Character length +#define SCCR1_T8 0x40 // Transmit bit 8 +#define SCCR1_R8 0x80 // Receive bit 8 + +#define SCI_SCCR2 2 // Control register 2 +#define SCCR2_SBK 0x01 // Send break +#define SCCR2_RWU 0x02 // Receiver wakeup enable +#define SCCR2_RE 0x04 // Receiver enable +#define SCCR2_TE 0x08 // Transmitter enable +#define SCCR2_ILIE 0x10 // Idle line interrupt enable +#define SCCR2_RIE 0x20 // Receiver interrupt enable +#define SCCR2_TCIE 0x40 // Transmit complete interrupt enable +#define SCCR2_TIE 0x80 // Transmit interrupt enable + +#define SCI_SCSR 3 // Status register +#define SCSR_FE 0x02 // Receiver framing error +#define SCSR_NF 0x04 // Receiver noise +#define SCSR_OR 0x08 // Receiver overrun +#define SCSR_IDLE 0x10 // Receiver idle +#define SCSR_RDRF 0x20 // Receive data register full +#define SCSR_TC 0x40 // Transmit complete +#define SCSR_TDRE 0x80 // Transmit data register empty +#define SCSR_INT (SCSR_IDLE | SCSR_RDRF| \ + SCSR_TC | SCSR_TDRE) // Interrupt sources + +#define SCI_SCDR 4 // Data register //------------------------------------------------- // SERIAL PERIPHERAL INTERFACE //------------------------------------------------- -#define SPI_SPCR 0 // Control register -#define SPCR_SPR 0x03 // SPI clock rate select -#define SPCR_CPHA 0x04 // Clock phase -#define SPCR_CPOL 0x08 // Clock polarity -#define SPCR_MSTR 0x10 // Master mode select -#define SPCR_DWOM 0x20 // Port D wire-or mode option -#define SPCR_SPE 0x40 // Serial peripheral system enable -#define SPCR_SPIE 0x80 // Serial peripheral interrupt enable +#define SPI_SPCR 0 // Control register +#define SPCR_SPR 0x03 // SPI clock rate select +#define SPCR_CPHA 0x04 // Clock phase +#define SPCR_CPOL 0x08 // Clock polarity +#define SPCR_MSTR 0x10 // Master mode select +#define SPCR_DWOM 0x20 // Port D wire-or mode option +#define SPCR_SPE 0x40 // Serial peripheral system enable +#define SPCR_SPIE 0x80 // Serial peripheral interrupt enable -#define SPI_SPSR 1 // Status register -#define SPSR_MODF 0x10 // Mode fault flag -#define SPSR_WCOL 0x40 // Write collision -#define SPSR_SPIF 0x80 // SPI transfer complete +#define SPI_SPSR 1 // Status register +#define SPSR_MODF 0x10 // Mode fault flag +#define SPSR_WCOL 0x40 // Write collision +#define SPSR_SPIF 0x80 // SPI transfer complete -#define SPI_SPDR 2 // Data I/O Register +#define SPI_SPDR 2 // Data I/O Register //************************************************************************** // DEVICE DEFINITIONS @@ -338,8 +338,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) @@ -363,7 +363,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)") + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Do (F16)") 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) @@ -494,7 +494,7 @@ void lk201_device::rcv_complete() sci_status |= SCSR_RDRF; update_interrupts(); receive_register_extract(); -// printf("lk201 got %02x\n", get_received_char()); +// printf("lk201 got %02x\n", get_received_char()); } void lk201_device::tra_complete() @@ -527,7 +527,7 @@ READ8_MEMBER( lk201_device::ddr_r ) WRITE8_MEMBER( lk201_device::ddr_w ) { -// printf("%02x to PORT %c DDR (PC=%x)\n", data, 'A' + offset, m_maincpu->pc()); +// printf("%02x to PORT %c DDR (PC=%x)\n", data, 'A' + offset, m_maincpu->pc()); send_port(space, offset, ports[offset] & data); @@ -543,7 +543,7 @@ READ8_MEMBER( lk201_device::ports_r ) // add in ddr-masked version of port writes incoming |= (ports[offset] & ddrs[offset]); -// printf("PORT %c read = %02x (DDR = %02x latch = %02x) (PC=%x)\n", 'A' + offset, ports[offset], ddrs[offset], ports[offset], m_maincpu->pc()); +// printf("PORT %c read = %02x (DDR = %02x latch = %02x) (PC=%x)\n", 'A' + offset, ports[offset], ddrs[offset], ports[offset], m_maincpu->pc()); return incoming; } @@ -557,7 +557,7 @@ WRITE8_MEMBER( lk201_device::ports_w ) void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 data) { -// printf("PORT %c write %02x (DDR = %02x) (PC=%x)\n", 'A' + offset, data, ddrs[offset], m_maincpu->pc()); +// printf("PORT %c write %02x (DDR = %02x) (PC=%x)\n", 'A' + offset, data, ddrs[offset], m_maincpu->pc()); switch (offset) { @@ -609,21 +609,21 @@ READ8_MEMBER( lk201_device::sci_r ) switch (offset) { - case SCI_BAUD: // Baud rate + case SCI_BAUD: // Baud rate break; - case SCI_SCCR1: // Control 1 + case SCI_SCCR1: // Control 1 break; - case SCI_SCCR2: // Control 2 + case SCI_SCCR2: // Control 2 incoming = sci_ctl2; break; - case SCI_SCSR: // Status + case SCI_SCSR: // Status incoming = sci_status; break; - case SCI_SCDR: // Data + case SCI_SCDR: // Data incoming = get_received_char(); sci_status &= ~SCSR_RDRF; m_maincpu->set_input_line(M68HC05EG_INT_CPI, 0); @@ -631,7 +631,7 @@ READ8_MEMBER( lk201_device::sci_r ) break; } -// printf("SCI read @ %x = %02x (PC=%x)\n", offset, incoming, m_maincpu->pc()); +// printf("SCI read @ %x = %02x (PC=%x)\n", offset, incoming, m_maincpu->pc()); return incoming; } @@ -640,22 +640,22 @@ WRITE8_MEMBER( lk201_device::sci_w ) { switch (offset) { - case SCI_BAUD: // Baud rate + case SCI_BAUD: // Baud rate break; - case SCI_SCCR1: // Control 1 + case SCI_SCCR1: // Control 1 break; - case SCI_SCCR2: // Control 2 + case SCI_SCCR2: // Control 2 sci_ctl2 = data; update_interrupts(); break; - case SCI_SCSR: // Status + case SCI_SCSR: // Status break; - case SCI_SCDR: // Data -// printf("LK201: sending %02x\n", data); + case SCI_SCDR: // Data +// printf("LK201: sending %02x\n", data); transmit_register_setup(data); sci_status &= ~(SCSR_TC | SCSR_TDRE); m_maincpu->set_input_line(M68HC05EG_INT_CPI, 0); @@ -663,7 +663,7 @@ WRITE8_MEMBER( lk201_device::sci_w ) break; } -// printf("SCI %02x to %x (PC=%x)\n", data, offset, m_maincpu->pc()); +// printf("SCI %02x to %x (PC=%x)\n", data, offset, m_maincpu->pc()); } READ8_MEMBER( lk201_device::spi_r ) @@ -672,20 +672,20 @@ READ8_MEMBER( lk201_device::spi_r ) switch (offset) { - case SPI_SPCR: // Control + case SPI_SPCR: // Control break; - case SPI_SPSR: // Status + case SPI_SPSR: // Status incoming = spi_status; spi_status &= ~SPSR_SPIF; break; - case SPI_SPDR: // Data I/O + case SPI_SPDR: // Data I/O incoming = spi_data; break; } -// printf("SPI read @ %x = %02x (PC=%x)\n", offset, incoming, m_maincpu->pc()); +// printf("SPI read @ %x = %02x (PC=%x)\n", offset, incoming, m_maincpu->pc()); return incoming; } @@ -694,13 +694,13 @@ WRITE8_MEMBER( lk201_device::spi_w ) { switch (offset) { - case SPI_SPCR: // Control + case SPI_SPCR: // Control break; - case SPI_SPSR: // Status (read only) + case SPI_SPSR: // Status (read only) break; - case SPI_SPDR: // Data I/O + case SPI_SPDR: // Data I/O spi_data = data; // Transfer only allowed if transfer complete flag has been acknowleged @@ -718,6 +718,5 @@ WRITE8_MEMBER( lk201_device::spi_w ) break; } -// printf("SPI %02x to %x (PC=%x)\n", data, offset, m_maincpu->pc()); +// printf("SPI %02x to %x (PC=%x)\n", data, offset, m_maincpu->pc()); } - diff --git a/src/mess/machine/dgn_beta.c b/src/mess/machine/dgn_beta.c index 6b2c4e9092b..aaf8fae22d0 100644 --- a/src/mess/machine/dgn_beta.c +++ b/src/mess/machine/dgn_beta.c @@ -931,7 +931,7 @@ void dgn_beta_state::dgn_beta_line_interrupt (int data) /********************************* Machine/Driver Initialization ****************************************/ void dgn_beta_state::machine_reset() -{ +{ wd2797_device *fdc = machine().device(FDC_TAG); pia6821_device *pia_0 = machine().device( PIA_0_TAG ); pia6821_device *pia_1 = machine().device( PIA_1_TAG ); diff --git a/src/mess/machine/hp48.c b/src/mess/machine/hp48.c index 9c3c4774ec5..8dbe6e01130 100644 --- a/src/mess/machine/hp48.c +++ b/src/mess/machine/hp48.c @@ -450,7 +450,7 @@ WRITE8_MEMBER(hp48_state::hp48_io_w) bit 1: transmitting bit 2: irq enable on buffer empty bit 3: led on (direct mode) - on HP49 G, flash ROM write enable + on HP49 G, flash ROM write enable - 0x1d: I/R output buffer */ @@ -576,10 +576,10 @@ READ8_MEMBER(hp48_state::hp48_io_r) READ8_MEMBER(hp48_state::hp48_bank_r) { - /* HP48 GX + /* HP48 GX bit 0: ignored bits 2-5: bank number - bit 6: enable + bit 6: enable */ /* HP49 G @@ -746,7 +746,7 @@ void hp48_state::hp48_apply_modules() else { /* NCE3 */ - nce3_enable = m_bank_switch >> 6; + nce3_enable = m_bank_switch >> 6; LOG(( "hp48_apply_modules: A19 disabled, NCE3 %s\n", nce3_enable ? "enabled" : "disabled" )); space.install_read_bank( 0, 0x7ffff, 0, 0x80000, "bank5" ); } @@ -1130,7 +1130,7 @@ void hp48_state::hp48_machine_start( hp48_models model ) m_model = model; /* internal RAM */ - ram_size = + ram_size = HP49_G_MODEL ? (512 * 1024) : HP48_GX_MODEL ? (128 * 1024) : (32 * 1024); @@ -1139,7 +1139,7 @@ void hp48_state::hp48_machine_start( hp48_models model ) /* ROM load */ - rom_size = + rom_size = HP49_G_MODEL ? (2048 * 1024) : HP48_S_SERIES ? (256 * 1024) : (512 * 1024); m_rom = auto_alloc_array(machine(), UINT8, 2 * rom_size); diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c index f02923073b4..1c144ec4b99 100644 --- a/src/mess/machine/mac.c +++ b/src/mess/machine/mac.c @@ -1242,7 +1242,7 @@ READ8_MEMBER(mac_state::mac_via_in_a_pmu) // printf("VIA1 IN_A (PC %x)\n", m_maincpu->safe_pc()); #if LOG_ADB -// printf("Read PM data %x\n", m_pm_data_recv); +// printf("Read PM data %x\n", m_pm_data_recv); #endif return m_pm_data_recv; } @@ -1312,7 +1312,7 @@ READ8_MEMBER(mac_state::mac_via_in_b_via2pmu) READ8_MEMBER(mac_state::mac_via_in_b_pmu) { int val = 0; -// printf("Read VIA B: PM_ACK %x\n", m_pm_ack); +// printf("Read VIA B: PM_ACK %x\n", m_pm_ack); val = 0x80 | 0x04 | m_pm_ack; // SCC wait/request (bit 2 must be set at 900c1a or startup tests always fail) // printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc()); @@ -1358,7 +1358,7 @@ WRITE8_MEMBER(mac_state::mac_via_out_a_pmu) // printf("VIA1 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc()); #if LOG_ADB -// printf("%02x to PM\n", data); +// printf("%02x to PM\n", data); #endif m_pm_data_send = data; return; @@ -1657,7 +1657,7 @@ WRITE8_MEMBER(mac_state::mac_via2_out_b) WRITE8_MEMBER(mac_state::mac_via2_out_b_pmu) { -// logerror("VIA2 OUT B PMU: %02x (PC %x)\n", data, m_maincpu->pc()); +// logerror("VIA2 OUT B PMU: %02x (PC %x)\n", data, m_maincpu->pc()); if ((data & 4) && !(m_pm_req & 4)) { diff --git a/src/mess/machine/mackbd.h b/src/mess/machine/mackbd.h index d52363e59f5..feb0eac27e0 100644 --- a/src/mess/machine/mackbd.h +++ b/src/mess/machine/mackbd.h @@ -12,13 +12,13 @@ //************************************************************************** #define MCFG_MACKBD_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MACKBD, 0) + MCFG_DEVICE_ADD(_tag, MACKBD, 0) #define MCFG_MACKBD_REPLACE(_tag) \ - MCFG_DEVICE_REPLACE(_tag, MACKBD, 0) + MCFG_DEVICE_REPLACE(_tag, MACKBD, 0) #define MCFG_MACKBD_REMOVE(_tag) \ - MCFG_DEVICE_REMOVE(_tag) + MCFG_DEVICE_REMOVE(_tag) #define MCFG_MACKBD_CLKOUT_HANDLER(_devcb) \ devcb = &mackbd_device::set_clkout_handler(*device, DEVCB2_##_devcb); diff --git a/src/mess/machine/mega32x.c b/src/mess/machine/mega32x.c index 6a3fe6efda5..52af206c90a 100644 --- a/src/mess/machine/mega32x.c +++ b/src/mess/machine/mega32x.c @@ -1582,14 +1582,14 @@ void sega_32x_device::_32x_interrupt_cb(int scanline, int irq6) _32x_check_framebuffer_swap(scanline >= irq6); m_32x_hcount_compare_val++; - + if (m_32x_hcount_compare_val >= m_32x_hcount_reg) { m_32x_hcount_compare_val = -1; - + if (scanline < 224 || m_sh2_hint_in_vbl) { - if (m_sh2_master_hint_enable) + if (m_sh2_master_hint_enable) m_master_cpu->set_input_line(SH2_HINT_IRQ_LEVEL, ASSERT_LINE); if (m_sh2_slave_hint_enable) m_slave_cpu->set_input_line(SH2_HINT_IRQ_LEVEL, ASSERT_LINE); diff --git a/src/mess/machine/mega32x.h b/src/mess/machine/mega32x.h index cf877add84e..ad10677c403 100644 --- a/src/mess/machine/mega32x.h +++ b/src/mess/machine/mega32x.h @@ -41,9 +41,9 @@ public: // set some variables at start, depending on region (shall be moved to a device interface?) void set_framerate(int rate) { m_framerate = rate; } void set_32x_pal(bool pal) { m_32x_pal = pal ? 1 : 0; } - void set_total_scanlines(int total) { m_base_total_scanlines = total; } // this get set at start only - void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF - + void set_total_scanlines(int total) { m_base_total_scanlines = total; } // this get set at start only + void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF + // static configuration static void static_set_palette_tag(device_t &device, const char *tag); @@ -192,7 +192,7 @@ private: UINT16 *m_32x_display_dram, *m_32x_access_dram; UINT16* m_32x_palette; UINT16* m_32x_palette_lookup; - + required_device m_palette; }; diff --git a/src/mess/machine/megacd.h b/src/mess/machine/megacd.h index 8d53cb088fb..3d0d7ef18f4 100644 --- a/src/mess/machine/megacd.h +++ b/src/mess/machine/megacd.h @@ -111,8 +111,8 @@ public: // set some variables at start, depending on region (shall be moved to a device interface?) void set_framerate(int rate) { m_framerate = rate; } - void set_total_scanlines(int total) { m_base_total_scanlines = total; } // this gets set at start only - void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF + void set_total_scanlines(int total) { m_base_total_scanlines = total; } // this gets set at start only + void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF void SCD_GET_TILE_INFO_16x16_1x1( int& tile_region, int& tileno, int tile_index ); void SCD_GET_TILE_INFO_32x32_1x1( int& tile_region, int& tileno, int tile_index ); diff --git a/src/mess/machine/micropolis.h b/src/mess/machine/micropolis.h index 8ac0325280f..9989c18a65e 100644 --- a/src/mess/machine/micropolis.h +++ b/src/mess/machine/micropolis.h @@ -38,7 +38,7 @@ struct micropolis_interface ***************************************************************************/ class micropolis_device : public device_t, - public micropolis_interface + public micropolis_interface { public: micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c index eb66a84fc6f..382d8639855 100644 --- a/src/mess/machine/nes.c +++ b/src/mess/machine/nes.c @@ -159,7 +159,7 @@ void nes_state::machine_start() // install additional handlers (read_h, read_ex, write_ex) if (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() == AVE_MAXI15 + || m_cartslot->get_pcb_id() == BANDAI_DATACH || m_cartslot->get_pcb_id() == BANDAI_KARAOKE || 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 || m_cartslot->get_pcb_id() == UNL_LH32 || m_cartslot->get_pcb_id() == UNL_LH10 || m_cartslot->get_pcb_id() == UNL_2708 || m_cartslot->get_pcb_id() == UNL_43272 || m_cartslot->get_pcb_id() == BMC_G63IN1 || m_cartslot->get_pcb_id() == BMC_8157 diff --git a/src/mess/machine/oric.c b/src/mess/machine/oric.c index ef9fe8165ab..9930f2a351d 100644 --- a/src/mess/machine/oric.c +++ b/src/mess/machine/oric.c @@ -55,7 +55,7 @@ void oric_state::oric_refresh_ints() if (m_is_telestrat==0) { /* oric 1 or oric atmos */ - + /* if floppy disc hardware is disabled, do not allow interrupts from it */ if ((m_io_floppy->manager().safe_to_read()) && ((m_io_floppy->read() & 0x07) == ORIC_FLOPPY_INTERFACE_NONE)) { diff --git a/src/mess/machine/partner.c b/src/mess/machine/partner.c index d61bc9b3bef..9f07f149d23 100644 --- a/src/mess/machine/partner.c +++ b/src/mess/machine/partner.c @@ -77,7 +77,7 @@ void partner_state::partner_window_2(UINT8 bank_num, UINT16 offset,UINT8 *rom) } } -READ8_MEMBER(partner_state::partner_floppy_r){ +READ8_MEMBER(partner_state::partner_floppy_r){ if (offset<0x100) { switch(offset & 3) { case 0x00 : return m_fdc->status_r(space, 0); diff --git a/src/mess/machine/pecom.c b/src/mess/machine/pecom.c index 5cc255a06b4..e9333b15bc0 100644 --- a/src/mess/machine/pecom.c +++ b/src/mess/machine/pecom.c @@ -170,7 +170,7 @@ WRITE8_MEMBER(pecom_state::sc_w ) // DMA acknowledge clears the DMAOUT request m_cdp1802->set_input_line(COSMAC_INPUT_LINE_DMAOUT, CLEAR_LINE); break; - + case COSMAC_STATE_CODE_S3_INTERRUPT: break; } diff --git a/src/mess/machine/sgi.c b/src/mess/machine/sgi.c index 1240dd5d378..e45be40ecae 100644 --- a/src/mess/machine/sgi.c +++ b/src/mess/machine/sgi.c @@ -88,7 +88,7 @@ void sgi_mc_device::device_start() } timer_init(); - + save_item(NAME(m_nCPUControl0)); save_item(NAME(m_nCPUControl1)); save_item(NAME(m_nWatchdog)); diff --git a/src/mess/machine/sgi.h b/src/mess/machine/sgi.h index 4109d7cebdf..d56c9ec5887 100644 --- a/src/mess/machine/sgi.h +++ b/src/mess/machine/sgi.h @@ -66,7 +66,7 @@ private: UINT32 m_nDMAMode; UINT32 m_nDMAZoomByteCnt; UINT32 m_nDMARunning; - + void update(); TIMER_CALLBACK_MEMBER(update_callback); void timer_init(); diff --git a/src/mess/machine/smartmed.c b/src/mess/machine/smartmed.c index fc5b38e8712..fc5fe8a22e3 100644 --- a/src/mess/machine/smartmed.c +++ b/src/mess/machine/smartmed.c @@ -76,12 +76,12 @@ const device_type NAND = &device_creator; nand_device::nand_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAND, "NAND Flash Memory", tag, owner, clock, "nand", __FILE__), - m_write_rnb(*this) + m_write_rnb(*this) { } nand_device::nand_device(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_write_rnb(*this) + m_write_rnb(*this) { } diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c index 9a11d1de4ae..7a542265938 100644 --- a/src/mess/machine/sms.c +++ b/src/mess/machine/sms.c @@ -698,9 +698,9 @@ void sms_state::setup_media_slots() // a bunch of SG1000 carts (compatible with SG1000 Mark III) use their own RAM... // TODO: are BASIC and Music actually compatible with Mark III?? if (m_cartslot->get_type() == SEGA8_BASIC_L3 || - m_cartslot->get_type() == SEGA8_MUSIC_EDITOR || - m_cartslot->get_type() == SEGA8_DAHJEE_TYPEA || - m_cartslot->get_type() == SEGA8_DAHJEE_TYPEB) + m_cartslot->get_type() == SEGA8_MUSIC_EDITOR || + m_cartslot->get_type() == SEGA8_DAHJEE_TYPEA || + m_cartslot->get_type() == SEGA8_DAHJEE_TYPEB) { m_mem_device_enabled |= ENABLE_EXT_RAM; } @@ -773,10 +773,10 @@ MACHINE_START_MEMBER(sms_state,sms) // the "call $4010" without a following RET statement. That is basically // a bug in the program code. The only way this cartridge could have run // successfully on a real unit is if the RAM would be initialized with - // a F0 pattern on power up; F0 = RET P. - // This initialization breaks the some Game Gear games though (e.g. + // a F0 pattern on power up; F0 = RET P. + // This initialization breaks the some Game Gear games though (e.g. // tempojr), suggesting that not all systems had the same initialization. - // For the moment we apply this to systems that have the Japanese SMS + // For the moment we apply this to systems that have the Japanese SMS // cartridge slot. if (m_has_jpn_sms_cart_slot) { @@ -888,7 +888,7 @@ WRITE8_MEMBER(smssdisp_state::sms_store_cart_select_w) // - the one with 16 cart slots and 3 card slots; // - the one with 16 cart slots and 16 card slots. // -// On front panel of both models there are only 16 game switches, +// On front panel of both models there are only 16 game switches, // that seems to change the active cart/card slot pair or, for the 4th // game switch onward of the 16-3 model, the active cart slot only. diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c index d9006355ab7..7467bd0e901 100644 --- a/src/mess/machine/svi318.c +++ b/src/mess/machine/svi318.c @@ -741,7 +741,7 @@ READ8_MEMBER(svi318_state::svi318_io_ext_r) { return 0xff; } - + fd1793_device *fdc = machine().device("wd179x"); switch( offset ) @@ -804,7 +804,7 @@ WRITE8_MEMBER(svi318_state::svi318_io_ext_w) { return; } - + fd1793_device *fdc = machine().device("wd179x"); switch( offset ) diff --git a/src/mess/machine/swtpc09.c b/src/mess/machine/swtpc09.c index 8e27c2224c0..dd3b59a7688 100644 --- a/src/mess/machine/swtpc09.c +++ b/src/mess/machine/swtpc09.c @@ -1,6 +1,6 @@ /*************************************************************************** - swtpc09 machine file - Robert Justice ,2009-2014 + swtpc09 machine file + Robert Justice ,2009-2014 ****************************************************************************/ @@ -21,7 +21,7 @@ #define VERBOSE 0 -#define LOG(x) do { if (VERBOSE) logerror x; } while (0) +#define LOG(x) do { if (VERBOSE) logerror x; } while (0) /******* MC6840 PTM on MPID Board *******/ @@ -41,7 +41,7 @@ WRITE8_MEMBER( swtpc09_state::ptm_o1_callback ) m_pia_counter++; //pia_counter = pia_counter && 0xff; - if (m_pia_counter & 0x80) pia->ca1_w(1); + if (m_pia_counter & 0x80) pia->ca1_w(1); } WRITE8_MEMBER( swtpc09_state::ptm_o3_callback ) @@ -54,9 +54,9 @@ WRITE8_MEMBER( swtpc09_state::ptm_o3_callback ) WRITE_LINE_MEMBER( swtpc09_state::ptm_irq ) { if (state) - swtpc09_irq_handler(PTM_IRQ, ASSERT_LINE); + swtpc09_irq_handler(PTM_IRQ, ASSERT_LINE); else - swtpc09_irq_handler(PTM_IRQ, CLEAR_LINE); + swtpc09_irq_handler(PTM_IRQ, CLEAR_LINE); } /******* MC6821 PIA on MPID Board *******/ @@ -64,7 +64,7 @@ WRITE_LINE_MEMBER( swtpc09_state::ptm_irq ) READ8_MEMBER( swtpc09_state::pia0_a_r ) { - return m_pia_counter; + return m_pia_counter; } READ8_MEMBER( swtpc09_state::pia0_ca1_r ) @@ -74,12 +74,12 @@ READ8_MEMBER( swtpc09_state::pia0_ca1_r ) WRITE_LINE_MEMBER( swtpc09_state::pia0_irq_a ) { - pia6821_device *pia = machine().device("pia"); + pia6821_device *pia = machine().device("pia"); if ( pia->irq_a_state()) - swtpc09_irq_handler(PIA_IRQ, ASSERT_LINE); + swtpc09_irq_handler(PIA_IRQ, ASSERT_LINE); else - swtpc09_irq_handler(PIA_IRQ, CLEAR_LINE); + swtpc09_irq_handler(PIA_IRQ, CLEAR_LINE); } @@ -90,14 +90,14 @@ WRITE_LINE_MEMBER( swtpc09_state::acia_interrupt ) { if (state) { - swtpc09_irq_handler(ACIA_IRQ, ASSERT_LINE); + swtpc09_irq_handler(ACIA_IRQ, ASSERT_LINE); LOG(("swtpc09_acia_irq_assert\n")); - } + } else { - swtpc09_irq_handler(ACIA_IRQ, CLEAR_LINE); + swtpc09_irq_handler(ACIA_IRQ, CLEAR_LINE); LOG(("swtpc09_acia_irq_clear\n")); - } + } } /*********************************************************************/ @@ -107,17 +107,17 @@ WRITE_LINE_MEMBER( swtpc09_state::acia_interrupt ) /* DMF2 dma extended address register */ READ8_MEMBER ( swtpc09_state::dmf2_dma_address_reg_r ) { - return m_fdc_dma_address_reg; + return m_fdc_dma_address_reg; } WRITE8_MEMBER ( swtpc09_state::dmf2_dma_address_reg_w ) { - m_fdc_dma_address_reg = data; - + m_fdc_dma_address_reg = data; + // bit 4 controls a gate enable/disable for DMF2 fdc irq line if ((m_fdc_dma_address_reg & 0x10) && (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2)) - swtpc09_irq_handler(FDC_IRQ, CLEAR_LINE); //then clear the irq to cpu - + swtpc09_irq_handler(FDC_IRQ, CLEAR_LINE); //then clear the irq to cpu + LOG(("swtpc09_dmf2_dma_address_reg_w %02X\n", data)); } @@ -134,31 +134,31 @@ WRITE8_MEMBER ( swtpc09_state::dmf2_control_reg_w ) switch (data & 0x0F) { - case 0x0e: - m_fdc->set_drive(0); - // need to set drive ready as sw checks before doing anything - machine().device("floppy0")->floppy_drive_set_ready_state(1,0); + case 0x0e: + m_fdc->set_drive(0); + // need to set drive ready as sw checks before doing anything + machine().device("floppy0")->floppy_drive_set_ready_state(1,0); break; - case 0x0d: - m_fdc->set_drive(1); - machine().device("floppy1")->floppy_drive_set_ready_state(1,0); + case 0x0d: + m_fdc->set_drive(1); + machine().device("floppy1")->floppy_drive_set_ready_state(1,0); break; - case 0x0b: - m_fdc->set_drive(2); - machine().device("floppy2")->floppy_drive_set_ready_state(1,0); - break; + case 0x0b: + m_fdc->set_drive(2); + machine().device("floppy2")->floppy_drive_set_ready_state(1,0); + break; - case 0x07: - m_fdc->set_drive(3); - machine().device("floppy3")->floppy_drive_set_ready_state(1,0); - break; + case 0x07: + m_fdc->set_drive(3); + machine().device("floppy3")->floppy_drive_set_ready_state(1,0); + break; default: break; - } + } - // ignore side select in emulation due to sector numbering + // ignore side select in emulation due to sector numbering ////side select //if (!(data & 0x10)) { // wd17xx_set_side(fdc, 1); @@ -168,15 +168,15 @@ WRITE8_MEMBER ( swtpc09_state::dmf2_control_reg_w ) //} - /* bit 5 dden select */ + /* bit 5 dden select */ if (!(data & 0x20)) { - m_fdc->dden_w(0); - LOG(("Density single\n")); + m_fdc->dden_w(0); + LOG(("Density single\n")); } if (data & 0x20) { - m_fdc->dden_w(1); - LOG(("Density double\n")); + m_fdc->dden_w(1); + LOG(("Density double\n")); } } @@ -184,10 +184,10 @@ WRITE8_MEMBER ( swtpc09_state::dmf2_control_reg_w ) void swtpc09_state::swtpc09_fdc_dma_transfer() { UINT8 *RAM = memregion("maincpu")->base(); - UINT32 offset; + UINT32 offset; address_space &space = m_maincpu->space(AS_PROGRAM); - offset = (m_fdc_dma_address_reg & 0x0f)<<16; + offset = (m_fdc_dma_address_reg & 0x0f)<<16; if (m_m6844_channel[0].active == 1) //active dma transfer { @@ -211,12 +211,12 @@ void swtpc09_state::swtpc09_fdc_dma_transfer() if (m_m6844_channel[0].counter == 0) // dma transfer has finished { - m_m6844_channel[0].control |= 0x80; // set dend flag - if (m_m6844_interrupt & 0x01) // interrupt for channel 0 is enabled? - { - m_m6844_interrupt |= 0x80; // set bit 7 to indicate active interrupt - swtpc09_irq_handler(DMAC_IRQ, ASSERT_LINE); - } + m_m6844_channel[0].control |= 0x80; // set dend flag + if (m_m6844_interrupt & 0x01) // interrupt for channel 0 is enabled? + { + m_m6844_interrupt |= 0x80; // set bit 7 to indicate active interrupt + swtpc09_irq_handler(DMAC_IRQ, ASSERT_LINE); + } } } @@ -230,26 +230,26 @@ void swtpc09_state::swtpc09_irq_handler(UINT8 peripheral, UINT8 state) switch (state) { case ASSERT_LINE: - m_interrupt |= peripheral; - break; + m_interrupt |= peripheral; + break; case CLEAR_LINE: - m_interrupt &= (~peripheral & 0x3f); - break; - } - - if (!m_active_interrupt && m_interrupt) //no active interrupt and it needs to be asserted - { - m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); - m_active_interrupt=TRUE; - LOG(("swtpc09_irq_assert %02X\n", peripheral)); - } + m_interrupt &= (~peripheral & 0x3f); + break; + } + + if (!m_active_interrupt && m_interrupt) //no active interrupt and it needs to be asserted + { + m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); + m_active_interrupt=TRUE; + LOG(("swtpc09_irq_assert %02X\n", peripheral)); + } else if (m_active_interrupt && !m_interrupt) //active interrupt and it needs to be cleared { m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); LOG(("swtpc09_irq_clear %02X\n", peripheral)); m_active_interrupt=FALSE; - } + } } /******* WD1791 FDC *******/ @@ -258,61 +258,61 @@ const wd17xx_interface swtpc09_wd17xx_interface = { DEVCB_NULL, DEVCB_DRIVER_LINE_MEMBER(swtpc09_state, fdc_intrq_w), - DEVCB_DRIVER_LINE_MEMBER(swtpc09_state, fdc_drq_w), + DEVCB_DRIVER_LINE_MEMBER(swtpc09_state, fdc_drq_w), {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3 } }; /* handlers for fdc */ WRITE_LINE_MEMBER( swtpc09_state::fdc_intrq_w ) { - LOG(("swtpc09_fdc_intrq_w %02X\n", state)); + LOG(("swtpc09_fdc_intrq_w %02X\n", state)); if ( m_system_type == UNIFLEX_DMF3 ) //IRQ from 1791 is connect into VIA ca2 { - if (state) - { - m_fdc_status |= 0x40; + if (state) + { + m_fdc_status |= 0x40; m_via->write_cb2(0); //fdc interrupt is connected to CA1 - m_dmf3_via_porta &= 0xfb; //clear pa3 + m_dmf3_via_porta &= 0xfb; //clear pa3 //m_via->write_porta(m_dmf3_via_porta); //and connected to PA3 - //swtpc09_irq_handler(FDC_IRQ, ASSERT_LINE); + //swtpc09_irq_handler(FDC_IRQ, ASSERT_LINE); } else { - m_fdc_status &= ~0x40; + m_fdc_status &= ~0x40; m_via->write_cb2(1); m_dmf3_via_porta |= 0x04; //and connected to PA3 //m_via->write_porta(m_dmf3_via_porta); //and connected to PA3 - //swtpc09_irq_handler(FDC_IRQ, CLEAR_LINE); + //swtpc09_irq_handler(FDC_IRQ, CLEAR_LINE); } - } + } else if ( m_system_type == FLEX_DC4_PIAIDE ) //for dc4 emulate irq jumper out { - if (state) - { - m_fdc_status |= 0x40; + if (state) + { + m_fdc_status |= 0x40; } else { - m_fdc_status &= ~0x40; + m_fdc_status &= ~0x40; } } else //for dmf2 it is connected directly to cpu via a gate { - if (state) - { - m_fdc_status |= 0x40; + if (state) + { + m_fdc_status |= 0x40; if (!(m_fdc_dma_address_reg & 0x10)) // is dmf2 fdc irq enabled { - LOG(("swtpc09_fdc_int ** assert\n")); + LOG(("swtpc09_fdc_int ** assert\n")); swtpc09_irq_handler(FDC_IRQ, ASSERT_LINE); } } else { - m_fdc_status &= ~0x40; - if (!(m_fdc_dma_address_reg & 0x10)) // is dmf2 fdc irq enabled + m_fdc_status &= ~0x40; + if (!(m_fdc_dma_address_reg & 0x10)) // is dmf2 fdc irq enabled { - LOG(("swtpc09_fdc_int ** clear\n")); + LOG(("swtpc09_fdc_int ** clear\n")); swtpc09_irq_handler(FDC_IRQ, CLEAR_LINE); } } @@ -323,23 +323,23 @@ WRITE_LINE_MEMBER( swtpc09_state::fdc_drq_w ) { if (m_system_type == FLEX_DC4_PIAIDE) //for dc4 no dma { - if (state) - { - m_fdc_status |= 0x80; - } - else - m_fdc_status &= 0x7f; - } + if (state) + { + m_fdc_status |= 0x80; + } + else + m_fdc_status &= 0x7f; + } else { - if (state) - { - m_fdc_status |= 0x80; - swtpc09_fdc_dma_transfer(); - } - else - m_fdc_status &= 0x7f; - } + if (state) + { + m_fdc_status |= 0x80; + swtpc09_fdc_dma_transfer(); + } + else + m_fdc_status &= 0x7f; + } } /*********************************************************************/ @@ -364,7 +364,7 @@ WRITE8_MEMBER( swtpc09_state::dmf3_via_write_porta ) //WRITE_LINE_MEMBER( swtpc09_state::dmf3_via_write_ca1 ) //{ -// return m_via_ca1_input; +// return m_via_ca1_input; // LOG(("swtpc09_dmf3_via_write_ca1 %02X\n", state)); //} @@ -372,21 +372,21 @@ WRITE8_MEMBER( swtpc09_state::dmf3_via_write_porta ) WRITE_LINE_MEMBER( swtpc09_state::dmf3_via_irq ) { if (state) - swtpc09_irq_handler(VIA_IRQ, ASSERT_LINE); - else - swtpc09_irq_handler(VIA_IRQ, CLEAR_LINE); + swtpc09_irq_handler(VIA_IRQ, ASSERT_LINE); + else + swtpc09_irq_handler(VIA_IRQ, CLEAR_LINE); } /* DMF3 dma extended address register */ READ8_MEMBER ( swtpc09_state::dmf3_dma_address_reg_r ) { - return m_fdc_dma_address_reg; + return m_fdc_dma_address_reg; } WRITE8_MEMBER ( swtpc09_state::dmf3_dma_address_reg_w ) { - m_fdc_dma_address_reg = data; - LOG(("swtpc09_dmf3_dma_address_reg_w %02X\n", data)); + m_fdc_dma_address_reg = data; + LOG(("swtpc09_dmf3_dma_address_reg_w %02X\n", data)); } /* DMF3 fdc control register */ @@ -402,31 +402,31 @@ WRITE8_MEMBER ( swtpc09_state::dmf3_control_reg_w ) switch (data & 0x0F) { - case 0x01: - m_fdc->set_drive(0); - // need to set drive ready as sw checks before doing anything - machine().device("floppy0")->floppy_drive_set_ready_state(1,0); + case 0x01: + m_fdc->set_drive(0); + // need to set drive ready as sw checks before doing anything + machine().device("floppy0")->floppy_drive_set_ready_state(1,0); break; - case 0x02: - m_fdc->set_drive(1); - machine().device("floppy1")->floppy_drive_set_ready_state(1,0); + case 0x02: + m_fdc->set_drive(1); + machine().device("floppy1")->floppy_drive_set_ready_state(1,0); break; - case 0x04: - m_fdc->set_drive(2); - machine().device("floppy2")->floppy_drive_set_ready_state(1,0); - break; + case 0x04: + m_fdc->set_drive(2); + machine().device("floppy2")->floppy_drive_set_ready_state(1,0); + break; - case 0x08: - m_fdc->set_drive(3); - machine().device("floppy3")->floppy_drive_set_ready_state(1,0); - break; + case 0x08: + m_fdc->set_drive(3); + machine().device("floppy3")->floppy_drive_set_ready_state(1,0); + break; default: break; - } + } - // ignore side select in emulation due to sector numbering + // ignore side select in emulation due to sector numbering ////side select //if (!(data & 0x10)) { // wd17xx_set_side(fdc, 1); @@ -436,15 +436,15 @@ WRITE8_MEMBER ( swtpc09_state::dmf3_control_reg_w ) //} - /* bit 5 dden select */ + /* bit 5 dden select */ if (data & 0x20) { - m_fdc->dden_w(0); - LOG(("Density single\n")); + m_fdc->dden_w(0); + LOG(("Density single\n")); } if (!(data & 0x20)) { - m_fdc->dden_w(1); - LOG(("Density double\n")); + m_fdc->dden_w(1); + LOG(("Density double\n")); } } @@ -456,31 +456,31 @@ WRITE8_MEMBER ( swtpc09_state::dc4_control_reg_w ) switch (data & 0x03) { - case 0x00: - m_fdc->set_drive(0); - // need to set drive ready as sw checks before doing anything - machine().device("floppy0")->floppy_drive_set_ready_state(1,0); + case 0x00: + m_fdc->set_drive(0); + // need to set drive ready as sw checks before doing anything + machine().device("floppy0")->floppy_drive_set_ready_state(1,0); break; - case 0x01: - m_fdc->set_drive(1); - machine().device("floppy1")->floppy_drive_set_ready_state(1,0); + case 0x01: + m_fdc->set_drive(1); + machine().device("floppy1")->floppy_drive_set_ready_state(1,0); break; - case 0x02: - m_fdc->set_drive(2); - machine().device("floppy2")->floppy_drive_set_ready_state(1,0); - break; + case 0x02: + m_fdc->set_drive(2); + machine().device("floppy2")->floppy_drive_set_ready_state(1,0); + break; - case 0x03: - m_fdc->set_drive(3); - machine().device("floppy3")->floppy_drive_set_ready_state(1,0); - break; + case 0x03: + m_fdc->set_drive(3); + machine().device("floppy3")->floppy_drive_set_ready_state(1,0); + break; default: break; - } + } - // ignore side select in emulation due to sector numbering + // ignore side select in emulation due to sector numbering } @@ -490,7 +490,7 @@ WRITE8_MEMBER ( swtpc09_state::dc4_control_reg_w ) READ8_MEMBER( swtpc09_state::piaide_a_r ) { - return m_piaide_porta; + return m_piaide_porta; } READ8_MEMBER( swtpc09_state::piaide_b_r ) @@ -500,43 +500,43 @@ READ8_MEMBER( swtpc09_state::piaide_b_r ) WRITE8_MEMBER( swtpc09_state::piaide_a_w ) { - m_piaide_porta = data; + m_piaide_porta = data; } WRITE8_MEMBER( swtpc09_state::piaide_b_w ) { - int tempidedata; + int tempidedata; - m_piaide_portb = data; + m_piaide_portb = data; - if ((data & 0x40)&&(!(data&0x20))) //cs0=0 cs1=1 bit 5&6 - { - if (!(data & 0x02)) //rd line bit 1 - { - tempidedata = m_ide->read_cs0(space, (data&0x1c)>>2, 0xffff); - LOG(("swtpc09_ide_bus_r: offset $%02X data %04X\n", (data&0x1c)>>2, tempidedata)); - m_piaide_porta = tempidedata & 0x00ff; - } - else if (!(data & 0x01)) //wr line bit 0 + if ((data & 0x40)&&(!(data&0x20))) //cs0=0 cs1=1 bit 5&6 + { + if (!(data & 0x02)) //rd line bit 1 + { + tempidedata = m_ide->read_cs0(space, (data&0x1c)>>2, 0xffff); + LOG(("swtpc09_ide_bus_r: offset $%02X data %04X\n", (data&0x1c)>>2, tempidedata)); + m_piaide_porta = tempidedata & 0x00ff; + } + else if (!(data & 0x01)) //wr line bit 0 { m_ide->write_cs0(space, (data&0x1c)>>2, m_piaide_porta, 0xffff); - LOG(("swtpc09_ide_bus_w: offset $%02X data %04X\n", (data&0x1c)>>2, m_piaide_porta)); - } - } - else if ((data & 0x20)&&(!(data&0x40))) //cs0=1 cs1=0 bit 5&6 - { - if (!(data & 0x02)) //rd line bit 1 - { - tempidedata = m_ide->read_cs1(space, (data&0x1c)>>2, 0xffff); - LOG(("swtpc09_ide_bus_r: offset $%02X data %04X\n", (data&0x1c)>>2, tempidedata)); - m_piaide_porta = tempidedata & 0x00ff; - } - else if (!(data & 0x01)) //wr line bit 0 + LOG(("swtpc09_ide_bus_w: offset $%02X data %04X\n", (data&0x1c)>>2, m_piaide_porta)); + } + } + else if ((data & 0x20)&&(!(data&0x40))) //cs0=1 cs1=0 bit 5&6 + { + if (!(data & 0x02)) //rd line bit 1 + { + tempidedata = m_ide->read_cs1(space, (data&0x1c)>>2, 0xffff); + LOG(("swtpc09_ide_bus_r: offset $%02X data %04X\n", (data&0x1c)>>2, tempidedata)); + m_piaide_porta = tempidedata & 0x00ff; + } + else if (!(data & 0x01)) //wr line bit 0 { m_ide->write_cs1(space, (data&0x1c)>>2, m_piaide_porta, 0xffff); - LOG(("swtpc09_ide_bus_w: offset $%02X data %04X\n", (data&0x1c)>>2, m_piaide_porta)); - } - } + LOG(("swtpc09_ide_bus_w: offset $%02X data %04X\n", (data&0x1c)>>2, m_piaide_porta)); + } + } } @@ -547,125 +547,125 @@ WRITE8_MEMBER( swtpc09_state::piaide_b_w ) WRITE8_MEMBER(swtpc09_state::dat_w) { - UINT8 a16_to_a19, a12_to_a15; - UINT8 *RAM = memregion("maincpu")->base(); - UINT32 physical_address, logical_address; + UINT8 a16_to_a19, a12_to_a15; + UINT8 *RAM = memregion("maincpu")->base(); + UINT32 physical_address, logical_address; - address_space &mem = m_maincpu->space(AS_PROGRAM); + address_space &mem = m_maincpu->space(AS_PROGRAM); fd1793_device *fdc = machine().device("fdc"); - pia6821_device *pia = machine().device("pia"); - ptm6840_device *ptm = machine().device("ptm"); - acia6850_device *acia = machine().device("acia"); - via6522_device *via = machine().device("via"); - pia6821_device *piaide = machine().device("piaide"); + pia6821_device *pia = machine().device("pia"); + ptm6840_device *ptm = machine().device("ptm"); + acia6850_device *acia = machine().device("acia"); + via6522_device *via = machine().device("via"); + pia6821_device *piaide = machine().device("piaide"); - a16_to_a19 = data & 0xf0; - a12_to_a15 = ~data & 0x0f; //lower 4 bits are inverted - physical_address = ((a16_to_a19 + a12_to_a15) << 12); - logical_address = offset << 12; - LOG(("swtpc09_dat_bank_unmap Logical address:%04X\n", offset << 12 )); - LOG(("swtpc09_dat_bank_set dat:%02X Logical address:%04X Physical address:%05X\n", data, offset << 12, physical_address )); + a16_to_a19 = data & 0xf0; + a12_to_a15 = ~data & 0x0f; //lower 4 bits are inverted + physical_address = ((a16_to_a19 + a12_to_a15) << 12); + logical_address = offset << 12; + LOG(("swtpc09_dat_bank_unmap Logical address:%04X\n", offset << 12 )); + LOG(("swtpc09_dat_bank_set dat:%02X Logical address:%04X Physical address:%05X\n", data, offset << 12, physical_address )); - // unmap page to be changed + // unmap page to be changed mem.unmap_readwrite(offset << 12, (offset << 12)+0x0fff); - // map in new page - if (a12_to_a15 == 0x0e) // 0xE000 address range to be mapped in at this page - { - if (m_system_type == FLEX_DMF2) // if flex/sbug, map in acia at 0xE004 - { + // map in new page + if (a12_to_a15 == 0x0e) // 0xE000 address range to be mapped in at this page + { + if (m_system_type == FLEX_DMF2) // if flex/sbug, map in acia at 0xE004 + { mem.nop_readwrite(logical_address+0x000, logical_address+0x003); - mem.install_readwrite_handler(logical_address+0x004, logical_address+0x004, read8_delegate(FUNC(acia6850_device::status_r), acia), write8_delegate(FUNC(acia6850_device::control_w),acia)); - mem.install_readwrite_handler(logical_address+0x005, logical_address+0x005, read8_delegate(FUNC(acia6850_device::data_r), acia), write8_delegate(FUNC(acia6850_device::data_w),acia)); - mem.nop_readwrite(logical_address+0x006, logical_address+0x07f); - mem.install_readwrite_handler(logical_address+0x080, logical_address+0x08f, read8_delegate(FUNC(pia6821_device::read), pia), write8_delegate(FUNC(pia6821_device::write), pia)); - mem.install_readwrite_handler(logical_address+0x090, logical_address+0x09f, read8_delegate(FUNC(ptm6840_device::read), ptm), write8_delegate(FUNC(ptm6840_device::write), ptm)); - mem.nop_readwrite(logical_address+0x0a0, logical_address+0xfff); + mem.install_readwrite_handler(logical_address+0x004, logical_address+0x004, read8_delegate(FUNC(acia6850_device::status_r), acia), write8_delegate(FUNC(acia6850_device::control_w),acia)); + mem.install_readwrite_handler(logical_address+0x005, logical_address+0x005, read8_delegate(FUNC(acia6850_device::data_r), acia), write8_delegate(FUNC(acia6850_device::data_w),acia)); + mem.nop_readwrite(logical_address+0x006, logical_address+0x07f); + mem.install_readwrite_handler(logical_address+0x080, logical_address+0x08f, read8_delegate(FUNC(pia6821_device::read), pia), write8_delegate(FUNC(pia6821_device::write), pia)); + mem.install_readwrite_handler(logical_address+0x090, logical_address+0x09f, read8_delegate(FUNC(ptm6840_device::read), ptm), write8_delegate(FUNC(ptm6840_device::write), ptm)); + mem.nop_readwrite(logical_address+0x0a0, logical_address+0xfff); } - else if (m_system_type == FLEX_DC4_PIAIDE) // if flex/sbug and dc4 and piaide - { + else if (m_system_type == FLEX_DC4_PIAIDE) // if flex/sbug and dc4 and piaide + { mem.nop_readwrite(logical_address+0x000, logical_address+0x003); - mem.install_readwrite_handler(logical_address+0x004, logical_address+0x004, read8_delegate(FUNC(acia6850_device::status_r), acia), write8_delegate(FUNC(acia6850_device::control_w),acia)); - mem.install_readwrite_handler(logical_address+0x005, logical_address+0x005, read8_delegate(FUNC(acia6850_device::data_r), acia), write8_delegate(FUNC(acia6850_device::data_w),acia)); - mem.install_write_handler(logical_address+0x014, logical_address+0x014, write8_delegate(FUNC(swtpc09_state::dc4_control_reg_w),this)); - mem.install_readwrite_handler(logical_address+0x018, logical_address+0x01b, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); - //mem.nop_readwrite(logical_address+0x01c, logical_address+0x05f); - mem.install_readwrite_handler(logical_address+0x060, logical_address+0x06f, read8_delegate(FUNC(pia6821_device::read), piaide), write8_delegate(FUNC(pia6821_device::write), piaide)); - //mem.nop_readwrite(logical_address+0x070, logical_address+0x07f); - mem.install_readwrite_handler(logical_address+0x080, logical_address+0x08f, read8_delegate(FUNC(pia6821_device::read), pia), write8_delegate(FUNC(pia6821_device::write), pia)); - mem.install_readwrite_handler(logical_address+0x090, logical_address+0x09f, read8_delegate(FUNC(ptm6840_device::read), ptm), write8_delegate(FUNC(ptm6840_device::write), ptm)); - //mem.nop_readwrite(logical_address+0x0a0, logical_address+0x7ff); - mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xe800]); //piaide rom + mem.install_readwrite_handler(logical_address+0x004, logical_address+0x004, read8_delegate(FUNC(acia6850_device::status_r), acia), write8_delegate(FUNC(acia6850_device::control_w),acia)); + mem.install_readwrite_handler(logical_address+0x005, logical_address+0x005, read8_delegate(FUNC(acia6850_device::data_r), acia), write8_delegate(FUNC(acia6850_device::data_w),acia)); + mem.install_write_handler(logical_address+0x014, logical_address+0x014, write8_delegate(FUNC(swtpc09_state::dc4_control_reg_w),this)); + mem.install_readwrite_handler(logical_address+0x018, logical_address+0x01b, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); + //mem.nop_readwrite(logical_address+0x01c, logical_address+0x05f); + mem.install_readwrite_handler(logical_address+0x060, logical_address+0x06f, read8_delegate(FUNC(pia6821_device::read), piaide), write8_delegate(FUNC(pia6821_device::write), piaide)); + //mem.nop_readwrite(logical_address+0x070, logical_address+0x07f); + mem.install_readwrite_handler(logical_address+0x080, logical_address+0x08f, read8_delegate(FUNC(pia6821_device::read), pia), write8_delegate(FUNC(pia6821_device::write), pia)); + mem.install_readwrite_handler(logical_address+0x090, logical_address+0x09f, read8_delegate(FUNC(ptm6840_device::read), ptm), write8_delegate(FUNC(ptm6840_device::write), ptm)); + //mem.nop_readwrite(logical_address+0x0a0, logical_address+0x7ff); + mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xe800]); //piaide rom } else // assume unibug, map in acia at 0xE000 { - mem.install_readwrite_handler(logical_address+0x000, logical_address+0x000, read8_delegate(FUNC(acia6850_device::status_r), acia), write8_delegate(FUNC(acia6850_device::control_w), acia)); - mem.install_readwrite_handler(logical_address+0x001, logical_address+0x001, read8_delegate(FUNC(acia6850_device::data_r), acia), write8_delegate(FUNC(acia6850_device::data_w), acia)); + mem.install_readwrite_handler(logical_address+0x000, logical_address+0x000, read8_delegate(FUNC(acia6850_device::status_r), acia), write8_delegate(FUNC(acia6850_device::control_w), acia)); + mem.install_readwrite_handler(logical_address+0x001, logical_address+0x001, read8_delegate(FUNC(acia6850_device::data_r), acia), write8_delegate(FUNC(acia6850_device::data_w), acia)); mem.nop_readwrite(logical_address+0x002, logical_address+0x07f); - mem.install_readwrite_handler(logical_address+0x080, logical_address+0x08f, read8_delegate(FUNC(pia6821_device::read), pia), write8_delegate(FUNC(pia6821_device::write), pia)); - mem.install_readwrite_handler(logical_address+0x090, logical_address+0x09f, read8_delegate(FUNC(ptm6840_device::read), ptm), write8_delegate(FUNC(ptm6840_device::write), ptm)); - mem.nop_readwrite(logical_address+0x0a0, logical_address+0xfff); - } - } - else if (a12_to_a15 == 0x0f) // 0xF000 address range to be mapped in at this page - { - if (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2) // if DMF2 conroller this is the map - { - mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this)); - mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); - mem.install_readwrite_handler(logical_address+0x024, logical_address+0x03f, read8_delegate(FUNC(swtpc09_state::dmf2_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_control_reg_w),this)); - mem.install_readwrite_handler(logical_address+0x040, logical_address+0x041, read8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_w),this)); - //mem.nop_readwrite(logical_address+0x042, logical_address+0x7ff); - mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xf800]); - mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); - } - else if (m_system_type == FLEX_DC4_PIAIDE) // 2k ram for piaide on s09 board - { - //mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this)); - //mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); - //mem.install_readwrite_handler(logical_address+0x024, logical_address+0x03f, read8_delegate(FUNC(swtpc09_state::dmf2_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_control_reg_w),this)); - //mem.install_readwrite_handler(logical_address+0x040, logical_address+0x041, read8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_w),this)); - mem.install_ram(logical_address+0x000, logical_address+0x7ff, &RAM[0xf000]); - mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xf800]); - mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); - } - else // assume DMF3 controller - { + mem.install_readwrite_handler(logical_address+0x080, logical_address+0x08f, read8_delegate(FUNC(pia6821_device::read), pia), write8_delegate(FUNC(pia6821_device::write), pia)); + mem.install_readwrite_handler(logical_address+0x090, logical_address+0x09f, read8_delegate(FUNC(ptm6840_device::read), ptm), write8_delegate(FUNC(ptm6840_device::write), ptm)); + mem.nop_readwrite(logical_address+0x0a0, logical_address+0xfff); + } + } + else if (a12_to_a15 == 0x0f) // 0xF000 address range to be mapped in at this page + { + if (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2) // if DMF2 conroller this is the map + { mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this)); - mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); - mem.install_readwrite_handler(logical_address+0x024, logical_address+0x024, read8_delegate(FUNC(swtpc09_state::dmf3_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf3_control_reg_w),this)); - mem.install_readwrite_handler(logical_address+0x025, logical_address+0x025, read8_delegate(FUNC(swtpc09_state::dmf3_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf3_dma_address_reg_w),this)); - //mem.nop_readwrite(logical_address+0x030, logical_address+0x03f); - mem.install_readwrite_handler(logical_address+0x040, logical_address+0x04f, read8_delegate(FUNC(via6522_device::read), via), write8_delegate(FUNC(via6522_device::write), via)); - //mem.nop_readwrite(logical_address+0x050, logical_address+0x7ff); - mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xf800]); - mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); - } - } - else if (offset==0x0f) // then we need to leave in top part of ram and dat write - { - mem.install_ram(logical_address, logical_address+0x0eff, 0, 0, &RAM[physical_address]); - mem.install_rom(logical_address+0xf00, logical_address+0xfff, 0, 0, &RAM[0xff00]); - mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); + mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); + mem.install_readwrite_handler(logical_address+0x024, logical_address+0x03f, read8_delegate(FUNC(swtpc09_state::dmf2_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_control_reg_w),this)); + mem.install_readwrite_handler(logical_address+0x040, logical_address+0x041, read8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_w),this)); + //mem.nop_readwrite(logical_address+0x042, logical_address+0x7ff); + mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xf800]); + mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); + } + else if (m_system_type == FLEX_DC4_PIAIDE) // 2k ram for piaide on s09 board + { + //mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this)); + //mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); + //mem.install_readwrite_handler(logical_address+0x024, logical_address+0x03f, read8_delegate(FUNC(swtpc09_state::dmf2_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_control_reg_w),this)); + //mem.install_readwrite_handler(logical_address+0x040, logical_address+0x041, read8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_w),this)); + mem.install_ram(logical_address+0x000, logical_address+0x7ff, &RAM[0xf000]); + mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xf800]); + mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); + } + else // assume DMF3 controller + { + mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this)); + mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc)); + mem.install_readwrite_handler(logical_address+0x024, logical_address+0x024, read8_delegate(FUNC(swtpc09_state::dmf3_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf3_control_reg_w),this)); + mem.install_readwrite_handler(logical_address+0x025, logical_address+0x025, read8_delegate(FUNC(swtpc09_state::dmf3_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf3_dma_address_reg_w),this)); + //mem.nop_readwrite(logical_address+0x030, logical_address+0x03f); + mem.install_readwrite_handler(logical_address+0x040, logical_address+0x04f, read8_delegate(FUNC(via6522_device::read), via), write8_delegate(FUNC(via6522_device::write), via)); + //mem.nop_readwrite(logical_address+0x050, logical_address+0x7ff); + mem.install_rom(logical_address+0x800, logical_address+0xfff, &RAM[0xf800]); + mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); + } + } + else if (offset==0x0f) // then we need to leave in top part of ram and dat write + { + mem.install_ram(logical_address, logical_address+0x0eff, 0, 0, &RAM[physical_address]); + mem.install_rom(logical_address+0xf00, logical_address+0xfff, 0, 0, &RAM[0xff00]); + mem.install_write_handler(logical_address+0xff0, logical_address+0xfff, write8_delegate(FUNC(swtpc09_state::dat_w),this)); } - else // all the rest is treated as ram, 1MB ram emulated - { - mem.install_ram(logical_address, logical_address+0x0fff, &RAM[physical_address]); - } + else // all the rest is treated as ram, 1MB ram emulated + { + mem.install_ram(logical_address, logical_address+0x0fff, &RAM[physical_address]); + } -// unused code to limit to 256k ram +// unused code to limit to 256k ram // else if (!(a12_to_a15 & 0x0c) ) // limit ram to 256k || a12_to_a15 == 0x02 // { // memory_install_ram(space, logical_address, logical_address+0x0fff, 0, 0, &RAM[physical_address]); -// } +// } // -// else // all the rest is treated as unallocated +// else // all the rest is treated as unallocated // { // memory_nop_readwrite(space, logical_address, logical_address+0x0fff, 0, 0); -// } +// } } @@ -720,11 +720,11 @@ READ8_MEMBER( swtpc09_state::m6844_r ) /* a read here clears the DMA end flag */ m_m6844_channel[offset - 0x10].control &= ~0x80; - if (m_m6844_interrupt & 0x80) // if interrupt is active, then clear - { - swtpc09_irq_handler(0x01, CLEAR_LINE); - m_m6844_interrupt &= 0x7f; // clear interrupt indication bit 7 - LOG(("swtpc09_6844_r interrupt cleared \n")); + if (m_m6844_interrupt & 0x80) // if interrupt is active, then clear + { + swtpc09_irq_handler(0x01, CLEAR_LINE); + m_m6844_interrupt &= 0x7f; // clear interrupt indication bit 7 + LOG(("swtpc09_6844_r interrupt cleared \n")); } break; @@ -746,16 +746,16 @@ READ8_MEMBER( swtpc09_state::m6844_r ) /* 0x17-0x1f not used */ default: break; } - //LOG(("swtpc09_6844_r %02X %02X\n", offset, result & 0xff)); + //LOG(("swtpc09_6844_r %02X %02X\n", offset, result & 0xff)); - if (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2) // if DMF2 controller data bus is inverted to 6844 - { - return ~result & 0xff; + if (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2) // if DMF2 controller data bus is inverted to 6844 + { + return ~result & 0xff; + } + else + { + return result & 0xff; } - else - { - return result & 0xff; - } } @@ -763,10 +763,10 @@ WRITE8_MEMBER( swtpc09_state::m6844_w ) { int i; - if (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2) // if DMF2 controller data bus is inverted to 6844 - data = ~data & 0xff; + if (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2) // if DMF2 controller data bus is inverted to 6844 + data = ~data & 0xff; - LOG(("swtpc09_6844_w %02X %02X\n", offset, data)); + LOG(("swtpc09_6844_w %02X %02X\n", offset, data)); /* switch off the offset we were given */ switch (offset) { @@ -849,7 +849,7 @@ WRITE8_MEMBER( swtpc09_state::m6844_w ) /* interrupt control */ case 0x15: m_m6844_interrupt = (m_m6844_interrupt & 0x80) | (data & 0x7f); - LOG(("swtpc09_m_m6844_interrupt_w %02X\n", m_m6844_interrupt)); + LOG(("swtpc09_m_m6844_interrupt_w %02X\n", m_m6844_interrupt)); break; /* chaining control */ @@ -865,13 +865,13 @@ WRITE8_MEMBER( swtpc09_state::m6844_w ) DRIVER_INIT_MEMBER( swtpc09_state, swtpc09 ) { - int i; - m_pia_counter = 0; // init ptm/pia counter to 0 - m_term_data = 0; // terminal keyboard input - m_fdc_status = 0; // for floppy controller - m_system_type = FLEX_DMF2; - m_interrupt = 0; - m_active_interrupt = FALSE; + int i; + m_pia_counter = 0; // init ptm/pia counter to 0 + m_term_data = 0; // terminal keyboard input + m_fdc_status = 0; // for floppy controller + m_system_type = FLEX_DMF2; + m_interrupt = 0; + m_active_interrupt = FALSE; /* reset the 6844 */ for (i = 0; i < 4; i++) @@ -887,13 +887,13 @@ DRIVER_INIT_MEMBER( swtpc09_state, swtpc09 ) DRIVER_INIT_MEMBER( swtpc09_state, swtpc09i ) { - int i; - m_pia_counter = 0; // init ptm/pia counter to 0 - m_term_data = 0; // terminal keyboard input - m_fdc_status = 0; // for floppy controller - m_system_type = FLEX_DC4_PIAIDE; - m_interrupt = 0; - m_active_interrupt = FALSE; + int i; + m_pia_counter = 0; // init ptm/pia counter to 0 + m_term_data = 0; // terminal keyboard input + m_fdc_status = 0; // for floppy controller + m_system_type = FLEX_DC4_PIAIDE; + m_interrupt = 0; + m_active_interrupt = FALSE; /* reset the 6844 */ for (i = 0; i < 4; i++) @@ -909,13 +909,13 @@ DRIVER_INIT_MEMBER( swtpc09_state, swtpc09i ) DRIVER_INIT_MEMBER( swtpc09_state, swtpc09u ) { - int i; - m_pia_counter = 0; //init ptm/pia counter to 0 - m_term_data = 0; //terminal keyboard input - m_fdc_status = 0; // for floppy controller - m_system_type = UNIFLEX_DMF2; - m_interrupt = 0; - m_active_interrupt = FALSE; + int i; + m_pia_counter = 0; //init ptm/pia counter to 0 + m_term_data = 0; //terminal keyboard input + m_fdc_status = 0; // for floppy controller + m_system_type = UNIFLEX_DMF2; + m_interrupt = 0; + m_active_interrupt = FALSE; /* reset the 6844 */ for (i = 0; i < 4; i++) @@ -931,14 +931,14 @@ DRIVER_INIT_MEMBER( swtpc09_state, swtpc09u ) DRIVER_INIT_MEMBER( swtpc09_state, swtpc09d3 ) { - int i; - m_pia_counter = 0; //init ptm/pia counter to 0 - m_term_data = 0; //terminal keyboard input - m_fdc_status = 0; // for floppy controller - m_via_ca1_input = 0; - m_system_type = UNIFLEX_DMF3; - m_interrupt = 0; - m_active_interrupt = FALSE; + int i; + m_pia_counter = 0; //init ptm/pia counter to 0 + m_term_data = 0; //terminal keyboard input + m_fdc_status = 0; // for floppy controller + m_via_ca1_input = 0; + m_system_type = UNIFLEX_DMF3; + m_interrupt = 0; + m_active_interrupt = FALSE; /* reset the 6844 */ diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c index 2d0a5923e42..118d8d19f1b 100644 --- a/src/mess/machine/thomson.c +++ b/src/mess/machine/thomson.c @@ -4161,14 +4161,14 @@ void thomson_state::mo6_update_cart_bank() { if ( bank_is_read_only ) { - space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); - space.nop_write( 0xb000, 0xefff); + space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.nop_write( 0xb000, 0xefff); } else { space.install_readwrite_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); } } } @@ -4186,14 +4186,14 @@ void thomson_state::mo6_update_cart_bank() { if (m_to8_cart_vpage < 4) { - space.install_write_handler( 0xb000, 0xbfff, write8_delegate(FUNC(thomson_state::mo6_vcart_lo_w),this)); - space.install_write_handler( 0xc000, 0xefff, write8_delegate(FUNC(thomson_state::mo6_vcart_hi_w),this)); + space.install_write_handler( 0xb000, 0xbfff, write8_delegate(FUNC(thomson_state::mo6_vcart_lo_w),this)); + space.install_write_handler( 0xc000, 0xefff, write8_delegate(FUNC(thomson_state::mo6_vcart_hi_w),this)); } else { - space.install_readwrite_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_readwrite_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); } } LOG_BANK(( "mo6_update_cart_bank: update CART bank %i write status to %s\n", @@ -4210,8 +4210,8 @@ void thomson_state::mo6_update_cart_bank() { if ( m_old_cart_bank < 0 || m_old_cart_bank > 3 ) { - space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); space.nop_write( 0xb000, 0xefff); } LOG_BANK(( "mo6_update_cart_bank: CART is external cartridge bank %i (A7CB style)\n", bank )); @@ -4229,14 +4229,14 @@ void thomson_state::mo6_update_cart_bank() { if ( bank_is_read_only ) { - space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); space.nop_write( 0xb000, 0xefff); } else { - space.install_readwrite_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_readwrite_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); } } LOG_BANK(( "mo6_update_cart_bank: CART is RAM bank %i (MO5 compat.) (%s)\n", @@ -4247,14 +4247,14 @@ void thomson_state::mo6_update_cart_bank() { if ( bank_is_read_only ) { - space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); space.nop_write( 0xb000, 0xefff); } else { - space.install_readwrite_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_readwrite_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_readwrite_bank( 0xc000, 0xefff, MO6_CART_HI ); } LOG_BANK(( "mo5_update_cart_bank: update CART bank %i write status to %s\n", m_to8_cart_vpage, @@ -4281,8 +4281,8 @@ void thomson_state::mo6_update_cart_bank() { if ( m_old_cart_bank < 4 || m_old_cart_bank > 7 ) { - space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); space.install_write_handler( 0xb000, 0xefff, write8_delegate(FUNC(thomson_state::mo6_cartridge_w),this) ); } LOG_BANK(( "mo6_update_cart_bank: CART is internal ROM bank %i\n", b )); @@ -4296,10 +4296,10 @@ void thomson_state::mo6_update_cart_bank() bank = m_thom_cart_bank % m_thom_cart_nb_banks; if ( bank != m_old_cart_bank ) { - if ( m_old_cart_bank < 0 || m_old_cart_bank > 3 ) + if ( m_old_cart_bank < 0 || m_old_cart_bank > 3 ) { - space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); - space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); + space.install_read_bank( 0xb000, 0xbfff, MO6_CART_LO ); + space.install_read_bank( 0xc000, 0xefff, MO6_CART_HI ); space.install_write_handler( 0xb000, 0xefff, write8_delegate(FUNC(thomson_state::mo6_cartridge_w),this) ); space.install_read_handler( 0xbffc, 0xbfff, read8_delegate(FUNC(thomson_state::mo6_cartridge_r),this) ); } diff --git a/src/mess/machine/ti99/990_hd.h b/src/mess/machine/ti99/990_hd.h index 5445ea45a99..770c2d428d6 100644 --- a/src/mess/machine/ti99/990_hd.h +++ b/src/mess/machine/ti99/990_hd.h @@ -14,7 +14,7 @@ class ti990_hdc_device : public device_t { public: ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template static devcb2_base &static_set_int_callback(device_t &device, _Object object) { return downcast(device).m_interrupt_callback.set_callback(object); } DECLARE_READ16_MEMBER(read); @@ -62,7 +62,7 @@ private: /* disk geometry */ unsigned int cylinders, heads, sectors_per_track, bytes_per_sector; }; - + UINT16 m_w[8]; devcb2_write_line m_interrupt_callback; diff --git a/src/mess/machine/ti99/grom.c b/src/mess/machine/ti99/grom.c index e519c02f6e8..6fce88c1fb6 100644 --- a/src/mess/machine/ti99/grom.c +++ b/src/mess/machine/ti99/grom.c @@ -94,7 +94,7 @@ */ ti99_grom_device::ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock, "ti99_grom", __FILE__), - m_gromready(*this) + m_gromready(*this) { } diff --git a/src/mess/machine/ti99/grom.h b/src/mess/machine/ti99/grom.h index 38eb39c048a..1599db84dd3 100644 --- a/src/mess/machine/ti99/grom.h +++ b/src/mess/machine/ti99/grom.h @@ -40,9 +40,9 @@ class ti99_grom_device : public bus8z_device, ti99grom_config { public: ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template static devcb2_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast(device).m_gromready.set_callback(object); } - + DECLARE_READ8Z_MEMBER(readz); DECLARE_WRITE8_MEMBER(write); diff --git a/src/mess/machine/ti99/gromport.c b/src/mess/machine/ti99/gromport.c index d8737b56d48..c126ac7bb9f 100644 --- a/src/mess/machine/ti99/gromport.c +++ b/src/mess/machine/ti99/gromport.c @@ -1391,15 +1391,15 @@ static GROM_CONFIG(grom7_config) */ static MACHINE_CONFIG_FRAGMENT( ti99_cartridge ) MCFG_GROM_ADD( GROM3_TAG, grom3_config ) - MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) + MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) MCFG_GROM_ADD( GROM4_TAG, grom4_config ) - MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) + MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) MCFG_GROM_ADD( GROM5_TAG, grom5_config ) - MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) + MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) MCFG_GROM_ADD( GROM6_TAG, grom6_config ) - MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) + MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) MCFG_GROM_ADD( GROM7_TAG, grom7_config ) - MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) + MCFG_GROM_READY_CALLBACK(WRITELINE(ti99_cartridge_device, ready_line)) MACHINE_CONFIG_END machine_config_constructor ti99_cartridge_device::device_mconfig_additions() const @@ -2428,7 +2428,7 @@ rpk* rpk_reader::open(emu_options &options, const char *filename, const char *sy catch (rpk_exception &exp) { newrpk->close(); - if (layout_xml != NULL) xml_file_free(layout_xml); + if (layout_xml != NULL) xml_file_free(layout_xml); if (zipfile != NULL) zip_file_close(zipfile); if (layout_text != NULL) global_free_array(layout_text); @@ -2436,7 +2436,7 @@ rpk* rpk_reader::open(emu_options &options, const char *filename, const char *sy throw exp; } - if (layout_xml != NULL) xml_file_free(layout_xml); + if (layout_xml != NULL) xml_file_free(layout_xml); if (zipfile != NULL) zip_file_close(zipfile); if (layout_text != NULL) global_free_array(layout_text); diff --git a/src/mess/machine/ti99/speech8.h b/src/mess/machine/ti99/speech8.h index ffcfabb89af..9e57dec76f6 100644 --- a/src/mess/machine/ti99/speech8.h +++ b/src/mess/machine/ti99/speech8.h @@ -27,7 +27,7 @@ class ti998_spsyn_device : public bus8z_device { public: ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + template static devcb2_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast(device).m_ready.set_callback(object); } DECLARE_READ8Z_MEMBER(readz); diff --git a/src/mess/machine/x68k_kbd.c b/src/mess/machine/x68k_kbd.c index 8bea0665d7a..6888867c092 100644 --- a/src/mess/machine/x68k_kbd.c +++ b/src/mess/machine/x68k_kbd.c @@ -355,9 +355,9 @@ void x68k_state::x68k_keyboard_push_scancode(unsigned char code) //m_mfp.rsr |= 0x80; // Buffer full //if(ioport("options")->read() & 0x01) //{ - // m_current_vector[6] = 0x4c; - // m_maincpu->set_input_line_and_vector(6,ASSERT_LINE,0x4c); - // logerror("MFP: Receive buffer full IRQ sent\n"); + // m_current_vector[6] = 0x4c; + // m_maincpu->set_input_line_and_vector(6,ASSERT_LINE,0x4c); + // logerror("MFP: Receive buffer full IRQ sent\n"); //} } } diff --git a/src/mess/machine/zx8302.h b/src/mess/machine/zx8302.h index 9ca86201fa1..4575e52b136 100644 --- a/src/mess/machine/zx8302.h +++ b/src/mess/machine/zx8302.h @@ -64,7 +64,7 @@ #define MCFG_ZX8302_OUT_NETOUT_CB(_devcb) \ devcb = &zx8302_device::set_out_netout_callback(*device, DEVCB2_##_devcb); - + #define MCFG_ZX8302_OUT_MDSELCK_CB(_devcb) \ devcb = &zx8302_device::set_out_mdselck_callback(*device, DEVCB2_##_devcb); @@ -79,7 +79,7 @@ #define MCFG_ZX8302_OUT_RAW1_CB(_devcb) \ devcb = &zx8302_device::set_out_raw1_callback(*device, DEVCB2_##_devcb); - + #define MCFG_ZX8302_IN_RAW1_CB(_devcb) \ devcb = &zx8302_device::set_in_raw1_callback(*device, DEVCB2_##_devcb); @@ -102,7 +102,7 @@ class zx8302_device : public device_t, public: // construction/destruction zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + static void set_rtc_clock(device_t &device, int rtc_clock) { downcast(device).m_rtc_clock = rtc_clock; } template static devcb2_base &set_out_ipl1l_callback(device_t &device, _Object object) { return downcast(device).m_out_ipl1l_cb.set_callback(object); } template static devcb2_base &set_out_baudx4_callback(device_t &device, _Object object) { return downcast(device).m_out_baudx4_cb.set_callback(object); } @@ -239,9 +239,9 @@ private: UINT8 m_status; // status register // IPC communication state - int m_comdata_from_ipc; // pending data from IPC->68000 - int m_comdata_to_cpu; // communication data IPC->68000 - int m_comdata_to_ipc; // communication data 68000->IPC + int m_comdata_from_ipc; // pending data from IPC->68000 + int m_comdata_to_cpu; // communication data IPC->68000 + int m_comdata_to_ipc; // communication data 68000->IPC int m_comctl; // communication control int m_ipc_state; // communication state int m_ipc_busy; // IPC busy diff --git a/src/mess/mess.lst b/src/mess/mess.lst index 69ff2d73aa9..f04d2009dce 100644 --- a/src/mess/mess.lst +++ b/src/mess/mess.lst @@ -1885,7 +1885,7 @@ prof181x // SWTPC S/09 swtpc09 // S09, DMF2 Floppy SBUG rom - FLEX swtpc09i // S09, DC4 Floppy + PIA IDE SBUG rom - FLEX -swtpc09u // S09, DMF2 Floppy UNIBUG rom - UniFLEX +swtpc09u // S09, DMF2 Floppy UNIBUG rom - UniFLEX swtpc09d3 // S09, DMF3 Floppy UNIBUG U3 rom - UniFLEX U3 @@ -1955,7 +1955,7 @@ batmantv // The Batman, 2004 harriet // 1990 // Fanuc -fanucspg // 1983 +fanucspg // 1983 fanucs15 // 1990 //********** Misc ********************************************************** diff --git a/src/mess/mess.mak b/src/mess/mess.mak index fb36f1f92bc..49efa08c064 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -1771,8 +1771,8 @@ $(MESSOBJ)/svision.a: \ $(MESS_DRIVERS)/svision.o \ $(MESS_AUDIO)/svision.o \ -$(MESSOBJ)/swtpc09.a: \ - $(MESS_DRIVERS)/swtpc09.o \ +$(MESSOBJ)/swtpc09.a: \ + $(MESS_DRIVERS)/swtpc09.o \ $(MESS_MACHINE)/swtpc09.o \ $(MESSOBJ)/synertec.a: \ diff --git a/src/mess/video/a7800.c b/src/mess/video/a7800.c index 146ce764ad2..afe40687431 100644 --- a/src/mess/video/a7800.c +++ b/src/mess/video/a7800.c @@ -4,7 +4,7 @@ Routines to control the Atari 7800 video hardware - 2014-03-24 Mike Saarna Fixed DMA regarding startup, shutdown and + 2014-03-24 Mike Saarna Fixed DMA regarding startup, shutdown and cycle stealing. 2013-05-08 huygens rewrite to emulate line ram buffers (mostly fixes Kung-Fu Master @@ -126,11 +126,11 @@ void a7800_state::maria_draw_scanline() int x, d, c, i, pixel_cell, cells; int maria_cycles; - if ( m_maria_offset == 0 ) - maria_cycles = 5+21; // DMA startup + last line shutdown - else - maria_cycles = 5+16; // DMA startup + other line shutdown - + if ( m_maria_offset == 0 ) + maria_cycles = 5+21; // DMA startup + last line shutdown + else + maria_cycles = 5+16; // DMA startup + other line shutdown + cells = 0; /* Process this DLL entry */ @@ -202,9 +202,9 @@ void a7800_state::maria_draw_scanline() } } } - // spin the CPU for Maria DMA, if it's not already spinning for WSYNC - if ( ! m_maria_wsync ) - m_maincpu->spin_until_time(m_maincpu->cycles_to_attotime(maria_cycles/4)); // Maria clock rate is 4 times that of the CPU + // spin the CPU for Maria DMA, if it's not already spinning for WSYNC + if ( ! m_maria_wsync ) + m_maincpu->spin_until_time(m_maincpu->cycles_to_attotime(maria_cycles/4)); // Maria clock rate is 4 times that of the CPU // draw line buffer to screen m_active_buffer = !m_active_buffer; // switch buffers diff --git a/src/mess/video/abc80.c b/src/mess/video/abc80.c index c282fbf41dd..681bfc88b81 100644 --- a/src/mess/video/abc80.c +++ b/src/mess/video/abc80.c @@ -203,7 +203,7 @@ MACHINE_CONFIG_FRAGMENT( abc80_video ) MCFG_SCREEN_UPDATE_DRIVER(abc80_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_11_9808MHz/2, ABC80_HTOTAL, ABC80_HBEND, ABC80_HBSTART, ABC80_VTOTAL, ABC80_VBEND, ABC80_VBSTART) - + MCFG_GFXDECODE_ADD("gfxdecode", "palette", abc80) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") MACHINE_CONFIG_END diff --git a/src/mess/video/abc800.c b/src/mess/video/abc800.c index 799c19eac49..bceb3d57eb2 100644 --- a/src/mess/video/abc800.c +++ b/src/mess/video/abc800.c @@ -71,7 +71,7 @@ offs_t abc800c_state::translate_trom_offset(offs_t offset) void abc800c_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) { const pen_t *pen = m_palette->pens(); - + UINT16 addr = 0; for (int y = m_hrs; y < MIN(cliprect.max_y + 1, m_hrs + 480); y += 2) @@ -201,7 +201,7 @@ MACHINE_CONFIG_END void abc800m_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) { UINT16 addr = 0; - + const pen_t *pen = m_palette->pens(); for (int y = m_hrs + VERTICAL_PORCH_HACK; y < MIN(cliprect.max_y + 1, m_hrs + VERTICAL_PORCH_HACK + 240); y++) diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c index 41608fe2c80..44f5dad8095 100644 --- a/src/mess/video/apollo.c +++ b/src/mess/video/apollo.c @@ -1725,7 +1725,6 @@ apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const cha m_lut_fifo(NULL), m_bt458(NULL) { - } apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const char *tag, device_t *owner, UINT32 clock, device_type type,const char *name, const char *shortname, const char *source) : @@ -1884,7 +1883,7 @@ void apollo_graphics_15i::device_reset() memset(m_image_memory, 0, m_image_memory_size * 2); // register_vblank_callback(this); - + /* FIXME: register for VBLANK callbacks */ register_vblank_callback(); } @@ -1960,7 +1959,7 @@ void apollo_graphics_19i::device_reset() READ16_MEMBER( apollo_graphics_15i::apollo_mgm_r ) -{ +{ if (is_mono()) { return apollo_mem_r(space, offset, mem_mask); diff --git a/src/mess/video/apple3.c b/src/mess/video/apple3.c index 6fd638c748a..2062ac4896e 100644 --- a/src/mess/video/apple3.c +++ b/src/mess/video/apple3.c @@ -19,7 +19,7 @@ #define DKGRAY 5 #define BLUE 6 #define LTBLUE 7 -#define BROWN 8 +#define BROWN 8 #define ORANGE 9 #define GRAY 10 #define PINK 11 @@ -411,7 +411,7 @@ void apple3_state::apple3_video_graphics_chires(bitmap_ind16 &bitmap) UINT32 apple3_state::screen_update_apple3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { -// printf("gfx mode %x\n", m_flags & (VAR_VM3|VAR_VM1|VAR_VM0)); +// printf("gfx mode %x\n", m_flags & (VAR_VM3|VAR_VM1|VAR_VM0)); switch(m_flags & (VAR_VM3|VAR_VM1|VAR_VM0)) { diff --git a/src/mess/video/gb_lcd.c b/src/mess/video/gb_lcd.c index e26434d08fe..55dcfe7a9f2 100644 --- a/src/mess/video/gb_lcd.c +++ b/src/mess/video/gb_lcd.c @@ -1166,7 +1166,7 @@ void cgb_lcd_device::update_sprites() { data = *((UINT16 *) &m_vram[((oam[3] & 0x8)<<10) + (oam[2] & tilemask) * 16 + (line - oam[0]) * 2]); } - + data = LITTLE_ENDIANIZE_INT16(data); switch (oam[3] & 0xA0) diff --git a/src/mess/video/gime.h b/src/mess/video/gime.h index bdc00cdba43..64006270c3a 100644 --- a/src/mess/video/gime.h +++ b/src/mess/video/gime.h @@ -21,9 +21,9 @@ // GIME CONFIG/INTERFACE //************************************************************************** -#define MCFG_GIME_HSYNC_CALLBACK MCFG_MC6847_HSYNC_CALLBACK +#define MCFG_GIME_HSYNC_CALLBACK MCFG_MC6847_HSYNC_CALLBACK -#define MCFG_GIME_FSYNC_CALLBACK MCFG_MC6847_FSYNC_CALLBACK +#define MCFG_GIME_FSYNC_CALLBACK MCFG_MC6847_FSYNC_CALLBACK #define MCFG_GIME_IRQ_CALLBACK(_write) \ devcb = &gime_base_device::set_irq_wr_callback(*device, DEVCB2_##_write); diff --git a/src/mess/video/intv.c b/src/mess/video/intv.c index cd418092c03..12bede1db5a 100644 --- a/src/mess/video/intv.c +++ b/src/mess/video/intv.c @@ -82,7 +82,7 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi for(x=0;x<40;x++) { offs = current_row*64+x; - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, videoram[offs], 7, /* white */ @@ -93,7 +93,7 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi { /* draw the cursor as a solid white block */ /* (should use a filled rect here!) */ - + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 191, /* a block */ 7, /* white */ diff --git a/src/mess/video/mikromik.c b/src/mess/video/mikromik.c index 428ee4e438d..5799837ed8b 100644 --- a/src/mess/video/mikromik.c +++ b/src/mess/video/mikromik.c @@ -121,6 +121,6 @@ MACHINE_CONFIG_FRAGMENT( mm1m6_video ) MCFG_DEVICE_ADD(UPD7220_TAG, UPD7220, XTAL_18_720MHz/8) MCFG_DEVICE_ADDRESS_MAP(AS_0, mm1_upd7220_map) - MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(mm1_state, hgdc_display_pixels) + MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(mm1_state, hgdc_display_pixels) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) MACHINE_CONFIG_END diff --git a/src/mess/video/nascom1.c b/src/mess/video/nascom1.c index 1a2356d3654..89a992f6062 100644 --- a/src/mess/video/nascom1.c +++ b/src/mess/video/nascom1.c @@ -16,7 +16,6 @@ UINT32 nascom1_state::screen_update_nascom1(screen_device &screen, bitmap_ind16 for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x03ca + sx], 1, 0, 0, sx * 8, 0); } @@ -25,7 +24,6 @@ UINT32 nascom1_state::screen_update_nascom1(screen_device &screen, bitmap_ind16 { for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x000a + (sy * 64) + sx], 1, 0, 0, sx * 8, (sy + 1) * 16); } @@ -40,7 +38,6 @@ UINT32 nascom1_state::screen_update_nascom2(screen_device &screen, bitmap_ind16 for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x03ca + sx], 1, 0, 0, sx * 8, 0); } @@ -49,7 +46,6 @@ UINT32 nascom1_state::screen_update_nascom2(screen_device &screen, bitmap_ind16 { for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x000a + (sy * 64) + sx], 1, 0, 0, sx * 8, (sy + 1) * 14); } diff --git a/src/mess/video/osi.c b/src/mess/video/osi.c index 3125460f18b..6c4ec0d96ce 100644 --- a/src/mess/video/osi.c +++ b/src/mess/video/osi.c @@ -158,7 +158,7 @@ MACHINE_CONFIG_FRAGMENT( uk101_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DRIVER(uk101_state, screen_update) - MCFG_SCREEN_SIZE(64*8, 16*16) + MCFG_SCREEN_SIZE(64*8, 16*16) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*16-1) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mess/video/pc1251.c b/src/mess/video/pc1251.c index 1bf93ac97bd..e10531dffc3 100644 --- a/src/mess/video/pc1251.c +++ b/src/mess/video/pc1251.c @@ -4,11 +4,11 @@ #include "includes/pc1251.h" static const POCKETC_FIGURE /*busy={ - "11 1 1 11 1 1", - "1 1 1 1 1 1 1", - "11 1 1 1 1 1", - "1 1 1 1 1 1", - "11 1 11 1e" + "11 1 1 11 1 1", + "1 1 1 1 1 1 1", + "11 1 1 1 1 1", + "1 1 1 1 1 1", + "11 1 11 1e" },*/ def={ "11 111 111", "1 1 1 1", @@ -22,11 +22,11 @@ static const POCKETC_FIGURE /*busy={ " 1 1 1 1 1 1", "11 1 1 1 1 1e" }, /*hyp={ - "1 1 1 1 11", - "1 1 1 1 1 1", - "111 1 1 11", - "1 1 1 1", - "1 1 1 1e" + "1 1 1 1 11", + "1 1 1 1 1 1", + "111 1 1 11", + "1 1 1 1", + "1 1 1 1e" },*/ de={ "11 111", "1 1 1", @@ -46,23 +46,23 @@ static const POCKETC_FIGURE /*busy={ "1 1 1 1 1 1", "1 1 1 1 11e" }, /*braces={ - " 1 1", - "1 1", - "1 1", - "1 1", - " 1 1e" + " 1 1", + "1 1", + "1 1", + "1 1", + " 1 1e" }, m={ - "1 1", - "11 11", - "1 1 1", - "1 1", - "1 1e" + "1 1", + "11 11", + "1 1 1", + "1 1", + "1 1e" }, e={ - "111", - "1", - "111", - "1", - "111e" + "111", + "1", + "111", + "1", + "111e" },*/ run={ "11 1 1 1 1", "1 1 1 1 11 1", @@ -76,17 +76,17 @@ static const POCKETC_FIGURE /*busy={ "1 1 1 1 1", "1 1 1 1e" }, /*japan={ - " 1 1 11 1 1 1", - " 1 1 1 1 1 1 1 11 1", - " 1 111 11 111 1 11", - "1 1 1 1 1 1 1 1 1", - " 1 1 1 1 1 1 1 1e" + " 1 1 11 1 1 1", + " 1 1 1 1 1 1 1 11 1", + " 1 111 11 111 1 11", + "1 1 1 1 1 1 1 1 1", + " 1 1 1 1 1 1 1 1e" }, sml={ - " 11 1 1 1", - "1 111 1", - " 1 1 1 1", - " 1 1 1 1", - "11 1 1 111e" + " 11 1 1 1", + "1 111 1", + " 1 1 1 1", + " 1 1 1 1", + "11 1 1 111e" },*/ rsv={ "11 11 1 1", "1 1 1 1 1", diff --git a/src/mess/video/pc1350.c b/src/mess/video/pc1350.c index ae1dd3ace1a..c6c8ff695fc 100644 --- a/src/mess/video/pc1350.c +++ b/src/mess/video/pc1350.c @@ -4,11 +4,11 @@ #include "includes/pc1350.h" static const POCKETC_FIGURE /*busy={ - "11 1 1 11 1 1", - "1 1 1 1 1 1 1", - "11 1 1 1 1 1", - "1 1 1 1 1 1", - "11 1 11 1e" + "11 1 1 11 1 1", + "1 1 1 1 1 1 1", + "11 1 1 1 1 1", + "1 1 1 1 1 1", + "11 1 11 1e" },*/ def={ "11 111 111", "1 1 1 1", @@ -22,47 +22,47 @@ static const POCKETC_FIGURE /*busy={ " 1 1 1 1 1 1", "11 1 1 1 1 1e" }, /*hyp={ - "1 1 1 1 11", - "1 1 1 1 1 1", - "111 1 1 11", - "1 1 1 1", - "1 1 1 1e" + "1 1 1 1 11", + "1 1 1 1 1 1", + "111 1 1 11", + "1 1 1 1", + "1 1 1 1e" }, de={ - "11 111", - "1 1 1", - "1 1 111", - "1 1 1", - "11 111e" + "11 111", + "1 1 1", + "1 1 111", + "1 1 1", + "11 111e" }, g={ - " 11", - "1", - "1 1", - "1 1", - " 11e" + " 11", + "1", + "1 1", + "1 1", + " 11e" }, rad={ - "11 1 11", - "1 1 1 1 1 1", - "11 111 1 1", - "1 1 1 1 1 1", - "1 1 1 1 11e" + "11 1 11", + "1 1 1 1 1 1", + "11 111 1 1", + "1 1 1 1 1 1", + "1 1 1 1 11e" }, braces={ - " 1 1", - "1 1", - "1 1", - "1 1", - " 1 1e" + " 1 1", + "1 1", + "1 1", + "1 1", + " 1 1e" }, m={ - "1 1", - "11 11", - "1 1 1", - "1 1", - "1 1e" + "1 1", + "11 11", + "1 1 1", + "1 1", + "1 1e" }, e={ - "111", - "1", - "111", - "1", - "111e" + "111", + "1", + "111", + "1", + "111e" },*/ run={ "11 1 1 1 1", "1 1 1 1 11 1", @@ -88,11 +88,11 @@ static const POCKETC_FIGURE /*busy={ " 1 1 1 1", "11 1 1 111e" }/*, rsv={ - "11 11 1 1", - "1 1 1 1 1", - "11 1 1 1", - "1 1 1 1 1", - "1 1 11 1e" + "11 11 1 1", + "1 1 1 1 1", + "11 1 1 1", + "1 1 1 1 1", + "1 1 11 1e" }*/; READ8_MEMBER(pc1350_state::pc1350_lcd_read) diff --git a/src/mess/video/pc1401.c b/src/mess/video/pc1401.c index 4a8f088f1e4..3f908ead1ff 100644 --- a/src/mess/video/pc1401.c +++ b/src/mess/video/pc1401.c @@ -93,35 +93,35 @@ static const POCKETC_FIGURE busy={ "1", "111e" }/*, run={ - "11 1 1 1 1", - "1 1 1 1 11 1", - "11 1 1 1 11", - "1 1 1 1 1 1", - "1 1 1 1 1e" + "11 1 1 1 1", + "1 1 1 1 11 1", + "11 1 1 1 11", + "1 1 1 1 1 1", + "1 1 1 1 1e" }, pro={ - "11 11 1 ", - "1 1 1 1 1 1", - "11 11 1 1", - "1 1 1 1 1", - "1 1 1 1e" + "11 11 1 ", + "1 1 1 1 1 1", + "11 11 1 1", + "1 1 1 1 1", + "1 1 1 1e" }, japan={ - " 1 1 11 1 1 1", - " 1 1 1 1 1 1 1 11 1", - " 1 111 11 111 1 11", - "1 1 1 1 1 1 1 1 1", - " 1 1 1 1 1 1 1 1e" + " 1 1 11 1 1 1", + " 1 1 1 1 1 1 1 11 1", + " 1 111 11 111 1 11", + "1 1 1 1 1 1 1 1 1", + " 1 1 1 1 1 1 1 1e" }, sml={ - " 11 1 1 1", - "1 111 1", - " 1 1 1 1", - " 1 1 1 1", - "11 1 1 111e" + " 11 1 1 1", + "1 111 1", + " 1 1 1 1", + " 1 1 1 1", + "11 1 1 111e" }, rsv={ - "11 11 1 1", - "1 1 1 1 1", - "11 1 1 1", - "1 1 1 1 1", - "1 1 11 1e" + "11 11 1 1", + "1 1 1 1 1", + "11 1 1 1", + "1 1 1 1 1", + "1 1 11 1e" }*/; #define DOWN 57 diff --git a/src/mess/video/tmc600.c b/src/mess/video/tmc600.c index 1bca0a5eb42..9001b7e0948 100644 --- a/src/mess/video/tmc600.c +++ b/src/mess/video/tmc600.c @@ -127,7 +127,7 @@ MACHINE_CONFIG_FRAGMENT( tmc600_video ) // video hardware MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, CDP1869_DOT_CLK_PAL) MCFG_TIMER_DRIVER_ADD_PERIODIC("blink", tmc600_state, blink_tick, attotime::from_hz(2)) - + MCFG_GFXDECODE_ADD("gfxdecode", CDP1869_TAG":palette", tmc600) // sound hardware @@ -135,7 +135,7 @@ MACHINE_CONFIG_FRAGMENT( tmc600_video ) MCFG_CDP1869_ADD(CDP1869_TAG, CDP1869_DOT_CLK_PAL, cdp1869_page_ram) MCFG_CDP1869_COLOR_CLOCK(CDP1869_COLOR_CLK_PAL) MCFG_CDP1869_CHAR_PCB_READ_OWNER(tmc600_state, tmc600_pcb_r) - MCFG_CDP1869_CHAR_RAM_READ_OWNER(tmc600_state, tmc600_char_ram_r) + MCFG_CDP1869_CHAR_RAM_READ_OWNER(tmc600_state, tmc600_char_ram_r) MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END diff --git a/src/mess/video/v1050.c b/src/mess/video/v1050.c index 930f2d0ea95..1e357e9aeae 100644 --- a/src/mess/video/v1050.c +++ b/src/mess/video/v1050.c @@ -132,6 +132,6 @@ MACHINE_CONFIG_FRAGMENT( v1050_video ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(640, 400) MCFG_SCREEN_VISIBLE_AREA(0,640-1, 0, 400-1) - + MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") MACHINE_CONFIG_END diff --git a/src/mess/video/vtvideo.c b/src/mess/video/vtvideo.c index fd880f163d1..6c198165d9a 100644 --- a/src/mess/video/vtvideo.c +++ b/src/mess/video/vtvideo.c @@ -10,7 +10,7 @@ ---------------------------------- - TESTS REQUIRED : do line and character attributes (plus combinations) match real hardware? - - JUMPY SOFT SCROLL : Soft scroll *should* be synced with beam or DMA (line linking/unlinking is done during VBI, in less than 550ms). + - JUMPY SOFT SCROLL : Soft scroll *should* be synced with beam or DMA (line linking/unlinking is done during VBI, in less than 550ms). See 4.7.4 and up in VT manual. - UNDOCUMENTED FEATURES of DC011 / DC012 (CLUES WANTED) @@ -253,7 +253,7 @@ WRITE8_MEMBER( vt100_video_device::dc012_w ) // set higher part scroll m_scroll_latch = (m_scroll_latch & 0x03) | ((data & 0x03) << 2); - m_scroll_latch_valid = 1; // MSB is written last. + m_scroll_latch_valid = 1; // MSB is written last. } } else @@ -570,35 +570,35 @@ void rainbow_video_device::display_char(bitmap_ind16 &bitmap, UINT8 code, int x, // Offset to bitmap in char-rom (used later below) int i = scan_line; - // Affects 'i' / 'y_preset' / 'scan_line' (= LOOP VARIABLE) - if ( m_scroll_latch_valid == 1) - { - // **** START IF SCROLL REGION: - if ( (old_scroll_region == 0) && (scroll_region == 1) ) - { + // Affects 'i' / 'y_preset' / 'scan_line' (= LOOP VARIABLE) + if ( m_scroll_latch_valid == 1) + { + // **** START IF SCROLL REGION: + if ( (old_scroll_region == 0) && (scroll_region == 1) ) + { if (scan_line == 0) // * EXECUTED ONCE * - { - scan_line = m_scroll_latch; // write less lines ! SIDE EFFECT ON LOOP ! + { + scan_line = m_scroll_latch; // write less lines ! SIDE EFFECT ON LOOP ! i = m_scroll_latch; // set hard offset to char-rom } - } - - // **** MIDDLE OF REGION: - if ( (old_scroll_region == 1) && (scroll_region == 1) ) - { - if ( ( y * 10 + scan_line - m_scroll_latch ) >= 0 ) - y_preset = y * 10 + scan_line - m_scroll_latch; - } - - // **** END OF SCROLL REGION: - if ( (old_scroll_region == 1) && (scroll_region == 0) ) - { + } + + // **** MIDDLE OF REGION: + if ( (old_scroll_region == 1) && (scroll_region == 1) ) + { + if ( ( y * 10 + scan_line - m_scroll_latch ) >= 0 ) + y_preset = y * 10 + scan_line - m_scroll_latch; + } + + // **** END OF SCROLL REGION: + if ( (old_scroll_region == 1) && (scroll_region == 0) ) + { if (i > (9 - m_scroll_latch) ) - { old_scroll_region = m_scroll_latch_valid; // keep track - return; // WHAT HAPPENS WITH THE REST OF THE LINE (BLANK ?) + { old_scroll_region = m_scroll_latch_valid; // keep track + return; // WHAT HAPPENS WITH THE REST OF THE LINE (BLANK ?) + } } - } - } // (IF) scroll latch valid + } // (IF) scroll latch valid switch (display_type) { diff --git a/src/mess/video/vtvideo.h b/src/mess/video/vtvideo.h index 5e3fc375f3e..dab107d58ae 100644 --- a/src/mess/video/vtvideo.h +++ b/src/mess/video/vtvideo.h @@ -115,7 +115,7 @@ extern const device_type RAINBOW_VIDEO; MCFG_DEVICE_ADD(_tag, RAINBOW_VIDEO, 0) \ MCFG_DEVICE_CONFIG(_intrf) \ MCFG_VIDEO_SET_SCREEN(_screen_tag) - + #endif diff --git a/src/mess/video/zx8301.h b/src/mess/video/zx8301.h index 21ed54a861a..2211b83e811 100644 --- a/src/mess/video/zx8301.h +++ b/src/mess/video/zx8301.h @@ -103,7 +103,7 @@ private: required_device m_cpu; devcb2_write_line m_write_vsync; - + //address_space *m_data; int m_dispoff; // display off diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index f87c863b16b..fc0d7d05d5c 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -113,9 +113,9 @@ __extension__ typedef signed long long INT64; /* pointer-sized values */ #ifdef PTR64 -typedef UINT64 FPTR; +typedef UINT64 FPTR; #else -typedef UINT32 FPTR; +typedef UINT32 FPTR; #endif diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h index 89aae9c1744..f5b9756120a 100644 --- a/src/osd/osdcore.h +++ b/src/osd/osdcore.h @@ -848,7 +848,7 @@ char *osd_get_clipboard_text(void); an allocated pointer to an osd_directory_entry representing info on the path; even if the file does not exist. - free with osd_free() + free with osd_free() -----------------------------------------------------------------------------*/ osd_directory_entry *osd_stat(const char *path); diff --git a/src/osd/sdl/blit13.h b/src/osd/sdl/blit13.h index 56cebafdb0c..e415a81dbd0 100644 --- a/src/osd/sdl/blit13.h +++ b/src/osd/sdl/blit13.h @@ -54,8 +54,8 @@ INLINE UINT32 pixel_ycc_to_rgb_pal(UINT16 *pixel, const rgb_t *palette) #define OP_RGB32PAL_ARGB32(_src) \ (texsource->palette[0x200 + (((_src) >> 16) & 0xff) ] | \ - texsource->palette[0x100 + (((_src) >> 8) & 0xff) ] | \ - texsource->palette[((_src) & 0xff) ] | 0xff000000) + texsource->palette[0x100 + (((_src) >> 8) & 0xff) ] | \ + texsource->palette[((_src) & 0xff) ] | 0xff000000) #define OP_PAL16_ARGB32(_src) (0xff000000 | texsource->palette[_src]) diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c index c3ad0966b68..22a92b56cfb 100644 --- a/src/osd/sdl/drawogl.c +++ b/src/osd/sdl/drawogl.c @@ -3091,4 +3091,3 @@ static void drawogl_window_clear(sdl_window_info *window) //FIXME: Handled in drawogl_window_draw as well sdl->blittimer = 3; } - diff --git a/src/osd/sdl/gl_shader_mgr.c b/src/osd/sdl/gl_shader_mgr.c index 7aa162973ae..1222c6def67 100644 --- a/src/osd/sdl/gl_shader_mgr.c +++ b/src/osd/sdl/gl_shader_mgr.c @@ -68,8 +68,8 @@ static int glsl_mamebm_fsh2vsh[GLSL_SHADER_FEAT_MAX_NUMBER] = }; static GLhandleARB glsl_mamebm_vsh_shader[GLSL_VERTEX_SHADER_MAX_NUMBER+9] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* general, custom0-9 */ static GLhandleARB glsl_mamebm_fsh_shader [GLSL_SHADER_FEAT_MAX_NUMBER+9] = @@ -83,13 +83,13 @@ static GLhandleARB glsl_scrn_programs [10] = }; static GLhandleARB glsl_scrn_vsh_shader[10] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* custom0-9 */ static GLhandleARB glsl_scrn_fsh_shader [10] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* rgb32: custom0-9 */ const char * glsl_shader_get_filter_name_mamebm(int glslShaderFeature) diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c index dad813d92f1..e4c2054ba3d 100644 --- a/src/osd/sdl/window.c +++ b/src/osd/sdl/window.c @@ -620,14 +620,14 @@ static void sdlwindow_update_cursor_state(running_machine &machine, sdl_window_i SDL_ShowCursor(SDL_ENABLE); if (SDL_GetWindowGrab(window->sdl_window )) SDL_SetWindowGrab(window->sdl_window, SDL_FALSE); - SDL_SetRelativeMouseMode(SDL_FALSE); + SDL_SetRelativeMouseMode(SDL_FALSE); } else { SDL_ShowCursor(SDL_DISABLE); if (!SDL_GetWindowGrab(window->sdl_window)) SDL_SetWindowGrab(window->sdl_window, SDL_TRUE); - SDL_SetRelativeMouseMode(SDL_TRUE); + SDL_SetRelativeMouseMode(SDL_TRUE); } SDL_SetCursor(NULL); // Force an update in case the underlying driver has changed visibility } diff --git a/src/tools/nltool.c b/src/tools/nltool.c index 5c86cace00a..2a3e68339da 100644 --- a/src/tools/nltool.c +++ b/src/tools/nltool.c @@ -59,16 +59,16 @@ void free_file_line( void *memory, const char *file, int line ) void CLIB_DECL logerror(const char *format, ...) { - va_list arg; - va_start(arg, format); - vprintf(format, arg); - va_end(arg); + va_list arg; + va_start(arg, format); + vprintf(format, arg); + va_end(arg); } struct options_entry oplist[] = { { "time_to_run;t", "1.0", OPTION_FLOAT, "time to run the emulation (seconds)" }, - { "logs;l", "", OPTION_STRING, "colon separated list of terminals to log" }, + { "logs;l", "", OPTION_STRING, "colon separated list of terminals to log" }, { "f", "-", OPTION_STRING, "file to process (default is stdin)" }, { "listdevices;ld", "", OPTION_BOOLEAN, "list all devices available for use" }, { "help;h", "0", OPTION_BOOLEAN, "display help" }, @@ -123,20 +123,19 @@ public: void init() { - m_setup = new netlist_setup_t(*this); - this->init_object(*this, "netlist"); - m_setup->init(); + m_setup = new netlist_setup_t(*this); + this->init_object(*this, "netlist"); + m_setup->init(); } - void read_netlist(const char *buffer) - { - + void read_netlist(const char *buffer) + { // read the netlist ... - netlist_sources_t sources; + netlist_sources_t sources; - sources.add(netlist_source_t(buffer)); - sources.parse(*m_setup,""); + sources.add(netlist_source_t(buffer)); + sources.parse(*m_setup,""); //m_setup->parse(buffer); log_setup(); @@ -147,37 +146,37 @@ public: this->reset(); } - void log_setup() - { - NL_VERBOSE_OUT(("Creating dynamic logs ...\n")); - nl_util::pstring_list ll = nl_util::split(m_logs, ":"); - for (int i=0; i < ll.count(); i++) - { - netlist_device_t *nc = m_setup->factory().new_device_by_classname("nld_log", *m_setup); - pstring name = "log_" + ll[i]; - m_setup->register_dev(nc, name); - m_setup->register_link(name + ".I", ll[i]); - } - } - - pstring m_logs; + void log_setup() + { + NL_VERBOSE_OUT(("Creating dynamic logs ...\n")); + nl_util::pstring_list ll = nl_util::split(m_logs, ":"); + for (int i=0; i < ll.count(); i++) + { + netlist_device_t *nc = m_setup->factory().new_device_by_classname("nld_log", *m_setup); + pstring name = "log_" + ll[i]; + m_setup->register_dev(nc, name); + m_setup->register_link(name + ".I", ll[i]); + } + } + + pstring m_logs; protected: void verror(const loglevel_e level, const char *format, va_list ap) const { - switch (level) - { - case NL_LOG: - case NL_WARNING: - vprintf(format, ap); - printf("\n"); - break; - case NL_ERROR: - vprintf(format, ap); - printf("\n"); - throw; - break; - } + switch (level) + { + case NL_LOG: + case NL_WARNING: + vprintf(format, ap); + printf("\n"); + break; + case NL_ERROR: + vprintf(format, ap); + printf("\n"); + throw; + break; + } } private: @@ -200,71 +199,71 @@ void usage(core_options &opts) static void run(core_options &opts) { - netlist_tool_t nt; - osd_ticks_t t = osd_ticks(); + netlist_tool_t nt; + osd_ticks_t t = osd_ticks(); - nt.init(); - nt.m_logs = opts.value("l"); - nt.read_netlist(filetobuf(opts.value("f"))); - double ttr = opts.float_value("t"); + nt.init(); + nt.m_logs = opts.value("l"); + nt.read_netlist(filetobuf(opts.value("f"))); + double ttr = opts.float_value("t"); - printf("startup time ==> %5.3f\n", (double) (osd_ticks() - t) / (double) osd_ticks_per_second() ); - printf("runnning ...\n"); - t = osd_ticks(); + printf("startup time ==> %5.3f\n", (double) (osd_ticks() - t) / (double) osd_ticks_per_second() ); + printf("runnning ...\n"); + t = osd_ticks(); - nt.process_queue(netlist_time::from_double(ttr)); + nt.process_queue(netlist_time::from_double(ttr)); - double emutime = (double) (osd_ticks() - t) / (double) osd_ticks_per_second(); - printf("%f seconds emulation took %f real time ==> %5.2f%%\n", ttr, emutime, ttr/emutime*100.0); + double emutime = (double) (osd_ticks() - t) / (double) osd_ticks_per_second(); + printf("%f seconds emulation took %f real time ==> %5.2f%%\n", ttr, emutime, ttr/emutime*100.0); } static void listdevices() { - netlist_tool_t nt; - nt.init(); - const netlist_factory_t::list_t &list = nt.setup().factory().list(); - - nt.setup().start_devices(); - nt.setup().resolve_inputs(); - - for (int i=0; i < list.count(); i++) - { - pstring out = pstring::sprintf("%-20s %s(", list[i]->classname().cstr(), - list[i]->name().cstr() ); - pstring terms(""); - - net_device_t_base_factory *f = list[i]; - netlist_device_t *d = f->Create(); - d->init(nt, pstring::sprintf("dummy%d", i)); - d->start_dev(); - - // get the list of terminals ... - for (int j=0; j < d->m_terminals.count(); j++) - { - pstring inp = d->m_terminals[j]; - if (inp.startsWith(d->name() + ".")) - inp = inp.substr(d->name().len() + 1); - terms += "," + inp; - } - - if (list[i]->param_desc().startsWith("+")) - { - out += "," + list[i]->param_desc().substr(1); - terms = ""; - } - else if (list[i]->param_desc() == "-") - { - /* no params at all */ - } - else - { - out += "," + list[i]->param_desc(); - } - out += ")"; - printf("%s\n", out.cstr()); - if (terms != "") - printf("Terminals: %s\n", terms.substr(1).cstr()); - } + netlist_tool_t nt; + nt.init(); + const netlist_factory_t::list_t &list = nt.setup().factory().list(); + + nt.setup().start_devices(); + nt.setup().resolve_inputs(); + + for (int i=0; i < list.count(); i++) + { + pstring out = pstring::sprintf("%-20s %s(", list[i]->classname().cstr(), + list[i]->name().cstr() ); + pstring terms(""); + + net_device_t_base_factory *f = list[i]; + netlist_device_t *d = f->Create(); + d->init(nt, pstring::sprintf("dummy%d", i)); + d->start_dev(); + + // get the list of terminals ... + for (int j=0; j < d->m_terminals.count(); j++) + { + pstring inp = d->m_terminals[j]; + if (inp.startsWith(d->name() + ".")) + inp = inp.substr(d->name().len() + 1); + terms += "," + inp; + } + + if (list[i]->param_desc().startsWith("+")) + { + out += "," + list[i]->param_desc().substr(1); + terms = ""; + } + else if (list[i]->param_desc() == "-") + { + /* no params at all */ + } + else + { + out += "," + list[i]->param_desc(); + } + out += ")"; + printf("%s\n", out.cstr()); + if (terms != "") + printf("Terminals: %s\n", terms.substr(1).cstr()); + } } /*------------------------------------------------- @@ -291,14 +290,14 @@ int main(int argc, char *argv[]) return 1; } - if (opts.bool_value("ld")) - { - listdevices(); - } - else - { - run(opts); - } + if (opts.bool_value("ld")) + { + listdevices(); + } + else + { + run(opts); + } return 0; } diff --git a/src/tools/srcclean.c b/src/tools/srcclean.c index 5ac248e330d..d0cbb6da0ab 100644 --- a/src/tools/srcclean.c +++ b/src/tools/srcclean.c @@ -33,20 +33,20 @@ static UINT8 modified[MAX_FILE_SIZE]; static int le_convert(char *buffer, int size) { - char *pos; - char *end = buffer + size; - - /* brute force */ - *end = 0; - pos = strchr(buffer, 0x0d); - while (pos != NULL) - { - memmove(pos, pos+1,end - pos + 1); - size--; - buffer = pos + 1; - pos = strchr(buffer, 0x0d); - } - return size; + char *pos; + char *end = buffer + size; + + /* brute force */ + *end = 0; + pos = strchr(buffer, 0x0d); + while (pos != NULL) + { + memmove(pos, pos+1,end - pos + 1); + size--; + buffer = pos + 1; + pos = strchr(buffer, 0x0d); + } + return size; } /*************************************************************************** @@ -55,12 +55,12 @@ static int le_convert(char *buffer, int size) int main(int argc, char *argv[]) { - bool unix_le = false; + bool unix_le = false; int removed_tabs = 0; int added_tabs = 0; int removed_spaces = 0; int removed_continuations = 0; - int fixed_dos_style = 0; + int fixed_dos_style = 0; int fixed_mac_style = 0; int fixed_nix_style = 0; int added_newline = 0; @@ -85,29 +85,29 @@ int main(int argc, char *argv[]) bool dry_run = false; while (arg_found && argc > 1) { - if (strcmp(argv[1], "-u") == 0) - { - unix_le = true; - argc--; - argv++; - } - else if (strcmp(argv[1], "-d") == 0) - { - dry_run = true; - argc--; - argv++; - } - else - arg_found = false; + if (strcmp(argv[1], "-u") == 0) + { + unix_le = true; + argc--; + argv++; + } + else if (strcmp(argv[1], "-d") == 0) + { + dry_run = true; + argc--; + argv++; + } + else + arg_found = false; } - /* print usage info */ - if (argc < 2) - { - printf("Usage:\nsrcclean [-u] [-d] \n"); - return 0; - } + /* print usage info */ + if (argc < 2) + { + printf("Usage:\nsrcclean [-u] [-d] \n"); + return 0; + } /* read the file */ file = fopen(argv[1], "rb"); @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) /* check whether we have dos line endings and are in unix mode */ if (unix_le && (strchr((char *) original, 0x0d) != NULL)) - fixed_dos_style = 1; + fixed_dos_style = 1; /* determine if we are a C file */ ext = strrchr(argv[1], '.'); @@ -245,13 +245,13 @@ int main(int argc, char *argv[]) } /* insert a proper CR/LF */ - modified[dst++] = 0x0d; + modified[dst++] = 0x0d; modified[dst++] = 0x0a; col = 0; /* skip over any LF in the source file */ if (ch == 0x0d && original[src] == 0x0a) - src++; + src++; else if (ch == 0x0a) fixed_nix_style = 1; else @@ -367,10 +367,10 @@ int main(int argc, char *argv[]) } } - /* convert to unix_le if requested */ + /* convert to unix_le if requested */ - if (unix_le) - dst = le_convert((char *) modified, dst); + if (unix_le) + dst = le_convert((char *) modified, dst); /* if the result == original, skip it */ if (dst != bytes || memcmp(original, modified, bytes)) @@ -386,15 +386,15 @@ int main(int argc, char *argv[]) if (hichars) printf(" fixed %d high-ASCII char(s)", hichars); if (fixed_nix_style && !unix_le) printf(" fixed *nix-style line-ends"); if (fixed_mac_style) printf(" fixed Mac-style line-ends"); - if (fixed_dos_style) printf(" fixed Dos-style line-ends"); + if (fixed_dos_style) printf(" fixed Dos-style line-ends"); printf("\n"); if (!dry_run) { - /* write the file */ - file = fopen(argv[1], "wb"); - fwrite(modified, 1, dst, file); - fclose(file); + /* write the file */ + file = fopen(argv[1], "wb"); + fwrite(modified, 1, dst, file); + fclose(file); } } diff --git a/src/tools/unidasm.c b/src/tools/unidasm.c index d3d4bd04d6f..ffb6ceaa84f 100644 --- a/src/tools/unidasm.c +++ b/src/tools/unidasm.c @@ -231,9 +231,9 @@ static const dasm_table_entry dasm_table[] = { "f8", _8bit, 0, CPU_DISASSEMBLE_NAME(f8) }, { "g65816", _8bit, 0, CPU_DISASSEMBLE_NAME(g65816_generic) }, { "h6280", _8bit, 0, CPU_DISASSEMBLE_NAME(h6280) }, - // { "h8", _16be, 0, CPU_DISASSEMBLE_NAME(h8) }, - // { "h8_24", _16be, 0, CPU_DISASSEMBLE_NAME(h8_24) }, - // { "h8_32", _16be, 0, CPU_DISASSEMBLE_NAME(h8_32) }, + // { "h8", _16be, 0, CPU_DISASSEMBLE_NAME(h8) }, + // { "h8_24", _16be, 0, CPU_DISASSEMBLE_NAME(h8_24) }, + // { "h8_32", _16be, 0, CPU_DISASSEMBLE_NAME(h8_32) }, { "hc11", _8bit, 0, CPU_DISASSEMBLE_NAME(mb88) }, { "hcd62121", _16be, 0, CPU_DISASSEMBLE_NAME(hcd62121) }, { "hd61700", _8bit, 0, CPU_DISASSEMBLE_NAME(hd61700) }, diff --git a/src/version.c b/src/version.c index c93644ad1cc..b868eebb078 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.152 ("__DATE__")"; +const char build_version[] = "0.153 ("__DATE__")"; -- cgit v1.2.3