diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/bus/gameboy/mbc6.cpp | 42 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/debuggerview.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/input/input_sdl.cpp | 65 |
4 files changed, 31 insertions, 84 deletions
diff --git a/src/devices/bus/gameboy/mbc6.cpp b/src/devices/bus/gameboy/mbc6.cpp index 46fcc9a0f07..7e1594f1b2b 100644 --- a/src/devices/bus/gameboy/mbc6.cpp +++ b/src/devices/bus/gameboy/mbc6.cpp @@ -102,8 +102,7 @@ private: void install_ram() ATTR_COLD; required_device<intelfsh8_device> m_flash; - memory_view m_view_rom_low; - memory_view m_view_rom_high; + memory_view m_view_rom[2]; memory_view m_view_ram; memory_bank_array_creator<2> m_bank_ram; u8 m_bank_mask_ram; @@ -123,8 +122,7 @@ mbc6_device::mbc6_device( u32 clock) : mbc_8k_device_base(mconfig, GB_ROM_MBC6, tag, owner, clock), m_flash(*this, "flash"), - m_view_rom_low(*this, "romlow"), - m_view_rom_high(*this, "romhigh" ), + m_view_rom{ { *this, "romlow"}, { *this, "romhigh" } }, m_view_ram(*this, "ram"), m_bank_ram(*this, { "ramlow", "ramhigh" }), m_bank_mask_ram(0U), @@ -145,12 +143,12 @@ std::error_condition mbc6_device::load(std::string &message) return image_error::BADSOFTWARE; // install views for ROM/flash and RAM - cart_space()->install_view(0x4000, 0x5fff, m_view_rom_low); - cart_space()->install_view(0x6000, 0x7fff, m_view_rom_high); + cart_space()->install_view(0x4000, 0x5fff, m_view_rom[0]); + cart_space()->install_view(0x6000, 0x7fff, m_view_rom[1]); cart_space()->install_view(0xa000, 0xbfff, m_view_ram); // set up ROM and RAM as appropriate - install_rom(*cart_space(), m_view_rom_low[0], m_view_rom_high[0]); + install_rom(*cart_space(), m_view_rom[0][0], m_view_rom[1][0]); install_ram(); // install memory controller handlers @@ -177,11 +175,11 @@ std::error_condition mbc6_device::load(std::string &message) emu::rw_delegate(*this, FUNC(mbc6_device::select_flash))); // install Flash handlers - m_view_rom_low[1].install_readwrite_handler( + m_view_rom[0][1].install_readwrite_handler( 0x4000, 0x5fff, emu::rw_delegate(*this, FUNC(mbc6_device::read_flash<0>)), emu::rw_delegate(*this, FUNC(mbc6_device::write_flash<0>))); - m_view_rom_high[1].install_readwrite_handler( + m_view_rom[1][1].install_readwrite_handler( 0x6000, 0x7fff, emu::rw_delegate(*this, FUNC(mbc6_device::read_flash<1>)), emu::rw_delegate(*this, FUNC(mbc6_device::write_flash<1>))); @@ -230,8 +228,8 @@ void mbc6_device::device_reset() m_flash_enable = 0U; m_flash_writable = 0U; - m_view_rom_low.select(0); - m_view_rom_high.select(0); + m_view_rom[0].select(0); + m_view_rom[1].select(0); m_view_ram.disable(); if (m_bank_mask_ram) @@ -270,7 +268,6 @@ void mbc6_device::write_flash(offs_t offset, u8 data) void mbc6_device::bank_switch_rom(offs_t offset, u8 data) { auto const bank(BIT(offset, 12)); - memory_view &view(bank ? m_view_rom_high : m_view_rom_low); m_bank_sel_rom[bank] = data; if (!m_flash_select[bank]) @@ -281,11 +278,11 @@ void mbc6_device::bank_switch_rom(offs_t offset, u8 data) "%s: ROM bank %s unmapped\n", machine().describe_context(), bank ? "high" : "low"); - view.disable(); // is there a chip select for a second program ROM? + m_view_rom[bank].disable(); // is there a chip select for a second program ROM? } else { - view.select(0); + m_view_rom[bank].select(0); } } @@ -299,7 +296,6 @@ void mbc6_device::bank_switch_rom(offs_t offset, u8 data) void mbc6_device::select_flash(offs_t offset, u8 data) { auto const bank(BIT(offset, 12)); - memory_view &view(bank ? m_view_rom_high : m_view_rom_low); m_flash_select[bank] = BIT(data, 3); if (m_flash_select[bank]) { @@ -309,9 +305,9 @@ void mbc6_device::select_flash(offs_t offset, u8 data) bank ? "high" : "low", m_flash_enable ? "enabled" : "disabled"); if (m_flash_enable) - view.select(1); + m_view_rom[bank].select(1); else - view.disable(); + m_view_rom[bank].disable(); } else if (BIT(m_bank_sel_rom[bank], 7)) { @@ -319,7 +315,7 @@ void mbc6_device::select_flash(offs_t offset, u8 data) "%s: ROM bank %s unmapped\n", machine().describe_context(), bank ? "high" : "low"); - view.disable(); // is there a chip select for a second program ROM? + m_view_rom[bank].disable(); // is there a chip select for a second program ROM? } else { @@ -327,7 +323,7 @@ void mbc6_device::select_flash(offs_t offset, u8 data) "%s: ROM bank %s selected\n", machine().describe_context(), bank ? "high" : "low"); - view.select(0); + m_view_rom[bank].select(0); } // game writes 0xc6 when selecting ROM during boot - what do the other bits do? @@ -368,17 +364,17 @@ void mbc6_device::enable_flash(u8 data) { LOG("%s: Flash enabled\n", machine().describe_context()); if (m_flash_select[0]) - m_view_rom_low.select(1); + m_view_rom[0].select(1); if (m_flash_select[1]) - m_view_rom_high.select(1); + m_view_rom[1].select(1); } else { LOG("%s: Flash disabled\n", machine().describe_context()); if (m_flash_select[0]) - m_view_rom_low.disable(); + m_view_rom[0].disable(); if (m_flash_select[1]) - m_view_rom_high.disable(); + m_view_rom[1].disable(); } if (data & ~0x01) diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp index e50659fcf3a..84035c07ed4 100644 --- a/src/osd/modules/debugger/qt/debuggerview.cpp +++ b/src/osd/modules/debugger/qt/debuggerview.cpp @@ -16,10 +16,6 @@ #include <QtWidgets/QApplication> #include <QtWidgets/QScrollBar> -#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) -#define horizontalAdvance width -#endif - namespace osd::debugger::qt { diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index 030eb4ab24d..f5e7502f4d4 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -25,10 +25,6 @@ #include <QtWidgets/QToolTip> #include <QtWidgets/QVBoxLayout> -#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) -#define horizontalAdvance width -#endif - namespace osd::debugger::qt { diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index fb478511a99..cc7cb2f1451 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -63,7 +63,7 @@ char const *const CONTROLLER_AXIS_XBOX[]{ "LT", "RT" }; -[[maybe_unused]] char const *const CONTROLLER_AXIS_PS[]{ +char const *const CONTROLLER_AXIS_PS[]{ "LSX", "LSY", "RSX", @@ -71,7 +71,7 @@ char const *const CONTROLLER_AXIS_XBOX[]{ "L2", "R2" }; -[[maybe_unused]] char const *const CONTROLLER_AXIS_SWITCH[]{ +char const *const CONTROLLER_AXIS_SWITCH[]{ "LSX", "LSY", "RSX", @@ -102,7 +102,7 @@ char const *const CONTROLLER_BUTTON_XBOX360[]{ "P4", "Touchpad" }; -[[maybe_unused]] char const *const CONTROLLER_BUTTON_XBOXONE[]{ +char const *const CONTROLLER_BUTTON_XBOXONE[]{ "A", "B", "X", @@ -125,7 +125,7 @@ char const *const CONTROLLER_BUTTON_XBOX360[]{ "P4", "Touchpad" }; -[[maybe_unused]] char const *const CONTROLLER_BUTTON_PS3[]{ +char const *const CONTROLLER_BUTTON_PS3[]{ "Cross", "Circle", "Square", @@ -148,7 +148,7 @@ char const *const CONTROLLER_BUTTON_XBOX360[]{ "P4", "Touchpad" }; -[[maybe_unused]] char const *const CONTROLLER_BUTTON_PS4[]{ +char const *const CONTROLLER_BUTTON_PS4[]{ "Cross", "Circle", "Square", @@ -171,7 +171,7 @@ char const *const CONTROLLER_BUTTON_XBOX360[]{ "P4", "Touchpad" }; -[[maybe_unused]] char const *const CONTROLLER_BUTTON_PS5[]{ +char const *const CONTROLLER_BUTTON_PS5[]{ "Cross", "Circle", "Square", @@ -194,7 +194,7 @@ char const *const CONTROLLER_BUTTON_XBOX360[]{ "P4", "Touchpad" }; -[[maybe_unused]] char const *const CONTROLLER_BUTTON_SWITCH[]{ +char const *const CONTROLLER_BUTTON_SWITCH[]{ "A", "B", "X", @@ -1288,10 +1288,7 @@ public: char const *const *axisnames = CONTROLLER_AXIS_XBOX; char const *const *buttonnames = CONTROLLER_BUTTON_XBOX360; bool digitaltriggers = false; -#if SDL_VERSION_ATLEAST(2, 0, 14) bool avoidpaddles = false; -#endif -#if SDL_VERSION_ATLEAST(2, 0, 12) auto const ctrltype = SDL_GameControllerGetType(m_ctrldevice); switch (ctrltype) { @@ -1324,14 +1321,12 @@ public: buttonnames = CONTROLLER_BUTTON_SWITCH; digitaltriggers = true; break; -#if SDL_VERSION_ATLEAST(2, 0, 14) //case SDL_CONTROLLER_TYPE_VIRTUAL: case SDL_CONTROLLER_TYPE_PS5: osd_printf_verbose("Game Controller: ... PlayStation 5 type\n"); axisnames = CONTROLLER_AXIS_PS; buttonnames = CONTROLLER_BUTTON_PS5; break; -#endif #if SDL_VERSION_ATLEAST(2, 0, 16) //case SDL_CONTROLLER_TYPE_AMAZON_LUNA: case SDL_CONTROLLER_TYPE_GOOGLE_STADIA: @@ -1360,7 +1355,6 @@ public: osd_printf_verbose("Game Controller: ... unrecognized type (%d)\n", int(ctrltype)); break; } -#endif // keep track of item numbers as we add controls std::pair<input_item_id, input_item_id> axisitems[SDL_CONTROLLER_AXIS_MAX]; @@ -1390,9 +1384,7 @@ public: for (auto [axis, item, buttontest] : axes) { bool avail = !buttontest || !digitaltriggers; -#if SDL_VERSION_ATLEAST(2, 0, 14) avail = avail && SDL_GameControllerHasAxis(m_ctrldevice, axis); -#endif if (avail) { auto const binding = SDL_GameControllerGetBindForAxis(m_ctrldevice, axis); @@ -1432,17 +1424,13 @@ public: { SDL_CONTROLLER_BUTTON_INVALID, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, true }, { SDL_CONTROLLER_BUTTON_LEFTSTICK, SDL_CONTROLLER_AXIS_INVALID, true }, { SDL_CONTROLLER_BUTTON_RIGHTSTICK, SDL_CONTROLLER_AXIS_INVALID, true }, -#if SDL_VERSION_ATLEAST(2, 0, 14) { SDL_CONTROLLER_BUTTON_PADDLE1, SDL_CONTROLLER_AXIS_INVALID, true }, { SDL_CONTROLLER_BUTTON_PADDLE2, SDL_CONTROLLER_AXIS_INVALID, true }, { SDL_CONTROLLER_BUTTON_PADDLE3, SDL_CONTROLLER_AXIS_INVALID, true }, { SDL_CONTROLLER_BUTTON_PADDLE4, SDL_CONTROLLER_AXIS_INVALID, true }, -#endif { SDL_CONTROLLER_BUTTON_GUIDE, SDL_CONTROLLER_AXIS_INVALID, false }, -#if SDL_VERSION_ATLEAST(2, 0, 14) { SDL_CONTROLLER_BUTTON_MISC1, SDL_CONTROLLER_AXIS_INVALID, false }, { SDL_CONTROLLER_BUTTON_TOUCHPAD, SDL_CONTROLLER_AXIS_INVALID, false }, -#endif }; input_item_id button_item = ITEM_ID_BUTTON1; unsigned buttoncount = 0; @@ -1452,9 +1440,7 @@ public: input_item_id actual = ITEM_ID_INVALID; if (SDL_CONTROLLER_BUTTON_INVALID != button) { -#if SDL_VERSION_ATLEAST(2, 0, 14) avail = SDL_GameControllerHasButton(m_ctrldevice, button); -#endif if (avail) { auto const binding = SDL_GameControllerGetBindForButton(m_ctrldevice, button); @@ -1481,9 +1467,7 @@ public: } else { -#if SDL_VERSION_ATLEAST(2, 0, 14) avail = SDL_GameControllerHasAxis(m_ctrldevice, axis); -#endif if (avail) { auto const binding = SDL_GameControllerGetBindForAxis(m_ctrldevice, axis); @@ -1533,9 +1517,7 @@ public: for (auto [button, item] : fixedbuttons) { bool avail = true; -#if SDL_VERSION_ATLEAST(2, 0, 14) avail = SDL_GameControllerHasButton(m_ctrldevice, button); -#endif if (avail) { auto const binding = SDL_GameControllerGetBindForButton(m_ctrldevice, button); @@ -1606,7 +1588,6 @@ public: { // took trigger buttons } -#if SDL_VERSION_ATLEAST(2, 0, 14) else if (add_axis_inc_dec_assignment(assignments, IPT_AD_STICK_Z, buttonitems[SDL_CONTROLLER_BUTTON_PADDLE1], buttonitems[SDL_CONTROLLER_BUTTON_PADDLE2])) { // took P1/P2 @@ -1615,7 +1596,6 @@ public: { // took P3/P4 } -#endif } // prefer trigger axes for pedals, otherwise take half axes and buttons @@ -1701,22 +1681,18 @@ public: { // took digital triggers } -#if SDL_VERSION_ATLEAST(2, 0, 14) else if (!avoidpaddles && consume_button_pair(assignments, IPT_UI_PREV_GROUP, IPT_UI_NEXT_GROUP, buttonitems[SDL_CONTROLLER_BUTTON_PADDLE1], buttonitems[SDL_CONTROLLER_BUTTON_PADDLE2])) { // took upper paddles } -#endif else if (consume_trigger_pair(assignments, IPT_UI_PREV_GROUP, IPT_UI_NEXT_GROUP, axisitems[SDL_CONTROLLER_AXIS_TRIGGERLEFT].first, axisitems[SDL_CONTROLLER_AXIS_TRIGGERRIGHT].first)) { // took analog triggers } -#if SDL_VERSION_ATLEAST(2, 0, 14) else if (!avoidpaddles && consume_button_pair(assignments, IPT_UI_PREV_GROUP, IPT_UI_NEXT_GROUP, buttonitems[SDL_CONTROLLER_BUTTON_PADDLE3], buttonitems[SDL_CONTROLLER_BUTTON_PADDLE4])) { // took lower paddles } -#endif else if (consume_axis_pair(assignments, IPT_UI_PREV_GROUP, IPT_UI_NEXT_GROUP, diraxis[1][1])) { // took secondary Y @@ -1727,7 +1703,6 @@ public: } // try to get a matching pair of buttons for page up/down -#if SDL_VERSION_ATLEAST(2, 0, 14) if (!avoidpaddles && consume_button_pair(assignments, IPT_UI_PAGE_UP, IPT_UI_PAGE_DOWN, buttonitems[SDL_CONTROLLER_BUTTON_PADDLE1], buttonitems[SDL_CONTROLLER_BUTTON_PADDLE2])) { // took upper paddles @@ -1737,7 +1712,6 @@ public: // took lower paddles } else -#endif if (consume_trigger_pair(assignments, IPT_UI_PAGE_UP, IPT_UI_PAGE_DOWN, axisitems[SDL_CONTROLLER_AXIS_TRIGGERLEFT].first, axisitems[SDL_CONTROLLER_AXIS_TRIGGERRIGHT].first)) { // took analog triggers @@ -2197,10 +2171,7 @@ protected: char guid_str[256]; guid_str[0] = '\0'; SDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str) - 1); - char const *serial = nullptr; -#if SDL_VERSION_ATLEAST(2, 0, 14) - serial = SDL_JoystickGetSerial(joy); -#endif + char const *const serial = SDL_JoystickGetSerial(joy); std::string id(guid_str); if (serial) id.append(1, '-').append(serial); @@ -2337,10 +2308,7 @@ public: else { SDL_JoystickGUID guid = SDL_JoystickGetGUID(joy); - char const *serial = nullptr; -#if SDL_VERSION_ATLEAST(2, 0, 14) - serial = SDL_JoystickGetSerial(joy); -#endif + char const *const serial = SDL_JoystickGetSerial(joy); auto *const target_device = find_reconnect_match(guid, serial); if (target_device) { @@ -2490,10 +2458,7 @@ public: } SDL_JoystickGUID guid = SDL_JoystickGetGUID(joy); - char const *serial = nullptr; -#if SDL_VERSION_ATLEAST(2, 0, 14) - serial = SDL_JoystickGetSerial(joy); -#endif + char const *const serial = SDL_JoystickGetSerial(joy); auto *const target_device = find_reconnect_match(guid, serial); if (target_device) { @@ -2523,10 +2488,7 @@ public: } SDL_JoystickGUID guid = SDL_JoystickGetDeviceGUID(event.cdevice.which); - char const *serial = nullptr; -#if SDL_VERSION_ATLEAST(2, 0, 14) - serial = SDL_GameControllerGetSerial(ctrl); -#endif + char const *const serial = SDL_GameControllerGetSerial(ctrl); auto *const target_device = find_reconnect_match(guid, serial); if (target_device) { @@ -2558,10 +2520,7 @@ private: char guid_str[256]; guid_str[0] = '\0'; SDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str) - 1); - char const *serial = nullptr; -#if SDL_VERSION_ATLEAST(2, 0, 14) - serial = SDL_GameControllerGetSerial(ctrl); -#endif + char const *const serial = SDL_GameControllerGetSerial(ctrl); std::string id(guid_str); if (serial) id.append(1, '-').append(serial); |