summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2014-04-07 06:04:18 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2014-04-07 06:04:18 +0000
commitfec65e0b5766ade69e086d1c5b859d97494fce56 (patch) (github)
treec22b07938e9ad590184f1276bc2bead6d888a78d
parent30d94e51c53f30187a1bc565ef33e4744319790e (diff)
downloadmame-fec65e0b5766ade69e086d1c5b859d97494fce56.tar.bz2
mame-fec65e0b5766ade69e086d1c5b859d97494fce56.zip
Cleanups and version bumpmame0153
-rw-r--r--hash/a7800.xml112
-rw-r--r--hash/coco_flop.xml6
-rw-r--r--hash/msx1_cart.xml32
-rw-r--r--hash/msx1_flop.xml70
-rw-r--r--hash/pico.xml2
-rw-r--r--hash/psx.xml14
-rw-r--r--src/build/flags_gcc.mak2
-rw-r--r--src/build/png2bdc.c8
-rw-r--r--src/emu/bus/a2bus/a2cffa.c6
-rw-r--r--src/emu/bus/a2bus/a2corvus.c21
-rw-r--r--src/emu/bus/a2bus/a2pic.c26
-rw-r--r--src/emu/bus/a2bus/a2ssc.c2
-rw-r--r--src/emu/bus/a2bus/a2ultraterm.c64
-rw-r--r--src/emu/bus/a2bus/a2videoterm.c4
-rw-r--r--src/emu/bus/a2bus/a2videoterm.h2
-rw-r--r--src/emu/bus/a2bus/a2vulcan.c2
-rw-r--r--src/emu/bus/adam/exp.h4
-rw-r--r--src/emu/bus/adamnet/fdc.h2
-rw-r--r--src/emu/bus/adamnet/spi.c6
-rw-r--r--src/emu/bus/adamnet/spi.h2
-rw-r--r--src/emu/bus/bml3/bml3mp1805.h2
-rw-r--r--src/emu/bus/c64/magic_formel.c6
-rw-r--r--src/emu/bus/cbm2/hrg.c2
-rw-r--r--src/emu/bus/cbm2/hrg.h2
-rw-r--r--src/emu/bus/cbm2/user.h2
-rw-r--r--src/emu/bus/cbmiec/c1541.c8
-rw-r--r--src/emu/bus/cbmiec/c1541.h4
-rw-r--r--src/emu/bus/cbmiec/c1571.c4
-rw-r--r--src/emu/bus/cbmiec/c1571.h4
-rw-r--r--src/emu/bus/coco/coco_fdc.c4
-rw-r--r--src/emu/bus/coco/coco_fdc.h6
-rw-r--r--src/emu/bus/coleco/exp.h4
-rw-r--r--src/emu/bus/coleco/hand.h2
-rw-r--r--src/emu/bus/coleco/sac.h2
-rw-r--r--src/emu/bus/coleco/std.h2
-rw-r--r--src/emu/bus/compucolor/floppy.c2
-rw-r--r--src/emu/bus/comx35/exp.h2
-rw-r--r--src/emu/bus/comx35/printer.c2
-rw-r--r--src/emu/bus/ecbbus/ecbbus.h5
-rw-r--r--src/emu/bus/ecbbus/grip.c6
-rw-r--r--src/emu/bus/econet/e01.c2
-rw-r--r--src/emu/bus/econet/econet.c2
-rw-r--r--src/emu/bus/econet/econet.h3
-rw-r--r--src/emu/bus/ep64/exp.h5
-rw-r--r--src/emu/bus/gameboy/gb_slot.c4
-rw-r--r--src/emu/bus/ieee488/c2031.c2
-rw-r--r--src/emu/bus/ieee488/c2031.h2
-rw-r--r--src/emu/bus/ieee488/c2040.c22
-rw-r--r--src/emu/bus/ieee488/c2040.h2
-rw-r--r--src/emu/bus/ieee488/c2040fdc.c30
-rw-r--r--src/emu/bus/ieee488/c8050.c2
-rw-r--r--src/emu/bus/ieee488/hardbox.c8
-rw-r--r--src/emu/bus/ieee488/softbox.c2
-rw-r--r--src/emu/bus/imi7000/imi5000h.h2
-rw-r--r--src/emu/bus/isa/3c505.c7
-rw-r--r--src/emu/bus/isa/adlib.h2
-rw-r--r--src/emu/bus/isa/aga.c15
-rw-r--r--src/emu/bus/isa/aga.h20
-rw-r--r--src/emu/bus/isa/cga.c4
-rw-r--r--src/emu/bus/isa/cga.h2
-rw-r--r--src/emu/bus/isa/dectalk.c2
-rw-r--r--src/emu/bus/isa/ega.h2
-rw-r--r--src/emu/bus/isa/gblaster.h2
-rw-r--r--src/emu/bus/isa/isa.c10
-rw-r--r--src/emu/bus/isa/isa.h28
-rw-r--r--src/emu/bus/isa/mda.c2
-rw-r--r--src/emu/bus/isa/mda.h2
-rw-r--r--src/emu/bus/isa/mufdc.c2
-rw-r--r--src/emu/bus/isa/mufdc.h4
-rw-r--r--src/emu/bus/isa/omti8621.c59
-rw-r--r--src/emu/bus/isa/omti8621.h6
-rw-r--r--src/emu/bus/isa/pds.c3
-rw-r--r--src/emu/bus/isa/sblaster.c2
-rw-r--r--src/emu/bus/isa/sblaster.h10
-rw-r--r--src/emu/bus/isa/sc499.c13
-rw-r--r--src/emu/bus/isa/side116.h2
-rw-r--r--src/emu/bus/megadrive/md_carts.c2
-rw-r--r--src/emu/bus/megadrive/md_slot.c2
-rw-r--r--src/emu/bus/nes/act53.c20
-rw-r--r--src/emu/bus/nes/aladdin.c36
-rw-r--r--src/emu/bus/nes/aladdin.h30
-rw-r--r--src/emu/bus/nes/bandai.c6
-rw-r--r--src/emu/bus/nes/bandai.h6
-rw-r--r--src/emu/bus/nes/camerica.c6
-rw-r--r--src/emu/bus/nes/datach.c38
-rw-r--r--src/emu/bus/nes/datach.h16
-rw-r--r--src/emu/bus/nes/jy.c20
-rw-r--r--src/emu/bus/nes/jy.h4
-rw-r--r--src/emu/bus/nes/karastudio.c41
-rw-r--r--src/emu/bus/nes/karastudio.h28
-rw-r--r--src/emu/bus/nes/mmc5.c34
-rw-r--r--src/emu/bus/nes/mmc5.h2
-rw-r--r--src/emu/bus/nes/nes_carts.c3
-rw-r--r--src/emu/bus/nes/nes_ines.inc14
-rw-r--r--src/emu/bus/nes/nes_slot.h4
-rw-r--r--src/emu/bus/nes/nxrom.c24
-rw-r--r--src/emu/bus/nes/sunsoft_dcs.c8
-rw-r--r--src/emu/bus/nes/sunsoft_dcs.h8
-rw-r--r--src/emu/bus/nubus/nubus_specpdq.c2
-rw-r--r--src/emu/bus/nubus/nubus_specpdq.h2
-rw-r--r--src/emu/bus/plus4/c1551.c2
-rw-r--r--src/emu/bus/plus4/c1551.h2
-rw-r--r--src/emu/bus/sms_exp/smsexp.h2
-rw-r--r--src/emu/bus/vidbrain/exp.h4
-rw-r--r--src/emu/bus/wangpc/tig.c6
-rw-r--r--src/emu/bus/wangpc/tig.h2
-rw-r--r--src/emu/bus/wangpc/wangpc.h2
-rw-r--r--src/emu/clifront.h2
-rw-r--r--src/emu/cpu/avr8/avr8.c828
-rw-r--r--src/emu/cpu/avr8/avr8.h294
-rw-r--r--src/emu/cpu/avr8/avr8dasm.c186
-rw-r--r--src/emu/cpu/cosmac/cosmac.h18
-rw-r--r--src/emu/cpu/cpu.mak50
-rw-r--r--src/emu/cpu/cubeqcpu/cubeqcpu.h8
-rw-r--r--src/emu/cpu/dsp32/dsp32.c2
-rw-r--r--src/emu/cpu/esrip/esrip.h6
-rw-r--r--src/emu/cpu/g65816/g65816.h4
-rw-r--r--src/emu/cpu/h8/h8.c76
-rw-r--r--src/emu/cpu/h8/h8.h2
-rw-r--r--src/emu/cpu/h8/h8.lst10
-rw-r--r--src/emu/cpu/h8/h83002.h2
-rw-r--r--src/emu/cpu/h8/h83006.h2
-rw-r--r--src/emu/cpu/h8/h83008.h2
-rw-r--r--src/emu/cpu/h8/h83048.h2
-rw-r--r--src/emu/cpu/h8/h83337.c4
-rw-r--r--src/emu/cpu/h8/h83337.h8
-rw-r--r--src/emu/cpu/h8/h8_adc.c6
-rw-r--r--src/emu/cpu/h8/h8_adc.h2
-rw-r--r--src/emu/cpu/h8/h8_intc.c12
-rw-r--r--src/emu/cpu/h8/h8_intc.h8
-rw-r--r--src/emu/cpu/h8/h8_port.c10
-rw-r--r--src/emu/cpu/h8/h8_port.h2
-rw-r--r--src/emu/cpu/h8/h8_sci.c61
-rw-r--r--src/emu/cpu/h8/h8_sci.h2
-rw-r--r--src/emu/cpu/h8/h8_timer16.c34
-rw-r--r--src/emu/cpu/h8/h8_timer16.h14
-rw-r--r--src/emu/cpu/h8/h8_timer8.c12
-rw-r--r--src/emu/cpu/h8/h8_timer8.h6
-rw-r--r--src/emu/cpu/h8/h8s2245.c48
-rw-r--r--src/emu/cpu/h8/h8s2245.h2
-rw-r--r--src/emu/cpu/h8/h8s2320.c96
-rw-r--r--src/emu/cpu/h8/h8s2320.h2
-rw-r--r--src/emu/cpu/h8/h8s2357.c96
-rw-r--r--src/emu/cpu/h8/h8s2357.h2
-rw-r--r--src/emu/cpu/h8/h8s2655.c96
-rw-r--r--src/emu/cpu/h8/h8s2655.h2
-rw-r--r--src/emu/cpu/i386/i386.c1
-rw-r--r--src/emu/cpu/i86/i186.c2
-rw-r--r--src/emu/cpu/mn10200/mn10200.c56
-rw-r--r--src/emu/cpu/mn10200/mn10200.h6
-rw-r--r--src/emu/cpu/pdp1/pdp1.c1
-rw-r--r--src/emu/cpu/pdp1/pdp1.h2
-rw-r--r--src/emu/cpu/pdp1/tx0.c1
-rw-r--r--src/emu/cpu/pdp1/tx0.h4
-rw-r--r--src/emu/cpu/powerpc/ppccom.c4
-rw-r--r--src/emu/cpu/rsp/rsp.h2
-rw-r--r--src/emu/cpu/rsp/rspdrc.c174
-rw-r--r--src/emu/cpu/sc61860/sc61860.c1
-rw-r--r--src/emu/cpu/scmp/scmp.c1
-rw-r--r--src/emu/cpu/se3208/se3208.c2
-rw-r--r--src/emu/cpu/se3208/se3208.h1
-rw-r--r--src/emu/cpu/sh2/sh2comn.c2
-rw-r--r--src/emu/cpu/sharc/sharc.c9
-rw-r--r--src/emu/cpu/sharc/sharc.h2
-rw-r--r--src/emu/cpu/ssp1601/ssp1601.c1
-rw-r--r--src/emu/cpu/superfx/superfx.c11
-rw-r--r--src/emu/cpu/tlcs90/tlcs90.c1
-rw-r--r--src/emu/cpu/tms32010/tms32010.c13
-rw-r--r--src/emu/cpu/tms32025/tms32025.c1
-rw-r--r--src/emu/cpu/tms32025/tms32025.h4
-rw-r--r--src/emu/cpu/tms32051/tms32051.c1
-rw-r--r--src/emu/cpu/tms32051/tms32051.h2
-rw-r--r--src/emu/cpu/tms34010/34010gfx.c2
-rw-r--r--src/emu/cpu/tms34010/tms34010.c2
-rw-r--r--src/emu/cpu/tms34010/tms34010.h2
-rw-r--r--src/emu/cpu/tms7000/tms7000.c1
-rw-r--r--src/emu/cpu/unsp/unsp.c11
-rw-r--r--src/emu/cpu/upd7810/upd7810.c3
-rw-r--r--src/emu/cpu/upd7810/upd7810.h2
-rw-r--r--src/emu/cpu/v60/v60.c1
-rw-r--r--src/emu/cpu/v60/v60.h2
-rw-r--r--src/emu/cpu/v810/v810.c1
-rw-r--r--src/emu/cpu/z180/z180.c1
-rw-r--r--src/emu/cpu/z180/z180tbl.h1
-rw-r--r--src/emu/cpu/z80/tlcs_z80.c11
-rw-r--r--src/emu/cpu/z80/z80.c4
-rw-r--r--src/emu/cpu/z8000/z8000.c1
-rw-r--r--src/emu/cpu/z8000/z8000.h2
-rw-r--r--src/emu/cpu/z8000/z8000ops.inc4
-rw-r--r--src/emu/crsshair.c2
-rw-r--r--src/emu/delegate.h8
-rw-r--r--src/emu/devfind.c2
-rw-r--r--src/emu/digfx.c4
-rw-r--r--src/emu/digfx.h12
-rw-r--r--src/emu/diimage.c20
-rw-r--r--src/emu/diimage.h8
-rw-r--r--src/emu/dioutput.c2
-rw-r--r--src/emu/diserial.h2
-rw-r--r--src/emu/drawgfx.h2
-rw-r--r--src/emu/drivenum.c6
-rw-r--r--src/emu/drivers/xtal.h2
-rw-r--r--src/emu/emualloc.h2
-rw-r--r--src/emu/emuopts.c2
-rw-r--r--src/emu/emupal.c32
-rw-r--r--src/emu/emupal.h77
-rw-r--r--src/emu/imagedev/flopdrv.c7
-rw-r--r--src/emu/imagedev/harddriv.h10
-rw-r--r--src/emu/ioport.c2
-rw-r--r--src/emu/ioport.h10
-rw-r--r--src/emu/machine.h2
-rw-r--r--src/emu/machine/64h156.c12
-rw-r--r--src/emu/machine/6522via.c2
-rw-r--r--src/emu/machine/6526cia.h4
-rw-r--r--src/emu/machine/6850acia.c6
-rw-r--r--src/emu/machine/68561mpcc.c2
-rw-r--r--src/emu/machine/74145.h18
-rw-r--r--src/emu/machine/8042kbdc.h2
-rw-r--r--src/emu/machine/8530scc.c2
-rw-r--r--src/emu/machine/bcreader.c106
-rw-r--r--src/emu/machine/bcreader.h4
-rw-r--r--src/emu/machine/com8116.h2
-rw-r--r--src/emu/machine/ds75161a.h26
-rw-r--r--src/emu/machine/generic.c1
-rw-r--r--src/emu/machine/hd63450.c8
-rw-r--r--src/emu/machine/hd63450.h18
-rw-r--r--src/emu/machine/hd64610.h6
-rw-r--r--src/emu/machine/i8251.c2
-rw-r--r--src/emu/machine/i8271.c14
-rw-r--r--src/emu/machine/i8271.h8
-rw-r--r--src/emu/machine/i8355.h8
-rw-r--r--src/emu/machine/im6402.h2
-rw-r--r--src/emu/machine/ins8154.h8
-rw-r--r--src/emu/machine/k053252.h4
-rw-r--r--src/emu/machine/kb3600.c4
-rw-r--r--src/emu/machine/kb3600.h26
-rw-r--r--src/emu/machine/kr2376.c2
-rw-r--r--src/emu/machine/kr2376.h8
-rw-r--r--src/emu/machine/laserdsc.c4
-rw-r--r--src/emu/machine/latch8.c16
-rw-r--r--src/emu/machine/latch8.h20
-rw-r--r--src/emu/machine/lh5810.h10
-rw-r--r--src/emu/machine/mb87078.c2
-rw-r--r--src/emu/machine/mb87078.h4
-rw-r--r--src/emu/machine/mc2661.h2
-rw-r--r--src/emu/machine/mc68328.h54
-rw-r--r--src/emu/machine/mc6843.c4
-rw-r--r--src/emu/machine/mc6843.h10
-rw-r--r--src/emu/machine/mc6846.h4
-rw-r--r--src/emu/machine/mc68681.c42
-rw-r--r--src/emu/machine/mc68681.h2
-rw-r--r--src/emu/machine/mc68901.c2
-rw-r--r--src/emu/machine/mc68901.h10
-rw-r--r--src/emu/machine/mm58167.c75
-rw-r--r--src/emu/machine/mm58167.h6
-rw-r--r--src/emu/machine/mm74c922.h12
-rw-r--r--src/emu/machine/mos6530.h14
-rw-r--r--src/emu/machine/mos6551.c2
-rw-r--r--src/emu/machine/msm6242.h4
-rw-r--r--src/emu/machine/ncr5380.h2
-rw-r--r--src/emu/machine/netlist.c377
-rw-r--r--src/emu/machine/netlist.h534
-rw-r--r--src/emu/machine/nsc810.c1
-rw-r--r--src/emu/machine/pc_lpt.c1
-rw-r--r--src/emu/machine/pci.c1
-rw-r--r--src/emu/machine/pckeybrd.c2
-rw-r--r--src/emu/machine/pckeybrd.h6
-rw-r--r--src/emu/machine/rp5c01.h2
-rw-r--r--src/emu/machine/rp5c15.h2
-rw-r--r--src/emu/machine/rtc4543.c4
-rw-r--r--src/emu/machine/rtc65271.h2
-rw-r--r--src/emu/machine/s3c2400.c6
-rw-r--r--src/emu/machine/s3c2400.h12
-rw-r--r--src/emu/machine/s3c2410.c4
-rw-r--r--src/emu/machine/s3c2410.h16
-rw-r--r--src/emu/machine/s3c2440.c56
-rw-r--r--src/emu/machine/s3c2440.h14
-rw-r--r--src/emu/machine/s3c24xx.inc3
-rw-r--r--src/emu/machine/saturn.c4
-rw-r--r--src/emu/machine/seibu_cop.h8
-rw-r--r--src/emu/machine/smc91c9x.h4
-rw-r--r--src/emu/machine/smc92x4.c12
-rw-r--r--src/emu/machine/smc92x4.h2
-rw-r--r--src/emu/machine/tc009xlvc.h2
-rw-r--r--src/emu/machine/terminal.c1
-rw-r--r--src/emu/machine/tmp68301.h4
-rw-r--r--src/emu/machine/tms5501.c8
-rw-r--r--src/emu/machine/upd1990a.c28
-rw-r--r--src/emu/machine/upd1990a.h2
-rw-r--r--src/emu/machine/upd7002.c2
-rw-r--r--src/emu/machine/upd7002.h10
-rw-r--r--src/emu/machine/upd765.c2
-rw-r--r--src/emu/machine/wd17xx.c2
-rw-r--r--src/emu/machine/wd17xx.h4
-rw-r--r--src/emu/machine/wd33c93.h2
-rw-r--r--src/emu/machine/z80dma.c1
-rw-r--r--src/emu/machine/z8536.h2
-rw-r--r--src/emu/mame.c4
-rw-r--r--src/emu/memarray.h2
-rw-r--r--src/emu/netlist/analog/nld_bjt.c175
-rw-r--r--src/emu/netlist/analog/nld_bjt.h234
-rw-r--r--src/emu/netlist/analog/nld_fourterm.c95
-rw-r--r--src/emu/netlist/analog/nld_fourterm.h56
-rw-r--r--src/emu/netlist/analog/nld_solver.c1318
-rw-r--r--src/emu/netlist/analog/nld_solver.h112
-rw-r--r--src/emu/netlist/analog/nld_switches.c50
-rw-r--r--src/emu/netlist/analog/nld_switches.h2
-rw-r--r--src/emu/netlist/analog/nld_twoterm.c60
-rw-r--r--src/emu/netlist/analog/nld_twoterm.h124
-rw-r--r--src/emu/netlist/devices/net_lib.c86
-rw-r--r--src/emu/netlist/devices/nld_4066.c90
-rw-r--r--src/emu/netlist/devices/nld_4066.h18
-rw-r--r--src/emu/netlist/devices/nld_7400.c59
-rw-r--r--src/emu/netlist/devices/nld_7400.h2
-rw-r--r--src/emu/netlist/devices/nld_7402.c59
-rw-r--r--src/emu/netlist/devices/nld_7402.h10
-rw-r--r--src/emu/netlist/devices/nld_7404.c62
-rw-r--r--src/emu/netlist/devices/nld_7404.h14
-rw-r--r--src/emu/netlist/devices/nld_7410.c51
-rw-r--r--src/emu/netlist/devices/nld_7410.h8
-rw-r--r--src/emu/netlist/devices/nld_74107.c56
-rw-r--r--src/emu/netlist/devices/nld_74107.h6
-rw-r--r--src/emu/netlist/devices/nld_74153.c93
-rw-r--r--src/emu/netlist/devices/nld_74153.h20
-rw-r--r--src/emu/netlist/devices/nld_7420.c35
-rw-r--r--src/emu/netlist/devices/nld_7420.h6
-rw-r--r--src/emu/netlist/devices/nld_7425.c39
-rw-r--r--src/emu/netlist/devices/nld_7425.h6
-rw-r--r--src/emu/netlist/devices/nld_7427.c51
-rw-r--r--src/emu/netlist/devices/nld_7427.h8
-rw-r--r--src/emu/netlist/devices/nld_7430.c27
-rw-r--r--src/emu/netlist/devices/nld_7430.h4
-rw-r--r--src/emu/netlist/devices/nld_7448.c225
-rw-r--r--src/emu/netlist/devices/nld_7448.h54
-rw-r--r--src/emu/netlist/devices/nld_7450.c107
-rw-r--r--src/emu/netlist/devices/nld_7450.h22
-rw-r--r--src/emu/netlist/devices/nld_7474.c66
-rw-r--r--src/emu/netlist/devices/nld_7474.h6
-rw-r--r--src/emu/netlist/devices/nld_7483.c40
-rw-r--r--src/emu/netlist/devices/nld_7483.h2
-rw-r--r--src/emu/netlist/devices/nld_7486.c51
-rw-r--r--src/emu/netlist/devices/nld_7486.h10
-rw-r--r--src/emu/netlist/devices/nld_7490.c69
-rw-r--r--src/emu/netlist/devices/nld_7490.h6
-rw-r--r--src/emu/netlist/devices/nld_7493.c58
-rw-r--r--src/emu/netlist/devices/nld_7493.h2
-rw-r--r--src/emu/netlist/devices/nld_74ls629.c194
-rw-r--r--src/emu/netlist/devices/nld_74ls629.h26
-rw-r--r--src/emu/netlist/devices/nld_9316.c93
-rw-r--r--src/emu/netlist/devices/nld_9316.h14
-rw-r--r--src/emu/netlist/devices/nld_legacy.c4
-rw-r--r--src/emu/netlist/devices/nld_ne555.c40
-rw-r--r--src/emu/netlist/devices/nld_ne555.h2
-rw-r--r--src/emu/netlist/devices/nld_signal.h172
-rw-r--r--src/emu/netlist/devices/nld_system.c10
-rw-r--r--src/emu/netlist/devices/nld_system.h256
-rw-r--r--src/emu/netlist/nl_base.c590
-rw-r--r--src/emu/netlist/nl_base.h1236
-rw-r--r--src/emu/netlist/nl_dice_compat.h52
-rw-r--r--src/emu/netlist/nl_lists.h596
-rw-r--r--src/emu/netlist/nl_parser.c600
-rw-r--r--src/emu/netlist/nl_parser.h424
-rw-r--r--src/emu/netlist/nl_setup.c238
-rw-r--r--src/emu/netlist/nl_setup.h20
-rw-r--r--src/emu/netlist/pstate.c38
-rw-r--r--src/emu/netlist/pstate.h38
-rw-r--r--src/emu/netlist/pstring.h16
-rw-r--r--src/emu/output.c8
-rw-r--r--src/emu/render.c2
-rw-r--r--src/emu/rendfont.c4
-rw-r--r--src/emu/rendfont.h10
-rw-r--r--src/emu/rendlay.c14
-rw-r--r--src/emu/rendlay.h2
-rw-r--r--src/emu/screen.c8
-rw-r--r--src/emu/screen.h2
-rw-r--r--src/emu/softlist.c174
-rw-r--r--src/emu/softlist.h58
-rw-r--r--src/emu/sound/aica.c72
-rw-r--r--src/emu/sound/aica.h10
-rw-r--r--src/emu/sound/ay8910.c85
-rw-r--r--src/emu/sound/cdp1869.c2
-rw-r--r--src/emu/sound/cdp1869.h4
-rw-r--r--src/emu/sound/dmadac.c3
-rw-r--r--src/emu/sound/dmadac.h2
-rw-r--r--src/emu/sound/es5503.c2
-rw-r--r--src/emu/sound/es5503.h8
-rw-r--r--src/emu/sound/ics2115.c2
-rw-r--r--src/emu/sound/k007232.h4
-rw-r--r--src/emu/sound/mos6560.h2
-rw-r--r--src/emu/sound/msm5205.h4
-rw-r--r--src/emu/sound/msm5232.c2
-rw-r--r--src/emu/sound/msm5232.h4
-rw-r--r--src/emu/sound/qs1000.c2
-rw-r--r--src/emu/sound/qs1000.h8
-rw-r--r--src/emu/sound/qsound.c18
-rw-r--r--src/emu/sound/scsp.c12
-rw-r--r--src/emu/sound/scsp.h28
-rw-r--r--src/emu/sound/sp0256.h8
-rw-r--r--src/emu/sound/spu.c12
-rw-r--r--src/emu/sound/tc8830f.c8
-rw-r--r--src/emu/sound/upd7759.c4
-rw-r--r--src/emu/sound/upd7759.h4
-rw-r--r--src/emu/sound/votrax.h4
-rw-r--r--src/emu/sound/ymf278b.c2
-rw-r--r--src/emu/sound/ymz280b.c2
-rw-r--r--src/emu/sound/zsg2.c44
-rw-r--r--src/emu/sound/zsg2.h2
-rw-r--r--src/emu/tilemap.h2
-rw-r--r--src/emu/ui/barcode.c28
-rw-r--r--src/emu/ui/barcode.h2
-rw-r--r--src/emu/ui/devctrl.h6
-rw-r--r--src/emu/ui/filemngr.c2
-rw-r--r--src/emu/ui/filesel.c24
-rw-r--r--src/emu/ui/filesel.h40
-rw-r--r--src/emu/ui/imgcntrl.c2
-rw-r--r--src/emu/ui/imginfo.c2
-rw-r--r--src/emu/ui/mainmenu.c4
-rw-r--r--src/emu/ui/menu.c204
-rw-r--r--src/emu/ui/menu.h96
-rw-r--r--src/emu/ui/selgame.c6
-rw-r--r--src/emu/ui/selgame.h8
-rw-r--r--src/emu/ui/swlist.c2
-rw-r--r--src/emu/ui/swlist.h26
-rw-r--r--src/emu/ui/ui.c186
-rw-r--r--src/emu/ui/ui.h32
-rw-r--r--src/emu/ui/viewgfx.c54
-rw-r--r--src/emu/validity.c2
-rw-r--r--src/emu/validity.h6
-rw-r--r--src/emu/video.c4
-rw-r--r--src/emu/video/315_5124.h14
-rw-r--r--src/emu/video/315_5313.c12
-rw-r--r--src/emu/video/315_5313.h18
-rw-r--r--src/emu/video/crt9007.h4
-rw-r--r--src/emu/video/crt9021.h4
-rw-r--r--src/emu/video/crt9212.h4
-rw-r--r--src/emu/video/dl1416.h2
-rw-r--r--src/emu/video/ef9345.h6
-rw-r--r--src/emu/video/epic12.c70
-rw-r--r--src/emu/video/epic12.h47
-rw-r--r--src/emu/video/epic12_blit2.c2
-rw-r--r--src/emu/video/epic12_blit3.c2
-rw-r--r--src/emu/video/epic12_blit4.c2
-rw-r--r--src/emu/video/epic12_blit6.c2
-rw-r--r--src/emu/video/epic12_blit7.c2
-rw-r--r--src/emu/video/epic12_blit8.c3
-rw-r--r--src/emu/video/epic12in.inc10
-rw-r--r--src/emu/video/epic12pixel.inc9
-rw-r--r--src/emu/video/fixfreq.c2
-rw-r--r--src/emu/video/hd44352.h2
-rw-r--r--src/emu/video/hd44780.h2
-rw-r--r--src/emu/video/hd61830.h2
-rw-r--r--src/emu/video/huc6260.h10
-rw-r--r--src/emu/video/huc6270.h6
-rw-r--r--src/emu/video/mb_vcu.h2
-rw-r--r--src/emu/video/mc6845.c2
-rw-r--r--src/emu/video/mc6847.c39
-rw-r--r--src/emu/video/mc6847.h6
-rw-r--r--src/emu/video/pc_vga.c6
-rw-r--r--src/emu/video/ramdac.h6
-rw-r--r--src/emu/video/tms34061.c2
-rw-r--r--src/emu/video/tms34061.h12
-rw-r--r--src/emu/video/upd3301.c1
-rw-r--r--src/emu/video/upd7220.h4
-rw-r--r--src/emu/video/v9938.h2
-rw-r--r--src/emu/video/vic4567.h2
-rw-r--r--src/lib/formats/cassimg.c2
-rw-r--r--src/lib/formats/ccvf_dsk.c8
-rw-r--r--src/lib/formats/d64_dsk.c2
-rw-r--r--src/lib/formats/fmtowns_dsk.c2
-rw-r--r--src/lib/formats/g64_dsk.c12
-rw-r--r--src/lib/formats/mbee_cas.h1
-rw-r--r--src/lib/formats/phc25_cas.c4
-rw-r--r--src/lib/formats/phc25_cas.h1
-rw-r--r--src/lib/formats/sol_cas.c6
-rw-r--r--src/lib/formats/sol_cas.h1
-rw-r--r--src/lib/formats/sorc_cas.h1
-rw-r--r--src/lib/formats/spc1000_cas.h1
-rw-r--r--src/lib/formats/z80ne_dsk.c2
-rw-r--r--src/lib/libflac/include/FLAC/export.h4
-rw-r--r--src/lib/libflac/include/FLAC/format.h7
-rw-r--r--src/lib/libflac/include/FLAC/metadata.h3
-rw-r--r--src/lib/libflac/include/FLAC/stream_decoder.h8
-rw-r--r--src/lib/libflac/include/FLAC/stream_encoder.h6
-rw-r--r--src/lib/libflac/include/private/fixed.h48
-rw-r--r--src/lib/libflac/include/private/float.h22
-rw-r--r--src/lib/libflac/include/private/lpc.h172
-rw-r--r--src/lib/libflac/include/private/window.h12
-rw-r--r--src/lib/libflac/libFLAC/bitreader.c16
-rw-r--r--src/lib/libflac/libFLAC/float.c2
-rw-r--r--src/lib/libflac/libFLAC/lpc.c112
-rw-r--r--src/lib/libflac/libFLAC/md5.c16
-rw-r--r--src/lib/libflac/libFLAC/metadata_iterators.c4
-rw-r--r--src/lib/libflac/libFLAC/metadata_object.c2
-rw-r--r--src/lib/libflac/libFLAC/stream_decoder.c8
-rw-r--r--src/lib/libflac/libFLAC/stream_encoder.c14
-rw-r--r--src/lib/util/chd.h2
-rw-r--r--src/lib/util/corealloc.c10
-rw-r--r--src/lib/util/cstrpool.c12
-rw-r--r--src/lib/util/cstrpool.h16
-rw-r--r--src/lib/util/options.h2
-rw-r--r--src/lib/util/palette.c64
-rw-r--r--src/lib/util/palette.h28
-rw-r--r--src/lib/util/tagmap.c2
-rw-r--r--src/lib/util/tagmap.h4
-rw-r--r--src/mame/audio/cclimber.c5
-rw-r--r--src/mame/audio/cclimber.h10
-rw-r--r--src/mame/audio/cps3.c8
-rw-r--r--src/mame/audio/namco52.c2
-rw-r--r--src/mame/audio/namco52.h10
-rw-r--r--src/mame/audio/namco54.c2
-rw-r--r--src/mame/audio/namco54.h6
-rw-r--r--src/mame/audio/taito_en.h2
-rw-r--r--src/mame/audio/taito_zm.c6
-rw-r--r--src/mame/audio/taito_zm.h4
-rw-r--r--src/mame/drivers/1942.c194
-rw-r--r--src/mame/drivers/1945kiii.c8
-rw-r--r--src/mame/drivers/20pacgal.c6
-rw-r--r--src/mame/drivers/3x3puzzl.c2
-rw-r--r--src/mame/drivers/4enlinea.c20
-rw-r--r--src/mame/drivers/5clown.c2
-rw-r--r--src/mame/drivers/88games.c6
-rw-r--r--src/mame/drivers/a1supply.c32
-rw-r--r--src/mame/drivers/acefruit.c2
-rw-r--r--src/mame/drivers/aerofgt.c12
-rw-r--r--src/mame/drivers/albazc.c2
-rw-r--r--src/mame/drivers/aleisttl.c32
-rw-r--r--src/mame/drivers/amusco.c51
-rw-r--r--src/mame/drivers/arcadia.c16
-rw-r--r--src/mame/drivers/aristmk4.c26
-rw-r--r--src/mame/drivers/asteroid.c2
-rw-r--r--src/mame/drivers/astinvad.c2
-rw-r--r--src/mame/drivers/astrof.c1
-rw-r--r--src/mame/drivers/asuka.c4
-rw-r--r--src/mame/drivers/atarigx2.c58
-rw-r--r--src/mame/drivers/atarittl.c132
-rw-r--r--src/mame/drivers/atetris.c2
-rw-r--r--src/mame/drivers/backfire.c4
-rw-r--r--src/mame/drivers/bailey.c32
-rw-r--r--src/mame/drivers/battlnts.c2
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/big10.c6
-rw-r--r--src/mame/drivers/blackt96.c2
-rw-r--r--src/mame/drivers/bladestl.c6
-rw-r--r--src/mame/drivers/blmbycar.c2
-rw-r--r--src/mame/drivers/blockhl.c2
-rw-r--r--src/mame/drivers/bloodbro.c2
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/bmcbowl.c4
-rw-r--r--src/mame/drivers/bmcpokr.c2
-rw-r--r--src/mame/drivers/bnstars.c4
-rw-r--r--src/mame/drivers/boogwing.c2
-rw-r--r--src/mame/drivers/bowltry.c30
-rw-r--r--src/mame/drivers/boxer.c8
-rw-r--r--src/mame/drivers/btime.c2
-rw-r--r--src/mame/drivers/bzone.c2
-rw-r--r--src/mame/drivers/cabal.c2
-rw-r--r--src/mame/drivers/calomega.c8
-rw-r--r--src/mame/drivers/carrera.c2
-rw-r--r--src/mame/drivers/cavepc.c8
-rw-r--r--src/mame/drivers/cball.c2
-rw-r--r--src/mame/drivers/cbuster.c2
-rw-r--r--src/mame/drivers/cd32.c2
-rw-r--r--src/mame/drivers/centiped.c2
-rw-r--r--src/mame/drivers/chanbara.c2
-rw-r--r--src/mame/drivers/chicago.c34
-rw-r--r--src/mame/drivers/chqflag.c2
-rw-r--r--src/mame/drivers/cliffhgr.c2
-rw-r--r--src/mame/drivers/cmmb.c2
-rw-r--r--src/mame/drivers/cninja.c12
-rw-r--r--src/mame/drivers/cntsteer.c2
-rw-r--r--src/mame/drivers/cobra.c2
-rw-r--r--src/mame/drivers/coinmstr.c74
-rw-r--r--src/mame/drivers/coolridr.c2
-rw-r--r--src/mame/drivers/cps1.c32
-rw-r--r--src/mame/drivers/cps3.c2
-rw-r--r--src/mame/drivers/crystal.c74
-rw-r--r--src/mame/drivers/cswat.c6
-rw-r--r--src/mame/drivers/cubeqst.c2
-rw-r--r--src/mame/drivers/cv1k.c48
-rw-r--r--src/mame/drivers/d9final.c2
-rw-r--r--src/mame/drivers/dacholer.c2
-rw-r--r--src/mame/drivers/dai3wksi.c6
-rw-r--r--src/mame/drivers/dassault.c2
-rw-r--r--src/mame/drivers/dblcrown.c16
-rw-r--r--src/mame/drivers/dblewing.c2
-rw-r--r--src/mame/drivers/ddealer.c8
-rw-r--r--src/mame/drivers/ddenlovr.c2
-rw-r--r--src/mame/drivers/ddragon3.c4
-rw-r--r--src/mame/drivers/dec0.c2
-rw-r--r--src/mame/drivers/deco32.c16
-rw-r--r--src/mame/drivers/deco_ld.c4
-rw-r--r--src/mame/drivers/deshoros.c2
-rw-r--r--src/mame/drivers/destroyr.c2
-rw-r--r--src/mame/drivers/dfruit.c4
-rw-r--r--src/mame/drivers/discoboy.c6
-rw-r--r--src/mame/drivers/dkong.c6
-rw-r--r--src/mame/drivers/docastle.c2
-rw-r--r--src/mame/drivers/dominob.c2
-rw-r--r--src/mame/drivers/dooyong.c2
-rw-r--r--src/mame/drivers/dorachan.c2
-rw-r--r--src/mame/drivers/dotrikun.c2
-rw-r--r--src/mame/drivers/dreamwld.c8
-rw-r--r--src/mame/drivers/dunhuang.c2
-rw-r--r--src/mame/drivers/dwarfd.c4
-rw-r--r--src/mame/drivers/ecoinf2.c30
-rw-r--r--src/mame/drivers/electra.c32
-rw-r--r--src/mame/drivers/enigma2.c2
-rw-r--r--src/mame/drivers/exedexes.c2
-rw-r--r--src/mame/drivers/exerion.c2
-rw-r--r--src/mame/drivers/exidyttl.c52
-rw-r--r--src/mame/drivers/exprraid.c8
-rw-r--r--src/mame/drivers/f1gp.c4
-rw-r--r--src/mame/drivers/fantland.c2
-rw-r--r--src/mame/drivers/fcrash.c4
-rw-r--r--src/mame/drivers/feversoc.c2
-rw-r--r--src/mame/drivers/firefox.c2
-rw-r--r--src/mame/drivers/firetrk.c4
-rw-r--r--src/mame/drivers/flipjack.c6
-rw-r--r--src/mame/drivers/flkatck.c16
-rw-r--r--src/mame/drivers/flyball.c2
-rw-r--r--src/mame/drivers/fungames.c32
-rw-r--r--src/mame/drivers/funkyjet.c2
-rw-r--r--src/mame/drivers/funworld.c220
-rw-r--r--src/mame/drivers/gaelco3d.c2
-rw-r--r--src/mame/drivers/gaiden.c2
-rw-r--r--src/mame/drivers/galaga.c38
-rw-r--r--src/mame/drivers/galaxi.c2
-rw-r--r--src/mame/drivers/galaxian.c4
-rw-r--r--src/mame/drivers/galaxold.c4
-rw-r--r--src/mame/drivers/galivan.c2
-rw-r--r--src/mame/drivers/galpani2.c4
-rw-r--r--src/mame/drivers/gaplus.c10
-rw-r--r--src/mame/drivers/gatron.c15
-rw-r--r--src/mame/drivers/gbusters.c6
-rw-r--r--src/mame/drivers/gei.c2
-rw-r--r--src/mame/drivers/ggconnie.c2
-rw-r--r--src/mame/drivers/ghosteo.c2
-rw-r--r--src/mame/drivers/gladiatr.c2
-rw-r--r--src/mame/drivers/go2000.c2
-rw-r--r--src/mame/drivers/goldnpkr.c10
-rw-r--r--src/mame/drivers/goldstar.c86
-rw-r--r--src/mame/drivers/gstream.c43
-rw-r--r--src/mame/drivers/gsword.c2
-rw-r--r--src/mame/drivers/gticlub.c6
-rw-r--r--src/mame/drivers/gunpey.c2
-rw-r--r--src/mame/drivers/gunsmoke.c2
-rw-r--r--src/mame/drivers/halleys.c6
-rw-r--r--src/mame/drivers/highvdeo.c6
-rw-r--r--src/mame/drivers/hng64.c28
-rw-r--r--src/mame/drivers/hornet.c4
-rw-r--r--src/mame/drivers/hshavoc.c2
-rw-r--r--src/mame/drivers/hvyunit.c2
-rw-r--r--src/mame/drivers/hyperspt.c2
-rw-r--r--src/mame/drivers/igs017.c2
-rw-r--r--src/mame/drivers/igs_m027.c1
-rw-r--r--src/mame/drivers/igspoker.c2
-rw-r--r--src/mame/drivers/ikki.c2
-rw-r--r--src/mame/drivers/intrscti.c2
-rw-r--r--src/mame/drivers/itgambl3.c13
-rw-r--r--src/mame/drivers/itgamble.c2
-rw-r--r--src/mame/drivers/jackie.c2
-rw-r--r--src/mame/drivers/jclub2.c199
-rw-r--r--src/mame/drivers/kaneko16.c12
-rw-r--r--src/mame/drivers/kingobox.c2
-rw-r--r--src/mame/drivers/koftball.c6
-rw-r--r--src/mame/drivers/konamigx.c2
-rw-r--r--src/mame/drivers/konendev.c2
-rw-r--r--src/mame/drivers/kopunch.c8
-rw-r--r--src/mame/drivers/lastbank.c2
-rw-r--r--src/mame/drivers/lethal.c84
-rw-r--r--src/mame/drivers/littlerb.c14
-rw-r--r--src/mame/drivers/ltcasino.c2
-rw-r--r--src/mame/drivers/m14.c4
-rw-r--r--src/mame/drivers/m62.c2
-rw-r--r--src/mame/drivers/m63.c3
-rw-r--r--src/mame/drivers/mappy.c16
-rw-r--r--src/mame/drivers/mazerbla.c2
-rw-r--r--src/mame/drivers/mcr3.c4
-rw-r--r--src/mame/drivers/mcr68.c8
-rw-r--r--src/mame/drivers/meadwttl.c32
-rw-r--r--src/mame/drivers/megaphx.c60
-rw-r--r--src/mame/drivers/megaplay.c32
-rw-r--r--src/mame/drivers/megatech.c54
-rw-r--r--src/mame/drivers/metalmx.c2
-rw-r--r--src/mame/drivers/metro.c10
-rw-r--r--src/mame/drivers/mgolf.c2
-rw-r--r--src/mame/drivers/mhavoc.c2
-rw-r--r--src/mame/drivers/micro3d.c2
-rw-r--r--src/mame/drivers/mil4000.c74
-rw-r--r--src/mame/drivers/mirage.c2
-rw-r--r--src/mame/drivers/mitchell.c2
-rw-r--r--src/mame/drivers/mlanding.c2
-rw-r--r--src/mame/drivers/model1.c4
-rw-r--r--src/mame/drivers/model2.c2
-rw-r--r--src/mame/drivers/model3.c6
-rw-r--r--src/mame/drivers/monacogp.c132
-rw-r--r--src/mame/drivers/mpoker.c2
-rw-r--r--src/mame/drivers/mpu4.c4
-rw-r--r--src/mame/drivers/mpu4hw.c4
-rw-r--r--src/mame/drivers/mpu4misc.c10
-rw-r--r--src/mame/drivers/mugsmash.c2
-rw-r--r--src/mame/drivers/multfish.c14
-rw-r--r--src/mame/drivers/multfish_boot.c2
-rw-r--r--src/mame/drivers/multfish_ref.c2
-rw-r--r--src/mame/drivers/murogmbl.c2
-rw-r--r--src/mame/drivers/mystwarr.c12
-rw-r--r--src/mame/drivers/namcos12.c6
-rw-r--r--src/mame/drivers/namcos22.c10
-rw-r--r--src/mame/drivers/naomi.c244
-rw-r--r--src/mame/drivers/nbmj8891.c4
-rw-r--r--src/mame/drivers/nbmj8900.c2
-rw-r--r--src/mame/drivers/neogeo.c7
-rw-r--r--src/mame/drivers/neptunp2.c2
-rw-r--r--src/mame/drivers/nightgal.c2
-rw-r--r--src/mame/drivers/ninjaw.c2
-rw-r--r--src/mame/drivers/nmg5.c2
-rw-r--r--src/mame/drivers/nss.c2
-rw-r--r--src/mame/drivers/nwk-tr.c2
-rw-r--r--src/mame/drivers/nycaptor.c4
-rw-r--r--src/mame/drivers/nyny.c2
-rw-r--r--src/mame/drivers/offtwall.c24
-rw-r--r--src/mame/drivers/ohmygod.c2
-rw-r--r--src/mame/drivers/olibochu.c4
-rw-r--r--src/mame/drivers/onetwo.c2
-rw-r--r--src/mame/drivers/othello.c2
-rw-r--r--src/mame/drivers/overdriv.c4
-rw-r--r--src/mame/drivers/pacman.c12
-rw-r--r--src/mame/drivers/panicr.c2
-rw-r--r--src/mame/drivers/pcxt.c12
-rw-r--r--src/mame/drivers/pengadvb.c12
-rw-r--r--src/mame/drivers/peplus.c4
-rw-r--r--src/mame/drivers/pgm.c1
-rw-r--r--src/mame/drivers/pgm2.c75
-rw-r--r--src/mame/drivers/photon.c2
-rw-r--r--src/mame/drivers/pinkiri8.c2
-rw-r--r--src/mame/drivers/pkscram.c2
-rw-r--r--src/mame/drivers/pktgaldx.c2
-rw-r--r--src/mame/drivers/polepos.c8
-rw-r--r--src/mame/drivers/pong.c1254
-rw-r--r--src/mame/drivers/popeye.c148
-rw-r--r--src/mame/drivers/popobear.c4
-rw-r--r--src/mame/drivers/puckpkmn.c4
-rw-r--r--src/mame/drivers/pzletime.c4
-rw-r--r--src/mame/drivers/qdrmfgp.c4
-rw-r--r--src/mame/drivers/quantum.c2
-rw-r--r--src/mame/drivers/r2dx_v33.c2
-rw-r--r--src/mame/drivers/raiden2.c14
-rw-r--r--src/mame/drivers/ramtek.c44
-rw-r--r--src/mame/drivers/rcorsair.c2
-rw-r--r--src/mame/drivers/realbrk.c2
-rw-r--r--src/mame/drivers/rltennis.c2
-rw-r--r--src/mame/drivers/rockrage.c4
-rw-r--r--src/mame/drivers/rohga.c10
-rw-r--r--src/mame/drivers/rollerg.c6
-rw-r--r--src/mame/drivers/rungun.c2
-rw-r--r--src/mame/drivers/s7.c2
-rw-r--r--src/mame/drivers/safarir.c2
-rw-r--r--src/mame/drivers/scobra.c4
-rw-r--r--src/mame/drivers/scramble.c2
-rw-r--r--src/mame/drivers/seabattl.c2
-rw-r--r--src/mame/drivers/segac2.c26
-rw-r--r--src/mame/drivers/segaorun.c20
-rw-r--r--src/mame/drivers/segas16a.c12
-rw-r--r--src/mame/drivers/segas18.c2
-rw-r--r--src/mame/drivers/segaybd.c2
-rw-r--r--src/mame/drivers/seicross.c4
-rw-r--r--src/mame/drivers/seta.c10
-rw-r--r--src/mame/drivers/seta2.c4
-rw-r--r--src/mame/drivers/sf.c2
-rw-r--r--src/mame/drivers/sidearms.c2
-rw-r--r--src/mame/drivers/sigmab98.c4
-rw-r--r--src/mame/drivers/simpl156.c2
-rw-r--r--src/mame/drivers/skylncr.c20
-rw-r--r--src/mame/drivers/slapfght.c16
-rw-r--r--src/mame/drivers/slapshot.c2
-rw-r--r--src/mame/drivers/smsmcorp.c2
-rw-r--r--src/mame/drivers/spy.c2
-rw-r--r--src/mame/drivers/statriv2.c2
-rw-r--r--src/mame/drivers/stuntair.c2
-rw-r--r--src/mame/drivers/subs.c2
-rw-r--r--src/mame/drivers/subsino.c2
-rw-r--r--src/mame/drivers/subsino2.c6
-rw-r--r--src/mame/drivers/supbtime.c4
-rw-r--r--src/mame/drivers/supercrd.c2
-rw-r--r--src/mame/drivers/superwng.c2
-rw-r--r--src/mame/drivers/system16.c2
-rw-r--r--src/mame/drivers/taito_b.c10
-rw-r--r--src/mame/drivers/taito_f2.c12
-rw-r--r--src/mame/drivers/taitoair.c2
-rw-r--r--src/mame/drivers/taitogn.c14
-rw-r--r--src/mame/drivers/taitojc.c4
-rw-r--r--src/mame/drivers/taitottl.c66
-rw-r--r--src/mame/drivers/taotaido.c2
-rw-r--r--src/mame/drivers/tceptor.c2
-rw-r--r--src/mame/drivers/tecmo16.c2
-rw-r--r--src/mame/drivers/thunderx.c2
-rw-r--r--src/mame/drivers/toaplan1.c2
-rw-r--r--src/mame/drivers/toaplan2.c6
-rw-r--r--src/mame/drivers/tourtabl.c2
-rw-r--r--src/mame/drivers/toypop.c6
-rw-r--r--src/mame/drivers/triforce.c2
-rw-r--r--src/mame/drivers/truco.c2
-rw-r--r--src/mame/drivers/tugboat.c2
-rw-r--r--src/mame/drivers/tumbleb.c2
-rw-r--r--src/mame/drivers/tumblep.c2
-rw-r--r--src/mame/drivers/turrett.c2
-rw-r--r--src/mame/drivers/uapce.c2
-rw-r--r--src/mame/drivers/ultraman.c8
-rw-r--r--src/mame/drivers/vamphalf.c4
-rw-r--r--src/mame/drivers/vaportra.c2
-rw-r--r--src/mame/drivers/vball.c2
-rw-r--r--src/mame/drivers/vega.c6
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/vlc.c4
-rw-r--r--src/mame/drivers/volfied.c2
-rw-r--r--src/mame/drivers/vp101.c2
-rw-r--r--src/mame/drivers/wardner.c4
-rw-r--r--src/mame/drivers/warpwarp.c2
-rw-r--r--src/mame/drivers/wecleman.c2
-rw-r--r--src/mame/drivers/welltris.c2
-rw-r--r--src/mame/drivers/witch.c18
-rw-r--r--src/mame/drivers/wiz.c4
-rw-r--r--src/mame/drivers/wolfpack.c2
-rw-r--r--src/mame/drivers/xmen.c4
-rw-r--r--src/mame/drivers/xybots.c2
-rw-r--r--src/mame/drivers/xyonix.c2
-rw-r--r--src/mame/drivers/zaxxon.c2
-rw-r--r--src/mame/drivers/zr107.c5
-rw-r--r--src/mame/etc/template_driver.c8
-rw-r--r--src/mame/includes/1943.h2
-rw-r--r--src/mame/includes/airbustr.h2
-rw-r--r--src/mame/includes/amiga.h4
-rw-r--r--src/mame/includes/atari.h2
-rw-r--r--src/mame/includes/atarisy1.h2
-rw-r--r--src/mame/includes/aztarac.h2
-rw-r--r--src/mame/includes/balsente.h2
-rw-r--r--src/mame/includes/battlane.h2
-rw-r--r--src/mame/includes/battlera.h2
-rw-r--r--src/mame/includes/bfm_sc45.h6
-rw-r--r--src/mame/includes/bigevglf.h2
-rw-r--r--src/mame/includes/bladestl.h1
-rw-r--r--src/mame/includes/btime.h2
-rw-r--r--src/mame/includes/bublbobl.h2
-rw-r--r--src/mame/includes/bwing.h2
-rw-r--r--src/mame/includes/calomega.h2
-rw-r--r--src/mame/includes/carpolo.h2
-rw-r--r--src/mame/includes/cave.h2
-rw-r--r--src/mame/includes/ccastles.h2
-rw-r--r--src/mame/includes/cchasm.h2
-rw-r--r--src/mame/includes/centiped.h2
-rw-r--r--src/mame/includes/cidelsa.h4
-rw-r--r--src/mame/includes/citycon.h2
-rw-r--r--src/mame/includes/cninja.h2
-rw-r--r--src/mame/includes/combatsc.h2
-rw-r--r--src/mame/includes/contra.h2
-rw-r--r--src/mame/includes/cop01.h2
-rw-r--r--src/mame/includes/copsnrob.h2
-rw-r--r--src/mame/includes/cps1.h4
-rw-r--r--src/mame/includes/crbaloon.h2
-rw-r--r--src/mame/includes/crimfght.h2
-rw-r--r--src/mame/includes/crshrace.h4
-rw-r--r--src/mame/includes/cvs.h4
-rw-r--r--src/mame/includes/darius.h2
-rw-r--r--src/mame/includes/dbz.h2
-rw-r--r--src/mame/includes/dcheese.h2
-rw-r--r--src/mame/includes/deadang.h2
-rw-r--r--src/mame/includes/dec8.h2
-rw-r--r--src/mame/includes/deco32.h4
-rw-r--r--src/mame/includes/djboy.h2
-rw-r--r--src/mame/includes/dkong.h2
-rw-r--r--src/mame/includes/docastle.h6
-rw-r--r--src/mame/includes/equites.h2
-rw-r--r--src/mame/includes/espial.h2
-rw-r--r--src/mame/includes/esripsys.h2
-rw-r--r--src/mame/includes/exerion.h4
-rw-r--r--src/mame/includes/exidy.h2
-rw-r--r--src/mame/includes/exidy440.h2
-rw-r--r--src/mame/includes/exprraid.h2
-rw-r--r--src/mame/includes/f1gp.h4
-rw-r--r--src/mame/includes/fastfred.h2
-rw-r--r--src/mame/includes/fcombat.h2
-rw-r--r--src/mame/includes/fgoal.h2
-rw-r--r--src/mame/includes/firetrap.h2
-rw-r--r--src/mame/includes/firetrk.h2
-rw-r--r--src/mame/includes/fuukifg2.h2
-rw-r--r--src/mame/includes/fuukifg3.h4
-rw-r--r--src/mame/includes/gaelco3d.h2
-rw-r--r--src/mame/includes/galaga.h2
-rw-r--r--src/mame/includes/galpanic.h2
-rw-r--r--src/mame/includes/gaplus.h2
-rw-r--r--src/mame/includes/gcpinbal.h2
-rw-r--r--src/mame/includes/gladiatr.h4
-rw-r--r--src/mame/includes/gottlieb.h4
-rw-r--r--src/mame/includes/gradius3.h2
-rw-r--r--src/mame/includes/grchamp.h2
-rw-r--r--src/mame/includes/gridlee.h2
-rw-r--r--src/mame/includes/gsword.h2
-rw-r--r--src/mame/includes/gyruss.h2
-rw-r--r--src/mame/includes/harddriv.h2
-rw-r--r--src/mame/includes/homedata.h2
-rw-r--r--src/mame/includes/homerun.h2
-rw-r--r--src/mame/includes/hyprduel.h2
-rw-r--r--src/mame/includes/ikki.h2
-rw-r--r--src/mame/includes/irobot.h2
-rw-r--r--src/mame/includes/ironhors.h2
-rw-r--r--src/mame/includes/itech32.h2
-rw-r--r--src/mame/includes/jackal.h2
-rw-r--r--src/mame/includes/kaneko16.h8
-rw-r--r--src/mame/includes/karnov.h6
-rw-r--r--src/mame/includes/konamigx.h2
-rw-r--r--src/mame/includes/labyrunr.h2
-rw-r--r--src/mame/includes/ladybug.h2
-rw-r--r--src/mame/includes/laserbat.h2
-rw-r--r--src/mame/includes/lasso.h2
-rw-r--r--src/mame/includes/lastduel.h4
-rw-r--r--src/mame/includes/lazercmd.h2
-rw-r--r--src/mame/includes/liberate.h2
-rw-r--r--src/mame/includes/lkage.h2
-rw-r--r--src/mame/includes/lockon.h2
-rw-r--r--src/mame/includes/lsasquad.h2
-rw-r--r--src/mame/includes/m10.h4
-rw-r--r--src/mame/includes/m107.h2
-rw-r--r--src/mame/includes/m52.h2
-rw-r--r--src/mame/includes/m72.h2
-rw-r--r--src/mame/includes/m92.h2
-rw-r--r--src/mame/includes/macrossp.h2
-rw-r--r--src/mame/includes/matmania.h2
-rw-r--r--src/mame/includes/mcatadv.h2
-rw-r--r--src/mame/includes/mcr68.h2
-rw-r--r--src/mame/includes/meadows.h2
-rw-r--r--src/mame/includes/metlclsh.h2
-rw-r--r--src/mame/includes/micro3d.h2
-rw-r--r--src/mame/includes/model3.h2
-rw-r--r--src/mame/includes/mouser.h4
-rw-r--r--src/mame/includes/mrflea.h2
-rw-r--r--src/mame/includes/ms32.h2
-rw-r--r--src/mame/includes/mugsmash.h2
-rw-r--r--src/mame/includes/multfish.h4
-rw-r--r--src/mame/includes/munchmo.h2
-rw-r--r--src/mame/includes/n8080.h2
-rw-r--r--src/mame/includes/namcona1.h6
-rw-r--r--src/mame/includes/namcos1.h2
-rw-r--r--src/mame/includes/namcos2.h2
-rw-r--r--src/mame/includes/naughtyb.h2
-rw-r--r--src/mame/includes/nemesis.h2
-rw-r--r--src/mame/includes/ninjaw.h2
-rw-r--r--src/mame/includes/nitedrvr.h2
-rw-r--r--src/mame/includes/nycaptor.h2
-rw-r--r--src/mame/includes/ojankohs.h2
-rw-r--r--src/mame/includes/orbit.h2
-rw-r--r--src/mame/includes/othunder.h2
-rw-r--r--src/mame/includes/pandoras.h2
-rw-r--r--src/mame/includes/paradise.h2
-rw-r--r--src/mame/includes/pcktgal.h2
-rw-r--r--src/mame/includes/pktgaldx.h2
-rw-r--r--src/mame/includes/playch10.h2
-rw-r--r--src/mame/includes/pooyan.h2
-rw-r--r--src/mame/includes/popeye.h2
-rw-r--r--src/mame/includes/portrait.h2
-rw-r--r--src/mame/includes/powerins.h2
-rw-r--r--src/mame/includes/psikyo4.h2
-rw-r--r--src/mame/includes/pushman.h2
-rw-r--r--src/mame/includes/rainbow.h2
-rw-r--r--src/mame/includes/rockrage.h3
-rw-r--r--src/mame/includes/rohga.h2
-rw-r--r--src/mame/includes/rungun.h2
-rw-r--r--src/mame/includes/sbasketb.h2
-rw-r--r--src/mame/includes/scramble.h2
-rw-r--r--src/mame/includes/segas16b.h2
-rw-r--r--src/mame/includes/segas18.h2
-rw-r--r--src/mame/includes/seicross.h2
-rw-r--r--src/mame/includes/seta.h2
-rw-r--r--src/mame/includes/skyfox.h4
-rw-r--r--src/mame/includes/slapfght.h4
-rw-r--r--src/mame/includes/slapshot.h2
-rw-r--r--src/mame/includes/snes.h4
-rw-r--r--src/mame/includes/snowbros.h2
-rw-r--r--src/mame/includes/spacefb.h2
-rw-r--r--src/mame/includes/sprcros2.h4
-rw-r--r--src/mame/includes/ssv.h2
-rw-r--r--src/mame/includes/stadhero.h2
-rw-r--r--src/mame/includes/stv.h6
-rw-r--r--src/mame/includes/system16.h2
-rw-r--r--src/mame/includes/tail2nos.h2
-rw-r--r--src/mame/includes/taito_f2.h2
-rw-r--r--src/mame/includes/taito_h.h2
-rw-r--r--src/mame/includes/taito_o.h2
-rw-r--r--src/mame/includes/taitojc.h2
-rw-r--r--src/mame/includes/taitosj.h2
-rw-r--r--src/mame/includes/tceptor.h2
-rw-r--r--src/mame/includes/thedeep.h2
-rw-r--r--src/mame/includes/thunderx.h2
-rw-r--r--src/mame/includes/timeplt.h2
-rw-r--r--src/mame/includes/toki.h2
-rw-r--r--src/mame/includes/topspeed.h2
-rw-r--r--src/mame/includes/tp84.h2
-rw-r--r--src/mame/includes/tubep.h2
-rw-r--r--src/mame/includes/tumbleb.h2
-rw-r--r--src/mame/includes/tunhunt.h2
-rw-r--r--src/mame/includes/turbo.h2
-rw-r--r--src/mame/includes/twin16.h2
-rw-r--r--src/mame/includes/undrfire.h2
-rw-r--r--src/mame/includes/vaportra.h2
-rw-r--r--src/mame/includes/volfied.h2
-rw-r--r--src/mame/includes/warriorb.h2
-rw-r--r--src/mame/includes/wecleman.h2
-rw-r--r--src/mame/includes/wgp.h2
-rw-r--r--src/mame/includes/wiz.h2
-rw-r--r--src/mame/includes/zac2650.h2
-rw-r--r--src/mame/includes/zodiack.h2
-rw-r--r--src/mame/layout/cherryb3.lay4
-rw-r--r--src/mame/layout/dblcrown.lay4
-rw-r--r--src/mame/layout/gamball.lay4
-rw-r--r--src/mame/layout/goldstar.lay4
-rw-r--r--src/mame/machine/asteroid.c2
-rw-r--r--src/mame/machine/atari.c1
-rw-r--r--src/mame/machine/atarigen.h2
-rw-r--r--src/mame/machine/cdi070.h2
-rw-r--r--src/mame/machine/gaelco3d.h2
-rw-r--r--src/mame/machine/igs036crypt.c100
-rw-r--r--src/mame/machine/igs036crypt.h4
-rw-r--r--src/mame/machine/inder_sb.c64
-rw-r--r--src/mame/machine/inder_sb.h2
-rw-r--r--src/mame/machine/inder_vid.c7
-rw-r--r--src/mame/machine/inder_vid.h6
-rw-r--r--src/mame/machine/megadriv.c12
-rw-r--r--src/mame/machine/namco06.c14
-rw-r--r--src/mame/machine/namco06.h24
-rw-r--r--src/mame/machine/namco50.c2
-rw-r--r--src/mame/machine/namco50.h8
-rw-r--r--src/mame/machine/namco51.h8
-rw-r--r--src/mame/machine/namco53.c10
-rw-r--r--src/mame/machine/namco53.h16
-rw-r--r--src/mame/machine/namco62.h4
-rw-r--r--src/mame/machine/namcoio.h18
-rw-r--r--src/mame/machine/namcos1.c5
-rw-r--r--src/mame/machine/naomim4.c6
-rw-r--r--src/mame/machine/pcecommn.c1
-rw-r--r--src/mame/machine/pcecommn.h2
-rw-r--r--src/mame/machine/slapfght.c2
-rw-r--r--src/mame/machine/tait8741.c7
-rw-r--r--src/mame/machine/tait8741.h52
-rw-r--r--src/mame/machine/taitoio.h32
-rw-r--r--src/mame/mame.lst132
-rw-r--r--src/mame/video/alpha68k.c2
-rw-r--r--src/mame/video/amspdwy.c2
-rw-r--r--src/mame/video/angelkds.c6
-rw-r--r--src/mame/video/appoooh.c4
-rw-r--r--src/mame/video/argus.c2
-rw-r--r--src/mame/video/atarimo.c4
-rw-r--r--src/mame/video/avgdvg.c50
-rw-r--r--src/mame/video/avgdvg.h124
-rw-r--r--src/mame/video/baraduke.c2
-rw-r--r--src/mame/video/battlane.c4
-rw-r--r--src/mame/video/battlex.c2
-rw-r--r--src/mame/video/bfm_adr2.c2
-rw-r--r--src/mame/video/bfm_adr2.h2
-rw-r--r--src/mame/video/bfm_dm01.c4
-rw-r--r--src/mame/video/bfm_dm01.h4
-rw-r--r--src/mame/video/bogeyman.c5
-rw-r--r--src/mame/video/bwing.c4
-rw-r--r--src/mame/video/c45.c1
-rw-r--r--src/mame/video/c45.h8
-rw-r--r--src/mame/video/canyon.c2
-rw-r--r--src/mame/video/carpolo.c2
-rw-r--r--src/mame/video/cclimber.c6
-rw-r--r--src/mame/video/chaknpop.c2
-rw-r--r--src/mame/video/champbas.c8
-rw-r--r--src/mame/video/cheekyms.c10
-rw-r--r--src/mame/video/combatsc.c2
-rw-r--r--src/mame/video/cps1.c2
-rw-r--r--src/mame/video/crimfght.c2
-rw-r--r--src/mame/video/darkmist.c2
-rw-r--r--src/mame/video/ddribble.c2
-rw-r--r--src/mame/video/dec8.c2
-rw-r--r--src/mame/video/decbac06.h2
-rw-r--r--src/mame/video/deckarn.h2
-rw-r--r--src/mame/video/decmxc06.c4
-rw-r--r--src/mame/video/decmxc06.h4
-rw-r--r--src/mame/video/deco16ic.h4
-rw-r--r--src/mame/video/decocomn.h4
-rw-r--r--src/mame/video/decospr.h3
-rw-r--r--src/mame/video/djmain.c4
-rw-r--r--src/mame/video/drgnmst.c2
-rw-r--r--src/mame/video/exerion.c4
-rw-r--r--src/mame/video/fcombat.c10
-rw-r--r--src/mame/video/firetrk.c8
-rw-r--r--src/mame/video/fitfight.c2
-rw-r--r--src/mame/video/gaelco2.c2
-rw-r--r--src/mame/video/galaxian.c2
-rw-r--r--src/mame/video/goindol.c4
-rw-r--r--src/mame/video/gottlieb.c2
-rw-r--r--src/mame/video/gotya.c4
-rw-r--r--src/mame/video/gp9001.h1
-rw-r--r--src/mame/video/grchamp.c4
-rw-r--r--src/mame/video/gticlub.c2
-rw-r--r--src/mame/video/gyruss.c2
-rw-r--r--src/mame/video/hyperspt.c4
-rw-r--r--src/mame/video/jalblend.c2
-rw-r--r--src/mame/video/k001005.h2
-rw-r--r--src/mame/video/k001604.h2
-rw-r--r--src/mame/video/k007121.h2
-rw-r--r--src/mame/video/k007342.c10
-rw-r--r--src/mame/video/k007342.h11
-rw-r--r--src/mame/video/k007420.c4
-rw-r--r--src/mame/video/k007420.h4
-rw-r--r--src/mame/video/k051316.h2
-rw-r--r--src/mame/video/k053244_k053245.h2
-rw-r--r--src/mame/video/k053246_k053247_k055673.h2
-rw-r--r--src/mame/video/k053250.h2
-rw-r--r--src/mame/video/k054338.c2
-rw-r--r--src/mame/video/kaneko16.c6
-rw-r--r--src/mame/video/kaneko_spr.c1
-rw-r--r--src/mame/video/kaneko_spr.h2
-rw-r--r--src/mame/video/kopunch.c2
-rw-r--r--src/mame/video/ladyfrog.c4
-rw-r--r--src/mame/video/lastduel.c2
-rw-r--r--src/mame/video/m10.c4
-rw-r--r--src/mame/video/m52.c4
-rw-r--r--src/mame/video/mermaid.c2
-rw-r--r--src/mame/video/mikie.c2
-rw-r--r--src/mame/video/mrflea.c2
-rw-r--r--src/mame/video/ms32.c2
-rw-r--r--src/mame/video/mugsmash.c2
-rw-r--r--src/mame/video/munchmo.c5
-rw-r--r--src/mame/video/mystston.c2
-rw-r--r--src/mame/video/namcona1.c2
-rw-r--r--src/mame/video/namcos22.c2
-rw-r--r--src/mame/video/ninjakd2.c2
-rw-r--r--src/mame/video/nova2001.c6
-rw-r--r--src/mame/video/oneshot.c3
-rw-r--r--src/mame/video/pooyan.c2
-rw-r--r--src/mame/video/popeye.c38
-rw-r--r--src/mame/video/ppu2c0x.c4
-rw-r--r--src/mame/video/ppu2c0x.h10
-rw-r--r--src/mame/video/psikyo4.c2
-rw-r--r--src/mame/video/raiden.c2
-rw-r--r--src/mame/video/sbasketb.c2
-rw-r--r--src/mame/video/segaic16.h2
-rw-r--r--src/mame/video/segaic24.h4
-rw-r--r--src/mame/video/seibu_crtc.h8
-rw-r--r--src/mame/video/shangkid.c8
-rw-r--r--src/mame/video/sidearms.c2
-rw-r--r--src/mame/video/slapfght.c44
-rw-r--r--src/mame/video/solomon.c2
-rw-r--r--src/mame/video/sonson.c2
-rw-r--r--src/mame/video/ssozumo.c2
-rw-r--r--src/mame/video/sspeedr.c4
-rw-r--r--src/mame/video/stadhero.c2
-rw-r--r--src/mame/video/starcrus.c28
-rw-r--r--src/mame/video/stlforce.c2
-rw-r--r--src/mame/video/strnskil.c2
-rw-r--r--src/mame/video/tagteam.c4
-rw-r--r--src/mame/video/taito_h.c6
-rw-r--r--src/mame/video/taito_o.c2
-rw-r--r--src/mame/video/taitoair.c2
-rw-r--r--src/mame/video/taitosj.c4
-rw-r--r--src/mame/video/tc0080vco.h2
-rw-r--r--src/mame/video/tc0110pcr.c1
-rw-r--r--src/mame/video/tc0110pcr.h9
-rw-r--r--src/mame/video/tc0480scp.h2
-rw-r--r--src/mame/video/tceptor.c2
-rw-r--r--src/mame/video/tecmo_spr.c2
-rw-r--r--src/mame/video/thepit.c4
-rw-r--r--src/mame/video/tia.h4
-rw-r--r--src/mame/video/tigeroad.c2
-rw-r--r--src/mame/video/trackfld.c4
-rw-r--r--src/mame/video/tunhunt.c3
-rw-r--r--src/mame/video/twincobr.c2
-rw-r--r--src/mame/video/wecleman.c1
-rw-r--r--src/mame/video/wiz.c10
-rw-r--r--src/mame/video/wolfpack.c10
-rw-r--r--src/mame/video/ygv608.c6
-rw-r--r--src/mame/video/ygv608.h2
-rw-r--r--src/mame/video/yiear.c2
-rw-r--r--src/mame/video/zaxxon.c8
-rw-r--r--src/mess/audio/upd1771.h2
-rw-r--r--src/mess/drivers/a2600.c4
-rw-r--r--src/mess/drivers/a7000.c2
-rw-r--r--src/mess/drivers/a7800.c318
-rw-r--r--src/mess/drivers/abc1600.c2
-rw-r--r--src/mess/drivers/ace.c2
-rw-r--r--src/mess/drivers/adam.c6
-rw-r--r--src/mess/drivers/alphasma.c2
-rw-r--r--src/mess/drivers/alphatro.c4
-rw-r--r--src/mess/drivers/amiga.c2
-rw-r--r--src/mess/drivers/amstr_pc.c2
-rw-r--r--src/mess/drivers/amstrad.c6
-rw-r--r--src/mess/drivers/amust.c38
-rw-r--r--src/mess/drivers/apc.c10
-rw-r--r--src/mess/drivers/apf.c28
-rw-r--r--src/mess/drivers/apollo.c47
-rw-r--r--src/mess/drivers/apple2.c38
-rw-r--r--src/mess/drivers/apple2gs.c2
-rw-r--r--src/mess/drivers/apple3.c37
-rw-r--r--src/mess/drivers/applix.c2
-rw-r--r--src/mess/drivers/apricot.c4
-rw-r--r--src/mess/drivers/apricotf.c2
-rw-r--r--src/mess/drivers/apricotp.c2
-rw-r--r--src/mess/drivers/argo.c2
-rw-r--r--src/mess/drivers/asst128.c4
-rw-r--r--src/mess/drivers/at.c10
-rw-r--r--src/mess/drivers/atari400.c2
-rw-r--r--src/mess/drivers/atarist.c2
-rw-r--r--src/mess/drivers/atm.c2
-rw-r--r--src/mess/drivers/avigo.c2
-rw-r--r--src/mess/drivers/bcs3.c2
-rw-r--r--src/mess/drivers/beehive.c2
-rw-r--r--src/mess/drivers/bigbord2.c2
-rw-r--r--src/mess/drivers/binbug.c4
-rw-r--r--src/mess/drivers/bmjr.c2
-rw-r--r--src/mess/drivers/bml3.c2
-rw-r--r--src/mess/drivers/c128.c4
-rw-r--r--src/mess/drivers/casloopy.c2
-rw-r--r--src/mess/drivers/cat.c14
-rw-r--r--src/mess/drivers/coco12.c2
-rw-r--r--src/mess/drivers/compis.c6
-rw-r--r--src/mess/drivers/compucolor.c76
-rw-r--r--src/mess/drivers/d6800.c2
-rw-r--r--src/mess/drivers/dct11em.c2
-rw-r--r--src/mess/drivers/dm7000.c2
-rw-r--r--src/mess/drivers/dms5000.c2
-rw-r--r--src/mess/drivers/esq1.c2
-rw-r--r--src/mess/drivers/esq5505.c2
-rw-r--r--src/mess/drivers/esqasr.c4
-rw-r--r--src/mess/drivers/esqkt.c134
-rw-r--r--src/mess/drivers/esqmr.c376
-rw-r--r--src/mess/drivers/europc.c20
-rw-r--r--src/mess/drivers/fanucs15.c680
-rw-r--r--src/mess/drivers/fanucspmg.c110
-rw-r--r--src/mess/drivers/fk1.c2
-rw-r--r--src/mess/drivers/fmtowns.c2
-rw-r--r--src/mess/drivers/fp6000.c2
-rw-r--r--src/mess/drivers/gb.c10
-rw-r--r--src/mess/drivers/geniusiq.c4
-rw-r--r--src/mess/drivers/grfd2301.c2
-rw-r--r--src/mess/drivers/hec2hrp.c2
-rw-r--r--src/mess/drivers/homelab.c6
-rw-r--r--src/mess/drivers/homez80.c2
-rw-r--r--src/mess/drivers/hp48.c88
-rw-r--r--src/mess/drivers/hp9k.c2
-rw-r--r--src/mess/drivers/hprot1.c84
-rw-r--r--src/mess/drivers/hunter2.c18
-rw-r--r--src/mess/drivers/hx20.c4
-rw-r--r--src/mess/drivers/ibm6580.c2
-rw-r--r--src/mess/drivers/ibmpcjr.c10
-rw-r--r--src/mess/drivers/ie15.c4
-rw-r--r--src/mess/drivers/indiana.c12
-rw-r--r--src/mess/drivers/intv.c4
-rw-r--r--src/mess/drivers/ip20.c2
-rw-r--r--src/mess/drivers/ip22.c4
-rw-r--r--src/mess/drivers/iq151.c2
-rw-r--r--src/mess/drivers/irisha.c2
-rw-r--r--src/mess/drivers/itt3030.c2
-rw-r--r--src/mess/drivers/jonos.c2
-rw-r--r--src/mess/drivers/jupiter.c4
-rw-r--r--src/mess/drivers/k8915.c2
-rw-r--r--src/mess/drivers/kaypro.c6
-rw-r--r--src/mess/drivers/konin.c2
-rw-r--r--src/mess/drivers/kyocera.c2
-rw-r--r--src/mess/drivers/lcmate2.c2
-rw-r--r--src/mess/drivers/llc.c4
-rw-r--r--src/mess/drivers/lola8a.c2
-rw-r--r--src/mess/drivers/m20.c13
-rw-r--r--src/mess/drivers/mac.c10
-rw-r--r--src/mess/drivers/mbc200.c2
-rw-r--r--src/mess/drivers/mbee.c2
-rw-r--r--src/mess/drivers/mc80.c4
-rw-r--r--src/mess/drivers/megadriv.c26
-rw-r--r--src/mess/drivers/mes.c2
-rw-r--r--src/mess/drivers/micronic.c4
-rw-r--r--src/mess/drivers/mirage.c2
-rw-r--r--src/mess/drivers/mk85.c2
-rw-r--r--src/mess/drivers/mk90.c2
-rw-r--r--src/mess/drivers/modellot.c4
-rw-r--r--src/mess/drivers/molecular.c2
-rw-r--r--src/mess/drivers/msx.c4
-rw-r--r--src/mess/drivers/multi16.c4
-rw-r--r--src/mess/drivers/multi8.c2
-rw-r--r--src/mess/drivers/mx2178.c2
-rw-r--r--src/mess/drivers/myb3k.c2
-rw-r--r--src/mess/drivers/mycom.c4
-rw-r--r--src/mess/drivers/mz2500.c4
-rw-r--r--src/mess/drivers/mz3500.c4
-rw-r--r--src/mess/drivers/mz700.c2
-rw-r--r--src/mess/drivers/mz80.c2
-rw-r--r--src/mess/drivers/nakajies.c2
-rw-r--r--src/mess/drivers/nanos.c2
-rw-r--r--src/mess/drivers/nc.c4
-rw-r--r--src/mess/drivers/ng_aes.c2
-rw-r--r--src/mess/drivers/ngp.c4
-rw-r--r--src/mess/drivers/octopus.c2
-rw-r--r--src/mess/drivers/odyssey2.c2
-rw-r--r--src/mess/drivers/p2000t.c2
-rw-r--r--src/mess/drivers/palm.c2
-rw-r--r--src/mess/drivers/paso1600.c2
-rw-r--r--src/mess/drivers/pasopia7.c8
-rw-r--r--src/mess/drivers/pb1000.c2
-rw-r--r--src/mess/drivers/pc.c2
-rw-r--r--src/mess/drivers/pc100.c4
-rw-r--r--src/mess/drivers/pc1500.c2
-rw-r--r--src/mess/drivers/pc4.c2
-rw-r--r--src/mess/drivers/pc6001.c2
-rw-r--r--src/mess/drivers/pc8001.c2
-rw-r--r--src/mess/drivers/pc8801.c6
-rw-r--r--src/mess/drivers/pc9801.c72
-rw-r--r--src/mess/drivers/pcm.c2
-rw-r--r--src/mess/drivers/pcw16.c2
-rw-r--r--src/mess/drivers/pda600.c2
-rw-r--r--src/mess/drivers/pentagon.c2
-rw-r--r--src/mess/drivers/phc25.c2
-rw-r--r--src/mess/drivers/phunsy.c6
-rw-r--r--src/mess/drivers/pipbug.c2
-rw-r--r--src/mess/drivers/plan80.c2
-rw-r--r--src/mess/drivers/plus4.c2
-rw-r--r--src/mess/drivers/pocketc.c2
-rw-r--r--src/mess/drivers/portfoli.c2
-rw-r--r--src/mess/drivers/pp01.c2
-rw-r--r--src/mess/drivers/psion.c6
-rw-r--r--src/mess/drivers/psx.c2
-rw-r--r--src/mess/drivers/pt68k4.c35
-rw-r--r--src/mess/drivers/ptcsol.c2
-rw-r--r--src/mess/drivers/pv1000.c2
-rw-r--r--src/mess/drivers/pve500.c6
-rw-r--r--src/mess/drivers/px4.c4
-rw-r--r--src/mess/drivers/ql.c70
-rw-r--r--src/mess/drivers/qx10.c4
-rw-r--r--src/mess/drivers/rainbow.c37
-rw-r--r--src/mess/drivers/rd110.c2
-rw-r--r--src/mess/drivers/replicator.c318
-rw-r--r--src/mess/drivers/rex6000.c2
-rw-r--r--src/mess/drivers/rm380z.c2
-rw-r--r--src/mess/drivers/rmt32.c2
-rw-r--r--src/mess/drivers/rsc55.c28
-rw-r--r--src/mess/drivers/rx78.c4
-rw-r--r--src/mess/drivers/sapi1.c4
-rw-r--r--src/mess/drivers/saturn.c8
-rw-r--r--src/mess/drivers/sbrain.c4
-rw-r--r--src/mess/drivers/sgi_ip2.c8
-rw-r--r--src/mess/drivers/sitcom.c2
-rw-r--r--src/mess/drivers/sm1800.c2
-rw-r--r--src/mess/drivers/smc777.c4
-rw-r--r--src/mess/drivers/socrates.c4
-rw-r--r--src/mess/drivers/softbox.c2
-rw-r--r--src/mess/drivers/sorcerer.c2
-rw-r--r--src/mess/drivers/special.c8
-rw-r--r--src/mess/drivers/spectrum.c2
-rw-r--r--src/mess/drivers/ssem.c2
-rw-r--r--src/mess/drivers/stratos.c18
-rw-r--r--src/mess/drivers/super80.c4
-rw-r--r--src/mess/drivers/supracan.c4
-rw-r--r--src/mess/drivers/sv8000.c15
-rw-r--r--src/mess/drivers/svmu.c2
-rw-r--r--src/mess/drivers/swtpc09.c136
-rw-r--r--src/mess/drivers/sym1.c4
-rw-r--r--src/mess/drivers/tandy1t.c11
-rw-r--r--src/mess/drivers/tandy2k.c20
-rw-r--r--src/mess/drivers/tavernie.c2
-rw-r--r--src/mess/drivers/thomson.c20
-rw-r--r--src/mess/drivers/ti85.c6
-rw-r--r--src/mess/drivers/ti89.c2
-rw-r--r--src/mess/drivers/tim011.c2
-rw-r--r--src/mess/drivers/tim100.c2
-rw-r--r--src/mess/drivers/tk80bs.c4
-rw-r--r--src/mess/drivers/trs80.c4
-rw-r--r--src/mess/drivers/uknc.c2
-rw-r--r--src/mess/drivers/unior.c2
-rw-r--r--src/mess/drivers/unistar.c2
-rw-r--r--src/mess/drivers/univac.c2
-rw-r--r--src/mess/drivers/ut88.c2
-rw-r--r--src/mess/drivers/v6809.c2
-rw-r--r--src/mess/drivers/vboy.c2
-rw-r--r--src/mess/drivers/vector06.c2
-rw-r--r--src/mess/drivers/victor9k.c20
-rw-r--r--src/mess/drivers/vip.c40
-rw-r--r--src/mess/drivers/vt100.c2
-rw-r--r--src/mess/drivers/vt220.c2
-rw-r--r--src/mess/drivers/vt320.c2
-rw-r--r--src/mess/drivers/vt520.c2
-rw-r--r--src/mess/drivers/vta2000.c4
-rw-r--r--src/mess/drivers/vtech1.c8
-rw-r--r--src/mess/drivers/wangpc.c2
-rw-r--r--src/mess/drivers/wswan.c4
-rw-r--r--src/mess/drivers/x07.c12
-rw-r--r--src/mess/drivers/x68k.c4
-rw-r--r--src/mess/drivers/xerox820.c4
-rw-r--r--src/mess/drivers/ymmu100.c6
-rw-r--r--src/mess/drivers/z100.c6
-rw-r--r--src/mess/drivers/z1013.c2
-rw-r--r--src/mess/drivers/z80ne.c4
-rw-r--r--src/mess/drivers/z9001.c2
-rw-r--r--src/mess/drivers/zorba.c4
-rw-r--r--src/mess/drivers/zrt80.c2
-rw-r--r--src/mess/includes/a7800.h2
-rw-r--r--src/mess/includes/advision.h2
-rw-r--r--src/mess/includes/amstrad.h2
-rw-r--r--src/mess/includes/apollo.h8
-rw-r--r--src/mess/includes/apple2gs.h2
-rw-r--r--src/mess/includes/apple3.h6
-rw-r--r--src/mess/includes/apricotf.h2
-rw-r--r--src/mess/includes/aquarius.h2
-rw-r--r--src/mess/includes/atarist.h2
-rw-r--r--src/mess/includes/avigo.h2
-rw-r--r--src/mess/includes/b2m.h2
-rw-r--r--src/mess/includes/bbc.h2
-rw-r--r--src/mess/includes/dm7000.h6
-rw-r--r--src/mess/includes/einstein.h2
-rw-r--r--src/mess/includes/fm7.h2
-rw-r--r--src/mess/includes/genpc.h4
-rw-r--r--src/mess/includes/intv.h2
-rw-r--r--src/mess/includes/kaypro.h2
-rw-r--r--src/mess/includes/lisa.h4
-rw-r--r--src/mess/includes/mc1502.h4
-rw-r--r--src/mess/includes/mikromik.h2
-rw-r--r--src/mess/includes/nascom1.h2
-rw-r--r--src/mess/includes/p2000t.h2
-rw-r--r--src/mess/includes/partner.h4
-rw-r--r--src/mess/includes/pcw.h2
-rw-r--r--src/mess/includes/pocketc.h2
-rw-r--r--src/mess/includes/ql.h132
-rw-r--r--src/mess/includes/rmnimbus.h2
-rw-r--r--src/mess/includes/softbox.h2
-rw-r--r--src/mess/includes/special.h4
-rw-r--r--src/mess/includes/studio2.h2
-rw-r--r--src/mess/includes/super80.h2
-rw-r--r--src/mess/includes/svi318.h2
-rw-r--r--src/mess/includes/swtpc09.h77
-rw-r--r--src/mess/includes/thomson.h2
-rw-r--r--src/mess/includes/tiki100.h2
-rw-r--r--src/mess/includes/tvc.h2
-rw-r--r--src/mess/includes/vc4000.h2
-rw-r--r--src/mess/includes/vector06.h2
-rw-r--r--src/mess/includes/x68k.h2
-rw-r--r--src/mess/includes/z88.h2
-rw-r--r--src/mess/includes/zx.h2
-rw-r--r--src/mess/layout/pve500.lay10
-rw-r--r--src/mess/layout/rainbow.lay2
-rw-r--r--src/mess/machine/6883sam.h2
-rw-r--r--src/mess/machine/a7800.c8
-rw-r--r--src/mess/machine/amstrad.c2
-rw-r--r--src/mess/machine/apollo.c24
-rw-r--r--src/mess/machine/apollo_kbd.c2
-rw-r--r--src/mess/machine/apple2.c20
-rw-r--r--src/mess/machine/apple2gs.c10
-rw-r--r--src/mess/machine/apple3.c153
-rw-r--r--src/mess/machine/apricotkb.c18
-rw-r--r--src/mess/machine/apricotkb.h2
-rw-r--r--src/mess/machine/atarifdc.c2
-rw-r--r--src/mess/machine/atarifdc.h2
-rw-r--r--src/mess/machine/bbc.c12
-rw-r--r--src/mess/machine/beta.h10
-rw-r--r--src/mess/machine/dec_lk201.c147
-rw-r--r--src/mess/machine/dgn_beta.c2
-rw-r--r--src/mess/machine/hp48.c12
-rw-r--r--src/mess/machine/mac.c8
-rw-r--r--src/mess/machine/mackbd.h6
-rw-r--r--src/mess/machine/mega32x.c6
-rw-r--r--src/mess/machine/mega32x.h8
-rw-r--r--src/mess/machine/megacd.h4
-rw-r--r--src/mess/machine/micropolis.h2
-rw-r--r--src/mess/machine/nes.c2
-rw-r--r--src/mess/machine/oric.c2
-rw-r--r--src/mess/machine/partner.c2
-rw-r--r--src/mess/machine/pecom.c2
-rw-r--r--src/mess/machine/sgi.c2
-rw-r--r--src/mess/machine/sgi.h2
-rw-r--r--src/mess/machine/smartmed.c4
-rw-r--r--src/mess/machine/sms.c14
-rw-r--r--src/mess/machine/svi318.c4
-rw-r--r--src/mess/machine/swtpc09.c624
-rw-r--r--src/mess/machine/thomson.c46
-rw-r--r--src/mess/machine/ti99/990_hd.h4
-rw-r--r--src/mess/machine/ti99/grom.c2
-rw-r--r--src/mess/machine/ti99/grom.h4
-rw-r--r--src/mess/machine/ti99/gromport.c14
-rw-r--r--src/mess/machine/ti99/speech8.h2
-rw-r--r--src/mess/machine/x68k_kbd.c6
-rw-r--r--src/mess/machine/zx8302.h12
-rw-r--r--src/mess/mess.lst4
-rw-r--r--src/mess/mess.mak4
-rw-r--r--src/mess/video/a7800.c18
-rw-r--r--src/mess/video/abc80.c2
-rw-r--r--src/mess/video/abc800.c4
-rw-r--r--src/mess/video/apollo.c5
-rw-r--r--src/mess/video/apple3.c4
-rw-r--r--src/mess/video/gb_lcd.c2
-rw-r--r--src/mess/video/gime.h4
-rw-r--r--src/mess/video/intv.c4
-rw-r--r--src/mess/video/mikromik.c2
-rw-r--r--src/mess/video/nascom1.c4
-rw-r--r--src/mess/video/osi.c2
-rw-r--r--src/mess/video/pc1251.c70
-rw-r--r--src/mess/video/pc1350.c90
-rw-r--r--src/mess/video/pc1401.c50
-rw-r--r--src/mess/video/tmc600.c4
-rw-r--r--src/mess/video/v1050.c2
-rw-r--r--src/mess/video/vtvideo.c52
-rw-r--r--src/mess/video/vtvideo.h2
-rw-r--r--src/mess/video/zx8301.h2
-rw-r--r--src/osd/osdcomm.h4
-rw-r--r--src/osd/osdcore.h2
-rw-r--r--src/osd/sdl/blit13.h4
-rw-r--r--src/osd/sdl/drawogl.c1
-rw-r--r--src/osd/sdl/gl_shader_mgr.c12
-rw-r--r--src/osd/sdl/window.c4
-rw-r--r--src/tools/nltool.c211
-rw-r--r--src/tools/srcclean.c94
-rw-r--r--src/tools/unidasm.c6
-rw-r--r--src/version.c2
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.
</part>
</software>
- <!-- XM board enhanced -->
-
- <!-- these should require an XM board? but the emulation seems to be built into the base driver?-->
- <!-- these have had the header stripped vs the .a78 files offered
- there was also a 'binary' with size 0x24000, CRC fd503bd4 -->
- <software name="dkongxm">
- <description>Donkey Kong (homebrew, XM enhanced, HSC support) (Demo)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
- <sharedfeat name="compatibility" value="PAL"/>
- <part name="cart" interface="a7800_cart">
- <feature name="pcb_type" value="TYPE-XM" />
- <dataarea name="rom" size="0x24000">
- <rom name="dkxm_final_demo_pal_hsc.a78" size="0x24000" crc="6510b674" sha1="65b723b470d287af51e9888813149c43fb11ac26" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="dkongxmu" cloneof="dkongxm" >
- <description>Donkey Kong (homebrew, XM enhanced, HSC support) (Demo) (NTSC)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
- <sharedfeat name="compatibility" value="NTSC"/>
- <part name="cart" interface="a7800_cart">
- <feature name="pcb_type" value="TYPE-XM" />
- <dataarea name="rom" size="0x24000">
- <rom name="dkxm_final_demo_ntsc_hsc.a78" size="0x24000" crc="2c67fea7" sha1="7825c1946e3c7492fa9bbfae33029cd68c0d1135" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="dkongxmn" cloneof="dkongxm">
- <description>Donkey Kong (homebrew, XM enhanced) (Demo)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
- <sharedfeat name="compatibility" value="PAL"/>
- <part name="cart" interface="a7800_cart">
- <feature name="pcb_type" value="TYPE-XM" />
- <dataarea name="rom" size="0x24000">
- <rom name="dkxm_final_demo_pal.a78" size="0x24000" crc="d362712e" sha1="118c462d6698bd23c378785f80062fdd7d65ca00" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="dkongxmnu" cloneof="dkongxm" >
- <description>Donkey Kong (homebrew, XM enhanced) (Demo) (NTSC)</description>
- <year>2012</year>
- <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
- <sharedfeat name="compatibility" value="NTSC"/>
- <part name="cart" interface="a7800_cart">
- <feature name="pcb_type" value="TYPE-XM" />
- <dataarea name="rom" size="0x24000">
- <rom name="dkxm_final_demo_ntsc.a78" size="0x24000" crc="6e170055" sha1="f4da231312da06ff9e8af5681b5013b14886b455" offset="0" />
- </dataarea>
- </part>
- </software>
+ <!-- XM board enhanced -->
+
+ <!-- these should require an XM board? but the emulation seems to be built into the base driver?-->
+ <!-- these have had the header stripped vs the .a78 files offered
+ there was also a 'binary' with size 0x24000, CRC fd503bd4 -->
+ <software name="dkongxm">
+ <description>Donkey Kong (homebrew, XM enhanced, HSC support) (Demo)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
+ <sharedfeat name="compatibility" value="PAL"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="pcb_type" value="TYPE-XM" />
+ <dataarea name="rom" size="0x24000">
+ <rom name="dkxm_final_demo_pal_hsc.a78" size="0x24000" crc="6510b674" sha1="65b723b470d287af51e9888813149c43fb11ac26" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="dkongxmu" cloneof="dkongxm" >
+ <description>Donkey Kong (homebrew, XM enhanced, HSC support) (Demo) (NTSC)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
+ <sharedfeat name="compatibility" value="NTSC"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="pcb_type" value="TYPE-XM" />
+ <dataarea name="rom" size="0x24000">
+ <rom name="dkxm_final_demo_ntsc_hsc.a78" size="0x24000" crc="2c67fea7" sha1="7825c1946e3c7492fa9bbfae33029cd68c0d1135" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="dkongxmn" cloneof="dkongxm">
+ <description>Donkey Kong (homebrew, XM enhanced) (Demo)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
+ <sharedfeat name="compatibility" value="PAL"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="pcb_type" value="TYPE-XM" />
+ <dataarea name="rom" size="0x24000">
+ <rom name="dkxm_final_demo_pal.a78" size="0x24000" crc="d362712e" sha1="118c462d6698bd23c378785f80062fdd7d65ca00" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="dkongxmnu" cloneof="dkongxm" >
+ <description>Donkey Kong (homebrew, XM enhanced) (Demo) (NTSC)</description>
+ <year>2012</year>
+ <publisher>&lt;homebrew&gt;</publisher> <!-- TEP392 -->
+ <sharedfeat name="compatibility" value="NTSC"/>
+ <part name="cart" interface="a7800_cart">
+ <feature name="pcb_type" value="TYPE-XM" />
+ <dataarea name="rom" size="0x24000">
+ <rom name="dkxm_final_demo_ntsc.a78" size="0x24000" crc="6e170055" sha1="f4da231312da06ff9e8af5681b5013b14886b455" offset="0" />
+ </dataarea>
+ </part>
+ </software>
</softwarelist>
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 @@
<softwarelist name="coco_flop" description="Tandy Radio Shack Color Computer disk images">
- <!-- coco3 only requires 512Kb, audio is a farty, run best with a a 6309? - coco3h driver) -->
- <!-- RUN"DONKEY" -->
- <software name="dkong" supported ="partial">
+ <!-- coco3 only requires 512Kb, audio is a farty, run best with a a 6309? - coco3h driver) -->
+ <!-- RUN"DONKEY" -->
+ <software name="dkong" supported ="partial">
<description>Donkey Kong (Sock Master's Donkey Kong Emulator for CoCo 3) (512Kb)</description>
<year>2007</year>
<publisher>Sock Master</publisher>
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...
- <!-- Devices -->
-
- <!-- mounting this should add the floppy drive, rather than it always being there? -->
- <software name="diskbas">
- <description>Disk BASIC v1.0 for FS-FD1 (Japan)</description>
- <year>1987</year>
- <publisher>Matsushita</publisher>
- <part name="cart" interface="msx_cart">
- <feature name="mapper" value="DISK_ROM" />
- <dataarea name="rom" size="0x4000">
- <rom name="disk basic v1.0 for fs-fd1 (1987)(matsushita electric industrial)(jp).rom" size="0x4000" crc="4c9b8214" sha1="8e3f6f08309f082a82be8298a66c9b90f2d34ad4" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <!-- SORT -->
+ <!-- Devices -->
+
+ <!-- mounting this should add the floppy drive, rather than it always being there? -->
+ <software name="diskbas">
+ <description>Disk BASIC v1.0 for FS-FD1 (Japan)</description>
+ <year>1987</year>
+ <publisher>Matsushita</publisher>
+ <part name="cart" interface="msx_cart">
+ <feature name="mapper" value="DISK_ROM" />
+ <dataarea name="rom" size="0x4000">
+ <rom name="disk basic v1.0 for fs-fd1 (1987)(matsushita electric industrial)(jp).rom" size="0x4000" crc="4c9b8214" sha1="8e3f6f08309f082a82be8298a66c9b90f2d34ad4" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <!-- SORT -->
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
-
+
-->
<software name="jsw2">
@@ -25,38 +25,38 @@
</part>
</software>
- <software name="ohmummy">
- <description>Oh Mummy!!</description>
- <year>1984</year>
- <publisher>Longman Software</publisher>
- <part name="flop1" interface="floppy_5_25">
- <dataarea name="flop" size="737280">
- <rom name="oh mummy!! (1984)(longman software)(gb).dsk" size="737280" crc="9cf775cc" sha1="cd7db0faf25ae33699b1708a19a874e3662e158a" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="ohshit">
- <description>Oh Shit!</description>
- <year>1986</year>
- <publisher>Aackosoft</publisher>
- <part name="flop1" interface="floppy_5_25">
- <dataarea name="flop" size="737280">
- <rom name="oh shit! (1986)(aackosoft)(nl).dsk" size="737280" crc="735ebc21" sha1="7de3f69a8a5136e0dd25214d36b1194a6506b377" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="ohno" cloneof="ohshit">
- <description>Oh No!</description>
- <year>1986</year>
- <publisher>Eaglesoft</publisher>
- <part name="flop1" interface="floppy_5_25">
- <dataarea name="flop" size="737280">
- <rom name="oh no! (1986)(eaglesoft)(nl)[aka oh shit!].dsk" size="737280" crc="aee65f34" sha1="5c2cd6dd8192a8c29fc0e272181272cb26cc2af6" offset="0" />
- </dataarea>
- </part>
- </software>
+ <software name="ohmummy">
+ <description>Oh Mummy!!</description>
+ <year>1984</year>
+ <publisher>Longman Software</publisher>
+ <part name="flop1" interface="floppy_5_25">
+ <dataarea name="flop" size="737280">
+ <rom name="oh mummy!! (1984)(longman software)(gb).dsk" size="737280" crc="9cf775cc" sha1="cd7db0faf25ae33699b1708a19a874e3662e158a" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="ohshit">
+ <description>Oh Shit!</description>
+ <year>1986</year>
+ <publisher>Aackosoft</publisher>
+ <part name="flop1" interface="floppy_5_25">
+ <dataarea name="flop" size="737280">
+ <rom name="oh shit! (1986)(aackosoft)(nl).dsk" size="737280" crc="735ebc21" sha1="7de3f69a8a5136e0dd25214d36b1194a6506b377" offset="0" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="ohno" cloneof="ohshit">
+ <description>Oh No!</description>
+ <year>1986</year>
+ <publisher>Eaglesoft</publisher>
+ <part name="flop1" interface="floppy_5_25">
+ <dataarea name="flop" size="737280">
+ <rom name="oh no! (1986)(eaglesoft)(nl)[aka oh shit!].dsk" size="737280" crc="aee65f34" sha1="5c2cd6dd8192a8c29fc0e272181272cb26cc2af6" offset="0" />
+ </dataarea>
+ </part>
+ </software>
</softwarelist>
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
</dataarea>
</part>
</software>
-
+
<software name="okaissod">
<description>NHK Okaasan to Issho Do Re Mi Fa Do~nuts! Oekaki Daisuki! Omoshiro Oekaki Daishuugou! (Jpn)</description>
<year>1998</year>
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 @@
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<softwarelist name="psx" description="Sony Playstation CD-ROMs">
- <!-- todo, reconvert original dumps using current CHDMAN verison - Feb 2014 -->
-
+ <!-- todo, reconvert original dumps using current CHDMAN verison - Feb 2014 -->
+
<!--
***********************
NON-REDUMP Rips
@@ -49,11 +49,11 @@ A few comments on these:
<!-- Prototype disks -->
-
+
<software name="bublbob2" >
<!-- Original images
- bb2.bin 62,620,864 1c2c9f63
- bb2.cue 69 096e5077
+ bb2.bin 62,620,864 1c2c9f63
+ bb2.cue 69 096e5077
-->
<description>Bubble Bobble II (prototype)</description>
<year>1995</year>
@@ -65,8 +65,8 @@ A few comments on these:
</part>
</software>
-
-
+
+
<software name="baldgate" supported="no">
<!-- Original images (from drx)
<rom name="baldur's gate - disc 1.bin" size="657475728" crc="96e9befa"/>
diff --git a/src/build/flags_gcc.mak b/src/build/flags_gcc.mak
index bfe6ca6e122..12fceb32135 100644
--- a/src/build/flags_gcc.mak
+++ b/src/build/flags_gcc.mak
@@ -8,7 +8,7 @@ endif
ifeq ($(findstring 4.8.,$(TEST_GCC)),4.8.)
CCOMFLAGS += -Wno-narrowing -Wno-attributes -Wno-unused-local-typedefs
# array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds)
- CCOMFLAGS += -Wno-unused-variable -Wno-array-bounds -Wno-strict-overflow
+ CCOMFLAGS += -Wno-unused-variable -Wno-array-bounds -Wno-strict-overflow
endif
ifeq ($(findstring arm,$(UNAME)),arm)
diff --git a/src/build/png2bdc.c b/src/build/png2bdc.c
index 9eb986a170c..197ded22fcc 100644
--- a/src/build/png2bdc.c
+++ b/src/build/png2bdc.c
@@ -74,7 +74,7 @@ struct render_font_char
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
- bitmap_argb32 * bitmap; // pointer to the bitmap containing the raw data
+ bitmap_argb32 * bitmap; // pointer to the bitmap containing the raw data
};
@@ -107,7 +107,7 @@ inline int pixel_is_set(bitmap_argb32 &bitmap, int y, int x)
//-------------------------------------------------
// write_data - write data to the given file and
-// throw an exception if an error occurs
+// throw an exception if an error occurs
//-------------------------------------------------
static void write_data(core_file &file, UINT8 *base, UINT8 *end)
@@ -123,7 +123,7 @@ static void write_data(core_file &file, UINT8 *base, UINT8 *end)
//-------------------------------------------------
// render_font_save_cached - write the cached
-// data out to the file
+// data out to the file
//-------------------------------------------------
static bool render_font_save_cached(render_font &font, const char *filename, UINT32 hash)
@@ -248,7 +248,7 @@ static bool render_font_save_cached(render_font &font, const char *filename, UIN
//-------------------------------------------------
// bitmap_to_chars - convert a bitmap to
-// characters in the given font
+// characters in the given font
//-------------------------------------------------
static bool bitmap_to_chars(bitmap_argb32 &bitmap, render_font &font)
diff --git a/src/emu/bus/a2bus/a2cffa.c b/src/emu/bus/a2bus/a2cffa.c
index 4d892fc7d61..e3d5dfa3c09 100644
--- a/src/emu/bus/a2bus/a2cffa.c
+++ b/src/emu/bus/a2bus/a2cffa.c
@@ -153,7 +153,7 @@ UINT8 a2bus_cffa2000_device::read_c0nx(address_space &space, UINT8 offset)
// Apple /// driver uses sta $c080,x when writing, which causes spurious reads of c088
if (!m_inwritecycle)
{
- m_lastreaddata = m_ata->read_cs0(space, offset - 8, 0xffff);
+ m_lastreaddata = m_ata->read_cs0(space, offset - 8, 0xffff);
}
return m_lastreaddata & 0xff;
@@ -184,7 +184,7 @@ void a2bus_cffa2000_device::write_c0nx(address_space &space, UINT8 offset, UINT8
case 0:
m_lastdata &= 0x00ff;
m_lastdata |= data<<8;
-// printf("%02x to 0, m_lastdata = %x\n", data, m_lastdata);
+// printf("%02x to 0, m_lastdata = %x\n", data, m_lastdata);
m_inwritecycle = true;
break;
@@ -199,7 +199,7 @@ void a2bus_cffa2000_device::write_c0nx(address_space &space, UINT8 offset, UINT8
case 8:
m_lastdata &= 0xff00;
m_lastdata |= data;
-// printf("%02x to 8, m_lastdata = %x\n", data, m_lastdata);
+// printf("%02x to 8, m_lastdata = %x\n", data, m_lastdata);
m_ata->write_cs0(space, offset-8, m_lastdata, 0xffff);
break;
diff --git a/src/emu/bus/a2bus/a2corvus.c b/src/emu/bus/a2bus/a2corvus.c
index dc5ca2fc5c9..783e6fe7054 100644
--- a/src/emu/bus/a2bus/a2corvus.c
+++ b/src/emu/bus/a2bus/a2corvus.c
@@ -4,27 +4,27 @@
Implementation of the Corvus flat-cable hard disk interface
for the Apple II.
-
+
This same card was used in the Corvus Concept.
-
+
C0n0 = drive read/write
C0n1 = read status (busy in bit 7, data direction in bit 6)
-
- Reads and writes to C0n2+ happen; the contents of the reads are thrown away
+
+ Reads and writes to C0n2+ happen; the contents of the reads are thrown away
immediately by all the code I've examined, and sending the writes to the
drive's write port makes it not work so they're intended to be ignored too.
-
+
5 MB: -chs 144,4,20 -ss 512
10 MB: -chs 358,3,20 -ss 512
20 MB: -chs 388,5,20 -ss 512
-
+
To set up a disk from scratch on the Apple II:
1) Create a disk of your desired capacity using CHDMAN -c none and the parameters
listed above for each of the possible sizes.
2) Boot apple2p with the corvus in slot 2 and a diskii(ng) in slot 6 with the
"Corvus Hard Drive - Diagnostics.dsk" mounted.
3) Press F to format. Accept all the default options from now on;
- there is no "format switch" to worry about with the current emulation.
+ there is no "format switch" to worry about with the current emulation.
4) Quit MESS. Restart with the corvus in slot 6 and a diskii(ng) in slot 7
with the "Corvus Hard Drive - Utilities 1.dsk" mounted.
5) When you get the BASIC prompt, "LOAD BSYSGEN"
@@ -35,7 +35,7 @@
10) When the format completes, type "RUN APPLESOFT BOOT PREP" and press Enter.
11) Once it finishes, quit MESS. Remove the diskii(ng) from slot 7 and
the system should boot from the Corvus HD.
-
+
*********************************************************************/
#include "a2corvus.h"
@@ -53,7 +53,7 @@
const device_type A2BUS_CORVUS = &device_creator<a2bus_corvus_device>;
#define CORVUS_ROM_REGION "corvus_rom"
-#define CORVUS_HD_TAG "corvushd"
+#define CORVUS_HD_TAG "corvushd"
static MACHINE_CONFIG_FRAGMENT(corvus)
MCFG_DEVICE_ADD(CORVUS_HD_TAG, CORVUS_HDC, 0)
@@ -158,7 +158,7 @@ void a2bus_corvus_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
{
if (offset == 0)
{
- m_corvushd->write(space, 0, data);
+ m_corvushd->write(space, 0, data);
}
}
@@ -180,4 +180,3 @@ UINT8 a2bus_corvus_device::read_c800(address_space &space, UINT16 offset)
{
return m_rom[offset & 0x7ff];
}
-
diff --git a/src/emu/bus/a2bus/a2pic.c b/src/emu/bus/a2bus/a2pic.c
index bdf80257493..73d87d0b84b 100644
--- a/src/emu/bus/a2bus/a2pic.c
+++ b/src/emu/bus/a2bus/a2pic.c
@@ -32,7 +32,7 @@ MACHINE_CONFIG_END
ROM_START( pic )
ROM_REGION(0x000200, PIC_ROM_REGION, 0)
- ROM_LOAD( "341-0057.bin", 0x000000, 0x000200, CRC(0d2d84ee) SHA1(bfc5b863d37e59875a6159528eb0f2b6082063b5) )
+ ROM_LOAD( "341-0057.bin", 0x000000, 0x000200, CRC(0d2d84ee) SHA1(bfc5b863d37e59875a6159528eb0f2b6082063b5) )
ROM_END
static INPUT_PORTS_START( pic )
@@ -182,13 +182,13 @@ UINT8 a2bus_pic_device::read_c0nx(address_space &space, UINT8 offset)
{
switch (offset)
{
- case 3:
+ case 3:
return m_ctx_data_in->read();
case 4:
return m_ack;
- case 6: // does reading this really work?
+ case 6: // does reading this really work?
m_irqenable = true;
break;
@@ -211,16 +211,16 @@ void a2bus_pic_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data
{
switch (offset)
{
- case 0: // set data out and send a strobe
+ case 0: // set data out and send a strobe
m_ctx_data_out->write(data);
if (m_autostrobe)
{
start_strobe();
}
- break;
+ break;
- case 2: // send a strobe
+ case 2: // send a strobe
start_strobe();
break;
@@ -236,13 +236,13 @@ void a2bus_pic_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data
}
}
-WRITE_LINE_MEMBER( a2bus_pic_device::ack_w )
+WRITE_LINE_MEMBER( a2bus_pic_device::ack_w )
{
if (m_started)
{
- UINT8 dsw1 = m_dsw1->read();
+ UINT8 dsw1 = m_dsw1->read();
- if (dsw1 & 0x10) // negative polarity
+ if (dsw1 & 0x10) // negative polarity
{
m_ack = (state == ASSERT_LINE) ? 0x00 : 0x80;
}
@@ -251,7 +251,7 @@ WRITE_LINE_MEMBER( a2bus_pic_device::ack_w )
m_ack = (state == ASSERT_LINE) ? 0x80 : 0x00;
}
- m_ack |= 0x40; // set ACK flip-flop
+ m_ack |= 0x40; // set ACK flip-flop
if ((dsw1 & 0x40) && (m_irqenable))
{
@@ -262,9 +262,9 @@ WRITE_LINE_MEMBER( a2bus_pic_device::ack_w )
void a2bus_pic_device::start_strobe()
{
- int usec = ((m_dsw1->read() & 7) * 2) + 1; // strobe length in microseconds
+ int usec = ((m_dsw1->read() & 7) * 2) + 1; // strobe length in microseconds
- if (m_dsw1->read() & 0x8) // negative polarity
+ if (m_dsw1->read() & 0x8) // negative polarity
{
m_ctx->write_strobe(CLEAR_LINE);
}
@@ -278,7 +278,7 @@ void a2bus_pic_device::start_strobe()
void a2bus_pic_device::clear_strobe()
{
- if (m_dsw1->read() & 0x8) // negative polarity
+ if (m_dsw1->read() & 0x8) // negative polarity
{
m_ctx->write_strobe(ASSERT_LINE);
}
diff --git a/src/emu/bus/a2bus/a2ssc.c b/src/emu/bus/a2bus/a2ssc.c
index e170675e0c1..05ffd4e06e4 100644
--- a/src/emu/bus/a2bus/a2ssc.c
+++ b/src/emu/bus/a2bus/a2ssc.c
@@ -228,7 +228,7 @@ WRITE_LINE_MEMBER( a2bus_ssc_device::acia_irq_w )
{
if (m_started)
{
- if (!(m_dsw2->read() & 4))
+ if (!(m_dsw2->read() & 4))
{
if (state)
{
diff --git a/src/emu/bus/a2bus/a2ultraterm.c b/src/emu/bus/a2bus/a2ultraterm.c
index bf5ac0cf8f1..eef9e997e63 100644
--- a/src/emu/bus/a2bus/a2ultraterm.c
+++ b/src/emu/bus/a2bus/a2ultraterm.c
@@ -7,18 +7,18 @@
Notes:
C0nX: C0n0 is 6845 register address,
- C0n1 is 6845 register data.
- C0n2 is control 1: b7 = 0 to read RAM at cc00, 1 for ROM (writes always to RAM)
- b6 = 0 for Apple II video, 1 for 6845
- b5 = 0 for 17.430 MHz 6845 clock, 1 for 28.7595 MHz 6845 clock
- b4 = 0 for 512 byte RAM block addressing (VideoTerm emulation), 1 for 256-byte RAM page addressing
- b3-b0 = page select
- C0n3 is control 2: b7 = 0 for attributes software controllable, 1 for DIP switches control attributes
- b5 = 0 for normal video if bit 7 set, 1 for inverse if bit 7 set
- b4 = 0 for lowlight if bit 7 set, 1 for highlight if bit 7 set
- b2 = 0 for high-density character set, 1 for low-density character set
- b1 = same as b5
- b0 = same as b4
+ C0n1 is 6845 register data.
+ C0n2 is control 1: b7 = 0 to read RAM at cc00, 1 for ROM (writes always to RAM)
+ b6 = 0 for Apple II video, 1 for 6845
+ b5 = 0 for 17.430 MHz 6845 clock, 1 for 28.7595 MHz 6845 clock
+ b4 = 0 for 512 byte RAM block addressing (VideoTerm emulation), 1 for 256-byte RAM page addressing
+ b3-b0 = page select
+ C0n3 is control 2: b7 = 0 for attributes software controllable, 1 for DIP switches control attributes
+ b5 = 0 for normal video if bit 7 set, 1 for inverse if bit 7 set
+ b4 = 0 for lowlight if bit 7 set, 1 for highlight if bit 7 set
+ b2 = 0 for high-density character set, 1 for low-density character set
+ b1 = same as b5
+ b0 = same as b4
C800-CBFF: ROM page 1
CC00-CFEF: VRAM window or ROM page 2
@@ -46,20 +46,20 @@ const device_type A2BUS_ULTRATERMENH = &device_creator<a2bus_ultratermenh_device
#define ULTRATERM_MC6845_NAME "mc6845_uterm"
#define CLOCK_LOW 17430000
-#define CLOCK_HIGH 28759500
+#define CLOCK_HIGH 28759500
-#define CT1_MEMSEL (0x80) // 0 for read RAM at cc00, 1 for read ROM
-#define CT1_VIDSEL (0x40) // 0 for Apple video passthrough, 1 for 6845 video
-#define CT1_CLKSEL (0x20) // 0 for Videoterm clock, 1 for faster clock
-#define CT1_VTEMU (0x10) // Videoterm emulation mode if 0
+#define CT1_MEMSEL (0x80) // 0 for read RAM at cc00, 1 for read ROM
+#define CT1_VIDSEL (0x40) // 0 for Apple video passthrough, 1 for 6845 video
+#define CT1_CLKSEL (0x20) // 0 for Videoterm clock, 1 for faster clock
+#define CT1_VTEMU (0x10) // Videoterm emulation mode if 0
#define CT1_PAGEMASK (0x0f)
-#define CT2_USEDIPS (0x80) // 0 to use the rest of ctrl2's bits, 1 to use DIPs
+#define CT2_USEDIPS (0x80) // 0 to use the rest of ctrl2's bits, 1 to use DIPs
#define CT2_INVBIT7H (0x20)
-#define CT2_HLBIT7H (0x10)
+#define CT2_HLBIT7H (0x10)
#define CT2_HIDENSITY (0x04)
#define CT2_INVBIT7L (0x02)
-#define CT2_HLBIT7L (0x01)
+#define CT2_HLBIT7L (0x01)
static MC6845_UPDATE_ROW( ultraterm_update_row );
@@ -96,24 +96,24 @@ MACHINE_CONFIG_END
ROM_START( a2ultraterm )
ROM_REGION(0x1000, ULTRATERM_ROM_REGION, 0)
- ROM_LOAD( "frm_b537.bin", 0x000000, 0x001000, CRC(1e85a93e) SHA1(b4acd1775c08ae43996ab4edf6d8e28f4736346b) )
+ ROM_LOAD( "frm_b537.bin", 0x000000, 0x001000, CRC(1e85a93e) SHA1(b4acd1775c08ae43996ab4edf6d8e28f4736346b) )
ROM_REGION(0x1000, ULTRATERM_GFX_REGION, 0)
- ROM_LOAD( "chs_7859.bin", 0x000000, 0x001000, CRC(ebe8f333) SHA1(3517fa9e7a39573f1cb159b3161d6939dec199ba) )
+ ROM_LOAD( "chs_7859.bin", 0x000000, 0x001000, CRC(ebe8f333) SHA1(3517fa9e7a39573f1cb159b3161d6939dec199ba) )
ROM_REGION(0x400, "pal", 0)
- ROM_LOAD( "ult_2a313.jed", 0x000000, 0x000305, CRC(dcd51dea) SHA1(0ad0c5e802e48495da27f7bd26ee3ab1c92d74dd) )
+ ROM_LOAD( "ult_2a313.jed", 0x000000, 0x000305, CRC(dcd51dea) SHA1(0ad0c5e802e48495da27f7bd26ee3ab1c92d74dd) )
ROM_END
ROM_START( a2ultratermenh )
ROM_REGION(0x1000, ULTRATERM_ROM_REGION, 0)
- ROM_LOAD( "frm_b5c9.bin", 0x000000, 0x001000, CRC(b71e05e0) SHA1(092e3eda4644d4f465809864a7f023ac7d1d1542) )
+ ROM_LOAD( "frm_b5c9.bin", 0x000000, 0x001000, CRC(b71e05e0) SHA1(092e3eda4644d4f465809864a7f023ac7d1d1542) )
ROM_REGION(0x1000, ULTRATERM_GFX_REGION, 0)
- ROM_LOAD( "chs_5604.bin", 0x000000, 0x001000, CRC(3fb4e90a) SHA1(94ff75199232a9b613585c22f88470f73fb7dd09) )
+ ROM_LOAD( "chs_5604.bin", 0x000000, 0x001000, CRC(3fb4e90a) SHA1(94ff75199232a9b613585c22f88470f73fb7dd09) )
ROM_REGION(0x400, "pal", 0)
- ROM_LOAD( "ult_251c.jed", 0x000000, 0x000305, CRC(12fabb0d) SHA1(d4a36837cb98bb65f7ddef7455eb5a7f8e648a82) )
+ ROM_LOAD( "ult_251c.jed", 0x000000, 0x000305, CRC(12fabb0d) SHA1(d4a36837cb98bb65f7ddef7455eb5a7f8e648a82) )
ROM_END
/***************************************************************************
@@ -245,24 +245,24 @@ void a2bus_videx160_device::write_c0nx(address_space &space, UINT8 offset, UINT8
case 2:
m_ctrl1 = data;
-// printf("%02x to ctrl1\n", data);
+// printf("%02x to ctrl1\n", data);
// if disabling Videoterm emulation, change RAM banking
if (data & CT1_VTEMU)
{
m_rambank = (data & CT1_PAGEMASK) * 256;
}
- break;
+ break;
case 3:
m_ctrl2 = data;
-// printf("%02x to ctrl2\n", data);
+// printf("%02x to ctrl2\n", data);
break;
}
if (!(m_ctrl1 & CT1_VTEMU))
{
- m_rambank = ((offset >> 2) & 3) * 512;
+ m_rambank = ((offset >> 2) & 3) * 512;
}
}
@@ -298,12 +298,12 @@ UINT8 a2bus_videx160_device::read_c800(address_space &space, UINT16 offset)
}
else
{
- if (m_ctrl1 & CT1_MEMSEL) // read ROM?
+ if (m_ctrl1 & CT1_MEMSEL) // read ROM?
{
return m_rom[offset + 0x800];
}
- return m_ram[(offset - 0x400) + m_rambank];
+ return m_ram[(offset - 0x400) + m_rambank];
}
}
diff --git a/src/emu/bus/a2bus/a2videoterm.c b/src/emu/bus/a2bus/a2videoterm.c
index 5c98d1645e1..d347f42d490 100644
--- a/src/emu/bus/a2bus/a2videoterm.c
+++ b/src/emu/bus/a2bus/a2videoterm.c
@@ -125,10 +125,10 @@ ROM_END
ROM_START( a2aevm80 )
ROM_REGION(0x800, VIDEOTERM_ROM_REGION, 0)
- ROM_LOAD( "ae viewmaster 80 rom.bin", 0x000000, 0x000800, CRC(62a4b111) SHA1(159bf7c4add1435be215fddb648c0743fbcc49b5) )
+ ROM_LOAD( "ae viewmaster 80 rom.bin", 0x000000, 0x000800, CRC(62a4b111) SHA1(159bf7c4add1435be215fddb648c0743fbcc49b5) )
ROM_REGION(0x1000, VIDEOTERM_GFX_REGION, 0)
- ROM_LOAD( "ae viewmaster 80 video rom.bin", 0x000000, 0x000800, CRC(4801ab90) SHA1(f90658ffee7740f3cb30ecef2e151f7dc6098833) )
+ ROM_LOAD( "ae viewmaster 80 video rom.bin", 0x000000, 0x000800, CRC(4801ab90) SHA1(f90658ffee7740f3cb30ecef2e151f7dc6098833) )
ROM_END
/***************************************************************************
diff --git a/src/emu/bus/a2bus/a2videoterm.h b/src/emu/bus/a2bus/a2videoterm.h
index 5213f41945c..5043a6cafd8 100644
--- a/src/emu/bus/a2bus/a2videoterm.h
+++ b/src/emu/bus/a2bus/a2videoterm.h
@@ -50,7 +50,7 @@ protected:
private:
int m_rambank;
-public:
+public:
required_device<palette_device> m_palette;
};
diff --git a/src/emu/bus/a2bus/a2vulcan.c b/src/emu/bus/a2bus/a2vulcan.c
index abd7fe21c32..ea13109e70c 100644
--- a/src/emu/bus/a2bus/a2vulcan.c
+++ b/src/emu/bus/a2bus/a2vulcan.c
@@ -77,7 +77,7 @@ ROM_END
ROM_START( vulcangold )
ROM_REGION(0x4000, VULCAN_ROM_REGION, 0)
- ROM_LOAD( "ae vulcan gold rom v2.0.bin", 0x000000, 0x004000, CRC(19bc3958) SHA1(96a22c2540fa603648a4e638e176eee76523b4e1) )
+ ROM_LOAD( "ae vulcan gold rom v2.0.bin", 0x000000, 0x004000, CRC(19bc3958) SHA1(96a22c2540fa603648a4e638e176eee76523b4e1) )
ROM_END
/***************************************************************************
diff --git a/src/emu/bus/adam/exp.h b/src/emu/bus/adam/exp.h
index c298a64a719..412aafe4ba2 100644
--- a/src/emu/bus/adam/exp.h
+++ b/src/emu/bus/adam/exp.h
@@ -51,8 +51,8 @@
class device_adam_expansion_slot_card_interface;
class adam_expansion_slot_device : public device_t,
- public device_slot_interface,
- public device_image_interface
+ public device_slot_interface,
+ public device_image_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/adamnet/fdc.h b/src/emu/bus/adamnet/fdc.h
index 89b7777af31..82883d1bdc5 100644
--- a/src/emu/bus/adamnet/fdc.h
+++ b/src/emu/bus/adamnet/fdc.h
@@ -29,7 +29,7 @@
// ======================> adam_fdc_device
class adam_fdc_device : public device_t,
- public device_adamnet_card_interface
+ public device_adamnet_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/adamnet/spi.c b/src/emu/bus/adamnet/spi.c
index 45041576def..b7248b4a0c9 100644
--- a/src/emu/bus/adamnet/spi.c
+++ b/src/emu/bus/adamnet/spi.c
@@ -18,9 +18,9 @@
//**************************************************************************
#define M6801_TAG "m6801"
-#define MC2661_TAG "mc2661"
-#define RS232_TAG "rs232"
-#define CENTRONICS_TAG "centronics"
+#define MC2661_TAG "mc2661"
+#define RS232_TAG "rs232"
+#define CENTRONICS_TAG "centronics"
diff --git a/src/emu/bus/adamnet/spi.h b/src/emu/bus/adamnet/spi.h
index 819d58ddd2b..dde7a772918 100644
--- a/src/emu/bus/adamnet/spi.h
+++ b/src/emu/bus/adamnet/spi.h
@@ -30,7 +30,7 @@
// ======================> adam_spi_device
class adam_spi_device : public device_t,
- public device_adamnet_card_interface
+ public device_adamnet_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/bml3/bml3mp1805.h b/src/emu/bus/bml3/bml3mp1805.h
index 4f3ab58e9dd..be2a072ae7d 100644
--- a/src/emu/bus/bml3/bml3mp1805.h
+++ b/src/emu/bus/bml3/bml3mp1805.h
@@ -33,7 +33,7 @@ public:
DECLARE_READ8_MEMBER(bml3_mp1805_r);
DECLARE_WRITE8_MEMBER(bml3_mp1805_w);
-
+
DECLARE_WRITE_LINE_MEMBER( bml3_mc6843_intrq_w );
protected:
diff --git a/src/emu/bus/c64/magic_formel.c b/src/emu/bus/c64/magic_formel.c
index d811f472767..d645baf34d5 100644
--- a/src/emu/bus/c64/magic_formel.c
+++ b/src/emu/bus/c64/magic_formel.c
@@ -11,9 +11,9 @@
/*
- TODO:
+ TODO:
- - pia6821 port A DDR needs to reset to 0xff or this won't boot
+ - pia6821 port A DDR needs to reset to 0xff or this won't boot
*/
@@ -69,7 +69,7 @@ WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pb_w )
PB2 RAM A9
PB3 RAM A8
PB4 RAM A12
- PB5 U9A clr
+ PB5 U9A clr
PB6
PB7 ROMH enable
diff --git a/src/emu/bus/cbm2/hrg.c b/src/emu/bus/cbm2/hrg.c
index 48968c70e9b..893b237bc5f 100644
--- a/src/emu/bus/cbm2/hrg.c
+++ b/src/emu/bus/cbm2/hrg.c
@@ -13,7 +13,7 @@
TODO:
- http://www.wfking.de/hires.htm
+ http://www.wfking.de/hires.htm
- version A (EF9365, 512x512 interlaced, 1 page)
- version B (EF9366, 512x256 non-interlaced, 2 pages)
diff --git a/src/emu/bus/cbm2/hrg.h b/src/emu/bus/cbm2/hrg.h
index 16c54a97118..78097da80e2 100644
--- a/src/emu/bus/cbm2/hrg.h
+++ b/src/emu/bus/cbm2/hrg.h
@@ -26,7 +26,7 @@
// ======================> cbm2_graphic_cartridge_device
class cbm2_graphic_cartridge_device : public device_t,
- public device_cbm2_expansion_card_interface
+ public device_cbm2_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cbm2/user.h b/src/emu/bus/cbm2/user.h
index 7f2352047b0..842426c93da 100644
--- a/src/emu/bus/cbm2/user.h
+++ b/src/emu/bus/cbm2/user.h
@@ -104,7 +104,7 @@ protected:
// ======================> cbm2_user_port_device
class cbm2_user_port_device : public device_t,
- public device_slot_interface
+ public device_slot_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cbmiec/c1541.c b/src/emu/bus/cbmiec/c1541.c
index ca9fb28de68..f0f8277861f 100644
--- a/src/emu/bus/cbmiec/c1541.c
+++ b/src/emu/bus/cbmiec/c1541.c
@@ -706,7 +706,7 @@ WRITE_LINE_MEMBER( base_c1541_device::byte_w )
//-------------------------------------------------
static SLOT_INTERFACE_START( c1540_floppies )
- SLOT_INTERFACE( "525ssqd", ALPS_3255190x )
+ SLOT_INTERFACE( "525ssqd", ALPS_3255190x )
SLOT_INTERFACE_END
@@ -715,8 +715,8 @@ SLOT_INTERFACE_END
//-------------------------------------------------
FLOPPY_FORMATS_MEMBER( base_c1541_device::floppy_formats )
- FLOPPY_D64_FORMAT,
- FLOPPY_G64_FORMAT
+ FLOPPY_D64_FORMAT,
+ FLOPPY_G64_FORMAT
FLOPPY_FORMATS_END
@@ -889,7 +889,7 @@ static MACHINE_CONFIG_FRAGMENT( c1541pdc )
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image")
MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(MC6821_TAG, pia6821_device, ca1_w))
- MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
+ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
diff --git a/src/emu/bus/cbmiec/c1541.h b/src/emu/bus/cbmiec/c1541.h
index 9fac9a61968..86f05529ac2 100644
--- a/src/emu/bus/cbmiec/c1541.h
+++ b/src/emu/bus/cbmiec/c1541.h
@@ -40,8 +40,8 @@
// ======================> base_c1541_device
class base_c1541_device : public device_t,
- public device_cbm_iec_interface,
- public device_c64_floppy_parallel_interface
+ public device_cbm_iec_interface,
+ public device_c64_floppy_parallel_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cbmiec/c1571.c b/src/emu/bus/cbmiec/c1571.c
index 3733582e77d..7a62db76330 100644
--- a/src/emu/bus/cbmiec/c1571.c
+++ b/src/emu/bus/cbmiec/c1571.c
@@ -13,7 +13,7 @@
TODO:
- - WD1770 set_floppy
+ - WD1770 set_floppy
- 1571CR
- MOS5710
- ICT Mini Chief MC-20
@@ -698,7 +698,7 @@ static MACHINE_CONFIG_FRAGMENT( c1571 )
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
-
+
MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
diff --git a/src/emu/bus/cbmiec/c1571.h b/src/emu/bus/cbmiec/c1571.h
index 519ed496fe2..4bcd01d5c2b 100644
--- a/src/emu/bus/cbmiec/c1571.h
+++ b/src/emu/bus/cbmiec/c1571.h
@@ -42,8 +42,8 @@
// ======================> c1571_device
class c1571_device : public device_t,
- public device_cbm_iec_interface,
- public device_c64_floppy_parallel_interface
+ public device_cbm_iec_interface,
+ public device_c64_floppy_parallel_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/coco/coco_fdc.c b/src/emu/bus/coco/coco_fdc.c
index 29b60b23a7c..305622c5873 100644
--- a/src/emu/bus/coco/coco_fdc.c
+++ b/src/emu/bus/coco/coco_fdc.c
@@ -80,7 +80,7 @@
#define LOG_FDC 0
#define WD_TAG "wd17xx"
-#define WD2797_TAG "wd2797"
+#define WD2797_TAG "wd2797"
#define DISTO_TAG "disto"
#define CLOUD9_TAG "cloud9"
@@ -437,7 +437,7 @@ const device_type DRAGON_FDC = &device_creator<dragon_fdc_device>;
// dragon_fdc_device - constructor
//-------------------------------------------------
dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
- : coco_fdc_device(mconfig, type, name, tag, owner, clock, shortname, source)
+ : coco_fdc_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/bus/coco/coco_fdc.h b/src/emu/bus/coco/coco_fdc.h
index fabfe12511a..ddbfcae868d 100644
--- a/src/emu/bus/coco/coco_fdc.h
+++ b/src/emu/bus/coco/coco_fdc.h
@@ -46,7 +46,7 @@ public:
void set_intrq(UINT8 val) { m_intrq = val; }
void set_drq(UINT8 val) { m_drq = val; }
-
+
DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w);
DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
protected:
@@ -65,12 +65,12 @@ protected:
UINT8 m_intrq : 1;
optional_device<wd1773_device> m_wd17xx; /* WD17xx */
- optional_device<wd2797_device> m_wd2797; /* WD2797 */
+ optional_device<wd2797_device> m_wd2797; /* WD2797 */
optional_device<ds1315_device> m_ds1315; /* DS1315 */
/* Disto RTC */
optional_device<msm6242_device> m_disto_msm6242; /* 6242 RTC on Disto interface */
-
+
offs_t m_msm6242_rtc_address;
};
diff --git a/src/emu/bus/coleco/exp.h b/src/emu/bus/coleco/exp.h
index d86be925df3..25dcd547cf7 100644
--- a/src/emu/bus/coleco/exp.h
+++ b/src/emu/bus/coleco/exp.h
@@ -64,8 +64,8 @@
class device_colecovision_cartridge_interface;
class colecovision_cartridge_slot_device : public device_t,
- public device_slot_interface,
- public device_image_interface
+ public device_slot_interface,
+ public device_image_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/coleco/hand.h b/src/emu/bus/coleco/hand.h
index 2a8f0690349..aeab7d65683 100644
--- a/src/emu/bus/coleco/hand.h
+++ b/src/emu/bus/coleco/hand.h
@@ -26,7 +26,7 @@
// ======================> coleco_hand_controller_t
class coleco_hand_controller_t : public device_t,
- public device_colecovision_control_port_interface
+ public device_colecovision_control_port_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/coleco/sac.h b/src/emu/bus/coleco/sac.h
index f0d7fe39020..18c6ec2eb3c 100644
--- a/src/emu/bus/coleco/sac.h
+++ b/src/emu/bus/coleco/sac.h
@@ -26,7 +26,7 @@
// ======================> coleco_super_action_controller_t
class coleco_super_action_controller_t : public device_t,
- public device_colecovision_control_port_interface
+ public device_colecovision_control_port_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/coleco/std.h b/src/emu/bus/coleco/std.h
index c05e9526e6b..46b8c8b3521 100644
--- a/src/emu/bus/coleco/std.h
+++ b/src/emu/bus/coleco/std.h
@@ -25,7 +25,7 @@
// ======================> colecovision_standard_cartridge_device
class colecovision_standard_cartridge_device : public device_t,
- public device_colecovision_cartridge_interface
+ public device_colecovision_cartridge_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/compucolor/floppy.c b/src/emu/bus/compucolor/floppy.c
index 62d8d2437b8..a2c840af357 100644
--- a/src/emu/bus/compucolor/floppy.c
+++ b/src/emu/bus/compucolor/floppy.c
@@ -111,7 +111,7 @@ compucolor_floppy_device::compucolor_floppy_device(const machine_config &mconfig
//-------------------------------------------------
-// device_config_complete -
+// device_config_complete -
//-------------------------------------------------
void compucolor_floppy_port_device::device_config_complete()
diff --git a/src/emu/bus/comx35/exp.h b/src/emu/bus/comx35/exp.h
index 669d01963a2..22c9f49b028 100644
--- a/src/emu/bus/comx35/exp.h
+++ b/src/emu/bus/comx35/exp.h
@@ -74,7 +74,7 @@
class device_comx_expansion_card_interface;
class comx_expansion_slot_device : public device_t,
- public device_slot_interface
+ public device_slot_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/comx35/printer.c b/src/emu/bus/comx35/printer.c
index 0c748e2012b..568a534324b 100644
--- a/src/emu/bus/comx35/printer.c
+++ b/src/emu/bus/comx35/printer.c
@@ -73,7 +73,7 @@ static MACHINE_CONFIG_FRAGMENT( comx_prn )
MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1))
MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit2))
MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit3))
- MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
+ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
MACHINE_CONFIG_END
diff --git a/src/emu/bus/ecbbus/ecbbus.h b/src/emu/bus/ecbbus/ecbbus.h
index 8989a2107ac..34d07bcd08f 100644
--- a/src/emu/bus/ecbbus/ecbbus.h
+++ b/src/emu/bus/ecbbus/ecbbus.h
@@ -69,8 +69,7 @@
//**************************************************************************
#define MCFG_ECBBUS_ADD() \
- MCFG_DEVICE_ADD(ECBBUS_TAG, ECBBUS, 0) \
-
+ MCFG_DEVICE_ADD(ECBBUS_TAG, ECBBUS, 0)
#define MCFG_ECBBUS_SLOT_ADD(_num, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, ECBBUS_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@@ -94,7 +93,7 @@
class ecbbus_device;
class ecbbus_slot_device : public device_t,
- public device_slot_interface
+ public device_slot_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ecbbus/grip.c b/src/emu/bus/ecbbus/grip.c
index 87799fa7ee8..3d9e77899ad 100644
--- a/src/emu/bus/ecbbus/grip.c
+++ b/src/emu/bus/ecbbus/grip.c
@@ -305,13 +305,13 @@ static MC6845_INTERFACE( crtc_intf )
static MC6845_INTERFACE( grip5_crtc_intf )
{
false,
- 0,0,0,0,
+ 0,0,0,0,
8,
NULL,
grip5_update_row,
NULL,
- DEVCB_DEVICE_LINE_MEMBER(Z80STI_TAG, z80sti_device, i1_w),
- DEVCB_DEVICE_LINE_MEMBER(Z80STI_TAG, z80sti_device, i2_w),
+ DEVCB_DEVICE_LINE_MEMBER(Z80STI_TAG, z80sti_device, i1_w),
+ DEVCB_DEVICE_LINE_MEMBER(Z80STI_TAG, z80sti_device, i2_w),
DEVCB_NULL,
DEVCB_NULL,
grip5_update_addr_changed
diff --git a/src/emu/bus/econet/e01.c b/src/emu/bus/econet/e01.c
index 53a9a655f19..f5fed35d73b 100644
--- a/src/emu/bus/econet/e01.c
+++ b/src/emu/bus/econet/e01.c
@@ -197,7 +197,7 @@ WRITE_LINE_MEMBER( e01_device::fdc_irq_w )
update_interrupts();
}
-WRITE_LINE_MEMBER( e01_device::fdc_drq_w )
+WRITE_LINE_MEMBER( e01_device::fdc_drq_w )
{
m_fdc_drq = state;
diff --git a/src/emu/bus/econet/econet.c b/src/emu/bus/econet/econet.c
index aaf37e513df..03016e6afc0 100644
--- a/src/emu/bus/econet/econet.c
+++ b/src/emu/bus/econet/econet.c
@@ -196,7 +196,7 @@ inline int econet_device::get_signal(int signal)
// econet_device - constructor
//-------------------------------------------------
-econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ECONET, "Econet", tag, owner, clock, "econet", __FILE__),
m_write_clk(*this),
m_write_data(*this)
diff --git a/src/emu/bus/econet/econet.h b/src/emu/bus/econet/econet.h
index 1ec6f3dad72..542fd910108 100644
--- a/src/emu/bus/econet/econet.h
+++ b/src/emu/bus/econet/econet.h
@@ -31,8 +31,7 @@
//**************************************************************************
#define MCFG_ECONET_ADD() \
- MCFG_DEVICE_ADD(ECONET_TAG, ECONET, 0) \
-
+ MCFG_DEVICE_ADD(ECONET_TAG, ECONET, 0)
#define MCFG_ECONET_SLOT_ADD(_tag, _num, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, ECONET_SLOT, 0) \
diff --git a/src/emu/bus/ep64/exp.h b/src/emu/bus/ep64/exp.h
index ae077f830d9..2afee455d39 100644
--- a/src/emu/bus/ep64/exp.h
+++ b/src/emu/bus/ep64/exp.h
@@ -69,8 +69,7 @@
#define MCFG_EP64_EXPANSION_BUS_SLOT_ADD(_tag, _def_slot) \
MCFG_DEVICE_ADD(_tag, EP64_EXPANSION_BUS_SLOT, 0) \
- MCFG_DEVICE_SLOT_INTERFACE(ep64_expansion_bus_cards, _def_slot, false) \
-
+ MCFG_DEVICE_SLOT_INTERFACE(ep64_expansion_bus_cards, _def_slot, false)
#define MCFG_EP64_EXPANSION_BUS_SLOT_DAVE(_tag) \
ep64_expansion_bus_slot_device::static_set_dave_tag(*device, "^"_tag);
@@ -95,7 +94,7 @@
class device_ep64_expansion_bus_card_interface;
class ep64_expansion_bus_slot_device : public device_t,
- public device_slot_interface
+ public device_slot_interface
{
friend class device_ep64_expansion_bus_card_interface;
diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c
index dff39ce978f..b0b95912269 100644
--- a/src/emu/bus/gameboy/gb_slot.c
+++ b/src/emu/bus/gameboy/gb_slot.c
@@ -36,8 +36,8 @@ const device_type MEGADUCK_CART_SLOT = &device_creator<megaduck_cart_slot_device
device_gb_cart_interface::device_gb_cart_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device),
- has_rumble(false),
- has_timer(false),
+ has_rumble(false),
+ has_timer(false),
has_battery(false)
{
}
diff --git a/src/emu/bus/ieee488/c2031.c b/src/emu/bus/ieee488/c2031.c
index 63565668586..2f88f16556a 100644
--- a/src/emu/bus/ieee488/c2031.c
+++ b/src/emu/bus/ieee488/c2031.c
@@ -286,7 +286,7 @@ WRITE_LINE_MEMBER( c2031_device::byte_w )
//-------------------------------------------------
static SLOT_INTERFACE_START( c2031_floppies )
- SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD )
+ SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD )
SLOT_INTERFACE_END
diff --git a/src/emu/bus/ieee488/c2031.h b/src/emu/bus/ieee488/c2031.h
index 7d20b0fb4df..15b964139d7 100644
--- a/src/emu/bus/ieee488/c2031.h
+++ b/src/emu/bus/ieee488/c2031.h
@@ -29,7 +29,7 @@
// ======================> c2031_device
class c2031_device : public device_t,
- public device_ieee488_interface
+ public device_ieee488_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ieee488/c2040.c b/src/emu/bus/ieee488/c2040.c
index 200ef30d4c2..b49b0a8a9ac 100644
--- a/src/emu/bus/ieee488/c2040.c
+++ b/src/emu/bus/ieee488/c2040.c
@@ -36,7 +36,7 @@
#define M6504_TAG "uh3"
#define M6522_TAG "um3"
#define M6530_TAG "uk3"
-#define FDC_TAG "fdc"
+#define FDC_TAG "fdc"
@@ -385,14 +385,14 @@ READ8_MEMBER( c2040_device::miot_pb_r )
bit description
- PB0
- PB1
- PB2
+ PB0
+ PB1
+ PB2
PB3 WPS
PB4
PB5
PB6 SYNC
- PB7
+ PB7
*/
@@ -416,10 +416,10 @@ WRITE8_MEMBER( c2040_device::miot_pb_w )
PB0 DRV SEL
PB1 DS0
PB2 DS1
- PB3
+ PB3
PB4
PB5
- PB6
+ PB6
PB7 M6504 IRQ
*/
@@ -452,7 +452,7 @@ static MOS6530_INTERFACE( miot_intf )
//-------------------------------------------------
static SLOT_INTERFACE_START( c2040_floppies )
- SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD )
+ SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD )
SLOT_INTERFACE_END
@@ -461,9 +461,9 @@ SLOT_INTERFACE_END
//-------------------------------------------------
FLOPPY_FORMATS_MEMBER( c2040_device::floppy_formats )
- FLOPPY_D64_FORMAT,
- FLOPPY_G64_FORMAT,
- FLOPPY_D67_FORMAT
+ FLOPPY_D64_FORMAT,
+ FLOPPY_G64_FORMAT,
+ FLOPPY_D67_FORMAT
FLOPPY_FORMATS_END
diff --git a/src/emu/bus/ieee488/c2040.h b/src/emu/bus/ieee488/c2040.h
index 3daa826cb42..706183cad99 100644
--- a/src/emu/bus/ieee488/c2040.h
+++ b/src/emu/bus/ieee488/c2040.h
@@ -38,7 +38,7 @@
// ======================> c2040_device
class c2040_device : public device_t,
- public device_ieee488_interface
+ public device_ieee488_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ieee488/c2040fdc.c b/src/emu/bus/ieee488/c2040fdc.c
index 990c37bc0aa..dfda8328f4a 100644
--- a/src/emu/bus/ieee488/c2040fdc.c
+++ b/src/emu/bus/ieee488/c2040fdc.c
@@ -11,10 +11,10 @@
/*
- TODO:
+ TODO:
- - writing starts in the middle of a byte
- - 8050 PLL
+ - writing starts in the middle of a byte
+ - 8050 PLL
*/
@@ -67,7 +67,7 @@ const rom_entry *c2040_fdc_t::device_rom_region() const
// c2040_fdc_t - constructor
//-------------------------------------------------
-c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
m_write_sync(*this),
m_write_ready(*this),
@@ -92,7 +92,7 @@ c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, device_type type, const
cur_live.write_start_time = attotime::never;
}
-c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C2040_FDC, "C2040 FDC", tag, owner, clock, "c2040fdc", __FILE__),
m_write_sync(*this),
m_write_ready(*this),
@@ -117,7 +117,7 @@ c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_
cur_live.write_start_time = attotime::never;
}
-c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
c2040_fdc_t(mconfig, C2040_FDC, "C2040 FDC", tag, owner, clock, "c2040fdc", __FILE__) { }
@@ -242,7 +242,7 @@ void c2040_fdc_t::commit(attotime tm)
{
if(cur_live.write_start_time.is_never() || tm == cur_live.write_start_time || !cur_live.write_position)
return;
-
+
if (LOG) logerror("%s committing %u transitions since %s\n", tm.as_string(), cur_live.write_position, cur_live.write_start_time.as_string());
if(get_floppy())
@@ -336,14 +336,14 @@ void c2040_fdc_t::live_run(attotime limit)
cur_live.cell_counter++;
cur_live.cell_counter &= 0xf;
}
-
+
if (!BIT(cell_counter, 1) && BIT(cur_live.cell_counter, 1)) {
// read bit
cur_live.shift_reg <<= 1;
cur_live.shift_reg |= !(BIT(cur_live.cell_counter, 3) || BIT(cur_live.cell_counter, 2));
cur_live.shift_reg &= 0x3ff;
-
- if (LOG) logerror("%s read bit %u (%u) >> %03x, rw=%u mode=%u\n", cur_live.tm.as_string(), cur_live.bit_counter,
+
+ if (LOG) logerror("%s read bit %u (%u) >> %03x, rw=%u mode=%u\n", cur_live.tm.as_string(), cur_live.bit_counter,
!(BIT(cur_live.cell_counter, 3) || BIT(cur_live.cell_counter, 2)), cur_live.shift_reg, cur_live.rw_sel, cur_live.mode_sel);
// write bit
@@ -375,7 +375,7 @@ void c2040_fdc_t::live_run(attotime limit)
cur_live.e = m_gcr_rom->base()[cur_live.i];
int ready = !(BIT(cell_counter, 1) && !BIT(cur_live.cell_counter, 1) && (cur_live.bit_counter == 9));
-
+
if (!ready) {
// load write shift register
// E7 E6 I7 E5 E4 E3 E2 I2 E1 E0
@@ -383,13 +383,13 @@ void c2040_fdc_t::live_run(attotime limit)
offs_t i = cur_live.i;
cur_live.shift_reg_write = BIT(e,7)<<9 | BIT(e,6)<<8 | BIT(i,7)<<7 | BIT(e,5)<<6 | BIT(e,4)<<5 | BIT(e,3)<<4 | BIT(e,2)<<3 | BIT(i,2)<<2 | (e & 0x03);
-
+
if (LOG) logerror("%s load write shift register %03x\n",cur_live.tm.as_string(),cur_live.shift_reg_write);
} else if (BIT(cell_counter, 1) && !BIT(cur_live.cell_counter, 1)) {
// clock write shift register
cur_live.shift_reg_write <<= 1;
cur_live.shift_reg_write &= 0x3ff;
-
+
if (LOG) logerror("%s write shift << %03x\n",cur_live.tm.as_string(),cur_live.shift_reg_write);
}
@@ -463,9 +463,9 @@ READ8_MEMBER( c2040_fdc_t::read )
offs_t i = checkpoint_live.i;
UINT8 data = (BIT(e, 6) << 7) | (BIT(i, 7) << 6) | (e & 0x33) | (BIT(e, 2) << 3) | (i & 0x04);
-
+
if (LOG) logerror("%s VIA reads data %02x (%03x)\n", machine().time().as_string(), data, checkpoint_live.shift_reg);
-
+
return data;
}
diff --git a/src/emu/bus/ieee488/c8050.c b/src/emu/bus/ieee488/c8050.c
index c7aeff38c0d..31e9c30dc8a 100644
--- a/src/emu/bus/ieee488/c8050.c
+++ b/src/emu/bus/ieee488/c8050.c
@@ -13,7 +13,7 @@
TODO:
- - Micropolis 8x50 stepper motor is same as 4040, except it takes 4 pulses to step a track instead of 1
+ - Micropolis 8x50 stepper motor is same as 4040, except it takes 4 pulses to step a track instead of 1
- BASIC program to set 8250/SFD-1001 to 8050 mode:
diff --git a/src/emu/bus/ieee488/hardbox.c b/src/emu/bus/ieee488/hardbox.c
index c729da65fc7..79dbc11565a 100644
--- a/src/emu/bus/ieee488/hardbox.c
+++ b/src/emu/bus/ieee488/hardbox.c
@@ -53,7 +53,7 @@
#define Z80_TAG "z80"
#define I8255_0_TAG "ic17"
#define I8255_1_TAG "ic16"
-#define CORVUS_HDC_TAG "corvus"
+#define CORVUS_HDC_TAG "corvus"
@@ -88,9 +88,9 @@ ROM_START( hardbox )
The version numbers listed are the ROM version reported by the HardBox diagnostics program.
Disassembling the ROMs showed that v2.3 and v2.4 are for Corvus Systems drives but v3.1 is
for Sunol Systems drives. Both types use the Corvus flat cable interface but there may be
- some programming differences, e.g. the v3.1 firmware for Sunol does not have the park heads
- routine in the Corvus versions. MESS emulates a Corvus drive so we default to the last
- known HardBox firmware for Corvus (v2.4). */
+ some programming differences, e.g. the v3.1 firmware for Sunol does not have the park heads
+ routine in the Corvus versions. MESS emulates a Corvus drive so we default to the last
+ known HardBox firmware for Corvus (v2.4). */
ROM_END
diff --git a/src/emu/bus/ieee488/softbox.c b/src/emu/bus/ieee488/softbox.c
index fd4f7f8558f..1fec2c0cca7 100644
--- a/src/emu/bus/ieee488/softbox.c
+++ b/src/emu/bus/ieee488/softbox.c
@@ -30,7 +30,7 @@
#define I8255_1_TAG "ic16"
#define COM8116_TAG "ic14"
#define RS232_TAG "rs232"
-#define CORVUS_HDC_TAG "corvus"
+#define CORVUS_HDC_TAG "corvus"
diff --git a/src/emu/bus/imi7000/imi5000h.h b/src/emu/bus/imi7000/imi5000h.h
index 8b313cc3a03..74405dcc2a2 100644
--- a/src/emu/bus/imi7000/imi5000h.h
+++ b/src/emu/bus/imi7000/imi5000h.h
@@ -32,7 +32,7 @@
// ======================> imi5000h_device
class imi5000h_device : public device_t,
- public device_imi7000_interface
+ public device_imi7000_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/isa/3c505.c b/src/emu/bus/isa/3c505.c
index fbe229f9e80..acc71e80ac0 100644
--- a/src/emu/bus/isa/3c505.c
+++ b/src/emu/bus/isa/3c505.c
@@ -3,8 +3,8 @@
*
* Created on: August 27, 2010
* Author: Hans Ostermeyer
- * ISA conversion by R. Belmont
- *
+ * ISA conversion by R. Belmont
+ *
* Released for general non-commercial use under the MAME license
* Visit http://mamedev.org for licensing and usage restrictions.
*
@@ -566,7 +566,7 @@ void threecom3c505_device::set_interrupt(enum line_state state)
case 5: m_isa->irq5_w(state); break;
case 6: m_isa->irq6_w(state); break;
case 7: m_isa->irq7_w(state); break;
- case 9: m_isa->irq2_w(state); break; // IRQ 9 on ISA16 goes to IRQ 2
+ case 9: m_isa->irq2_w(state); break; // IRQ 9 on ISA16 goes to IRQ 2
case 10: m_isa->irq10_w(state); break;
case 11: m_isa->irq11_w(state); break;
case 12: m_isa->irq12_w(state); break;
@@ -1579,4 +1579,3 @@ READ8_MEMBER(threecom3c505_device::read)
LOG2(("reading 3C505 Register at offset %02x = %02x", offset, data));
return data;
}
-
diff --git a/src/emu/bus/isa/adlib.h b/src/emu/bus/isa/adlib.h
index cdfe854f01b..78ad2afdfaa 100644
--- a/src/emu/bus/isa/adlib.h
+++ b/src/emu/bus/isa/adlib.h
@@ -23,7 +23,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
-
+
DECLARE_READ8_MEMBER(ym3812_16_r);
DECLARE_WRITE8_MEMBER(ym3812_16_w);
protected:
diff --git a/src/emu/bus/isa/aga.c b/src/emu/bus/isa/aga.c
index 8f950d382d4..ec1ac365018 100644
--- a/src/emu/bus/isa/aga.c
+++ b/src/emu/bus/isa/aga.c
@@ -92,7 +92,7 @@ void isa8_aga_device::device_start()
m_isa->install_memory(0xb0000, 0xbffff, 0, 0, read8_delegate(FUNC(isa8_aga_device::pc_aga_videoram_r),this), write8_delegate(FUNC(isa8_aga_device::pc_aga_videoram_w),this));
m_isa->install_device(0x3b0, 0x3bf, 0, 0, read8_delegate( FUNC(isa8_aga_device::pc_aga_mda_r), this ), write8_delegate( FUNC(isa8_aga_device::pc_aga_mda_w), this ) );
m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_aga_device::pc_aga_cga_r), this ), write8_delegate( FUNC(isa8_aga_device::pc_aga_cga_w), this ) );
-
+
/* Initialise the cga palette */
int i;
@@ -113,8 +113,8 @@ void isa8_aga_device::device_start()
}
}
}
-
- UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
+
+ UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
/* just a plain bit pattern for graphics data generation */
for (i = 0; i < 256; i++)
gfx[i] = i;
@@ -179,7 +179,7 @@ void isa8_aga_pc200_device::device_start()
m_isa->install_memory(0xb0000, 0xbffff, 0, 0, read8_delegate(FUNC(isa8_aga_pc200_device::pc200_videoram_r),this), write8_delegate(FUNC(isa8_aga_pc200_device::pc200_videoram_w),this));
m_isa->install_device(0x3b0, 0x3bf, 0, 0, read8_delegate( FUNC(isa8_aga_device::pc_aga_mda_r), this ), write8_delegate( FUNC(isa8_aga_device::pc_aga_mda_w), this ) );
m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_aga_pc200_device::pc200_cga_r), this ), write8_delegate( FUNC(isa8_aga_pc200_device::pc200_cga_w), this ) );
-
+
/* Initialise the cga palette */
int i;
@@ -200,8 +200,8 @@ void isa8_aga_pc200_device::device_start()
}
}
}
-
- UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
+
+ UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
/* just a plain bit pattern for graphics data generation */
for (i = 0; i < 256; i++)
gfx[i] = i;
@@ -765,7 +765,6 @@ void isa8_aga_device::set_palette_luts(void)
WRITE8_MEMBER (isa8_aga_device:: pc_aga_cga_w )
{
if ( m_mode == AGA_COLOR ) {
-
switch(offset) {
case 0: case 2: case 4: case 6:
m_mc6845->address_w( space, offset, data );
@@ -867,7 +866,7 @@ WRITE8_MEMBER ( isa8_aga_device::pc_aga_videoram_w )
}
READ8_MEMBER( isa8_aga_device::pc_aga_videoram_r )
-{
+{
switch (m_mode) {
case AGA_COLOR:
if (offset>=0x8000) return m_videoram[offset-0x8000];
diff --git a/src/emu/bus/isa/aga.h b/src/emu/bus/isa/aga.h
index baeecb13f55..12568353e3a 100644
--- a/src/emu/bus/isa/aga.h
+++ b/src/emu/bus/isa/aga.h
@@ -38,7 +38,7 @@ public:
isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
- virtual void device_start();
+ virtual void device_start();
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
@@ -46,7 +46,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( hsync_changed );
DECLARE_WRITE_LINE_MEMBER( vsync_changed );
-
+
DECLARE_READ8_MEMBER( pc_aga_mda_r );
DECLARE_WRITE8_MEMBER( pc_aga_mda_w );
DECLARE_READ8_MEMBER( pc_aga_cga_r );
@@ -56,9 +56,9 @@ public:
DECLARE_WRITE8_MEMBER( pc_aga_videoram_w );
DECLARE_READ8_MEMBER( pc_aga_videoram_r );
- required_device<palette_device> m_palette;
- required_device<mc6845_device> m_mc6845;
-
+ required_device<palette_device> m_palette;
+ required_device<mc6845_device> m_mc6845;
+
required_ioport m_cga_config;
mc6845_update_row_func m_update_row;
@@ -75,11 +75,11 @@ public:
int m_framecnt;
UINT8 m_vsync;
UINT8 m_hsync;
-
+
UINT8 m_cga_palette_lut_2bpp[4];
- UINT8 *m_videoram;
+ UINT8 *m_videoram;
};
// device type definition
@@ -94,14 +94,14 @@ public:
// construction/destruction
isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_start();
+ virtual void device_start();
// optional information overrides
virtual const rom_entry *device_rom_region() const;
-
+
UINT8 m_port8;
UINT8 m_portd;
UINT8 m_porte;
-
+
DECLARE_READ8_MEMBER( pc200_videoram_r );
DECLARE_WRITE8_MEMBER( pc200_videoram_w );
DECLARE_WRITE8_MEMBER( pc200_cga_w );
diff --git a/src/emu/bus/isa/cga.c b/src/emu/bus/isa/cga.c
index 753e2950142..cd5557ee6b2 100644
--- a/src/emu/bus/isa/cga.c
+++ b/src/emu/bus/isa/cga.c
@@ -285,7 +285,7 @@ void isa8_cga_device::device_start()
m_vram.resize(m_vram_size);
m_update_row = NULL;
m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_cga_device::io_read), this ), write8_delegate( FUNC(isa8_cga_device::io_write), this ) );
- m_isa->install_bank(0xb8000, 0xb8000 + MIN(0x8000,m_vram_size) - 1, 0, m_vram_size & 0x4000, "bank_cga", m_vram);
+ m_isa->install_bank(0xb8000, 0xb8000 + MIN(0x8000,m_vram_size) - 1, 0, m_vram_size & 0x4000, "bank_cga", m_vram);
/* Initialise the cga palette */
int i;
@@ -1799,7 +1799,7 @@ isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, co
ROM_START( mc1502 )
ROM_REGION(0x2000,"gfx1", 0)
// taken from mc1502
- ROM_LOAD( "symgen.rom", 0x0000, 0x2000, CRC(b2747a52) SHA1(6766d275467672436e91ac2997ac6b77700eba1e))
+ ROM_LOAD( "symgen.rom", 0x0000, 0x2000, CRC(b2747a52) SHA1(6766d275467672436e91ac2997ac6b77700eba1e))
ROM_END
const rom_entry *isa8_cga_mc1502_device::device_rom_region() const
diff --git a/src/emu/bus/isa/cga.h b/src/emu/bus/isa/cga.h
index 976fedb80e1..52f54796fdd 100644
--- a/src/emu/bus/isa/cga.h
+++ b/src/emu/bus/isa/cga.h
@@ -68,7 +68,7 @@ public:
bool m_superimpose;
UINT8 m_plantronics; /* This should be moved into the appropriate subclass */
offs_t m_start_offset;
- required_device<palette_device> m_palette;
+ required_device<palette_device> m_palette;
};
// device type definition
diff --git a/src/emu/bus/isa/dectalk.c b/src/emu/bus/isa/dectalk.c
index 1533ec7c775..34e02695bb7 100644
--- a/src/emu/bus/isa/dectalk.c
+++ b/src/emu/bus/isa/dectalk.c
@@ -143,7 +143,7 @@ ROM_START( dectalk_isa )
ROM_LOAD16_BYTE("pc_boot_hxl.am27c64.d6.e26", 0x0000, 0x2000, CRC(7492f1e3) SHA1(fe6946a227f01c94f2b99220320a616445c96ee0)) // Some cards have a different label on the chip which lists the sum16: 31AC (matches contents)
ROM_LOAD16_BYTE("pc_boot_hxh.am27c64.d8.e27", 0x0001, 0x2000, CRC(1fe7fe40) SHA1(6e89c237f01aa22e0d21ff4d6fdf8137c6ace374)) // Some cards have a different label on the chip which lists the sum16: 1A25 (matches contents)
ROM_REGION( 0x2000, "dectalk_dsp", 0 )
- ROM_LOAD("spc_034c__2-1-92.tms320p15nl.d3.bin", 0x0000, 0x2000, CRC(d8b1201e) SHA1(4b873a5e882205fcac79a27562054b5c4d1a117c))
+ ROM_LOAD("spc_034c__2-1-92.tms320p15nl.d3.bin", 0x0000, 0x2000, CRC(d8b1201e) SHA1(4b873a5e882205fcac79a27562054b5c4d1a117c))
ROM_END
const rom_entry* dectalk_isa_device::device_rom_region() const
diff --git a/src/emu/bus/isa/ega.h b/src/emu/bus/isa/ega.h
index 2914e13abbd..13ded1e31b0 100644
--- a/src/emu/bus/isa/ega.h
+++ b/src/emu/bus/isa/ega.h
@@ -96,7 +96,7 @@ public:
UINT8 m_vsync;
UINT8 m_vblank;
UINT8 m_display_enable;
- required_device<palette_device> m_palette;
+ required_device<palette_device> m_palette;
};
diff --git a/src/emu/bus/isa/gblaster.h b/src/emu/bus/isa/gblaster.h
index ba11f51f680..8bcde87342e 100644
--- a/src/emu/bus/isa/gblaster.h
+++ b/src/emu/bus/isa/gblaster.h
@@ -23,7 +23,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
-
+
DECLARE_READ8_MEMBER(saa1099_16_r);
DECLARE_WRITE8_MEMBER(saa1099_1_16_w);
DECLARE_WRITE8_MEMBER(saa1099_2_16_w);
diff --git a/src/emu/bus/isa/isa.c b/src/emu/bus/isa/isa.c
index 3d4a2bc898f..af6834fcbdb 100644
--- a/src/emu/bus/isa/isa.c
+++ b/src/emu/bus/isa/isa.c
@@ -243,12 +243,12 @@ void isa8_device::device_start()
m_iowidth = m_iospace->data_width();
m_prgwidth = m_prgspace->data_width();
}
- else // use host CPU's program and I/O spaces directly
+ else // use host CPU's program and I/O spaces directly
{
- m_iospace = &m_maincpu->space(AS_IO);
- m_iowidth = m_maincpu->space_config(AS_IO)->m_databus_width;
+ m_iospace = &m_maincpu->space(AS_IO);
+ m_iowidth = m_maincpu->space_config(AS_IO)->m_databus_width;
m_prgspace = &m_maincpu->space(AS_PROGRAM);
- m_prgwidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
+ m_prgwidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
}
}
@@ -679,5 +679,3 @@ UINT16 device_isa16_card_interface::dack16_r(int line)
void device_isa16_card_interface::dack16_w(int line,UINT16 data)
{
}
-
-
diff --git a/src/emu/bus/isa/isa.h b/src/emu/bus/isa/isa.h
index 775e8c259a3..a66cce07604 100644
--- a/src/emu/bus/isa/isa.h
+++ b/src/emu/bus/isa/isa.h
@@ -156,22 +156,22 @@ public:
template<class _iochck> void set_iochck_callback(_iochck iochck) { m_write_iochck.set_callback(iochck); }
// for ISA8, put the 8-bit configs in the primary slots and the 16-bit configs in the secondary
- virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
- {
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
+ {
switch (spacenum)
{
case AS_PROGRAM: return &m_program_config;
- case AS_IO: return &m_io_config;
- case AS_DATA: return &m_program16_config;
- case AS_3: return &m_io16_config;
- default: fatalerror("isa: invalid memory space!\n");
+ case AS_IO: return &m_io_config;
+ case AS_DATA: return &m_program16_config;
+ case AS_3: return &m_io16_config;
+ default: fatalerror("isa: invalid memory space!\n");
}
}
void install_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler);
- template<typename T> void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map, device_t &device), int bits = 8, UINT64 unitmask = U64(0xffffffffffffffff))
+ template<typename T> void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map, device_t &device), int bits = 8, UINT64 unitmask = U64(0xffffffffffffffff))
{
- m_iospace->install_device(addrstart, addrend, device, map, bits, unitmask);
+ m_iospace->install_device(addrstart, addrend, device, map, bits, unitmask);
}
void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
void install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region);
@@ -331,15 +331,15 @@ public:
void install16_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_delegate rhandler, write16_delegate whandler);
// for ISA16, put the 16-bit configs in the primary slots and the 8-bit configs in the secondary
- virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
- {
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
+ {
switch (spacenum)
{
case AS_PROGRAM: return &m_program16_config;
- case AS_IO: return &m_io16_config;
- case AS_DATA: return &m_program_config;
- case AS_3: return &m_io_config;
- default: fatalerror("isa: invalid memory space!\n");
+ case AS_IO: return &m_io16_config;
+ case AS_DATA: return &m_program_config;
+ case AS_3: return &m_io_config;
+ default: fatalerror("isa: invalid memory space!\n");
}
}
diff --git a/src/emu/bus/isa/mda.c b/src/emu/bus/isa/mda.c
index 9fac599f912..ce08169992c 100644
--- a/src/emu/bus/isa/mda.c
+++ b/src/emu/bus/isa/mda.c
@@ -99,7 +99,7 @@ WRITE_LINE_MEMBER(isa8_mda_device::pc_cpu_line)
MACHINE_CONFIG_FRAGMENT( pcvideo_mda )
MCFG_SCREEN_ADD( MDA_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 )
- MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update )
+ MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update )
MCFG_PALETTE_ADD( "palette", 4 )
diff --git a/src/emu/bus/isa/mda.h b/src/emu/bus/isa/mda.h
index 74a4a78cbb0..2fc74d49265 100644
--- a/src/emu/bus/isa/mda.h
+++ b/src/emu/bus/isa/mda.h
@@ -39,7 +39,7 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_reset();
+ virtual void device_reset();
public:
int m_framecnt;
diff --git a/src/emu/bus/isa/mufdc.c b/src/emu/bus/isa/mufdc.c
index 7976a47f869..5ef6abc219b 100644
--- a/src/emu/bus/isa/mufdc.c
+++ b/src/emu/bus/isa/mufdc.c
@@ -1,6 +1,6 @@
/***************************************************************************
- Multi Unique FDC
+ Multi Unique FDC
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/isa/mufdc.h b/src/emu/bus/isa/mufdc.h
index 2f1253ea529..da6ff090217 100644
--- a/src/emu/bus/isa/mufdc.h
+++ b/src/emu/bus/isa/mufdc.h
@@ -1,6 +1,6 @@
/***************************************************************************
- Multi Unique FDC
+ Multi Unique FDC
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
@@ -33,7 +33,7 @@
// ======================> mufdc_device
class mufdc_device : public device_t,
- public device_isa8_card_interface
+ public device_isa8_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/isa/omti8621.c b/src/emu/bus/isa/omti8621.c
index 9cb218bc251..17b7381c492 100644
--- a/src/emu/bus/isa/omti8621.c
+++ b/src/emu/bus/isa/omti8621.c
@@ -3,9 +3,9 @@
*
* Created on: August 30, 2010
* Author: Hans Ostermeyer
- *
+ *
* Converted to ISA device by R. Belmont
- *
+ *
* Released for general non-commercial use under the MAME license
* Visit http://mamedev.org for licensing and usage restrictions.
*
@@ -72,7 +72,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
void omti_disk_config(UINT16 disk_type);
public:
UINT16 m_type;
@@ -288,7 +288,7 @@ void omti8621_device::device_start()
sector_buffer.resize(OMTI_DISK_SECTOR_SIZE*OMTI_MAX_BLOCK_COUNT);
m_timer = timer_alloc(0, NULL);
-
+
our_disks[0] = subdevice<omti_disk_image_device>(OMTI_DISK0_TAG);
our_disks[1] = subdevice<omti_disk_image_device>(OMTI_DISK1_TAG);
}
@@ -388,7 +388,7 @@ void omti8621_device::device_config_complete()
set_interrupt - update the IRQ state
-------------------------------------------------*/
-void omti8621_device::set_interrupt(enum line_state line_state)
+void omti8621_device::set_interrupt(enum line_state line_state)
{
LOG2(("set_interrupt: status_port=%x, line_state %d", status_port, line_state));
m_isa->irq14_w(line_state);
@@ -396,7 +396,7 @@ void omti8621_device::set_interrupt(enum line_state line_state)
void omti8621_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- set_interrupt(ASSERT_LINE);
+ set_interrupt(ASSERT_LINE);
}
/***************************************************************************
@@ -525,7 +525,7 @@ UINT32 omti8621_device::get_disk_address(const UINT8 * cdb) {
set_data_transfer - setup for data transfer from/to data
***************************************************************************/
-void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
+void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
{
// set controller for read data transfer
omti_state = OMTI_STATE_DATA;
@@ -541,7 +541,7 @@ void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
read_sectors_from_disk - read sectors starting at diskaddr into sector_buffer
***************************************************************************/
-void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
+void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
{
UINT8 *data_buffer = sector_buffer;
device_image_interface *image = our_disks[lun]->m_image;
@@ -561,7 +561,7 @@ void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8
write_sectors_to_disk - write sectors starting at diskaddr from sector_buffer
***************************************************************************/
-void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
+void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
{
UINT8 *data_buffer = sector_buffer;
device_image_interface *image = our_disks[lun]->m_image;
@@ -586,7 +586,7 @@ void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 l
copy_sectors - copy sectors
***************************************************************************/
-void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count, UINT8 lun)
+void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count, UINT8 lun)
{
device_image_interface *image = our_disks[lun]->m_image;
@@ -613,7 +613,7 @@ void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count,
format track - format a track
***************************************************************************/
-void omti8621_device::format_track(const UINT8 * cdb)
+void omti8621_device::format_track(const UINT8 * cdb)
{
UINT8 lun = get_lun(cdb);
UINT32 disk_addr = get_disk_address(cdb);
@@ -668,7 +668,7 @@ void omti8621_device::set_esdi_defect_list(UINT8 lun, UINT8 head)
log_command - log command from a command descriptor block
***************************************************************************/
-void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
+void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
{
if (verbose > 0) {
int i;
@@ -767,7 +767,7 @@ void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
log_data - log data in the common data buffer
***************************************************************************/
-void omti8621_device::log_data()
+void omti8621_device::log_data()
{
if (verbose > 0) {
int i;
@@ -788,7 +788,7 @@ void omti8621_device::log_data()
do_command
***************************************************************************/
-void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
+void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
{
UINT8 lun = get_lun(cdb);
omti_disk_image_device *disk = our_disks[lun];
@@ -943,11 +943,11 @@ void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
// LOG(("do_command: UNEXPECTED omti_state %02x",omti_state));
// }
status_port |= OMTI_STATUS_IREQ;
- if (command_duration == 0)
+ if (command_duration == 0)
{
set_interrupt(ASSERT_LINE);
- }
- else
+ }
+ else
{
// FIXME: should delay omti_state and status_port as well
m_timer->adjust(attotime::from_msec(command_duration), 0);
@@ -959,7 +959,7 @@ void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
get_command_length
***************************************************************************/
-UINT8 omti8621_device::get_command_length(UINT8 command_byte)
+UINT8 omti8621_device::get_command_length(UINT8 command_byte)
{
return command_byte == OMTI_CMD_COPY ? 10 : 6;
}
@@ -968,7 +968,7 @@ UINT8 omti8621_device::get_command_length(UINT8 command_byte)
get_data
***************************************************************************/
-UINT16 omti8621_device::get_data()
+UINT16 omti8621_device::get_data()
{
UINT16 data = 0xff;
if (data_index < data_length) {
@@ -989,7 +989,7 @@ UINT16 omti8621_device::get_data()
set_data
***************************************************************************/
-void omti8621_device::set_data(UINT16 data)
+void omti8621_device::set_data(UINT16 data)
{
if (data_index < data_length) {
data_buffer[data_index++] = data >> 8;
@@ -1008,7 +1008,7 @@ void omti8621_device::set_data(UINT16 data)
WRITE16_MEMBER(omti8621_device::write)
{
- switch (mem_mask)
+ switch (mem_mask)
{
case 0x00ff:
write8(space, offset*2+1, data, mem_mask);
@@ -1026,7 +1026,7 @@ WRITE16_MEMBER(omti8621_device::write)
WRITE8_MEMBER(omti8621_device::write8)
{
- switch (offset)
+ switch (offset)
{
case OMTI_PORT_DATA_OUT: // 0x00
switch (omti_state) {
@@ -1120,7 +1120,7 @@ WRITE8_MEMBER(omti8621_device::write8)
READ16_MEMBER(omti8621_device::read)
{
- switch (mem_mask)
+ switch (mem_mask)
{
case 0x00ff:
return read8(space, offset*2+1, mem_mask);
@@ -1138,10 +1138,10 @@ READ8_MEMBER(omti8621_device::read8)
switch (offset) {
case OMTI_PORT_DATA_IN: // 0x00
- if (status_port & OMTI_STATUS_CD)
+ if (status_port & OMTI_STATUS_CD)
{
data = command_status;
- switch (omti_state)
+ switch (omti_state)
{
case OMTI_STATE_COMMAND:
LOG2(("reading OMTI 8621 Data Status Register 1 at offset %02x = %02x (omti state = %02x)", offset, data, omti_state));
@@ -1155,8 +1155,8 @@ READ8_MEMBER(omti8621_device::read8)
LOG(("UNEXPECTED reading OMTI 8621 Data Status Register 3 at offset %02x = %02x (omti state = %02x)", offset, data, omti_state));
break;
}
- }
- else
+ }
+ else
{
LOG(("UNEXPECTED reading OMTI 8621 Data Register 4 at offset %02x = %02x (status bit C/D = 0)", offset, data));
}
@@ -1165,7 +1165,7 @@ READ8_MEMBER(omti8621_device::read8)
case OMTI_PORT_STATUS: // 0x01
data = status_port;
// omit excessive logging
- if (data != last_data)
+ if (data != last_data)
{
LOG2(("reading OMTI 8621 Status Register 5 at offset %02x = %02x", offset, data));
// last_data = data;
@@ -1342,7 +1342,7 @@ void omti_disk_image_device::device_start()
-------------------------------------------------*/
void omti_disk_image_device::device_reset()
-{
+{
LOG1(("device_reset_omti_disk"));
if (exists() && fseek(0, SEEK_END) == 0)
@@ -1379,4 +1379,3 @@ bool omti_disk_image_device::call_create(int format_type, option_resolution *for
}
return IMAGE_INIT_PASS;
}
-
diff --git a/src/emu/bus/isa/omti8621.h b/src/emu/bus/isa/omti8621.h
index 3f637232d29..d6b09ea5d3a 100644
--- a/src/emu/bus/isa/omti8621.h
+++ b/src/emu/bus/isa/omti8621.h
@@ -2,8 +2,8 @@
* omti8621.h - SMS OMTI 8621 disk controller
*
* Created on: August 30, 2010
- * Author: Hans Ostermeyer
- *
+ * Author: Hans Ostermeyer
+ *
* Converted to ISA device March 3, 2014 by R. Belmont
*
* Released for general non-commercial use under the MAME license
@@ -28,7 +28,7 @@
***************************************************************************/
class omti_disk_image_device;
-
+
/* ----- device interface ----- */
class omti8621_device : public device_t, public device_isa16_card_interface
diff --git a/src/emu/bus/isa/pds.c b/src/emu/bus/isa/pds.c
index 054e4fad750..dc932cc9e46 100644
--- a/src/emu/bus/isa/pds.c
+++ b/src/emu/bus/isa/pds.c
@@ -47,12 +47,10 @@ void isa8_pds_device::device_start()
void isa8_pds_device::device_reset()
{
-
}
void isa8_pds_device::device_stop()
{
-
}
I8255_INTERFACE(pds_ppi_intf)
@@ -73,4 +71,3 @@ machine_config_constructor isa8_pds_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( pds_config );
}
-
diff --git a/src/emu/bus/isa/sblaster.c b/src/emu/bus/isa/sblaster.c
index 1d69bf31bee..e6056a27e0a 100644
--- a/src/emu/bus/isa/sblaster.c
+++ b/src/emu/bus/isa/sblaster.c
@@ -1190,7 +1190,7 @@ void isa8_sblaster1_0_device::device_start()
set_isa_device();
// 1.0 always has the SAA1099s for CMS back-compatibility
m_isa->install_device(0x0220, 0x0221, 0, 0, read8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_16_r), this ), write8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_1_16_w), this ) );
- m_isa->install_device(0x0222, 0x0223, 0, 0, read8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_16_r), this ), write8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_2_16_w), this ) );
+ m_isa->install_device(0x0222, 0x0223, 0, 0, read8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_16_r), this ), write8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_2_16_w), this ) );
m_isa->set_dma_channel(1, this, FALSE);
m_dsp.version = 0x0105;
sb8_device::device_start();
diff --git a/src/emu/bus/isa/sblaster.h b/src/emu/bus/isa/sblaster.h
index 1666f9e667f..05f940eee2c 100644
--- a/src/emu/bus/isa/sblaster.h
+++ b/src/emu/bus/isa/sblaster.h
@@ -157,17 +157,17 @@ class sb8_device : public sb_device,
public:
// construction/destruction
sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
-
+
DECLARE_READ8_MEMBER(ym3812_16_r);
- DECLARE_WRITE8_MEMBER(ym3812_16_w);
+ DECLARE_WRITE8_MEMBER(ym3812_16_w);
protected:
virtual void device_start();
virtual void drq_w(int state) { m_isa->drq1_w(state); }
virtual void irq_w(int state, int source) { m_isa->irq5_w(state); }
virtual UINT8 dack_r(int line) { return sb_device::dack_r(line); }
virtual void dack_w(int line, UINT8 data) { sb_device::dack_w(line, data); }
-private:
- required_device<ym3812_device> m_ym3812;
+private:
+ required_device<ym3812_device> m_ym3812;
};
class isa8_sblaster1_0_device : public sb8_device
@@ -189,7 +189,7 @@ private:
// internal state
required_device<saa1099_device> m_saa1099_1;
required_device<saa1099_device> m_saa1099_2;
-
+
};
class isa8_sblaster1_5_device : public sb8_device
diff --git a/src/emu/bus/isa/sc499.c b/src/emu/bus/isa/sc499.c
index aa73cf1346b..c7cd5737b3b 100644
--- a/src/emu/bus/isa/sc499.c
+++ b/src/emu/bus/isa/sc499.c
@@ -1,8 +1,8 @@
/*
* sc499.c - ARCHIVE SC-499 cartridge tape controller (for Apollo DN3x00)
* Created on: April 17, 2011
- * Author: Hans Ostermeyer
- * ISA conversion by R. Belmont
+ * Author: Hans Ostermeyer
+ * ISA conversion by R. Belmont
*
* Released for general non-commercial use under the MAME license
* Visit http://mamedev.org for licensing and usage restrictions.
@@ -636,7 +636,7 @@ void sc499_device::set_interrupt(enum line_state state)
{
if (state != irq_state)
{
- LOG2(("set_interrupt(%d)",state));
+ LOG2(("set_interrupt(%d)",state));
switch (m_irq)
{
case 2: m_isa->irq2_w(state); break;
@@ -659,7 +659,7 @@ void sc499_device::set_dma_drq(enum line_state state)
{
if (state != dma_drq_state)
{
- LOG2(("set_dma_drq(%d)",state));
+ LOG2(("set_dma_drq(%d)",state));
switch (m_drq)
{
@@ -668,7 +668,7 @@ void sc499_device::set_dma_drq(enum line_state state)
case 3: m_isa->drq3_w(state); break;
default: logerror("sc499: invalid DRQ %d\n", m_drq); break;
}
-
+
dma_drq_state = state;
}
}
@@ -1115,7 +1115,7 @@ UINT8 sc499_device::dack_r(int line)
return data;
}
-void sc499_device::dack_w(int line, UINT8 data)
+void sc499_device::dack_w(int line, UINT8 data)
{
LOG3(("dack_write: data=%x", data));
@@ -1311,4 +1311,3 @@ void sc499_ctape_image_device::device_config_complete()
{
update_names(SC499_CTAPE, "ctape", "ct");
};
-
diff --git a/src/emu/bus/isa/side116.h b/src/emu/bus/isa/side116.h
index 588d0b2aedb..8e452a5b99e 100644
--- a/src/emu/bus/isa/side116.h
+++ b/src/emu/bus/isa/side116.h
@@ -26,7 +26,7 @@
// ======================> side116_device
class side116_device : public device_t,
- public device_isa8_card_interface
+ public device_isa8_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/megadrive/md_carts.c b/src/emu/bus/megadrive/md_carts.c
index 191c939ad7e..1fda9d88194 100644
--- a/src/emu/bus/megadrive/md_carts.c
+++ b/src/emu/bus/megadrive/md_carts.c
@@ -1,6 +1,6 @@
/**********************************************************************
- Megadrive carts
+ Megadrive carts
**********************************************************************/
diff --git a/src/emu/bus/megadrive/md_slot.c b/src/emu/bus/megadrive/md_slot.c
index f240048385a..09b61e539eb 100644
--- a/src/emu/bus/megadrive/md_slot.c
+++ b/src/emu/bus/megadrive/md_slot.c
@@ -466,7 +466,7 @@ int base_md_cart_slot_device::load_nonlist()
bool is_smd, is_md;
UINT32 tmplen = length(), offset, len;
dynamic_buffer tmpROM(tmplen);
-
+
// STEP 1: store a (possibly headered) copy of the file and determine its type (SMD? MD? BIN?)
fread(tmpROM, tmplen);
is_smd = genesis_is_SMD(&tmpROM[0x200], tmplen - 0x200);
diff --git a/src/emu/bus/nes/act53.c b/src/emu/bus/nes/act53.c
index 5ee6293ac68..6914d1137df 100644
--- a/src/emu/bus/nes/act53.c
+++ b/src/emu/bus/nes/act53.c
@@ -7,7 +7,7 @@
Visit http://mamedev.org for licensing and usage restrictions.
- Here we emulate the Multi-Discrete PCB designed by Tepples for
+ Here we emulate the Multi-Discrete PCB designed by Tepples for
this homebew multicart [mapper 28]
***********************************************************************************************************/
@@ -67,23 +67,23 @@ void nes_action53_device::pcb_reset()
Board ACTION 53
- In MESS: *VERY* preliminary support.
-
+ In MESS: *VERY* preliminary support.
+
This board uses 4 registers (reg is selected by writes to 0x5xxx)
Info from nesdev wiki
-
+
R:$00: [...M ..CC]
C = CHR Reg
M = Mirroring
This bit overwrites bit 0 of R:$80, but only if bit 1 of
R:$80 is clear
-
+
R:$01: [...M PPPP]
P = PRG Reg
M = Mirroring
This bit overwrites bit 0 of R:$80, but only if bit 1 of
R:$80 is clear
-
+
R:$80: [..GG PSMM]
G = Game Size (0=32K, 1=64K, 2=128K, 3=256K)
P = PRG Size (0=32k mode, 1=16k mode)
@@ -106,9 +106,9 @@ void nes_action53_device::pcb_reset()
void nes_action53_device::update_prg()
{
UINT8 prg_lo = 0, prg_hi = 0, helper = 0;
- UINT8 out = (m_reg[3] & 0x3f) << 1; // Outer PRG reg
- UINT8 size = (m_reg[2] & 0x30) >> 4; // Game size
- UINT8 mask = (1 << (size + 1)) - 1; // Bits to be taken from PRG reg
+ UINT8 out = (m_reg[3] & 0x3f) << 1; // Outer PRG reg
+ UINT8 size = (m_reg[2] & 0x30) >> 4; // Game size
+ UINT8 mask = (1 << (size + 1)) - 1; // Bits to be taken from PRG reg
if (!BIT(m_reg[2], 3))
{
@@ -134,7 +134,7 @@ void nes_action53_device::update_prg()
}
}
-// printf("banks : 0x%2X - 0x%2X\n", prg_lo, prg_hi);
+// printf("banks : 0x%2X - 0x%2X\n", prg_lo, prg_hi);
prg16_89ab(prg_lo);
prg16_cdef(prg_hi);
}
diff --git a/src/emu/bus/nes/aladdin.c b/src/emu/bus/nes/aladdin.c
index 9a09aba7818..ea5e3a763d3 100644
--- a/src/emu/bus/nes/aladdin.c
+++ b/src/emu/bus/nes/aladdin.c
@@ -31,7 +31,7 @@
//----------------------------------
//
-// Aladdin Cartslot implementation
+// Aladdin Cartslot implementation
//
//----------------------------------
@@ -52,7 +52,7 @@ aladdin_cart_interface::~aladdin_cart_interface()
}
READ8_MEMBER(aladdin_cart_interface::read)
-{
+{
if (offset < 0x4000)
return m_rom[(m_lobank * 0x4000) + (offset & 0x3fff)];
else
@@ -86,7 +86,7 @@ READ8_MEMBER(nes_aladdin_slot_device::read)
{
if (m_cart)
return m_cart->read(space, offset, mem_mask);
-
+
return 0xff;
}
@@ -100,18 +100,18 @@ bool nes_aladdin_slot_device::call_load()
if (!ROM)
return IMAGE_INIT_FAIL;
-
+
if (software_entry() == NULL)
{
if (length() != 0x20010 && length() != 0x40010)
return IMAGE_INIT_FAIL;
-
+
UINT8 temp[0x40010];
size = length() - 0x10;
fread(&temp, length());
memcpy(ROM, temp + 0x10, size);
-
- // double check that iNES files are really mapper 71 or 232
+
+ // double check that iNES files are really mapper 71 or 232
{
UINT8 mapper = (temp[6] & 0xf0) >> 4;
mapper |= temp[7] & 0xf0;
@@ -123,14 +123,14 @@ bool nes_aladdin_slot_device::call_load()
{
if (get_software_region_length("rom") != 0x20000 && get_software_region_length("rom") != 0x40000)
return IMAGE_INIT_FAIL;
-
+
size = get_software_region_length("rom");
memcpy(ROM, get_software_region("rom"), size);
}
m_cart->set_cart_size(size);
}
-
+
return IMAGE_INIT_PASS;
}
@@ -149,19 +149,19 @@ void nes_aladdin_slot_device::get_default_card_software(astring &result)
UINT32 len = core_fsize(m_file);
dynamic_buffer rom(len);
UINT8 mapper;
-
+
core_fread(m_file, rom, len);
mapper = (rom[6] & 0xf0) >> 4;
mapper |= rom[7] & 0xf0;
-// if (mapper == 71)
-// slot_string = "algn";
+// if (mapper == 71)
+// slot_string = "algn";
if (mapper == 232)
slot_string = "algq";
clear();
-
+
result.cpy(slot_string);
}
else
@@ -171,7 +171,7 @@ void nes_aladdin_slot_device::get_default_card_software(astring &result)
//----------------------------------
//
-// Aladdin Minicart implementation
+// Aladdin Minicart implementation
//
//----------------------------------
@@ -262,7 +262,7 @@ void nes_algq_rom_device::write_prg(UINT32 offset, UINT8 data)
//-----------------------------------------------
//
-// Camerica/Codemasters Aladdin passthru
+// Camerica/Codemasters Aladdin passthru
// implementation
//
//-----------------------------------------------
@@ -295,7 +295,7 @@ void nes_aladdin_device::pcb_reset()
/*-------------------------------------------------
Camerica/Codemasters Aladdin Deck Enhancer
-
+
iNES: mapper 71 & 232
In MESS: Supported (but timing issues in some games)
@@ -307,10 +307,10 @@ READ8_MEMBER(nes_aladdin_device::read_h)
LOG_MMC(("aladdin read_h, offset: %04x\n", offset));
// this shall be the proper code, but it's a bit slower, so we access directly the subcart below
//return m_subslot->read(space, offset, mem_mask);
-
+
if (m_subslot->m_cart)
return m_subslot->m_cart->read(space, offset, mem_mask);
- else // this is "fake" in the sense that we fill CPU space with 0xff if no Aladdin cart is loaded
+ else // this is "fake" in the sense that we fill CPU space with 0xff if no Aladdin cart is loaded
return hi_access_rom(offset);
}
diff --git a/src/emu/bus/nes/aladdin.h b/src/emu/bus/nes/aladdin.h
index 922e9778a82..fad8ac15f27 100644
--- a/src/emu/bus/nes/aladdin.h
+++ b/src/emu/bus/nes/aladdin.h
@@ -6,7 +6,7 @@
//----------------------------------
//
-// Aladdin Cartslot implementation
+// Aladdin Cartslot implementation
//
//----------------------------------
@@ -18,14 +18,14 @@ public:
// construction/destruction
aladdin_cart_interface(const machine_config &mconfig, device_t &device);
virtual ~aladdin_cart_interface();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
-
+
UINT8 *get_cart_base() { return m_rom; }
void set_cart_size(UINT32 size) { m_rom_size = size; m_rom_mask = (size / 0x4000) - 1; }
virtual void write_prg(UINT32 offset, UINT8 data) { }
-
+
protected:
// internal state
UINT8 *m_rom;
@@ -43,15 +43,15 @@ public:
// construction/destruction
nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~nes_aladdin_slot_device();
-
+
// device-level overrides
virtual void device_start();
virtual void device_config_complete() { update_names(); }
-
+
// image-level overrides
virtual bool call_load();
virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry);
-
+
virtual iodevice_t image_type() const { return IO_CARTSLOT; }
virtual bool is_readable() const { return 1; }
virtual bool is_writeable() const { return 0; }
@@ -61,13 +61,13 @@ public:
virtual const char *image_interface() const { return "ade_cart"; }
virtual const char *file_extensions() const { return "nes,bin"; }
virtual const option_guide *create_option_guide() const { return NULL; }
-
+
// slot interface overrides
virtual void get_default_card_software(astring &result);
-
+
virtual DECLARE_READ8_MEMBER(read);
void write_prg(UINT32 offset, UINT8 data) { if (m_cart) m_cart->write_prg(offset, data); }
-
+
aladdin_cart_interface* m_cart;
};
@@ -82,7 +82,7 @@ extern const device_type NES_ALADDIN_SLOT;
//----------------------------------
//
-// Aladdin Minicart implementation
+// Aladdin Minicart implementation
//
//----------------------------------
@@ -95,12 +95,12 @@ public:
// construction/destruction
nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const;
virtual UINT8* get_cart_base();
virtual void write_prg(UINT32 offset, UINT8 data);
-
+
protected:
// device-level overrides
virtual void device_start();
@@ -115,7 +115,7 @@ class nes_algq_rom_device : public nes_algn_rom_device
public:
// construction/destruction
nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual void write_prg(UINT32 offset, UINT8 data);
@@ -134,7 +134,7 @@ extern const device_type NES_ALGQ_ROM;
//-----------------------------------------------
//
-// Codemasters Aladdin passthru implementation
+// Codemasters Aladdin passthru implementation
//
//-----------------------------------------------
diff --git a/src/emu/bus/nes/bandai.c b/src/emu/bus/nes/bandai.c
index e92b2ad33ed..4114f32896f 100644
--- a/src/emu/bus/nes/bandai.c
+++ b/src/emu/bus/nes/bandai.c
@@ -19,11 +19,11 @@
* Bandai Datach Joint ROM System [mapper 157] is emulated in a separate source file
to implement also the subslot, but the PCB is basically a Bandai LZ93D50 + 24C02 EEPROM
pcb with added barcode reader and subslot
-
+
* Bandai Karaoke Studio [mapper 188] is emulated in a separate source file
to implement also the subslot and the mic inputs
-
-
+
+
TODO:
- investigate why EEPROM does not work
- add support to the PPU for the code necessary to Oeka Kids games (also needed by UNL-DANCE2000 PCB)
diff --git a/src/emu/bus/nes/bandai.h b/src/emu/bus/nes/bandai.h
index 9fafb604c6f..2561fdfa264 100644
--- a/src/emu/bus/nes/bandai.h
+++ b/src/emu/bus/nes/bandai.h
@@ -38,7 +38,7 @@ public:
// construction/destruction
nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
@@ -46,11 +46,11 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_m);
virtual void pcb_reset();
-
+
protected:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
diff --git a/src/emu/bus/nes/camerica.c b/src/emu/bus/nes/camerica.c
index 8b0386034d7..5c70ea8ecb9 100644
--- a/src/emu/bus/nes/camerica.c
+++ b/src/emu/bus/nes/camerica.c
@@ -13,10 +13,10 @@
* Camerica BF9096 Boards [mapper 232]
* Camerica Golden Five [mapper 104]
- Aladdin Deck Enhancer pass-thru cart and the corresponding minicarts
+ Aladdin Deck Enhancer pass-thru cart and the corresponding minicarts
(ALGNV11 & ALGQV11 PCBs) are emulated in a separate source file.
-
+
TODO:
- check what causes flickering from PPU in Fire Hawk, Poogie and Big Nose (same PPU issue as Back to
Future 2&3?)
@@ -189,7 +189,7 @@ WRITE8_MEMBER(nes_bf9096_device::write_h)
{
m_latch = data & 3;
prg16_89ab(m_bank_base | m_latch);
- }
+ }
}
/*-------------------------------------------------
diff --git a/src/emu/bus/nes/datach.c b/src/emu/bus/nes/datach.c
index b16efe9ffdf..949ae046b41 100644
--- a/src/emu/bus/nes/datach.c
+++ b/src/emu/bus/nes/datach.c
@@ -35,7 +35,7 @@
//--------------------------------
//
-// Datach Cartslot implementation
+// Datach Cartslot implementation
//
//--------------------------------
@@ -55,7 +55,7 @@ datach_cart_interface::~datach_cart_interface()
}
READ8_MEMBER(datach_cart_interface::read)
-{
+{
if (offset < 0x4000)
return m_rom[(m_bank * 0x4000) + (offset & 0x3fff)];
else
@@ -113,7 +113,7 @@ bool nes_datach_slot_device::call_load()
fread(&temp, length());
memcpy(ROM, temp + shift, 0x40000);
- // double check that iNES files are really mapper 157
+ // double check that iNES files are really mapper 157
// (or 16, since some older .nes files marked Datach as mapper 16)
if (length() == 0x40010)
{
@@ -153,7 +153,7 @@ void nes_datach_slot_device::get_default_card_software(astring &result)
//--------------------------------
//
-// Datach Minicart implementation
+// Datach Minicart implementation
//
// Two kinds of PCB exist
// * ROM only, used by most games
@@ -221,7 +221,7 @@ machine_config_constructor nes_datach_24c01_device::device_mconfig_additions() c
//---------------------------------
//
-// Datach Base Unit implementation
+// Datach Base Unit implementation
//
//---------------------------------
@@ -244,7 +244,7 @@ void nes_datach_device::device_start()
serial_timer = timer_alloc(TIMER_SERIAL);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
serial_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1000));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
save_item(NAME(m_datach_latch));
@@ -256,7 +256,7 @@ void nes_datach_device::pcb_reset()
prg16_89ab(0);
prg16_cdef(m_prg_chunks - 1);
chr8(0, m_chr_source);
-
+
m_irq_enable = 0;
m_irq_count = 0;
m_datach_latch = 0;
@@ -269,27 +269,27 @@ void nes_datach_device::pcb_reset()
-------------------------------------------------*/
/*-------------------------------------------------
-
+
Bandai LZ93D50 + Datach barcode reader emulation
-
+
Games: Datach Games
-
+
iNES: mappers 157
-
+
In MESS: Supported
-
+
TODO: Datach carts should actually be handled
separately! Original carts were minicarts to be
inserted in a smaller slot of the Barcode reader
FC cart. The Barcode reader acts as a passthrough
but it has no internal ROM (it does not work if
you don't have any minicart inserted)
-
- TODO2: This class should be derived from the
+
+ TODO2: This class should be derived from the
LZ93D50 + X24C02 class, since the main board
- has this EEPROM. Moreover, Datach - Battle Rush
+ has this EEPROM. Moreover, Datach - Battle Rush
has a second X24C01 EEPROM that we don't emulate yet...
-
+
-------------------------------------------------*/
@@ -318,14 +318,14 @@ READ8_MEMBER(nes_datach_device::read_h)
if (m_subslot->m_cart)
return m_subslot->m_cart->read(space, offset, mem_mask);
- else // this is "fake" in the sense that we fill CPU space with 0xff if no Datach cart is loaded
+ else // this is "fake" in the sense that we fill CPU space with 0xff if no Datach cart is loaded
return hi_access_rom(offset);
}
WRITE8_MEMBER(nes_datach_device::write_h)
{
LOG_MMC(("Datach write_h, offset: %04x, data: %02x\n", offset, data));
-
+
switch (offset & 0x0f)
{
case 0: case 1: case 2: case 3:
@@ -406,7 +406,7 @@ void nes_datach_device::device_timer(emu_timer &timer, device_timer_id id, int p
m_irq_count = 0xffff;
else
m_irq_count--;
-
+
if (!m_irq_count)
{
machine().device("maincpu")->execute().set_input_line(M6502_IRQ_LINE, ASSERT_LINE);
diff --git a/src/emu/bus/nes/datach.h b/src/emu/bus/nes/datach.h
index 6fc8cd5e0b4..76a95a06395 100644
--- a/src/emu/bus/nes/datach.h
+++ b/src/emu/bus/nes/datach.h
@@ -7,7 +7,7 @@
//--------------------------------
//
-// Datach Cartslot implementation
+// Datach Cartslot implementation
//
//--------------------------------
@@ -84,7 +84,7 @@ extern const device_type NES_DATACH_SLOT;
//--------------------------------
//
-// Datach Minicart implementation
+// Datach Minicart implementation
//
//--------------------------------
@@ -127,7 +127,7 @@ extern const device_type NES_DATACH_24C01;
//---------------------------------
//
-// Datach Base Unit implementation
+// Datach Base Unit implementation
//
//---------------------------------
@@ -138,7 +138,7 @@ class nes_datach_device : public nes_lz93d50_device
public:
// construction/destruction
nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
@@ -146,17 +146,17 @@ public:
virtual DECLARE_READ8_MEMBER(read_m);
virtual DECLARE_READ8_MEMBER(read_h);
virtual DECLARE_WRITE8_MEMBER(write_h);
-
+
virtual void pcb_reset();
-
+
protected:
UINT8 m_datach_latch;
required_device<i2cmem_device> m_i2cmem;
- required_device<barcode_reader_device> m_reader;
+ required_device<barcode_reader_device> m_reader;
required_device<nes_datach_slot_device> m_subslot;
UINT8 m_i2c_dir;
UINT8 m_i2c_in_use;
-
+
static const device_timer_id TIMER_SERIAL = 1;
emu_timer *serial_timer;
};
diff --git a/src/emu/bus/nes/jy.c b/src/emu/bus/nes/jy.c
index 1eedc36ac9b..66caa918769 100644
--- a/src/emu/bus/nes/jy.c
+++ b/src/emu/bus/nes/jy.c
@@ -310,13 +310,13 @@ void nes_jy_typea_device::update_prg()
prg32((last & 0x0f) | (exPrg >> 2));
m_bank_6000 = (((m_mmc_prg_bank[3] * 4) + 3) & 0x3f) | (exPrg >> 2);
break;
-
+
case 1: // 16KB
prg16_89ab((m_mmc_prg_bank[1] & 0x1f) | (exPrg >> 1));
prg16_cdef((last & 0x1f) | (exPrg >> 1));
m_bank_6000 = (((m_mmc_prg_bank[3] * 2) + 1) & 0x1f) | (exPrg >> 1);
break;
-
+
case 2: // 8KB
prg8_89(m_mmc_prg_bank[0] | exPrg);
prg8_ab(m_mmc_prg_bank[1] | exPrg);
@@ -324,7 +324,7 @@ void nes_jy_typea_device::update_prg()
prg8_ef(last | exPrg);
m_bank_6000 = m_mmc_prg_bank[3] | exPrg;
break;
-
+
case 3: // 8KB Alt
prg8_89((unscramble(m_mmc_prg_bank[0]) & 0x3f) | exPrg);
prg8_ab((unscramble(m_mmc_prg_bank[1]) & 0x3f) | exPrg);
@@ -347,12 +347,12 @@ void nes_jy_typea_device::update_chr()
// Block mode enabled: in this case lower bits select a 256KB page inside CHRROM
// and the low bytes of m_mmc_vrom_bank select the banks inside such a page
- // docs suggest m_reg[3] & 0x1f for chr_page below,
+ // docs suggest m_reg[3] & 0x1f for chr_page below,
// but 45 in 1 (JY-120A) menu requires to use this (from NEStopia)
- UINT8 chr_page = (m_reg[3] & 1) | ((m_reg[3] & 0x18) >> 2);
+ UINT8 chr_page = (m_reg[3] & 1) | ((m_reg[3] & 0x18) >> 2);
UINT32 extra_chr_base = BIT(m_reg[3], 5) ? 0 : (chr_page * 0x100);
UINT32 extra_chr_mask = BIT(m_reg[3], 5) ? 0xffffff : 0xff;
-
+
switch (m_reg[0] & 0x18)
{
case 0x00: // 8KB
@@ -360,7 +360,7 @@ void nes_jy_typea_device::update_chr()
extra_chr_mask >>= 3;
chr8(extra_chr_base | (m_mmc_vrom_bank[0] & extra_chr_mask), m_chr_source);
break;
-
+
case 0x08: // 4KB
extra_chr_base >>= 2;
extra_chr_mask >>= 2;
@@ -369,7 +369,7 @@ void nes_jy_typea_device::update_chr()
chr4_0(extra_chr_base | (m_mmc_vrom_bank[m_chr_latch[0]] & extra_chr_mask), m_chr_source);
chr4_4(extra_chr_base | (m_mmc_vrom_bank[m_chr_latch[1]] & extra_chr_mask), m_chr_source);
break;
-
+
case 0x10: // 2KB
extra_chr_base >>= 1;
extra_chr_mask >>= 1;
@@ -378,7 +378,7 @@ void nes_jy_typea_device::update_chr()
chr2_4(extra_chr_base | (m_mmc_vrom_bank[4] & extra_chr_mask), m_chr_source);
chr2_6(extra_chr_base | (m_mmc_vrom_bank[6] & extra_chr_mask), m_chr_source);
break;
-
+
case 0x18: // 1KB
chr1_0(extra_chr_base | (m_mmc_vrom_bank[0] & extra_chr_mask), m_chr_source);
chr1_1(extra_chr_base | (m_mmc_vrom_bank[1] & extra_chr_mask), m_chr_source);
@@ -573,7 +573,7 @@ void nes_jy_typec_device::update_mirror_typec()
READ8_MEMBER(nes_jy_typec_device::chr_r)
{
int bank = offset >> 10;
-
+
irq_clock(0, 2);
switch (offset & 0xff0)
{
diff --git a/src/emu/bus/nes/jy.h b/src/emu/bus/nes/jy.h
index 720c3ea2e60..47e16d983c4 100644
--- a/src/emu/bus/nes/jy.h
+++ b/src/emu/bus/nes/jy.h
@@ -20,7 +20,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_m);
virtual DECLARE_WRITE8_MEMBER(write_l);
virtual DECLARE_WRITE8_MEMBER(write_h);
-
+
virtual DECLARE_READ8_MEMBER(chr_r);
virtual DECLARE_READ8_MEMBER(nt_r);
@@ -39,7 +39,7 @@ protected:
UINT8 m_mul[2];
UINT8 m_latch;
UINT8 m_reg[4];
- UINT8 m_chr_latch[2]; // type C uses a more complex CHR 4K mode, and these vars are only changed for those games
+ UINT8 m_chr_latch[2]; // type C uses a more complex CHR 4K mode, and these vars are only changed for those games
UINT8 m_mmc_prg_bank[4];
UINT16 m_mmc_nt_bank[4];
UINT16 m_mmc_vrom_bank[8];
diff --git a/src/emu/bus/nes/karastudio.c b/src/emu/bus/nes/karastudio.c
index d331cbdeb4d..afb7a2b1363 100644
--- a/src/emu/bus/nes/karastudio.c
+++ b/src/emu/bus/nes/karastudio.c
@@ -8,22 +8,22 @@
Here we emulate the following PCBs Bandai Karaoke Studio [mapper 188]
-
+
The Karaoke Studio cart consist of a large connector which fits the FC cart slot, with a microphone
- connected. The game data is in the connector itself. The microphone has two buttons on it, and the
- game uses these only to navigate through the menus (the two buttons are not read through the controller
- port, which is not accessible from the cart, but from $6000-$7fff). Part of the connector body can be
+ connected. The game data is in the connector itself. The microphone has two buttons on it, and the
+ game uses these only to navigate through the menus (the two buttons are not read through the controller
+ port, which is not accessible from the cart, but from $6000-$7fff). Part of the connector body can be
removed to be replaced by an expansion cart containing new songs (we emulate this by adding a -cart2 slot).
-
+
TODO:
- verify expansion slot emulation for the Senyou Cassettes:
not much documentation exists about the expansion carts (except for few paragraphs
at Enri's FC webpage), so I implemented it based on "common sense"
* expansion carts do not contain the required game data => main PRG must be in the main cart
- so to remain connected even when an expansion is inserted (differently from Datach, where
+ so to remain connected even when an expansion is inserted (differently from Datach, where
the base unit contains no PRG)
- * bankswicth writes with bit3=0 (to access expansion) when no expansion is present should do
+ * bankswicth writes with bit3=0 (to access expansion) when no expansion is present should do
nothing
***********************************************************************************************************/
@@ -43,7 +43,7 @@
//-----------------------------------------
//
-// Karaoke Studio Cartslot implementation
+// Karaoke Studio Cartslot implementation
//
//-----------------------------------------
@@ -93,7 +93,7 @@ READ8_MEMBER(nes_kstudio_slot_device::read)
{
if (m_cart)
return m_cart->read(space, offset, mem_mask);
-
+
return 0xff;
}
@@ -102,27 +102,27 @@ bool nes_kstudio_slot_device::call_load()
if (m_cart)
{
UINT8 *ROM = m_cart->get_cart_base();
-
+
if (!ROM)
return IMAGE_INIT_FAIL;
-
+
// Existing exapnsion carts are all 128K, so we only load files of this size
if (software_entry() == NULL)
{
if (length() != 0x20000)
return IMAGE_INIT_FAIL;
-
- fread(&ROM, 0x20000);
+
+ fread(&ROM, 0x20000);
}
else
{
if (get_software_region_length("rom") != 0x20000)
return IMAGE_INIT_FAIL;
-
+
memcpy(ROM, get_software_region("rom"), 0x20000);
}
}
-
+
return IMAGE_INIT_PASS;
}
@@ -141,7 +141,7 @@ void nes_kstudio_slot_device::get_default_card_software(astring &result)
//-----------------------------------------------
//
-// Karaoke Studio Expansion cart implementation
+// Karaoke Studio Expansion cart implementation
//
//-----------------------------------------------
@@ -181,7 +181,7 @@ UINT8 *nes_kstudio_rom_device::get_cart_base()
//------------------------------------------
//
-// Karaoke Studio Base Cart implementation
+// Karaoke Studio Base Cart implementation
//
//------------------------------------------
@@ -220,7 +220,7 @@ void nes_karaokestudio_device::pcb_reset()
Bandai Karaoke Studio board emulation
- Games: Karaoke Studio + expansion carts with
+ Games: Karaoke Studio + expansion carts with
additional songs
Note: we currently do not emulate properly the
@@ -260,7 +260,7 @@ WRITE8_MEMBER(nes_karaokestudio_device::write_h)
// cart (when expansion is present, code keeps switching both from the expansion rom and from
// the main ROM)
// my guess is that writes with bit3=0 and no expansion just do nothing, but it shall be verified
-
+
if (offset >= 04000)
{
if (BIT(data, 3))
@@ -268,7 +268,7 @@ WRITE8_MEMBER(nes_karaokestudio_device::write_h)
m_exp_active = 0;
prg16_89ab(data & 7);
}
- else // expansion cart
+ else // expansion cart
{
m_exp_active = 1;
m_subslot->write_prg_bank(data & 7);
@@ -308,4 +308,3 @@ machine_config_constructor nes_karaokestudio_device::device_mconfig_additions()
{
return MACHINE_CONFIG_NAME( karaoke_studio );
}
-
diff --git a/src/emu/bus/nes/karastudio.h b/src/emu/bus/nes/karastudio.h
index d3c8f2a6568..bfa4c252ac7 100644
--- a/src/emu/bus/nes/karastudio.h
+++ b/src/emu/bus/nes/karastudio.h
@@ -6,7 +6,7 @@
//-----------------------------------------
//
-// Karaoke Studio Cartslot implementation
+// Karaoke Studio Cartslot implementation
//
//-----------------------------------------
@@ -18,13 +18,13 @@ public:
// construction/destruction
kstudio_cart_interface(const machine_config &mconfig, device_t &device);
virtual ~kstudio_cart_interface();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
-
+
UINT8 *get_cart_base() { return m_rom; }
void write_prg_bank(UINT8 bank) { m_bank = bank; }
-
+
protected:
// internal state
UINT8 *m_rom;
@@ -42,15 +42,15 @@ public:
// construction/destruction
nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~nes_kstudio_slot_device();
-
+
// device-level overrides
virtual void device_start();
virtual void device_config_complete() { update_names(); }
-
+
// image-level overrides
virtual bool call_load();
virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry);
-
+
virtual iodevice_t image_type() const { return IO_CARTSLOT; }
virtual bool is_readable() const { return 1; }
virtual bool is_writeable() const { return 0; }
@@ -60,13 +60,13 @@ public:
virtual const char *image_interface() const { return "ks_cart"; }
virtual const char *file_extensions() const { return "bin"; }
virtual const option_guide *create_option_guide() const { return NULL; }
-
+
// slot interface overrides
virtual void get_default_card_software(astring &result);
-
+
virtual DECLARE_READ8_MEMBER(read);
void write_prg_bank(UINT8 bank) { if (m_cart) m_cart->write_prg_bank(bank); }
-
+
kstudio_cart_interface* m_cart;
};
@@ -81,7 +81,7 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false)
//-----------------------------------------------
//
-// Karaoke Studio Expansion cart implementation
+// Karaoke Studio Expansion cart implementation
//
//-----------------------------------------------
@@ -93,11 +93,11 @@ class nes_kstudio_rom_device : public device_t,
public:
// construction/destruction
nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const;
virtual UINT8* get_cart_base();
-
+
protected:
// device-level overrides
virtual void device_start();
@@ -110,7 +110,7 @@ extern const device_type NES_KSEXPANSION_ROM;
//-------------------------------------------
//
-// Karaoke Studio Base Cart implementation
+// Karaoke Studio Base Cart implementation
//
//-------------------------------------------
diff --git a/src/emu/bus/nes/mmc5.c b/src/emu/bus/nes/mmc5.c
index 7601a90c914..c3aa9beeed7 100644
--- a/src/emu/bus/nes/mmc5.c
+++ b/src/emu/bus/nes/mmc5.c
@@ -117,7 +117,7 @@ void nes_exrom_device::pcb_reset()
m_split_chr = 0;
m_ex1_bank = 0;
m_vcount = 0;
-
+
memset(m_vrom_bank, 0x3ff, ARRAY_LENGTH(m_vrom_bank));
m_prg_regs[0] = 0xfc;
m_prg_regs[1] = 0xfd;
@@ -241,7 +241,7 @@ void nes_exrom_device::update_prg()
void nes_exrom_device::hblank_irq(int scanline, int vblank, int blanked )
{
m_vcount = scanline;
-
+
if (scanline == m_irq_count)
{
if (m_irq_enable)
@@ -284,7 +284,7 @@ inline bool nes_exrom_device::in_split()
{
ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
int tile = ppu->get_tilenum();
-
+
if (tile < 34)
{
if (!m_split_rev && tile < m_split_ctrl)
@@ -303,7 +303,7 @@ READ8_MEMBER(nes_exrom_device::nt_r)
{
case MMC5FILL:
if ((offset & 0x3ff) >= 0x3c0)
- return m_floodattr;
+ return m_floodattr;
return m_floodtile;
case EXRAM:
@@ -315,7 +315,7 @@ READ8_MEMBER(nes_exrom_device::nt_r)
case CIRAM:
default:
- // Uchuu Keibitai SDF uses extensively split screen for its intro,
+ // Uchuu Keibitai SDF uses extensively split screen for its intro,
// but it does not work yet
if (m_split_scr && !(m_exram_control & 0x02) && in_split())
{
@@ -338,7 +338,7 @@ READ8_MEMBER(nes_exrom_device::nt_r)
{
if ((offset & 0x3ff) >= 0x3c0)
return m_mmc5_attrib[(m_exram[offset & 0x3ff] >> 6) & 0x03];
- else // in this case, we write Ex1 CHR bank, but then access NT normally!
+ else // in this case, we write Ex1 CHR bank, but then access NT normally!
{
m_ex1_chr = 1;
m_ex1_bank = (m_exram[offset & 0x3ff] & 0x3f) | (m_high_chr << 6);
@@ -350,17 +350,17 @@ READ8_MEMBER(nes_exrom_device::nt_r)
WRITE8_MEMBER(nes_exrom_device::nt_w)
{
- int page = ((offset & 0xc00) >> 10);
-
+ int page = ((offset & 0xc00) >> 10);
+
if (!m_nt_writable[page])
return;
-
+
switch (m_nt_src[page])
{
case EXRAM:
m_exram[offset & 0x3ff] = data;
break;
-
+
case CIRAM:
default:
m_nt_access[page][offset & 0x3ff] = data;
@@ -415,10 +415,10 @@ READ8_MEMBER(nes_exrom_device::chr_r)
// However, if a game enables Ex1 but does not write a new m_ex1_bank, I'm not sure here we get the correct behavior
if (m_exram_control == 1 && ppu->get_draw_phase() == PPU_DRAW_BG && m_ex1_chr)
return bg_ex1_chr_r(offset & 0xfff);
-
+
if (m_split_scr && !(m_exram_control & 0x02) && in_split() && ppu->get_draw_phase() == PPU_DRAW_BG && m_split_chr)
return split_chr_r(offset & 0xfff);
-
+
if (ppu->is_sprite_8x16())
{
if (ppu->get_draw_phase() == PPU_DRAW_OAM)
@@ -444,9 +444,9 @@ READ8_MEMBER(nes_exrom_device::read_l)
if ((offset >= 0x1c00) && (offset <= 0x1fff))
{
// EXRAM
- if (BIT(m_exram_control, 1)) // Modes 2,3 = read
+ if (BIT(m_exram_control, 1)) // Modes 2,3 = read
return m_exram[offset - 0x1c00];
- else
+ else
return m_open_bus; // Modes 0,1 = open bus
}
@@ -486,9 +486,9 @@ WRITE8_MEMBER(nes_exrom_device::write_l)
if ((offset >= 0x1c00) && (offset <= 0x1fff))
{
// EXRAM
- if (m_exram_control == 0x02) // Mode 2 = write data
+ if (m_exram_control == 0x02) // Mode 2 = write data
m_exram[offset - 0x1c00] = data;
- else if (m_exram_control != 0x03) // Modes 0,1 = write data in frame / write 0 otherwise
+ else if (m_exram_control != 0x03) // Modes 0,1 = write data in frame / write 0 otherwise
{
if (m_irq_status & 0x40)
m_exram[offset - 0x1c00] = data;
@@ -554,7 +554,7 @@ WRITE8_MEMBER(nes_exrom_device::write_l)
case 0x1116:
case 0x1117:
m_prg_regs[offset & 3] = data & 0x7f;
- m_prg_ram_mapped[offset & 3] = !BIT(data, 7); // m_prg_ram_mapped[3] is not used, in fact!
+ m_prg_ram_mapped[offset & 3] = !BIT(data, 7); // m_prg_ram_mapped[3] is not used, in fact!
update_prg();
break;
diff --git a/src/emu/bus/nes/mmc5.h b/src/emu/bus/nes/mmc5.h
index cd15c58d817..dbd4988d839 100644
--- a/src/emu/bus/nes/mmc5.h
+++ b/src/emu/bus/nes/mmc5.h
@@ -66,7 +66,7 @@ protected:
UINT8 m_prg_ram_mapped[4];
UINT8 m_ex1_bank;
-
+
UINT8 m_high_chr; // $5130
UINT8 m_split_scr; // $5200
diff --git a/src/emu/bus/nes/nes_carts.c b/src/emu/bus/nes/nes_carts.c
index 047683d4103..27ef460b504 100644
--- a/src/emu/bus/nes/nes_carts.c
+++ b/src/emu/bus/nes/nes_carts.c
@@ -127,7 +127,7 @@ SLOT_INTERFACE_START(nes_cart)
SLOT_INTERFACE_INTERNAL("bf9093", NES_BF9093)
SLOT_INTERFACE_INTERNAL("bf9096", NES_BF9096)
SLOT_INTERFACE_INTERNAL("goldenfive", NES_GOLDEN5)
- SLOT_INTERFACE_INTERNAL("ade", NES_ALADDIN)
+ SLOT_INTERFACE_INTERNAL("ade", NES_ALADDIN)
SLOT_INTERFACE_INTERNAL("cne_decathl", NES_CNE_DECATHL)
SLOT_INTERFACE_INTERNAL("cne_fsb", NES_CNE_FSB)
SLOT_INTERFACE_INTERNAL("cne_shlz", NES_CNE_SHLZ)
@@ -354,4 +354,3 @@ SLOT_INTERFACE_INTERNAL("test", NES_NROM)
//
SLOT_INTERFACE_INTERNAL("unknown", NES_NROM) // a few pirate dumps uses the wrong mapper...
SLOT_INTERFACE_END
-
diff --git a/src/emu/bus/nes/nes_ines.inc b/src/emu/bus/nes/nes_ines.inc
index 9577fef635a..0a464506667 100644
--- a/src/emu/bus/nes/nes_ines.inc
+++ b/src/emu/bus/nes/nes_ines.inc
@@ -56,8 +56,8 @@ static const nes_mmc mmc_list[] =
{ 24, KONAMI_VRC6 },
{ 25, KONAMI_VRC4 },
{ 26, KONAMI_VRC6 },
- { 27, UNL_WORLDHERO }, // 27 World Hero board - Unsupported
- { 28, BTL_ACTION53 }, // 28 - Multi-discrete PCB designed by Tepples for Action 53
+ { 27, UNL_WORLDHERO }, // 27 World Hero board - Unsupported
+ { 28, BTL_ACTION53 }, // 28 - Multi-discrete PCB designed by Tepples for Action 53
// 29 Unused
// 30 Unused
// 31 Unused
@@ -132,7 +132,7 @@ static const nes_mmc mmc_list[] =
// 100 images hacked to work with nesticle?
// 101 Unused (Urusei Yatsura had been assigned to this mapper, but it's Mapper 87)
// 102 Unused
- { 103, UNL_2708 }, // 103 Bootleg cart 2708 (Doki Doki Panic - FDS Conversion) - Unsupported
+ { 103, UNL_2708 }, // 103 Bootleg cart 2708 (Doki Doki Panic - FDS Conversion) - Unsupported
{ 104, CAMERICA_GOLDENFIVE },
{ 105, STD_EVENT },
{ 106, BTL_SMB3 },
@@ -191,7 +191,7 @@ static const nes_mmc mmc_list[] =
{ 159, BANDAI_LZ93EX1 }, // with 24c01
{ 160, SACHEN_SA009 },
// 161 Unused
- { 162, WAIXING_FS304}, // not confirmed, but a lot of chinese releases use it like this...
+ { 162, WAIXING_FS304}, // not confirmed, but a lot of chinese releases use it like this...
{ 163, NANJING_BOARD},
{ 164, WAIXING_FFV },
{ 165, WAIXING_SH2 },
@@ -264,7 +264,7 @@ static const nes_mmc mmc_list[] =
{ 232, CAMERICA_BF9096 },
{ 233, BMC_SUPER22 },
{ 234, AVE_MAXI15 },
- { 235, BMC_GOLD150 }, // 235 Golden Game x-in-1 - Unsupported
+ { 235, BMC_GOLD150 }, // 235 Golden Game x-in-1 - Unsupported
// 236 Game 800-in-1 - Unsupported
// 237 Unused
{ 238, UNL_603_5052 },
@@ -525,7 +525,7 @@ void nes_cart_slot_device::call_load_ines()
switch (m_pcb_id)
{
case STD_NROM:
- if (prg_size == 3 * 0x4000) // NROM368 are padded with 2k empty data at start to accomplish with iNES standard
+ if (prg_size == 3 * 0x4000) // NROM368 are padded with 2k empty data at start to accomplish with iNES standard
{
m_pcb_id = STD_NROM368;
fseek(0x810, SEEK_SET);
@@ -834,7 +834,7 @@ const char * nes_cart_slot_device::get_default_card_ines(UINT8 *ROM, UINT32 len)
}
// use info from nes.hsi if available!
-// if (hashfile_extrainfo(*this, mapinfo))
+// if (hashfile_extrainfo(*this, mapinfo))
if (0)
{
if (4 == sscanf(mapinfo,"%d %d %d %d", &mapint1, &mapint2, &mapint3, &mapint4))
diff --git a/src/emu/bus/nes/nes_slot.h b/src/emu/bus/nes/nes_slot.h
index c37ccb1d88d..f93f5f76819 100644
--- a/src/emu/bus/nes/nes_slot.h
+++ b/src/emu/bus/nes/nes_slot.h
@@ -119,8 +119,8 @@ enum
WAIXING_DQ8, WAIXING_FFV, WAIXING_WXZS2, SUPERGAME_LIONKING, SUPERGAME_BOOGERMAN,
KAY_BOARD, HOSENKAN_BOARD, NITRA_TDA, GOUDER_37017, NANJING_BOARD,
WHIRLWIND_2706,
- NOCASH_NOCHR, // homebrew PCB design which uses NTRAM for CHRRAM
- BTL_ACTION53, // homebrew PCB for homebrew multicarts
+ NOCASH_NOCHR, // homebrew PCB design which uses NTRAM for CHRRAM
+ BTL_ACTION53, // homebrew PCB for homebrew multicarts
/* FFE boards, for mappers 6, 8, 17 */
FFE3_BOARD, FFE4_BOARD, FFE8_BOARD, TEST_BOARD,
/* Unsupported (for place-holder boards, with no working emulation) & no-board (at init) */
diff --git a/src/emu/bus/nes/nxrom.c b/src/emu/bus/nes/nxrom.c
index 68349d97f7b..8c3d56a4e6a 100644
--- a/src/emu/bus/nes/nxrom.c
+++ b/src/emu/bus/nes/nxrom.c
@@ -283,15 +283,15 @@ void nes_un1rom_device::pcb_reset()
-------------------------------------------------*/
/*-------------------------------------------------
-
+
NROM-368 board emulation
-
+
iNES: mapper 0 with 3xPRG banks
This is an homebrew extension to map linearly 46KB
or PRG in boards with no PRG bankswitch logic
-
+
In MESS: Supported
-
+
-------------------------------------------------*/
READ8_MEMBER(nes_nrom368_device::read_l)
@@ -425,7 +425,7 @@ READ8_MEMBER(nes_cnrom_device::chr_r)
// For most boards, chr_open_bus remains always zero.
if (m_chr_open_bus)
return m_open_bus;
-
+
return m_chr_access[bank][offset & 0x3ff];
}
@@ -549,16 +549,16 @@ WRITE8_MEMBER(nes_un1rom_device::write_h)
}
/*-------------------------------------------------
-
+
NoCash NOCHR board emulation
-
+
This is an homebrew PCB design on a single chip
(+possibly CIC) which uses the NTRAM as CHRRAM!
-
+
iNES: mapper 218
-
+
In MESS: Supported.
-
+
-------------------------------------------------*/
WRITE8_MEMBER(nes_nochr_device::chr_w)
@@ -569,7 +569,7 @@ WRITE8_MEMBER(nes_nochr_device::chr_w)
else if (mirr == PPU_MIRROR_LOW)
m_ciram[(offset & 0x3ff) + 0x400] = data;
else
- m_ciram[offset & 0x7ff] = data; // not sure here, since there is no software to test...
+ m_ciram[offset & 0x7ff] = data; // not sure here, since there is no software to test...
}
READ8_MEMBER(nes_nochr_device::chr_r)
@@ -580,5 +580,5 @@ READ8_MEMBER(nes_nochr_device::chr_r)
else if (mirr == PPU_MIRROR_LOW)
return m_ciram[(offset & 0x3ff) + 0x400];
else
- return m_ciram[offset & 0x7ff]; // not sure here, since there is no software to test...
+ return m_ciram[offset & 0x7ff]; // not sure here, since there is no software to test...
}
diff --git a/src/emu/bus/nes/sunsoft_dcs.c b/src/emu/bus/nes/sunsoft_dcs.c
index 93e1e67bf59..d4dd1a8e261 100644
--- a/src/emu/bus/nes/sunsoft_dcs.c
+++ b/src/emu/bus/nes/sunsoft_dcs.c
@@ -27,7 +27,7 @@
//-----------------------------------------------
//
-// Nantettate!! Baseball Cartslot implementation
+// Nantettate!! Baseball Cartslot implementation
//
//-----------------------------------------------
@@ -119,7 +119,7 @@ void nes_ntb_slot_device::get_default_card_software(astring &result)
//-----------------------------------------------
//
-// Nantettate!! Baseball Minicart implementation
+// Nantettate!! Baseball Minicart implementation
//
//-----------------------------------------------
@@ -154,8 +154,8 @@ UINT8 *nes_ntb_rom_device::get_cart_base()
//------------------------------------------------
//
-// Nantettate!! Baseball base cart implementation
-// a.k.a. Sunsoft Dual Cassette System
+// Nantettate!! Baseball base cart implementation
+// a.k.a. Sunsoft Dual Cassette System
// (variant of Sunsoft-4 PCB)
//
//------------------------------------------------
diff --git a/src/emu/bus/nes/sunsoft_dcs.h b/src/emu/bus/nes/sunsoft_dcs.h
index c11794fd640..02c32fc3f19 100644
--- a/src/emu/bus/nes/sunsoft_dcs.h
+++ b/src/emu/bus/nes/sunsoft_dcs.h
@@ -6,7 +6,7 @@
//-----------------------------------------------
//
-// Nantettate!! Baseball Cartslot implementation
+// Nantettate!! Baseball Cartslot implementation
//
//-----------------------------------------------
@@ -77,7 +77,7 @@ extern const device_type NES_NTB_SLOT;
//-----------------------------------------------
//
-// Nantettate!! Baseball Minicart implementation
+// Nantettate!! Baseball Minicart implementation
//
//-----------------------------------------------
@@ -106,8 +106,8 @@ extern const device_type NES_NTB_ROM;
//------------------------------------------------
//
-// Nantettate!! Baseball base cart implementation
-// a.k.a. Sunsoft Dual Cassette System
+// Nantettate!! Baseball base cart implementation
+// a.k.a. Sunsoft Dual Cassette System
// (variant of Sunsoft-4 PCB)
//
//------------------------------------------------
diff --git a/src/emu/bus/nubus/nubus_specpdq.c b/src/emu/bus/nubus/nubus_specpdq.c
index c0db4c01ac7..51d5ee15e8a 100644
--- a/src/emu/bus/nubus/nubus_specpdq.c
+++ b/src/emu/bus/nubus/nubus_specpdq.c
@@ -37,7 +37,7 @@ MACHINE_CONFIG_FRAGMENT( specpdq )
MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
MCFG_SCREEN_SIZE(1280,1024)
MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 844-1)
-
+
MCFG_PALETTE_ADD("palette", 256)
MACHINE_CONFIG_END
diff --git a/src/emu/bus/nubus/nubus_specpdq.h b/src/emu/bus/nubus/nubus_specpdq.h
index 4cc249ff98d..d1267ec42f3 100644
--- a/src/emu/bus/nubus/nubus_specpdq.h
+++ b/src/emu/bus/nubus/nubus_specpdq.h
@@ -51,7 +51,7 @@ private:
int m_width, m_height, m_patofsx, m_patofsy;
UINT32 m_vram_addr, m_vram_src;
UINT8 m_fillbytes[256];
- required_device<palette_device> m_palette;
+ required_device<palette_device> m_palette;
};
diff --git a/src/emu/bus/plus4/c1551.c b/src/emu/bus/plus4/c1551.c
index 7d46d56b7b0..9bf22d73819 100644
--- a/src/emu/bus/plus4/c1551.c
+++ b/src/emu/bus/plus4/c1551.c
@@ -355,7 +355,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
static SLOT_INTERFACE_START( c1551_floppies )
- SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD )
+ SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD )
SLOT_INTERFACE_END
diff --git a/src/emu/bus/plus4/c1551.h b/src/emu/bus/plus4/c1551.h
index da9533e1494..7f6963682fb 100644
--- a/src/emu/bus/plus4/c1551.h
+++ b/src/emu/bus/plus4/c1551.h
@@ -30,7 +30,7 @@
// ======================> c1551_device
class c1551_device : public device_t,
- public device_plus4_expansion_card_interface
+ public device_plus4_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/sms_exp/smsexp.h b/src/emu/bus/sms_exp/smsexp.h
index 871424aa856..5e665439b9d 100644
--- a/src/emu/bus/sms_exp/smsexp.h
+++ b/src/emu/bus/sms_exp/smsexp.h
@@ -51,7 +51,7 @@ public:
DECLARE_WRITE8_MEMBER(write_mapper);
DECLARE_READ8_MEMBER(read_ram);
DECLARE_WRITE8_MEMBER(write_ram);
-
+
int get_lphaser_xoffs();
device_sms_expansion_slot_interface *m_device;
diff --git a/src/emu/bus/vidbrain/exp.h b/src/emu/bus/vidbrain/exp.h
index c28ee41862a..2f1e7f67988 100644
--- a/src/emu/bus/vidbrain/exp.h
+++ b/src/emu/bus/vidbrain/exp.h
@@ -108,8 +108,8 @@ protected:
// ======================> videobrain_expansion_slot_device
class videobrain_expansion_slot_device : public device_t,
- public device_slot_interface,
- public device_image_interface
+ public device_slot_interface,
+ public device_image_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/wangpc/tig.c b/src/emu/bus/wangpc/tig.c
index 4c7b27dc0d9..3cefdc7614c 100644
--- a/src/emu/bus/wangpc/tig.c
+++ b/src/emu/bus/wangpc/tig.c
@@ -122,14 +122,14 @@ static MACHINE_CONFIG_FRAGMENT( wangpc_tig )
MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette")
- MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL_52_832MHz/28)
+ MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL_52_832MHz/28)
MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_0_map)
- MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(wangpc_tig_device, hgdc_draw_text)
+ MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(wangpc_tig_device, hgdc_draw_text)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADD(UPD7720_1_TAG, UPD7220, XTAL_52_832MHz/28)
MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map)
- MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(wangpc_tig_device, hgdc_display_pixels)
+ MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(wangpc_tig_device, hgdc_display_pixels)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MACHINE_CONFIG_END
diff --git a/src/emu/bus/wangpc/tig.h b/src/emu/bus/wangpc/tig.h
index dae01f0a56d..bf73f97148a 100644
--- a/src/emu/bus/wangpc/tig.h
+++ b/src/emu/bus/wangpc/tig.h
@@ -61,7 +61,7 @@ private:
UINT8 m_option;
UINT8 m_attr[16];
UINT8 m_underline;
- required_device<palette_device> m_palette;
+ required_device<palette_device> m_palette;
};
diff --git a/src/emu/bus/wangpc/wangpc.h b/src/emu/bus/wangpc/wangpc.h
index 11af0a455ca..ea594b19413 100644
--- a/src/emu/bus/wangpc/wangpc.h
+++ b/src/emu/bus/wangpc/wangpc.h
@@ -82,7 +82,7 @@
class wangpcbus_device;
class wangpcbus_slot_device : public device_t,
- public device_slot_interface
+ public device_slot_interface
{
public:
// construction/destruction
diff --git a/src/emu/clifront.h b/src/emu/clifront.h
index dfa2bc721d9..8242f73ae40 100644
--- a/src/emu/clifront.h
+++ b/src/emu/clifront.h
@@ -114,7 +114,7 @@ private:
cli_options & m_options;
osd_interface & m_osd;
int m_result;
- UINT64 m_start_memory;
+ UINT64 m_start_memory;
};
diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c
index d0589abfff6..730326fccd0 100644
--- a/src/emu/cpu/avr8/avr8.c
+++ b/src/emu/cpu/avr8/avr8.c
@@ -633,11 +633,11 @@ avr8_device::avr8_device(const machine_config &mconfig, const char *name, const
m_data_config("data", ENDIANNESS_LITTLE, 8, 16, 0, internal_map),
m_io_config("io", ENDIANNESS_LITTLE, 8, 4),
m_eeprom(NULL),
- m_cpu_type(cpu_type),
- m_lfuses(0x62),
- m_hfuses(0x99),
- m_efuses(0xFF),
- m_lock_bits(0xFF),
+ m_cpu_type(cpu_type),
+ m_lfuses(0x62),
+ m_hfuses(0x99),
+ m_efuses(0xFF),
+ m_lock_bits(0xFF),
m_pc(0),
m_spi_active(false),
m_spi_prescale(0),
@@ -649,12 +649,12 @@ avr8_device::avr8_device(const machine_config &mconfig, const char *name, const
{
// Allocate & setup
- for (int t=0; t<=5; t++){
+ for (int t=0; t<=5; t++){
m_timer_top[t] = 0;
m_timer_increment[t] = 1;
m_timer_prescale[t] = 0;
m_timer_prescale_count[t] = 0;
- }
+ }
}
@@ -675,7 +675,7 @@ void avr8_device::static_set_config(device_t &device, const avr8_config &config)
void avr8_device::set_low_fuses(const UINT8 byte)
{
- m_lfuses = byte;
+ m_lfuses = byte;
}
//-------------------------------------------------
@@ -684,7 +684,7 @@ void avr8_device::set_low_fuses(const UINT8 byte)
void avr8_device::set_high_fuses(const UINT8 byte)
{
- m_hfuses = byte;
+ m_hfuses = byte;
}
//-------------------------------------------------
@@ -693,7 +693,7 @@ void avr8_device::set_high_fuses(const UINT8 byte)
void avr8_device::set_extended_fuses(const UINT8 byte)
{
- m_efuses = byte;
+ m_efuses = byte;
}
//-------------------------------------------------
@@ -702,7 +702,7 @@ void avr8_device::set_extended_fuses(const UINT8 byte)
void avr8_device::set_lock_bits(const UINT8 byte)
{
- m_lock_bits = byte;
+ m_lock_bits = byte;
}
//-------------------------------------------------
@@ -841,26 +841,26 @@ void avr8_device::device_start()
void avr8_device::device_reset()
{
- logerror("AVR low fuse bits: 0x%02X\n", m_lfuses);
- logerror("AVR high fuse bits: 0x%02X\n", m_hfuses);
- logerror("AVR extended fuse bits: 0x%02X\n", m_efuses);
- logerror("AVR lock bits: 0x%02X\n", m_lock_bits);
-
- switch ((m_hfuses & (BOOTSZ1|BOOTSZ0)) >> 1){
- case 0: m_boot_size = 4096; break;
- case 1: m_boot_size = 2048; break;
- case 2: m_boot_size = 1024; break;
- case 3: m_boot_size = 512; break;
- default: break;
- }
-
- if (m_hfuses & BOOTRST){
- m_shifted_pc = 0x0000;
- logerror("Booting AVR core from address 0x0000\n");
- } else {
- m_shifted_pc = (m_addr_mask + 1) - 2*m_boot_size;
- logerror("AVR Boot loader section size: %d words\n", m_boot_size);
- }
+ logerror("AVR low fuse bits: 0x%02X\n", m_lfuses);
+ logerror("AVR high fuse bits: 0x%02X\n", m_hfuses);
+ logerror("AVR extended fuse bits: 0x%02X\n", m_efuses);
+ logerror("AVR lock bits: 0x%02X\n", m_lock_bits);
+
+ switch ((m_hfuses & (BOOTSZ1|BOOTSZ0)) >> 1){
+ case 0: m_boot_size = 4096; break;
+ case 1: m_boot_size = 2048; break;
+ case 2: m_boot_size = 1024; break;
+ case 3: m_boot_size = 512; break;
+ default: break;
+ }
+
+ if (m_hfuses & BOOTRST){
+ m_shifted_pc = 0x0000;
+ logerror("Booting AVR core from address 0x0000\n");
+ } else {
+ m_shifted_pc = (m_addr_mask + 1) - 2*m_boot_size;
+ logerror("AVR Boot loader section size: %d words\n", m_boot_size);
+ }
for (int i = 0; i < 0x200; i++)
{
@@ -871,12 +871,12 @@ void avr8_device::device_reset()
m_spi_prescale = 0;
m_spi_prescale_count = 0;
- for (int t=0; t<=5; t++){
+ for (int t=0; t<=5; t++){
m_timer_top[t] = 0;
m_timer_increment[t] = 1;
m_timer_prescale[t] = 0;
m_timer_prescale_count[t] = 0;
- }
+ }
m_interrupt_pending = false;
m_elapsed_cycles = 0;
@@ -1136,31 +1136,31 @@ void avr8_device::timer_tick(int cycles)
}
}
- for (int t=0; t<=5; t++){
- if (m_timer_prescale[t] != 0)
- {
- m_timer_prescale_count[t]++;
- if (m_timer_prescale_count[t] >= m_timer_prescale[t])
- {
- switch (t){
- case 0: timer0_tick(); break;
- case 1: timer1_tick(); break;
- case 2: timer2_tick(); break;
- case 3: timer3_tick(); break;
- case 4: timer4_tick(); break;
- case 5: timer5_tick(); break;
- }
- m_timer_prescale_count[t] -= m_timer_prescale[t];
- }
- }
- }
+ for (int t=0; t<=5; t++){
+ if (m_timer_prescale[t] != 0)
+ {
+ m_timer_prescale_count[t]++;
+ if (m_timer_prescale_count[t] >= m_timer_prescale[t])
+ {
+ switch (t){
+ case 0: timer0_tick(); break;
+ case 1: timer1_tick(); break;
+ case 2: timer2_tick(); break;
+ case 3: timer3_tick(); break;
+ case 4: timer4_tick(); break;
+ case 5: timer5_tick(); break;
+ }
+ m_timer_prescale_count[t] -= m_timer_prescale[t];
+ }
+ }
+ }
}
}
-// UINT8 ocr0[2] = { m_r[AVR8_REGIDX_OCR0A], m_r[AVR8_REGIDX_OCR0B] };
-//TODO UINT8 ocf0[2] = { (1 << AVR8_TIFR0_OCF0A_SHIFT), (1 << AVR8_TIFR4_OCF0B_SHIFT) };
-//TODO UINT8 int0[2] = { AVR8_INTIDX_OCF0A, AVR8_INTIDX_OCF0B };
+// UINT8 ocr0[2] = { m_r[AVR8_REGIDX_OCR0A], m_r[AVR8_REGIDX_OCR0B] };
+//TODO UINT8 ocf0[2] = { (1 << AVR8_TIFR0_OCF0A_SHIFT), (1 << AVR8_TIFR4_OCF0B_SHIFT) };
+//TODO UINT8 int0[2] = { AVR8_INTIDX_OCF0A, AVR8_INTIDX_OCF0B };
#define LOG_TIMER_0 0
#define LOG_TIMER_5 1
@@ -1168,8 +1168,8 @@ void avr8_device::timer_tick(int cycles)
void avr8_device::timer0_tick()
{
#if LOG_TIMER_0
- printf("AVR8_WGM0: %d\n", AVR8_WGM0);
- printf("AVR8_TCCR0A_COM0B: %d\n", AVR8_TCCR0A_COM0B);
+ printf("AVR8_WGM0: %d\n", AVR8_WGM0);
+ printf("AVR8_TCCR0A_COM0B: %d\n", AVR8_TCCR0A_COM0B);
#endif
UINT8 count = m_r[AVR8_REGIDX_TCNT0];
@@ -1178,69 +1178,69 @@ void avr8_device::timer0_tick()
switch(AVR8_WGM0)
{
case WGM02_NORMAL:
- printf("WGM02_NORMAL: Unimplemented timer#0 waveform generation mode\n");
- break;
+ printf("WGM02_NORMAL: Unimplemented timer#0 waveform generation mode\n");
+ break;
case WGM02_PWM_PC:
- printf("WGM02_PWM_PC: Unimplemented timer#0 waveform generation mode\n");
- break;
+ printf("WGM02_PWM_PC: Unimplemented timer#0 waveform generation mode\n");
+ break;
case WGM02_CTC_CMP:
- switch(AVR8_TCCR0A_COM0B){
- case 0: /* Normal Operation */
- if (count == m_timer_top[0]){
- m_timer_top[0] = 0;
- }
- break;
- case 1: /* Toggle OC0B on compare match */
- if (count == m_timer_top[0]){
- m_timer_top[0] = 0;
+ switch(AVR8_TCCR0A_COM0B){
+ case 0: /* Normal Operation */
+ if (count == m_timer_top[0]){
+ m_timer_top[0] = 0;
+ }
+ break;
+ case 1: /* Toggle OC0B on compare match */
+ if (count == m_timer_top[0]){
+ m_timer_top[0] = 0;
#if LOG_TIMER_0
- printf("[0] Toggle OC0B\n");
+ printf("[0] Toggle OC0B\n");
#endif
- m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) ^ (1 << 5));
- }
- break;
- case 2: /* Clear OC0B on compare match */
- if (count == m_timer_top[0]){
- m_timer_top[0] = 0;
- //Clear OC0B
+ m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) ^ (1 << 5));
+ }
+ break;
+ case 2: /* Clear OC0B on compare match */
+ if (count == m_timer_top[0]){
+ m_timer_top[0] = 0;
+ //Clear OC0B
#if LOG_TIMER_0
- printf("[0] Clear OC0B\n");
+ printf("[0] Clear OC0B\n");
#endif
- m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) & ~(1 << 5));
- }
- break;
- case 3: /* Set OC0B on compare match */
- if (count == m_timer_top[0]){
- m_timer_top[0] = 0;
+ m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) & ~(1 << 5));
+ }
+ break;
+ case 3: /* Set OC0B on compare match */
+ if (count == m_timer_top[0]){
+ m_timer_top[0] = 0;
#if LOG_TIMER_0
- printf("[0] Set OC0B\n");
+ printf("[0] Set OC0B\n");
#endif
- m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) | (1 << 5));
- }
- break;
- }
- break;
+ m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) | (1 << 5));
+ }
+ break;
+ }
+ break;
case WGM02_FAST_PWM:
- printf("WGM02_FAST_PWM: Unimplemented timer#0 waveform generation mode\n");
- break;
+ printf("WGM02_FAST_PWM: Unimplemented timer#0 waveform generation mode\n");
+ break;
case WGM02_PWM_PC_CMP:
- printf("WGM02_PWM_PC_CMP: Unimplemented timer#0 waveform generation mode\n");
- break;
+ printf("WGM02_PWM_PC_CMP: Unimplemented timer#0 waveform generation mode\n");
+ break;
case WGM02_FAST_PWM_CMP:
- printf("WGM02_FAST_PWM_CMP: Unimplemented timer#0 waveform generation mode\n");
- break;
+ printf("WGM02_FAST_PWM_CMP: Unimplemented timer#0 waveform generation mode\n");
+ break;
default:
verboselog(m_pc, 0, "update_timer0_compare_mode: Unknown waveform generation mode: %02x\n", AVR8_WGM0);
break;
}
- count = count & 0xff;
+ count = count & 0xff;
count += increment;
m_r[AVR8_REGIDX_TCNT0] = count & 0xff;
@@ -1268,7 +1268,7 @@ void avr8_device::timer0_force_output_compare(int reg)
void avr8_device::changed_tccr0b(UINT8 data)
{
- if (VERBOSE_LEVEL) printf("changed_tccr0b: data=0x%02X\n", data);
+ if (VERBOSE_LEVEL) printf("changed_tccr0b: data=0x%02X\n", data);
UINT8 oldtccr = AVR8_TCCR0B;
UINT8 newtccr = data;
@@ -1415,57 +1415,57 @@ void avr8_device::timer1_tick()
void avr8_device::update_timer_waveform_gen_mode(UINT8 t, UINT8 mode)
{
- INT32 oc_val = -1, ic_val = -1;
-
- switch (t){
- case 0:
- oc_val = AVR8_OCR0A;
- ic_val = -1;
- break;
- case 1:
- oc_val = AVR8_OCR1A;
- ic_val = AVR8_ICR1;
- break;
- case 2:
- oc_val = AVR8_OCR2A;
- ic_val = -1;
- break;
- case 3:
- oc_val = AVR8_OCR3A;
- ic_val = AVR8_ICR3;
- break;
- case 4:
- oc_val = AVR8_OCR4A;
- ic_val = AVR8_ICR4;
- break;
- case 5:
- oc_val = AVR8_OCR5A;
- ic_val = AVR8_ICR5;
- break;
- }
-
- INT32 top_values_02[8] = {0xFF, 0xFF, oc_val, 0xFF, -1, oc_val, -1, oc_val}; //table 20-8
-
- INT32 top_values_1345[16] = {0xFFFF, 0x00FF, 0x01FF, 0x03FF,
- oc_val, 0x00FF, 0x01FF, 0x03FF,
- ic_val, oc_val, ic_val, oc_val,
- ic_val, -1, ic_val, oc_val}; //table 17-2
-
- switch(t){
- case 0:
- case 2:
- m_timer_top[t] = top_values_02[mode];
- break;
- case 1:
- case 3:
- case 4:
- case 5:
- m_timer_top[t] = top_values_1345[mode];
- break;
- }
-
- if (m_timer_top[t] == -1){
- m_timer_top[t] = 0;
+ INT32 oc_val = -1, ic_val = -1;
+
+ switch (t){
+ case 0:
+ oc_val = AVR8_OCR0A;
+ ic_val = -1;
+ break;
+ case 1:
+ oc_val = AVR8_OCR1A;
+ ic_val = AVR8_ICR1;
+ break;
+ case 2:
+ oc_val = AVR8_OCR2A;
+ ic_val = -1;
+ break;
+ case 3:
+ oc_val = AVR8_OCR3A;
+ ic_val = AVR8_ICR3;
+ break;
+ case 4:
+ oc_val = AVR8_OCR4A;
+ ic_val = AVR8_ICR4;
+ break;
+ case 5:
+ oc_val = AVR8_OCR5A;
+ ic_val = AVR8_ICR5;
+ break;
+ }
+
+ INT32 top_values_02[8] = {0xFF, 0xFF, oc_val, 0xFF, -1, oc_val, -1, oc_val}; //table 20-8
+
+ INT32 top_values_1345[16] = {0xFFFF, 0x00FF, 0x01FF, 0x03FF,
+ oc_val, 0x00FF, 0x01FF, 0x03FF,
+ ic_val, oc_val, ic_val, oc_val,
+ ic_val, -1, ic_val, oc_val}; //table 17-2
+
+ switch(t){
+ case 0:
+ case 2:
+ m_timer_top[t] = top_values_02[mode];
+ break;
+ case 1:
+ case 3:
+ case 4:
+ case 5:
+ m_timer_top[t] = top_values_1345[mode];
+ break;
+ }
+
+ if (m_timer_top[t] == -1){
+ m_timer_top[t] = 0;
printf("update_timer_waveform_gen_mode: Timer #%d - Unsupported waveform generation type: %d\n", t, mode);
}
}
@@ -1497,7 +1497,7 @@ void avr8_device::update_timer1_input_edge_select()
void avr8_device::changed_tccr1b(UINT8 data)
{
- if (VERBOSE_LEVEL) printf("changed_tccr1b: data=0x%02X\n", data);
+ if (VERBOSE_LEVEL) printf("changed_tccr1b: data=0x%02X\n", data);
UINT8 oldtccr = AVR8_TCCR1B;
UINT8 newtccr = data;
@@ -1651,7 +1651,7 @@ void avr8_device::timer2_force_output_compare(int reg)
void avr8_device::changed_tccr2b(UINT8 data)
{
- if (VERBOSE_LEVEL) printf("changed_tccr2b: data=0x%02X\n", data);
+ if (VERBOSE_LEVEL) printf("changed_tccr2b: data=0x%02X\n", data);
UINT8 oldtccr = AVR8_TCCR2B;
UINT8 newtccr = data;
@@ -1711,8 +1711,8 @@ void avr8_device::timer4_tick()
//(m_r[AVR8_REGIDX_TCCR1A] & AVR8_TCCR1A_COM1B_MASK) >> AVR8_TCCR1A_COM1B_SHIFT };
UINT16 ocr4[2] = { (m_r[AVR8_REGIDX_OCR4AH] << 8) | m_r[AVR8_REGIDX_OCR4AL],
(m_r[AVR8_REGIDX_OCR4BH] << 8) | m_r[AVR8_REGIDX_OCR4BL] };
-//TODO UINT8 ocf4[2] = { (1 << AVR8_TIFR4_OCF4A_SHIFT), (1 << AVR8_TIFR4_OCF4B_SHIFT) };
-//TODO UINT8 int4[2] = { AVR8_INTIDX_OCF4A, AVR8_INTIDX_OCF4B };
+//TODO UINT8 ocf4[2] = { (1 << AVR8_TIFR4_OCF4A_SHIFT), (1 << AVR8_TIFR4_OCF4B_SHIFT) };
+//TODO UINT8 int4[2] = { AVR8_INTIDX_OCF4A, AVR8_INTIDX_OCF4B };
INT32 increment = m_timer_increment[4];
switch(AVR8_WGM4)
@@ -1720,38 +1720,38 @@ void avr8_device::timer4_tick()
case WGM4_FAST_PWM_8:
case WGM4_FAST_PWM_9:
case WGM4_FAST_PWM_10:
- switch(AVR8_TCCR4A_COM4B){
- case 0: /* Normal Operation */
- break;
- case 1: /* TODO */
- break;
- case 2: /* Non-inverting mode */
- if (count == m_timer_top[4]){
- //Clear OC0B
- printf("[2] Clear OC0B\n");
- m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) & ~(1 << 5));
- } else if (count == 0){
- //Set OC0B
- printf("[2] Set OC0B\n");
- m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) | (1 << 5));
- }
- break;
- case 3: /* Inverting mode */
- if (count == m_timer_top[4]){
- //Set OC0B
- printf("[3] Set OC0B\n");
- m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) | (1 << 5));
- } else if (count == 0){
- //Clear OC0B
- printf("[3] Clear OC0B\n");
- m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) & ~(1 << 5));
- }
- break;
- }
- break;
+ switch(AVR8_TCCR4A_COM4B){
+ case 0: /* Normal Operation */
+ break;
+ case 1: /* TODO */
+ break;
+ case 2: /* Non-inverting mode */
+ if (count == m_timer_top[4]){
+ //Clear OC0B
+ printf("[2] Clear OC0B\n");
+ m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) & ~(1 << 5));
+ } else if (count == 0){
+ //Set OC0B
+ printf("[2] Set OC0B\n");
+ m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) | (1 << 5));
+ }
+ break;
+ case 3: /* Inverting mode */
+ if (count == m_timer_top[4]){
+ //Set OC0B
+ printf("[3] Set OC0B\n");
+ m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) | (1 << 5));
+ } else if (count == 0){
+ //Clear OC0B
+ printf("[3] Clear OC0B\n");
+ m_io->write_byte(AVR8_IO_PORTG, m_io->read_byte(AVR8_IO_PORTG) & ~(1 << 5));
+ }
+ break;
+ }
+ break;
case WGM4_CTC_OCR:
- //printf("[T4] tick WGM4_CTC_OCR: %d\n", count);
+ //printf("[T4] tick WGM4_CTC_OCR: %d\n", count);
if (count == 0xffff)
{
m_r[AVR8_REGIDX_TIFR4] |= AVR8_TIFR4_TOV4_MASK;
@@ -1785,15 +1785,15 @@ void avr8_device::timer4_tick()
void avr8_device::update_timer_clock_source(UINT8 t, UINT8 clock_select)
{
- int prescale_values[8] = {0, 1, 8, 64, 256, 1024, -1, -1};
+ int prescale_values[8] = {0, 1, 8, 64, 256, 1024, -1, -1};
m_timer_prescale[t] = prescale_values[clock_select];
- if (VERBOSE_LEVEL) printf("update_timer_clock_source: t=%d cs=%d\n", t, clock_select);
+ if (VERBOSE_LEVEL) printf("update_timer_clock_source: t=%d cs=%d\n", t, clock_select);
- if (m_timer_prescale[t] == 0xFFFF){
- printf("[Timer #%d]: update_timer_clock_source: External trigger mode not implemented yet\n", t);
- m_timer_prescale[t] = 0;
- }
+ if (m_timer_prescale[t] == 0xFFFF){
+ printf("[Timer #%d]: update_timer_clock_source: External trigger mode not implemented yet\n", t);
+ m_timer_prescale[t] = 0;
+ }
if (m_timer_prescale_count[t] > m_timer_prescale[t])
m_timer_prescale_count[t] = m_timer_prescale[t] - 1;
@@ -1801,25 +1801,25 @@ void avr8_device::update_timer_clock_source(UINT8 t, UINT8 clock_select)
void avr8_device::changed_tccr3a(UINT8 data)
{
- //TODO: Implement-me
-// AVR8_TCCR3A = data;
+ //TODO: Implement-me
+// AVR8_TCCR3A = data;
}
void avr8_device::changed_tccr3b(UINT8 data)
{
- printf("IMPLEMENT-ME: changed_tccr4b: data=0x%02X\n", data);
+ printf("IMPLEMENT-ME: changed_tccr4b: data=0x%02X\n", data);
}
void avr8_device::changed_tccr3c(UINT8 data)
{
-// UINT8 oldtccr = AVR8_TCCR3C;
-// UINT8 newtccr = data;
-// UINT8 changed = newtccr ^ oldtccr;
- printf("IMPLEMENT-ME: changed_tccr3c: data=0x%02X\n", data);
+// UINT8 oldtccr = AVR8_TCCR3C;
+// UINT8 newtccr = data;
+// UINT8 changed = newtccr ^ oldtccr;
+ printf("IMPLEMENT-ME: changed_tccr3c: data=0x%02X\n", data);
-// AVR8_TCCR3C = data;
+// AVR8_TCCR3C = data;
- //TODO: Implement-me
+ //TODO: Implement-me
}
void avr8_device::changed_tccr4a(UINT8 data)
@@ -1838,7 +1838,7 @@ void avr8_device::changed_tccr4a(UINT8 data)
void avr8_device::changed_tccr4b(UINT8 data)
{
- printf("changed_tccr4b: data=0x%02X\n", data);
+ printf("changed_tccr4b: data=0x%02X\n", data);
UINT8 oldtccr = AVR8_TCCR4B;
UINT8 newtccr = data;
@@ -1849,13 +1849,13 @@ void avr8_device::changed_tccr4b(UINT8 data)
if(changed & AVR8_TCCR4B_FOC4A_MASK)
{
// TODO
-// timer4_force_output_compare(AVR8_REG_A);
+// timer4_force_output_compare(AVR8_REG_A);
}
if(changed & AVR8_TCCR4B_FOC4B_MASK)
{
// TODO
-// timer4_force_output_compare(AVR8_REG_B);
+// timer4_force_output_compare(AVR8_REG_B);
}
if(changed & AVR8_TCCR4B_WGM4_32_MASK)
@@ -1871,13 +1871,13 @@ void avr8_device::changed_tccr4b(UINT8 data)
void avr8_device::changed_tccr4c(UINT8 data)
{
-// UINT8 oldtccr = AVR8_TCCR4C;
-// UINT8 newtccr = data;
-// UINT8 changed = newtccr ^ oldtccr;
+// UINT8 oldtccr = AVR8_TCCR4C;
+// UINT8 newtccr = data;
+// UINT8 changed = newtccr ^ oldtccr;
AVR8_TCCR4C = data;
- //TODO: Implement-me
+ //TODO: Implement-me
}
/************************************************************************************************/
@@ -1886,8 +1886,8 @@ void avr8_device::changed_tccr4c(UINT8 data)
void avr8_device::timer5_tick()
{
#if LOG_TIMER_5
- printf("AVR8_WGM5: %d\n", AVR8_WGM5);
- printf("AVR8_TCCR5A_COM5B: %d\n", AVR8_TCCR5A_COM5B);
+ printf("AVR8_WGM5: %d\n", AVR8_WGM5);
+ printf("AVR8_TCCR5A_COM5B: %d\n", AVR8_TCCR5A_COM5B);
#endif
UINT16 count = (AVR8_TCNT5H << 8) + AVR8_TCNT5L;
@@ -1896,64 +1896,64 @@ void avr8_device::timer5_tick()
switch(AVR8_WGM5)
{
case WGM5_NORMAL:
- case WGM5_PWM_8_PC:
- case WGM5_PWM_9_PC:
- case WGM5_PWM_10_PC:
+ case WGM5_PWM_8_PC:
+ case WGM5_PWM_9_PC:
+ case WGM5_PWM_10_PC:
// case WGM5_CTC_OCR:
- case WGM5_FAST_PWM_8:
- case WGM5_FAST_PWM_9:
- case WGM5_FAST_PWM_10:
- case WGM5_PWM_PFC_ICR:
- case WGM5_PWM_PFC_OCR:
- case WGM5_PWM_PC_ICR:
- case WGM5_PWM_PC_OCR:
- case WGM5_CTC_ICR:
- case WGM5_FAST_PWM_ICR:
- case WGM5_FAST_PWM_OCR:
- printf("Unimplemented timer#5 waveform generation mode: WGMM5=0x%02X\n", AVR8_WGM5);
- break;
+ case WGM5_FAST_PWM_8:
+ case WGM5_FAST_PWM_9:
+ case WGM5_FAST_PWM_10:
+ case WGM5_PWM_PFC_ICR:
+ case WGM5_PWM_PFC_OCR:
+ case WGM5_PWM_PC_ICR:
+ case WGM5_PWM_PC_OCR:
+ case WGM5_CTC_ICR:
+ case WGM5_FAST_PWM_ICR:
+ case WGM5_FAST_PWM_OCR:
+ printf("Unimplemented timer#5 waveform generation mode: WGMM5=0x%02X\n", AVR8_WGM5);
+ break;
case WGM5_CTC_OCR:
- //TODO: verify this! Can be very wrong!!!
- switch(AVR8_TCCR5A_COM5B){
- case 0: /* Normal Operation */
- if (count == m_timer_top[5]){
- m_timer_top[5] = 0;
- }
- break;
- case 1: /* Toggle OC5B on compare match */
- if (count == m_timer_top[5]){
- m_timer_top[5] = 0;
+ //TODO: verify this! Can be very wrong!!!
+ switch(AVR8_TCCR5A_COM5B){
+ case 0: /* Normal Operation */
+ if (count == m_timer_top[5]){
+ m_timer_top[5] = 0;
+ }
+ break;
+ case 1: /* Toggle OC5B on compare match */
+ if (count == m_timer_top[5]){
+ m_timer_top[5] = 0;
#if LOG_TIMER_5
- printf("[5] Toggle OC5B\n");
+ printf("[5] Toggle OC5B\n");
#endif
- m_io->write_byte(AVR8_IO_PORTL, m_io->read_byte(AVR8_IO_PORTL) ^ (1 << 4));
- }
- break;
- case 2: /* Clear OC5B on compare match */
- if (count == m_timer_top[5]){
- m_timer_top[5] = 0;
- //Clear OC5B
+ m_io->write_byte(AVR8_IO_PORTL, m_io->read_byte(AVR8_IO_PORTL) ^ (1 << 4));
+ }
+ break;
+ case 2: /* Clear OC5B on compare match */
+ if (count == m_timer_top[5]){
+ m_timer_top[5] = 0;
+ //Clear OC5B
#if LOG_TIMER_5
- printf("[5] Clear OC5B\n");
+ printf("[5] Clear OC5B\n");
#endif
- m_io->write_byte(AVR8_IO_PORTL, m_io->read_byte(AVR8_IO_PORTL) & ~(1 << 4));
- }
- break;
- case 3: /* Set OC5B on compare match */
- if (count == m_timer_top[5]){
- m_timer_top[5] = 0;
+ m_io->write_byte(AVR8_IO_PORTL, m_io->read_byte(AVR8_IO_PORTL) & ~(1 << 4));
+ }
+ break;
+ case 3: /* Set OC5B on compare match */
+ if (count == m_timer_top[5]){
+ m_timer_top[5] = 0;
#if LOG_TIMER_5
- printf("[5] Set OC5B\n");
+ printf("[5] Set OC5B\n");
#endif
- m_io->write_byte(AVR8_IO_PORTL, m_io->read_byte(AVR8_IO_PORTL) | (1 << 4));
- }
- break;
- }
- break;
+ m_io->write_byte(AVR8_IO_PORTL, m_io->read_byte(AVR8_IO_PORTL) | (1 << 4));
+ }
+ break;
+ }
+ break;
default:
- printf("Timer #5: Unknown waveform generation mode: %02x\n", AVR8_WGM5);
+ printf("Timer #5: Unknown waveform generation mode: %02x\n", AVR8_WGM5);
break;
}
@@ -1978,7 +1978,7 @@ void avr8_device::changed_tccr5a(UINT8 data)
void avr8_device::changed_tccr5b(UINT8 data)
{
- printf("changed_tccr5b: data=0x%02X\n", data);
+ printf("changed_tccr5b: data=0x%02X\n", data);
UINT8 oldtccr = AVR8_TCCR5B;
UINT8 newtccr = data;
@@ -1989,19 +1989,19 @@ void avr8_device::changed_tccr5b(UINT8 data)
if(changed & AVR8_TCCR5C_FOC5A_MASK)
{
// TODO
-// timer5_force_output_compare(AVR8_REG_A);
+// timer5_force_output_compare(AVR8_REG_A);
}
if(changed & AVR8_TCCR5C_FOC5B_MASK)
{
// TODO
-// timer5_force_output_compare(AVR8_REG_B);
+// timer5_force_output_compare(AVR8_REG_B);
}
if(changed & AVR8_TCCR5C_FOC5C_MASK)
{
// TODO
-// timer5_force_output_compare(AVR8_REG_C);
+// timer5_force_output_compare(AVR8_REG_C);
}
if(changed & AVR8_TCCR5B_WGM5_32_MASK)
@@ -2160,66 +2160,66 @@ WRITE8_MEMBER( avr8_device::regs_w )
break;
case AVR8_REGIDX_PORTA:
- m_io->write_byte(AVR8_IO_PORTA, data);
- m_r[AVR8_REGIDX_PORTA] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTA, data);
+ m_r[AVR8_REGIDX_PORTA] = data;
+ break;
case AVR8_REGIDX_PORTB:
- m_io->write_byte(AVR8_IO_PORTB, data);
- m_r[AVR8_REGIDX_PORTB] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTB, data);
+ m_r[AVR8_REGIDX_PORTB] = data;
+ break;
case AVR8_REGIDX_PORTC:
- m_io->write_byte(AVR8_IO_PORTC, data);
- m_r[AVR8_REGIDX_PORTC] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTC, data);
+ m_r[AVR8_REGIDX_PORTC] = data;
+ break;
case AVR8_REGIDX_PORTD:
- m_io->write_byte(AVR8_IO_PORTD, data);
- m_r[AVR8_REGIDX_PORTD] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTD, data);
+ m_r[AVR8_REGIDX_PORTD] = data;
+ break;
case AVR8_REGIDX_PORTE:
- m_io->write_byte(AVR8_IO_PORTE, data);
- m_r[AVR8_REGIDX_PORTE] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTE, data);
+ m_r[AVR8_REGIDX_PORTE] = data;
+ break;
case AVR8_REGIDX_PORTF:
- m_io->write_byte(AVR8_IO_PORTF, data);
- m_r[AVR8_REGIDX_PORTF] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTF, data);
+ m_r[AVR8_REGIDX_PORTF] = data;
+ break;
case AVR8_REGIDX_PORTG:
- m_io->write_byte(AVR8_IO_PORTG, data);
- m_r[AVR8_REGIDX_PORTG] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTG, data);
+ m_r[AVR8_REGIDX_PORTG] = data;
+ break;
case AVR8_REGIDX_PORTH:
- m_io->write_byte(AVR8_IO_PORTH, data);
- m_r[AVR8_REGIDX_PORTH] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTH, data);
+ m_r[AVR8_REGIDX_PORTH] = data;
+ break;
case AVR8_REGIDX_PORTJ:
- m_io->write_byte(AVR8_IO_PORTJ, data);
- m_r[AVR8_REGIDX_PORTJ] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTJ, data);
+ m_r[AVR8_REGIDX_PORTJ] = data;
+ break;
case AVR8_REGIDX_PORTK:
- m_io->write_byte(AVR8_IO_PORTK, data);
- m_r[AVR8_REGIDX_PORTK] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTK, data);
+ m_r[AVR8_REGIDX_PORTK] = data;
+ break;
case AVR8_REGIDX_PORTL:
- m_io->write_byte(AVR8_IO_PORTL, data);
- m_r[AVR8_REGIDX_PORTL] = data;
- break;
+ m_io->write_byte(AVR8_IO_PORTL, data);
+ m_r[AVR8_REGIDX_PORTL] = data;
+ break;
case AVR8_REGIDX_DDRA:
case AVR8_REGIDX_DDRB:
case AVR8_REGIDX_DDRC:
case AVR8_REGIDX_DDRD:
case AVR8_REGIDX_SREG:
- case AVR8_REGIDX_RAMPZ:
+ case AVR8_REGIDX_RAMPZ:
case AVR8_REGIDX_SPH:
case AVR8_REGIDX_SPL:
m_r[offset] = data;
@@ -2287,7 +2287,7 @@ WRITE8_MEMBER( avr8_device::regs_w )
case AVR8_REGIDX_EEARH:
case AVR8_REGIDX_EEDR:
m_r[offset] = data;
- break;
+ break;
case AVR8_REGIDX_EECR:
m_r[offset] = data;
@@ -2297,17 +2297,17 @@ WRITE8_MEMBER( avr8_device::regs_w )
UINT16 addr = (m_r[AVR8_REGIDX_EEARH] & AVR8_EEARH_MASK) << 8;
addr |= m_r[AVR8_REGIDX_EEARL];
m_r[AVR8_REGIDX_EEDR] = m_eeprom[addr];
- if (VERBOSE_LEVEL) printf("EEPROM read @ 0x%04x data = 0x%02x\n", addr, m_eeprom[addr]);
+ if (VERBOSE_LEVEL) printf("EEPROM read @ 0x%04x data = 0x%02x\n", addr, m_eeprom[addr]);
}
if ((data & AVR8_EECR_EEPE_MASK) && (data & AVR8_EECR_EEMPE_MASK))
{
UINT16 addr = (m_r[AVR8_REGIDX_EEARH] & AVR8_EEARH_MASK) << 8;
addr |= m_r[AVR8_REGIDX_EEARL];
m_eeprom[addr] = m_r[AVR8_REGIDX_EEDR];
- if (VERBOSE_LEVEL) printf("EEPROM write @ 0x%04x data = 0x%02x ('%c')\n", addr, m_eeprom[addr], m_eeprom[addr]);
+ if (VERBOSE_LEVEL) printf("EEPROM write @ 0x%04x data = 0x%02x ('%c')\n", addr, m_eeprom[addr], m_eeprom[addr]);
- m_r[offset] = data & ~AVR8_EECR_EEPE_MASK; //indicates that we've finished writing a value to the EEPROM.
- //TODO: shouldn't this happen only after a certain dalay?
+ m_r[offset] = data & ~AVR8_EECR_EEPE_MASK; //indicates that we've finished writing a value to the EEPROM.
+ //TODO: shouldn't this happen only after a certain dalay?
}
break;
@@ -2338,60 +2338,60 @@ WRITE8_MEMBER( avr8_device::regs_w )
break;
}
- case AVR8_REGIDX_WDTCSR:
+ case AVR8_REGIDX_WDTCSR:
verboselog(m_pc, 0, "AVR8: WDTCSR = %02x\n", data );
- //TODO: changed_wdtcsr(data);
- break;
+ //TODO: changed_wdtcsr(data);
+ break;
- case AVR8_REGIDX_CLKPR:
+ case AVR8_REGIDX_CLKPR:
verboselog(m_pc, 0, "AVR8: CLKPR = %02x\n", data );
- //TODO: changed_clkpr(data);
- break;
+ //TODO: changed_clkpr(data);
+ break;
- case AVR8_REGIDX_PRR0:
+ case AVR8_REGIDX_PRR0:
verboselog(m_pc, 0, "AVR8: PRR0 = %02x\n", data );
- //TODO: changed_prr0(data);
- break;
+ //TODO: changed_prr0(data);
+ break;
- case AVR8_REGIDX_PRR1:
+ case AVR8_REGIDX_PRR1:
verboselog(m_pc, 0, "AVR8: PRR1 = %02x\n", data );
- //TODO: changed_prr1(data);
- break;
+ //TODO: changed_prr1(data);
+ break;
- case AVR8_REGIDX_OSCCAL:
+ case AVR8_REGIDX_OSCCAL:
verboselog(m_pc, 0, "AVR8: OSCCAL = %02x\n", data );
- //TODO: changed_osccal(data);
- break;
+ //TODO: changed_osccal(data);
+ break;
- case AVR8_REGIDX_PCICR:
+ case AVR8_REGIDX_PCICR:
verboselog(m_pc, 0, "AVR8: PCICR = %02x\n", data );
- //TODO: changed_pcicr(data);
- break;
+ //TODO: changed_pcicr(data);
+ break;
- case AVR8_REGIDX_EICRA:
+ case AVR8_REGIDX_EICRA:
verboselog(m_pc, 0, "AVR8: EICRA = %02x\n", data );
- //TODO: changed_eicra(data);
- break;
+ //TODO: changed_eicra(data);
+ break;
- case AVR8_REGIDX_EICRB:
+ case AVR8_REGIDX_EICRB:
verboselog(m_pc, 0, "AVR8: EICRB = %02x\n", data );
- //TODO: changed_eicrb(data);
- break;
+ //TODO: changed_eicrb(data);
+ break;
- case AVR8_REGIDX_PCMSK0:
+ case AVR8_REGIDX_PCMSK0:
verboselog(m_pc, 0, "AVR8: PCMSK0 = %02x\n", data );
- //TODO: changed_pcmsk0(data);
- break;
+ //TODO: changed_pcmsk0(data);
+ break;
- case AVR8_REGIDX_PCMSK1:
+ case AVR8_REGIDX_PCMSK1:
verboselog(m_pc, 0, "AVR8: PCMSK1 = %02x\n", data );
- //TODO: changed_pcmsk1(data);
- break;
+ //TODO: changed_pcmsk1(data);
+ break;
- case AVR8_REGIDX_PCMSK2:
+ case AVR8_REGIDX_PCMSK2:
verboselog(m_pc, 0, "AVR8: PCMSK2 = %02x\n", data );
- //TODO: changed_pcmsk2(data);
- break;
+ //TODO: changed_pcmsk2(data);
+ break;
case AVR8_REGIDX_TIMSK0:
verboselog(m_pc, 0, "AVR8: TIMSK0 = %02x\n", data );
@@ -2442,55 +2442,55 @@ WRITE8_MEMBER( avr8_device::regs_w )
update_interrupt(AVR8_INTIDX_TOV5);
break;
- case AVR8_REGIDX_XMCRA:
+ case AVR8_REGIDX_XMCRA:
verboselog(m_pc, 0, "AVR8: XMCRA = %02x\n", data );
- //TODO: changed_xmcra(data);
- break;
+ //TODO: changed_xmcra(data);
+ break;
- case AVR8_REGIDX_XMCRB:
+ case AVR8_REGIDX_XMCRB:
verboselog(m_pc, 0, "AVR8: XMCRB = %02x\n", data );
- //TODO: changed_xmcrb(data);
- break;
+ //TODO: changed_xmcrb(data);
+ break;
- case AVR8_REGIDX_ADCL:
+ case AVR8_REGIDX_ADCL:
verboselog(m_pc, 0, "AVR8: ADCL = %02x\n", data );
- //TODO: changed_adcl(data);
- break;
+ //TODO: changed_adcl(data);
+ break;
- case AVR8_REGIDX_ADCH:
+ case AVR8_REGIDX_ADCH:
verboselog(m_pc, 0, "AVR8: ADCH = %02x\n", data );
- //TODO: changed_adch(data);
- break;
+ //TODO: changed_adch(data);
+ break;
- case AVR8_REGIDX_ADCSRA:
+ case AVR8_REGIDX_ADCSRA:
verboselog(m_pc, 0, "AVR8: ADCSRA = %02x\n", data );
- //TODO: changed_adcsra(data);
- break;
+ //TODO: changed_adcsra(data);
+ break;
- case AVR8_REGIDX_ADCSRB:
+ case AVR8_REGIDX_ADCSRB:
verboselog(m_pc, 0, "AVR8: ADCSRB = %02x\n", data );
- //TODO: changed_adcsrb(data);
- break;
+ //TODO: changed_adcsrb(data);
+ break;
- case AVR8_REGIDX_ADMUX:
+ case AVR8_REGIDX_ADMUX:
verboselog(m_pc, 0, "AVR8: ADMUX = %02x\n", data );
- //TODO: changed_admux(data);
- break;
+ //TODO: changed_admux(data);
+ break;
- case AVR8_REGIDX_DIDR0:
+ case AVR8_REGIDX_DIDR0:
verboselog(m_pc, 0, "AVR8: DIDR0 = %02x\n", data );
- //TODO: changed_didr0(data);
- break;
+ //TODO: changed_didr0(data);
+ break;
- case AVR8_REGIDX_DIDR1:
+ case AVR8_REGIDX_DIDR1:
verboselog(m_pc, 0, "AVR8: DIDR1 = %02x\n", data );
- //TODO: changed_didr1(data);
- break;
+ //TODO: changed_didr1(data);
+ break;
- case AVR8_REGIDX_DIDR2:
+ case AVR8_REGIDX_DIDR2:
verboselog(m_pc, 0, "AVR8: DIDR2 = %02x\n", data );
- //TODO: changed_didr2(data);
- break;
+ //TODO: changed_didr2(data);
+ break;
case AVR8_REGIDX_TCCR1A:
verboselog(m_pc, 0, "AVR8: TCCR1A = %02x\n", data );
@@ -2577,17 +2577,17 @@ WRITE8_MEMBER( avr8_device::regs_w )
case AVR8_REGIDX_TCCR3A:
verboselog(m_pc, 0, "AVR8: TCCR3A = %02x\n", data );
- changed_tccr3a(data);
+ changed_tccr3a(data);
break;
case AVR8_REGIDX_TCCR3B:
verboselog(m_pc, 0, "AVR8: TCCR3B = %02x\n", data );
- changed_tccr3b(data);
+ changed_tccr3b(data);
break;
case AVR8_REGIDX_TCCR3C:
verboselog(m_pc, 0, "AVR8: TCCR3C = %02x\n", data );
- changed_tccr3c(data);
+ changed_tccr3c(data);
break;
case AVR8_REGIDX_TCNT3L:
@@ -2632,17 +2632,17 @@ WRITE8_MEMBER( avr8_device::regs_w )
case AVR8_REGIDX_TCCR4A:
verboselog(m_pc, 0, "AVR8: TCCR4A = %02x\n", data );
- changed_tccr4a(data);
+ changed_tccr4a(data);
break;
case AVR8_REGIDX_TCCR4B:
verboselog(m_pc, 0, "AVR8: TCCR4B = %02x\n", data );
- changed_tccr4b(data);
+ changed_tccr4b(data);
break;
case AVR8_REGIDX_TCCR4C:
verboselog(m_pc, 0, "AVR8: TCCR4C = %02x\n", data );
- changed_tccr4c(data);
+ changed_tccr4c(data);
break;
case AVR8_REGIDX_TCNT4L:
@@ -2687,12 +2687,12 @@ WRITE8_MEMBER( avr8_device::regs_w )
case AVR8_REGIDX_TCCR5A:
verboselog(m_pc, 0, "AVR8: TCCR5A = %02x\n", data );
- changed_tccr5a(data);
+ changed_tccr5a(data);
break;
case AVR8_REGIDX_TCCR5B:
verboselog(m_pc, 0, "AVR8: TCCR5B = %02x\n", data );
- changed_tccr5b(data);
+ changed_tccr5b(data);
break;
case AVR8_REGIDX_ASSR:
@@ -2723,7 +2723,7 @@ WRITE8_MEMBER( avr8_device::regs_w )
case AVR8_REGIDX_TWCR:
verboselog(m_pc, 0, "AVR8: TWCR = %02x\n", data );
//TODO: changed_twcr(data);
- m_r[AVR8_REGIDX_TWCR] = data;
+ m_r[AVR8_REGIDX_TWCR] = data;
break;
case AVR8_REGIDX_TWAMR:
@@ -2746,10 +2746,10 @@ WRITE8_MEMBER( avr8_device::regs_w )
//TODO: changed_ucsr0c(data);
break;
/*
- case AVR8_REGIDX_:
- verboselog(m_pc, 0, "AVR8: = %02x\n", data );
- //TODO: changed_(data);
- break;
+ case AVR8_REGIDX_:
+ verboselog(m_pc, 0, "AVR8: = %02x\n", data );
+ //TODO: changed_(data);
+ break;
*/
default:
verboselog(m_pc, 0, "AVR8: Unknown Register Write: %03x = %02x\n", offset, data);
@@ -2759,7 +2759,7 @@ WRITE8_MEMBER( avr8_device::regs_w )
READ8_MEMBER( avr8_device::regs_r )
{
-// printf("--- READ offset %04x ---\n", offset);
+// printf("--- READ offset %04x ---\n", offset);
switch( offset )
{
@@ -2798,48 +2798,48 @@ READ8_MEMBER( avr8_device::regs_r )
return m_r[offset];
case AVR8_REGIDX_PINA:
- // TODO: consider the DDRA
- return m_io->read_byte(AVR8_REG_A);
+ // TODO: consider the DDRA
+ return m_io->read_byte(AVR8_REG_A);
case AVR8_REGIDX_PINB:
- // TODO: consider the DDRB
- return m_io->read_byte(AVR8_REG_B);
+ // TODO: consider the DDRB
+ return m_io->read_byte(AVR8_REG_B);
case AVR8_REGIDX_PINC:
- // TODO: consider the DDRC
- return m_io->read_byte(AVR8_REG_C);
+ // TODO: consider the DDRC
+ return m_io->read_byte(AVR8_REG_C);
case AVR8_REGIDX_PIND:
- // TODO: consider the DDRD
- return m_io->read_byte(AVR8_REG_D);
+ // TODO: consider the DDRD
+ return m_io->read_byte(AVR8_REG_D);
case AVR8_REGIDX_PINE:
- // TODO: consider the DDRE
- return m_io->read_byte(AVR8_REG_E);
+ // TODO: consider the DDRE
+ return m_io->read_byte(AVR8_REG_E);
case AVR8_REGIDX_PINF:
- // TODO: consider the DDRF
- return m_io->read_byte(AVR8_REG_F);
+ // TODO: consider the DDRF
+ return m_io->read_byte(AVR8_REG_F);
case AVR8_REGIDX_PING:
- // TODO: consider the DDRG
- return m_io->read_byte(AVR8_REG_G);
+ // TODO: consider the DDRG
+ return m_io->read_byte(AVR8_REG_G);
case AVR8_REGIDX_PINH:
- // TODO: consider the DDRH
- return m_io->read_byte(AVR8_REG_H);
+ // TODO: consider the DDRH
+ return m_io->read_byte(AVR8_REG_H);
case AVR8_REGIDX_PINJ:
- // TODO: consider the DDRJ
- return m_io->read_byte(AVR8_REG_J);
+ // TODO: consider the DDRJ
+ return m_io->read_byte(AVR8_REG_J);
case AVR8_REGIDX_PINK:
- // TODO: consider the DDRK
- return m_io->read_byte(AVR8_REG_K);
+ // TODO: consider the DDRK
+ return m_io->read_byte(AVR8_REG_K);
case AVR8_REGIDX_PINL:
- // TODO: consider the DDRL
- return m_io->read_byte(AVR8_REG_L);
+ // TODO: consider the DDRL
+ return m_io->read_byte(AVR8_REG_L);
case AVR8_REGIDX_PORTA:
case AVR8_REGIDX_PORTB:
@@ -2868,7 +2868,7 @@ READ8_MEMBER( avr8_device::regs_r )
return m_r[offset];
// EEPROM registers:
- case AVR8_REGIDX_EECR:
+ case AVR8_REGIDX_EECR:
case AVR8_REGIDX_EEDR:
return m_r[offset];
@@ -2878,7 +2878,7 @@ READ8_MEMBER( avr8_device::regs_r )
case AVR8_REGIDX_GPIOR0:
case AVR8_REGIDX_GPIOR1:
case AVR8_REGIDX_GPIOR2:
-// case AVR8_REGIDX_UCSR0B:/*TODO: needed for Replicator 1 */
+// case AVR8_REGIDX_UCSR0B:/*TODO: needed for Replicator 1 */
case AVR8_REGIDX_SPDR: /*TODO: needed for Replicator 1 */
case AVR8_REGIDX_SPSR: /*TODO: needed for Replicator 1 */
// case AVR8_REGIDX_ADCSRA: /*TODO: needed for Replicator 1 */
@@ -2886,23 +2886,23 @@ READ8_MEMBER( avr8_device::regs_r )
case AVR8_REGIDX_SPL:
case AVR8_REGIDX_SPH:
case AVR8_REGIDX_SREG:
- case AVR8_REGIDX_TIMSK0:
- case AVR8_REGIDX_TIMSK1:
- case AVR8_REGIDX_TIMSK2:
+ case AVR8_REGIDX_TIMSK0:
+ case AVR8_REGIDX_TIMSK1:
+ case AVR8_REGIDX_TIMSK2:
// case AVR8_REGIDX_TIMSK3: /*TODO: needed for Replicator 1 */
- case AVR8_REGIDX_TIMSK4:
- case AVR8_REGIDX_TIMSK5:
+ case AVR8_REGIDX_TIMSK4:
+ case AVR8_REGIDX_TIMSK5:
return m_r[offset];
/* Two-wire registers: */
case AVR8_REGIDX_TWCR:
- /*TODO: needed for Replicator 1
- BLOQUEIA PROGRESSO DA EXECUÇÃO DO FIRMWARE no endereço 105EC*/
+ /*TODO: needed for Replicator 1
+ BLOQUEIA PROGRESSO DA EXECU??O DO FIRMWARE no endere?o 105EC*/
return m_r[offset];
case AVR8_REGIDX_TWSR:
- //quick hack: by returning a value != 0x08 we induce an error state that makes the object code jump out of the wait loop and continue execution failing the 2-wire write operation.
- //TODO: implement-me!
+ //quick hack: by returning a value != 0x08 we induce an error state that makes the object code jump out of the wait loop and continue execution failing the 2-wire write operation.
+ //TODO: implement-me!
return 0x00; /*TODO: needed for Replicator 1 */
@@ -3309,12 +3309,12 @@ void avr8_device::execute_run()
break;
case 0x0007: // ELPM Rd,Z+
pd32 = (m_r[AVR8_REGIDX_RAMPZ] << 16) | ZREG;
- m_r[RD5(op)] = m_program->read_byte(pd32);
- pd32++;
- m_r[AVR8_REGIDX_RAMPZ] = (pd32 >> 16) & 0x00ff;
- m_r[31] = (pd32 >> 8) & 0x00ff;
+ m_r[RD5(op)] = m_program->read_byte(pd32);
+ pd32++;
+ m_r[AVR8_REGIDX_RAMPZ] = (pd32 >> 16) & 0x00ff;
+ m_r[31] = (pd32 >> 8) & 0x00ff;
m_r[30] = pd32 & 0x00ff;
- opcycles = 3;
+ opcycles = 3;
break;
case 0x0009: // LD Rd,Y+
pd = YREG;
@@ -3323,7 +3323,7 @@ void avr8_device::execute_run()
m_r[29] = (pd >> 8) & 0x00ff;
m_r[28] = pd & 0x00ff;
opcycles = 2;
- break;
+ break;
case 0x000a: // LD Rd,-Y
pd = YREG;
pd--;
@@ -3679,7 +3679,7 @@ void avr8_device::execute_run()
case 0x00a0: // WDR
//output += sprintf( output, "WDR" );
//unimplemented_opcode(op); //TODO: necessary for emulating the Replicator 1
- //printf("Watchdot Reset!\n");
+ //printf("Watchdot Reset!\n");
opcycles = 1;
break;
case 0x00c0: // LPM
diff --git a/src/emu/cpu/avr8/avr8.h b/src/emu/cpu/avr8/avr8.h
index 9438813c17c..2a2f2ac3b88 100644
--- a/src/emu/cpu/avr8/avr8.h
+++ b/src/emu/cpu/avr8/avr8.h
@@ -90,7 +90,7 @@ public:
// inline configuration helpers
static void static_set_config(device_t &device, const avr8_config &config);
- // fuse configs
+ // fuse configs
void set_low_fuses(UINT8 byte);
void set_high_fuses(UINT8 byte);
void set_extended_fuses(UINT8 byte);
@@ -147,15 +147,15 @@ protected:
const address_space_config m_io_config;
UINT8 *m_eeprom;
- // bootloader
+ // bootloader
UINT16 m_boot_size;
UINT8 m_cpu_type;
- // Fuses
- UINT8 m_lfuses;
- UINT8 m_hfuses;
- UINT8 m_efuses;
- UINT8 m_lock_bits;
+ // Fuses
+ UINT8 m_lfuses;
+ UINT8 m_hfuses;
+ UINT8 m_efuses;
+ UINT8 m_lock_bits;
// CPU registers
UINT32 m_pc;
@@ -241,8 +241,8 @@ protected:
void changed_tccr3a(UINT8 data);
void changed_tccr3b(UINT8 data);
void changed_tccr3c(UINT8 data);
-// void update_ocr3(UINT8 newval, UINT8 reg);
-// void timer3_force_output_compare(int reg);
+// void update_ocr3(UINT8 newval, UINT8 reg);
+// void timer3_force_output_compare(int reg);
// timer 4
void timer4_tick();
@@ -256,8 +256,8 @@ protected:
void timer5_tick();
void changed_tccr5a(UINT8 data);
void changed_tccr5b(UINT8 data);
-// void update_ocr5(UINT8 newval, UINT8 reg);
-// void timer5_force_output_compare(int reg);
+// void update_ocr5(UINT8 newval, UINT8 reg);
+// void timer5_force_output_compare(int reg);
// address spaces
address_space *m_program;
@@ -496,24 +496,24 @@ enum
AVR8_REGIDX_TCNT0,
AVR8_REGIDX_OCR0A,
AVR8_REGIDX_OCR0B,
- //0x49: Reserved
+ //0x49: Reserved
AVR8_REGIDX_GPIOR1 = 0x4A,
AVR8_REGIDX_GPIOR2,
AVR8_REGIDX_SPCR,
AVR8_REGIDX_SPSR,
AVR8_REGIDX_SPDR,
- //0x4F: Reserved
+ //0x4F: Reserved
AVR8_REGIDX_ACSR = 0x50,
AVR8_REGIDX_OCDR,
- //0x52: Reserved
+ //0x52: Reserved
AVR8_REGIDX_SMCR = 0x53,
AVR8_REGIDX_MCUSR,
AVR8_REGIDX_MCUCR,
- //0x56: Reserved
+ //0x56: Reserved
AVR8_REGIDX_SPMCSR = 0x57,
- //0x58: Reserved
- //0x59: Reserved
- //0x5A: Reserved
+ //0x58: Reserved
+ //0x59: Reserved
+ //0x5A: Reserved
AVR8_REGIDX_RAMPZ = 0x5B,
AVR8_REGIDX_EIND,
AVR8_REGIDX_SPL,
@@ -522,12 +522,12 @@ enum
//--------------------------
AVR8_REGIDX_WDTCSR = 0x60,
AVR8_REGIDX_CLKPR,
- //0x62: Reserved
- //0x63: Reserved
+ //0x62: Reserved
+ //0x63: Reserved
AVR8_REGIDX_PRR0 = 0x64,
AVR8_REGIDX_PRR1,
AVR8_REGIDX_OSCCAL,
- //0x67: Reserved
+ //0x67: Reserved
AVR8_REGIDX_PCICR = 0x68,
AVR8_REGIDX_EICRA,
AVR8_REGIDX_EICRB,
@@ -542,8 +542,8 @@ enum
AVR8_REGIDX_TIMSK5,
AVR8_REGIDX_XMCRA,
AVR8_REGIDX_XMCRB,
- //0x76: Reserved
- //0x77: Reserved
+ //0x76: Reserved
+ //0x77: Reserved
AVR8_REGIDX_ADCL = 0x78,
AVR8_REGIDX_ADCH,
AVR8_REGIDX_ADCSRA,
@@ -555,7 +555,7 @@ enum
AVR8_REGIDX_TCCR1A,
AVR8_REGIDX_TCCR1B,
AVR8_REGIDX_TCCR1C,
- //0x83: Reserved
+ //0x83: Reserved
AVR8_REGIDX_TCNT1L = 0x84,
AVR8_REGIDX_TCNT1H,
AVR8_REGIDX_ICR1L,
@@ -566,12 +566,12 @@ enum
AVR8_REGIDX_OCR1BH,
AVR8_REGIDX_OCR1CL,
AVR8_REGIDX_OCR1CH,
- //0x8E: Reserved
- //0x8F: Reserved
+ //0x8E: Reserved
+ //0x8F: Reserved
AVR8_REGIDX_TCCR3A = 0x90,
AVR8_REGIDX_TCCR3B,
AVR8_REGIDX_TCCR3C,
- //0x93: Reserved
+ //0x93: Reserved
AVR8_REGIDX_TCNT3L = 0x94,
AVR8_REGIDX_TCNT3H,
AVR8_REGIDX_ICR3L,
@@ -582,12 +582,12 @@ enum
AVR8_REGIDX_OCR3BH,
AVR8_REGIDX_OCR3CL,
AVR8_REGIDX_OCR3CH,
- //0x9E: Reserved
- //0x9F: Reserved
+ //0x9E: Reserved
+ //0x9F: Reserved
AVR8_REGIDX_TCCR4A = 0xA0,
AVR8_REGIDX_TCCR4B,
AVR8_REGIDX_TCCR4C,
- //0xA3: Reserved
+ //0xA3: Reserved
AVR8_REGIDX_TCNT4L = 0xA4,
AVR8_REGIDX_TCNT4H,
AVR8_REGIDX_ICR4L,
@@ -598,88 +598,88 @@ enum
AVR8_REGIDX_OCR4BH,
AVR8_REGIDX_OCR4CL,
AVR8_REGIDX_OCR4CH,
- //0xAE: Reserved
- //0xAF: Reserved
+ //0xAE: Reserved
+ //0xAF: Reserved
AVR8_REGIDX_TCCR2A = 0xB0,
AVR8_REGIDX_TCCR2B,
AVR8_REGIDX_TCNT2,
AVR8_REGIDX_OCR2A,
AVR8_REGIDX_OCR2B,
- //0xB5: Reserved
+ //0xB5: Reserved
AVR8_REGIDX_ASSR = 0xB6,
- //0xB7: Reserved
+ //0xB7: Reserved
AVR8_REGIDX_TWBR = 0xB8,
AVR8_REGIDX_TWSR,
AVR8_REGIDX_TWAR,
AVR8_REGIDX_TWDR,
AVR8_REGIDX_TWCR,
AVR8_REGIDX_TWAMR,
- //0xBE: Reserved
- //0xBF: Reserved
+ //0xBE: Reserved
+ //0xBF: Reserved
AVR8_REGIDX_UCSR0A = 0xC0,
AVR8_REGIDX_UCSR0B,
AVR8_REGIDX_UCSR0C,
- //0xC3: Reserved
+ //0xC3: Reserved
AVR8_REGIDX_UBRR0L = 0xC4,
AVR8_REGIDX_UBRR0H,
AVR8_REGIDX_UDR0,
- //0xC7: Reserved
+ //0xC7: Reserved
AVR8_REGIDX_UCSR1A = 0xC8,
AVR8_REGIDX_UCSR1B,
AVR8_REGIDX_UCSR1C,
- //0xCB: Reserved
+ //0xCB: Reserved
AVR8_REGIDX_UBRR1L = 0xCC,
AVR8_REGIDX_UBRR1H,
AVR8_REGIDX_UDR1,
- //0xCF: Reserved
+ //0xCF: Reserved
AVR8_REGIDX_UCSR2A = 0xD0,
AVR8_REGIDX_UCSR2B,
AVR8_REGIDX_UCSR2C,
- //0xD3: Reserved
+ //0xD3: Reserved
AVR8_REGIDX_UBRR2L = 0xD4,
AVR8_REGIDX_UBRR2H,
AVR8_REGIDX_UDR2,
- //0xD7: Reserved
- //0xD8: Reserved
- //0xD9: Reserved
- //0xDA: Reserved
- //0xDB: Reserved
- //0xDC: Reserved
- //0xDD: Reserved
- //0xDE: Reserved
- //0xDF: Reserved
- //0xE0: Reserved
- //0xE1: Reserved
- //0xE2: Reserved
- //0xE3: Reserved
- //0xE4: Reserved
- //0xE5: Reserved
- //0xE6: Reserved
- //0xE7: Reserved
- //0xE8: Reserved
- //0xE9: Reserved
- //0xEA: Reserved
- //0xEB: Reserved
- //0xEC: Reserved
- //0xED: Reserved
- //0xEE: Reserved
- //0xEF: Reserved
- //0xF0: Reserved
- //0xF1: Reserved
- //0xF2: Reserved
- //0xF3: Reserved
- //0xF4: Reserved
- //0xF5: Reserved
- //0xF6: Reserved
- //0xF7: Reserved
- //0xF8: Reserved
- //0xF9: Reserved
- //0xFA: Reserved
- //0xFB: Reserved
- //0xFC: Reserved
- //0xFD: Reserved
- //0xFE: Reserved
- //0xFF: Reserved
+ //0xD7: Reserved
+ //0xD8: Reserved
+ //0xD9: Reserved
+ //0xDA: Reserved
+ //0xDB: Reserved
+ //0xDC: Reserved
+ //0xDD: Reserved
+ //0xDE: Reserved
+ //0xDF: Reserved
+ //0xE0: Reserved
+ //0xE1: Reserved
+ //0xE2: Reserved
+ //0xE3: Reserved
+ //0xE4: Reserved
+ //0xE5: Reserved
+ //0xE6: Reserved
+ //0xE7: Reserved
+ //0xE8: Reserved
+ //0xE9: Reserved
+ //0xEA: Reserved
+ //0xEB: Reserved
+ //0xEC: Reserved
+ //0xED: Reserved
+ //0xEE: Reserved
+ //0xEF: Reserved
+ //0xF0: Reserved
+ //0xF1: Reserved
+ //0xF2: Reserved
+ //0xF3: Reserved
+ //0xF4: Reserved
+ //0xF5: Reserved
+ //0xF6: Reserved
+ //0xF7: Reserved
+ //0xF8: Reserved
+ //0xF9: Reserved
+ //0xFA: Reserved
+ //0xFB: Reserved
+ //0xFC: Reserved
+ //0xFD: Reserved
+ //0xFE: Reserved
+ //0xFF: Reserved
AVR8_REGIDX_PINH = 0x100,
AVR8_REGIDX_DDRH,
AVR8_REGIDX_PORTH,
@@ -692,30 +692,30 @@ enum
AVR8_REGIDX_PINL,
AVR8_REGIDX_DDRL,
AVR8_REGIDX_PORTL,
- //0x10C: Reserved
- //0x10D: Reserved
- //0x10E: Reserved
- //0x10F: Reserved
- //0x110: Reserved
- //0x111: Reserved
- //0x112: Reserved
- //0x113: Reserved
- //0x114: Reserved
- //0x115: Reserved
- //0x116: Reserved
- //0x117: Reserved
- //0x118: Reserved
- //0x119: Reserved
- //0x11A: Reserved
- //0x11B: Reserved
- //0x11C: Reserved
- //0x11D: Reserved
- //0x11E: Reserved
- //0x11F: Reserved
+ //0x10C: Reserved
+ //0x10D: Reserved
+ //0x10E: Reserved
+ //0x10F: Reserved
+ //0x110: Reserved
+ //0x111: Reserved
+ //0x112: Reserved
+ //0x113: Reserved
+ //0x114: Reserved
+ //0x115: Reserved
+ //0x116: Reserved
+ //0x117: Reserved
+ //0x118: Reserved
+ //0x119: Reserved
+ //0x11A: Reserved
+ //0x11B: Reserved
+ //0x11C: Reserved
+ //0x11D: Reserved
+ //0x11E: Reserved
+ //0x11F: Reserved
AVR8_REGIDX_TCCR5A,
AVR8_REGIDX_TCCR5B,
AVR8_REGIDX_TCCR5C,
- //0x123: Reserved
+ //0x123: Reserved
AVR8_REGIDX_TCNT5L,
AVR8_REGIDX_TCNT5H,
AVR8_REGIDX_ICR5L,
@@ -726,34 +726,34 @@ enum
AVR8_REGIDX_OCR5BH,
AVR8_REGIDX_OCR5CL,
AVR8_REGIDX_OCR5CH,
- //0x12E: Reserved
- //0x12F: Reserved
+ //0x12E: Reserved
+ //0x12F: Reserved
AVR8_REGIDX_UCSR3A,
AVR8_REGIDX_UCSR3B,
AVR8_REGIDX_UCSR3C,
- //0x133: Reserved
+ //0x133: Reserved
AVR8_REGIDX_UBRR3L,
AVR8_REGIDX_UBRR3H,
AVR8_REGIDX_UDR3,
- //0x137: Reserved
- // .
- // . up to
- // .
- //0x1FF: Reserved
+ //0x137: Reserved
+ // .
+ // . up to
+ // .
+ //0x1FF: Reserved
};
enum {
- AVR8_IO_PORTA = 0,
- AVR8_IO_PORTB,
- AVR8_IO_PORTC,
- AVR8_IO_PORTD,
- AVR8_IO_PORTE,
- AVR8_IO_PORTF,
- AVR8_IO_PORTG,
- AVR8_IO_PORTH,
- AVR8_IO_PORTJ,
- AVR8_IO_PORTK,
- AVR8_IO_PORTL
+ AVR8_IO_PORTA = 0,
+ AVR8_IO_PORTB,
+ AVR8_IO_PORTC,
+ AVR8_IO_PORTD,
+ AVR8_IO_PORTE,
+ AVR8_IO_PORTF,
+ AVR8_IO_PORTG,
+ AVR8_IO_PORTH,
+ AVR8_IO_PORTJ,
+ AVR8_IO_PORTK,
+ AVR8_IO_PORTL
};
//TODO: AVR8_REG_* and AVR8_IO_PORT* seem to serve the same purpose and thus should be unified. Verify this!
@@ -810,46 +810,46 @@ enum
//lock bit masks
enum
{
- LB1 = (1 << 0),
- LB2 = (1 << 1),
- BLB01 = (1 << 2),
- BLB02 = (1 << 3),
- BLB11 = (1 << 4),
- BLB12 = (1 << 5),
+ LB1 = (1 << 0),
+ LB2 = (1 << 1),
+ BLB01 = (1 << 2),
+ BLB02 = (1 << 3),
+ BLB11 = (1 << 4),
+ BLB12 = (1 << 5),
};
//extended fuses bit masks
enum
{
- BODLEVEL0 = (1 << 0),
- BODLEVEL1 = (1 << 1),
- BODLEVEL2 = (1 << 2),
+ BODLEVEL0 = (1 << 0),
+ BODLEVEL1 = (1 << 1),
+ BODLEVEL2 = (1 << 2),
};
//high fuses bit masks
enum
{
- BOOTRST = (1 << 0),
- BOOTSZ0 = (1 << 1),
- BOOTSZ1 = (1 << 2),
- EESAVE = (1 << 3),
- WDTON = (1 << 4),
- SPIEN = (1 << 5),
- JTAGEN = (1 << 6),
- OCDEN = (1 << 7),
+ BOOTRST = (1 << 0),
+ BOOTSZ0 = (1 << 1),
+ BOOTSZ1 = (1 << 2),
+ EESAVE = (1 << 3),
+ WDTON = (1 << 4),
+ SPIEN = (1 << 5),
+ JTAGEN = (1 << 6),
+ OCDEN = (1 << 7),
};
//low fuses bit masks
enum
{
- CKSEL0 = (1 << 0),
- CKSEL1 = (1 << 1),
- CKSEL2 = (1 << 2),
- CKSEL3 = (1 << 3),
- SUT0 = (1 << 4),
- SUT1 = (1 << 5),
- CKOUT = (1 << 6),
- CKDIV8 = (1 << 7),
+ CKSEL0 = (1 << 0),
+ CKSEL1 = (1 << 1),
+ CKSEL2 = (1 << 2),
+ CKSEL3 = (1 << 3),
+ SUT0 = (1 << 4),
+ SUT1 = (1 << 5),
+ CKOUT = (1 << 6),
+ CKDIV8 = (1 << 7),
};
#define AVR8_EEARH_MASK 0x01
diff --git a/src/emu/cpu/avr8/avr8dasm.c b/src/emu/cpu/avr8/avr8dasm.c
index b92daeb3dac..219488299c6 100644
--- a/src/emu/cpu/avr8/avr8dasm.c
+++ b/src/emu/cpu/avr8/avr8dasm.c
@@ -30,73 +30,73 @@ CPU_DISASSEMBLE( avr8 )
UINT32 op = oprom[pos++];
op |= oprom[pos++] << 8;
UINT32 addr = 0;
- const char* register_names[0x40] = {"PINA", "DDRA", "PORTA", "PINB", "DDRB", "PORTB", "PINC", "DDRC", "PORTC", "PIND", "DDRD", "PORTD", "PINE", "DDRE", "PORTE", "PINF", "DDRF", "PORTF", "PING", "DDRG", "PORTG", "TIFR0", "TIFR1", "TIFR2","TIFR3", "TIFR4", "TIFR5", "PCIFR", "EIFR", "EIMSK", "GPIOR0", "EECR", "EEDR", "EEARL", "EEARH", "GTCCR", "TCCR0A", "TCCR0B", "TCNT0", "OCR0A", "OCR0B", "0x29", "GPIOR1", "GPIOR2", "SPCR", "SPSR", "SPDR", "0x2F", "ACSR", "OCDR", "0x32", "SMCR", "MCUSR", "MCUCR", "0x36", "SPMCSR", "0x38", "0x39", "0x3A", "RAMPZ", "EIND", "SPL", "SPH", "SREG"};
+ const char* register_names[0x40] = {"PINA", "DDRA", "PORTA", "PINB", "DDRB", "PORTB", "PINC", "DDRC", "PORTC", "PIND", "DDRD", "PORTD", "PINE", "DDRE", "PORTE", "PINF", "DDRF", "PORTF", "PING", "DDRG", "PORTG", "TIFR0", "TIFR1", "TIFR2","TIFR3", "TIFR4", "TIFR5", "PCIFR", "EIFR", "EIMSK", "GPIOR0", "EECR", "EEDR", "EEARL", "EEARH", "GTCCR", "TCCR0A", "TCCR0B", "TCNT0", "OCR0A", "OCR0B", "0x29", "GPIOR1", "GPIOR2", "SPCR", "SPSR", "SPDR", "0x2F", "ACSR", "OCDR", "0x32", "SMCR", "MCUSR", "MCUCR", "0x36", "SPMCSR", "0x38", "0x39", "0x3A", "RAMPZ", "EIND", "SPL", "SPH", "SREG"};
- const char* register_bit_names[0x40][8] = {
- /* PINA */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* DDRA */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PORTA */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PINB */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* DDRB */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PORTB */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PINC */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* DDRC */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PORTC */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PIND */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* DDRD */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PORTD */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PINE */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* DDRE */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PORTE */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PINF */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* DDRF */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PORTF */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PING */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* DDRG */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* PORTG */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* TIFR0 */ { "TOV0", "OCF0A", "OCF0B", "3", "4", "5", "6", "7"},
- /* TIFR1 */ { "TOV1", "OCF1A", "OCF1B", "OCF1C", "4", "ICF1", "6", "7"},
- /* TIFR2 */ { "TOV2", "OCF2A", "OCF2B", "3", "4", "5", "6", "7"},
- /* TIFR3 */ { "TOV3", "OCF3A", "OCF3B", "OCF3C", "4", "ICF3", "6", "7"},
- /* TIFR4 */ { "TOV4", "OCF4A", "OCF4B", "OCF4C", "4", "ICF4", "6", "7"},
- /* TIFR5 */ { "TOV5", "OCF5A", "OCF5B", "OCF5C", "4", "ICF5", "6", "7"},
- /* PCIFR */ {"PCIF0", "PCIF1", "PCIF2", "3", "4", "5", "6", "7"},
- /* EIFR */ {"INTF0", "INTF1", "INTF2", "INTF3", "INTF4", "INTF5", "INTF6", "INTF7"},
- /* EIMSK */ { "INT0", "INT1", "INT2", "INT3", "INT4", "INT5", "INT6", "INT7"},
- /* GPIOR0 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* EECR */ { "EERE", "EEPE", "EEMPE", "EERIE", "EEPM0", "EEPM1", "6", "7"},
- /* EEDR */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* EEARL */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* EEARH */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* GTCCR */ {"PSRSYNC", "PSRASY", "2", "3", "4", "5", "6", "TSM"},
- /* TCCR0A */ {"WGM00", "WGM01", "2", "3","COM0B0","COM0B1","COM0A0","COM0A1"},
- /* TCCR0B */ { "CS0", "CS1", "CS2", "WGM02", "4", "5", "FOC0B", "FOC0A"},
- /* TCNT0 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* OCR0A */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* OCR0B */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* 0x29 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* GPIOR1 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* GPIOR2 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* SPCR */ { "SPR0", "SPR1", "CPHA", "CPOL", "MSTR", "DORD", "SPE", "SPIE"},
- /* SPSR */ {"SPI2X", "1", "2", "3", "4", "5", "WCOL", "SPIF"},
- /* SPDR */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* 0x2F */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* ACSR */ {"ACIS0", "ACIS1", "ACIC", "ACIE", "ACI", "ACO", "ACBG", "ACD"},
- /* OCDR */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* 0x32 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* SMCR */ { "SE", "SM0", "SM1", "SM2", "4", "5", "6", "7"},
- /* MCUSR */ { "PORF", "EXTRF", "BORF", "WDRF", "JTRF", "5", "6", "7"},
- /* MCUCR */ { "IVCE", "IVSEL", "2", "3", "PUD", "5", "6", "JTD"},
- /* 0x36 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* SPMCSR */ {"SPMEN", "PGERS", "PGWRT","BLBSET","RWWSRE", "SIGRD", "RWWSB", "SPMIE"},
- /* 0x38 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* 0x39 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* 0x3A */ { "0", "1", "2", "3", "4", "5", "6", "7"},
- /* RAMPZ */ {"RAMPZ0","RAMPZ1", "2", "3", "4", "5", "6", "7"},
- /* EIND */ {"EIND0", "1", "2", "3", "4", "5", "6", "7"},
- /* SPL */ { "SP0", "SP1", "SP2", "SP3", "SP4", "SP5", "SP6", "SP7"},
- /* SPH */ { "SP8", "SP9", "SP10", "SP11", "SP12", "SP13", "SP14", "SP15"},
- /* SREG */ { "C", "Z", "N", "V", "S", "H", "T", "I"}};
+ const char* register_bit_names[0x40][8] = {
+ /* PINA */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* DDRA */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PORTA */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PINB */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* DDRB */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PORTB */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PINC */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* DDRC */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PORTC */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PIND */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* DDRD */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PORTD */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PINE */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* DDRE */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PORTE */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PINF */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* DDRF */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PORTF */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PING */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* DDRG */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* PORTG */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* TIFR0 */ { "TOV0", "OCF0A", "OCF0B", "3", "4", "5", "6", "7"},
+ /* TIFR1 */ { "TOV1", "OCF1A", "OCF1B", "OCF1C", "4", "ICF1", "6", "7"},
+ /* TIFR2 */ { "TOV2", "OCF2A", "OCF2B", "3", "4", "5", "6", "7"},
+ /* TIFR3 */ { "TOV3", "OCF3A", "OCF3B", "OCF3C", "4", "ICF3", "6", "7"},
+ /* TIFR4 */ { "TOV4", "OCF4A", "OCF4B", "OCF4C", "4", "ICF4", "6", "7"},
+ /* TIFR5 */ { "TOV5", "OCF5A", "OCF5B", "OCF5C", "4", "ICF5", "6", "7"},
+ /* PCIFR */ {"PCIF0", "PCIF1", "PCIF2", "3", "4", "5", "6", "7"},
+ /* EIFR */ {"INTF0", "INTF1", "INTF2", "INTF3", "INTF4", "INTF5", "INTF6", "INTF7"},
+ /* EIMSK */ { "INT0", "INT1", "INT2", "INT3", "INT4", "INT5", "INT6", "INT7"},
+ /* GPIOR0 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* EECR */ { "EERE", "EEPE", "EEMPE", "EERIE", "EEPM0", "EEPM1", "6", "7"},
+ /* EEDR */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* EEARL */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* EEARH */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* GTCCR */ {"PSRSYNC", "PSRASY", "2", "3", "4", "5", "6", "TSM"},
+ /* TCCR0A */ {"WGM00", "WGM01", "2", "3","COM0B0","COM0B1","COM0A0","COM0A1"},
+ /* TCCR0B */ { "CS0", "CS1", "CS2", "WGM02", "4", "5", "FOC0B", "FOC0A"},
+ /* TCNT0 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* OCR0A */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* OCR0B */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* 0x29 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* GPIOR1 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* GPIOR2 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* SPCR */ { "SPR0", "SPR1", "CPHA", "CPOL", "MSTR", "DORD", "SPE", "SPIE"},
+ /* SPSR */ {"SPI2X", "1", "2", "3", "4", "5", "WCOL", "SPIF"},
+ /* SPDR */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* 0x2F */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* ACSR */ {"ACIS0", "ACIS1", "ACIC", "ACIE", "ACI", "ACO", "ACBG", "ACD"},
+ /* OCDR */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* 0x32 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* SMCR */ { "SE", "SM0", "SM1", "SM2", "4", "5", "6", "7"},
+ /* MCUSR */ { "PORF", "EXTRF", "BORF", "WDRF", "JTRF", "5", "6", "7"},
+ /* MCUCR */ { "IVCE", "IVSEL", "2", "3", "PUD", "5", "6", "JTD"},
+ /* 0x36 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* SPMCSR */ {"SPMEN", "PGERS", "PGWRT","BLBSET","RWWSRE", "SIGRD", "RWWSB", "SPMIE"},
+ /* 0x38 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* 0x39 */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* 0x3A */ { "0", "1", "2", "3", "4", "5", "6", "7"},
+ /* RAMPZ */ {"RAMPZ0","RAMPZ1", "2", "3", "4", "5", "6", "7"},
+ /* EIND */ {"EIND0", "1", "2", "3", "4", "5", "6", "7"},
+ /* SPL */ { "SP0", "SP1", "SP2", "SP3", "SP4", "SP5", "SP6", "SP7"},
+ /* SPH */ { "SP8", "SP9", "SP10", "SP11", "SP12", "SP13", "SP14", "SP15"},
+ /* SREG */ { "C", "Z", "N", "V", "S", "H", "T", "I"}};
switch(op & 0xf000)
{
@@ -524,28 +524,28 @@ CPU_DISASSEMBLE( avr8 )
output += sprintf( output, "SBIW R%d:R%d, 0x%02x", 24+(RD2(op) << 1)+1, 24+(RD2(op) << 1), KCONST6(op) );
break;
case 0x0800:
- if (ACONST5(op) < 0x20)
- output += sprintf( output, "CBI %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
- else
- output += sprintf( output, "CBI 0x%02x, %d", ACONST5(op), RR3(op) );
+ if (ACONST5(op) < 0x20)
+ output += sprintf( output, "CBI %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
+ else
+ output += sprintf( output, "CBI 0x%02x, %d", ACONST5(op), RR3(op) );
break;
case 0x0900:
- if (ACONST5(op) < 0x20)
- output += sprintf( output, "SBIC %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
- else
- output += sprintf( output, "SBIC 0x%02x, %d", ACONST5(op), RR3(op) );
+ if (ACONST5(op) < 0x20)
+ output += sprintf( output, "SBIC %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
+ else
+ output += sprintf( output, "SBIC 0x%02x, %d", ACONST5(op), RR3(op) );
break;
case 0x0a00:
- if (ACONST5(op) < 0x20)
- output += sprintf( output, "SBI %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
- else
- output += sprintf( output, "SBI 0x%02x, %d", ACONST5(op), RR3(op) );
+ if (ACONST5(op) < 0x20)
+ output += sprintf( output, "SBI %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
+ else
+ output += sprintf( output, "SBI 0x%02x, %d", ACONST5(op), RR3(op) );
break;
case 0x0b00:
- if (ACONST5(op) < 0x20)
- output += sprintf( output, "SBIS %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
- else
- output += sprintf( output, "SBIS 0x%02x, %d", ACONST5(op), RR3(op) );
+ if (ACONST5(op) < 0x20)
+ output += sprintf( output, "SBIS %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)] );
+ else
+ output += sprintf( output, "SBIS 0x%02x, %d", ACONST5(op), RR3(op) );
break;
case 0x0c00:
case 0x0d00:
@@ -558,23 +558,23 @@ CPU_DISASSEMBLE( avr8 )
case 0xb000:
if(op & 0x0800)
{
- if (ACONST6(op) < 0x40 ) {
- output += sprintf( output, "OUT %s, R%d", register_names[ACONST6(op)], RD5(op) );
- } else {
- output += sprintf( output, "OUT 0x%02x, R%d", ACONST6(op), RD5(op) );
- }
+ if (ACONST6(op) < 0x40 ) {
+ output += sprintf( output, "OUT %s, R%d", register_names[ACONST6(op)], RD5(op) );
+ } else {
+ output += sprintf( output, "OUT 0x%02x, R%d", ACONST6(op), RD5(op) );
+ }
}
else
{
- if (ACONST6(op) < 0x40 ) {
- output += sprintf( output, "IN R%d, %s", RD5(op), register_names[ACONST6(op)] );
- } else {
- output += sprintf( output, "IN R%d, 0x%02x", RD5(op), ACONST6(op) );
- }
+ if (ACONST6(op) < 0x40 ) {
+ output += sprintf( output, "IN R%d, %s", RD5(op), register_names[ACONST6(op)] );
+ } else {
+ output += sprintf( output, "IN R%d, 0x%02x", RD5(op), ACONST6(op) );
+ }
}
break;
case 0xc000:
- //I'm not sure if this is correct. why pc + ... : pc + 8 + ... ?
+ //I'm not sure if this is correct. why pc + ... : pc + 8 + ... ?
output += sprintf( output, "RJMP %08x", (((op & 0x0800) ? pc + ((op & 0x0fff) | 0xfffff000) : pc + 8 + (op & 0x0fff)) << 0) );
break;
case 0xd000:
diff --git a/src/emu/cpu/cosmac/cosmac.h b/src/emu/cpu/cosmac/cosmac.h
index 3903b247466..eafd8195aa2 100644
--- a/src/emu/cpu/cosmac/cosmac.h
+++ b/src/emu/cpu/cosmac/cosmac.h
@@ -374,16 +374,16 @@ protected:
const address_space_config m_io_config;
// device callbacks
- devcb2_read_line m_read_wait;
- devcb2_read_line m_read_clear;
- devcb2_read_line m_read_ef1;
- devcb2_read_line m_read_ef2;
- devcb2_read_line m_read_ef3;
- devcb2_read_line m_read_ef4;
+ devcb2_read_line m_read_wait;
+ devcb2_read_line m_read_clear;
+ devcb2_read_line m_read_ef1;
+ devcb2_read_line m_read_ef2;
+ devcb2_read_line m_read_ef3;
+ devcb2_read_line m_read_ef4;
devcb2_write_line m_write_q;
- devcb2_read8 m_read_dma;
- devcb2_write8 m_write_dma;
- devcb2_write8 m_write_sc;
+ devcb2_read8 m_read_dma;
+ devcb2_write8 m_write_dma;
+ devcb2_write8 m_write_sc;
// control modes
enum cosmac_mode
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index d7a03f92931..227682e1d84 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -489,39 +489,39 @@ $(CPUOBJ)/g65816/g65816o4.o: $(CPUSRC)/g65816/g65816o4.c \
ifneq ($(filter H8,$(CPUS)),)
OBJDIRS += $(CPUOBJ)/h8
CPUOBJS += $(CPUOBJ)/h8/h8.o $(CPUOBJ)/h8/h8h.o $(CPUOBJ)/h8/h8s2000.o $(CPUOBJ)/h8/h8s2600.o \
- $(CPUOBJ)/h8/h83337.o \
- $(CPUOBJ)/h8/h83002.o $(CPUOBJ)/h8/h83006.o $(CPUOBJ)/h8/h83008.o \
- $(CPUOBJ)/h8/h83048.o \
- $(CPUOBJ)/h8/h8s2245.o $(CPUOBJ)/h8/h8s2320.o $(CPUOBJ)/h8/h8s2357.o \
- $(CPUOBJ)/h8/h8s2655.o \
- $(CPUOBJ)/h8/h8_adc.o $(CPUOBJ)/h8/h8_port.o $(CPUOBJ)/h8/h8_intc.o \
- $(CPUOBJ)/h8/h8_timer8.o $(CPUOBJ)/h8/h8_timer16.o $(CPUOBJ)/h8/h8_sci.o
+ $(CPUOBJ)/h8/h83337.o \
+ $(CPUOBJ)/h8/h83002.o $(CPUOBJ)/h8/h83006.o $(CPUOBJ)/h8/h83008.o \
+ $(CPUOBJ)/h8/h83048.o \
+ $(CPUOBJ)/h8/h8s2245.o $(CPUOBJ)/h8/h8s2320.o $(CPUOBJ)/h8/h8s2357.o \
+ $(CPUOBJ)/h8/h8s2655.o \
+ $(CPUOBJ)/h8/h8_adc.o $(CPUOBJ)/h8/h8_port.o $(CPUOBJ)/h8/h8_intc.o \
+ $(CPUOBJ)/h8/h8_timer8.o $(CPUOBJ)/h8/h8_timer16.o $(CPUOBJ)/h8/h8_sci.o
DASMOBJS +=
endif
-$(CPUOBJ)/h8/h8.o: $(CPUSRC)/h8/h8.c \
+$(CPUOBJ)/h8/h8.o: $(CPUSRC)/h8/h8.c \
$(CPUOBJ)/h8/h8.inc \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h8h.o: $(CPUSRC)/h8/h8h.c \
+$(CPUOBJ)/h8/h8h.o: $(CPUSRC)/h8/h8h.c \
$(CPUOBJ)/h8/h8h.inc \
$(CPUSRC)/h8/h8h.h \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h8s2000.o: $(CPUSRC)/h8/h8s2000.c \
+$(CPUOBJ)/h8/h8s2000.o: $(CPUSRC)/h8/h8s2000.c \
$(CPUOBJ)/h8/h8s2000.inc \
$(CPUSRC)/h8/h8s2000.h \
$(CPUSRC)/h8/h8h.h \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h8s2600.o: $(CPUSRC)/h8/h8s2600.c \
+$(CPUOBJ)/h8/h8s2600.o: $(CPUSRC)/h8/h8s2600.c \
$(CPUOBJ)/h8/h8s2600.inc \
$(CPUSRC)/h8/h8s2600.h \
$(CPUSRC)/h8/h8s2000.h \
$(CPUSRC)/h8/h8h.h \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h83337.o: $(CPUSRC)/h8/h83337.c \
+$(CPUOBJ)/h8/h83337.o: $(CPUSRC)/h8/h83337.c \
$(CPUSRC)/h8/h83337.h \
$(CPUSRC)/h8/h8.h \
$(CPUSRC)/h8/h8_intc.h \
@@ -531,7 +531,7 @@ $(CPUOBJ)/h8/h83337.o: $(CPUSRC)/h8/h83337.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h83002.o: $(CPUSRC)/h8/h83002.c \
+$(CPUOBJ)/h8/h83002.o: $(CPUSRC)/h8/h83002.c \
$(CPUSRC)/h8/h83002.h \
$(CPUSRC)/h8/h8h.h \
$(CPUSRC)/h8/h8.h \
@@ -541,7 +541,7 @@ $(CPUOBJ)/h8/h83002.o: $(CPUSRC)/h8/h83002.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h83006.o: $(CPUSRC)/h8/h83006.c \
+$(CPUOBJ)/h8/h83006.o: $(CPUSRC)/h8/h83006.c \
$(CPUSRC)/h8/h83006.h \
$(CPUSRC)/h8/h8h.h \
$(CPUSRC)/h8/h8.h \
@@ -552,7 +552,7 @@ $(CPUOBJ)/h8/h83006.o: $(CPUSRC)/h8/h83006.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h83008.o: $(CPUSRC)/h8/h83008.c \
+$(CPUOBJ)/h8/h83008.o: $(CPUSRC)/h8/h83008.c \
$(CPUSRC)/h8/h83008.h \
$(CPUSRC)/h8/h8h.h \
$(CPUSRC)/h8/h8.h \
@@ -563,7 +563,7 @@ $(CPUOBJ)/h8/h83008.o: $(CPUSRC)/h8/h83008.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h83048.o: $(CPUSRC)/h8/h83048.c \
+$(CPUOBJ)/h8/h83048.o: $(CPUSRC)/h8/h83048.c \
$(CPUSRC)/h8/h83048.h \
$(CPUSRC)/h8/h8h.h \
$(CPUSRC)/h8/h8.h \
@@ -573,7 +573,7 @@ $(CPUOBJ)/h8/h83048.o: $(CPUSRC)/h8/h83048.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h8s2245.o: $(CPUSRC)/h8/h8s2245.c \
+$(CPUOBJ)/h8/h8s2245.o: $(CPUSRC)/h8/h8s2245.c \
$(CPUSRC)/h8/h8s2245.h \
$(CPUSRC)/h8/h8s2000.h \
$(CPUSRC)/h8/h8h.h \
@@ -585,7 +585,7 @@ $(CPUOBJ)/h8/h8s2245.o: $(CPUSRC)/h8/h8s2245.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h8s2320.o: $(CPUSRC)/h8/h8s2320.c \
+$(CPUOBJ)/h8/h8s2320.o: $(CPUSRC)/h8/h8s2320.c \
$(CPUSRC)/h8/h8s2320.h \
$(CPUSRC)/h8/h8s2000.h \
$(CPUSRC)/h8/h8h.h \
@@ -597,7 +597,7 @@ $(CPUOBJ)/h8/h8s2320.o: $(CPUSRC)/h8/h8s2320.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h8s2357.o: $(CPUSRC)/h8/h8s2357.c \
+$(CPUOBJ)/h8/h8s2357.o: $(CPUSRC)/h8/h8s2357.c \
$(CPUSRC)/h8/h8s2357.h \
$(CPUSRC)/h8/h8s2000.h \
$(CPUSRC)/h8/h8h.h \
@@ -609,7 +609,7 @@ $(CPUOBJ)/h8/h8s2357.o: $(CPUSRC)/h8/h8s2357.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h8s2655.o: $(CPUSRC)/h8/h8s2655.c \
+$(CPUOBJ)/h8/h8s2655.o: $(CPUSRC)/h8/h8s2655.c \
$(CPUSRC)/h8/h8s2655.h \
$(CPUSRC)/h8/h8s2600.h \
$(CPUSRC)/h8/h8s2000.h \
@@ -622,25 +622,25 @@ $(CPUOBJ)/h8/h8s2655.o: $(CPUSRC)/h8/h8s2655.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_sci.h
-$(CPUOBJ)/h8/h8_intc.o: $(CPUSRC)/h8/h8_intc.c \
+$(CPUOBJ)/h8/h8_intc.o: $(CPUSRC)/h8/h8_intc.c \
$(CPUSRC)/h8/h8_intc.h \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h8_adc.o: $(CPUSRC)/h8/h8_adc.c \
+$(CPUOBJ)/h8/h8_adc.o: $(CPUSRC)/h8/h8_adc.c \
$(CPUSRC)/h8/h8_adc.h \
$(CPUSRC)/h8/h8_intc.h \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h8_port.o: $(CPUSRC)/h8/h8_port.c \
+$(CPUOBJ)/h8/h8_port.o: $(CPUSRC)/h8/h8_port.c \
$(CPUSRC)/h8/h8_port.h \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h8_timer16.o: $(CPUSRC)/h8/h8_timer16.c \
+$(CPUOBJ)/h8/h8_timer16.o: $(CPUSRC)/h8/h8_timer16.c \
$(CPUSRC)/h8/h8_timer16.h \
$(CPUSRC)/h8/h8_intc.h \
$(CPUSRC)/h8/h8.h
-$(CPUOBJ)/h8/h8_sci.o: $(CPUSRC)/h8/h8_sci.c \
+$(CPUOBJ)/h8/h8_sci.o: $(CPUSRC)/h8/h8_sci.c \
$(CPUSRC)/h8/h8_sci.h \
$(CPUSRC)/h8/h8_intc.h \
$(CPUSRC)/h8/h8.h
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.h b/src/emu/cpu/cubeqcpu/cubeqcpu.h
index 47bf5f00c87..4243fe15595 100644
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.h
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.h
@@ -357,10 +357,10 @@ private:
UINT32 m_clkcnt;
/* RAM */
- UINT16 m_sram[4096]; /* Shared with rotate CPU */
- UINT8 m_ptr_ram[1024]; /* Pointer RAM */
- UINT32 m_e_stack[32768]; /* Stack DRAM: 32kx20 */
- UINT32 m_o_stack[32768]; /* Stack DRAM: 32kx20 */
+ UINT16 m_sram[4096]; /* Shared with rotate CPU */
+ UINT8 m_ptr_ram[1024]; /* Pointer RAM */
+ UINT32 m_e_stack[32768]; /* Stack DRAM: 32kx20 */
+ UINT32 m_o_stack[32768]; /* Stack DRAM: 32kx20 */
address_space *m_program;
direct_read_data *m_direct;
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c
index f95c09463a7..13af2eed780 100644
--- a/src/emu/cpu/dsp32/dsp32.c
+++ b/src/emu/cpu/dsp32/dsp32.c
@@ -188,7 +188,7 @@ dsp32c_device::dsp32c_device(const machine_config &mconfig, const char *tag, dev
void dsp32c_device::device_start()
{
m_output_pins_changed.resolve_safe();
-
+
// get our address spaces
m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
diff --git a/src/emu/cpu/esrip/esrip.h b/src/emu/cpu/esrip/esrip.h
index c89a20ffb40..d39a7fb047c 100644
--- a/src/emu/cpu/esrip/esrip.h
+++ b/src/emu/cpu/esrip/esrip.h
@@ -27,13 +27,13 @@
#define MCFG_ESRIP_FDT_R_CALLBACK(_read) \
devcb = &esrip_device::static_set_fdt_r_callback(*device, DEVCB2_##_read);
-
+
#define MCFG_ESRIP_FDT_W_CALLBACK(_write) \
devcb = &esrip_device::static_set_fdt_w_callback(*device, DEVCB2_##_write);
-
+
#define MCFG_ESRIP_STATUS_IN_CALLBACK(_read) \
devcb = &esrip_device::static_set_status_in_callback(*device, DEVCB2_##_read);
-
+
#define MCFG_ESRIP_DRAW_CALLBACK_OWNER(_class, _method) \
esrip_device::static_set_draw_callback(*device, esrip_draw_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
diff --git a/src/emu/cpu/g65816/g65816.h b/src/emu/cpu/g65816/g65816.h
index 5422a6749f4..0a7207730a0 100644
--- a/src/emu/cpu/g65816/g65816.h
+++ b/src/emu/cpu/g65816/g65816.h
@@ -66,7 +66,7 @@ class _5a22_device : public legacy_cpu_device
{
public:
_5a22_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_WRITE8_MEMBER( wrmpya_w );
DECLARE_WRITE8_MEMBER( wrmpyb_w );
DECLARE_WRITE8_MEMBER( wrdivl_w );
@@ -77,7 +77,7 @@ public:
DECLARE_READ8_MEMBER( rddivh_r );
DECLARE_READ8_MEMBER( rdmpyl_r );
DECLARE_READ8_MEMBER( rdmpyh_r );
-
+
void set_5a22_map();
};
diff --git a/src/emu/cpu/h8/h8.c b/src/emu/cpu/h8/h8.c
index 20bffeb7852..5835d911fcb 100644
--- a/src/emu/cpu/h8/h8.c
+++ b/src/emu/cpu/h8/h8.c
@@ -252,26 +252,26 @@ void h8_device::state_string_export(const device_state_entry &entry, astring &st
case STATE_GENFLAGS:
if(has_exr)
string.printf("%c%c %c%c%c%c%c%c%c%c",
- (EXR & EXR_T) ? 'T' : '-',
- '0' + (EXR & EXR_I),
- (CCR & F_I) ? 'I' : '-',
- (CCR & F_UI) ? 'u' : '-',
- (CCR & F_H) ? 'H' : '-',
- (CCR & F_U) ? 'U' : '-',
- (CCR & F_N) ? 'N' : '-',
- (CCR & F_Z) ? 'Z' : '-',
- (CCR & F_V) ? 'V' : '-',
- (CCR & F_C) ? 'C' : '-');
+ (EXR & EXR_T) ? 'T' : '-',
+ '0' + (EXR & EXR_I),
+ (CCR & F_I) ? 'I' : '-',
+ (CCR & F_UI) ? 'u' : '-',
+ (CCR & F_H) ? 'H' : '-',
+ (CCR & F_U) ? 'U' : '-',
+ (CCR & F_N) ? 'N' : '-',
+ (CCR & F_Z) ? 'Z' : '-',
+ (CCR & F_V) ? 'V' : '-',
+ (CCR & F_C) ? 'C' : '-');
else
- string.printf("%c%c%c%c%c%c%c%c",
- (CCR & F_I) ? 'I' : '-',
- (CCR & F_UI) ? 'u' : '-',
- (CCR & F_H) ? 'H' : '-',
- (CCR & F_U) ? 'U' : '-',
- (CCR & F_N) ? 'N' : '-',
- (CCR & F_Z) ? 'Z' : '-',
- (CCR & F_V) ? 'V' : '-',
- (CCR & F_C) ? 'C' : '-');
+ string.printf("%c%c%c%c%c%c%c%c",
+ (CCR & F_I) ? 'I' : '-',
+ (CCR & F_UI) ? 'u' : '-',
+ (CCR & F_H) ? 'H' : '-',
+ (CCR & F_U) ? 'U' : '-',
+ (CCR & F_N) ? 'N' : '-',
+ (CCR & F_Z) ? 'Z' : '-',
+ (CCR & F_V) ? 'V' : '-',
+ (CCR & F_C) ? 'C' : '-');
break;
case H8_R0:
case H8_R1:
@@ -554,7 +554,7 @@ UINT8 h8_device::read8(UINT32 adr)
void h8_device::write8(UINT32 adr, UINT8 data)
{
- // logerror("W %06x %02x\n", adr & 0xffffff, data);
+ // logerror("W %06x %02x\n", adr & 0xffffff, data);
icount--;
program->write_byte(adr, data);
}
@@ -567,7 +567,7 @@ UINT16 h8_device::read16(UINT32 adr)
void h8_device::write16(UINT32 adr, UINT16 data)
{
- // logerror("W %06x %04x\n", adr & 0xfffffe, data);
+ // logerror("W %06x %04x\n", adr & 0xfffffe, data);
icount--;
program->write_word(adr & ~1, data);
}
@@ -644,7 +644,7 @@ UINT8 h8_device::do_addx8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT8 h8_device::do_subx8(UINT8 v1, UINT8 v2)
@@ -662,7 +662,7 @@ UINT8 h8_device::do_subx8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT8 h8_device::do_inc8(UINT8 v1, UINT8 v2)
@@ -675,7 +675,7 @@ UINT8 h8_device::do_inc8(UINT8 v1, UINT8 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80)
CCR |= F_V;
- return res;
+ return res;
}
UINT16 h8_device::do_inc16(UINT16 v1, UINT16 v2)
@@ -688,7 +688,7 @@ UINT16 h8_device::do_inc16(UINT16 v1, UINT16 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x8000)
CCR |= F_V;
- return res;
+ return res;
}
UINT32 h8_device::do_inc32(UINT32 v1, UINT32 v2)
@@ -701,7 +701,7 @@ UINT32 h8_device::do_inc32(UINT32 v1, UINT32 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80000000)
CCR |= F_V;
- return res;
+ return res;
}
UINT8 h8_device::do_add8(UINT8 v1, UINT8 v2)
@@ -719,7 +719,7 @@ UINT8 h8_device::do_add8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT16 h8_device::do_add16(UINT16 v1, UINT16 v2)
@@ -737,7 +737,7 @@ UINT16 h8_device::do_add16(UINT16 v1, UINT16 v2)
if(res & 0x10000)
CCR |= F_C;
return res;
-
+
}
UINT32 h8_device::do_add32(UINT32 v1, UINT32 v2)
@@ -754,7 +754,7 @@ UINT32 h8_device::do_add32(UINT32 v1, UINT32 v2)
CCR |= F_V;
if(res & U64(0x100000000))
CCR |= F_C;
- return res;
+ return res;
}
UINT8 h8_device::do_dec8(UINT8 v1, UINT8 v2)
@@ -767,7 +767,7 @@ UINT8 h8_device::do_dec8(UINT8 v1, UINT8 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80)
CCR |= F_V;
- return res;
+ return res;
}
UINT16 h8_device::do_dec16(UINT16 v1, UINT16 v2)
@@ -780,7 +780,7 @@ UINT16 h8_device::do_dec16(UINT16 v1, UINT16 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x8000)
CCR |= F_V;
- return res;
+ return res;
}
UINT32 h8_device::do_dec32(UINT32 v1, UINT32 v2)
@@ -793,7 +793,7 @@ UINT32 h8_device::do_dec32(UINT32 v1, UINT32 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80000000)
CCR |= F_V;
- return res;
+ return res;
}
UINT8 h8_device::do_sub8(UINT8 v1, UINT8 v2)
@@ -811,7 +811,7 @@ UINT8 h8_device::do_sub8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT16 h8_device::do_sub16(UINT16 v1, UINT16 v2)
@@ -829,7 +829,7 @@ UINT16 h8_device::do_sub16(UINT16 v1, UINT16 v2)
if(res & 0x10000)
CCR |= F_C;
return res;
-
+
}
UINT32 h8_device::do_sub32(UINT32 v1, UINT32 v2)
@@ -846,7 +846,7 @@ UINT32 h8_device::do_sub32(UINT32 v1, UINT32 v2)
CCR |= F_V;
if(res & U64(0x100000000))
CCR |= F_C;
- return res;
+ return res;
}
UINT8 h8_device::do_shal8(UINT8 v)
@@ -1017,7 +1017,7 @@ UINT8 h8_device::do_shal2_8(UINT8 v)
if(v & 0x40)
CCR |= F_C;
if((v & 0xc0) == 0x40 || (v & 0xc0) == 0x80 ||
- (v & 0x60) == 0x20 || (v & 0x60) == 0x40)
+ (v & 0x60) == 0x20 || (v & 0x60) == 0x40)
CCR |= F_V;
v <<= 2;
if(!v)
@@ -1033,7 +1033,7 @@ UINT16 h8_device::do_shal2_16(UINT16 v)
if(v & 0x4000)
CCR |= F_C;
if((v & 0xc000) == 0x4000 || (v & 0xc000) == 0x8000 ||
- (v & 0x6000) == 0x2000 || (v & 0x6000) == 0x4000)
+ (v & 0x6000) == 0x2000 || (v & 0x6000) == 0x4000)
CCR |= F_V;
v <<= 2;
if(!v)
@@ -1049,7 +1049,7 @@ UINT32 h8_device::do_shal2_32(UINT32 v)
if(v & 0x40000000)
CCR |= F_C;
if((v & 0xc0000000) == 0x40000000 || (v & 0xc0000000) == 0x80000000 ||
- (v & 0x60000000) == 0x20000000 || (v & 0x60000000) == 0x40000000)
+ (v & 0x60000000) == 0x20000000 || (v & 0x60000000) == 0x40000000)
CCR |= F_V;
v <<= 2;
if(!v)
diff --git a/src/emu/cpu/h8/h8.h b/src/emu/cpu/h8/h8.h
index b43c319809d..38d8b3b9561 100644
--- a/src/emu/cpu/h8/h8.h
+++ b/src/emu/cpu/h8/h8.h
@@ -499,7 +499,7 @@ enum {
H8_E6,
H8_E7,
H8_CCR,
- H8_EXR,
+ H8_EXR,
};
#endif
diff --git a/src/emu/cpu/h8/h8.lst b/src/emu/cpu/h8/h8.lst
index 22c3e6f994f..3ec1f46fbe4 100644
--- a/src/emu/cpu/h8/h8.lst
+++ b/src/emu/cpu/h8/h8.lst
@@ -937,7 +937,7 @@ macro jsr32 %opc %spreg
}
r8_w(IR[0], do_add8(TMP1, TMP2));
prefetch();
-
+
0f80 ff88 0 mov.l r32h r32l h
TMP1 = r32_r(IR[0] >> 4);
set_nzv32(TMP1);
@@ -1303,7 +1303,7 @@ macro jsr32 %opc %spreg
}
r8_w(IR[0], do_add8(TMP1, TMP2));
prefetch();
-
+
1f80 ff88 0 cmp.l r32h r32l h
do_sub32(r32_r(IR[0]), r32_r(IR[0] >> 4));
prefetch();
@@ -2206,19 +2206,19 @@ macro jsr32 %opc %spreg
7000 ff80 0 bset imm3 r8l
TMP1 = r8_r(IR[0]);
bset IR[0] >> 4
- r8_w(IR[0], TMP1);
+ r8_w(IR[0], TMP1);
prefetch();
7100 ff80 0 bnot imm3 r8l
TMP1 = r8_r(IR[0]);
bnot IR[0] >> 4
- r8_w(IR[0], TMP1);
+ r8_w(IR[0], TMP1);
prefetch();
7200 ff80 0 bclr imm3 r8l
TMP1 = r8_r(IR[0]);
bclr IR[0] >> 4
- r8_w(IR[0], TMP1);
+ r8_w(IR[0], TMP1);
prefetch();
7300 ff80 0 btst imm3 r8l
diff --git a/src/emu/cpu/h8/h83002.h b/src/emu/cpu/h8/h83002.h
index 010846729c3..f3d9745c321 100644
--- a/src/emu/cpu/h8/h83002.h
+++ b/src/emu/cpu/h8/h83002.h
@@ -54,7 +54,7 @@ public:
h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83006.h b/src/emu/cpu/h8/h83006.h
index 4bea038b541..9d2061dcd3e 100644
--- a/src/emu/cpu/h8/h83006.h
+++ b/src/emu/cpu/h8/h83006.h
@@ -56,7 +56,7 @@ public:
h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83008.h b/src/emu/cpu/h8/h83008.h
index 9be1b6b978f..699f7453897 100644
--- a/src/emu/cpu/h8/h83008.h
+++ b/src/emu/cpu/h8/h83008.h
@@ -56,7 +56,7 @@ public:
h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83048.h b/src/emu/cpu/h8/h83048.h
index 7ece527222a..d3bcf295d11 100644
--- a/src/emu/cpu/h8/h83048.h
+++ b/src/emu/cpu/h8/h83048.h
@@ -63,7 +63,7 @@ public:
h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83337.c b/src/emu/cpu/h8/h83337.c
index a6768de88e6..2a4f261a517 100644
--- a/src/emu/cpu/h8/h83337.c
+++ b/src/emu/cpu/h8/h83337.c
@@ -95,9 +95,9 @@ DEVICE_ADDRESS_MAP_START(map, 16, h83337_device)
AM_RANGE(0xff90, 0xff91) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tier_r, tier_w, 0xff00)
AM_RANGE(0xff90, 0xff91) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tsr_r, tsr_w, 0x00ff)
AM_RANGE(0xff92, 0xff93) AM_DEVREADWRITE( "timer16:0", h8_timer16_channel_device, tcnt_r, tcnt_w )
-// AM_RANGE(0xff94, 0xff95) AM_DEVREADWRITE( "timer16:0", h8_timer16_channel_device, ocr_r, ocr_w )
+// AM_RANGE(0xff94, 0xff95) AM_DEVREADWRITE( "timer16:0", h8_timer16_channel_device, ocr_r, ocr_w )
AM_RANGE(0xff96, 0xff97) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tcr_r, tcr_w, 0xff00)
-// AM_RANGE(0xff96, 0xff97) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tocr_r, tocr_w, 0x00ff)
+// AM_RANGE(0xff96, 0xff97) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tocr_r, tocr_w, 0x00ff)
AM_RANGE(0xff98, 0xff9f) AM_DEVREAD( "timer16:0", h8_timer16_channel_device, tgr_r )
AM_RANGE(0xffac, 0xffad) AM_DEVREADWRITE8("port1", h8_port_device, pcr_r, pcr_w, 0xff00)
diff --git a/src/emu/cpu/h8/h83337.h b/src/emu/cpu/h8/h83337.h
index 393068c4da0..ed5467cd801 100644
--- a/src/emu/cpu/h8/h83337.h
+++ b/src/emu/cpu/h8/h83337.h
@@ -63,13 +63,13 @@ public:
h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(wscr_r);
- DECLARE_WRITE8_MEMBER(wscr_w);
+ DECLARE_WRITE8_MEMBER(wscr_w);
DECLARE_READ8_MEMBER(stcr_r);
- DECLARE_WRITE8_MEMBER(stcr_w);
+ DECLARE_WRITE8_MEMBER(stcr_w);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
DECLARE_READ8_MEMBER(mdcr_r);
- DECLARE_WRITE8_MEMBER(mdcr_w);
+ DECLARE_WRITE8_MEMBER(mdcr_w);
protected:
required_device<h8_intc_device> intc;
diff --git a/src/emu/cpu/h8/h8_adc.c b/src/emu/cpu/h8/h8_adc.c
index 8def493ef86..644f8608a31 100644
--- a/src/emu/cpu/h8/h8_adc.c
+++ b/src/emu/cpu/h8/h8_adc.c
@@ -124,7 +124,7 @@ void h8_adc_device::device_reset()
mode = IDLE;
channel = 0;
count = 0;
- next_event = 0;
+ next_event = 0;
mode_update();
analog_powered = !analog_power_control;
adtrg = true;
@@ -188,7 +188,7 @@ void h8_adc_device::start_conversion()
count = start_count;
sampling();
conversion_wait(true, !analog_powered);
- analog_powered = true;
+ analog_powered = true;
}
void h8_adc_device::timeout(UINT64 current_time)
@@ -450,7 +450,7 @@ void h8_adc_2655_device::mode_update()
if(adcsr & 0x03) {
mode |= BUFFER;
-
+
}
if(adcsr & 0x08) {
diff --git a/src/emu/cpu/h8/h8_adc.h b/src/emu/cpu/h8/h8_adc.h
index 6d0cef502f5..314af72c24b 100644
--- a/src/emu/cpu/h8/h8_adc.h
+++ b/src/emu/cpu/h8/h8_adc.h
@@ -43,7 +43,7 @@
#include "h8.h"
#include "h8_intc.h"
-#define MCFG_H8_ADC_GENERIC_ADD( _tag, _type, intc, vect ) \
+#define MCFG_H8_ADC_GENERIC_ADD( _tag, _type, intc, vect ) \
MCFG_DEVICE_ADD( _tag, _type, 0 ) \
downcast<h8_adc_device *>(device)->set_info(intc, vect);
diff --git a/src/emu/cpu/h8/h8_intc.c b/src/emu/cpu/h8/h8_intc.c
index 18570794a63..b563cdb63ae 100644
--- a/src/emu/cpu/h8/h8_intc.c
+++ b/src/emu/cpu/h8/h8_intc.c
@@ -280,10 +280,10 @@ void h8h_intc_device::update_irq_types()
const int h8h_intc_device::vector_to_slot[64] = {
-1, -1, -1, -1, -1, -1, -1, -1, // NMI at 7
-1, -1, -1, -1, 0, 1, 2, 2, // IRQ 0-3
- 3, 3, 3, 3, 4, 4, 4, 4, // IRQ 4-5, (reservedx2), WOVI, CMI, (reserved), ADI
- 5, 5, 5, 5, 6, 6, 6, 6, // IMIA0, IMIB0, OVI0, (reserved), IMIA1, IMIB1, OVI1, (reserved)
- 7, 7, 7, 7, 8, 8, 8, 8, // IMIA2, IMIB2, OVI2, (reserved), CMIA0, CMIB0, CMIx1, TOVI0/1
- 9, 9, 9, 9, 10, 10, 10, 10, // CMIA2, CMIB2, CMIx3, TOVI2/3, DEND0A, DEND0B, DEND1A, DEND1B
+ 3, 3, 3, 3, 4, 4, 4, 4, // IRQ 4-5, (reservedx2), WOVI, CMI, (reserved), ADI
+ 5, 5, 5, 5, 6, 6, 6, 6, // IMIA0, IMIB0, OVI0, (reserved), IMIA1, IMIB1, OVI1, (reserved)
+ 7, 7, 7, 7, 8, 8, 8, 8, // IMIA2, IMIB2, OVI2, (reserved), CMIA0, CMIB0, CMIx1, TOVI0/1
+ 9, 9, 9, 9, 10, 10, 10, 10, // CMIA2, CMIB2, CMIx3, TOVI2/3, DEND0A, DEND0B, DEND1A, DEND1B
11, 11, 11, 11, 12, 12, 12, 12, // (reservedx4), ERI0, RXI0, TXI0, TEI0
13, 13, 13, 13, 14, 14, 14, 14 // ERI1, RXI1, TXI1, TEI1, ERI2, RXI2, TXI2, TEI2
};
@@ -342,8 +342,8 @@ WRITE8_MEMBER(h8s_intc_device::iprk_w)
const int h8s_intc_device::vector_to_slot[92] = {
-1, -1, -1, -1, -1, -1, -1, -1, // NMI at 7
-1, -1, -1, -1, -1, -1, -1, -1,
- 0, 1, 2, 2, 3, 3, 4, 4, // IRQ 0-7
- 5, 6, 7, 8, 9, 9, 9, 9, // SWDTEND, WOVI, CMI, (reserved), ADI
+ 0, 1, 2, 2, 3, 3, 4, 4, // IRQ 0-7
+ 5, 6, 7, 8, 9, 9, 9, 9, // SWDTEND, WOVI, CMI, (reserved), ADI
10, 10, 10, 10, 10, 10, 10, 10, // TGI0A, TGI0B, TGI0C, TGI0D, TGI0V
11, 11, 11, 11, 12, 12, 12, 12, // TGI1A, TGI1B, TGI1V, TGI1U, TGI2A, TGI2B, TGI2V, TGI2U
13, 13, 13, 13, 13, 13, 13, 13, // TGI3A, TGI3B, TGI3C, TGI3D, TGI3V
diff --git a/src/emu/cpu/h8/h8_intc.h b/src/emu/cpu/h8/h8_intc.h
index d0b2e2420af..bc28b26d604 100644
--- a/src/emu/cpu/h8/h8_intc.h
+++ b/src/emu/cpu/h8/h8_intc.h
@@ -42,13 +42,13 @@
#include "h8.h"
-#define MCFG_H8_INTC_ADD( _tag ) \
+#define MCFG_H8_INTC_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, H8_INTC, 0 )
-#define MCFG_H8H_INTC_ADD( _tag ) \
+#define MCFG_H8H_INTC_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, H8H_INTC, 0 )
-#define MCFG_H8S_INTC_ADD( _tag ) \
+#define MCFG_H8S_INTC_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, H8S_INTC, 0 )
@@ -100,7 +100,7 @@ public:
h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(isr_r);
- DECLARE_WRITE8_MEMBER(isr_w);
+ DECLARE_WRITE8_MEMBER(isr_w);
DECLARE_READ8_MEMBER(icr_r);
DECLARE_WRITE8_MEMBER(icr_w);
DECLARE_READ8_MEMBER(icrc_r);
diff --git a/src/emu/cpu/h8/h8_port.c b/src/emu/cpu/h8/h8_port.c
index 7694f571c7b..db78d88e589 100644
--- a/src/emu/cpu/h8/h8_port.c
+++ b/src/emu/cpu/h8/h8_port.c
@@ -18,21 +18,21 @@ void h8_port_device::set_info(int _address, UINT8 _default_ddr, UINT8 _mask)
WRITE8_MEMBER(h8_port_device::ddr_w)
{
- // logerror("%s: ddr_w %02x\n", tag(), data);
+ // logerror("%s: ddr_w %02x\n", tag(), data);
ddr = data;
update_output();
}
WRITE8_MEMBER(h8_port_device::dr_w)
{
- // logerror("%s: dr_w %02x\n", tag(), data);
+ // logerror("%s: dr_w %02x\n", tag(), data);
dr = data;
update_output();
}
READ8_MEMBER(h8_port_device::dr_r)
{
- // logerror("%s: dr_r %02x\n", tag(), (dr | mask) & 0xff);
+ // logerror("%s: dr_r %02x\n", tag(), (dr | mask) & 0xff);
return dr | mask;
}
@@ -41,8 +41,8 @@ READ8_MEMBER(h8_port_device::port_r)
UINT8 res = mask | (dr & ddr);
if((ddr & ~mask) != UINT8(~mask))
res |= io->read_word(address) & ~ddr;
-
- // logerror("%s: port_r %02x (%02x %02x)\n", tag(), res, ddr & ~mask, UINT8(~mask));
+
+ // logerror("%s: port_r %02x (%02x %02x)\n", tag(), res, ddr & ~mask, UINT8(~mask));
return res;
}
diff --git a/src/emu/cpu/h8/h8_port.h b/src/emu/cpu/h8/h8_port.h
index 2407929d14b..10df3d8a3e2 100644
--- a/src/emu/cpu/h8/h8_port.h
+++ b/src/emu/cpu/h8/h8_port.h
@@ -42,7 +42,7 @@
#include "h8.h"
-#define MCFG_H8_PORT_ADD( _tag, address, ddr, mask ) \
+#define MCFG_H8_PORT_ADD( _tag, address, ddr, mask ) \
MCFG_DEVICE_ADD( _tag, H8_PORT, 0 ) \
downcast<h8_port_device *>(device)->set_info(address, ddr, mask);
diff --git a/src/emu/cpu/h8/h8_sci.c b/src/emu/cpu/h8/h8_sci.c
index 0db62806588..e5213bc109b 100644
--- a/src/emu/cpu/h8/h8_sci.c
+++ b/src/emu/cpu/h8/h8_sci.c
@@ -32,13 +32,13 @@ WRITE8_MEMBER(h8_sci_device::smr_w)
{
smr = data;
logerror("%s: smr_w %02x %s %c%c%c%s /%d (%06x)\n", tag(), data,
- data & SMR_CA ? "sync" : "async",
- data & SMR_CHR ? '7' : '8',
- data & SMR_PE ? data & SMR_OE ? 'o' : 'e' : 'n',
- data & SMR_STOP ? '2' : '1',
- data & SMR_MP ? " mp" : "",
- 1 << 2*(data & SMR_CKS),
- cpu->pc());
+ data & SMR_CA ? "sync" : "async",
+ data & SMR_CHR ? '7' : '8',
+ data & SMR_PE ? data & SMR_OE ? 'o' : 'e' : 'n',
+ data & SMR_STOP ? '2' : '1',
+ data & SMR_MP ? " mp" : "",
+ 1 << 2*(data & SMR_CKS),
+ cpu->pc());
clock_update();
}
@@ -64,14 +64,14 @@ READ8_MEMBER(h8_sci_device::brr_r)
WRITE8_MEMBER(h8_sci_device::scr_w)
{
logerror("%s: scr_w %02x%s%s%s%s%s%s clk=%d (%06x)\n", tag(), data,
- data & SCR_TIE ? " txi" : "",
- data & SCR_RIE ? " rxi" : "",
- data & SCR_TE ? " tx" : "",
- data & SCR_RE ? " rx" : "",
- data & SCR_MPIE ? " mpi" : "",
- data & SCR_TEIE ? " tei" : "",
- data & SCR_CKE,
- cpu->pc());
+ data & SCR_TIE ? " txi" : "",
+ data & SCR_RIE ? " rxi" : "",
+ data & SCR_TE ? " tx" : "",
+ data & SCR_RE ? " rx" : "",
+ data & SCR_MPIE ? " mpi" : "",
+ data & SCR_TEIE ? " tei" : "",
+ data & SCR_CKE,
+ cpu->pc());
UINT8 delta = scr ^ data;
scr = data;
@@ -217,7 +217,7 @@ void h8_sci_device::device_start()
external_to_internal_ratio = (external_clock_period*cpu->clock()).as_double();
internal_to_external_ratio = 1/external_to_internal_ratio;
}
-
+
intc = siblingdevice<h8_intc_device>(intc_tag);
save_item(NAME(rdr));
save_item(NAME(tdr));
@@ -301,7 +301,7 @@ WRITE_LINE_MEMBER(h8_sci_device::clk_w)
case CLKM_EXTERNAL_SYNC:
if((!ext_clock_value) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(ext_clock_value && (clock_state & CLK_RX))
rx_raised_edge();
break;
@@ -324,16 +324,16 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
clock_base += fp;
}
assert(delta < fp);
-
+
bool new_clock = delta >= divider;
if(new_clock != clock_value) {
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
if(clock_state || clock_value)
clk_cb(clock_value);
@@ -359,16 +359,16 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
if(clock_mode == CLKM_INTERNAL_ASYNC_OUT && (clock_state || !clock_value))
clk_cb(clock_value);
}
}
-
+
event = clock_base + (clock_value ? fp : divider*8);
}
break;
@@ -385,14 +385,14 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
}
}
-
+
event = UINT64((clock_base + (clock_value ? 2 : 1))*external_to_internal_ratio)+1;
}
break;
@@ -409,14 +409,14 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
}
}
-
+
event = UINT64((clock_base + (clock_value ? 16 : 8))*external_to_internal_ratio)+1;
}
break;
@@ -503,7 +503,7 @@ void h8_sci_device::tx_start()
}
clock_start(CLK_TX);
}
-
+
void h8_sci_device::tx_dropped_edge()
{
logerror("%s: tx_dropped_edge state=%s bit=%d\n", tag(), state_names[tx_state], tx_bit);
@@ -676,4 +676,3 @@ void h8_sci_device::rx_raised_edge()
}
logerror("%s: -> state=%s, bit=%d\n", tag(), state_names[rx_state], rx_bit);
}
-
diff --git a/src/emu/cpu/h8/h8_sci.h b/src/emu/cpu/h8/h8_sci.h
index e0083a87676..bd508e44061 100644
--- a/src/emu/cpu/h8/h8_sci.h
+++ b/src/emu/cpu/h8/h8_sci.h
@@ -84,7 +84,7 @@ public:
template<class _Object> static devcb2_base &set_clk_cb(device_t &device, _Object object) { return downcast<h8_sci_device &>(device).clk_cb.set_callback(object); }
UINT64 internal_update(UINT64 current_time);
-
+
protected:
enum {
ST_IDLE, ST_START, ST_BIT, ST_PARITY, ST_STOP, ST_LAST_TICK,
diff --git a/src/emu/cpu/h8/h8_timer16.c b/src/emu/cpu/h8/h8_timer16.c
index 92ec7f932b2..abf89b42c16 100644
--- a/src/emu/cpu/h8/h8_timer16.c
+++ b/src/emu/cpu/h8/h8_timer16.c
@@ -94,14 +94,14 @@ WRITE8_MEMBER(h8_timer16_channel_device::tier_w)
tier = data;
tier_update();
logerror("%s: irq %c%c%c%c%c%c trigger=%d\n",
- tag(),
- ier & IRQ_A ? 'a' : '.',
- ier & IRQ_B ? 'b' : '.',
- ier & IRQ_C ? 'c' : '.',
- ier & IRQ_D ? 'd' : '.',
- ier & IRQ_V ? 'v' : '.',
- ier & IRQ_U ? 'u' : '.',
- ier & IRQ_TRIG ? 1 : 0);
+ tag(),
+ ier & IRQ_A ? 'a' : '.',
+ ier & IRQ_B ? 'b' : '.',
+ ier & IRQ_C ? 'c' : '.',
+ ier & IRQ_D ? 'd' : '.',
+ ier & IRQ_V ? 'v' : '.',
+ ier & IRQ_U ? 'u' : '.',
+ ier & IRQ_TRIG ? 1 : 0);
recalc_event();
}
@@ -218,11 +218,11 @@ void h8_timer16_channel_device::update_counter(UINT64 cur_time)
tcnt = tt % counter_cycle;
if(0)
logerror("%s: Updating %d (%ld %ld) (%ld %ld) -> %d/%d\n",
- tag(),
- ott,
- long(last_clock_update), long(cur_time),
- long(base_time), long(new_time),
- tt, tcnt);
+ tag(),
+ ott,
+ long(last_clock_update), long(cur_time),
+ long(base_time), long(new_time),
+ tt, tcnt);
for(int i=0; i<tgr_count; i++)
if((ier & (1 << i)) && (tt == tgr[i] || tcnt == tgr[i]) && interrupt[i] != -1) {
@@ -284,7 +284,7 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
if(0)
logerror("%s: tcnt=%d tgr%c=%d cycle=%d -> delay=%d\n",
- tag(), tcnt, 'a'+i, tgr[i], counter_cycle, new_delay);
+ tag(), tcnt, 'a'+i, tgr[i], counter_cycle, new_delay);
if(event_delay > new_delay)
event_delay = new_delay;
}
@@ -292,10 +292,10 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
event_time = ((((cur_time + (1ULL << clock_divider) - phase) >> clock_divider) + event_delay - 1) << clock_divider) + phase;
else
event_time = 0;
-
+
if(event_time && 0)
logerror("%s: next event in %d cycles (%ld)\n", tag(), int(event_time - cpu->get_cycle()), long(event_time));
-
+
} else {
logerror("decrementing counter\n");
exit(1);
@@ -622,7 +622,7 @@ void h8s_timer16_channel_device::set_chain(const char *_chain_tag)
}
void h8s_timer16_channel_device::set_info(int _tgr_count, UINT8 _tier_mask, const char *intc, int irq_base,
- int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7)
+ int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7)
{
tgr_count = _tgr_count;
tbr_count = 0;
diff --git a/src/emu/cpu/h8/h8_timer16.h b/src/emu/cpu/h8/h8_timer16.h
index 210951ead97..2f3c581fe55 100644
--- a/src/emu/cpu/h8/h8_timer16.h
+++ b/src/emu/cpu/h8/h8_timer16.h
@@ -43,23 +43,23 @@
#include "h8.h"
#include "h8_intc.h"
-#define MCFG_H8_TIMER16_ADD( _tag, _count, _tstr ) \
- MCFG_DEVICE_ADD( _tag, H8_TIMER16, 0 ) \
+#define MCFG_H8_TIMER16_ADD( _tag, _count, _tstr ) \
+ MCFG_DEVICE_ADD( _tag, H8_TIMER16, 0 ) \
downcast<h8_timer16_device *>(device)->set_info(_count, _tstr);
#define MCFG_H8_TIMER16_CHANNEL_ADD( _tag, tgr_count, tbr_count, intc, irq_base ) \
- MCFG_DEVICE_ADD( _tag, H8_TIMER16_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8_TIMER16_CHANNEL, 0 ) \
downcast<h8_timer16_channel_device *>(device)->set_info(tgr_count, tbr_count, intc, irq_base);
#define MCFG_H8H_TIMER16_CHANNEL_ADD( _tag, tgr_count, tbr_count, intc, irq_base ) \
- MCFG_DEVICE_ADD( _tag, H8H_TIMER16_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8H_TIMER16_CHANNEL, 0 ) \
downcast<h8h_timer16_channel_device *>(device)->set_info(tgr_count, tbr_count, intc, irq_base);
#define MCFG_H8S_TIMER16_CHANNEL_ADD( _tag, tgr_count, tier_mask, intc, irq_base, t0, t1, t2, t3, t4, t5, t6, t7 ) \
- MCFG_DEVICE_ADD( _tag, H8S_TIMER16_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8S_TIMER16_CHANNEL, 0 ) \
downcast<h8s_timer16_channel_device *>(device)->set_info(tgr_count, tier_mask, intc, irq_base, t0, t1, t2, t3, t4, t5, t6, t7);
-#define MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN( _tag ) \
+#define MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN( _tag ) \
downcast<h8s_timer16_channel_device *>(device)->set_chain(_tag);
class h8_timer16_channel_device : public device_t {
@@ -180,7 +180,7 @@ public:
virtual ~h8s_timer16_channel_device();
void set_info(int tgr_count, UINT8 _tier_mask, const char *intc, int irq_base,
- int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7);
+ int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7);
void set_chain(const char *chain_tag);
protected:
diff --git a/src/emu/cpu/h8/h8_timer8.c b/src/emu/cpu/h8/h8_timer8.c
index 7f6f7178686..074085b5f06 100644
--- a/src/emu/cpu/h8/h8_timer8.c
+++ b/src/emu/cpu/h8/h8_timer8.c
@@ -92,7 +92,7 @@ void h8_timer8_channel_device::update_tcr()
clock_type = INPUT_UPDOWN;
clock_divider = 0;
logerror("%s: clock external both edges", tag());
- break;
+ break;
}
switch(tcr & TCR_CCLR) {
@@ -118,9 +118,9 @@ void h8_timer8_channel_device::update_tcr()
}
logerror(", irq=%c%c%c\n",
- tcr & TCR_CMIEB ? 'b' : '-',
- tcr & TCR_CMIEA ? 'a' : '-',
- tcr & TCR_OVIE ? 'o' : '-');
+ tcr & TCR_CMIEB ? 'b' : '-',
+ tcr & TCR_CMIEA ? 'a' : '-',
+ tcr & TCR_OVIE ? 'o' : '-');
}
READ8_MEMBER(h8_timer8_channel_device::tcsr_r)
@@ -223,7 +223,7 @@ void h8_timer8_channel_device::update_counter(UINT64 cur_time)
if(tt == tcor[0] || tcnt == tcor[0]) {
if(chained_timer)
chained_timer->chained_timer_tcora();
-
+
if(!(tcsr & TCSR_CMFA)) {
tcsr |= TCSR_CMFA;
if(tcr & TCR_CMIEA)
@@ -317,7 +317,7 @@ void h8_timer8_channel_device::timer_tick()
if(tcnt == tcor[0]) {
if(chained_timer)
chained_timer->chained_timer_tcora();
-
+
if(!(tcsr & TCSR_CMFA)) {
tcsr |= TCSR_CMFA;
if(tcr & TCR_CMIEA)
diff --git a/src/emu/cpu/h8/h8_timer8.h b/src/emu/cpu/h8/h8_timer8.h
index 0b8915a87cf..fb73a7eb17e 100644
--- a/src/emu/cpu/h8/h8_timer8.h
+++ b/src/emu/cpu/h8/h8_timer8.h
@@ -44,11 +44,11 @@
#include "h8_intc.h"
#define MCFG_H8_TIMER8_CHANNEL_ADD( _tag, intc, irq_ca, irq_cb, irq_v, div1, div2, div3, div4, div5, div6 ) \
- MCFG_DEVICE_ADD( _tag, H8_TIMER8_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8_TIMER8_CHANNEL, 0 ) \
downcast<h8_timer8_channel_device *>(device)->set_info(intc, irq_ca, irq_cb, irq_v, div1, div2, div3, div4, div5, div6);
#define MCFG_H8H_TIMER8_CHANNEL_ADD( _tag, intc, irq_ca, irq_cb, irq_v, chain, chain_mode, has_adte, has_ice ) \
- MCFG_DEVICE_ADD( _tag, H8H_TIMER8_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8H_TIMER8_CHANNEL, 0 ) \
downcast<h8h_timer8_channel_device *>(device)->set_info(intc, irq_ca, irq_cb, irq_v, chain, chain_mode, has_adte, has_ice);
class h8_timer8_channel_device : public device_t {
@@ -95,7 +95,7 @@ protected:
TCSR_ADTE = 0x10,
TCSR_OVF = 0x20,
TCSR_CMFA = 0x40,
- TCSR_CMFB = 0x80
+ TCSR_CMFB = 0x80
};
enum {
diff --git a/src/emu/cpu/h8/h8s2245.c b/src/emu/cpu/h8/h8s2245.c
index ee1aefaac9f..91a0f5bead9 100644
--- a/src/emu/cpu/h8/h8s2245.c
+++ b/src/emu/cpu/h8/h8s2245.c
@@ -101,33 +101,33 @@ static MACHINE_CONFIG_FRAGMENT(h8s2245)
MCFG_H8H_TIMER8_CHANNEL_ADD("timer8_1", "intc", 68, 69, 70, "timer8_0", h8_timer8_channel_device::CHAIN_A, false, false)
MCFG_H8_TIMER16_ADD("timer16", 3, 0x00)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:0", 4, 0x60, "intc", 32,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:1", 2, 0x4c, "intc", 40,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:2")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:2", 2, 0x4c, "intc", 44,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024)
MCFG_H8_SCI_ADD("sci0", "intc", 80, 81, 82, 83)
MCFG_H8_SCI_ADD("sci1", "intc", 84, 85, 86, 87)
MCFG_H8_SCI_ADD("sci2", "intc", 88, 89, 90, 91)
diff --git a/src/emu/cpu/h8/h8s2245.h b/src/emu/cpu/h8/h8s2245.h
index 8b1f0c2136b..d0b7108641c 100644
--- a/src/emu/cpu/h8/h8s2245.h
+++ b/src/emu/cpu/h8/h8s2245.h
@@ -63,7 +63,7 @@ public:
h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8s_intc_device> intc;
diff --git a/src/emu/cpu/h8/h8s2320.c b/src/emu/cpu/h8/h8s2320.c
index 8121b9e4fbb..83e27aaa9f3 100644
--- a/src/emu/cpu/h8/h8s2320.c
+++ b/src/emu/cpu/h8/h8s2320.c
@@ -145,61 +145,61 @@ static MACHINE_CONFIG_FRAGMENT(h8s2320)
MCFG_H8H_TIMER8_CHANNEL_ADD("timer8_1", "intc", 68, 69, 70, "timer8_0", h8_timer8_channel_device::CHAIN_A, false, false)
MCFG_H8_TIMER16_ADD("timer16", 6, 0x00)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:0", 4, 0x60, "intc", 32,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:1", 2, 0x4c, "intc", 40,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:2")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:2", 2, 0x4c, "intc", 44,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:3", 4, 0x60, "intc", 48,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::DIV_1024,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device