Read about our upcoming Code of Conduct on this issue

Commit 368521f8 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

fw-signature.h: fix bad merge

--HG--
branch : 1200D
parent 7f7a474c5437
......@@ -19,27 +19,16 @@
#define SIG_50D_109 0x4673ef59 // from FF010000
#define SIG_500D_111 0x44f49aef // from FF010000
#define SIG_5D2_212 0xae78b938 // from FF010000
#define SIG_7D_203 0x50163E93 // from FF010000
#define SIG_7D_MASTER_203 0x640BF4D1 // from FF010000
#define SIG_1100D_105 0x46de7624 // from FF010000
#define SIG_1200D_101 0x9d618f81 // identical to 1.0.0, except version and build date
#define SIG_1200D_102 0xba19c526 // QEMU
#define SIG_6D_112 0x6D677512
#define SIG_6D_113 0x6B6A9C6F
#define SIG_6D_116 0x11cb1ed2
#define SIG_5D3_113 0x2e2f65f5
#define SIG_5D3_123 0x672EEACE
#define SIG_EOSM_106 0x6393A881
#define SIG_EOSM_202 0x2D7c6dcf
#define SIG_7D_203 0x50163E93
#define SIG_7D_MASTER_203 0x640BF4D1
#define SIG_650D_104 0x4B7FC4D0
#define SIG_700D_111 0x645D8FD5
#define SIG_700D_113 0x5AE36B51
#define SIG_700D_114 0x4b35ce13
#define SIG_700D_115 0x4c2d9f68
#define SIG_100D_100A 0x2EBD343C
#define SIG_100D_100B 0x34443B7F
#define SIG_100D_100C 0x31eb5dfa
#define SIG_100D_101 0x3b82b55e
#define SIG_6D_116 0x11cb1ed2 // from FF0C0000
#define SIG_5D3_113 0x2e2f65f5 // from FF0C0000
#define SIG_EOSM_202 0x2D7c6dcf // from FF0C0000
#define SIG_650D_104 0x4B7FC4D0 // from FF0C0000
#define SIG_700D_114 0x4b35ce13 // from FF0C0000
#define SIG_100D_101 0x3b82b55e // from FF0C0000
static uint32_t compute_signature(uint32_t * start, uint32_t num)
{
......
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