commit e6ecdadd57e79c2218b3e6ae407f12599f33bd22
author Jackie Li <yaodong.li@intel.com> Mon Mar 25 09:03:16 2013 -0700
committer buildbot <buildbot@intel.com> Mon Apr 01 13:16:41 2013 -0700
tree 540a30fab615301730edb147c102592a2ce5635e
parent 6a6081a46a83da606cf21548879b37695adc7e1f

Enable refactored HWC for merrifield.

BZ: 95290

This refactored HWC replaces current HWC for merrifield under hardware/intel/mfld_cdk/hwc/merrifield.

Change-Id: I00986b24e70e33c13e5e81e8b3473a42166640a1
Signed-off-by: Andy Qiu <junhai.qiu@intel.com>
Signed-off-by: Jackie Li <yaodong.li@intel.com>
Reviewed-on: http://android.intel.com:8080/98227
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Gummadi, Latha C <latha.c.gummadi@intel.com>
Tested-by: Gummadi, Latha C <latha.c.gummadi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

include/DisplayDevice.h

diff --git a/include/DisplayDevice.h b/include/DisplayDevice.h
index db7ff42..16ffc86 100644
--- a/include/DisplayDevice.h
+++ b/include/DisplayDevice.h
@@ -29,8 +29,8 @@
 #define DISPLAYDEVICE_H_
 
 #include <DisplayPlane.h>
-#include <VsyncControl.h>
-#include <BlankControl.h>
+#include <IVsyncControl.h>
+#include <IBlankControl.h>
 #include <VsyncEventObserver.h>
 #include <HotplugEventObserver.h>
 #include <HwcLayerList.h>
@@ -48,7 +48,6 @@
           mDpiX(dpix),
           mDpiY(dpiy)
     {}
-    ~DisplayConfig() {}
 public:
     int getRefreshRate() const { return mRefreshRate; }
     int getWidth() const { return mWidth; }
@@ -110,17 +109,19 @@
     virtual int getType() const;
 
     //events
-    virtual void onHotplug(int connected);
+    virtual void onHotplug();
     virtual void onVsync(int64_t timestamp);
 
     virtual void dump(Dump& d);
 protected:
+    virtual void deinitialize();
+protected:
     void onGeometryChanged(hwc_display_contents_1_t *list);
     bool updateDisplayConfigs(struct Output *output);
 protected:
-    virtual VsyncControl* createVsyncControl() = 0;
-    virtual BlankControl* createBlankControl() = 0;
-    virtual HotplugControl* createHotplugControl() = 0;
+    virtual IVsyncControl* createVsyncControl() = 0;
+    virtual IBlankControl* createBlankControl() = 0;
+    virtual IHotplugControl* createHotplugControl() = 0;
 protected:
     uint32_t mType;
     const char *mName;
@@ -133,11 +134,11 @@
     int mActiveDisplayConfig;
 
     // vsync control
-    VsyncControl *mVsyncControl;
+    IVsyncControl *mVsyncControl;
     // blank control
-    BlankControl *mBlankControl;
+    IBlankControl *mBlankControl;
     // hotplug control
-    HotplugControl *mHotplugControl;
+    IHotplugControl *mHotplugControl;
 
     // hotplug event observer
     sp<HotplugEventObserver> mHotplugObserver;