summaryrefslogtreecommitdiff
path: root/libpcsxcore/psxdma.c
diff options
context:
space:
mode:
authorSND\dario86_cp <SND\dario86_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2012-02-19 02:15:18 +0000
committerSND\dario86_cp <SND\dario86_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2012-02-19 02:15:18 +0000
commit79c267cda79b52cff2ce83397af87aac64d049d7 (patch)
tree43f49fa80e13ee9303d5472f0176c5062fc2e5dc /libpcsxcore/psxdma.c
parent12ddb091ed0a98ef323f2ee9e743386f570a4325 (diff)
Updated Free Software Foundation address (Jem256).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@75156 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/psxdma.c')
-rw-r--r--libpcsxcore/psxdma.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 88eb7fa8..c6bc6eb0 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
@@ -48,8 +48,8 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
break;
}
SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2);
-
- // Jungle Book - 0-0.333x DMA
+
+ // Jungle Book - 0-0.333x DMA
SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3);
return;
@@ -67,14 +67,14 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
size = (bcr >> 16) * (bcr & 0xffff) * 2;
SPU_readDMAMem(ptr, size);
psxCpu->Clear(madr, size);
-
-#if 1
- SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
-#else
- // Experimental burst dma transfer (0.333x max)
- SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3);
-#endif
- return;
+
+#if 1
+ SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
+#else
+ // Experimental burst dma transfer (0.333x max)
+ SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3);
+#endif
+ return;
#ifdef PSXDMA_LOG
default:
@@ -87,8 +87,8 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
DMA_INTERRUPT(4);
}
-
-void psxDma6(u32 madr, u32 bcr, u32 chcr) {
+
+void psxDma6(u32 madr, u32 bcr, u32 chcr) {
u32 size;
u32 *mem = (u32 *)PSXM(madr);
@@ -106,22 +106,22 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
return;
}
- // already 32-bit size
- size = bcr;
-
+ // already 32-bit size
+ size = bcr;
+
while (bcr--) {
*mem-- = SWAP32((madr - 4) & 0xffffff);
madr -= 4;
}
mem++; *mem = 0xffffff;
-
-#if 1
- GPUOTCDMA_INT( size );
-#else
- // Experimental burst dma transfer (0.333x max)
- GPUOTCDMA_INT( size/3 );
-#endif
- return;
+
+#if 1
+ GPUOTCDMA_INT( size );
+#else
+ // Experimental burst dma transfer (0.333x max)
+ GPUOTCDMA_INT( size/3 );
+#endif
+ return;
}
#ifdef PSXDMA_LOG
else {
@@ -133,9 +133,9 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
HW_DMA6_CHCR &= SWAP32(~0x01000000);
DMA_INTERRUPT(6);
}
-
-void gpuotcInterrupt()
-{
- HW_DMA6_CHCR &= SWAP32(~0x01000000);
- DMA_INTERRUPT(6);
-}
+
+void gpuotcInterrupt()
+{
+ HW_DMA6_CHCR &= SWAP32(~0x01000000);
+ DMA_INTERRUPT(6);
+}