diff options
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | hw/display.h (renamed from hw/backlight.h) | 33 |
2 files changed, 17 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8accafd..f7e3fca 100644 --- 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/display.h index c795343..063396c 100644 --- a/hw/backlight.h +++ b/hw/display.h @@ -17,43 +17,38 @@ */ -#ifndef __HW_BACKLIGHT_H__ -#define __HW_BACKLIGHT_H__ +#ifndef __HW_DISPLAY_H__ +#define __HW_DISPLAY_H__ #include <hw/common.h> /** * The id of this device */ -#define BACKLIGHT_HARDWARE_DEVICE_ID "backlight" +#define DISPLAY_HARDWARE_DEVICE_ID "display" /** * The version of this device */ -#define BACKLIGHT_HARDWARE_DEVICE_VERSION MAKE_VERSION(1,0) +#define DISPLAY_HARDWARE_DEVICE_VERSION MAKE_VERSION(1,0) -/** - * The mode of backlight - */ -enum backlight_mode { - BACKLIGHT_MANUAL, /* Manual setting */ - BACKLIGHT_SENSOR, /* Worked by sensor */ +enum display_state { + DISPLAY_ON, /* In use */ + DISPLAY_STANDBY, /* Blanked, low power */ + DISPLAY_SUSPEND, /* Blanked, lower power */ + DISPLAY_OFF, /* Shut off, awaiting activity */ }; -struct backlight_device { +struct display_device { struct hw_common common; - /** - * The brightness value is 0 to 100. - */ + /* 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); + /* Control display state */ + int (*get_state)(enum display_state *state); + int (*set_state)(enum display_state state); }; #endif |