device-node: Add display device structure

Backlight structure will replace with display structure.
The role and mean of backlight is too restrictive.
Display will cover all function of drm, backlight and so on.

Change-Id: Icf0a45d2fb522f0f55b7210fabf4a8b5bd77ef3b
Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8accafd0186724f348ae7a0bcf6d689eff9819e9..f7e3fca2827294291b3b61513231786f7f2537f5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,11 +26,6 @@ SET(HEADERS
        include/device-node.h
        include/devman_plugin_intf.h)
 
-SET(HW_HEADERS
-       hw/common.h
-       hw/backlight.h
-       hw/led.h)
-
 INCLUDE(devices/CMakeLists.txt)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
@@ -61,9 +56,9 @@ FOREACH(hfile ${HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME})
 ENDFOREACH(hfile)
 
-FOREACH(hfile ${HW_HEADERS})
-       INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/hw)
-ENDFOREACH(hfile)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hw/ DESTINATION include/hw
+               FILES_MATCHING
+               PATTERN "*.h")
 
 CONFIGURE_FILE(hwcommon.pc.in hwcommon.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hwcommon.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

diff --git a/hw/backlight.h b/hw/backlight.h
deleted file mode 100644 (file)
index c795343..0000000
--- a/hw/backlight.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * libdevice-node
- *
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef __HW_BACKLIGHT_H__
-#define __HW_BACKLIGHT_H__
-
-#include <hw/common.h>
-
-/**
- * The id of this device
- */
-#define BACKLIGHT_HARDWARE_DEVICE_ID   "backlight"
-
-/**
- * The version of this device
- */
-#define BACKLIGHT_HARDWARE_DEVICE_VERSION      MAKE_VERSION(1,0)
-
-/**
- * The mode of backlight
- */
-enum backlight_mode {
-       BACKLIGHT_MANUAL,       /* Manual setting */
-       BACKLIGHT_SENSOR,       /* Worked by sensor */
-};
-
-struct backlight_device {
-       struct hw_common common;
-
-       /**
-        * The brightness value is 0 to 100.
-        */
-       int (*get_brightness)(int *brightness);
-       int (*set_brightness)(int brightness);
-
-       /**
-        * The backlight mode can be BACKLIGHT_MANUAL and BACKLIGHT_SENSOR.
-        */
-       int (*get_mode)(enum backlight_mode *mode);
-       int (*set_mode)(enum backlight_mode mode);
-};
-
-#endif

diff --git a/hw/display.h b/hw/display.h
new file mode 100644 (file)
index 0000000..063396c
--- /dev/null
+++ b/hw/display.h
@@ -0,0 +1,54 @@
+/*
+ * libdevice-node
+ *
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef __HW_DISPLAY_H__
+#define __HW_DISPLAY_H__
+
+#include <hw/common.h>
+
+/**
+ * The id of this device
+ */
+#define DISPLAY_HARDWARE_DEVICE_ID     "display"
+
+/**
+ * The version of this device
+ */
+#define DISPLAY_HARDWARE_DEVICE_VERSION        MAKE_VERSION(1,0)
+
+enum display_state {
+       DISPLAY_ON,       /* In use */
+       DISPLAY_STANDBY,  /* Blanked, low power */
+       DISPLAY_SUSPEND,  /* Blanked, lower power */
+       DISPLAY_OFF,      /* Shut off, awaiting activity */
+};
+
+struct display_device {
+       struct hw_common common;
+
+       /* The brightness value is 0 to 100. */
+       int (*get_brightness)(int *brightness);
+       int (*set_brightness)(int brightness);
+
+       /* Control display state */
+       int (*get_state)(enum display_state *state);
+       int (*set_state)(enum display_state state);
+};
+
+#endif