diff --git a/hash/ibm5150.xml b/hash/ibm5150.xml index 172e4dcf16f..16a4f7b3fb5 100644 --- a/hash/ibm5150.xml +++ b/hash/ibm5150.xml @@ -10459,7 +10459,7 @@ has been replaced with an all-zero block. --> - + Italy '90 Soccer diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml index 032259a6be8..9b10c778a9b 100644 --- a/hash/ibm5170.xml +++ b/hash/ibm5170.xml @@ -12801,7 +12801,7 @@ license:CC0 - + Jazz Jackrabbit diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 01c9ca0997e..0e02e9bbd34 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -2670,7 +2670,7 @@ license:CC0 - + Bruce Lee (set 10, Erbe) 1988 @@ -21450,7 +21450,7 @@ license:CC0 - + Rainbow Islands (Erbe, small case) 1990 @@ -42324,7 +42324,7 @@ license:CC0 - + Aspar - GP Master (set 2) 1989 @@ -54579,7 +54579,7 @@ license:CC0 - + Continental Circus (Mastertronic Plus) 1989 @@ -74876,7 +74876,7 @@ license:CC0 - + Grand Prix Circuit (Dro Soft) 1990 @@ -85746,7 +85746,7 @@ license:CC0 - + Perigos na Selva 1983 @@ -105851,7 +105851,7 @@ license:CC0 - + Penetrator (Investronica) 1983 diff --git a/plugins/console/init.lua b/plugins/console/init.lua index 388a1ca016b..de8a5844a68 100644 --- a/plugins/console/init.lua +++ b/plugins/console/init.lua @@ -296,11 +296,11 @@ function console.startplugin() end setmetatable(console, { - __gc = function () - if history_fullpath then - local ln = require("linenoise") - ln.savehistory(history_fullpath) - end + __gc = function () + if history_fullpath then + local ln = require("linenoise") + ln.savehistory(history_fullpath) + end end}) return exports diff --git a/scripts/genie.lua b/scripts/genie.lua index 2a50eb8765d..fcf46b64e43 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1134,10 +1134,10 @@ end end if (version >= 110000) then buildoptions { - "-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists - "-Wno-stringop-overread", -- machine/bbc.cpp in GCC 11.1 - "-Wno-misleading-indentation", -- sqlite3.c in GCC 11.1 - "-Wno-maybe-uninitialized" -- expat in GCC 11.1 + "-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists + "-Wno-stringop-overread", -- machine/bbc.cpp in GCC 11.1 + "-Wno-misleading-indentation", -- sqlite3.c in GCC 11.1 + "-Wno-maybe-uninitialized" -- expat in GCC 11.1 } end end diff --git a/src/devices/bus/a2bus/booti.cpp b/src/devices/bus/a2bus/booti.cpp index e365ebe2492..54e7720642f 100644 --- a/src/devices/bus/a2bus/booti.cpp +++ b/src/devices/bus/a2bus/booti.cpp @@ -6,14 +6,14 @@ Implementation of the BOOTI card - The BOOTI is an Apple II interface to the CH376 USB module. - The CH376 is intended for use with small microcontrollers (or, - you know, the 6502) to give them access to FAT-formatted - flash drives. See ch376.cpp for details. + The BOOTI is an Apple II interface to the CH376 USB module. + The CH376 is intended for use with small microcontrollers (or, + you know, the 6502) to give them access to FAT-formatted + flash drives. See ch376.cpp for details. - C0n0: read/write data to CH376 - C0n1: read status/write command to CH376 - C0n4: $C800 ROM bank (0-3) + C0n0: read/write data to CH376 + C0n1: read status/write command to CH376 + C0n4: $C800 ROM bank (0-3) *********************************************************************/ diff --git a/src/devices/bus/rs232/mboardd.cpp b/src/devices/bus/rs232/mboardd.cpp index cdbe002c8d1..2af648bd831 100644 --- a/src/devices/bus/rs232/mboardd.cpp +++ b/src/devices/bus/rs232/mboardd.cpp @@ -2,16 +2,16 @@ // copyright-holders:R. Belmont /* - mboardd.cpp - Mockingboard D emulation - by R. Belmont + mboardd.cpp - Mockingboard D emulation + by R. Belmont - The Apple IIc didn't have slots, so Sweet Micro Systems came up with this, a Mockingboard - in a little box that attached to the IIc's modem port. There's nothing special about the - IIc though - with a proper cable, anything that speaks 9600 8N1 RS-232 could drive this - device. + The Apple IIc didn't have slots, so Sweet Micro Systems came up with this, a Mockingboard + in a little box that attached to the IIc's modem port. There's nothing special about the + IIc though - with a proper cable, anything that speaks 9600 8N1 RS-232 could drive this + device. - A decent disassembly of the 6803 firmware is available from the Apple II Documentation Project: - https://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Interface%20Cards/Audio/Sweet%20Microsystems%20Mockingboard/Source%20Code/ + A decent disassembly of the 6803 firmware is available from the Apple II Documentation Project: + https://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Interface%20Cards/Audio/Sweet%20Microsystems%20Mockingboard/Source%20Code/ */ @@ -35,7 +35,7 @@ mockingboard_d_device::mockingboard_d_device(const machine_config &mconfig, cons void mockingboard_d_device::device_add_mconfig(machine_config &config) { - M6803(config, m_cpu, 4.9152_MHz_XTAL); // value reverse-engineered from 9600 baud SCI rate needed + M6803(config, m_cpu, 4.9152_MHz_XTAL); // value reverse-engineered from 9600 baud SCI rate needed m_cpu->set_addrmap(AS_PROGRAM, &mockingboard_d_device::m6803_mem); m_cpu->in_p2_cb().set(FUNC(mockingboard_d_device::p2_r)); m_cpu->out_p1_cb().set(FUNC(mockingboard_d_device::p1_w)); diff --git a/src/devices/bus/vsmile/keyboard.h b/src/devices/bus/vsmile/keyboard.h index b07e411220d..2d01776ee39 100644 --- a/src/devices/bus/vsmile/keyboard.h +++ b/src/devices/bus/vsmile/keyboard.h @@ -42,7 +42,7 @@ public: enum comms_state : uint8_t { - STATE_POWERUP = 0U, + STATE_POWERUP = 0U, STATE_HELLO_MESSAGE, STATE_HELLO_RECEIVE_BYTE1, STATE_HELLO_RECEIVE_BYTE2, diff --git a/src/devices/cpu/m6502/m5074x.cpp b/src/devices/cpu/m6502/m5074x.cpp index 5df0e863a0c..deb79eb0585 100644 --- a/src/devices/cpu/m6502/m5074x.cpp +++ b/src/devices/cpu/m6502/m5074x.cpp @@ -370,7 +370,7 @@ void m5074x_device::ports_w(offs_t offset, uint8_t data) break; case 0xa: // p4 (4-bit open drain) - send_port(4, (data & m_ddrs[4] & 0x0f) | (m_pullups[4] & ~m_ddrs[4])); + send_port(4, (data & m_ddrs[4] & 0x0f) | (m_pullups[4] & ~m_ddrs[4])); m_ports[4] = data & 0x0f; break; diff --git a/src/devices/cpu/m6800/m6801.cpp b/src/devices/cpu/m6800/m6801.cpp index b816d9c8710..a5e3226d770 100644 --- a/src/devices/cpu/m6800/m6801.cpp +++ b/src/devices/cpu/m6800/m6801.cpp @@ -1787,7 +1787,7 @@ void hd6301x_cpu_device::increment_t2cnt(int amount) } m_tcsr3 |= 0x80; - m_timer_next = 0; // HACK + m_timer_next = 0; // HACK } else m_t2cnt += amount; diff --git a/src/devices/cpu/pdp8/pdp8dasm.cpp b/src/devices/cpu/pdp8/pdp8dasm.cpp index 01bd857775a..3fdbc139249 100644 --- a/src/devices/cpu/pdp8/pdp8dasm.cpp +++ b/src/devices/cpu/pdp8/pdp8dasm.cpp @@ -866,7 +866,7 @@ offs_t pdp8_disassembler::disassemble(std::ostream &stream, offs_t pc, const pdp case 4: stream << "JMS"; dasm_memory_reference(stream, inst, pc); - return 1 | SUPPORTED | STEP_OVER; + return 1 | SUPPORTED | STEP_OVER; case 5: stream << "JMP"; diff --git a/src/devices/machine/at28c64b.cpp b/src/devices/machine/at28c64b.cpp index 194711228a1..5abd3e3485f 100644 --- a/src/devices/machine/at28c64b.cpp +++ b/src/devices/machine/at28c64b.cpp @@ -229,7 +229,7 @@ uint8_t at28c64b_device::read(offs_t offset) if( m_last_write >= 0 ) { uint8_t data = m_last_write ^ 0x80; -// logerror( "%s: AT28C64B: read( %04x ) write status %02x\n", machine().describe_context(), offset, data ); +// logerror( "%s: AT28C64B: read( %04x ) write status %02x\n", machine().describe_context(), offset, data ); return data; } else diff --git a/src/devices/sound/c140.h b/src/devices/sound/c140.h index a29d77328fc..4c2b18efa46 100644 --- a/src/devices/sound/c140.h +++ b/src/devices/sound/c140.h @@ -97,7 +97,7 @@ protected: C140_VOICE m_voi[MAX_VOICE]; emu_timer *m_int1_timer; - + u8 keyon_status_read(u16 offset); }; diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index 9edd13e8d2d..b4488be7052 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -3,7 +3,7 @@ /********************************************************************** Intel 82720 Graphics Display Controller emulation - also known as NEC uPD7220 + also known as NEC uPD7220 **********************************************************************/ @@ -1732,12 +1732,12 @@ void upd7220_device::update_graphics(bitmap_rgb32 &bitmap, const rectangle &clip if(im || force_bitmap) { // according to documentation only areas 0-1-2 can be drawn in bitmap mode - // PC98 Quarth definitely needs area 2 for player section. + // PC98 Quarth definitely needs area 2 for player section. // TODO: what happens if combined area size is smaller than display height? // documentation suggests that it should repeat from area 0, needs real HW verification (no known SW do it). if(area >= 3) break; - + // PC98 madoum1-3 sets up ALL areas to a length of 0 after initial intro screen. // madoum1: area 0 sad==0 on gameplay (PC=0x955e7), sad==0xaa0 on second intro screen (tower) then intentionally scrolls up and back to initial position. // Suggests that length should be treated as max size if this occurs, this is also proven to be correct via real HW verification. diff --git a/src/lib/formats/fs_oric_jasmin.cpp b/src/lib/formats/fs_oric_jasmin.cpp index 686eb2bb71a..0b6740c49c3 100644 --- a/src/lib/formats/fs_oric_jasmin.cpp +++ b/src/lib/formats/fs_oric_jasmin.cpp @@ -89,7 +89,7 @@ fs_meta_data fs_oric_jasmin::impl::metadata() len--; res.set(fs_meta_name::name, bdir.rstr(0xf8, len)); - return res; + return res; } bool fs_oric_jasmin::validate_filename(std::string name) @@ -149,7 +149,7 @@ void fs_oric_jasmin::impl::format(const fs_meta_data &meta) } fs_oric_jasmin::impl::impl(fsblk_t &blockdev) : filesystem_t(blockdev, 256), m_root(true) -{ +{ } bool fs_oric_jasmin::impl::ref_valid(u16 ref) @@ -440,7 +440,7 @@ fs_oric_jasmin::impl::file_t fs_oric_jasmin::impl::root_dir::file_create(const f bdir.w8 (off+0x0f, info.get_flag(fs_meta_name::sequential, true) ? 'S' : 'D'); bdir.w16l(off+0x10, 2); // 2 sectors for an empty file - return file_t(new file(m_fs, this, bdir.rodata() + off, id)); + return file_t(new file(m_fs, this, bdir.rodata() + off, id)); } diff --git a/src/lib/formats/fs_oric_jasmin.h b/src/lib/formats/fs_oric_jasmin.h index c71cbf9097e..304fbf1eb05 100644 --- a/src/lib/formats/fs_oric_jasmin.h +++ b/src/lib/formats/fs_oric_jasmin.h @@ -77,7 +77,7 @@ public: impl(fsblk_t &blockdev); virtual ~impl() = default; - + virtual void format(const fs_meta_data &meta) override; virtual fs_meta_data metadata() override; virtual void metadata_change(const fs_meta_data &info) override; diff --git a/src/lib/formats/fs_prodos.cpp b/src/lib/formats/fs_prodos.cpp index 844e1d9c81d..a79c02fb800 100644 --- a/src/lib/formats/fs_prodos.cpp +++ b/src/lib/formats/fs_prodos.cpp @@ -188,7 +188,7 @@ void fs_prodos::impl::format(const fs_meta_data &meta) } fs_prodos::impl::impl(fsblk_t &blockdev) : filesystem_t(blockdev, 512), m_root(true) -{ +{ } util::arbitrary_datetime fs_prodos::impl::prodos_to_dt(u32 date) @@ -216,7 +216,7 @@ fs_meta_data fs_prodos::impl::metadata() res.set(fs_meta_name::os_minimum_version, bdir.r8(0x21)); res.set(fs_meta_name::creation_date, prodos_to_dt(bdir.r32l(0x1c))); res.set(fs_meta_name::modification_date, prodos_to_dt(bdir.r32l(0x16))); - return res; + return res; } filesystem_t::dir_t fs_prodos::impl::root() @@ -251,7 +251,7 @@ fs_meta_data fs_prodos::impl::dir::metadata() res.set(fs_meta_name::os_minimum_version, bdir.r8(0x21)); res.set(fs_meta_name::creation_date, prodos_to_dt(bdir.r32l(0x1c))); res.set(fs_meta_name::modification_date, prodos_to_dt(bdir.r32l(0x16))); - return res; + return res; } std::vector fs_prodos::impl::dir::contents() @@ -362,7 +362,7 @@ fs_meta_data fs_prodos::impl::file::metadata() auto rootblk = m_fs.m_blockdev.get(r16l(m_entry+0x11)); res.set(fs_meta_name::length, rootblk.r24l(0x005)); res.set(fs_meta_name::rsrc_length, rootblk.r24l(0x105)); - + } else if(type >= 1 && type <= 3) res.set(fs_meta_name::length, r24l(m_entry + 0x15)); diff --git a/src/lib/formats/fs_prodos.h b/src/lib/formats/fs_prodos.h index 49ac796783b..626dcbea821 100644 --- a/src/lib/formats/fs_prodos.h +++ b/src/lib/formats/fs_prodos.h @@ -58,7 +58,7 @@ public: impl(fsblk_t &blockdev); virtual ~impl() = default; - + virtual void format(const fs_meta_data &meta) override; virtual fs_meta_data metadata() override; diff --git a/src/lib/formats/fsmgr.cpp b/src/lib/formats/fsmgr.cpp index 2f762796e4c..09234ebcaf4 100644 --- a/src/lib/formats/fsmgr.cpp +++ b/src/lib/formats/fsmgr.cpp @@ -24,7 +24,7 @@ bool fs_refcounted_inner::unref() if(m_ref == 0) { if(m_weak_ref) drop_weak_references(); - else + else delete this; return true; } diff --git a/src/lib/formats/fsmgr.h b/src/lib/formats/fsmgr.h index 25b95cc6795..4546e83d89b 100644 --- a/src/lib/formats/fsmgr.h +++ b/src/lib/formats/fsmgr.h @@ -140,7 +140,7 @@ public: } else if(m_is_weak_ref != cref.m_is_weak_ref) { ref(); cref.unref(); - m_object = cref.m_object; // In case the object got deleted (when going from strong ref to weak on the last strong) + m_object = cref.m_object; // In case the object got deleted (when going from strong ref to weak on the last strong) } cref.m_object = nullptr; return *this; @@ -161,7 +161,7 @@ private: m_object->ref(); } } - + void unref() { if(m_object) { bool del = m_is_weak_ref ? m_object->unref_weak() : m_object->unref(); @@ -269,7 +269,7 @@ public: fsblk_t() : m_block_size(0) {} virtual ~fsblk_t() = default; - + virtual void set_block_size(uint32_t block_size); virtual uint32_t block_count() const = 0; virtual block_t get(uint32_t id) = 0; @@ -385,7 +385,7 @@ protected: }; class unformatted_floppy_creator; - + class filesystem_manager_t { public: struct floppy_enumerator { diff --git a/src/lib/util/timeconv.cpp b/src/lib/util/timeconv.cpp index 084e989b513..99953712003 100644 --- a/src/lib/util/timeconv.cpp +++ b/src/lib/util/timeconv.cpp @@ -37,7 +37,7 @@ arbitrary_datetime arbitrary_datetime::now() time_t sec; time(&sec); auto t = *localtime(&sec); - + arbitrary_datetime dt; dt.year = t.tm_year + 1900; dt.month = t.tm_mon + 1; @@ -46,7 +46,7 @@ arbitrary_datetime arbitrary_datetime::now() dt.minute = t.tm_min; dt.second = t.tm_sec; - return dt; + return dt; } static std::chrono::system_clock::duration calculate_system_clock_adjustment() diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index ec9451f6fa8..53e04129d01 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -513,7 +513,7 @@ void _1942_state::_1942(machine_config &config) PALETTE(config, m_palette, FUNC(_1942_state::_1942_palette), 64*4+4*32*8+16*16, 256); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(MASTER_CLOCK/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + m_screen->set_raw(MASTER_CLOCK/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 m_screen->set_screen_update(FUNC(_1942_state::screen_update)); m_screen->set_palette(m_palette); @@ -573,7 +573,7 @@ void _1942p_state::_1942p(machine_config &config) PALETTE(config, m_palette, FUNC(_1942p_state::_1942p_palette), 0x500, 0x400); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(MASTER_CLOCK/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + m_screen->set_raw(MASTER_CLOCK/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 m_screen->set_screen_update(FUNC(_1942p_state::screen_update)); m_screen->set_palette(m_palette); diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp index 57ae008bbfa..0d592d0c810 100644 --- a/src/mame/drivers/1943.cpp +++ b/src/mame/drivers/1943.cpp @@ -296,7 +296,7 @@ void _1943_state::_1943(machine_config &config) // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(XTAL(24'000'000)/4, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + m_screen->set_raw(XTAL(24'000'000)/4, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 m_screen->set_screen_update(FUNC(_1943_state::screen_update)); m_screen->set_palette(m_palette); diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 5720143e554..39cbfdaf7ae 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -4772,7 +4772,7 @@ static void apple2_cards(device_slot_interface &device) device.option_add("sider1", A2BUS_SIDER1); /* Advanced Tech Systems / First Class Peripherals Sider 1 SASI card */ device.option_add("uniprint", A2BUS_UNIPRINT); /* Videx Uniprint parallel printer card */ device.option_add("ccs7710", A2BUS_CCS7710); /* California Computer Systems Model 7710 Asynchronous Serial Interface */ - device.option_add("booti", A2BUS_BOOTI); /* Booti Card */ + device.option_add("booti", A2BUS_BOOTI); /* Booti Card */ } void apple2gs_state::apple2gs(machine_config &config) diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index c26cf9f0c71..4bc60fa14ab 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -656,7 +656,7 @@ void bionicc_state::bionicc(machine_config &config) // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(24_MHz_XTAL / 4, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(24_MHz_XTAL / 4, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(bionicc_state::screen_update)); screen.screen_vblank().set(m_spriteram, FUNC(buffered_spriteram16_device::vblank_copy_rising)); screen.set_palette(m_palette); diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index 2de5018d2c0..528f444a448 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -310,7 +310,7 @@ void blktiger_state::blktiger(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(24_MHz_XTAL / 4, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(24_MHz_XTAL / 4, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(blktiger_state::screen_update_blktiger)); screen.screen_vblank().set("spriteram", FUNC(buffered_spriteram8_device::vblank_copy_rising)); screen.set_palette(m_palette); diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp index b58c985fca5..bf6a4193808 100644 --- a/src/mame/drivers/calomega.cpp +++ b/src/mame/drivers/calomega.cpp @@ -449,7 +449,7 @@ Major improvements... - Worked the analogic color system, adding the three R-G-B presets. - - Added the PORT_ADJUST for RGB in all games, defining the default values. + - Added the PORT_ADJUST for RGB in all games, defining the default values. - Redumped the Cal Omega - Game 20.8 (Winner's Choice). Reworked proper inputs. - Inputs from the scratch for all the Pixels, Keno and Hotline games. Promoted to WORKING. - Specific inputs for games 12.8, 15.7, 15.9, 17.2, and 20.4. Promoted to WORKING. @@ -770,7 +770,7 @@ void calomega_state::s903_mux_w(uint8_t data) uint8_t calomega_state::s905_mux_port_r() { - switch( m_s905_mux_data & 0x0f ) // bits 0-3 + switch( m_s905_mux_data & 0x0f ) // bits 0-3 { case 0x01: return m_in0_0->read(); case 0x02: return m_in0_1->read(); @@ -786,10 +786,10 @@ void calomega_state::s905_mux_w(uint8_t data) m_s905_mux_data = data ^ 0x0f; // inverted /* Upper nibble - PIA_1_PB_4 - Hopper1. - PIA_1_PB_5 - Hopper2. - PIA_1_PB_6 - Not Connected. - PIA_1_PB_7 - Lockout. + PIA_1_PB_4 - Hopper1. + PIA_1_PB_5 - Hopper2. + PIA_1_PB_6 - Not Connected. + PIA_1_PB_7 - Lockout. */ m_hopper->motor_w(BIT(~data, 4) && BIT(~data, 5)); m_lockout = BIT(data, 7); @@ -800,18 +800,18 @@ void calomega_state::s905_mux_w(uint8_t data) uint8_t calomega_state::pia0_bin_r() { - //logerror("PIA0: Port B in\n"); + //logerror("PIA0: Port B in\n"); return 0xff; } void calomega_state::pia0_aout_w(uint8_t data) { - //logerror("PIA0: Port A out: %02X\n", data); + //logerror("PIA0: Port A out: %02X\n", data); } void calomega_state::pia0_bout_w(uint8_t data) { - // Meters???...M1-M5 + // Meters???...M1-M5 m_diverter = BIT(data, 3); m_lockout = BIT(data, 5); m_hopper->motor_w(BIT(~data, 6) && BIT(~data, 7)); @@ -832,7 +832,7 @@ uint8_t calomega_state::pia1_ain_r() uint8_t calomega_state::pia1_bin_r() { - // logerror("PIA1: Port B in\n"); + // logerror("PIA1: Port B in\n"); return 0xff; } @@ -917,7 +917,7 @@ WRITE_LINE_MEMBER(calomega_state::vblank1_w) WRITE_LINE_MEMBER(calomega_state::vblank2_w) { m_vblank = state; - m_pia[1]->read(0); + m_pia[1]->read(0); m_pia[1]->read(0); m_pia[1]->cb1_w(state); @@ -980,7 +980,7 @@ WRITE_LINE_MEMBER(calomega_state::dummy_pia_line_w) */ void calomega_state::lamps_903a_w(uint8_t data) { - // Whole 8 bits of PIA0 port B + // Whole 8 bits of PIA0 port B m_lamps[0] = BIT(~data, 0); // L1 (Hold 1) m_lamps[1] = BIT(~data, 1); // L2 (Hold 2) m_lamps[2] = BIT(~data, 2); // L3 (Hold 3) @@ -993,7 +993,7 @@ void calomega_state::lamps_903a_w(uint8_t data) void calomega_state::lamps_903b_w(uint8_t data) { - // First 4 bits of PIA1 port A + // First 4 bits of PIA1 port A m_lamps[5] = BIT(~data, 0); // L6 (Cancel) m_lamps[6] = BIT(~data, 1); // L7 (Bet) m_lamps[7] = BIT(~data, 2); // L8 (Take) @@ -1002,7 +1002,7 @@ void calomega_state::lamps_903b_w(uint8_t data) void calomega_state::lamps_905_w(uint8_t data) { - // Whole 8 bits of PIA0 port B + // Whole 8 bits of PIA0 port B m_lamps[0] = BIT(~data, 0); // L1 (Hold 1) m_lamps[1] = BIT(~data, 1); // L2 (Hold 2) m_lamps[2] = BIT(~data, 2); // L3 (Hold 3) @@ -1484,8 +1484,8 @@ static INPUT_PORTS_START( keno_903 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("43") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KB_11") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Exit") PORT_CODE(KEYCODE_X) // #84 0x54 TEST EXIT + PORT_START("KB_11") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Exit") PORT_CODE(KEYCODE_X) // #84 0x54 TEST EXIT PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_CANCEL ) // #83 0x53 CANCEL "N" PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("60") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("50") @@ -1921,7 +1921,7 @@ static INPUT_PORTS_START( comg208 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Learn") PORT_CODE(KEYCODE_7) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service/Clear") PORT_CODE(KEYCODE_8) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Data / Audit") PORT_CODE(KEYCODE_9) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Data / Audit") PORT_CODE(KEYCODE_9) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Mode") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2557,7 +2557,7 @@ static INPUT_PORTS_START( biggame ) INPUT_PORTS_END -static INPUT_PORTS_START( nudgensw ) // nudge bingo +static INPUT_PORTS_START( nudgensw ) // nudge bingo PORT_START("IN0-0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Nudge 1 Up") PORT_CODE(KEYCODE_A) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Nudge 2 Up") PORT_CODE(KEYCODE_S) @@ -2706,7 +2706,7 @@ static INPUT_PORTS_START( nudgesw ) PORT_INCLUDE( nudgensw ) PORT_MODIFY("SW1") // settings (PIA1), SW2 in schematics - PORT_DIPNAME( 0xc0, 0xc0, "Bet Options" ) PORT_DIPLOCATION("SW2:3,4") + PORT_DIPNAME( 0xc0, 0xc0, "Bet Options" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x00, "Play 1" ) PORT_DIPSETTING( 0x40, "Play 1 to 3" ) PORT_DIPSETTING( 0x80, "Play 1 to 4" ) @@ -2714,7 +2714,7 @@ static INPUT_PORTS_START( nudgesw ) INPUT_PORTS_END -static INPUT_PORTS_START( hotline ) // nudge bingo +static INPUT_PORTS_START( hotline ) // nudge bingo PORT_START("IN0-0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Move Up 1") PORT_CODE(KEYCODE_A) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Move Up 2") PORT_CODE(KEYCODE_S) @@ -3604,14 +3604,14 @@ static INPUT_PORTS_START( comg204 ) PORT_START("IN0-0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Play (Bet)") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL ) PORT_NAME("Deal / Draw") - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME("Hit (Pedir)") PORT_CODE(KEYCODE_V) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME("Hit (Pedir)") PORT_CODE(KEYCODE_V) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_STAND ) PORT_NAME("Stand") - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP ) PORT_NAME("Double") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP ) PORT_NAME("Double") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN0-1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Learn") PORT_CODE(KEYCODE_8) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Clr Data") PORT_CODE(KEYCODE_0) @@ -3619,7 +3619,7 @@ static INPUT_PORTS_START( comg204 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN0-2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -3629,7 +3629,7 @@ static INPUT_PORTS_START( comg204 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN0-3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Tilt") PORT_CODE(KEYCODE_T) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -4572,7 +4572,7 @@ void calomega_state::sys903(machine_config &config) ay8912.port_a_read_callback().set_ioport("SW3"); // from schematics ay8912.add_route(ALL_OUTPUTS, "mono", 0.75); - // acia 0 + // acia 0 ACIA6850(config, m_acia6850[0], 0); m_acia6850[0]->irq_handler().set_inputline("maincpu", M6502_IRQ_LINE); @@ -4596,11 +4596,11 @@ void calomega_state::sys903kb(machine_config &config) I8035(config, m_kstec, XTAL(5'185'000)); // from schematics m_kstec->set_addrmap(AS_PROGRAM, &calomega_state::kstec_mem_map); m_kstec->set_addrmap(AS_IO, &calomega_state::kstec_io_map); - m_kstec->p2_out_cb().set([this] (int data) { calomega_state::m_kbscan = (data & 0xf0) >> 4; }); // set keyboard scan lines - m_kstec->p1_in_cb().set(FUNC(calomega_state::keyb_903_r)); // get keyboard input lines - m_kstec->t0_in_cb().set("uart", FUNC(i8251_device::txrdy_r)); // uart tx handshake - m_kstec->t1_in_cb().set([this] () { return calomega_state::m_rxrdy; }); // uart rx handshake - + m_kstec->p2_out_cb().set([this] (int data) { calomega_state::m_kbscan = (data & 0xf0) >> 4; }); // set keyboard scan lines + m_kstec->p1_in_cb().set(FUNC(calomega_state::keyb_903_r)); // get keyboard input lines + m_kstec->t0_in_cb().set("uart", FUNC(i8251_device::txrdy_r)); // uart tx handshake + m_kstec->t1_in_cb().set([this] () { return calomega_state::m_rxrdy; }); // uart rx handshake + PIA6821(config, m_pia[0], 0); m_pia[0]->readpa_handler().set(FUNC(calomega_state::s903_mux_port_r)); m_pia[0]->readpb_handler().set(FUNC(calomega_state::dummy_pia_r)); // Debug: some dipsw maybe??? @@ -4645,14 +4645,14 @@ void calomega_state::sys903kb(machine_config &config) ay8912.port_a_read_callback().set_ioport("SW3"); // from schematics ay8912.add_route(ALL_OUTPUTS, "mono", 0.75); - // acia 0 + // acia 0 ACIA6850(config, m_acia6850[0], 0); m_acia6850[0]->txd_handler().set("uart", FUNC(i8251_device::write_rxd)); - m_acia6850[0]->irq_handler().set_inputline("maincpu", M6502_IRQ_LINE); + m_acia6850[0]->irq_handler().set_inputline("maincpu", M6502_IRQ_LINE); I8251(config, m_uart, 5'185'000); - m_uart->txd_handler().set("acia6850_0", FUNC(acia6850_device::write_rxd)); - m_uart->rxrdy_handler().set([this] (int state) { calomega_state::m_rxrdy = state;}); + m_uart->txd_handler().set("acia6850_0", FUNC(acia6850_device::write_rxd)); + m_uart->rxrdy_handler().set([this] (int state) { calomega_state::m_rxrdy = state;}); clock_device &aciabaud(CLOCK(config, "aciabaud", UART_CLOCK)); aciabaud.signal_handler().set(FUNC(calomega_state::w_903kb_acia_clock)); @@ -4813,7 +4813,7 @@ ROM_END ROM_START( comg079 ) // Cal Omega v7.9 (Arcade Poker) /* The original code jumps to $2e64 where there's an inexistent mnemonic 0x32! (kill). - Also writes to $axxx (inexistent) and $08fx-$09xx (supposed to be $0880-$0881). + Also writes to $axxx (inexistent) and $08fx-$09xx (supposed to be $0880-$0881). Found damaged bits on this program ROM. Fix details on init(). */ ROM_REGION( 0x10000, "maincpu", 0 ) @@ -5851,126 +5851,126 @@ void calomega_state::init_comg079() uint8_t *PRGROM = memregion( "maincpu" )->base(); PRGROM[0x2ad2] = 0x00; // checksum flag (0xe0) - PRGROM[0x2CD1] = 0x33; - PRGROM[0x2CD3] = 0x5A; - PRGROM[0x2CD5] = 0x76; - PRGROM[0x2CD9] = 0x13; - PRGROM[0x2CDB] = 0x30; - PRGROM[0x2CDD] = 0x06; - PRGROM[0x2D01] = 0x10; - PRGROM[0x2D06] = 0x36; - PRGROM[0x2D07] = 0x20; - PRGROM[0x2D08] = 0x7D; - PRGROM[0x2D09] = 0x3D; - PRGROM[0x2D0A] = 0x60; - PRGROM[0x2D30] = 0x26; - PRGROM[0x2D31] = 0x00; - PRGROM[0x2D33] = 0x00; - PRGROM[0x2D35] = 0x25; - PRGROM[0x2D36] = 0x00; - PRGROM[0x2D37] = 0x4C; - PRGROM[0x2D39] = 0x34; - PRGROM[0x2D3B] = 0x00; - PRGROM[0x2D3C] = 0x38; - PRGROM[0x2D3E] = 0x40; - PRGROM[0x2D3F] = 0x48; - PRGROM[0x2D41] = 0x01; - PRGROM[0x2D44] = 0x48; - PRGROM[0x2D46] = 0x02; - PRGROM[0x2D48] = 0x0F; - PRGROM[0x2D4A] = 0x0B; - PRGROM[0x2D4C] = 0x02; - PRGROM[0x2D4F] = 0x01; - PRGROM[0x2D50] = 0x68; - PRGROM[0x2D52] = 0x00; - PRGROM[0x2D53] = 0x4C; - PRGROM[0x2D54] = 0x3A; - PRGROM[0x2D55] = 0x2D; - PRGROM[0x2D56] = 0x68; - PRGROM[0x2D57] = 0x68; - PRGROM[0x2D58] = 0x60; - PRGROM[0x2D5A] = 0x00; - PRGROM[0x2D5C] = 0x06; - PRGROM[0x2D5E] = 0x01; - PRGROM[0x2D60] = 0x02; - PRGROM[0x2D62] = 0x02; - PRGROM[0x2D63] = 0x20; - PRGROM[0x2D64] = 0x3A; - PRGROM[0x2D65] = 0x2D; - PRGROM[0x2D66] = 0x60; - PRGROM[0x2D68] = 0x00; - PRGROM[0x2D6A] = 0x08; - PRGROM[0x2D6C] = 0x01; - PRGROM[0x2D6E] = 0x02; - PRGROM[0x2D79] = 0x0A; - PRGROM[0x2D7B] = 0x06; - PRGROM[0x2D80] = 0x78; - PRGROM[0x2D81] = 0x2D; - PRGROM[0x2D82] = 0x09; - PRGROM[0x2D84] = 0x60; - PRGROM[0x2D86] = 0x00; - PRGROM[0x2D87] = 0xBE; - PRGROM[0x2D88] = 0x97; - PRGROM[0x2D89] = 0x2D; - PRGROM[0x2D8C] = 0x97; - PRGROM[0x2D8F] = 0x9D; - PRGROM[0x2D90] = 0x00; - PRGROM[0x2D98] = 0x04; - PRGROM[0x2D9C] = 0x00; - PRGROM[0x2DAC] = 0x04; - PRGROM[0x2DB0] = 0x04; - PRGROM[0x2DB4] = 0x00; - PRGROM[0x2DB6] = 0x0F; - PRGROM[0x2DB8] = 0x04; - PRGROM[0x2DBC] = 0x04; - PRGROM[0x2DD1] = 0x20; - PRGROM[0x2DD3] = 0x00; - PRGROM[0x2DD5] = 0x00; - PRGROM[0x2DD6] = 0x10; - PRGROM[0x2DD7] = 0x99; - PRGROM[0x2DD9] = 0x11; - PRGROM[0x2DDB] = 0x00; - PRGROM[0x2DDD] = 0x99; - PRGROM[0x2DDE] = 0x00; - PRGROM[0x2DE3] = 0x8A; - PRGROM[0x2DE5] = 0x00; - PRGROM[0x2DE6] = 0x99; - PRGROM[0x2DE7] = 0x00; - PRGROM[0x2DE8] = 0x14; - PRGROM[0x2DE9] = 0x99; - PRGROM[0x2DEA] = 0x00; - PRGROM[0x2DEB] = 0x15; - PRGROM[0x2DED] = 0x00; - PRGROM[0x2DEE] = 0x16; - PRGROM[0x2DEF] = 0x99; - PRGROM[0x2E01] = 0x90; - PRGROM[0x2E03] = 0x45; - PRGROM[0x2E05] = 0x49; - PRGROM[0x2E06] = 0x01; - PRGROM[0x2E07] = 0x4A; - PRGROM[0x2E09] = 0x90; - PRGROM[0x2E0B] = 0x91; - PRGROM[0x2E0D] = 0x92; - PRGROM[0x2E0F] = 0x93; - PRGROM[0x2E30] = 0xE0; - PRGROM[0x2E31] = 0x12; - PRGROM[0x2E32] = 0x90; - PRGROM[0x2E34] = 0xAD; - PRGROM[0x2E35] = 0xC4; - PRGROM[0x2E36] = 0x08; - PRGROM[0x2E37] = 0x29; - PRGROM[0x2E38] = 0x80; - PRGROM[0x2E39] = 0xD0; - PRGROM[0x2E3A] = 0x13; - PRGROM[0x2E3B] = 0xA0; - PRGROM[0x2E3C] = 0x00; - PRGROM[0x2E3E] = 0x04; - PRGROM[0x2E67] = 0x2E; - PRGROM[0x2E68] = 0x8D; - PRGROM[0x2E69] = 0x08; - PRGROM[0x2E6A] = 0x00; - PRGROM[0x2E6E] = 0x8D; - PRGROM[0x2E6F] = 0x09; + PRGROM[0x2CD1] = 0x33; + PRGROM[0x2CD3] = 0x5A; + PRGROM[0x2CD5] = 0x76; + PRGROM[0x2CD9] = 0x13; + PRGROM[0x2CDB] = 0x30; + PRGROM[0x2CDD] = 0x06; + PRGROM[0x2D01] = 0x10; + PRGROM[0x2D06] = 0x36; + PRGROM[0x2D07] = 0x20; + PRGROM[0x2D08] = 0x7D; + PRGROM[0x2D09] = 0x3D; + PRGROM[0x2D0A] = 0x60; + PRGROM[0x2D30] = 0x26; + PRGROM[0x2D31] = 0x00; + PRGROM[0x2D33] = 0x00; + PRGROM[0x2D35] = 0x25; + PRGROM[0x2D36] = 0x00; + PRGROM[0x2D37] = 0x4C; + PRGROM[0x2D39] = 0x34; + PRGROM[0x2D3B] = 0x00; + PRGROM[0x2D3C] = 0x38; + PRGROM[0x2D3E] = 0x40; + PRGROM[0x2D3F] = 0x48; + PRGROM[0x2D41] = 0x01; + PRGROM[0x2D44] = 0x48; + PRGROM[0x2D46] = 0x02; + PRGROM[0x2D48] = 0x0F; + PRGROM[0x2D4A] = 0x0B; + PRGROM[0x2D4C] = 0x02; + PRGROM[0x2D4F] = 0x01; + PRGROM[0x2D50] = 0x68; + PRGROM[0x2D52] = 0x00; + PRGROM[0x2D53] = 0x4C; + PRGROM[0x2D54] = 0x3A; + PRGROM[0x2D55] = 0x2D; + PRGROM[0x2D56] = 0x68; + PRGROM[0x2D57] = 0x68; + PRGROM[0x2D58] = 0x60; + PRGROM[0x2D5A] = 0x00; + PRGROM[0x2D5C] = 0x06; + PRGROM[0x2D5E] = 0x01; + PRGROM[0x2D60] = 0x02; + PRGROM[0x2D62] = 0x02; + PRGROM[0x2D63] = 0x20; + PRGROM[0x2D64] = 0x3A; + PRGROM[0x2D65] = 0x2D; + PRGROM[0x2D66] = 0x60; + PRGROM[0x2D68] = 0x00; + PRGROM[0x2D6A] = 0x08; + PRGROM[0x2D6C] = 0x01; + PRGROM[0x2D6E] = 0x02; + PRGROM[0x2D79] = 0x0A; + PRGROM[0x2D7B] = 0x06; + PRGROM[0x2D80] = 0x78; + PRGROM[0x2D81] = 0x2D; + PRGROM[0x2D82] = 0x09; + PRGROM[0x2D84] = 0x60; + PRGROM[0x2D86] = 0x00; + PRGROM[0x2D87] = 0xBE; + PRGROM[0x2D88] = 0x97; + PRGROM[0x2D89] = 0x2D; + PRGROM[0x2D8C] = 0x97; + PRGROM[0x2D8F] = 0x9D; + PRGROM[0x2D90] = 0x00; + PRGROM[0x2D98] = 0x04; + PRGROM[0x2D9C] = 0x00; + PRGROM[0x2DAC] = 0x04; + PRGROM[0x2DB0] = 0x04; + PRGROM[0x2DB4] = 0x00; + PRGROM[0x2DB6] = 0x0F; + PRGROM[0x2DB8] = 0x04; + PRGROM[0x2DBC] = 0x04; + PRGROM[0x2DD1] = 0x20; + PRGROM[0x2DD3] = 0x00; + PRGROM[0x2DD5] = 0x00; + PRGROM[0x2DD6] = 0x10; + PRGROM[0x2DD7] = 0x99; + PRGROM[0x2DD9] = 0x11; + PRGROM[0x2DDB] = 0x00; + PRGROM[0x2DDD] = 0x99; + PRGROM[0x2DDE] = 0x00; + PRGROM[0x2DE3] = 0x8A; + PRGROM[0x2DE5] = 0x00; + PRGROM[0x2DE6] = 0x99; + PRGROM[0x2DE7] = 0x00; + PRGROM[0x2DE8] = 0x14; + PRGROM[0x2DE9] = 0x99; + PRGROM[0x2DEA] = 0x00; + PRGROM[0x2DEB] = 0x15; + PRGROM[0x2DED] = 0x00; + PRGROM[0x2DEE] = 0x16; + PRGROM[0x2DEF] = 0x99; + PRGROM[0x2E01] = 0x90; + PRGROM[0x2E03] = 0x45; + PRGROM[0x2E05] = 0x49; + PRGROM[0x2E06] = 0x01; + PRGROM[0x2E07] = 0x4A; + PRGROM[0x2E09] = 0x90; + PRGROM[0x2E0B] = 0x91; + PRGROM[0x2E0D] = 0x92; + PRGROM[0x2E0F] = 0x93; + PRGROM[0x2E30] = 0xE0; + PRGROM[0x2E31] = 0x12; + PRGROM[0x2E32] = 0x90; + PRGROM[0x2E34] = 0xAD; + PRGROM[0x2E35] = 0xC4; + PRGROM[0x2E36] = 0x08; + PRGROM[0x2E37] = 0x29; + PRGROM[0x2E38] = 0x80; + PRGROM[0x2E39] = 0xD0; + PRGROM[0x2E3A] = 0x13; + PRGROM[0x2E3B] = 0xA0; + PRGROM[0x2E3C] = 0x00; + PRGROM[0x2E3E] = 0x04; + PRGROM[0x2E67] = 0x2E; + PRGROM[0x2E68] = 0x8D; + PRGROM[0x2E69] = 0x08; + PRGROM[0x2E6A] = 0x00; + PRGROM[0x2E6E] = 0x8D; + PRGROM[0x2E6F] = 0x09; } void calomega_state::init_comg080() @@ -6009,7 +6009,7 @@ void calomega_state::init_comg176() void calomega_state::init_any() { uint8_t *PRGROM = memregion( "maincpu" )->base(); - PRGROM[0x0000] = 0x00; + PRGROM[0x0000] = 0x00; } diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp index 6137c7df8e3..3818d6c7a37 100644 --- a/src/mame/drivers/commando.cpp +++ b/src/mame/drivers/commando.cpp @@ -278,7 +278,7 @@ void commando_state::commando(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(XTAL / 2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(XTAL / 2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(commando_state::screen_update_commando)); screen.screen_vblank().set(m_spriteram, FUNC(buffered_spriteram8_device::vblank_copy_rising)); screen.screen_vblank().append(FUNC(commando_state::vblank_irq)); diff --git a/src/mame/drivers/diamondking.cpp b/src/mame/drivers/diamondking.cpp index 80761ac9dea..230e4aba584 100644 --- a/src/mame/drivers/diamondking.cpp +++ b/src/mame/drivers/diamondking.cpp @@ -93,7 +93,7 @@ REEL1->|C| A |K6T0808C10 | ____________ |__|| | _________ | | __________ |HCF4094BE _________ | | |CI-2 unused |HCF4094BE | - | __________ __________ | + | __________ __________ | | |411GR-001| |411GR-001| | |SEGASA-SONIC __________ O <- LED __________ __________ | |1B-2006-283 |HCF4094BE| ___________ ___________ |_74LS14N_| |HCF4094BE| | diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index 8e86dae7aa6..4fb5682372e 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -408,7 +408,7 @@ void gng_state::gng(machine_config &config) BUFFERED_SPRITERAM8(config, m_spriteram); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(XTAL(12'000'000)/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(XTAL(12'000'000)/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(gng_state::screen_update_gng)); screen.screen_vblank().set(m_spriteram, FUNC(buffered_spriteram8_device::vblank_copy_rising)); screen.set_palette(m_palette); diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp index b2d21f72057..866157d1bf7 100644 --- a/src/mame/drivers/gunpey.cpp +++ b/src/mame/drivers/gunpey.cpp @@ -240,7 +240,7 @@ constexpr u32 get_video_addr(u16 x, u16 y) return (x & 0x7ff) | (u32(y & 0x7ff) << 11); } - + class gunpey_state : public driver_device { public: diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp index b4b9d797310..a7985a71f47 100644 --- a/src/mame/drivers/gunsmoke.cpp +++ b/src/mame/drivers/gunsmoke.cpp @@ -320,7 +320,7 @@ void gunsmoke_state::gunsmoke(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(gunsmoke_state::screen_update_gunsmoke)); screen.set_palette(m_palette); diff --git a/src/mame/drivers/jpmimpctsw.cpp b/src/mame/drivers/jpmimpctsw.cpp index dd1c68c0937..0f3f0682f7a 100644 --- a/src/mame/drivers/jpmimpctsw.cpp +++ b/src/mame/drivers/jpmimpctsw.cpp @@ -12531,7 +12531,7 @@ GAME( 199?, j6tbrdclj, j6tbrdcl, impact_nonvideo, j6tbrdclg,jpmimpct_state GAME( 199?, j6tbrdclk, j6tbrdcl, impact_nonvideo, j6tbrdcl, jpmimpct_state, empty_init, ROT0, "JPM", "Thunderbirds Club (JPM) (IMPACT) (set 12)", GAME_FLAGS ) GAME( 199?, j6tbrdcll, j6tbrdcl, impact_nonvideo, j6tbrdcl, jpmimpct_state, empty_init, ROT0, "JPM", "Thunderbirds Club (JPM) (IMPACT) (set 13)", GAME_FLAGS ) -GAMEL( 199?, j6tomb, 0, impact_nonvideo, j6tomb, jpmimpct_state, empty_init, ROT0, "JPM", "Tomb Raider (JPM) (IMPACT) (set 1)", GAME_FLAGS, layout_j6tombc ) //inputs +GAMEL( 199?, j6tomb, 0, impact_nonvideo, j6tomb, jpmimpct_state, empty_init, ROT0, "JPM", "Tomb Raider (JPM) (IMPACT) (set 1)", GAME_FLAGS, layout_j6tombc ) //inputs GAMEL( 199?, j6tomba, j6tomb, impact_nonvideo, j6tomb, jpmimpct_state, empty_init, ROT0, "JPM", "Tomb Raider (JPM) (IMPACT) (set 2)", GAME_FLAGS, layout_j6tombc ) GAMEL( 199?, j6tombb, j6tomb, impact_nonvideo, j6tomb, jpmimpct_state, empty_init, ROT0, "JPM", "Tomb Raider (JPM) (IMPACT) (set 3)", GAME_FLAGS, layout_j6tombc ) GAMEL( 199?, j6tombc, j6tomb, impact_nonvideo, j6tomb, jpmimpct_state, empty_init, ROT0, "JPM", "Tomb Raider (JPM) (IMPACT) (set 4)", GAME_FLAGS, layout_j6tombc ) diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp index 221413140b4..fb66bf2408e 100644 --- a/src/mame/drivers/ladybug.cpp +++ b/src/mame/drivers/ladybug.cpp @@ -58,7 +58,7 @@ Mrs. Dynamite Space Raider Space Raider also uses the Starfield generator board from Zero Hour, - Connected via flywires to these boards + Connected via flywires to these boards TODO: @@ -147,11 +147,11 @@ void dorodon_state::decrypted_opcodes_map(address_map &map) void mrsdyna_state::mrsdyna_cpu1_map(address_map &map) { // LS138 @ J4 - map(0x0000, 0x5fff).rom(); // 2764s at R4, N4, and M4 + map(0x0000, 0x5fff).rom(); // 2764s at R4, N4, and M4 // LS138 @ J4 and LS139 @ H4 map(0x6000, 0x6fff).ram(); // 6116s @ K3 & M3, also connected to clk on PAL K2 (16R6, U001) - map(0x7000, 0x73ff).w("video", FUNC(ladybug_video_device::spr_w)); // pin 29 on ribbon - //map(0x77ff, 0x7fff); // LS139 @ H4 pin7 is NC + map(0x7000, 0x73ff).w("video", FUNC(ladybug_video_device::spr_w)); // pin 29 on ribbon + //map(0x77ff, 0x7fff); // LS139 @ H4 pin7 is NC // LS138 @ J4, Pin11 (0x8000-0x9fff) and // LS138 @ N3 (bottom 3 bits) diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 0d4f71d4bb1..0b5762b5261 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -1781,7 +1781,7 @@ ROM_START( dokaben2 ) ROM_REGION( 0x100000, "gfx1", ROMREGION_ERASEFF ) ROM_LOAD( "d2_02.1e", 0x000000, 0x20000, CRC(5dd7b941) SHA1(b0e93e733b9bbabe68896c92af34b90daf8dcd7c) ) /* chars */ ROM_LOAD( "d2_03.2e", 0x020000, 0x20000, CRC(b615e696) SHA1(f1ec11202fce23af4af15682b158795f7ff4234f) ) - /* 40000-7ffff empty */ + /* 40000-7ffff empty */ ROM_LOAD( "d2_04.1g", 0x080000, 0x20000, CRC(56b35605) SHA1(c065b03b5cb00ac75b8b439a4f35d9b04a886626) ) ROM_LOAD( "d2_05.2g", 0x0a0000, 0x20000, CRC(ce98ff74) SHA1(ddae2e035369886ab03074e947405ef916cc425a) ) /* c0000-fffff empty */ diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 287fcd89a42..d551daa213c 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -15,7 +15,7 @@ - CMT support (-13/-36 cbus only, identify which models mounted it off the bat); - Write a PC80S31K device for 2d type floppies (also used on PC-8801 and PC-88VA, it's the FDC + Z80 sub-system); - - DAC1BIT has a bit of clicking with start/end of samples, is it fixable or just a btanb? + - DAC1BIT has a bit of clicking with start/end of samples, is it fixable or just a btanb? - clean-ups & split into separate devices and driver flavours; - derive romsets by default options (cfr. 3.5 2HD floppies vs. default 5.25, 2D/2DD etc.); - Remove kludge for POR bit in a20_ctrl_w fn; @@ -2150,7 +2150,7 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801f) for(i=0;i<0x1000;i++) ROM[i] = PRG[i+op_mode*0x8000+0x10000]; - + m_beeper->set_state(0); } @@ -2171,7 +2171,7 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801rs) else m_maincpu->space(AS_PROGRAM).install_rom(0xd8000, 0xd9fff, memregion("ide")->base() + 0x2000); } - + m_dac_disable = true; } @@ -2359,7 +2359,7 @@ void pc9801_state::pc9801_common(machine_config &config) m_ppi_sys->in_pa_callback().set_ioport("DSW2"); m_ppi_sys->in_pb_callback().set_ioport("DSW1"); m_ppi_sys->in_pc_callback().set_constant(0xa0); // 0x80 cpu triple fault reset flag? -// m_ppi_sys->out_pc_callback().set(FUNC(pc9801_state::ppi_sys_portc_w)); +// m_ppi_sys->out_pc_callback().set(FUNC(pc9801_state::ppi_sys_portc_w)); I8255(config, m_ppi_prn, 0); // TODO: check this one @@ -2465,7 +2465,7 @@ void pc9801_state::pc9801rs(machine_config &config) m_hgdc2->set_addrmap(0, &pc9801_state::upd7220_grcg_2_map); -// DAC_1BIT(config, m_dac, 0).set_output_range(-1, 1).add_route(ALL_OUTPUTS, "mono", 0.15); +// DAC_1BIT(config, m_dac, 0).set_output_range(-1, 1).add_route(ALL_OUTPUTS, "mono", 0.15); SPEAKER_SOUND(config, m_dac).add_route(ALL_OUTPUTS, "mono", 0.40); PALETTE(config, m_palette, FUNC(pc9801_state::pc9801_palette), 16 + 16); } diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index 17fba19bd90..68732d64797 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -3130,7 +3130,7 @@ GAME( 1993, raiden2i, raiden2, raiden2, raiden2, raiden2_state, init_raiden // code rev with first ROM having checksum 2abc848c GAME( 1993, raiden2e, raiden2, raiden2, raiden2, raiden2_state, init_raiden2, ROT270, "Seibu Kaihatsu", "Raiden II (easier, Korea)", MACHINE_SUPPORTS_SAVE ) // (Region 0x04) - Korea, if regions are the same as RDX, no license or region message tho -GAME( 1993, raiden2eub, raiden2, raiden2, raiden2, raiden2_state, init_raiden2, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden II (easier, US set 3)", MACHINE_SUPPORTS_SAVE ) // (Region 0x01) - PRG0 is same as raiden2e, but PRG1 has region byte different than raiden2e, other ROMs match raiden2u +GAME( 1993, raiden2eub, raiden2, raiden2, raiden2, raiden2_state, init_raiden2, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden II (easier, US set 3)", MACHINE_SUPPORTS_SAVE ) // (Region 0x01) - PRG0 is same as raiden2e, but PRG1 has region byte different than raiden2e, other ROMs match raiden2u // code rev with first ROM having checksum ed1514e3 (using 4x program ROM configuration, not 2) would have crc 2abc848c in 2 ROM config, so same rev as above GAME( 1993, raiden2eua, raiden2, raiden2, raiden2, raiden2_state, init_raiden2, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden II (easier, US set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1993, raiden2eg, raiden2, raiden2, raiden2, raiden2_state, init_raiden2, ROT270, "Seibu Kaihatsu (Tuning license)", "Raiden II (easier, Germany)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/rfslotsmcs48.cpp b/src/mame/drivers/rfslotsmcs48.cpp index a82e32c74be..235ac52ccc4 100644 --- a/src/mame/drivers/rfslotsmcs48.cpp +++ b/src/mame/drivers/rfslotsmcs48.cpp @@ -54,7 +54,7 @@ protected: required_device m_maincpu; required_device m_audiocpu; }; - + INPUT_PORTS_START(ajofrin) INPUT_PORTS_END diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp index d07492a7809..099eccd1026 100644 --- a/src/mame/drivers/rmnimbus.cpp +++ b/src/mame/drivers/rmnimbus.cpp @@ -214,11 +214,11 @@ void rmnimbus_state::nimbus(machine_config &config) /* Known unavailable BIOS set: - Another version of v1.31a labelled: SYS1 16128 31/10/86, SYS2 16129 28/10/86 - Another version of v1.32c labelled: SYS1 17130 10.03.87, SYS 2. 17131 09.03.87 - Another version of v1.32c labelled: SYS 1 21323 2/12/88, SYS 2 21324 5/1/89 - v1.33c labelled "RESEARCH MACHINE P.N. 32857(32858) PC186 SYS1(SYS2) V1.33C", no date labelled - Another version of v1.40d labelled: 24693 IC30 02/7/91(AA), 24694 IC27 28/6/91(AA) + Another version of v1.31a labelled: SYS1 16128 31/10/86, SYS2 16129 28/10/86 + Another version of v1.32c labelled: SYS1 17130 10.03.87, SYS 2. 17131 09.03.87 + Another version of v1.32c labelled: SYS 1 21323 2/12/88, SYS 2 21324 5/1/89 + v1.33c labelled "RESEARCH MACHINE P.N. 32857(32858) PC186 SYS1(SYS2) V1.33C", no date labelled + Another version of v1.40d labelled: 24693 IC30 02/7/91(AA), 24694 IC27 28/6/91(AA) */ ROM_START( nimbus ) ROM_REGION( 0x100000, MAINCPU_TAG, 0 ) @@ -226,7 +226,7 @@ ROM_START( nimbus ) ROM_SYSTEM_BIOS(0, "v125a", "Nimbus BIOS v1.25a (1985-12-02)") ROMX_LOAD("sys1-1.25a_13484_6-11-85_m5m27256p.rom", 0xf0001, 0x8000, CRC(5870df28) SHA1(12e1a7d22439d512b221c355d641d113f0e6568e), ROM_SKIP(1) | ROM_BIOS(0)) ROMX_LOAD("sys2-1.25a_13485_2-12-85_m5m27256p.rom", 0xf0000, 0x8000, CRC(15888320) SHA1(32cc2485468c6a9944e505162e319a283eef8a84), ROM_SKIP(1) | ROM_BIOS(0)) - + ROM_SYSTEM_BIOS(1, "v131a", "Nimbus BIOS v1.31a (1986-06-18)") ROMX_LOAD("sys1-1.31a-16128-1986-06-18.rom", 0xf0001, 0x8000, CRC(6416eb05) SHA1(1b640163a7efbc24381c7b24976a8609c066959b), ROM_SKIP(1) | ROM_BIOS(1)) ROMX_LOAD("sys2-1.31a-16129-1986-06-18.rom", 0xf0000, 0x8000, CRC(b224359d) SHA1(456bbe37afcd4429cca76ba2d6bd534dfda3fc9c), ROM_SKIP(1) | ROM_BIOS(1)) @@ -238,7 +238,7 @@ ROM_START( nimbus ) ROM_SYSTEM_BIOS(3, "v132d", "Nimbus BIOS v1.32d (1989-01-20)") ROMX_LOAD("sys1-1.32d_21323_17-1-89_m5m27256p_63210c.rom", 0xf0001, 0x8000, CRC(e0ecbc02) SHA1(b5cb16df23bd30af5556660364e4733790f99164), ROM_SKIP(1) | ROM_BIOS(3)) ROMX_LOAD("sys2-1.32d_21324_20-1-89_m5m27256p_63210c.rom", 0xf0000, 0x8000, CRC(8ef4a357) SHA1(29309cb8bfe9256d4684f3e6575e3720b0dcacd4), ROM_SKIP(1) | ROM_BIOS(3)) - + ROM_SYSTEM_BIOS(4, "v132f", "Nimbus BIOS v1.32f (1989-11-29)") ROMX_LOAD("sys-1-1.32f-22779-1989-11-29.rom", 0xf0001, 0x8000, CRC(786c31e8) SHA1(da7f828f7f96087518bea1a3d89fee59b283b4ba), ROM_SKIP(1) | ROM_BIOS(4)) ROMX_LOAD("sys-2-1.32f-22778-1989-11-29.rom", 0xf0000, 0x8000, CRC(0be3db64) SHA1(af806405ec6fbc20385705f90d5059a47de17b08), ROM_SKIP(1) | ROM_BIOS(4)) diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp index 874804aa4bb..856056f586f 100644 --- a/src/mame/drivers/sprint2.cpp +++ b/src/mame/drivers/sprint2.cpp @@ -193,14 +193,14 @@ uint8_t sprint2_state::sync_r() } -template +template uint8_t sprint2_state::steering_r() { return m_steering[Which]; } -template +template void sprint2_state::steering_reset_w(uint8_t data) { m_steering[Which] |= 0x80; diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index 34f5a062f41..26f1f01315e 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -431,7 +431,7 @@ void supduck_state::supduck(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(supduck_state::screen_update)); screen.set_palette(m_palette); screen.screen_vblank().set(m_spriteram, FUNC(buffered_spriteram16_device::vblank_copy_rising)); diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index d91a1baecd0..03655143e3c 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -634,7 +634,7 @@ void tigeroad_state::tigeroad(machine_config &config) // Timings may be different, driver originally had 60.08Hz vblank. screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(tigeroad_state::screen_update)); screen.screen_vblank().set("spriteram", FUNC(buffered_spriteram16_device::vblank_copy_rising)); screen.set_palette(m_palette); @@ -713,7 +713,7 @@ void tigeroad_state::f1dream_comad(machine_config &config) BUFFERED_SPRITERAM16(config, "spriteram"); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(6000000, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(tigeroad_state::screen_update)); screen.screen_vblank().set("spriteram", FUNC(buffered_spriteram16_device::vblank_copy_rising)); screen.set_palette(m_palette); diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp index 97c7dd8189a..d15f826c8f1 100644 --- a/src/mame/drivers/vulgus.cpp +++ b/src/mame/drivers/vulgus.cpp @@ -229,7 +229,7 @@ void vulgus_state::vulgus(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(XTAL(12'000'000)/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 + screen.set_raw(XTAL(12'000'000)/2, 384, 128, 0, 262, 22, 246); // hsync is 50..77, vsync is 257..259 screen.set_screen_update(FUNC(vulgus_state::screen_update)); screen.set_palette(m_palette); diff --git a/src/mame/drivers/ympsr340.cpp b/src/mame/drivers/ympsr340.cpp index 7f748690ea5..1605eda99c2 100644 --- a/src/mame/drivers/ympsr340.cpp +++ b/src/mame/drivers/ympsr340.cpp @@ -100,7 +100,7 @@ void psr340_state::psr340_map(address_map &map) map(0x600000, 0x600000).lr8(NAME([]() -> uint8_t { return 0x80; })); // FDC status -// map(0xffe000, 0xffe7ff).ram(); +// map(0xffe000, 0xffe7ff).ram(); map(0xffe027, 0xffe027).r(FUNC(psr340_state::matrix_r)); diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h index 5a02553bc0b..661724c243a 100644 --- a/src/mame/includes/pc9801.h +++ b/src/mame/includes/pc9801.h @@ -178,7 +178,7 @@ private: required_shared_ptr m_video_ram_2; optional_shared_ptr m_ext_gvram; optional_device m_beeper; -// optional_device m_dac; +// optional_device m_dac; optional_device m_dac; optional_device m_ram; optional_device m_ipl; diff --git a/src/mame/layout/j6drdogh.lay b/src/mame/layout/j6drdogh.lay index 8a8f8339653..f545e97c9ac 100644 --- a/src/mame/layout/j6drdogh.lay +++ b/src/mame/layout/j6drdogh.lay @@ -4649,4 +4649,4 @@ - \ No newline at end of file + diff --git a/src/mame/layout/j6guabc.lay b/src/mame/layout/j6guabc.lay index 6fc1c0103ea..c705d92717c 100644 --- a/src/mame/layout/j6guabc.lay +++ b/src/mame/layout/j6guabc.lay @@ -7727,4 +7727,4 @@ - \ No newline at end of file + diff --git a/src/mame/layout/j6indy6.lay b/src/mame/layout/j6indy6.lay index 13f259729ca..184a752ac50 100644 --- a/src/mame/layout/j6indy6.lay +++ b/src/mame/layout/j6indy6.lay @@ -3973,4 +3973,4 @@ - \ No newline at end of file + diff --git a/src/mame/layout/j6indy8.lay b/src/mame/layout/j6indy8.lay index 3e17d69abcd..aa4218a4488 100644 --- a/src/mame/layout/j6indy8.lay +++ b/src/mame/layout/j6indy8.lay @@ -3973,4 +3973,4 @@ - \ No newline at end of file + diff --git a/src/mame/layout/j6reelmn.lay b/src/mame/layout/j6reelmn.lay index 5c126eeabca..3432f175277 100644 --- a/src/mame/layout/j6reelmn.lay +++ b/src/mame/layout/j6reelmn.lay @@ -2759,4 +2759,4 @@ - \ No newline at end of file + diff --git a/src/mame/layout/j6sonic10.lay b/src/mame/layout/j6sonic10.lay index 58fde3b1fa8..1cdadb70b31 100644 --- a/src/mame/layout/j6sonic10.lay +++ b/src/mame/layout/j6sonic10.lay @@ -4198,4 +4198,4 @@ - \ No newline at end of file + diff --git a/src/mame/layout/j6wldkng.lay b/src/mame/layout/j6wldkng.lay index 288451ff6ac..ba0ffe20c8a 100644 --- a/src/mame/layout/j6wldkng.lay +++ b/src/mame/layout/j6wldkng.lay @@ -2213,4 +2213,4 @@ - \ No newline at end of file + diff --git a/src/mame/layout/kenokb.lay b/src/mame/layout/kenokb.lay index 85e472153da..7af332784a3 100644 --- a/src/mame/layout/kenokb.lay +++ b/src/mame/layout/kenokb.lay @@ -70,7 +70,7 @@ license:CC0 - + @@ -79,34 +79,34 @@ license:CC0 - + - + - + - + - + @@ -117,7 +117,7 @@ license:CC0 - + @@ -170,26 +170,26 @@ license:CC0 - + - + - + - + - + - + diff --git a/src/mame/machine/sorcerer.cpp b/src/mame/machine/sorcerer.cpp index b76c42258d0..6e3f547784f 100644 --- a/src/mame/machine/sorcerer.cpp +++ b/src/mame/machine/sorcerer.cpp @@ -559,9 +559,9 @@ QUICKLOAD_LOAD_MEMBER(sorcerer_state::quickload_cb) 1. A start address of 01D5 indicates a basic program which needs its pointers fixed up. 2. If autorunning, jump to C689 (command processor), else jump to C3DD (READY prompt). Important addresses: - 01D5 = start (load) address of a conventional basic program - C858 = an autorun basic program will have this exec address on the tape - C3DD = part of basic that displays READY and lets user enter input */ + 01D5 = start (load) address of a conventional basic program + C858 = an autorun basic program will have this exec address on the tape + C3DD = part of basic that displays READY and lets user enter input */ if (((start_address == 0x1d5) || (execute_address == 0xc858)) && (space.read_byte(0xdffa) == 0xc3)) { diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h index 1c93428d876..4845bd301b2 100644 --- a/src/osd/sdl/osdsdl.h +++ b/src/osd/sdl/osdsdl.h @@ -16,7 +16,7 @@ #define SDLOPTION_INIPATH "inipath" #define SDLOPTION_SDLVIDEOFPS "sdlvideofps" #define SDLOPTION_USEALLHEADS "useallheads" -#define SDLOPTION_ATTACH_WINDOW "attach_window" +#define SDLOPTION_ATTACH_WINDOW "attach_window" #define SDLOPTION_CENTERH "centerh" #define SDLOPTION_CENTERV "centerv" diff --git a/src/tools/floptool.cpp b/src/tools/floptool.cpp index 0a0b5b5f4b8..bff08afb600 100644 --- a/src/tools/floptool.cpp +++ b/src/tools/floptool.cpp @@ -2,7 +2,7 @@ // copyright-holders:Olivier Galibert /*************************************************************************** - (Floppy) image command-line manager + (Floppy) image command-line manager ***************************************************************************/ @@ -568,7 +568,7 @@ static int generic_dir(const filesystem_manager_t *fm, fsblk_t &blockdev) std::unordered_map nmap; for(size_t i = 0; i != names.size(); i++) nmap[names[i]] = i; - + auto root = load_fs->root(); std::vector> entries; @@ -593,7 +593,7 @@ static int generic_dir(const filesystem_manager_t *fm, fsblk_t &blockdev) } printf("%s\n", l.c_str()); } - + return 0; }