mirror of
https://github.com/holub/mame
synced 2025-04-21 07:52:35 +03:00
(MESS) c64: Cleanup. (nw)
This commit is contained in:
parent
bfa4567628
commit
df559d1ea4
@ -184,7 +184,7 @@ void c64_cpm_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UIN
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_cpm_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_cpm_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
if (m_ba != ba)
|
||||
{
|
||||
|
@ -47,7 +47,7 @@ protected:
|
||||
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
inline void update_signals();
|
||||
|
@ -212,7 +212,7 @@ void c64_easyflash_cartridge_device::c64_cd_w(address_space &space, offs_t offse
|
||||
// c64_exrom_r - EXROM read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_easyflash_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_easyflash_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return !BIT(m_mode, 1);
|
||||
}
|
||||
@ -222,7 +222,7 @@ int c64_easyflash_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_easyflash_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_easyflash_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return !(BIT(m_mode, 0) | !(BIT(m_mode, 2) | m_jp1->read()));
|
||||
}
|
||||
|
@ -44,8 +44,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<amd_29f040_device> m_flash_roml;
|
||||
|
@ -62,7 +62,7 @@ UINT8 c64_exos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, U
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_exos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_exos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return !(ba & rw & ((offset & 0xe000) == 0xe000) & hiram);
|
||||
return !(ba & rw & ((offset & 0xe000) == 0xe000) & m_slot->hiram());
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ protected:
|
||||
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
};
|
||||
|
||||
|
||||
|
@ -351,9 +351,11 @@ int c64_expansion_slot_device::game_r(offs_t offset, int sphi2, int ba, int rw,
|
||||
{
|
||||
int state = 1;
|
||||
|
||||
m_hiram = hiram;
|
||||
|
||||
if (m_card != NULL)
|
||||
{
|
||||
state = m_card->c64_game_r(offset, sphi2, ba, rw, hiram);
|
||||
state = m_card->c64_game_r(offset, sphi2, ba, rw);
|
||||
}
|
||||
|
||||
return state;
|
||||
@ -368,9 +370,11 @@ int c64_expansion_slot_device::exrom_r(offs_t offset, int sphi2, int ba, int rw,
|
||||
{
|
||||
int state = 1;
|
||||
|
||||
m_hiram = hiram;
|
||||
|
||||
if (m_card != NULL)
|
||||
{
|
||||
state = m_card->c64_exrom_r(offset, sphi2, ba, rw, hiram);
|
||||
state = m_card->c64_exrom_r(offset, sphi2, ba, rw);
|
||||
}
|
||||
|
||||
return state;
|
||||
|
@ -115,6 +115,7 @@ public:
|
||||
DECLARE_WRITE_LINE_MEMBER( reset_w ) { m_write_reset(state); }
|
||||
int phi2() { return clock(); }
|
||||
int dotclock() { return phi2() * 8; }
|
||||
int hiram() { return m_hiram; }
|
||||
|
||||
protected:
|
||||
// device-level overrides
|
||||
@ -148,6 +149,8 @@ protected:
|
||||
devcb2_write_line m_write_reset;
|
||||
|
||||
device_c64_expansion_card_interface *m_card;
|
||||
|
||||
int m_hiram;
|
||||
};
|
||||
|
||||
|
||||
@ -172,8 +175,8 @@ protected:
|
||||
// runtime
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) { return data; };
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) { };
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram) { return m_game; }
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram) { return m_exrom; }
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) { return m_game; }
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { return m_exrom; }
|
||||
|
||||
c64_expansion_slot_device *m_slot;
|
||||
|
||||
|
@ -341,7 +341,7 @@ void c64_ide64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, U
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_ide64_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_ide64_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return (sphi2 && ba) ? m_game : 1;
|
||||
}
|
||||
@ -351,7 +351,7 @@ int c64_ide64_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int
|
||||
// c64_exrom_r - EXROM read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_ide64_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_ide64_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return (sphi2 && ba) ? m_exrom : 1;
|
||||
}
|
||||
|
@ -47,8 +47,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<atmel_29c010_device> m_flash_rom;
|
||||
|
@ -252,7 +252,7 @@ void c64_ieee488_device::c64_cd_w(address_space &space, offs_t offset, UINT8 dat
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_ieee488_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_ieee488_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, hiram);
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<tpi6525_device> m_tpi;
|
||||
|
@ -93,7 +93,7 @@ void c64_kingsoft_cartridge_device::c64_cd_w(address_space &space, offs_t offset
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_kingsoft_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_kingsoft_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exrom & !(ba & rw & ((offset >= 0x8000 && offset < 0xc000) || (offset >= 0xe000)));
|
||||
}
|
||||
|
@ -39,7 +39,7 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
};
|
||||
|
||||
|
||||
|
@ -274,7 +274,7 @@ void c64_magic_formel_cartridge_device::c64_cd_w(address_space &space, offs_t of
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_magic_formel_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_magic_formel_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return !(ba & rw & ((offset & 0xe000) == 0xe000) & !(m_pb7 & m_cb2_ff));
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<pia6821_device> m_pia;
|
||||
|
@ -359,7 +359,7 @@ void c64_magic_voice_cartridge_device::c64_cd_w(address_space &space, offs_t off
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_magic_voice_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_magic_voice_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return !((m_tpi_pc6 && sphi2) || (!m_tpi_pc6 && sphi2 && !PB5 && A12 && A13 && !A14));
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
offs_t get_offset(offs_t offset);
|
||||
|
@ -223,9 +223,9 @@ void c64_music64_cartridge_device::c64_cd_w(address_space &space, offs_t offset,
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_music64_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_music64_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, hiram);
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
||||
|
||||
@ -233,7 +233,7 @@ int c64_music64_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, i
|
||||
// c64_exrom_r - EXROM read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_music64_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_music64_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->exrom_r(offset, sphi2, ba, rw, hiram);
|
||||
return m_exp->exrom_r(offset, sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
@ -42,8 +42,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<c64_expansion_slot_device> m_exp;
|
||||
|
@ -271,9 +271,9 @@ void c64_sfx_sound_expander_cartridge_device::c64_cd_w(address_space &space, off
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_sfx_sound_expander_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_sfx_sound_expander_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->game_r(get_offset(offset, rw), sphi2, ba, rw, hiram);
|
||||
return m_exp->game_r(get_offset(offset, rw), sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
||||
|
||||
@ -281,7 +281,7 @@ int c64_sfx_sound_expander_cartridge_device::c64_game_r(offs_t offset, int sphi2
|
||||
// c64_exrom_r - EXROM read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_sfx_sound_expander_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_sfx_sound_expander_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->exrom_r(get_offset(offset, rw), sphi2, ba, rw, hiram);
|
||||
return m_exp->exrom_r(get_offset(offset, rw), sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
@ -45,8 +45,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<ym3526_device> m_opl;
|
||||
|
@ -179,9 +179,9 @@ void c64_stardos_cartridge_device::c64_cd_w(address_space &space, offs_t offset,
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_stardos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_stardos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return !(sphi2 && ba & rw & ((offset & 0xe000) == 0xe000) & hiram);
|
||||
return !(sphi2 && ba & rw & ((offset & 0xe000) == 0xe000) & m_slot->hiram());
|
||||
}
|
||||
|
||||
|
||||
@ -189,7 +189,7 @@ int c64_stardos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, i
|
||||
// c64_exrom_r - EXROM read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_stardos_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_stardos_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return (BIT(offset, 13)) ? 1 : m_exrom;
|
||||
}
|
||||
|
@ -42,8 +42,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
inline void charge_io1_capacitor();
|
||||
|
@ -291,9 +291,9 @@ void c64_supercpu_device::c64_cd_w(address_space &space, offs_t offset, UINT8 da
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_supercpu_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_supercpu_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, hiram);
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
||||
|
||||
@ -301,7 +301,7 @@ int c64_supercpu_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, in
|
||||
// c64_exrom_r - EXROM read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_supercpu_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_supercpu_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->exrom_r(offset, sphi2, ba, rw, hiram);
|
||||
return m_exp->exrom_r(offset, sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
@ -44,8 +44,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<legacy_cpu_device> m_maincpu;
|
||||
|
@ -176,9 +176,9 @@ void c64_tdos_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UI
|
||||
// c64_game_r - GAME read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_tdos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_tdos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, hiram);
|
||||
return m_exp->game_r(offset, sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
||||
|
||||
@ -186,7 +186,7 @@ int c64_tdos_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int
|
||||
// c64_exrom_r - EXROM read
|
||||
//-------------------------------------------------
|
||||
|
||||
int c64_tdos_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram)
|
||||
int c64_tdos_cartridge_device::c64_exrom_r(offs_t offset, int sphi2, int ba, int rw)
|
||||
{
|
||||
return m_exp->exrom_r(offset, sphi2, ba, rw, hiram);
|
||||
return m_exp->exrom_r(offset, sphi2, ba, rw, m_slot->hiram());
|
||||
}
|
||||
|
@ -42,8 +42,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
|
||||
|
||||
private:
|
||||
required_device<mc6852_device> m_ssda;
|
||||
|
@ -39,7 +39,7 @@ protected:
|
||||
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram) { return 0; }
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { return 0; }
|
||||
|
||||
private:
|
||||
emu_timer *m_game_timer;
|
||||
|
@ -47,8 +47,8 @@ protected:
|
||||
// device_c64_expansion_card_interface overrides
|
||||
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram) { return 1; }
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram) { return 0; }
|
||||
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) { return 1; }
|
||||
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { return 0; }
|
||||
|
||||
private:
|
||||
required_device<h46505_device> m_crtc;
|
||||
|
Loading…
Reference in New Issue
Block a user