Fix setting display mode

Author: rickgaiser

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