Index: platform/a1000/platform_camera.h
===================================================================
--- platform/a1000/platform_camera.h (revision 957)
+++ platform/a1000/platform_camera.h (working copy)
@@ -53,4 +53,5 @@
#define CAM_ACTIVE_AREA_Y1
8
#define CAM_ACTIVE_AREA_X2
3682
#define CAM_ACTIVE_AREA_Y2
2764
+ #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1
//----------------------------------------------------------
Index: platform/a1000/lib.c
===================================================================
--- platform/a1000/lib.c (revision 957)
+++ platform/a1000/lib.c (working copy)
@@ -54,3 +54,10 @@
led_c.blink_count=
255;
_PostLEDMessage
(&led_c
);
}
+
+void vid_bitmap_refresh() //as used in other models
+{
+ extern int enabled_refresh_physical_screen;
+ enabled_refresh_physical_screen=1;
+ _RefreshPhysicalScreen(1);
+}
Index: platform/a1000/sub/100b/capt_seq.c
===================================================================
--- platform/a1000/sub/100b/capt_seq.c (revision 957)
+++ platform/a1000/sub/100b/capt_seq.c (working copy)
@@ -9,7 +9,7 @@
#define NR_OFF
(1)
static long raw_save_stage;
-static long *nrflag = (long*)0x9F90;
+static long *nrflag = (long*)0x8594;
#define RAWDATA_AVAILABLE
(1)
#define RAWDATA_SAVED
(2)
Index: platform/a1000/sub/100b/stubs_entry.S
===================================================================
--- platform/a1000/sub/100b/stubs_entry.S (revision 957)
+++ platform/a1000/sub/100b/stubs_entry.S (working copy)
@@ -14,8 +14,6 @@
// Stubs below should be checked. Stub not matched
100%, or difference found to current &#
39;stubs_entry_2.S&#
39;
// Name Address Rule % Comp to stubs_entry_2.S
-//NSTUB(ExpCtrlTool_StopContiAE ,0xffc1fbac) //104 *** != 0xffc1fabc
-//NSTUB(Lseek ,0xffc13484) //101 *** != 0xffc1354c
//NSTUB
(PT_PlaySound ,0xffc
48c7c
) //
102 *** != 0xffc48fbc
//NSTUB
(SetAE_ShutterSpeed ,0xffe42b88
) //
102 *** != 0xffe3de6c
//NSTUB
(kbd_pwr_off ,0xffc3163c
) //
2 64% *** != 0xffc3164c
@@ -33,10 +31,10 @@
DEF
(physw_status ,0x0000f3f8
) // Found @0xffc113ec
DEF
(physw_run ,0x00001be4
) // Found @0xffc11064
DEF
(levent_table ,0xffeab474
) // Found @0xffeab474
-//DEF(FlashParamsTable ,0xffec9f7c) // Found @0xffec9f7c, ** != ** stubs_min = 0xffeca0bc (0xFFECA0BC)
-//DEF(movie_status ,0x000050a0) // Found @0xffc47cf8, ** != ** stubs_min = 0x000058a0 (0x5868+0x38)
+DEF(FlashParamsTable ,0xffec9f7c) // Found @0xffec9f7c
+DEF(movie_status ,0x000050a0) // Found @0xffc47cf8
DEF
(canon_menu_active ,0x00005480
) // Found @0xffc59fb8
-//DEF(canon_shoot_menu_active ,0x00009735) // Found @0xffd3b670, ** != ** stubs_min = 0x0000c05d (0xC05D)
+DEF(canon_shoot_menu_active ,0x00009735) // Found @0xffd3b670
DEF
(playrec_mode ,0x00005228
) // Found @0xffc4ec4c
DEF
(zoom_status ,0x
0000c0a4
) // Found @0xffdfc7b0
DEF
(some_flag_for_af_scan ,0x
000085a8) // Found @0xffd
0a65c
@@ -44,9 +42,9 @@
// each entry contains
3 int value
(s
), the first is the zoom focus length.
// there are
8 entries in the table - set NUM_FL to
8
DEF
(focus_len_table ,0xfffe297c
) // Found @0xfffe297c
-//DEF(zoom_busy ,0x00007fdc) // Found @0xffd03034, ** != ** stubs_min = 0x0000b4a4 (0xB4A4)
-//DEF(focus_busy ,0x00007ee4) // Found @0xffcfebb4, ** != ** stubs_min = 0x00007ee8 (0x7EE8)
-//DEF(recreview_hold ,0x000059e4) // Found @0xffc65b4c, ** != ** stubs_min = 0x000094c8 (0x94C8)
+DEF(zoom_busy ,0x00007fdc) // Found @0xffd03034
+DEF(focus_busy ,0x00007ee4) // Found @0xffcfebb4
+DEF(recreview_hold ,0x000059e4) // Found @0xffc65b4c
// Values below go in &#
39;lib.c&#
39;:
//void *vid_get_bitmap_fb
() { return
(void*
)0x10361000;
} // Found @0xffc2ce78
@@ -103,10 +101,11 @@
NSTUB
(DeleteFile_Fut ,0xffc12bf0
) //
112
NSTUB
(DoAFLock ,0xffc
14d9c
) //
102
NSTUB
(EnterToCompensationEVF ,0xffc14fec
) //
104
-NSTUB(ExecuteEventProcedure ,0xffc55764) // 1
+NSTUB(ExecuteEventProcedure ,0xffc55764) // 2
NSTUB
(ExitFromCompensationEVF ,0xffc15030
) //
104
NSTUB
(ExitTask ,0xffc0bb50
) //
101
NSTUB
(ExpCtrlTool_StartContiAE ,0xffc1fa68
) //
104
+NSTUB(ExpCtrlTool_StopContiAE ,0xffc1fbac) //104
NSTUB
(Fclose_Fut ,0xffc
12d6c
) //
101
NSTUB
(Feof_Fut ,0xffc12f58
) //
1
NSTUB
(Fflush_Fut ,0xffc12f94
) //
1
@@ -138,6 +137,7 @@
NSTUB
(LEDDrive ,0xffc
30c9c
) //
103
NSTUB
(LocalTime ,0xffc53768
) //
1
NSTUB
(LockMainPower ,0xffc5cdd0
) //
103
+NSTUB(Lseek ,0xffc13484) //101
NSTUB
(MakeDirectory_Fut ,0xffc
12c64) //
1
NSTUB
(MoveFocusLensToDistance ,0xffe403bc
) //
102
NSTUB
(MoveIrisWithAv ,0xffdec64c
) //
102
Index: platform/a1000/sub/100b/stubs_entry_2.S
===================================================================
--- platform/a1000/sub/100b/stubs_entry_2.S (revision 957)
+++ platform/a1000/sub/100b/stubs_entry_2.S (working copy)
@@ -2,8 +2,8 @@
#define NULL_SUB 0xFFC00940
// Override stubs_entry.S
-NHSTUB(ExpCtrlTool_StopContiAE, 0xFFC1FABC)
-NHSTUB(Lseek, 0xffc1354c)
+//NHSTUB(ExpCtrlTool_StopContiAE, 0xFFC1FABC)
+//NHSTUB(Lseek, 0xffc1354c)
NHSTUB
(PT_PlaySound, 0xFFC48FBC
)
NHSTUB
(SetAE_ShutterSpeed, 0xFFE3DE6C
)
NHSTUB
(kbd_pwr_off, 0xFFC3164C
)
Index: platform/a1000/sub/100b/stubs_min.S
===================================================================
--- platform/a1000/sub/100b/stubs_min.S (revision 957)
+++ platform/a1000/sub/100b/stubs_min.S (working copy)
@@ -11,9 +11,6 @@
// ROM:FF84CCFC STR R0,
[R4,#
4] @ Store the address of the LED table
(base+
4)
DEF
(led_table, 0x2290
) // 0x270C +
4
-//ROM:FFA0AFB8(a1000) // old - found at ROM:FFA4503C
-DEF(FlashParamsTable, 0xFFECA0BC)
-
// found in sub_FF957174
(called from MoveZoomLensWithPoint
(sub_FF957B34
))
// ROM:FF957178 LDR R4, =0xB37C
// ..
@@ -22,7 +19,7 @@
// ROM:FF9571C4 MOVNE R1, #0xE0
// ROM:FF9571C8 ADRNE R0, aZoomlenscontro @ "ZoomLensController.c"
// ROM:FF9571CC BLNE assert
-DEF(zoom_busy, 0xB4A4) //0xB37C + 0x34
+//DEF(zoom_busy, 0xB4A4) //0xB37C + 0x34
// Found in sub_FF950718
(<- sub_FFA0D148 <- sub_FFA0D394 <- sub_FFA0D408
// <- MoveFocusLensToDistance
(sub_FFA0D41C
))
@@ -33,7 +30,7 @@
// ROM:FF950778 MOVNE R1, #0x90
// ROM:FF95077C ADRNE R0, aFocuslenscontr @ "FocusLensController.c"
// ROM:FF950780 BLNE assert
-DEF(focus_busy, 0x7EE8) //0xB274 + 8 or 7fd4
+//DEF(focus_busy, 0x7EE8) //0xB274 + 8 or 7fd4
// Same as previous variable, unusable. Originally found it by peeking through
// memory and it looked suitable at first. This address along with 0xBE64
@@ -46,7 +43,7 @@
// ROM:FF982314 MOV R0, #
0
// ROM:FF982318 STRB R0,
[R1
]
// ROM:FF98231C STRB R0,
[R1,#
1]
-DEF(canon_shoot_menu_active, 0xC05D) // 0xC05C + 1
+//DEF(canon_shoot_menu_active, 0xC05D) // 0xC05C + 1
// Found in sub_FF9754AC. Again, ewavr found this one, he did supply one pointer
// &#
39;search for LDR R12, =0x3007&#
39;. I guess this is the right one then <img src="./images/smilies/smile.gif" alt=":
)" title="Smile" />
@@ -54,6 +51,7 @@
// ROM:FF9754B0 008 LDR R1, =0xBD60
// ROM:FF9754B4 008 LDR R12, =0x3007
// ROM:FF9754B8 008 LDR R2,
[R1,#0xCC
]
-DEF(recreview_hold, 0x94C8) // 0xBD60 + 0xCC
-DEF(movie_status, 0x5868 + 0x38)
+//DEF(recreview_hold, 0x94C8) // 0xBD60 + 0xCC
+//DEF(movie_status, 0x5868 + 0x38)
DEF
(mode_magic, 0x58D4
)
+DEF(enabled_refresh_physical_screen, 0xa460 + 0x30) // found in sub_ffd7a308
Index: platform/a1000/sub/100b/lib.c
===================================================================
--- platform/a1000/sub/100b/lib.c (revision 957)
+++ platform/a1000/sub/100b/lib.c (working copy)
@@ -39,7 +39,7 @@
void *vid_get_viewport_fb_d
()
{
- return (void*)(*(int*)0x4F30); // 0x4EE8 + 0x50
+ return (void*)(*(int*)0x4F3C);
}
long vid_get_bitmap_width
()Erstellt in 0.022 Sekunden, mit
GeSHi 1.0.8.9
