Merged qemu into 1200D
1200D: removed old minimal target to fix "make zip"
Minimal targets: only compile subdirectories with a valid Makefile
QEMU tests: FA_CaptureTestImage works on 1300D
(prints "Image Power Failure", but the fix is not straightforward)
Merged qemu into 1200D
Merged lua_fix into 1200D
fw-signature.h: fix bad merge
Makefile: when running "make install", copy ML-SETUP.FIR only for the generic profile
(not for minimal or other targets)
Makefile: always check all minimal targets when running "make zip"
(only check whether they compile without errors, just like with the installer)
Minimal target: moved the Hello World example into its own directory and removed old platform folders
Minimal targets: 5D3 1.1.3 hacks no longer needed
GDB scripts: fix IDC names containing spaces
QEMU: fix timeout in ImgPowDet emulation
(there were nondeterministic errors in the FRSP test)
QEMU: emulate ADTGDMA interrupt (used on 100D and EOS M2)
- fixes FA_CaptureTestImage on 100D
- some LiveView screenshots changed on 100D
- color palette in LiveView changed on M2; can be worked around by pressing L (updated menu tests)
QEMU tests: ignore nondeterministic screenshot on 6D
(may appear with or without free space)
GDB scripts: moved try_expand_ram_struct at the top
GDB scripts: minor whitespace fix
QEMU: ensure valid RAM address before executing EDMAC transfers
(EOS M fails here when running FA_CaptureTestImage)
QEMU: image sensor power emulation
(fixes FA_CaptureTestImage on 5D2; tested on all other models able to run the FRSP test)
QEMU: output dummy data (zeros) on read EDMAC connections
Fixes FA_CaptureTestImage on 700D and 650D.
qemu-frsp: fix compiling for 70D
QEMU: allow reads to EDMAC CHSW registers
(required for FA_CaptureTestImage emulation on 6D and others)
qemu-frsp: ensure valid exposure settings before the test
(exposure time not too long, ISO other than Auto; required on 600D and others)
QEMU: fix YUV vertical scaling for 1100D
(only the FRSP test uses it for now)
qemu-frsp: allocate a YUV buffer if there isn't one already set up (only with CONFIG_QEMU)
Fixes preview on 5D3 and 1100D, where Canon firmware does not allocate one at startup.
QEMU tests: all models able to navigate Canon menu should pass the FRSP (FA_CaptureTestImage) test
Most of them will fail; to be fixed.
QEMU tests: handle models not yet in mainline
(FRSP and HPTimer tests are using this for now)
QEMU: updated gcc 7/8 patch for systems using virtio-9p
QEMU: updated gcc 7.x patch to also work with gcc 8.x
eos.c: fix gcc8 warnings
Makefile: allow "make install*" without a FIR file
(for minimal targets and new platforms)
QEMU logging: attempt to identify tail calls by default
(-d calls,notail to disable)
QEMU tests: updated for 200D 1.0.1
QEMU logging: moved IDC files into model subdirectories
(for consistency with romcpy shell files)
QEMU logging: fix typo when using -d romcpy
(output file path was not printed correctly)
QEMU tests: initial support for 800D
(fixme: call trace not deterministic, same as 77D)
800D: minor stub fixes in GDB script
qemu: add 800D to model_list.c, and add 800D/debugmsg.gdb
Config options: fix issue #2892
(custom presets not appearing in menu)
Merged config_var_refactor into lua_fix
Merged unified into lua_fix
Menu: fix config var incorrectly changed during fast toggles
(e.g. 36 -> 35 without calling the CBR)
Config variables: declare all internal structures static
Config variables: include the forward declaration in the CONFIG_INT_EX definition
(no longer needed to declare CONFIG_VAR_CHANGE_FUNC's twice)
Config variables: use CONFIG_VAR_CHANGE_FUNC (similar to MENU_SELECT_FUNC); minor renames
Merged unified into config_var_refactor
audio-ak: fix compiling for 500D
menu: short joystick clicks should not be interpreted as SET outside ML menu
(fixes incorrect trigger of Auto ETTR from joystick, for example)
rename xxx_update functions for config_vars to xxx_on_change
rename CONFIG_INT_UPDATE to CONFIG_INT_EX and .update to .on_change to avoid confusion and name conflicts with MENU_UPDATE_FUNCs
config var: refactor audio-lapis to use new config var CBR (not tested -> I have none of these cameras)
config var: refactor audio-ak and audio-common to use new config var CBR (TODO: audio-lapis)
Ghost image: further cleanups and fixes
Ghost image: fix crash (issues #2796, #2783, #2878, #2885)
features.tmpl edited online with Bitbucket: use id in th section heading to allow for direct linking via anchor
Merged in edmac (pull request #886)
EDMAC module: fixes for DIGIC 4, connection map
Merged in adv_int (pull request #907)
Advanced intervalometer updates
Merged in memory-backend (pull request #906)
Memory backend improvements
Makefile: fix "make install_qemu CONFIG_QEMU=y" for minimal targets
QEMU: experimental support for gdb-multiarch
(latest Ubuntu no longer has gdb-arm-none-eabi...)
QEMU install: minor fixes
QEMU install: on some systems, building GDB requires makeinfo; skip it
Also show the last few lines from the compilation logs if there's an error.
QEMU install: on older Ubuntu, gcc/gdb installation without package manager may be required
QEMU install: minor fix for 32-bit Ubuntu
(option 3: no 64-bit gcc available)
QEMU installer: removed option to allow old 64-bit GDB
(hopefully no longer needed)
QEMU installer: minor fix regarding GDB installation
(force compiling from source if a valid 64-bit gdb is already installed)
QEMU installer: attempt to compile gdb 8.1 from source if a 32-bit version is not available (in particular, Mac and WSL)
https://www.magiclantern.fm/forum/index.php?topic=2864.msg200954#msg200954 (thanks t3r4n)
QEMU install: there's no DISPLAY variable on Mac
QEMU: better emulation for cache patches
(uninstalling works, at least for dm-spy-experiments)
QEMU: fix CPU0 labels incorrectly appearing in DIGIC 6 logs
(only DIGIC 7 should display these)
QEMU: moved ARM946EOS-specific functions (cache lockdown and WFI) from cpu.c to helper.c
Minimal targets: CONFIG_QEMU no longer hardcoded in Makefile
(should be specified on the command line if desired)
Makefile: allow CONFIG_QEMU to work on all ML profiles, including minimal and installer
By default, CONFIG options are only used for the generic profile.
This enables qprintf for debugging DIGIC 6/7 ports using the minimal profile.
QEMU: fix printing callstack from GDB scripts
(broken in 1834cd8)
GDB scripts: workaround for a crash occuring with 5D
(possibly GDB bug; can't explain why it works)
qemu-frsp: fix compiling on lua_fix codebase
(1200D and soon all others)
QEMU: updated expected test results for 1200D 1.0.2
(no stubs changed in debugmsg.gdb)
QEMU: removed bogus/unused BGMT_ISO
QEMU: fix Q button code for 1200D
- assuming the same applies to 1300D; unsure about 600D/1100D
QEMU: fix compiling on 32-bit x86 hosts
Caveat: -d romcpy not working on x86 (requires int128_t)
QEMU README: initial notes on DIGIC 7
QEMU: initial support for DIGIC 7 EOS (200D, 77D, 6D2)
- added ROMID; updated MemDiv, XDMAC, SDIO
- emulation starts many tasks, talks to MPU, initializes SD, creates the DCIM directory on the virtual card
- fails with ERROR WaitPU1 TimeOut
- dumpf does not save any logs (figure out why)
- note: M5 ROM should now be loaded as ROM0
QEMU logging: initial support for DIGIC 7
(CPU0 only; exception vectors at nonzero address)
QEMU tests: ROM dumper needs larger timeout on slower computers; undo unwanted changes from cb93334
QEMU tests: fix expected results for restore after format after updating SD image
QEMU tests: reworked ROM dump test to wait as much or as little as each camera needs
(fixme: 70D waits for some CFDMA messages that are for some other device)
QEMU: usleep patching no longer required on M3
QEMU: updated ROM dump tests to check SFDATA.BIN too
(currently only applies to DIGIC 6)
QEMU: updated SD image with latest display test
QEMU: experimental UTimer emulation
- these look pretty much like regular timers (same offsets), but behave like HPTimers!
- UTimer patches from DIGIC 6 no longer needed!
- fine-tuned HPTimer messages
QEMU: fix logging of MMIO registers from the same range as MREQ
(eos_handle_mreq also receives a few other registers, unknown yet)
QEMU: specify actual RAM size for each model, rather than using generic values
(emulating with larger size usually works, but doesn't catch some edge cases)
QEMU: reordered model definitions in model_list.c
(grouped by DIGIC version and similarity)
QEMU: renamed IO_MEM_START/SIZE to MMIO_ADDR/SIZE for consistency;
added MMIO_ADDR to model_list.c (possibly needed for future models)
QEMU: removed unused entries; moved ML helpers to a different GPIO range.
Old range was not accessible on certain models, such as PowerShots and DIGIC 7.
Old GPIOs are still accepted (debugging existing code from experimental branches is still possible without merging latest qemu).
QEMU logging: -d romcpy now output a shell script for extracting the copied blocks
QEMU: memfd patch to fix compilation with glibc 2.27
QEMU installer: minor updates
- option to "make clean" before renaming the old folder (to save disk space)
- exit if QEMU fails to compile
- check for a valid DISPLAY (important for WSL)
- updated help links
QEMU: updated CPU definition for DIGIC 7; renamed for older models and reverted the HIVECS property back to false
QEMU tests: updated checksums for EOS M/M2 screenshots displaying date/time
(fix commit 8c575ef99b7f)
QEMU tests: updated checksum for a screenshot affected by transparency - commit 5b274e3
(Canon quirk - it's not even a LiveView screenshot)
annotate_mpu_log.py: allow incomplete mpu_send/recv lines
(such as the ones from 80D logs)
MPU spells: documented some AF-related properties
GDB scripts: also identify and name PTP handlers
GDB scripts: identify named functions during execution and export as IDC
Named functions identified from: task_create, register_func, register_interrupt, CreateStateObject
Tested on 5D3 1.1.3, EOSM2 1.0.3 and 80D 1.0.2 (missing stubs added).
QEMU: check whether the ROM contents are mirrored (whether dumped size is larger than actual ROM size)
[EOS] loading './50D/ROM0.BIN' to 0xF0000000-0xF0FFFFFF
[EOS] mirrored data; unique 0x400000 bytes repeated 0x4 times
[EOS] loading './50D/ROM1.BIN' to 0xF8000000-0xF8FFFFFF
[EOS] mirrored data; unique 0x800000 bytes repeated 0x2 times
QEMU: SRM_SetBusy/ClearBusy emulation for 5D3/6D/70D
annotate_mpu_log.py: mark unknown MPU messages with ???
(this ensures all MPU messages are displayed to the terminal, including unknown ones)
Menu: QEMU hack 90f702c no longer needed for EOS M/M2
(keeping changes to gui.h and button_codes.h)
run_canon_fw.sh: fix printing GDB command line on systems where process name is limited to 15 chars;
only look at processes started by the same parent as this script (to avoid false positives)
to be tested on Mac and WSL
QEMU: EOS M and M2 appear to handle the Q/SET button just like 100D
QEMU: enabled MPU properties for EOS M (no more issues after LiveView emulation)
QEMU: allow any argument for PROP_LEO_LENSID (EOSM); documented PROP_LEO_LENS*
Should fix emulation with ROMs saved with a different lens (apparently lens ID goes into ROM - property 0xC000004)
QEMU: send PROP_LV_LENS message at initialization (5D3 1.1.3; 1.2.3 commented; the message is model-specific)
Useful for LiveView emulation (display focal length, focus distance etc)
Message sent in a different place (not as in the logs), as it interferes with our (broken) LiveView emulation
QEMU: experimental bitmap transparency support
(doesn't match the hardware exactly, but it's better than nothing)
QEMU: experimental movie mode switch (V key)
Some cameras have dedicated movie mode on the dial, others use a switch and can record video in any mode dial position.
QEMU: key mapping for Zoom In / Zoom Out (they don't do anything interesing yet);
allow defining different keybindings on the same physical key (5D3/6D: only one zoom button, unlike most others)
cleaned up zoom button handling on 5D3 and 6D (unpress zoom out should not be sent from keyboard, for example)
QEMU: fix copy/paste error in HPTimer emulation
(no side effects)
QEMU tests: large timeouts appear to help in some tricky cases
(such as mode switches, which may be slower than usual)
QEMU: updated GUI tests for LiveView.
EOS M/M2: no more reason to start with the date/time dialog.
Still some color palette issues; usually can be worked around by switching to other video mode and back.
Minor call trace differences for 650D and 700D (missed from previous commit)
QEMU: LiveView works!!! (GUI elements only, no image)
Credits go to Greg for the first PoC https://www.magiclantern.fm/forum/index.php?topic=2864.msg179867#msg179867
Tests not yet updated, just to check whether the implementation is really without side effects outside LV.
Only one screenshot changed - on EOS M (that screenshot was already in LiveView).
Note: 70D uses more EDMAC connections; increased number from 48 to 64.
MPU spells: identified some more properties while looking into the EOSM shutter bug
QEMU: validate calls to eos_trigger_int
allow missing UART RX/TX interrupt and just print a warning
(affected: Eeko and EOS M5; fix not obvious)
QEMU: removed unnecessary assertion in interrupt controller
(triggered very rarely under "normal" conditions, but happens very often with io_trace)
QEMU tests: run the GDB test for 10 seconds
(these logs will be used for building the interrupt map)
QEMU: fix alignment of MMIO messages before starting tasks (-d io)
QEMU: fix HPTimer handling of periodic triggers
(VxWorks models use a HPTimer as heartbeat, unlike DryOS)
No visible differences on the UI, but heartbeat is now triggering on all VxWorks models.
Minor emulation differences on 60D, 600D, 650D, 700D, 100D, EOSM, 6D (besides VxWorks models).
GDB scripts: EOSM.202 stubs for logging properties
annotate_mpu_log.py: fix handling logs with Windows newlines
QEMU: delay EDMAC reads by one timer step (apparently reads are supposed to finish after writes)
Change required to pass the memory benchmark on 5D3 and 6D.
700D gives the same error if writes are delayed.
Minor changes to call/return trace on 60D, 600D, 1200D and 1300D (no visible effects).
QEMU tests: updated EOSM2 call/return trace for latest SFDATA.BIN from dfort
(previously, SFDATA.BIN for 100D was assumed; no visible changes)
QEMU: declared silent control events for 5D3
(not used; only for annotations)
MPU spells: found PROP_LV_APERTURE and PROP_SILENT_CONTROL_STATUS
QEMU: declared internal zoom in/out events for 5D3
(they are sent by the MPU during GUI mode switches)
QEMU: fix LV button code for 5D3
annotate_mpu_log.py: more output options (to stdout, to file, auto rename)
MPU spells: script to annotate logs with mpu_send/recv events
(known MPU messages moved to known_spells.py)
Makefile: fix "make install_qemu CONFIG_QEMU=y" for minimal targets
adv_int: ignore empty lines when loading keyframes
adv_int: use strstr instead of my_strstr (fixes slow load)
Include strstr in ML core
adv_int: refactor keyframe time formatting
adv_int: auto-load the saved sequence at startup
adv_int: renamed menu entry to "Ramping options"
QEMU: workaround to emulate io_trace
(without it, many MMIO events are missed, apparently because of QEMU's TLB cache)
NotifyBox: log messages to QEMU console
GDB scripts: replaced *(int*)(x) with MEM(x)
(for consistency with other ML code, and maybe slightly easier to read)
QEMU: experimental Q button emulation for 100D
(not 100% sure about it, but seems to emulate the long Q/SET press correctly)
This procedure will enable the BOOTDISK flag in your camera's Flash ROM, allowing it to load and execute custom code from the memory card. A copy of the original (unmodified) ROM contents will be saved to the card.
Magic Lantern will run from this card; it won't replace your original firmware.
This procedure disables the BOOTDISK flag. You will no longer be able to run Magic Lantern, unless you reinstall it.
Some settings changed by Magic Lantern might be persistent; this procedure will not reset them. To restore the camera to factory state, you may also want to clear all camera settings and custom functions from Canon menu.
Copyright (C) 2009-2018 Magic Lantern Development Team
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.