Merge remote-tracking branch 'devdl11/upsilon-dev-1.0.1.01fix' into upsilon-dev

bootloader/Makefile

@@ -37,6 +37,7 @@ bootloader_src += $(addprefix bootloader/interface/menus/, \
   warning.cpp \
   slot_recovery.cpp \
   crash.cpp \
+  upsilon_recovery.cpp \
 )
 
 bootloader_images = $(addprefix bootloader/, \

bootloader/boot.cpp

@@ -63,7 +63,7 @@ bool Boot::isKernelPatched(const Slot & s) {
   return  *(uint32_t *)(origin_isr + sizeof(uint32_t) * 7) == ((uint32_t)&_fake_isr_function_start) + 1;
 }
 
-__attribute((section(".fake_isr_function"))) __attribute__((used)) void Boot::flash_interrupt() {
+__attribute__((section(".fake_isr_function"))) __attribute__((used)) void Boot::flash_interrupt() {
   // a simple function
   Ion::Device::Flash::ClearInternalFlashErrors();
   asm("bx lr");

bootloader/boot.h

@@ -47,7 +47,7 @@ public:
   static void bootSlot(Bootloader::Slot slot);
   static void bootSelectedSlot();
   __attribute__ ((noreturn)) static void jumpToInternalBootloader(); 
-  __attribute((section(".fake_isr_function"))) __attribute__((used)) static void flash_interrupt();
+  __attribute__ ((section(".fake_isr_function"))) __attribute__((used)) static void flash_interrupt();
 
   static void bootloader();
   static void lockInternal();

bootloader/interface/menus/upsilon_recovery.cpp

@@ -0,0 +1,48 @@
+#include "upsilon_recovery.h"
+#include <bootloader/slots/slot.h>
+#include <bootloader/usb_data.h>
+#include <ion/src/device/shared/drivers/board.h>
+#include <ion.h>
+#include <stdlib.h>
+
+extern "C" void jump_to_firmware(const uint32_t* stackPtr, const void(*startPtr)(void));
+
+Bootloader::UpsilonRecoveryMenu::UpsilonRecoveryMenu() : Menu(KDColorBlack, KDColorWhite, Messages::upsilonRecoveryTitle, Messages::mainTitle) {
+    setup();
+}
+
+void Bootloader::UpsilonRecoveryMenu::setup() {
+  m_defaultColumns[0] = Column(Messages::upsilonRecoveryMessage1, k_small_font, 0, true);
+  m_defaultColumns[1] = Column(Messages::upsilonRecoveryMessage2, k_small_font, 0, true);
+  m_defaultColumns[2] = Column(Messages::upsilonRecoveryMessage3, k_small_font, 0, true);
+  m_defaultColumns[3] = Column(Messages::upsilonRecoveryMessage4, k_small_font, 0, true);
+  m_defaultColumns[4] = Column(Messages::upsilonRecoveryMessage5, k_small_font, 0, true);
+  
+  m_columns[0] = ColumnBinder(&m_defaultColumns[0]);
+  m_columns[1] = ColumnBinder(&m_defaultColumns[1]);
+  m_columns[2] = ColumnBinder(&m_defaultColumns[2]);
+  m_columns[3] = ColumnBinder(&m_defaultColumns[3]);
+  m_columns[4] = ColumnBinder(&m_defaultColumns[4]);
+}
+
+void Bootloader::UpsilonRecoveryMenu::postOpen() {
+  // We override the open method
+  for (;;) {
+    uint64_t scan = Ion::Keyboard::scan();
+    if (scan == Ion::Keyboard::State(Ion::Keyboard::Key::Back)) {
+      while (Ion::Keyboard::scan() == Ion::Keyboard::State(Ion::Keyboard::Key::Back));
+      forceExit();
+      return;
+    } else if (scan == Ion::Keyboard::State(Ion::Keyboard::Key::OnOff)) {
+      Ion::Power::suspend();
+      return;
+    } else if (scan == Ion::Keyboard::State(Ion::Keyboard::Key::OK)) {
+      Slot slot = Slot::Upsilon();
+      Ion::Device::Board::bootloaderMPU();
+      // Deinitialize the backlight to prevent bugs when the firmware boots 
+      Ion::Backlight::shutdown();
+      jump_to_firmware(slot.kernelHeader()->stackPointer(), slot.userlandHeader()->upsilonRecoveryBootFunction());
+      for(;;);
+    }
+  }
+}

bootloader/interface/menus/upsilon_recovery.h

@@ -0,0 +1,15 @@
+#ifndef _BOOTLOADER_INTERFACE_MENUS_UPSILON_RECOVERY_H_
+#define _BOOTLOADER_INTERFACE_MENUS_UPSILON_RECOVERY_H_
+
+#include <bootloader/interface/src/menu.h>
+
+namespace Bootloader {
+  class UpsilonRecoveryMenu : public Menu {
+    public:
+      UpsilonRecoveryMenu();
+      void setup() override;
+      void postOpen() override;
+  };
+}
+
+#endif

bootloader/interface/static/messages.h

@@ -53,6 +53,15 @@ public:
   constexpr static const char * recoveryMessage4 = "Press Back to continue.";
   constexpr static const char * recoveryMessage5 = "(you will not be able to recover your data !)";
 
+  // Upsilon Recovery menu
+  constexpr static const char * upsilonRecoveryTitle = "Upsilon Recovery";
+
+  constexpr static const char * upsilonRecoveryMessage1 = "The bootloader has detected a crash.";
+  constexpr static const char * upsilonRecoveryMessage2 = "Because you also have an Upsilon slot,";
+  constexpr static const char * upsilonRecoveryMessage3 = "you can recover your data by booting";
+  constexpr static const char * upsilonRecoveryMessage4 = "the Upsilon slot.";
+  constexpr static const char * upsilonRecoveryMessage5 = "Press OK to continue, BACK to cancel";
+
   // Warning menu
   constexpr static const char * epsilonWarningTitle = "Epsilon Slot";
 

bootloader/recovery.cpp

@@ -1,6 +1,7 @@
 #include <bootloader/recovery.h>
 #include <ion.h>
 #include <ion/src/device/n0110/drivers/power.h>
+#include <ion/src/device/shared/drivers/bldata.h>
 #include <ion/src/device/shared/drivers/reset.h>
 #include <ion/src/device/shared/drivers/board.h>
 #include <assert.h>
@@ -10,6 +11,7 @@
 #include <bootloader/usb_data.h>
 #include <bootloader/interface/menus/slot_recovery.h>
 #include <bootloader/interface/menus/crash.h>
+#include <bootloader/interface/menus/upsilon_recovery.h>
 
 constexpr static uint32_t MagicStorage = 0xEE0BDDBA;
 
@@ -76,7 +78,15 @@ void Bootloader::Recovery::recoverData() {
   Ion::Display::pushRectUniform(KDRect(0,0,320,240), KDColorWhite);
   Ion::Backlight::init();
 
-  USBData udata = USBData::Recovery((uint32_t)getSlotConcerned().getStorageAddress(), (uint32_t)getSlotConcerned().getStorageSize());
+  CrashedSlot slot = getSlotConcerned();
+
+  if (Slot::hasUpsilon() && Slot::Upsilon().userlandHeader()->hasUpsilonExtras()) {
+    Ion::Device::BootloaderSharedData::sharedBootloaderData()->setRecovery((uint32_t)slot.getStorageAddress(), slot.getStorageSize());
+    UpsilonRecoveryMenu reco = UpsilonRecoveryMenu();
+    reco.open();
+  }
+
+  USBData udata = USBData::Recovery((uint32_t)slot.getStorageAddress(), (uint32_t)slot.getStorageSize());
   
   SlotRecoveryMenu menu = SlotRecoveryMenu(&udata);
   menu.open();

bootloader/slots/slot.cpp

@@ -3,6 +3,8 @@
 #include <ion/src/device/shared/drivers/flash.h>
 #include <ion/src/device/shared/drivers/external_flash.h>
 #include <bootloader/boot.h>
+#include <assert.h>
+#include <ion.h>
 
 extern "C" void jump_to_firmware(const uint32_t* stackPtr, const void(*startPtr)(void));
 
@@ -20,6 +22,15 @@ const Slot Slot::Khi() {
   return Slot(0x90180000);
 }
 
+const bool Slot::hasUpsilon() {
+  return (isFullyValid(A()) && A().userlandHeader()->isUpsilon()) || (isFullyValid(B()) && B().userlandHeader()->isUpsilon());
+}
+
+const Slot Slot::Upsilon() {
+  assert(hasUpsilon());
+  return (isFullyValid(A()) && A().userlandHeader()->isUpsilon()) ? A() : B();
+}
+
 const KernelHeader* Slot::kernelHeader() const {
   return m_kernelHeader;
 }
@@ -65,6 +76,9 @@ const UserlandHeader* Slot::userlandHeader() const {
   // Configure the MPU for the booted firmware
   Ion::Device::Board::bootloaderMPU();
 
+  // Deinitialize the backlight to prevent bugs when the firmware boots 
+  Ion::Backlight::shutdown();
+
   // Jump
   jump_to_firmware(kernelHeader()->stackPointer(), kernelHeader()->startPointer());
   for(;;);

bootloader/slots/slot.h

@@ -25,6 +25,8 @@ public:
   static const Slot A();
   static const Slot B();
   static const Slot Khi();
+  static const bool hasUpsilon();
+  static const Slot Upsilon();
 
   static bool isFullyValid(const Slot& slot) {
     return slot.kernelHeader()->isValid() && slot.userlandHeader()->isValid();

bootloader/slots/userland_header.cpp

@@ -40,4 +40,16 @@ const size_t UserlandHeader::storageSize() const {
   return m_storageSizeRAM;
 }
 
+const bool UserlandHeader::hasUpsilonExtras() const {
+  return m_upsilonExtraMagicHeader == UpsilonExtraMagic && m_upsilonExtraMagicFooter == UpsilonExtraMagic;
+}
+
+const uint16_t UserlandHeader::getExtraVersion() const {
+  return m_extraVersion;
+}
+
+const void (*UserlandHeader::upsilonRecoveryBootFunction() const)() {
+  return m_recoveryAddress;
+}
+
 }

bootloader/slots/userland_header.h

@@ -17,12 +17,17 @@ public:
   const char * upsilonVersion() const;
   const void * storageAddress() const;
   const size_t storageSize() const;
+  const bool hasUpsilonExtras() const;
+  const void (*upsilonRecoveryBootFunction() const)();
+  const uint32_t getExtraVersion() const;
+
 
 private:
   UserlandHeader();
   constexpr static uint32_t Magic = 0xDEC0EDFE;
   constexpr static uint32_t OmegaMagic = 0xEFBEADDE;
   constexpr static uint32_t UpsilonMagic = 0x55707369;
+  constexpr static uint32_t UpsilonExtraMagic = 0xaa7073ff;
   uint32_t m_header;
   const char m_expectedEpsilonVersion[8];
   void * m_storageAddressRAM;
@@ -42,6 +47,10 @@ private:
   const char m_UpsilonVersion[16];
   uint32_t m_osType;
   uint32_t m_upsilonMagicFooter;
+  uint32_t m_upsilonExtraMagicHeader;
+  const void (*m_recoveryAddress)();
+  uint32_t m_extraVersion;
+  uint32_t m_upsilonExtraMagicFooter;
 };
 
 extern const UserlandHeader* s_userlandHeaderA;