Diff: main.cpp

Revision:

76:f56c2b955535

Parent:

75:ba60407546fb

Child:

77:20f948d4885e

--- a/main.cpp	Thu Oct 17 15:50:43 2013 +0000
+++ b/main.cpp	Tue Dec 10 15:51:54 2013 +0000
@@ -699,13 +699,14 @@
     LocalFileSystem local("local");
     FILE *file;
     
-    // Upload Matrox EDID to mem4 (ie. index 3). Use this EDID slot when setting Matrox resolutions.
+    // Upload EDIDs
     if (tvOne.getProcessorType().version < 415)
     {
         if (debug) debug->printf("Skipping EDID upload as unsupported on detected TV One firmware\r\n");
     }
     else
     {
+        // Upload Matrox EDID to mem4 (ie. index 3). Use this EDID slot when setting Matrox resolutions.
         file = fopen("/local/matroxe.did", "r"); // 8.3, avoid .bin as mbed executable extension
         if (file)
         {
@@ -716,6 +717,18 @@
         {
             if (debug) debug->printf("Could not open Matrox EDID file 'matroxe.did'\r\n");
         }
+        
+        // Upload Datapath X4 EDID to mem3 (ie. index 2). Use this EDID slot when setting X4 resolutions.
+        file = fopen("/local/x4e.did", "r"); // 8.3, avoid .bin as mbed executable extension
+        if (file)
+        {
+            ok = ok && tvOne.uploadEDID(file, 2);   
+            fclose(file);
+        }
+        else
+        {
+            if (debug) debug->printf("Could not open X4 EDID file 'x4e.did'\r\n");
+        }
     }
 
     // Upload Logo to SIS2. Use this (minimal) image when no sources are connected.