6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-28 06:29:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixed: input value is no longer overwritten by 0xff. The '0' key now works.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-01 20:19:02 -04:00
parent 0267bc237f
commit eca9586a0f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Machines/AmstradCPC/AmstradCPC.cpp
View File

@ -266,7 +266,6 @@ class i8255PortHandler : public Intel::i8255::PortHandler {
case 1: printf("Vsync, etc: %02x\n", value); break; case 1: printf("Vsync, etc: %02x\n", value); break;
case 2: { case 2: {
// TODO: the AY really should allow port communications to be active. Work needed. // TODO: the AY really should allow port communications to be active. Work needed.
// printf("%d\n", value & 15);
int key_row = value & 15; int key_row = value & 15;
if(key_row < 10) { if(key_row < 10) {
ay_->set_port_input(false, key_state_.rows[key_row]); ay_->set_port_input(false, key_state_.rows[key_row]);
@ -287,9 +286,7 @@ class i8255PortHandler : public Intel::i8255::PortHandler {
uint8_t get_value(int port) { uint8_t get_value(int port) {
switch(port) { switch(port) {
case 0: case 0: return ay_->get_data_output();
return ay_->get_data_output();
break;
case 1: printf("[In] Vsync, etc\n"); break; case 1: printf("[In] Vsync, etc\n"); break;
case 2: printf("[In] Key row, etc\n"); break; case 2: printf("[In] Key row, etc\n"); break;
} }
@ -378,6 +375,8 @@ class ConcreteMachine:
} }
break; break;
case CPU::Z80::PartialMachineCycle::Input: case CPU::Z80::PartialMachineCycle::Input:
*cycle.value = 0xff;
// Check for a CRTC access // Check for a CRTC access
if(!(address & 0x4000)) { if(!(address & 0x4000)) {
switch((address >> 8) & 3) { switch((address >> 8) & 3) {
@ -391,8 +390,6 @@ class ConcreteMachine:
if(!(address & 0x800)) { if(!(address & 0x800)) {
*cycle.value = i8255_.get_register((address >> 8) & 3); *cycle.value = i8255_.get_register((address >> 8) & 3);
} }
*cycle.value = 0xff;
break; break;
case CPU::Z80::PartialMachineCycle::Interrupt: case CPU::Z80::PartialMachineCycle::Interrupt:
@ -456,8 +453,7 @@ class ConcreteMachine:
} }
void set_key_state(uint16_t key, bool isPressed) { void set_key_state(uint16_t key, bool isPressed) {
// if(isPressed) key_state_.rows[key >> 4] &= ~(key&7); else key_state_.rows[key >> 4] |= (key&7); if(isPressed) key_state_.rows[key >> 4] &= ~(key&7); else key_state_.rows[key >> 4] |= (key&7);
key_state_.rows[key >> 4] &= ~(key&7);
} }
void clear_all_keys() { void clear_all_keys() {