From 92d6e163a8e417c3ec527a70d3858b182e2e6d13 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 22 Mar 2020 14:33:57 +1100 Subject: srcclean (nw) --- hash/apple2_flop_clcracked.xml | 12 +- hash/apple2_flop_orig.xml | 42 ++--- hash/compis.xml | 262 +++++++++++++-------------- hash/ibm5150.xml | 8 +- hash/ibm5170.xml | 20 +- hash/lynx.xml | 4 +- hash/mc1000_cass.xml | 60 +++--- hash/mobigo_cart.xml | 4 +- hash/mz2200_cass.xml | 212 +++++++++++----------- hash/pasopia_cass.xml | 2 +- hash/specpls3_flop.xml | 70 +++---- hash/super80_cass.xml | 2 +- src/devices/bus/coco/coco_psg.cpp | 18 +- src/devices/bus/isa/bblue2.cpp | 28 +-- src/devices/bus/isa/bblue2.h | 6 +- src/devices/bus/multibus/multibus.h | 22 +-- src/devices/bus/ti99/peb/cc_fdc.cpp | 160 ++++++++-------- src/devices/bus/ti99/peb/cc_fdc.h | 42 ++--- src/devices/bus/ti99/peb/forti.cpp | 38 ++-- src/devices/bus/ti99/peb/forti.h | 6 +- src/devices/cpu/avr8/avr8.cpp | 84 ++++----- src/devices/cpu/avr8/avr8ops.hxx | 2 +- src/devices/cpu/gigatron/gigatron.cpp | 2 +- src/devices/cpu/gigatron/gigatron.h | 4 +- src/devices/cpu/ks0164/ks0164.cpp | 10 +- src/devices/cpu/ks0164/ks0164d.cpp | 2 +- src/devices/cpu/tlcs90/tlcs90d.cpp | 2 +- src/devices/cpu/xavix2/xavix2.h | 4 +- src/devices/machine/pxa255.cpp | 22 +-- src/devices/machine/scn_pci.cpp | 26 +-- src/devices/machine/sunplus_gcm394_video.cpp | 6 +- src/devices/machine/sunplus_gcm394_video.h | 4 +- src/devices/sound/ks0164.cpp | 16 +- src/devices/sound/ks0164.h | 6 +- src/devices/video/crt9212.cpp | 6 +- src/devices/video/ppu2c0x.cpp | 18 +- src/devices/video/ppu2c0x.h | 2 +- src/devices/video/ppu2c0x_sh6578.cpp | 2 +- src/devices/video/ppu2c0x_sh6578.h | 2 +- src/emu/save.h | 2 +- src/lib/formats/ibmxdf_dsk.cpp | 34 ++-- src/lib/netlist/analog/nld_generic_models.h | 2 +- src/lib/netlist/examples/turkey_shoot.cpp | 52 +++--- src/mame/drivers/1945kiii.cpp | 38 ++-- src/mame/drivers/clshroad.cpp | 4 +- src/mame/drivers/gaelco2.cpp | 2 +- src/mame/drivers/galaxian.cpp | 26 +-- src/mame/drivers/gigatron.cpp | 4 +- src/mame/drivers/gumbo.cpp | 4 +- src/mame/drivers/holeland.cpp | 6 +- src/mame/drivers/iris3130.cpp | 2 +- src/mame/drivers/kawai_k1.cpp | 2 +- src/mame/drivers/kawai_r100.cpp | 4 +- src/mame/drivers/legionna.cpp | 6 +- src/mame/drivers/m10.cpp | 2 +- src/mame/drivers/nes_sh6578.cpp | 14 +- src/mame/drivers/nes_vt.cpp | 36 ++-- src/mame/drivers/nmk16.cpp | 4 +- src/mame/drivers/peoplepc.cpp | 10 +- src/mame/drivers/segas16b.cpp | 24 +-- src/mame/drivers/seta.cpp | 4 +- src/mame/drivers/spg2xx_digimake.cpp | 2 +- src/mame/drivers/spg2xx_mysprtch.cpp | 2 +- src/mame/drivers/spg2xx_skannerztv.cpp | 12 +- src/mame/drivers/spg2xx_wiwi.cpp | 6 +- src/mame/drivers/spg2xx_zone_32bit.cpp | 10 +- src/mame/drivers/summit.cpp | 38 ++-- src/mame/drivers/sunplus_unsp20soc.cpp | 12 +- src/mame/drivers/taito_l.cpp | 4 +- src/mame/drivers/taito_z.cpp | 2 +- src/mame/drivers/toaplan1.cpp | 2 +- src/mame/drivers/williams.cpp | 4 +- src/mame/drivers/xavix2.cpp | 14 +- src/mame/layout/summit.lay | 8 +- src/mame/video/boogwing.cpp | 2 +- src/mame/video/deco32.cpp | 4 +- src/mame/video/deco_ace.cpp | 6 +- src/mame/video/williams.cpp | 2 +- src/mame/video/xexex.cpp | 10 +- 79 files changed, 830 insertions(+), 830 deletions(-) diff --git a/hash/apple2_flop_clcracked.xml b/hash/apple2_flop_clcracked.xml index 3e51a8bec09..89a10001860 100644 --- a/hash/apple2_flop_clcracked.xml +++ b/hash/apple2_flop_clcracked.xml @@ -36273,7 +36273,7 @@ license:CC0 - + Cyborg (Version 2) (cleanly cracked) 1981 @@ -36286,13 +36286,13 @@ license:CC0 - + Where in North Dakota is Carmen Sandiego? (cleanly cracked) 1989 Broderbund Software - - + @@ -11406,7 +11406,7 @@ license:CC0 - - - - - - - - - - - - - - - - - - - - - - ABC/Enkät/Etikett/Klockan - 1989 - Gävle Datapedagogiska Centrum - - - - - - - - + + ABC/Enkät/Etikett/Klockan + 1989 + Gävle Datapedagogiska Centrum + + + + + + + + - - Demospel - 19?? - DataNova - - - - - - + + Demospel + 19?? + DataNova + + + + + + - - PI HarmoniEtt (Delta, enanvändare) - 1987 - Telenova - - - - - - - - + + PI HarmoniEtt (Delta, enanvändare) + 1987 + Telenova + + + + + + + + - - MA2 info (skollicens) - 19?? - Hjärsta Mediakonsult Handelsbolag - - - - - - + + MA2 info (skollicens) + 19?? + Hjärsta Mediakonsult Handelsbolag + + + + + + - - Skriv lätt, skriv rätt (version 7532) - 19?? - Telenova - - - - - - - + + Skriv lätt, skriv rätt (version 7532) + 19?? + Telenova + + + + + + + - - MS-DOS v3.2 (version 7331) - 1987 - Telenova - - - - - - - + + MS-DOS v3.2 (version 7331) + 1987 + Telenova + + + + + + + - - Systemskiva II (Svensk, version 6385) - 1986 - Telenova - - - - - - + + Systemskiva II (Svensk, version 6385) + 1986 + Telenova + + + + + + - - Distributionskunskap (version 8014) - 19?? - Telenova - - - - - - - + + Distributionskunskap (version 8014) + 19?? + Telenova + + + + + + + - - ADB-lön (version 7482) - 19?? - Telenova - - - - - - - + + ADB-lön (version 7482) + 19?? + Telenova + + + + + + + - - Läkemedelsräkning (version 7234) - 19?? - Telenova - - - - - - - + + Läkemedelsräkning (version 7234) + 19?? + Telenova + + + + + + + - - Procenträkning (version 7334) - 19?? - Telenova - - - - - - - + + Procenträkning (version 7334) + 19?? + Telenova + + + + + + + - - Räkna lätt, räkna rätt (version 6175) - 19?? - Telenova - - - - - - - + + Räkna lätt, räkna rätt (version 6175) + 19?? + Telenova + + + + + + + diff --git a/hash/ibm5150.xml b/hash/ibm5150.xml index 9dd1f2c6781..fd6a4d57c06 100644 --- a/hash/ibm5150.xml +++ b/hash/ibm5150.xml @@ -2311,7 +2311,7 @@ Known PC Booter Games Not Dumped, Or Dumped and Lost when Demonlord's Site went - + Timothy Leary's Mind Mirror 1986 @@ -8481,7 +8481,7 @@ has been replaced with an all-zero block. --> - + Dyna Blaster @@ -8940,7 +8940,7 @@ has been replaced with an all-zero block. --> - + Indiana Jones and the Last Crusade - The Graphic Adventure 1989 @@ -11159,7 +11159,7 @@ has been replaced with an all-zero block. --> - + Sierra Demo 1987 diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml index f78dbc8a5b3..4bcefed7be0 100644 --- a/hash/ibm5170.xml +++ b/hash/ibm5170.xml @@ -8919,7 +8919,7 @@ license:CC0 - + Amazon - Guardians of Eden 1992 @@ -8973,7 +8973,7 @@ license:CC0 - + AMD 80C287 Game and Demo 199? @@ -9145,7 +9145,7 @@ license:CC0 - + Bible Adventures 1992 @@ -10554,7 +10554,7 @@ license:CC0 - + Freddy Pharkas, Frontier Pharmacist 1993 @@ -10972,7 +10972,7 @@ license:CC0 - + The Humans (5.25" HD) 1993 @@ -10993,7 +10993,7 @@ license:CC0 - + Inca (Italian) 1992 @@ -11627,7 +11627,7 @@ license:CC0 - + Lotus - The Ultimate Challenge 1993 @@ -11640,7 +11640,7 @@ license:CC0 - + LucasArts Air Combat Classics 1994 @@ -12117,7 +12117,7 @@ license:CC0 - + Mystic Towers 1994 @@ -12243,7 +12243,7 @@ license:CC0 - + POWER DoLLS diff --git a/hash/lynx.xml b/hash/lynx.xml index 2da2ece8944..0612008443d 100644 --- a/hash/lynx.xml +++ b/hash/lynx.xml @@ -1061,7 +1061,7 @@ Known undumped prototypes: - + Yastuna Vol.1 - The Alchemy of Cubes 2008 @@ -1072,7 +1072,7 @@ Known undumped prototypes: - + Yastuna Vol.2 - The Space Incident 2008 diff --git a/hash/mc1000_cass.xml b/hash/mc1000_cass.xml index aa781fc6a0f..9dbb24da7ea 100644 --- a/hash/mc1000_cass.xml +++ b/hash/mc1000_cass.xml @@ -846,19 +846,19 @@ Info for original games comes from https://web.archive.org/web/20141023024713/mc --> - - Aventura - 19?? - <unknown> + + Aventura + 19?? + <unknown> - + - - - - - + + + + + - - Circulos - 19?? - <unknown> + + Circulos + 19?? + <unknown> - + - - - - - + + + + + - - Explosao - 19?? - <type-in> + + Explosao + 19?? + <type-in> - + - - - - - + + + + + + Mobigo Kiosk (Germany) 201? diff --git a/hash/mz2200_cass.xml b/hash/mz2200_cass.xml index e00273efa62..cfccc23377f 100644 --- a/hash/mz2200_cass.xml +++ b/hash/mz2200_cass.xml @@ -3,119 +3,119 @@ - - Cannon Ball - 1983 - Hudson - - - - - - - - + + Cannon Ball + 1983 + Hudson + + + + + + + + - - Vegetable Crash - 1983 - Hudson - - - - - - - - + + Vegetable Crash + 1983 + Hudson + + + + + + + + - - Bomber Man - 1983 - Hudson - - - - - - - - + + Bomber Man + 1983 + Hudson + + + + + + + + - - Power Fail - 1983 - Hudson - - - - - - - - + + Power Fail + 1983 + Hudson + + + + + + + + - - Hiyoko Fighter - 1983 - Hudson - - - - - - - - + + Hiyoko Fighter + 1983 + Hudson + + + + + + + + - - The Spider - 1983 - Hudson - - - - - - - - + + The Spider + 1983 + Hudson + + + + + + + + - - Hitsuja~i! - 1983 - Hudson - - - - - - - - + + Hitsuja~i! + 1983 + Hudson + + + + + + + + - - MJ-05 - 1983 - Hudson - - - - - - - + + MJ-05 + 1983 + Hudson + + + + + + + - - Help! - 1983 - Hudson - - - - - - - + + Help! + 1983 + Hudson + + + + + + + diff --git a/hash/pasopia_cass.xml b/hash/pasopia_cass.xml index 24170bf2c5d..628824a9e80 100644 --- a/hash/pasopia_cass.xml +++ b/hash/pasopia_cass.xml @@ -5,7 +5,7 @@ license:CC0 --> - @@ -644,17 +644,17 @@ license:CC0 - + - + @@ -1007,17 +1007,17 @@ license:CC0 - + - + @@ -1442,17 +1442,17 @@ license:CC0 - + - + diff --git a/hash/super80_cass.xml b/hash/super80_cass.xml index 9a6581bd9f6..0bc4481bfa3 100644 --- a/hash/super80_cass.xml +++ b/hash/super80_cass.xml @@ -11,7 +11,7 @@ license:CC0 Meaning of numbers: 1-99 = for BASIC (32 columns); 100-119 = for BASIC (80 columns); 400-499 = Machine Language; 150-299 = ported from Microbee; 300-329 = BASIC, ported from Exidy Sorcerer; 500-529 = Machine Language, ported from Exidy Sorcerer. All porting done by Robbbert. - + Dick Smith catalog numbers, taken from advertisements: diff --git a/src/devices/bus/coco/coco_psg.cpp b/src/devices/bus/coco/coco_psg.cpp index 4ca8c412d35..46dd0998f93 100644 --- a/src/devices/bus/coco/coco_psg.cpp +++ b/src/devices/bus/coco/coco_psg.cpp @@ -200,15 +200,15 @@ WRITE8_MEMBER(coco_psg_device::scs_write) case 0x1d: /* control register - BIT FUNCTION - 0 YM2149 MASTER CLOCK; 0=2MHz, 1=1MHz - 1 Gameport A SEL signal (pin 7 of controller port A) - 2 Gameport B SEL signal (pin 7 of controller port B) - 3 Write Enable (for FLASH/SRAM); 0=disabled, 1=enabled - 4 Autostart enable; 0=enabled, 1=disabled - 5 FLASH programming enable; 0=disabled, 1=enabled - 6 not used - 7 not used + BIT FUNCTION + 0 YM2149 MASTER CLOCK; 0=2MHz, 1=1MHz + 1 Gameport A SEL signal (pin 7 of controller port A) + 2 Gameport B SEL signal (pin 7 of controller port B) + 3 Write Enable (for FLASH/SRAM); 0=disabled, 1=enabled + 4 Autostart enable; 0=enabled, 1=disabled + 5 FLASH programming enable; 0=disabled, 1=enabled + 6 not used + 7 not used */ m_control = data; diff --git a/src/devices/bus/isa/bblue2.cpp b/src/devices/bus/isa/bblue2.cpp index e376440a3b3..121ec92e390 100644 --- a/src/devices/bus/isa/bblue2.cpp +++ b/src/devices/bus/isa/bblue2.cpp @@ -2,10 +2,10 @@ // copyright-holders:Barry Rodewald /* * Microlog Baby Blue II CPU Plus - * + * * ISA card used to emulate CP/M-80 on a PC or XT * Includes a Z80B CPU, 2 DB25 RS-232C serial ports (8250), a Centronics parallel port, and an RTC - * + * * Issues: * RTC type is unknown * Z80 location test and Interrupt test sometimes fail @@ -26,14 +26,14 @@ DEFINE_DEVICE_TYPE(ISA8_BABYBLUE2, isa8_babyblue2_device, "isa_bblue2", "Microlo static void isa_com(device_slot_interface &device) { -// device.option_add("microsoft_mouse", MSFT_HLE_SERIAL_MOUSE); -// device.option_add("logitech_mouse", LOGITECH_HLE_SERIAL_MOUSE); -// device.option_add("wheel_mouse", WHEEL_HLE_SERIAL_MOUSE); -// device.option_add("msystems_mouse", MSYSTEMS_HLE_SERIAL_MOUSE); -// device.option_add("rotatable_mouse", ROTATABLE_HLE_SERIAL_MOUSE); +// device.option_add("microsoft_mouse", MSFT_HLE_SERIAL_MOUSE); +// device.option_add("logitech_mouse", LOGITECH_HLE_SERIAL_MOUSE); +// device.option_add("wheel_mouse", WHEEL_HLE_SERIAL_MOUSE); +// device.option_add("msystems_mouse", MSYSTEMS_HLE_SERIAL_MOUSE); +// device.option_add("rotatable_mouse", ROTATABLE_HLE_SERIAL_MOUSE); device.option_add("terminal", SERIAL_TERMINAL); device.option_add("null_modem", NULL_MODEM); -// device.option_add("sun_kbd", SUN_KBD_ADAPTOR); +// device.option_add("sun_kbd", SUN_KBD_ADAPTOR); } void isa8_babyblue2_device::z80_program_map(address_map &map) @@ -58,10 +58,10 @@ void isa8_babyblue2_device::device_add_mconfig(machine_config &config) Z80(config, m_z80, 6_MHz_XTAL); m_z80->set_addrmap(AS_PROGRAM, &isa8_babyblue2_device::z80_program_map); m_z80->set_addrmap(AS_IO, &isa8_babyblue2_device::z80_io_map); - + RAM(config, m_ram); m_ram->set_default_size("64k"); - + INS8250(config, m_serial1, XTAL(1'843'200)); m_serial1->out_tx_callback().set("rs232_1", FUNC(rs232_port_device::write_txd)); m_serial1->out_dtr_callback().set("rs232_1", FUNC(rs232_port_device::write_dtr)); @@ -85,7 +85,7 @@ void isa8_babyblue2_device::device_add_mconfig(machine_config &config) m_rs232_2->dsr_handler().set(m_serial2, FUNC(ins8250_uart_device::dsr_w)); m_rs232_2->ri_handler().set(m_serial2, FUNC(ins8250_uart_device::ri_w)); m_rs232_2->cts_handler().set(m_serial2, FUNC(ins8250_uart_device::cts_w)); - + PC_LPT(config, m_parallel); } @@ -110,7 +110,7 @@ static INPUT_PORTS_START( babyblue2 ) PORT_DIPSETTING( 0x0e, "RAM: E0000 I/O: 31c" ) PORT_DIPSETTING( 0x0f, "RAM: F0000 I/O: 31f" ) PORT_DIPUNKNOWN( 0x70, 0x00 ) PORT_DIPLOCATION( "SW1:3,2,1" ) - + // exact setting unknown at this stage PORT_START("SW2") PORT_DIPNAME( 0x07, 0x07, "Device Module Ports" ) PORT_DIPLOCATION( "SW2:3,2,1" ) @@ -152,7 +152,7 @@ static INPUT_PORTS_START( babyblue2 ) PORT_DIPNAME(0x10, 0x40, "RAM Bank III" ) PORT_DIPLOCATION( "SW3:3" ) PORT_DIPSETTING( 0x00, "Enabled" ) PORT_DIPSETTING( 0x10, "Disabled" ) - + PORT_START("H2") PORT_CONFNAME( 0x01, 0x01, "LPT port config" ) PORT_CONFSETTING( 0x00, "LPT1" ) @@ -216,7 +216,7 @@ void isa8_babyblue2_device::device_reset() { // map Z80 LPT port based on jumper setting m_z80->space(AS_IO).install_readwrite_handler(z80lptloc, z80lptloc+7, read8_delegate(m_parallel, FUNC(pc_lpt_device::read)), write8_delegate(m_parallel, FUNC(pc_lpt_device::write))); - + m_isa->install_device(ioloc, ioloc+1, read8_delegate(*this, FUNC(isa8_babyblue2_device::z80_control_r)), write8_delegate(*this, FUNC(isa8_babyblue2_device::z80_control_w))); m_isa->install_device(lptloc, lptloc+7, read8_delegate(m_parallel, FUNC(pc_lpt_device::read)), write8_delegate(m_parallel, FUNC(pc_lpt_device::write))); m_isa->install_device(0x3f8, 0x03ff, read8sm_delegate(m_serial1, FUNC(ins8250_device::ins8250_r)), write8sm_delegate(m_serial1, FUNC(ins8250_device::ins8250_w))); diff --git a/src/devices/bus/isa/bblue2.h b/src/devices/bus/isa/bblue2.h index 6f888a7d869..e81f0a0c500 100644 --- a/src/devices/bus/isa/bblue2.h +++ b/src/devices/bus/isa/bblue2.h @@ -29,7 +29,7 @@ public: DECLARE_WRITE8_MEMBER(z80_control_w); DECLARE_READ8_MEMBER(z80_ram_r) { return m_ram->read(offset); } DECLARE_WRITE8_MEMBER(z80_ram_w) { m_ram->write(offset,data); } - + DECLARE_WRITE_LINE_MEMBER(port1_irq) { m_isa->irq4_w(state); } DECLARE_WRITE_LINE_MEMBER(port2_irq) { m_isa->irq3_w(state); } DECLARE_WRITE_LINE_MEMBER(lpt_irq); @@ -55,10 +55,10 @@ private: required_ioport m_dsw3; required_ioport m_h2; required_device m_ram; - + void z80_program_map(address_map &map); void z80_io_map(address_map &map); - + bool m_devices_installed; }; diff --git a/src/devices/bus/multibus/multibus.h b/src/devices/bus/multibus/multibus.h index 3f7ee5cbf77..def7895d16d 100644 --- a/src/devices/bus/multibus/multibus.h +++ b/src/devices/bus/multibus/multibus.h @@ -5,7 +5,7 @@ multibus.h Intel Multibus - + P1 Multibus connector: Power supplies @@ -58,17 +58,17 @@ 81 +5Vdc 82 +5Vdc 83 +5Vdc 84 +5Vdc 85 GND 86 GND - + P2 Multibus connector: - + 1-54 reserved for iLBX bus - + Address 55 ADR16/ 56 ADR17/ 57 ADR14/ 58 ADR15/ - + 59-60 reserved for iLBx bus - + *********************************************************************/ #ifndef MAME_BUS_MULTIBUS_MULTIBUS_H @@ -92,7 +92,7 @@ public: // Set memory space void install_mem_rw(address_space& space); - + auto irq0_callback() { return m_irq_cb[0].bind(); } auto irq1_callback() { return m_irq_cb[1].bind(); } auto irq2_callback() { return m_irq_cb[2].bind(); } @@ -102,7 +102,7 @@ public: auto irq6_callback() { return m_irq_cb[6].bind(); } auto irq7_callback() { return m_irq_cb[7].bind(); } auto irqa_callback() { return m_irqa_cb.bind(); } - + DECLARE_WRITE_LINE_MEMBER( irq0_w ); DECLARE_WRITE_LINE_MEMBER( irq1_w ); DECLARE_WRITE_LINE_MEMBER( irq2_w ); @@ -112,10 +112,10 @@ public: DECLARE_WRITE_LINE_MEMBER( irq6_w ); DECLARE_WRITE_LINE_MEMBER( irq7_w ); DECLARE_WRITE_LINE_MEMBER( irqa_w ); - + protected: virtual void device_start() override; - + devcb_write_line::array<8> m_irq_cb; devcb_write_line m_irqa_cb; @@ -129,7 +129,7 @@ public: // Set CPU memory space virtual void install_mem_rw(address_space& space) = 0; - + protected: device_multibus_interface(const machine_config &mconfig , device_t &device); virtual ~device_multibus_interface(); diff --git a/src/devices/bus/ti99/peb/cc_fdc.cpp b/src/devices/bus/ti99/peb/cc_fdc.cpp index 7fe38b5b4b7..d26ae2604a9 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.cpp +++ b/src/devices/bus/ti99/peb/cc_fdc.cpp @@ -6,13 +6,13 @@ Double Density, Double-sided Two flavors: - + * Original controller Named "PEB-DCC" Single 16K EPROM or two 8K EPROMs (selectable by jumper; only 2x8K emulated) Two PALs WD2793 - + * Modified controller with redesigned PCB Named "CorComp FDC Rev A" Two 8K EPROMs (by Millers Graphics, 3rd party HW/SW contributor) @@ -21,7 +21,7 @@ Michael Zapf March 2020 - + *******************************************************************************/ #include "emu.h" @@ -75,21 +75,21 @@ namespace bus { namespace ti99 { namespace peb { corcomp_fdc_device::corcomp_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock): device_t(mconfig, type, tag, owner, clock), device_ti99_peribox_card_interface(mconfig, *this), - m_wdc(*this, WDC_TAG), - m_decpal(nullptr), - m_ctrlpal(nullptr), - m_motormf(*this, MOTORMF_TAG), - m_tms9901(*this, TMS9901_TAG), - m_buffer_ram(*this, BUFFER), - m_dsrrom(nullptr), - m_cardsel(false), - m_banksel(false), - m_selected_drive(0), - m_address(0), - m_writing(false) -{ -} - + m_wdc(*this, WDC_TAG), + m_decpal(nullptr), + m_ctrlpal(nullptr), + m_motormf(*this, MOTORMF_TAG), + m_tms9901(*this, TMS9901_TAG), + m_buffer_ram(*this, BUFFER), + m_dsrrom(nullptr), + m_cardsel(false), + m_banksel(false), + m_selected_drive(0), + m_address(0), + m_writing(false) +{ +} + SETADDRESS_DBIN_MEMBER( corcomp_fdc_device::setaddress_dbin ) { // Do not allow setaddress for debugger @@ -100,7 +100,7 @@ SETADDRESS_DBIN_MEMBER( corcomp_fdc_device::setaddress_dbin ) } /* - Provides the current address to the PALs. + Provides the current address to the PALs. */ uint16_t corcomp_fdc_device::get_address() { @@ -108,9 +108,9 @@ uint16_t corcomp_fdc_device::get_address() } /* - Before the 9901 configures the P11 pin as output, it delivers Z output, - which is pulled down by R10 on the board. We implement this by using a - variable. + Before the 9901 configures the P11 pin as output, it delivers Z output, + which is pulled down by R10 on the board. We implement this by using a + variable. */ bool corcomp_fdc_device::upper_bank() { @@ -128,8 +128,8 @@ bool corcomp_fdc_device::write_access() } /* - The Debugging access must not have any side effect on the controller. - We only allow access to the EPROM and RAM. + The Debugging access must not have any side effect on the controller. + We only allow access to the EPROM and RAM. */ void corcomp_fdc_device::debug_read(offs_t offset, uint8_t* value) { @@ -137,20 +137,20 @@ void corcomp_fdc_device::debug_read(offs_t offset, uint8_t* value) m_address = offset; *value = 0x00; - + if (m_ctrlpal->selectram()) { // SRAM selected *value = m_buffer_ram->pointer()[m_address & 0x7f] & 0xf0; // only the first 4 bits } - + if (m_ctrlpal->selectdsr()) { // EPROM selected uint16_t base = m_banksel? 0x2000 : 0; uint8_t* rom = &m_dsrrom[base | (m_address & 0x1fff)]; *value = *rom; - } + } m_address = saveaddress; } @@ -161,7 +161,7 @@ void corcomp_fdc_device::debug_write(offs_t offset, uint8_t data) if (m_ctrlpal->selectram()) { m_buffer_ram->pointer()[m_address & 0x7f] = data & 0xf0; // only the first 4 bits - } + } m_address = saveaddress; } @@ -175,7 +175,7 @@ void corcomp_fdc_device::operate_ready_line() } /* - Callbacks from the WDC chip + Callbacks from the WDC chip */ WRITE_LINE_MEMBER( corcomp_fdc_device::fdc_irq_w ) { @@ -201,36 +201,36 @@ READ8Z_MEMBER(corcomp_fdc_device::readz) debug_read(offset, value); return; } - + if (m_ctrlpal->selectram()) { // SRAM selected *value = m_buffer_ram->pointer()[m_address & 0x7f] & 0xf0; // only the first 4 bits LOGMASKED(LOG_RAM, "Read RAM: %04x -> %02x\n", m_address & 0xffff, *value); } - + if (m_ctrlpal->selectwdc()) { // WDC selected *value = m_wdc->read((m_address >> 1)&0x03); LOGMASKED(LOG_CONTR, "Read FDC: %04x -> %02x\n", m_address & 0xffff, *value); } - + if (m_ctrlpal->selectdsr()) { // EPROM selected uint16_t base = m_banksel? 0x2000 : 0; uint8_t* rom = &m_dsrrom[base | (m_address & 0x1fff)]; *value = *rom; - + if (WORD_ALIGNED(m_address)) { - uint16_t val = (*rom << 8) | (*(rom+1)); + uint16_t val = (*rom << 8) | (*(rom+1)); LOGMASKED(LOG_EPROM, "Read DSR: %04x (page %d)-> %04x\n", m_address & 0xffff, base>>13, val); } } } - + void corcomp_fdc_device::write(offs_t offset, uint8_t data) { if (machine().side_effects_disabled()) @@ -244,7 +244,7 @@ void corcomp_fdc_device::write(offs_t offset, uint8_t data) LOGMASKED(LOG_RAM, "Write RAM: %04x <- %02x\n", m_address & 0xffff, data&0xf0); m_buffer_ram->pointer()[m_address & 0x7f] = data & 0xf0; // only the first 4 bits } - + if (m_ctrlpal->selectwdc()) { // WDC selected @@ -297,9 +297,9 @@ READ8_MEMBER( corcomp_fdc_device::tms9901_input ) // INT6: Switch 2 // INT7: Switch 4 // INT8: Switch 6 - // INT9: - + // INT9: - // P9: MotorMF - // P12: WDCu11.28 (HLD) + // P12: WDCu11.28 (HLD) const uint8_t dipswitch[] = { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; switch (offset) @@ -396,7 +396,7 @@ WRITE_LINE_MEMBER( corcomp_fdc_device::motor_w ) } /* - Push the P11 state to the variable. + Push the P11 state to the variable. */ WRITE_LINE_MEMBER( corcomp_fdc_device::select_bank ) { @@ -487,10 +487,10 @@ void corcomp_fdc_device::common_config(machine_config& config) m_wdc->intrq_wr_callback().set(FUNC(corcomp_fdc_device::fdc_irq_w)); m_wdc->drq_wr_callback().set(FUNC(corcomp_fdc_device::fdc_drq_w)); m_wdc->hld_wr_callback().set(FUNC(corcomp_fdc_device::fdc_hld_w)); - + TMS9901(config, m_tms9901, 0); m_tms9901->read_cb().set(FUNC(corcomp_fdc_device::tms9901_input)); - + // Outputs // P0: LED (DSR?), PALu2.1 // P1: MFu6.clk (Motor) @@ -505,7 +505,7 @@ void corcomp_fdc_device::common_config(machine_config& config) // P11: ROMBNK // P13: - // P14: - - // P15: - + // P15: - m_tms9901->p_out_cb(0).set(FUNC(corcomp_fdc_device::select_card)); m_tms9901->p_out_cb(1).set(MOTORMF_TAG, FUNC(ttl74123_device::b_w)); m_tms9901->p_out_cb(4).set(FUNC(corcomp_fdc_device::select_dsk)); @@ -515,7 +515,7 @@ void corcomp_fdc_device::common_config(machine_config& config) m_tms9901->p_out_cb(8).set(FUNC(corcomp_fdc_device::select_dsk)); m_tms9901->p_out_cb(10).set(WDC_TAG, FUNC(wd_fdc_device_base::dden_w)); m_tms9901->p_out_cb(11).set(FUNC(corcomp_fdc_device::select_bank)); - + // Motor monoflop TTL74123(config, m_motormf, 0); m_motormf->set_connection_type(TTL74123_NOT_GROUNDED_NO_DIODE); @@ -532,7 +532,7 @@ void corcomp_fdc_device::common_config(machine_config& config) FLOPPY_CONNECTOR(config, "3", ccfdc_floppies, nullptr, corcomp_fdc_device::floppy_formats).enable_sound(true); // SRAM 2114 1Kx4 - RAM(config, BUFFER).set_default_size("1k").set_default_value(0); + RAM(config, BUFFER).set_default_size("1k").set_default_value(0); } // ============================================================================ @@ -541,20 +541,20 @@ void corcomp_fdc_device::common_config(machine_config& config) corcomp_dcc_device::corcomp_dcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock): corcomp_fdc_device(mconfig, TI99_CCDCC, tag, owner, clock) -{ +{ } void corcomp_dcc_device::device_add_mconfig(machine_config& config) { WD2793(config, m_wdc, 4_MHz_XTAL / 4); common_config(config); - + // For the 2793, attach the HLT line m_tms9901->p_out_cb(3).set(WDC_TAG, FUNC(wd_fdc_device_base::hlt_w)); - + // PAL circuits are connected in device_config_complete CCDCC_PALU2(config, CCDCC_PALU2_TAG, 0); - CCDCC_PALU1(config, CCDCC_PALU1_TAG, 0); + CCDCC_PALU1(config, CCDCC_PALU1_TAG, 0); } ROM_START( cc_dcc ) @@ -581,8 +581,8 @@ const tiny_rom_entry *corcomp_dcc_device::device_rom_region() const } // ======================================================================== -// PAL circuits on the CorComp board -// ======================================================================== +// PAL circuits on the CorComp board +// ======================================================================== ccfdc_dec_pal_device::ccfdc_dec_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock), @@ -607,7 +607,7 @@ void ccfdc_dec_pal_device::device_config_complete() } /* - Indicates 9901 addressing. + Indicates 9901 addressing. */ READ_LINE_MEMBER( ccfdc_dec_pal_device::address9901 ) { @@ -615,7 +615,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::address9901 ) } /* - Indicates SRAM addressing. + Indicates SRAM addressing. */ READ_LINE_MEMBER( ccfdc_dec_pal_device::addressram ) { @@ -624,7 +624,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::addressram ) } /* - Indicates WDC addressing. + Indicates WDC addressing. */ READ_LINE_MEMBER( ccfdc_dec_pal_device::addresswdc ) { @@ -633,7 +633,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::addresswdc ) } /* - Indicates DSR addressing. + Indicates DSR addressing. */ READ_LINE_MEMBER( ccfdc_dec_pal_device::address4 ) { @@ -642,7 +642,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::address4 ) } /* - Indicates SRAM selection. + Indicates SRAM selection. */ READ_LINE_MEMBER( ccfdc_sel_pal_device::selectram ) { @@ -651,7 +651,7 @@ READ_LINE_MEMBER( ccfdc_sel_pal_device::selectram ) } /* - Indicates WDC selection. + Indicates WDC selection. */ READ_LINE_MEMBER( ccfdc_sel_pal_device::selectwdc ) { @@ -659,18 +659,18 @@ READ_LINE_MEMBER( ccfdc_sel_pal_device::selectwdc ) } /* - Indicates EPROM selection. + Indicates EPROM selection. */ READ_LINE_MEMBER( ccfdc_sel_pal_device::selectdsr ) { return (m_decpal->address4() && !m_decpal->addresswdc() - && !(m_decpal->addressram() && (m_board->upper_bank()))) + && !(m_decpal->addressram() && (m_board->upper_bank()))) ? ASSERT_LINE : CLEAR_LINE; } // ======================================================================== -// PAL circuits on the original CorComp board +// PAL circuits on the original CorComp board // PAL u2 is the address decoder, delivering its results to the // selector PAL u1. // ======================================================================== @@ -686,7 +686,7 @@ ccdcc_palu1_device::ccdcc_palu1_device(const machine_config &mconfig, const char } /* - Wait state logic + Wait state logic */ READ_LINE_MEMBER( ccdcc_palu1_device::ready_out ) { @@ -697,8 +697,8 @@ READ_LINE_MEMBER( ccdcc_palu1_device::ready_out ) bool noterm = m_wdc->intrq_r()==CLEAR_LINE; // There is no interrupt yet bool motor = (m_motormf->q_r()==1); // The disk is spinning - line_state ready = (wdc && lastdig && trap && waitbyte && noterm && motor)? CLEAR_LINE : ASSERT_LINE; // then clear READY and thus trigger wait states - + line_state ready = (wdc && lastdig && trap && waitbyte && noterm && motor)? CLEAR_LINE : ASSERT_LINE; // then clear READY and thus trigger wait states + LOGMASKED(LOG_READY, "READY = %d (%d,%d,%d,%d,%d,%d)\n", ready, wdc, lastdig, trap, waitbyte, noterm, motor); return ready; } @@ -715,25 +715,25 @@ void ccdcc_palu1_device::device_config_complete() corcomp_fdca_device::corcomp_fdca_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock): corcomp_fdc_device(mconfig, TI99_CCFDC, tag, owner, clock) -{ +{ } void corcomp_fdca_device::device_add_mconfig(machine_config& config) { WD1773(config, m_wdc, 8_MHz_XTAL); common_config(config); - + // PAL circuits are connected in device_config_complete CCFDC_PALU12(config, CCFDC_PALU12_TAG, 0); - CCFDC_PALU6(config, CCFDC_PALU6_TAG, 0); + CCFDC_PALU6(config, CCFDC_PALU6_TAG, 0); } /* - READY trap circuitry on the revised board (U10) + READY trap circuitry on the revised board (U10) */ bool corcomp_fdca_device::ready_trap_active() { - return m_tms9901->read_bit(tms9901_device::P2) + return m_tms9901->read_bit(tms9901_device::P2) && ((m_address & 6)==6) && (m_motormf->q_r()==1); } @@ -757,7 +757,7 @@ const tiny_rom_entry *corcomp_fdca_device::device_rom_region() const } // ======================================================================== -// PAL circuits on the revised CorComp board +// PAL circuits on the revised CorComp board // PAL u12 is the address decoder, delivering its results to the // selector PAL u6. // ======================================================================== @@ -768,8 +768,8 @@ ccfdc_palu12_device::ccfdc_palu12_device(const machine_config &mconfig, const ch } /* - Indicates 9901 addressing. In this PAL version, the A9 address line is - also used. + Indicates 9901 addressing. In this PAL version, the A9 address line is + also used. */ READ_LINE_MEMBER( ccfdc_palu12_device::address9901 ) { @@ -782,20 +782,20 @@ ccfdc_palu6_device::ccfdc_palu6_device(const machine_config &mconfig, const char } /* - Indicates WDC selection. Also checks whether A12 and /WE match. - That is, when writing (/WE=0), A12 must be 1 (addresses 5ff8..e), - otherwise (/WE=1), A12 must be 0 (addresses 5ff0..6) + Indicates WDC selection. Also checks whether A12 and /WE match. + That is, when writing (/WE=0), A12 must be 1 (addresses 5ff8..e), + otherwise (/WE=1), A12 must be 0 (addresses 5ff0..6) */ READ_LINE_MEMBER( ccfdc_palu6_device::selectwdc ) { - return (m_decpal->addresswdc() + return (m_decpal->addresswdc() && ((m_board->get_address()&1)==0) && (((m_board->get_address()&8)!=0)==(m_board->write_access())))? ASSERT_LINE : CLEAR_LINE; } /* - Indicates EPROM selection. The Rev A selector PAL leads back some of - its outputs for this calculation. + Indicates EPROM selection. The Rev A selector PAL leads back some of + its outputs for this calculation. */ READ_LINE_MEMBER( ccfdc_palu6_device::selectdsr ) { @@ -803,8 +803,8 @@ READ_LINE_MEMBER( ccfdc_palu6_device::selectdsr ) } /* - Wait state logic. The Rev A selector relies on an AND circuit on the - board which evaluates whether the trap is active. + Wait state logic. The Rev A selector relies on an AND circuit on the + board which evaluates whether the trap is active. */ READ_LINE_MEMBER( ccfdc_palu6_device::ready_out ) @@ -815,8 +815,8 @@ READ_LINE_MEMBER( ccfdc_palu6_device::ready_out ) bool waitbyte = m_wdc->drq_r()==CLEAR_LINE; // We are waiting for a byte bool noterm = m_wdc->intrq_r()==CLEAR_LINE; // There is no interrupt yet - line_state ready = (wdc && even && trap && waitbyte && noterm)? CLEAR_LINE : ASSERT_LINE; // then clear READY and thus trigger wait states - + line_state ready = (wdc && even && trap && waitbyte && noterm)? CLEAR_LINE : ASSERT_LINE; // then clear READY and thus trigger wait states + LOGMASKED(LOG_READY, "READY = %d (%d,%d,%d,%d,%d)\n", ready, wdc, even, trap, waitbyte, noterm); return ready; } diff --git a/src/devices/bus/ti99/peb/cc_fdc.h b/src/devices/bus/ti99/peb/cc_fdc.h index ac356c8c0c7..116604e8857 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.h +++ b/src/devices/bus/ti99/peb/cc_fdc.h @@ -34,9 +34,9 @@ class corcomp_fdc_device : public device_t, public device_ti99_peribox_card_inte friend class ccfdc_dec_pal_device; friend class ccfdc_sel_pal_device; friend class ccdcc_palu1_device; - friend class ccfdc_palu6_device; + friend class ccfdc_palu6_device; friend class ccfdc_palu12_device; - + public: DECLARE_READ8Z_MEMBER(readz) override; void write(offs_t offset, uint8_t data) override; @@ -50,12 +50,12 @@ public: DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_hld_w ); DECLARE_READ8_MEMBER( tms9901_input ); - DECLARE_WRITE_LINE_MEMBER( select_dsk ); + DECLARE_WRITE_LINE_MEMBER( select_dsk ); DECLARE_WRITE_LINE_MEMBER( side_select ); DECLARE_WRITE_LINE_MEMBER( motor_w ); DECLARE_WRITE_LINE_MEMBER( select_card ); DECLARE_WRITE_LINE_MEMBER( select_bank ); - + protected: corcomp_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -76,16 +76,16 @@ protected: // PALs ccfdc_dec_pal_device* m_decpal; ccfdc_sel_pal_device* m_ctrlpal; - + // Lines that are polled by the PAL chips bool card_selected(); bool upper_bank(); bool write_access(); bool ready_trap_active(); - + // Deliver the current state of the address bus uint16_t get_address(); - + // Wait state logic void operate_ready_line(); @@ -94,10 +94,10 @@ protected: // Motor monoflop required_device m_motormf; - + // Interface chip - required_device m_tms9901; - + required_device m_tms9901; + // Debugger accessors void debug_read(offs_t offset, uint8_t* value); void debug_write(offs_t offset, uint8_t data); @@ -107,17 +107,17 @@ protected: // DSR ROM uint8_t* m_dsrrom; - + // State of the bank select line. Pulled down initially. bool m_cardsel; bool m_banksel; // Selected drive - int m_selected_drive; - + int m_selected_drive; + // Recent address int m_address; - + // Write access bool m_writing; }; @@ -145,15 +145,15 @@ public: DECLARE_READ_LINE_MEMBER(address4); DECLARE_READ_LINE_MEMBER(addressram); virtual DECLARE_READ_LINE_MEMBER(address9901); - + protected: ccfdc_dec_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); void device_start() override { }; - void device_config_complete() override; + void device_config_complete() override; corcomp_fdc_device* m_board; - required_device m_tms9901; + required_device m_tms9901; }; // =========== Selector PAL circuit ================ @@ -175,8 +175,8 @@ protected: corcomp_fdc_device* m_board; ccfdc_dec_pal_device* m_decpal; required_device m_motormf; - required_device m_tms9901; - required_device m_wdc; + required_device m_tms9901; + required_device m_wdc; }; // =========== Specific decoder PAL circuit of the CCDCC ================ @@ -194,7 +194,7 @@ class ccdcc_palu1_device : public ccfdc_sel_pal_device public: ccdcc_palu1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_READ_LINE_MEMBER(ready_out) override; - + private: void device_config_complete() override; }; @@ -206,7 +206,7 @@ private: class corcomp_fdca_device : public corcomp_fdc_device { friend class ccfdc_palu6_device; - + public: corcomp_fdca_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); private: diff --git a/src/devices/bus/ti99/peb/forti.cpp b/src/devices/bus/ti99/peb/forti.cpp index b4a3836bc0d..d91cc2b2149 100644 --- a/src/devices/bus/ti99/peb/forti.cpp +++ b/src/devices/bus/ti99/peb/forti.cpp @@ -2,27 +2,27 @@ // copyright-holders:Michael Zapf /******************************************************************************* FORTi Sound card - + 4 x TMS9919 sound generators 4 sound outputs; may be coupled to two stereo outputs - + Mapping: - + 1000 01xx xxxD CBA0 - + 8402: Sound chip 1 (A) 8404: Sound chip 2 (B) 8408: Sound chip 3 (C) 8410: Sound chip 4 (D) - + Sound chips may be addressed in parallel: 8406: Sound chips 1+2 841a: Sound chips 1+3+4 - All sound READY lines are combined by a wired-AND as the common + All sound READY lines are combined by a wired-AND as the common READY line to the CPU. - - Michael Zapf + + Michael Zapf March 2020 *******************************************************************************/ @@ -44,19 +44,19 @@ DEFINE_DEVICE_TYPE_NS(TI99_FORTI, bus::ti99::peb, forti_device, "ti99_forti", "FORTi Sound Card") namespace bus { namespace ti99 { namespace peb { - + forti_device::forti_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock): device_t(mconfig, TI99_FORTI, tag, owner, clock), device_ti99_peribox_card_interface(mconfig, *this), m_generator1(*this, FORTI_GEN1_TAG), m_generator2(*this, FORTI_GEN2_TAG), m_generator3(*this, FORTI_GEN3_TAG), - m_generator4(*this, FORTI_GEN4_TAG) + m_generator4(*this, FORTI_GEN4_TAG) { } /* - No read access. The FORTi card does not support any reading. + No read access. The FORTi card does not support any reading. */ READ8Z_MEMBER(forti_device::readz) { @@ -64,20 +64,20 @@ READ8Z_MEMBER(forti_device::readz) } /* - READY callbacks from the sound chips. + READY callbacks from the sound chips. */ WRITE_LINE_MEMBER( forti_device::ready_sound ) { - LOGMASKED(LOG_READY, "READY (%d, %d, %d, %d)\n", m_generator1->ready_r(), + LOGMASKED(LOG_READY, "READY (%d, %d, %d, %d)\n", m_generator1->ready_r(), m_generator2->ready_r(), m_generator3->ready_r(), m_generator4->ready_r()); - + line_state ready = (m_generator1->ready_r() && m_generator2->ready_r() && m_generator3->ready_r() && m_generator4->ready_r())? ASSERT_LINE : CLEAR_LINE; - + m_slot->set_ready(ready); } -void forti_device::write(offs_t offset, uint8_t data) +void forti_device::write(offs_t offset, uint8_t data) { // Decode for 8400-87ff if ((offset & 0xfc01) == 0x8400) @@ -101,10 +101,10 @@ void forti_device::device_add_mconfig(machine_config& config) { // 1 and 3 are mixed to left channel // 2 and 4 are moxed to right channel - + SPEAKER(config, "forti_left").front_left(); SPEAKER(config, "forti_right").front_right(); - + SN94624(config, m_generator1, XTAL(3'579'545)/8); m_generator1->ready_cb().set(FUNC(forti_device::ready_sound)); m_generator1->add_route(ALL_OUTPUTS, "forti_left", 0.75); @@ -130,4 +130,4 @@ void forti_device::device_reset() { } -} } } // end namespace bus::ti99::peb \ No newline at end of file +} } } // end namespace bus::ti99::peb diff --git a/src/devices/bus/ti99/peb/forti.h b/src/devices/bus/ti99/peb/forti.h index f5ede4b0a71..46c812a7c00 100644 --- a/src/devices/bus/ti99/peb/forti.h +++ b/src/devices/bus/ti99/peb/forti.h @@ -2,11 +2,11 @@ // copyright-holders:Michael Zapf /******************************************************************************* FORTi Sound card - + 4 x TMS9919 sound generators 4 sound outputs; may be coupled to two stereo outputs - - Michael Zapf + + Michael Zapf March 2020 *******************************************************************************/ diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp index 024fead2789..eefc6fdf230 100644 --- a/src/devices/cpu/avr8/avr8.cpp +++ b/src/devices/cpu/avr8/avr8.cpp @@ -62,39 +62,39 @@ #include "avr8dasm.h" #include "debugger.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_BOOT (1 << 2) -#define LOG_TIMER0 (1 << 3) -#define LOG_TIMER1 (1 << 4) -#define LOG_TIMER2 (1 << 5) -#define LOG_TIMER3 (1 << 6) -#define LOG_TIMER4 (1 << 7) -#define LOG_TIMER5 (1 << 8) -#define LOG_TIMER0_TICK (1 << 9) -#define LOG_TIMER1_TICK (1 << 10) -#define LOG_TIMER2_TICK (1 << 11) -#define LOG_TIMER3_TICK (1 << 12) -#define LOG_TIMER4_TICK (1 << 13) -#define LOG_TIMER5_TICK (1 << 14) -#define LOG_EEPROM (1 << 15) -#define LOG_GPIO (1 << 16) -#define LOG_WDOG (1 << 17) -#define LOG_CLOCK (1 << 18) -#define LOG_POWER (1 << 19) -#define LOG_OSC (1 << 20) -#define LOG_PINCHG (1 << 21) -#define LOG_EXTMEM (1 << 22) -#define LOG_ADC (1 << 23) -#define LOG_DIGINPUT (1 << 24) -#define LOG_ASYNC (1 << 25) -#define LOG_TWI (1 << 26) -#define LOG_UART (1 << 27) -#define LOG_TIMERS (LOG_TIMER0 | LOG_TIMER1 | LOG_TIMER2 | LOG_TIMER3 | LOG_TIMER4 | LOG_TIMER5) -#define LOG_TIMER_TICKS (LOG_TIMER0_TICK | LOG_TIMER1_TICK | LOG_TIMER2_TICK | LOG_TIMER3_TICK | LOG_TIMER4_TICK | LOG_TIMER5_TICK) -#define LOG_ALL (LOG_UNKNOWN | LOG_BOOT | LOG_TIMERS | LOG_TIMER_TICKS | LOG_EEPROM | LOG_GPIO | LOG_WDOG | LOG_CLOCK | LOG_POWER \ +#define LOG_UNKNOWN (1 << 1) +#define LOG_BOOT (1 << 2) +#define LOG_TIMER0 (1 << 3) +#define LOG_TIMER1 (1 << 4) +#define LOG_TIMER2 (1 << 5) +#define LOG_TIMER3 (1 << 6) +#define LOG_TIMER4 (1 << 7) +#define LOG_TIMER5 (1 << 8) +#define LOG_TIMER0_TICK (1 << 9) +#define LOG_TIMER1_TICK (1 << 10) +#define LOG_TIMER2_TICK (1 << 11) +#define LOG_TIMER3_TICK (1 << 12) +#define LOG_TIMER4_TICK (1 << 13) +#define LOG_TIMER5_TICK (1 << 14) +#define LOG_EEPROM (1 << 15) +#define LOG_GPIO (1 << 16) +#define LOG_WDOG (1 << 17) +#define LOG_CLOCK (1 << 18) +#define LOG_POWER (1 << 19) +#define LOG_OSC (1 << 20) +#define LOG_PINCHG (1 << 21) +#define LOG_EXTMEM (1 << 22) +#define LOG_ADC (1 << 23) +#define LOG_DIGINPUT (1 << 24) +#define LOG_ASYNC (1 << 25) +#define LOG_TWI (1 << 26) +#define LOG_UART (1 << 27) +#define LOG_TIMERS (LOG_TIMER0 | LOG_TIMER1 | LOG_TIMER2 | LOG_TIMER3 | LOG_TIMER4 | LOG_TIMER5) +#define LOG_TIMER_TICKS (LOG_TIMER0_TICK | LOG_TIMER1_TICK | LOG_TIMER2_TICK | LOG_TIMER3_TICK | LOG_TIMER4_TICK | LOG_TIMER5_TICK) +#define LOG_ALL (LOG_UNKNOWN | LOG_BOOT | LOG_TIMERS | LOG_TIMER_TICKS | LOG_EEPROM | LOG_GPIO | LOG_WDOG | LOG_CLOCK | LOG_POWER \ LOG_OSC | LOG_PINCHG | LOG_EXTMEM | LOG_ADC | LOG_DIGINPUT | LOG_ASYNC | LOG_TWI | LOG_UART) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" //************************************************************************** @@ -197,9 +197,9 @@ enum static const char avr8_reg_name[4] = { 'A', 'B', 'C', 'D' }; -#define SREG_R(b) ((m_r[AVR8_REGIDX_SREG] & (1 << (b))) >> (b)) -#define SREG_W(b,v) m_r[AVR8_REGIDX_SREG] = (m_r[AVR8_REGIDX_SREG] & ~(1 << (b))) | ((v) << (b)) -#define SREG m_r[AVR8_REGIDX_SREG] +#define SREG_R(b) ((m_r[AVR8_REGIDX_SREG] & (1 << (b))) >> (b)) +#define SREG_W(b,v) m_r[AVR8_REGIDX_SREG] = (m_r[AVR8_REGIDX_SREG] & ~(1 << (b))) | ((v) << (b)) +#define SREG m_r[AVR8_REGIDX_SREG] #define NOT(x) (1 - (x)) // Opcode-Parsing Defines @@ -1744,7 +1744,7 @@ void avr8_device::timer4_tick() // uint8_t compare_mode[2] = { (m_r[AVR8_REGIDX_TCCR1A] & AVR8_TCCR1A_COM1A_MASK) >> AVR8_TCCR1A_COM1A_SHIFT, // (m_r[AVR8_REGIDX_TCCR1A] & AVR8_TCCR1A_COM1B_MASK) >> AVR8_TCCR1A_COM1B_SHIFT }; // uint16_t ocr4[2] = { static_cast((m_r[AVR8_REGIDX_OCR4AH] << 8) | m_r[AVR8_REGIDX_OCR4AL]), - // static_cast((m_r[AVR8_REGIDX_OCR4BH] << 8) | m_r[AVR8_REGIDX_OCR4BL]) }; + // static_cast((m_r[AVR8_REGIDX_OCR4BH] << 8) | m_r[AVR8_REGIDX_OCR4BL]) }; // TODO uint8_t ocf4[2] = { (1 << AVR8_TIFR4_OCF4A_SHIFT), (1 << AVR8_TIFR4_OCF4B_SHIFT) }; // TODO uint8_t int4[2] = { AVR8_INTIDX_OCF4A, AVR8_INTIDX_OCF4B }; int32_t increment = m_timer_increment[4]; @@ -1934,7 +1934,7 @@ void avr8_device::timer5_tick() case WGM5_PWM_8_PC: case WGM5_PWM_9_PC: case WGM5_PWM_10_PC: -// case WGM5_CTC_OCR: +// case WGM5_CTC_OCR: case WGM5_FAST_PWM_8: case WGM5_FAST_PWM_9: case WGM5_FAST_PWM_10: @@ -2874,18 +2874,18 @@ 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_SPDR: // TODO: needed for Replicator 1 - case AVR8_REGIDX_SPSR: // TODO: needed for Replicator 1 -// case AVR8_REGIDX_ADCSRA: // TODO: needed for Replicator 1 -// case AVR8_REGIDX_ADCSRB: // 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 +// case AVR8_REGIDX_ADCSRB: // TODO: needed for Replicator 1 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_TIMSK3: // TODO: needed for Replicator 1 +// case AVR8_REGIDX_TIMSK3: // TODO: needed for Replicator 1 case AVR8_REGIDX_TIMSK4: case AVR8_REGIDX_TIMSK5: return m_r[offset]; diff --git a/src/devices/cpu/avr8/avr8ops.hxx b/src/devices/cpu/avr8/avr8ops.hxx index 4c465230d21..6ad36baa35b 100644 --- a/src/devices/cpu/avr8/avr8ops.hxx +++ b/src/devices/cpu/avr8/avr8ops.hxx @@ -4,7 +4,7 @@ Atmel 8-bit AVR simulator - Opcode implementations + Opcode implementations ***************************************************************************/ diff --git a/src/devices/cpu/gigatron/gigatron.cpp b/src/devices/cpu/gigatron/gigatron.cpp index dc4f38cc3fe..6c25f4abd52 100644 --- a/src/devices/cpu/gigatron/gigatron.cpp +++ b/src/devices/cpu/gigatron/gigatron.cpp @@ -119,7 +119,7 @@ void gigatron_cpu_device::init() save_item(NAME(m_ppc)); save_item(NAME(m_inReg)); save_item(NAME(m_pc)); - + m_outx_cb.resolve_safe(); } diff --git a/src/devices/cpu/gigatron/gigatron.h b/src/devices/cpu/gigatron/gigatron.h index e11f48d226a..6cc1173d23c 100644 --- a/src/devices/cpu/gigatron/gigatron.h +++ b/src/devices/cpu/gigatron/gigatron.h @@ -26,7 +26,7 @@ public: // construction/destruction gigatron_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); auto outx_cb() { return m_outx_cb.bind(); } - + protected: // device-level overrides virtual void device_start() override; @@ -77,7 +77,7 @@ private: int m_icount; void gigatron_illegal(); - + devcb_write8 m_outx_cb; }; diff --git a/src/devices/cpu/ks0164/ks0164.cpp b/src/devices/cpu/ks0164/ks0164.cpp index d3de46b9267..f4122eeab5d 100644 --- a/src/devices/cpu/ks0164/ks0164.cpp +++ b/src/devices/cpu/ks0164/ks0164.cpp @@ -138,8 +138,8 @@ u16 ks0164_cpu_device::snz(u16 r) if(r & 0x8000) f |= F_N; m_r[R_PSW] = (m_r[R_PSW] & ~F_MASK) | f; - return r; -} + return r; +} void ks0164_cpu_device::do_alu(u16 opcode, u16 v2) { @@ -384,7 +384,7 @@ void ks0164_cpu_device::execute_run() case 0: { // Push all registers // 1100 .... .... .001 - + m_program->write_word(m_r[R_SP] - 2, m_r[0]); m_program->write_word(m_r[R_SP] - 4, m_r[1]); m_program->write_word(m_r[R_SP] - 6, m_r[2]); @@ -475,7 +475,7 @@ void ks0164_cpu_device::execute_run() case 0: { // Push all registers // 1100 .... .... .011 - + m_r[0] = m_program->read_word(m_r[R_SP] + 6); m_r[1] = m_program->read_word(m_r[R_SP] + 4); m_r[2] = m_program->read_word(m_r[R_SP] + 2); @@ -741,7 +741,7 @@ void ks0164_cpu_device::execute_run() default: unk(opcode); break; - } + } m_r[R_ZERO] = 0; } diff --git a/src/devices/cpu/ks0164/ks0164d.cpp b/src/devices/cpu/ks0164/ks0164d.cpp index dfdb4e79ce7..a87c7bb89b9 100644 --- a/src/devices/cpu/ks0164/ks0164d.cpp +++ b/src/devices/cpu/ks0164/ks0164d.cpp @@ -217,7 +217,7 @@ const ks0164_disassembler::instruction ks0164_disassembler::instructions[] { { 0xf004, 0xf8ff, [](P) -> u32 { util::stream_format(stream, "dbra %s, %04x", regs[(opcode >> 8) & 7], opcodes.r16(pc+2)); return 4; } }, { 0xf00d, 0xf8ff, [](P) -> u32 { util::stream_format(stream, "cmpbeq %s, %04x, %04x", regs[(opcode >> 8) & 7], opcodes.r16(pc+2), opcodes.r16(pc+4)); return 6; } }, - + { 0x0000, 0x0000, [](P) -> u32 { util::stream_format(stream, "?%04x", opcode); return 2; } }, }; diff --git a/src/devices/cpu/tlcs90/tlcs90d.cpp b/src/devices/cpu/tlcs90/tlcs90d.cpp index e56bb02d59a..bb0a1b9931c 100644 --- a/src/devices/cpu/tlcs90/tlcs90d.cpp +++ b/src/devices/cpu/tlcs90/tlcs90d.cpp @@ -65,7 +65,7 @@ tmp90844_disassembler::tmp90844_disassembler() } const char *const tmp90c051_disassembler::ir_names[0x4c] = { - "P2", "P2CR", "P3", "P3CR", + "P2", "P2CR", "P3", "P3CR", "P3FR", "P4", "P5", "P45CR", "P45FR", "P6", "P6CR", "P6FR", "TREG0", "TREG1", "TREG2", "TREG3", "T01MOD", "T23MOD", "TFFCR", "TRDC", "TRUN", "IRF0", "IRF1", "IRF2", "INTE0", "INTE1", "INTE2", "DMAE", diff --git a/src/devices/cpu/xavix2/xavix2.h b/src/devices/cpu/xavix2/xavix2.h index 099b7e4a27e..de4d62e38bc 100644 --- a/src/devices/cpu/xavix2/xavix2.h +++ b/src/devices/cpu/xavix2/xavix2.h @@ -108,8 +108,8 @@ protected: if(r & 0x80000000) f |= F_N; m_hr[4] = (m_hr[4] & ~F_MASK) | f; - return r; - } + return r; + } inline u32 do_lsl(u32 v1, u32 shift) { if(!shift) { diff --git a/src/devices/machine/pxa255.cpp b/src/devices/machine/pxa255.cpp index eb3e377a098..6788c10a3ce 100644 --- a/src/devices/machine/pxa255.cpp +++ b/src/devices/machine/pxa255.cpp @@ -15,17 +15,17 @@ #include "screen.h" #include "speaker.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_I2S (1 << 2) -#define LOG_DMA (1 << 3) -#define LOG_OSTIMER (1 << 4) -#define LOG_INTC (1 << 5) -#define LOG_GPIO (1 << 6) -#define LOG_LCD_DMA (1 << 7) -#define LOG_LCD (1 << 8) -#define LOG_ALL (LOG_UNKNOWN | LOG_I2S | LOG_DMA | LOG_OSTIMER | LOG_INTC | LOG_GPIO | LOG_LCD_DMA | LOG_LCD) - -#define VERBOSE (0) +#define LOG_UNKNOWN (1 << 1) +#define LOG_I2S (1 << 2) +#define LOG_DMA (1 << 3) +#define LOG_OSTIMER (1 << 4) +#define LOG_INTC (1 << 5) +#define LOG_GPIO (1 << 6) +#define LOG_LCD_DMA (1 << 7) +#define LOG_LCD (1 << 8) +#define LOG_ALL (LOG_UNKNOWN | LOG_I2S | LOG_DMA | LOG_OSTIMER | LOG_INTC | LOG_GPIO | LOG_LCD_DMA | LOG_LCD) + +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(PXA255_PERIPHERALS, pxa255_periphs_device, "pxa255_periphs", "Intel XScale PXA255 Peripherals") diff --git a/src/devices/machine/scn_pci.cpp b/src/devices/machine/scn_pci.cpp index 2c77f3ac9fd..2f34f1a9be5 100644 --- a/src/devices/machine/scn_pci.cpp +++ b/src/devices/machine/scn_pci.cpp @@ -1212,18 +1212,18 @@ void scn_pci_device::write_mode(u8 data) if ((data & 0x03) != 0) { LOGMASKED(LOG_INIT, "Asynchronous %dX mode: %d data bits, %s parity, %s stop bit%s\n", - BIT(data, 1) ? (BIT(data, 0) ? 64 : 16) : 1, - ((data & 0x0c) >> 2) + 5, - BIT(data, 4) ? (BIT(data, 5) ? "even" : "odd") : "no", - s_stop_bit_desc[(data & 0xc0) >> 6], (data & 0xc0) != 0x40 ? "s" : ""); + BIT(data, 1) ? (BIT(data, 0) ? 64 : 16) : 1, + ((data & 0x0c) >> 2) + 5, + BIT(data, 4) ? (BIT(data, 5) ? "even" : "odd") : "no", + s_stop_bit_desc[(data & 0xc0) >> 6], (data & 0xc0) != 0x40 ? "s" : ""); } else { LOGMASKED(LOG_INIT, "Synchronous 1X mode: %s%s SYN, %d data bits, %s parity\n", - BIT(data, 6) ? "transparent " : "", - BIT(data, 7) ? "single" : "double", - ((data & 0x0c) >> 2) + 5, - BIT(data, 4) ? (BIT(data, 5) ? "even" : "odd") : "no"); + BIT(data, 6) ? "transparent " : "", + BIT(data, 7) ? "single" : "double", + ((data & 0x0c) >> 2) + 5, + BIT(data, 4) ? (BIT(data, 5) ? "even" : "odd") : "no"); if (m_is_aci) logerror("%s: Invalid synchronous mode configured\n", machine().describe_context()); } @@ -1258,9 +1258,9 @@ void scn_pci_device::write_mode(u8 data) else if (BIT(data, 4)) { LOGMASKED(LOG_INIT, "%sRxC (%.1f baud with %s output)\n", - BIT(data, 5) ? "Internal TxC/" : "External TxC, internal ", - baud_rate, - BIT(data, 7) ? "BKDET" : BIT(data, 6) ? "16X" : "1X"); + BIT(data, 5) ? "Internal TxC/" : "External TxC, internal ", + baud_rate, + BIT(data, 7) ? "BKDET" : BIT(data, 6) ? "16X" : "1X"); // BKDET output if (BIT(data, 7)) @@ -1269,8 +1269,8 @@ void scn_pci_device::write_mode(u8 data) else if (BIT(data, 5)) { LOGMASKED(LOG_INIT, "Internal TxC (%.1f baud with %s output), external RxC\n", - baud_rate, - BIT(data, 6) ? "16X" : "1X"); + baud_rate, + BIT(data, 6) ? "16X" : "1X"); } else LOGMASKED(LOG_INIT, "External TxC, external RxC (may be indepedent)\n"); diff --git a/src/devices/machine/sunplus_gcm394_video.cpp b/src/devices/machine/sunplus_gcm394_video.cpp index 34eb17c3d32..ebba1fd8557 100644 --- a/src/devices/machine/sunplus_gcm394_video.cpp +++ b/src/devices/machine/sunplus_gcm394_video.cpp @@ -4,7 +4,7 @@ SunPlus GCM394-series SoC peripheral emulation (Video) - This is very similar to spg2xx but with additional features, layers and modes + This is very similar to spg2xx but with additional features, layers and modes **********************************************************************/ @@ -219,7 +219,7 @@ void gcm394_base_video_device::device_start() decodegfx(":maincpu"); m_space_read_cb.resolve_safe(0); - + m_screenpos_timer = timer_alloc(TIMER_SCREENPOS); m_screenpos_timer->adjust(attotime::never); @@ -365,7 +365,7 @@ void gcm394_base_video_device::draw(const rectangle &cliprect, uint32_t line, ui { words_per_tile = 8; // seems to be correct for sprites regardless of size / bpp on smartfp } - + int x_max; if (m_707f & 0x0010) { diff --git a/src/devices/machine/sunplus_gcm394_video.h b/src/devices/machine/sunplus_gcm394_video.h index e88cf402c82..a17923a2917 100644 --- a/src/devices/machine/sunplus_gcm394_video.h +++ b/src/devices/machine/sunplus_gcm394_video.h @@ -81,7 +81,7 @@ public: DECLARE_READ16_MEMBER(video_703a_palettebank_r); DECLARE_WRITE16_MEMBER(video_703a_palettebank_w); - + void update_raster_split_position(); DECLARE_WRITE16_MEMBER(split_irq_xpos_w); DECLARE_WRITE16_MEMBER(split_irq_ypos_w); @@ -125,7 +125,7 @@ public: DECLARE_READ16_MEMBER(video_7051_r); DECLARE_READ16_MEMBER(video_70e0_r); - + auto write_video_irq_callback() { return m_video_irq_cb.bind(); }; virtual void device_add_mconfig(machine_config& config) override; diff --git a/src/devices/sound/ks0164.cpp b/src/devices/sound/ks0164.cpp index 6746fba18d2..928234f8697 100644 --- a/src/devices/sound/ks0164.cpp +++ b/src/devices/sound/ks0164.cpp @@ -98,7 +98,7 @@ void ks0164_device::device_timer(emu_timer &timer, device_timer_id id, int param void ks0164_device::mpuin_set(bool control, u8 data) { - // logerror("mpu push %s %02x\n", control ? "ctrl" : "data", data); + // logerror("mpu push %s %02x\n", control ? "ctrl" : "data", data); m_mpu_in = data; if(control) m_mpu_status |= MPUS_RX_CTRL; @@ -122,7 +122,7 @@ void ks0164_device::mpu401_ctrl_w(u8 data) u8 ks0164_device::mpu401_data_r() { - // logerror("mpu pop %02x\n", m_mpu_out); + // logerror("mpu pop %02x\n", m_mpu_out); return m_mpu_out; } @@ -139,7 +139,7 @@ u8 ks0164_device::mpu401_status_r() std::string cc = machine().describe_context(); if(pc != cc || pr != res) { - // logerror("status read %02x (%s)\n", res, cc); + // logerror("status read %02x (%s)\n", res, cc); pc = cc; pr = res; } @@ -148,7 +148,7 @@ u8 ks0164_device::mpu401_status_r() u8 ks0164_device::mpu401_istatus_r() { - // logerror("mpu istatus read %02x (%04x)\n", m_mpu_status, m_cpu->pc()); + // logerror("mpu istatus read %02x (%04x)\n", m_mpu_status, m_cpu->pc()); return m_mpu_status; } @@ -156,14 +156,14 @@ void ks0164_device::mpu401_istatus_w(u8 data) { m_mpu_status = (m_mpu_status & ~(MPUS_RX_INT|MPUS_TX_INT)) | (data & (MPUS_RX_INT|MPUS_TX_INT)); m_cpu->set_input_line(11, (m_mpu_status & (MPUS_RX_INT|MPUS_RX_FULL)) == (MPUS_RX_INT|MPUS_RX_FULL) ? ASSERT_LINE : CLEAR_LINE); - // logerror("mpu status write %02x (%04x)\n", m_mpu_status, m_cpu->pc()); + // logerror("mpu status write %02x (%04x)\n", m_mpu_status, m_cpu->pc()); } u8 ks0164_device::mpu401_r() { m_mpu_status &= ~MPUS_RX_FULL; m_cpu->set_input_line(11, CLEAR_LINE); - // logerror("mpu_r %02x (%04x)\n", m_mpu_in, m_cpu->pc()); + // logerror("mpu_r %02x (%04x)\n", m_mpu_in, m_cpu->pc()); return m_mpu_in; } @@ -171,7 +171,7 @@ void ks0164_device::mpu401_w(u8 data) { m_mpu_out = data; m_mpu_status |= MPUS_TX_FULL; - // logerror("mpu_w %02x (%04x)\n", m_mpu_out, m_cpu->pc()); + // logerror("mpu_w %02x (%04x)\n", m_mpu_out, m_cpu->pc()); } u16 ks0164_device::vec_r(offs_t offset, u16 mem_mask) @@ -254,7 +254,7 @@ void ks0164_device::irqen_76_w(u8 data) m_cpu->set_input_line(14, CLEAR_LINE); } - // logerror("irqen_76 = %02x (%04x)\n", m_irqen_76, m_cpu->pc()); + // logerror("irqen_76 = %02x (%04x)\n", m_irqen_76, m_cpu->pc()); } u8 ks0164_device::irqen_77_r() diff --git a/src/devices/sound/ks0164.h b/src/devices/sound/ks0164.h index 2edb82d590f..a89d30b96d0 100644 --- a/src/devices/sound/ks0164.h +++ b/src/devices/sound/ks0164.h @@ -40,7 +40,7 @@ private: optional_memory_region m_mem_region; required_device m_cpu; address_space_config m_mem_config; - sound_stream *m_stream; + sound_stream *m_stream; emu_timer *m_timer; memory_access_cache<1, 0, ENDIANNESS_BIG> *m_mem_cache; @@ -50,7 +50,7 @@ private: u16 m_sregs[0x20][0x20]; u8 m_mpu_in; - u8 m_mpu_out; + u8 m_mpu_out; u8 m_mpu_status; u8 m_unk60; @@ -80,7 +80,7 @@ private: u8 voice_select_r(); void voice_select_w(u8 data); u16 voice_r(offs_t offset); - void voice_w(offs_t offset, u16 data, u16 mem_mask); + void voice_w(offs_t offset, u16 data, u16 mem_mask); void mpuin_set(bool control, u8 data); u8 mpu401_r(); diff --git a/src/devices/video/crt9212.cpp b/src/devices/video/crt9212.cpp index 836680dffee..5bbcd8aaac7 100644 --- a/src/devices/video/crt9212.cpp +++ b/src/devices/video/crt9212.cpp @@ -92,7 +92,7 @@ void crt9212_device::device_start() // clrcnt_w - clear counter //------------------------------------------------- -void crt9212_device::clrcnt_w(int state) +void crt9212_device::clrcnt_w(int state) { if (m_clrcnt && !state) { @@ -107,7 +107,7 @@ void crt9212_device::clrcnt_w(int state) // rclk_w - read clock //------------------------------------------------- -void crt9212_device::rclk_w(int state) +void crt9212_device::rclk_w(int state) { if (!m_rclk && state) { @@ -160,7 +160,7 @@ void crt9212_device::rclk_w(int state) // wclk_w - write clock //------------------------------------------------- -void crt9212_device::wclk_w(int state) +void crt9212_device::wclk_w(int state) { if (!m_wclk && state) { diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp index 39023752c8f..bad650cf0a6 100644 --- a/src/devices/video/ppu2c0x.cpp +++ b/src/devices/video/ppu2c0x.cpp @@ -32,7 +32,7 @@ /*************************************************************************** - CONSTANTS + CONSTANTS ***************************************************************************/ /* default monochromatic colortable */ @@ -428,14 +428,14 @@ void ppu2c0x_device::init_palette(bool indirect) switch (color_emphasis) { - case 0: r_mod = 1.0; g_mod = 1.0; b_mod = 1.0; break; - case 1: r_mod = 1.24; g_mod = .915; b_mod = .743; break; - case 2: r_mod = .794; g_mod = 1.09; b_mod = .882; break; - case 3: r_mod = .905; g_mod = 1.03; b_mod = 1.28; break; - case 4: r_mod = .741; g_mod = .987; b_mod = 1.0; break; - case 5: r_mod = 1.02; g_mod = .908; b_mod = .979; break; - case 6: r_mod = 1.02; g_mod = .98; b_mod = .653; break; - case 7: r_mod = .75; g_mod = .75; b_mod = .75; break; + case 0: r_mod = 1.0; g_mod = 1.0; b_mod = 1.0; break; + case 1: r_mod = 1.24; g_mod = .915; b_mod = .743; break; + case 2: r_mod = .794; g_mod = 1.09; b_mod = .882; break; + case 3: r_mod = .905; g_mod = 1.03; b_mod = 1.28; break; + case 4: r_mod = .741; g_mod = .987; b_mod = 1.0; break; + case 5: r_mod = 1.02; g_mod = .908; b_mod = .979; break; + case 6: r_mod = 1.02; g_mod = .98; b_mod = .653; break; + case 7: r_mod = .75; g_mod = .75; b_mod = .75; break; } */ diff --git a/src/devices/video/ppu2c0x.h b/src/devices/video/ppu2c0x.h index b95652791f5..fcd53435809 100644 --- a/src/devices/video/ppu2c0x.h +++ b/src/devices/video/ppu2c0x.h @@ -197,7 +197,7 @@ protected: int m_global_refresh_mask; int m_line_write_increment_large; bool m_paletteram_in_ppuspace; // sh6578 doesn't have the palette in PPU space, so various side-effects don't apply - std::vector m_palette_ram; /* shouldn't be in main memory! */ + std::vector m_palette_ram; /* shouldn't be in main memory! */ std::unique_ptr m_bitmap; /* target bitmap */ int m_regs[PPU_MAX_REG]; /* registers */ int m_tile_page; /* current tile page */ diff --git a/src/devices/video/ppu2c0x_sh6578.cpp b/src/devices/video/ppu2c0x_sh6578.cpp index c075f684147..0514d7dcc8d 100644 --- a/src/devices/video/ppu2c0x_sh6578.cpp +++ b/src/devices/video/ppu2c0x_sh6578.cpp @@ -145,7 +145,7 @@ void ppu_sh6578_device::draw_tile(uint8_t* line_priority, int color_byte, int co pen = this->pen(palval); } - *dest = pen; + *dest = pen; // priority marking if (!trans) diff --git a/src/devices/video/ppu2c0x_sh6578.h b/src/devices/video/ppu2c0x_sh6578.h index 99cbe7f41a2..9671bf00dfb 100644 --- a/src/devices/video/ppu2c0x_sh6578.h +++ b/src/devices/video/ppu2c0x_sh6578.h @@ -23,7 +23,7 @@ public: protected: ppu_sh6578_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - + void ppu_internal_map(address_map& map); private: diff --git a/src/emu/save.h b/src/emu/save.h index 53576dd0d0b..a9f25488a00 100644 --- a/src/emu/save.h +++ b/src/emu/save.h @@ -232,7 +232,7 @@ public: static save_error check_file(running_machine &machine, emu_file &file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...)); save_error write_file(emu_file &file); save_error read_file(emu_file &file); - + save_error write_buffer(u8 *data, size_t size); save_error read_buffer(u8 *data, size_t size); diff --git a/src/lib/formats/ibmxdf_dsk.cpp b/src/lib/formats/ibmxdf_dsk.cpp index 4f609475a51..59c653b5b4e 100644 --- a/src/lib/formats/ibmxdf_dsk.cpp +++ b/src/lib/formats/ibmxdf_dsk.cpp @@ -10,23 +10,23 @@ - http://www.os2museum.com/wp/the-xdf-diskette-format/ - https://fdutils.linux.lu/Fdutils.html#SEC47 and xdfcopy.c - Mapping XDF disk image to physical sectors on a 3.5" disk: - - First track uses standard 512-byte sectors: - - lbn 0 (boot sector) = 0.129 (head.sector) - - lbn 1-11 (FAT) = 0.130-0.139, then 1.129 - - lbn 12-19 (aux FS) = 0.1-0.8 - - lbn 20-22 = padding, not written to disk - - lbn 23-36 (root directory) = 1.130-1.143 - - lbn 37-41 = padding, not written to disk - - lbn 42-45 (start of data area) = 1.144-1.147 - - All other tracks use mixed size sectors, sequenced like so: - 0.131, 0.132, 1.134, 0.130, 1.130, 0.134, 1.132, 1.131 - - To do: - - 5.25 HD and 3.5 ED formats - - replace magic numbers + Mapping XDF disk image to physical sectors on a 3.5" disk: + + First track uses standard 512-byte sectors: + - lbn 0 (boot sector) = 0.129 (head.sector) + - lbn 1-11 (FAT) = 0.130-0.139, then 1.129 + - lbn 12-19 (aux FS) = 0.1-0.8 + - lbn 20-22 = padding, not written to disk + - lbn 23-36 (root directory) = 1.130-1.143 + - lbn 37-41 = padding, not written to disk + - lbn 42-45 (start of data area) = 1.144-1.147 + + All other tracks use mixed size sectors, sequenced like so: + 0.131, 0.132, 1.134, 0.130, 1.130, 0.134, 1.132, 1.131 + + To do: + - 5.25 HD and 3.5 ED formats + - replace magic numbers *********************************************************************/ diff --git a/src/lib/netlist/analog/nld_generic_models.h b/src/lib/netlist/analog/nld_generic_models.h index f72469bdc20..336699fcaad 100644 --- a/src/lib/netlist/analog/nld_generic_models.h +++ b/src/lib/netlist/analog/nld_generic_models.h @@ -17,7 +17,7 @@ // convergence but this yet not really is observable // -#define USE_TEXTBOOK_DIODE (1) +#define USE_TEXTBOOK_DIODE (1) namespace netlist { diff --git a/src/lib/netlist/examples/turkey_shoot.cpp b/src/lib/netlist/examples/turkey_shoot.cpp index 4921f866c6e..e5b7f26c72e 100644 --- a/src/lib/netlist/examples/turkey_shoot.cpp +++ b/src/lib/netlist/examples/turkey_shoot.cpp @@ -2,31 +2,31 @@ // copyright-holders:Couriersud /* - * This example illustrates how to use netlist to derive RGB output + * This example illustrates how to use netlist to derive RGB output * levels from complex output circuits. - * + * * Create x.cpp: - #include - - int main() - { - // Change IC86 output every micro second starting at 1ms - for (std::size_t i=0;i<256;i++) - printf("%.9f,IC86.D.IN,%d\n", (double) i / 1.0e6 + 1.0e-3, (int)i); - } - - * Run these commands: - * + #include + + int main() + { + // Change IC86 output every micro second starting at 1ms + for (std::size_t i=0;i<256;i++) + printf("%.9f,IC86.D.IN,%d\n", (double) i / 1.0e6 + 1.0e-3, (int)i); + } + + * Run these commands: + * * c++ x.cpp * ./a.out > src/lib/netlist/examples/turkey_shoot.csv * ./nltool -c run -t 0.0013 -f src/lib/netlist/examples/turkey_shoot.cpp -i src/lib/netlist/examples/turkey_shoot.csv -l BLUE * ./nlwav -f tab -o x.tab -s 0.0010005 -i 0.000001 -n 256 log_BLUE.log - * + * * x.tab now contains 256 values representing the different output levels: * low 4 bits: color value * high 4 bits: attenuation value - * + * */ @@ -90,7 +90,7 @@ NETLIST_START(turkey_shoot_vga) LOCAL_SOURCE(SHIM74LS374_DIP) LOCAL_LIB_ENTRY(SHIM74LS374_DIP) - + INCLUDE(turkey_shoot_schematics) NETLIST_END() @@ -101,9 +101,9 @@ NETLIST_START(turkey_shoot_schematics) ANALOG_INPUT(I_V5, 5) TTL_INPUT(BLANK, 0) - + IND(L1, 0.0000047) - + CAP(C60, CAP_U(0.1)) CAP(C54, CAP_P(47)) CAP(C57, CAP_P(47)) @@ -119,7 +119,7 @@ NETLIST_START(turkey_shoot_schematics) RES(R11, RES_K(3.9)) RES(R12, RES_K(2)) RES(R13, RES_K(1)) - + RES(R35, RES_K(2.2)) RES(R36, RES_K(2.7)) RES(R31, 270) @@ -138,13 +138,13 @@ NETLIST_START(turkey_shoot_schematics) DIODE(D7, "1N4148") DIODE(D8, "1N4148") DIODE(D17, "1N4148") - + QBJT_EB(Q3, "2N3904") QBJT_EB(Q4, "2N3904") QBJT_EB(Q5, "2N3904") SHIM74LS374_DIP(IC86) - + NET_C(D8.K, IC86.19) NET_C(D7.K, IC86.16) NET_C(D6.K, IC86.15) @@ -173,20 +173,20 @@ NETLIST_START(turkey_shoot_schematics) NET_C(I_V12, L1.1) NET_C(Q4.E, R30.1, R29.1, R28.1, R31.1) - + NET_C(GND, R31.2, R29.2, R28.2) NET_C(R6.2, R7.2, R8.2, R9.2, R30.2, Q3.B) NET_C(I_V5, Q3.C) - NET_C(GND, C54.2, R22.2) + NET_C(GND, C54.2, R22.2) NET_C(Q3.E, D17.A) NET_C(D17.K, R22.1, R23.1) NET_C(R23.2, C54.1) - + NET_C(I_V5, IC86.20, BLANK.VCC) NET_C(GND, IC86.10, BLANK.GND) - + ALIAS(BLUE, C54.1) - + NETLIST_END() diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp index b4fd824cbd3..db424a83f54 100644 --- a/src/mame/drivers/1945kiii.cpp +++ b/src/mame/drivers/1945kiii.cpp @@ -330,10 +330,10 @@ void k3_state::scrolly_w(u16 data) void k3_state::k3_soundbanks_w(u16 data) { /* - ---- ---- ---x ---- Unknown - ---- ---- ---- -x-- OKI1 Bank - ---- ---- ---- --x- OKI0 Bank - ---- ---- ---- ---x VRAM access flip-flop + ---- ---- ---x ---- Unknown + ---- ---- ---- -x-- OKI1 Bank + ---- ---- ---- --x- OKI0 Bank + ---- ---- ---- ---x VRAM access flip-flop */ vram_buffer(BIT(data, 0)); // rising edge m_oki[1]->set_rom_bank(BIT(data, 2)); @@ -497,9 +497,9 @@ static INPUT_PORTS_START( k3old ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0007, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( 1C_1C ) ) // 5C_1C in newer versions - PORT_DIPSETTING( 0x0001, DEF_STR( 1C_1C ) ) // 4C_1C in newer versions - PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) ) // 1C_3C in newer versions + PORT_DIPSETTING( 0x0002, DEF_STR( 1C_1C ) ) // 5C_1C in newer versions + PORT_DIPSETTING( 0x0001, DEF_STR( 1C_1C ) ) // 4C_1C in newer versions + PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) ) // 1C_3C in newer versions PORT_DIPSETTING( 0x0004, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Free_Play ) ) PORT_DIPNAME( 0x0018, 0x0008, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5") @@ -513,8 +513,8 @@ static INPUT_PORTS_START( k3old ) PORT_DIPSETTING( 0x0020, "4" ) PORT_DIPSETTING( 0x0000, "5" ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_DIPUNKNOWN_DIPLOC( 0x0100, 0x0100, "SW2:1" ) // In newer 1945K-III sets this is Demo_Sounds - Demo Sounds always OFF here! - PORT_DIPUNKNOWN_DIPLOC( 0x0200, 0x0200, "SW2:2" ) // In newer 1945K-III sets this is Allow_Continue - Always Continue + PORT_DIPUNKNOWN_DIPLOC( 0x0100, 0x0100, "SW2:1" ) // In newer 1945K-III sets this is Demo_Sounds - Demo Sounds always OFF here! + PORT_DIPUNKNOWN_DIPLOC( 0x0200, 0x0200, "SW2:2" ) // In newer 1945K-III sets this is Allow_Continue - Always Continue PORT_DIPUNKNOWN_DIPLOC( 0x0400, 0x0400, "SW2:3" ) PORT_DIPUNKNOWN_DIPLOC( 0x0800, 0x0800, "SW2:4" ) PORT_DIPUNKNOWN_DIPLOC( 0x1000, 0x1000, "SW2:5" ) @@ -565,11 +565,11 @@ static INPUT_PORTS_START( solite ) PORT_DIPSETTING( 0x0008, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x0018, DEF_STR( Hardest ) ) - PORT_DIPUNKNOWN_DIPLOC( 0x0020, 0x0020, "SW1:6" ) // In 1945K-III sets 6&7 are Lives - PORT_DIPUNKNOWN_DIPLOC( 0x0040, 0x0040, "SW1:7" ) // In 1945K-III sets 6&7 are Lives + PORT_DIPUNKNOWN_DIPLOC( 0x0020, 0x0020, "SW1:6" ) // In 1945K-III sets 6&7 are Lives + PORT_DIPUNKNOWN_DIPLOC( 0x0040, 0x0040, "SW1:7" ) // In 1945K-III sets 6&7 are Lives PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_DIPUNKNOWN_DIPLOC( 0x0100, 0x0100, "SW2:1" ) // In newer 1945K-III sets this is Demo_Sounds - Demo Sounds always ON here! - PORT_DIPUNKNOWN_DIPLOC( 0x0200, 0x0200, "SW2:2" ) // In newer 1945K-III sets this is Allow_Continue - Always Continue + PORT_DIPUNKNOWN_DIPLOC( 0x0100, 0x0100, "SW2:1" ) // In newer 1945K-III sets this is Demo_Sounds - Demo Sounds always ON here! + PORT_DIPUNKNOWN_DIPLOC( 0x0200, 0x0200, "SW2:2" ) // In newer 1945K-III sets this is Allow_Continue - Always Continue PORT_DIPUNKNOWN_DIPLOC( 0x0400, 0x0400, "SW2:3" ) PORT_DIPUNKNOWN_DIPLOC( 0x0800, 0x0800, "SW2:4" ) PORT_DIPUNKNOWN_DIPLOC( 0x1000, 0x1000, "SW2:5" ) @@ -698,8 +698,8 @@ void k3_state::k3(machine_config &config) ROM_START( 1945kiii ) ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ -// ROM_LOAD16_BYTE( "prg-1.u51", 0x00001, 0x40000, CRC(c4bbae5d) SHA1(a326fad902150c6b64c39618dda2c58baf12ae98) ) -// ROM_LOAD16_BYTE( "prg-2.u52", 0x00000, 0x40000, CRC(092abf2e) SHA1(be42c54c3051d4efe76858e4bc85dfadc2d0cc1a) ) +// ROM_LOAD16_BYTE( "prg-1.u51", 0x00001, 0x40000, CRC(c4bbae5d) SHA1(a326fad902150c6b64c39618dda2c58baf12ae98) ) +// ROM_LOAD16_BYTE( "prg-2.u52", 0x00000, 0x40000, CRC(092abf2e) SHA1(be42c54c3051d4efe76858e4bc85dfadc2d0cc1a) ) ROM_LOAD16_BYTE( "prg-1.u51", 0x00001, 0x80000, CRC(6b345f27) SHA1(60867fa0e2ea7ebdd4b8046315ee0c83e5cf0d74) ) /* identical halves */ ROM_LOAD16_BYTE( "prg-2.u52", 0x00000, 0x80000, CRC(ce09b98c) SHA1(a06bb712b9cf2249cc535de4055b14a21c68e0c5) ) /* identical halves */ @@ -719,8 +719,8 @@ ROM_END ROM_START( 1945kiiin ) ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ -// ROM_LOAD16_BYTE( "u34", 0x00001, 0x40000, CRC(234a55a5) SHA1(df0464793531251ac64cee54e474314e5e5f05ab) ) -// ROM_LOAD16_BYTE( "u35", 0x00000, 0x40000, CRC(1e6e23a5) SHA1(c0e3f8b34be77ff34f6dfbe1f966ca05db285e76) ) +// ROM_LOAD16_BYTE( "u34", 0x00001, 0x40000, CRC(234a55a5) SHA1(df0464793531251ac64cee54e474314e5e5f05ab) ) +// ROM_LOAD16_BYTE( "u35", 0x00000, 0x40000, CRC(1e6e23a5) SHA1(c0e3f8b34be77ff34f6dfbe1f966ca05db285e76) ) ROM_LOAD16_BYTE( "u34", 0x00001, 0x80000, CRC(d0cf4f03) SHA1(3455927221afae5103c02b12c1b855f416c47e91) ) /* 27C040 ROM had no label - identical halves */ ROM_LOAD16_BYTE( "u35", 0x00000, 0x80000, CRC(056c64ed) SHA1(b0eddad9c950676b94316d3aeb32f3ed4b9ade0f) ) /* 27C040 ROM had no label - identical halves */ @@ -750,8 +750,8 @@ ROM_END ROM_START( 1945kiiio ) ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ -// ROM_LOAD16_BYTE( "3.u34", 0x00001, 0x40000, CRC(bcfb8b84) SHA1(7126463231cfaf4d6baf4d2efba88079c6c4c399) ) -// ROM_LOAD16_BYTE( "4.u35", 0x00000, 0x40000, CRC(ec1234a5) SHA1(36cf7a48236acd75365eefbba81024c343bb0124) ) +// ROM_LOAD16_BYTE( "3.u34", 0x00001, 0x40000, CRC(bcfb8b84) SHA1(7126463231cfaf4d6baf4d2efba88079c6c4c399) ) +// ROM_LOAD16_BYTE( "4.u35", 0x00000, 0x40000, CRC(ec1234a5) SHA1(36cf7a48236acd75365eefbba81024c343bb0124) ) ROM_LOAD16_BYTE( "3.u34", 0x00001, 0x80000, CRC(5515baa0) SHA1(6fd4c9b7cc27035d6baaafa73f5f5930bfde62a4) ) /* 0x40000 to 0x7FFFF 0x00 padded */ ROM_LOAD16_BYTE( "4.u35", 0x00000, 0x80000, CRC(fd177664) SHA1(0ea1854be8d88577129546a56d13bcdc4739ae52) ) /* 0x40000 to 0x7FFFF 0x00 padded */ diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp index 7a9545bb93d..78dff2a5ff2 100644 --- a/src/mame/drivers/clshroad.cpp +++ b/src/mame/drivers/clshroad.cpp @@ -23,11 +23,11 @@ TODO: text layer is not correctly emulated, fixed by initializing VRAM to 0xf0? (that layer seems unused by this game); - firebatl: bad sprite colors; - firebatl: remove ROM patch; -- firebatl: reads $6000-$6002 and $6100 at POST, and in the range $6100-$61ff before every start +- firebatl: reads $6000-$6002 and $6100 at POST, and in the range $6100-$61ff before every start of gameplay/after player dies. Currently 0-filled in ROM loading: - $6100 is actually OR-ed with the coinage work RAM buffer setting at $8022; - - $6124 is shifted right once at PC=0x5df and stored to $82e6, which is later checked at PC=0x187 and must + - $6124 is shifted right once at PC=0x5df and stored to $82e6, which is later checked at PC=0x187 and must be $01 otherwise game goes into an infinite loop after dying (without ROM patch); - (more ...) diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index d2ba59da875..82818052c64 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -955,7 +955,7 @@ ROM_START( srollnd ) ROM_LOAD( "nd3.u51", 0x0200000, 0x020000, CRC(e19ac5b8) SHA1(980a3b339f6958e5e04ea624f26dabd2e06f0c68) ) ROM_LOAD( "nd6.u48", 0x0400000, 0x020000, CRC(81cd4097) SHA1(94c7f0d3c21070039dbef9fc43d0f5f2619dad5a) ) ROM_LOAD( "nd4.u50", 0x0600000, 0x020000, CRC(8c66cd09) SHA1(5cf0a001bfd46c1e955f7952f8a42a001beaf43c) ) - + ROM_REGION( 0x21b, "pals", 0 ) ROM_LOAD( "palce16v8h.u16", 0x000, 0x117, NO_DUMP ) ROM_LOAD( "pal16l8acn.u17", 0x117, 0x104, NO_DUMP ) diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index f6092f30aa7..7354719a160 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -7999,19 +7999,19 @@ ROM_START( galaxrf ) ROM_END ROM_START( galaxianrp ) - ROM_REGION( 0x4000, "maincpu", 0 ) - ROM_LOAD( "4.7k", 0x0000, 0x0800, CRC(e8f3aa67) SHA1(a0e9576784dbe602dd9780e667f01f31defd7c00) ) // All eproms are Fujitsu MB8516 eproms - ROM_LOAD( "5.7j", 0x0800, 0x0800, CRC(f58283e3) SHA1(edc6e72516c50fd3402281d9936574d276581ce9) ) - ROM_LOAD( "6.7h", 0x1000, 0x0800, CRC(4c7031c0) SHA1(97f7ab0cedcd8eba1c8f6f516d84d672a2108258) ) - ROM_LOAD( "7.7f", 0x1800, 0x0800, CRC(097d92a2) SHA1(63ef86657286a4e1fae4f795e0e6b410ca2ef06b) ) - ROM_LOAD( "3.7l", 0x2000, 0x0800, CRC(5341d75a) SHA1(40bc8fcc598f58c6ff944e2a4a9288463e75a09d) ) - - ROM_REGION( 0x1000, "gfx1", 0 ) - ROM_LOAD( "2.1j", 0x0000, 0x0800, CRC(b8629cc6) SHA1(d529e9434f497a80953fe3768d34c805d072f88b) ) - ROM_LOAD( "1.1l", 0x0800, 0x0800, CRC(6d42351c) SHA1(2193deadcbee109c5c14b0c31d1e113f747744a3) ) - - ROM_REGION( 0x0020, "proms", 0 ) - ROM_LOAD( "6l.bpr", 0x0000, 0x0020, BAD_DUMP CRC(c3ac9467) SHA1(f382ad5a34d282056c78a5ec00c30ec43772bae2) ) // Taken from the parent set + ROM_REGION( 0x4000, "maincpu", 0 ) + ROM_LOAD( "4.7k", 0x0000, 0x0800, CRC(e8f3aa67) SHA1(a0e9576784dbe602dd9780e667f01f31defd7c00) ) // All eproms are Fujitsu MB8516 eproms + ROM_LOAD( "5.7j", 0x0800, 0x0800, CRC(f58283e3) SHA1(edc6e72516c50fd3402281d9936574d276581ce9) ) + ROM_LOAD( "6.7h", 0x1000, 0x0800, CRC(4c7031c0) SHA1(97f7ab0cedcd8eba1c8f6f516d84d672a2108258) ) + ROM_LOAD( "7.7f", 0x1800, 0x0800, CRC(097d92a2) SHA1(63ef86657286a4e1fae4f795e0e6b410ca2ef06b) ) + ROM_LOAD( "3.7l", 0x2000, 0x0800, CRC(5341d75a) SHA1(40bc8fcc598f58c6ff944e2a4a9288463e75a09d) ) + + ROM_REGION( 0x1000, "gfx1", 0 ) + ROM_LOAD( "2.1j", 0x0000, 0x0800, CRC(b8629cc6) SHA1(d529e9434f497a80953fe3768d34c805d072f88b) ) + ROM_LOAD( "1.1l", 0x0800, 0x0800, CRC(6d42351c) SHA1(2193deadcbee109c5c14b0c31d1e113f747744a3) ) + + ROM_REGION( 0x0020, "proms", 0 ) + ROM_LOAD( "6l.bpr", 0x0000, 0x0020, BAD_DUMP CRC(c3ac9467) SHA1(f382ad5a34d282056c78a5ec00c30ec43772bae2) ) // Taken from the parent set ROM_END ROM_START( galaxrfgg ) diff --git a/src/mame/drivers/gigatron.cpp b/src/mame/drivers/gigatron.cpp index acea33c2f5a..6be8072871a 100644 --- a/src/mame/drivers/gigatron.cpp +++ b/src/mame/drivers/gigatron.cpp @@ -39,14 +39,14 @@ private: void prog_map(address_map &map); void data_map(address_map &map); - + uint16_t lights_changed; DECLARE_READ8_MEMBER(gigatron_random) { return machine().rand() & 0xff; } - + DECLARE_WRITE8_MEMBER(blinkenlights); required_device m_maincpu; diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp index bfe1fd7348c..af7d7307055 100644 --- a/src/mame/drivers/gumbo.cpp +++ b/src/mame/drivers/gumbo.cpp @@ -369,8 +369,8 @@ ROM_END ROM_START( mspuzzleb ) /* all the roms for this set needs a full redump, the PCB was in pretty bad condition and data reads were not consistent */ ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 Code */ -// ROM_LOAD16_BYTE( "u1.rom", 0x00001, 0x20000, BAD_DUMP CRC(ec940df4) SHA1(20bb6e2757868cf8fbbb11e05adf8c1d625ee172) ) -// ROM_LOAD16_BYTE( "u2.rom", 0x00000, 0x20000, BAD_DUMP CRC(7b9cac82) SHA1(c5edfb3fbdf43219ba317c18222e671ebed94469) ) +// ROM_LOAD16_BYTE( "u1.rom", 0x00001, 0x20000, BAD_DUMP CRC(ec940df4) SHA1(20bb6e2757868cf8fbbb11e05adf8c1d625ee172) ) +// ROM_LOAD16_BYTE( "u2.rom", 0x00000, 0x20000, BAD_DUMP CRC(7b9cac82) SHA1(c5edfb3fbdf43219ba317c18222e671ebed94469) ) ROM_LOAD16_BYTE( "u1.u1", 0x00001, 0x40000, CRC(5e96ea17) SHA1(9b4cfa32e386eacca4e65190d29978cf9cf08fbc) ) /* identical halves - use program ROMs from mspuzzlea for now */ ROM_LOAD16_BYTE( "u2.u2", 0x00000, 0x40000, CRC(8f161b0c) SHA1(783dbb34ae5fb7603558c17a39abbe0a93e3a01f) ) /* identical halves - use program ROMs from mspuzzlea for now */ diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp index 557ccd60200..3fb26e8d4a3 100644 --- a/src/mame/drivers/holeland.cpp +++ b/src/mame/drivers/holeland.cpp @@ -6,13 +6,13 @@ driver by Mathis Rosenhauer - Notes: - - In stop mode press p1 start to freeze the screen, p2 start to resume + Notes: + - In stop mode press p1 start to freeze the screen, p2 start to resume TODO: - missing high bit of sprite X coordinate? (see round 2 and 3 of attract mode in crzrally) - - crzrally: emulate steering wheel; + - crzrally: emulate steering wheel; ***************************************************************************/ diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index 171f9e8c91f..4e58ecc998f 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -49,7 +49,7 @@ #define LOG_INVALID_SEGMENT (1 << 1) #define LOG_OTHER (1 << 2) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/drivers/kawai_k1.cpp b/src/mame/drivers/kawai_k1.cpp index b348da67b36..afda9d008f7 100644 --- a/src/mame/drivers/kawai_k1.cpp +++ b/src/mame/drivers/kawai_k1.cpp @@ -44,7 +44,7 @@ void kawai_k1_state::k1(machine_config &config) UPD78310(config, m_mpu, 12_MHz_XTAL); // µPD78310G-36 m_mpu->set_addrmap(AS_PROGRAM, &kawai_k1_state::mem_map); - NVRAM(config, "toneram", nvram_device::DEFAULT_ALL_0); // LC3564PL-12 + battery + NVRAM(config, "toneram", nvram_device::DEFAULT_ALL_0); // LC3564PL-12 + battery } ROM_START(k1) diff --git a/src/mame/drivers/kawai_r100.cpp b/src/mame/drivers/kawai_r100.cpp index fb597941669..0a09ced01f6 100644 --- a/src/mame/drivers/kawai_r100.cpp +++ b/src/mame/drivers/kawai_r100.cpp @@ -46,8 +46,8 @@ void kawai_r100_state::r100(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &kawai_r100_state::main_map); //m_maincpu->set_addrmap(AS_DATA, &kawai_r100_state::data_map); - NVRAM(config, "nvram1", nvram_device::DEFAULT_ALL_0); // MB8464-15LL-SK + battery - NVRAM(config, "nvram2", nvram_device::DEFAULT_ALL_0); // MB8464-15LL-SK + battery + NVRAM(config, "nvram1", nvram_device::DEFAULT_ALL_0); // MB8464-15LL-SK + battery + NVRAM(config, "nvram2", nvram_device::DEFAULT_ALL_0); // MB8464-15LL-SK + battery //M60009_AGU_DGU(config, "pcm", 5_MHz_XTAL); } diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 8b26e3f81a1..0c4da9f4d97 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -956,7 +956,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( cupsoc ) - // p3 and p4 inputs are routed thru two 10-pins on lower-left of PCB + // p3 and p4 inputs are routed thru two 10-pins on lower-left of PCB // TODO: dip-conditional with coin slots // SEIBU_COIN_INPUTS override PORT_START("COIN") @@ -1450,11 +1450,11 @@ void legionna_state::cupsoc(machine_config &config) screen.set_refresh_hz(60); screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); screen.set_size(42*8, 36*8); - // TODO: real PCB is a bit more complex, + // TODO: real PCB is a bit more complex, // it's really 320x256 in-game but with 8px border color on top/bottom. // Border color is also not pure black but a very dark grey, // can be seen when throw-in on bottom line occurs. - screen.set_visarea(0*8, 40*8-1, 1*8, 31*8-1); + screen.set_visarea(0*8, 40*8-1, 1*8, 31*8-1); screen.set_screen_update(FUNC(legionna_state::screen_update_grainbow)); screen.set_palette(m_palette); diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp index bf79f9707e5..430b49facba 100644 --- a/src/mame/drivers/m10.cpp +++ b/src/mame/drivers/m10.cpp @@ -772,7 +772,7 @@ static INPUT_PORTS_START( greenber ) PORT_START("DSW") PORT_DIPNAME(0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPSETTING ( 0x03, "2" ) -// PORT_DIPSETTING ( 0x02, "3" ) // dupe +// PORT_DIPSETTING ( 0x02, "3" ) // dupe PORT_DIPSETTING ( 0x01, "3" ) PORT_DIPSETTING ( 0x00, "4" ) PORT_DIPNAME(0x08, 0x00, "Replay" ) diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp index 4defdbbf3bd..e7c3599361c 100644 --- a/src/mame/drivers/nes_sh6578.cpp +++ b/src/mame/drivers/nes_sh6578.cpp @@ -5,9 +5,9 @@ SH6578 NES clone hardware enhanced NES, different to VT / OneBus systems - video rendering is changed significantly compared to NES so not using NES PPU device - has 256x256 pixel pages, attributes are stored next to tile numbers (not in their own table after them) etc. - + video rendering is changed significantly compared to NES so not using NES PPU device + has 256x256 pixel pages, attributes are stored next to tile numbers (not in their own table after them) etc. + */ #include "emu.h" @@ -42,7 +42,7 @@ public: m_timer(*this, "timer"), m_in(*this, "IN%u", 0U) { } - + void nes_sh6578(machine_config& config); void nes_sh6578_pal(machine_config& config); @@ -435,11 +435,11 @@ READ8_MEMBER(nes_sh6578_state::apu_read_mem) void nes_sh6578_state::nes_sh6578_map(address_map& map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2007).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x2008, 0x2008).rw(m_ppu, FUNC(ppu_sh6578_device::read_extended), FUNC(ppu_sh6578_device::write_extended)); + map(0x2000, 0x2007).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); + map(0x2008, 0x2008).rw(m_ppu, FUNC(ppu_sh6578_device::read_extended), FUNC(ppu_sh6578_device::write_extended)); map(0x2040, 0x207f).rw(m_ppu, FUNC(ppu_sh6578_device::palette_read), FUNC(ppu_sh6578_device::palette_write)); - + map(0x4000, 0x4013).rw(m_apu, FUNC(nesapu_device::read), FUNC(nesapu_device::write)); map(0x4014, 0x4014).rw(FUNC(nes_sh6578_state::psg1_4014_r), FUNC(nes_sh6578_state::sprite_dma_w)); map(0x4015, 0x4015).rw(FUNC(nes_sh6578_state::psg1_4015_r), FUNC(nes_sh6578_state::psg1_4015_w)); diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index 61b82c933d8..d5aa746e8ff 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -1723,7 +1723,7 @@ void nes_vt_state::nes_vt_map(address_map &map) { map(0x0000, 0x07ff).ram(); // ddrdismx relies on the mirroring - map(0x2000, 0x2007).mirror(0x00e0).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* standard PPU registers */ + map(0x2000, 0x2007).mirror(0x00e0).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* standard PPU registers */ map(0x2010, 0x201f).mirror(0x00e0).rw(m_ppu, FUNC(ppu_vt03_device::read_extended), FUNC(ppu_vt03_device::write_extended)); /* extra VT PPU registers */ map(0x4000, 0x4013).rw(m_apu, FUNC(nesapu_device::read), FUNC(nesapu_device::write)); @@ -1787,7 +1787,7 @@ void nes_vt_cy_state::nes_vt_bt_map(address_map &map) void nes_vt_hh_state::nes_vt_hh_map(address_map &map) { map(0x0000, 0x1fff).mask(0x0fff).ram(); - map(0x2000, 0x2007).mirror(0x00e0).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* standard PPU registers */ + map(0x2000, 0x2007).mirror(0x00e0).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* standard PPU registers */ map(0x2010, 0x201f).mirror(0x00e0).rw(m_ppu, FUNC(ppu_vt03_device::read_extended), FUNC(ppu_vt03_device::write_extended)); /* extra VT PPU registers */ map(0x4000, 0x4013).rw(m_apu, FUNC(nesapu_device::read), FUNC(nesapu_device::write)); @@ -1838,7 +1838,7 @@ void nes_vt_hh_state::nes_vt_fp_map(address_map &map) void nes_vt_dg_state::nes_vt_dg_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2007).mirror(0x00e0).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* standard PPU registers */ + map(0x2000, 0x2007).mirror(0x00e0).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* standard PPU registers */ map(0x2010, 0x201f).mirror(0x00e0).rw(m_ppu, FUNC(ppu_vt03_device::read_extended), FUNC(ppu_vt03_device::write_extended)); /* extra VT PPU registers */ map(0x4000, 0x4013).rw(m_apu, FUNC(nesapu_device::read), FUNC(nesapu_device::write)); @@ -2274,7 +2274,7 @@ static INPUT_PORTS_START( timetp36 ) PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) // where does the 'Y' button map? no games use it? - PORT_START("EXTRAIN0") // see code at 8084, stored at 0x66 + PORT_START("EXTRAIN0") // see code at 8084, stored at 0x66 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("X") // used in the NAM-1975 rip-off 'Army Strike' PORT_DIPNAME( 0x02, 0x02, "Unknown Bit 0" ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) @@ -2868,25 +2868,25 @@ CONS( 200?, lxcmcydp, 0, 0, nes_vt_cy, nes_vt, nes_vt_cy_lexibook_state, empt CONS( 2016, rtvgc300, 0, 0, nes_vt_cy, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Retro TV Game Console - 300 Games", MACHINE_NOT_WORKING ) CONS( 2017, rtvgc300fz,0, 0, nes_vt_cy, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Retro TV Game Console - Frozen - 300 Games", MACHINE_NOT_WORKING ) -/* The following are also confirmed to be NES/VT derived units, most having a standard set of games with a handful of lazy graphic mods thrown in to fit the unit theme +/* The following are also confirmed to be NES/VT derived units, most having a standard set of games with a handful of lazy graphic mods thrown in to fit the unit theme (handhekd units, use standard AAA batteries) - Lexibook Compact Cyber Arcade - Cars - Lexibook Compact Cyber Arcade - Paw Patrol - Lexibook Compact Cyber Arcade - Barbie - Lexibook Compact Cyber Arcade - Finding Dory - Lexibook Compact Cyber Arcade - Marvel Ultimate Spiderman - Lexibook Compact Cyber Arcade - PJ Masks - - (Handheld units, but different form factor to Compact Cyber Arcade, charged via USB) - Lexibook Console Colour - Minnie Mouse - Lexibook Console Colour - Disney's Planes - Lexibook Console Colour - Barbie + Lexibook Compact Cyber Arcade - Cars + Lexibook Compact Cyber Arcade - Paw Patrol + Lexibook Compact Cyber Arcade - Barbie + Lexibook Compact Cyber Arcade - Finding Dory + Lexibook Compact Cyber Arcade - Marvel Ultimate Spiderman + Lexibook Compact Cyber Arcade - PJ Masks + + (Handheld units, but different form factor to Compact Cyber Arcade, charged via USB) + Lexibook Console Colour - Minnie Mouse + Lexibook Console Colour - Disney's Planes + Lexibook Console Colour - Barbie (units for use with TV) - Lexibook Retro TV Game Console (300 Games) - Cars + Lexibook Retro TV Game Console (300 Games) - Cars - (more?) + (more?) */ // intial code isn't valid? scrambled? diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index b1becd18b6f..ce90a961847 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -107,7 +107,7 @@ mustang and blkheart test mode: 1) Press player 2 buttons 1+2 during reset. "Ready?" will appear 2) Press player 1 button 1 14 (!) times -Note: blkheart has a buggy service mode, apparently they shifted the ASCII gfx bank at $3xx but +Note: blkheart has a buggy service mode, apparently they shifted the ASCII gfx bank at $3xx but forgot to update the routines so it treats the VRAM as if ASCII bank is at $0xx (cfr. the move.w imm,Ax). gunnail test mode: @@ -121,7 +121,7 @@ bjtwin test mode: 2) Press player 1 buttons in this sequence: 2,2,2, 1,1,1, 2,2,2, 1,1,1 The release date of this program will appear. -Note: Some code has to be patched out for this to work (cfr. init_bjtwin fn). +Note: Some code has to be patched out for this to work (cfr. init_bjtwin fn). The program remaps button 2 and 3 to button 1, so you can't enter the above sequence. --- diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index e8879467a0d..2d5168d910b 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Carl - -/********************************************************************************************* + +/********************************************************************************************* The keyboard has a sticker that proclaims it was made by Fujitsu Limited. [ASC] [ESC] [F1 ] [F2 ] [F3 ] [F4 ] [F5 ] [F6 ] [F7 ] [F8 ] [F9 ] [F10] [F11] [F11] [PRN] @@ -9,7 +9,7 @@ The keyboard has a sticker that proclaims it was made by Fujitsu Limited. [ TAB ] [ Q ] [ W ] [ E ] [ R ] [ T ] [ Z ] [ U ] [ I ] [ O ] [ P ] [ Ü ] [+ *] [ DEL ] [ 4 ] [ 5 ] [ 5 ] [ - ] [HOM] [SHIFTLOCK] [ A ] [ S ] [ D ] [ F ] [ G ] [ H ] [ J ] [ K ] [ L ] [ Ö ] [ Ä ] [# '] [RET] [ 1 ] [ 2 ] [ 3 ] [RET] [UP ] [SHIFT] [2 3] [ Y ] [ X ] [ C ] [ V ] [ B ] [ N ] [ M ] [, ;] [. :] [- _] [ Ü ] [URN] [ 0 ] [ . ] [URN] [DWN] -[ CTRL ] [ SPACE ] +[ CTRL ] [ SPACE ] * The ASC key top left has a red LED, "Depressing the ASCII key, [...], switches off the LED indicator. This key acts as a toggle between the ASCII character set, and your country's standard (NATIONAL) character set. You would use this feature if @@ -19,10 +19,10 @@ The keyboard has a sticker that proclaims it was made by Fujitsu Limited. * BKS is the full word BACKSPACE * the C to the right of BKS has a red keycap, it deletes the complete line * the five direction keys are all marked with arrows, HOME being diagonally to the top left -* SHIFTLOCK also has an LED indicator, and is released by pressing one of the SHIFT keys +* SHIFTLOCK also has an LED indicator, and is released by pressing one of the SHIFT keys **********************************************************************************************/ - + #include "emu.h" #include "cpu/i86/i86.h" #include "imagedev/floppy.h" diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 16fa2544b50..5837cc0f1a7 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -1530,15 +1530,15 @@ READ16_MEMBER( segas16b_state::hwchamp_custom_io_r ) return result; case 0x30/2: // c43035 /* - Signals, affects blocking and stance (both fists down, both fists up, up/down or down/up) - According to service mode: - ---- --00 no status for right trigger - ---- --01 down - ---- --10 up - ---- --11 both (signals) in red, mustn't occur most likely - ---- xx-- same applied to left trigger - According to the flyer, cabinet has two sticks that can be moved up/down and/or towards the cabinet, - simulating punch motions. + Signals, affects blocking and stance (both fists down, both fists up, up/down or down/up) + According to service mode: + ---- --00 no status for right trigger + ---- --01 down + ---- --10 up + ---- --11 both (signals) in red, mustn't occur most likely + ---- xx-- same applied to left trigger + According to the flyer, cabinet has two sticks that can be moved up/down and/or towards the cabinet, + simulating punch motions. */ u8 left = m_hwc_left_limit->read(); u8 right = m_hwc_right_limit->read(); @@ -1553,7 +1553,7 @@ READ16_MEMBER( segas16b_state::hwchamp_custom_io_r ) result |= 1 << 1; if (right > 0xc0) result |= 1 << 0; - + return result; } break; @@ -1574,7 +1574,7 @@ WRITE16_MEMBER( segas16b_state::hwchamp_custom_io_w ) case 0: m_hwc_input_value = m_hwc_monitor->read(); break; - + // TODO: order of these two flipped when returning a status of 0xf0 instead of open bus in r 0x30? case 1: m_hwc_input_value = m_hwc_right->read(); @@ -2874,7 +2874,7 @@ static INPUT_PORTS_START( hwchamp ) PORT_START("RIGHT_LIMIT") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(32) PORT_PLAYER(2) PORT_NAME("Right Y Limit") - + PORT_START("LEFT_LIMIT") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(32) PORT_PLAYER(1) PORT_NAME("Left Y Limit") INPUT_PORTS_END diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 29866aa5ff4..0d41b5526c0 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -6348,8 +6348,8 @@ static INPUT_PORTS_START( twineagl ) // Cabinet is user choice // We use Licensor Option 2 instead of 1 just to avoid the "For use in Japan" // TODO: the copyright dips actually don't have any effect on a real (European) PCB - // Most likely these are overwritten by the lead JPs that the board has - // (4x3 near SW2 at J2, 2x3 near two empty ROM sockets U31/U37 at C10). + // Most likely these are overwritten by the lead JPs that the board has + // (4x3 near SW2 at J2, 2x3 near two empty ROM sockets U31/U37 at C10). PORT_START("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, "Copyright / License" ) PORT_DIPLOCATION("SW1:1") /* Always "Seta" if sim. players = 1 */ PORT_DIPSETTING( 0x0000, "Taito America / Romstar" ) PORT_CONDITION("DSW",0x4000,NOTEQUALS,0x4000) diff --git a/src/mame/drivers/spg2xx_digimake.cpp b/src/mame/drivers/spg2xx_digimake.cpp index dd9c504d6de..cba8f642d4f 100644 --- a/src/mame/drivers/spg2xx_digimake.cpp +++ b/src/mame/drivers/spg2xx_digimake.cpp @@ -127,7 +127,7 @@ static INPUT_PORTS_START( rad_digi ) // some of the inputs seem to act like butt PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, "Something" ) + PORT_DIPNAME( 0x0008, 0x0008, "Something" ) PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) diff --git a/src/mame/drivers/spg2xx_mysprtch.cpp b/src/mame/drivers/spg2xx_mysprtch.cpp index 2a2f6f591b6..cf29d4481f6 100644 --- a/src/mame/drivers/spg2xx_mysprtch.cpp +++ b/src/mame/drivers/spg2xx_mysprtch.cpp @@ -245,7 +245,7 @@ INPUT_PORTS_END WRITE16_MEMBER(spg2xx_game_mysprt_orig_state::porta_w) { - // this seems like nice clean logic, based on writes and how the port direction is set, + // this seems like nice clean logic, based on writes and how the port direction is set, // mysprtch and mysptqvc work fine with this logic, but mysprtcp is more problematic, especially in test mode, see other function logerror("%s: porta_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c \n", machine().describe_context(), data, mem_mask, diff --git a/src/mame/drivers/spg2xx_skannerztv.cpp b/src/mame/drivers/spg2xx_skannerztv.cpp index 8ab794d8bc8..797b9bc7fa6 100644 --- a/src/mame/drivers/spg2xx_skannerztv.cpp +++ b/src/mame/drivers/spg2xx_skannerztv.cpp @@ -22,7 +22,7 @@ SEND(from console) RECEIVE (to console) Buttons BLO: -Bit 0 Up +Bit 0 Up Bit 1 Down Bit 2 2/B Bit 3 1/A @@ -33,8 +33,8 @@ Bit 7 Unused BHI: Unused Port A -Bit 0 Enable "Left" Controller -Bit 1 Enable "Right" Controller +Bit 0 Enable "Left" Controller +Bit 1 Enable "Right" Controller Player 0: @@ -44,7 +44,7 @@ D: E: 65: monsters B5: items - + doPlayer(player) var_3 = player - 1 pData = Player[var_3] @@ -233,7 +233,7 @@ doPlayer(player) Retries[var_3] = 3 break doPlayerMore(player) - + doPlayerMore(player) var_2 = WaitCycle[player-1] if(var_2 == 0) return @@ -277,7 +277,7 @@ doPlayerMore(player) return case 1: ClearPlayer(player) - return + return ClearPlayer(player) if(player == 1) byte_1238 |= 40h diff --git a/src/mame/drivers/spg2xx_wiwi.cpp b/src/mame/drivers/spg2xx_wiwi.cpp index f0628b39de7..cdd075116f4 100644 --- a/src/mame/drivers/spg2xx_wiwi.cpp +++ b/src/mame/drivers/spg2xx_wiwi.cpp @@ -231,15 +231,15 @@ INPUT_PORTS_END void spg2xx_game_wiwi18_state::init_wiwi18() { - // workaround for security checks on startup - + // workaround for security checks on startup + uint16_t* rom = (uint16_t*)memregion("maincpu")->base(); if (rom[0x1ca259]==0x4e04) rom[0x1ca259] = 0xf165; // wiwi18 if (rom[0x1355a4]==0x4e04) rom[0x1355a4] = 0xf165; // foxsport if (rom[0x362e1c]==0x4e04) rom[0x362e1c] = 0xf165; // lexifit if (rom[0x4c7f4d]==0x4e04) rom[0x4c7f4d] = 0xf165; // lexifit (2nd bank) - + } diff --git a/src/mame/drivers/spg2xx_zone_32bit.cpp b/src/mame/drivers/spg2xx_zone_32bit.cpp index 790ff330770..8f52bfc04ce 100644 --- a/src/mame/drivers/spg2xx_zone_32bit.cpp +++ b/src/mame/drivers/spg2xx_zone_32bit.cpp @@ -237,7 +237,7 @@ WRITE16_MEMBER(zon32bit_state::portc_w) else m_upperbank &= ~0x0800; } - + if (oldbank != m_basebank) m_maincpu->invalidate_cache(); @@ -268,9 +268,9 @@ void zon32bit_state::mem_map_zon32bit(address_map &map) READ16_MEMBER(zon32bit_state::z32_rom_r) { /* - This has upper and lower bank, which can be changed independently. - Banking hookup is currently very hacky as bank values are written - to ports then erased at the moment, maybe they latch somehow? + This has upper and lower bank, which can be changed independently. + Banking hookup is currently very hacky as bank values are written + to ports then erased at the moment, maybe they latch somehow? */ int base = 0x0000000; @@ -608,7 +608,7 @@ ROM_END /* - Following pinout was used for dumping + Following pinout was used for dumping +------------------+ VCC -|01 70|- VCC diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp index 9604b7e7117..32aeee755c6 100644 --- a/src/mame/drivers/summit.cpp +++ b/src/mame/drivers/summit.cpp @@ -111,7 +111,7 @@ void summit_state::mainmap(address_map &map) static INPUT_PORTS_START( summit ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_CANCEL ) - PORT_DIPNAME( 0x02, 0x02, "IN0-02" ) // tilt? + PORT_DIPNAME( 0x02, 0x02, "IN0-02" ) // tilt? PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPNAME( 0x04, 0x04, "IN0-04" ) @@ -120,9 +120,9 @@ static INPUT_PORTS_START( summit ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD2 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) - PORT_DIPNAME( 0x40, 0x40, "Percentage 02" ) // payout percentage - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 72 - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 + PORT_DIPNAME( 0x40, 0x40, "Percentage 02" ) // payout percentage + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 72 + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 PORT_DIPNAME( 0x80, 0x80, "IN0-80" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) @@ -138,9 +138,9 @@ static INPUT_PORTS_START( summit ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("Down") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Up") - PORT_DIPNAME( 0x40, 0x40, "Percentage 04" ) // payout percentage - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 74 - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 + PORT_DIPNAME( 0x40, 0x40, "Percentage 04" ) // payout percentage + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 74 + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 PORT_DIPNAME( 0x80, 0x80, "IN1-80" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) @@ -156,33 +156,33 @@ static INPUT_PORTS_START( summit ) PORT_DIPNAME( 0x08, 0x08, "IN2-08" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPNAME( 0x10, 0x10, "IN2-10" ) // output to 0x3a00 bit 3 + PORT_DIPNAME( 0x10, 0x10, "IN2-10" ) // output to 0x3a00 bit 3 PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPNAME( 0x20, 0x20, "IN2-20" ) // output to 0x3880 bit 3, 0x3a00 bit 1 + PORT_DIPNAME( 0x20, 0x20, "IN2-20" ) // output to 0x3880 bit 3, 0x3a00 bit 1 PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPNAME( 0x40, 0x40, "Percentage 08" ) // payout percentage - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 78 - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 + PORT_DIPNAME( 0x40, 0x40, "Percentage 08" ) // payout percentage + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 78 + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 PORT_DIPNAME( 0x80, 0x80, "IN2-80" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_START("IN3") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_BET ) PORT_NAME("Start") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_BET ) PORT_NAME("Start") PORT_DIPNAME( 0x02, 0x02, "IN3-02" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("50p") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_NAME("50p") PORT_DIPNAME( 0x08, 0x08, "IN3-04" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Token") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("Cash") - PORT_DIPNAME( 0x40, 0x40, "Percentage 16" ) // payout percentage - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 86 - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 + PORT_DIPNAME( 0x40, 0x40, "Percentage 16" ) // payout percentage + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // 86 + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // 70 PORT_DIPNAME( 0x80, 0x80, "IN3-80" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) @@ -342,8 +342,8 @@ void summit_state::out3_w(uint8_t data) // -----2-- 10p out // ------1- toggles rapidly // -------0 unknown - -// machine().bookkeeping().coin_lockout_w(0, BIT(data, 4)); + +// machine().bookkeeping().coin_lockout_w(0, BIT(data, 4)); machine().bookkeeping().coin_counter_w(0, BIT(data, 3)); machine().bookkeeping().coin_counter_w(1, BIT(data, 2)); } diff --git a/src/mame/drivers/sunplus_unsp20soc.cpp b/src/mame/drivers/sunplus_unsp20soc.cpp index b7245ff9091..84dc1335cae 100644 --- a/src/mame/drivers/sunplus_unsp20soc.cpp +++ b/src/mame/drivers/sunplus_unsp20soc.cpp @@ -3,7 +3,7 @@ /* (unSP 2.0 based System on a Chip) - JAKKS call this GPAC800, other sources (including Pac-Man Connect and Play test mode) call it GPL16250 + JAKKS call this GPAC800, other sources (including Pac-Man Connect and Play test mode) call it GPL16250 die markings GCM394 - Smart Fit Park @@ -51,9 +51,9 @@ - Non-emulation bugs (happen on real hardware): - paccon: Pac-Man - Bottom set of Power Pills are squashed. - Galaga - Incorrect sprite used for left shot in 'Double Ship' mode + Non-emulation bugs (happen on real hardware): + paccon: Pac-Man - Bottom set of Power Pills are squashed. + Galaga - Incorrect sprite used for left shot in 'Double Ship' mode */ @@ -469,7 +469,7 @@ void gcm394_game_state::cs_callback(uint16_t cs0, uint16_t cs1, uint16_t cs2, ui // wipe existing mappings; m_memory->get_program()->unmap_readwrite(0, (0x8000000*5)-1); m_memory->get_program()->nop_readwrite(0, (0x8000000*5)-1); // stop logging spam if video params are invalid - + int start_address = 0; int end_address; @@ -1737,7 +1737,7 @@ void generalplus_gpac800_game_state::machine_reset() void generalplus_gpac800_game_state::nand_init210() { - m_sdram.resize(m_sdram_kwords); + m_sdram.resize(m_sdram_kwords); m_sdram2.resize(0x10000); m_nandblocksize = 0x210; diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 48ab769b489..a1a78cf1f21 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -1930,7 +1930,7 @@ ROM_START( kurikint ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD( "b42-01.ic1", 0x00000, 0x80000, CRC(7d1a1fec) SHA1(28311b07673686c18988400d0254533a454f07f4) ) ROM_LOAD( "b42-02.ic5", 0x80000, 0x80000, CRC(1a52e65c) SHA1(20a1fc4d02b5928fb01444079692e23d178c6297) ) - + ROM_REGION( 0x022e, "plds", 0 ) ROM_LOAD( "gal16v8-b42-03.ic4.bin", 0x0000, 0x0117, CRC(f7150d37) SHA1(10f9190b89c802e0722fd6ba0f17ba97d463f434) ) /* derived, but verified, PAL16L8 Stamped B42-03 */ ROM_LOAD( "gal16v8-b42-04.ic21.bin", 0x0117, 0x0117, CRC(b57b806c) SHA1(04cbb008256b7317ebf366327dfd38ead8eaf94e) ) /* derived, but verified, PAL16L8 Stamped B42-04 */ @@ -1964,7 +1964,7 @@ ROM_START( kurikintu ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD( "b42-01.ic1", 0x00000, 0x80000, CRC(7d1a1fec) SHA1(28311b07673686c18988400d0254533a454f07f4) ) ROM_LOAD( "b42-02.ic5", 0x80000, 0x80000, CRC(1a52e65c) SHA1(20a1fc4d02b5928fb01444079692e23d178c6297) ) - + ROM_REGION( 0x022e, "plds", 0 ) ROM_LOAD( "gal16v8-b42-03.ic4.bin", 0x0000, 0x0117, CRC(f7150d37) SHA1(10f9190b89c802e0722fd6ba0f17ba97d463f434) ) /* derived, but verified, PAL16L8 Stamped B42-03 */ ROM_LOAD( "gal16v8-b42-04.ic21.bin", 0x0117, 0x0117, CRC(b57b806c) SHA1(04cbb008256b7317ebf366327dfd38ead8eaf94e) ) /* derived, but verified, PAL16L8 Stamped B42-04 */ diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index a212deb7502..41b754e6782 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -2454,7 +2454,7 @@ static INPUT_PORTS_START( enforceja ) PORT_DIPSETTING( 0x20, DEF_STR( On ) ) PORT_DIPSETTING( 0x00, "In Game Only" ) PORT_DIPSETTING( 0x10, "In Game Only (duplicate)" ) - + PORT_START("STICKX") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(20) PORT_KEYDELTA(4) PORT_PLAYER(1) diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index 41cf5c8d8d3..46f1f63be32 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -1545,7 +1545,7 @@ static INPUT_PORTS_START( samesame ) PORT_INCLUDE( fireshrk ) PORT_MODIFY("DSWA") /* DSW A */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!1") PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!5") diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp index a045d60be41..28e192f5d58 100644 --- a/src/mame/drivers/williams.cpp +++ b/src/mame/drivers/williams.cpp @@ -485,8 +485,8 @@ 1 1 1 x x x x x x x x x x x x x E000-FFFF 8K ROM Reference videos: https://www.youtube.com/watch?v=R5OeC6Wc_yI - https://www.youtube.com/watch?v=3J_EZ1OXlww - https://www.youtube.com/watch?v=zxZ48iJShSU + https://www.youtube.com/watch?v=3J_EZ1OXlww + https://www.youtube.com/watch?v=zxZ48iJShSU ***************************************************************************/ diff --git a/src/mame/drivers/xavix2.cpp b/src/mame/drivers/xavix2.cpp index 9d302724c3c..5c1411b68e5 100644 --- a/src/mame/drivers/xavix2.cpp +++ b/src/mame/drivers/xavix2.cpp @@ -90,7 +90,7 @@ protected: u16 gpu0b_count_r(); void gpu0b_count_w(u16 data); void gpu0_trigger_w(u8 data); - + void gpu1_adr_w(u16 data); u16 gpu1b_adr_r(); void gpu1b_adr_w(u16 data); @@ -100,7 +100,7 @@ protected: void gpu1_trigger_w(u8 data); void gpu_update(u16 count, u16 adr); - + void gpu_descsize_w(u16 data); void gpu_descdata_w(u16 data); void gpu_adr_w(u16 data); @@ -467,12 +467,12 @@ u8 xavix2_state::debug_port_status_r() void xavix2_state::pio_mode_w(offs_t offset, u32 data, u32 mem_mask) { COMBINE_DATA(&m_pio_mode[offset]); - // logerror("%s: pio mode%d %08x %08x -> %08x\n", machine().describe_context(), offset, data, mem_mask, m_pio_mode[offset]); + // logerror("%s: pio mode%d %08x %08x -> %08x\n", machine().describe_context(), offset, data, mem_mask, m_pio_mode[offset]); m_pio_mask_out = 0; for (u32 i=0; i<32; i++) { m_pio_mask_out |= (((m_pio_mode[i / 16] >> ((i % 16) * 2)) & 3) == 3) ? 1 << i : 0; } - // logerror("%s: pio mode in0 %08x, out %08x\n", machine().describe_context(), m_pio_mask_out); + // logerror("%s: pio mode in0 %08x, out %08x\n", machine().describe_context(), m_pio_mask_out); pio_update(); } @@ -595,10 +595,10 @@ void xavix2_state::mem(address_map &map) uint32_t xavix2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { if(machine().input().code_pressed_once(KEYCODE_8)) - irq_raise(8); + irq_raise(8); if(machine().input().code_pressed_once(KEYCODE_0)) - irq_raise(10); - + irq_raise(10); + constexpr int dx = 0x400 - 320; constexpr int dy = 0x200 - 200; diff --git a/src/mame/layout/summit.lay b/src/mame/layout/summit.lay index e6e54f0e560..9fd33fecf40 100644 --- a/src/mame/layout/summit.lay +++ b/src/mame/layout/summit.lay @@ -30,13 +30,13 @@ Simple layout for Push-Over (Summit Coin) - + - + @@ -84,7 +84,7 @@ Simple layout for Push-Over (Summit Coin) - + @@ -107,6 +107,6 @@ Simple layout for Push-Over (Summit Coin) - + diff --git a/src/mame/video/boogwing.cpp b/src/mame/video/boogwing.cpp index db4c8f09090..6668fc3b6d2 100644 --- a/src/mame/video/boogwing.cpp +++ b/src/mame/video/boogwing.cpp @@ -250,7 +250,7 @@ void boogwing_state::mix_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, c if (((pix2 & 0x900) != 0x900) || ((spri2 <= spri1) && sprite1_drawed)) { // TODO: make it functional, check out modes 0x21 and 0x1000. - dstline[x] = (m_deco_ace->get_aceram(0x1f) == 0x22) ? + dstline[x] = (m_deco_ace->get_aceram(0x1f) == 0x22) ? sub_blend_r32(dstline[x], paldata[((drawnpixe1 & 3) ? calculated_coloffs : 0) | pix3], alpha3) : alpha_blend_r32(dstline[x], paldata[((drawnpixe1 & 3) ? calculated_coloffs : 0) | pix3], alpha3); } diff --git a/src/mame/video/deco32.cpp b/src/mame/video/deco32.cpp index 023dd8ed4b0..7fd9112092b 100644 --- a/src/mame/video/deco32.cpp +++ b/src/mame/video/deco32.cpp @@ -322,7 +322,7 @@ void nslasher_state::mix_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, c int alpha = ((!alpha1) || alpha2) ? m_deco_ace->get_alpha((col1 & 0x8) ? (0x4 + ((col1 & 0x3) / 2)) : ((col1 & 0x7) / 2)) : 0xff; /* I don't really understand how object ACE ram is really hooked up, - the only obvious place in Night Slashers is the stagecoach in level 2 */ + the only obvious place in Night Slashers is the stagecoach in level 2 */ col1 = (col1 % gfx1->colors()) * gfx1->granularity(); // Apply sprite bitmap 1 according to priority rules @@ -524,7 +524,7 @@ void nslasher_state::mix_tattass(screen_device &screen, bitmap_rgb32 &bitmap, co int alpha = m_deco_ace->get_alpha(col1 / 8); /* I don't really understand how object ACE ram is really hooked up, - the only obvious place in Night Slashers is the stagecoach in level 2 */ + the only obvious place in Night Slashers is the stagecoach in level 2 */ col1 = ((col1 & 0xf) % gfx1->colors()) * gfx1->granularity(); // Apply sprite bitmap 1 according to priority rules diff --git a/src/mame/video/deco_ace.cpp b/src/mame/video/deco_ace.cpp index c706334cae1..00a597052b5 100644 --- a/src/mame/video/deco_ace.cpp +++ b/src/mame/video/deco_ace.cpp @@ -29,9 +29,9 @@ Bytes 0x14(0x28) to 0x19(0x32) - object alpha control per pixel (if ((pix & 0x900) == 0x900)) Bytes 0x1a(0x34) to 0x1e(0x3c) - unused/unknown Bytes 0x1f(0x3e) - 2nd tilemap chip, 'tilemap_1' alpha control, used at shadowing - - 0 = opaque, 0x10 = 50% transparent, - 0x20 = fully transparent (doesn't make sense bitwise -AS), + + 0 = opaque, 0x10 = 50% transparent, + 0x20 = fully transparent (doesn't make sense bitwise -AS), 0x22 = stage 1 boss dark effect in Boogie Wings (incorrectly emulated, reverses source pixel + shifts down by 1? -AS) 0x21/0x1000 = used,unknown (by what!? -AS) diff --git a/src/mame/video/williams.cpp b/src/mame/video/williams.cpp index b47a1ef83c2..f6658a6391b 100644 --- a/src/mame/video/williams.cpp +++ b/src/mame/video/williams.cpp @@ -372,7 +372,7 @@ rgb_t williams2_state::calc_col(uint16_t lo, uint16_t hi) { /* * frgb contains channel output voltages created with this netlist file: - * src/lib/netlist/examples/turkey_shoot.cpp + * src/lib/netlist/examples/turkey_shoot.cpp * Instructions to create the table are found in turkey_shoot.cpp * * Reference videos: https://www.youtube.com/watch?v=R5OeC6Wc_yI diff --git a/src/mame/video/xexex.cpp b/src/mame/video/xexex.cpp index cc7d72324e8..ce75e5023b1 100644 --- a/src/mame/video/xexex.cpp +++ b/src/mame/video/xexex.cpp @@ -26,11 +26,11 @@ K053246_CB_MEMBER(xexex_state::sprite_callback) K056832_CB_MEMBER(xexex_state::tile_callback) { /* - Color format - xxxx ---- Color - ---- -x-- Alpha blend enable - ---- --x- Used, Unknown - Everything else : unknown + Color format + xxxx ---- Color + ---- -x-- Alpha blend enable + ---- --x- Used, Unknown + Everything else : unknown */ *priority = *color & 1; // alpha flag *color = m_layer_colorbase[layer] | (*color >> 2 & 0x0f); -- cgit v1.2.3