Skip to content

Commit ca8521e

Browse files
committed
added a subs_min to defined constants
1 parent b7173e4 commit ca8521e

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

platform/m6/lib.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
#include "lib.h"
66

77
void shutdown_soft() {
8-
_PostLogicalEventForNotPowerType(0x1005, 0);
8+
// _PostLogicalEventForNotPowerType(0x1005, 0);
99
}
1010

1111
/**
1212
* @see main startup
1313
*/
1414
void shutdown() {
15-
while (1)
16-
_SleepTask(500);
15+
1716
}
1817

1918
/**

platform/m6/sub/101a/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJS=boot.o stubs_auto.o stubs_entry.o stubs_entry_2.o mmu_utils.o capt_seq.o
1+
OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o stubs_entry_2.o mmu_utils.o capt_seq.o
22
STUBS_AUTO_DEPS=boot.c
33

44
include ../../../makefile_sub.inc

platform/m6/sub/101a/stubs_entry.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ DEF(levent_table ,0xe06b81a4) // Found @0xe007ba58
163163
DEF(FlashParamsTable ,0xe09d82c4) // Found @0xe003e7e4
164164
DEF(playrec_mode ,0x0000b74c) // (0xb748+0x4) Found @0xe02ce292
165165
DEF(jpeg_count_str ,0x00124ed8) // Found @0xe011e19a
166-
//DEF(zoom_busy ,0x00000000), ** != ** stubs_entry_2 = 0x00000001 (1)
167-
//DEF(focus_busy ,0x00000000), ** != ** stubs_entry_2 = 0x00000001 (1)
166+
//DEF(zoom_busy ,0x00000000), ** != ** stubs_min = 0x00000001 (1)
167+
//DEF(focus_busy ,0x00000000), ** != ** stubs_min = 0x00000001 (1)
168168
DEF(imager_active ,0x000086c4) // (0x86c0+0x4) Found @0xe01ccb12
169169
DEF(canon_menu_active ,0x0000c740) // (0xc73c+0x4) Found @0xe035a48a
170170
DEF(file_counter_var ,0x00010aa8) // Found @0xe03e3d2c
@@ -173,9 +173,9 @@ DEF(_nrflag ,0x000234bc) // (0x234b4+0x8) Found @0xe00
173173
DEF(av_override_semaphore ,0x0003d344) // Found @0xe03f4bc4
174174
DEF(active_bitmap_buffer ,0x0000c6f8) // (0xc6ac+0x4c) Found @0xe035e688
175175
DEF(displaytype ,0x00009c28) // (0x9bc8+0x60) Found @0xe00e5578
176-
//DEF(bitmap_buffer ,0x0000c6fc), ** != ** stubs_entry_2 = 0x00000000 ()
176+
//DEF(bitmap_buffer ,0x0000c6fc), ** != ** stubs_min = 0x00000000 ()
177177
DEF(live_free_cluster_count ,0x0012a948) // (0x12a910+0x38) Found @0xe002d066
178-
//DEF_CONST(uiprop_count ,0x00000000), ** != ** stubs_entry_2 = 0x000000e8 (0x000000e8)
178+
//DEF_CONST(uiprop_count ,0x00000000), ** != ** stubs_min = 0x000000e8 (0x000000e8)
179179
DEF(exmem_alloc_table ,0x00073ba8) // Found @0xe0074062
180180
DEF(exmem_types_table ,0xe1160da0) // Found @0xe0074066
181181
DEF_CONST(exmem_type_count ,0x0000001a) // Found @0xe1160da0

platform/m6/sub/101a/stubs_entry_2.S

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,7 @@ NHSTUB(GetLensWideFocalLength, 0xe03f4573)
2828

2929
NHSTUB(VTMLock, NULL_SUB)
3030
NHSTUB(VTMUnlock, NULL_SUB)
31-
DEF_CONST(uiprop_count, 0x000000e8) // found 0x0xe025db4a
32-
FAKEDEF(focus_busy, 1)
33-
FAKEDEF(zoom_busy, 1)
3431
NHSTUB(MakeSDCardBootable, 0xe036111b)
35-
DEF(current_fb_d, 0x0000fd84) // found 0xe00c0ae2 (0xfd58 + 0x2c)
36-
DEF(recreview_hold, 0x99e8) // found 0xe033c384 (0x9998 + 0x50)
37-
FAKEDEF(canon_shoot_menu_active, 1)
38-
DEF(simple_movie_status, 0xb464) // found 0xe00dbb72 (0xb390 + 0x80 + 0x54)
39-
DEF(current_viewport_buffer, 0x00008870) // found 0xe03676da (0x8848 + 0x20 + 0x8)
40-
DEF(viewport_buffers, 0) // TODO
41-
IGNORE(bitmap_buffer)
4232

4333
// MMU
4434
NHSTUB(dcache_clean_by_mva, 0xe036ba79)

platform/m6/sub/101a/stubs_min.S

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#include "stubs_asm.h"
2+
3+
DEF_CONST(uiprop_count, 0x000000e8) // found 0x0xe025db4a
4+
5+
FAKEDEF(focus_busy, 1)
6+
FAKEDEF(zoom_busy, 1)
7+
FAKEDEF(canon_shoot_menu_active, 1)
8+
9+
DEF(current_fb_d, 0x0000fd84) // found 0xe00c0ae2 (0xfd58 + 0x2c)
10+
DEF(recreview_hold, 0x99e8) // found 0xe033c384 (0x9998 + 0x50)
11+
DEF(simple_movie_status, 0xb464) // found 0xe00dbb72 (0xb390 + 0x80 + 0x54)
12+
DEF(current_viewport_buffer, 0x00008870) // found 0xe03676da (0x8848 + 0x20 + 0x8)
13+
DEF(viewport_buffers, 0xe05e3e08)
14+
15+
IGNORE(bitmap_buffer)

0 commit comments

Comments
 (0)