#926 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-6D.118 https://bitbucket.org/daniel_fort/magic-lantern
# Note: This will create a new head!
hg merge update-to-6D.118
hg commit -m 'Merged in daniel_fort/magic-lantern/update-to-6D.118 (pull request #926)'
  1. Daniel Fort

Update Canon firmware from 1.1.6 to 1.1.8 on the 6D

Comments (1)

  1. Daniel Fort author
    check-stubs.py platform/6D.116/stubs.S platform/6D.118/stubs.S 
    STUB                                                    OLD           NEW     DELTA
    current_interrupt                                    0x0000064c -> 0x0000064c [0x000]
    create_init_task                                     0x00003168 -> 0x00003168 [0x000]
    DryosDebugMsg                                        0x000067c8 -> 0x00006824 [0x05c]
    dm_set_store_level                                   0x00006b34 -> 0x00006b90 [0x05c]
    SetHPTimerAfterNow                                   0x00007e44 -> 0x00007ea0 [0x05c]
    SetHPTimerNextTick                                   0x00007f34 -> 0x00007f90 [0x05c]
    create_named_semaphore                               0x0000904c -> 0x000090a8 [0x05c]
    take_semaphore                                       0x000091ac -> 0x00009208 [0x05c]
    give_semaphore                                       0x00009298 -> 0x000092f4 [0x05c]
    msleep                                               0x00009688 -> 0x000096e4 [0x05c]
    task_create                                          0x0000973c -> 0x00009798 [0x05c]
    GetSizeOfMaxRegion                                   0x0000a318 -> 0x0000a374 [0x05c]
    GetMemoryInformation                                 0x0000a36c -> 0x0000a3c8 [0x05c]
    _AllocateMemory                                      0x0000a5cc -> 0x0000a628 [0x05c]
    _FreeMemory                                          0x0000a968 -> 0x0000a9c4 [0x05c]
    CreateMemoryChunk                                    0x0000b230 -> 0x0000b28c [0x05c]
    GetMemoryAddressOfMemoryChunk                        0x0000b7d4 -> 0x0000b830 [0x05c]
    DeleteMemorySuite                                    0x0000b848 -> 0x0000b8a4 [0x05c]
    CreateMemorySuite                                    0x0000ba50 -> 0x0000baac [0x05c]
    AddMemoryChunk                                       0x0000bd2c -> 0x0000bd88 [0x05c]
    GetFirstChunkFromSuite                               0x0000bdfc -> 0x0000be58 [0x05c]
    GetNextMemoryChunk                                   0x0000c598 -> 0x0000c5f4 [0x05c]
    msg_queue_create                                     0x0000cde8 -> 0x0000ce44 [0x05c]
    CreateRecursiveLock                                  0x0000cfd0 -> 0x0000d02c [0x05c]
    dma_memcpy                                           0x0000d334 -> 0x0000d390 [0x05c]
    SetTimerAfter                                        0x0000e3ac -> 0x0000e408 [0x05c]
    CancelTimer                                          0x0000e5ac -> 0x0000e608 [0x05c]
    task_trampoline                                      0x0000ea60 -> 0x0000eabc [0x05c]
    SetEDmac                                             0x00034058 -> 0x000340b4 [0x05c]
    ConnectWriteEDmac                                    0x000341b8 -> 0x00034214 [0x05c]
    ConnectReadEDmac                                     0x0003427c -> 0x000342d8 [0x05c]
    StartEDmac                                           0x00034404 -> 0x00034460 [0x05c]
    AbortEDmac                                           0x00034728 -> 0x00034784 [0x05c]
    RegisterEDmacCompleteCBR                             0x000347c8 -> 0x00034824 [0x05c]
    UnregisterEDmacCompleteCBR                           0x00034804 -> 0x00034860 [0x05c]
    RegisterEDmacAbortCBR                                0x0003485c -> 0x000348b8 [0x05c]
    UnregisterEDmacAbortCBR                              0x00034898 -> 0x000348f4 [0x05c]
    RegisterEDmacPopCBR                                  0x000348f0 -> 0x0003494c [0x05c]
    UnregisterEDmacPopCBR                                0x0003492c -> 0x00034988 [0x05c]
    msg_queue_receive                                    0x00036880 -> 0x000368dc [0x05c]
    msg_queue_post                                       0x00036a6c -> 0x00036ac8 [0x05c]
    msg_queue_count                                      0x00036aac -> 0x00036b08 [0x05c]
    AcquireRecursiveLock                                 0x00036bb8 -> 0x00036c14 [0x05c]
    ReleaseRecursiveLock                                 0x00036ccc -> 0x00036d28 [0x05c]
    vsnprintf                                            0x000381f4 -> 0x00038250 [0x05c]
    TryPostStageEvent                                    0x00039874 -> 0x000398d0 [0x05c]
    TryPostStageEvent_end                                0x000398d4 -> 0x00039930 [0x05c]
    TryPostEvent                                         0x00039f54 -> 0x00039fb0 [0x05c]
    TryPostEvent_end                                     0x00039fb4 -> 0x0003a010 [0x05c]
    _alloc_dma_memory                                    0x0003a19c -> 0x0003a1f8 [0x05c]
    _free_dma_memory                                     0x0003a1d0 -> 0x0003a22c [0x05c]
    is_taskid_valid                                      0x0004bb0c -> 0x0004bb68 [0x05c]
    bzero32                                              0x0006be64 -> 0x0006bec0 [0x05c]
    task_dispatch_hook                                   0x00074b1c -> 0x00074b74 [0x058]
    pre_isr_hook                                         0x00074b20 -> 0x00074b78 [0x058]
    post_isr_hook                                        0x00074b24 -> 0x00074b7c [0x058]
    current_task                                         0x00074c28 -> 0x00074c80 [0x058]
    gui_main_struct                                      0x00074f60 -> 0x00074fb8 [0x058]
    sounddev                                             0x00075330 -> 0x00075388 [0x058]
    dm_names                                             0x000758d8 -> 0x00075930 [0x058]
    task_max                                             0x00075f58 -> 0x00075fb4 [0x05c]
    mvr_config                                           0x0007aedc -> 0x0007af34 [0x058]
    gui_task_list                                        0x000829ac -> 0x00082a04 [0x058]
    sd_device                                            0x0008d6a4 -> 0x0008d6fc [0x058]
    LCD_Palette                                          0x0009a498 -> 0x0009a4f8 [0x060]
    bmp_vram_info                                        0x0009bc98 -> 0x0009bcf8 [0x060]
    camera_engine                                        0xc0220000 -> 0xc0220000 [0x000]
    cstart                                               0xff0c1ba8 -> 0xff0c1ba8 [0x000]
    init_task                                            0xff0c5438 -> 0xff0c5434 [0x004]
    _malloc                                              0xff0c8d50 -> 0xff0c8d4c [0x004]
    _free                                                0xff0c8da8 -> 0xff0c8da4 [0x004]
    gui_main_task                                        0xff0df594 -> 0xff0df590 [0x004]
    GUI_Control                                          0xff0df968 -> 0xff0df964 [0x004]
    GUI_ChangeMode                                       0xff0dfb24 -> 0xff0dfb20 [0x004]
    gui_init_end                                         0xff0dffdc -> 0xff0dffd8 [0x004]
    SRM_AllocateMemoryResourceFor1stJob                  0xff0f0090 -> 0xff0f0088 [0x008]
    SRM_FreeMemoryResourceFor1stJob                      0xff0f40c0 -> 0xff0f40b8 [0x008]
    StartASIFDMAADC                                      0xff11c5c8 -> 0xff11c5c0 [0x008]
    SoundDevShutDownIn                                   0xff11c874 -> 0xff11c86c [0x008]
    StopASIFDMAADC                                       0xff11c874 -> 0xff11c86c [0x008]
    StartASIFDMADAC                                      0xff11c99c -> 0xff11c994 [0x008]
    StopASIFDMADAC                                       0xff11cc1c -> 0xff11cc14 [0x008]
    SetASIFMode                                          0xff11cd44 -> 0xff11cd3c [0x008]
    SetNextASIFADCBuffer                                 0xff11d0e4 -> 0xff11d0dc [0x008]
    SetNextASIFDACBuffer                                 0xff11d2cc -> 0xff11d2c4 [0x008]
    sounddev_task                                        0xff11e244 -> 0xff11e23c [0x008]
    SoundDevActiveIn                                     0xff11e64c -> 0xff11e644 [0x008]
    SetAudioVolumeIn                                     0xff11e9ec -> 0xff11e9e4 [0x008]
    SetAudioVolumeOut                                    0xff11ea20 -> 0xff11ea18 [0x008]
    prop_register_slave                                  0xff12fb7c -> 0xff12fb74 [0x008]
    _prop_request_change                                 0xff12fd6c -> 0xff12fd64 [0x008]
    prop_deliver                                         0xff1302e8 -> 0xff1302e0 [0x008]
    _prop_cleanup                                        0xff1303b4 -> 0xff1303ac [0x008]
    LoadCalendarFromRTC                                  0xff140bf8 -> 0xff140bf0 [0x008]
    _audio_ic_write_bulk                                 0xff1422a8 -> 0xff1422a0 [0x008]
    _audio_ic_read                                       0xff142608 -> 0xff142600 [0x008]
    PowerAudioOutput                                     0xff142d60 -> 0xff142d58 [0x008]
    SetSamplingRate                                      0xff142ddc -> 0xff142dd4 [0x008]
    call                                                 0xff14683c -> 0xff146834 [0x008]
    AllocateMemoryResource                               0xff14a41c -> 0xff14a414 [0x008]
    AllocateContinuousMemoryResource                     0xff14a468 -> 0xff14a460 [0x008]
    FreeMemoryResource                                   0xff14a580 -> 0xff14a578 [0x008]
    SetGUIRequestMode                                    0xff18dfe0 -> 0xff18dfd8 [0x008]
    Gui_SetSoundRecord                                   0xff19b440 -> 0xff19b438 [0x008]
    GUI_SetRollingPitchingLevelStatus                    0xff270950 -> 0xff27098c [0x03c]
    ptp_register_handler                                 0xff292a10 -> 0xff292a4c [0x03c]
    _EngDrvOut                                           0xff2ade1c -> 0xff2ade58 [0x03c]
    shamem_read                                          0xff2adeb8 -> 0xff2adef4 [0x03c]
    _engio_write                                         0xff2ae134 -> 0xff2ae170 [0x03c]
    CreateResLockEntry                                   0xff2b2090 -> 0xff2b20cc [0x03c]
    LockEngineResources                                  0xff2b2550 -> 0xff2b258c [0x03c]
    UnLockEngineResources                                0xff2b26f4 -> 0xff2b2730 [0x03c]
    _FIO_OpenFile                                        0xff33251c -> 0xff332578 [0x05c]
    _FIO_CreateFile                                      0xff3325d8 -> 0xff332634 [0x05c]
    _FIO_RemoveFile                                      0xff332684 -> 0xff3326e0 [0x05c]
    _FIO_ReadFile                                        0xff33272c -> 0xff332788 [0x05c]
    FIO_SeekSkipFile                                     0xff3327dc -> 0xff332838 [0x05c]
    _FIO_WriteFile                                       0xff3328cc -> 0xff332928 [0x05c]
    FIO_CloseFile                                        0xff33297c -> 0xff3329d8 [0x05c]
    _FIO_GetFileSize                                     0xff332af8 -> 0xff332b54 [0x05c]
    _FIO_RenameFile                                      0xff333010 -> 0xff33306c [0x05c]
    _FIO_CreateDirectory                                 0xff3331d8 -> 0xff333234 [0x05c]
    _FIO_FindFirstEx                                     0xff3337a0 -> 0xff3337fc [0x05c]
    FIO_FindNextEx                                       0xff333894 -> 0xff3338f0 [0x05c]
    FIO_FindClose                                        0xff333974 -> 0xff3339d0 [0x05c]
    PlayMain_handler                                     0xff3a195c -> 0xff3a19b8 [0x05c]
    dialog_redraw                                        0xff4b5644 -> 0xff4b5844 [0x200]
    ErrForCamera_handler                                 0xff50cd18 -> 0xff50cf18 [0x200]
    CancelDateTimer                                      0xff51b038 -> 0xff51b238 [0x200]
    dialog_set_property_str                              0xff51e234 -> 0xff51e434 [0x200]
    HideUnaviFeedBack_maybe                              0xff52aa6c -> 0xff52ac6c [0x200]
    LiveViewApp_handler_BL_JudgeBottomInfoDispTimerState 0xff52cbcc -> 0xff52cdcc [0x200]
    LiveViewApp_handler                                  0xff52d000 -> 0xff52d200 [0x200]
    ShootOlcApp_handler                                  0xff53a39c -> 0xff53a59c [0x200]
    PlayMovieGuideApp_handler                            0xff5593b4 -> 0xff5595b4 [0x200]
    fsuDecodePartitionTable                              0xff654f88 -> 0xff65518c [0x204]
    GetCFnData                                           0xff69d0e8 -> 0xff69d2ec [0x204]
    SetCFnData                                           0xff69d1d0 -> 0xff69d3d4 [0x204]
    ErrCardForLVApp_handler                              0xff6bef3c -> 0xff6bf14c [0x210]
    LiveViewShutterApp_handler                           0xff713b40 -> 0xff713d50 [0x210]
    LiveViewWifiApp_handler                              0xff71df54 -> 0xff71e164 [0x210]
    audio_thresholds                                     0xff9d08a4 -> 0xff9d0a9c [0x1f8]