#920 Open

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 7a3b5fa3f4c6
hg pull -r update-to-1100D.106 https://bitbucket.org/daniel_fort/magic-lantern
# Note: This will create a new head!
hg merge update-to-1100D.106
hg commit -m 'Merged in daniel_fort/magic-lantern/update-to-1100D.106 (pull request #920)'
  1. Daniel Fort

Update to the latest Canon firmware.

Comments (1)

  1. Daniel Fort author
    check-stubs.py platform/1100D.105/stubs.S platform/1100D.106/stubs.S 
    STUB                                                    OLD           NEW     DELTA
    current_interrupt                                    0x00000674 -> 0x00000674 [0x000]
    task_dispatch_hook                                   0x0000193c -> 0x0000193c [0x000]
    current_task                                         0x00001a2c -> 0x00001a2c [0x000]
    gui_main_struct                                      0x00001bf4 -> 0x00001bf4 [0x000]
    sounddev                                             0x00001e58 -> 0x00001e58 [0x000]
    dm_names                                             0x000028e4 -> 0x000028e4 [0x000]
    task_max                                             0x00002e00 -> 0x00002e00 [0x000]
    gui_timer_struct                                     0x00003ac8 -> 0x00003ac8 [0x000]
    mvr_config                                           0x00005b4c -> 0x00005b4c [0x000]
    additional_version                                   0x0000833c -> 0x0000833c [0x000]
    gui_task_list                                        0x0000af6c -> 0x0000af6c [0x000]
    cf_device                                            0x0001553c -> 0x0001553c [0x000]
    sd_device                                            0x00015560 -> 0x00015560 [0x000]
    LCD_Palette                                          0x0001c06c -> 0x0001c06c [0x000]
    bmp_vram_info                                        0x0001d86c -> 0x0001d86c [0x000]
    lv_path_struct                                       0x000736b4 -> 0x000736b4 [0x000]
    camera_engine                                        0xc0220000 -> 0xc0220000 [0x000]
    cstart                                               0xff011028 -> 0xff011028 [0x000] [!!!]
    create_init_task                                     0xff017f80 -> 0xff017f88 [0x008]
    _malloc                                              0xff018d34 -> 0xff018d3c [0x008]
    _free                                                0xff018d8c -> 0xff018d94 [0x008]
    init_task                                            0xff0197d8 -> 0xff0197e0 [0x008]
    gui_main_task                                        0xff020a40 -> 0xff020a48 [0x008]
    GUI_Control                                          0xff020dfc -> 0xff020e04 [0x008]
    gui_init_end                                         0xff02144c -> 0xff021454 [0x008]
    SRM_AllocateMemoryResourceFor1stJob                  0xff029268 -> 0xff029270 [0x008]
    SRM_FreeMemoryResourceFor1stJob                      0xff02bcf0 -> 0xff02bcf8 [0x008]
    StartASIFDMAADC                                      0xff0554c4 -> 0xff0554cc [0x008]
    StartASIFDMADAC                                      0xff055678 -> 0xff055680 [0x008]
    StopASIFDMADAC                                       0xff05574c -> 0xff055754 [0x008]
    SetNextASIFADCBuffer                                 0xff055c00 -> 0xff055c08 [0x008]
    SetNextASIFDACBuffer                                 0xff055cb8 -> 0xff055cc0 [0x008]
    sounddev_task                                        0xff057570 -> 0xff057578 [0x008]
    sounddev_active_in                                   0xff0579dc -> 0xff0579e4 [0x008]
    _prop_request_change                                 0xff05b45c -> 0xff05b464 [0x008]
    prop_deliver                                         0xff05ba3c -> 0xff05ba44 [0x008]
    prop_register_slave                                  0xff05bac4 -> 0xff05bacc [0x008]
    _prop_cleanup                                        0xff05bbe4 -> 0xff05bbec [0x008]
    LoadCalendarFromRTC                                  0xff0694e4 -> 0xff0694ec [0x008]
    _audio_ic_read                                       0xff0699f4 -> 0xff0699fc [0x008]
    _audio_ic_write                                      0xff069b38 -> 0xff069b40 [0x008]
    SetAudioVolumeOut                                    0xff069d88 -> 0xff069d90 [0x008]
    PowerAudioOutput                                     0xff069e9c -> 0xff069ea4 [0x008]
    SetSamplingRate                                      0xff069f88 -> 0xff069f90 [0x008]
    DryosDebugMsg                                        0xff06c914 -> 0xff06c91c [0x008]
    dm_set_store_level                                   0xff06cc74 -> 0xff06cc7c [0x008]
    call                                                 0xff06d7dc -> 0xff06d7e4 [0x008]
    SetHPTimerAfterNow                                   0xff06e260 -> 0xff06e268 [0x008]
    SetHPTimerNextTick                                   0xff06e354 -> 0xff06e35c [0x008]
    create_named_semaphore                               0xff06f40c -> 0xff06f414 [0x008]
    take_semaphore                                       0xff06f56c -> 0xff06f574 [0x008]
    give_semaphore                                       0xff06f654 -> 0xff06f65c [0x008]
    msleep                                               0xff06fa40 -> 0xff06fa48 [0x008]
    task_create                                          0xff06faf4 -> 0xff06fafc [0x008]
    GetSizeOfMaxRegion                                   0xff0706bc -> 0xff0706c4 [0x008]
    GetMemoryInformation                                 0xff070710 -> 0xff070718 [0x008]
    _AllocateMemory                                      0xff07096c -> 0xff070974 [0x008]
    _FreeMemory                                          0xff070cfc -> 0xff070d04 [0x008]
    CreateMemoryChunk                                    0xff0715bc -> 0xff0715c4 [0x008]
    GetMemoryAddressOfMemoryChunk                        0xff071b5c -> 0xff071b64 [0x008]
    DeleteMemorySuite                                    0xff071bd0 -> 0xff071bd8 [0x008]
    CreateMemorySuite                                    0xff071d9c -> 0xff071da4 [0x008]
    AddMemoryChunk                                       0xff072040 -> 0xff072048 [0x008]
    GetFirstChunkFromSuite                               0xff072114 -> 0xff07211c [0x008]
    GetNextMemoryChunk                                   0xff0728a8 -> 0xff0728b0 [0x008]
    CreateRecursiveLock                                  0xff073a7c -> 0xff073a84 [0x008]
    dma_memcpy                                           0xff073eb0 -> 0xff073eb8 [0x008]
    AllocateMemoryResource                               0xff074b1c -> 0xff074b24 [0x008]
    AllocateContinuousMemoryResource                     0xff074b68 -> 0xff074b70 [0x008]
    FreeMemoryResource                                   0xff074c80 -> 0xff074c88 [0x008]
    SetTimerAfter                                        0xff076270 -> 0xff076278 [0x008]
    CancelTimer                                          0xff076470 -> 0xff076478 [0x008]
    task_trampoline                                      0xff07c970 -> 0xff07c978 [0x008]
    SetGUIRequestMode                                    0xff0a3434 -> 0xff0a343c [0x008]
    gui_change_mode                                      0xff0a7420 -> 0xff0a7428 [0x008]
    gui_local_post                                       0xff0a7b90 -> 0xff0a7b98 [0x008]
    gui_other_post                                       0xff0a8128 -> 0xff0a8130 [0x008]
    mvrSetDefQScale                                      0xff1b9020 -> 0xff1b9028 [0x008]
    mvrSetFullHDOptSize                                  0xff1b9058 -> 0xff1b9060 [0x008]
    mvrSetGopOptSizeFULLHD                               0xff1b9248 -> 0xff1b9250 [0x008]
    mvrFixQScale                                         0xff1b9544 -> 0xff1b954c [0x008]
    SetEDmac                                             0xff1d34cc -> 0xff1d34d4 [0x008]
    ConnectWriteEDmac                                    0xff1d3584 -> 0xff1d358c [0x008]
    ConnectReadEDmac                                     0xff1d3648 -> 0xff1d3650 [0x008]
    StartEDmac                                           0xff1d37cc -> 0xff1d37d4 [0x008]
    AbortEDmac                                           0xff1d391c -> 0xff1d3924 [0x008]
    RegisterEDmacCompleteCBR                             0xff1d39bc -> 0xff1d39c4 [0x008]
    UnregisterEDmacCompleteCBR                           0xff1d39d0 -> 0xff1d39d8 [0x008]
    RegisterEDmacAbortCBR                                0xff1d39e4 -> 0xff1d39ec [0x008]
    UnregisterEDmacAbortCBR                              0xff1d3a24 -> 0xff1d3a2c [0x008]
    RegisterEDmacPopCBR                                  0xff1d3aec -> 0xff1d3af4 [0x008]
    UnregisterEDmacPopCBR                                0xff1d3b00 -> 0xff1d3b08 [0x008]
    shamem_read                                          0xff1d47b8 -> 0xff1d47c0 [0x008]
    _EngDrvOut                                           0xff1d48c8 -> 0xff1d48d0 [0x008]
    _engio_write                                         0xff1d4c8c -> 0xff1d4c94 [0x008]
    CreateResLockEntry                                   0xff1d787c -> 0xff1d7884 [0x008]
    LockEngineResources                                  0xff1d7dbc -> 0xff1d7dc4 [0x008]
    UnLockEngineResources                                0xff1d7ef8 -> 0xff1d7f00 [0x008]
    _FIO_OpenFile                                        0xff1d91c0 -> 0xff1d91c8 [0x008]
    _FIO_CreateFile                                      0xff1d927c -> 0xff1d9284 [0x008]
    _FIO_RemoveFile                                      0xff1d9328 -> 0xff1d9330 [0x008]
    _FIO_ReadFile                                        0xff1d93d0 -> 0xff1d93d8 [0x008]
    FIO_SeekSkipFile                                     0xff1d9480 -> 0xff1d9488 [0x008]
    _FIO_WriteFile                                       0xff1d9570 -> 0xff1d9578 [0x008]
    FIO_CloseFile                                        0xff1d9620 -> 0xff1d9628 [0x008]
    _FIO_GetFileSize                                     0xff1d979c -> 0xff1d97a4 [0x008]
    _FIO_RenameFile                                      0xff1d9c94 -> 0xff1d9c9c [0x008]
    _FIO_CreateDirectory                                 0xff1d9e5c -> 0xff1d9e64 [0x008]
    _FIO_FindFirstEx                                     0xff1da41c -> 0xff1da424 [0x008]
    FIO_FindNextEx                                       0xff1da510 -> 0xff1da518 [0x008]
    FIO_FindClose                                        0xff1da5f0 -> 0xff1da5f8 [0x008]
    msg_queue_create                                     0xff1e874c -> 0xff1e8754 [0x008]
    msg_queue_receive                                    0xff1e885c -> 0xff1e8864 [0x008]
    msg_queue_post                                       0xff1e8a48 -> 0xff1e8a50 [0x008]
    msg_queue_count                                      0xff1e8a88 -> 0xff1e8a90 [0x008]
    AcquireRecursiveLock                                 0xff1e8b94 -> 0xff1e8b9c [0x008]
    ReleaseRecursiveLock                                 0xff1e8ca8 -> 0xff1e8cb0 [0x008]
    vsnprintf                                            0xff1ebfe0 -> 0xff1ebfe8 [0x008]
    _alloc_dma_memory                                    0xff1efe08 -> 0xff1efe10 [0x008]
    _free_dma_memory                                     0xff1efe3c -> 0xff1efe44 [0x008]
    dialog_set_property_str                              0xff2277e8 -> 0xff2277f0 [0x008]
    ptp_register_handler                                 0xff2a35d4 -> 0xff2a35dc [0x008]
    dialog_redraw                                        0xff31d3ec -> 0xff31d3f4 [0x008]
    MirrorDisplay                                        0xff337c2c -> 0xff337c34 [0x008]
    ReverseDisplay                                       0xff337c5c -> 0xff337c64 [0x008]
    NormalDisplay                                        0xff337c8c -> 0xff337c94 [0x008]
    is_taskid_valid                                      0xff34e544 -> 0xff34e54c [0x008]
    ErrForCamera_handler                                 0xff35b728 -> 0xff35b730 [0x008]
    CancelDateTimer                                      0xff36c6a4 -> 0xff36c6ac [0x008]
    HideUnaviFeedBack_maybe                              0xff3714a4 -> 0xff3714ac [0x008]
    LiveViewApp_handler                                  0xff375f6c -> 0xff375f74 [0x008]
    LiveViewApp_handler_BL_JudgeBottomInfoDispTimerState 0xff3765f4 -> 0xff3765fc [0x008]
    LiveViewApp_handler_end                              0xff377c44 -> 0xff377c4c [0x008]
    ShootOlcApp_handler                                  0xff383ac8 -> 0xff383ad0 [0x008]
    PlayMain_handler                                     0xff38f290 -> 0xff38f298 [0x008]
    fsuDecodePartitionTable                              0xff41686c -> 0xff416878 [0x00c]
    ErrCardForLVApp_handler                              0xff45596c -> 0xff455978 [0x00c]
    PlayMovieGuideApp_handler                            0xff48b9d4 -> 0xff48b9dc [0x008]
    GetCFnData                                           0xff510c1c -> 0xff510c28 [0x00c]
    SetCFnData                                           0xff510e48 -> 0xff510e54 [0x00c]
    bzero32                                              0xff530984 -> 0xff530990 [0x00c]
    audio_thresholds                                     0xff5a67e4 -> 0xff5a67f4 [0x010]