#917 Open
Repository
daniel_fort
Branch
update-to-60D.112
Repository
hudson
Branch
unified

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

Update 60D from Canon firmware 1.1.1 to 1.1.2

Comments (1)

  1. Daniel Fort author
    check-stubs.py 60D.111/stubs.S 60D.112/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                                      0x00001cf8 -> 0x00001cf8 [0x000]
    sounddev                                             0x00001f50 -> 0x00001f50 [0x000]
    dm_names                                             0x00002d1c -> 0x00002d1c [0x000]
    task_max                                             0x00003234 -> 0x00003234 [0x000]
    gui_timer_struct                                     0x00004414 -> 0x00004414 [0x000]
    mvr_config                                           0x00005dd0 -> 0x00005dd0 [0x000]
    additional_version                                   0x000250d4 -> 0x000250d4 [0x000]
    gui_task_list                                        0x00028760 -> 0x00028760 [0x000]
    cf_device                                            0x000350fc -> 0x000350fc [0x000]
    sd_device                                            0x00035120 -> 0x00035120 [0x000]
    LCD_Palette                                          0x0003bfa4 -> 0x0003bfa4 [0x000]
    bmp_vram_info                                        0x0003d7b0 -> 0x0003d7b0 [0x000]
    lv_path_struct                                       0x00052940 -> 0x00052940 [0x000]
    camera_engine                                        0xc0220000 -> 0xc0220000 [0x000]
    msg_queue_count                                      0xf81d6d18 -> 0xf81d6d18 [0x000]
    cstart                                               0xff011028 -> 0xff011028 [0x000] [!!!]
    create_init_task                                     0xff017b68 -> 0xff017b68 [0x000] [!!!]
    _malloc                                              0xff01891c -> 0xff01891c [0x000] [!!!]
    _free                                                0xff018974 -> 0xff018974 [0x000] [!!!]
    init_task                                            0xff0193c0 -> 0xff0193c0 [0x000] [!!!]
    gui_main_task                                        0xff024144 -> 0xff024144 [0x000] [!!!]
    GUI_Control                                          0xff024500 -> 0xff024500 [0x000] [!!!]
    gui_init_end                                         0xff024b5c -> 0xff024b5c [0x000] [!!!]
    SRM_AllocateMemoryResourceFor1stJob                  0xff02cec4 -> 0xff02cec4 [0x000] [!!!]
    SRM_FreeMemoryResourceFor1stJob                      0xff02f764 -> 0xff02f764 [0x000] [!!!]
    StartASIFDMAADC                                      0xff055328 -> 0xff055328 [0x000] [!!!]
    StartASIFDMADAC                                      0xff0554dc -> 0xff0554dc [0x000] [!!!]
    StopASIFDMADAC                                       0xff0555b0 -> 0xff0555b0 [0x000] [!!!]
    SetNextASIFADCBuffer                                 0xff055af0 -> 0xff055af0 [0x000] [!!!]
    SetNextASIFDACBuffer                                 0xff055ba8 -> 0xff055ba8 [0x000] [!!!]
    sounddev_task                                        0xff056e4c -> 0xff056e4c [0x000] [!!!]
    sounddev_active_in                                   0xff0571bc -> 0xff0571bc [0x000] [!!!]
    _prop_request_change                                 0xff05a9f0 -> 0xff05a9f0 [0x000] [!!!]
    prop_deliver                                         0xff05afd0 -> 0xff05afd0 [0x000] [!!!]
    prop_register_slave                                  0xff05b058 -> 0xff05b058 [0x000] [!!!]
    _prop_cleanup                                        0xff05b178 -> 0xff05b178 [0x000] [!!!]
    LoadCalendarFromRTC                                  0xff067b68 -> 0xff067b68 [0x000] [!!!]
    _audio_ic_read                                       0xff068078 -> 0xff068078 [0x000] [!!!]
    _audio_ic_write                                      0xff0681c4 -> 0xff0681c4 [0x000] [!!!]
    SetAudioVolumeOut                                    0xff068478 -> 0xff068478 [0x000] [!!!]
    PowerAudioOutput                                     0xff0686f4 -> 0xff0686f4 [0x000] [!!!]
    SetSamplingRate                                      0xff06877c -> 0xff06877c [0x000] [!!!]
    DryosDebugMsg                                        0xff06b8dc -> 0xff06b8dc [0x000] [!!!]
    dm_set_store_level                                   0xff06bc3c -> 0xff06bc3c [0x000] [!!!]
    call                                                 0xff06c7a4 -> 0xff06c7a4 [0x000] [!!!]
    SetHPTimerAfterNow                                   0xff06d228 -> 0xff06d228 [0x000] [!!!]
    SetHPTimerNextTick                                   0xff06d31c -> 0xff06d31c [0x000] [!!!]
    create_named_semaphore                               0xff06e3d4 -> 0xff06e3d4 [0x000] [!!!]
    take_semaphore                                       0xff06e534 -> 0xff06e534 [0x000] [!!!]
    give_semaphore                                       0xff06e61c -> 0xff06e61c [0x000] [!!!]
    msleep                                               0xff06ea08 -> 0xff06ea08 [0x000] [!!!]
    task_create                                          0xff06eabc -> 0xff06eabc [0x000] [!!!]
    GetSizeOfMaxRegion                                   0xff06f684 -> 0xff06f684 [0x000] [!!!]
    GetMemoryInformation                                 0xff06f6d8 -> 0xff06f6d8 [0x000] [!!!]
    _AllocateMemory                                      0xff06f934 -> 0xff06f934 [0x000] [!!!]
    _FreeMemory                                          0xff06fcc4 -> 0xff06fcc4 [0x000] [!!!]
    CreateMemoryChunk                                    0xff070584 -> 0xff070584 [0x000] [!!!]
    GetMemoryAddressOfMemoryChunk                        0xff070af0 -> 0xff070af0 [0x000] [!!!]
    DeleteMemorySuite                                    0xff070b64 -> 0xff070b64 [0x000] [!!!]
    CreateMemorySuite                                    0xff070d34 -> 0xff070d34 [0x000] [!!!]
    AddMemoryChunk                                       0xff070fd4 -> 0xff070fd4 [0x000] [!!!]
    GetFirstChunkFromSuite                               0xff0710a8 -> 0xff0710a8 [0x000] [!!!]
    GetNextMemoryChunk                                   0xff071840 -> 0xff071840 [0x000] [!!!]
    msg_queue_create                                     0xff072830 -> 0xff072830 [0x000] [!!!]
    CreateRecursiveLock                                  0xff072a14 -> 0xff072a14 [0x000] [!!!]
    AllocateMemoryResource                               0xff073aa8 -> 0xff073aa8 [0x000] [!!!]
    AllocateContinuousMemoryResource                     0xff073af4 -> 0xff073af4 [0x000] [!!!]
    FreeMemoryResource                                   0xff073c0c -> 0xff073c0c [0x000] [!!!]
    SetTimerAfter                                        0xff0751ac -> 0xff0751ac [0x000] [!!!]
    CancelTimer                                          0xff0753ac -> 0xff0753ac [0x000] [!!!]
    task_trampoline                                      0xff07b8ac -> 0xff07b8ac [0x000] [!!!]
    SetGUIRequestMode                                    0xff0a4040 -> 0xff0a4040 [0x000] [!!!]
    mvrSetDefQScale                                      0xff1adbcc -> 0xff1adbcc [0x000] [!!!]
    mvrFixQScale                                         0xff1ae0f0 -> 0xff1ae0f0 [0x000] [!!!]
    SetEDmac                                             0xff1c42a8 -> 0xff1c42a8 [0x000] [!!!]
    ConnectWriteEDmac                                    0xff1c4360 -> 0xff1c4360 [0x000] [!!!]
    ConnectReadEDmac                                     0xff1c4424 -> 0xff1c4424 [0x000] [!!!]
    StartEDmac                                           0xff1c45a8 -> 0xff1c45a8 [0x000] [!!!]
    AbortEDmac                                           0xff1c46f8 -> 0xff1c46f8 [0x000] [!!!]
    RegisterEDmacCompleteCBR                             0xff1c4798 -> 0xff1c4798 [0x000] [!!!]
    UnregisterEDmacCompleteCBR                           0xff1c47ac -> 0xff1c47ac [0x000] [!!!]
    RegisterEDmacAbortCBR                                0xff1c47c0 -> 0xff1c47c0 [0x000] [!!!]
    UnregisterEDmacAbortCBR                              0xff1c4800 -> 0xff1c4800 [0x000] [!!!]
    RegisterEDmacPopCBR                                  0xff1c48c8 -> 0xff1c48c8 [0x000] [!!!]
    UnregisterEDmacPopCBR                                0xff1c48dc -> 0xff1c48dc [0x000] [!!!]
    shamem_read                                          0xff1c5594 -> 0xff1c5594 [0x000] [!!!]
    _EngDrvOut                                           0xff1c56a4 -> 0xff1c56a4 [0x000] [!!!]
    _engio_write                                         0xff1c5a68 -> 0xff1c5a68 [0x000] [!!!]
    CreateResLockEntry                                   0xff1c8658 -> 0xff1c8658 [0x000] [!!!]
    LockEngineResources                                  0xff1c8b98 -> 0xff1c8b98 [0x000] [!!!]
    UnLockEngineResources                                0xff1c8cd4 -> 0xff1c8cd4 [0x000] [!!!]
    _FIO_OpenFile                                        0xff1c9f9c -> 0xff1c9f9c [0x000] [!!!]
    _FIO_CreateFile                                      0xff1ca058 -> 0xff1ca058 [0x000] [!!!]
    _FIO_RemoveFile                                      0xff1ca104 -> 0xff1ca104 [0x000] [!!!]
    _FIO_ReadFile                                        0xff1ca1ac -> 0xff1ca1ac [0x000] [!!!]
    FIO_SeekSkipFile                                     0xff1ca25c -> 0xff1ca25c [0x000] [!!!]
    _FIO_WriteFile                                       0xff1ca34c -> 0xff1ca34c [0x000] [!!!]
    FIO_CloseFile                                        0xff1ca3fc -> 0xff1ca3fc [0x000] [!!!]
    _FIO_GetFileSize                                     0xff1ca578 -> 0xff1ca578 [0x000] [!!!]
    _FIO_RenameFile                                      0xff1caa70 -> 0xff1caa70 [0x000] [!!!]
    _FIO_CreateDirectory                                 0xff1cac38 -> 0xff1cac38 [0x000] [!!!]
    _FIO_FindFirstEx                                     0xff1cb1f8 -> 0xff1cb1f8 [0x000] [!!!]
    FIO_FindNextEx                                       0xff1cb2ec -> 0xff1cb2ec [0x000] [!!!]
    FIO_FindClose                                        0xff1cb3cc -> 0xff1cb3cc [0x000] [!!!]
    msg_queue_receive                                    0xff1d6aec -> 0xff1d6aec [0x000] [!!!]
    msg_queue_post                                       0xff1d6cd8 -> 0xff1d6cd8 [0x000] [!!!]
    AcquireRecursiveLock                                 0xff1d6e24 -> 0xff1d6e24 [0x000] [!!!]
    ReleaseRecursiveLock                                 0xff1d6f38 -> 0xff1d6f38 [0x000] [!!!]
    vsnprintf                                            0xff1da530 -> 0xff1da530 [0x000] [!!!]
    _alloc_dma_memory                                    0xff1de354 -> 0xff1de354 [0x000] [!!!]
    _free_dma_memory                                     0xff1de388 -> 0xff1de388 [0x000] [!!!]
    GUI_SetRollingPitchingLevelStatus                    0xff20ba90 -> 0xff20ba90 [0x000] [!!!]
    dialog_set_property_str                              0xff21adcc -> 0xff21adcc [0x000] [!!!]
    ptp_register_handler                                 0xff29352c -> 0xff29352c [0x000] [!!!]
    dialog_redraw                                        0xff30800c -> 0xff30800c [0x000] [!!!]
    MirrorDisplay                                        0xff325704 -> 0xff325704 [0x000] [!!!]
    ReverseDisplay                                       0xff325734 -> 0xff325734 [0x000] [!!!]
    NormalDisplay                                        0xff325764 -> 0xff325764 [0x000] [!!!]
    is_taskid_valid                                      0xff33ef30 -> 0xff33ef30 [0x000] [!!!]
    ErrForCamera_handler                                 0xff34c034 -> 0xff34c034 [0x000] [!!!]
    CancelDateTimer                                      0xff35cb2c -> 0xff35cb2c [0x000] [!!!]
    PlayMain_handler                                     0xff363a54 -> 0xff363a54 [0x000] [!!!]
    HideUnaviFeedBack_maybe                              0xff36e760 -> 0xff36e760 [0x000] [!!!]
    LiveViewApp_handler                                  0xff372278 -> 0xff372278 [0x000] [!!!]
    LiveViewApp_handler_BL_JudgeBottomInfoDispTimerState 0xff37283c -> 0xff37283c [0x000] [!!!]
    LiveViewApp_handler_end                              0xff373e20 -> 0xff373e20 [0x000] [!!!]
    ShootOlcApp_handler                                  0xff381860 -> 0xff381860 [0x000] [!!!]
    fsuDecodePartitionTable                              0xff404ac4 -> 0xff404ac8 [0x004]
    PlayMovieGuideApp_handler                            0xff451514 -> 0xff451518 [0x004]
    ErrCardForLVApp_handler                              0xff4687dc -> 0xff4687e0 [0x004]
    GetCFnData                                           0xff51bbb0 -> 0xff51bbb4 [0x004]
    SetCFnData                                           0xff51bdb8 -> 0xff51bdbc [0x004]
    bzero32                                              0xff53801c -> 0xff538020 [0x004]
    audio_thresholds                                     0xff5ada3c -> 0xff5ada3c [0x000] [!!!]