r3351 - trunk/src/target/OM-2007.2/daemons/neod/src

mickey at sita.openmoko.org mickey at sita.openmoko.org
Sun Nov 4 19:05:14 CET 2007


Author: mickey
Date: 2007-11-04 19:05:13 +0100 (Sun, 04 Nov 2007)
New Revision: 3351

Modified:
   trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: only check PMU event status input node on startup


Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c	2007-11-04 17:46:06 UTC (rev 3350)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c	2007-11-04 18:05:13 UTC (rev 3351)
@@ -366,12 +366,12 @@
                 {
                     g_debug( "charger IN" );
                     neod_buttonactions_sound_play( "touchscreen" );
-                    g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freesmartphone.powermanagement.ChargerConnected", NULL );
+                    g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freedesktop.powermanagement.ChargerConnected", NULL );
                 }
                 else if ( event.value == 0 ) /* released */
                 {
                     g_debug( "charger OUT" );
-                    g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freesmartphone.powermanagement.ChargerDisconnected", NULL );
+                    g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freedesktop.powermanagement.ChargerDisconnected", NULL );
                 }
                 neod_buttonactions_powersave_reset();
                 if ( power_state != NORMAL )
@@ -911,6 +911,9 @@
 
         g_debug( "input node %d corresponds to %s", i, name );
 
+        if ( strcmp( name, "FIC Neo1973 PMU events" ) != 0 )
+            continue;
+
         BIT_MASK( keys, KEY_MAX );
         if( ioctl( input_fd[i].fd, EVIOCGKEY(sizeof(keys)), keys ) < 0)
         {
@@ -921,12 +924,12 @@
         if ( BIT_TEST( keys, CHARGER_INSERTION_BUTTON ) )
         {
             g_debug( "charger already inserted" );
-            g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freesmartphone.powermanagement.ChargerConnected", NULL );
+            g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freedesktop.powermanagement.ChargerConnected", NULL );
         }
         else
         {
             g_debug( "charger not yet inserted" );
-            g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freesmartphone.powermanagement.ChargerDisconnected", NULL );
+            g_spawn_command_line_async( "dbus-send /org/freedesktop/PowerManagement org.freedesktop.powermanagement.ChargerDisconnected", NULL );
         }
     }
 





More information about the commitlog mailing list