Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 13:34:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bus/nes_ctrl: Cleaned up Famicom keyboard inputs; bus/gameboy: Shut up a couple of coverity warnings.

Browse Source
This commit is contained in:
Vas Crabb 2022-09-14 04:20:26 +10:00
parent c827d7542a
commit ef89299953
3 changed files with 76 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/gameboy/gbslot.cpp
View File

@ -828,7 +828,7 @@ bool detect_mmm01(std::string_view tag, util::random_read &file, u64 length, u64
std::find_if(
std::begin(KNOWN_COLLECTIONS),
std::end(KNOWN_COLLECTIONS),
[backheader] (auto const &name)
[&backheader] (auto const &name)
{
return std::equal(std::begin(name), std::end(name), &backheader[cartheader::OFFSET_TITLE - 0x100]);
}));

4
src/devices/bus/gameboy/mbc.cpp
View File

@ -1207,7 +1207,9 @@ class sintax_device : public mbc5_logo_spoof_device_base
{
public:
sintax_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
mbc5_logo_spoof_device_base(mconfig, GB_ROM_SINTAX, tag, owner, clock)
mbc5_logo_spoof_device_base(mconfig, GB_ROM_SINTAX, tag, owner, clock),
m_scramble_mode(0U),
m_xor_index(0U)
{
}

10
src/devices/bus/nes_ctrl/fckeybrd.cpp
View File

@ -25,7 +25,7 @@ static INPUT_PORTS_START( fc_keyboard )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Kana")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RSHIFT)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\\')
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Stop") PORT_CODE(KEYCODE_BACKSPACE)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("Stop")
PORT_START("FCKEY.1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))
@ -104,11 +104,11 @@ static INPUT_PORTS_START( fc_keyboard )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Del") PORT_CODE(KEYCODE_DEL)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ins") PORT_CODE(KEYCODE_INSERT)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL) PORT_NAME("Del")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_INSERT) PORT_NAME("Ins")
PORT_START("FCKEY.9")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_KEYBOARD ) // final dummy row
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) // final dummy row
INPUT_PORTS_END
@ -210,7 +210,7 @@ void nes_fckeybrd_device::write(u8 data)
u8 prev = m_fck_nibble;
m_fck_nibble = BIT(data, 1);
if (prev && !m_fck_nibble)
m_fck_scan = (m_fck_scan + 1) % 10;
m_fck_scan = (m_fck_scan + 1) % m_kbd.size();
if (BIT(data, 0)) // reset
m_fck_scan = 0;