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>

4 files changed, 22 insertions, 24 deletions

diff --git a/common/observers/HotplugEventObserver.cpp b/common/observers/HotplugEventObserver.cpp
index e24f137..d2ad964 100644
--- a/common/observers/HotplugEventObserver.cpp
+++ b/common/observers/HotplugEventObserver.cpp
@@ -25,48 +25,47 @@
  *    Jackie Li <yaodong.li@intel.com>
  *
  */
-#include <Log.h>
+#include <cutils/log.h>
+
 #include <HotplugEventObserver.h>
 #include <DisplayDevice.h>
 
 namespace android {
 namespace intel {
 
-static Log& log = Log::getInstance();
 HotplugEventObserver::HotplugEventObserver(DisplayDevice& disp,
-                                              HotplugControl& hotplug)
+                                              IHotplugControl& hotplug)
     : mDisplayDevice(disp),
       mHotplug(hotplug)
 {
-    log.d("HotplugEventObserver");
+    LOGD("HotplugEventObserver");
 }
 
 HotplugEventObserver::~HotplugEventObserver()
 {
-    log.d("~HotplugEventObserver");
+    LOGD("~HotplugEventObserver");
 }
 
 bool HotplugEventObserver::threadLoop()
 {
-    int connection = DisplayDevice::DEVICE_DISCONNECTED;
     int event;
 
     // wait for hotplug event
     if (mHotplug.wait(mDisplayDevice.getType(), event))
-        mDisplayDevice.onHotplug(connection);
+        mDisplayDevice.onHotplug();
 
     return true;
 }
 
 status_t HotplugEventObserver::readyToRun()
 {
-    log.d("HotplugEventObserver::readyToRun");
+    LOGD("HotplugEventObserver::readyToRun");
     return NO_ERROR;
 }
 
 void HotplugEventObserver::onFirstRef()
 {
-    log.d("HotplugEventObserver::onFirstRef");
+    LOGD("HotplugEventObserver::onFirstRef");
     run("HotplugEventObserver", PRIORITY_URGENT_DISPLAY);
 }
 
diff --git a/common/observers/HotplugEventObserver.h b/common/observers/HotplugEventObserver.h
index 38db6f7..e1c891b 100644
--- a/common/observers/HotplugEventObserver.h
+++ b/common/observers/HotplugEventObserver.h
@@ -29,7 +29,7 @@
 #define HOTPLUGEVENTOBSERVER_H_
 
 #include <utils/threads.h>
-#include <HotplugControl.h>
+#include <IHotplugControl.h>
 
 namespace android {
 namespace intel {
@@ -39,7 +39,7 @@ class DisplayDevice;
 class HotplugEventObserver : public Thread
 {
 public:
-    HotplugEventObserver(DisplayDevice& disp, HotplugControl& hotplug);
+    HotplugEventObserver(DisplayDevice& disp, IHotplugControl& hotplug);
     virtual ~HotplugEventObserver();
 private:
     virtual bool threadLoop();
@@ -47,7 +47,7 @@ private:
     virtual void onFirstRef();
 private:
     DisplayDevice& mDisplayDevice;
-    HotplugControl& mHotplug;
+    IHotplugControl& mHotplug;
 }; // HotplugEventObserver
 }
 }
diff --git a/common/observers/VsyncEventObserver.cpp b/common/observers/VsyncEventObserver.cpp
index 91792ab..45cc535 100644
--- a/common/observers/VsyncEventObserver.cpp
+++ b/common/observers/VsyncEventObserver.cpp
@@ -25,22 +25,21 @@
  *    Jackie Li <yaodong.li@intel.com>
  *
  */
-#include <Log.h>
+#include <cutils/log.h>
+
 #include <VsyncEventObserver.h>
 #include <DisplayDevice.h>
 
 namespace android {
 namespace intel {
 
-static Log& log = Log::getInstance();
-
 VsyncEventObserver::VsyncEventObserver(DisplayDevice& disp,
-                                          VsyncControl& vsync)
+                                          IVsyncControl& vsync)
     : mDisplayDevice(disp),
       mVsync(vsync),
       mEnabled(0)
 {
-    log.v("VsyncEventObserver()");
+    LOGV("VsyncEventObserver()");
 }
 
 VsyncEventObserver::~VsyncEventObserver()
@@ -50,7 +49,7 @@ VsyncEventObserver::~VsyncEventObserver()
 
 void VsyncEventObserver::control(int enabled)
 {
-    log.v("control: enabled %s", enabled ? "True" : "False");
+    LOGV("control: enabled %s", enabled ? "True" : "False");
 
     Mutex::Autolock _l(mLock);
     mEnabled = enabled;
@@ -70,7 +69,7 @@ bool VsyncEventObserver::threadLoop()
     bool ret = mVsync.wait(mDisplayDevice.getType(), timestamp);
 
     if (ret == false) {
-        log.w("threadLoop: failed to wait for vsync, check vsync enabling...");
+        LOGW("threadLoop: failed to wait for vsync, check vsync enabling...");
         return true;
     }
 
@@ -81,13 +80,13 @@ bool VsyncEventObserver::threadLoop()
 
 status_t VsyncEventObserver::readyToRun()
 {
-    log.v("VsyncEventObserver: readyToRun. disp %d", mDisplayDevice.getType());
+    LOGV("VsyncEventObserver: readyToRun. disp %d", mDisplayDevice.getType());
     return NO_ERROR;
 }
 
 void VsyncEventObserver::onFirstRef()
 {
-    log.v("VsyncEventObserver: onFirstRef. disp %d", mDisplayDevice.getType());
+    LOGV("VsyncEventObserver: onFirstRef. disp %d", mDisplayDevice.getType());
     run("VsyncEventObserver", PRIORITY_URGENT_DISPLAY);
 }
 
diff --git a/common/observers/VsyncEventObserver.h b/common/observers/VsyncEventObserver.h
index 9efefb3..50531d0 100644
--- a/common/observers/VsyncEventObserver.h
+++ b/common/observers/VsyncEventObserver.h
@@ -29,7 +29,7 @@
 #define __VSYNC_EVENT_OBSERVER_H__
 
 #include <utils/threads.h>
-#include <VsyncControl.h>
+#include <IVsyncControl.h>
 
 namespace android {
 namespace intel {
@@ -38,7 +38,7 @@ class DisplayDevice;
 
 class VsyncEventObserver : public Thread {
 public:
-    VsyncEventObserver(DisplayDevice& disp, VsyncControl& vsync);
+    VsyncEventObserver(DisplayDevice& disp, IVsyncControl& vsync);
     virtual ~VsyncEventObserver();
     void control(int enabled);
 private:
@@ -49,7 +49,7 @@ private:
     mutable Mutex mLock;
     Condition mCondition;
     DisplayDevice& mDisplayDevice;
-    VsyncControl& mVsync;
+    IVsyncControl& mVsync;
     int mEnabled;
 };