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

Minor firmware update from 1.1.1 to 1.1.2

Forum discussion:

https://www.magiclantern.fm/forum/index.php?topic=11864.msg199872#msg199872

Comments (1)

  1. Daniel Fort author
    check-stubs.py 500D.111/stubs.S 500D.112/stubs.S 
    
    STUB                                   OLD           NEW     DELTA
    current_interrupt                   0x00000668 -> 0x00000668 [0x000]
    task_dispatch_hook                  0x00001934 -> 0x00001934 [0x000]
    current_task                        0x00001a74 -> 0x00001a74 [0x000]
    gui_main_struct                     0x00001c70 -> 0x00001c70 [0x000]
    sounddev                            0x00001f04 -> 0x00001f04 [0x000]
    dm_names                            0x00002d18 -> 0x00002d18 [0x000]
    task_max                            0x000031dc -> 0x000031dc [0x000]
    gui_timer_struct                    0x00003b90 -> 0x00003b90 [0x000]
    mvr_config                          0x00008684 -> 0x00008684 [0x000]
    additional_version                  0x000150fc -> 0x000150fc [0x000]
    gui_task_list                       0x0001874c -> 0x0001874c [0x000]
    cf_device                           0x000235e0 -> 0x000235e0 [0x000]
    sd_device                           0x00023624 -> 0x00023624 [0x000]
    bmp_vram_info                       0x00027e04 -> 0x00027e04 [0x000]
    LCD_Palette                         0x00027e40 -> 0x00027e40 [0x000]
    camera_engine                       0xc0220000 -> 0xc0220000 [0x000]
    cstart                              0xff010894 -> 0xff010894 [0x000] [!!!]
    init_task                           0xff011dbc -> 0xff011dbc [0x000] [!!!]
    create_init_task                    0xff0174e0 -> 0xff0174e0 [0x000] [!!!]
    is_taskid_valid                     0xff018338 -> 0xff018338 [0x000] [!!!]
    _malloc                             0xff018f70 -> 0xff018f70 [0x000] [!!!]
    _free                               0xff019044 -> 0xff019044 [0x000] [!!!]
    gui_main_task                       0xff022a9c -> 0xff022a9c [0x000] [!!!]
    GUI_Control                         0xff022f64 -> 0xff022f64 [0x000] [!!!]
    GUI_ChangeMode                      0xff023164 -> 0xff023164 [0x000] [!!!]
    gui_init_end                        0xff023450 -> 0xff023450 [0x000] [!!!]
    SRM_AllocateMemoryResourceFor1stJob 0xff02a788 -> 0xff02a788 [0x000] [!!!]
    SRM_FreeMemoryResourceFor1stJob     0xff02c6f8 -> 0xff02c6f8 [0x000] [!!!]
    StartASIFDMAADC                     0xff053614 -> 0xff053614 [0x000] [!!!]
    StartASIFDMADAC                     0xff0537b0 -> 0xff0537b0 [0x000] [!!!]
    StopASIFDMADAC                      0xff053880 -> 0xff053880 [0x000] [!!!]
    SetNextASIFADCBuffer                0xff053d7c -> 0xff053d7c [0x000] [!!!]
    SetNextASIFDACBuffer                0xff053e34 -> 0xff053e34 [0x000] [!!!]
    sounddev_task                       0xff0549e8 -> 0xff0549e8 [0x000] [!!!]
    sounddev_active_in                  0xff054b8c -> 0xff054b8c [0x000] [!!!]
    _audio_ic_write                     0xff056064 -> 0xff056064 [0x000] [!!!]
    SetSamplingRate                     0xff056584 -> 0xff056584 [0x000] [!!!]
    SetAudioVolumeOut                   0xff056810 -> 0xff056810 [0x000] [!!!]
    PowerAudioOutput                    0xff056d70 -> 0xff056d70 [0x000] [!!!]
    _audio_ic_read                      0xff056eb0 -> 0xff056eb0 [0x000] [!!!]
    prop_deliver                        0xff0597e0 -> 0xff0597e0 [0x000] [!!!]
    prop_register_slave                 0xff059868 -> 0xff059868 [0x000] [!!!]
    _prop_cleanup                       0xff05993c -> 0xff05993c [0x000] [!!!]
    _prop_request_change                0xff059988 -> 0xff059988 [0x000] [!!!]
    LoadCalendarFromRTC                 0xff0642d0 -> 0xff0642d0 [0x000] [!!!]
    DryosDebugMsg                       0xff066a98 -> 0xff066a98 [0x000] [!!!]
    dm_set_store_level                  0xff066de4 -> 0xff066de4 [0x000] [!!!]
    call                                0xff067828 -> 0xff067828 [0x000] [!!!]
    SetHPTimerAfterNow                  0xff068268 -> 0xff068268 [0x000] [!!!]
    SetHPTimerNextTick                  0xff0682e8 -> 0xff0682e8 [0x000] [!!!]
    msg_queue_create                    0xff0693c0 -> 0xff0693c0 [0x000] [!!!]
    msg_queue_receive                   0xff0694d0 -> 0xff0694d0 [0x000] [!!!]
    msg_queue_post                      0xff0696bc -> 0xff0696bc [0x000] [!!!]
    msg_queue_count                     0xff0696fc -> 0xff0696fc [0x000] [!!!]
    create_named_semaphore              0xff069770 -> 0xff069770 [0x000] [!!!]
    take_semaphore                      0xff0698d0 -> 0xff0698d0 [0x000] [!!!]
    give_semaphore                      0xff0699b8 -> 0xff0699b8 [0x000] [!!!]
    msleep                              0xff069d74 -> 0xff069d74 [0x000] [!!!]
    task_create                         0xff069e2c -> 0xff069e2c [0x000] [!!!]
    GetSizeOfMaxRegion                  0xff06aa04 -> 0xff06aa04 [0x000] [!!!]
    GetMemoryInformation                0xff06aa58 -> 0xff06aa58 [0x000] [!!!]
    _AllocateMemory                     0xff06acb4 -> 0xff06acb4 [0x000] [!!!]
    _FreeMemory                         0xff06b044 -> 0xff06b044 [0x000] [!!!]
    CreateMemoryChunk                   0xff06b90c -> 0xff06b90c [0x000] [!!!]
    GetMemoryAddressOfMemoryChunk       0xff06be78 -> 0xff06be78 [0x000] [!!!]
    DeleteMemorySuite                   0xff06beec -> 0xff06beec [0x000] [!!!]
    CreateMemorySuite                   0xff06c0d0 -> 0xff06c0d0 [0x000] [!!!]
    AddMemoryChunk                      0xff06c3a8 -> 0xff06c3a8 [0x000] [!!!]
    GetFirstChunkFromSuite              0xff06c494 -> 0xff06c494 [0x000] [!!!]
    GetNextMemoryChunk                  0xff06cc4c -> 0xff06cc4c [0x000] [!!!]
    CreateRecursiveLock                 0xff06dec0 -> 0xff06dec0 [0x000] [!!!]
    AllocateMemoryResource              0xff06ee88 -> 0xff06ee88 [0x000] [!!!]
    AllocateContinuousMemoryResource    0xff06eecc -> 0xff06eecc [0x000] [!!!]
    FreeMemoryResource                  0xff06efdc -> 0xff06efdc [0x000] [!!!]
    SetTimerAfter                       0xff070500 -> 0xff070500 [0x000] [!!!]
    CancelTimer                         0xff070700 -> 0xff070700 [0x000] [!!!]
    task_trampoline                     0xff072b30 -> 0xff072b30 [0x000] [!!!]
    DispSensorStart                     0xff079b68 -> 0xff079b68 [0x000] [!!!]
    SetGUIRequestMode                   0xff08eb90 -> 0xff08eb90 [0x000] [!!!]
    gui_massive_event_loop              0xff08f638 -> 0xff08f638 [0x000] [!!!]
    gui_change_mode                     0xff090c4c -> 0xff090c4c [0x000] [!!!]
    gui_local_post                      0xff091114 -> 0xff091114 [0x000] [!!!]
    gui_other_post                      0xff0915f0 -> 0xff0915f0 [0x000] [!!!]
    gui_post_10000085                   0xff091720 -> 0xff091720 [0x000] [!!!]
    gui_change_shoot_type_post          0xff0917d4 -> 0xff0917d4 [0x000] [!!!]
    gui_change_lcd_state_post           0xff09186c -> 0xff09186c [0x000] [!!!]
    gui_init_event                      0xff091e9c -> 0xff091e9c [0x000] [!!!]
    mvrSetDefQScale                     0xff17be38 -> 0xff17be38 [0x000] [!!!]
    mvrSetFullHDOptSize                 0xff17be70 -> 0xff17be70 [0x000] [!!!]
    mvrFixQScale                        0xff17c2ac -> 0xff17c2ac [0x000] [!!!]
    SetEDmac                            0xff18fb4c -> 0xff18fb4c [0x000] [!!!]
    ConnectWriteEDmac                   0xff18fb68 -> 0xff18fb68 [0x000] [!!!]
    ConnectReadEDmac                    0xff18fb90 -> 0xff18fb90 [0x000] [!!!]
    StartEDmac                          0xff18fbf0 -> 0xff18fbf0 [0x000] [!!!]
    AbortEDmac                          0xff18fcc0 -> 0xff18fcc0 [0x000] [!!!]
    RegisterEDmacCompleteCBR            0xff18fd60 -> 0xff18fd60 [0x000] [!!!]
    UnregisterEDmacCompleteCBR          0xff18fd74 -> 0xff18fd74 [0x000] [!!!]
    RegisterEDmacAbortCBR               0xff18fd88 -> 0xff18fd88 [0x000] [!!!]
    UnregisterEDmacAbortCBR             0xff18fe30 -> 0xff18fe30 [0x000] [!!!]
    RegisterEDmacPopCBR                 0xff18fe60 -> 0xff18fe60 [0x000] [!!!]
    UnregisterEDmacPopCBR               0xff18fe74 -> 0xff18fe74 [0x000] [!!!]
    _EngDrvOut                          0xff190b84 -> 0xff190b84 [0x000] [!!!]
    shamem_read                         0xff190be8 -> 0xff190be8 [0x000] [!!!]
    _engio_write                        0xff190cf4 -> 0xff190cf4 [0x000] [!!!]
    CreateResLockEntry                  0xff19384c -> 0xff19384c [0x000] [!!!]
    UnLockEngineResources               0xff193ed0 -> 0xff193ed0 [0x000] [!!!]
    LockEngineResources                 0xff194190 -> 0xff194190 [0x000] [!!!]
    _FIO_OpenFile                       0xff196338 -> 0xff196338 [0x000] [!!!]
    _FIO_CreateFile                     0xff1963ec -> 0xff1963ec [0x000] [!!!]
    FIO_CloseFile                       0xff196494 -> 0xff196494 [0x000] [!!!]
    _FIO_RemoveFile                     0xff196608 -> 0xff196608 [0x000] [!!!]
    _FIO_ReadFile                       0xff196724 -> 0xff196724 [0x000] [!!!]
    FIO_SeekSkipFile                    0xff1967d4 -> 0xff1967d4 [0x000] [!!!]
    _FIO_WriteFile                      0xff1968d4 -> 0xff1968d4 [0x000] [!!!]
    _FIO_GetFileSize                    0xff196a88 -> 0xff196a88 [0x000] [!!!]
    _FIO_CreateDirectory                0xff196cf8 -> 0xff196cf8 [0x000] [!!!]
    _FIO_FindFirstEx                    0xff197378 -> 0xff197378 [0x000] [!!!]
    FIO_FindNextEx                      0xff1974a4 -> 0xff1974a4 [0x000] [!!!]
    FIO_FindClose                       0xff1975a4 -> 0xff1975a4 [0x000] [!!!]
    gui_timer_something                 0xff1a09ac -> 0xff1a09ac [0x000] [!!!]
    AcquireRecursiveLock                0xff1a0d44 -> 0xff1a0d44 [0x000] [!!!]
    ReleaseRecursiveLock                0xff1a0e58 -> 0xff1a0e58 [0x000] [!!!]
    vsnprintf                           0xff1a442c -> 0xff1a442c [0x000] [!!!]
    _alloc_dma_memory                   0xff1a7298 -> 0xff1a7298 [0x000] [!!!]
    _free_dma_memory                    0xff1a72cc -> 0xff1a72cc [0x000] [!!!]
    GUI_SetLvMode                       0xff1becf4 -> 0xff1becf4 [0x000] [!!!]
    ptp_register_handler                0xff20c498 -> 0xff20c498 [0x000] [!!!]
    dialog_redraw                       0xff269270 -> 0xff269270 [0x000] [!!!]
    ErrForCamera_handler                0xff2a0d94 -> 0xff2a0d94 [0x000] [!!!]
    LiveViewApp_handler                 0xff2ae79c -> 0xff2ae79c [0x000] [!!!]
    CancelDateTimer                     0xff2b80ac -> 0xff2b80ac [0x000] [!!!]
    PlayMain_handler                    0xff2be2f4 -> 0xff2be2f4 [0x000] [!!!]
    ShootOlcApp_handler                 0xff2c5d1c -> 0xff2c5d1c [0x000] [!!!]
    dialog_set_property_str             0xff2c9128 -> 0xff2c9128 [0x000] [!!!]
    fsuDecodePartitionTable             0xff330304 -> 0xff330304 [0x000] [!!!]
    GetCFnData                          0xff359804 -> 0xff35980c [0x008]
    SetCFnData                          0xff359a0c -> 0xff359a14 [0x008]
    PlayMovieGuideApp_handler           0xff36f6e8 -> 0xff36f6f0 [0x008]
    ErrCardForLVApp_handler             0xff371068 -> 0xff371070 [0x008]
    bzero32                             0xff3ebcb8 -> 0xff3ebcc0 [0x008]