Changeset 1564 for branches/release-1_0

Timestamp:

01/16/12 02:33:38 (16 months ago)

Author:

philmoz

Message:

Fix 'screen_opened' logic for G12, SX30 and SX40 - fixes the 'flashlight' option (sets screen to all white when the LCD is opened and swivelled to face forward).

Location:

branches/release-1_0/platform

Files:

• g12/main.c (modified) (1 diff)
• sx30/main.c (modified) (1 diff)
• sx40hs/main.c (modified) (1 diff)

branches/release-1_0/platform/g12/main.c

@@ -29 +29 @@
 
 int screen_opened(void) {
-        return !(physw_status[0] & 0x80000000);
+        return (physw_status[0] & 0x80000000);
 }
 

branches/release-1_0/platform/sx30/main.c

@@ -29 +29 @@
 
 int screen_opened(void) {
-//      mode |= (physw_status[1] & 0x01000000)?0:MODE_SCREEN_OPENED;
-        return !(physw_status[1] & 0x02000000);
+        return (physw_status[1] & 0x02000000);
 }
 
 int screen_rotated(void) {
-//      mode |= (physw_status[1] & 0x00080000)?0:MODE_SCREEN_ROTATED;
         return !(physw_status[1] & 0x00800000);
 }

branches/release-1_0/platform/sx40hs/main.c

@@ -29 +29 @@
 
 int screen_opened(void) {
-        return !(physw_status[2] & 0x00000400);
+        return (physw_status[2] & 0x00000400);
 }