diff options
author | Twinaphex | 2017-01-29 06:00:06 +0100 |
---|---|---|
committer | GitHub | 2017-01-29 06:00:06 +0100 |
commit | b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b (patch) | |
tree | adce7b06d1acc25f52c6e10616451bba02f9f7a5 /source/obc1.c | |
parent | 813fc89d37d1d8c8d2fa090a28f74aa0fdcea5df (diff) | |
parent | 0e59b999fa976de2d00490f552a1ff0a27d40f63 (diff) | |
download | snes9x2005-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.tar.gz snes9x2005-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.tar.bz2 snes9x2005-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.zip |
Merge pull request #30 from jamsilva/master
Converted most types to stdint-style (fixing a few in the process).
Diffstat (limited to 'source/obc1.c')
-rw-r--r-- | source/obc1.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/obc1.c b/source/obc1.c index f0afdd4..2d46238 100644 --- a/source/obc1.c +++ b/source/obc1.c @@ -6,9 +6,9 @@ static uint8_t* OBC1_RAM = NULL; -int OBC1_Address; -int OBC1_BasePtr; -int OBC1_Shift; +int32_t OBC1_Address; +int32_t OBC1_BasePtr; +int32_t OBC1_Shift; uint8_t GetOBC1(uint16_t Address) { @@ -63,8 +63,7 @@ void SetOBC1(uint8_t Byte, uint16_t Address) case 0x7ff4: { - unsigned char Temp; - + uint8_t Temp; Temp = OBC1_RAM[OBC1_BasePtr + (OBC1_Address >> 2) + 0x200]; Temp = (Temp & ~(3 << OBC1_Shift)) | ((Byte & 3) << OBC1_Shift); OBC1_RAM[OBC1_BasePtr + (OBC1_Address >> 2) + 0x200] = Temp; |