r4585 - developers/raster/ompower

[raster at docs.openmoko.org]

Author: raster
Date: 2008-08-05 09:07:38 +0200 (Tue, 05 Aug 2008)
New Revision: 4585

Modified:
   developers/raster/ompower/main.c
   developers/raster/ompower/power.c
Log:
fix brightness swizzle



Modified: developers/raster/ompower/main.c
===================================================================
--- developers/raster/ompower/main.c	2008-08-05 06:49:39 UTC (rev 4584)
+++ developers/raster/ompower/main.c	2008-08-05 07:07:38 UTC (rev 4585)
@@ -1,5 +1,8 @@
 #include "main.h"
 
+void file_write(const char *file, int val);
+int file_read(const char *file);
+    
 static int debug = 0;
 
 #define DBG(args...) if (debug) fprintf(stderr, ##args)
@@ -221,7 +224,7 @@
    ecore_string_init();
    ecore_app_args_set(argc, (const char **)argv);
    e_dbus_init();
-   
+
    c = e_dbus_bus_get(DBUS_BUS_SYSTEM);
    if (!c)
      {
@@ -232,6 +235,7 @@
    _declare_iface(c);
 
    DBG("Beginning main loop\n");
+   
    ecore_main_loop_begin();
 
    e_dbus_connection_close(c);

Modified: developers/raster/ompower/power.c
===================================================================
--- developers/raster/ompower/power.c	2008-08-05 06:49:39 UTC (rev 4584)
+++ developers/raster/ompower/power.c	2008-08-05 07:07:38 UTC (rev 4585)
@@ -1,6 +1,6 @@
 #include "main.h"
 
-static void
+void
 file_write(const char *file, int val)
 {
    char buf[80];
@@ -13,10 +13,10 @@
    close(fd);
 }
 
-static int
+int
 file_read(const char *file)
 {
-   char buf[80];
+   char buf[80], *p;
    int fd, len;
    
    fd = open(file, O_RDONLY);
@@ -29,6 +29,8 @@
      }
    buf[len] = 0;
    close(fd);
+   p = strchr(buf, '\n');
+   if (p) *p = 0;
    return atoi(buf);
 }
 
@@ -87,9 +89,9 @@
    int prev_brightness;
 
    prev_brightness = brightness_get();
+   if (prev_brightness >= 0) brightness_set(0);
    screen_off();
    
-//   usleep(500);
    system("apm -s");
    
    // we resumed - find out why
@@ -97,10 +99,8 @@
    
    if (manual_resume)
      {
-//	usleep(500);
 	screen_on();
-	if (prev_brightness >= 0)
-	  brightness_set(prev_brightness);
+	if (prev_brightness >= 0) brightness_set(prev_brightness);
      }
 }