Skip to content

Commit 39af23a

Browse files
cedricbompartcedricbompart
committed
finally got the M6 to blink in the boot method
1 parent 6e7eea8 commit 39af23a

File tree

5 files changed

+44
-40
lines changed

5 files changed

+44
-40
lines changed

‎camera_list.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ m10,110d,BETA,,
378378
m10,110f,BETA,,
379379
m10,110g,BETA,110f,
380380
m10,111a,ALPHA,,
381+
m6,101a,ALPHA,,
381382
sx710hs,100a,,,
382383
sx710hs,101a,,,
383384
sx700hs,100d,,,

‎loader/generic/compat_table.h‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,6 @@
4444
{ 12638,1,0xc02200c4,0xfffe0130 }, // sx100is
4545
{ 12639,1,0xc02200cc,0xfffe0130 }, // ixus960_sd950
4646
{ 12640,1,0xc02200cc,0xfffe0130 }, // ixus860_sd870
47-
#elif (NEED_ENCODED_DISKBOOT == 1)
48-
{ 12659,1,0xc02200d4,0xfffe0130 }, // ixus970_sd890
49-
{ 12660,1,0xc0220130,0xfffe0130 }, // ixus90_sd790
50-
{ 12661,1,0xc02200d4,0xfffe0130 }, // ixus85_sd770
51-
{ 12662,1,0xc02200c4,0xfffe0130 }, // a590
52-
{ 12663,1,0xc02200c4,0xfffe0130 }, // a580
53-
{ 12666,1,0xc0220084,0xfffe0130 }, // a470
54-
{ 12676,1,0xc02200d4,0xfffe0130 }, // ixus80_sd1100
55-
{ 12685,1,0xc0220060,0xfffe0130 }, // sx10
56-
{ 12686,1,0xc02200c4,0xfffe0130 }, // a1000
57-
{ 12687,1,0xc02200d4,0xfffe0130 }, // g10
58-
{ 12689,1,0xc02200c4,0xfffe0130 }, // a2000
59-
{ 12690,1,0xc02200c4,0xfffe0130 }, // sx110is
60-
{ 12691,1,0xc02200bc,0xfffe0130 }, // ixus980_sd990
61-
{ 12693,0,0,0xfffe0130 }, // sx1
62-
{ 12694,1,0xc02200d4,0xfffe0130 }, // ixus870_sd880
6347
#elif (NEED_ENCODED_DISKBOOT == 10)
6448
{ 12894,2,0xc022c30c,0xfff40040 }, // n
6549
{ 12895,4,0xd20b0994,0xfff60040 }, // sx280hs
@@ -77,6 +61,22 @@
7761
{ 12916,4,0xd20b0994,0xfff20040 }, // g16
7862
{ 12918,1,0xc0220120,0xfffe0040 }, // sx170is
7963
{ 12919,1,0xc022302c,0xfff40040 }, // sx510hs
64+
#elif (NEED_ENCODED_DISKBOOT == 1)
65+
{ 12659,1,0xc02200d4,0xfffe0130 }, // ixus970_sd890
66+
{ 12660,1,0xc0220130,0xfffe0130 }, // ixus90_sd790
67+
{ 12661,1,0xc02200d4,0xfffe0130 }, // ixus85_sd770
68+
{ 12662,1,0xc02200c4,0xfffe0130 }, // a590
69+
{ 12663,1,0xc02200c4,0xfffe0130 }, // a580
70+
{ 12666,1,0xc0220084,0xfffe0130 }, // a470
71+
{ 12676,1,0xc02200d4,0xfffe0130 }, // ixus80_sd1100
72+
{ 12685,1,0xc0220060,0xfffe0130 }, // sx10
73+
{ 12686,1,0xc02200c4,0xfffe0130 }, // a1000
74+
{ 12687,1,0xc02200d4,0xfffe0130 }, // g10
75+
{ 12689,1,0xc02200c4,0xfffe0130 }, // a2000
76+
{ 12690,1,0xc02200c4,0xfffe0130 }, // sx110is
77+
{ 12691,1,0xc02200bc,0xfffe0130 }, // ixus980_sd990
78+
{ 12693,0,0,0xfffe0130 }, // sx1
79+
{ 12694,1,0xc02200d4,0xfffe0130 }, // ixus870_sd880
8080
#elif (NEED_ENCODED_DISKBOOT == 12)
8181
{ 12933,4,0xd20b0994,0xfff20040 }, // sx700hs
8282
{ 12935,3,0xc022d1fc,0xffff0040 }, // ixus150_elph140
@@ -110,6 +110,8 @@
110110
{ 13012,3,0xc022d1fc,0xffff0270 }, // ixus185_elph185
111111
{ 13013,3,0xc022d1fc,0xfffe0270 }, // sx430is
112112
{ 13014,4,0xd20b0994,0xfff20270 }, // sx730hs
113+
#elif (NEED_ENCODED_DISKBOOT == 19)
114+
{ 12997,5,0xD20801E0,0xe1f20270 }, // m6
113115
#elif (NEED_ENCODED_DISKBOOT == 2)
114116
{ 12732,1,0xc0220134,0xfffe0130 }, // d10
115117
{ 12733,1,0xc0220130,0xfffe0130 }, // ixus110_sd960

‎platform/m6/makefile.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ override OPT_FI2=
1515
MAXRAMADDR = 0x3fffffff
1616

