Changeset 1420

Timestamp:

11/21/11 08:13:36 (18 months ago)

Author:

philmoz

Message:

Update for IXUS 310 HS:

• add missing 'wait_until_remote_button_is_released' and 'capt_seq_hook_set_nr' calls
• comment out debug_led calls

Location:

trunk/platform/ixus310_elph500hs

Files:

• kbd.c (modified) (3 diffs)
• sub/100a/capt_seq.c (modified) (1 diff)
• sub/101a/capt_seq.c (modified) (1 diff)

trunk/platform/ixus310_elph500hs/kbd.c

@@ -533 +533 @@
 
 asm volatile ("STMFD SP!, {R0-R11,LR}\n"); // store R0-R11 and LR in stack
-debug_led(1);
+//debug_led(1);
 tick = get_tick_count();
 tick2 = tick;
@@ -566 +566 @@
                                                 }
                                         else{
-                                                if((int)get_tick_count()-tick2>1000) {debug_led(0);}
+                                                if((int)get_tick_count()-tick2>1000) {/*debug_led(0);*/}
                                                 }
                                         }
@@ -637 +637 @@
   }
 
-debug_led(0);
+//debug_led(0);
 asm volatile ("LDMFD SP!, {R0-R11,LR}\n"); // restore R0-R11 and LR from stack
 }

trunk/platform/ixus310_elph500hs/sub/100a/capt_seq.c

@@ -102 +102 @@
 // jump table entry 1
 "loc_FF075010: \n"
+
+"       BL      wait_until_remote_button_is_released\n" // +++
+"       BL      capt_seq_hook_set_nr\n"                         // +++
+
 "               LDR             R8, [R0,#0xC] \n"
 "       MOV     R0, R8 \n"
-
 "       BL      sub_FF184DA8 \n"
 

trunk/platform/ixus310_elph500hs/sub/101a/capt_seq.c

@@ -102 +102 @@
 // jump table entry 1
 "loc_FF075010: \n"
+
+"       BL      wait_until_remote_button_is_released\n" // +++
+"       BL      capt_seq_hook_set_nr\n"                         // +++
+
 "               LDR             R8, [R0,#0xC] \n"
 "       MOV     R0, R8 \n"
-
 "       BL      sub_FF184DA8 \n"