diff options
| author | 2025-10-26 03:26:21 +1100 | |
|---|---|---|
| committer | 2025-10-26 03:26:21 +1100 | |
| commit | ae78e07ff054248eff02cec235b6748796cf5dda (patch) | |
| tree | da77a98d9732f49d7dc3e3bc9953ffe2e40923e7 | |
| parent | 9f3766ce2716b33be12c61683d4f32db81faf678 (diff) | |
srcclean and tidy
80 files changed, 884 insertions, 884 deletions
diff --git a/hash/orina_stylish_plus_cart.xml b/hash/orina_stylish_plus_cart.xml index cb3cca16e3d..8da68df7768 100644 --- a/hash/orina_stylish_plus_cart.xml +++ b/hash/orina_stylish_plus_cart.xml @@ -6,7 +6,7 @@ license:CC0-1.0 <softwarelist name="orina_stylish_plus_cart" description="Takara Tomy Orina Stylish+ Cartridges"> <!-- "Demon Slayer" and "Sanrio Characters" cartridges also exist --> - + <software name="sumikko" supported="no"> <description>Sumikko Gurashi</description> <year>2021</year> diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index 17447f5a751..8284ec96644 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -11,10 +11,10 @@ local lfs = require('lfs') local exports = { name = 'hiscore', - version = '1.1.0', - description = 'Hiscore with per-game exclusion support', - license = 'CC0', - author = { name = 'borgar@borgar.net + aaciii@yahoo.com' } + version = '1.1.0', + description = 'Hiscore with per-game exclusion support', + license = 'CC0', + author = { name = 'borgar@borgar.net + aaciii@yahoo.com' } } local hiscore = exports @@ -30,46 +30,46 @@ end local excluded_games = {} local function save_exclusions() - if not hiscore_plugin_path then return end - local exclude_file = hiscore_plugin_path .. '/exclude_games.json' - local file = io.open(exclude_file, 'w') - if file then - local data = { excluded_games = {} } - for game, _ in pairs(excluded_games) do - table.insert(data.excluded_games, game) - end - file:write(json.stringify(data, { indent = true })) - file:close() - emu.print_verbose('[Hiscore] Exclusions saved.') - else - emu.print_error('[Hiscore] Failed to save exclusions.') - end + if not hiscore_plugin_path then return end + local exclude_file = hiscore_plugin_path .. '/exclude_games.json' + local file = io.open(exclude_file, 'w') + if file then + local data = { excluded_games = {} } + for game, _ in pairs(excluded_games) do + table.insert(data.excluded_games, game) + end + file:write(json.stringify(data, { indent = true })) + file:close() + emu.print_verbose('[Hiscore] Exclusions saved.') + else + emu.print_error('[Hiscore] Failed to save exclusions.') + end end -- added function to load list of excluded games (hiscore support disabled) local function load_exclusions() - if not hiscore_plugin_path then return end - local exclude_file = hiscore_plugin_path .. '/exclude_games.json' - local file = io.open(exclude_file, 'r') - if file then - local content = file:read('*all') - file:close() - local data = json.decode(content) - if data and data.excluded_games then - for _, game in ipairs(data.excluded_games) do - excluded_games[game] = true - end - emu.print_verbose('[Hiscore] Exclusions loaded.') - end - else - emu.print_verbose('[Hiscore] No exclude_games.json found. No exclusions active.') - end + if not hiscore_plugin_path then return end + local exclude_file = hiscore_plugin_path .. '/exclude_games.json' + local file = io.open(exclude_file, 'r') + if file then + local content = file:read('*all') + file:close() + local data = json.decode(content) + if data and data.excluded_games then + for _, game in ipairs(data.excluded_games) do + excluded_games[game] = true + end + emu.print_verbose('[Hiscore] Exclusions loaded.') + end + else + emu.print_verbose('[Hiscore] No exclude_games.json found. No exclusions active.') + end end -- added function to determine if active game is on the exclusion list (hiscore support disabled) local function is_game_excluded() - local game = emu.romname() - return excluded_games[game] == true + local game = emu.romname() + return excluded_games[game] == true end @@ -133,58 +133,58 @@ function hiscore.startplugin() end -- build menu - local function populate_menu() - local items = {} + local function populate_menu() + local items = {} - table.insert(items, { _p('plugin-hiscore', 'Hiscore Support Options'), '', 'off' }) - table.insert(items, { '---', '', '' }) + table.insert(items, { _p('plugin-hiscore', 'Hiscore Support Options'), '', 'off' }) + table.insert(items, { '---', '', '' }) - local game = emu.romname() - local enabled = not is_game_excluded() - local status = enabled and 'Yes' or 'No' - table.insert(items, { "Enable Hiscore Support for this game", status, enabled and 'l' or 'r' }) + local game = emu.romname() + local enabled = not is_game_excluded() + local status = enabled and 'Yes' or 'No' + table.insert(items, { "Enable Hiscore Support for this game", status, enabled and 'l' or 'r' }) - local setting = timed_save and _p('plugin-hiscore', 'When updated') or _p('plugin-hiscore', 'On exit') - table.insert(items, { _p('plugin-hiscore', 'Save scores'), setting, timed_save and 'l' or 'r' }) + local setting = timed_save and _p('plugin-hiscore', 'When updated') or _p('plugin-hiscore', 'On exit') + table.insert(items, { _p('plugin-hiscore', 'Save scores'), setting, timed_save and 'l' or 'r' }) - return items - end + return items + end -- handle menu events - local function handle_menu(index, event) - + local function handle_menu(index, event) + -- added menu item to enable/disable hiscore support for this game if index == 3 then - if event == 'left' or event == 'right' then - local game = emu.romname() - if event == 'left' then - -- Disable Hiscore Support for this game (add to exclude list) - excluded_games[game] = true - emu.print_verbose(string.format('[Hiscore] Hiscore support disabled for game "%s"', game)) - elseif event == 'right' then - -- Enable Hiscore Support for this game (remove from exclude list) - excluded_games[game] = nil - emu.print_verbose(string.format('[Hiscore] Hiscore support enabled for game "%s"', game)) - end - save_exclusions() - return true - else - return false - end - end - - -- previous menu item to select when scores are saved remains unchanged (now on menu index #4) + if event == 'left' or event == 'right' then + local game = emu.romname() + if event == 'left' then + -- Disable Hiscore Support for this game (add to exclude list) + excluded_games[game] = true + emu.print_verbose(string.format('[Hiscore] Hiscore support disabled for game "%s"', game)) + elseif event == 'right' then + -- Enable Hiscore Support for this game (remove from exclude list) + excluded_games[game] = nil + emu.print_verbose(string.format('[Hiscore] Hiscore support enabled for game "%s"', game)) + end + save_exclusions() + return true + else + return false + end + end + + -- previous menu item to select when scores are saved remains unchanged (now on menu index #4) if index == 4 then - if event == 'left' then - timed_save = false - return true - elseif event == 'right' then - timed_save = true - return true - end - end - return false - end + if event == 'left' then + timed_save = false + return true + elseif event == 'right' then + timed_save = true + return true + end + end + return false + end local hiscoredata_path = "hiscore.dat"; @@ -306,11 +306,11 @@ function hiscore.startplugin() local function write_scores ( posdata ) -- check if game is on the exclude list before writing - if is_game_excluded() then - emu.print_verbose('[Hiscore] Skipping write_scores - excluded game: ' .. emu.romname()) - return - end - + if is_game_excluded() then + emu.print_verbose('[Hiscore] Skipping write_scores - excluded game: ' .. emu.romname()) + return + end + emu.print_verbose("hiscore: write_scores") local output = io.open(get_file_name(), "wb"); if not output then @@ -334,11 +334,11 @@ function hiscore.startplugin() local function read_scores ( posdata ) - -- check if game is on the exclude list before loading scores + -- check if game is on the exclude list before loading scores if is_game_excluded() then - emu.print_verbose('[Hiscore] Skipping read_scores - excluded game: ' .. emu.romname()) - return false - end + emu.print_verbose('[Hiscore] Skipping read_scores - excluded game: ' .. emu.romname()) + return false + end local input = io.open(get_file_name(), "rb"); if input then @@ -433,7 +433,7 @@ function hiscore.startplugin() last_write_time = -10 emu.print_verbose("Starting " .. emu.gamename()) read_config(); - + -- re-load game exclusions list on reset load_exclusions(); local dat = read_hiscore_dat() diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index c2680722a81..81c6fc7a3c3 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -35,7 +35,7 @@ end files { MAME_DIR .. "src/lib/util/abi.h", MAME_DIR .. "src/lib/util/aes256cbc.cpp", - MAME_DIR .. "src/lib/util/aes256cbc.h", + MAME_DIR .. "src/lib/util/aes256cbc.h", MAME_DIR .. "src/lib/util/avhuff.cpp", MAME_DIR .. "src/lib/util/avhuff.h", MAME_DIR .. "src/lib/util/aviio.cpp", diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 768d154a47a..6cd94ba9292 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -3474,7 +3474,7 @@ if (MACHINES["SPG2XX"]~=null) then MAME_DIR .. "src/devices/machine/generalplus_gpl162xx_soc.cpp", MAME_DIR .. "src/devices/machine/generalplus_gpl162xx_soc.h", MAME_DIR .. "src/devices/machine/generalplus_gpl1625x_soc.cpp", - MAME_DIR .. "src/devices/machine/generalplus_gpl1625x_soc.h", + MAME_DIR .. "src/devices/machine/generalplus_gpl1625x_soc.h", MAME_DIR .. "src/devices/machine/generalplus_gpl162xx_soc_video.cpp", MAME_DIR .. "src/devices/machine/generalplus_gpl162xx_soc_video.h", MAME_DIR .. "src/devices/machine/generalplus_gpl951xx_soc.cpp", diff --git a/src/devices/bus/centronics/hasp_savquest.cpp b/src/devices/bus/centronics/hasp_savquest.cpp index 4c6e091568d..476ec3ef9a6 100644 --- a/src/devices/bus/centronics/hasp_savquest.cpp +++ b/src/devices/bus/centronics/hasp_savquest.cpp @@ -38,15 +38,15 @@ void hasp_savquest_device::input_select_in(int state) void hasp_savquest_device::update_state() { -// const uint8_t s_hasp_cmppass[] = { -// 0xc3, 0xd9, 0xd3, 0xfb, 0x9d, 0x89, 0xb9, 0xa1, 0xb3, 0xc1, 0xf1, 0xcd, 0xdf, 0x9d -// }; /* 0x9d or 0x9e */ +// const uint8_t s_hasp_cmppass[] = { +// 0xc3, 0xd9, 0xd3, 0xfb, 0x9d, 0x89, 0xb9, 0xa1, 0xb3, 0xc1, 0xf1, 0xcd, 0xdf, 0x9d +// }; /* 0x9d or 0x9e */ -// const uint8_t s_hasp_prodinfo[] = { -// 0x51, 0x4c, 0x52, 0x4d, 0x53, 0x4e, 0x53, 0x4e, 0x53, 0x49, 0x53, 0x48, 0x53, 0x4b, 0x53, 0x4a, -// 0x53, 0x43, 0x53, 0x45, 0x52, 0x46, 0x53, 0x43, 0x53, 0x41, 0xac, 0x40, 0x53, 0xbc, 0x53, 0x42, -// 0x53, 0x57, 0x53, 0x5d, 0x52, 0x5e, 0x53, 0x5b, 0x53, 0x59, 0xac, 0x58, 0x53, 0xa4 -// }; +// const uint8_t s_hasp_prodinfo[] = { +// 0x51, 0x4c, 0x52, 0x4d, 0x53, 0x4e, 0x53, 0x4e, 0x53, 0x49, 0x53, 0x48, 0x53, 0x4b, 0x53, 0x4a, +// 0x53, 0x43, 0x53, 0x45, 0x52, 0x46, 0x53, 0x43, 0x53, 0x41, 0xac, 0x40, 0x53, 0xbc, 0x53, 0x42, +// 0x53, 0x57, 0x53, 0x5d, 0x52, 0x5e, 0x53, 0x5b, 0x53, 0x59, 0xac, 0x58, 0x53, 0xa4 +// }; // ignore if not selected if (m_select_in_state) @@ -64,6 +64,6 @@ void hasp_savquest_device::update_state() m_prev_data = m_data_in; -// printf("%02x\n", m_data_in); +// printf("%02x\n", m_data_in); output_perror(1); } diff --git a/src/devices/bus/centronics/hasp_savquest.h b/src/devices/bus/centronics/hasp_savquest.h index e7dfe413ddf..9c2f234c295 100644 --- a/src/devices/bus/centronics/hasp_savquest.h +++ b/src/devices/bus/centronics/hasp_savquest.h @@ -36,7 +36,7 @@ private: u8 m_prev_data; int m_select_in_state; -// int m_haspind = 0; +// int m_haspind = 0; int m_haspstate = 0; enum hasp_states { @@ -45,11 +45,11 @@ private: HASPSTATE_PASSEND, HASPSTATE_READ }; -// int m_hasp_passind = 0; -// uint8_t m_hasp_tmppass[0x29]{}; -// uint8_t m_port379 = 0; -// int m_hasp_passmode = 0; -// int m_hasp_prodind = 0; +// int m_hasp_passind = 0; +// uint8_t m_hasp_tmppass[0x29]{}; +// uint8_t m_port379 = 0; +// int m_hasp_passmode = 0; +// int m_hasp_prodind = 0; void update_state(); }; diff --git a/src/devices/bus/megadrive/cart/everdrive.cpp b/src/devices/bus/megadrive/cart/everdrive.cpp index 810333c2d40..82733f3b44f 100644 --- a/src/devices/bus/megadrive/cart/everdrive.cpp +++ b/src/devices/bus/megadrive/cart/everdrive.cpp @@ -54,10 +54,10 @@ ROM_START( everdrive_md ) ROM_REGION16_BE(0x800000, "flash", ROMREGION_ERASE00) ROM_LOAD16_WORD_SWAP("v35.bin", 0x00000, 0x20000, CRC(161b4d2e) SHA1(fe71de7dd1f2117409b158ccd45c68b1d6781a9c) ) -// ROM_LOAD16_WORD_SWAP("game.bin", 0x400000, 0x3e0000, CRC(1) SHA1(1) ) -// ROM_LOAD16_WORD_SWAP("mdos_v2.bin", 0x10000, 0x20000, CRC(b777ef96) SHA1(8efe2ec873fa4fcaddf08a2c156e540ba4a05b57) ) -// ROM_LOAD16_WORD_SWAP("os-v36.bin", 0x10000, 0x10000, CRC(ff915066) SHA1(977a8cca44ce9fa0765001f535f19390a7d8ff16) ) -// ROM_LOAD16_WORD_SWAP("os-v22.bin", 0x10000, 0x10000, CRC(22bcd1c7) SHA1(a23916e6bc1e8d8681704b774a3cbc745065d21e) ) +// ROM_LOAD16_WORD_SWAP("game.bin", 0x400000, 0x3e0000, CRC(1) SHA1(1) ) +// ROM_LOAD16_WORD_SWAP("mdos_v2.bin", 0x10000, 0x20000, CRC(b777ef96) SHA1(8efe2ec873fa4fcaddf08a2c156e540ba4a05b57) ) +// ROM_LOAD16_WORD_SWAP("os-v36.bin", 0x10000, 0x10000, CRC(ff915066) SHA1(977a8cca44ce9fa0765001f535f19390a7d8ff16) ) +// ROM_LOAD16_WORD_SWAP("os-v22.bin", 0x10000, 0x10000, CRC(22bcd1c7) SHA1(a23916e6bc1e8d8681704b774a3cbc745065d21e) ) ROM_END @@ -112,8 +112,8 @@ void megadrive_hb_everdrive_device::cart_map(address_map &map) ); // vblank redirection (for cheating), in OS mode (so at copy time) -// m_vbl_catch[0](0x00'0078, 0x00'0079).lr16(NAME([] () { return 0xff; })); -// m_vbl_catch[0](0x00'007a, 0x00'007b).lr16(NAME([this] () { return m_vblv; })); +// m_vbl_catch[0](0x00'0078, 0x00'0079).lr16(NAME([] () { return 0xff; })); +// m_vbl_catch[0](0x00'007a, 0x00'007b).lr16(NAME([this] () { return m_vblv; })); } // TODO: OS range /TIME inaccessible when in game_mode diff --git a/src/devices/bus/megadrive/cart/gamtec.h b/src/devices/bus/megadrive/cart/gamtec.h index 05219bc868f..0481d0f19a9 100644 --- a/src/devices/bus/megadrive/cart/gamtec.h +++ b/src/devices/bus/megadrive/cart/gamtec.h @@ -106,7 +106,7 @@ protected: virtual void device_start() override ATTR_COLD; virtual void device_reset() override ATTR_COLD; -// bool check_rom(std::string &message) ATTR_COLD; +// bool check_rom(std::string &message) ATTR_COLD; memory_bank_creator m_rom; std::vector<u8> m_decrypted_rom; }; diff --git a/src/devices/bus/megadrive/cart/multigame.h b/src/devices/bus/megadrive/cart/multigame.h index e42f5b0390b..e3cf26e68fb 100644 --- a/src/devices/bus/megadrive/cart/multigame.h +++ b/src/devices/bus/megadrive/cart/multigame.h @@ -10,7 +10,7 @@ #include "slot.h" class megadrive_tectoy_sports_device : public device_t, - public device_megadrive_cart_interface + public device_megadrive_cart_interface { public: megadrive_tectoy_sports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -26,7 +26,7 @@ protected: }; class megadrive_cm2in1_device : public device_t, - public device_megadrive_cart_interface + public device_megadrive_cart_interface { public: megadrive_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/megadrive/cart/seganet.cpp b/src/devices/bus/megadrive/cart/seganet.cpp index 9a8dffe1ba6..1bc3867952b 100644 --- a/src/devices/bus/megadrive/cart/seganet.cpp +++ b/src/devices/bus/megadrive/cart/seganet.cpp @@ -54,7 +54,7 @@ void megadrive_seganet_device::cart_map(address_map &map) void megadrive_seganet_device::time_io_map(address_map &map) { -// map(0x01, 0x01) unknown, used in tandem with 0xf1 writes, ram bank select? +// map(0x01, 0x01) unknown, used in tandem with 0xf1 writes, ram bank select? map(0xf1, 0xf1).lw8( NAME([this] (offs_t offset, u8 data) { // assumed, bclr #$1 at PC=5e282 diff --git a/src/devices/bus/megadrive/cart/seganet.h b/src/devices/bus/megadrive/cart/seganet.h index ae43e121d0f..3bbc0787a2a 100644 --- a/src/devices/bus/megadrive/cart/seganet.h +++ b/src/devices/bus/megadrive/cart/seganet.h @@ -9,7 +9,7 @@ #include "slot.h" class megadrive_seganet_device : public device_t, - public device_megadrive_cart_interface + public device_megadrive_cart_interface { public: megadrive_seganet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/megadrive/cart/slot.cpp b/src/devices/bus/megadrive/cart/slot.cpp index 478a9374fa9..6c2d41f26e6 100644 --- a/src/devices/bus/megadrive/cart/slot.cpp +++ b/src/devices/bus/megadrive/cart/slot.cpp @@ -45,24 +45,24 @@ void device_megadrive_cart_interface::interface_pre_reset() void device_megadrive_cart_interface::cart_map(address_map &map) { // NOTE: is host responsibility to handle open bus access -// map(0x000000, 0x3fffff).unmaprw(); +// map(0x000000, 0x3fffff).unmaprw(); } // $a13000 base void device_megadrive_cart_interface::time_io_map(address_map &map) { -// map(0x00, 0xff).unmaprw(); +// map(0x00, 0xff).unmaprw(); } //void device_megadrive_cart_interface::rom_alloc(size_t size) //{ -// if (m_rom == nullptr) -// { -// m_rom = (uint16_t *)device().machine().memory().region_alloc(device().subtag("^cart:rom"), size, 2, ENDIANNESS_BIG)->base(); -// m_rom_size = size; -// m_rom_mask = size - 1; -// } +// if (m_rom == nullptr) +// { +// m_rom = (uint16_t *)device().machine().memory().region_alloc(device().subtag("^cart:rom"), size, 2, ENDIANNESS_BIG)->base(); +// m_rom_size = size; +// m_rom_mask = size - 1; +// } //} @@ -101,31 +101,31 @@ const char *megadrive_cart_slot_device::get_cart_type(const uint8_t *ROM, uint32 { using namespace bus::megadrive; -// int type = slotoptions::MD_STD; +// int type = slotoptions::MD_STD; // TODO: not caring about loose detection for now return slotoptions::MD_STD; } //static int md_get_pcb_id(const char *slot) //{ -// for (auto & elem : slot_list) -// { -// if (!strcmp(elem.slot_option, slot)) -// return elem.pcb_id; -// } +// for (auto & elem : slot_list) +// { +// if (!strcmp(elem.slot_option, slot)) +// return elem.pcb_id; +// } // -// return MD_STD; +// return MD_STD; //} //static const char *md_get_slot(int type) //{ -// for (auto & elem : slot_list) -// { -// if (elem.pcb_id == type) -// return elem.slot_option; -// } +// for (auto & elem : slot_list) +// { +// if (elem.pcb_id == type) +// return elem.slot_option; +// } // -// return "rom"; +// return "rom"; //} std::pair<std::error_condition, std::string> megadrive_cart_slot_device::call_load() @@ -160,7 +160,7 @@ std::error_condition megadrive_cart_slot_device::load_swlist() if (slot_name == nullptr) slot_name = slotoptions::MD_STD; -// printf("%s\n", slot_name); +// printf("%s\n", slot_name); return std::error_condition(m_cart->load()); } @@ -210,7 +210,7 @@ std::string megadrive_cart_slot_device::get_default_card_software(get_default_ca uint32_t const offset = 0; // genesis_is_SMD(&rom[0x200], len - 0x200) ? 0x200 : 0; -// int const type = get_cart_type(&rom[offset], len - offset); +// int const type = get_cart_type(&rom[offset], len - offset); char const *const slot_string = get_cart_type(&rom[offset], len - offset); return std::string(slot_string); @@ -225,8 +225,8 @@ void megadrive_cart_slot_device::call_unload() { if (m_cart) m_cart->unload(); -// if (m_cart && m_cart->get_nvram_base() && m_cart->get_nvram_size()) -// battery_save(m_cart->get_nvram_base(), m_cart->get_nvram_size()); +// if (m_cart && m_cart->get_nvram_base() && m_cart->get_nvram_size()) +// battery_save(m_cart->get_nvram_base(), m_cart->get_nvram_size()); } // 0x000000-0x3fffff diff --git a/src/devices/bus/megadrive/cart/ssf.cpp b/src/devices/bus/megadrive/cart/ssf.cpp index c62ae6c5a83..56a2099991e 100644 --- a/src/devices/bus/megadrive/cart/ssf.cpp +++ b/src/devices/bus/megadrive/cart/ssf.cpp @@ -149,15 +149,15 @@ void megadrive_hb_ssf_ex_device::device_reset() */ void megadrive_hb_ssf_ex_device::time_f0_w(offs_t offset, u16 data, u16 mem_mask) { - logerror("time_f0_w %04x & %04x (%s)\n", data, mem_mask, BIT(data, 15) ? "valid" : "ignored"); - if (BIT(data, 15)) - { + logerror("time_f0_w %04x & %04x (%s)\n", data, mem_mask, BIT(data, 15) ? "valid" : "ignored"); + if (BIT(data, 15)) + { m_sram_view.select(BIT(data, 13)); // m_led_output = BIT(data, 12); - m_rom_bank[0]->set_entry(data & 0x1f); - } + m_rom_bank[0]->set_entry(data & 0x1f); + } } void megadrive_hb_ssf_ex_device::cart_map(address_map &map) diff --git a/src/devices/bus/megadrive/cart/ssf.h b/src/devices/bus/megadrive/cart/ssf.h index acb85748c22..c7b2d827d49 100644 --- a/src/devices/bus/megadrive/cart/ssf.h +++ b/src/devices/bus/megadrive/cart/ssf.h @@ -54,7 +54,7 @@ public: virtual void cart_map(address_map &map) override ATTR_COLD; virtual void time_io_map(address_map &map) override ATTR_COLD; protected: -// virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; +// virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; virtual void device_start() override ATTR_COLD; virtual void device_reset() override ATTR_COLD; diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index c06c988584e..bff49a48097 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -694,7 +694,7 @@ int base_md_cart_slot_device::get_cart_type(const uint8_t *ROM, uint32_t len) kof98_sig[] = { 0x9b, 0xfc, 0x00, 0x00, 0x4a, 0x00 }, s15in1_sig[] = { 0x22, 0x3c, 0x00, 0xa1, 0x30, 0x00 }, kof99_sig[] = { 0x20, 0x3c, 0x30, 0x00, 0x00, 0xa1 }, // move.l #$300000A1,d0 -// radica_sig[] = { 0x4e, 0xd0, 0x30, 0x39, 0x00, 0xa1 }, // jmp (a0) move.w ($a130xx),d0 +// radica_sig[] = { 0x4e, 0xd0, 0x30, 0x39, 0x00, 0xa1 }, // jmp (a0) move.w ($a130xx),d0 soulb_sig[] = { 0x33, 0xfc, 0x00, 0x0c, 0x00, 0xff }, // move.w #$C,($FF020A).l (what happens if check fails) s19in1_sig[] = { 0x13, 0xc0, 0x00, 0xa1, 0x30, 0x38 }, rockman_sig[] = { 0xea, 0x80 }; @@ -834,8 +834,8 @@ int base_md_cart_slot_device::get_cart_type(const uint8_t *ROM, uint32_t len) case 0x400000: //if (!memcmp(&ROM[0x3c031c], radica_sig, sizeof(radica_sig)) || - // !memcmp(&ROM[0x3f031c], radica_sig, sizeof(radica_sig))) // ssf+gng + radica vol1 - // type = RADICA; + // !memcmp(&ROM[0x3f031c], radica_sig, sizeof(radica_sig))) // ssf+gng + radica vol1 + // type = RADICA; if (!memcmp(&ROM[0x028460], soulb_sig, sizeof(soulb_sig))) type = SOULBLAD; diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h index 71cf4d6774b..f2aaf94e419 100644 --- a/src/devices/bus/megadrive/md_slot.h +++ b/src/devices/bus/megadrive/md_slot.h @@ -52,7 +52,7 @@ enum SSF2, /* Super Street Fighter 2 */ CM_2IN1, /* CodeMasters 2in1 : Psycho Pinball + Micro Machines */ GAME_KANDUME, /* Game no Kandume Otokuyou */ -// RADICA, /* Radica TV games, handled in sega/megadriv_rad.cpp */ +// RADICA, /* Radica TV games, handled in sega/megadriv_rad.cpp */ TILESMJ2, /* 16 Mahjong Tiles II */ BUGSLIFE, /* A Bug's Life */ diff --git a/src/devices/bus/pc98_cbus/pc9801_14.cpp b/src/devices/bus/pc98_cbus/pc9801_14.cpp index c55a213ecfd..6cdacfc52be 100644 --- a/src/devices/bus/pc98_cbus/pc9801_14.cpp +++ b/src/devices/bus/pc98_cbus/pc9801_14.cpp @@ -46,7 +46,7 @@ pc9801_14_device::pc9801_14_device(const machine_config &mconfig, const char *ta , m_bus(*this, DEVICE_SELF_OWNER) , m_ppi(*this, "ppi") , m_pit(*this, "pit") -// , m_tms(*this, "tms") +// , m_tms(*this, "tms") { } @@ -66,7 +66,7 @@ void pc9801_14_device::device_add_mconfig(machine_config &config) I8255(config, m_ppi); m_ppi->out_pa_callback().set([this](uint8_t data) { LOG("TMS3631: PA envelope 1 %02x\n", data); }); m_ppi->out_pb_callback().set([this](uint8_t data) { LOG("TMS3631: PB envelope 2 %02x\n", data); }); -// m_ppi->in_pc_callback().set_constant(0x08); +// m_ppi->in_pc_callback().set_constant(0x08); m_ppi->out_pc_callback().set([this](uint8_t data) { LOG("TMS3631: data %02x\n", data); }); // TODO: TMS3631-RI104 & TMS3631-RI105 diff --git a/src/devices/bus/pc98_cbus/pc9801_14.h b/src/devices/bus/pc98_cbus/pc9801_14.h index 4528ca10ed1..7a554f07a42 100644 --- a/src/devices/bus/pc98_cbus/pc9801_14.h +++ b/src/devices/bus/pc98_cbus/pc9801_14.h @@ -37,7 +37,7 @@ private: required_device<pc98_cbus_slot_device> m_bus; required_device<i8255_device> m_ppi; required_device<pit8253_device> m_pit; -// required_device<tms3631_device> m_tms; +// required_device<tms3631_device> m_tms; }; // device type definition diff --git a/src/devices/bus/pc98_cbus/sound.cpp b/src/devices/bus/pc98_cbus/sound.cpp index be05f130b2f..b065b006ac8 100644 --- a/src/devices/bus/pc98_cbus/sound.cpp +++ b/src/devices/bus/pc98_cbus/sound.cpp @@ -99,19 +99,19 @@ void sound_pc9821ce_device::pnp_io_map(address_map &map) // ??-? -??- <unknown> // --x- ---- using SCSI (mapping or mounting?) // ---- x--- Sound ports PnP -// map(0x10, 0x10) +// map(0x10, 0x10) // ???? ??-- <unknown> // ---- --xx SCSI I/O port -// map(0x20, 0x20) +// map(0x20, 0x20) // ???? ?--- <unknown> // ---- -111 SCSI not used // ---- -000 SCSI used -// map(0x21, 0x21) +// map(0x21, 0x21) -// map(0x30, 0x30) Sound irq related -// map(0x40, 0x40) <unknown> +// map(0x30, 0x30) Sound irq related +// map(0x40, 0x40) <unknown> // CPU flag // -100 High @@ -122,9 +122,9 @@ void sound_pc9821ce_device::pnp_io_map(address_map &map) NAME([] () { return 4; }) ); -// map(0x52, 0x52) <unknown> +// map(0x52, 0x52) <unknown> -// map(0xf0, 0xf0) <unknown> +// map(0xf0, 0xf0) <unknown> } /* diff --git a/src/devices/bus/pc98_cbus/sound.h b/src/devices/bus/pc98_cbus/sound.h index eb8e3c5631a..fff95f97d54 100644 --- a/src/devices/bus/pc98_cbus/sound.h +++ b/src/devices/bus/pc98_cbus/sound.h @@ -41,7 +41,7 @@ private: }; class sound_pc9821cx3_device : public pc9801_118_device - , public device_memory_interface + , public device_memory_interface { public: // construction/destruction diff --git a/src/devices/bus/pci/permedia2.cpp b/src/devices/bus/pci/permedia2.cpp index 8966953bc54..b00b0a2b7d2 100644 --- a/src/devices/bus/pci/permedia2.cpp +++ b/src/devices/bus/pci/permedia2.cpp @@ -24,7 +24,7 @@ permedia2_device::permedia2_device(const machine_config &mconfig, device_type ty , m_vga(*this, "vga") , m_vga_rom(*this, "vga_rom") { - // TODO: can change class code + // TODO: can change class code set_ids(0x104c3d07, 0x01, 0x030100, 0x104c3d07); } @@ -36,7 +36,7 @@ permedia2_device::permedia2_device(const machine_config &mconfig, const char *ta ROM_START( permedia2 ) ROM_REGION32_LE( 0x20000, "vga_rom", ROMREGION_ERASEFF ) - // TODO: 4 other dumps available on VGALegacyMK3, separate Sun versions to own subclass + // TODO: 4 other dumps available on VGALegacyMK3, separate Sun versions to own subclass ROM_SYSTEM_BIOS( 0, "creative", "03/03/98 Creative Graphics Blaster Exxtreme" ) ROMX_LOAD( "creative.vbi", 0x00000, 0x08000, CRC(3e622da7) SHA1(b06f89777badfdb7cd4c76b414ba19fcaed243c9), ROM_BIOS(0) ) // Tech-Source Inc. Raptor GFX @@ -69,7 +69,7 @@ void permedia2_device::device_add_mconfig(machine_config &config) // TODO: bump to TVP4020 core VGA(config, m_vga, 0); m_vga->set_screen("screen"); - // either 4 or 8MB + // either 4 or 8MB m_vga->set_vram_size(8*1024*1024); } diff --git a/src/devices/bus/pci/permedia2.h b/src/devices/bus/pci/permedia2.h index be397bf6131..603afc4723d 100644 --- a/src/devices/bus/pci/permedia2.h +++ b/src/devices/bus/pci/permedia2.h @@ -37,7 +37,7 @@ protected: virtual u8 capptr_r() override; private: required_device<vga_device> m_vga; - required_memory_region m_vga_rom; + required_memory_region m_vga_rom; u8 vram_r(offs_t offset); void vram_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/plg1x0/plg100-vl.cpp b/src/devices/bus/plg1x0/plg100-vl.cpp index 653e4ddeac3..ab4038c0525 100644 --- a/src/devices/bus/plg1x0/plg100-vl.cpp +++ b/src/devices/bus/plg1x0/plg100-vl.cpp @@ -67,8 +67,8 @@ void plg100_vl_device::device_add_mconfig(machine_config &config) m_cpu->write_sci_tx<1>().set([this] (int state) { m_connector->do_midi_tx(state); }); DSPV(config, m_dspv, 22.5792_MHz_XTAL); - // m_dspv->add_route(0, DEVICE_SELF_OWNER, 1.0, 0); - // m_dspv->add_route(1, DEVICE_SELF_OWNER, 1.0, 1); + // m_dspv->add_route(0, DEVICE_SELF_OWNER, 1.0, 0); + // m_dspv->add_route(1, DEVICE_SELF_OWNER, 1.0, 1); } ROM_START( plg100_vl ) diff --git a/src/devices/bus/qbus/dvk_dwhle.cpp b/src/devices/bus/qbus/dvk_dwhle.cpp index 051e71f9239..990c2ff4e7c 100644 --- a/src/devices/bus/qbus/dvk_dwhle.cpp +++ b/src/devices/bus/qbus/dvk_dwhle.cpp @@ -362,7 +362,7 @@ uint16_t dvk_dwhle_device::read(offs_t offset) case REGISTER_CSR: data = m_regs[offset] & KZDCSR_RD; // fails interrupt test -// clear_drqa(); + //clear_drqa(); break; case REGISTER_SI: @@ -558,7 +558,7 @@ TIMER_CALLBACK_MEMBER(dvk_dwhle_device::write_tick) m_regs[REGISTER_SI] &= ~KZDSI_BUSY; m_regs[REGISTER_ERR] |= KZDERR_AM; m_regs[REGISTER_CSR] |= KZDCSR_ERR; -// raise_drqb(); + //raise_drqb(); } } diff --git a/src/devices/bus/qbus/dvk_kmd.cpp b/src/devices/bus/qbus/dvk_kmd.cpp index 80e94e2d931..ac118b8d32e 100644 --- a/src/devices/bus/qbus/dvk_kmd.cpp +++ b/src/devices/bus/qbus/dvk_kmd.cpp @@ -22,22 +22,22 @@ Commands: - 0 read - 1 write - 2 read dd - 3 write dd - 4 read track - 5 read id - 6 format iso - 7 seek - 8 set - 9 read error state + 0 read + 1 write + 2 read dd + 3 write dd + 4 read track + 5 read id + 6 format iso + 7 seek + 8 set + 9 read error state A* - B* format & write - C* format ibm - D* block move - E* run user code - F boot + B* format & write + C* format ibm + D* block move + E* run user code + F boot ***************************************************************************/ diff --git a/src/devices/cpu/t11/t11ops.hxx b/src/devices/cpu/t11/t11ops.hxx index 1aeaace16dd..b1244dc455f 100644 --- a/src/devices/cpu/t11/t11ops.hxx +++ b/src/devices/cpu/t11/t11ops.hxx @@ -1124,7 +1124,7 @@ void t11_device::xor_ded(uint16_t op) { CHECK_IS(IS_LEIS); m_icount -= 30; void t11_device::xor_ix(uint16_t op) { CHECK_IS(IS_LEIS); m_icount -= 30; { XOR_M(IX); } } void t11_device::xor_ixd(uint16_t op) { CHECK_IS(IS_LEIS); m_icount -= 36; { XOR_M(IXD); } } -void t11_device::ash_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { ASH_R(RG); } } // XXX icount is fake +void t11_device::ash_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { ASH_R(RG); } } // XXX icount is fake void t11_device::ash_rgd(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { ASH_M(RGD); } } void t11_device::ash_in(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { ASH_M(IN); } } void t11_device::ash_ind(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 27; { ASH_M(IND); } } @@ -1133,7 +1133,7 @@ void t11_device::ash_ded(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 30; void t11_device::ash_ix(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 30; { ASH_M(IX); } } void t11_device::ash_ixd(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 36; { ASH_M(IXD); } } -void t11_device::ashc_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { ASHC_R(RG); } } // XXX icount is fake +void t11_device::ashc_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { ASHC_R(RG); } } // XXX icount is fake void t11_device::ashc_rgd(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { ASHC_M(RGD); } } void t11_device::ashc_in(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { ASHC_M(IN); } } void t11_device::ashc_ind(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 27; { ASHC_M(IND); } } @@ -1142,7 +1142,7 @@ void t11_device::ashc_ded(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 30; void t11_device::ashc_ix(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 30; { ASHC_M(IX); } } void t11_device::ashc_ixd(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 36; { ASHC_M(IXD); } } -void t11_device::mul_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { MUL_R(RG); } } // XXX icount is fake +void t11_device::mul_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { MUL_R(RG); } } // XXX icount is fake void t11_device::mul_rgd(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { MUL_M(RGD); } } void t11_device::mul_in(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { MUL_M(IN); } } void t11_device::mul_ind(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 27; { MUL_M(IND); } } @@ -1151,7 +1151,7 @@ void t11_device::mul_ded(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 30; void t11_device::mul_ix(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 30; { MUL_M(IX); } } void t11_device::mul_ixd(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 36; { MUL_M(IXD); } } -void t11_device::div_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { DIV_R(RG); } } // XXX icount is fake +void t11_device::div_rg(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 12; { DIV_R(RG); } } // XXX icount is fake void t11_device::div_rgd(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { DIV_M(RGD); } } void t11_device::div_in(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 21; { DIV_M(IN); } } void t11_device::div_ind(uint16_t op) { CHECK_IS(IS_EIS); m_icount -= 27; { DIV_M(IND); } } diff --git a/src/devices/cpu/x86log.h b/src/devices/cpu/x86log.h index 481c99371d8..d95f4a36d6a 100644 --- a/src/devices/cpu/x86log.h +++ b/src/devices/cpu/x86log.h @@ -85,8 +85,8 @@ public: /*------------------------------------------------- - add_comment - add a comment associated - with a given code pointer + add_comment - add a comment associated + with a given code pointer -------------------------------------------------*/ template <typename... Ts> diff --git a/src/devices/machine/generalplus_gpl1625x_soc.cpp b/src/devices/machine/generalplus_gpl1625x_soc.cpp index c94c7e7ea8e..83e058e64dc 100644 --- a/src/devices/machine/generalplus_gpl1625x_soc.cpp +++ b/src/devices/machine/generalplus_gpl1625x_soc.cpp @@ -40,7 +40,7 @@ // 701e - VComStep // 701f // 7020 - Segment_Tx1 -// 7021 - Segment_Tx2 +// 7021 - Segment_Tx2 // 7022 - Segment_sp // 7023 - Segment_Tx3 // 7024 - Segment_Tx4 @@ -62,36 +62,36 @@ // 703a - Palette_Control // // 703c - TV_Control -// +// // 703e - LPHPosition // 703f - LPVPosition // // 7042 - SControl // -// 7050 - TFT_Ctrl +// 7050 - TFT_Ctrl // 7051 - TFT_V_Width or STN_COM_Clip // 7052 - TFT_VSync_Setup // 7053 - TFT_V_Start -// 7054 - TFT_V_End +// 7054 - TFT_V_End // 7055 - TFT_H_Width // 7056 - TFT_HSync_Setup // 7057 - TFT_H_ Start // 7058 - TFT_H_ End -// 7059 - TFT_RGB_Ctrl -// 705a - TFT_Status +// 7059 - TFT_RGB_Ctrl +// 705a - TFT_Status // 705b - TFT_MemMode_WriteCMD // 705c - TFT_MemMode_ReadCMD -// +// // 705f - STN_Ctrl1 -// -// 7062 - PPU_IRQ_EN or TFT_INT_EN +// +// 7062 - PPU_IRQ_EN or TFT_INT_EN // 7063 - PPU_IRQ_Status or TFT_INT_CLR // // 706c - TFT_V_Show_Start // 706d - TFT_V_Show_End // 706e - TFT_H_Show_Start -// 706f - TFT_H_Show_End -// +// 706f - TFT_H_Show_End +// // 7070 - SPDMA_Source // 7071 - SPDMA_Target // 7072 - SPDMA_Number @@ -105,16 +105,16 @@ // 707e - PPU_RAM_Bank // 707f - PPU_Enable // -// 7080 - TV_Saturation or STN_SEG -// 7081 - TV_Hue or STN_COM +// 7080 - TV_Saturation or STN_SEG +// 7081 - TV_Hue or STN_COM // 7082 - TV_Brightness or STN_PIC_COM // 7083 - TV_Sharpness or STN_CPWAIT -// 7084 - TV_Y_Gain or STN_Ctrl2 -// 7085 - TV_Y_Delay or STN_GTG_SEG +// 7084 - TV_Y_Gain or STN_Ctrl2 +// 7085 - TV_Y_Delay or STN_GTG_SEG // 7086 - TV_V_Position or STN_GTG_COM -// 7087 - TV_H_Position or STN_SEG_Clip -// 7088 - TV_VedioDAC -// +// 7087 - TV_H_Position or STN_SEG_Clip +// 7088 - TV_VedioDAC +// // 7090 - TG_CTRL1 // 7091 - TG_CTRL2 // 7092 - TG_HLSTART @@ -167,17 +167,17 @@ // 780e - SLEEP // 780f - Power_State -// 7810 - BankSwitch_Ctrl +// 7810 - BankSwitch_Ctrl -// 7816 - MAPSEL +// 7816 - MAPSEL // 7817 - PLLN // 7818 - PLLWiatCLK // 7819 - Cache_Ctrl // 781a - Cache_HitRate -// +// // 781f - IO_SR_SMT -// 7820 - MCS0_Ctrl +// 7820 - MCS0_Ctrl // 7821 - MCS1_Ctrl // 7822 - MCS2_Ctrl // 7823 - MCS3_Ctrl @@ -208,12 +208,12 @@ // 783d - SDRAM_CBRCYC // 783e - SDRAM_MISC // 783f - SDR_STATUS -// +// // 7840 - Mem_Ctrl // 7841 - Addr_Ctrl // 784e - ECC_ERR0_HB (?) -// 784f - ECC_ERR1_HB (?) +// 784f - ECC_ERR1_HB (?) // 7850 - NF_Ctrl // 7851 - NF_CMD @@ -228,9 +228,9 @@ // 785a - ECC_CPR_LB // 785b - ECC_LPR_CKL_LB // 785c - ECC_LPR_CKH_LB -// 785d - ECC_CPCKR_LB +// 785d - ECC_CPCKR_LB // 785e - ECC_ERR0_LB -// 785f - ECC_ERR1_LB +// 785f - ECC_ERR1_LB // 7860 - IOA_Data // 7861 - IOA_Buffer @@ -248,21 +248,21 @@ // 7870 - IOC_Data // 7871 - IOC_Buffer // 7872 - IOC_Dir -// 7873 - IOC_Attrib +// 7873 - IOC_Attrib // 7874 - SDRAM_Drv // 7875 - IOC_Drv // 7876 - SDRAM_Dly // 7877 - IOC_Latch -// 7878 - IOD_Data +// 7878 - IOD_Data // 7879 - IOD_Buffer -// 787a - IOD_Dir -// 787b - IOD_Attrib +// 787a - IOD_Dir +// 787b - IOD_Attrib // 787c - IOD_Drv -// 787d - IOD_Dly +// 787d - IOD_Dly // 787e - CS_Drv / MCS_Drv // 787f - CS_Dly / MCS_Dly // 7880 - IOE_Data -// 7881 - IOE_Buffer +// 7881 - IOE_Buffer // 7882 - IOE_Dir // 7883 - IOE_Attrib // 7884 - IOE_Drv @@ -310,7 +310,7 @@ // 78d3 - TimerC_CCReg // 78d4 - TimerC_UpCount -// 78d8 - TimerD_Ctrl +// 78d8 - TimerD_Ctrl // 78da - TimerD_Preload // 78dc - TimerD_UpCount @@ -319,12 +319,12 @@ // 78e4 - TimerE_UpCount // 78e8 - TimerF_Ctrl // 78ea - TimerF_Preload -// 78ec - TimerF_UpCount +// 78ec - TimerF_UpCount // 78f0 - CHA_Ctrl // 78f1 - CHA_Data // 78f2 - CHA_FIFO -// +// // 78f8 - CHB_Ctrl // 78f9 - CHB_Data // 78fa - CHB_FIFO @@ -332,173 +332,173 @@ // 78ff - IISEN -// 7900 - UART_Data -// 7901 - UART_RXStatus -// 7902 - UART_Ctrl +// 7900 - UART_Data +// 7901 - UART_RXStatus +// 7902 - UART_Ctrl // 7903 - UART_BaudRate // 7904 - UART_Status // 7905 - UART_FIFO -// 7906 - UART_TXDLY -// 7907 - IrDA_BaudRate -// 7908 - IrDA_Ctrl +// 7906 - UART_TXDLY +// 7907 - IrDA_BaudRate +// 7908 - IrDA_Ctrl // 7909 - IrDA_LowPower // 7920 - Second // 7921 - Minute -// 7922 - Hour +// 7922 - Hour -// 7924 - Alarm_Second +// 7924 - Alarm_Second // 7925 - Alarm_Minute -// 7926 - Alarm_Hour +// 7926 - Alarm_Hour // 7934 - RTC_Ctrl // 7935 - RTC_INT_Status -// 7936 - RTC_INT_Ctrl +// 7936 - RTC_INT_Ctrl // 7937 - RTC_Busy -// 7940 - SPI_Ctrl +// 7940 - SPI_Ctrl // 7941 - SPI_TXStatus // 7942 - SPI_TXData -// 7943 - SPI_RXStatus +// 7943 - SPI_RXStatus // 7944 - SPI_RXData // 7945 - SPI_Misc -// 7960 - ADC_Setup -// 7961 - MADC_Ctrl +// 7960 - ADC_Setup +// 7961 - MADC_Ctrl // 7962 - MADC_Data -// 7963 - ASADC_Ctrl -// 7964 - ASDAC_Data +// 7963 - ASADC_Ctrl +// 7964 - ASDAC_Data -// 7966 - USELINEIN +// 7966 - USELINEIN // 7967 - SH_WAIT // 79d0 - SD1_DataTX // 79d1 - SD1_DataRX // 79d2 - SD1_CMD -// 79d3 - SD1_ArgL +// 79d3 - SD1_ArgL // 79d4 - SD1_ArgH // 79d5 - SD1_RespL // 79d6 - SD1_RespH // 79d7 - SD1_Status -// 79d8 - SD1_Ctrl +// 79d8 - SD1_Ctrl // 79d9 - SD1_BLKLEN // 79da - SD1_INT // 79e0 - SD2_DataTX // 79e1 - SD2_DataRX // 79e2 - SD2_CMD -// 79e3 - SD2_ArgL +// 79e3 - SD2_ArgL // 79e4 - SD2_ArgH // 79e5 - SD2_RespL // 79e6 - SD2_RespH // 79e7 - SD2_Status -// 79e8 - SD2_Ctrl +// 79e8 - SD2_Ctrl // 79e9 - SD2_BLKLEN // 79ea - SD2_INT // 79f0 - CMA_R_Y_In // 79f1 - CMA_G_U_In -// 79f2 - CMA_B_V_In -// 79f3 - CMA_Ctrl -// 79f4 - CMA_R_Y_Out +// 79f2 - CMA_B_V_In +// 79f3 - CMA_Ctrl +// 79f4 - CMA_R_Y_Out // 79f5 - CMA_G_U_Out // 79f6 - CMA_B_V_Out // 7a00 - USBH_Config // 7a01 - USBH_TimeConfig // 7a02 - USBH_Data -// 7a03 - USBH_Transfer -// 7a04 - USBH_DveAddr +// 7a03 - USBH_Transfer +// 7a04 - USBH_DveAddr // 7a05 - USBH_DveEP // 7a06 - USBH_TXCount // 7a07 - USBH_RXCount // 7a08 - USBH_FIFOInPointer // 7a09 - USBH_FIFOOutPointer // 7a0a - USBH_AutoInByteCount -// 7a0b - USBH_AutoOutByteCount -// 7a0c - USBH_AutoTrans +// 7a0b - USBH_AutoOutByteCount +// 7a0c - USBH_AutoTrans // 7a0d - USBH_Status -// 7a0e - USBH_INT +// 7a0e - USBH_INT // 7a0f - USBH_INTEN // 7a11 - USBH_SoftRST // 7a12 - USBH_SOFTimer // 7a13 - USBH_FrameNum -// -// 7a17 - USBH_INAckCount -// 7a18 - USBH_OutAckCount -// 7a19 - USBH_RSTAckCount +// +// 7a17 - USBH_INAckCount +// 7a18 - USBH_OutAckCount +// 7a19 - USBH_RSTAckCount -// 7a1b - USBH_DReadback +// 7a1b - USBH_DReadback -// 7a20 - USBH_SOF_BOND -// 7a21 - USBH_ISOConfig +// 7a20 - USBH_SOF_BOND +// 7a21 - USBH_ISOConfig -// 7a30 - USBD_Config -// 7a31 - USBD_Function +// 7a30 - USBD_Config +// 7a31 - USBD_Function // 7a32 - USBD_PMR // 7a33 - USBD_EP0Data // 7a34 - USBD_BIData -// 7a35 - USBD_BOData -// 7a36 - USBD_INTINData -// 7a37 - USBD_EPEvent -// 7a38 - USBD_GLOINT -// 7a39 - USBD_INTEN +// 7a35 - USBD_BOData +// 7a36 - USBD_INTINData +// 7a37 - USBD_EPEvent +// 7a38 - USBD_GLOINT +// 7a39 - USBD_INTEN // 7a3a - USBD_INT -// 7a3b - USBD_SCI NTEN -// 7a3c - USBD_SCINT -// 7a3d - USBD_EPAutoSet -// 7a3e - USBD_EPSetStall +// 7a3b - USBD_SCI NTEN +// 7a3c - USBD_SCINT +// 7a3d - USBD_EPAutoSet +// 7a3e - USBD_EPSetStall // 7a3f - USBD_EPBufClear // 7a40 - USBD_EPEvntClear // 7a41 - USBD_EP0WrtCount // 7a42 - USBD_BOWrtCount // 7a43 - USBD_EP0BufPointer // 7a44 - USBD_BIBufPointer -// 7a45 - USBD_BOBufPointer -// 7a46 - USBD_EP0RTR +// 7a45 - USBD_BOBufPointer +// 7a46 - USBD_EP0RTR // 7a47 - USBD_EP0RR // 7a48 - USBD_ EP0VR // 7a49 - USBD_ EP0IR // 7a4a - USBD_ EP0LR -// 7a4b - USBD_INTBufPointer +// 7a4b - USBD_INTBufPointer // 7a4c - USBD_INTF -// 7a4d - USBD_ALT +// 7a4d - USBD_ALT // 7a4e - USBD_ISOOData -// 7a4f - USBD_ISOIData +// 7a4f - USBD_ISOIData // 7a50 - USBD_DMAWrtCountL -// 7a51 - USBD_DMAWrtCountH +// 7a51 - USBD_DMAWrtCountH // 7a52 - USBD_DMAAck // 7a53 - USBD_DMAAckH -// 7a54 - USBD_EPStall +// 7a54 - USBD_EPStall // 7a55 - USBD_CALT -// 7a56 - USBD_MAXALT +// 7a56 - USBD_MAXALT // 7a57 - USBD_Device -// 7a58 - USBD_NullPkt +// 7a58 - USBD_NullPkt // 7a59 - USBD_DMAINT -// 7a5b - USBD_MAXINT +// 7a5b - USBD_MAXINT // 7a5c - USBD_ISOEvent // 7a5d - USBD_ISOINTE // 7a5e - USBD_ISOINT // 7a5f - USBD_ISOOWrtCount // 7a60 - USBD_IOUTData -// 7a61 - USBD_IOUTEvent -// 7a62 - USBD_IOUTINTEN +// 7a61 - USBD_IOUTEvent +// 7a62 - USBD_IOUTINTEN // 7a63 - USBD_IOUTINT // 7a64 - USBD_IOUTWrtCount -// 7a65 - USBD_ISOOBufPointer +// 7a65 - USBD_ISOOBufPointer // 7a66 - USBD_ISOIBufPointer // 7a80 - DMA_Ctrl0 -// 7a81 - DMA_SRC_AddrL0 +// 7a81 - DMA_SRC_AddrL0 // 7a82 - DMA_TAR_AddrL0 // 7a83 - DMA_TCountL0 // 7a84 - DMA_SRC_AddrH0 // 7a85 - DMA_TAR_AddrH0 -// 7a86 - DMA_TCountH0 -// 7a87 - DMA_MISC0 -// 7a88 - DMA_Ctrl1 +// 7a86 - DMA_TCountH0 +// 7a87 - DMA_MISC0 +// 7a88 - DMA_Ctrl1 // 7a89 - DMA_SRC_AddrL1 // 7a8a - DMA_TAR_AddrL1 // 7a8b - DMA_TCountL1 @@ -507,12 +507,12 @@ // 7a8e - DMA_TCountH1 // 7a8f - DMA_MISC1 // 7a90 - DMA_Ctrl2 -// 7a91 - DMA_SRC_AddrL2 +// 7a91 - DMA_SRC_AddrL2 // 7a92 - DMA_TAR_AddrL2 // 7a93 - DMA_TCountL2 // 7a94 - DMA_SRC_AddrH2 // 7a95 - DMA_TAR_AddrH2 -// 7a96 - DMA_TCountH2 +// 7a96 - DMA_TCountH2 // 7a97 - DMA_MISC2 // 7a98 - DMA_Ctrl3 // 7a99 - DMA_SRC_AddrL3 @@ -534,8 +534,8 @@ // // 7ac0 - KS_Ctrl1 // 7ac1 - KS_Ctrl2 -// 7ac2 - KS_Addr -// 7ac3 - KS_Velocity +// 7ac2 - KS_Addr +// 7ac3 - KS_Velocity // // 7ac8 - KS_Data0 // 7ac9 - KS_Data1 @@ -553,8 +553,8 @@ // 7ae1 - E-Fuse1 // 7ae2 - E-Fuse2 // 7ae3 - E-Fuse3 -// -// 7af0 - Byte_Swap +// +// 7af0 - Byte_Swap // 7af1 - Nibble_Swap // 7af2 - TwoBit_Swap // 7af3 - Bit_Reverse diff --git a/src/devices/machine/generalplus_gpl162xx_soc.cpp b/src/devices/machine/generalplus_gpl162xx_soc.cpp index 90772343082..4b1cda7f1ea 100644 --- a/src/devices/machine/generalplus_gpl162xx_soc.cpp +++ b/src/devices/machine/generalplus_gpl162xx_soc.cpp @@ -2,22 +2,22 @@ // copyright-holders:David Haywood /***************************************************************************** - GPL16220A - 320x240 output, 16K words internal RAM - GPL16230A (GPAC500A) - expands RAM to 28K words, adds SDRAM support, adds NAND Flash/ROM/OTP support, USB support - GPL16240VA - adds 640x480 output (V = VGA support?) - GPL16250VA (GPAC800A) - adds '3D' sprite mode (see generalplus_gpl1625x_soc.cpp) + GPL16220A - 320x240 output, 16K words internal RAM + GPL16230A (GPAC500A) - expands RAM to 28K words, adds SDRAM support, adds NAND Flash/ROM/OTP support, USB support + GPL16240VA - adds 640x480 output (V = VGA support?) + GPL16250VA (GPAC800A) - adds '3D' sprite mode (see generalplus_gpl1625x_soc.cpp) - there is also the 'B' series - these only have 12K words RAM? but have the extra maths unit at 0x79A0? + there is also the 'B' series + these only have 12K words RAM? but have the extra maths unit at 0x79A0? - GPL16218B - GPL16238B (this could be GPAC500B) - GPL16248VB - GPL16258VB (this could be GPAC800B) (see generalplus_gpl1625x_soc.cpp) + GPL16218B + GPL16238B (this could be GPAC500B) + GPL16248VB + GPL16258VB (this could be GPAC800B) (see generalplus_gpl1625x_soc.cpp) - die is marked 'GCM394' on some chips + die is marked 'GCM394' on some chips - The GPAC500 / GPAC800 might be slightly customized rather than direct rebadgings + The GPAC500 / GPAC800 might be slightly customized rather than direct rebadgings **********************************************************************/ @@ -818,7 +818,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7016 - Tx2_X_Position // 7017 - Tx2_Y_Position // 7018 - Tx2_Attribute -// 7019 - Tx2_Control +// 7019 - Tx2_Control // 701a - Tx2_N_PTR // 701b - Tx2_A_PTR // 701c - VComValue @@ -832,7 +832,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7024 - Segment_Tx4 // // 7028 - Tx4_Cosine -// 7029 - Tx4_Sine +// 7029 - Tx4_Sine // 702a - Blending // 702b - Segment_Tx1H // 702c - Segment_Tx2H @@ -844,7 +844,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7036 - IRQTMV // 7037 - IRQTMH // 7038 - Line_Counter -// 7039 - LightPen_Control +// 7039 - LightPen_Control // 703a - Palette_Control // // 703c - TV_Control @@ -866,7 +866,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7059 - TFT_RGB_Ctrl // 705a - TFT_Status // 705b - TFT_MemMode_WriteCMD -// 705c - TFT_MemMode_ReadCMD +// 705c - TFT_MemMode_ReadCMD // // 705f - STN_Ctrl1 (bit 0 is STN enable, which presumably changes the mappings at 708x and 7051 from TV/TFT to STN regs) // @@ -880,7 +880,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // // 7070 - SPDMA_Source // 7071 - SPDMA_Target -// 7072 - SPDMA_Number +// 7072 - SPDMA_Number // 7073 - HB_Ctrl // 7074 - HB_GO // @@ -894,15 +894,15 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 707f - PPU_Enable // // 7080 - TV_Saturation or STN_SEG -// 7081 - TV_Hue or STN_COM -// 7082 - TV_Brightness or STN_PIC_COM -// 7083 - TV_Sharpness or STN_CPWAIT -// 7084 - TV_Y_Gain or STN_Ctrl2 -// 7085 - TV_Y_Delay or STN_GTG_SEG -// 7086 - TV_V_Position or STN_GTG_COM -// 7087 - TV_H_Position or STN_SEG_Clip +// 7081 - TV_Hue or STN_COM +// 7082 - TV_Brightness or STN_PIC_COM +// 7083 - TV_Sharpness or STN_CPWAIT +// 7084 - TV_Y_Gain or STN_Ctrl2 +// 7085 - TV_Y_Delay or STN_GTG_SEG +// 7086 - TV_V_Position or STN_GTG_COM +// 7087 - TV_H_Position or STN_SEG_Clip // 7088 - TV_VideoDAC -// +// // 70b0 - Tx1_AttributeH // 70b1 - Tx2_AttributeH // 70b2 - Tx3_AttributeH @@ -915,8 +915,8 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 70b9 - Tx3_A_PTRH // 70ba - Tx4_N_PTRH // 70bb - Tx4_A_PTRH -// -// 70d8 - BLD_Enable +// +// 70d8 - BLD_Enable // // 70e0 - Random0 // 70e1 - Random1 @@ -941,7 +941,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 780e - SLEEP // 780f - Power_State // -// 7810 - BankSwitch_Ctrl +// 7810 - BankSwitch_Ctrl // // 7817 - PLLChange // 7818 - PLLCLKWait @@ -952,7 +952,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // // 7820 - MCS0_Ctrl // 7821 - MCS1_Ctrl -// 7822 - MCS2_Ctrl +// 7822 - MCS2_Ctrl // 7823 - MCS3_Ctrl // 7824 - MCS4_Ctrl // 7825 - PSRAM_Ctrl @@ -969,7 +969,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7835 - MCS0_Page // 7836 - MCS1_Page // 7837 - MCS2_Page -// 7838 - MCS3_Page +// 7838 - MCS3_Page // 7839 - MCS4_Page // // 7840 - Mem_Ctrl @@ -1000,7 +1000,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 78b0 - TimeBaseA_Ctrl // 78b1 - TimeBaseB_Ctrl // 78b2 - TimeBaseC_Ctrl -// +// // 78b8 - TimeBase_Reset // // 78c0 - TimerA_Ctrl @@ -1028,10 +1028,10 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 78e0 - TimerE_Ctrl // 78e2 - TimerE_Preload // 78e4 - TimerE_UpCount -// +// // 78e8 - TimerF_Ctrl // 78ea - TimerF_Preload -// 78ec - TimerF_UpCount +// 78ec - TimerF_UpCount // // 78f0 - CHA_Ctrl // 78f1 - CHA_Data @@ -1054,7 +1054,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7934 - RTC_Ctrl // 7935 - RTC_INT_Status // 7936 - RTC_INT_Ctrl -// 7937 - RTC_Busy +// 7937 - RTC_Busy // // 7940 - SPI_Ctrl // 7941 - SPI_TXStatus @@ -1071,7 +1071,7 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 79a5 - Quotient // 79a6 - RemainderH // 79a7 - Remainder -// 79a8 - Divider_Status +// 79a8 - Divider_Status // // 79e0 - SD2_DataTX // 79e1 - SD2_DataRX @@ -1103,12 +1103,12 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7a8f - DMA_MISC1 // // 7ab0 - DMA_SPRISIZE0 -// 7ab1 - DMA_SPRISIZE1 +// 7ab1 - DMA_SPRISIZE1 // // 7abd - DMA_LineLength // 7abe - DMA_SS // 7abf - DMA_INT -// +// // 7af0 - Byte_Swap // 7af1 - Nibble_Swap // 7af2 - TwoBit_Swap @@ -1144,10 +1144,10 @@ void sunplus_gcm394_base_device::unk_w(offs_t offset, uint16_t data) // 7b9a - Attack/Release Time Control // // 7b9f - Wave Table Bank Address -// +// // 7ba5 - SPU_CtrPW -// -// 7bb2 - SPU_CtrPWaveOutL +// +// 7bb2 - SPU_CtrPWaveOutL // 7bb3 - SPU_CtrPWaveOutR // // 7bb6 - SPU_CtrChToneRelease_H diff --git a/src/devices/machine/generalplus_gpl951xx_soc.cpp b/src/devices/machine/generalplus_gpl951xx_soc.cpp index 98206f968c6..48c4036ada7 100644 --- a/src/devices/machine/generalplus_gpl951xx_soc.cpp +++ b/src/devices/machine/generalplus_gpl951xx_soc.cpp @@ -98,7 +98,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7014 - Tx1_N_PTR // 7015 - Tx1_A_PTR // 7016 - Tx2_X_Position - // 7017 - Tx2_Y_Position + // 7017 - Tx2_Y_Position // 7018 - Tx2_Attribute // 7019 - Tx2_Contro // 701a - Tx2_N_PTR @@ -119,9 +119,9 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 702e - Segment_Tx3H // // 7030 - Fade_Control - // + // // 703a - Palette_Control - // + // // 7042 - SControl // // 7050 - TFT_Ctrl @@ -140,7 +140,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // // 705e - STN_PIC_SEG // 705f - STN_Ctrl1 - // + // // 7062 - TFT_INT_EN // 7063 - TFT_INT_CLR // 7064 - US_Ctrl @@ -148,24 +148,24 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7066 - US_Vscaling // 7067 - US_Width // 7068 - US_Height - // 7069 - US_Hoffset + // 7069 - US_Hoffset // 706a - US_Voffset // // 706c - TFT_V_Show_Start // 706d - TFT_V_Show_End // 706e - TFT_H_Show_Start - // 706f - TFT_H_Show_End - // + // 706f - TFT_H_Show_End + // // 7070 - SPDMA_Source // 7071 - SPDMA_Target // 7072 - SPDMA_Number // 7073 - HB_Ctrl // 7074 - HB_GO - // - // 707d - BLD_Color + // + // 707d - BLD_Color // // 707e - PPU_RAM_BANK - // 707f - PPU_Enable + // 707f - PPU_Enable // // 7080 - STN_SEG // 7081 - STN_COM @@ -173,8 +173,8 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7083 - STN_CPWait // 7084 - STN_Ctrl2 // 7085 - STN_GTG_SEG - // 7086 - STN_GTG_COM - // + // 7086 - STN_GTG_COM + // // 70b4 - Tx1_N_PTRH // 70b5 - Tx1_A_PTRH // 70b6 - Tx2_N_PTRH @@ -187,7 +187,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // // 70e0 - Random0 (15-bit) // 70e1 - Random1 (15-bit) - // + // // 7100 to 71ff - Tx_Hvoffset // 7200 to 72ff - HCMValue // 7300 to 73ff - Palette (banked) @@ -203,7 +203,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7807 - Clock_Ctrl // 7808 - LVR_Ctrl // 7809 - PM_Ctrl - // 780a - Watchdog_Ctrl + // 780a - Watchdog_Ctrl map(0x00780b, 0x00780b).nopw(); // Watchdog_Clear // 780c - WAIT // 780d - HALT @@ -232,7 +232,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7831 - CHECKSUM1_LB // 7832 - CHECKSUM0_HB // 7833 - CHECKSUM1_HB - // + // // 7848 - ECC_LPRL_HB // 7849 - ECC_LPRH_HB // 784a - ECC_CPR_HB @@ -248,10 +248,10 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7853 - NF_AddrH // 7854 - NF_Data // 7855 - NF_INT_Ctrl - // 7856 - unused or BCH_Control + // 7856 - unused or BCH_Control // 7857 - ECC_Ctrl // 7858 - ECC_LPRL_LB or BCH_Error - // 7859 - ECC_LPRH_LB or BCH_Parity0 + // 7859 - ECC_LPRH_LB or BCH_Parity0 // 785a - ECC_CPR_LB or BCH_Parity1 // 785b - ECC_LPR_CKL_LB or BCH_Parity2 // 785c - ECC_LPR_CKH_LB or BCH_Parity3 @@ -331,7 +331,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 78b1 - TimeBaseB_Ctrl // 78b2 - TimeBaseC_Ctrl - // 78b8 - TimeBase_Reset + // 78b8 - TimeBase_Reset // 78c0 - I2C_Ctrl // 78c1 - I2C_Status @@ -358,7 +358,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 78ee // 78ef - // 78f0 - CHA_Ctrl + // 78f0 - CHA_Ctrl // 78f1 - CHA_Data // 78f2 - CHA_FIFO // 78f3 @@ -500,7 +500,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7a58 - USBD_ EP0VR // 7a59 - USBD_ EP0IR // 7a5a - USBD_ EP0LR - // + // // 7a60 - USBD_DMAWrtCountL // 7a61 - USBD_DMAWrtCountH // 7a62 - USBD_DMAAckL @@ -544,7 +544,7 @@ void generalplus_gpl951xx_device::gpspi_direct_internal_map(address_map& map) // 7ac4 - CTS_Ctrl2 // 7ac5 - CTS_Status // 7ac6 - CTS_Ctrl3 - // + // // 7ac8 - CTS_FIFOLevel // 7ac9 - CTS_CNT diff --git a/src/devices/machine/w83977tf.cpp b/src/devices/machine/w83977tf.cpp index c31583fdd4b..6f1fdb79f90 100644 --- a/src/devices/machine/w83977tf.cpp +++ b/src/devices/machine/w83977tf.cpp @@ -48,12 +48,12 @@ w83977tf_device::w83977tf_device(const machine_config &mconfig, const char *tag, , m_irq1_callback(*this) , m_irq8_callback(*this) , m_irq9_callback(*this) -// , m_txd1_callback(*this) -// , m_ndtr1_callback(*this) -// , m_nrts1_callback(*this) -// , m_txd2_callback(*this) -// , m_ndtr2_callback(*this) -// , m_nrts2_callback(*this) + //, m_txd1_callback(*this) + //, m_ndtr1_callback(*this) + //, m_nrts1_callback(*this) + //, m_txd2_callback(*this) + //, m_ndtr2_callback(*this) + //, m_nrts2_callback(*this) , m_gpio1_read_cb(*this, 0xff) , m_gpio1_write_cb(*this) , m_index(0) @@ -81,7 +81,7 @@ void w83977tf_device::device_start() m_isa->set_dma_channel(2, this, true); m_isa->set_dma_channel(3, this, true); save_pointer(NAME(m_activate), 0xb); -// remap(AS_IO, 0, 0x400); + //remap(AS_IO, 0, 0x400); } void w83977tf_device::device_reset() diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp index 3626de39650..b2a8fb93e70 100644 --- a/src/devices/sound/esqpump.cpp +++ b/src/devices/sound/esqpump.cpp @@ -4,8 +4,8 @@ esqpump.cpp - Ensoniq 5505/5506 to 5510 interface. - Modeled specifically after the routing of and for use with - the VFX family of keyboards. + Modeled specifically after the routing of and for use with + the VFX family of keyboards. By Christian Brunschen diff --git a/src/devices/sound/swp30.h b/src/devices/sound/swp30.h index 466a758802a..1f8a2fbdeb1 100644 --- a/src/devices/sound/swp30.h +++ b/src/devices/sound/swp30.h @@ -382,7 +382,7 @@ private: u16 filter_2_a_r(offs_t offset); u16 level_2_r(offs_t offset); u16 filter_b_r(offs_t offset); - + void filter_1_a_w(offs_t offset, u16 data); void level_1_w(offs_t offset, u16 data); void filter_2_a_w(offs_t offset, u16 data); @@ -422,7 +422,7 @@ private: template<int sel> void vol_w(offs_t offset, u16 data); static s32 volume_apply(s32 level, s32 sample); - + static s32 mixer_att(s32 sample, s32 att); // Control registers @@ -466,7 +466,7 @@ private: void meg_reverb_map(address_map &map) ATTR_COLD; - + virtual u16 swp30d_const_r(u16 address) const override; virtual u16 swp30d_offset_r(u16 address) const override; diff --git a/src/devices/sound/va_vcf.h b/src/devices/sound/va_vcf.h index d5d9cf49db7..b71174d8541 100644 --- a/src/devices/sound/va_vcf.h +++ b/src/devices/sound/va_vcf.h @@ -5,22 +5,22 @@ Virtual analog filters: * VA_LPF4 / va_lpf4_device - An ideal (linear) 4th order, resonant low-pass filter. + An ideal (linear) 4th order, resonant low-pass filter. - Cutoff frequency and resonance can either be provided by calling class - methods, or via input streams. + Cutoff frequency and resonance can either be provided by calling class + methods, or via input streams. - The frequency CV is in Hz, and the resonance CV is the feedback gain (0-4). - The meaning of CV can be different in subclasses: it will typically match - the type of inputs in the emulated hardware. + The frequency CV is in Hz, and the resonance CV is the feedback gain (0-4). + The meaning of CV can be different in subclasses: it will typically match + the type of inputs in the emulated hardware. * CEM3320_LPF4 / cem3320_lpf4_device: - A CEM3320 configured as a 4th order low-pass filter, with optional resonance - control. + A CEM3320 configured as a 4th order low-pass filter, with optional resonance + control. - The frequency CV is the voltage applied to pin 12. The resonance CV is the - voltage applied to resistor R_RC, connected to pin 9. + The frequency CV is the voltage applied to pin 12. The resonance CV is the + voltage applied to resistor R_RC, connected to pin 9. */ #ifndef MAME_SOUND_VA_VCF_H diff --git a/src/devices/video/ym7101.cpp b/src/devices/video/ym7101.cpp index e37a5e5a319..d201ea23070 100644 --- a/src/devices/video/ym7101.cpp +++ b/src/devices/video/ym7101.cpp @@ -104,11 +104,11 @@ void ym7101_device::device_start() save_item(STRUCT_MEMBER(m_command, latch)); save_item(STRUCT_MEMBER(m_command, address)); save_item(STRUCT_MEMBER(m_command, code)); -// save_item(STRUCT_MEMBER(m_command, write_state)); + //save_item(STRUCT_MEMBER(m_command, write_state)); save_item(STRUCT_MEMBER(m_dma, source_address)); save_item(STRUCT_MEMBER(m_dma, length)); -// save_item(STRUCT_MEMBER(m_dma, mode)); + //save_item(STRUCT_MEMBER(m_dma, mode)); save_item(STRUCT_MEMBER(m_dma, active)); save_item(STRUCT_MEMBER(m_dma, fill)); @@ -904,8 +904,8 @@ void ym7101_device::prepare_tile_line(int scanline) const u16 tile_mask = 0x7ff; //const u16 page_mask[] = { 0x7ff, 0x1fff, 0x1fff, 0x1fff }; -// const u16 m_hpage = page_masks[m_hsz]; -// const u16 m_vpage = page_masks[m_vsz]; + //const u16 m_hpage = page_masks[m_hsz]; + //const u16 m_vpage = page_masks[m_vsz]; // AV Artisan games will set plane B base with 0x18000 const u32 plane_a_name_base = (m_plane_a_name_table & m_vram_mask) >> 1; diff --git a/src/mame/access/acvirus.cpp b/src/mame/access/acvirus.cpp index 062076bc22b..4d9e3360511 100644 --- a/src/mame/access/acvirus.cpp +++ b/src/mame/access/acvirus.cpp @@ -153,9 +153,9 @@ void acvirus_state::virus(machine_config &config) m_maincpu->port_out_cb<5>().set(FUNC(acvirus_state::p5_w)); /* - This may be hooked either to memorymap or to some of the ports: - map(0x?, 0x?).rw("lcdc", FUNC(hd44780_device::data_r), FUNC(hd44780_device::data_w)).umask16(0x00ff); - map(0x?, 0x?).rw("lcdc", FUNC(hd44780_device::control_r), FUNC(hd44780_device::control_w)).umask16(0x00ff); + This may be hooked either to memorymap or to some of the ports: + map(0x?, 0x?).rw("lcdc", FUNC(hd44780_device::data_r), FUNC(hd44780_device::data_w)).umask16(0x00ff); + map(0x?, 0x?).rw("lcdc", FUNC(hd44780_device::control_r), FUNC(hd44780_device::control_w)).umask16(0x00ff); */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD)); screen.set_refresh_hz(60); diff --git a/src/mame/capcom/alien.cpp b/src/mame/capcom/alien.cpp index 6d757631ab4..2b76f0642ba 100644 --- a/src/mame/capcom/alien.cpp +++ b/src/mame/capcom/alien.cpp @@ -91,7 +91,7 @@ TODO: * - dumped *! - CF card dumped, boot roms missing - + **************************************************************************************************/ diff --git a/src/mame/gaelco/gaelco2_v.cpp b/src/mame/gaelco/gaelco2_v.cpp index 1955b672375..13dafd5dbe9 100644 --- a/src/mame/gaelco/gaelco2_v.cpp +++ b/src/mame/gaelco/gaelco2_v.cpp @@ -466,104 +466,104 @@ u32 gaelco2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co } /* - The Y-scroll value in rowscroll mode has a very unusual implementation - the scroll value seems come from a 0x1000 bit being set in one of the - 512 rowscroll table entries. - - Only the bit representing the largest value is used? - - The ordering of the bits does not appear to be immediatley obvious. - - This is used in Touch & Go for the 'Super Spike' but we only scroll - 32 possible values, the entries used for the other scroll values - are unknown unless a pattern can be derived, or figured out from - the game code. - - _______________________________________ entry number - 1111 1111 1111 1111 - 0123 4567 89ab cdef 0123 4567 89ab cdef - _______________________________________ offset into linescroll ram - 0000 0000 0000 1111 1111 1111 1111 1111 - 6677 7888 8999 0001 1112 2233 3444 4555 - 5814 7036 9258 1470 3692 5814 7036 9258 - _______________________________________ - scr = expected scroll value if bit 0x1000 at offset is set - - scr (entry from above) - --x- ---- ---- ---- ---- ---- ---- ---- 32 (02) - ---- ---- ---- --x- ---- ---- ---- ---- 31 (0e) - ---- ---- --x- ---- ---- ---- ---- ---- 30 (0a) - ---- ---- ---- ---- ---- ---- ---x ---- 29 (1b) - ---- ---- ---- ---- ---- -x-- ---- ---- 28 (15) - ---- ---- ---- ---- ---x ---- ---- ---- 27 (13) - ---- x--- ---- ---- ---- ---- ---- ---- 26 (04) - ---- ---- ---- ---- ---- ---- -x-- ---- 25 (19) - ---- ---- ---- x--- ---- ---- ---- ---- 24 (0c) - ---- ---- ---- ---- ---- ---- ---- ---x 23 (1f) - ---- ---- x--- ---- ---- ---- ---- ---- 22 (08) - ---- ---- ---- ---- ---- ---- ---- -x-- 21 (1d) - ---- ---- ---- ---- -x-- ---- ---- ---- 20 (11) - ---- --x- ---- ---- ---- ---- ---- ---- 19 (06) - ---- ---- ---- ---- ---- ---x ---- ---- 18 (17) - ---- ---- ---- ---- x--- ---- ---- ---- 17 (10) - -x-- ---- ---- ---- ---- ---- ---- ---- 16 (01) - ---- ---- ---- -x-- ---- ---- ---- ---- 15 (0d) - ---- ---- ---- ---- ---- --x- ---- ---- 14 (16) - ---- ---- -x-- ---- ---- ---- ---- ---- 13 (09) - ---- ---- ---- ---- ---- ---- --x- ---- 12 (1a) - ---- -x-- ---- ---- ---- ---- ---- ---- 11 (05) - ---- ---- ---- ---- ---- ---- ---- --x- 10 (1e) - x--- ---- ---- ---- ---- ---- ---- ---- 9 (00) - ---- ---- ---- ---- --x- ---- ---- ---- 8 (12) - ---- ---- ---x ---- ---- ---- ---- ---- 7 (0b) - ---- ---- ---- ---- ---- x--- ---- ---- 6 (14) - ---x ---- ---- ---- ---- ---- ---- ---- 5 (03) - ---- ---- ---- ---- ---- ---- ---- x--- 4 (1c) - ---- ---- ---- ---- ---- ---- x--- ---- 3 (18) - ---- ---x ---- ---- ---- ---- ---- ---- 2 (07) - ---- ---- ---- ---x ---- ---- ---- ---- 1 (0f) - - ================================================== sorted list for reference - - x--- ---- ---- ---- ---- ---- ---- ---- 9 - -x-- ---- ---- ---- ---- ---- ---- ---- 16 - --x- ---- ---- ---- ---- ---- ---- ---- 32 - ---x ---- ---- ---- ---- ---- ---- ---- 5 - - ---- x--- ---- ---- ---- ---- ---- ---- 26 - ---- -x-- ---- ---- ---- ---- ---- ---- 11 - ---- --x- ---- ---- ---- ---- ---- ---- 19 - ---- ---x ---- ---- ---- ---- ---- ---- 2 - - ---- ---- x--- ---- ---- ---- ---- ---- 22 - ---- ---- -x-- ---- ---- ---- ---- ---- 13 - ---- ---- --x- ---- ---- ---- ---- ---- 30 - ---- ---- ---x ---- ---- ---- ---- ---- 7 - - ---- ---- ---- x--- ---- ---- ---- ---- 24 - ---- ---- ---- -x-- ---- ---- ---- ---- 15 - ---- ---- ---- --x- ---- ---- ---- ---- 31 - ---- ---- ---- ---x ---- ---- ---- ---- 1 - - ---- ---- ---- ---- x--- ---- ---- ---- 17 - ---- ---- ---- ---- -x-- ---- ---- ---- 20 - ---- ---- ---- ---- --x- ---- ---- ---- 8 - ---- ---- ---- ---- ---x ---- ---- ---- 27 - - ---- ---- ---- ---- ---- x--- ---- ---- 6 - ---- ---- ---- ---- ---- -x-- ---- ---- 28 - ---- ---- ---- ---- ---- --x- ---- ---- 14 - ---- ---- ---- ---- ---- ---x ---- ---- 18 - - ---- ---- ---- ---- ---- ---- x--- ---- 3 - ---- ---- ---- ---- ---- ---- -x-- ---- 25 - ---- ---- ---- ---- ---- ---- --x- ---- 12 - ---- ---- ---- ---- ---- ---- ---x ---- 29 - - ---- ---- ---- ---- ---- ---- ---- x--- 4 - ---- ---- ---- ---- ---- ---- ---- -x-- 21 - ---- ---- ---- ---- ---- ---- ---- --x- 10 - ---- ---- ---- ---- ---- ---- ---- ---x 23 + The Y-scroll value in rowscroll mode has a very unusual implementation + the scroll value seems come from a 0x1000 bit being set in one of the + 512 rowscroll table entries. + + Only the bit representing the largest value is used? + + The ordering of the bits does not appear to be immediatley obvious. + + This is used in Touch & Go for the 'Super Spike' but we only scroll + 32 possible values, the entries used for the other scroll values + are unknown unless a pattern can be derived, or figured out from + the game code. + + _______________________________________ entry number + 1111 1111 1111 1111 + 0123 4567 89ab cdef 0123 4567 89ab cdef + _______________________________________ offset into linescroll ram + 0000 0000 0000 1111 1111 1111 1111 1111 + 6677 7888 8999 0001 1112 2233 3444 4555 + 5814 7036 9258 1470 3692 5814 7036 9258 + _______________________________________ + scr = expected scroll value if bit 0x1000 at offset is set + + scr (entry from above) + --x- ---- ---- ---- ---- ---- ---- ---- 32 (02) + ---- ---- ---- --x- ---- ---- ---- ---- 31 (0e) + ---- ---- --x- ---- ---- ---- ---- ---- 30 (0a) + ---- ---- ---- ---- ---- ---- ---x ---- 29 (1b) + ---- ---- ---- ---- ---- -x-- ---- ---- 28 (15) + ---- ---- ---- ---- ---x ---- ---- ---- 27 (13) + ---- x--- ---- ---- ---- ---- ---- ---- 26 (04) + ---- ---- ---- ---- ---- ---- -x-- ---- 25 (19) + ---- ---- ---- x--- ---- ---- ---- ---- 24 (0c) + ---- ---- ---- ---- ---- ---- ---- ---x 23 (1f) + ---- ---- x--- ---- ---- ---- ---- ---- 22 (08) + ---- ---- ---- ---- ---- ---- ---- -x-- 21 (1d) + ---- ---- ---- ---- -x-- ---- ---- ---- 20 (11) + ---- --x- ---- ---- ---- ---- ---- ---- 19 (06) + ---- ---- ---- ---- ---- ---x ---- ---- 18 (17) + ---- ---- ---- ---- x--- ---- ---- ---- 17 (10) + -x-- ---- ---- ---- ---- ---- ---- ---- 16 (01) + ---- ---- ---- -x-- ---- ---- ---- ---- 15 (0d) + ---- ---- ---- ---- ---- --x- ---- ---- 14 (16) + ---- ---- -x-- ---- ---- ---- ---- ---- 13 (09) + ---- ---- ---- ---- ---- ---- --x- ---- 12 (1a) + ---- -x-- ---- ---- ---- ---- ---- ---- 11 (05) + ---- ---- ---- ---- ---- ---- ---- --x- 10 (1e) + x--- ---- ---- ---- ---- ---- ---- ---- 9 (00) + ---- ---- ---- ---- --x- ---- ---- ---- 8 (12) + ---- ---- ---x ---- ---- ---- ---- ---- 7 (0b) + ---- ---- ---- ---- ---- x--- ---- ---- 6 (14) + ---x ---- ---- ---- ---- ---- ---- ---- 5 (03) + ---- ---- ---- ---- ---- ---- ---- x--- 4 (1c) + ---- ---- ---- ---- ---- ---- x--- ---- 3 (18) + ---- ---x ---- ---- ---- ---- ---- ---- 2 (07) + ---- ---- ---- ---x ---- ---- ---- ---- 1 (0f) + + ================================================== sorted list for reference + + x--- ---- ---- ---- ---- ---- ---- ---- 9 + -x-- ---- ---- ---- ---- ---- ---- ---- 16 + --x- ---- ---- ---- ---- ---- ---- ---- 32 + ---x ---- ---- ---- ---- ---- ---- ---- 5 + + ---- x--- ---- ---- ---- ---- ---- ---- 26 + ---- -x-- ---- ---- ---- ---- ---- ---- 11 + ---- --x- ---- ---- ---- ---- ---- ---- 19 + ---- ---x ---- ---- ---- ---- ---- ---- 2 + + ---- ---- x--- ---- ---- ---- ---- ---- 22 + ---- ---- -x-- ---- ---- ---- ---- ---- 13 + ---- ---- --x- ---- ---- ---- ---- ---- 30 + ---- ---- ---x ---- ---- ---- ---- ---- 7 + + ---- ---- ---- x--- ---- ---- ---- ---- 24 + ---- ---- ---- -x-- ---- ---- ---- ---- 15 + ---- ---- ---- --x- ---- ---- ---- ---- 31 + ---- ---- ---- ---x ---- ---- ---- ---- 1 + + ---- ---- ---- ---- x--- ---- ---- ---- 17 + ---- ---- ---- ---- -x-- ---- ---- ---- 20 + ---- ---- ---- ---- --x- ---- ---- ---- 8 + ---- ---- ---- ---- ---x ---- ---- ---- 27 + + ---- ---- ---- ---- ---- x--- ---- ---- 6 + ---- ---- ---- ---- ---- -x-- ---- ---- 28 + ---- ---- ---- ---- ---- --x- ---- ---- 14 + ---- ---- ---- ---- ---- ---x ---- ---- 18 + + ---- ---- ---- ---- ---- ---- x--- ---- 3 + ---- ---- ---- ---- ---- ---- -x-- ---- 25 + ---- ---- ---- ---- ---- ---- --x- ---- 12 + ---- ---- ---- ---- ---- ---- ---x ---- 29 + + ---- ---- ---- ---- ---- ---- ---- x--- 4 + ---- ---- ---- ---- ---- ---- ---- -x-- 21 + ---- ---- ---- ---- ---- ---- ---- --x- 10 + ---- ---- ---- ---- ---- ---- ---- ---x 23 */ diff --git a/src/mame/gaelco/splash.cpp b/src/mame/gaelco/splash.cpp index 77537ecf3af..d4a04a7ca65 100644 --- a/src/mame/gaelco/splash.cpp +++ b/src/mame/gaelco/splash.cpp @@ -642,7 +642,7 @@ void roldfrog_state::roldfrog(machine_config &config) ymsnd.add_route(3, "mono", 1.0); } -template <unsigned Which> +template <unsigned Which> void funystrp_state::adpcm_int(int state) { if (m_snd_interrupt_enable[Which] || m_msm_toggle[Which] == 1) diff --git a/src/mame/handheld/generalplus_gpce4.cpp b/src/mame/handheld/generalplus_gpce4.cpp index 4d98d4fac53..5ad8381af74 100644 --- a/src/mame/handheld/generalplus_gpce4.cpp +++ b/src/mame/handheld/generalplus_gpce4.cpp @@ -3,7 +3,7 @@ // seems to be a GPCExxx series SunPlus CPU // GPCE4064 series seems very likely for the Super Impulse titles -// +// // GPCE4P064B is an OTP part with support for 30Kbyte OTP ROM (+2Kbyte 'test' area) which matches mapacman // it also lacks Port C, which appears to be unused here @@ -489,7 +489,7 @@ void generalplus_gpl_unknown_state::map(address_map &map) // 300c - IOA_WakeUp_Mask // 300d - IOB_WakeUp_Mask // 300e - IOC_WakeUp_Mask - map(0x00300f, 0x00300f).r(FUNC(generalplus_gpl_unknown_state::reg300f_r)); // IO_Ctrl + map(0x00300f, 0x00300f).r(FUNC(generalplus_gpl_unknown_state::reg300f_r)); // IO_Ctrl // 3010 - TimerA_Data // 3011 - TimerA_CNTR @@ -521,8 +521,8 @@ void generalplus_gpl_unknown_state::map(address_map &map) // 3042 - DAC_CH2_Data // 3043 - PPAMCtrl - map(0x003050, 0x003050).rw(FUNC(generalplus_gpl_unknown_state::reg3050_r), FUNC(generalplus_gpl_unknown_state::reg3050_w)); // INT_Ctrl - map(0x003051, 0x003051).w(FUNC(generalplus_gpl_unknown_state::reg3051_w)); // INT_Status + map(0x003050, 0x003050).rw(FUNC(generalplus_gpl_unknown_state::reg3050_r), FUNC(generalplus_gpl_unknown_state::reg3050_w)); // INT_Ctrl + map(0x003051, 0x003051).w(FUNC(generalplus_gpl_unknown_state::reg3051_w)); // INT_Status map(0x003052, 0x003052).r(FUNC(generalplus_gpl_unknown_state::reg3052_r)); // FIQ_SEL map(0x003053, 0x003053).r(FUNC(generalplus_gpl_unknown_state::reg3053_r)); // INT2_Ctrl // 3054 - INT2_Status @@ -530,9 +530,9 @@ void generalplus_gpl_unknown_state::map(address_map &map) // 3070 - ADC_Ctrl // 3071 - ADC_Data - // 3072 - ADC_LineIn_BitCtrl + // 3072 - ADC_LineIn_BitCtrl // 3073 - ADC_PGA_Ctrl - // 3074 - ADC_FIFO_Ctrl + // 3074 - ADC_FIFO_Ctrl map(0x003090, 0x003090).r(FUNC(generalplus_gpl_unknown_state::reg3090_r)); // SPI2_Ctrl map(0x003091, 0x003091).r(FUNC(generalplus_gpl_unknown_state::reg3091_r)); // SPI2_TXStatus @@ -571,7 +571,7 @@ void generalplus_gpl_unknown_state::map(address_map &map) // 30e6 - SPI_Man_Ctrl // 30e7 - SPI_Auto_Ctrl // 30e8 - SPI_PRGM_BC - // 30e9 - SPI_BANK + // 30e9 - SPI_BANK // 30ea - SPI_DMA_Start // 30eb - SPI_DMA_BC // 30ec - SPI_RX_DMA_ADDR diff --git a/src/mame/handheld/gw35th.cpp b/src/mame/handheld/gw35th.cpp index 5208737b2f1..723d420d8a6 100644 --- a/src/mame/handheld/gw35th.cpp +++ b/src/mame/handheld/gw35th.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders: +// copyright-holders: #include "emu.h" diff --git a/src/mame/handheld/hh_ht11xx.cpp b/src/mame/handheld/hh_ht11xx.cpp index 17c3f4a1356..ab089af9d3c 100644 --- a/src/mame/handheld/hh_ht11xx.cpp +++ b/src/mame/handheld/hh_ht11xx.cpp @@ -325,7 +325,7 @@ ROM_END *******************************************************************************/ -// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS -CONS( 1993, brke23p2, 0, 0, brke23p2, brke23p2, hh_ht1190_state, empty_init, "E-Star", "Brick Game 96 in 1 (E-23 Plus Mark II)", MACHINE_IMPERFECT_TIMING | MACHINE_NO_SOUND ) // some other dieshots have 1996 on them, it is also possible the software is from Holtek -CONS( 199?, ga888, 0, 0, ga888, ga888, hh_ht1130_state, empty_init, "<unknown>", "Block Game & Echo Key GA888", MACHINE_IMPERFECT_TIMING | MACHINE_NO_SOUND ) // clone of Tetris Jr? -CONS( 199?, piko55, 0, 0, piko55, piko55, hh_ht1130_state, empty_init, "Gametech", "Pikorin 55", MACHINE_IMPERFECT_TIMING | MACHINE_NO_SOUND ) +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS +CONS( 1993, brke23p2, 0, 0, brke23p2, brke23p2, hh_ht1190_state, empty_init, "E-Star", "Brick Game 96 in 1 (E-23 Plus Mark II)", MACHINE_IMPERFECT_TIMING | MACHINE_NO_SOUND ) // some other dieshots have 1996 on them, it is also possible the software is from Holtek +CONS( 199?, ga888, 0, 0, ga888, ga888, hh_ht1130_state, empty_init, "<unknown>", "Block Game & Echo Key GA888", MACHINE_IMPERFECT_TIMING | MACHINE_NO_SOUND ) // clone of Tetris Jr? +CONS( 199?, piko55, 0, 0, piko55, piko55, hh_ht1130_state, empty_init, "Gametech", "Pikorin 55", MACHINE_IMPERFECT_TIMING | MACHINE_NO_SOUND ) diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index deb3b0eeb15..b3ab381088e 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -1324,7 +1324,7 @@ VIDEO_START_MEMBER(unkch_state, bonusch) m_enable_reg = 0x1b; // 1 for regular reels; 2 for d-up reel numbers. -// m_reelbank = 2; +// m_reelbank = 2; } @@ -1793,9 +1793,9 @@ uint32_t unkch_state::screen_update_bonusch(screen_device &screen, bitmap_rgb32 uint32_t wingco_state::screen_update_magical(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { rgb_t m_bg_color; - + bitmap.fill(rgb_t::black(), cliprect); - + if (!(m_enable_reg & 0x01)) return 0; @@ -1809,7 +1809,7 @@ uint32_t wingco_state::screen_update_magical(screen_device &screen, bitmap_rgb32 m_reel_tilemap[1]->set_scrolly(i, m_reel_scroll[1][i*2]); // m_reel_tilemap[2]->set_scrolly(i, m_reel_scroll[2][i*2]); } - + rectangle const visible1alt(0*8, (16+48)*8-1, 4*8, 16*8-1); rectangle const visible2alt(0*8, (16+48)*8-1, 16*8, 30*8-1); @@ -2185,19 +2185,19 @@ void cmaster_state::outport0_w(uint8_t data) xxxx ---- unused? */ -// popmessage("outport %02x",data); +// popmessage("outport %02x",data); m_enable_reg = data; } void cmaster_state::chyangb_outport0_w(uint8_t data) { -// popmessage("outport %02x",data); +// popmessage("outport %02x",data); m_enable_reg = data & 0xef; // mask bg register flag } void cmaster_state::wcat3a_outport0_w(uint8_t data) { -// popmessage("outport %02x",data); +// popmessage("outport %02x",data); m_enable_reg = data & 0x0b; // mask bg register flag } @@ -2351,7 +2351,7 @@ void wingco_state::mcu_portc_w(uint8_t data) void wingco_state::draw8_sn_w(uint8_t data) { // SN76489A commands have a inversed bit order. -// Maybe this design was meant for protection. +// Maybe this design was meant for protection. data = bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7); m_draw8sn->write(data); @@ -2565,21 +2565,21 @@ void cb3_state::misc_out_w(uint8_t data) void wingco_state::magodds_outb850_w(uint8_t data) { uint8_t pal_index[8] = { 0, 1, 6, 3, 4, 5, 2, 7 }; // fix reels BG color - m_bgreels = pal_index[data & 0x07]; // set BG reels color index - + m_bgreels = pal_index[data & 0x07]; // set BG reels color index + if (data&0x20) m_tile_bank = 2; else m_tile_bank = 0; -// popmessage("magodds_outb850_w %02x", data); +// popmessage("magodds_outb850_w %02x", data); m_fg_tilemap->mark_all_dirty(); } void wingco_state::magodds_outb860_w(uint8_t data) { -// popmessage("magodds_outb860_w %02x\n", data); +// popmessage("magodds_outb860_w %02x\n", data); } void wingco_state::fl7w4_outc802_w(uint8_t data) @@ -2614,7 +2614,7 @@ void unkch_state::coincount_w(uint8_t data) machine().bookkeeping().coin_counter_w(1, data & 0x08); // Key In counter machine().bookkeeping().coin_counter_w(2, data & 0x02); // payout counter -// popmessage("coin counters: %02x", data); +// popmessage("coin counters: %02x", data); } void unkch_state::unkcm_0x02_w(uint8_t data) @@ -2635,7 +2635,7 @@ void unkch_state::unkcm_0x02_w(uint8_t data) */ -// popmessage("unkcm_0x02_w %02x", data); +// popmessage("unkcm_0x02_w %02x", data); m_vblank_irq_enable = data & 0x80; if (!m_vblank_irq_enable) @@ -2656,7 +2656,7 @@ void unkch_state::unkcm_0x03_w(uint8_t data) m_vidreg = data; -// popmessage("unkcm_0x03_w %02x", data); +// popmessage("unkcm_0x03_w %02x", data); } #if 0 @@ -2673,7 +2673,7 @@ void goldstar_state::ladylinr_outport_w(uint8_t data) .x.. .... x... .... */ -// popmessage("Output: %02X", data); +// popmessage("Output: %02X", data); } #endif @@ -2848,7 +2848,7 @@ uint8_t cd3poker_state::armaly_prot_r() void unkch_state::bonch_0x10_w(uint8_t data) // prot. system { -// popmessage("bonch_0x10_w %02x", data); +// popmessage("bonch_0x10_w %02x", data); logerror("bonch_0x10_w %02x\n", data); } @@ -2861,8 +2861,8 @@ void unkch_state::bonch_0x20_w(uint8_t data) // meters machine().bookkeeping().coin_counter_w(4, data & 0x10); // Coin D machine().bookkeeping().coin_counter_w(5, data & 0x40); // Key Out -// popmessage("bonch_0x20_w %02x", data); -// logerror("bonch_0x20_w %02x\n", data); +// popmessage("bonch_0x20_w %02x", data); +// logerror("bonch_0x20_w %02x\n", data); } void unkch_state::bonch_0x30_w(uint8_t data) // lamps @@ -2876,14 +2876,14 @@ void unkch_state::bonch_0x30_w(uint8_t data) // lamps m_lamps[6] = BIT(data, 6); // D-Up/Take m_lamps[7] = BIT(data, 7); // Stop All -// popmessage("bonch_0x30_w %02x", data); -// logerror("bonch_0x30_w %02x\n", data); +// popmessage("bonch_0x30_w %02x", data); +// logerror("bonch_0x30_w %02x\n", data); } void unkch_state::bonch_0x40_w(uint8_t data) // player 2 ??? wdog ??? video_reg ??? { -// popmessage("bonch_0x40_w %02x", data); -// if((data & 0x6f) != 0) // skip bits 4 and 7 (bit 7 wd or vid_reg enable/disable global) - (bit 4 fixed 1) - (values 90-10-90-10-etc...) +// popmessage("bonch_0x40_w %02x", data); +// if((data & 0x6f) != 0) // skip bits 4 and 7 (bit 7 wd or vid_reg enable/disable global) - (bit 4 fixed 1) - (values 90-10-90-10-etc...) logerror("bonch_0x40_w %02x\n", data); // bit 5 - Hopper Motor @@ -2986,7 +2986,7 @@ void wingco_state::sm7831_write(offs_t offset, uint8_t data) sm7831_Y_reg[i] = 0; logerror("SM7831: Clear X register - Offset:%02x - Data:%02x\n", offset, data); break; - case 0x01: // Move Register X to Y + case 0x01: // Move Register X to Y for(int i = 0; i < 8 ; i++) sm7831_Y_reg[i] = sm7831_X_reg[i]; logerror("SM7831: Move Register X to Y - Offset:%02x - Data:%02x\n", offset, data); @@ -3014,14 +3014,14 @@ void wingco_state::sm7831_write(offs_t offset, uint8_t data) } logerror("SM7831: Exchange Register X with Z - Offset:%02x - Data:%02x\n", offset, data); break; - case 0x03: logerror("SM7831: Zero sense Register X - Offset:%02x - Data:%02x\n", offset, data); break; // Zero sense Register X - Set Zero Flag if ... - case 0x23: logerror("SM7831: Zero sense Register Y - Offset:%02x - Data:%02x\n", offset, data); break; // Zero sense Register y - Set Zero Flag if ... - case 0x04: logerror("SM7831: Register X normalization - Offset:%02x - Data:%02x\n", offset, data); break; // Register X normalization - case 0x24: logerror("SM7831: Register Y normalization - Offset:%02x - Data:%02x\n", offset, data); break; // Register Y normalization + case 0x03: logerror("SM7831: Zero sense Register X - Offset:%02x - Data:%02x\n", offset, data); break; // Zero sense Register X - Set Zero Flag if ... + case 0x23: logerror("SM7831: Zero sense Register Y - Offset:%02x - Data:%02x\n", offset, data); break; // Zero sense Register y - Set Zero Flag if ... + case 0x04: logerror("SM7831: Register X normalization - Offset:%02x - Data:%02x\n", offset, data); break; // Register X normalization + case 0x24: logerror("SM7831: Register Y normalization - Offset:%02x - Data:%02x\n", offset, data); break; // Register Y normalization // Arithmetic Commands - case 0x08: // Add X + Y -> X + case 0x08: // Add X + Y -> X { uint8_t carry = 0; @@ -3067,7 +3067,7 @@ void wingco_state::sm7831_write(offs_t offset, uint8_t data) } break; - case 0x09: // Sub X - Y -> X + case 0x09: // Sub X - Y -> X { uint8_t borrow = 0; @@ -3106,23 +3106,23 @@ void wingco_state::sm7831_write(offs_t offset, uint8_t data) logerror("SM7831: Sub X - Y -> X - Offset:%02x - Data:%02x - borrow:%02x\n", offset, data, borrow); } break; - case 0x0a: logerror("SM7831: Mul X * Y -> X - Offset:%02x - Data:%02x\n", offset, data); break; // Mul X * Y -> X - case 0x0c: logerror("SM7831: Div X / Y -> X - Offset:%02x - Data:%02x\n", offset, data); break; // Div X / Y -> X - case 0x0e: logerror("SM7831: SQRTodd X sqrt -> X - Offset:%02x - Data:%02x\n", offset, data); break; // SQRTodd X sqrt -> X - case 0x1e: logerror("SM7831: SQRTeven X sqrt -> X - Offset:%02x - Data:%02x\n", offset, data); break; // SQRTeven X sqrt -> X + case 0x0a: logerror("SM7831: Mul X * Y -> X - Offset:%02x - Data:%02x\n", offset, data); break; // Mul X * Y -> X + case 0x0c: logerror("SM7831: Div X / Y -> X - Offset:%02x - Data:%02x\n", offset, data); break; // Div X / Y -> X + case 0x0e: logerror("SM7831: SQRTodd X sqrt -> X - Offset:%02x - Data:%02x\n", offset, data); break; // SQRTodd X sqrt -> X + case 0x1e: logerror("SM7831: SQRTeven X sqrt -> X - Offset:%02x - Data:%02x\n", offset, data); break; // SQRTeven X sqrt -> X default: logerror("SM7831: Default - Offset:%02x - Data:%02x\n", offset, data); break; } else switch((data & 0xc0) >> 4) { case 0x04: - case 0x05: logerror("SM7831: SL Register X - Offset:%02x - Data:%02x\n", offset, data); break; // SR Register X + case 0x05: logerror("SM7831: SL Register X - Offset:%02x - Data:%02x\n", offset, data); break; // SR Register X case 0x06: - case 0x07: logerror("SM7831: SL Register Y - Offset:%02x - Data:%02x\n", offset, data); break; // SL Register Y + case 0x07: logerror("SM7831: SL Register Y - Offset:%02x - Data:%02x\n", offset, data); break; // SL Register Y case 0x08: - case 0x09: logerror("SM7831: SR Register X - Offset:%02x - Data:%02x\n", offset, data); break; // SR Register X + case 0x09: logerror("SM7831: SR Register X - Offset:%02x - Data:%02x\n", offset, data); break; // SR Register X case 0x0a: - case 0x0b: logerror("SM7831: SR Register Y - Offset:%02x - Data:%02x\n", offset, data); break; // SR Register Y + case 0x0b: logerror("SM7831: SR Register Y - Offset:%02x - Data:%02x\n", offset, data); break; // SR Register Y default: logerror("SM7831: Default - Offset:%02x - Data:%02x\n", offset, data); break; } @@ -7020,10 +7020,10 @@ static INPUT_PORTS_START( tonypok ) PORT_DIPSETTING( 0x00, "300" ) PORT_DIPSETTING( 0x08, "1000" ) PORT_DIPNAME( 0x30, 0x00, "Credit Limit" ) PORT_DIPLOCATION("DSW2:!5,!6") // OK - PORT_DIPSETTING( 0x00, "10.000" ) - PORT_DIPSETTING( 0x10, "50.000" ) - PORT_DIPSETTING( 0x20, "100.000" ) - PORT_DIPSETTING( 0x30, "Unlimited" ) + PORT_DIPSETTING( 0x00, "10.000" ) + PORT_DIPSETTING( 0x10, "50.000" ) + PORT_DIPSETTING( 0x20, "100.000" ) + PORT_DIPSETTING( 0x30, "Unlimited" ) PORT_DIPNAME( 0x40, 0x40, "Key In Type" ) PORT_DIPLOCATION("DSW2:!7") // OK PORT_DIPSETTING( 0x40, "A-Type" ) PORT_DIPSETTING( 0x00, "B-Type" ) @@ -7066,10 +7066,10 @@ static INPUT_PORTS_START( tonypok ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x06, 0x06, "Coin In Limit" ) PORT_DIPLOCATION("DSW4:2,3") // OK - PORT_DIPSETTING( 0x06, "1,000" ) - PORT_DIPSETTING( 0x04, "5,000" ) - PORT_DIPSETTING( 0x02, "10,000" ) - PORT_DIPSETTING( 0x00, "20,000" ) + PORT_DIPSETTING( 0x06, "1,000" ) + PORT_DIPSETTING( 0x04, "5,000" ) + PORT_DIPSETTING( 0x02, "10,000" ) + PORT_DIPSETTING( 0x00, "20,000" ) PORT_DIPNAME( 0x08, 0x08, "Instant W-Up Game" ) PORT_DIPLOCATION("DSW4:4") // OK PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // play W-up game right away from bet screen! @@ -8540,37 +8540,37 @@ INPUT_PORTS_END static INPUT_PORTS_START( f16s8l ) /* ============================================================================ - Findings Summary (current build) + Findings Summary (current build) ---------------------------------------------------------------------------- - • Maximum / Minimum Bet functions identified and operational - • Key-In value table verified - • Double-Up mode and percentage settings confirmed - • Bet-Type switching functional - • Coin A ratio verified — also applies to Coin D and determines - hopper payout rate (tokens per unit) - • Payout percentage and Odds Table behavior confirmed - - • Coin B input not present - • Coin C produces sound only — no credit increment (likely disabled channel) - • "Hold a Pair after Losing a Spin" feature not located in current code - - • Double-Up always active - • Reel speed is stable - • No limits detected on credit-in, hopper-out, or gameplay credits + • Maximum / Minimum Bet functions identified and operational + • Key-In value table verified + • Double-Up mode and percentage settings confirmed + • Bet-Type switching functional + • Coin A ratio verified — also applies to Coin D and determines + hopper payout rate (tokens per unit) + • Payout percentage and Odds Table behavior confirmed + + • Coin B input not present + • Coin C produces sound only — no credit increment (likely disabled channel) + • "Hold a Pair after Losing a Spin" feature not located in current code + + • Double-Up always active + • Reel speed is stable + • No limits detected on credit-in, hopper-out, or gameplay credits ---------------------------------------------------------------------------- - Gameplay characteristics and special features: - • Mario JOK symbol acts as WILD for all symbols and triggers - the on-screen message "GOLD JOKER" - • Girl JP symbol: does not form combinations, but whenever it appears - anywhere on the reels during a winning spin, the total win is DOUBLED - • Random "LUCKY YOU" event grants 3 free spins at any time - • "GOOD FEVER" event may activate randomly, doubling all wins - on the fever payline + Gameplay characteristics and special features: + • Mario JOK symbol acts as WILD for all symbols and triggers + the on-screen message "GOLD JOKER" + • Girl JP symbol: does not form combinations, but whenever it appears + anywhere on the reels during a winning spin, the total win is DOUBLED + • Random "LUCKY YOU" event grants 3 free spins at any time + • "GOOD FEVER" event may activate randomly, doubling all wins + on the fever payline ============================================================================ - End of findings + End of findings ============================================================================ */ PORT_INCLUDE( lucky8b ) @@ -8589,10 +8589,10 @@ static INPUT_PORTS_START( f16s8l ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x18, 0x18, "Double Up %" ) PORT_DIPLOCATION("DSW1:4,5") - PORT_DIPSETTING( 0x18, "50%" ) - PORT_DIPSETTING( 0x10, "60%" ) - PORT_DIPSETTING( 0x08, "70%" ) - PORT_DIPSETTING( 0x00, "80%" ) + PORT_DIPSETTING( 0x18, "50%" ) + PORT_DIPSETTING( 0x10, "60%" ) + PORT_DIPSETTING( 0x08, "70%" ) + PORT_DIPSETTING( 0x00, "80%" ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:6") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -8605,10 +8605,10 @@ static INPUT_PORTS_START( f16s8l ) PORT_MODIFY("DSW2") PORT_DIPNAME( 0x03, 0x03, "Main Game Pay Rate" ) PORT_DIPLOCATION("DSW2:1,2") - PORT_DIPSETTING( 0x03, "50%" ) - PORT_DIPSETTING( 0x02, "60%" ) - PORT_DIPSETTING( 0x01, "70%" ) - PORT_DIPSETTING( 0x00, "80%" ) + PORT_DIPSETTING( 0x03, "50%" ) + PORT_DIPSETTING( 0x02, "60%" ) + PORT_DIPSETTING( 0x01, "70%" ) + PORT_DIPSETTING( 0x00, "80%" ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW2:3") PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -8625,15 +8625,15 @@ static INPUT_PORTS_START( f16s8l ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x80, "Odds Table" ) PORT_DIPLOCATION("DSW2:8") - PORT_DIPSETTING( 0x80, "Low" ) - PORT_DIPSETTING( 0x00, "High" ) + PORT_DIPSETTING( 0x80, "Low" ) + PORT_DIPSETTING( 0x00, "High" ) PORT_MODIFY("DSW3") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("DSW3:1,2") - PORT_DIPSETTING( 0x03, DEF_STR( 1C_10C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 1C_5C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( 1C_10C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW3:3") PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -8655,28 +8655,28 @@ static INPUT_PORTS_START( f16s8l ) PORT_MODIFY("DSW4") PORT_DIPNAME( 0x07, 0x06, "Key In Rate" ) PORT_DIPLOCATION("DSW4:1,2,3") - PORT_DIPSETTING( 0x00, "1 Pulse / 5 Credits" ) - PORT_DIPSETTING( 0x04, "1 Pulse / 10 Credits" ) - PORT_DIPSETTING( 0x02, "1 Pulse / 20 Credits" ) - PORT_DIPSETTING( 0x06, "1 Pulse / 100 Credits" ) - PORT_DIPSETTING( 0x01, "1 Pulse / 110 Credits" ) - PORT_DIPSETTING( 0x05, "1 Pulse / 120 Credits" ) - PORT_DIPSETTING( 0x03, "1 Pulse / 130 Credits" ) - PORT_DIPSETTING( 0x07, "1 Pulse / 140 Credits" ) + PORT_DIPSETTING( 0x00, "1 Pulse / 5 Credits" ) + PORT_DIPSETTING( 0x04, "1 Pulse / 10 Credits" ) + PORT_DIPSETTING( 0x02, "1 Pulse / 20 Credits" ) + PORT_DIPSETTING( 0x06, "1 Pulse / 100 Credits" ) + PORT_DIPSETTING( 0x01, "1 Pulse / 110 Credits" ) + PORT_DIPSETTING( 0x05, "1 Pulse / 120 Credits" ) + PORT_DIPSETTING( 0x03, "1 Pulse / 130 Credits" ) + PORT_DIPSETTING( 0x07, "1 Pulse / 140 Credits" ) PORT_DIPNAME( 0x08, 0x08, "Double Up Type" ) PORT_DIPLOCATION("DSW4:4") // both are hi-lo with witches - PORT_DIPSETTING( 0x00, "Type 1" ) - PORT_DIPSETTING( 0x08, "Type 2" ) + PORT_DIPSETTING( 0x00, "Type 1" ) + PORT_DIPSETTING( 0x08, "Type 2" ) PORT_DIPNAME( 0x10, 0x10, "Bet Type" ) PORT_DIPLOCATION("DSW4:5") - PORT_DIPSETTING( 0x10, "Type 1" ) - PORT_DIPSETTING( 0x00, "Type 2" ) + PORT_DIPSETTING( 0x10, "Type 1" ) + PORT_DIPSETTING( 0x00, "Type 2" ) PORT_DIPNAME( 0x60, 0x00, "Maximum Bet" ) PORT_DIPLOCATION("DSW4:6,7") - PORT_DIPSETTING( 0x60, "32" ) - PORT_DIPSETTING( 0x20, "64" ) - PORT_DIPSETTING( 0x40, "78" ) - PORT_DIPSETTING( 0x00, "80" ) + PORT_DIPSETTING( 0x60, "32" ) + PORT_DIPSETTING( 0x20, "64" ) + PORT_DIPSETTING( 0x40, "78" ) + PORT_DIPSETTING( 0x00, "80" ) PORT_DIPNAME( 0x80, 0x80, "Minimum Bet" ) PORT_DIPLOCATION("DSW4:8") - PORT_DIPSETTING( 0x00, "1" ) - PORT_DIPSETTING( 0x80, "8" ) + PORT_DIPSETTING( 0x00, "1" ) + PORT_DIPSETTING( 0x80, "8" ) INPUT_PORTS_END @@ -8815,63 +8815,63 @@ static INPUT_PORTS_START( wcat3 ) /* The following info is from japanese manual - //---------------- DSW5 is present in the daughterboard ---------------- - PORT_MODIFY("DSW5") - PORT_DIPNAME( 0x03, 0x02, "Coin Limit" ) PORT_DIPLOCATION("DSW5:1,2") - PORT_DIPSETTING( 0x03, "1,000" ) // off,off - PORT_DIPSETTING( 0x02, "5,000" ) // on,off - PORT_DIPSETTING( 0x01, "10,000" ) // off,on - PORT_DIPSETTING( 0x00, "20,000" ) // on,on - PORT_DIPNAME( 0x1c, 0x14, "Credit Limit" ) PORT_DIPLOCATION("DSW5:3,4,5") - PORT_DIPSETTING( 0x1c, "5,000" ) // off,off,off - PORT_DIPSETTING( 0x18, "10,000" ) // on,off,off - PORT_DIPSETTING( 0x14, "20,000" ) // off,on,off - PORT_DIPSETTING( 0x10, "30,000" ) // on,on,off - PORT_DIPSETTING( 0x0c, "40,000" ) // off,off,on - PORT_DIPSETTING( 0x08, "50,000" ) // on,off,on - PORT_DIPSETTING( 0x04, "100,000" ) // off,on,on - PORT_DIPSETTING( 0x00, "None" ) // on,on,on - PORT_DIPNAME( 0x20, 0x00, "Reel Speed" ) PORT_DIPLOCATION("DSW5:6") - PORT_DIPSETTING( 0x20, "Normal" ) // off - PORT_DIPSETTING( 0x00, "High" ) // on - PORT_DIPNAME( 0xc0, 0xc0, "Max Bet" ) PORT_DIPLOCATION("DSW5:7,8") - PORT_DIPSETTING( 0xc0, "8 Bet" ) // off,off - PORT_DIPSETTING( 0x80, "16 Bet" ) // on,off - PORT_DIPSETTING( 0x40, "32 Bet" ) // off,on - PORT_DIPSETTING( 0x00, "64 Bet" ) // on,on - - //---------------- DSW6 is present in the daughterboard ---------------- - PORT_MODIFY("DSW6") - PORT_DIPNAME( 0x03, 0x03, "Bell Fever Line Count" ) PORT_DIPLOCATION("DSW6:1,2") - PORT_DIPSETTING( 0x03, "3" ) // off,off - PORT_DIPSETTING( 0x02, "5" ) // on,off - PORT_DIPSETTING( 0x01, "7" ) // off,on - PORT_DIPSETTING( 0x00, "9" ) // on,on - PORT_DIPNAME( 0x04, 0x04, "Cat Bonus Count" ) PORT_DIPLOCATION("DSW6:3") - PORT_DIPSETTING( 0x04, "7" ) // off - PORT_DIPSETTING( 0x00, "9" ) // on - PORT_DIPNAME( 0x10, 0x10, "Cat Bonus Multiplier" ) PORT_DIPLOCATION("DSW6:5") - PORT_DIPSETTING( 0x00, "x2" ) // on - PORT_DIPSETTING( 0x10, "x3" ) // off - PORT_DIPNAME( 0x60, 0x60, "Bar Bonus Count (1/2/3 BAR)" ) PORT_DIPLOCATION("DSW6:6,7") - PORT_DIPSETTING( 0x60, "3 / 6 / 8" ) // off,off - PORT_DIPSETTING( 0x40, "4 / 8 / 12" ) // on,off - PORT_DIPSETTING( 0x20, "5 / 10 / 14" ) // off,on - PORT_DIPSETTING( 0x00, "6 / 12 / 16" ) // on,on - - //------------- Rotary Switch is present in the daughterboard ------------- - PORT_MODIFY("Rotary SW") - PORT_DIPNAME( 0x0f, 0x05, "Wave Level" ) PORT_DIPLOCATION("SW7:1,2,3,4") - PORT_DIPSETTING( 0x00, "0 (None)" ) // all off -> 0 - PORT_DIPSETTING( 0x01, "1" ) - PORT_DIPSETTING( 0x02, "2" ) - PORT_DIPSETTING( 0x03, "3" ) - PORT_DIPSETTING( 0x04, "4" ) - PORT_DIPSETTING( 0x05, "5" ) - PORT_DIPSETTING( 0x06, "6" ) - PORT_DIPSETTING( 0x07, "7" ) - PORT_DIPSETTING( 0x08, "8" ) - PORT_DIPSETTING( 0x09, "9 (Large)" ) + //---------------- DSW5 is present in the daughterboard ---------------- + PORT_MODIFY("DSW5") + PORT_DIPNAME( 0x03, 0x02, "Coin Limit" ) PORT_DIPLOCATION("DSW5:1,2") + PORT_DIPSETTING( 0x03, "1,000" ) // off,off + PORT_DIPSETTING( 0x02, "5,000" ) // on,off + PORT_DIPSETTING( 0x01, "10,000" ) // off,on + PORT_DIPSETTING( 0x00, "20,000" ) // on,on + PORT_DIPNAME( 0x1c, 0x14, "Credit Limit" ) PORT_DIPLOCATION("DSW5:3,4,5") + PORT_DIPSETTING( 0x1c, "5,000" ) // off,off,off + PORT_DIPSETTING( 0x18, "10,000" ) // on,off,off + PORT_DIPSETTING( 0x14, "20,000" ) // off,on,off + PORT_DIPSETTING( 0x10, "30,000" ) // on,on,off + PORT_DIPSETTING( 0x0c, "40,000" ) // off,off,on + PORT_DIPSETTING( 0x08, "50,000" ) // on,off,on + PORT_DIPSETTING( 0x04, "100,000" ) // off,on,on + PORT_DIPSETTING( 0x00, "None" ) // on,on,on + PORT_DIPNAME( 0x20, 0x00, "Reel Speed" ) PORT_DIPLOCATION("DSW5:6") + PORT_DIPSETTING( 0x20, "Normal" ) // off + PORT_DIPSETTING( 0x00, "High" ) // on + PORT_DIPNAME( 0xc0, 0xc0, "Max Bet" ) PORT_DIPLOCATION("DSW5:7,8") + PORT_DIPSETTING( 0xc0, "8 Bet" ) // off,off + PORT_DIPSETTING( 0x80, "16 Bet" ) // on,off + PORT_DIPSETTING( 0x40, "32 Bet" ) // off,on + PORT_DIPSETTING( 0x00, "64 Bet" ) // on,on + + //---------------- DSW6 is present in the daughterboard ---------------- + PORT_MODIFY("DSW6") + PORT_DIPNAME( 0x03, 0x03, "Bell Fever Line Count" ) PORT_DIPLOCATION("DSW6:1,2") + PORT_DIPSETTING( 0x03, "3" ) // off,off + PORT_DIPSETTING( 0x02, "5" ) // on,off + PORT_DIPSETTING( 0x01, "7" ) // off,on + PORT_DIPSETTING( 0x00, "9" ) // on,on + PORT_DIPNAME( 0x04, 0x04, "Cat Bonus Count" ) PORT_DIPLOCATION("DSW6:3") + PORT_DIPSETTING( 0x04, "7" ) // off + PORT_DIPSETTING( 0x00, "9" ) // on + PORT_DIPNAME( 0x10, 0x10, "Cat Bonus Multiplier" ) PORT_DIPLOCATION("DSW6:5") + PORT_DIPSETTING( 0x00, "x2" ) // on + PORT_DIPSETTING( 0x10, "x3" ) // off + PORT_DIPNAME( 0x60, 0x60, "Bar Bonus Count (1/2/3 BAR)" ) PORT_DIPLOCATION("DSW6:6,7") + PORT_DIPSETTING( 0x60, "3 / 6 / 8" ) // off,off + PORT_DIPSETTING( 0x40, "4 / 8 / 12" ) // on,off + PORT_DIPSETTING( 0x20, "5 / 10 / 14" ) // off,on + PORT_DIPSETTING( 0x00, "6 / 12 / 16" ) // on,on + + //------------- Rotary Switch is present in the daughterboard ------------- + PORT_MODIFY("Rotary SW") + PORT_DIPNAME( 0x0f, 0x05, "Wave Level" ) PORT_DIPLOCATION("SW7:1,2,3,4") + PORT_DIPSETTING( 0x00, "0 (None)" ) // all off -> 0 + PORT_DIPSETTING( 0x01, "1" ) + PORT_DIPSETTING( 0x02, "2" ) + PORT_DIPSETTING( 0x03, "3" ) + PORT_DIPSETTING( 0x04, "4" ) + PORT_DIPSETTING( 0x05, "5" ) + PORT_DIPSETTING( 0x06, "6" ) + PORT_DIPSETTING( 0x07, "7" ) + PORT_DIPSETTING( 0x08, "8" ) + PORT_DIPSETTING( 0x09, "9 (Large)" ) */ INPUT_PORTS_END @@ -12090,7 +12090,7 @@ static INPUT_PORTS_START( bonusch ) PORT_START("DSW1") PORT_DIPNAME( 0x03, 0x03, "Double-Up Type" ) PORT_DIPSETTING( 0x03, "1" ) // Hi-Lo Card Style - PORT_DIPSETTING( 0x02, "2" ) // Hi-Lo With Reel Bonus + PORT_DIPSETTING( 0x02, "2" ) // Hi-Lo With Reel Bonus PORT_DIPSETTING( 0x01, "3" ) // Hi-Lo With Poker Combo PORT_DIPSETTING( 0x00, "None" ) PORT_DIPNAME( 0x04, 0x04, "Hopper SW" ) @@ -12167,7 +12167,7 @@ static INPUT_PORTS_START( bonusch ) PORT_DIPSETTING( 0x30, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, "1 Coin / 200 Credit" ) // add this to the core -> 1 Coin 200 Credits + PORT_DIPSETTING( 0x00, "1 Coin / 200 Credit" ) // add this to the core -> 1 Coin 200 Credits PORT_DIPNAME( 0x80, 0x80, "Reel" ) PORT_DIPSETTING( 0x80, "Auto Stop" ) PORT_DIPSETTING( 0x00, "Manual Stop" ) @@ -16208,7 +16208,7 @@ ROM_START( cmv823 ) ROM_LOAD( "sub-pcb.bin", 0x4000, 0x4000, CRC(0dae1586) SHA1(0e217fdd54b5855ef8a8543d1af861f577f8e0d3) ) ROM_CONTINUE( 0x0000, 0x4000 ) ROM_CONTINUE( 0x8000, 0x8000 ) - + ROM_REGION( 0x18000, "gfx1", 0 ) ROM_LOAD( "m5.256", 0x00000, 0x8000, CRC(19cc1d67) SHA1(47487f9362bfb36a32100ed772960628844462bf) ) ROM_LOAD( "m6.256", 0x08000, 0x8000, CRC(63b3df4e) SHA1(9bacd23da598805ec18ec5ad15cab95d71eb9262) ) @@ -25468,10 +25468,10 @@ ROM_START( bonusch ) ROM_CONTINUE( 0x10000, 0x08000 ) ROM_REGION( 0x20000, "gfx2", 0 ) -// ROM_LOAD( "4.1p", 0x08000, 0x08000, CRC(530bdec2) SHA1(2ce0993386fe6b165363a053b54fc66d8bf385d7) ) -// ROM_CONTINUE( 0x00000, 0x08000 ) -// ROM_LOAD( "3.1m", 0x18000, 0x08000, CRC(2acac012) SHA1(59d879214c4e473fa6fedb4a08dcd9b3c6a881a3) ) -// ROM_CONTINUE( 0x10000, 0x08000 ) +// ROM_LOAD( "4.1p", 0x08000, 0x08000, CRC(530bdec2) SHA1(2ce0993386fe6b165363a053b54fc66d8bf385d7) ) +// ROM_CONTINUE( 0x00000, 0x08000 ) +// ROM_LOAD( "3.1m", 0x18000, 0x08000, CRC(2acac012) SHA1(59d879214c4e473fa6fedb4a08dcd9b3c6a881a3) ) +// ROM_CONTINUE( 0x10000, 0x08000 ) ROM_LOAD( "4.1p", 0x08000, 0x04000, CRC(530bdec2) SHA1(2ce0993386fe6b165363a053b54fc66d8bf385d7) ) ROM_CONTINUE( 0x0e000, 0x02000 ) // 3rd and 4th querters swapped @@ -25512,10 +25512,10 @@ ROM_START( bonuscha ) ROM_CONTINUE( 0x10000, 0x08000 ) ROM_REGION( 0x20000, "gfx2", 0 ) -// ROM_LOAD( "4.1p", 0x08000, 0x08000, CRC(530bdec2) SHA1(2ce0993386fe6b165363a053b54fc66d8bf385d7) ) -// ROM_CONTINUE( 0x00000, 0x08000 ) -// ROM_LOAD( "3.1m", 0x18000, 0x08000, CRC(2acac012) SHA1(59d879214c4e473fa6fedb4a08dcd9b3c6a881a3) ) -// ROM_CONTINUE( 0x10000, 0x08000 ) +// ROM_LOAD( "4.1p", 0x08000, 0x08000, CRC(530bdec2) SHA1(2ce0993386fe6b165363a053b54fc66d8bf385d7) ) +// ROM_CONTINUE( 0x00000, 0x08000 ) +// ROM_LOAD( "3.1m", 0x18000, 0x08000, CRC(2acac012) SHA1(59d879214c4e473fa6fedb4a08dcd9b3c6a881a3) ) +// ROM_CONTINUE( 0x10000, 0x08000 ) ROM_LOAD( "4.1p", 0x08000, 0x04000, CRC(530bdec2) SHA1(2ce0993386fe6b165363a053b54fc66d8bf385d7) ) ROM_CONTINUE( 0x0e000, 0x02000 ) // 3rd and 4th querters swapped @@ -29559,10 +29559,10 @@ void cmaster_state::init_cutya() uint8_t *rom = memregion("maincpu")->base(); rom[0x02e6] = 0x83; // jp 0301h -> jp 8301h start - rom[0x2a6e] = 0x83; // ld hl, 0301h -> 8301h start + rom[0x2a6e] = 0x83; // ld hl, 0301h -> 8301h start rom[0x8f51] = 0x84; // jp 4423h -> jp 8423h loop attract rom[0x0821] = 0x93; // 81fh jp 53CBh -> jp 93cbh - rom[0x0927] = 0x5a; // 0926h call 0722h -> call 465ah - keep original program flow (as cutyline) + rom[0x0927] = 0x5a; // 0926h call 0722h -> call 465ah - keep original program flow (as cutyline) rom[0x0928] = 0x46; rom[0x9415] = 0xcd; // 9415h jp 8646h -> call 4d09h - keep original program flow (as cutyline) rom[0x9416] = 0x09; @@ -29586,7 +29586,7 @@ void cmaster_state::init_cutya() rom[0x05b5] = 0x94; // jp 548ah -> jp 948ah rom[0x0619] = 0x93; // jp 53d2h -> jp 93d2h rom[0x82d8] = 0x93; // jp 53fch -> jp 93fch - rom[0x9493] = 0xa5; // jp nz 0560h -> a560h + rom[0x9493] = 0xa5; // jp nz 0560h -> a560h } void wingco_state::init_cbaai() diff --git a/src/mame/igs/pgm3.cpp b/src/mame/igs/pgm3.cpp index 412b255b311..f35727daf3a 100644 --- a/src/mame/igs/pgm3.cpp +++ b/src/mame/igs/pgm3.cpp @@ -147,7 +147,7 @@ void pgm3_state::machine_reset() // the first 0x20000 bytes are encrypted with this key, it then uses other keys to decrypt the rest // the decryption is done in hardware, not software - decryptaes(rom_aes_key, rom_aes_iv, 0x10000000, 0x00000000, 0x20000); + decryptaes(rom_aes_key, rom_aes_iv, 0x10000000, 0x00000000, 0x20000); // if we want to boot from somewhere else, change this //m_maincpu->set_state_int(arm7_cpu_device::ARM7_R15, 0x04000000); diff --git a/src/mame/igs/spoker.cpp b/src/mame/igs/spoker.cpp index 48d5b6d3674..cea3e61e097 100644 --- a/src/mame/igs/spoker.cpp +++ b/src/mame/igs/spoker.cpp @@ -941,13 +941,13 @@ static INPUT_PORTS_START( spk306us ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) PORT_DIPNAME( 0x02, 0x02, "Play Score" ) PORT_DIPLOCATION("SW3:2") PORT_DIPSETTING( 0x02, DEF_STR( No ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x04, 0x04, "Box Score" ) PORT_DIPLOCATION("SW3:3") - PORT_DIPSETTING( 0x04, DEF_STR( No ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x08, 0x08, "Box Score: 10 Times" ) PORT_DIPLOCATION("SW3:4") - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x04, 0x04, "Box Score" ) PORT_DIPLOCATION("SW3:3") + PORT_DIPSETTING( 0x04, DEF_STR( No ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x08, 0x08, "Box Score: 10 Times" ) PORT_DIPLOCATION("SW3:4") + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x10, 0x10, "Auto Ticket" ) PORT_DIPLOCATION("SW3:5") PORT_DIPSETTING( 0x10, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) @@ -959,24 +959,24 @@ static INPUT_PORTS_START( spk306us ) // When Box Score is set to "10 Times", the W-UP GAME is disabled even if the W-UP GAME option is set to "Yes". PORT_START("DSW4") - PORT_DIPUNKNOWN( 0x01, 0x01 ) PORT_DIPLOCATION("SW4:1") - PORT_DIPUNKNOWN( 0x02, 0x02 ) PORT_DIPLOCATION("SW4:2") - PORT_DIPUNKNOWN( 0x04, 0x04 ) PORT_DIPLOCATION("SW4:3") - PORT_DIPUNKNOWN( 0x08, 0x08 ) PORT_DIPLOCATION("SW4:4") - PORT_DIPUNKNOWN( 0x10, 0x10 ) PORT_DIPLOCATION("SW4:5") - PORT_DIPUNKNOWN( 0x20, 0x20 ) PORT_DIPLOCATION("SW4:6") - PORT_DIPUNKNOWN( 0x40, 0x40 ) PORT_DIPLOCATION("SW4:7") - PORT_DIPUNKNOWN( 0x80, 0x80 ) PORT_DIPLOCATION("SW4:8") - - PORT_START("DSW5") + PORT_DIPUNKNOWN( 0x01, 0x01 ) PORT_DIPLOCATION("SW4:1") + PORT_DIPUNKNOWN( 0x02, 0x02 ) PORT_DIPLOCATION("SW4:2") + PORT_DIPUNKNOWN( 0x04, 0x04 ) PORT_DIPLOCATION("SW4:3") + PORT_DIPUNKNOWN( 0x08, 0x08 ) PORT_DIPLOCATION("SW4:4") + PORT_DIPUNKNOWN( 0x10, 0x10 ) PORT_DIPLOCATION("SW4:5") + PORT_DIPUNKNOWN( 0x20, 0x20 ) PORT_DIPLOCATION("SW4:6") + PORT_DIPUNKNOWN( 0x40, 0x40 ) PORT_DIPLOCATION("SW4:7") + PORT_DIPUNKNOWN( 0x80, 0x80 ) PORT_DIPLOCATION("SW4:8") + + PORT_START("DSW5") PORT_DIPUNKNOWN( 0x01, 0x01 ) PORT_DIPLOCATION("SW5:1") - PORT_DIPUNKNOWN( 0x02, 0x02 ) PORT_DIPLOCATION("SW5:2") - PORT_DIPUNKNOWN( 0x04, 0x04 ) PORT_DIPLOCATION("SW5:3") - PORT_DIPUNKNOWN( 0x08, 0x08 ) PORT_DIPLOCATION("SW5:4") - PORT_DIPUNKNOWN( 0x10, 0x10 ) PORT_DIPLOCATION("SW5:5") - PORT_DIPUNKNOWN( 0x20, 0x20 ) PORT_DIPLOCATION("SW5:6") - PORT_DIPUNKNOWN( 0x40, 0x40 ) PORT_DIPLOCATION("SW5:7") - PORT_DIPUNKNOWN( 0x80, 0x80 ) PORT_DIPLOCATION("SW5:8") + PORT_DIPUNKNOWN( 0x02, 0x02 ) PORT_DIPLOCATION("SW5:2") + PORT_DIPUNKNOWN( 0x04, 0x04 ) PORT_DIPLOCATION("SW5:3") + PORT_DIPUNKNOWN( 0x08, 0x08 ) PORT_DIPLOCATION("SW5:4") + PORT_DIPUNKNOWN( 0x10, 0x10 ) PORT_DIPLOCATION("SW5:5") + PORT_DIPUNKNOWN( 0x20, 0x20 ) PORT_DIPLOCATION("SW5:6") + PORT_DIPUNKNOWN( 0x40, 0x40 ) PORT_DIPLOCATION("SW5:7") + PORT_DIPUNKNOWN( 0x80, 0x80 ) PORT_DIPLOCATION("SW5:8") PORT_START("SERVICE") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/layout/vet3000.lay b/src/mame/layout/vet3000.lay index 2006b97197b..90714904e51 100644 --- a/src/mame/layout/vet3000.lay +++ b/src/mame/layout/vet3000.lay @@ -129,7 +129,7 @@ copyright-holders:Felipe Sanches <image><data><![CDATA[ <svg width="7" height="16"> <path fill="#191919" stroke="none" d=" - M 0,12.4 H 2.3 v 3.6 h 2.4 v -3.6 h 2.3 l -3.5,-12.4 z + M 0,12.4 H 2.3 v 3.6 h 2.4 v -3.6 h 2.3 l -3.5,-12.4 z "/> </svg> ]]></data></image> @@ -273,7 +273,7 @@ copyright-holders:Felipe Sanches <element ref="yellow_key_61" inputtag="ROW6" inputmask="0x10"><!-- Up / Down --><bounds x="778" y="202" width="61" height="61"/></element> <element ref="up_arrow"><bounds x="805.5" y="214" width="7" height="16"/></element> <element ref="up_arrow"><orientation rotate="180" /><bounds x="805.5" y="236" width="7" height="16"/></element> - + <element ref="yellow_key_61" inputtag="ROW7" inputmask="0x10"><!-- Left / Right --><bounds x="841" y="202" width="61" height="61"/></element> <element ref="right_arrow"><bounds x="858" y="220" width="28" height="7"/></element> <element ref="right_arrow"><orientation rotate="180" /><bounds x="858" y="239" width="28" height="7"/></element> diff --git a/src/mame/layout/virusb.lay b/src/mame/layout/virusb.lay index 094065100e9..a8cc56c4551 100644 --- a/src/mame/layout/virusb.lay +++ b/src/mame/layout/virusb.lay @@ -72,7 +72,7 @@ license:CC0-1.0 <rect> <color red="0.6" green="0.6" blue="0.6"/> <bounds x="22" y="2" width="3" height="12"/> - </rect> + </rect> <disk> <color red="1" green="1" blue="1" alpha="0.05"/> <bounds x="5" y="5" width="37" height="37"/> @@ -151,8 +151,8 @@ license:CC0-1.0 <group name="knob_saturation"> <!-- FIXME: This one should have dots only in the left half - and the word "SATURATION" along a circular path to the right. - but I don't know how to draw that in the .lay schema + and the word "SATURATION" along a circular path to the right. + but I don't know how to draw that in the .lay schema --> <element ref="gray_line"><bounds x="36.5" y="15" width="4" height="8"/></element> <group ref="knob_base"><bounds x="0" y="7" width="77" height="59"/></group> diff --git a/src/mame/linn/linndrum.cpp b/src/mame/linn/linndrum.cpp index bf87caa1410..ff131aa0a04 100644 --- a/src/mame/linn/linndrum.cpp +++ b/src/mame/linn/linndrum.cpp @@ -315,7 +315,7 @@ void linndrum_vcf_eg_device::update_freq_cv_offset() m_i_offset = vx / R; LOGMASKED(LOG_CALIBRATION, "%s: CV Offset current: %f. CV range: %f - %f\n", - tag(), m_i_offset, get_freq_cv(0), get_freq_cv(EG_V_TARGET)); + tag(), m_i_offset, get_freq_cv(0), get_freq_cv(EG_V_TARGET)); } DECLARE_INPUT_CHANGED_MEMBER(linndrum_vcf_eg_device::freq_cv_offset_changed) diff --git a/src/mame/misc/marywu.cpp b/src/mame/misc/marywu.cpp index a27b3436236..e155735fca7 100644 --- a/src/mame/misc/marywu.cpp +++ b/src/mame/misc/marywu.cpp @@ -101,9 +101,9 @@ static INPUT_PORTS_START( marywu ) PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON4) // K3 PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("P1") - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("P1.6") PORT_CODE(KEYCODE_C) // If press or IP_ACTIVE_LOW Will cause Error 30 if press - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("P1.7") PORT_CODE(KEYCODE_V) // If press during startup, it will cause error 76. + PORT_START("P1") + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("P1.6") PORT_CODE(KEYCODE_C) // If press or IP_ACTIVE_LOW Will cause Error 30 if press + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("P1.7") PORT_CODE(KEYCODE_V) // If press during startup, it will cause error 76. INPUT_PORTS_END void marywu_state::ay1_port_a_w(uint8_t data) diff --git a/src/mame/misc/savquest.cpp b/src/mame/misc/savquest.cpp index 000e325e2d1..1220d0d0823 100644 --- a/src/mame/misc/savquest.cpp +++ b/src/mame/misc/savquest.cpp @@ -10,7 +10,7 @@ TODO: - Needs proper AWE64 emulation defined as a slot option default, with fallbacks to AWE32 and SB16; - \- to workaround: attrib -R C:\IMMERSIA\BIN\IMMOS.BAT then edit file to swap sound card + \- to workaround: attrib -R C:\IMMERSIA\BIN\IMMOS.BAT then edit file to swap sound card - When switching gfx mode during boot routine it still sets a terminal debug mode (with cut down screen portions) instead of normal Voodoo drawing. Culprit may be an I/O port reading or a Voodoo bug; @@ -112,10 +112,10 @@ private: //int m_haspstate = 0; //enum hasp_states //{ - // HASPSTATE_NONE, - // HASPSTATE_PASSBEG, - // HASPSTATE_PASSEND, - // HASPSTATE_READ + // HASPSTATE_NONE, + // HASPSTATE_PASSBEG, + // HASPSTATE_PASSEND, + // HASPSTATE_READ //}; //int m_hasp_passind = 0; //uint8_t m_hasp_tmppass[0x29]{}; @@ -454,9 +454,9 @@ void savquest_state::winbond_superio_config(device_t *device) // fdc.ndtr2().set(":serport1", FUNC(rs232_port_device::write_dtr)); // fdc.nrts2().set(":serport1", FUNC(rs232_port_device::write_rts)); - auto *lpt = device->subdevice<pc_lpt_device>("lpt"); - auto *centronics = lpt->subdevice<centronics_device>("centronics"); - centronics->set_default_option("hasp_savquest"); + auto *lpt = device->subdevice<pc_lpt_device>("lpt"); + auto *centronics = lpt->subdevice<centronics_device>("centronics"); + centronics->set_default_option("hasp_savquest"); centronics->set_fixed(true); } @@ -497,7 +497,7 @@ void savquest_state::savquest(machine_config &config) m_voodoo2->set_tmumem(4, 4); /* this is the 12Mb card */ m_voodoo2->set_status_cycles(1000); // optimization to consume extra cycles when polling status -// m_voodoo2->vblank_callback().set(FUNC(savquest_state::vblank_assert)); +// m_voodoo2->vblank_callback().set(FUNC(savquest_state::vblank_assert)); screen_device &screen(SCREEN(config, "voodoo_screen", SCREEN_TYPE_RASTER)); screen.set_refresh_hz(57); @@ -511,15 +511,15 @@ void savquest_state::savquest(machine_config &config) PCI_SLOT(config, "pci:1", pci_cards, 9, 0, 1, 2, 3, "virge").set_fixed(true); PCI_SLOT(config, "pci:2", pci_cards, 10, 1, 2, 3, 0, nullptr); PCI_SLOT(config, "pci:3", pci_cards, 11, 2, 3, 0, 1, nullptr); -// PCI_SLOT(config, "pci:4", pci_cards, 12, 3, 0, 1, 2, "voodoo2"); +// PCI_SLOT(config, "pci:4", pci_cards, 12, 3, 0, 1, 2, "voodoo2"); } ROM_START( savquest ) ROM_REGION32_LE(0x40000, "pci:07.0", 0) ROM_LOAD( "p2xbl_award_451pg.bin", 0x00000, 0x040000, CRC(37d0030e) SHA1(c6773d0e02325116f95c497b9953f59a9ac81317) ) -// ROM_REGION32_LE( 0x10000, "video_bios", 0 ) // 1st half is 2.04.14, second half is 2.01.11 -// ROM_LOAD( "vgabios.bin", 0x000000, 0x010000, CRC(a81423d6) SHA1(a099af621ce7fbaa55a2d9947d9f07e04f1b5fca) ) +// ROM_REGION32_LE( 0x10000, "video_bios", 0 ) // 1st half is 2.04.14, second half is 2.01.11 +// ROM_LOAD( "vgabios.bin", 0x000000, 0x010000, CRC(a81423d6) SHA1(a099af621ce7fbaa55a2d9947d9f07e04f1b5fca) ) ROM_REGION( 0x080, "rtc", 0 ) /* default NVRAM */ ROM_LOAD( "savquest_ds12885.bin", 0x0000, 0x080, BAD_DUMP CRC(e9270019) SHA1(4d900ca317d93c915c80a9053528b741746f08a1) ) diff --git a/src/mame/namco/namcofl.cpp b/src/mame/namco/namcofl.cpp index 03485730362..46f75e0439d 100644 --- a/src/mame/namco/namcofl.cpp +++ b/src/mame/namco/namcofl.cpp @@ -355,7 +355,7 @@ void namcofl_state::sysreg_w(offs_t offset, uint32_t data, uint32_t mem_mask) // 1: ROM at 00000000, RAM at 10000000 m_mainbank.select(data & 1); } - else if (offset >= 0x10 && offset <= 0x13) // clear i960 IRQ line + else if (offset >= 0x10 && offset <= 0x13) // clear i960 IRQ line { // data value doesn't seem to matter m_maincpu->set_input_line(m_irq_type[offset & 3], CLEAR_LINE); diff --git a/src/mame/namco/namcos1_sprite.cpp b/src/mame/namco/namcos1_sprite.cpp index ef0b2e096ee..59bce051199 100644 --- a/src/mame/namco/namcos1_sprite.cpp +++ b/src/mame/namco/namcos1_sprite.cpp @@ -3,21 +3,21 @@ /* Namco System 1/86 Sprites - found on Namco System 1, System 86, - Baraduke/Alien Sector and Metro-Cross hardware + Baraduke/Alien Sector and Metro-Cross hardware based on docs in namcos86.cpp and namcos1.cpp, - they configured with following chips: - - CUS39 ULA sprite generator - - CUS35/CUS48 ULA sprite address generator + they configured with following chips: + - CUS39 ULA sprite generator + - CUS35/CUS48 ULA sprite address generator "Shadow" sprites are used in namcos1.cpp Device used in the following drivers: - namco/namcos86.cpp - - namco/namcos1.cpp + - namco/namcos1.cpp - Using same sprite hardware but not using this implementation currently: - - namco/baraduke.cpp + Using same sprite hardware but not using this implementation currently: + - namco/baraduke.cpp */ diff --git a/src/mame/nec/pc9821.cpp b/src/mame/nec/pc9821.cpp index e3d54b4a13c..9e8eb666d7d 100644 --- a/src/mame/nec/pc9821.cpp +++ b/src/mame/nec/pc9821.cpp @@ -686,7 +686,7 @@ void pc9821_canbe_state::pc9821cx3_map(address_map &map) // TODO: remaining settings // bp 0xfd25a,1,{eax |= 0x91;g} m_bios_view[4](0x000f8000, 0x000fffff).rom().region("biosrom", 0x38000); -// m_bios_view[5](0x000f8000, 0x000fffff).rom().region("biosrom", 0x30000); +// m_bios_view[5](0x000f8000, 0x000fffff).rom().region("biosrom", 0x30000); // setup mode m_bios_view[6](0x000f8000, 0x000fffff).rom().region("biosrom", 0x40000); @@ -700,10 +700,10 @@ void pc9821_canbe_state::pc9821cx3_io(address_map &map) { pc9821_io(map); // TODO: MBCFG index/data devices (as C-Bus option) -// map(0x0411, 0x0411) index -// map(0x0413, 0x0413) data -// map(0x0b00, 0x0b00) index -// map(0x0b02, 0x0b02) data +// map(0x0411, 0x0411) index +// map(0x0413, 0x0413) data +// map(0x0b00, 0x0b00) index +// map(0x0b02, 0x0b02) data map(0x043d, 0x043d).w(FUNC(pc9821_canbe_state::itf_43d_bank_w)); // TODO: uses its own banking scheme to accomodate extra GFX ROM size map(0x043f, 0x043f).lw8(NAME([this] (offs_t offset, u8 data) { @@ -931,8 +931,8 @@ void pc9821_canbe_state::pc9821ce(machine_config &config) //void pc9821_canbe_state::pc9821ce2(machine_config &config) //{ -// pc9821ce(config); -// m_cbus[0]->set_default_option("pc9801_118"); +// pc9821ce(config); +// m_cbus[0]->set_default_option("pc9801_118"); //} void pc9821_canbe_state::pc9821cx3(machine_config &config) @@ -969,12 +969,12 @@ void pc9821_canbe_state::pc9821cx3(machine_config &config) //void pc9821_mate_x_state::pc9821xs(machine_config &config) //{ -// pc9821(config); -// const XTAL xtal = XTAL(66'000'000); -// I486(config.replace(), m_maincpu, xtal); // i486dx2 -// m_maincpu->set_addrmap(AS_PROGRAM, &pc9821_mate_x_state::pc9821_map); -// m_maincpu->set_addrmap(AS_IO, &pc9821_mate_x_state::pc9821_io); -// m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb)); +// pc9821(config); +// const XTAL xtal = XTAL(66'000'000); +// I486(config.replace(), m_maincpu, xtal); // i486dx2 +// m_maincpu->set_addrmap(AS_PROGRAM, &pc9821_mate_x_state::pc9821_map); +// m_maincpu->set_addrmap(AS_IO, &pc9821_mate_x_state::pc9821_io); +// m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb)); //} void pc9821_mate_x_state::pc9821xa16(machine_config &config) @@ -1312,7 +1312,7 @@ ROM_START( pc9821ce ) LOAD_KANJI_ROMS(ROMREGION_ERASEFF) // Uses SCSI not IDE -// LOAD_IDE_ROM +// LOAD_IDE_ROM ROM_END @@ -1324,9 +1324,9 @@ getitf98 dump known to exist, in case anyone bothers to assemble a franken def . */ //ROM_START( pc9821ce2 ) -// ROM_REGION16_LE( 0x30000, "ipl", ROMREGION_ERASEFF ) -// ROM_LOAD( "itf_ce2.rom", 0x10000, 0x008000, BAD_DUMP CRC(273e9e88) SHA1(9bca7d5116788776ed0f297bccb4dfc485379b41) ) -// ROM_LOAD( "bios_ce2.rom", 0x18000, 0x018000, BAD_DUMP CRC(76affd90) SHA1(910fae6763c0cd59b3957b6cde479c72e21f33c1) ) +// ROM_REGION16_LE( 0x30000, "ipl", ROMREGION_ERASEFF ) +// ROM_LOAD( "itf_ce2.rom", 0x10000, 0x008000, BAD_DUMP CRC(273e9e88) SHA1(9bca7d5116788776ed0f297bccb4dfc485379b41) ) +// ROM_LOAD( "bios_ce2.rom", 0x18000, 0x018000, BAD_DUMP CRC(76affd90) SHA1(910fae6763c0cd59b3957b6cde479c72e21f33c1) ) /* @@ -1405,15 +1405,15 @@ Retired: not very useful without actual code */ //ROM_START( pc9821xs ) -// ROM_REGION16_LE( 0x30000, "ipl", ROMREGION_ERASEFF ) -// // "ROM SUM ERROR" -// ROM_LOAD( "itf.rom", 0x10000, 0x008000, BAD_DUMP CRC(dd4c7bb8) SHA1(cf3aa193df2722899066246bccbed03f2e79a74a) ) -// ROM_LOAD( "bios_xs.rom", 0x18000, 0x018000, BAD_DUMP CRC(0a682b93) SHA1(76a7360502fa0296ea93b4c537174610a834d367) ) -// // tested in RAM at PC=0 onward (specifically PC=1c) -// ROM_FILL( 0x2fffe, 1, 0x0d ) - -// ROM_REGION( 0x80000, "chargen", 0 ) -// ROM_LOAD( "font_xs.rom", 0x00000, 0x046800, BAD_DUMP CRC(c9a77d8f) SHA1(deb8563712eb2a634a157289838b95098ba0c7f2) ) +// ROM_REGION16_LE( 0x30000, "ipl", ROMREGION_ERASEFF ) +// // "ROM SUM ERROR" +// ROM_LOAD( "itf.rom", 0x10000, 0x008000, BAD_DUMP CRC(dd4c7bb8) SHA1(cf3aa193df2722899066246bccbed03f2e79a74a) ) +// ROM_LOAD( "bios_xs.rom", 0x18000, 0x018000, BAD_DUMP CRC(0a682b93) SHA1(76a7360502fa0296ea93b4c537174610a834d367) ) +// // tested in RAM at PC=0 onward (specifically PC=1c) +// ROM_FILL( 0x2fffe, 1, 0x0d ) + +// ROM_REGION( 0x80000, "chargen", 0 ) +// ROM_LOAD( "font_xs.rom", 0x00000, 0x046800, BAD_DUMP CRC(c9a77d8f) SHA1(deb8563712eb2a634a157289838b95098ba0c7f2) ) /* Xa16 - Pentium P54C @ 166 diff --git a/src/mame/nec/pc9821.h b/src/mame/nec/pc9821.h index 7ba56ccf1ea..316a1ced9a4 100644 --- a/src/mame/nec/pc9821.h +++ b/src/mame/nec/pc9821.h @@ -119,7 +119,7 @@ public: } void pc9821ce(machine_config &config); -// void pc9821ce2(machine_config &config); +// void pc9821ce2(machine_config &config); void pc9821cx3(machine_config &config); protected: @@ -158,7 +158,7 @@ public: void pc9821xa16(machine_config &config); void pc9821xv13(machine_config &config); -// void pc9821xs(machine_config &config); +// void pc9821xs(machine_config &config); }; // Mate R diff --git a/src/mame/nintendo/nes_vt32.cpp b/src/mame/nintendo/nes_vt32.cpp index 45f10749b78..fd8b8e138a5 100644 --- a/src/mame/nintendo/nes_vt32.cpp +++ b/src/mame/nintendo/nes_vt32.cpp @@ -513,7 +513,7 @@ CONS( 2020, lxpcpp, 0, 0, nes_vt32_32mb, nes_vt32, nes_vt32_unk_state, empt // unclear SoC types maybe even different // Rush'n Attack has the raster split in the wrong place on the 5 language version (mountains in first stage) when using real hardware // said game also requires either extra RAM on the PCB (none visible) or a SoC that natively supports that -// +// // not set as clones as each other because the games lists are different CONS( 201?, k10_5l, 0, 0, nes_vt32_16mb, nes_vt32, nes_vt32_unk_state, empty_init, "<unknown>", "Games Power 500-in-1 Ultra Thin Handheld Game (K10) (5 languages)", MACHINE_NOT_WORKING ) CONS( 201?, k10_2l, 0, 0, nes_vt32_16mb, nes_vt32, nes_vt32_unk_state, empty_init, "<unknown>", "Games Power 500-in-1 Ultra Thin Handheld Game (K10) (2 languages)", MACHINE_NOT_WORKING ) diff --git a/src/mame/olivetti/att6300p.cpp b/src/mame/olivetti/att6300p.cpp index 736bb75915d..86160b9b57a 100644 --- a/src/mame/olivetti/att6300p.cpp +++ b/src/mame/olivetti/att6300p.cpp @@ -204,21 +204,21 @@ private: enum { // PROTECTEN register bits - B_VIRT_PE_IOSETUP = 0x01, - B_VIRT_PE_MEMSETUP = 0x02, - B_VIRT_PE_IORDTRAP = 0x08, - B_VIRT_PE__PWRUP = 0x10, // Active Low - B_VIRT_PE_IOWRTRAP = 0x20, - B_VIRT_PE_MEMFENCE = 0x40, - B_VIRT_PE_PROTECTEN = 0x80, + B_VIRT_PE_IOSETUP = 0x01, + B_VIRT_PE_MEMSETUP = 0x02, + B_VIRT_PE_IORDTRAP = 0x08, + B_VIRT_PE__PWRUP = 0x10, // Active Low + B_VIRT_PE_IOWRTRAP = 0x20, + B_VIRT_PE_MEMFENCE = 0x40, + B_VIRT_PE_PROTECTEN = 0x80, // BITREAD register bits - B_VIRT_BR_PROTECTEN = 0x01, - B_VIRT_BR__SANITYNMI = 0x02, // Active Low - B_VIRT_BR__TRAPIO = 0x04, // Active Low - B_VIRT_BR_NMI = 0x08, - B_VIRT_BR_TS = 0x10, - B_VIRT_BR__PWRUP = 0x20, // Active Low + B_VIRT_BR_PROTECTEN = 0x01, + B_VIRT_BR__SANITYNMI = 0x02, // Active Low + B_VIRT_BR__TRAPIO = 0x04, // Active Low + B_VIRT_BR_NMI = 0x08, + B_VIRT_BR_TS = 0x10, + B_VIRT_BR__PWRUP = 0x20, // Active Low }; void dma_segment_w(offs_t offset, uint8_t data); @@ -520,7 +520,7 @@ int att6300p_state::kbc_t0_r() int att6300p_state::kbc_t1_r() { - return BIT(m_ctrlport_a, 7); // Keyboard Enable + return BIT(m_ctrlport_a, 7); // Keyboard Enable } uint8_t att6300p_state::keyboard_data_r() @@ -945,7 +945,7 @@ void att6300p_state::att6300p(machine_config &config) m_pic->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); PIT8254(config, m_pit); - m_pit->set_clk<0>(14.318181_MHz_XTAL / 12); // IOCLK/4 + m_pit->set_clk<0>(14.318181_MHz_XTAL / 12); // IOCLK/4 m_pit->set_clk<1>(14.318181_MHz_XTAL / 12); m_pit->set_clk<2>(14.318181_MHz_XTAL / 12); m_pit->out_handler<0>().set(m_pic, FUNC(pic8259_device::ir0_w)); @@ -955,7 +955,7 @@ void att6300p_state::att6300p(machine_config &config) SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00); - ISA8(config, m_isabus, 14.318181_MHz_XTAL / 3); // IOCLK + ISA8(config, m_isabus, 14.318181_MHz_XTAL / 3); // IOCLK m_isabus->set_memspace(m_mmu, AS_PROGRAM); m_isabus->set_iospace(m_mmu, AS_IO); m_isabus->irq2_callback().set(m_pic, FUNC(pic8259_device::ir2_w)); @@ -1018,7 +1018,7 @@ void att6300p_state::att6300p(machine_config &config) MM58274C(config, "mm58274", 32.768_kHz_XTAL); - Z80CTC(config, m_ctc, 12_MHz_XTAL / 4); // PCLK/2 + Z80CTC(config, m_ctc, 12_MHz_XTAL / 4); // PCLK/2 m_ctc->zc_callback<0>().set(m_ctc, FUNC(z80ctc_device::trg1)); m_ctc->zc_callback<1>().set(FUNC(att6300p_state::zc01_cb)); m_ctc->zc_callback<2>().set(FUNC(att6300p_state::zc02_cb)); diff --git a/src/mame/olivetti/att6300p_mmu.h b/src/mame/olivetti/att6300p_mmu.h index e551f390aa7..eea580d55ce 100644 --- a/src/mame/olivetti/att6300p_mmu.h +++ b/src/mame/olivetti/att6300p_mmu.h @@ -68,16 +68,16 @@ private: // Per-port IO protection flags enum { - IO_PROT_NOTRAP = 2, - IO_PROT_INHIBIT_READ = 4, - IO_PROT_INHIBIT_WRITE = 8, + IO_PROT_NOTRAP = 2, + IO_PROT_INHIBIT_READ = 4, + IO_PROT_INHIBIT_WRITE = 8, }; // Flags for trapped IO accesses enum { - TRAPIO_FLAG__IORC = 2, // Active Low - TRAPIO_FLAG__LBHE = 4, // Active Low - TRAPIO_FLAG_LA0 = 8 + TRAPIO_FLAG__IORC = 2, // Active Low + TRAPIO_FLAG__LBHE = 4, // Active Low + TRAPIO_FLAG_LA0 = 8 }; }; diff --git a/src/mame/paia/fatman.cpp b/src/mame/paia/fatman.cpp index 42dabb1024d..89bb237ba77 100644 --- a/src/mame/paia/fatman.cpp +++ b/src/mame/paia/fatman.cpp @@ -351,7 +351,7 @@ void fatman_state::update_vca_eg() } LOGMASKED(LOG_EG, "VCA EG decay: %d, release: %d, attacked: %d, trip dt: %g\n", - m_vca_eg_decay, m_vca_eg_release, attacked, comp_trip_dt.as_double()); + m_vca_eg_decay, m_vca_eg_release, attacked, comp_trip_dt.as_double()); } // `param` specifies whether the VCA EG voltage has exceeded the EG reference. diff --git a/src/mame/pc/teradrive.cpp b/src/mame/pc/teradrive.cpp index 4663d63eb5d..8fcf149e69d 100644 --- a/src/mame/pc/teradrive.cpp +++ b/src/mame/pc/teradrive.cpp @@ -642,7 +642,7 @@ void teradrive_state::md_68k_map(address_map &map) }) ); // map(0xc00000, 0xdfffff) VDP and PSG (with mirrors and holes) -// $d00000 alias required by earthdef +// $d00000 alias required by earthdef map(0xc00000, 0xc0001f).mirror(0x100000).m(m_md_vdp, FUNC(ym7101_device::if16_map)); map(0xe00000, 0xe0ffff).mirror(0x1f0000).ram(); // Work RAM, usually accessed at $ff0000 } diff --git a/src/mame/roland/roland_pg1000.cpp b/src/mame/roland/roland_pg1000.cpp index c93711e98c3..f561ec1296f 100644 --- a/src/mame/roland/roland_pg1000.cpp +++ b/src/mame/roland/roland_pg1000.cpp @@ -2,44 +2,44 @@ // copyright-holders:Felipe Sanches /**************************************************************************** - Roland PG-1000 programmer. + Roland PG-1000 programmer. - To be used alongside Roland D-50/D-550/MT-32 + To be used alongside Roland D-50/D-550/MT-32 ----------------------------------------------------------------------------- - Notes: - midiin1 is the usual "MIDI IN" port. - midiin2 is the "Parameter In" port. + Notes: + midiin1 is the usual "MIDI IN" port. + midiin2 is the "Parameter In" port. - usage: - mame pg1000 -midiin1 "ctrl" -midiin2 "synth" -midiout "synth" + usage: + mame pg1000 -midiin1 "ctrl" -midiin2 "synth" -midiout "synth" - where: - "ctrl" is a MIDI OUT device such as - an external usb midi keyboard controller. + where: + "ctrl" is a MIDI OUT device such as + an external usb midi keyboard controller. - "synth" is a D-50 or a D-550. - (and I guess it may work with a Roland MT-32 as well) + "synth" is a D-50 or a D-550. + (and I guess it may work with a Roland MT-32 as well) - During development, I tested this setup using a real Roland D-550. + During development, I tested this setup using a real Roland D-550. ----------------------------------------------------------------------------- - Known driver bug: + Known driver bug: - This driver is almost perfectly functional, but remains marked with the - MACHINE_NOT_WORKING flag due to an unresolved issue related to its - MIDI ports. + This driver is almost perfectly functional, but remains marked with the + MACHINE_NOT_WORKING flag due to an unresolved issue related to its + MIDI ports. - While running it hooked up to an USB-MIDI controller, the MIDI messages - are not perfectly repeated from MIDI IN to MIDI OUT as they should be. - Instead, sometimes we get some data corruption, specially when using - the sustain pedal. + While running it hooked up to an USB-MIDI controller, the MIDI messages + are not perfectly repeated from MIDI IN to MIDI OUT as they should be. + Instead, sometimes we get some data corruption, specially when using + the sustain pedal. - I suspect this may be some CPU bug, perhaps an incorrect or incomplete - implementation of one of the upd7810 instructions used in the serial - port code-path. + I suspect this may be some CPU bug, perhaps an incorrect or incomplete + implementation of one of the upd7810 instructions used in the serial + port code-path. ****************************************************************************/ diff --git a/src/mame/sega/model2.h b/src/mame/sega/model2.h index 284fc5f1ec8..964de0035ac 100644 --- a/src/mame/sega/model2.h +++ b/src/mame/sega/model2.h @@ -622,7 +622,7 @@ struct m2_poly_extra_data u32 texwidth[6]; u32 texheight[6]; u32 texx[6]; - u32 texy[6]; + u32 texy[6]; u8 texmirrorx; u8 texmirrory; u8 luma; diff --git a/src/mame/sega/model2rd.ipp b/src/mame/sega/model2rd.ipp index 6f0887ca176..3d8bb6c9fda 100644 --- a/src/mame/sega/model2rd.ipp +++ b/src/mame/sega/model2rd.ipp @@ -168,7 +168,7 @@ void model2_renderer::draw_scanline_tex(int32_t scanline, const extent_t &extent float dvdyoz = extent.param[2].dpdy; float norm = sqrtf( std::max(dudxoz * dudxoz + dvdxoz * dvdxoz, dudyoz * dudyoz + dvdyoz * dvdyoz) ); int tr, tg, tb; - u32 t, t2; + u32 t, t2; u8 luma; colorbase = state->m_palram[(colorbase + 0x1000)] & 0x7fff; diff --git a/src/mame/sega/y2.cpp b/src/mame/sega/y2.cpp index f45f3e22b78..b2e1df10770 100644 --- a/src/mame/sega/y2.cpp +++ b/src/mame/sega/y2.cpp @@ -95,7 +95,7 @@ ROM_START( systemy2 ) SYSTEM_Y2_FPGA_BITSTREAM ROM_REGION( 0x8000000, "boot", ROMREGION_ERASE00 ) ROM_REGION( 0x42000000, "nand_u101", ROMREGION_ERASE00 ) - ROM_REGION( 0x42000000, "nand_u102", ROMREGION_ERASE00 ) + ROM_REGION( 0x42000000, "nand_u102", ROMREGION_ERASE00 ) ROM_END ROM_START( kof2002um ) // The King of Fighters 复仇之路/Fùchóu zhī lù/Road to Revenge diff --git a/src/mame/seibu/raiden2_v.cpp b/src/mame/seibu/raiden2_v.cpp index 730a887ffaa..55753ebb89a 100644 --- a/src/mame/seibu/raiden2_v.cpp +++ b/src/mame/seibu/raiden2_v.cpp @@ -41,7 +41,7 @@ void raiden2_state::m_videoram_private_w(offs_t offset, u16 data) void raiden2_state::draw_sprites(const rectangle &cliprect) { // causes a blank square in the corner of zero team, but otherwise the thrusters of the ship in the r2 intro are clipped, using 0x8000 as a sign bit instead of this logic works for r2, but not zero team - static constexpr s32 ZEROTEAM_MASK_X = 0x1ff; + static constexpr s32 ZEROTEAM_MASK_X = 0x1ff; static constexpr s32 ZEROTEAM_MASK_Y = 0x1ff; m_sprite_bitmap.fill(0xf, cliprect); diff --git a/src/mame/seibu/seibu_helper.cpp b/src/mame/seibu/seibu_helper.cpp index cd7abd7750b..9a04b15634d 100644 --- a/src/mame/seibu/seibu_helper.cpp +++ b/src/mame/seibu/seibu_helper.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ville Linde, Nicola Salmoria /* - Helper for common decryption method in Seibu Kaihatsu hardwares. + Helper for common decryption method in Seibu Kaihatsu hardwares. */ #include "emu.h" diff --git a/src/mame/seta/st0020.cpp b/src/mame/seta/st0020.cpp index 980e8917a41..6274572a9dc 100644 --- a/src/mame/seta/st0020.cpp +++ b/src/mame/seta/st0020.cpp @@ -645,7 +645,7 @@ void st0020_device::draw_single_sprites(bitmap_ind16 &bitmap, const rectangle &c int yscale = ydim / 8; /* Let's approximate to the nearest greater integer value - to avoid holes in between tiles */ + to avoid holes in between tiles */ if (xscale & 0xffff) xscale += (1 << 16) / 16; if (yscale & 0xffff) diff --git a/src/mame/sinclair/specnext_im2.h b/src/mame/sinclair/specnext_im2.h index 4dee077dfe4..74ef0d40b73 100644 --- a/src/mame/sinclair/specnext_im2.h +++ b/src/mame/sinclair/specnext_im2.h @@ -21,7 +21,7 @@ public: protected: virtual void device_start() override ATTR_COLD; virtual void device_reset() override ATTR_COLD; - + virtual int z80daisy_irq_state() override; virtual int z80daisy_irq_ack() override; virtual void z80daisy_irq_reti() override; diff --git a/src/mame/skeleton/aws.cpp b/src/mame/skeleton/aws.cpp index f512e3fceeb..e3b31dc502b 100644 --- a/src/mame/skeleton/aws.cpp +++ b/src/mame/skeleton/aws.cpp @@ -49,7 +49,7 @@ private: required_device<i8272a_device> m_fdc; required_device<i8275_device> m_crtc; required_device<upd7201_device> m_serial1; // Cluster networking and Keyboard -// required_device<upd7201_device> m_serial2; // RS-232C ports +// required_device<upd7201_device> m_serial2; // RS-232C ports required_region_ptr<u8> m_fontrom; @@ -78,7 +78,7 @@ void aws_state::pit_out2_w(int state) I8275_DRAW_CHARACTER_MEMBER(aws_state::display_pixels) { -// using namespace i8275_attributes; +// using namespace i8275_attributes; for(int i=0;i<9;i++) { if(i>=7) diff --git a/src/mame/skeleton/ngen.cpp b/src/mame/skeleton/ngen.cpp index 69658abdf7f..2d42e4d6f3c 100644 --- a/src/mame/skeleton/ngen.cpp +++ b/src/mame/skeleton/ngen.cpp @@ -295,8 +295,8 @@ void ngen_state::cpu_peripheral_cb(offs_t offset, uint16_t data, uint16_t mem_ma // Largely guesswork at this stage void ngen_state::peripheral_w(offs_t offset, uint16_t data, uint16_t mem_mask) { -// if(offset < 0x140) -// logerror("Peripheral write %04x data %04x mask %04x\n",offset,data,mem_mask); +// if(offset < 0x140) +// logerror("Peripheral write %04x data %04x mask %04x\n",offset,data,mem_mask); switch(offset) { case 0x00: @@ -962,8 +962,8 @@ void ngen_state::ngen386i_mem(address_map &map) void ngen_state::ngen386_io(address_map &map) { map(0x0000, 0x0001).rw(FUNC(ngen_state::xbus_r), FUNC(ngen_state::xbus_w)); -// map(0xf800, 0xfeff).rw(FUNC(ngen_state::peripheral_r), FUNC(ngen_state::peripheral_w)).umask16(0x00ff); -// map(0xf904, 0xf907).rw("pit",FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask32(0x00ff00ff); +// map(0xf800, 0xfeff).rw(FUNC(ngen_state::peripheral_r), FUNC(ngen_state::peripheral_w)).umask16(0x00ff); +// map(0xf904, 0xf907).rw("pit",FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask32(0x00ff00ff); map(0xf800, 0xf81f).rw("dmac",FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask32(0x00ff00ff); map(0xf828, 0xf83f).rw(FUNC(ngen_state::dma_bank_r), FUNC(ngen_state::dma_bank_w)).umask32(0x0000ffff); map(0xfc24, 0xfc27).rw("pic",FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask32(0x00ff00ff); diff --git a/src/mame/skeleton/orina_stylish_plus.cpp b/src/mame/skeleton/orina_stylish_plus.cpp index b9c689008e6..05669be20ca 100644 --- a/src/mame/skeleton/orina_stylish_plus.cpp +++ b/src/mame/skeleton/orina_stylish_plus.cpp @@ -2,10 +2,10 @@ // copyright-holders: /* - This is a placeholder driver for the Orina Stylish Plus so that a - Software List for the cartridges can exist. + This is a placeholder driver for the Orina Stylish Plus so that a + Software List for the cartridges can exist. - Internal hardware of machine is currently unknown + Internal hardware of machine is currently unknown */ #include "emu.h" diff --git a/src/mame/technos/shadfrce.cpp b/src/mame/technos/shadfrce.cpp index 435614d10fb..57ee5c95598 100644 --- a/src/mame/technos/shadfrce.cpp +++ b/src/mame/technos/shadfrce.cpp @@ -740,7 +740,7 @@ static INPUT_PORTS_START( shadfrceu ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) - PORT_MODIFY("DSW2") + PORT_MODIFY("DSW2") PORT_DIPNAME( 0x0c, 0x08, "Stage Clear Energy Regain" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x08, "100%" ) PORT_DIPSETTING( 0x04, "50%" ) diff --git a/src/mame/televideo/tv965.cpp b/src/mame/televideo/tv965.cpp index ff657daa7bb..3ea7f32caf2 100644 --- a/src/mame/televideo/tv965.cpp +++ b/src/mame/televideo/tv965.cpp @@ -206,7 +206,7 @@ void tv965_state::tv965(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // CXK5864BP-10L + battery SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - // m_screen->set_raw(26.9892_MHz_XTAL, 1020, 0, 800, 441, 0, 416); + // m_screen->set_raw(26.9892_MHz_XTAL, 1020, 0, 800, 441, 0, 416); m_screen->set_raw(44.4528_MHz_XTAL, 1680, 0, 1320, 441, 0, 416); m_screen->set_screen_update("crtc", FUNC(scn2672_device::screen_update)); diff --git a/src/mame/tms/vet3000.cpp b/src/mame/tms/vet3000.cpp index ae5742a9008..6d01f6364f1 100644 --- a/src/mame/tms/vet3000.cpp +++ b/src/mame/tms/vet3000.cpp @@ -2,30 +2,30 @@ // copyright-holders:Felipe Sanches /*************************************************************************** - VET 3000, "The Video Effects Titler" + VET 3000, "The Video Effects Titler" - https://www.youtube.com/watch?v=DJXlqe2UXKs - https://datassette.org/node/106385 + https://www.youtube.com/watch?v=DJXlqe2UXKs + https://datassette.org/node/106385 - Notes: + Notes: ------------------------------------------------------------ - There's some model and company info in the back of the unit: + There's some model and company info in the back of the unit: - VET 3000 - TMS - Tecnologia em - Micro Sistemas - CGC 52.733.847/0001-89 - Made in Brazil + VET 3000 + TMS - Tecnologia em + Micro Sistemas + CGC 52.733.847/0001-89 + Made in Brazil ------------------------------------------------------------ - There are 2 rear video connectors (In and Out) but the video - input is currently not supported. + There are 2 rear video connectors (In and Out) but the video + input is currently not supported. ------------------------------------------------------------ - There's also a 36-pin (2*18) pcb edge rear connector labeled - "interface" but the purpose of this is not know yet and so - it is currently not documented in this driver. + There's also a 36-pin (2*18) pcb edge rear connector labeled + "interface" but the purpose of this is not know yet and so + it is currently not documented in this driver. ***************************************************************************/ diff --git a/src/mame/toaplan/dt7.cpp b/src/mame/toaplan/dt7.cpp index d11028af50d..4f8b1ac05b0 100644 --- a/src/mame/toaplan/dt7.cpp +++ b/src/mame/toaplan/dt7.cpp @@ -15,7 +15,7 @@ - service mode doesn't display properly - currently only coins up with service button - sound dies after one stage? - - merge tilemap emulation into toaplan/toaplan_txtilemap.cpp? + - merge tilemap emulation into toaplan/toaplan_txtilemap.cpp? */ diff --git a/src/mame/tvgames/xavix.h b/src/mame/tvgames/xavix.h index 2700d8e9d96..88b48f02958 100644 --- a/src/mame/tvgames/xavix.h +++ b/src/mame/tvgames/xavix.h @@ -592,7 +592,7 @@ protected: void update_irqs(); void refresh_sound_irq_state(); void reprogram_sound_timer(int index); - + uint8_t m_irqsource = 0; uint8_t m_vectorenable = 0; diff --git a/src/mame/tvgames/xavix_a.cpp b/src/mame/tvgames/xavix_a.cpp index 24a0345c1b4..38fb25aa8f3 100644 --- a/src/mame/tvgames/xavix_a.cpp +++ b/src/mame/tvgames/xavix_a.cpp @@ -58,9 +58,9 @@ namespace // - DAC timing knobs: // - lead/lag shift the latch strobe within the 16-cycle frame, // - gap!=0 issues a second write strobe (at 3−lag+gap), duplicating the held sample within the frame. - // - no titles found that change these from the defaults, so unable to test. + // - no titles found that change these from the defaults, so unable to test. // These alter *when* a channel is latched (and can duplicate it), but not the state-machine rate itself. - + static constexpr uint8_t MIXER_ORDER_MULTIPLEX[16] = { 0x0, 0xa, 0x7, 0xd, 0xc, 0x6, 0xb, 0x1, 0x4, 0xe, 0x3, 0x9, 0x8, 0x2, 0xf, 0x5 }; static constexpr uint8_t MIXER_ORDER_BROADCAST[16] = { 0x0, 0x8, 0x4, 0xc, 0x2, 0xa, 0x6, 0xe, 0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf }; static constexpr int AMP_TABLE[8] = { 2, 4, 8, 12, 16, 20, 20, 20 }; @@ -409,7 +409,7 @@ void xavix_sound_device::enable_voice(int voice, bool update_only) m_voice[voice].enabled = 1; m_voice[voice].bank = wave_addr_bank; m_voice[voice].position = uint32_t(wave_addr) << 14; - // TODO: Work out why subtracting a single sample from the wave loop address is needed for loops to be in tune. + // TODO: Work out why subtracting a single sample from the wave loop address is needed for loops to be in tune. m_voice[voice].loop_position = (wave_loop_addr ? (uint32_t(wave_loop_addr - 1) << 14) : 0); m_voice[voice].start_position = m_voice[voice].position; m_voice[voice].noise_state = wave_addr ? wave_addr : 0xace1u; @@ -576,40 +576,40 @@ void xavix_sound_device::set_output_mode(bool mono) uint32_t xavix_sound_device::tempo_to_period_ticks(uint8_t tp) const { - if (!tp) return 0; // paused - const uint32_t s = uint32_t(m_cyclerate_div) + 1; // cyclerate+1 - uint64_t samples = (uint64_t(s) * 1024u + (tp / 2)) / tp; // round-nearest - if (samples < 1) samples = 1; - if (samples > 2'000'000u) samples = 2'000'000u; - return uint32_t(samples); + if (!tp) return 0; // paused + const uint32_t s = uint32_t(m_cyclerate_div) + 1; // cyclerate+1 + uint64_t samples = (uint64_t(s) * 1024u + (tp / 2)) / tp; // round-nearest + if (samples < 1) samples = 1; + if (samples > 2'000'000u) samples = 2'000'000u; + return uint32_t(samples); } uint32_t xavix_sound_device::envelope_period_ticks(uint8_t tp) const { - const uint32_t base = tempo_to_period_ticks(tp); - if (!base) return 0; - const uint64_t scaled = uint64_t(base) * 16u; // envelope cadence - return uint32_t(scaled > 64'000'000u ? 64'000'000u : scaled); + const uint32_t base = tempo_to_period_ticks(tp); + if (!base) return 0; + const uint64_t scaled = uint64_t(base) * 16u; // envelope cadence + return uint32_t(scaled > 64'000'000u ? 64'000'000u : scaled); } attotime xavix_sound_device::tempo_period(uint8_t tempo) const { - const uint32_t samples = tempo_to_period_ticks(tempo); - if (!samples) return attotime::never; - return attotime::from_ticks(samples, m_sequencer_rate_hz); // engine ticks + const uint32_t samples = tempo_to_period_ticks(tempo); + if (!samples) return attotime::never; + return attotime::from_ticks(samples, m_sequencer_rate_hz); // engine ticks } double xavix_sound_device::tempo_tick_hz(uint8_t tempo) const { - const uint32_t samples = tempo_to_period_ticks(tempo); - return samples ? (double(m_sequencer_rate_hz) / double(samples)) : 0.0; + const uint32_t samples = tempo_to_period_ticks(tempo); + return samples ? (double(m_sequencer_rate_hz) / double(samples)) : 0.0; } uint32_t xavix_sound_device::phase_step_per_tick(uint32_t rate) const { - if (!rate) return 0; - uint64_t step = rate; // sequencer rate equals timing base - return uint32_t(step ? step : 1); + if (!rate) return 0; + uint64_t step = rate; // sequencer rate equals timing base + return uint32_t(step ? step : 1); } void xavix_sound_device::set_tempo(int index, uint8_t value) @@ -951,7 +951,7 @@ uint8_t xavix_state::sound_voice_startstop_r(offs_t offset) void xavix_state::sound_voice_startstop_w(offs_t offset, uint8_t data) { LOGMASKED(LOG_VOICE, "[voice] startstop offs=%d data=%02x prev=%02x\n", - offset, data, m_soundreg16_0[offset]); + offset, data, m_soundreg16_0[offset]); for (int i = 0; i < 8; i++) { const int voice_state = BIT(data, i); @@ -1164,5 +1164,5 @@ void xavix_state::reprogram_sound_timer(int index) const std::string period_text = period.as_string(18); m_sound_timer[index]->adjust(period, index, period); LOGMASKED(LOG_TIMER, "[timer] %d arm tempo=%02x freq=%.6fHz period=%s\n", - index, tempo, frequency, period_text.c_str()); + index, tempo, frequency, period_text.c_str()); } diff --git a/src/mame/ussr/1801vp033.h b/src/mame/ussr/1801vp033.h index 021f7db6ce5..91de57c04aa 100644 --- a/src/mame/ussr/1801vp033.h +++ b/src/mame/ussr/1801vp033.h @@ -22,7 +22,7 @@ // ======================> k1801vp033_device class k1801vp033_device : public device_t, - public device_z80daisy_interface + public device_z80daisy_interface { public: // construction/destruction diff --git a/src/mame/ussr/bk_m.cpp b/src/mame/ussr/bk_m.cpp index 7318c9a8818..115d361d7d1 100644 --- a/src/mame/ussr/bk_m.cpp +++ b/src/mame/ussr/bk_m.cpp @@ -206,22 +206,22 @@ void bk_state::bk0011_palette(palette_device &palette) { rgb_t const values[][3] = { - { rgb_t(0, 0, 255), rgb_t(0, 255, 0), rgb_t(255, 0, 0) }, // 0 - { rgb_t(255, 255, 0), rgb_t(255, 0, 255), rgb_t(255, 0, 0) }, // 1 - { rgb_t(0, 255, 255), rgb_t(0, 0, 255), rgb_t(255, 0, 255) }, // 2 - { rgb_t(0, 255, 0), rgb_t(0, 255, 255), rgb_t(255, 255, 0) }, // 3 - { rgb_t(255, 0, 255), rgb_t(0, 255, 255), rgb_t(255, 255, 255) }, // 4 - { rgb_t(255, 255, 255), rgb_t(255, 255, 255), rgb_t(255, 255, 255) }, // 5 - { rgb_t(192, 0, 0), rgb_t(142, 0, 0), rgb_t(255, 0, 0) }, // 6 - { rgb_t(192, 255, 0), rgb_t(142, 255, 0), rgb_t(255, 255, 0) }, // 7 - { rgb_t(192, 0, 255), rgb_t(142, 0, 255), rgb_t(255, 0, 255) }, // 8 - { rgb_t(142, 255, 0), rgb_t(142, 0, 255), rgb_t(142, 0, 0) }, // 9 - { rgb_t(192, 255, 0), rgb_t(192, 0, 255), rgb_t(192, 0, 0) }, // 10 - { rgb_t(0, 255, 255), rgb_t(255, 255, 0), rgb_t(255, 0, 0) }, // 11 - { rgb_t(255, 0, 0), rgb_t(0, 255, 0), rgb_t(0, 255, 255) }, // 12 - { rgb_t(0, 255, 255), rgb_t(255, 255, 0), rgb_t(255, 255, 255) }, // 13 - { rgb_t(255, 255, 0), rgb_t(0, 255, 0), rgb_t(255, 255, 255) }, // 14 - { rgb_t(0, 255, 255), rgb_t(0, 255, 0), rgb_t(255, 255, 255) } // 15 + { rgb_t(0, 0, 255), rgb_t(0, 255, 0), rgb_t(255, 0, 0) }, // 0 + { rgb_t(255, 255, 0), rgb_t(255, 0, 255), rgb_t(255, 0, 0) }, // 1 + { rgb_t(0, 255, 255), rgb_t(0, 0, 255), rgb_t(255, 0, 255) }, // 2 + { rgb_t(0, 255, 0), rgb_t(0, 255, 255), rgb_t(255, 255, 0) }, // 3 + { rgb_t(255, 0, 255), rgb_t(0, 255, 255), rgb_t(255, 255, 255) }, // 4 + { rgb_t(255, 255, 255), rgb_t(255, 255, 255), rgb_t(255, 255, 255) }, // 5 + { rgb_t(192, 0, 0), rgb_t(142, 0, 0), rgb_t(255, 0, 0) }, // 6 + { rgb_t(192, 255, 0), rgb_t(142, 255, 0), rgb_t(255, 255, 0) }, // 7 + { rgb_t(192, 0, 255), rgb_t(142, 0, 255), rgb_t(255, 0, 255) }, // 8 + { rgb_t(142, 255, 0), rgb_t(142, 0, 255), rgb_t(142, 0, 0) }, // 9 + { rgb_t(192, 255, 0), rgb_t(192, 0, 255), rgb_t(192, 0, 0) }, // 10 + { rgb_t(0, 255, 255), rgb_t(255, 255, 0), rgb_t(255, 0, 0) }, // 11 + { rgb_t(255, 0, 0), rgb_t(0, 255, 0), rgb_t(0, 255, 255) }, // 12 + { rgb_t(0, 255, 255), rgb_t(255, 255, 0), rgb_t(255, 255, 255) }, // 13 + { rgb_t(255, 255, 0), rgb_t(0, 255, 0), rgb_t(255, 255, 255) }, // 14 + { rgb_t(0, 255, 255), rgb_t(0, 255, 0), rgb_t(255, 255, 255) } // 15 }; for (int i = 0, j = 0; i < 16; i++) { diff --git a/src/mame/ussr/dvk_kcgd.cpp b/src/mame/ussr/dvk_kcgd.cpp index 857aaa1dc7f..73e6a116f0c 100644 --- a/src/mame/ussr/dvk_kcgd.cpp +++ b/src/mame/ussr/dvk_kcgd.cpp @@ -323,8 +323,8 @@ uint16_t kcgd_state::vram_mmap_r(offs_t offset) * * 167774: * - * 0-2 R mouse coordinate data - * 3 R mouse button state + * 0-2 R mouse coordinate data + * 3 R mouse button state */ void kcgd_state::palette_control(offs_t offset, uint16_t data, uint16_t mem_mask) diff --git a/src/mame/ussr/vm1timer.cpp b/src/mame/ussr/vm1timer.cpp index 3e2888a9941..bf19ab57341 100644 --- a/src/mame/ussr/vm1timer.cpp +++ b/src/mame/ussr/vm1timer.cpp @@ -81,7 +81,7 @@ void k1801vm1_timer_device::device_reset() void k1801vm1_timer_device::init_w() { -// m_limit is not reset by INIT or DCLO +// m_limit is not reset by INIT or DCLO m_csr = 0; } |
