strat: automatic program id detection

stratosphere/LogManager/source/lm_main.cpp

@@ -34,12 +34,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::AtmosphereProgramId::AtmosphereLogManager;
-
-}
-
 using namespace ams;
 
 #define AMS_LM_USE_FATAL_ERROR 1

stratosphere/TioServer/source/tio_main.cpp

@@ -35,12 +35,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::DevServer;
-
-}
-
 using namespace ams;
 
 #define AMS_TIO_SERVER_USE_FATAL_ERROR 1

stratosphere/ams_mitm/source/amsmitm_main.cpp

@@ -45,8 +45,6 @@ extern "C" {
 
 namespace ams {
 
-    ncm::ProgramId CurrentProgramId = ncm::AtmosphereProgramId::Mitm;
-
     /* Override. */
     void ExceptionHandler(FatalErrorContext *ctx) {
         /* We're bpc-mitm (or ams_mitm, anyway), so manually reboot to fatal error. */

stratosphere/boot/source/boot_main.cpp

@@ -56,8 +56,6 @@ extern "C" {
 
 namespace ams {
 
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Boot;
-
     void ExceptionHandler(FatalErrorContext *ctx) {
         /* We're boot sysmodule, so manually reboot to fatal error. */
         boot::RebootForFatalError(ctx);

stratosphere/boot2/source/boot2_main.cpp

@@ -39,12 +39,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Boot2;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {

stratosphere/creport/source/creport_main.cpp

@@ -42,12 +42,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Creport;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {

stratosphere/cs/source/cs_main.cpp

@@ -34,12 +34,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Cs;
-
-}
-
 using namespace ams;
 
 #define AMS_CS_SERVER_USE_FATAL_ERROR 1

stratosphere/dmnt.gen2/source/dmnt2_main.cpp

@@ -36,12 +36,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::DmntGen2;
-
-}
-
 using namespace ams;
 
 #define AMS_DMNT2_SERVER_USE_FATAL_ERROR 1

stratosphere/dmnt/source/dmnt_main.cpp

@@ -36,12 +36,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Dmnt;
-
-}
-
 using namespace ams;
 
 void __libnx_initheap(void) {

stratosphere/eclct.stub/source/eclct_stub.cpp

@@ -34,12 +34,6 @@ extern "C" {
     void __libnx_exception_handler(ThreadExceptionDump *ctx);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Eclct;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {

stratosphere/erpt/source/erpt_main.cpp

@@ -39,12 +39,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Erpt;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {

stratosphere/fatal/source/fatal_main.cpp

@@ -46,12 +46,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Fatal;
-
-}
-
 using namespace ams;
 
 namespace ams::fatal {

stratosphere/htc/source/htc_main.cpp

@@ -34,12 +34,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Htc;
-
-}
-
 using namespace ams;
 
 #define AMS_HTC_USE_FATAL_ERROR 1

stratosphere/jpegdec/source/jpegdec_main.cpp

@@ -36,11 +36,6 @@ extern "C" {
     void __libnx_exception_handler(ThreadExceptionDump *ctx);
 }
 
-namespace ams {
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::JpegDec;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {

stratosphere/loader/source/ldr_main.cpp

@@ -41,12 +41,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Loader;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {

stratosphere/ncm/source/ncm_main.cpp

@@ -39,12 +39,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Ncm;
-
-}
-
 using namespace ams;
 
 namespace {

stratosphere/pgl/source/pgl_main.cpp

@@ -39,12 +39,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Pgl;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {

stratosphere/pm/source/pm_main.cpp

@@ -44,12 +44,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Pm;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {
@@ -81,7 +75,7 @@ namespace {
         /* Doing this here works around a bug fixed in 6.0.0. */
         /* Not doing so will cause svcDebugActiveProcess to deadlock on lower firmwares if called for it's own process. */
         if (process_id == os::GetCurrentProcessId()) {
-            return ams::CurrentProgramId;
+            return os::GetCurrentProgramId();
         }
 
         /* Get a debug handle. */

stratosphere/ro/source/ro_main.cpp

@@ -36,12 +36,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Ro;
-
-}
-
 using namespace ams;
 
 namespace ams::ro {

stratosphere/sm/source/sm_main.cpp

@@ -51,8 +51,6 @@ namespace {
 
 namespace ams {
 
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Sm;
-
     void NORETURN Exit(int rc) {
         AMS_ABORT("Exit called by immortal process");
     }

stratosphere/spl/source/spl_main.cpp

@@ -49,12 +49,6 @@ extern "C" {
     void __libnx_free(void *mem);
 }
 
-namespace ams {
-
-    ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::Spl;
-
-}
-
 using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {