diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/bus/rs232/exorterm.cpp | 1 | ||||
-rw-r--r-- | src/devices/cpu/gigatron/gigatron.cpp | 6 | ||||
-rw-r--r-- | src/devices/machine/exorterm.cpp | 15 | ||||
-rw-r--r-- | src/devices/machine/v3021.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/v3021.h | 2 | ||||
-rw-r--r-- | src/devices/sound/k053260.cpp | 1 | ||||
-rw-r--r-- | src/emu/debug/debugcmd.cpp | 48 | ||||
-rw-r--r-- | src/mame/drivers/exorciser.cpp | 3 | ||||
-rw-r--r-- | src/mame/drivers/mpu4vid.cpp | 4 |
9 files changed, 38 insertions, 44 deletions
diff --git a/src/devices/bus/rs232/exorterm.cpp b/src/devices/bus/rs232/exorterm.cpp index d47c15b4d54..a4980d53538 100644 --- a/src/devices/bus/rs232/exorterm.cpp +++ b/src/devices/bus/rs232/exorterm.cpp @@ -77,7 +77,6 @@ void exorterm155_terminal_device::device_reset() m_exorterm155->rs232_conn_cts_w(0); // To the computer - output_rxd(1); output_dcd(0); output_dsr(0); if (!m_flow_control->read()) diff --git a/src/devices/cpu/gigatron/gigatron.cpp b/src/devices/cpu/gigatron/gigatron.cpp index 0bd05bceb26..b40b03c08b7 100644 --- a/src/devices/cpu/gigatron/gigatron.cpp +++ b/src/devices/cpu/gigatron/gigatron.cpp @@ -86,7 +86,7 @@ void gigatron_cpu_device::reset_cpu() m_pc = 0; m_npc = (m_pc + 1) & m_romMask; m_ppc = 0; - m_inReg = 0xFF; + m_inReg = 0xff; m_outx = 0; m_out = 0; @@ -341,8 +341,8 @@ void gigatron_cpu_device::execute_set_input(int irqline, int state) gigatron_cpu_device::gigatron_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig, GTRON, tag, owner, clock) - , m_ramMask(0xFFFF) - , m_romMask(0xFFFF) + , m_ramMask(0xffff) + , m_romMask(0xffff) , m_program_config("program", ENDIANNESS_BIG, 16, 16, -1) , m_data_config("data", ENDIANNESS_BIG, 8, 16, 0) , m_outx_cb(*this) diff --git a/src/devices/machine/exorterm.cpp b/src/devices/machine/exorterm.cpp index 923dc049ee7..0b62597e3f1 100644 --- a/src/devices/machine/exorterm.cpp +++ b/src/devices/machine/exorterm.cpp @@ -761,11 +761,8 @@ void exorterm155_device::device_start() save_item(NAME(m_kbd_start_holdoff)); // Keyboard - - if (!m_kbd_scan_timer) - m_kbd_scan_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exorterm155_device::kbd_scan_row), this)); - if (!m_kbd_repeat_timer) - m_kbd_repeat_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exorterm155_device::kbd_repeat), this)); + m_kbd_scan_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exorterm155_device::kbd_scan_row), this)); + m_kbd_repeat_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exorterm155_device::kbd_repeat), this)); kbd_reset_state(); kbd_repeat_stop(); @@ -775,6 +772,9 @@ void exorterm155_device::device_start() save_item(NAME(m_kbd_repeat_row)); save_item(NAME(m_kbd_repeat_column)); save_item(NAME(m_kbd_last_modifiers)); + + m_dsr = 1; + m_ring = 0; } void exorterm155_device::device_reset() @@ -793,9 +793,6 @@ void exorterm155_device::device_reset() m_special_char_disp = 0; m_sys_timer_count = 0; - m_dsr = 1; - m_ring = 0; - m_beeper->set_state(0); // Keyboard @@ -819,7 +816,7 @@ ROM_START( exorterm155 ) ROM_LOAD("51aw1018b24.bin", 0xd800, 0x0800, CRC(18a0ed66) SHA1(5fa6e4b3c27969c1d7e27c79fc2993e4cc9262cf)) ROM_REGION(0x0800, "chargen", 0) - ROM_LOAD("chargen.rom", 0x0000, 0x0800, CRC(0087cbad) SHA1(a6d3dd0512db4c459944c60d728536755a570964)) + ROM_LOAD("chargen.rom", 0x0000, 0x0800, CRC(0087cbad) SHA1(a6d3dd0512db4c459944c60d728536755a570964) BAD_DUMP) // constructed from an apparently similar published Motorola character set ROM_END diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp index 50c0283f310..559a617340a 100644 --- a/src/devices/machine/v3021.cpp +++ b/src/devices/machine/v3021.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Angelo Salese +// copyright-holders:Angelo Salese,cam900 /*************************************************************************** v3021.cpp diff --git a/src/devices/machine/v3021.h b/src/devices/machine/v3021.h index 298dd4134f6..cac5c6884d4 100644 --- a/src/devices/machine/v3021.h +++ b/src/devices/machine/v3021.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Angelo Salese +// copyright-holders:Angelo Salese,cam900 /*************************************************************************** v3021.h diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp index 05b08c95131..181c992f360 100644 --- a/src/devices/sound/k053260.cpp +++ b/src/devices/sound/k053260.cpp @@ -65,7 +65,6 @@ static constexpr int CLOCKS_PER_SAMPLE = 64; // device type definition DEFINE_DEVICE_TYPE(K053260, k053260_device, "k053260", "K053260 KDSC") - ; // Pan multipliers. Set according to integer angles in degrees, amusingly. diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp index b431bb88732..c6dda192e59 100644 --- a/src/emu/debug/debugcmd.cpp +++ b/src/emu/debug/debugcmd.cpp @@ -1982,7 +1982,6 @@ void debugger_commands::execute_saveregion(int ref, const std::vector<std::strin { u64 offset, length; memory_region *region; - FILE *f; /* validate parameters */ if (!validate_number_parameter(params[1], offset)) @@ -1992,21 +1991,21 @@ void debugger_commands::execute_saveregion(int ref, const std::vector<std::strin if (!validate_memory_region_parameter(params[3], region)) return; - /* open the file */ - f = fopen(params[0].c_str(), "wb"); - if (!f) { - m_console.printf("Error opening file '%s'\n", params[0].c_str()); + if (offset >= region->bytes()) + { + m_console.printf("Invalid offset\n"); return; } + if ((length <= 0) || ((length + offset) >= region->bytes())) + length = region->bytes() - offset; - if(offset >= region->bytes()) { - m_console.printf("Invalide offset\n"); + /* open the file */ + FILE *f = fopen(params[0].c_str(), "wb"); + if (!f) + { + m_console.printf("Error opening file '%s'\n", params[0].c_str()); return; } - // get full length - if(length <= 0 || length + offset >= region->bytes()) { - length = region->bytes() - offset; - } fwrite(region->base() + offset, 1, length, f); fclose(f); @@ -2123,14 +2122,13 @@ void debugger_commands::execute_load(int ref, const std::vector<std::string> &pa /*------------------------------------------------- - execute_saveregion - execute the save command on region memory + execute_loadregion - execute the load command on region memory -------------------------------------------------*/ void debugger_commands::execute_loadregion(int ref, const std::vector<std::string> ¶ms) { u64 offset, length; memory_region *region; - FILE *f; /* validate parameters */ if (!validate_number_parameter(params[1], offset)) @@ -2140,9 +2138,18 @@ void debugger_commands::execute_loadregion(int ref, const std::vector<std::strin if (!validate_memory_region_parameter(params[3], region)) return; + if (offset >= region->bytes()) + { + m_console.printf("Invalid offset\n"); + return; + } + if ((length <= 0) || ((length + offset) >= region->bytes())) + length = region->bytes() - offset; + /* open the file */ - f = fopen(params[0].c_str(), "rb"); - if (!f) { + FILE *f = fopen(params[0].c_str(), "rb"); + if (!f) + { m_console.printf("Error opening file '%s'\n", params[0].c_str()); return; } @@ -2151,18 +2158,9 @@ void debugger_commands::execute_loadregion(int ref, const std::vector<std::strin u64 size = ftell(f); rewind(f); - if(offset >= region->bytes()) { - m_console.printf("Invalide offset\n"); - return; - } - // get full length - if(length <= 0 || length + offset >= region->bytes()) { - length = region->bytes() - offset; - } // check file size - if(length >= size) { + if (length >= size) length = size; - } fread(region->base() + offset, 1, length, f); diff --git a/src/mame/drivers/exorciser.cpp b/src/mame/drivers/exorciser.cpp index 2f15bfca0fd..f83ea59b38a 100644 --- a/src/mame/drivers/exorciser.cpp +++ b/src/mame/drivers/exorciser.cpp @@ -178,10 +178,11 @@ public: DECLARE_INPUT_CHANGED_MEMBER(maincpu_clock_change); DECLARE_WRITE_LINE_MEMBER(abort_key_w); -private: +protected: virtual void machine_reset() override; virtual void machine_start() override; +private: void dbg_map(address_map &map); void mem_map(address_map &map); diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index c53d87c2843..f393a4bfbc1 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -8860,7 +8860,7 @@ GAME( 199?, v4sixxc, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwb GAME( 199?, v4sixxg, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token) (MPU4 Video)",GAME_FLAGS ) GAME( 199?, v4sixxh, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS ) GAME( 199?, v4sixxi, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS ) -GAME( 199?, v4sixxj, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token, % Key) (MPU4 Video) (MPU4 Video)",GAME_FLAGS ) +GAME( 199?, v4sixxj, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS ) GAME( 199?, v4sixxk, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, All - Cash) (MPU4 Video)",GAME_FLAGS ) GAME( 199?, v4sixxl, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, All - Cash) (MPU4 Video)",GAME_FLAGS ) GAME( 199?, v4sixxm, v4sixx, bwbvid, v4shpwnd, mpu4vid_state, init_bwbhack, ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, All - Cash, Datapak) (MPU4 Video)",GAME_FLAGS ) @@ -8947,7 +8947,7 @@ GAME( 1996, v4renob, v4reno, bwbvid_oki, v4reno, mpu4vid_state, init_ GAME( 1996, v4renos, v4reno, bwbvid_oki, v4reno, mpu4vid_state, init_prizeinv, ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS ) GAME( 1996, v4renou, v4reno, bwbvid_oki, v4reno, mpu4vid_state, init_prizeinv, ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS ) GAME( 1996, v4renor, v4reno, bwbvid_oki, v4reno, mpu4vid_state, init_prizeinv, ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (Showcase) (set 1) (MPU4 Video)",GAME_FLAGS ) -GAME( 1996, v4renot, v4reno, bwbvid_oki, v4reno, mpu4vid_state, init_prizeinv, ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (Showcase) (set 2)(MPU4 Video)",GAME_FLAGS ) +GAME( 1996, v4renot, v4reno, bwbvid_oki, v4reno, mpu4vid_state, init_prizeinv, ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (Showcase) (set 2) (MPU4 Video)",GAME_FLAGS ) // older 68k version GAME( 1996, v4reno8, v4reno, bwbvid_oki, v4reno, mpu4vid_state, init_prizeinv, ROT0, "BWB","Reno Reels (Release 8, 20p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS ) // 68k ROMs below have no matching base roms |