diff --git a/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp b/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
index 1c3bca1a3..bf7210586 100644
--- a/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
@@ -144,6 +144,11 @@ namespace ams::impl {
AMS_DEFINE_SYSTEM_THREAD(10, tma, BridgePcieDriver);
+ /* DevServer/TioServer. */
+ AMS_DEFINE_SYSTEM_THREAD(21, TioServer, Main);
+ AMS_DEFINE_SYSTEM_THREAD(21, TioServer, FileServerHtcsServer);
+ AMS_DEFINE_SYSTEM_THREAD(21, TioServer, SdCardObserver);
+
#undef AMS_DEFINE_SYSTEM_THREAD
diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
index 894c556fe..f8028b078 100644
--- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
@@ -101,6 +101,7 @@ namespace ams::ncm {
static const SystemProgramId Manu;
static const SystemProgramId Htc;
+ static const SystemProgramId DevServer;
};
struct AtmosphereProgramId {
@@ -202,6 +203,7 @@ namespace ams::ncm {
inline constexpr const SystemProgramId SystemProgramId::Manu = { 0x010000000000B14Aul };
inline constexpr const SystemProgramId SystemProgramId::Htc = { 0x010000000000B240ul };
+ inline constexpr const SystemProgramId SystemProgramId::DevServer = { 0x010000000000D623ul };
inline constexpr bool IsSystemProgramId(const ProgramId &program_id) {
return (SystemProgramId::Start <= program_id && program_id <= SystemProgramId::End) || IsAtmosphereProgramId(program_id);
diff --git a/stratosphere/TioServer/Makefile b/stratosphere/TioServer/Makefile
new file mode 100644
index 000000000..aab86a63a
--- /dev/null
+++ b/stratosphere/TioServer/Makefile
@@ -0,0 +1,113 @@
+#---------------------------------------------------------------------------------
+# pull in common stratosphere sysmodule configuration
+#---------------------------------------------------------------------------------
+include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../../libraries/config/templates/stratosphere.mk
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT := $(CURDIR)/$(TARGET)
+export TOPDIR := $(CURDIR)
+
+export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+ $(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR := $(CURDIR)/$(BUILD)
+
+CFILES := $(call FIND_SOURCE_FILES,$(SOURCES),c)
+CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp)
+SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s)
+
+BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+ export LD := $(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+ export LD := $(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES := $(addsuffix .o,$(BINFILES)) \
+ $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+
+export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+ -I$(CURDIR)/$(BUILD)
+
+export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
+
+ifeq ($(strip $(CONFIG_JSON)),)
+ jsons := $(wildcard *.json)
+ ifneq (,$(findstring $(TARGET).json,$(jsons)))
+ export APP_JSON := $(TOPDIR)/$(TARGET).json
+ else
+ ifneq (,$(findstring config.json,$(jsons)))
+ export APP_JSON := $(TOPDIR)/config.json
+ endif
+ endif
+else
+ export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
+endif
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+$(BUILD):
+ @[ -d $@ ] || mkdir -p $@
+ @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
+clean:
+ @echo clean ...
+ @rm -fr $(BUILD) $(TARGET).nsp $(TARGET).npdm $(TARGET).nso $(TARGET).elf
+
+
+#---------------------------------------------------------------------------------
+else
+.PHONY: all
+
+DEPENDS := $(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all : $(OUTPUT).nsp
+
+ifeq ($(strip $(APP_JSON)),)
+$(OUTPUT).nsp : $(OUTPUT).nso
+else
+$(OUTPUT).nsp : $(OUTPUT).nso $(OUTPUT).npdm
+endif
+
+$(OUTPUT).nso : $(OUTPUT).elf
+
+$(OUTPUT).elf : $(OFILES)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o : %.bin
+#---------------------------------------------------------------------------------
+ @echo $(notdir $<)
+ @$(bin2o)
+
+-include $(DEPENDS)
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/stratosphere/TioServer/TioServer.json b/stratosphere/TioServer/TioServer.json
new file mode 100644
index 000000000..05dea993b
--- /dev/null
+++ b/stratosphere/TioServer/TioServer.json
@@ -0,0 +1,83 @@
+{
+ "name": "TioServer",
+ "title_id": "0x010000000000D623",
+ "title_id_range_min": "0x010000000000D623",
+ "title_id_range_max": "0x010000000000D623",
+ "main_thread_stack_size": "0x00004000",
+ "main_thread_priority": 49,
+ "default_cpu_id": 3,
+ "process_category": 0,
+ "is_retail": true,
+ "pool_partition": 2,
+ "is_64_bit": true,
+ "address_space_type": 3,
+ "disable_device_address_space_merge": true,
+ "filesystem_access": {
+ "permissions": "0xFFFFFFFFFFFFFFFF"
+ },
+ "service_access": ["fatal:u", "fsp-srv", "htcs"],
+ "service_host": [],
+ "kernel_capabilities": [{
+ "type": "kernel_flags",
+ "value": {
+ "highest_thread_priority": 63,
+ "lowest_thread_priority": 24,
+ "lowest_cpu_id": 3,
+ "highest_cpu_id": 3
+ }
+ }, {
+ "type": "syscalls",
+ "value": {
+ "svcSetHeapSize": "0x01",
+ "svcSetMemoryPermission": "0x02",
+ "svcSetMemoryAttribute": "0x03",
+ "svcMapMemory": "0x04",
+ "svcUnmapMemory": "0x05",
+ "svcQueryMemory": "0x06",
+ "svcExitProcess": "0x07",
+ "svcCreateThread": "0x08",
+ "svcStartThread": "0x09",
+ "svcExitThread": "0x0a",
+ "svcSleepThread": "0x0b",
+ "svcGetThreadPriority": "0x0c",
+ "svcSetThreadPriority": "0x0d",
+ "svcGetThreadCoreMask": "0x0e",
+ "svcSetThreadCoreMask": "0x0f",
+ "svcGetCurrentProcessorNumber": "0x10",
+ "svcSignalEvent": "0x11",
+ "svcClearEvent": "0x12",
+ "svcMapSharedMemory": "0x13",
+ "svcUnmapSharedMemory": "0x14",
+ "svcCreateTransferMemory": "0x15",
+ "svcCloseHandle": "0x16",
+ "svcResetSignal": "0x17",
+ "svcWaitSynchronization": "0x18",
+ "svcCancelSynchronization": "0x19",
+ "svcArbitrateLock": "0x1a",
+ "svcArbitrateUnlock": "0x1b",
+ "svcWaitProcessWideKeyAtomic": "0x1c",
+ "svcSignalProcessWideKey": "0x1d",
+ "svcGetSystemTick": "0x1e",
+ "svcConnectToNamedPort": "0x1f",
+ "svcSendSyncRequestLight": "0x20",
+ "svcSendSyncRequest": "0x21",
+ "svcSendSyncRequestWithUserBuffer": "0x22",
+ "svcSendAsyncRequestWithUserBuffer": "0x23",
+ "svcGetProcessId": "0x24",
+ "svcGetThreadId": "0x25",
+ "svcBreak": "0x26",
+ "svcOutputDebugString": "0x27",
+ "svcReturnFromException": "0x28",
+ "svcGetInfo": "0x29",
+ "svcWaitForAddress": "0x34",
+ "svcSignalToAddress": "0x35",
+ "svcCallSecureMonitor": "0x7f"
+ }
+ }, {
+ "type": "min_kernel_version",
+ "value": "0x0030"
+ }, {
+ "type": "handle_table_size",
+ "value": 0
+ }]
+}
\ No newline at end of file
diff --git a/stratosphere/TioServer/source/tio_main.cpp b/stratosphere/TioServer/source/tio_main.cpp
new file mode 100644
index 000000000..bd2844517
--- /dev/null
+++ b/stratosphere/TioServer/source/tio_main.cpp
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include
+
+extern "C" {
+ extern u32 __start__;
+
+ u32 __nx_applet_type = AppletType_None;
+ u32 __nx_fs_num_sessions = 1;
+
+ #define INNER_HEAP_SIZE 0x0
+ size_t nx_inner_heap_size = INNER_HEAP_SIZE;
+ char nx_inner_heap[INNER_HEAP_SIZE];
+
+ void __libnx_initheap(void);
+ void __appInit(void);
+ void __appExit(void);
+
+ void *__libnx_alloc(size_t size);
+ void *__libnx_aligned_alloc(size_t alignment, size_t size);
+ void __libnx_free(void *mem);
+}
+
+namespace ams {
+
+ ncm::ProgramId CurrentProgramId = ncm::SystemProgramId::DevServer;
+
+}
+
+using namespace ams;
+
+#define AMS_TIO_SERVER_USE_FATAL_ERROR 1
+
+#if AMS_TIO_SERVER_USE_FATAL_ERROR
+
+extern "C" {
+
+ /* Exception handling. */
+ alignas(16) u8 __nx_exception_stack[ams::os::MemoryPageSize];
+ u64 __nx_exception_stack_size = sizeof(__nx_exception_stack);
+ void __libnx_exception_handler(ThreadExceptionDump *ctx);
+
+}
+
+void __libnx_exception_handler(ThreadExceptionDump *ctx) {
+ ams::CrashHandler(ctx);
+}
+
+#endif
+
+void __appInit(void) {
+ hos::InitializeForStratosphere();
+
+ /* TODO */
+}
+
+void __appExit(void) {
+ /* TODO */
+}
+
+namespace ams {
+
+ void *Malloc(size_t size) {
+ AMS_ABORT("ams::Malloc was called");
+ }
+
+ void Free(void *ptr) {
+ AMS_ABORT("ams::Free was called");
+ }
+
+}
+
+void *operator new(size_t size) {
+ AMS_ABORT("operator new(size_t) was called");
+}
+
+void operator delete(void *p) {
+ AMS_ABORT("operator delete(void *) was called");
+}
+
+void *__libnx_alloc(size_t size) {
+ AMS_ABORT("__libnx_alloc was called");
+}
+
+void *__libnx_aligned_alloc(size_t alignment, size_t size) {
+ AMS_ABORT("__libnx_aligned_alloc was called");
+}
+
+void __libnx_free(void *mem) {
+ AMS_ABORT("__libnx_free was called");
+}
+
+int main(int argc, char **argv)
+{
+ /* Set thread name. */
+ os::SetThreadNamePointer(os::GetCurrentThread(), AMS_GET_SYSTEM_THREAD_NAME(TioServer, Main));
+ AMS_ASSERT(os::GetThreadPriority(os::GetCurrentThread()) == AMS_GET_SYSTEM_THREAD_PRIORITY(TioServer, Main));
+
+ return 0;
+}