git subrepo push libraries

subrepo:
  subdir:   "libraries"
  merged:   "6cc765fca"
upstream:
  origin:   "https://github.com/Atmosphere-NX/Atmosphere-libs"
  branch:   "master"
  commit:   "6cc765fca"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"

libraries/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Atmosphere-NX/Atmosphere-libs
 	branch = master
-	commit = 6e2c09c795c3996397b2c5720007453b782e7db9
-	parent = 4928bcb00322a17345521f27f30bafa3e58ea681
+	commit = 6cc765fcaa5f83b9cd6dc5b424bae31a0f33b29f
+	parent = 3cb5d5f957020d07f5bdb3fb89521f29bea5d79d
 	method = merge
 	cmdver = 0.4.1

libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp

@@ -361,10 +361,18 @@ namespace ams::kern::board::nintendo::nx {
         }();
 
         /* Return (possibly) adjusted size. */
-        /* NOTE: On 20.0.0+ the browser requires much more memory in the applet pool in order to function. */
+        /* NOTE: On 20.0.0+ (and even more-so 21.0.0+) the browser requires much more memory in the applet pool in order to function. */
         /* Thus, we have to reduce our extra system memory size by 26 MB to compensate. */
-        const size_t ExtraSystemMemoryForAtmosphere = kern::GetTargetFirmware() >= ams::TargetFirmware_20_0_0 ? 14_MB : 40_MB;
-        return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize;
+        if (kern::GetTargetFirmware() >= ams::TargetFirmware_21_0_0) {
+            constexpr size_t ExtraSystemMemoryForAtmosphere_21_0_0 = 7_MB;
+            return base_pool_size - ExtraSystemMemoryForAtmosphere_21_0_0 - KTraceBufferSize;
+        } else if (kern::GetTargetFirmware() >= ams::TargetFirmware_20_0_0) {
+            constexpr size_t ExtraSystemMemoryForAtmosphere_20_0_0 = 14_MB;
+            return base_pool_size - ExtraSystemMemoryForAtmosphere_20_0_0 - KTraceBufferSize;
+        } else {
+            constexpr size_t ExtraSystemMemoryForAtmosphere = 40_MB;
+            return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize;
+        }
     }
 
     size_t KSystemControl::Init::GetMinimumNonSecureSystemPoolSize() {

libraries/libstratosphere/include/stratosphere/hos/hos_types.hpp

@@ -97,6 +97,8 @@ namespace ams::hos {
         Version_20_4_0  = ::ams::TargetFirmware_20_4_0,
         Version_20_5_0  = ::ams::TargetFirmware_20_5_0,
         Version_21_0_0  = ::ams::TargetFirmware_21_0_0,
+        Version_21_0_1  = ::ams::TargetFirmware_21_0_1,
+        Version_21_1_0  = ::ams::TargetFirmware_21_1_0,
 
         Version_Current = ::ams::TargetFirmware_Current,
 

libraries/libvapours/include/vapours/ams/ams_api_version.h

@@ -17,10 +17,10 @@
 
 #define ATMOSPHERE_RELEASE_VERSION_MAJOR    1
 #define ATMOSPHERE_RELEASE_VERSION_MINOR    10
-#define ATMOSPHERE_RELEASE_VERSION_MICRO    0
+#define ATMOSPHERE_RELEASE_VERSION_MICRO    1
 
 #define ATMOSPHERE_RELEASE_VERSION ATMOSPHERE_RELEASE_VERSION_MAJOR, ATMOSPHERE_RELEASE_VERSION_MINOR, ATMOSPHERE_RELEASE_VERSION_MICRO
 
 #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MAJOR 21
-#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR 0
+#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR 1
 #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 0

libraries/libvapours/include/vapours/ams/ams_target_firmware.h

@@ -95,8 +95,10 @@
 #define ATMOSPHERE_TARGET_FIRMWARE_20_4_0 ATMOSPHERE_TARGET_FIRMWARE(20,  4,  0)
 #define ATMOSPHERE_TARGET_FIRMWARE_20_5_0 ATMOSPHERE_TARGET_FIRMWARE(20,  5,  0)
 #define ATMOSPHERE_TARGET_FIRMWARE_21_0_0 ATMOSPHERE_TARGET_FIRMWARE(21,  0,  0)
+#define ATMOSPHERE_TARGET_FIRMWARE_21_0_1 ATMOSPHERE_TARGET_FIRMWARE(21,  0,  1)
+#define ATMOSPHERE_TARGET_FIRMWARE_21_1_0 ATMOSPHERE_TARGET_FIRMWARE(21,  1,  0)
 
-#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_21_0_0
+#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_21_1_0
 
 #define ATMOSPHERE_TARGET_FIRMWARE_MIN ATMOSPHERE_TARGET_FIRMWARE(0, 0, 0)
 #define ATMOSPHERE_TARGET_FIRMWARE_MAX ATMOSPHERE_TARGET_FIRMWARE_CURRENT
@@ -184,6 +186,8 @@ namespace ams {
         TargetFirmware_20_4_0  = ATMOSPHERE_TARGET_FIRMWARE_20_4_0,
         TargetFirmware_20_5_0  = ATMOSPHERE_TARGET_FIRMWARE_20_5_0,
         TargetFirmware_21_0_0  = ATMOSPHERE_TARGET_FIRMWARE_21_0_0,
+        TargetFirmware_21_0_1  = ATMOSPHERE_TARGET_FIRMWARE_21_0_1,
+        TargetFirmware_21_1_0  = ATMOSPHERE_TARGET_FIRMWARE_21_1_0,
 
         TargetFirmware_Current = ATMOSPHERE_TARGET_FIRMWARE_CURRENT,
 

stratosphere/loader/source/ldr_embedded_usb_patches.inc

@@ -79,6 +79,11 @@ constexpr inline const EmbeddedPatchEntry Usb30ForceEnablePatches_20_1_0[] = {
     { 0x7090, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
 };
 
+constexpr inline const EmbeddedPatchEntry Usb30ForceEnablePatches_21_0_0[] = {
+    { 0x6D60, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
+    { 0x6DE0, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
+};
+
 constexpr inline const EmbeddedPatch Usb30ForceEnablePatches[] = {
     { ParseModuleId("C0D3F4E87E8B0FE9BBE9F1968A20767F3DC08E03"), util::size(Usb30ForceEnablePatches_9_0_0),  Usb30ForceEnablePatches_9_0_0 },
     { ParseModuleId("B9C700CA8335F8BAA0D2041D8D09F772890BA988"), util::size(Usb30ForceEnablePatches_10_0_0), Usb30ForceEnablePatches_10_0_0 },
@@ -93,5 +98,6 @@ constexpr inline const EmbeddedPatch Usb30ForceEnablePatches[] = {
     { ParseModuleId("4F21AE15E814FA46515C0401BB23D4F7ADCBF3F4"), util::size(Usb30ForceEnablePatches_18_0_0), Usb30ForceEnablePatches_18_0_0 }, /* 18.0.0 */
     { ParseModuleId("54BB9BB32C958E02752DC5E4AE8D016BFE1F5418"), util::size(Usb30ForceEnablePatches_19_0_0), Usb30ForceEnablePatches_19_0_0 }, /* 19.0.0 */
     { ParseModuleId("40E80E7442C0DFC985315E6F9E8C77229818AC0F"), util::size(Usb30ForceEnablePatches_20_0_0), Usb30ForceEnablePatches_20_0_0 }, /* 20.0.0 */
-    { ParseModuleId("A5EF8D22EDF8A384E4135270ED596C1D2D524159"), util::size(Usb30ForceEnablePatches_20_1_0), Usb30ForceEnablePatches_20_1_0 }, /* 20.1.0 - 20.1.1 */
+    { ParseModuleId("A5EF8D22EDF8A384E4135270ED596C1D2D524159"), util::size(Usb30ForceEnablePatches_20_1_0), Usb30ForceEnablePatches_20_1_0 }, /* 20.1.0 - 20.5.0 */
+    { ParseModuleId("766D0C2277207B40AD9B8DE309396D50CCE94885"), util::size(Usb30ForceEnablePatches_21_0_0), Usb30ForceEnablePatches_21_0_0 }, /* 21.0.0 */
 };

stratosphere/loader/source/ldr_process_creation.cpp

@@ -245,14 +245,14 @@ namespace ams::ldr {
 
             /* If we don't have an RTLD, we must only have a main. */
             const bool has_browser_dll = (acid_flags & Acid::AcidFlag_LoadBrowserCoreDll) != 0;
-            if (ali->has_rtld) {
-                /* If we have rtld, we must also have sdk. */
-                R_UNLESS(ali->has_sdk, ldr::ResultInvalidNso());
+            if (!ali->has_rtld) {
+                /* If don't have rtld, we must also not have sdk. */
+                R_UNLESS(!ali->has_sdk, ldr::ResultInvalidNso());
 
-                /* We must also only have one of [subsdk, browser dll]. */
+                /* We must also not have both subsdk and browser dll. */
                 R_UNLESS(!(ali->has_subsdk && has_browser_dll), ldr::ResultInvalidNso());
             } else {
-                /* If we don't have rtld, we are not browser, and must not have browser core dll. */
+                /* If we have rtld, we must not have browser core dll. */
                 R_UNLESS(!has_browser_dll, ldr::ResultInvalidNso());
             }
 

stratosphere/ro/source/impl/ro_nro_utils.cpp

@@ -53,14 +53,14 @@ namespace ams::ro::impl {
 
     Result SetNroPerms(os::NativeHandle process_handle, u64 base_address, u64 rx_size, u64 ro_size, u64 rw_size, bool is_aligned_header) {
         const u64 rx_offset = is_aligned_header ? os::MemoryPageSize : 0;
-        const u64 ro_offset = rx_offset + rx_size;
+        const u64 ro_offset = rx_size;
         const u64 rw_offset = ro_offset + ro_size;
 
         if (is_aligned_header) {
             R_TRY(os::SetProcessMemoryPermission(process_handle, base_address, os::MemoryPageSize, os::MemoryPermission_ReadOnly));
         }
 
-        R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + rx_offset, rx_size, os::MemoryPermission_ReadExecute));
+        R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + rx_offset, rx_size - rx_offset, os::MemoryPermission_ReadExecute));
         R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + ro_offset, ro_size, os::MemoryPermission_ReadOnly));
         R_TRY(os::SetProcessMemoryPermission(process_handle, base_address + rw_offset, rw_size, os::MemoryPermission_ReadWrite));