Changeset 453

Timestamp:

07/23/08 00:10:40 (2 years ago)

Author:

phyrephox

Message:

* added video_overrides, SDHC & touchwheel "patch" from mil22 from here: http://chdk.setepontos.com/index.php/topic,1962.msg18265.html#msg18265

-> needs a bit ironing out (supposedly bitrate setting is fubared)

+ added fast movie switches:
it is now possible to quickly change video quality during recording via the up/down buttons
also you can pause a movie by pressing left, unpause it by pressing right
for this feature a new option has been added to the video override menu.

drawbacks: there is no visual feedback yet on quality change/pause/unpause functions
+ new ubasic command: set_movie_status. If you set it to 1, movie will be paused. 2 will unpause movie and 3 will stop movie.

needs proper testing, proper visual representation

thanks to Hacki & ewavr

Files:

• branches/juciphox/core/conf.c (modified) (1 diff)
• branches/juciphox/core/gui.c (modified) (1 diff)
• branches/juciphox/core/gui_lang.c (modified) (1 diff)
• branches/juciphox/core/gui_lang.h (modified) (1 diff)
• branches/juciphox/core/kbd.c (modified) (4 diffs)
• branches/juciphox/include/camera.h (modified) (1 diff)
• branches/juciphox/include/conf.h (modified) (1 diff)
• branches/juciphox/include/platform.h (modified) (1 diff)
• branches/juciphox/lang/english.lng (modified) (1 diff)
• branches/juciphox/lang/german.lng (modified) (1 diff)
• branches/juciphox/lib/ubasic/tokenizer.c (modified) (1 diff)
• branches/juciphox/lib/ubasic/tokenizer.h (modified) (1 diff)
• branches/juciphox/lib/ubasic/ubasic.c (modified) (2 diffs)
• branches/juciphox/platform/ixus860_sd870/main.c (modified) (1 diff)
• branches/juciphox/platform/ixus860_sd870/sub/100c/Makefile (modified) (1 diff)
• branches/juciphox/platform/ixus860_sd870/sub/100c/boot.c (modified) (4 diffs)
• branches/juciphox/platform/ixus860_sd870/sub/100c/movie_rec.c (added)
• branches/juciphox/platform/ixus860_sd870/sub/100c/stubs_auto.S (modified) (7 diffs)
• branches/juciphox/platform/ixus860_sd870/sub/100c/stubs_entry_2.S (modified) (3 diffs)
• branches/juciphox/platform/ixus860_sd870/sub/100c/touch_wheel.c (added)

branches/juciphox/core/conf.c

@@ -339 +339 @@
-                CONF_INFO(200, conf.raw_exceptions_warn,      CONF_DEF_VALUE, i:1, NULL),
-                CONF_INFO(201, conf.menu_select_first_entry,      CONF_DEF_VALUE, i:1, NULL),
+                CONF_INFO(202, conf.fast_movie_control,           CONF_DEF_VALUE, i:1, NULL),
-
-};

branches/juciphox/core/gui.c

@@ -403 +403 @@
-      {0x60,LANG_MENU_VIDEO_QUALITY,           MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.video_quality, MENU_MINMAX(1, 99)}, 
-      {0x5c,LANG_MENU_CLEAR_VIDEO_VALUES,    MENUITEM_BOOL,    (int*)&conf.clear_video},
+      {0x5c,LANG_MENU_FAST_SWITCH_VIDEO,   MENUITEM_BOOL,  &conf.fast_movie_control},
-#if CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
-      {0x5c,LANG_MENU_OPTICAL_ZOOM_IN_VIDEO,   MENUITEM_BOOL,  &conf.unlock_optical_zoom_for_video},                                                    

branches/juciphox/core/gui_lang.c

@@ -513 +513 @@
-"393 \"script\"\n"
-"394 \"scriptless\"\n"
+"395 \"Fast Video Control?\"\n"
-;
-

branches/juciphox/core/gui_lang.h

@@ -502 +502 @@
-#define LANG_MENU_SCRIPTLESS   394
-
+#define LANG_MENU_FAST_SWITCH_VIDEO 395
+
-//-------------------------------------------------------------------
-
-4
+5
-
-//-------------------------------------------------------------------

branches/juciphox/core/kbd.c

