6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-01 11:49:58 +00:00
Code Issues Projects Releases Wiki Activity

It would appear the 1770 and 1773 actually differ in relation to the (non-sensical) ability not to spin-up for a Type 2, and whether a side compare can occur. So the WD1770 class now requires a personality to be specified. Which it singly fails to honour.

Browse Source
This commit is contained in:
Thomas Harte 2016-11-26 23:29:30 +08:00
parent d8ecc52de8
commit 2f459690d4
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Components/1770/1770.cpp
View File

@ -11,7 +11,7 @@
using namespace WD; using namespace WD;
WD1770::WD1770() : WD1770::WD1770(Personality p) :
Storage::Disk::Controller(8000000, 16, 300), Storage::Disk::Controller(8000000, 16, 300),
status_(0), status_(0),
interesting_event_mask_(Event::Command), interesting_event_mask_(Event::Command),
@ -22,7 +22,8 @@ WD1770::WD1770() :
is_reading_data_(false), is_reading_data_(false),
interrupt_request_line_(false), interrupt_request_line_(false),
data_request_line_(false), data_request_line_(false),
delegate_(nullptr) delegate_(nullptr),
personality_(p)
{ {
set_is_double_density(false); set_is_double_density(false);
posit_event(Event::Command); posit_event(Event::Command);

8
Components/1770/1770.hpp
View File

@ -15,7 +15,11 @@ namespace WD {
class WD1770: public Storage::Disk::Controller { class WD1770: public Storage::Disk::Controller {
public: public:
WD1770(); enum Personality {
P1770,
P1773
};
WD1770(Personality p);
void set_is_double_density(bool is_double_density); void set_is_double_density(bool is_double_density);
void set_register(int address, uint8_t value); void set_register(int address, uint8_t value);
@ -48,6 +52,8 @@ class WD1770: public Storage::Disk::Controller {
inline void set_delegate(Delegate *delegate) { delegate_ = delegate; } inline void set_delegate(Delegate *delegate) { delegate_ = delegate; }
private: private:
Personality personality_;
uint8_t status_; uint8_t status_;
uint8_t track_; uint8_t track_;
uint8_t sector_; uint8_t sector_;

2
Machines/Electron/Plus3.cpp
View File

@ -10,6 +10,8 @@
using namespace Electron; using namespace Electron;
Plus3::Plus3() : WD1770(P1770) {}
void Plus3::set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int drive) void Plus3::set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int drive)
{ {
if(!drives_[drive]) if(!drives_[drive])

2
Machines/Electron/Plus3.hpp
View File

@ -15,6 +15,8 @@ namespace Electron {
class Plus3 : public WD::WD1770 { class Plus3 : public WD::WD1770 {
public: public:
Plus3();
void set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int drive); void set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int drive);
void set_control_register(uint8_t control); void set_control_register(uint8_t control);

3
Machines/Oric/Microdisc.cpp
View File

@ -13,7 +13,8 @@ using namespace Oric;
Microdisc::Microdisc() : Microdisc::Microdisc() :
irq_enable_(false), irq_enable_(false),
delegate_(nullptr), delegate_(nullptr),
paging_flags_(BASICDisable) paging_flags_(BASICDisable),
WD1770(P1773)
{} {}
void Microdisc::set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int drive) void Microdisc::set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int drive)