1717
# TODO: check
18-
NEED_ENCODED_DISKBOOT=18
18+
NEED_ENCODED_DISKBOOT=19
1919
KEYSYS=d4k
2020
FI2FLAGS=W
2121

‎platform/m6/sub/101a/makefile.inc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# points to the start of the memory pool used by the firmware
2-
MEMISOSTART = 0x2b4138
2+
#MEMISOSTART=0x2b4138
3+
MEMISOSTART=0x11A1000
34

45
# values for ARAM, from sig finder
5-
ARAM_HEAP_START = 0x006ce000
6+
ARAM_HEAP_START=0x006ce000

‎tools/dancingbits.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
21
// Dancing bits data for encoding diskboot.bin file
32
// Used by dancingbits.c and finsig_dryos.c
43

5-
#define VITALY 18
4+
#define VITALY 19
65
unsigned char _chr_[VITALY][8] = {
7-
{ 4,6,1,0,7,2,5,3 }, // original flavor
8-
{ 5,3,6,1,2,7,0,4 }, // nacho cheese sx200is, ixus100_sd780, ixu95_sd1200, a1100, d10
9-
{ 2,5,0,4,6,1,3,7 }, // mesquite bbq ixus200_sd980, sx20 (dryos r39)
10-
{ 4,7,3,2,6,5,0,1 }, // cool ranch a3100 (dryos r43)
11-
{ 3,2,7,5,1,4,6,0 }, // cajun chicken s95, g12, sx30 (dryos r45)
12-
{ 0,4,2,7,3,6,5,1 }, // spicy wasabi sx220, sx230, ixus310 (dryos r47)
13-
{ 7,1,5,3,0,6,4,2 }, // sea salt & vinegar sx40hs, sx150is (dryos r49)
14-
{ 6,3,1,0,5,7,2,4 }, // spicy habenaro sx260hs (dryos r50)
15-
{ 1,0,4,6,2,3,7,5 }, // tapatio hot sauce sx160is (dryos r51)
16-
{ 3,6,7,2,4,5,1,0 }, // blazin' jalapeno a1400 (dryos r52)
17-
{ 0,2,6,3,1,4,7,5 }, // guacamole sx510hs (dryos r52)
18-
{ 2,7,0,6,3,1,5,4 }, // (dryos r54)
19-
{ 6,5,3,7,0,2,4,1 }, // oyster sauce ixus160_elph160 (dryos r55)
20-
{ 7,4,5,0,2,1,3,6 }, // jeronymo sx530 (dryos r55)
21-
{ 5,0,2,1,7,3,4,6 }, // sonic sour cream, g5x (dryos R58)
22-
{ 1,3,7,4,5,6,0,2 }, // ixus175_elph180, sx420is (dryos r58)
23-
{ 4,7,5,6,1,3,2,0 }, // sx430is (dryos r59)
24-
{ 0,7,4,2,6,5,1,3 }, // m100 (dryos r59)
25-
};
6+
{ 4, 6, 1, 0, 7, 2, 5, 3 }, // original flavor
7+
{ 5, 3, 6, 1, 2, 7, 0, 4 }, // nacho cheese sx200is, ixus100_sd780, ixu95_sd1200, a1100, d10
8+
{ 2, 5, 0, 4, 6, 1, 3, 7 }, // mesquite bbq ixus200_sd980, sx20 (dryos r39)
9+
{ 4, 7, 3, 2, 6, 5, 0, 1 }, // cool ranch a3100 (dryos r43)
10+
{ 3, 2, 7, 5, 1, 4, 6, 0 }, // cajun chicken s95, g12, sx30 (dryos r45)
11+
{ 0, 4, 2, 7, 3, 6, 5, 1 }, // spicy wasabi sx220, sx230, ixus310 (dryos r47)
12+
{ 7, 1, 5, 3, 0, 6, 4, 2 }, // sea salt & vinegar sx40hs, sx150is (dryos r49)
13+
{ 6, 3, 1, 0, 5, 7, 2, 4 }, // spicy habenaro sx260hs (dryos r50)
14+
{ 1, 0, 4, 6, 2, 3, 7, 5 }, // tapatio hot sauce sx160is (dryos r51)
15+
{ 3, 6, 7, 2, 4, 5, 1, 0 }, // blazin' jalapeno a1400 (dryos r52)
16+
{ 0, 2, 6, 3, 1, 4, 7, 5 }, // guacamole sx510hs (dryos r52)
17+
{ 2, 7, 0, 6, 3, 1, 5, 4 }, // (dryos r54)
18+
{ 6, 5, 3, 7, 0, 2, 4, 1 }, // oyster sauce ixus160_elph160 (dryos r55)
19+
{ 7, 4, 5, 0, 2, 1, 3, 6 }, // jeronymo sx530 (dryos r55)
20+
{ 5, 0, 2, 1, 7, 3, 4, 6 }, // sonic sour cream, g5x (dryos R58)
21+
{ 1, 3, 7, 4, 5, 6, 0, 2 }, // ixus175_elph180, sx420is (dryos r58)
22+
{ 4, 7, 5, 6, 1, 3, 2, 0 }, // sx430is (dryos r59)
23+
{ 0, 7, 4, 2, 6, 5, 1, 3 }, // m100 (dryos r59)
24+
{ 3, 2, 1, 5, 4, 0, 6, 7 }, // m6 (dryos 59)
25+
};
2626

0 commit comments

Comments
 (0)