Main Builds » 100D / Rebel SL1 1.0.1

Latest Build (2018-06-06 00:21)

Change Log

565ee36: 100D: fix INPUT_ENABLE_IMAGE_PHYSICAL_SCREEN_PARAMETER (display filters working)\u000a\u000a



  1. Make sure you are running Canon firmware 1.0.1.

  2. Once you have the correct Canon firmware:
    • Format the card from the camera.
    • Unzip the archive and copy ML files to the memory card.
    • Run the Firmware Update process from Canon menu.

      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.

  3. After installation, please copy your ROM backup files (ML/LOGS/ROM*.BIN on the card) to a safe place.
Detailed instructions on the wiki. Please don't forget to check the FAQ and the user guide.


From camera:
  1. Run Firmware Update from your ML card.
  2. Follow the on-screen instructions, including the fine print.

    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.

From one card:
  • Canon menu: Format card, remove Magic Lantern.
  • This procedure does not disable the BOOTDISK flag. With this method, you will still be able to run Magic Lantern from other cards.
  • Never delete the Magic Lantern files from the card! Format the card instead.

Known issues

Camera doesn't boot?

  1. Remove battery, remove card.
  2. Put battery back, close card and battery covers.
  3. Start the camera without card.
    • » Did it work? Format the card, reinstall Magic Lantern.
    • » Still not working? Double-check battery and card doors, run the diagnostic tools and get in touch with us.

Troubleshooting tips

  • If your camera locks up, remove the battery and reboot.
  • Make sure you have a backup card without Magic Lantern on it (just in case).
  • To restore ML defaults: Prefs → Config files.
  • To see what settings you have changed from ML defaults: Modified (Δ) menu.
  • To disable Magic Lantern temporarily: press and hold SET at startup.

Older Builds (hide) (hide details)

Test results: 6 passed, 1 failed.

f506ed3: 100D: fix timer A limit in x5 zoom mode\u000a\u000a\u000aTODO: double-check all other models (raw_diag OB zones screenshot in all LiveView modes, with FPS override maxed out)

Build Log

Test results: 7 passed, 0 failed.

