[ros-diffs] [cgutman] 56112: [HIVESYS] - Add video adapters to the critical device database [VBE] - Turn on PnP support

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sun Mar 11 11:07:22 2012
New Revision: 56112

URL: http://svn.reactos.org/svn/reactos?rev=56112&view=rev
Log:
[HIVESYS]
- Add video adapters to the critical device database
[VBE]
- Turn on PnP support

Modified:
    trunk/reactos/boot/bootdata/hivesys_i386.inf
    trunk/reactos/drivers/video/miniport/vbe/vbemp.c

Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=56112&r1=56111&r2=56112&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sun Mar 11 11:07:22 2012
@@ -55,6 +55,14 @@
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","Service",0x00000000,"mouhid"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}"
 
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","Service",0x00000000,"VBE"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
+
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","Service",0x00000000,"VBE"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
+
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","Service",0x00000000,"VBE"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
 
 
 HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot","AlternateShell",2,"cmd.exe"

Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/vbemp.c?rev=56112&r1=56111&r2=56112&view=diff
==============================================================================
--- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Sun Mar 11 11:07:22 2012
@@ -47,9 +47,9 @@
    InitData.HwInitialize = VBEInitialize;
    InitData.HwStartIO = VBEStartIO;
    InitData.HwResetHw = VBEResetHw;
-   //InitData.HwGetPowerState = VBEGetPowerState;
-   //InitData.HwSetPowerState = VBESetPowerState;
-   //InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor;
+   InitData.HwGetPowerState = VBEGetPowerState;
+   InitData.HwSetPowerState = VBESetPowerState;
+   InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor;
    InitData.HwDeviceExtensionSize = sizeof(VBE_DEVICE_EXTENSION);
 
    return VideoPortInitialize(Context1, Context2, &InitData, NULL);