[cgutman] 56127: [VBEMP] - Report a single non-PnP monitor if no EDID data could be retrieved [INF] - Add monitor.inf to build

Author: cgutman
Date: Mon Mar 12 03:15:34 2012
New Revision: 56127

URL: http://svn.reactos.org/svn/reactos?rev=56127&view=rev
Log:
[VBEMP]
- Report a single non-PnP monitor if no EDID data could be retrieved
[INF]
- Add monitor.inf to build

Modified:
    trunk/reactos/drivers/video/miniport/vbe/edid.c
    trunk/reactos/media/inf/CMakeLists.txt
    trunk/reactos/media/inf/syssetup.inf
    trunk/reactos/media/inf/syssetup.inf.tpl

Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/...
==============================================================================
--- trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] Mon Mar 12 03:15:34 2012
@@ -273,6 +273,11 @@
    {
       VideoPortDebugPrint(Info, "VBEMP: EDID information read using I²C\n");
    }
+   else if (ChildEnumInfo->ChildIndex == 1)
+   {
+       /* We must have 1 monitor, so just report it with no EDID information */
+       VideoPortDebugPrint(Info, "VBEMP: Reporting monitor with no EDID information\n");
+   }
    else
    {
       VideoPortDebugPrint(Warn, "VBEMP: Unable to read EDID information\n");

Modified: trunk/reactos/media/inf/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?re...
==============================================================================
--- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Mon Mar 12 03:15:34 2012
@@ -18,6 +18,7 @@
     kscaptur.inf
     layout.inf
     machine.inf
+    monitor.inf
     msmouse.inf
     NET_NIC.inf
     netamd.inf

Modified: trunk/reactos/media/inf/syssetup.inf
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev=...
==============================================================================
--- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original)
+++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Mon Mar 12 03:15:34 2012
@@ -13,7 +13,8 @@
 hdc.inf
 input.inf
 keyboard.inf
-machine.inf
+machine.inf
+monitor.inf
 msmouse.inf
 NET_NIC.inf
 ports.inf

Modified: trunk/reactos/media/inf/syssetup.inf.tpl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl?...
==============================================================================
Binary files - no diff available.