ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

comment out some replaced stuff

This commit is contained in:
Jaklyy 2024-12-14 23:36:28 -05:00
parent c902dcfc98
commit d912429d8c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/DMA.cpp
View File

@ -215,7 +215,7 @@ u32 DMA::UnitTimings9_16(u8 burststart)
dst_n = NDS.ARM9MemTimings[dst_id][4]; dst_n = NDS.ARM9MemTimings[dst_id][4];
dst_s = NDS.ARM9MemTimings[dst_id][5]; dst_s = NDS.ARM9MemTimings[dst_id][5];
if (src_rgn == Mem9_MainRAM) /*if (src_rgn == Mem9_MainRAM)
{ {
if (dst_rgn == Mem9_MainRAM) if (dst_rgn == Mem9_MainRAM)
{ {
@ -276,7 +276,7 @@ u32 DMA::UnitTimings9_16(u8 burststart)
return ((burststart == 2) ? src_n : src_s) + 7; return ((burststart == 2) ? src_n : src_s) + 7;
} }
} }
else if (src_rgn & dst_rgn) else*/ if (src_rgn & dst_rgn)
{ {
if (burststart != 1) if (burststart != 1)
return src_n + dst_n + (src_n == 1 || burststart <= 0); return src_n + dst_n + (src_n == 1 || burststart <= 0);
@ -306,7 +306,7 @@ u32 DMA::UnitTimings9_32(u8 burststart)
dst_n = NDS.ARM9MemTimings[dst_id][6]; dst_n = NDS.ARM9MemTimings[dst_id][6];
dst_s = NDS.ARM9MemTimings[dst_id][7]; dst_s = NDS.ARM9MemTimings[dst_id][7];
if (src_rgn == Mem9_MainRAM) /*if (src_rgn == Mem9_MainRAM)
{ {
if (dst_rgn == Mem9_MainRAM) if (dst_rgn == Mem9_MainRAM)
return (burststart == 2) ? 13 : 18; return (burststart == 2) ? 13 : 18;
@ -369,7 +369,7 @@ u32 DMA::UnitTimings9_32(u8 burststart)
return ((burststart == 2) ? src_n : src_s) + 8; return ((burststart == 2) ? src_n : src_s) + 8;
} }
} }
else if (src_rgn & dst_rgn) else*/ if (src_rgn & dst_rgn)
{ {
if (burststart != 1) if (burststart != 1)
return src_n + dst_n + (src_n == 1 || burststart <= 0); return src_n + dst_n + (src_n == 1 || burststart <= 0);
@ -401,7 +401,7 @@ u32 DMA::UnitTimings7_16(bool burststart)
dst_n = NDS.ARM7MemTimings[dst_id][0]; dst_n = NDS.ARM7MemTimings[dst_id][0];
dst_s = NDS.ARM7MemTimings[dst_id][1]; dst_s = NDS.ARM7MemTimings[dst_id][1];
if (src_rgn == Mem7_MainRAM) /*if (src_rgn == Mem7_MainRAM)
{ {
if (dst_rgn == Mem7_MainRAM) if (dst_rgn == Mem7_MainRAM)
return 16; return 16;
@ -460,7 +460,7 @@ u32 DMA::UnitTimings7_16(bool burststart)
return (burststart ? src_n : src_s) + 7; return (burststart ? src_n : src_s) + 7;
} }
} }
else if (src_rgn & dst_rgn) else*/ if (src_rgn & dst_rgn)
{ {
return src_n + dst_n + 1; return src_n + dst_n + 1;
} }
@ -487,7 +487,7 @@ u32 DMA::UnitTimings7_32(bool burststart)
dst_n = NDS.ARM7MemTimings[dst_id][2]; dst_n = NDS.ARM7MemTimings[dst_id][2];
dst_s = NDS.ARM7MemTimings[dst_id][3]; dst_s = NDS.ARM7MemTimings[dst_id][3];
if (src_rgn == Mem7_MainRAM) /*if (src_rgn == Mem7_MainRAM)
{ {
if (dst_rgn == Mem7_MainRAM) if (dst_rgn == Mem7_MainRAM)
return 18; return 18;
@ -550,7 +550,7 @@ u32 DMA::UnitTimings7_32(bool burststart)
return (burststart ? src_n : src_s) + 8; return (burststart ? src_n : src_s) + 8;
} }
} }
else if (src_rgn & dst_rgn) else*/ if (src_rgn & dst_rgn)
{ {
return src_n + dst_n + 1; return src_n + dst_n + 1;
} }