Permalink
Browse files

PS2-HW: Fix DMA channel register addresses

The macro for address of channel 9 was wrongly having the address of
channel 8, fixed it. (Luckily MADR and QWC were unused so we should be
safe)

Thanks to Fireboyd78 for notifying us about this. (Closes #2091)

Also fixed some inconsistencies where some of the DMA channel register
addresses weren't defined for all the bitfields.
  • Loading branch information...
ssakash committed Oct 10, 2017
1 parent af2278c commit 3356c63cdc168ca245fb8af4a9c185d213934102
Showing with 7 additions and 2 deletions.
  1. +7 −2 pcsx2/Hw.h
View
@@ -275,6 +275,7 @@ enum EERegisterAddresses
D7_CHCR = 0x1000C800,
D7_MADR = 0x1000C810,
D7_QWC = 0x1000C820,
D7_TADR = 0x1000C830,
SIF2_CHCR = 0x1000C800,
SIF2_MADR = 0x1000C810,
@@ -285,6 +286,8 @@ enum EERegisterAddresses
D8_CHCR = 0x1000D000,
D8_MADR = 0x1000D010,
D8_QWC = 0x1000D020,
D8_TADR = 0x1000D030,
D8_SADR = 0x1000D080,
fromSPR_CHCR = 0x1000D000,
fromSPR_MADR = 0x1000D010,
@@ -294,8 +297,10 @@ enum EERegisterAddresses
//toSPR
D9_CHCR = 0x1000D400,
D9_MADR = 0x1000D010,
D9_QWC = 0x1000D020,
D9_MADR = 0x1000D410,
D9_QWC = 0x1000D420,
D9_TADR = 0x1000D430,
D9_SADR = 0x1000D480,
toSPR_CHCR = 0x1000D400,
toSPR_MADR = 0x1000D410,

2 comments on commit 3356c63

@gregory38

This comment has been minimized.

Show comment
Hide comment
@gregory38

gregory38 Oct 10, 2017

Contributor

Note that some features are not supported by some channels.

Contributor

gregory38 replied Oct 10, 2017

Note that some features are not supported by some channels.

@gregory38

This comment has been minimized.

Show comment
Hide comment
@gregory38

gregory38 Oct 11, 2017

Contributor

@ssakash Check the EE user manual.

D7_TADR, D8_TADR doesn't seem to exists. If you confirm it, I will suggest to use comment in code rather than constant. Could be a good idea to check all DMA channels :)

Contributor

gregory38 replied Oct 11, 2017

@ssakash Check the EE user manual.

D7_TADR, D8_TADR doesn't seem to exists. If you confirm it, I will suggest to use comment in code rather than constant. Could be a good idea to check all DMA channels :)

Please sign in to comment.