Merge pull request #2 from rickgaiser/fixes

Fix DMA transfers and add PAL mode to display settings

Author: fjtrujy

include/ps2s/displayenv.h

@@ -104,7 +104,7 @@ class CDisplayEnv {
         unsigned int screenX = 0, unsigned int screenY = 0,
         unsigned int magH = 4, unsigned int magV = 1);
 
-    inline void GsDisplayModeIs(tDisplayMode mode);
+    inline void SetDisplayMode(tDisplayMode mode);
 
     // blending the two read circuits
     inline void BlendRC1WithBG(void) { gsrPMode.SLBG = 1; }
@@ -156,20 +156,26 @@ class CDisplayEnv {
         unsigned int psm);
 } __attribute((aligned(16)));
 
-void CDisplayEnv::GsDisplayModeIs(tDisplayMode mode)
+void CDisplayEnv::SetDisplayMode(tDisplayMode mode)
 {
     using namespace DisplayModes;
+
     switch (mode) {
     case ntsc:
         HorizontalOverScan = 158 * 4;
         VerticalOverScan   = 50 * 1;
         break;
+    case pal:
+        HorizontalOverScan = 158 * 4; // untested!
+        VerticalOverScan   = 50 * 1;  // untested!
+        break;
     case dtv:
         HorizontalOverScan = 302;
         VerticalOverScan   = 24;
         break;
     default:
         mError("This display mode isn't handled yet..somebody type in the values.");
+        return;
     }
 }
 

src/displayenv.cpp

@@ -11,6 +11,8 @@
 #include "ps2s/displayenv.h"
 #include "ps2s/utils.h"
 
+#include <kernel.h>
+
 namespace GS {
 
 /********************************************
@@ -24,7 +26,7 @@ CDisplayEnv::CDisplayEnv(void)
     gsrPMode.CRTMD = 0;
 
     // some reasonable (?) defaults
-    GsDisplayModeIs(DisplayModes::ntsc);
+    SetDisplayMode(DisplayModes::ntsc);
     SetUseReadCircuit1(false);
     SetUseReadCircuit2(true);
     BlendRC1WithRC2();
@@ -79,12 +81,12 @@ void CDisplayEnv::SetDisplay(tGsrDisplay* displayReg,
 void CDisplayEnv::SendSettings(void)
 {
     using namespace GS::ControlRegs;
-    //*(tU64*)pmode = *(tU64*)&gsrPMode;
-    *(tU64*)dispfb1 = *(tU64*)&gsrDispFB1;
-    *(tU64*)dispfb2 = *(tU64*)&gsrDispFB2;
-    //*(tU64*)display1 = *(tU64*)&gsrDisplay1;
-    //*(tU64*)display2 = *(tU64*)&gsrDisplay2;
-    *(tU64*)bgcolor = *(tU64*)&gsrBGColor;
+    *(tU64*)pmode    = *(tU64*)&gsrPMode;
+    *(tU64*)dispfb1  = *(tU64*)&gsrDispFB1;
+    *(tU64*)dispfb2  = *(tU64*)&gsrDispFB2;
+    *(tU64*)display1 = *(tU64*)&gsrDisplay1;
+    *(tU64*)display2 = *(tU64*)&gsrDisplay2;
+    *(tU64*)bgcolor  = *(tU64*)&gsrBGColor;
 }
 
 } // namespace GS

src/packet.cpp

@@ -89,19 +89,19 @@ void CDmaPacket::Send(bool waitForEnd, bool flushCache)
     //    FlushCache(0);
 
     // clear any memory mappings (this won't work for sp)
-    dma_channel_fast_waits(dmaChannelId);
+    dma_channel_wait(dmaChannelId, 1000000);
     dma_channel_send_normal(dmaChannelId, (void*)((tU32)pBase & 0x0fffffff), pktQWLength, 0, 0);
 
     if (waitForEnd)
-        dma_channel_fast_waits(dmaChannelId);
+        dma_channel_wait(dmaChannelId, 1000000);
 }
 
 void CDmaPacket::HexDump(tU32 numQwords)
 {
     if (numQwords == 0)
         numQwords = ((tU32)pNext - (tU32)pBase) / 16;
 
-    printf("dumping %d words\n", ((tU32)pNext - (tU32)pBase) / 4);
+    printf("dumping %d words (%d qwords)\n", ((tU32)pNext - (tU32)pBase) / 4, numQwords);
 
     tU32 i = 0;
     for (tU32 *nextWord = (tU32*)pBase; nextWord != (tU32*)pNext; nextWord++, i++) {
@@ -152,11 +152,11 @@ void CSCDmaPacket::Send(bool waitForEnd, bool flushCache)
         FlushCache(0);
 
     // clear any memory mappings (this won't work for sp)
-    dma_channel_fast_waits(dmaChannelId);
+    dma_channel_wait(dmaChannelId, 1000000);
     dma_channel_send_chain(dmaChannelId, (void*)((tU32)pBase & 0x0fffffff), 0, bTTE ? DMA_FLAG_TRANSFERTAG : 0, 0);
 
     if (waitForEnd)
-        dma_channel_fast_waits(dmaChannelId);
+        dma_channel_wait(dmaChannelId, 1000000);
 }
 
 /********************************************