diff options
| author | HyunKyung Kim <hk310.kim@samsung.com> | 2021-02-18 16:36:21 +0900 |
|---|---|---|
| committer | Weizhung Ding <weizhungding@google.com> | 2021-03-18 00:33:04 +0800 |
| commit | b34f290be29ca38a9a50d918afe6dd3daaae4fee (patch) | |
| tree | 75e077762f8c589e0c22da5a1092afb54ee48055 | |
| parent | 62ca8c3e27f608bbaa07269662359e96c03c8ca0 (diff) | |
| download | gs101-b34f290be29ca38a9a50d918afe6dd3daaae4fee.tar.gz | |
libhwc2.1: Clean up code related to multi display
Use std::array, std::string instead of c style code
Bug: 162322019
Test: single/dual display boot to OS, and suspend/resume
Signed-off-by: HyunKyung Kim <hk310.kim@samsung.com>
Change-Id: Ia2704774dad23807a95656f4085dcaa4e2109944
| -rw-r--r-- | libhwc2.1/ExynosHWCModule.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libhwc2.1/ExynosHWCModule.h b/libhwc2.1/ExynosHWCModule.h index 95cae16..f1fb196 100644 --- a/libhwc2.1/ExynosHWCModule.h +++ b/libhwc2.1/ExynosHWCModule.h @@ -17,6 +17,8 @@ #ifndef ANDROID_EXYNOS_HWC_MODULE_H_ #define ANDROID_EXYNOS_HWC_MODULE_H_ +#include <array> + #include "ExynosHWC.h" #include "DeconHeader.h" @@ -68,9 +70,9 @@ const dpp_channel_map_t IDMA_CHANNEL_MAP[] = { struct exynos_display_t { uint32_t type; uint32_t index; - char display_name[MAX_NAME_SIZE]; - char decon_node_name[MAX_NAME_SIZE]; - char vsync_node_name[MAX_NAME_SIZE]; + std::string display_name; + std::string decon_node_name; + std::string vsync_node_name; }; #define PRIMARY_MAIN_BASE_WIN 2 @@ -142,11 +144,9 @@ const exynos_mpp_t AVAILABLE_M2M_MPP_UNITS[] = { #endif }; -const exynos_display_t AVAILABLE_DISPLAY_UNITS[] = { +const std::array<exynos_display_t, 2> AVAILABLE_DISPLAY_UNITS = {{ {HWC_DISPLAY_PRIMARY, 0, "PrimaryDisplay", "/dev/dri/card0", ""}, - {HWC_DISPLAY_PRIMARY, 1, "SecondaryDisplay", "/dev/dri/card0", ""}, -}; - -#define DISPLAY_COUNT sizeof(AVAILABLE_DISPLAY_UNITS)/sizeof(exynos_display_t) + {HWC_DISPLAY_PRIMARY, 1, "SecondaryDisplay", "/dev/dri/card0", ""} +}}; #endif |