fixed patching keyboard task, updated camera info

cedricbompart · cedricbompart · commit a0d7b6351450 · 2022-08-09T09:18:16.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ bin
 CHDK/MODULES
 
 platform/**/sub/**/bin_compat.h
+platform/fi2.inc
 
 tools/ghidra_scripts/**
 
diff --git a/camera_info.csv b/camera_info.csv
@@ -372,6 +372,7 @@ m10,111a,ALPHA,,,,12960,dryos,57,60,0xFC000000,0x8000,0x1fffffff,d4g,W,13,1,,0x0
 sx710hs,100a,,,,,12966,dryos,57,60,0xFC000000,0x8000,0x1fffffff,d4g,,13,1,1,0x006ce000 ,0x00022000 ,,,,,,7
 sx710hs,101a,,,,,12966,dryos,57,60,0xFC000000,0x8000,0x1fffffff,d4g,,13,1,1,0x006ce000 ,0x00022000 ,,,,,,7
 ixus285_elph360hs,100b,ALPHA,,,SKIP,12989,dryos,58,41,0xff010000,0x1900,0x1FFFFFF,d4i,W,16,,,,,,,,,,10
+ixus285_elph360hs,100c,ALPHA,,,SKIP,12989,dryos,58,41,0xff010000,0x1900,0x1FFFFFF,d4i,W,16,,,,,,,,,,10
 sx420is,100a,BETA,,,,12991,dryos,58,41,0xff010000,0x1900,0x1FFFFFF,d4i,W,16,,,,,,,,,,10
 ixus175_elph180,100a,,100c,,,12993,dryos,58,41,0xFF810000,0x1900,0x07ffffff,d4i,W,16,,,,,,,,,,10
 ixus175_elph180,100b,,100c,,,12993,dryos,58,41,0xFF810000,0x1900,0x07ffffff,d4i,W,16,,,,,,,,,,10
@@ -395,5 +396,6 @@ sx730hs,100b,,100c,,,13014,dryos,59,60,0xFC000000,0x8000,0x1fffffff,d4j,W,17,1,,
 sx730hs,100c,,,,,13014,dryos,59,60,0xFC000000,0x8000,0x1fffffff,d4j,W,17,1,,,,,,,,,12
 sx730hs,100d,,,,,13014,dryos,59,60,0xFC000000,0x8000,0x1fffffff,d4j,W,17,1,,,,,,,,,12
 sx730hs,100e,,100d,,,13014,dryos,59,60,0xFC000000,0x8000,0x1fffffff,d4j,W,17,1,,,,,,,,,12
+m6,101a,ALPHA,,,,12997 ,dryos,59,70,0xE0000000,0x8000,0x3fffffff,d7,W,19,1,,0x006ce000,,,,,,,12
 
 Generated file - run 'make camera-info' to update
diff --git a/platform/fi2.inc.txt b/platform/fi2.inc.txt
@@ -48,3 +48,9 @@ ifeq ($(KEYSYS), d4e)
 FI2KEY=
 FI2IV =
 endif
+
+# m6
+ifeq ($(KEYSYS), d7)
+FI2KEY=
+FI2IV=
+endif
diff --git a/platform/m6/makefile.inc b/platform/m6/makefile.inc
@@ -9,12 +9,10 @@ DIGIC = 70
 MEMBASEADDR=0x8000
 ROMBASEADDR=0xE0000000
 
-override OPT_FI2=
-
 MAXRAMADDR = 0x3fffffff
 
 NEED_ENCODED_DISKBOOT=19
-KEYSYS=d4k // TODO
+KEYSYS=d7
 FI2FLAGS=W
 
 # next line is for the compatibility check, as comment
diff --git a/platform/m6/sub/101a/boot.c b/platform/m6/sub/101a/boot.c
@@ -65,11 +65,12 @@ void __attribute__((naked,noinline,aligned(4))) patch_E007A1E8() {
 }
 
 void plant_hacks_for_e0070000(unsigned addr) {
+	// override keyboard task
+	place_fw_patch_t2_64b(patch_E007A1E8, addr + 0xA1E8);
 	// insert startup mode handling
 	place_fw_patch_t2_64b(patch_E0079DA4, addr + 0x9DA4);
-	place_fw_patch_t2_64b(patch_E007A1E8, addr + 0xA1E8);
 	// nop (benign 16-bit instruction, added to replace 1st half of destroyed 32-bit instruction)
-	*(unsigned short*) (addr + 0xA1E6) = 0xbf00;
+	*(unsigned short*) (addr + 0x9DA2) = 0xbf00;
 }
 
 // should be integrated in dcache_clean_all

-Original file line number
+Diff line change
 FI2KEY=
 FI2IV =
 endif
++
 +# m6
 +ifeq ($(KEYSYS), d7)
 +FI2KEY=
 +FI2IV=
 +endif
Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,12 @@ void __attribute__((naked,noinline,aligned(4))) patch_E007A1E8() {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`void plant_hacks_for_e0070000(unsigned addr) {`
	`68`	`+ // override keyboard task`
	`69`	`+ place_fw_patch_t2_64b(patch_E007A1E8, addr + 0xA1E8);`
`68`	`70`	`// insert startup mode handling`
`69`	`71`	`place_fw_patch_t2_64b(patch_E0079DA4, addr + 0x9DA4);`
`70`		`- place_fw_patch_t2_64b(patch_E007A1E8, addr + 0xA1E8);`
`71`	`72`	`// nop (benign 16-bit instruction, added to replace 1st half of destroyed 32-bit instruction)`
`72`		`- (unsigned short) (addr + 0xA1E6) = 0xbf00;`
	`73`	`+ (unsigned short) (addr + 0x9DA2) = 0xbf00;`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`// should be integrated in dcache_clean_all`