From df4732be2e6fd8a9621345a3bbe0cf30157d55eb Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 24 Jul 2017 22:33:49 -0400 Subject: [PATCH] Corrected test. --- .../Bridges/MOS6522Bridge.mm | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/Bridges/MOS6522Bridge.mm b/OSBindings/Mac/Clock SignalTests/Bridges/MOS6522Bridge.mm index ac05933f5..67fc86a02 100644 --- a/OSBindings/Mac/Clock SignalTests/Bridges/MOS6522Bridge.mm +++ b/OSBindings/Mac/Clock SignalTests/Bridges/MOS6522Bridge.mm @@ -18,69 +18,56 @@ class VanillaVIA: public MOS::MOS6522 { uint8_t port_a_value; uint8_t port_b_value; - void set_interrupt_status(bool new_status) - { + void set_interrupt_status(bool new_status) { irq_line = new_status; } - uint8_t get_port_input(Port port) - { + uint8_t get_port_input(Port port) { return port ? port_b_value : port_a_value; } }; -@implementation MOS6522Bridge -{ +@implementation MOS6522Bridge { VanillaVIA _via; } -- (instancetype)init -{ +- (instancetype)init { self = [super init]; - if(self) - { + if(self) { _via.bridge = self; } return self; } -- (void)setValue:(uint8_t)value forRegister:(NSUInteger)registerNumber -{ +- (void)setValue:(uint8_t)value forRegister:(NSUInteger)registerNumber { _via.set_register((int)registerNumber, value); } -- (uint8_t)valueForRegister:(NSUInteger)registerNumber -{ +- (uint8_t)valueForRegister:(NSUInteger)registerNumber { return _via.get_register((int)registerNumber); } -- (void)runForHalfCycles:(NSUInteger)numberOfHalfCycles -{ - _via.run_for_half_cycles((int)numberOfHalfCycles); +- (void)runForHalfCycles:(NSUInteger)numberOfHalfCycles { + _via.run_for(HalfCycles((int)numberOfHalfCycles)); } -- (BOOL)irqLine -{ +- (BOOL)irqLine { return _via.irq_line; } -- (void)setPortAInput:(uint8_t)portAInput -{ +- (void)setPortAInput:(uint8_t)portAInput { _via.port_a_value = portAInput; } -- (uint8_t)portAInput -{ +- (uint8_t)portAInput { return _via.port_a_value; } -- (void)setPortBInput:(uint8_t)portBInput -{ +- (void)setPortBInput:(uint8_t)portBInput { _via.port_b_value = portBInput; } -- (uint8_t)portBInput -{ +- (uint8_t)portBInput { return _via.port_b_value; }