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

Merge pull request #1331 from TomHarte/IODeviceSel

Browse Source
This commit is contained in:
Thomas Harte 2024-02-15 11:16:15 -05:00 committed by GitHub
commit dda5f41487
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Machines/Apple/AppleII/AppleII.cpp
View File

@ -929,14 +929,14 @@ template <Analyser::Static::AppleII::Target::Model model, bool has_mockingboard>
This also sets the active card for the C8 region. This also sets the active card for the C8 region.
*/ */
active_card_ = card_number = (address - 0xc100) >> 8; active_card_ = card_number = (address - 0xc100) >> 8;
select = Apple::II::Card::Device; select = Apple::II::Card::IO;
} else { } else {
/* /*
Decode the area conventionally used by cards for registers: Decode the area conventionally used by cards for registers:
C0n0 to C0nF: card n - 8. C0n0 to C0nF: card n - 8.
*/ */
card_number = (address - 0xc090) >> 4; card_number = (address - 0xc090) >> 4;
select = Apple::II::Card::IO; select = Apple::II::Card::Device;
} }
// If the selected card is a just-in-time card, update the just-in-time cards, // If the selected card is a just-in-time card, update the just-in-time cards,

8
Machines/Apple/AppleII/Card.hpp
View File

@ -41,12 +41,12 @@ class Card {
virtual ~Card() {} virtual ~Card() {}
enum Select: int { enum Select: int {
None = 0, // No select line is active. None = 0, // No select line is active.
IO = 1 << 0, // IO select is active; i.e. access is in range $C0x0 to $C0xf. Device = 1 << 0, // Device select ('DEVSEL') is active; i.e. access is in range $C0x0 to $C0xf.
Device = 1 << 1, // Device select is active; i.e. access is in range $Cx00 to $Cxff. IO = 1 << 1, // IO select ('IOSEL') is active; i.e. access is in range $Cx00 to $Cxff.
C8Region = 1 << 2, // Access is to the region $c800 to $cfff, was preceded by at least C8Region = 1 << 2, // Access is to the region $c800 to $cfff, was preceded by at least
// one Device access to this card, and has not yet been followed up // one Device access to this card, and has not yet been followed up
// by an access to $cfff. // by an access to $cfff. IOSTRB on original hardware.
}; };
// TODO: I think IO and Device are the wrong way around above. // TODO: I think IO and Device are the wrong way around above.
@ -112,7 +112,7 @@ class Card {
} }
protected: protected:
int select_constraints_ = IO | Device; int select_constraints_ = Device | IO;
Delegate *delegate_ = nullptr; Delegate *delegate_ = nullptr;
void set_select_constraints(int constraints) { void set_select_constraints(int constraints) {
if(constraints == select_constraints_) return; if(constraints == select_constraints_) return;

6
Machines/Apple/AppleII/DiskIICard.cpp
View File

@ -46,14 +46,14 @@ void DiskIICard::perform_bus_operation(Select select, bool is_read, uint16_t add
diskii_.set_data_input(*value); diskii_.set_data_input(*value);
switch(select) { switch(select) {
default: break; default: break;
case IO: { case Device: {
const int disk_value = diskii_.read_address(address); const int disk_value = diskii_.read_address(address);
if(is_read) { if(is_read) {
if(disk_value != diskii_.DidNotLoad) if(disk_value != diskii_.DidNotLoad)
*value = uint8_t(disk_value); *value = uint8_t(disk_value);
} }
} break; } break;
case Device: case IO:
if(is_read) *value = boot_[address & 0xff]; if(is_read) *value = boot_[address & 0xff];
break; break;
} }
@ -74,7 +74,7 @@ void DiskIICard::set_activity_observer(Activity::Observer *observer) {
void DiskIICard::set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference preference) { void DiskIICard::set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference preference) {
diskii_clocking_preference_ = preference; diskii_clocking_preference_ = preference;
set_select_constraints((preference != ClockingHint::Preference::RealTime) ? (IO | Device) : None); set_select_constraints((preference != ClockingHint::Preference::RealTime) ? (Device | IO) : None);
} }
Storage::Disk::Drive &DiskIICard::get_drive(int drive) { Storage::Disk::Drive &DiskIICard::get_drive(int drive) {

2
Machines/Apple/AppleII/Mockingboard.hpp
View File

@ -60,7 +60,7 @@ class Mockingboard: public Card {
} }
void perform_bus_operation(Select select, bool is_read, uint16_t address, uint8_t *value) final { void perform_bus_operation(Select select, bool is_read, uint16_t address, uint8_t *value) final {
if(!(select & Device)) { if(!(select & IO)) {
return; return;
} }

4
Machines/Apple/AppleII/SCSICard.cpp
View File

@ -79,13 +79,13 @@ void SCSICard::perform_bus_operation(Select select, bool is_read, uint16_t addre
switch(select) { switch(select) {
default: break; default: break;
case Select::Device: case Select::IO:
if(is_read) { if(is_read) {
*value = rom_[address & 255]; *value = rom_[address & 255];
} }
break; break;
case Select::IO: case Select::Device:
address &= 0xf; address &= 0xf;
switch(address) { switch(address) {
case 0x0: case 0x1: case 0x2: case 0x3: case 0x0: case 0x1: case 0x2: case 0x3: