Merge pull request #2811 from ZachyCatGames/patch-1

pgl: GetHostContentMetaInfo returns a ncm::ContentMetaType

docs/changelog.md

@@ -1,4 +1,7 @@
 # Changelog
+## 1.11.1
++ Basic support was added for 22.1.0.
++ General system stability improvements to enhance the user's experience.
 ## 1.11.0
 + Support was added for 22.0.0.
 + Special thanks to @alula for handling a large chunk of the necessary kernel, loader and erpt changes.

emummc/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/m4xw/emummc
 	branch = develop
-	commit = 8ab963b0b1c24b68de8e0c98c62c7822a9765bf3
+	commit = 3726bfd659600cdafd138277054568a3edba60a6
-	parent = 1e88f37892555da4c38ca6c95f43c56cc6bb87e6
+	parent = 80bd459516e813fc6f10268ca31dd72a053a4ef3
 	method = merge
-	cmdver = 0.4.1
+	cmdver = 0.4.9

libraries/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Atmosphere-NX/Atmosphere-libs
 	branch = master
-	commit = 9a8703e710760be8c88147d15414a1c581711625
+	commit = 82f1553c4c7e68364f7e630b1c68f2aee8681dee
-	parent = eb34f9789c62745d87f37e76761b14d946bac300
+	parent = 252f8685b493d0dfd428e9439b0296109776b935
 	method = merge
-	cmdver = 0.4.1
+	cmdver = 0.4.9

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

@@ -101,6 +101,7 @@ namespace ams::hos {
         Version_21_1_0  = ::ams::TargetFirmware_21_1_0,
         Version_21_2_0  = ::ams::TargetFirmware_21_2_0,
         Version_22_0_0  = ::ams::TargetFirmware_22_0_0,
+        Version_22_1_0  = ::ams::TargetFirmware_22_1_0,
 
         Version_Current = ::ams::TargetFirmware_Current,
 

libraries/libstratosphere/include/stratosphere/pgl/pgl_types.hpp

@@ -41,7 +41,8 @@ namespace ams::pgl {
         u32 version;
         ncm::ContentType content_type;
         u8 id_offset;
-        u8 reserved_0E[2];
+        ncm::ContentMetaType content_meta_type;
+        u8 reserved_0F;
 
         static constexpr ContentMetaInfo Make(u64 id, u32 version, ncm::ContentType content_type, u8 id_offset) {
             return {

libraries/libstratosphere/source/pgl/srv/pgl_srv_shell_host_utils.cpp

@@ -345,10 +345,11 @@ namespace ams::pgl::srv {
 
         /* Get the content meta info. */
         *out = {
-            .id           = reader.GetProgramId().value,
+            .id                = reader.GetProgramId().value,
-            .version      = reader.GetProgramVersion(),
+            .version           = reader.GetProgramVersion(),
-            .content_type = ncm::ContentType::Program,
+            .content_type      = ncm::ContentType::Program,
-            .id_offset    = reader.GetProgramIndex(),
+            .id_offset         = reader.GetProgramIndex(),
+            .content_meta_type = reader.GetContentMetaType(),
         };
 
         R_SUCCEED();

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

@@ -17,10 +17,10 @@
 
 #define ATMOSPHERE_RELEASE_VERSION_MAJOR    1
 #define ATMOSPHERE_RELEASE_VERSION_MINOR    11
-#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 22
-#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

@@ -99,8 +99,9 @@
 #define ATMOSPHERE_TARGET_FIRMWARE_21_1_0 ATMOSPHERE_TARGET_FIRMWARE(21,  1,  0)
 #define ATMOSPHERE_TARGET_FIRMWARE_21_2_0 ATMOSPHERE_TARGET_FIRMWARE(21,  2,  0)
 #define ATMOSPHERE_TARGET_FIRMWARE_22_0_0 ATMOSPHERE_TARGET_FIRMWARE(22,  0,  0)
+#define ATMOSPHERE_TARGET_FIRMWARE_22_1_0 ATMOSPHERE_TARGET_FIRMWARE(22,  1,  0)
 
-#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_22_0_0
+#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_22_1_0
 
 #define ATMOSPHERE_TARGET_FIRMWARE_MIN ATMOSPHERE_TARGET_FIRMWARE(0, 0, 0)
 #define ATMOSPHERE_TARGET_FIRMWARE_MAX ATMOSPHERE_TARGET_FIRMWARE_CURRENT
@@ -192,6 +193,7 @@ namespace ams {
         TargetFirmware_21_1_0  = ATMOSPHERE_TARGET_FIRMWARE_21_1_0,
         TargetFirmware_21_2_0  = ATMOSPHERE_TARGET_FIRMWARE_21_2_0,
         TargetFirmware_22_0_0  = ATMOSPHERE_TARGET_FIRMWARE_22_0_0,
+        TargetFirmware_22_1_0  = ATMOSPHERE_TARGET_FIRMWARE_22_1_0,
 
         TargetFirmware_Current = ATMOSPHERE_TARGET_FIRMWARE_CURRENT,
 

stratosphere/ams_mitm/source/fs_mitm/fsmitm_romfs.cpp

@@ -36,6 +36,11 @@ namespace ams::mitm::fs {
             };
 
             constexpr const ApplicationWithDynamicHeapInfo ApplicationsWithDynamicHeap[] = {
+                /* Until Then. */
+                /* Requirement ~34 MB. */
+                /* No particular heap sensitivity. */
+                { 0x010019C023004000,  16_MB, 0_MB },
+
                 /* Trails in the Sky 1st Chapter. */
                 /* Requirement ? MB. 16 MB stolen heap fixes a crash, though. */
                 /* Unknown heap sensitivity. */