mirror of
https://github.com/TomHarte/CLK.git
synced 2025-02-21 05:29:13 +00:00
Standardise name.
This commit is contained in:
parent
2e7e5ea12b
commit
ce440d52b3
@ -14,7 +14,7 @@
|
|||||||
namespace MSX {
|
namespace MSX {
|
||||||
namespace Cartridge {
|
namespace Cartridge {
|
||||||
|
|
||||||
class ASCII16kbROMSlotHandler: public ROMSlotHandler {
|
class ASCII16kbROMSlotHandler: public MemorySlotHandler {
|
||||||
public:
|
public:
|
||||||
ASCII16kbROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
|
ASCII16kbROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
namespace MSX {
|
namespace MSX {
|
||||||
namespace Cartridge {
|
namespace Cartridge {
|
||||||
|
|
||||||
class ASCII8kbROMSlotHandler: public ROMSlotHandler {
|
class ASCII8kbROMSlotHandler: public MemorySlotHandler {
|
||||||
public:
|
public:
|
||||||
ASCII8kbROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
|
ASCII8kbROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
namespace MSX {
|
namespace MSX {
|
||||||
namespace Cartridge {
|
namespace Cartridge {
|
||||||
|
|
||||||
class KonamiROMSlotHandler: public ROMSlotHandler {
|
class KonamiROMSlotHandler: public MemorySlotHandler {
|
||||||
public:
|
public:
|
||||||
KonamiROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
|
KonamiROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
namespace MSX {
|
namespace MSX {
|
||||||
namespace Cartridge {
|
namespace Cartridge {
|
||||||
|
|
||||||
class KonamiWithSCCROMSlotHandler: public ROMSlotHandler {
|
class KonamiWithSCCROMSlotHandler: public MemorySlotHandler {
|
||||||
public:
|
public:
|
||||||
KonamiWithSCCROMSlotHandler(MSX::MemorySlot &slot, Konami::SCC &scc) :
|
KonamiWithSCCROMSlotHandler(MSX::MemorySlot &slot, Konami::SCC &scc) :
|
||||||
slot_(slot), scc_(scc) {}
|
slot_(slot), scc_(scc) {}
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
namespace MSX {
|
namespace MSX {
|
||||||
|
|
||||||
class DiskROM: public ROMSlotHandler, public WD::WD1770 {
|
class DiskROM: public MemorySlotHandler, public WD::WD1770 {
|
||||||
public:
|
public:
|
||||||
DiskROM(const MSX::MemorySlot &slot);
|
DiskROM(const MSX::MemorySlot &slot);
|
||||||
|
|
||||||
|
@ -790,7 +790,7 @@ class ConcreteMachine:
|
|||||||
/// via the primary slot register.
|
/// via the primary slot register.
|
||||||
struct MemorySlot: public MSX::MemorySlot {
|
struct MemorySlot: public MSX::MemorySlot {
|
||||||
HalfCycles cycles_since_update;
|
HalfCycles cycles_since_update;
|
||||||
std::unique_ptr<ROMSlotHandler> handler;
|
std::unique_ptr<MemorySlotHandler> handler;
|
||||||
};
|
};
|
||||||
MemorySlot memory_slots_[4];
|
MemorySlot memory_slots_[4];
|
||||||
MemorySlot *final_slot_ = nullptr;
|
MemorySlot *final_slot_ = nullptr;
|
||||||
|
@ -70,7 +70,7 @@ class MemorySlot {
|
|||||||
std::size_t length);
|
std::size_t length);
|
||||||
|
|
||||||
/// Marks the region indicated by @c destination_address and @c length
|
/// Marks the region indicated by @c destination_address and @c length
|
||||||
/// as unmapped. In practical terms that means that a @c ROMSlotHandler
|
/// as unmapped. In practical terms that means that a @c MemorySlotHandler
|
||||||
/// will be used to field accesses to that area, allowing for areas that are not
|
/// will be used to field accesses to that area, allowing for areas that are not
|
||||||
/// backed by memory to be modelled.
|
/// backed by memory to be modelled.
|
||||||
void unmap(
|
void unmap(
|
||||||
@ -89,9 +89,9 @@ class MemorySlot {
|
|||||||
inline static MemoryChunk scratch;
|
inline static MemoryChunk scratch;
|
||||||
};
|
};
|
||||||
|
|
||||||
class ROMSlotHandler {
|
class MemorySlotHandler {
|
||||||
public:
|
public:
|
||||||
virtual ~ROMSlotHandler() {}
|
virtual ~MemorySlotHandler() {}
|
||||||
|
|
||||||
/*! Advances time by @c half_cycles. */
|
/*! Advances time by @c half_cycles. */
|
||||||
virtual void run_for([[maybe_unused]] HalfCycles half_cycles) {}
|
virtual void run_for([[maybe_unused]] HalfCycles half_cycles) {}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user