Changeset 345

Timestamp:

03/25/08 08:03:49 (5 years ago)

Author:

cail

Message:

reworking feather (touch wheel on ixus) to work universally via task suspend.
requires taskSuspend, taskResume, taskNameToId

Location:

trunk

Files:

• include/camera.h (modified) (2 diffs)
• platform/ixus65_sd630/kbd.c (modified) (4 diffs)
• platform/ixus65_sd630/sub/100a/stubs_entry_2.S (modified) (1 diff)
• platform/ixus65_sd630/sub/100a/stubs_min.S (modified) (1 diff)

trunk/include/camera.h

@@ -31 +31 @@
     #undef  CAM_SHOW_OSD_IN_SHOOT_MENU      // On some cameras Canon shoot menu has additional functionality and useful in this case to see CHDK OSD in this mode  
     #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO  1 // Camera can unlock optical zoom in video (if it is locked)
+    #undef  CAM_FEATURE_FEATHER             // Cameras with "feather" or touch wheel.
 
     #undef  CAM_CONSOLE_LOG_ENABLED         // Development: internal camera stdout -> A/stdout.txt
+
 
 //----------------------------------------------------------
@@ -265 +267 @@
     #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
     #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
+    #define CAM_FEATURE_FEATHER         1
 
     #define CAM_CONSOLE_LOG_ENABLED     1

trunk/platform/ixus65_sd630/kbd.c

@@ -8 +8 @@
 #define NEW_SS (0x2000)
 #define SD_READONLY_FLAG (0x20000)
-
-#define FEATURE_FEATHER 1
 
 typedef struct {
@@ -96 +94 @@
 }
 
-#if FEATURE_FEATHER
-extern int touch_keys_angle;
-extern int * touch_keys_sema;
-int touch_keys_sema_stored;
+#if CAM_FEATURE_FEATHER
+//extern int touch_keys_angle;
 #endif
 
@@ -116 +112 @@
     kbd_new_state[1] = physw_status[1];
     kbd_new_state[2] = physw_status[2];
+
+    static int taskFeatherID = 0;
+
+    if (taskFeatherID == 0) {
+        taskFeatherID = taskNameToId("tFeather");
+        printf("taskFeatherID:%x\n", taskFeatherID);
+    }
+
+
 
 /*
@@ -151 +156 @@
     if (kbd_process() == 0){
         // leave it ...
-#if FEATURE_FEATHER
-        if (*touch_keys_sema == 0) {
-            *touch_keys_sema = touch_keys_sema_stored;
-        }
+#if CAM_FEATURE_FEATHER
+        taskResume(taskFeatherID);
 #endif
     } else {
         // Drop platform keys to none, and simulate ordered key presses
         physw_status[2] = (physw_status[2] & (~KEY_MASK)) | (kbd_mod_state & KEY_MASK);
-#if FEATURE_FEATHER
-        if (*touch_keys_sema != 0) {
-            touch_keys_sema_stored = *touch_keys_sema;
-            *touch_keys_sema = 0;
-        }
+#if CAM_FEATURE_FEATHER
+        taskSuspend(taskFeatherID);
+
         // We still need this sema when simulating key presses
         if (kbd_mod_state != KEY_MASK) {
-            *touch_keys_sema = touch_keys_sema_stored;
-        }
+            taskResume(taskFeatherID);
+        }
+
 #endif
     }

trunk/platform/ixus65_sd630/sub/100a/stubs_entry_2.S

@@ -24 +24 @@
 
 
-NHSTUB(taskName, 0xFFB22A50)
-NHSTUB(taskIdListGet, 0xFFB22B58)
-
+NSTUB(taskName, 0xFFB22A50)
+NSTUB(taskIdListGet, 0xFFB22B58)
+NSTUB(taskResume, 0xFFB22E34)
+NSTUB(taskSuspend, 0xFFB22C60)
+NSTUB(taskNameToId, 0xFFB22A74)
 
 // These two are indistinguishable!!!!

trunk/platform/ixus65_sd630/sub/100a/stubs_min.S

@@ -20 +20 @@
 // Could be retrieved from 'PhySW' Task function
 DEF(touch_keys_angle, 0x0000E8C8)
-// Semaphore address to disable Feather processing
-DEF(touch_keys_sema, 0x0000E874)
-
-
 
 DEF(zoom_busy, 0x79E20)