@@ -1145 +1145 @@
-                    return 1;
-                }
-conf.fast_ev && kbd_use_up_down_as_fast_ev
+(conf.fast_ev || conf.fast_movie_control) && kbd_use_up_down_left_right_as_fast_switch
-                    return 1;
-                }
@@ -1192 +1192 @@
-}
-
-
+
+
+
+
+
+
-    static long key_pressed = 0;
-if (!(kbd_is_key_pressed(KEY_UP)) && !(kbd_is_key_pressed(KEY_DOWN))) key_pressed = 0;
@@ -1205 +1210 @@
-            shooting_set_prop(207,shooting_get_prop(207)+(conf.fast_ev_step+1)*16);
-#endif
+            key_pressed = KEY_UP;
+            return 1;
+        }
+
+    } 
+    if (kbd_is_key_pressed(KEY_UP) && (mode_get()&MODE_MASK) == MODE_REC && movie_status == 4 && (canon_shoot_menu_active==0)) {
+
+        if (conf.fast_movie_control && key_pressed == 0) {
+                        
+                        
+                            conf.video_bitrate+=1;
+    if (conf.video_bitrate<0)
+        conf.video_bitrate=sizeof(modes)/sizeof(modes[0])-1;
+    else if (conf.video_bitrate>=(sizeof(modes)/sizeof(modes[0])))
+        conf.video_bitrate=sizeof(modes)/sizeof(modes[0])-1;
+    shooting_video_bitrate_change(conf.video_bitrate);
+                        
+                        
-            key_pressed = KEY_UP;
-            return 1;
@@ -1227 +1250 @@
-
-    } 
+    
+       if (kbd_is_key_pressed(KEY_DOWN) && (mode_get()&MODE_MASK) == MODE_REC && movie_status == 4 && (canon_shoot_menu_active==0)) {
+
+            
+       if (conf.fast_movie_control && key_pressed == 0) {
+                        
+                        
+    conf.video_bitrate+=-1;
+    if (conf.video_bitrate<0)
+        conf.video_bitrate=0;
+    else if (conf.video_bitrate>=(sizeof(modes)/sizeof(modes[0])))
+        conf.video_bitrate=0;
+
+    shooting_video_bitrate_change(conf.video_bitrate);
+
+    return modes[conf.video_bitrate];
+                        
+                        
+            key_pressed = KEY_DOWN;
+            return 1;
+        }
+
+    } 
+    
+       if (kbd_is_key_pressed(KEY_LEFT) && (mode_get()&MODE_MASK) == MODE_REC && movie_status == 4 && (canon_shoot_menu_active==0)) {
+
+            
+       if (conf.fast_movie_control && key_pressed == 0) {
+                        
+movie_status = 1;
+                        
+                        
+            key_pressed = KEY_LEFT;
+            return 1;
+        }
+
+    } 
+    
+       if (kbd_is_key_pressed(KEY_RIGHT) && (mode_get()&MODE_MASK) == MODE_REC && movie_status == 1 && (canon_shoot_menu_active==0)) {
+
+            
+       if (conf.fast_movie_control && key_pressed == 0) {
+                        
+movie_status = 4;
+                        
+                        
+            key_pressed = KEY_RIGHT;
+            return 1;
+        }
+
+    } 
+    
-    return 0;
-}

branches/juciphox/include/camera.h

@@ -461 +461 @@
-    #undef  CAM_HAS_USER_TV_MODES
-    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
-
+
+
-    
-//----------------------------------------------------------

branches/juciphox/include/conf.h

@@ -134 +134 @@
-    int fast_ev;
-    int fast_ev_step;
+    int fast_movie_control;
-    int splash_show;
-

branches/juciphox/include/platform.h

@@ -295 +295 @@
-void kbd_reset_autoclicked_key();
-long kbd_use_zoom_as_mf();
-as_fast_ev
+left_right_as_fast_switch
-void kbd_set_alt_mode_key_mask(long key);
-int get_usb_power(int edge);

branches/juciphox/lang/english.lng

@@ -531 +531 @@
-393 "script"
-394 "scriptless"
+395 "Fast Video Control?"

branches/juciphox/lang/german.lng

@@ -525 +525 @@
-391 "Warnung bei Ausnahme?"
-392 "Erste Zeile selektiert?"
+393 "script"
+394 "scriptless"
+395 "Schnelle Video Kontrolle?"

branches/juciphox/lib/ubasic/tokenizer.c

@@ -144 +144 @@
-  {"set_iso",                 TOKENIZER_SET_ISO_MODE}, //FOR COMPATIBILITY
-  {"set_led",                 TOKENIZER_SET_LED},
+  {"set_movie_status",        TOKENIZER_SET_MOVIE_STATUS},  
-  {"set_nd_filter",           TOKENIZER_SET_ND_FILTER},
-  {"set_prop",                TOKENIZER_SET_PROP},

branches/juciphox/lib/ubasic/tokenizer.h

@@ -172 +172 @@
-  TOKENIZER_SHOT_HISTO_ENABLE,
-  TOKENIZER_GET_HISTO_RANGE,
+  TOKENIZER_SET_MOVIE_STATUS,
-  
-} ubasic_token;

branches/juciphox/lib/ubasic/ubasic.c

@@ -1419 +1419 @@
-
-static void set_ev_statement()
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    accept_cr();
-}
@@ -1942 +1965 @@
-        set_ev_statement();
-   break;
+   
+    case TOKENIZER_SET_MOVIE_STATUS:
+        set_movie_status_statement();
+   break;
-
-  case TOKENIZER_WAIT_CLICK:

branches/juciphox/platform/ixus860_sd870/main.c

@@ -107 +107 @@
-    return 4100;
-}
-
-void change_video_tables(int a, int b){
-
-}

branches/juciphox/platform/ixus860_sd870/sub/100c/Makefile

@@ -1 +1 @@
-topdir=../../../../
-
-
-
+ movie_rec.o touch_wheel.o
+ movie_rec.c touch_wheel.c
-
-include $(topdir)/platform/makefile_sub.inc

branches/juciphox/platform/ixus860_sd870/sub/100c/boot.c

