ncm: employ kernel strats

libraries/libstratosphere/include/stratosphere/lr.hpp

@@ -18,3 +18,4 @@
 #include <vapours.hpp>
 #include <stratosphere/lr/lr_types.hpp>
 #include <stratosphere/lr/lr_api.hpp>
+#include <stratosphere/lr/lr_location_resolver_manager_impl.hpp>

libraries/libstratosphere/include/stratosphere/ncm.hpp

@@ -16,9 +16,12 @@
 
 #pragma once
 
-#include "ncm/ncm_types.hpp"
-#include "ncm/ncm_auto_buffer.hpp"
-#include "ncm/ncm_content_meta.hpp"
-#include "ncm/ncm_content_meta_database.hpp"
-#include "ncm/ncm_content_storage.hpp"
-#include "ncm/ncm_api.hpp"
+#include <stratosphere/ncm/ncm_types.hpp>
+#include <stratosphere/ncm/ncm_auto_buffer.hpp>
+#include <stratosphere/ncm/ncm_make_path.hpp>
+#include <stratosphere/ncm/ncm_content_id_utils.hpp>
+#include <stratosphere/ncm/ncm_content_meta.hpp>
+#include <stratosphere/ncm/ncm_content_meta_database.hpp>
+#include <stratosphere/ncm/ncm_content_storage.hpp>
+#include <stratosphere/ncm/ncm_content_manager_impl.hpp>
+#include <stratosphere/ncm/ncm_api.hpp>

libraries/libstratosphere/include/stratosphere/ncm/ncm_auto_buffer.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <vapours.hpp>
 

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp

