diff options
author | Alcaro | 2017-01-17 00:37:18 +0100 |
---|---|---|
committer | GitHub | 2017-01-17 00:37:18 +0100 |
commit | 6e9a6c9b040035cdc7d015b8bdb21e920c811dca (patch) | |
tree | 73e7755d117b8dd9eea499977c632727deb20d00 /source/apu.h | |
parent | 7ed90abe19954aaf1fa56657a08e3cae4c8a67ce (diff) | |
parent | cbbfa871ae3d9db3852d9122a6d8355896c073ed (diff) | |
download | snes9x2005-6e9a6c9b040035cdc7d015b8bdb21e920c811dca.tar.gz snes9x2005-6e9a6c9b040035cdc7d015b8bdb21e920c811dca.tar.bz2 snes9x2005-6e9a6c9b040035cdc7d015b8bdb21e920c811dca.zip |
Merge pull request #26 from jamsilva/master
Cleanups v2
Diffstat (limited to 'source/apu.h')
-rw-r--r-- | source/apu.h | 40 |
1 files changed, 19 insertions, 21 deletions
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 - |