1d7da4a: 100D: disabled full-screen magic zoom (issue #2842)

Build Log

Test results: 5 passed, 1 failed.

d863156: 100D: attempt to fix Q/SET regression (tested in QEMU, unsure about the exact hardware behavior)\u000a\u000aalso reduced long-press delay to 0.5 seconds

Build Log

Test results: 6 passed, 0 failed.

2dae7e4: Merged new_dryos_task_hooks into 100D_merge_fw101

8a5b890: 100D: cleanup handling of the Q button\u000a(see b9e0b9e)

ba97711: Merged qemu into new_dryos_task_hooks

d6d9373: fix QEMU_DIR once more

f0f54d3: fix QEMU_DIR

90f702c: Menu: hack to allow browsing ML menu on EOSM and EOSM2\u000a(requires CONFIG_QEMU=y)

c9e8864: Merged makefile-updates into qemu\u000a(also updated README regarding "make install_qemu" on modules)

c5400ab: QEMU: moved default installation directory to qemu-eos\u000aRationale: user is likely to have another qemu directory, unrelated to ML (such as the vanilla qemu repo)\u000aCan be changed by setting QEMU_DIR, e.g. "export QEMU_DIR=qemu" before running will install QEMU in the old path\u000aTo be thoroughly tested.

f331c27: Makefile: moved default QEMU directory to qemu-eos

dd1e602: QEMU: trim HTML logs to 10000 lines if higher\u000a(very slow to render; also, at these sizes, browsing/grepping plain text is way faster)

755c166: Makefile: also updated QEMU_INSTALLED_DBI_DIR to use QEMU_PATH

fe7bb16: Makefile: fix copy/paste error

60d8eb2: Makefile: fix cleaning up after "make zip"; removed warning

b764804: Makefile: allow changing QEMU installation directory from Makefile.user and/or the environment\u000a(QEMU_DIR)

7293343: Makefile: zip and install_qemu targets for modules

f55f334: Makefile: always clean after running install_check\u000a

263f93e: Makefile: always rebuild version.o

9933b60: Makefile: prevent install_check from running in parallel with building regular ML\u000a(conflicts while compiling from the same sources - )

a96d082: GDB scripts: logging hook for prop_deliver

da3ede4: GDB scripts: logging hooks for CreateStateObject\u000auseful to find all state objects created during the emulation\u000a

41e3fda: QEMU installer: fine-tuned prompt when reinstalling

0ee9487: QEMU: fix Q button handling on 550D, 600D, 1100D (to be tested)

ad4f694: QEMU readme: table of contents; minor typos

067abb6: QEMU readme: GPIO section update

52e6389: 6D: fix task_max

7800ecf: updated to decode lens firmware updates (*.lfu)\u000a

a9e3bc2: QEMU readme: misc updates (formatting, rephrasing); GPIO section

ed7f831: QEMU installer: make it clear the script expects user input when it's asking whether to compile QEMU

be21c3c: eject removes the disk image completely while unmount doesn't remove the disk image from /dev.

8c50f2b: reworked description of the peripherals

b0d934a: QEMU install: fix mistakes

7649bac: QEMU readme: typos, formatting

a86704f: QEMU readme: note for Bitbucket not always rendering the RST\u000a(reloading the page usually works; apparently it doesn't need javascript, so what's going on?)

9ffd65b: QEMU readme: some basic concepts related to how the DIGIC hardware works\u000a(some parts adapted from )

6b6d0da: QEMU readme: misc notes\u000a- tip to save SD images as qcow2 (they take less disk space)\u000a- instrumentation tools\u000a- history updates\u000a- minor formatting fixes

d8a162f: QEMU: use 600D MPU messages for 1300D\u000afixes toggling drive mode,

f12001a: GDB scripts: hide warnings about undefined task addresses when running with patches.gdb\u000a(when running with debugmsg.gdb, full context info is printed)

6f70c85: GDB scripts: fix address in log_result\u000a(LR is no longer valid, as we are no longer at the beginning of a function call)

7c7c472: QEMU recent git no longer accepts empty identities\u000a

d4cefff: QEMU scripts: removed hardcoded references to ../magic-lantern\u000aand documented how the directories can be customized

ecde6a5: QEMU readme: documented directory structure

c4b3c68: QEMU logging: cleaned up hacks around memory logging options\u000a(logging tools may require any memory logging backends, but in the logs, only those items specifically requested by user will be printed)

ae1cdc1: hide osascript messages on Mac\u000a(when trying to bring the QEMU window in foreground, but there isn't any)

3070976: QEMU install: keep the 64-bit gdb warning prompt on Mac and WSL (to be tested)

19f5eb6: QEMU install: attempt to fix warnings about 64-bit gdb on Mac and WSL (to be tested)\u000athe script should print warnings about them, but accept them as valid

ded8f42: QEMU install: fix path issue after compilation

89a679e: QEMU install: fix warning about lsb_release on Mac or other systems without it

f7c4d0a: QEMU install: attempt to fix warnings about 64-bit GDB on Mac (to be tested)

8e06a0e: QEMU install: fine-tuned QEMU compilation, to be tested\u000a(error handling, display the next steps after compilation finished)

972d3eb: QEMU install: on WSL and Mac, try the latest 64-bit toolchain (to be tested)\u000aLinux installation still uses the 32-bit one (older version)\u000aTODO: attempt to compile a 32-bit GDB for Mac\u000aReworded warnings, as a 32-bit GDB is now only needed for development;\u000ait's no longer mandatory for running the examples, since

7b014d2: QEMU: simplified SFDMA mapping by removing model-specific redirection\u000a(they are fairly consistent across all models)

445254a: QEMU tests: 40D call trace still not fully deterministic (CF uses some status polling, not just DMA)\u000are-applying workaround (only check the "basic" call trace, without function arguments and extra info)

6abd0a4: QEMU: documented SD detect registers on recent DIGIC 5 models\u000a(non-functional)

9851807: QEMU: refactored CFDMA/UartDMA handling to remove model-specific redirections\u000aenabled UartDMA on all models (including VxWorks), but it's not working yet\u000a70D: IFE DMA handling moved from SDDMA to CFDMA (minor, no noticeable side effects other than breaking the tests)

805384d: QEMU: fix 5D3 CF emulation\u000a(disabled by default; can be enabled from mpu_spells/5D3.h)

27ed39b: QEMU: documented property groups ("complex" MPU messages)\u000aincluding GDB logging hooks to find them

400b47a: QEMU tests: relaxed shutdown checks\u000a(some false positives caused by non-deterministic emulation)\u000a(note: menu tests are executed non-determinstically, unlike the call trace, so each run is different)

b7ddc01: QEMU: attempt to get deterministic execution on CF models when using -icount\u000aoperations are slowed down to avoid timing variations\u000adefault behavior (without -icount) is not affected\u000aon main firmware, the call/return trace test is now deterministic on all models!\u000afixme: CF emulation in PIO mode is still non-deterministic

9f0813a: GDB scripts: generic logging hooks

54c74ec: QEMU readme: example of identifying the location of an assertion using gdb and -d callstack; minor updates

8fa259b: QEMU: updated 750D/760D GDB scripts and tests; file I/O works!\u000a(using 750D SFDATA.BIN)

979316f: Merged in t3r4n/magic-lantern/qemu (pull request #894)

569968e: QEMU: fix some MPU spells\u000a(typos caught by automated checking)

487260c: Added the serial flash line for 750D and 760D into model_list. See

364db8e: QEMU readme: minor link updates

8fa748b: QEMU readme: moved developer and reverse engineering notes to a new file\u000a(reason: bitbucket seems to have trouble rendering large files)

7337880: QEMU readme, GDB scripts: info on debugging symbols; more symbol-file choices in comments\u000a(depending on what you are debugging - regular ML, reboot shim or Canon firmware)

f037cd0: QEMU readme, GDB scripts: recommend '-ex quit' after patches.gdb, but not after debugmsg.gdb\u000a\u000areason: when running with patches.gdb, you may not want to type "quit" after stopping the emulation\u000ahowever, this trick removes the ability to use interactive breakpoints in GDB (it would quit as soon as reaching one), so don't recommend it for debugmsg.gdb

3886414: QEMU readme: fix typos; minor updates

96f61d9: QEMU: fix serial flash DMA on DIGIC 6 (tested on 80D, 5D4 and 750D with PR #894);\u000arefactored serial flash to use its own DMA (not shared with SD)

253c364: QEMU: updated 80D test results for actual serial flash contents\u000a

af745f0: QEMU readme: formatting

3e4b069: QEMU readme: GDB scripting examples, including callstack

b725d64: QEMU readme: use em-dashes instead of simple dashes

14755cb: QEMU: changed I/O logging behavior\u000a- "-d io" implies "-d nochain -singlestep" (this prints correct PC values, but emulation is slower)\u000a- "-d io_quick" to get the old behavior (faster, with incorrect PC values)\u000a- "-d io_log" to print mmio_log entries for dm-spy-experiments\u000a- "-d nochain" always implies "-singlestep" (easier to enable this mode on other kind of logs that may need it)\u000a- updated README

0bfec8d: QEMU readme: moved the "Incorrect firmware version" section to Hacking\u000a(it's no longer an issue for regular users)

be5a69a: QEMU readme: started to document the steps needed to emulate Canon GUI

0641d77: QEMU readme: minor updates, corrections

aa8cd0d: QEMU tests: updated after changing the SD image\u000a- format screenshots slightly different at free space (before only)\u000a- call/return traces are also different (different layout on the SD image)

53cba30: QEMU: updated sd.img.xz with latest portable display test\u000a(main change: fix identification of firmware version - 7889972)

08d2e81: GDB scripts: fix assert handling on EOS M10

1eedbfb: QEMU: moved 7D2 patches to GDB scripts;\u000ainitial GDB script for 7D2 slave

74a881d: QEMU: defined FPGA memory regions for 5D2 and 50D\u000a(just to prevent some warnings; nothing changed in functionality)

93a3941: QEMU tests: run all cleanups on CTRL-C\u000a(stop all background tasks, make sure QEMU is no longer running, remove temporary files...)

06bfaad: QEMU: enabled serial flash emulation on 5D4\u000a(emulation on main firmware doesn't go that far, but can be tested from bootloader menu)

893e226: QEMU: refactored serial flash CS handling to reduce duplicate code\u000a(moved CS register and tested value to model_list.c)

545a63e: QEMU tests: reworked menu tests (including format)\u000a- use vncexpect whenever the md5 of the next screen is known (reduces timing sensitivity and also faster overall)\u000a- no more wait hacks required for format tests\u000a- use a single vncdotool command whenever possible (faster)\u000a- removed duplicate code (function for sending a menu sequence)\u000a- fine-tuned progress indicator

bda26e9: MPU spells: allow changing various Canon properties that require confirmation from the MPU:\u000aISO, shutter, aperture, EC, FEC, metering, drive, AF mode, picture style, WB, ExpSim, ALO, HTP, MLU\u000aall but WB were broken if changed from ML menu/scripts; they are working now (fixme: not included in tests)\u000asome of them were working from Canon UI before this patch (picture style, WB, ExpSim, metering and drive mode)\u000aWB was working before, but uses confirmation in logs; updated for consistency\u000a\u000acould not test on: 5D2, 40D, 50D, 550D, 650D, 700D, EOSM2\u000anot working: EOSM (breaks previous tests => disabled)

09403d4: QEMU: experimental mode dial emulation\u000aworks on most models to some extent, except 40D, could not test on 550D, 650D, 70D, EOSM2

f3f3d2d: MPU spells: comment out possible mode switches\u000anot required for the GUI, but will interfere later with the mode switching feature\u000aaffected models: 6D (call/return trace changed), 70D, 700D (no side effects noticed)

060a1f0: Merged in t3r4n/magic-lantern/qemu_installer (pull request #893)\u000a\u000aFurther automation in install script to compile directly at the end.

bb9193e: QEMU: more MPU properties identified by brute-forcing

ecf616f: QEMU: formatting fixes in / known_spells.h

2149521: QEMU: added property IDs to known MPU spells\u000aalso alternate names as comments

e0a4e87: QEMU: identified more MPU spells, corrected a few others\u000a- experimentally (playing around in menus)\u000a- brute-forcing MPU messages to identify properties\u000a- cross-checked names and IDs in startup logs and ROM strings\u000a- still, it's impossible not to find a few incorrect ones

1699165: QEMU: experiment - brute-force MPU messages to find out their meaning

af43d85: GDB scripts: hooks for logging properties (prop_request_change, MPU property functions)\u000a(example for 5D3.113 and 550D.109; useful for identifying properties)

3c3ebba: qemu-util: fix compilation in bootloader context;\u000asample boot messages in reboot.c, e.g. printing firmware signature or RESTARTSTART address\u000a(only present in the output binary when compiling with CONFIG_QEMU=y)

c33141c: GDB scripts: disable serial flash version check patch on EOS M2\u000anot really needed (the error message seems harmless and doesn't prevent GUI emulation)\u000abut changed ML firmware signature checking\u000aand won't be needed after getting a serial flash dump from a real camera anyway

eed976e: QEMU further Ubuntu/WSL cleanups (minor)

351a3ad: QEMU fine-tuned messages and date format when renaming an older installation

3c0b723: Merged in t3r4n/magic-lantern/qemu_install_improvement (pull request #892)\u000a\u000aOption to rename or delete existing QEMU directory during installation

0a7e1da: QEMU WSL fixes\u000a- checking for Ubuntu (uname -a does not report Ubuntu)\u000a- hide 32-bit toolchain options

eeacf80: Mac fixes\u000a- use is_mounted (lsof checks are enough)\u000a- typo in osascript when trying to bring QEMU window to front

54c02f6: fine-tuned checking of whether SD/CF image is in use\u000a- use lsof to detect whether another process opened the SD/CF image for writing\u000a- only allow multiple instances of QEMU if using -snapshot (read-only access to SD/CF image)\u000a- check all results returned by losetup (note: lsof does not show whether the image is mounted)\u000a- use alternate methods (grepping mount output) if losetup is not available\u000a- to be tested/refined on Mac and Windows 10 WSL

44bce28: QEMU: RTC workaround to bring back 400D GUI\u000a(broken in 0d654a0, not covered by tests as it's very slow)

0bdb061: QEMU: 40D GUI working!\u000a- MPU RX register was read 8 bits at a time (other models so far used 16-bit reads)\u000a- using 50D MPU spells\u000a- button codes found with, from existing ML port\u000a- HotPlug: external monitor, USB, Toe, erase switch\u000a- CFDMA: new channel, protocol tweaks, enabled interrupts\u000a- Powersave workaround (GUI locked up after some seconds of inactivity, similar to 1300D)

ff562b6: QEMU: fix USB CONNECT on 450D/1000D\u000a(incidentally, this also fixes the card format dialog on these cameras - likely UILock issue)

7f1a436: QEMU: 1300D GUI works!\u000a- this camera uses a different DryOS timer (totally unexpected!)\u000a- removed JPCORE patch (firmware expects this to be initialized properly)\u000a- generic MPU spells; button codes from 1100D\u000a- powersave workaround (without it, GUI would lock up after a few seconds of inactivity)\u000a- no patches required!

351f6de: QEMU: cleaned up serial flash handling on models that don't use one\u000apreviously, they were called on unrelated SIO/SDIO channels, with little or no side effects,\u000aother than breaking a few function call trace tests

5137e76: QEMU: updated 80D tests for 1.0.2; DCIM test also works!

b6c5710: QEMU: 80D file I/O support from main firmware\u000a(experimental, tested with "dumpf" in the serial console)

4e1b65e: QEMU: enable card support on generic MPU spells\u000a(experimental, some models work better than others)

7ea57e7: GDB scripts: some experimental 80D patches, to be fixed in the emulation

17b0443: GDB scripts: log state object transitions\u000a(stubs for 550D and 80D)

ec28012: GDB scripts: 80D logging hooks for semaphores and message queues\u000a(disabled by default; also updated assert_log for 1.0.2)

04c809c: QEMU: RomRead DMA is actually XDMAC\u000a(up to 4 channels; 80D only uses 2)

0d25b8e: QEMU: experimental MPU support for 80D, 750D and 760D\u000aseems to work with generic spells - at least the emulation goes further\u000aalso minor refactoring / comments on MPU registers for earlier models\u000aalso enabled for 5D4 just to avoid a crash - emulation doesn't reach mpu_send yet, but it calls InitializeIntercom

381a309: QEMU tests: do not start if compilation fails\u000a(small nitpick that could result in false test results)

7abb5ba: QEMU: updated tests after b75e1342711a\u000a(context info is now correctly printed when returning from msg_queue_receive, take_semaphore etc)

391ba33: QEMU: generic MPU spells compatible with most EOS models (experimental)

b75e134: QEMU logging: fix losing track of called functions when DryOS tasks are switched outside interrupts\u000asee the assertion error on 5D4 callstack consistency test (after 442b691)\u000ato be tested; there was a similar error was on 80D, non-deterministic\u000a(encountered when running with -d debugmsg,callstack,tail with all patches enabled)

2c5f303: QEMU: MPU status doesn't seem to matter much; simplified to prepare for DIGIC 6 compatibility\u000atodo: cross-check with actual hardware

5154ad0: QEMU: shared memory initialization for DIGIC 6 (MEMDIV messages)\u000ato try: SHM_SHOW_INFO / SHM_SHOW_DIST_INFO on serial console (only 80D, 750D and 760D reach this far)\u000a( sleep 3; echo "akashimorino";\u000a sleep 1; echo "SHM_SHOW_INFO";\u000a sleep 1; echo "SHM_SHOW_DIST_INFO";\u000a) | ./ 80D -serial stdio

26d2dc2: QEMU: refactored serial flash SIO handler with io_log

6774de5: QEMU: refactored serial flash connections to avoid hardcoding camera model names\u000afixme: D3 models and 1300D still hardwired to serial flash handlers to pass the tests

6521336: QEMU: experimental serial flash support for 80D\u000ausing SFDATA.BIN from 70D, patched at 0x10004 from 09 8B C1 20 to 00 00 01 20\u000ameaning: size of 70D's property block at 0x10000 is 0x12BC98 (data is shifted by 4 bytes)\u000abut 80D expects a maximum size of 0x12000 in FE47BF40 ("Liar Valid Packages!!" if the size check fails)\u000aso we trim the property block at the expected size of 0x12000\u000athis will lose a few properties, but at least the emulation goes further (no SF dumper for D6 yet)\u000aother 8MB SFDATA.BIN patched in the same way should also work (700D, 650D, EOSM, 6D),\u000abut their data block at 0x10000 is larger, so more properties will be probably lost (not tested)

442b691: QEMU: RomRead DMA for DIGIC 6, used for initializing property blocks\u000a(very similar to regular DMA, slightly different register offsets)

44c8b3c: QEMU: slow down UART input to work around race conditions\u000a(not exactly clean, but at least DryShell tests are now passing on all models)

b972984: QEMU: fixed UART on DIGIC 6 (DryShell works!)\u000afixme: tests are failing, but typing on the UI works fine\u000anote: DIGIC 4/5 emulation changed a bit (0xC0270000 was misinterpreted before)

2b0b39a: QEMU: found out why DIGIC 6 models were getting stuck at startup!\u000aThe firmware was reading the memory layout from CP15 registers;\u000amost of them were emulated well in QEMU, except ATCM and BTCM, which were implemented as NOP.\u000aThey are still NOP in current QEMU git.\u000a\u000aPatching the memory regions loop is no longer required!\u000a(keeping empty 80D patch for future use)

46f2e6e: MPU spells: some names could not be identified (fixed)

d01f900: QEMU tests: call rather than duplicating its work\u000a(fixes some tests failing if mtools is configured to use lowercase by default)

741aec2: on Mac, bring QEMU window to foreground\u000a(by default, the window is opened behind the terminal, so one may not even notice it)

e84ed9e: print camera name in QEMU window title

2eea98e: only clear the terminal if running in interactive mode\u000a

c47039f: QEMU logging: always log unmapped memory regions

7a9bd49: GDB scripts: fix text alignment with "native" logging options (minor)

b3b129e: QEMU fix null byte warning when parsing model list\u000a(bash 4.4 and newer? )

6e86e2b: QEMU install: print fewer help details after installation; link to the online documentation

1297b50: QEMU readme: formatting, typos

1e4f1a6: QEMU readme: more info regarding custom SD/CF images

dd3e675: QEMU readme: more ways to install ML to the virtual SD/CF images

bc84c85: QEMU readme: note about "make install_qemu" not available in all branches

6fd16a7: QEMU readme: note about models using a serial flash

1ffbae0: QEMU README: minor updates to 050a3cc

61ab0d2: Merged unified into qemu

5788c6e: Merged makefile-updates into qemu

98871fc: Makefile: backout 0b9b550\u000a?= not needed when overriding from command-line, e.g. make CONFIG_QEMU=y

4895777: Merged makefile-updates into qemu

420208d: Mac compatibility fixes

ca07590: QEMU: 5D3 1.2.3 GUI works!\u000afixme: not covered by tests

481de4e: QEMU: refactored RTC CS\u000aeach model now uses its own GPIO, rather than enabling all possible registers on all models\u000a70D call trace test: minor change to 0xC02201F8, no impact on functionality

5caccbb: QEMU: 70D GUI works!\u000a- GDB patch required (SIO locking up DisplayMgr task, probably touch screen not responding)\u000a- RTC (similar to 6D, but on different SIO channel)\u000a- updated tests (menu, format, call trace)\u000a- minor change to 100D call trace test (0xC022005C = 450D RTC CS; no impact on functionality)

1aa1e60: QEMU: 6D GUI works!\u000a- MPU log and serial flash from Audionut,\u000a- RTC (a bit hackish, to be refactored)\u000a- GPIOs for HDMI and WriteProtect\u000a- tests (menu, format, call trace)\u000a- patched MPU spells to avoid an intermittent issue (race condition when setting picture quality?)

4822de4: QEMU: fix typo in MPU spells script (broken in a42e55a)\u000a"Complete WaitID = 0x80020000" should have been commented out\u000athis disables LiveView "emulation" in 700D/650D and fixes ML menu for nightly tests\u000atodo: add a test for this (existing tests did not catch this issue)

a55cb4e: QEMU tests: reordered (important, breaks often and/or very fast == runs earlier)

5cd1788: QEMU tests: run in parallel when it's straightforward to do so (experimental)\u000anot parallelized: tests requiring custom builds or checking card contents afterwards

1536a34: QEMU tests: prepare for parallel execution (3)\u000a- stop each QEMU instance from the monitor socket\u000a- two methods: shutdown (clean DryOS shutdown, for GUI tests) and quit (clean QEMU shutdown without turning off the guest OS, for all other tests)\u000a- check for any stale qemu-system-arm / arm-none-eabi-gdb only after each set of tests

2ffb654: QEMU tests: prepare for parallel execution (2)\u000a- unique QEMU_JOB_ID for each job\u000a- unique GDB port and VNC display, derived from QEMU_JOB_ID

01aa167: QEMU tests: prepare for parallel execution (1)\u000a- allow overriding GDB port for each instance (replaced '-s -S' with '-S -gdb tcp::$GDB_PORT'; gdb receives '-ex "set \$TCP_PORT=$GDB_PORT"')\u000a- allow overriding VNC display for each instance (replaced ':12345' with '$VNC_DISP')\u000a- indentation of qemu/gdb commands

050a3cc: QEMU scripts: rough backend support for parallel execution\u000a- requires manual resource allocation\u000a- QEMU_JOB_ID used as prefix for qemu.monitor (each instance would get its own monitor socket)\u000a- GDB port can be overriden and derived from QEMU_JOB_ID (see README)\u000a- VNC port can be handled in the same way\u000a- README updated

e54bfde: QEMU tests/readme: recent netcat requires -N

a31b6ba: QEMU tests: one more race condition fix

9319429: QEMU tests: speed optimizations\u000a- only restore SD/CF images if they were actually changed\u000a- do not wait for gdb if it's not running\u000a- overhead with no tests running: from ~30 seconds to ~10 seconds

e6350ca: QEMU tests: more race condition fixes

73c25e9: QEMU tests: attempt to fix some race conditions

b39024f: QEMU tests: minor fixes after refactoring

ae395c7: QEMU tests: use -snapshot to prevent changing SD and CF images\u000a(exceptions: tests for ROM dumper and DCIM, where we check card contents to validate the test result)

f6125c9: QEMU tests: allow selecting only specific tests to run (lowercase arguments)\u000aCan be mixed freely with camera models (uppercase arguments)\u000aDefault (no arguments): run all tests

ef23b2a: QEMU tests: refactored each test as a bash function\u000a- top-level continue -> return\u000a- moved common preparations to run_test\u000a- each test function uses globals $CAM and $TEST (camera model and test output basename)\u000a- test outputs named $TEST.whatever or $\u000a- generic cleanup after each test\u000a- top-level for loops kept; the loop body calls run_test

695f378: QEMU: make sure mtools prints uppercase filenames by default\u000a(our tests assume this behavior, but some systems have different defaults)

8ceae47: Merged makefile-updates into qemu

cc49f78: QEMU: fix arrow unpress handling on cameras without UDLR (tested on EOSM)

67009e6: QEMU tests: replaced two slow grep commands with sed

9037452: QEMU tests: check call/return trace only until the last function from IDC\u000a(the next 1000 lines can be nondeterministic on digic 6 models)

5be11ba: QEMU tests: refactored matching heuristic for call/return trace on main firmware\u000a(rewritten in Python - much faster)

0eea273: QEMU install: brew docutils needs additional setup; just use the one from pip

824ab8d: removed dependency on realpath\u000a(not available on Mac)

3f97cbe: Makefile: fix compiling tcc

b145d5f: QEMU install: Mac cleanups, to be tested\u000a(xcode-select auto-installed by brew, docutils available as package)

00118b9: Makefile: moved toolchain setup to Makefile.setup\u000a(this allows toolchain to be overridden from Makefile.user)

80119ee: use ESC c to reset the terminal, instead of "tput reset"\u000a("tput reset" may crash when running as background job - bash bug?)

e9d8550: QEMU install: refuse to overwrite an existing installation

8eca12b: QEMU install: only apply the gcc 7.x patch if user actually has gcc 7\u000aalso commit the gcc 7.x patch to our local git repo, so it won't affect updates to qemu-2.5.0.patch

5d46a3e: QEMU install: we have gcc-arm-embedded:i386 on the PPA :)

73efb79: Makefile: fixes to allow compiling ML with Linaro arm-eabi-gcc; updated toolchain recommendations

4c0316f: QEMU: patch for building with gcc 7.x

d4d4812: QEMU install: explicit check for Ubuntu (other systems use apt-get, with different package names); explicit "dpkg --add-architecture i386" if any package needs it\u000a(should fix installation on newer Ubuntu - to be tested)

46231df: MPU spells: try to use parameters (ARG0, ARG1 etc) in simple cases\u000a(same-length replies, repeating the arguments in the same position)\u000a(note: PROP_BURST_COUNT doesn't always work well like this)

fbc7402: QEMU: typo when loading raw images for capture emulation

702d21f: MPU spells: identified some lens properties (PROP_LENS and PROP_LENS_NAME)

a42e55a: MPU spells: identify property description for Complete WaitID messages

866e6b2: QEMU: comment out some common MPU spells and use the ones from our headers;\u000aalways include the headers in autogenerated spells\u000aalways disable sensor cleaning\u000a(some emulation differences in a few models, hopefully non-essential)

89f33ed: MPU spells: identified PROP_BATTERY_CHECK\u000a(verified before dialogs such as card format or firmware update)

c1a3873: QEMU: print names of MPU spells (exported from\u000aand highlight the ones without name or without known behavior

2e56dfb: MPU spells: documented a bunch of properties and updated their indexing\u000a(some trial and error, others copied from )

c679ab2: QEMU: handle INFO unpress event (for 5D3)

301ae81: QEMU: generate valid dark frames if a CR2 isn't available

a3591c8: QEMU: allow full-res 14-bit data from any format readable by dcraw\u000a(usually CR2 and DNG; example in README)

309e498: QEMU: use <%d> for EDMAC connections in debug messages\u000a(e.g. connection <5>, channel #16)

e5eb342: QEMU: moved image processing engine functions to separate file\u000a(EDMAC, PREPRO, JPCORE...)

996d051: make install_qemu: check whether sd.img or cf.img is mounted before copying files

2b91c8c: also print the command-line of arm-none-eabi-gdb, if any\u000aand whether it's running as a background job or not

5421d97: QEMU: updated 600D test to include the info screen\u000a(had to enable it in Canon menu)

501a169: QEMU: disabled sensor cleaning animation on 5D2, 50D, 60D\u000a(interferes with ML menu; updated tests)

6afd543: QEMU: warn user when shutdown is not clean

a3bec4e: QEMU: updated 100D menu test to show all menus (including the FlexiZone AF setting)

73d1573: QEMU: run 100D with FlexiZone AF enabled (this setting results in ML crashing at startup)\u000a

b3e509e: QEMU tests: declared cameras able to run the FRSP test at the beginning\u000a(so run_test arguments now apply to this test as well)

1412149: qemu-frsp: updated to operate from PLAY mode\u000apreviously, it was operating on the date/time screen;\u000anow all models are starting either with Canon's info screen,\u000aor with display off, or show the sensor cleaning animation

c19d7a4: QEMU install: updated regex for parsing GUI_CAMS from\u000a(to allow multi-line declaration)

bbe51f6: QEMU tests: 100D typo\u000a(old file)

a044bc8: QEMU tests: updated for 5D2/50D without date/time dialog\u000anote: sensor cleaning animation makes the test nondeterministic - do not check these screens

4d945c0: QEMU: 5D2/50D RTC patch from g3gg0\u000a(date/time dialog is history!)

6c493fb: QEMU: updated README

8d9c682: QEMU: enabled PROP_MPU_GPS on all DIGIC 5 models

8914fc4: QEMU: EOS M boots the GUI!\u000a(it also needs the GPS patch - moved to GPS.h)

4b919be: QEMU: updated tests\u000a(after RTC emulation, I2C and patches cleanup)

93e57ce: GDB scripts: date/time patches no longer needed!

baa4496: QEMU: reworked I2C debug messages

26f7275: QEMU: updated MMIO highlighting code\u000a(module name is now highlighted as well - easier to spot)

10a6add: QEMU: moved RTC emulation to its own handler; reworked debug messages

a691c3d: QEMU: enabled RTC emulation for most models\u000aexceptions: 5D2 and 50D appear to use a different chip or method

0d654a0: QEMU: RTC patch from g3gg0\u000a5D3 and 60D no longer show the date/time screen!

b8f8669: QEMU: I2C patch from g3gg0

6433c78: QEMU: figured out why 5D3 was locking up at startup and in certain menus - it was waiting for PROP_MPU_GPS!\u000a(thanks g3gg0)

db3174d: QEMU install: don't install two toolchains if user selects 64-bit GDB

32d5cef: QEMU install: libnewlib-arm-none-eabi is architecture-independent

8a17206: QEMU install: download toolchain from launchpad and use as mirror\u000a( is currently down, hopefully not from our experiments)

0c43b50: QEMU install: make it clear that *you* have to run the PATH command (not the script);\u000ause export (e.g. for shells other than bash) -

b424f9a: QEMU install: 32-bit Mac toolchain doesn't have gdb...

d26bf04: QEMU install: wrong quotes

5e428cc: QEMU install: fix some copy/paste errors

1702004: QEMU install: allow using the current 64-bit toolchain on Ubuntu; minor fixes

d887fd8: QEMU install: more toolchain options (experimental)\u000a- Mac: try the toolchain from (not tested)\u000a- Ubuntu: options to install GCC from Ubuntu repo\u000a - older version, 32-bit or 64/bit\u000a - from gcc-arm-embedded PPA (6.x 64-bit)\u000a - from gcc-arm-embedded (32-bit installed in home directory)\u000a - use the existing installation if possible\u000a- Ubuntu: don't install libfdt-dev (not needed?)\u000a- all: print warnings about 64-bit GDB and allow using it anyway if user says so\u000a- all: check whether arm-none-eabi-gcc can compile a simple program\u000a- all: check whether rst2html or vncdotool are installed outside package manager

1a0c8cc: Merged in kichetof/magic-lantern-1/kichetof/qemu-install-elegant-way-to-install-pack-1506440503741 (pull request #861)\u000a\u000aQEMU install: elegant way to install packages on macOS

f4d6f45: QEMU install: remove docutils install for macOS

c94cd8c: QEMU install: elegant way to install packages on macOS\u000aChecks if the package is already installed otherwise install it

75c10ef: QEMU install: on Ubuntu, gdb-arm-none-eabi:i386 and gcc-arm-none-eabi can be installed with the same command\u000a(false alarm; let's also check for correct installation)

36f0c12: QEMU install: pip does not require sudo

6294699: QEMU install: fix for dpkg -l also returning non-installed packages\u000a

a393b45: QEMU install: on Ubuntu, gdb-arm-none-eabi:i386 and gcc-arm-none-eabi must not be installed with the same command\u000a(otherwise, we get gcc-arm-none-eabi:i386 which does not include libnewlib-arm-none-eabi...)

5be6b11: QEMU install: pip recommends sudo -H\u000a

84e77a5: QEMU install: also set up the toolchain for compiling ML (Ubuntu)

92399e9: QEMU install: typo

983ebed: Makefile: updated toolchain recommendation; minor edits

f19ab52: QEMU install: 64-bit arm-none-eabi-gdb doesn't work (cannot boot 5D3 GUI),\u000ano matter where it comes from (Ubuntu repo or gcc-arm-embedded PPA)...\u000aon 64-bit Ubuntu, gdb-arm-one-eabi:i386 works, but Windows and Mac are out of luck for now

a1b765e: Makefile: attempt to use any arm-none-eabi-gcc from PATH, if already installed (to be tested)\u000aBy default, it will attempt to use ~/gcc-arm-none-eabi-5_4-2016q3 if installed.

6c6a7f7: QEMU install: gcc-arm-embedded try #5

c816b19: QEMU install: gcc-arm-embedded try #4

f30c606: QEMU install: gcc-arm-embedded try #3

e0edbf5: QEMU install: gcc-arm-embedded try #2

beaa53c: QEMU install: let's try gcc-arm-embedded from PPA

8b43556: Merged in kichetof/magic-lantern-1/kichetof/qemu-check-if-brew-is-installed-on-macos-1506424463270 (pull request #860)\u000aalso included this suggestion:

dccfc07: QEMU: check if brew is installed on macOS

f65820c: Makefile: use gcc 5.4.1 by default (current version from )

a24f36e: QEMU install: more Mac patches (not tested)\u000afrom

a8c0793: QEMU install: also install docutils and vncdotool

1c1402e: QEMU install: verbosity fine-tuning

5c2fbe1: QEMU: minor README updates

b3188ba: QEMU: README formatting

84b2c84: QEMU: README formatting

e22d95a: QEMU: updated install instructions in README

2da1561: QEMU install: arm-none-eabi-gdb requires 32-bit libraries on Ubuntu

2531efc: QEMU: set up arm-none-eabi-gdb from the install script

b266b03: QEMU: auto-install dependencies if running on Ubuntu-based systems (to be tested)

45fa299: QEMU: some Mac patches for install script (not tested)\u000a

0926611: QEMU: ggrep patch for Mac from kichetof\u000a

756f231: QEMU: supply an email address for git if the default doesn't work\u000a

c16b550: QEMU tests: M3 display test, using DISKBOOT.BIN from Ant123\u000a(also test other PowerShot models to see whether they are loading DISKBOOT.BIN from the card)

35113df: QEMU: EOS M3 display support from Ant123 (using a custom CHDK build)

230b85a: QEMU README: Bitbucket doesn't resize the images...

1b96139: QEMU README: let's try some screenshots

0db6b6e: QEMU: more README updates\u000a- shutdown notes (system_powerdown vs quit)\u000a- rewritten QEMU monitor section\u000a- how to bypass the date/time dialog

39eb4b0: QEMU: minor improvements to README

ad0159f: QEMU: README updates\u000a- shutdown and reboot\u000a- running from physical card\u000a- menu navigation (keys)\u000a- misc notes, minor typos

168ba86: QEMU: 1000D GUI works too\u000a(based on 450D)

057f2c6: QEMU: stretch display vertically on VxWorks models\u000a(double all lines to get correct aspect ratio)

0732213: QEMU: emulate JUMP and Direct Print buttons (for VxWorks models)

a075527: Backout 89254290c3f7\u000a(shutdown only works only when not activating Canon menu, with or without this patch)

d2dbd23: QEMU: 450D GUI working!\u000a- updated MPU spells, button codes and parsing scripts\u000a- WriteProtect GPIO\u000a- SET does not send unpress events\u000a- menu navigation working, format locks up\u000a- shutdown working\u000a- updated tests

30c239f: QEMU: print whether available keys are press-only or they also send unpress events

8925429: QEMU: re-created 70D MPU spells; shutdown working

20a176d: QEMU: shutdown working on most models able to start the GUI (all but 70D)

72ed052: minimal targets: removed old references to qemu-util

5a8ad8c: QEMU tests: always stop GDB when QEMU quits

fd35fba: QEMU tests: updated to handle shutdown and reboot\u000a(shutdown test after menu navigation, reboot test when formatting card and restoring ML)

d79e391: QEMU: handle PROP_ABORT (after opening battery door)\u000afixme: it doesn't shutdown, figure out why

063c3ef: QEMU: handle the powerdown event\u000a(menu: Machine -> Power Down)

6198074: QEMU: experimental shutdown handling (card door and power switch)

8df1b6a: reloc.c: cleaned up ifdef's

698f0de: QEMU: minor README update\u000a(ML menu now working on all models able to boot the GUI)

446db81: QEMU: 1200D doesn't have a dedicated delete button\u000a(use the key codes from 1100D - same as 600D, but without the delete button)

22b4722: QEMU: experimental Av button handling for Rebel cameras\u000a(fixme: has some side effects, such as changing the displayed shutter speed)

779bed7: QEMU: don't auto-repeat keys, except for scrollwheels

eaea104: QEMU: also allow right shift for half-shutter

bfda257: QEMU: handle the FUNC button (for 50D menu navigation)

97b097b: Merged unified into qemu

b5e7123: QEMU: updated 700D to 1.1.5 (GDB scripts and menu tests)

f20dedc: QEMU: README updates

66f4df6: QEMU: initial README draft

2412fbe: Makefile: "make install_qemu" for platform targets;\u000aupdated to use it

96bddd8: qemu-util: qprintf requires stdarg.h (when not included from dryos.h)

cf36c61: Makefile: allow using CONFIG_QEMU for modules (qprintf and related functions)

0b9b550: Makefile: allow overriding CONFIG_* options on the command line\u000ae.g. make CONFIG_QEMU=y\u000a(suggestion from g3gg0)

5ce88f3: qemu-util: make the QEMU debugging API header-only

037e8ca: console include qemu-util.h is no longer needed

04e9a75: menu: removed QEMU workaround (no longer needed - GUI mode switch works on most models)

266f08e: QEMU: workaround for invalidating executable code after ROM patches\u000afixme: this should be handled internally by QEMU; not sure why it isn't\u000ato reproduce: register_interrupt hook on dm-spy-experiments branch, with hooks enabled right after Canon's init task\u000a(the hook will fail on models where this function is in ROM, e.g. 550D, but will succeed if it's in RAM, e.g. 5D3)

10967ec: Raw backend: some more debug messages\u000a(useful for qemu-frsp tests)

fc3f8d7: QEMU tests: reworked FA_CaptureTestImage test:\u000a- enabled debugmsg in the main log; moved UART output to a new file\u000a- run until FA_CaptureTestImage Fin appears in the UART log\u000a- also check models with no display (from the UART log)

1efbe23: qemu-frsp: fix compilation

fb73d4f: Merged unified into qemu

95a1b76: QEMU tests: FA_CaptureTestImage test also working on 50D, 500D, 550D and - without display - on 1100D

cdd4349: qemu-frsp: use CONFIG_QEMU to enable debug messages from raw.c

6ffef9c: qemu-util: removed old experiments\u000a(kept the initial hello world for historical purposes)

249eacf: Raw backend: print to QEMU console if compiled with CONFIG_QEMU=y\u000a(without enabling RAW_DEBUG)

230f796: qemu-frsp: fix compiling on 500D, 5D2 and 50D

180051f: memcheck: check malloc heap in the same way as AllocateMemory (500D only for now)

2a0ae3f: memcheck: option to identify uninitialized memory accesses in main firmware\u000athat could be exploited from bootloader

c50d44a: memcheck: fix operation on DIGIC 6

f2c84b5: memcheck: fix operation without ML memcpy

06334d5: QEMU: tests for memchk, from minimal ML\u000a(not all of them are passing)

15d8d0f: qemu-hptimer: CONFIG_INSTALLER no longer needed

be3254c: 7D: fix minimal targets (no LEDON/LEDOFF on this model though)

c48a6fc: GDB scripts: register_interrupt on all models (with test)

09e9d43: GDB scripts: removed duplicate code between */debugmsg.gdb and */patches.gdb\u000a(if patches.gdb is present, debugmsg.gdb will always include it)\u000a(also moved 1300D patch to separate file)

29bab2b: GDB scripts: disabled slow items by default\u000a(semaphores, message queues, MPU communication, ResLock, EDMAC)

1196a70: GDB scripts: symbol-file commands to get debugging symbols from ML (commented out)\u000atodo: auto-enable when autoexec.bin is executed?

9265538: QEMU: always load camera-specific files from CAM/ or CAM/FW/ (refactored to avoid duplicate code)

262146b: QEMU tests: updated menu test for 70D 1.1.2

059a526: QEMU tests: updated 70D needles (expected results) for 1.1.2

a094e14: QEMU tests: allow camera models as arguments

f53a35a: QEMU: with -d exec, make sure the instructions aren't printed twice

d422843: QEMU tests: very basic Dry-shell test

3f81006: QEMU: experimental UART support in main firmware\u000a(Dry-shell working on all DIGIC 4 and 5 models)

5792b77: QEMU: option to highlight certain MMIO registers\u000a(requires editing the source code)

726806f: QEMU: option to export MMIO reads as dm-spy entries (dm-spy-experiments branch)\u000athis allows cross-checking the values with the ones from actual hardware\u000ausage:\u000a- ./ 5D3 [...] -d io,nochain -singlestep\u000a- copy/paste some entries into dm-spy-extra.c (grep for mmio_log to find them)\u000a- get logs from both camera and QEMU (dm-spy-experiments branch, CONFIG_DEBUG_INTERCEPT_STARTUP=y, maybe also CONFIG_QEMU=y)\u000a- adjust the emulation until the logs match

ef9d1d0: QEMU: require verbose (e.g. -d io,int,verbose) to show DryOS timer interrupts and DIGIC timer

6a5929d: QEMU: incomplete 5D3 1.2.3 GUI (boots with black screen, no menus)

feb0949: QEMU logging: option to identify tail function calls (heuristic)

6fa216a: QEMU tests: trimming should work now

22230b6: QEMU tests: trimming must be done on useful lines, not on raw input lines\u000a(otherwise the test will be sensitive to any additional info in the raw log)

84f6013: QEMU tests: call/return trace tests first\u000a(they are more likely to fail or require frequent updates)

665bf5b: QEMU tests: include interrupts in main firmware call/return test\u000a(this allows counting related stats from the filtered log - smaller)

2010fa1: QEMU tests: use ansi2txt only once in the main firmware call/return test (speed optimization)

c3ba92d: QEMU tests: IDC needs trimming as well in order to get deterministic results

47136af: QEMU tests: trim calls-main-basic.idc until matching the "needle" md5\u000a(hopefully this trick will get repeatable results on faster PCs)

8677809: QEMU tests: 5D2 IDC test not deterministic (functions are the same, but comments are not)

4f0863d: QEMU: do not use non-printable task names\u000a(VxWorks: current_task is set before it has a valid name)

ee74ce9: QEMU: backout parts of 8e29c15\u000alarge timeout didn't solve the repeatability issue - results are still sensitive to processing speed\u000asome models keep running in a loop, and after 10-20 seconds, they "discover" a new function and so on

8e29c15: QEMU tests: let's try a larger timeout; minor fine-tunings

2d1d5d5: QEMU tests: found a way to get deterministic execution (icount option)\u000a- reworked the call/return trace tests to also run on main firmware (with -icount)\u000a- fixme: CF models do not have deterministic execution, even with -icount\u000a- fromutility tests also enabled on CF models (IDC only)\u000a- "first interrupt" test replaced with full call/return trace on main firmware\u000a- removed "sorted IDC" tests (the regular IDC + call/return trace tests are much stronger)

d2a2f64: script to wait for a string to appear in a log file, with timeout since last update of the log file

45531b1: minor fixes

16db46e: Moved my_fprintf to fio-ml.c (fixes compilation of minimal/qemu-frsp)

ce4e0ea: QEMU logging: always name DebugMsg, even if no symbols are loaded

f2fdf93: QEMU logging: fix loading symbol names on Thumb code

ec061a6: QEMU: fix off by one error when loading ML stub names

d43bf3a: boot-hack: check whether we can reach anything in the ROM with relative jumps

bfa1b22: boot-hack: self-check for ARMLIB_OVERFLOWING_BUFFER

Build Log

Test results: 5 passed, 1 failed.

519f2d0: Merged new-dryos-task-hooks into 100D_merge_fw101\u000a(enabled CONFIG_NEW_DRYOS_TASK_HOOKS in internals.h; added task_dispatch_hook comment)

83bb3a3: boot-hack: use CONFIG_NEW_DRYOS_TASK_HOOKS to enable new-style DryOS hooks\u000a(undefining HIJACK_TASK_ADDR was not obvious)

e601292: boot-hack: uninstall cache hacks after booting (to be tested)

96851a9: boot-hack: more debug messages regarding memory allocation\u000a(for HIJACK_CACHE_HACK and RSCMGR_MEMORY_PATCH_END)

8260b14: boot-hack: fix CONFIG_HELLO_WORLD & friends when booting with HIJACK_CACHE_HACK\u000a(task_dispatch_hook should not be set in this case)

792e194: boot-hack: fix task dispatch hook message missing when booting with HIJACK_CACHE_HACK

be1f5a3: Task hooks: disabled task switch debug messages by default\u000a(too verbose)

a0aedff: 550D, 600D: fix memory allocation (amend 5b4fe18)

0fe3220: 6D: ADTG shutter addresses did not work, trying another set

224843f: 6D: fix ADTG shutter addresses after memory layout change\u000a\u000a\u000a\u000anot tested, just confirmed the new addresses in QEMU\u000afixme: are these deterministic? under what conditions?

Build Log

Test results: 2 passed, 4 failed.

97d64bf: 100D: enabled Sticky half-shutter (unlikely to cause issues) and Sticky DOF preview (to be tested)

Build Log

Test results: 5 passed, 1 failed.

df1f1b5: Merged unified into 100D_merge_fw101

1aab319: Merged new-dryos-task-hooks into 100D_merge_fw101

31848a7: 100D: MPU stubs (for dm-spy-experiments)


82126d8: Merged in makefile-updates (pull request #873)\u000a\u000aMakefile updates to use any valid ARM toolchain

6cef1ea: Makefile: fix 7D build_fir

52bccf5: Makefile: fix building Lua with gcc 4.7.3

a289367: Makefile: only attempt to build/install/check ML-SETUP.FIR if there is a valid installer directory\u000a(some platforms may not have have one - 7D_MASTER, new ports)

5b81f34: Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF\u000a(backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)

1d98a07: Makefile: moved 7D-specific tweaks (FIR etc) into main target (7D.203)\u000afor consistency with other platforms, including 7D2\u000ato build the regular FIR: make build_fir\u000ato build the installer FIR: make ML-SETUP.FIR -B

f8beef0: Makefile: FIR building updates\u000a- always install ML-SETUP.FIR (zip, install, install_qemu)\u000a- build_fir for regular ML (not installer) now gives AUTOEXEC.FIR\u000a- to recompile ML-SETUP.FIR: "make ML-SETUP.FIR -B" from platform directory\u000a- "make zip" will also compile the installer from source, without replacing the precompiled ML-SETUP.FIR\u000a (just to make sure the source code changes do not interfere with building the installer)

47f3108: Makefile: fix building xor_chk from its own directory

59a6d0a: Makefile: more .NOTPARALLEL fixes

5249a4a: Makefile: fix 7D FIR path\u000a(just for consistency)

2c627b1: Makefile: use .NOTPARALLEL in top-level Makefiles, rather than double-colon rules\u000aML platforms/modules are built sequentially, but within each platform/module, parallel build is used\u000ato be tested on Mac with -j8\u000a(on Make 3.81, double-colon are executed in parallel, while in 4.2.1 they are sequential)

36d3ec2: Makefile: fix README.rst generation with POSIX shells\u000ato reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash

01953d3: Makefile: serialize "make install", fix some related dependencies\u000aparallel copying could lock up WIFI_SD cards\u000ato reproduce: "WIFI_SD=y make install ML_MODULES=" from platform/CAM directory

e592e31: Makefile: monitor wifi connection when using WIFI_SD=y\u000a(experimental, helps troubleshooting connectivity issues)

84d6ed4: Makefile: minor refactors for WIFI_SD (coding style)\u000aalso fixed a typo

26fe70c: Modules: better error handling for missing rst2html\u000a

5ea430b: Makefile: speed optimizations\u000a- helper to evaluate only once, only if used\u000a- modules hgstamp: only evaluate if used\u000a- CF_CARD, VERSION: only evaluate once if used\u000a- PWD is special? renamed to avoid unneeded shell calls\u000aProfiling tips:\u000a- perf record make; perf report --sort comm\u000a- make SHELL="sh -x"\u000a- make clean SHELL="sh -x" |& grep "^+" | sort | uniq -c

f2ed3dc: Makefile: enable parallel compilation for modules, but compile them sequentially\u000ahuge modules like Lua will compile much faster\u000acompiling everything in parallel is not 100% safe (some dependency checks may fail)

4d93c8f: Makefile: do not print toolchain info on recursive calls

d206167: Makefile: reworked global targets\u000ainstall: doesn't make sense, as we no longer have a "one size fits all" build capable of running on all models\u000a (alternative: 5D3.113_install, 60D_install etc)\u000azip: build zip for each camera model, sequentially (parallel build still used within each zip)\u000aall: similar to zip (build camera models sequentially, but use parallel compilation within each platform)\u000aclean, check: these can run in parallel (no restrictions)

aa05061: Makefile: fix module dependency checking on "make zip"\u000aby default, a module succeeds if it can be loaded on any camera model, from those compiled (doesn't matter which one)\u000awhen using "make zip", we only want to include the modules compatible with current camera model, without considering other models\u000a(fixme: not the cleanest way to implement this)

718e285: Makefile: fix module_strings dependency rule\u000a(previously, there was an error with make -j)

2db4026: Makefile: dropped ML_MODULES_STATIC (unused) and renamed ML_MODULES_DYNAMIC to ML_MODULES\u000anote: if you have customized the module list in Makefile.modules.user, just rename ML_MODULES_DYNAMIC to ML_MODULES\u000ato compile without modules: make 5D3 ML_MODULES=

ff1401e: Makefile: fix "make clean" from modules directory with stale modules from other branches\u000a

3ca10bd: Makefile: fix running from other directory\u000ae.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu

9199719: Makefile: model-specific install targets for the root directory\u000aexamples: make 500D_install; make 500D_install_qemu

871f759: 7D: fix compiling with FEATURE_VIDEO_HACKS

6a08a65: Makefile: fix building 7D_MASTER

c7554e3: Makefile: minor cleanups from 0b9b550

440a589: Makefile: always define CONFIG_$(MODEL)_$(FW_VERSION)\u000ae.g. CONFIG_5D3_113, CONIFG_7D_203 and so on

539328f: Makefile: fix for GNU make 3.8.1\u000a(thanks g3gg0)

f03c00c: Makefile: fix newline issue with WIFI_SD=y

84d1418: Makefile: fix Mac issue (undefine not supported)\u000a

623689f: fixed late evaluation issue in rule builder

bda493a: fix indentation

5b4fe18: 550D, 600D: reserve 576K for ML\u000a(640 is a bit too much, 512 is too tight)

27f4105: Makefile: rules for "make install_qemu"\u000a(to use them, qemu has to be installed first)

383ea35: Makefile: with WIFI_SD=y, ping the card until it comes online (useful for router connections)

7fd995a: Makefile: portable way to get number of processors

30a88aa: further makefile cleanup, added make check to show which models were built and their memory usage

37dd596: fix 'all' target for models

dcc1583: disable ASSERT for 7D_MASTER

376a9cc: removed explicit make executable definition. allows to run e.g. 'remake' to debug make rules

e6ffbdf: reworked model make rules to support different firmware versions for a model [to be thoroughly tested]

9033380: disable ASSERT for 7D_MASTER

a494258: Feature matrix: updated links

3f85e34: Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876)\u000a\u000aAdd 6D.116 to sf_dump module

c326fdc: Added 6D.116 to sf_dump module.

75a085c: Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877)\u000a\u000a600D audio meters fix

c82a97f: 600D also needs Audio IC turned on at boot.

d4e6421: Makefile: also print CONFIG overrides from command-line\u000a(alongside the ones from Makefile.user)

447a93c: Makefile: print tips for using make -j\u000a(how to set it by default in Makefiles?)

4b4b194: Makefile: silence warning about CONFIG_SITE\u000a(some recent Linux distros use it)

345427f: Makefile: portable way to get libgcc.a's path

26c84b1: Makefile: removed old dropbox target

be16e64: Makefile: print build info after "make zip"; skip EXIDX line

d3e332d: Makefile: fix CONFIG_CCACHE

f51317e: Makefile: use "gio mount" rather than "gvfs-mount"\u000a(they are interchangeable; older systems may require gvfs-mount, newer systems will print warnings)

0391160: Task hooks: fix task overriding on very old DryOS models\u000a(to be tested on all camera models)

9aec0a1: Makefile: if no valid ARM GCC is found in PATH, try to find one in the home directory

84dd3fd: selftest: check handling of null pointer errors (make sure a crash log is saved)\u000a100D and 70D used to crash in this scenario, rather than saving a log\u000a (next few pages)

02c1a68: Merged unified into new-dryos-task-hooks

cd0ee94: Makefile: fix compiling tcc

d06fe5d: Makefile: moved toolchain setup to Makefile.setup\u000a(this allows toolchain to be overridden from Makefile.user)

993fd34: Makefile: fixes to allow compiling ML with Linaro arm-eabi-gcc; updated toolchain recommendations

579cec7: Makefile: updated toolchain recommendation; minor edits

6566325: Makefile: attempt to use any arm-none-eabi-gcc from PATH, if already installed (to be tested)\u000aBy default, it will attempt to use ~/gcc-arm-none-eabi-5_4-2016q3 if installed.

e533765: Makefile: use gcc 5.4.1 by default (current version from )

30db465: Merged in daniel_fort/magic-lantern/unified_650D_audio_meters_fix (pull request #870)\u000a\u000a650D audio meters fix

0fa7a8e: 650D has the same audio meters issue as the 700D -- needs the same fix.

08720b2: Merged in daniel_fort/magic-lantern/unified_700D_audio_meters_fix_1 (pull request #866)\u000a\u000aAudio meters fix for 700D\u000a\u000aApproved-by: Daniel Fort

17b95fb: Audio meters stop functioning after recording the first clip when using mlv_snd. Easy fix suggested by a1ex.

Build Log

Test results: 6 passed, 0 failed.

ca46ef4: 100D: minor typo

c08b8ae: Merged new-dryos-task-hooks into 100D_merge_fw101

4cf7015: tskmon: in null pointer check, retrieve last last task name directly, rather than calling is_taskid_valid\u000aalso fixed some possible null pointer bugs in the... null pointer checking code\u000a(fixes crash when reporting null pointer on 100D and likely on all other cameras with new-style DryOS hooks)

Build Log

Test results: 0 passed, 5 failed.

1db2345: 100D: fix MAX_ISO_BV

Build Log

Test results: 4 passed, 0 failed.

d85e97b: Merged unified into 100D_merge_fw101

80501e7: installer: fix compilation

22a03ba: Merged in daniel_fort/magic-lantern/update-to-700D.115 (pull request #813)\u000a\u000aUpdate to 700D.115

5e44a93: 700D: fix AbortEDmac

77e64aa: Dummy merge with dfort's unified

4ce4d28: 700D, 6D, 7D: fix AbortEDmac

b363c94: 700D: undo dialog_refresh_timer change in mlv_rec/mlv_lite\u000a(this address is the same in 1.1.4 and 1.1.5)

7e969b4: Update sf_dump module to 700D.115

93e177a: Fixed is_taskid_valid stub.

0b141cd: Merged unified into update-to-700D.115

e228e1b: Added minimal autoexec.bin for 700D

2023513: Merged unified into update-to-700D.115

72ac881: Merged unified into update-to-700D.115

434b7eb: Incorporated pull request #842 to fix Autoexposure module

70852eb: Merged hudson/unified into unified to prevent new remote heads.

2e989b7: Update to latest exiftool

435cb10: Merged unified into update-to-700D.115

f15d607: Resolve conflicts with changes to Task info in stubs.S

1400d79: Merged unified into update-to-700D.115

2a83ae8: Added new ML-SETUP.FIR created by a1ex

fc28684: update to firmware revision 700D.115

fa90b21: hg rename 700D.114 700D.115

226838b: Merged in daniel_fort/magic-lantern/unified_silent_module_fix (pull request #854)\u000a\u000amodify silent.c to work with commit f404e5f

0e9da39: TCC Makefile: fix minor typo

b6df56d: silent.c: there are no info bars in paused LiveView mode

d8d44a7: modify silent.c to work with commit f404e5f\u000aRaw backend: allow displaying raw previews without conflicting with LiveView info bars

Build Log

Test results: 3 passed, 1 failed.

b28cd95: Merged in nikfreak/magic-lantern/100D_merge_fw101 (pull request #867)\u000a\u000a100D merge fw101 update

70e77de: 100D: AbortEDmac stub

a96451f: 100D: fix ADTG/CMOS_WRITE_FUNC

Build Log

Test results: 3 passed, 0 failed.

c796fbb: Merged in Dannephoto/magic-lantern/100D_merge_fw101_SOUND (pull request #863)\u000a\u000aFix for audio issues on eos 100D, possibly other cameras too.\u000a\u000a* Fix for audio issues on eos 100D, possibly other cameras too.\u000a\u000a Thanks too dfort for code.\u000a\u000a* Nikfreak found the correct stub\u000a\u000a\u000aApproved-by: nikfreak

Build Log

9f943d9: Merged unified into 100D_merge_fw101

1cfca21: fix 100D (tested, confirmed working)

3223248: fix wrong stub (thx @dfort for the note)

2029c44: manual focus: allow moving focus box

6768410: 100D: enabled CONFIG_TSKMON

4f97f4f: 100D: fix task_dispatch_hook

858a20c: 100D: enabled CONFIG_ALLOCATE_MEMORY_POOL and classic boot process\u000a(similar to 6D, reserved 592K at the beginning of AllocateMemory pool)

5b0b23e: Merged new-dryos-task-hooks into 100D_merge_fw101\u000a(note: 100D will not boot until fixing memory allocation)

261ca8a: 6D: 592K reserved at the beginning of AllocateMemory (simpler code)

02965e5: 100D: enabled CONFIG_EDMAC_RAW_SLURP

1762542: Merged qemu into new-dryos-task-hooks

b6468e0: Merged unified into new-dryos-task-hooks

b8f3e05: boot-hack: fix wrong comments (AllocateMemory != system memory)

fc545d1: sync FIO stub changes introduced in unified

ef01395: Merged hudson/magic-lantern/unified into 100D_merge_fw101

5afed4d: fix suggested by a1ex for

c8b7f50: use MENU button for calling zebras in playback mode.\u000arequested and\u000aw/o this menu button would open Canon menu and quitting playback mode anyways. If one needs to do so just press halfshutter or play button(s) to quit playback mode and afterwards the menu button.

22928a1: we indeed can switch between YUV422 addresses\u000afixes\u000aalso sync MOV_RES_AND_FPS_COMBINATIONS value (Digic5)

83173fc: adjust movie related consts

e902a88: Merged hudson/magic-lantern/unified into 100D_merge_fw101

744f586: remove custom symbol file handling\u000a(leftover from fw revisioning 100D_100A/100B)

8433bca: fix curent_interrupt stub (thx @a1ex)

67cf458: add missing task related stubs

155d57f: Backout changeset 1914eafc755cad2f2ebb17a4bde35949deb5eacf

1914eaf: fix wrong stub, as suggested\u000a

bc6d41d: flexinfo refinement (switch back to COLOR_FG_NONLV)

efad6c5: adopt celsius display and apply color related adjustments

81386c6: use INFO button to disable ML during boot

25c196b: fix indentation

6694d6a: Merge unified

4a394d3: prepare for edmac_raw_slurp

08cfbd1: Merge unified

7f18e89: Merged unified into 100D_merge_fw101

60a2c84: trying to fix the version numbering for the last time ;D\u000amust have been sleeping

48ab54d: fix faulty version numberings

0164b73: cleanup part2

0e58df5: cleanup part1

71e3947: initial ML port for FW1.0.1 -> getting rid of revision handling

d823c4c: Created new branch 100D_merge_fw101

ebd35b4: Merged backtrace into qemu

bcfbe3b: GDB scripts: comment out DebugMsg (prefer -d debugmsg instead)

0ff5205: identify DebugMsg from GDB script if not set\u000a(moved from\u000aalso print command-line after clearing the screen

9104bf2: QEMU: GDB scripts for 50D and 6D

e4376a1: backtrace: moved sources to src/ to avoid symlinking (cross-platform issues)\u000aand let the install script figure it out

2968edb: Merged backtrace into qemu

4a03838: Merged unified into qemu

115fe25: backtrace: brute force stack scanning as backup strategy (idea from g3gg0: gdb.c, gdb_get_callstack)

ab6d33c: backtrace: fix BKT_RANDOM_BRANCHES experiment

fbb532b: backtrace: BX LR is never encountered during tests

3db5423: backtrace: fix stack overflow

64d4726: run_ml_all_cams: fix missing quote

f3780ad: QEMU logging: backtrace test script

595b8b8: run_ml_all_cams: prefer single quotes instead of \$ for options

6b6c5c5: run_ml_all_cams: allow full customization of log file name

6400dc7: Stack traces for crash and assert logs, using the backtrace backend

b9c5214: Updated backtrace.c to work on the camera as well\u000a(same source file for both QEMU and ML)

4e7c966: arm-mcr.h: fixed read_lr (not sure what the problem was) and added read_sp

29f6edc: QEMU logging: experimental stack trace routine (backtrace) that does not require prior instrumentation\u000ait attempts to walk the stack, emulating instructions that change LR, SP, function returns and tail calls\u000asome more experiments and self-tests are available as compile-time options\u000athis method can be adapted to run on the camera as well

9a966eb: run_ml_all_cams: fix copying zip to SD/CF image

695235c: QEMU logging: fix assertion when printing callstack from interrupts on Thumb code

965584e: QEMU logging: save/restore callstack exec state for each DryOS task when handling interrupts\u000aThis fixes calls/returns that were missed if an interrupt happened exactly before the jump\u000a(non-deterministic issue; was fairly rare and not obvious)

870370f: QEMU logging: indent now public (eos_indent); larger buffer

f7a8977: QEMU logging: CALL_LOCATION for eos_callstack_get_caller_param; fix CALL_DEPTH

dfa8c40: QEMU logging: overriding LR no longer needed in call_stack_push

aaa41f3: run_ml_all_cams: fix copying zip to SD/CF image

cd37857: QEMU logging: do not report jumps from tight loops\u000aotherwise, some loops would print a huge amount of jumps (unnecessary)\u000athese would slow down certain tests a lot, e.g. 5D3 callstack on fromutility

1edb651: QEMU logging: record direct jumps to function calls (many such calls in DIGIC 6)

8b90df8: QEMU logging: log task switches before other items\u000aotherwise, consistency errors may appear - see\u000aminor differences in VxWorks tests

dea9a09: QEMU: ignore CBZ (on Thumb-2 code)

d9d4d65: run_ml_all_cams: use multi-line QEMU_SCRIPT's (nicer formatting)

fee11f9: run_ml_all_cams: fix BOOT=0

0b67e0c: run_ml_all_cams: fix ML_PLATFORMS when not specified

8ebfcc8: QEMU: 650D GUI

67deddd: QEMU: 650D GUI (including tests)

3049e97: QEMU: 1300D updates\u000a- SD interrupts (DCIM test passed)\u000a- HDMI status (minor)\u000a- GDB script updated for latest firmware\u000a- patch JPCORE (fixes assert)

2facd3e: QEMU tests: removed MENU_CAMS (all GUI_CAMS are now able to browse Canon menu)

47994c3: QEMU: 70D menu tests (format test not working)

08dde97: QEMU tests: only print ROMCPY messages before the first interrupt

a2ad3bd: QEMU: options for to compile and run a given set of ML platforms, from any HG changeset

efb2dcf: QEMU: updated as discussed on EOS M2 thread\u000a

70592bd: QEMU: flush after qprintn, so the output will appear right away

a5b489e: QEMU logging: handle %c with -debugmsg

225c660: QEMU logging: minor fixes for -d autoexec

6968862: QEMU: updated 5D4 GDB script and tests for 1.0.4

2773fc1: QEMU logging: workaround to handle some missing return from interrupts\u000a(updated 600D and 1100D unique function tests - they differ by one function)

b8a0b80: QEMU: EOS M2 tests + patches.gdb

5fa8899: QEMU: OOB fix from

6b3b4d5: Merged in daniel_fort/magic-lantern/qemu-EOSM2-wip_1 (pull request #835)\u000a\u000aQEMU EOSM2 preliminary setup.

1de8d88: Updates to debugmsg.gdb

5bddd34: Found correct values by checking against 1.0.2 firmware.

078d3b5: I’m pretty sure “set *(int*)0xFF356DE8 = 0xe12fff1e” is wrong but everything else should be good.

aa849bb: Added EOSM2 to mph.c

76097c1: Updated EOSM2 debugmsg.gdb file.

2b8378e: Added EOSM2.h file, copied from 100D.

2a61375: Copied button codes from 100D to EOSM2.

f69e35f: Added EOSM2 in supported cameras list.

3d14927: Added mpu registers to EOSM2 in model_list.c

d0028cf: Merged qemu into qemu-EOSM2-wip-1

bdd3ae2: Merged latest qemu commits

af3e5b8: Merged in qemu commits

23a8c2d: Added items from ML on EOS-M2 forum post:

6099a11: EOSM2 preliminary setup.

3124887: Merged in daniel_fort/magic-lantern/qemu-build-tweaks-2 (pull request #836)\u000a\u000aQemu build tweaks 2\u000a\u000aApproved-by: Daniel Fort

e7bb2c9: -s option not needed with uname.

576af0a: Check for mounted EOS_DIGITAL disk image handled differently on OS X.

f8a0b00: Merged qemu into qemu-build-tweaks-2

f33c089: Merged qemu into qemu to prevent multiple heads.

d09f1b9: Changed shebang for portability. Missed these two scripts in my last pull request.

830451b: OS X doesn’t require root permissions to mount disk image.

4a991e5: Use hdiutil on OS X systems.

f3506bd: Merged in daniel_fort/magic-lantern/qemu-build-tweaks-1 (pull request #834)

9912f99: QEMU: updated reference data for sorted IDC tests on some models\u000a(100D, 700D, EOSM, 5D)

53384d7: QEMU: 80D patches.gdb\u000a(required to run the stack trace check on a DIGIC 6 model with DryOS task switches)

2801b8d: QEMU logging: fix some rarely missed jumps\u000a(usually in return from interrupt)

2c0ee53: QEMU logging: fix Thumb PC in call stack traces (for DIGIC 6)

8400e34: QEMU test suite: check callstack consistency\u000a(whether verbose stack trace matches the call/return trace)\u000a(also checks context info, such as current task or interrupt)

6b2ce04: QEMU: do not log UART messages when it's redirected to a file\u000a(-serial file:out.log)

49b5e9e: QEMU: with -d calls, always align location information\u000a(insert a newline on very long lines)\u000a(updated tests)

a1d759c: QEMU: also log interrupt ID when using -d calls

90f73ee: QEMU: use verbose stack trace for DebugMsg and GDB scripts\u000a(each call on its own line - much more readable)\u000ato get callstack for every single DebugMsg, use "-d debugmsg,callstack,v"\u000aor, for GDB scripts: "-d callstack -s -S" for QEMU, "macro define PRINT_CALLSTACK 1" in the GDB script, without quotes)

a23f3fe: QEMU: option to log DebugMsg calls natively, without GDB scripts\u000a(much faster; very similar to nkls' initial implementation)

0782bfb: QEMU: redirect the monitor console to qemu.monitor unix socket\u000a(to restore the old behavior, run with -monitor vc)

0e2ff63: Merged in daniel_fort/magic-lantern/qemu-build-tweaks-1 (pull request #834)\u000a(fixes for building QEMU on Mac)\u000a\u000aQEMU build tweaks 1\u000a\u000aApproved-by: Daniel Fort

0e7529c: Merged in latest qemu commits

9d6000c: QEMU: parameterized MPU spells for PROP_CARDn_STATUS;\u000aupdated WriteProtect handling on most DIGIC 4/5 models\u000a(otherwise, these GUIs would show the card write-protected dialog)

46711f9: QEMU: use timestamps to decide the relationship between MPU spells\u000a(only messages received shortly after a mpu_send call should be considered replies)

d9d06e7: QEMU: warning about duplicate MPU spells\u000a(they will show where the communication may depend on state)

dba399a: QEMU: include a description for each input MPU spell\u000a(updated with definitions for some known spells)

4217f46: Suppress printing an error message if the command isn’t found.

293fd54: Changed shebang in bash scripts. This should make them more portable. An issue came up because the Macintosh uses an older version of bash in /bin/bash and we want to use a newer Homebrew installed version in /user/local/bin/bash without breaking other setups.

dfe7530: QEMU: parameterized MPU spells for UILock and NotifyGUIEVent

9dad505: QEMU: parameterized MPU spells (experimental)

a55cd40: QEMU: incomplete half-shutter emulation\u000a(fixme: it should show the metering indicator or close menus/dialogs)

575c170: QEMU: menu navigation works on 5D3 1.1.3

c1a7c47: QEMU logging: minor cleanups

c70e94c: QEMU logging: moved ABI checking in its own routine (minor refactor)

e764ef2: QEMU logging: moved -tasks in its own routine (much faster)\u000anote: task switching locations differ on VxWorks models after this change\u000a(they are approximate anyway)

0784cd2: QEMU logging: option to enable verbosity only when autoexec.bin is loaded\u000a(useful for new ports; bootloader can be very verbose with certain logging settings)

eedf340: QEMU: exposed callstack to GDB and ML guest code\u000abased on nkls' first implementation of DebugMsg helper\u000aassert in gdb scripts now always prints the call stack

24f1e46: GDB scrips: task switch logging helper (pure GDB)

313f7ad: QEMU logging: stronger test for ML stubs\u000a(fixes some non-function symbols that appear when compiling ML with -ggdb)

896a1f5: Experimental debug info in magiclantern elf file\u000ait allows mapping from code address to source line\u000a(example: eu-addr2line -s -S -e magiclantern 0x50d60)\u000ait should not end up in autoexec.bin or affect it in any way

5f0db05: QEMU logging: attempt to guess strings and named functions in call/return trace\u000a(adapted from dm-spy-experiments)\u000a(self-test results updated)

43885e0: qemu-util now always available (in dryos.h)\u000a(these functions are only compiled with CONFIG_QEMU=y; otherwise they are just type-checked and optimized out)

7cb9756: boot-hack: fix boot with CONFIG_QEMU on some models\u000a(qprintf/vsnprintf reboots the camera because it's not yet initialized)\u000aalso added a safeguard to prevent such mistakes

90cb9be: QEMU test suite: fix PowerShot tests using wrong debugmsg.gdb

2ce28c8: QEMU logging: fix copy/paste error in ROM block autodetection

3726245: QEMU logging: explicit option to show task switches\u000a(rather than hijacking callstack)

c8351c4: QEMU test suite: list memory blocks copied from ROM during bootloader tests\u000a(both EOS and PowerShot firmwares)

932f224: QEMU logging: allow ROM block copying in arbitrary increments, up to 128-bit\u000amixing memory access sizes is allowed too\u000athe block must be copied sequentially, from left to right or from right to left or mixed, with no gaps at any moment during the copy operation\u000acopying e.g. 16 bytes from/to offset 0, 16 bytes f/t 0x10, 4 bytes f/t 0x20 and 1 byte f/t 0x24 will be considered a 0x25-byte block\u000abut copying 16 bytes f/t offset 0, 4 bytes f/t 0x14 and then 4 bytes f/t 0x10 will be treated as 2 adjacent blocks (16 bytes and 8 bytes); that's because of the gap during the copy operation\u000aonly blocks larger than 0x40 bytes are printed

1b8c321: QEMU logging: experimental option for finding memory blocks copied from ROM to RAM\u000a(only 32-bit sequential copies for now)

d1af24b: QEMU logging: fix memory logging selection in complex cases\u000ae.g. romr,ramw should only log ROM reads and RAM writes\u000ain simple cases (such as just romr or just ramw), hooks are installed only for the selected operation (read or write)\u000ain these cases, additional checks will be redundant\u000ahowever, with complex cases such as romr,ramw, hooks are installed for all reads and and all writes\u000aso we can no longer rely on the hooks (being installed or not) for filtering the results

33ea5e4: QEMU logging: fix task info on Eeko

cf0f2ea: QEMU logging: quiet some jumps that are not function calls (frequently used on Thumb-2)

51af2a7: QEMU: fix CSS in HTML logs from subdirectories

d92f5b3: QEMU scripts: allow loading symbols from any ML target (e.g. minimal, installer)

8867df0: QEMU: .current_task_addr for most models\u000a(where it was already known - copied from ML stubs or from debugmsg.gdb)

dfa166b: QEMU logging: experimental task switch detection (DIGIC 2-6)

582f32e: QEMU logging: attempt to fix a rare crash when returning from interrupt

5e7dc4d: QEMU logging: fix VxWorks return from interrupt; refactored interrupt detection on DIGIC 6

4fe5ddf: QEMU test suite: fix call/return trace logs being trimmed way before the first interrupt\u000a(the deterministic part is usually much larger than previously covered)

4d8dbe0: QEMU test suite: also report nested interrupts

0e6ee38: QEMU: fix minor regression in DIGIC 6 bootloader\u000a(introduced in 7f1ba92; some tests changed)

195b998: QEMU logging: minor rename

06aecd4: QEMU test suite: workaround for the non-determinism in the sorted IDC test\u000a(retry up to 5 times until it succeeds)

3941fd9: QEMU test suite: more tests for call/return trace and IDC scripts (including Thumb, interrupts, secondary cores)\u000aNot all models are passing.

6ed53d7: QEMU: fix cache lockdown printf's (they should go to stderr)

0c628a4: QEMU: fix handling UART interrupts with serial redirected

89cd3a1: QEMU: fine-tuned verbsity of various components\u000a(interrupts, digic timer, DMA, serial flash, CFATA)

52b2428: QEMU logging: fix call identification on Thumb (eeko)

749068b: QEMU logging: fix crash on 5D3 eeko

b8a71e7: QEMU: changed REG_PRINT_NUM so it no longer includes a newline; updated boot-hack and fixed regression in boot-check logs

43e3d51: QEMU: warn on ROM size mismatch

9fbba7a: QEMU clear screen on each run

24a9c1b: QEMU logging: experimental symbol name loading from ML object files\u000aexample (bash): . ./ 500D.111; ./ 500D,firmware="boot=1" ...\u000afixme: QEMU elf loader patched in a not very clean way

2bad7cd: QEMU logging: simplified function call detection a bit more\u000a(results should be unchanged)

42cb918: QEMU logging: always guess function arguments located on the stack\u000a(-d calls now implies -d ramr)

1c55172: QEMU logging: explicit option to export to IDC\u000a(-d idc)

6eed828: QEMU logging: check R4-R11 and SP when returning from function calls\u000a(all registers now stored on the call stack)

1417f37: QEMU logging: in IDC comments, record task name when available and drop prev_sp

608645a: QEMU logging: basic test for IDC (function list only)\u000a(useful when formatting changes)

814fa8f: QEMU test suite: nicer way to interrupt our background QEMU process

5b7bc89: QEMU logging: simplified function call detection\u000a(results should be unchanged)

056b4f8: QEMU logging: indent callstack locations at 80 chars\u000aindent amount configurable at compile time\u000atests updated

4c3f62f: QEMU: 1300D current_task_addr

5fb4fac: QEMU: initial GDB script for 1300D; display test

970d607: QEMU: initial support for Mac and clang in install scripts (to be tested)

77f8c0c: QEMU: fix compiling with clang

dbbd3bc: QEMU test suite: removed basic GUI test (redundant)

8c13efd: QEMU test suite: tests for callstack and call/return trace

758e5ef: QEMU: disable gray noise that appeared until GUI initialization (faster)

96c0c0d: QEMU logging: minor callstack speed optimization

b9d26fc: QEMU logging: in call/return trace, print caller (from call stack) instead of raw LR

2e31be4: QEMU logging: callstack speed optimization

469a5bf: QEMU logging: fix handling nested interrupts in callstack

65e8a49: QEMU logging: initial call stack support for Thumb-2 (DIGIC 6)

5cbf495: QEMU logging: attempt to guess additional function arguments from RAM tracing\u000a(use -d calls,ram to enable this)

3de9a10: QEMU logging: print first 4 arguments and return value for all function calls\u000a(with -d calls)

3ee28fd: QEMU: get stack limits of current DryOS task and print them on the call stack\u000anew API: eos_get_current_task_stack

511c988: QEMU logging: API for retrieving various parameters from the call stack\u000a(SP, stack frame size, call depth, function arguments)\u000anote: R0-R3 stored on the call stack\u000aAPI name: eos_callstack_get_caller_param

31a8bfb: QEMU logging: fine-tune options; auto-enable dependencies

a7f5369: QEMU: indent memcheck and io_log messages according to call depth\u000anew API: eos_callstack_get_indent

6238b07: QEMU memcheck: fix line wrapping in verbose messages about multitasked free calls\u000a(minor; visible with -d memchk,v)

c614583: QEMU logging: generic print_location; refactored memcheck to use it\u000a(eos_print_location)

0221262: QEMU logging: simple call stack printing API, used in memcheck when reporting errors\u000a(eos_callstack_print)

9d51d21: QEMU logging: experimental call stack reconstruction\u000aideas from\u000afixme: requires -d calls,nochain -singlestep\u000anew APIs: eos_get_current_task_id, eos_callstack_indent

fbf5f53: QEMU logging: refactored to split IDC and call logic

5d109f9: QEMU memcheck: split exec hook into components\u000a(malloc and memcpy for now; non-functional change)

38caf78: QEMU memcheck: refactored with CPU env (easier to get register values; non-functional)

d33e262: QEMU memcheck: refactored malloc list with a data structure (non-functional)

00fb273: QEMU memcheck: identify blocks affected by heap errors (messages similar to valgrind)

1a4005e: QEMU memcheck: fix memcpy handling\u000a(do not copy allocation flags, only initialization; fix copying from ROM)

8e46838: QEMU: AbortEDmac emulation

021bc58: QEMU: basic model of EDMAC transfer delay

5d8419d: QEMU: gui/menu tests for 5D2 and 50D

42fe886: QEMU: force line-buffered output for our messages

a4b1a88: QEMU: a few more assertions for memcheck

0da32ad: QEMU: fix card formatting on 50D and 5D2; menu tests for 5D2

66506c0: QEMU: fix CURRENT_CPU outside MMIO handlers\u000a(defaults to cpu0; fixes CF routines crashing when used with -d memchk)\u000a(may need to be changed for EOS M5, when its time comes)

fe3dddc: QEMU: updated 5D2 MPU spells, thanks Ilia. Menu works!\u000a

f777356: QEMU: GDB script for 5D2

faee6f5: QEMU: 50D menu navigation tests

9caf786: QEMU: 50D menu navigation works!

bbacfc8: QEMU: 50D button codes

ae595d3: QEMU: fix 50D CFATA and HDMI; GUI boots!

a9096f2: QEMU: 50D MPU spells, thanks jrm21\u000a

f571fe2: QEMU: minor speed optimization in serial_flash

98e94f1: QEMU: speed up test suite\u000a(large delays no longer needed)

36ece09: QEMU: CFDMA write works on 5D2 (DCIM test passed!)

f9a6a47: QEMU: fix CFDMA on 5D2 (only read works)

8b68fd2: QEMU: made MPU/SF/SD/CF logging macros generic (in eos.h)\u000a-d sdcf for logging SD/CF messages

d2245b0: QEMU: configurable resolution for digic timer

80169f4: QEMU: updated tests for faster card formatting\u000a(BUSY dialog no longer caught)

9bd3474: QEMU: trigger SDIO interrupt on errors as well\u000a(fixes semaphore timeout after CMD1; to be tested for side effects)

3401f3f: mpu: refactored verbosity; most messages now hidden by default\u000a(-d mpu or -d mpu,verbose or -d io,mpu etc to show them)

80deb63: serial_flash: refactored verbosity; most messages now hidden by default (-d sflash shows them)

98569f7: QEMU: fix memory logging on models with serial flash

47134ac: QEMU: minor fixes in scripts

49aa93c: QEMU memcheck: fix printf's\u000a(should go to stderr)

13d3d12: QEMU memcheck: get ML stubs from environment variables

26a3fce: QEMU memchk: experimental TCM checking\u000a(catches even more null pointer bugs)

1b020f8: QEMU memchk: moved stubs in a data structure, for easier porting

1f6a52c: QEMU: highly experimental memory checking tool (-d memchk)\u000a(stubs hardcoded for 500D)

62f8fca: Memory logging: fine-tuned messages

35a8497: QEMU: moved our memory logging routines to logging.c

540bb08: QEMU: moved our calls logging hook to separate file; preparing to add more tools

53f8679: QEMU: hook called when execution a TranslationBlock\u000a(todo: move the hardcoded analysis tools from cpu-exec)

ab614b1: QEMU: use 64 bits for qemu_loglevel; renumbered and defined some more options for future use

70ea686: QEMU: output all our messages to stderr\u000a(should fix colors getting mixed up)

f3286de: QEMU: use macros for ANSI colors

8b4d4cb: QEMU: minor fix in UILock.h\u000a(todo: parameterized MPU messages)

ce3cde7: QEMU: compile with code coverage (gcov); helper script for lcov

d5b43fa: QEMU test suite: updated portable ROM dumper link; added 1300D

611711b: QEMU: log DMA memory accesses as well; self-test to make sure all writes are logged\u000a(the test works by rebuilding a second copy of the RAM from the write trace, and comparing with QEMU's copy)

f31088f: QEMU: experimental logging of guest memory accesses (LDR/STR, RAM or ROM)\u000adidn't call it "memory tracing" as it doesn't use QEMU tracing API\u000aremoved old TRACE_MEM code

4815be6: QEMU: fix apparently random lock-up (interrupts no longer triggering, for no apparent reason)\u000a(bug introduced in 24909946bb90)

d2463b7: QEMU: fix io_log crash on get_current_task_name\u000a(to reproduce: 450D with -d io)

f695185: QEMU: experimental MPU support for 1300D\u000a(it seems to work, to some extent, but we need a startup log from a real camera to get further)

486a568: QEMU: flash model ID for 1300D (fixes startup assertion)

cbf042b: QEMU: initial support for 1300D, thanks adamnock

ae248f7: QEMU: model ROM as ROM device, rather than RAM\u000a(writes are allowed and logged)

ede93ed: QEMU: support for multiple firmware versions (e.g. 5D3 1.1.3 and 1.2.3)\u000aexample: ./ 5D3,firmware="113;boot=0"

93a3e27: QEMU: minor fixes for helper scripts

ef5e720: QEMU: allow arbitrary targets in (e.g. minimal); small fixes

a9e7221: QEMU: minor fixes for helper scripts

b474ef0: QEMU: save HTML logs to subdirectory

1aa445d: QEMU: helper scripts for automated tests on all ML cameras

f6450e4: QEMU: fix compiling HPTimer test (requires CONFIG_QEMU)

2ffdd0d: QEMU: script to clean up redundant ANSI escape sequences from logs

6192929: boot-hack: more debug messages with CONFIG_QEMU

3f09215: QEMU: guest API for disassembling code at any address

6c2908d: boot-hack: debug messages when compiling with CONFIG_QEMU\u000a(useful for new ports or for troubleshooting non-booting situations)

4cf806e: qemu-util: helper to print numbers to QEMU console very early in the boot process

cc309c9: qemu-util: allow using qprintf without guarding every call by CONFIG_QEMU\u000a(dummy inline functions on regular builds; simplified console.c)

5c78942: QEMU: fix signed EDMAC off2 on DIGIC 4

1fc73e1: QEMU: disabled battery cover emulation on 60D and 100D\u000a(interferes with some GUI tests)

5ac5156: QEMU: non-deterministic lock-ups solved, thanks nkls!\u000a(retries no longer needed in the test suite)

855a2f2: QEMU: mutexes no longer needed after refactoring

56f8d13: QEMU: refactored interrupt thread using QEMUTimer\u000a(credits: nkls, )

94a1997: GDB scripts: helper to log the return value of any function

fe3dfbb: QEMU: GDB scripts and task address for 100D

9cff2f9: QEMU: battery cover emulation\u000a(with various degrees of success)

cc113f0: QEMU: another fix for gcc 4.x/6.x\u000a(amend commit 242d6f1)

cdb42ea: QEMU: updated instructions regarding CONFIG_QEMU (it's no longer required)

242d6f1: QEMU: updated configure script to fix compilation with gcc 4.x and 6.x

41e331c: QEMU test suite: always wait after terminating qemu-system-arm\u000a(might fix some intermittent VNC issues)

e9e3ed7: QEMU: skip a few tests on 1100D and 1200D, that are very sensitive to timing (processing speed)

6957508: QEMU: updated help in install script

0693628: QEMU: updated 60D tests

1d5511a: GDB scripts: 700D patches (required for GUI emulation)

c4e6358: QEMU: fix commit b36254 (missing files)

b362541: QEMU: menu navigation and card format tests for 60D, 550D, 600D, 700D, 100D, 1100D, 1200D

d29dbdb: QEMU: updated GUI test result for 60D, 100D, 1100D, 1200D\u000a(after GUI emulation, they boot to date/time menu rather than info screen, but you may now click OK to bypass it)

0b35f5c: QEMU: ported 500D GUIMode/UILock/format spells on 550D, 60D/1200D/1100D, 600D, 700D, 100D.\u000aCanon menu navigation and card formatting works on all these models!

805b084: MPU spells: comment out button events

8af0189: QEMU: updated formatting of MPU spells to make them self-contained\u000a(easier to copy/paste around)

5645a69: QEMU: fix 100D lockup

c881ba2: QEMU: fix display waiting routine (EnableBitmapVBufferForPlayBackAndWait)\u000aThis unlocks menu navigation on many models!

d37de6c: QEMU: initial support for 7D (slave core only, IPC disabled)

e70e0cd: QEMU test suite: minor speed-up when waiting for specific text in the log file

d6454bf: QEMU: moved HPTimer test from qemu-util to a minimal test binary;\u000aadded a test for current task name and current interrupt ID;\u000ashould work on all models that can load autoexec.bin and start a few tasks (no need for GUI)

2575c0c: QEMU: aggressive LED redraw

bf41cb1: QEMU: better handle double-buffered displays (minor)

69fc2d2: 7D: fix minimal target\u000a(also removed some custom installer settings)

c905f43: 6D: fix minimal target

ba2f322: Merged task_name into qemu

ac20d58: qemu-util: moved register definitions to header

43c11d8: QEMU: restoring ML after format works too (500D)\u000aThis test requires patched vncdotool (patch included).

20b5b68: QEMU: formatting the virtual card works! (500D)

7aa5fa6: QEMU: run all tests with custom card images\u000a(fixes false error on 500D menu test - free space reported in menu should not depend on user card contents)

3a97582: QEMU: fix ML helper MMIO (regression from M5, 7534423f)

cf96ee7: QEMU: fix USB connect on DIGIC 4 models

bdbd3e9: QEMU: more dialogs working on 500D!

784580e: QEMU: fix handling INFO and PLAY (typo)

71563c9: QEMU: fix IDC output for large runs

2efe1a0: QEMU: fix typo in extract_init_spells

978e6be: QEMU: use unix sockets for menu test

d373382: QEMU: menu navigation test\u000a(500D for now)

8145cf2: QEMU: fix race condition in key handling\u000a(very fast clicks are OK now)

a4b8fe9: GDB scripts: initial 1100D support (DebugMsg, task_create, SetEDmac)

9d50cd9: GDB scripts: date/time patches for 500D, 550D, 600D, 60D, 70D

bf092df: qemu-frsp: fix compilation for 5D3 (use 1.1.3)

39164cf: Merged unified into qemu

46bd96d: QEMU: 500D MPU spells (menu navigation works, thanks Greg)

679028e: QEMU: current_task_addr for 500D, 550D and 600D

4aa69e9: QEMU: fix LED not redrawing properly

0436581: QEMU, annotate some more properties; fix minor quirks (comments only)

9e5b512: QEMU: experimental multi-core emulation for M5

7534423: QEMU: initial support for EOS M5 (first core only; starts a few tasks)

7f1ba92: QEMU: initial support for EOS M10 (starts a few tasks and mounts the SD card)

32d3908: QEMU: option to log function calls and export them to IDA (-d calls -singlestep)

0319ffb: QEMU: 500D GUI test

7a7f858: QEMU: refactored 8-bit palette handling\u000a(removed duplicate code)

f739333: QEMU: handle 8-bit BMP palette menu mode

36084dc: QEMU: GDB scripts 500D

d583374: QEMU: GDB scripts 500D

ac8dadc: QEMU: disable JPCORE (fixes DCIM test regression on EOSM)

279666c: QEMU: 100D boots Canon GUI, 70D shows date/time screen!

4a3d468: QEMU: fix hotplug events on EOS M

4192b7f: QEMU: first steps for JPCORE emulation

12369bb: QEMU: attempt to follow the MPU spell sequence even if some messages are repeated

df741f8: QEMU: use larger delays before tail in

b35c551: QEMU: allow retries in some tests, until successful\u000a(there are some nondeterministic bugs in the emulation)

b57afe1: QEMU: workaround for MPU communication sometimes getting out of sync

8299cc8: QEMU: updated 700D and EOSM display test checksums to match dumps from dfort

dd961b6: QEMU: fix eeko path

e0124e8: QEMU: allow arbitrary working directory via $QEMU_EOS_WORKDIR

4fc69b3: QEMU: EOSM passes the DCIM directory test

e3bd1d8: GDB scripts: EOSM patches (startup sequence works)

68413b3: QEMU: some definitions for 700D and EOSM

135a6ee: QEMU: current_task_addr for 1100D

c10d86c: QEMU: first steps for handling 5D3 eeko communication with main CPU

852127f: QEMU: minor update to 5D3 eeko memory map

a317356: GDB scripts: 5D3 eeko interrupts

87f08fa: QEMU: handle EDMAC offset 0x40

16ea5c1: GDB scripts: initial support for EOS M; minor fix for 700D

b2ae50b: QEMU: MPU spells for 700D and EOSM (logs from dfort)

f4ef5e6: QEMU: updated 1000D support for 1.0.7\u000a(GDB script, display test checksum, fix current task address)

7ac7415: QEMU: Eeko DryOS timer (not sure it actually works)

74ba3ae: QEMU: run Eeko from RAM dumps; minor updates

6940830: QEMU: quiet cache maintenance registers

8d2c628: QEMU: print description of some MPU registers as they are set (reveals memory map)

22a753d: QEMU: option to enable UART debug logging (-d uart); mark "-d io" option as EOS-specific

f41ca66: QEMU: Eeko UART emulation (can navigate the debug menu)

4c858e5: QEMU: Eeko interrupt registers

aded9e3: QEMU: initial support for 5D3 Eeko (a small DryOS core running Thumb-2 code)\u000acredits: g3gg0 for identifying it

c1fc7e7: QEMU: fix SDIO regression on M3

8822a3b: QEMU: include LR in MMIO logs

e323fdd: QEMU: fix CHSW assert on M3

e3a5d5c: QEMU: emulate photo capture process on 5D3\u000a- more DMA channels (EekoBltDmac = DMA5)\u000a- Eeko WakeUp\u000a- MMIO size 0x20000000\u000a- image data on connection 35\u000a- the test requires some patching, because 5D3 does not initialize the YUV buffer at startup

5e91ed8: QEMU: DCIM test appears to work on 450D as well\u000a... given enough retries :)

a3b80e3: QEMU: code for listing EDMAC interrupt names (for dm-spy-experiments)

8a35400: QEMU: emulate all EDMAC size configurations!\u000a(xn,yn,xa,ya,xb,yb,off1a,off1b,off2a,off2b,off3 for both read and write transfers)\u000aAlso included a function to pretty-print an EDMAC configuration.\u000aTest code and details will follow.

679d301: QEMU: 450D MPU spells and button codes

4282e53: QEMU: fix 5D4 ram_manufacturer_id; updated display test result for latest ROM

88d8588: QEMU: fix EDMAC off1 for DIGIC 3

aa6eb59: QEMU: handle EDMAC "pop" operation

d5cc0c5: QEMU: refactored MMIO registers with macros for direct mapping to variables (less verbose)

b4485f5: QEMU: dummy Furikake emulation for 60D (just copy the data from input to output)

378cd8c: QEMU: partial EDMAC transfers (incomplete)

a0dc54e: QEMU: fix EDMAC connection count; asserts

ad0483c: QEMU: full-res silent picture test (working on 60D and 1200D)

f7b1c5e: 550D: fix compiling minimal target

00a3f1e: Minimal test binary for taking and previewing a full-res silent picture, for QEMU test suite

89c0cd0: Merged cleanup into qemu

b60c973: Merged unified into qemu

38b1392: QEMU: reordered tests

3159ea0: QEMU: file I/O test from main firmware (creating DCIM directory if missing); only works on a few models for now

1ce10ee: QEMU: portable ROM dumper test (works on most SD models)

7c8067f: QEMU: PIO SD transfers (450D mounts the SD image)

3139894: QEMU: always print SDIO errors

506411c: QEMU: fix SD interrupts on 450D (attempts to mount the card, but fails at sdPIOReadBlk)

4e4f87d: QEMU: current_task_addr for some VxWorks models (for MMIO registers)

50e1d62: GDB scripts: ignore %R in DebugMsg (40D: "%RegisterCBRSetupRequest")

1cfceb8: QEMU: initial MPU support for 450D, with 60D spells

f76bb1c: QEMU: fix VxWorks heartbeat (including HPTimer workaround)

d5f80c5: QEMU: handle extended HPTimers (VxWorks heartbeat seems to work)

9e1271e: QEMU: EDMAC interrupts for DIGIC 5

9cf1533: QEMU: 550D shows date/time screen (EDMAC fix)

629b279: QEMU: emulate the picture taking process (can take a full-res silent picture on 60D and save it as DNG)\u000a- EDMAC transfers: handle xa, ya, xb, yb, xn, off1a, off1b\u000a- dummy head timer emulation (just triggering an interrupt)\u000a- dummy emulation of the HIV image processing module ("consuming" row/column correction data)\u000a- note: the code from silent.c and raw.c must be patched to avoid GUI mode changes (patch not included)

b526534: QEMU: dummy emulation of image preprocessing modules (ADKIZ also triggers interrupt on 60D => evfInit succeeds)

e04be24: QEMU: partial EDMAC transfer emulation

810b761: GDB scripts: log some EDMAC calls (60D stubs)

acdaf2c: QEMU: updated 40D and 100D display tests for latest firmware versions

3e4002f: also copy test scripts

ad535bd: QEMU: UART support borrowed from hw/arm/digic.c (cc frantony)\u000aTo use it: "View -> Serial0" or "-serial stdio" or "-nographic"\u000aAlso updated test script.

0653508: QEMU: initial support for 5D4 AE processor (K349AE)

f04d4db: QEMU: test for GDB scripts (not all models working; fixed 7D2 and M3)

ea50ca5: QEMU: refactor to avoid duplicate camera lists

9576f15: QEMU: fix 400D startup messages

09d70ee: QEMU: quiet 60D hotplug activity

2c1e96c: QEMU: refuse to run if any of the card images is mounted

04b1397: QEMU: fix 5D4 display emulation; updated SD image with new display test

b9a749d: QEMU: initial support for 5D4 (SD image updated too with latest display test)

d44e953: QEMU: initial support for 40D, 400D and 450D (display test working)

337cfac: QEMU: 5D runs the display test

cc8ef08: QEMU: experimental CFDMA support (5D loads autoexec)

7dd8ec7: QEMU: fix 50D (display test works)

32309d7: GDB scripts: increase tcp connect timeout

43f130d: QEMU: initial support for 5D (no autoexec yet)

dad0b0a: QEMU: initial support for A1100 (proof of concept, CC frantony)

a07d2ab: GDB scripts: 1000D task info

3aad46d: GDB scripts: check CURRENT_TASK before dereferencing (to avoid nonprintable output when invalid)

afccd7d: Updated SD image with display test updated for VxWorks\u000aAlso updated screenshots' MD5 (the new test prints an extra line)

8303a4a: QEMU: 1000D display from bootloader

2490994: QEMU: initial support for 1000D (DIGIC 3)

f5399e7: QEMU: moved RAM and TCM parameters to model_list.c; fixed TCM size on DIGIC 6

1c30060: QEMU: assume 80D bootloader on 7D2 for now

493db1c: QEMU test suite: also prepare a temporary CF card image

0aada94: QEMU test suite: more robust handling of temporary SD card image\u000a(previous image is restored even if you press CTRL-C while preparing the new one)

3461ad7: QEMU test suite: custom test for EOS M3

99d05c4: QEMU: testing scripts (first attempt to write a test suite), covering:\u000a- bootloader jumping to main firmware: works on most models, except 7D (50D not tested)\u000a- portable display test from bootloader: works on most models, except 7D (50D not tested)\u000a- Canon GUI test (screenshot): works on 60D, 5D3, 1200D, 1100D, and - to some extent - 600D\u000a\u000aTODO:\u000a- SD/CF read/write tests (bootloader ROM dumpers, startup on formatted card, minimal file I/O from ML)\u000a- tests for gdb scripts (e.g. does it display task_create calls? does the GUI boot under the debugger?)\u000a- various device tests (timers, EDMAC, LED blinking, serial console...)\u000a- tests for Magic Lantern binaries, to be run on the nightly build server

c1d5a86: QEMU: fix LED emulation on most models

be762db: QEMU: fix LED emulation on 5D3

eda2afd: QEMU: fix SDDMA handling on DIGIC 6 (EOS M3 now loads DISKBOOT.BIN from the card)

3a74515: GDB scripts: log more register_interrupt calls on EOS M3

f65d41b: GDB scripts: log more DebugMsg calls on EOS M3

5600f9e: GDB scripts: refactored DebugMsg to allow code reuse

ec3a565: QEMU: revised sound patch EOS M3 (was patching a generic semaphore routine; fixes SD init)

6fd673a: QEMU: card LED emulation (not all models tested)

60bf4f3: QEMU: battery patch no longer needed on EOS M3 (Ant123)

727e31b: QEMU: load ROM0 (aka SECONDARY16.BIN) on EOS M3

3b1e6d0: QEMU: moved rom[01]_addr to model_list.c; fix ROM1 address for D6

dc3dc61: QEMU: initial support for 750D and 760D

4a7e2b2: QEMU: moved RAM manufacturer ID to model_list.c (80D)

021c9b4: QEMU: experimental cache hack emulation (very incomplete; 60D dm-spy works!)

8f8e95d: QEMU: updated Makefile options and comments

a088788: QEMU: 700D serial flash + GDB scripts

5f2fb31: 100D: fix divide-by-zero caused by Set_AVS.

7233fed: QEMU: Fix serial flash, add 100D spells.

83ddccc: QEMU: 5D3 1.1.3 boots Canon GUI!

289e7f4: QEMU: fix a display init lockup on 5D3. Canon GUI runs on 1.1.3!

0d1f11a: QEMU: hotplug registers for 5D3

4431c83: QEMU: fix SDIO response bytes order (fixes SD identification; now works on DIGIC 5 too)

3e4f2ad: QEMU: minor display fix

d19a4ba: QEMU: dummy EDMAC emulation (experiment)

e294a7a: QEMU: moved ROM files under camera subdirectory; you no longer need to concatenate them; they can be made optional (for cameras with only one ROM)

c4a6850: QEMU: better CPU model for DIGIC 6; removed Thumb interrupts hack

bffa4eb: GDB scripts: minor speed optimization for DebugMsg

1074dc6: QEMU: disabling signature check at startup no longer needed

ed49a71: QEMU: P15 patch no longer needed on M3

a15d244: QEMU: SD write protect (boot) switch for M3

240a20a: QEMU: SD1stInit appears to work on EOS M3

d8e3324: GDB scripts: print SD1stInit messages

2a8246b: QEMU: battery level for EOS M3, from Ant123

3e340a4: QEMU: PhySw values for EOS M3, from Ant123

9fe42ad: QEMU: ADC values for EOS M3, from Ant123

09b48a2: QEMU: also log CP registers ignored during emulation (ARM_CP_NOP, LOG_ALL_CP_READS/WRITES)

b183fd0: QEMU: fix use after free when using LOG_ALL_CP_READS

a7fc585: GDB scripts: 80D patch (tasks starting now)

6f73770: QEMU: log all CP register reads

d8f9ec6: GDB scripts: list 80D memory regions

a9d933e: QEMU: updated usage examples in

952aecc: QEMU: hijack machine option "firmware" to pass machine-specific parameters via command line\u000afor example, to enable the boot flag: ./run_canon_fw 60D,firmware="boot=1"

2ccff7d: QEMU: moved HPTimer interrupt to model_list

3b7b762: QEMU: moved bootflags address to model_list

35c71dc: QEMU: bootloader display working on 80D!

a967d76: QEMU: clock enable register on DIGIC 6

3bc2816: GDB scripts: 80D DebugMsg, tasks, interrupts

fb99f82: QEMU: fix crash when bootloader display buffer is not set

43093ec: QEMU: 6D patches no longer needed

72d8e01: QEMU: fix some button codes

1d4c8a3: QEMU: most patches no longer needed for 7D2 either (it runs with 80D bootloader)

f606914: QEMU: CP15 patches no longer needed for EOS M3

d25df1e: QEMU 80D: initial support for SDIO/SDDMA; loading autoexec.bin works!

4142c1b: QEMU 80D: bootloader emulation works!

920787c: QEMU: initial support for 80D

7a9bf1e: QEMU: removed old key handling code and other hacks that are no longer needed (at least on those models that can boot the GUI)

6751c99: QEMU: fix install

c3b5617: QEMU: fix 100D scrollwheel codes

2065ec8: QEMU: cleaned up some button code names

a691bb6: QEMU: make MPU init spells static

c90ea4f: QEMU: a few more button codes

7765da8: QEMU: refactored MPU key handling to remove duplicate button codes

99413e5: QEMU: print help regarding available keys

d40c4d9: QEMU: script to extract MPU button codes from ROMs\u000a(it emulates bindReceiveSwitch using unicorn)

788f025: QEMU: proof of concept: key handling via MPU spells.\u000aCan adjust date/time on 600D, can navigate ML menu without CONFIG_QEMU on 1200D with scrollwheels (PgUp,PgDn,[,]) and SET (spacebar)

f2fdb5a: QEMU: refactored MPU code to allow sending arbitrary messages

f2e6d82: QEMU, MPU spells: recognize button codes from gui.h (comments only)

e9f3d75: QEMU, MPU spells: mark bindReceiveSwitch messages (comment only)

1584c8c: QEMU, MPU spells: mark NotifyGUIEvent messages (comment only)

2248bd5: QEMU: script to manage MPU spells (autogenerated version + patches with manual modifications)

99f9374: QEMU: updated 5D2 MPU spells

523a1b5: QEMU: moved MPU spells to separate files, one for each camera

e2c0456: QEMU, get camera model name from log file name

6bef295: QEMU: use "-d int" for showing interrupt messages

08074f0: QEMU: use "-d io" for showing MMIO activity

f058d4b: GDB scripts: log semaphores, message queues and interrupts for EOS M3

022de0f: QEMU: better patch for battery checks on EOS M3

ab641b9: QEMU: handle ADC on EOS M3 (print channel ID only)

a050d15: GDB scripts: comments update

cc6b994: GDB scripts: increase timeout for connection to qemu

6209c4d: GDB scripts: patch RTC init function for 550D and 600D

7fefb7e: GDB scripts: only output should be hex by default, not input

9a38692: GDB scripts: log message queues (600D stubs)

d881e57: GDB scripts: 600D DebugMsg, tasks, MPU messages

3202863: QEMU: MPU spells for 600D

656093d: GDB scripts: log resource locks (stubs for 550D)

43e62d9: GDB scripts: log eventprocs (stubs for 550D and 5D3)

af455e3: GDB scripts: 550D DebugMsg, tasks, semaphores, MPU

0440b95: QEMU: merged eos_handle_serial_flash.[ch] into serial_flash.[ch]

394a704: QEMU: removed debug_message_helper (now implemented with pure GDB scripts)

0b3fcad: QEMU: check access type for EDMAC CHSW registers (only writes implemented)

6172489: QEMU: emulate power control registers (dummy)

8cb2c00: QEMU: 550D MPU spells (not yet working)

e18a99d: GDB scripts: track semaphores (create, delete, take, give)

9646ca6: QEMU: 1100D boots Canon GUI with 60D MPU spells as well :)

fa09908: QEMU: all DIGIC 4 cameras appear to use the same MPU request register

fb0c2cb: QEMU: fix typo

008aaa6: QEMU: 1200D boots Canon GUI with... 60D MPU spells!!!

507c96e: QEMU: model HPCopy DMA transfer delays (fixes assert in 1200D)

60225f0: GDB scripts: 1200D experiments

7241ce6: QEMU: current_task_addr and mpu_request_register for 1200D

918af56: Merge qemu-nkls into qemu

3ea3344: QEMU: autodetect MPU spell set from camera model

84b3f86: QEMU: include a small SD/CF card image during installation

f5d3ba9: QEMU: fix serial flash transfers via DMA, thanks nkls

6a2c25d: QEMU: moved firmware_start = 0xFF010000 to digic 4 defaults in model_list.c

a6fc0c3: QEMU: fix SDIO interrupt for DIGIC 5 cameras

506f322: QEMU: moved I/O memory size to model_list

a1531f7: QEMU: moved DryOS timer interrupt and ID to model_list

98751f2: QEMU: removed unused Q_HELPER_ADDR

ddf1f1b: QEMU: moved ROM[01]_SIZE to model_list (note: digic 6 dumps must be 64MB now)

3963d66: QEMU: generic parameters in model_list, for all cameras with the same digic version

dcae9f5: QEMU: renamed rom_start to firmware_start

853c4ba: QEMU: moved serial flash size into model_list (refactor)

79b24d9: QEMU: moved MPU request register into model_list (refactor)

060fca1: QEMU: moved current_task_addr into model_list (refactor)

f29445e: QEMU: link struct eos_model_desc into EOSState, rather than copying individual fields (refactor)

8172130: QEMU: reformatted model_list for easier expansion

c131f87: QEMU: 5D3 MPU spells

6cf9b52: QEMU: WFI emulation via CP15 (5D3, maybe others)

11d26dd: GDB scripts: log DebugMsg and task_create on 5D3

403d5dd: QEMU: patch battery init on EOS M3

ef6e454: QEMU: TIO fix for EOS M3

7111606: QEMU: print task name for I/O register accesses (experimental)

eaaac22: GDB scripts: misc stubs for 70D

12358d8: GDB scripts: log timer routines (70D stubs)

11e52d2: QEMU: don't format strings containing " (gdb fails at eval printf)

9032a25: GDB scripts: log try_post_event calls (70D)

959d5b8: GDB scripts: nicer way to log return value for take_semaphore

0761a01: QEMU: MPU init spell workaround for 70D

234b27c: QEMU: don't delete unmatched mpu_send lines

bb42715: QEMU: link mpu_send lines with "Complete WaitID" lines (updated 60D and 70D, comments only)

097d66e: QEMU: fix serial flash transfers via DMA

f1b9ca5: QEMU: moved eos_handle_sio3/mreq to mpu.c/h

8781bfd: QEMU: fix last two chars from last MPU spell

e5d7ab0: QEMU: fix warnings about SD/CF card images

9df3ae7: QEMU: fix very short HPTimer delays (timer overrun)

2df82f2: GDB scripts: log assert and register_interrupt on 70D

1cc3cee: GDB scripts: print interrupt ID when not running a regular task (print_current_location)

c1a7920: QEMU: output all characters via TIO

c97f6f3: QEMU: make sure all interrupt requests are valid

26d8b52: QEMU: stop emulator when GDB quits; also reset colors

48bec55: GDB scripts: log mpu_send/mpu_recv calls

47e4769: QEMU: 70D card write protect register

996c877: QEMU: log all coprocessor register writes

df47d64: QEMU: fix HPTimers on 7D2

985e7a1: GDB scripts: register_interrupt log

3b167a0: QEMU: DebugMsg logs implemented as pure gdb scripts!

c57fd1e: QEMU: patched some more functions on EOSM3

d5e3337: QEMU: interrupts on EOS M3 require Thumb mode (maybe on 7D2 as well, to be tested)

8357bed: QEMU: DryOS task scheduling appears to work on EOSM3 (experimental)

1151b11: QEMU: gdb script for EOSM3

6a47909: QEMU: patch two init functions on EOSM3

1598a34: QEMU: patch usleep on EOSM3 (workaround)

bf9144e: QEMU: fix disassembly when patching 7D2/EOSM3 (broken by qemu upgrade)

2cab1bc: QEMU: initial support for EOS M3

ac8ddee: QEMU: 7D2 autoexec experiment

b2a5753: QEMU: some gdb scripts (60D, 70D, 7D2)

f525b1d: QEMU: patch two functions in 7D2 master (emulation goes much further now)

2e00ae0: QEMU: cleanup model detection for serial flash

b54e9aa: QEMU: enabled 7D2 patches by default (autodetected from model name)

2213bbd: QEMU: give higher priority to interrupts with higher ID (SIO3/MREQ should have higher priority than DryOS timer)

747da6d: QEMU: fix MPU request/status register on different cameras (60D, 5D2, 100D and 70D for now)

c1b3498: QEMU: refactored eos_init_common/eos_common_init into a single function

dda0163: QEMU: store camera model and digic version in EOSState

adb19d7: QEMU: fine-tuned debug messages in eos_load_image

fd1db4c: QEMU: 70D init spells, not yet working

da9b33e: QEMU: enabled serial flash for 70D, to be tested

3f7e4f5: QEMU: save SIO mode for serial flash (minor)

4227770: QEMU: fix indentation in eos_handle_sio_serialflash.c

755a452: QEMU: serial flash image is now mandatory for models that use one at startup

b34a93f: QEMU: fix indentation in serial_flash.c

c8c677f: QEMU: fix SIO messages

f7b60d8: QEMU: ignore %S format for DebugMsg\u000a(used incorrectly in Canon code, e.g. %SetUSBLowPowerModeHook - causes segfault)

0eee6e2: QEMU: DebugMsg color macros a little more generic

ec68dad: QEMU: align DebugMsg messages with io_log ones and print call location

5e626ad: QEMU: fix segfault with uninitialized bmp_vram

853e451: QEMU: fix compilation

4aa2b2b: QEMU: merged 1de3d07

ea5dccb: QEMU: fix false MPU receive request (e.g. in 5D2 bootloader)

fe2f881: QEMU: fix false positive when interpreting MPU messages

31f8428: QEMU: merged ee5defb

46efd17: QEMU: adapted ee5defb\u000aQEMU: 5D2 MPU spells, not tested (not there yet)

a85ec37: QEMU: re-enabled 7D2 experiments (to be tested)

29fdfa8: QEMU: merged 63e7324 (hopefully)

423ae8d: QEMU: adapted 63e7324\u000aRemoved old hacks (including from emulator

1de398f: Init testing branch (serial flash).

339e558: Fixes for 100D.

3e99392: QEMU: fix installation

0db9ad0: Add workspace scripts.

76a89fd: Updates to semaphore tracker.

5d1f223: Add bufcon GPIO names.

075e981: Add serial flash code.

b4d0559: Separate mpu and eos_ml helpers from main eos.c file.

e84f8b3: Add debug message helper.

1a948b7: Dynamic initialization of camera models.

af50a1e: QEMU exit on errors

7847bc0: QEMU only init git repo if not already there

68db2c4: Fixed a segmentation fault, it's now running!

baa7f9d: Hacked to compile.

8b4f1ea: QEMU: upgraded to 2.5.0

1bd3c11: QEMU: adapted "Restructure of EOS code." from

1de3d07: QEMU: EDMAC registers (print only)

5a81483: QEMU: fix false MPU receive request (e.g. in 5D2 bootloader)

a77c37b: QEMU: fix false positive when interpreting MPU messages

98a624c: QEMU: experimental CF card emulation (5D2 loads autoexec.bin from CF image!)

a6b9c77: QEMU: a few more CF registers

e7c288e: QEMU: script to parse MPU log files and extract the "init spells"

ee5defb: QEMU: 5D2 MPU spells, not tested (not there yet)

3a64d3c: QEMU: handle more CFDMA address ranges, including 5D2

aeeb0d0: QEMU: handle 5D2 VSW_STATUS (thanks ROS)

bcaf460: Merged unified into qemu

c9f18c4: qemu-util: fix warnings

ce1b83f: qemu-util: fix HPTimer warnings

e5ff088: qemu-util: added qprint

d4d329d: qemu: hide help after user opens ML menu

b311bc3: QEMU: refactored SIO messages with io_log

7c0eb75: QEMU: remove SD emulation messages

ed731fc: QEMU: updated scripts to run ML from a sdcard image

4110b99: QEMU: minor fix (reported by nikfreak)

63e7324: Removed old hacks (including from emulator

e110a0b: Removed qemu-helper from ML source

591b82d: Removed most QEMU hacks from ML source, so ML is now able to boot from autoexec.bin via bootloader (at least on 60D). Lua working as well!

453a446: AllocMem patch: sync caches before executing the patched code

23d8a54: 6D AllocMem patch: do not change the start address, to prevent shifting address of certain constants (e.g. dual iso)

b3396be: assert handler: print program counter in crash logs

f9dff60: boot-hack: some self-checks for AllocateMemory patching

f42d15b: new task hooks: updated comments, debug info, code formatting

f604659: boot-hack: better comments for 6D AllocMem

381a5bf: Found the new task_dispatch_hook (for 6D, will also work on newer cameras). Does it work?\u000a- refactored my_task_dispatch_hook to work on both old and new DryOS (tested in QEMU)\u000a- 6D: switched to classic boot process (limited testing in QEMU)\u000a- tskmon: small refactoring, hopefully works on new DryOS too (not tested)

41a22d6: boot-hack: minor cleanups

91e1ed5: QEMU: use SD card emulation from hw/sd/sd.c. Working not only in bootloader, but in main firmware as well!

88b3d20: QEMU: only allow 32-bit access to MMIO registers (simpler code)

c05db36: QEMU: removed old screenshot code

195cdc4: QEMU: grouped keyboard state variables into a structure

7565007: QEMU: grouped display state variables into a structure

4744439: QEMU: handle 8-bit BMP palette

5a94edb: QEMU: some more GPIO registers for 60D. Canon GUI runs!

217cf86: QEMU: experimental MPU emulation (60D)

f70ed3c: QEMU: ignore SCTLR bit 30 (hack; see 8ab96de)

c5205a9: QEMU: renamed EOSState *ws to EOSState *s

fdcae4d: QEMU: trace target ASM code during execution (-d exec -singlestep)

8825744: QEMU: emulate cache lockdown for DIGIC 4/5 (NOP)

548678f: QEMU: use built-in disassembler for patching messages

dd3f953: QEMU: emulate both master and slave from 7D2 (not both at the same time though)

e124a79: QEMU: better DIGIC 6 emulation. TODO: find out how to enable interrupts

12015a9: QEMU: log ASM code (-d in_asm) without additional lines

3b7d2ba: QEMU: upgraded to version 2.3.0

73d4515: QEMU: first steps towards DIGIC 6 / 7D2 emulation

91cfae7: QEMU: fix error handling when SD image is not present

222b98d: QEMU: HPTimer emulation (man, that was hard...)

17ed162: QEMU: don't reset irq_id when writing to 0xC0201010

9256833: QEMU: also reset interrupt request flag when reading 0xC0201004

259fd82: QEMU: disable interrupt when triggered (so an interrupt can't be interrupted by the same interrupt)

0aa963e: QEMU: minor cleanup

ca4ae11: QEMU: register 0xC0201004 resets on read (interrupt engine)

be8e51c: QEMU: fix DMA copying

f2f49a3: QEMU: use a mutex for interrupt variables

8ab96de: QEMU: don't switch to Thumb mode on exceptions on arm946eos, even if SCTLR bit 30 is enabled\u000a\u000aTODO: discuss with QEMU devs (comments suggest it might be a bug in QEMU, not sure)

37101c4: QEMU: log ARM coprocessor register writes

32b3f59: QEMU: modified install script to create a git repo, for tracking changes to QEMU source

972c6b4: QEMU: fix valgrind warnings

be1e8af: QEMU: recognize ATA registers (5D3)

cf6d96f: QEMU: SD emulation working on 5D3

0d1d45b: QEMU: dropped run_ml_*.sh (maintenance burden; just use instead)

f3e46b8: QEMU: handle SD emulation on 70D

d741b90: QEMU: force bootflag enabled (for new ports)

f6e9f48: QEMU: definitions for 70D, 700D, 1100D, 1200D and EOS M

9f27382: QEMU: move Basic2 registers to GPIO (and fix them, since Basic2 was not called)

3854f45: QEMU: handle SD emulation on 6D

86c46eb: QEMU: handle 4-bit palette registers (for bootloader)

5f1240c: QEMU: check for card access past the end of the card

27cfc69: QEMU: small fixes

2d05ece: QEMU: make bootloader configuration default

1f78083: QEMU: SDIO emulation working in bootloader! (tested on 60D ROM, loads the "recovery" autoexec.bin and dumps the ROM to SD card image)

596f989: QEMU: print SDIO register names, from

7f913c5: QEMU: print REG_PRINT_CHAR (including DebugMsg's) in blue and REG_PRINT_NUM in green

55e87b9: QEMU: wrap timers around when reaching reload value

885ed5b: QEMU: fix bootloader palette (black and white colors) and disable YUV handling

ac8d80e: QEMU: patch 6D bootloader so it thinks it can load autoexec.bin (disabled by default; bootloader display test works!)

5bfa96e: QEMU: patch some MCR instructions that can't be emulated (6D/5D3)

495545d: QEMU: fix some 6D bootloader GPIOs; verbose messages for other boot GPIOs

fbf7c88: QEMU: handle 6D SDIO

ba4dada: Autoexec is executed from 0x800000, not 0x40800000 (updated both Makefile and QEMU)

ec930a4: QEMU: lower stack pointer before loading autoexec

fc48ffc: QEMU: trace RAM reads + writes in a given range (define TRACE_MEM_START in eos.h to enable it)

af3a46f: QEMU: handle bootloader display (can't recognize it yet, need to edit source to enable it)

59d654b: QEMU: handle all 3 timers, not just timer #2 (incomplete)

b5a524b: QEMU: fix TIO text color

3a4c0bf: QEMU: handle CLOCK_ENABLE register (incomplete)

9aba3cc: QEMU: load autoexec at 0x40800000 (fixes debug symbols in reboot.c)

be854c3: QEMU: fix interrupts triggered while another interrupt is running

cca2305: QEMU: more accurate timer handling (tested with msleep + get_ms_clock_value + PC clock)

c44cb9e: QEMU: highlight TIO messages in red; quiet 0xC0800008

c3cd03f: QEMU: handle 5D2 CF LED

dc93322: QEMU: more verbose DMA messages

83f22a8: QEMU: fix tabs

462b9bf: QEMU: fix warning

b8e97b2: QEMU: refactored register-related messages to be a little more consistent and reduce duplicate code (io_log)

c0df1b6: QEMU scripts: minor cleanups

Build Log

2018-06-06 00:21 - Build failed!

Build Log

Magic Lantern is not approved nor endorsed by Canon in any way, and using it will probably void your warranty.
We are not responsible for any damages to your camera.

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.