SuccessChanges

Summary

  1. Check return values for get_yuv422_vram calls (should fail gracefully)
  2. VRAM backend: check for uninitialized YUV buffer (fixes mlv_play/pic_view not working at startup, outside LV, if no regular images are on the card)
  3. file_man: close the viewer when quitting the menu via e.g. half-shutter
  4. Merged in raw-disable-powersave (pull request #595) Disable powersave during raw recording
  5. Close branch raw-disable-powersave
  6. Merged in qemu (pull request #517) QEMU support
  7. Merged in restore-after-format (pull request #575) Restore after format: refactoring + fix for EOS-M
  8. Close branch restore-after-format
  9. Restore after format: also restore FIR and LOG files from root directory, plus some cleanup
  10. 600D, 1100D: fix toggle button for restore after format, https://bitbucket.org/hudson/magic-lantern/pull-request/575/restore-after-format-refactoring-fix-for/diff#comment-2677043
  11. mlv_rec: disable powersave timer while recording (not tested, but confirmed with raw_rec)
  12. Undo 25022dc (7D boot process experiment)
  13. QEMU support: fix 5D2
  14. 5D3 113: restore after format working (backported from 123 - b1296f0)
  15. qemu: add support for EOS 6D
  16. raw_rec: attempt to disable powersave timer while recording (not tested)
  17. Register PROP_ICU_AUTO_POWEROFF for modules
  18. qemu-helper: updated for latest FIO changes
  19. Merged unified into qemu
  20. boot-hack.c: imported some cleanups from the 70D branch (197e38f)
  21. EOS-M, restore after format: fix button code
  22. EOS-M, restore after format: use the DELETE button to toggle between "Keep ML" and "Remove ML"
  23. Fix typos
  24. Restore after format: moved button codes from gui-common.c to platform/consts.h, and some small refactoring
  25. Merged unified into qemu
  26. QEMU support: very rough LV RAW buffer emulation (disabled by default in qemu-util.c)
  27. QEMU support: 550D working
  28. QEMU support: forgot to add run_ml_7D.sh
  29. QEMU support: fix 7D ROM start address (not sure if important, works either way)
  30. 7D: classic boot process, with AllocateMemory (tested only on QEMU for now)
  31. QEMU support: print an error message and exit if autoexec.bin is too large
  32. reloc.c: added a safety check
  33. reloc.c: when compiled with CONFIG_QEMU, print debug messages
  34. QEMU support: 7D slave works! (with ML menus and LiveView)
  35. Merged unified into qemu
  36. QEMU support: force a refresh of VRAM parameters (workaround, because properties are not working yet)
  37. QEMU support: LiveView emulation (some overlays working!)
  38. QEMU support: allow operation without a valid YUV422 buffer (fallback)
  39. QEMU support: fix scaling for YUV422 dumps from HDMI
  40. QEMU support: ability to load and display a YUV422 buffer (built-in LCD only for now)
  41. QEMU support: show random pixels behind color 0 (placeholder for LiveView image)
  42. QEMU support: first step towards emulating external monitors (proof of concept)
  43. QEMU support: use a dynamically allocated BMP VRAM instead of a hardcoded one
  44. QEMU install script: force --enable-sdl (to make sure you get the graphics window) and use parallel compilation for QEMU (make -j)
  45. QEMU support: start a few more Canon tasks
  46. QEMU support: run Canon's init task and use their memory allocation routines
  47. QEMU support: use gray for transparent backgrounds; makes Arkanoid playable :)
  48. QEMU support: copy the .sym file to be able to emulate modules
  49. QEMU support: silence ASIF messages when reading audio level
  50. QEMU support: added a welcome screen that shows keyboard help
  51. QEMU support: patched ML code to allow menu navigation in emulator :)
  52. Modules: fix error handling when opening files
  53. Merged in berlincount/magic-lantern/qemu (pull request #506) enable calling script from anywhere; prevent interpreter degradation; allow qemu parameter passing
  54. enable calling script from anywhere; prevent interpreter degradation; allow qemu parameter passing
  55. QEMU support: keyboard emulation, almost ready for live menu navigation :)
  56. QEMU support: minor refactor
  57. Merged in berlincount/magic-lantern/qemu (pull request #504) make variable defaults overrideable from the outside
  58. make variable defaults overrideable from the outside
  59. QEMU support: graphical display :)
  60. QEMU support: dummy ASIF handler
  61. QEMU support: attempt to use DryOS task scheduler. Hello World still working!
  62. QEMU support: fix screenshot alignment after enabling TCM
  63. QEMU support: fixes for FIO_FindFirst/FindNext (file info) and FIO_GetFileSize (return value)
  64. QEMU support: emulation for some 5D3 registers checked in bootloader
  65. QEMU support: enabled TCM regions, thanks g3gg0
  66. QEMU support: fix menu screenshots demo (CONFIG_QEMU_MENU_SCREENSHOTS in Makefile.user)
  67. QEMU support: added some very rough FIO handlers - just enough to load the new fonts and print Hello World nicely
  68. QEMU support: refactored ML helpers as a generic eos_handler
  69. QEMU support: load ML symbols when debugging with GDB
  70. QEMU support: added 100D and 5D3.123
  71. QEMU support: fix compilation, "hello world" working again
Changeset 10803:703ee626326d by Alex:
Check return values for get_yuv422_vram calls (should fail gracefully)
The file was modifiedsrc/greenscreen.c (diff)
The file was modifiedsrc/shoot.c (diff)
The file was modifiedsrc/tweaks.c (diff)
The file was modifiedsrc/vram.c (diff)
The file was modifiedsrc/zebra.c (diff)
Changeset 10802:26a32b368c65 by Alex:
VRAM backend: check for uninitialized YUV buffer (fixes mlv_play/pic_view not working at startup, outside LV, if no regular images are on the card)
The file was modifiedsrc/menu.c (diff)
The file was modifiedsrc/raw.c (diff)
The file was modifiedsrc/vram.c (diff)
The file was modifiedsrc/vram.h (diff)
Changeset 10801:ad17431babbe by Alex:
file_man: close the viewer when quitting the menu via e.g. half-shutter
The file was modifiedmodules/file_man/file_man.c (diff)
Changeset 10800:5db01f0b0b0e by a1ex <broscutamaker@gmail.com>:
Merged in raw-disable-powersave (pull request #595)<br><br>Disable powersave during raw recording
Changeset 10799:ef32b405b4f5 by a1ex <broscutamaker@gmail.com>:
Close branch raw-disable-powersave
Changeset 10798:595277032b7a by a1ex <broscutamaker@gmail.com>:
Merged in qemu (pull request #517)<br><br>QEMU support
Changeset 10797:a26bd2855ca5 by a1ex <broscutamaker@gmail.com>:
Merged in restore-after-format (pull request #575)<br><br>Restore after format: refactoring + fix for EOS-M
Changeset 10796:4617058cc993 by a1ex <broscutamaker@gmail.com>:
Close branch restore-after-format
Changeset 10795:bc88f6bc1205 by Alex:
Restore after format: also restore FIR and LOG files from root directory, plus some cleanup
The file was modifiedsrc/cropmarks.c (diff)
The file was modifiedsrc/cropmarks.h (diff)
The file was modifiedsrc/debug.c (diff)
Changeset 10794:bb9bddbc669b by Alex:
600D, 1100D: fix toggle button for restore after format, https://bitbucket.org/hudson/magic-lantern/pull-request/575/restore-after-format-refactoring-fix-for/diff#comment-2677043
The file was modifiedplatform/1100D.105/consts.h (diff)
The file was modifiedplatform/600D.102/consts.h (diff)
Changeset 10793:4d1fd7229a5e by Alex:
mlv_rec: disable powersave timer while recording (not tested, but confirmed with raw_rec)
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 10792:a8a501d5773e by Alex:
Undo 25022dc (7D boot process experiment)
The file was modifiedplatform/7D.203/Makefile.platform.default (diff)
The file was modifiedplatform/7D.203/Makefile.setup.default (diff)
The file was modifiedplatform/7D.203/consts.h (diff)
The file was modifiedplatform/7D.203/internals.h (diff)
The file was modifiedsrc/boot-hack.c (diff)
Changeset 10791:23b96f3884be by Alex:
QEMU support: fix 5D2
The file was modifiedplatform/5D2.212/gui.c (diff)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10790:6e54d476874e by Alex:
5D3 113: restore after format working (backported from 123 - b1296f0)
The file was modifiedplatform/5D3.113/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.113/consts.h (diff)
The file was modifiedplatform/5D3.113/internals.h (diff)
The file was modifiedplatform/5D3.113/stubs.S (diff)
The file was modifiedsrc/bootflags.c (diff)
The file was modifiedsrc/debug.c (diff)
Changeset 10789:b59a1ac5fbfc by nikfreak <vatoloco2@gmx.de>:
qemu: add support for EOS 6D
The file was addedcontrib/qemu/scripts/run_ml_6D.sh
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10788:77a538abb263 by Alex:
raw_rec: attempt to disable powersave timer while recording (not tested)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 10787:e676e1afea1f by Alex:
Register PROP_ICU_AUTO_POWEROFF for modules
The file was modifiedsrc/property.c (diff)
Changeset 10786:4b522dd5063d by Alex:
qemu-helper: updated for latest FIO changes
The file was modifiedsrc/qemu-helper.c (diff)
Changeset 10785:87719a796c35 by Alex:
Merged unified into qemu
Changeset 10784:adc9e0b099e0 by Alex:
boot-hack.c: imported some cleanups from the 70D branch (197e38f)
The file was modifiedsrc/boot-hack.c (diff)
Changeset 10783:46cd6373626c by Alex:
EOS-M, restore after format: fix button code
The file was modifiedplatform/EOSM.202/consts.h (diff)
Changeset 10782:c9ed5e08cbef by Alex:
EOS-M, restore after format: use the DELETE button to toggle between &quot;Keep ML&quot; and &quot;Remove ML&quot;
The file was modifiedplatform/EOSM.202/consts.h (diff)
Changeset 10781:8b18a219b97d by Alex:
Fix typos
The file was modifiedplatform/1100D.105/consts.h (diff)
The file was modifiedplatform/500D.111/consts.h (diff)
Changeset 10780:3410bcc2febf by Alex:
Restore after format: moved button codes from gui-common.c to platform/consts.h, and some small refactoring
The file was modifiedplatform/1100D.105/consts.h (diff)
The file was modifiedplatform/500D.111/consts.h (diff)
The file was modifiedplatform/50D.109/consts.h (diff)
The file was modifiedplatform/550D.109/consts.h (diff)
The file was modifiedplatform/5D2.212/consts.h (diff)
The file was modifiedplatform/5D3.113/consts.h (diff)
The file was modifiedplatform/600D.102/consts.h (diff)
The file was modifiedplatform/60D.111/consts.h (diff)
The file was modifiedplatform/650D.104/consts.h (diff)
The file was modifiedplatform/6D.113/consts.h (diff)
The file was modifiedplatform/700D.113/consts.h (diff)
The file was modifiedplatform/7D.203/consts.h (diff)
The file was modifiedplatform/EOSM.202/consts.h (diff)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
Changeset 10779:476ed70dc856 by Alex:
Merged unified into qemu
Changeset 10778:06f82aa57ba0 by Alex:
QEMU support: very rough LV RAW buffer emulation (disabled by default in qemu-util.c)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
The file was modifiedsrc/qemu-util.c (diff)
The file was modifiedsrc/state-object.c (diff)
Changeset 10777:33d051cf5ff1 by Alex:
QEMU support: 550D working
The file was addedcontrib/qemu/scripts/run_ml_550D.sh
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedsrc/boot-hack.c (diff)
The file was modifiedsrc/qemu-helper.c (diff)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10776:f2f51a2e940f by Alex:
QEMU support: forgot to add run_ml_7D.sh
The file was addedcontrib/qemu/scripts/run_ml_7D.sh
Changeset 10775:c46269721aa9 by Alex:
QEMU support: fix 7D ROM start address (not sure if important, works either way)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10774:25022dccec3a by Alex:
7D: classic boot process, with AllocateMemory (tested only on QEMU for now)
The file was modifiedplatform/7D.203/Makefile.platform.default (diff)
The file was modifiedplatform/7D.203/Makefile.setup.default (diff)
The file was modifiedplatform/7D.203/consts.h (diff)
The file was modifiedplatform/7D.203/internals.h (diff)
The file was modifiedsrc/boot-hack.c (diff)
Changeset 10773:8b90105d2b87 by Alex:
QEMU support: print an error message and exit if autoexec.bin is too large
The file was modifiedsrc/boot-hack.c (diff)
Changeset 10772:0aa6fd5097c0 by Alex:
reloc.c: added a safety check
The file was modifiedsrc/reloc.c (diff)
Changeset 10771:d484097bce2e by Alex:
reloc.c: when compiled with CONFIG_QEMU, print debug messages
The file was modifiedsrc/reloc.c (diff)
Changeset 10770:0edac340ab54 by Alex:
QEMU support: 7D slave works! (with ML menus and LiveView)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedsrc/gui.c (diff)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10769:e45dcb36bcfb by Alex:
Merged unified into qemu
Changeset 10768:3a6c07929e7b by Alex:
QEMU support: force a refresh of VRAM parameters (workaround, because properties are not working yet)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10767:df6c87fd43a2 by Alex:
QEMU support: LiveView emulation (some overlays working!)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10766:695e36653ec2 by Alex:
QEMU support: allow operation without a valid YUV422 buffer (fallback)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10765:08452f50cd8d by Alex:
QEMU support: fix scaling for YUV422 dumps from HDMI
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10764:4b681e02c26b by Alex:
QEMU support: ability to load and display a YUV422 buffer (built-in LCD only for now)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10763:f6d045e71ecd by Alex:
QEMU support: show random pixels behind color 0 (placeholder for LiveView image)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10762:f70d49ad4702 by Alex:
QEMU support: first step towards emulating external monitors (proof of concept)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10761:cd4729c65210 by Alex:
QEMU support: use a dynamically allocated BMP VRAM instead of a hardcoded one
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
The file was modifiedsrc/qemu-helper.c (diff)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10760:d915d6fd2d04 by Alex:
QEMU install script: force --enable-sdl (to make sure you get the graphics window) and use parallel compilation for QEMU (make -j)
The file was modifiedcontrib/qemu/install.sh (diff)
Changeset 10759:17b02039dde6 by Alex:
QEMU support: start a few more Canon tasks
The file was modifiedsrc/boot-hack.c (diff)
Changeset 10758:b530521e21ff by Alex:
QEMU support: run Canon&#039;s init task and use their memory allocation routines
The file was modifiedsrc/boot-hack.c (diff)
The file was modifiedsrc/qemu-helper.c (diff)
The file was modifiedsrc/qemu-util.c (diff)
The file was modifiedsrc/qemu-util.h (diff)
Changeset 10757:c63846b071ad by Alex:
QEMU support: use gray for transparent backgrounds; makes Arkanoid playable :)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10756:2f78de0c406d by Alex:
QEMU support: copy the .sym file to be able to emulate modules
The file was modifiedcontrib/qemu/scripts/run_ml.sh (diff)
Changeset 10755:55591ef9b1bf by Alex:
QEMU support: silence ASIF messages when reading audio level
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10754:dc960a37c012 by Alex:
QEMU support: added a welcome screen that shows keyboard help
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10753:08b0ec4d54b4 by Alex:
QEMU support: patched ML code to allow menu navigation in emulator :)
The file was modifiedsrc/boot-hack.c (diff)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/gui.c (diff)
The file was modifiedsrc/mem.c (diff)
The file was modifiedsrc/menu.c (diff)
The file was modifiedsrc/qemu-helper.c (diff)
Changeset 10752:65d859043833 by Alex:
Modules: fix error handling when opening files
The file was modifiedsrc/module.c (diff)
The file was modifiedsrc/tcc-glue.c (diff)
Changeset 10751:d6f5c07b472a by a1ex <broscutamaker@gmail.com>:
Merged in berlincount/magic-lantern/qemu (pull request #506)<br><br>enable calling script from anywhere; prevent interpreter degradation; allow qemu parameter passing
Changeset 10750:c9841dc26b89 by Andreas Kotes <count-magiclantern@flatline.de>:
enable calling script from anywhere; prevent interpreter degradation; allow qemu parameter passing
The file was modifiedcontrib/qemu/scripts/run_ml.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_100D.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_500D.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_50D.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_5D2.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_5D3.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_5D3_123.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_600D.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_60D.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml_650D.sh (diff)
Changeset 10749:dfd034b9cb6f by Alex:
QEMU support: keyboard emulation, almost ready for live menu navigation :)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
The file was modifiedsrc/qemu-util.c (diff)
Changeset 10748:03ba08b08e7d by Alex:
QEMU support: minor refactor
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
Changeset 10747:e5758c9745e2 by a1ex <broscutamaker@gmail.com>:
Merged in berlincount/magic-lantern/qemu (pull request #504)<br><br>make variable defaults overrideable from the outside
Changeset 10746:ad5ea8ce704c by Andreas Kotes <count-magiclantern@flatline.de>:
make variable defaults overrideable from the outside
The file was modifiedcontrib/qemu/install.sh (diff)
The file was modifiedcontrib/qemu/scripts/copy_back_to_contrib.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_canon_fw.sh (diff)
The file was modifiedcontrib/qemu/scripts/run_ml.sh (diff)
Changeset 10745:cf39559c5014 by Alex:
QEMU support: graphical display :)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
Changeset 10744:b665730f30df by Alex:
QEMU support: dummy ASIF handler
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
Changeset 10743:e30ab5d0e105 by Alex:
QEMU support: attempt to use DryOS task scheduler. Hello World still working!
The file was modifiedsrc/qemu-helper.c (diff)
Changeset 10742:34f01f6a391c by Alex:
QEMU support: fix screenshot alignment after enabling TCM
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10741:93e3fcec3b6b by Alex:
QEMU support: fixes for FIO_FindFirst/FindNext (file info) and FIO_GetFileSize (return value)
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedsrc/qemu-helper.c (diff)
Changeset 10740:b79cd7a0b438 by Alex:
QEMU support: emulation for some 5D3 registers checked in bootloader
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10739:613a727314fc by Alex:
QEMU support: enabled TCM regions, thanks g3gg0
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10738:1397105502bb by Alex:
QEMU support: fix menu screenshots demo (CONFIG_QEMU_MENU_SCREENSHOTS in Makefile.user)
The file was modifiedMakefile.user.default (diff)
The file was modifiedsrc/qemu-util.h (diff)
Changeset 10737:6836d3507fb2 by Alex:
QEMU support: added some very rough FIO handlers - just enough to load the new fonts and print Hello World nicely
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
The file was modifiedcontrib/qemu/install.sh (diff)
The file was modifiedsrc/qemu-helper.c (diff)
Changeset 10736:0136eec58cd5 by Alex:
QEMU support: refactored ML helpers as a generic eos_handler
The file was modifiedcontrib/qemu/hw/eos.c (diff)
The file was modifiedcontrib/qemu/hw/eos.h (diff)
Changeset 10735:61198fe752cc by Alex:
QEMU support: load ML symbols when debugging with GDB
The file was modifiedcontrib/qemu/scripts/gdbopts (diff)
The file was modifiedcontrib/qemu/scripts/run_ml.sh (diff)
Changeset 10734:3997c506fdf5 by Alex:
QEMU support: added 100D and 5D3.123
The file was addedcontrib/qemu/scripts/run_ml_100D.sh
The file was addedcontrib/qemu/scripts/run_ml_5D3_123.sh
The file was modifiedcontrib/qemu/hw/eos.c (diff)
Changeset 10733:c4748b5a8580 by Alex:
QEMU support: fix compilation, &quot;hello world&quot; working again
The file was addedsrc/qemu-util.h
The file was modifiedsrc/Makefile.src.config (diff)
The file was modifiedsrc/bmp.c (diff)
The file was modifiedsrc/boot-hack.c (diff)
The file was modifiedsrc/console.c (diff)
The file was modifiedsrc/fw-signature.h (diff)
The file was modifiedsrc/mem.c (diff)
The file was modifiedsrc/qemu-helper.c (diff)