drm_hwcomposer: use CamelCase in source/header files related to class

Main goal is to increase readability of file names.
AOSP uses camelcase for files in many projects.
Lets do the same for drm_hwcomposer.

Keep platform/ directory as is, since class names is different from file names.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Change-Id: I7e992357851c2a86711f4da1241c4d507359e56b

Android.bp

@@ -18,7 +18,7 @@
 cc_library_static {
     name: "libdrmhwc_utils",
 
-    srcs: ["utils/worker.cpp"],
+    srcs: ["utils/Worker.cpp"],
 
     include_dirs: [
         "external/drm_hwcomposer/include",
@@ -80,31 +80,31 @@ cc_library_static {
     name: "drm_hwcomposer",
     defaults: ["hwcomposer.drm_defaults"],
     srcs: [
-        "drmhwctwo.cpp",
+        "DrmHwcTwo.cpp",
 
-        "compositor/drmdisplaycomposition.cpp",
-        "compositor/drmdisplaycompositor.cpp",
+        "compositor/DrmDisplayComposition.cpp",
+        "compositor/DrmDisplayCompositor.cpp",
 
-        "drm/drmconnector.cpp",
-        "drm/drmcrtc.cpp",
-        "drm/drmdevice.cpp",
-        "drm/drmencoder.cpp",
-        "drm/drmeventlistener.cpp",
-        "drm/drmmode.cpp",
-        "drm/drmplane.cpp",
-        "drm/drmproperty.cpp",
-        "drm/resourcemanager.cpp",
-        "drm/vsyncworker.cpp",
+        "drm/DrmConnector.cpp",
+        "drm/DrmCrtc.cpp",
+        "drm/DrmDevice.cpp",
+        "drm/DrmEncoder.cpp",
+        "drm/DrmEventListener.cpp",
+        "drm/DrmMode.cpp",
+        "drm/DrmPlane.cpp",
+        "drm/DrmProperty.cpp",
+        "drm/ResourceManager.cpp",
+        "drm/VSyncWorker.cpp",
 
         "platform/platform.cpp",
 
         "utils/autolock.cpp",
         "utils/hwcutils.cpp",
 
-        "backend/backendmanager.cpp",
-        "backend/backend.cpp",
-        "backend/backendclient.cpp",
-        "backend/backendrcardu.cpp",
+        "backend/BackendManager.cpp",
+        "backend/Backend.cpp",
+        "backend/BackendClient.cpp",
+        "backend/BackendRCarDu.cpp",
     ],
 }
 

DrmHwcTwo.cpp

@@ -17,7 +17,7 @@
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 #define LOG_TAG "hwc-drm-two"
 
-#include "drmhwctwo.h"
+#include "DrmHwcTwo.h"
 
 #include <cutils/properties.h>
 #include <hardware/hardware.h>
@@ -27,8 +27,8 @@
 
 #include <string>
 
-#include "backend/backendmanager.h"
-#include "compositor/drmdisplaycomposition.h"
+#include "backend/BackendManager.h"
+#include "compositor/DrmDisplayComposition.h"
 
 namespace android {
 

DrmHwcTwo.h

@@ -23,9 +23,9 @@
 #include <array>
 #include <map>
 
-#include "compositor/drmdisplaycompositor.h"
-#include "drm/resourcemanager.h"
-#include "drm/vsyncworker.h"
+#include "compositor/DrmDisplayCompositor.h"
+#include "drm/ResourceManager.h"
+#include "drm/VSyncWorker.h"
 #include "drmhwcomposer.h"
 #include "platform/platform.h"
 

backend/Backend.cpp

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "backend.h"
-#include "backendmanager.h"
+#include "Backend.h"
+
+#include "BackendManager.h"
 
 namespace android {
 

backend/Backend.h

@@ -17,7 +17,7 @@
 #ifndef ANDROID_BACKEND_H
 #define ANDROID_BACKEND_H
 
-#include "drmhwctwo.h"
+#include "DrmHwcTwo.h"
 
 namespace android {
 

backend/BackendClient.cpp

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "backendclient.h"
-#include "backendmanager.h"
+#include "BackendClient.h"
+
+#include "BackendManager.h"
 
 namespace android {
 

backend/BackendClient.h

@@ -17,8 +17,7 @@
 #ifndef ANDROID_BACKEND_CLIENT_H
 #define ANDROID_BACKEND_CLIENT_H
 
-#include "backend.h"
-#include "drmhwctwo.h"
+#include "Backend.h"
 
 namespace android {
 

backend/BackendManager.cpp

@@ -16,7 +16,7 @@
 
 #define LOG_TAG "hwc-backend"
 
-#include "backendmanager.h"
+#include "BackendManager.h"
 
 #include <cutils/properties.h>
 #include <log/log.h>

backend/BackendManager.h

@@ -22,8 +22,7 @@
 #include <string>
 #include <vector>
 
-#include "backend.h"
-#include "drmhwctwo.h"
+#include "Backend.h"
 
 #define REGISTER_BACKEND(name_str_, backend_)                               \
   static int                                                                \

backend/BackendRCarDu.cpp

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "backendrcardu.h"
-#include "backendmanager.h"
+#include "BackendRCarDu.h"
+
+#include "BackendManager.h"
 #include "drm_fourcc.h"
 
 namespace android {

backend/BackendRCarDu.h

@@ -17,8 +17,7 @@
 #ifndef HWC_DISPLAY_BACKEND_RCAR_DU_H
 #define HWC_DISPLAY_BACKEND_RCAR_DU_H
 
-#include "backend.h"
-#include "drmhwctwo.h"
+#include "Backend.h"
 
 namespace android {
 

compositor/DrmDisplayComposition.cpp

@@ -16,7 +16,7 @@
 
 #define LOG_TAG "hwc-drm-display-composition"
 
-#include "drmdisplaycomposition.h"
+#include "DrmDisplayComposition.h"
 
 #include <log/log.h>
 #include <stdlib.h>
@@ -26,8 +26,8 @@
 #include <algorithm>
 #include <unordered_set>
 
-#include "drm/drmdevice.h"
-#include "drmdisplaycompositor.h"
+#include "DrmDisplayCompositor.h"
+#include "drm/DrmDevice.h"
 #include "platform/platform.h"
 
 namespace android {

compositor/DrmDisplayComposition.h

@@ -23,8 +23,8 @@
 #include <sstream>
 #include <vector>
 
-#include "drm/drmcrtc.h"
-#include "drm/drmplane.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmPlane.h"
 #include "drmhwcomposer.h"
 
 namespace android {

compositor/DrmDisplayCompositor.cpp

@@ -17,7 +17,7 @@
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 #define LOG_TAG "hwc-drm-display-compositor"
 
-#include "drmdisplaycompositor.h"
+#include "DrmDisplayCompositor.h"
 
 #include <drm/drm_mode.h>
 #include <log/log.h>
@@ -32,9 +32,9 @@
 #include <sstream>
 #include <vector>
 
-#include "drm/drmcrtc.h"
-#include "drm/drmdevice.h"
-#include "drm/drmplane.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmPlane.h"
 #include "utils/autolock.h"
 
 static const uint32_t kWaitWritebackFence = 100;  // ms

compositor/DrmDisplayCompositor.h

@@ -25,10 +25,10 @@
 #include <sstream>
 #include <tuple>
 
-#include "drm/resourcemanager.h"
-#include "drm/vsyncworker.h"
-#include "drmdisplaycomposition.h"
-#include "drmframebuffer.h"
+#include "DrmDisplayComposition.h"
+#include "DrmFramebuffer.h"
+#include "drm/ResourceManager.h"
+#include "drm/VSyncWorker.h"
 #include "drmhwcomposer.h"
 
 // One for the front, one for the back, and one for cases where we need to

drm/DrmConnector.cpp

@@ -16,17 +16,17 @@
 
 #define LOG_TAG "hwc-drm-connector"
 
-#include "drmconnector.h"
-#include "drmdevice.h"
+#include "DrmConnector.h"
 
 #include <errno.h>
+#include <log/log.h>
 #include <stdint.h>
+#include <xf86drmMode.h>
 
 #include <array>
 #include <sstream>
 
-#include <log/log.h>
-#include <xf86drmMode.h>
+#include "DrmDevice.h"
 
 namespace android {
 

drm/DrmConnector.h

@@ -23,9 +23,9 @@
 #include <string>
 #include <vector>
 
-#include "drmencoder.h"
-#include "drmmode.h"
-#include "drmproperty.h"
+#include "DrmEncoder.h"
+#include "DrmMode.h"
+#include "DrmProperty.h"
 
 namespace android {
 

drm/DrmCrtc.cpp

@@ -16,13 +16,13 @@
 
 #define LOG_TAG "hwc-drm-crtc"
 
-#include "drmcrtc.h"
-#include "drmdevice.h"
+#include "DrmCrtc.h"
 
+#include <log/log.h>
 #include <stdint.h>
 #include <xf86drmMode.h>
 
-#include <log/log.h>
+#include "DrmDevice.h"
 
 namespace android {
 

drm/DrmCrtc.h

@@ -20,8 +20,8 @@
 #include <stdint.h>
 #include <xf86drmMode.h>
 
-#include "drmmode.h"
-#include "drmproperty.h"
+#include "DrmMode.h"
+#include "DrmProperty.h"
 
 namespace android {
 

drm/DrmDevice.cpp

@@ -16,22 +16,21 @@
 
 #define LOG_TAG "hwc-drm-device"
 
-#include "drmdevice.h"
+#include "DrmDevice.h"
 
+#include <cutils/properties.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <log/log.h>
 #include <stdint.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
-#include <cinttypes>
 
 #include <algorithm>
 #include <array>
+#include <cinttypes>
 #include <string>
 
-#include <cutils/properties.h>
-#include <log/log.h>
-
 static void trim_left(std::string &str) {
   str.erase(std::begin(str),
             std::find_if(std::begin(str), std::end(str),

drm/DrmDevice.h

@@ -21,11 +21,11 @@
 
 #include <tuple>
 
-#include "drmconnector.h"
-#include "drmcrtc.h"
-#include "drmencoder.h"
-#include "drmeventlistener.h"
-#include "drmplane.h"
+#include "DrmConnector.h"
+#include "DrmCrtc.h"
+#include "DrmEncoder.h"
+#include "DrmEventListener.h"
+#include "DrmPlane.h"
 #include "platform/platform.h"
 
 namespace android {

drm/DrmEncoder.cpp

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-#include "drmencoder.h"
-#include "drmdevice.h"
+#include "DrmEncoder.h"
 
 #include <stdint.h>
 #include <xf86drmMode.h>
 
+#include "DrmDevice.h"
+
 namespace android {
 
 DrmEncoder::DrmEncoder(drmModeEncoderPtr e, DrmCrtc *current_crtc,

drm/DrmEncoder.h

@@ -23,7 +23,7 @@
 #include <set>
 #include <vector>
 
-#include "drmcrtc.h"
+#include "DrmCrtc.h"
 
 namespace android {
 

drm/DrmEventListener.cpp

@@ -16,19 +16,19 @@
 
 #define LOG_TAG "hwc-drm-event-listener"
 
-#include "drmeventlistener.h"
-#include "drmdevice.h"
+#include "DrmEventListener.h"
 
 #include <assert.h>
 #include <errno.h>
-#include <linux/netlink.h>
-#include <sys/socket.h>
-
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer.h>
+#include <linux/netlink.h>
 #include <log/log.h>
+#include <sys/socket.h>
 #include <xf86drm.h>
 
+#include "DrmDevice.h"
+
 namespace android {
 
 DrmEventListener::DrmEventListener(DrmDevice *drm)

drm/DrmEventListener.h

@@ -18,7 +18,7 @@
 #define ANDROID_DRM_EVENT_LISTENER_H_
 
 #include "autofd.h"
-#include "utils/worker.h"
+#include "utils/Worker.h"
 
 namespace android {
 

drm/DrmMode.cpp

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "drmmode.h"
-#include "drmdevice.h"
+#include "DrmMode.h"
+
+#include "DrmDevice.h"
 
 namespace android {
 

drm/DrmPlane.cpp

@@ -16,14 +16,15 @@
 
 #define LOG_TAG "hwc-drm-plane"
 
-#include "drmplane.h"
-#include "drmdevice.h"
+#include "DrmPlane.h"
 
 #include <errno.h>
+#include <log/log.h>
 #include <stdint.h>
+
 #include <cinttypes>
 
-#include <log/log.h>
+#include "DrmDevice.h"
 
 namespace android {
 

drm/DrmPlane.h

@@ -22,8 +22,8 @@
 
 #include <vector>
 
-#include "drmcrtc.h"
-#include "drmproperty.h"
+#include "DrmCrtc.h"
+#include "DrmProperty.h"
 
 namespace android {
 

drm/DrmProperty.cpp

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-#include "drmproperty.h"
-#include "drmdevice.h"
+#include "DrmProperty.h"
 
 #include <errno.h>
 #include <stdint.h>
+#include <xf86drmMode.h>
+
 #include <string>
 
-#include <xf86drmMode.h>
+#include "DrmDevice.h"
 
 namespace android {
 

drm/ResourceManager.cpp

@@ -16,11 +16,12 @@
 
 #define LOG_TAG "hwc-resource-manager"
 
-#include "resourcemanager.h"
+#include "ResourceManager.h"
 
 #include <cutils/properties.h>
 #include <log/log.h>
 #include <sys/stat.h>
+
 #include <sstream>
 
 namespace android {

drm/ResourceManager.h

@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "drmdevice.h"
+#include "DrmDevice.h"
 #include "platform/platform.h"
 
 namespace android {

drm/VSyncWorker.cpp

@@ -16,15 +16,14 @@
 
 #define LOG_TAG "hwc-vsync-worker"
 
-#include "vsyncworker.h"
+#include "VSyncWorker.h"
 
+#include <log/log.h>
 #include <stdlib.h>
 #include <time.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include <log/log.h>
-
 namespace android {
 
 VSyncWorker::VSyncWorker()

drm/VSyncWorker.h

@@ -23,8 +23,8 @@
 
 #include <map>
 
-#include "drmdevice.h"
-#include "utils/worker.h"
+#include "DrmDevice.h"
+#include "utils/Worker.h"
 
 namespace android {
 

include/DrmFramebuffer.h

@@ -18,9 +18,7 @@
 #define ANDROID_DRM_FRAMEBUFFER_
 
 #include <stdint.h>
-
 #include <sync/sync.h>
-
 #include <ui/GraphicBuffer.h>
 
 namespace android {

platform/platform.cpp

@@ -20,7 +20,7 @@
 
 #include <log/log.h>
 
-#include "drm/drmdevice.h"
+#include "drm/DrmDevice.h"
 
 namespace android {
 

platform/platform.h

@@ -23,7 +23,7 @@
 #include <map>
 #include <vector>
 
-#include "compositor/drmdisplaycomposition.h"
+#include "compositor/DrmDisplayComposition.h"
 #include "drmhwcomposer.h"
 
 namespace android {

platform/platformdrmgeneric.h

@@ -22,7 +22,7 @@
 
 #include <map>
 
-#include "drm/drmdevice.h"
+#include "drm/DrmDevice.h"
 #include "platform.h"
 
 #ifndef DRM_FORMAT_INVALID

tests/worker_test.cpp

@@ -1,4 +1,4 @@
-#include "utils/worker.h"
+#include "utils/Worker.h"
 
 #include <gtest/gtest.h>
 #include <hardware/hardware.h>

utils/Worker.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "worker.h"
+#include "Worker.h"
 
 #include <sys/prctl.h>
 #include <sys/resource.h>