@@ -13,9 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <stratosphere.hpp>
+#include <stratosphere/ncm/ncm_types.hpp>
 
 namespace ams::ncm {
 

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_manager_impl.hpp

@@ -13,11 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <stratosphere.hpp>
-#include "ncm_rights_cache.hpp"
-#include "ncm_fs_utils.hpp"
+#include <stratosphere/ncm/ncm_types.hpp>
+#include <stratosphere/ncm/ncm_i_content_manager.hpp>
+#include <stratosphere/ncm/ncm_rights_id_cache.hpp>
 
 namespace ams::ncm {
 

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere/ncm/ncm_types.hpp>
 

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta_database.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere/ncm/ncm_types.hpp>
 #include <stratosphere/ncm/ncm_i_content_meta_database.hpp>

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_storage.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere/ncm/ncm_types.hpp>
 #include <stratosphere/ncm/ncm_i_content_storage.hpp>

libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_manager.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere/ncm/ncm_i_content_storage.hpp>
 #include <stratosphere/ncm/ncm_i_content_meta_database.hpp>

libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_meta_database.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere/ncm/ncm_types.hpp>
 #include <stratosphere/sf.hpp>

libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere/ncm/ncm_types.hpp>
 #include <stratosphere/ncm/ncm_path.hpp>

libraries/libstratosphere/include/stratosphere/ncm/ncm_make_path.hpp

@@ -13,10 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
+#include <stratosphere/ncm/ncm_path.hpp>
 
 namespace ams::ncm {
 

libraries/libstratosphere/include/stratosphere/ncm/ncm_path.hpp

@@ -18,6 +18,7 @@
 #include <stratosphere/ncm/ncm_types.hpp>
 #include <stratosphere/fs/fs_directory.hpp>
 #include <stratosphere/sf/sf_buffer_tags.hpp>
+#include <stratosphere/kvdb/kvdb_bounded_string.hpp>
 
 namespace ams::ncm {
 

libraries/libstratosphere/include/stratosphere/ncm/ncm_rights_id_cache.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::ncm {

libraries/libstratosphere/include/stratosphere/ncm/ncm_types.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <vapours.hpp>
 #include <stratosphere/fs/fs_rights_id.hpp>

libraries/libstratosphere/source/ncm/ncm_content_id_utils.cpp

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "ncm_content_id_utils.hpp"
+#include <stratosphere.hpp>
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_content_manager_impl.cpp

@@ -13,13 +13,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include "ncm_content_manager_impl.hpp"
+#include <stratosphere.hpp>
+#include "ncm_content_storage_impl.hpp"
+#include "ncm_read_only_content_storage_impl.hpp"
 #include "ncm_content_meta_database_impl.hpp"
 #include "ncm_on_memory_content_meta_database_impl.hpp"
-#include "ncm_content_storage_impl.hpp"
-#include "ncm_make_path.hpp"
-#include "ncm_read_only_content_storage_impl.hpp"
+#include "ncm_fs_utils.hpp"
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.cpp

@@ -13,9 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include <stratosphere.hpp>
 #include "ncm_content_meta_database_impl.hpp"
-#include "ncm_content_id_utils.hpp"
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 #include "ncm_content_meta_database_impl_base.hpp"
 

libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl_base.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere.hpp>
 

libraries/libstratosphere/source/ncm/ncm_content_storage_impl.cpp

@@ -13,11 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include <stratosphere.hpp>
 #include "ncm_content_storage_impl.hpp"
 #include "ncm_fs_utils.hpp"
-#include "ncm_make_path.hpp"
-#include "ncm_content_id_utils.hpp"
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_content_storage_impl.hpp

@@ -13,15 +13,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
-#include "ncm_placeholder_accessor.hpp"
-#include "ncm_rights_cache.hpp"
 #include "ncm_content_storage_impl_base.hpp"
-#include "ncm_fs_utils.hpp"
+#include "ncm_placeholder_accessor.hpp"
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_content_storage_impl_base.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere.hpp>
 

libraries/libstratosphere/source/ncm/ncm_fs_utils.cpp

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include <stratosphere.hpp>
 #include "ncm_fs_utils.hpp"
 
 namespace ams::ncm::impl {

libraries/libstratosphere/source/ncm/ncm_fs_utils.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::ncm::impl {

libraries/libstratosphere/source/ncm/ncm_make_path.cpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include "ncm_make_path.hpp"
-#include "ncm_content_id_utils.hpp"
+#include <stratosphere.hpp>
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.cpp

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include <stratosphere.hpp>
 #include "ncm_on_memory_content_meta_database_impl.hpp"
 
 namespace ams::ncm {

libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 #include "ncm_content_meta_database_impl.hpp"
 

libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.cpp

@@ -13,9 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include <stratosphere.hpp>
 #include "ncm_placeholder_accessor.hpp"
-#include "ncm_make_path.hpp"
+#include "ncm_fs_utils.hpp"
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.hpp

@@ -13,14 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
-#include "ncm_fs_utils.hpp"
-#include "ncm_make_path.hpp"
-
 namespace ams::ncm {
 
     class PlaceHolderAccessor {

libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.cpp

@@ -13,9 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include "ncm_fs_utils.hpp"
+#include <stratosphere.hpp>
 #include "ncm_read_only_content_storage_impl.hpp"
+#include "ncm_fs_utils.hpp"
 
 namespace ams::ncm {
 

libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 #include "ncm_content_storage_impl_base.hpp"
 

libraries/libstratosphere/source/ncm/ncm_remote_content_manager_impl.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere.hpp>
 #include "ncm_remote_content_storage_impl.hpp"

libraries/libstratosphere/source/ncm/ncm_remote_content_meta_database_impl.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere.hpp>
 

libraries/libstratosphere/source/ncm/ncm_remote_content_storage_impl.hpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere.hpp>
 

stratosphere/ncm/source/ncm_main.cpp

@@ -15,8 +15,6 @@
  */
 
 #include <stratosphere.hpp>
-#include <stratosphere/lr/lr_location_resolver_manager_impl.hpp>
-#include "ncm_content_manager_impl.hpp"
 
 extern "C" {
     extern u32 __start__;