6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Added fire and reset inputs.

Browse Source
This commit is contained in:
Thomas Harte 2015-08-18 20:58:05 -04:00
parent 88d5064737
commit ca6b54536e
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Machines/Atari2600.cpp
View File

@ -27,7 +27,7 @@ Machine::Machine()
_hMoveWillCount = false;
_piaDataValue[0] = _piaDataValue[1] = 0xff;
_piaInputValue[0] = _piaInputValue[1] = 0xff;
_tiaInputValue[0] = _tiaInputValue[1] = 0xff;
setup6502();
set_reset_line(true);
@ -358,7 +358,7 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
case 0x0c:
case 0x0d:
// TODO: inputs
returnValue &= _tiaInputValue[decodedAddress - 0x0c];
break;
}
} else {
@ -530,11 +530,6 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
returnValue &= _piaTimerStatus;
_piaTimerStatus &= ~0x40;
break;
case 0x0c:
case 0x0d:
returnValue &= _piaInputValue[decodedAddress - 0x0c];
break;
}
} else {
const uint8_t decodedAddress = address & 0x0f;
@ -570,15 +565,19 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
void Machine::set_digital_input(Atari2600DigitalInput input, bool state)
{
switch (input) {
case Atari2600DigitalInputJoy1Up: if(state) _piaDataValue[0] &= 0x10; else _piaDataValue[0] |= 0x10; break;
case Atari2600DigitalInputJoy1Down: if(state) _piaDataValue[0] &= 0x20; else _piaDataValue[0] |= 0x20; break;
case Atari2600DigitalInputJoy1Left: if(state) _piaDataValue[0] &= 0x40; else _piaDataValue[0] |= 0x40; break;
case Atari2600DigitalInputJoy1Right: if(state) _piaDataValue[0] &= 0x80; else _piaDataValue[0] |= 0x80; break;
case Atari2600DigitalInputJoy1Up: if(state) _piaDataValue[0] &= ~0x10; else _piaDataValue[0] |= 0x10; break;
case Atari2600DigitalInputJoy1Down: if(state) _piaDataValue[0] &= ~0x20; else _piaDataValue[0] |= 0x20; break;
case Atari2600DigitalInputJoy1Left: if(state) _piaDataValue[0] &= ~0x40; else _piaDataValue[0] |= 0x40; break;
case Atari2600DigitalInputJoy1Right: if(state) _piaDataValue[0] &= ~0x80; else _piaDataValue[0] |= 0x80; break;
case Atari2600DigitalInputJoy2Up: if(state) _piaDataValue[0] &= 0x01; else _piaDataValue[0] |= 0x01; break;
case Atari2600DigitalInputJoy2Down: if(state) _piaDataValue[0] &= 0x02; else _piaDataValue[0] |= 0x02; break;
case Atari2600DigitalInputJoy2Left: if(state) _piaDataValue[0] &= 0x04; else _piaDataValue[0] |= 0x04; break;
case Atari2600DigitalInputJoy2Right: if(state) _piaDataValue[0] &= 0x08; else _piaDataValue[0] |= 0x08; break;
case Atari2600DigitalInputJoy2Up: if(state) _piaDataValue[0] &= ~0x01; else _piaDataValue[0] |= 0x01; break;
case Atari2600DigitalInputJoy2Down: if(state) _piaDataValue[0] &= ~0x02; else _piaDataValue[0] |= 0x02; break;
case Atari2600DigitalInputJoy2Left: if(state) _piaDataValue[0] &= ~0x04; else _piaDataValue[0] |= 0x04; break;
case Atari2600DigitalInputJoy2Right: if(state) _piaDataValue[0] &= ~0x08; else _piaDataValue[0] |= 0x08; break;
// TODO: latching
case Atari2600DigitalInputJoy1Fire: if(state) _tiaInputValue[0] &= ~0x80; else _tiaInputValue[0] |= 0x80; break;
case Atari2600DigitalInputJoy2Fire: if(state) _tiaInputValue[1] &= ~0x80; else _tiaInputValue[1] |= 0x80; break;
default: break;
}

2
Machines/Atari2600.hpp
View File

@ -78,7 +78,7 @@ class Machine: public CPU6502::Processor<Machine> {
// joystick state
uint8_t _piaDataDirection[2];
uint8_t _piaDataValue[2];
uint8_t _piaInputValue[2];
uint8_t _tiaInputValue[2];
// collisions
uint8_t _collisions[8];

8
OSBindings/Mac/Clock Signal/Atari2600Document.swift
View File

@ -88,12 +88,20 @@ class Atari2600Document: NSDocument, CSCathodeRayViewDelegate, CSCathodeRayViewR
if let input = inputForKey(event) {
atari2600!.setState(true, forDigitalInput: input)
}
if event.keyCode == 36 {
atari2600!.setResetLineEnabled(true)
}
}
func keyUp(event: NSEvent) {
if let input = inputForKey(event) {
atari2600!.setState(false, forDigitalInput: input)
}
if event.keyCode == 36 {
atari2600!.setResetLineEnabled(false)
}
}
func flagsChanged(newModifiers: NSEvent) {

2
OSBindings/Mac/Clock Signal/CSAtari2600.h
View File

@ -16,6 +16,8 @@
- (void)runForNumberOfCycles:(int)cycles;
- (void)setROM:(NSData *)rom;
- (void)setState:(BOOL)state forDigitalInput:(Atari2600DigitalInput)digitalInput;
- (void)setResetLineEnabled:(BOOL)enabled;
@end

6
OSBindings/Mac/Clock Signal/CSAtari2600.mm
View File

@ -83,6 +83,12 @@ struct Atari2600CRTDelegate: public Outputs::CRT::CRTDelegate {
});
}
- (void)setResetLineEnabled:(BOOL)enabled {
dispatch_async(_serialDispatchQueue, ^{
_atari2600.set_reset_line(enabled ? true : false);
});
}
- (instancetype)init {
self = [super init];