--- a/graphics_plat/guestvideodriver_api/eabi/guestvideohwapiu.def	Tue Sep 21 19:06:30 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/eabi/guestvideohwapiu.def	Thu Sep 23 15:56:32 2010 +0100
@@ -8,4 +8,4 @@
         _ZN17RGuestVideoDriverC2Ev @ 7 NONAME
         _ZN17RGuestVideoDriverD1Ev @ 8 NONAME
         _ZN17RGuestVideoDriverD2Ev @ 9 NONAME
-	_ZN17RGuestVideoDriver25GetFrameBufferBaseAddressERm @ 10 NONAME
+	_ZN17RGuestVideoDriver27GetSurfaceBufferBaseAddressERm @ 10 NONAME

--- a/graphics_plat/guestvideodriver_api/eabi/guestvideohwu.def	Tue Sep 21 19:06:30 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/eabi/guestvideohwu.def	Thu Sep 23 15:56:32 2010 +0100
@@ -1,6 +1,6 @@
 EXPORTS
  _Z19CreateLogicalDevicev @ 1 NONAME
- _ZN24DVirtualVideoHwInterface12GetFrameBaseEv @ 2 NONAME
+ _ZN24DVirtualVideoHwInterface20GetSurfaceBufferBaseEv @ 2 NONAME
  _ZTI17DDeviceReqHandler @ 3 NONAME DATA 40
  _ZTI21DVirtualVideoHwDevice @ 4 NONAME DATA 32
  _ZTI22DVirtualVideoHwChannel @ 5 NONAME DATA 12

--- a/graphics_plat/guestvideodriver_api/inc/guestvideodriver.h	Tue Sep 21 19:06:30 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/inc/guestvideodriver.h	Thu Sep 23 15:56:32 2010 +0100
@@ -62,13 +62,13 @@
 	IMPORT_C TInt EglGetSgHandles( const TUint64 aId, TUint64 *aSgHandles );
 
 	/**
-     * Gets Base Address of Frame Buffer
+     * Gets Base Address of Surface Buffer
      * @param aHWAddress	returned Base Address
      *
 	 * @note	A base address of 0 is invalid, and indicates a failure to
      *          obtain the base address.
 	 */
-	IMPORT_C TInt GetFrameBufferBaseAddress( TUint32& aHWAddress );
+	IMPORT_C TInt GetSurfaceBufferBaseAddress( TUint32& aHWAddress );
 
 
 private:

--- a/graphics_plat/guestvideodriver_api/inc/guestvideodriverinterfaceconstants.h	Tue Sep 21 19:06:30 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/inc/guestvideodriverinterfaceconstants.h	Thu Sep 23 15:56:32 2010 +0100
@@ -37,8 +37,8 @@
 #define VVI_PARAMETERS_OUTPUT_BASE_ADDRESS VVI_BASE + 0x01000000
 #define VVI_PARAMETERS_OUTPUT_MEMORY_SIZE  0x01000000
 
-#define VVI_FRAMEBUFFER_BASE_ADDRESS VVI_BASE + 0x02000000
-#define VVI_FRAMEBUFFER_MEMORY_SIZE  0x01000000
+#define VVI_SURFACEBUFFER_BASE_ADDRESS VVI_BASE + 0x02000000
+#define VVI_SURFACEBUFFER_MEMORY_SIZE  0x01000000
 
 // register indices, TODO: cleanup needed, some are not used
 #define VVI_R_ID                                0x0000
@@ -54,7 +54,7 @@
 #define VVI_R_INPUT_BUFFER_MAX_TAIL             0x0028
 #define VVI_R_REQUEST_ID                        0x002c
 #define VVI_R_SHARED_CMD_MEMORY_BASE            0x0030
-#define VVI_R_SHARED_FRAMEBUFFER_MEMORY_BASE    0x0034
+#define VVI_R_SHARED_SURFACEBUFFER_MEMORY_BASE  0x0034
 #define VVI_R_LASTREG                           0x0038  // not a register, address of last register
 
 // COMMAND register values

--- a/graphics_plat/guestvideodriver_api/inc/guestvideodriverprotocol.h	Tue Sep 21 19:06:30 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/inc/guestvideodriverprotocol.h	Thu Sep 23 15:56:32 2010 +0100
@@ -33,11 +33,11 @@
      */
     enum TRequestId
 	{
-	ERequestExecuteCommand = 0x1001, 	// Asynchronous (DoRequest)
-	ERequestMapAddress = 0x1002, 		// Synchronous  (DoControl)
-	ERequestLoadCommands = 0x1004, 		// Synchronous  (DoRequest)
-	ERequestSgHandles = 0x1005, 		// Synchronous  (DoControl)
-	ERequestFrameBaseAddress = 0x1006, 	// Synchronous  (DoControl)
+	ERequestExecuteCommand = 0x1001, 			// Asynchronous (DoRequest)
+	ERequestMapAddress = 0x1002, 				// Synchronous  (DoControl)
+	ERequestLoadCommands = 0x1004, 				// Synchronous  (DoRequest)
+	ERequestSgHandles = 0x1005, 				// Synchronous  (DoControl)
+	ERequestSurfaceBufferBaseAddress = 0x1006, 	// Synchronous  (DoControl)
 	};
 
     }

--- a/graphics_plat/guestvideodriver_api/ldd/inc/virtualvideohwinterface.h	Tue Sep 21 19:06:30 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/ldd/inc/virtualvideohwinterface.h	Thu Sep 23 15:56:32 2010 +0100
@@ -53,7 +53,7 @@
         ERegInputBufferMaxTail,
         ERegRequestId,
         ERegSharedCmdMemBase,
-        ERegSharedFramebufferMemBase,
+        ERegSharedSurfacebufferMemBase,
         ENumRegisters              ///< Number of registers                     
         
         };
@@ -144,12 +144,12 @@
     void SetSharedCmdMemBase( TUint32 aPhysicalAddress );
         
     /**
-     * Set shared framebuffer memory base address.
+     * Set shared surface buffer memory base address.
      *
      * @param aPhysicalAddress Physical address of the contiguous memory area reserved for video device.
      */
 
-    void SetSharedFramebufferMemBase( TUint32 aPhysicalAddress );
+    void SetSharedSurfacebufferMemBase( TUint32 aPhysicalAddress );
     
     /**
      * Address to input parameter buffer
@@ -183,7 +183,7 @@
     void SetRegisterValue( TRegister aRegister,
         TUint32 aValue );
 
-    IMPORT_C static TPhysAddr GetFrameBase();
+    IMPORT_C static TPhysAddr GetSurfaceBufferBase();
 
     protected: