diff -r d8d95053303a -r e8ccf068ac7f guestrendering/guestvideodriver/ldd/src/virtualvideohwdevice.cpp
--- a/guestrendering/guestvideodriver/ldd/src/virtualvideohwdevice.cpp	Fri Aug 20 18:02:40 2010 +0100
+++ b/guestrendering/guestvideodriver/ldd/src/virtualvideohwdevice.cpp	Wed Aug 25 17:57:53 2010 +0100
@@ -1,169 +1,167 @@
-/*
- * =============================================================================
- *  Name        : virtualvideohwdevice.cpp
- *  Part of     : 
- *  Description : Implementation of the class DVirtualVideoHwDevice.
- *  Version     : %version:3 %
- *
- *  Copyright © 2002-2008 Nokia. All rights reserved.
- *  This material, including documentation and any related
- *  computer programs, is protected by copyright controlled by
- *  Nokia. All rights are reserved. Copying, including
- *  reproducing, storing, adapting or translating, any
- *  or all of this material requires the prior written consent of
- *  Nokia. This material also contains confidential
- *  information which may not be disclosed to others without the
- *  prior written consent of Nokia.
- * =============================================================================
- */
-
-
-// INCLUDE FILES
-#include <kernel/kernel.h>
-#include <assp.h>
-
-#include "virtualvideohwdevice.h"
-#include "virtualvideohwchannel.h"
-#include "platsimvideodriverprotocol.h"
-#include "platsimvideodrivercommon.h"
-#include "virtualvideohwinterface.h"
-#include "devicereqhandler.h"
-#include "virtualvideotracing.h"
-
-const TInt KPriority = 27; // DfcQue0 has same priority
-
-// a .LDD requires that the first exported function creates the device. By
-// returning a concrete DLogicalDevice-derived class, this implements
-// polymorphism using a named DLL.
-DECLARE_STANDARD_LDD()
-    {
-    return new DVirtualVideoHwDevice; 
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// DVirtualVideoHwDevice::DVirtualVideoHwDevice
-// -----------------------------------------------------------------------------
-//
-DVirtualVideoHwDevice::DVirtualVideoHwDevice()
-    {
-    // No need to set iParseMask as we don't have PDD.
-    // Just set the version.
-    using namespace PlatsimVideoDriver;
-    iVersion = TVersion( KMajorVer, KMinorVer, KBuildVer );
-    VVHW_TRACE("DVirtualVideoHwDevice::DVirtualVideoHwDevice");
-    }
-
-// -----------------------------------------------------------------------------
-// DVirtualVideoHwDevice::Install
-// -----------------------------------------------------------------------------
-//
-TInt DVirtualVideoHwDevice::Install()
-    {
-    // Our name, used by User::FreeLogicalDevice 
-    TInt err = SetName( &PlatsimVideoDriver::KDeviceName );
-    if ( err != KErrNone )
-        {
-        VVHW_TRACE("DVirtualVideoHwDevice::Install SetName %d", err);
-        return err;
-        }
-
-    // Enter critical section
-    NKern::ThreadEnterCS();
-    
-    err = Kern::DfcQCreate( iDfcQ, KPriority, &PlatsimVideoDriver::KDfcThreadName );
-
-    // Leave critical section
-    NKern::ThreadLeaveCS();
-
-    if ( err != KErrNone )
-        {
-        VVHW_TRACE("DVirtualVideoHwDevice::Install Kern::DfcQCreate %d", err);
-        return err;
-        }
-    
-    iHwInterface = new DVirtualVideoHwInterface;
-    if ( !iHwInterface )
-        {
-        return KErrNoMemory;
-        }
-
-    err = iHwInterface->InitRegisterMemory();
-    if ( err != KErrNone )
-        {
-        VVHW_TRACE("DVirtualVideoHwDevice::Install InitRegisterMemory %d", err);
-        return err;
-        }
-
-    err = iHwInterface->InitParametersInputMemory();
-    if ( err != KErrNone )
-        {
-        VVHW_TRACE("DVirtualVideoHwDevice::Install InitParametersInputMemory %d", err);
-        return err;
-        }
-
-    err = iHwInterface->InitParametersOutputMemory();
-    if ( err != KErrNone )
-        {
-        VVHW_TRACE("DVirtualVideoHwDevice::Install InitParametersOutputMemory %d", err);
-        return err;
-        }
-
-    iDeviceReqHandler = new DDeviceReqHandler( *iHwInterface, iDfcQ );
-    if ( !iDeviceReqHandler )
-        {
-        return KErrNoMemory;
-        }
-
-    VVHW_TRACE("DVirtualVideoHwDevice::Install return %d", err);
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// DVirtualVideoHwDevice::~DVirtualVideoHwDevice
-// -----------------------------------------------------------------------------
-//
-DVirtualVideoHwDevice::~DVirtualVideoHwDevice()
-    {
-    delete iDeviceReqHandler;
-    delete iDfcQ;
-    delete iHwInterface;
-    VVHW_TRACE("DVirtualVideoHwDevice:~DVirtualVideoHwDevice");
-    }
-
-// -----------------------------------------------------------------------------
-// DVirtualVideoHwDevice::GetCaps
-// -----------------------------------------------------------------------------
-//
-void DVirtualVideoHwDevice::GetCaps( TDes8& aDes ) const
-    {
-    TVersion version; 
-
-    // fill it with information
-    version = iVersion; 
-
-    // copy as much of our information as will fit into this descriptor
-    aDes.Copy( (TUint8*)&version, Min( aDes.MaxLength(), sizeof( version ) ) );
-    }
-
-// -----------------------------------------------------------------------------
-// DVirtualVideoHwDevice::Create
-// -----------------------------------------------------------------------------
-//
-TInt DVirtualVideoHwDevice::Create( DLogicalChannelBase*& aChannel )
-    { 
-    aChannel = NULL;
-    TInt error = KErrNone;
-    aChannel = new DVirtualVideoHwChannel(
-            *this,
-            *iHwInterface,
-            *iDeviceReqHandler,
-            iDfcQ);
-    
-    if ( !aChannel )
-        {
-        error = KErrNoMemory;
-        }
-    return error;
-    }
+/*
+ * =============================================================================
+ *  Name        : virtualvideohwdevice.cpp
+ *  Part of     : 
+ *  Description : Implementation of the class DVirtualVideoHwDevice.
+ *  Version     : %version:3 %
+ *
+ *  Copyright © 2002-2008 Nokia. All rights reserved.
+ *  This material, including documentation and any related
+ *  computer programs, is protected by copyright controlled by
+ *  Nokia. All rights are reserved. Copying, including
+ *  reproducing, storing, adapting or translating, any
+ *  or all of this material requires the prior written consent of
+ *  Nokia. This material also contains confidential
+ *  information which may not be disclosed to others without the
+ *  prior written consent of Nokia.
+ * =============================================================================
+ */
+
+#include <kernel/kernel.h>
+#include <assp.h>
+
+#include <graphics/guestvideodriverprotocol.h>
+#include <graphics/virtualvideohwdevice.h>
+#include <graphics/virtualvideohwchannel.h>
+#include <graphics/virtualvideohwinterface.h>
+#include <graphics/virtualvideotracing.h>
+#include <graphics/guestvideodrivercommon.h>
+#include <graphics/devicereqhandler.h>
+
+const TInt KPriority = 27; // DfcQue0 has same priority
+
+// a .LDD requires that the first exported function creates the device. By
+// returning a concrete DLogicalDevice-derived class, this implements
+// polymorphism using a named DLL.
+DECLARE_STANDARD_LDD()
+    {
+    return new DVirtualVideoHwDevice; 
+    }
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// DVirtualVideoHwDevice::DVirtualVideoHwDevice
+// -----------------------------------------------------------------------------
+//
+DVirtualVideoHwDevice::DVirtualVideoHwDevice()
+    {
+    // No need to set iParseMask as we don't have PDD.
+    // Just set the version.
+    using namespace GuestVideoDriver;
+    iVersion = TVersion( KMajorVer, KMinorVer, KBuildVer );
+    VVHW_TRACE("DVirtualVideoHwDevice::DVirtualVideoHwDevice");
+    }
+
+// -----------------------------------------------------------------------------
+// DVirtualVideoHwDevice::Install
+// -----------------------------------------------------------------------------
+//
+TInt DVirtualVideoHwDevice::Install()
+    {
+    // Our name, used by User::FreeLogicalDevice 
+    TInt err = SetName( &GuestVideoDriver::KDeviceName );
+    if ( err != KErrNone )
+        {
+        VVHW_TRACE("DVirtualVideoHwDevice::Install SetName %d", err);
+        return err;
+        }
+
+    // Enter critical section
+    NKern::ThreadEnterCS();
+    
+    err = Kern::DfcQCreate( iDfcQ, KPriority, &GuestVideoDriver::KDfcThreadName );
+
+    // Leave critical section
+    NKern::ThreadLeaveCS();
+
+    if ( err != KErrNone )
+        {
+        VVHW_TRACE("DVirtualVideoHwDevice::Install Kern::DfcQCreate %d", err);
+        return err;
+        }
+    
+    iHwInterface = new DVirtualVideoHwInterface;
+    if ( !iHwInterface )
+        {
+        return KErrNoMemory;
+        }
+
+    err = iHwInterface->InitRegisterMemory();
+    if ( err != KErrNone )
+        {
+        VVHW_TRACE("DVirtualVideoHwDevice::Install InitRegisterMemory %d", err);
+        return err;
+        }
+
+    err = iHwInterface->InitParametersInputMemory();
+    if ( err != KErrNone )
+        {
+        VVHW_TRACE("DVirtualVideoHwDevice::Install InitParametersInputMemory %d", err);
+        return err;
+        }
+
+    err = iHwInterface->InitParametersOutputMemory();
+    if ( err != KErrNone )
+        {
+        VVHW_TRACE("DVirtualVideoHwDevice::Install InitParametersOutputMemory %d", err);
+        return err;
+        }
+
+    iDeviceReqHandler = new DDeviceReqHandler( *iHwInterface, iDfcQ );
+    if ( !iDeviceReqHandler )
+        {
+        return KErrNoMemory;
+        }
+
+    VVHW_TRACE("DVirtualVideoHwDevice::Install return %d", err);
+    return err;
+    }
+
+// -----------------------------------------------------------------------------
+// DVirtualVideoHwDevice::~DVirtualVideoHwDevice
+// -----------------------------------------------------------------------------
+//
+DVirtualVideoHwDevice::~DVirtualVideoHwDevice()
+    {
+    delete iDeviceReqHandler;
+    delete iDfcQ;
+    delete iHwInterface;
+    VVHW_TRACE("DVirtualVideoHwDevice:~DVirtualVideoHwDevice");
+    }
+
+// -----------------------------------------------------------------------------
+// DVirtualVideoHwDevice::GetCaps
+// -----------------------------------------------------------------------------
+//
+void DVirtualVideoHwDevice::GetCaps( TDes8& aDes ) const
+    {
+    TVersion version; 
+
+    // fill it with information
+    version = iVersion; 
+
+    // copy as much of our information as will fit into this descriptor
+    aDes.Copy( (TUint8*)&version, Min( aDes.MaxLength(), sizeof( version ) ) );
+    }
+
+// -----------------------------------------------------------------------------
+// DVirtualVideoHwDevice::Create
+// -----------------------------------------------------------------------------
+//
+TInt DVirtualVideoHwDevice::Create( DLogicalChannelBase*& aChannel )
+    { 
+    aChannel = NULL;
+    TInt error = KErrNone;
+    aChannel = new DVirtualVideoHwChannel(
+            *this,
+            *iHwInterface,
+            *iDeviceReqHandler,
+            iDfcQ);
+    
+    if ( !aChannel )
+        {
+        error = KErrNoMemory;
+        }
+    return error;
+    }