6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-10-07 21:57:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into LockFreeQueue

Browse Source
This commit is contained in:
Thomas Harte 2020-07-29 21:22:19 -04:00
commit 9410594486
5 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Machines/Oric/BD500.hpp
View File

@ -18,6 +18,11 @@
namespace Oric { namespace Oric {
/*!
Emulates a Byte Drive 500, at least to some extent. Very little is known about this interface,
and I'm in possession of only a single disk image. So much of the below is community guesswork;
see the thread at https://forum.defence-force.org/viewtopic.php?f=25&t=2055
*/
class BD500: public DiskController { class BD500: public DiskController {
public: public:
BD500(); BD500();
@ -36,6 +41,16 @@ class BD500: public DiskController {
void access(int address); void access(int address);
void set_head_loaded(bool loaded); void set_head_loaded(bool loaded);
bool enable_overlay_ram_ = false;
bool disable_basic_rom_ = false;
void select_paged_item() {
PagedItem item = PagedItem::RAM;
if(!enable_overlay_ram_) {
item = disable_basic_rom_ ? PagedItem::DiskROM : PagedItem::BASIC;
}
set_paged_item(item);
}
}; };
}; };

22
Machines/Oric/DiskController.hpp
View File

@ -44,28 +44,18 @@ class DiskController: public WD::WD1770 {
protected: protected:
Delegate *delegate_ = nullptr; Delegate *delegate_ = nullptr;
bool enable_overlay_ram_ = false; void set_paged_item(PagedItem item) {
bool disable_basic_rom_ = false;
void select_paged_item() {
PagedItem item = PagedItem::RAM;
if(!enable_overlay_ram_) {
item = disable_basic_rom_ ? PagedItem::DiskROM : PagedItem::BASIC;
}
set_paged_item(item);
}
private:
PagedItem paged_item_ = PagedItem::DiskROM;
int clock_rate_;
Storage::Disk::Drive::ReadyType ready_type_;
inline void set_paged_item(PagedItem item) {
if(paged_item_ == item) return; if(paged_item_ == item) return;
paged_item_ = item; paged_item_ = item;
if(delegate_) { if(delegate_) {
delegate_->disk_controller_did_change_paged_item(this); delegate_->disk_controller_did_change_paged_item(this);
} }
} }
private:
PagedItem paged_item_ = PagedItem::DiskROM;
int clock_rate_;
Storage::Disk::Drive::ReadyType ready_type_;
}; };

10
Machines/Oric/Jasmin.hpp
View File

@ -29,6 +29,16 @@ class Jasmin: public DiskController {
uint8_t selected_drives_ = 0; uint8_t selected_drives_ = 0;
Activity::Observer *observer_ = nullptr; Activity::Observer *observer_ = nullptr;
bool enable_overlay_ram_ = false;
bool disable_basic_rom_ = false;
void select_paged_item() {
PagedItem item = PagedItem::RAM;
if(!enable_overlay_ram_) {
item = disable_basic_rom_ ? PagedItem::DiskROM : PagedItem::BASIC;
}
set_paged_item(item);
}
}; };
}; };

15
Machines/Oric/Microdisc.cpp
View File

@ -38,7 +38,7 @@ void Microdisc::set_control_register(uint8_t control, uint8_t changes) {
// b4: side select // b4: side select
if(changes & 0x10) { if(changes & 0x10) {
const int head = (control & 0x10) ? 1 : 0; const int head = (control & 0x10) >> 4;
for_all_drives([head] (Storage::Disk::Drive &drive, size_t) { for_all_drives([head] (Storage::Disk::Drive &drive, size_t) {
drive.set_head(head); drive.set_head(head);
}); });
@ -52,7 +52,7 @@ void Microdisc::set_control_register(uint8_t control, uint8_t changes) {
// b0: IRQ enable // b0: IRQ enable
if(changes & 0x01) { if(changes & 0x01) {
const bool had_irq = get_interrupt_request_line(); const bool had_irq = get_interrupt_request_line();
irq_enable_ = !!(control & 0x01); irq_enable_ = bool(control & 0x01);
const bool has_irq = get_interrupt_request_line(); const bool has_irq = get_interrupt_request_line();
if(has_irq != had_irq && delegate_) { if(has_irq != had_irq && delegate_) {
delegate_->wd1770_did_change_output(this); delegate_->wd1770_did_change_output(this);
@ -62,9 +62,14 @@ void Microdisc::set_control_register(uint8_t control, uint8_t changes) {
// b7: EPROM select (0 = select) // b7: EPROM select (0 = select)
// b1: ROM disable (0 = disable) // b1: ROM disable (0 = disable)
if(changes & 0x82) { if(changes & 0x82) {
enable_overlay_ram_ = control & 0x80; PagedItem item;
disable_basic_rom_ = !(control & 0x02); if(control & 0x02) item = PagedItem::BASIC;
select_paged_item(); else if(control & 0x80) {
item = PagedItem::RAM;
} else {
item = PagedItem::DiskROM;
}
set_paged_item(item);
} }
} }

4
Storage/Disk/Controller/DiskController.cpp
View File

@ -90,7 +90,7 @@ void Controller::set_drive(int index_mask) {
return; return;
} }
ClockingHint::Preference former_prefernece = preferred_clocking(); const ClockingHint::Preference former_preference = preferred_clocking();
// Stop receiving events from the current drive. // Stop receiving events from the current drive.
get_drive().set_event_delegate(nullptr); get_drive().set_event_delegate(nullptr);
@ -114,7 +114,7 @@ void Controller::set_drive(int index_mask) {
get_drive().set_event_delegate(this); get_drive().set_event_delegate(this);
if(preferred_clocking() != former_prefernece) { if(preferred_clocking() != former_preference) {
update_clocking_observer(); update_clocking_observer();
} }
} }