Changeset 917

Timestamp:

08/01/10 08:21:22 (3 years ago)

Author:

fe50

Message:

• added adjustable <Alt> button for A590, by Rorschach, ​http://chdk.setepontos.com/index.php/topic,3025.msg52621.html#msg52621 , ​http://chdk.kernreaktor.org/mantis/view.php?id=344 <Alt> key can be set to the DISPLAY or PRINT button from the "Miscellaneous stuff" / "<ALT> mode button" menu

Location:

trunk

Files:

• core/gui.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• platform/a590/kbd.c (modified) (5 diffs)

trunk/core/gui.c

@@ -1447 +1447 @@
     static const char* names[]={ "Shrtcut", "Flash", "Video"};
     static const int keys[]={ KEY_PRINT, KEY_FLASH, KEY_VIDEO };
-#elif defined(CAMERA_a570)
+#elif defined(CAMERA_a570) || defined(CAMERA_a590)
     static const char* names[]={ "Print", "Display"};
     static const int keys[] = {KEY_PRINT, KEY_DISPLAY};

trunk/include/camera.h

@@ -534 +534 @@
 
 #elif defined (CAMERA_a590)
+#define CAM_ADJUSTABLE_ALT_BUTTON   1
 #define CAM_PROPSET                 2
 #define CAM_DRYOS                   1

trunk/platform/a590/kbd.c

@@ -241 +241 @@
         physw_status[1] = kbd_new_state[1];
         physw_status[2] = kbd_new_state[2];
+        physw_status[1] |= alt_mode_key_mask;
     } else {
         // override keys
@@ -341 +342 @@
 long kbd_get_pressed_key()
 {
-    int i;
-    for (i=0;keymap[i].hackkey;i++){
+        int i;
+        for (i=0;keymap[i].hackkey;i++){
         if ((kbd_new_state[keymap[i].grp] & keymap[i].canonkey) == 0){
-            return keymap[i].hackkey;
-        }
-    }
-    return 0;
+                return keymap[i].hackkey;
+        }
+        }
+        return 0;
 }
 
 long kbd_get_clicked_key()
 {
-    int i;
-    for (i=0;keymap[i].hackkey;i++){
+        int i;
+        for (i=0;keymap[i].hackkey;i++){
         if (((kbd_prev_state[keymap[i].grp] & keymap[i].canonkey) != 0) &&
-            ((kbd_new_state[keymap[i].grp] & keymap[i].canonkey) == 0)){
-            return keymap[i].hackkey;
-        }
-    }
-    return 0;
+                (kbd_new_state[keymap[i].grp] & keymap[i].canonkey) == 0)){
+                return keymap[i].hackkey;
+                }
+        }
+        return 0;
 }
 
@@ -391 +392 @@
         }
     }
-        
-        
 }
 
@@ -434 +433 @@
 
 static KeyMap keymap[] = {
-    /* tiny bug: key order matters. see kbd_get_pressed_key()
-     * for example
-     */
-        { 2, KEY_UP             , 0x00000010 }, 
+        /* tiny bug: key order matters. see kbd_get_pressed_key()
+        * for example
+        */
+        { 2, KEY_UP                     , 0x00000010 }, 
         { 2, KEY_DOWN           , 0x00000020 }, 
         { 2, KEY_LEFT           , 0x00000080 }, 
         { 2, KEY_RIGHT          , 0x00000040 }, 
         { 2, KEY_SET            , 0x00000100 }, 
-        { 1, KEY_SHOOT_FULL     , 0xC0000000 },
+        { 1, KEY_SHOOT_FULL     , 0xC0000000 }, 
         { 1, KEY_SHOOT_HALF     , 0x40000000 }, 
         { 2, KEY_ZOOM_IN        , 0x00000004 }, 
@@ -451 +450 @@
         { 1, KEY_ERASE          , 0x00800000 }, 
         { 0, 0, 0 }
-
 };
 
 
-
 void kbd_fetch_data(long *dst)
 {
-    volatile long *mmio0 = (void*)0xc0220200;
-    volatile long *mmio1 = (void*)0xc0220204;
-    volatile long *mmio2 = (void*)0xc0220208;
-
-    dst[0] = *mmio0;
-    dst[1] = *mmio1;
-    dst[2] = *mmio2 & 0xffff;
-}
+        volatile long *mmio0 = (void*)0xc0220200;
+        volatile long *mmio1 = (void*)0xc0220204;
+        volatile long *mmio2 = (void*)0xc0220208;
+
+        dst[0] = *mmio0;
+        dst[1] = *mmio1;
+        dst[2] = *mmio2 & 0xffff;
+}
+
+void kbd_set_alt_mode_key_mask(long key)
+{
+        int i;
+        for (i=0; keymap[i].hackkey; ++i) {
+                if (keymap[i].hackkey == key) {
+                        alt_mode_key_mask = keymap[i].canonkey;
+                        return;
+                }
+        }
+}