diff --git a/hash/leapfrog_leappad_cart.xml b/hash/leapfrog_leappad_cart.xml index 81e3f2676e4..df1e8b88f11 100644 --- a/hash/leapfrog_leappad_cart.xml +++ b/hash/leapfrog_leappad_cart.xml @@ -199,7 +199,7 @@ license:CC0-1.0 - + FUN-damentals Series - Smart Guide to 4rd Grade (UK) 2002 @@ -212,7 +212,7 @@ license:CC0-1.0 - + FUN-damentals Series - Smart Guide to 5th Grade (UK) @@ -1149,7 +1149,7 @@ license:CC0-1.0 - + Okaasan to Issho: Goo Choco Lantan: Spoo no Fushigi na Oto no Daibouken! (Japan) 2002 @@ -1161,7 +1161,7 @@ license:CC0-1.0 - + Kuma no Pooh-san Hachimitsu no tsubo ga ippai Pooh-san to kazu·katachi (Japan) @@ -1179,7 +1179,7 @@ license:CC0-1.0 Disney's World of English 1: Birthday Fun (Japan) 200? - LeapFrog / Disney + LeapFrog / Disney diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp index 578503aff35..534546d47d6 100644 --- a/src/devices/machine/z80dma.cpp +++ b/src/devices/machine/z80dma.cpp @@ -262,7 +262,7 @@ int z80dma_device::z80daisy_irq_ack() else { LOGINT("z80dma_irq_ack: failed to find an interrupt to ack!\n"); - return 0; + return 0; } } diff --git a/src/mame/altos/altos586.cpp b/src/mame/altos/altos586.cpp index d6b58b02751..b495a342951 100644 --- a/src/mame/altos/altos586.cpp +++ b/src/mame/altos/altos586.cpp @@ -143,21 +143,21 @@ private: u16 m_err_addr2; enum : u16 { - INVALID_INSN = 0x0001, // Invalid Instruction - END_OF_STACK = 0x0008, // End of Stack Warning - SYS_W_VIOLATION = 0x0010, // System write Violation - USER_W_VIOLATION = 0x0080, // User Mode Write Violation - IOP_W_VIOLATION = 0x0400, // I/O Processor Write Violation - USER_ACC_VIOLATION = 0x0800, // User Mode Access Violation + INVALID_INSN = 0x0001, // Invalid Instruction + END_OF_STACK = 0x0008, // End of Stack Warning + SYS_W_VIOLATION = 0x0010, // System write Violation + USER_W_VIOLATION = 0x0080, // User Mode Write Violation + IOP_W_VIOLATION = 0x0400, // I/O Processor Write Violation + USER_ACC_VIOLATION = 0x0800, // User Mode Access Violation }; u16 m_violation; enum { - IOP_W = 11, // Allow I/O Processor Write - SYS_W = 12, // Allow System Write - STACK_BOUND = 13, // Stack Boundary Page - USER_ACC = 14, // Allow User Access - USER_W = 15, // Allow User Write + IOP_W = 11, // Allow I/O Processor Write + SYS_W = 12, // Allow System Write + STACK_BOUND = 13, // Stack Boundary Page + USER_ACC = 14, // Allow User Access + USER_W = 15, // Allow User Write }; u16 m_map_ram[256]; }; @@ -499,17 +499,17 @@ void altos586_state::iop_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(FUNC(altos586_state::hiaddr_w)); // 0x00 Address Latch - map(0x20, 0x23).rw("iop_pit0", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x20 PIT 0 - map(0x24, 0x27).rw("iop_pit1", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x24 PIT 1 - map(0x28, 0x2b).rw("iop_sio0", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x28 SIO 0 - map(0x2c, 0x2f).rw("iop_sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x2C SIO 1 - map(0x30, 0x33).rw("iop_sio2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x30 SIO 2 - map(0x34, 0x37).rw("iop_pio", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); // 0x34 PIO - map(0x38, 0x3b).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); // 0x38 FDC - map(0x3c, 0x3f).rw("iop_dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // 0x3C DMA - map(0x40, 0x40).noprw(); // 0x40 DMA - Clear carrier sense and parity error bit - map(0x80, 0x9f).rw("iop_rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)); // 0x80 RTC - Counter - thousandths of seconds + map(0x00, 0x00).w(FUNC(altos586_state::hiaddr_w)); // 0x00 Address Latch + map(0x20, 0x23).rw("iop_pit0", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x20 PIT 0 + map(0x24, 0x27).rw("iop_pit1", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x24 PIT 1 + map(0x28, 0x2b).rw("iop_sio0", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x28 SIO 0 + map(0x2c, 0x2f).rw("iop_sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x2C SIO 1 + map(0x30, 0x33).rw("iop_sio2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x30 SIO 2 + map(0x34, 0x37).rw("iop_pio", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); // 0x34 PIO + map(0x38, 0x3b).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); // 0x38 FDC + map(0x3c, 0x3f).rw("iop_dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // 0x3C DMA + map(0x40, 0x40).noprw(); // 0x40 DMA - Clear carrier sense and parity error bit + map(0x80, 0x9f).rw("iop_rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)); // 0x80 RTC - Counter - thousandths of seconds // 0x60 586T Generate MULTIBUS interrupt } diff --git a/src/mame/altos/altos586_hdc.cpp b/src/mame/altos/altos586_hdc.cpp index 37bef261b1c..d70dd39bc7a 100644 --- a/src/mame/altos/altos586_hdc.cpp +++ b/src/mame/altos/altos586_hdc.cpp @@ -29,13 +29,13 @@ [2] Preliminary 8600 User Manual Section 7. System Specs. - 4.5. Rigid Disk Controllers and Interface - Specification Revision 4.2, May 27, 1982, Page 52-62 + 4.5. Rigid Disk Controllers and Interface + Specification Revision 4.2, May 27, 1982, Page 52-62 [3] Preliminary 8600 User Manual Section 7. System Specs. - A. Rigid Disk Controller Documentation - Specification Revision 4.2, May 27, 1982, Page 95-108 + A. Rigid Disk Controller Documentation + Specification Revision 4.2, May 27, 1982, Page 95-108 Note: The Altos 8600 manuals [2] and [3] describe a controller wired differently (the 8089 seems to be in local mode, not remote), @@ -369,13 +369,13 @@ void altos586_hdc_device::attn_w(uint16_t data) void altos586_hdc_device::device_start() { - save_item(NAME(m_status)); - save_item(NAME(m_seek_status)); - save_item(NAME(m_cyl_latch)); - save_item(NAME(m_cyl[0])); - save_item(NAME(m_cyl[1])); - save_pointer(NAME(m_sector), std::size(m_sector)); - save_item(NAME(m_secoffset)); - save_item(NAME(m_drive)); - save_item(NAME(m_head)); + save_item(NAME(m_status)); + save_item(NAME(m_seek_status)); + save_item(NAME(m_cyl_latch)); + save_item(NAME(m_cyl[0])); + save_item(NAME(m_cyl[1])); + save_pointer(NAME(m_sector), std::size(m_sector)); + save_item(NAME(m_secoffset)); + save_item(NAME(m_drive)); + save_item(NAME(m_head)); } diff --git a/src/mame/atari/a2600.cpp b/src/mame/atari/a2600.cpp index 38f2b7d376b..b6e52f84c23 100644 --- a/src/mame/atari/a2600.cpp +++ b/src/mame/atari/a2600.cpp @@ -246,7 +246,7 @@ public: void tvboy(machine_config &config); void tvboyn(machine_config &config); - + protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/capcom/alien.cpp b/src/mame/capcom/alien.cpp index bc3d6dc26ca..436dc45daab 100644 --- a/src/mame/capcom/alien.cpp +++ b/src/mame/capcom/alien.cpp @@ -624,7 +624,7 @@ ROM_END ROM_START( dokodemo ) ROM_REGION32_LE( 0x1000000, "maincpu", 0 ) // BIOS code ROM_LOAD32_WORD( "ic30", 0x000000, 0x400000, BAD_DUMP CRC(74687757) SHA1(96b6e3725bcf16e92c6966f9b9ce93cfdd7ba641) ) // needs verification if this game really use same boot ROMs as pingu/gekimaka - ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) // + ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) // ROM_REGION( 0x800100, "ymz770_flash1", ROMREGION_ERASEFF ) //sound samples flash rom, not really needed, programmed by boot loader ROM_LOAD16_WORD_SWAP( "flash1", 0x000000, 0x800000, BAD_DUMP CRC(dda4879f) SHA1(4aa06247ca674e86be6c111db7f6abf1ed6e121d) ) @@ -673,7 +673,7 @@ ROM_END ROM_START( wontame ) ROM_REGION32_LE( 0x1000000, "maincpu", 0 ) // BIOS code ROM_LOAD32_WORD( "ic30", 0x000000, 0x400000, BAD_DUMP CRC(74687757) SHA1(96b6e3725bcf16e92c6966f9b9ce93cfdd7ba641) ) // needs verification if this game really use same boot ROMs as pingu/gekimaka - ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) // + ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) // ROM_REGION( 0x800100, "ymz770_flash1", ROMREGION_ERASEFF ) ROM_LOAD16_WORD_SWAP( "flash1", 0x000000, 0x800000, BAD_DUMP CRC(056e982e) SHA1(4b29218b00d7023c0b748aae13752f0c12539750) ) diff --git a/src/mame/gaelco/gaelco3d.cpp b/src/mame/gaelco/gaelco3d.cpp index dcc746d7d00..152fe334885 100644 --- a/src/mame/gaelco/gaelco3d.cpp +++ b/src/mame/gaelco/gaelco3d.cpp @@ -1325,7 +1325,7 @@ ROM_END /* Football Power has a small PCB inside the ball controller, very similar to the one found on -Gaelco Football, with two accelerometers and a PIC. +Gaelco Football, with two accelerometers and a PIC. _________________ | ______ | _| / / | diff --git a/src/mame/konami/k052109.cpp b/src/mame/konami/k052109.cpp index e4bffba9251..607d396ad11 100644 --- a/src/mame/konami/k052109.cpp +++ b/src/mame/konami/k052109.cpp @@ -73,16 +73,16 @@ address lines), and then reading it from the 051962. 180c-1833: A y scroll 1a00-1bff: A x scroll 1c00 : Maps the three 8kB RAM chips to memory addresses. - ------xx select the configuration from this table - RAM0 RAM1 RAM2 - 00 A~B 6~7 8~9 Reset state - 01 8~9 4~5 6~7 - 10 6~7 2~3 4~5 - 11 4~5 0~1 2~3 TMNT setting - ---xxx-- affects how RAMs are accessed - -x------ - 0 = replace bits 5:4 of color attribute by bits 1:0 - 1 = do not alter color attribute (gradius3,xmen) + ------xx select the configuration from this table + RAM0 RAM1 RAM2 + 00 A~B 6~7 8~9 Reset state + 01 8~9 4~5 6~7 + 10 6~7 2~3 4~5 + 11 4~5 0~1 2~3 TMNT setting + ---xxx-- affects how RAMs are accessed + -x------ + 0 = replace bits 5:4 of color attribute by bits 1:0 + 1 = do not alter color attribute (gradius3,xmen) 1c80 : row/column scroll control ------xx layer A row scroll 00 = disabled diff --git a/src/mame/layout/kn5000.lay b/src/mame/layout/kn5000.lay index baa7e436f50..4f9de1e8d10 100644 --- a/src/mame/layout/kn5000.lay +++ b/src/mame/layout/kn5000.lay @@ -6,15 +6,15 @@ license:CC0-1.0 - - + - ]]> - + ]]> + @@ -407,7 +407,7 @@ license:CC0-1.0 - + diff --git a/src/mame/matsushita/kn5000.cpp b/src/mame/matsushita/kn5000.cpp index 37fdc307ff3..1bcd481dea7 100644 --- a/src/mame/matsushita/kn5000.cpp +++ b/src/mame/matsushita/kn5000.cpp @@ -2,7 +2,7 @@ // copyright-holders:Felipe Sanches /****************************************************************************** - Technics SX-KN5000 music keyboard driver + Technics SX-KN5000 music keyboard driver ******************************************************************************/ @@ -18,15 +18,15 @@ class mn89304_vga_device : public svga_device { public: - // construction/destruction - mn89304_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + // construction/destruction + mn89304_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual void device_reset() override; + virtual void device_reset() override; - virtual void palette_update() override; - virtual void recompute_params() override; - virtual uint16_t offset() override; + virtual void palette_update() override; + virtual void recompute_params() override; + virtual uint16_t offset() override; }; DEFINE_DEVICE_TYPE(MN89304_VGA, mn89304_vga_device, "mn89304_vga", "MN89304 VGA") @@ -35,51 +35,51 @@ DEFINE_DEVICE_TYPE(MN89304_VGA, mn89304_vga_device, "mn89304_vga", "MN89304 VGA" mn89304_vga_device::mn89304_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : svga_device(mconfig, MN89304_VGA, tag, owner, clock) { - // ... + // ... } void mn89304_vga_device::device_reset() { - svga_device::device_reset(); - svga.rgb8_en = 1; + svga_device::device_reset(); + svga.rgb8_en = 1; } // sets up mode 0, by default it will throw 155 Hz, assume divided by 3 void mn89304_vga_device::recompute_params() { - u8 xtal_select = (vga.miscellaneous_output & 0x0c) >> 2; - int xtal; + u8 xtal_select = (vga.miscellaneous_output & 0x0c) >> 2; + int xtal; - switch(xtal_select & 3) - { - case 0: xtal = XTAL(25'174'800).value() / 3; break; - case 1: xtal = XTAL(28'636'363).value() / 3; break; - case 2: - default: - throw emu_fatalerror("MN89304: setup ext. clock select"); - } + switch(xtal_select & 3) + { + case 0: xtal = XTAL(25'174'800).value() / 3; break; + case 1: xtal = XTAL(28'636'363).value() / 3; break; + case 2: + default: + throw emu_fatalerror("MN89304: setup ext. clock select"); + } - recompute_params_clock(1, xtal); + recompute_params_clock(1, xtal); } void mn89304_vga_device::palette_update() { - // 4bpp RAMDAC - for (int i = 0; i < 256; i++) - { - set_pen_color( - i, - pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 0]), - pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 1]), - pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 2]) - ); - } + // 4bpp RAMDAC + for (int i = 0; i < 256; i++) + { + set_pen_color( + i, + pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 0]), + pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 1]), + pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 2]) + ); + } } uint16_t mn89304_vga_device::offset() { - return svga_device::offset() << 3; + return svga_device::offset() << 3; } @@ -152,7 +152,7 @@ void kn5000_state::maincpu_mem(address_map &map) map(0x300000, 0x3fffff).rom().region("custom_data", 0); // 8MBit FLASH ROM @ IC19 (CS5) map(0x400000, 0x7fffff).rom().region("rhythm_data", 0); // 32MBit ROM @ IC14 (A22=1 and CS5) map(0x800000, 0x82ffff).rom().region("subprogram", 0); // not sure yet in which chip this is stored, but I suspect it should be IC19 -// map(0xc00000, 0xdfffff).mirror(0x200000).rom().region("table_data", 0); //2 * 8MBit ROMs @ IC1, IC3 (CS2) +// map(0xc00000, 0xdfffff).mirror(0x200000).rom().region("table_data", 0); //2 * 8MBit ROMs @ IC1, IC3 (CS2) map(0xe00000, 0xffffff).mask(0x1fffff).rom().region("program", 0); //2 * 8MBit FLASH ROMs @ IC4, IC6 } @@ -686,10 +686,10 @@ void kn5000_state::kn5000(machine_config &config) // bit 6 = (input) COM.MAC // bit 7 = (input) COM.MIDI // TODO: m_maincpu->portz_read().set([this] { - // TODO: return ioport("COM_SELECT")->read() | (m_sstat << 2); + // TODO: return ioport("COM_SELECT")->read() | (m_sstat << 2); // TODO: }); // TODO: m_maincpu->portz_write().set([this] (u8 data) { - // TODO: m_mstat = data & 3; + // TODO: m_mstat = data & 3; // TODO: }); @@ -718,10 +718,10 @@ void kn5000_state::kn5000(machine_config &config) // bit 3 (not used) // bit 4 = (input) MSTAT1 // TODO: m_subcpu->portd_read().set([this] { - // TODO: return (BIT(m_mstat, 0) << 2) | (BIT(m_mstat, 1) << 4); + // TODO: return (BIT(m_mstat, 0) << 2) | (BIT(m_mstat, 1) << 4); // TODO: }); // TODO: m_subcpu->portd_write().set([this] (u8 data) { - // TODO: m_sstat = data & 3; + // TODO: m_sstat = data & 3; // TODO: }); diff --git a/src/mame/sinclair/tsconf_m.cpp b/src/mame/sinclair/tsconf_m.cpp index 518c705af8d..102fab8223b 100644 --- a/src/mame/sinclair/tsconf_m.cpp +++ b/src/mame/sinclair/tsconf_m.cpp @@ -277,7 +277,7 @@ void tsconf_state::tsconf_draw_gfx(bitmap_rgb32 &bitmap, const rectangle &clipre rgb_t pen = m_palette->pen_color(pal_offset | (pix >> 4)); if (pen != transparent) { - *bm = pen; + *bm = pen; } bm++; if (width != 1) diff --git a/src/mame/skeleton/koto_zevio.cpp b/src/mame/skeleton/koto_zevio.cpp index 292bcf5dbe2..55c37481f8a 100644 --- a/src/mame/skeleton/koto_zevio.cpp +++ b/src/mame/skeleton/koto_zevio.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -// The Zevio SoC was developed by Koto Laboratory, the same company behind the Wonderswan +// The Zevio SoC was developed by Koto Laboratory, the same company behind the Wonderswan #include "emu.h" @@ -104,7 +104,7 @@ ROM_START( dbzonep ) // original dump had the first 0x100 bytes repeated again at the end, why? ROM_REGION( 0x800, "eeprom", ROMREGION_ERASEFF ) - ROM_LOAD( "s24cs16a.u6", 0x000000, 0x800, CRC(a1724ea8) SHA1(93a6f73e30f47b6a0c83f62dfd9d8236473518a8) ) + ROM_LOAD( "s24cs16a.u6", 0x000000, 0x800, CRC(a1724ea8) SHA1(93a6f73e30f47b6a0c83f62dfd9d8236473518a8) ) ROM_END } // anonymous namespace diff --git a/src/mame/tvgames/generalplus_gpl16250_spi.cpp b/src/mame/tvgames/generalplus_gpl16250_spi.cpp index 08f48766dba..df46dd11816 100644 --- a/src/mame/tvgames/generalplus_gpl16250_spi.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_spi.cpp @@ -3,8 +3,8 @@ /* GPL16250* games using SPI Flash + RAM configuration - *part number could be different for these, they've only - been seen as globtops + *part number could be different for these, they've only + been seen as globtops */ #include "emu.h"