@@ -238 +238 @@
-}; //#fe
-
+// Extracted method: task_Startup (FF81DC78-FF81DCD0)
-void __attribute__((naked,noinline)) task_Startup_my() { //#fs 
-        asm volatile (
-       
-sub_FF8151CC    \n"       //taskcreate_ClockSave
+
+_taskcreate_ClockSave    \n"
-                "BL     sub_FF823FA8    \n"
-                "BL     sub_FF820E84    \n"
@@ -251 +252 @@
-        CreateTask_spytask();
-
+                //*((int*)0x9C10) = 1; // this turns on wheel debug mode
+                //*((int*)0x9C18) = 1; // this completely disables the wheel and buttons
+
-        asm volatile (
-                "BL     sub_FF82BE24    \n"
-   \n"
+_my        \n"  // ---------> touch_wheel.c
-                "BL     sub_FF828B4C    \n"
-                "BL     sub_FF82BE28    \n"
@@ -266 +270 @@
-                //"BL   nullsub_2       \n"
-                "BL     sub_FF82213C    \n"
-sub_FF82B828   \n"       //taskcreate_Bye
+_taskcreate_Bye        \n"
-                "BL     sub_FF8228D8    \n"
-sub_FF822048    \n"       //taskcreate_TempCheck
-   \n"       // !!!divert for SDHC-bootdisk-support
+_taskcreate_TempCheck    \n"
+_my        \n"       //   ---------------> for SDHC and movie rec
-                "BL     sub_FF822004    \n"
-
@@ -393 +397 @@
-// SDHC-Boot-Support
-// -----------------
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        asm volatile (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        );
-}; //#fe
-
-sub_FFC1C294
+task_InitFileModules
-        asm volatile (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        );
-}; //#fe
-
-C5F474
+869D2C
-        asm volatile (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        );
-}; //#fe
-
-C5F410
+84D4A8
-        asm volatile (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        );
-}; //#fe
-
-C5E6C0
+84D2E4
-        asm volatile (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        );
-}; //#fe
-
-C5E06C_my() { //#fs  uAC_B
+84D17C_my() { //#fs  ; Partition table parse takes place here. => SDHC-b
-        asm volatile (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}; //#fe
-
-void __attribute__((naked,noinline)) sub_FFC5F7A4_my() { //#fs  CreateTask_InitFileModules
-        asm volatile (
-                "LDR     R0, =0x5AB4\n"
-                "STMFD   SP!, {R3,LR}\n"
-                "LDR     R1, [R0,#4]\n"
-                "CMP     R1, #0\n"
-                "BNE     locret_FFC5F7DC\n"
-                "MOV     R1, #1\n"
-                "STR     R1, [R0,#4]\n"
-                "MOV     R3, #0\n"
-                "STR     R3, [SP]\n"
-                "LDR     R3, =task_InitFileModules_my\n"        // continue for SDHC-boot (orig: FFC5F754)
-                "MOV     R1, #0x19\n"
-                "LDR     R0, =0xFFC5F908\n"     // aInitfilemodule ; "InitFileModules"
-                "MOV     R2, #0x1000\n"
-                "BL      sub_FFC0BBC0\n"         // CreateTask, 0xFFC0BBC0
-        "locret_FFC5F7DC:\n"
-                "LDMFD   SP!, {R12,PC}\n"
-        );
-}; //#fe
-
-void __attribute__((naked,noinline)) task_InitFileModules_my() { //#fs  
-        asm volatile (
-                "STMFD   SP!, {R4-R6,LR}\n"
-                "BL      sub_FFC5A4BC\n"
-                "LDR     R5, =0x5006\n"
-                "MOVS    R4, R0\n"
-                "MOVNE   R1, #0\n"
-                "MOVNE   R0, R5\n"
-                "BLNE    sub_FFC5B69C\n"
-                "BL      sub_FFC5A4E8_my\n"    // continue to SDHC-hook here!
-
-                "BL      core_spytask_can_start\n"      // CHDK: Set "it's-save-to-start"-Flag for spytask
-
-                "CMP     R4, #0\n"
-                "MOVEQ   R0, R5\n"
-                "LDMEQFD SP!, {R4-R6,LR}\n"
-                "MOVEQ   R1, #0\n"
-                "BEQ     sub_FFC5B69C\n"        // cameralog "LogicalEvent...", it's save to run this after spytask has started
-                "LDMFD   SP!, {R4-R6,PC}\n"
-        );
-}; //#fe
-
-void __attribute__((naked,noinline)) sub_FFC5A4E8_my() { //#fs  
-        asm volatile (
-                "STMFD   SP!, {R4,LR}\n"
-                "BL      sub_FFC3F0CC_my\n"    // continue to SDHC-hook here!
-                "LDR     R4, =0x58D0\n"
-                "LDR     R0, [R4,#4]\n"
-                "CMP     R0, #0\n"
-                "BNE     loc_FFC5A518\n"
-                "BL      sub_FFC674CC\n"
-                "BL      sub_FFCDCA24\n"
-                "BL      sub_FFC674CC\n"
-                "BL      sub_FFCE6504\n"
-                "BL      sub_FFC674DC\n"
-                "BL      sub_FFCDCAC4\n"
-                "loc_FFC5A518:\n"
-                "MOV     R0, #1\n"
-                "STR     R0, [R4]\n"
-                "LDMFD   SP!, {R4,PC}\n"
-        );
-}; //#fe
-
-void __attribute__((naked,noinline)) sub_FFC3F0CC_my() { //#fs  
-        asm volatile (
-                "STMFD   SP!, {R4-R6,LR}\n"
-                "MOV     R6, #0\n"
-                "MOV     R0, R6\n"
-                "BL      sub_FFC3EC9C\n"
-                "LDR     R4, =0x11800\n"
-                "MOV     R5, #0\n"
-                "LDR     R0, [R4,#0x38]\n"
-                "BL      sub_FFC3F664\n"
-                "CMP     R0, #0\n"
-                "LDREQ   R0, =0x2BA0\n"
-                "STREQ   R5, [R0,#0xC]\n"
-                "STREQ   R5, [R0,#0x10]\n"
-                "STREQ   R5, [R0,#0x14]\n"
-                "MOV     R0, R6\n"
-                "BL      sub_FFC3ECDC\n"        // uMounter (u=unknown, just to prevent misunderstandings)
-                "MOV     R0, R6\n"
-                "BL      sub_FFC3EF08_my\n"    // continue to SDHC-hook here!
-                "MOV     R5, R0\n"
-                "MOV     R0, R6\n"
-                "BL      sub_FFC3EF74\n"
-                "LDR     R1, [R4,#0x3C]\n"
-                "AND     R2, R5, R0\n"
-                "CMP     R1, #0\n"
-                "MOV     R0, #0\n"
-                "MOVEQ   R0, #0x80000001\n"
-                "BEQ     loc_FFC3F160\n"
-                "LDR     R3, [R4,#0x2C]\n"
-                "CMP     R3, #2\n"
-                "MOVEQ   R0, #4\n"
-                "CMP     R1, #5\n"
-                "ORRNE   R0, R0, #1\n"
-                "BICEQ   R0, R0, #1\n"
-                "CMP     R2, #0\n"
-                "BICEQ   R0, R0, #2\n"
-                "ORREQ   R0, R0, #0x80000000\n"
-                "BICNE   R0, R0, #0x80000000\n"
-                "ORRNE   R0, R0, #2\n"
-        "loc_FFC3F160:\n"
-                "STR     R0, [R4,#0x40]\n"
-                "LDMFD   SP!, {R4-R6,PC}\n"
-        );
-}; //#fe
-
-void __attribute__((naked,noinline)) sub_FFC3EF08_my() { //#fs  
-        asm volatile (
-                "STMFD   SP!, {R4-R6,LR}\n"
-                "LDR     R5, =0x2BA0\n"
-                "MOV     R6, R0\n"
-                "LDR     R0, [R5,#0x10]\n"
-                "CMP     R0, #0\n"
-                "MOVNE   R0, #1\n"
-                "LDMNEFD SP!, {R4-R6,PC}\n"
-                "MOV     R0, #0x17\n"
-                "MUL     R1, R0, R6\n"
-                "LDR     R0, =0x11800\n"
-                "ADD     R4, R0, R1,LSL#2\n"
-                "LDR     R0, [R4,#0x38]\n"
-                "MOV     R1, R6\n"
-                "BL      sub_FFC3EDA0_my\n"        //    continue to SDHC-hook here!
-                "CMP     R0, #0\n"
-                "LDMEQFD SP!, {R4-R6,PC}\n"
-                "LDR     R0, [R4,#0x38]\n"
-                "MOV     R1, R6\n"
-                "BL      sub_FFC3F77C\n"
-                "CMP     R0, #0\n"
-                "LDMEQFD SP!, {R4-R6,PC}\n"
-                "MOV     R0, R6\n"
-                "BL      sub_FFC3E8BC\n"
-                "CMP     R0, #0\n"
-                "MOVNE   R1, #1\n"
-                "STRNE   R1, [R5,#0x10]\n"
-                "LDMFD   SP!, {R4-R6,PC}\n"
-        );
-}; //#fe
-
-void __attribute__((naked,noinline)) sub_FFC3EDA0_my() { //#fs  ; Partition table parse takes place here. => SDHC-boot
-        asm volatile (
-                "STMFD   SP!, {R4-R8,LR} \n"
-                "MOV     R8, R0\n"
-                "MOV     R0, #0x17\n"
-                "MUL     R1, R0, R1\n"
-                "LDR     R0, =0x11800\n"
-                "MOV     R6, #0\n"
-                "ADD     R7, R0, R1,LSL#2\n"
-                "LDR     R0, [R7,#0x3C]\n"
-                "MOV     R5, #0\n"
-                "CMP     R0, #6\n"
-                "ADDLS   PC, PC, R0,LSL#2\n"
-                "B       loc_FFC3EEEC\n"
-        "loc_FFC3EDD0:\n"
-                "B       loc_FFC3EE04\n"
-        "loc_FFC3EDD4:\n"
-                "B       loc_FFC3EDEC\n"
-        "loc_FFC3EDD8:\n"
-                "B       loc_FFC3EDEC\n"
-        "loc_FFC3EDDC:\n"
-                "B       loc_FFC3EDEC\n"
-        "loc_FFC3EDE0:\n"
-                "B       loc_FFC3EDEC\n"
-        "loc_FFC3EDE4:\n"
-                "B       loc_FFC3EEE4\n"
-        "loc_FFC3EDE8:\n"
-                "B       loc_FFC3EDEC\n"
-        "loc_FFC3EDEC:\n"
-                "MOV     R2, #0\n"
-                "MOV     R1, #0x200\n"
-                "MOV     R0, #3\n"
-                "BL      sub_FFC56994\n"
-                "MOVS    R4, R0\n"
-                "BNE     loc_FFC3EE0C\n"
-        "loc_FFC3EE04:\n"
-                "MOV     R0, #0\n"
-                "LDMFD   SP!, {R4-R8,PC}\n"
-        "loc_FFC3EE0C:\n"
-                "LDR     R12, [R7,#0x4C]\n"
-                "MOV     R3, R4\n"
-                "MOV     R2, #1\n"
-                "MOV     R1, #0\n"
-                "MOV     R0, R8\n"
-
-                //"BLX     R12\n"       // !! Workaround !!
-                "MOV     LR, PC\n"      // gcc won't compile "BLX R12" nor "BL R12".
-                "MOV     PC, R12\n"     // workaround: make your own "BL" and hope we don't need the change to thumb-mode
-
-                "CMP     R0, #1\n"
-                "BNE     loc_FFC3EE38\n"
-                "MOV     R0, #3\n"
-                "BL      sub_FFC56AD4\n"
-                "B       loc_FFC3EE04\n"
-
-        "loc_FFC3EE38:\n"
-                "MOV     R0, R8\n"
-                "BL      sub_FFCF554C\n"        // Add FAT32 autodetect-code after this line\n"
-
-                // Start of DataGhost's FAT32 autodetection code
-                // Policy: If there is a partition which has type W95 FAT32, use the first one of those for image storage
-                // According to the code below, we can use R1, R2, R3 and R12.
-                // LR wasn't really used anywhere but for storing a part of the partition signature. This is the only thing
-                // that won't work with an offset, but since we can load from LR+offset into LR, we can use this to do that :)
-                "MOV     R12, R4\n"                    // Copy the MBR start address so we have something to work with
-                "MOV     LR, R4\n"                     // Save old offset for MBR signature
-                "MOV     R1, #1\n"                     // Note the current partition number
-                "B       dg_sd_fat32_enter\n"          // We actually need to check the first partition as well, no increments yet!
-           "dg_sd_fat32:\n"
-                "CMP     R1, #4\n"                     // Did we already see the 4th partition?
-                "BEQ     dg_sd_fat32_end\n"            // Yes, break. We didn't find anything, so don't change anything.
-                "ADD     R12, R12, #0x10\n"            // Second partition
-                "ADD     R1, R1, #1\n"                 // Second partition for the loop
-           "dg_sd_fat32_enter:\n"
-                "LDRB    R2, [R12, #0x1BE]\n"          // Partition status
-                "LDRB    R3, [R12, #0x1C2]\n"          // Partition type (FAT32 = 0xB)
-                "CMP     R3, #0xB\n"                   // Is this a FAT32 partition?
-                "BNE     dg_sd_fat32\n"                // No, it isn't.
-                "CMP     R2, #0x00\n"                  // It is, check the validity of the partition type
-                "CMPNE   R2, #0x80\n"
-                "BNE     dg_sd_fat32\n"                // Invalid, go to next partition
-                                                       // This partition is valid, it's the first one, bingo!
-                "MOV     R4, R12\n"                    // Move the new MBR offset for the partition detection.
-                
-           "dg_sd_fat32_end:\n"
-                // End of DataGhost's FAT32 autodetection code                
-      
-                "LDRB    R1, [R4,#0x1C9]\n"     // Continue with firmware
-                "LDRB    R3, [R4,#0x1C8]\n"
-                "LDRB    R12, [R4,#0x1CC]\n"
-                "MOV     R1, R1,LSL#24\n"
-                "ORR     R1, R1, R3,LSL#16\n"
-                "LDRB    R3, [R4,#0x1C7]\n"
-                "LDRB    R2, [R4,#0x1BE]\n"
-               //"LDRB    LR, [R4,#0x1FF]\n"            // replaced, see below
-                "ORR     R1, R1, R3,LSL#8\n"
-                "LDRB    R3, [R4,#0x1C6]\n"
-                "CMP     R2, #0\n"
-                "CMPNE   R2, #0x80\n"
-                "ORR     R1, R1, R3\n"
-                "LDRB    R3, [R4,#0x1CD]\n"
-                "MOV     R3, R3,LSL#24\n"
-                "ORR     R3, R3, R12,LSL#16\n"
-                "LDRB    R12, [R4,#0x1CB]\n"
-                "ORR     R3, R3, R12,LSL#8\n"
-                "LDRB    R12, [R4,#0x1CA]\n"
-                "ORR     R3, R3, R12\n"
-               //"LDRB    R12, [R4,#0x1FE]\n"           // replaced, see below
-
-                "LDRB    R12, [LR,#0x1FE]\n"            // New! First MBR signature byte (0x55)
-                "LDRB    LR, [LR,#0x1FF]\n"             //      Last MBR signature byte (0xAA)
-
-                "MOV     R4, #0\n"
-                "BNE     loc_FFC3EEC0\n"
-                "CMP     R0, R1\n"
-                "BCC     loc_FFC3EEC0\n"
-                "ADD     R2, R1, R3\n"
-                "CMP     R2, R0\n"
-                "CMPLS   R12, #0x55\n"
-                "CMPEQ   LR, #0xAA\n"
-                "MOVEQ   R6, R1\n"
-                "MOVEQ   R5, R3\n"
-                "MOVEQ   R4, #1\n"
-        "loc_FFC3EEC0:\n"
-                "MOV     R0, #3\n"
-                "BL      sub_FFC56AD4\n"
-                "CMP     R4, #0\n"
-                "BNE     loc_FFC3EEF8\n"
-                "MOV     R6, #0\n"
-                "MOV     R0, R8\n"
-                "BL      sub_FFCF554C\n"
-                "MOV     R5, R0\n"
-                "B       loc_FFC3EEF8\n"
-        "loc_FFC3EEE4:\n"
-                "MOV     R5, #0x40\n"
-                "B       loc_FFC3EEF8\n"
-        "loc_FFC3EEEC:\n"
-                "LDR     R1, =0x365\n"
-                "LDR     R0, =0xFFC3ED94\n"             // aMounter_c  ; "Mounter.c"
-                "BL      sub_FFC0C098\n"                // Assert
-        "loc_FFC3EEF8:\n"
-                "STR     R6, [R7,#0x44]!\n"
-                "MOV     R0, #1\n"
-                "STR     R5, [R7,#4]\n"
-                "LDMFD   SP!, {R4-R8,PC}\n"
-        );
-}; //#fe
-*/
-

branches/juciphox/platform/ixus860_sd870/sub/100c/stubs_auto.S

@@ -14 +14 @@
-STUB(FF814EB0)
-STUB(FF815088)
-STUB(FF8151CC)
-STUB(FF819598)
-STUB(FF819A10)
@@ -23 +22 @@
-STUB(FF81BEE8)
-STUB(FF81BF0C)
+STUB(FF81BF78)
+STUB(FF81BFD0)
-STUB(FF81C090)
-STUB(FF81DCD4)
-STUB(FF820E84)
+STUB(FF821F08)
-STUB(FF822004)
-STUB(FF822048)
-STUB(FF82213C)
+STUB(FF8224B4)
-STUB(FF8228D8)
-STUB(FF822DAC)
@@ -37 +39 @@
-STUB(FF825BA8)
-STUB(FF825C34)
+STUB(FF825C94)
+STUB(FF825CD0)
+STUB(FF825ED4)
+STUB(FF825F04)
+STUB(FF825F4C)
+STUB(FF8261C4)
+STUB(FF8261F8)
+STUB(FF82622C)
+STUB(FF82675C)
+STUB(FF826844)
+STUB(FF828094)
+STUB(FF828534)
+STUB(FF82856C)
+STUB(FF828A3C)
+STUB(FF828AB0)
-STUB(FF828B4C)
-STUB(FF828EAC)
@@ -42 +59 @@
-STUB(FF829130)
-STUB(FF829608)
+STUB(FF829624)
-STUB(FF8297FC)
-STUB(FF829850)
-STUB(FF82B828)
-STUB(FF82BA7C)
-STUB(FF82BB44)
-STUB(FF82BC5C)
+STUB(FF82BC90)
-STUB(FF82BCAC)
-STUB(FF82BE24)
-STUB(FF82BE28)
-STUB(FF82BE40)
+STUB(FF82BE70)
+STUB(FF82BE84)
+STUB(FF82BF28)
+STUB(FF82BF40)
+STUB(FF82BF50)
+STUB(FF82BFBC)
+STUB(FF82BFFC)
+STUB(FF82C01C)
+STUB(FF82C090)
+STUB(FF82C130)
+STUB(FF82C1B0)
+STUB(FF82C324)
-STUB(FF82C8E4)
+STUB(FF82C964)
+STUB(FF82C96C)
+STUB(FF82C974)
+STUB(FF82CA04)
+STUB(FF82CA3C)
+STUB(FF82CA40)
+STUB(FF82CA7C)
+STUB(FF82CA9C)
+STUB(FF82CAA0)
+STUB(FF82CAA8)
+STUB(FF82CADC)
+STUB(FF82CAF8)
+STUB(FF82CD9C)
+STUB(FF82CDE8)
+STUB(FF82CE18)
+STUB(FF831E08)
+STUB(FF8325CC)
+STUB(FF835568)
+STUB(FF837628)
+STUB(FF83A068)
+STUB(FF83F560)
+STUB(FF840AF8)
+STUB(FF841FF4)
+STUB(FF842230)
+STUB(FF842244)
+STUB(FF8422FC)
+STUB(FF842BAC)
+STUB(FF843B6C)
+STUB(FF843CF8)
+STUB(FF844124)
+STUB(FF8443D8)
+STUB(FF8459F8)
-STUB(FF846AC0)
+STUB(FF847600)
+STUB(FF847CBC)
+STUB(FF84CC98)
+STUB(FF84D078)
+STUB(FF84D0B8)
+STUB(FF84D17C)
+STUB(FF84D2E4)
+STUB(FF84D350)
+STUB(FF84D4A8)
+STUB(FF84DA40)
+STUB(FF84DB58)
+STUB(FF854428)
-STUB(FF856814)
+STUB(FF8572B4)
+STUB(FF857610)
+STUB(FF8577AC)
+STUB(FF857950)
+STUB(FF857AB8)
+STUB(FF857CB4)
+STUB(FF857FE8)
+STUB(FF858440)
+STUB(FF85846C)
+STUB(FF859588)
+STUB(FF8595B4)
+STUB(FF859634)
-STUB(FF859FE8)
-STUB(FF85A544)
+STUB(FF85AD20)
-STUB(FF85AFF4)
-STUB(FF85B1C4)
@@ -64 +151 @@
-STUB(FF85BF7C)
-STUB(FF85C054)
+STUB(FF85CDA4)
+STUB(FF85CDD4)
-STUB(FF85D270)
+STUB(FF85D2FC)
-STUB(FF85D7B8)
-STUB(FF85DE2C)
@@ -71 +161 @@
-STUB(FF85F14C)
-STUB(FF85F2F8)
+STUB(FF86376C)
+STUB(FF865128)
+STUB(FF865240)
+STUB(FF865744)
+STUB(FF8661D8)
+STUB(FF866318)
+STUB(FF867708)
+STUB(FF8684DC)
+STUB(FF86910C)
-STUB(FF869470)
-STUB(FF869600)
-STUB(FF869814)
+STUB(FF869920)
+STUB(FF8699CC)
+STUB(FF869D00)
+STUB(FF869D2C)
+STUB(FF86A1BC)
+STUB(FF86A26C)
+STUB(FF86A470)
+STUB(FF86AC20)
+STUB(FF86C590)
+STUB(FF86CAF0)
+STUB(FF86D4F8)
+STUB(FF86DBA8)
+STUB(FF86DC24)
+STUB(FF86DC48)
+STUB(FF86E2D0)
+STUB(FF86E350)
+STUB(FF86E38C)
+STUB(FF86E428)
+STUB(FF86E44C)
+STUB(FF86E480)
+STUB(FF86E4C4)
+STUB(FF86E5AC)
+STUB(FF86E5B8)
+STUB(FF86E5E4)
+STUB(FF86E64C)
+STUB(FF86E768)
+STUB(FF86EB38)
+STUB(FF86EBB4)
+STUB(FF86EBFC)
+STUB(FF86EC58)
+STUB(FF86ECAC)
+STUB(FF86ECF0)
+STUB(FF86ED10)
+STUB(FF86EDAC)
+STUB(FF86EE0C)
+STUB(FF86EFE4)
+STUB(FF86F224)
+STUB(FF86F498)
+STUB(FF86F5E8)
+STUB(FF86F6F0)
+STUB(FF86F89C)
+STUB(FF86F9F8)
+STUB(FF86FB00)
+STUB(FF86FE00)
+STUB(FF86FF90)
+STUB(FF86FFB4)
+STUB(FF86FFD8)
+STUB(FF86FFFC)
+STUB(FF870128)
+STUB(FF87015C)
+STUB(FF870178)
+STUB(FF870198)
+STUB(FF8701C8)
+STUB(FF8701E8)
+STUB(FF870204)
+STUB(FF870244)
+STUB(FF870284)
+STUB(FF8702AC)
+STUB(FF870378)
+STUB(FF8703BC)
+STUB(FF870400)
+STUB(FF870430)
+STUB(FF870468)
+STUB(FF870550)
+STUB(FF870694)
+STUB(FF870774)
+STUB(FF8708A0)
+STUB(FF8708E0)
+STUB(FF870958)
+STUB(FF8709BC)
+STUB(FF870B0C)
+STUB(FF870BF4)
+STUB(FF870C28)
+STUB(FF870DB0)
+STUB(FF870DE0)
+STUB(FF870E44)
+STUB(FF8710D4)
+STUB(FF8710FC)
+STUB(FF871144)
+STUB(FF871178)
+STUB(FF871630)
+STUB(FF871808)
+STUB(FF871908)
+STUB(FF871944)
+STUB(FF871A10)
+STUB(FF871A14)
+STUB(FF871A44)
+STUB(FF871A6C)
+STUB(FF871AB0)
+STUB(FF871AE8)
+STUB(FF871C90)
+STUB(FF871D48)
+STUB(FF872190)
+STUB(FF872284)
+STUB(FF872390)
+STUB(FF8723D0)
+STUB(FF872404)
+STUB(FF872BD4)
+STUB(FF872CA8)
+STUB(FF873024)
+STUB(FF87340C)
+STUB(FF8734F4)
+STUB(FF87400C)
+STUB(FF8747A4)
+STUB(FF8749E8)
+STUB(FF874AD4)
+STUB(FF874AFC)
+STUB(FF874B8C)
+STUB(FF874BB8)
+STUB(FF874C1C)
+STUB(FF874D74)
+STUB(FF874D80)
+STUB(FF874F2C)
+STUB(FF874F70)
+STUB(FF874FA0)
+STUB(FF874FCC)
+STUB(FF874FF4)
+STUB(FF875018)
+STUB(FF875044)
+STUB(FF875074)
+STUB(FF875100)
+STUB(FF87520C)
+STUB(FF875290)
+STUB(FF875294)
+STUB(FF875354)
+STUB(FF875AB8)
+STUB(FF876BDC)
+STUB(FF877030)
+STUB(FF877048)
+STUB(FF877068)
+STUB(FF877244)
+STUB(FF8772D8)
+STUB(FF877388)
+STUB(FF8778C4)
+STUB(FF87795C)
+STUB(FF8779C0)
+STUB(FF877A08)
+STUB(FF877A34)
+STUB(FF877AA4)
+STUB(FF877BD0)
+STUB(FF878138)
+STUB(FF8781D0)
+STUB(FF87821C)
+STUB(FF87841C)
+STUB(FF878468)
+STUB(FF87847C)
+STUB(FF878590)
+STUB(FF8785AC)
+STUB(FF878608)
+STUB(FF878688)
+STUB(FF8789F8)
+STUB(FF878A38)
+STUB(FF878A64)
+STUB(FF878A9C)
+STUB(FF878AB4)
+STUB(FF878B3C)
+STUB(FF878B58)
+STUB(FF878B84)
+STUB(FF878BA4)
+STUB(FF878BDC)
+STUB(FF878BF8)
+STUB(FF878C2C)
+STUB(FF878C50)
+STUB(FF878F68)
+STUB(FF878FA8)
+STUB(FF879F20)
+STUB(FF879F30)
+STUB(FF87A0AC)
+STUB(FF87A5C8)
+STUB(FF87A61C)
+STUB(FF87B388)
+STUB(FF87BA34)
+STUB(FF87C298)
+STUB(FF87E548)
+STUB(FF87F454)
+STUB(FF880EC0)
+STUB(FF884864)
+STUB(FF88A398)
+STUB(FF88D5E4)
+STUB(FF88D8A4)
+STUB(FF88E760)
+STUB(FF88F300)
+STUB(FF8B319C)
+STUB(FF8C0804)
+STUB(FF8E2418)
+STUB(FF8E6BF8)
+STUB(FF8E79C4)
+STUB(FF8EBADC)
+STUB(FF8EBBA0)
-STUB(FF8EF628)
+STUB(FF8FB3B0)
+STUB(FF8FB458)
+STUB(FF8FB780)
+STUB(FF907F04)
+STUB(FF90835C)
+STUB(FF9186B8)
+STUB(FF92CAB4)
+STUB(FF92E71C)
+STUB(FF92E8B0)
+STUB(FF92EC34)
+STUB(FF92EE8C)
+STUB(FF92EEC4)
-STUB(FF92FB94)
-STUB(FF92FEC4)
@@ -108 +408 @@
-STUB(FF932038)
-STUB(FF932524)
+STUB(FF93E3F0)
+STUB(FF93E580)
+STUB(FF93F224)
+STUB(FF93F8DC)
+STUB(FF940CAC)
+STUB(FF94234C)
+STUB(FF944944)
-STUB(FF9449BC)
+STUB(FF94514C)
+STUB(FF9452C0)
+STUB(FF945CA4)
+STUB(FF9492D0)
+STUB(FF949414)
+STUB(FF949460)
+STUB(FF94A428)
+STUB(FF94A43C)
+STUB(FF94A468)
+STUB(FF94A5D8)
+STUB(FF94A5E8)
+STUB(FF94A5EC)
+STUB(FF94B4BC)
+STUB(FF94BB7C)
+STUB(FF94BD3C)
+STUB(FF94BDD4)
+STUB(FF94C184)
+STUB(FF94C2C4)
+STUB(FF94C554)
+STUB(FF94C73C)
+STUB(FF94C93C)
+STUB(FF94CB2C)
+STUB(FF94CBAC)
+STUB(FF9527FC)
+STUB(FF952B88)
+STUB(FF952C54)
+STUB(FF952F94)
+STUB(FF95352C)
+STUB(FF9546C8)
+STUB(FF954AFC)
+STUB(FF954EDC)
+STUB(FF9560A0)
+STUB(FF9563E4)
+STUB(FF956D3C)
+STUB(FF989F3C)
+STUB(FF989F50)
+STUB(FF98BE68)
+STUB(FF98BF5C)
+STUB(FF98ECC8)
+STUB(FF98ECE8)
+STUB(FF99E624)
+STUB(FF99E698)
-STUB(FFA8C05C)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

branches/juciphox/platform/ixus860_sd870/sub/100c/stubs_entry_2.S

@@ -5 +5 @@
-NHSTUB(kbd_pwr_off, 0xFF84448C)
-NHSTUB(kbd_pwr_on, 0xFF84443C)
+NSTUB(kbd_read_keys, 0xFF8230CC)
-NHSTUB(kbd_read_keys_r2, 0xFF843FA8)
-NHSTUB(time, 0xFF865744)
@@ -11 +12 @@
-NSTUB(PutOutNdFilter, 0xFF9E44C4)
-
+NSTUB(UnsetZoomForMovie,     0xFF94A2C4)
+
+NSTUB(CreateController, 0xFF86A6E4)
+NSTUB(DebugAssert, 0xFF81C090)
+NSTUB(EventProcedure, 0xFF81C0EC)
+NSTUB(GetAEIntegralServiceMode_0, 0xFF82C92C)
+NSTUB(GetAEIntegralServiceMode_7, 0xFF94A430)
+NSTUB(GetVRAMHPixelsSize_0, 0xFF8734A8)
+NSTUB(GetVRAMHPixelsSize_1, 0xFF878A2C)
+NSTUB(HardwareDefect, 0xFF86D2D8)
+NSTUB(IsControlEventActive, 0xFF86CC0C)
+NSTUB(IsFactoryMode, 0xFF847C34)
+NSTUB(KernelCreateTask, 0xFF81BE90)
+NSTUB(LockMainPower, 0xFF86D04C)
+NSTUB(PTM_GetCurrentItem, 0xFF86DB08)
+NSTUB(PTM_SetCurrentCaptureMode, 0xFF86D9C4)
+NSTUB(PT_GetPropertyCaseString, 0xFF869470)
+NSTUB(PT_SetPropertyCaseString, 0xFF869368)
+NSTUB(PostLogicalEventForNotPowerType, 0xFF86AE94)
+NSTUB(PostLogicalEventToUI, 0xFF86AEE0)
+NSTUB(RestartDevice, 0xFF82B964)
+NSTUB(StartDiskboot, 0xFF82BB44)
+NSTUB(StartFactoryModeController, 0xFF847C74)
+NSTUB(StartGUISystem, 0xFF88F8E0)
+NSTUB(StartRecModeMenu, 0xFF980908)
+NSTUB(StartWDT, 0xFF868080)
+NSTUB(TakeSemaphore, 0xFF81BA54)
+NSTUB(j_IsEvfDriveMode_16, 0xFF956658)
+NSTUB(j_PTM_GetWorkingCaptureMode, 0xFF86DAF8)
+NSTUB(j_PTM_SetCurrentItem, 0xFF86DAFC)
+NSTUB(j_PTM_SetCurrentItem_0, 0xFF86DB00)
+NSTUB(j_nullsub_192, 0xFF82BABC)
+NSTUB(j_unknown_libname_73, 0xFF870E40)
+NSTUB(nullsub_2, 0xFF820BC0)
+NSTUB(nullsub_206, 0xFF857EF0)
+NSTUB(nullsub_35, 0xFF86E47C)
+NSTUB(nullsub_37, 0xFF875398)
+NSTUB(nullsub_96, 0xFF93D744)
+NSTUB(qPrintf, 0xFF8115D0)
+NSTUB(taskcreate_AudioTsk, 0xFF8445B0)
+NSTUB(taskcreate_AviWrite, 0xFF92DB10)
+NSTUB(taskcreate_Bye, 0xFF82B828)
+NSTUB(taskcreate_ClockSave, 0xFF8151CC)
+NSTUB(taskcreate_CommonDrivers, 0xFF870D74)
+NSTUB(taskcreate_DSITask, 0xFF879048)
+NSTUB(taskcreate_FaceFrame, 0xFF878E78)
+NSTUB(taskcreate_LEDCon, 0xFF843798)
+NSTUB(taskcreate_PhySw, 0xFF822DAC)
+NSTUB(taskcreate_StartupImage, 0xFF82C06C)
+NSTUB(taskcreate_TempCheck, 0xFF822048)
+NSTUB(taskcreate_Thermometer, 0xFF8469CC)
+NSTUB(taskcreate_WdtReset, 0xFF867FE8)
+NSTUB(unknown_libname_80, 0xFF871E70)
+NSTUB(unknown_libname_96, 0xFF87A340)
+
+
+
+
-
-//NHSTUB(OnPrintTouchWheel, 0xFF8E7130)
-//NHSTUB(OffPrintTouchWheel, 0xFF8E7120)
+
+//NSTUB(TurnOnMic, 0xFF845074)  // these functions don't actually work, although they do appear similar to those in the A650
+//NSTUB(TurnOffMic, 0xFF8450AC)
-
-
@@ -91 +153 @@
-NSTUB(taskSuspend,                       0xFF810958)
-
-NSTUB(UnsetZoomForMovie,                 0xFF810958)