Merge upstream Atmosphere master into boot-storage

libraries/libvapours/source/crypto/impl/crypto_aes_impl.arch.arm64.cpp

@@ -14,13 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <vapours.hpp>
-#if defined(ATMOSPHERE_IS_STRATOSPHERE)
+#if defined(ATMOSPHERE_IS_MESOSPHERE)
+#include <mesosphere/kern_panic.hpp>
+#endif
+#if defined(ATMOSPHERE_IS_STRATOSPHERE) || defined(ATMOSPHERE_IS_MESOSPHERE)
 #include <arm_neon.h>
 #endif
 
 namespace ams::crypto::impl {
 
-#if defined(ATMOSPHERE_IS_STRATOSPHERE)
+#if defined(ATMOSPHERE_IS_STRATOSPHERE) || defined(ATMOSPHERE_IS_MESOSPHERE)
 
 
     namespace {

libraries/libvapours/source/sdmmc/impl/sdmmc_device_detector.cpp

@@ -61,7 +61,7 @@ namespace ams::sdmmc::impl {
         gpio::Initialize();
 
         /* Open and configure the pad session. */
-        gpio::OpenSession(std::addressof(m_gpio_pad_session), m_gpio_device_code);
+        R_DISCARD(gpio::OpenSession(std::addressof(m_gpio_pad_session), m_gpio_device_code));
         gpio::SetDirection(std::addressof(m_gpio_pad_session), gpio::Direction_Input);
         gpio::SetDebounceTime(std::addressof(m_gpio_pad_session), m_gpio_debounce_ms);
         gpio::SetDebounceEnabled(std::addressof(m_gpio_pad_session), true);
@@ -200,7 +200,7 @@ namespace ams::sdmmc::impl {
         os::InitializeEvent(std::addressof(m_detector_thread_end_event), false, os::EventClearMode_ManualClear);
 
         /* Create and start the detector thread. */
-        os::CreateThread(std::addressof(m_detector_thread), DetectorThreadEntry, this, m_detector_thread_stack, sizeof(m_detector_thread_stack), AMS_GET_SYSTEM_THREAD_PRIORITY(sdmmc, DeviceDetector));
+        R_DISCARD(os::CreateThread(std::addressof(m_detector_thread), DetectorThreadEntry, this, m_detector_thread_stack, sizeof(m_detector_thread_stack), AMS_GET_SYSTEM_THREAD_PRIORITY(sdmmc, DeviceDetector)));
         os::SetThreadNamePointer(std::addressof(m_detector_thread), AMS_GET_SYSTEM_THREAD_NAME(sdmmc, DeviceDetector));
         os::StartThread(std::addressof(m_detector_thread));
     }

libraries/libvapours/source/sdmmc/impl/sdmmc_sdmmc_controller.board.nintendo_nx.cpp

@@ -500,7 +500,7 @@ namespace ams::sdmmc::impl {
                 this->ClearInterrupt();
                 R_SUCCEED();
             } else if (sdmmc::ResultWaitInterruptSoftwareTimeout::Includes(result)) {
-                SdHostStandardController::AbortTransaction();
+                R_DISCARD(SdHostStandardController::AbortTransaction());
                 R_THROW(sdmmc::ResultIssueTuningCommandSoftwareTimeout());
             } else {
                 R_RETURN(result);