From cbbfa871ae3d9db3852d9122a6d8355896c073ed Mon Sep 17 00:00:00 2001 From: João Silva Date: Mon, 16 Jan 2017 22:39:57 +0000 Subject: Many cleanups. --- source/apu.h | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'source/apu.h') diff --git a/source/apu.h b/source/apu.h index d5cdc78..3f88346 100644 --- a/source/apu.h +++ b/source/apu.h @@ -10,29 +10,29 @@ typedef struct { - uint8_t* PC; + uint8_t* PC; SAPURegisters Registers; - uint8_t* RAM; - uint8_t* DirectPage; - bool APUExecuting; - uint8_t Bit; - uint32_t Address; - uint8_t* WaitAddress1; - uint8_t* WaitAddress2; - uint32_t WaitCounter; - uint8_t _Carry; - uint8_t _Zero; - uint8_t _Overflow; - uint32_t TimerErrorCounter; - uint32_t Scanline; - int32_t OneCycle; - int32_t TwoCycles; + uint8_t* RAM; + uint8_t* DirectPage; + bool APUExecuting; + uint8_t Bit; + uint32_t Address; + uint8_t* WaitAddress1; + uint8_t* WaitAddress2; + uint32_t WaitCounter; + uint8_t _Carry; + uint8_t _Zero; + uint8_t _Overflow; + uint32_t TimerErrorCounter; + uint32_t Scanline; + int32_t OneCycle; + int32_t TwoCycles; } SIAPU; typedef struct { int32_t Cycles; - bool ShowROM; + bool ShowROM; uint8_t Flags; uint8_t KeyedChannels; uint8_t OutPorts [4]; @@ -40,8 +40,8 @@ typedef struct uint8_t ExtraRAM [64]; uint16_t Timer [3]; uint16_t TimerTarget [3]; - bool TimerEnabled [3]; - bool TimerValueWritten [3]; + bool TimerEnabled [3]; + bool TimerValueWritten [3]; } SAPU; SAPU APU; @@ -78,7 +78,6 @@ extern uint16_t S9xAPUCycles [256]; // Scaled cycle lengths extern uint16_t S9xAPUCycleLengths [256]; // Raw data. extern void (*S9xApuOpcodes [256])(void); - #define APU_VOL_LEFT 0x00 #define APU_VOL_RIGHT 0x01 #define APU_P_LOW 0x02 @@ -130,4 +129,3 @@ extern void (*S9xApuOpcodes [256])(void); #define APU_EXECUTE() do{}while(0) #endif - -- cgit v1.2.3