Read about our upcoming Code of Conduct on this issue

Commit 83440298 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

MPU spells: comment out possible mode switches

not required for the GUI, but will interfere later with the mode switching feature
affected models: 6D (call/return trace changed), 70D, 700D (no side effects noticed)

--HG--
branch : qemu
parent 060a1f0acd75
......@@ -84,7 +84,7 @@ static struct mpu_init_spell mpu_init_spells_6D[] = {
{ 0x06, 0x05, 0x01, 0x97, 0x00, 0x01 }, /* reply #4.1, PROP 8004006F */
{ 0 } } },
{ { 0x08, 0x06, 0x00, 0x00, 0x01, 0x97, 0x00 }, .description = "Complete WaitID = 0x8003006F PROP 8004006F", .out_spells = { /* spell #5 */
{ 0x50, 0x4e, 0x02, 0x0e, 0x03, 0x03, 0x03, 0x01, 0x03, 0x01, 0x00, 0x48, 0x00, 0x00, 0x00, 0x19, 0x64, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x78, 0x48, 0x70, 0x48, 0x70, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01 },/* reply #5.1, PROP_SHOOTING_MODE_CHANGE? */
// { 0x50, 0x4e, 0x02, 0x0e, 0x03, 0x03, 0x03, 0x01, 0x03, 0x01, 0x00, 0x48, 0x00, 0x00, 0x00, 0x19, 0x64, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x78, 0x48, 0x70, 0x48, 0x70, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01 },/* reply #5.1, PROP_SHOOTING_MODE_CHANGE?, mode switch? */
{ 0 } } },
{ { 0x08, 0x06, 0x00, 0x00, 0x02, 0x0e, 0x00 }, .description = "Complete WaitID = 0x80000001 PROP_SHOOTING_MODE_CHANGE?", .out_spells = { /* spell #6 */
{ 0 } } },
......
......@@ -254,7 +254,7 @@ static struct mpu_init_spell mpu_init_spells_700D[] = {
{ { 0x08, 0x06, 0x00, 0x00, 0x04, 0x0c, 0x00 }, .description = "Complete WaitID = 0x80040004 PROP_SHOOTING_TYPE", .out_spells = { /* spell #51 */
{ 0 } } },
{ { 0x14, 0x13, 0x09, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, {/* spell #52 */
{ 0x50, 0x4e, 0x02, 0x0e, 0x03, 0x03, 0x05, 0x00, 0x03, 0x00, 0x00, 0x68, 0x00, 0x00, 0x01, 0x15, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x7d, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xd0, 0x00, 0x00, 0x80, 0x48, 0x78, 0x48, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },/* reply #52.1, PROP_SHOOTING_MODE_CHANGE? */
// { 0x50, 0x4e, 0x02, 0x0e, 0x03, 0x03, 0x05, 0x00, 0x03, 0x00, 0x00, 0x68, 0x00, 0x00, 0x01, 0x15, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x7d, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xd0, 0x00, 0x00, 0x80, 0x48, 0x78, 0x48, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },/* reply #52.1, PROP_SHOOTING_MODE_CHANGE?, mode switch? */
{ 0x06, 0x05, 0x03, 0x38, 0x95, 0x00 }, /* reply #52.2, PROP 80030035 */
{ 0x0e, 0x0c, 0x0a, 0x08, 0x02, 0x00, 0x01, 0x03, 0x98, 0x60, 0x00, 0x7d, 0x00 },/* reply #52.3, PD_NotifyOlcInfoChanged */
{ 0 } } },
......
......@@ -93,7 +93,7 @@ static struct mpu_init_spell mpu_init_spells_70D[] = {
{ { 0x08, 0x06, 0x00, 0x00, 0x01, 0x97, 0x00 }, .description = "Complete WaitID = 0x8003006F PROP 8004006F", .out_spells = { /* spell #5 */
{ 0 } } },
{ { 0x08, 0x07, 0x03, 0x6a, 0x00, 0x01, 0x00, 0x00 }, { /* spell #6 */
{ 0x70, 0x6e, 0x02, 0x0e, 0x03, 0x03, 0x01, 0x00, 0x03, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x14, 0x50, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x01, 0x01, 0x00, 0x00, 0x3c, 0x00, 0x60, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x80, 0x48, 0x01, 0x00, 0x78, 0x48, 0x00, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },/* reply #6.1, PROP_SHOOTING_MODE_CHANGE? */
// { 0x70, 0x6e, 0x02, 0x0e, 0x03, 0x03, 0x01, 0x00, 0x03, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x14, 0x50, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x01, 0x01, 0x00, 0x00, 0x3c, 0x00, 0x60, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x80, 0x48, 0x01, 0x00, 0x78, 0x48, 0x00, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },/* reply #6.1, PROP_SHOOTING_MODE_CHANGE?, mode switch? */
{ 0 } } },
{ { 0x08, 0x06, 0x00, 0x00, 0x02, 0x0e, 0x00 }, .description = "Complete WaitID = 0x80000001 PROP_SHOOTING_MODE_CHANGE?", .out_spells = { /* spell #7 */
{ 0 } } },
......
......@@ -556,6 +556,13 @@ for l in lines:
reply = replace_spell_arg(reply, 4, "00")
warning = ("disabled, " + warning).strip(" ,")
# comment out mode switches
if reply[6:11] in [ "02 00", "02 0e" ] and num > 1:
cmt = "//"
warning = "mode switch?"
# show lens name as comment
if description == "PROP_LENS_NAME":
description += ": "
for ch in reply.split(" ")[4:]:
......
1e164fdd818e097978ab162831150e9d calls-main.log
490c82e5b0f13973e948bed379abf242 calls-main.log
e4544c20daf1d78430d7c5dfe08c4112 calls-main.idc
d5c44a27dda0d7c711fad3e87e91a53b calls-main-basic.log
b4cbeaa8651d6afe5fe3574f0929bf39 calls-main-basic.log
62f4ab58a5dc12aa548e8611e563ca1c calls-main-basic.idc
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment