diff options
| author | William Douglas <william.douglas@intel.com> | 2012-07-10 12:24:37 -0700 |
|---|---|---|
| committer | William Douglas <william.douglas@intel.com> | 2012-07-10 12:28:27 -0700 |
| commit | 67b79a108da304d9284d010308f75285eb6dd556 (patch) | |
| tree | bf0605208aa21b2d8b8c1d80dac87107d687d1bd | |
| parent | 4ac62b5863263003ce022db2bb76f556e833359a (diff) | |
| download | power-manager-67b79a108da304d9284d010308f75285eb6dd556.tar.gz power-manager-67b79a108da304d9284d010308f75285eb6dd556.tar.bz2 power-manager-67b79a108da304d9284d010308f75285eb6dd556.zip | |
Use "standby" for arm when turning the lcd on with xset.
The change to use "on" instead of "standby" resulted in the lunchbox
images no longer bring the display back on after going off. Define
CMD_ON to be "standby" on arm.
Signed-off-by: William Douglas <william.douglas@intel.com>
| -rw-r--r-- | packaging/power-manager.changes | 4 | ||||
| -rw-r--r-- | pm_x_lcd_onoff.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/packaging/power-manager.changes b/packaging/power-manager.changes index 85c057a..04391fa 100644 --- a/packaging/power-manager.changes +++ b/packaging/power-manager.changes @@ -1,3 +1,7 @@ +* Tue Jul 10 2012 william.douglas@intel.com <william.douglas@intel.com> build/2012-07-04.095101@b69ceab +[ William Douglas ] +- Use "standby" for arm when turning the lcd on with xset. + * Wed Jul 04 2012 Anas Nashif <anas.nashif@intel.com> d891f8d - Do not use bin sub-package, cleanup spec [ Austin Zhang ] diff --git a/pm_x_lcd_onoff.c b/pm_x_lcd_onoff.c index cc6b69f..6e04706 100644 --- a/pm_x_lcd_onoff.c +++ b/pm_x_lcd_onoff.c @@ -24,8 +24,15 @@ #include "pm_device_plugin.h" +/* Need more information but right now xset using "on" doesn't work + * for arm and so we define CMD_ON as CMD_STANDBY when not on x86. + */ #define CMD_STANDBY "standby" +#ifndef X86 +#define CMD_ON CMD_STANDBY +#else #define CMD_ON "on" +#endif #define CMD_OFF "off" static int pm_x_set_lcd_backlight(struct _PMSys *p, int onoff) |