10 files changed, 0 insertions, 772 deletions

diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
deleted file mode 100644
index 961305e9f..000000000
--- a/src/core/hle/service/am/am.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <array>
-#include <cinttypes>
-#include "common/common_types.h"
-#include "common/logging/log.h"
-#include "core/hle/ipc.h"
-#include "core/hle/result.h"
-#include "core/hle/service/am/am.h"
-#include "core/hle/service/am/am_app.h"
-#include "core/hle/service/am/am_net.h"
-#include "core/hle/service/am/am_sys.h"
-#include "core/hle/service/am/am_u.h"
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace AM {
-
-static std::array<u32, 3> am_content_count = {0, 0, 0};
-static std::array<u32, 3> am_titles_count = {0, 0, 0};
-static std::array<u32, 3> am_titles_list_count = {0, 0, 0};
-static u32 am_ticket_count = 0;
-static u32 am_ticket_list_count = 0;
-
-void GetNumPrograms(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 media_type = cmd_buff[1] & 0xFF;
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = am_titles_count[media_type];
-    LOG_WARNING(Service_AM, "(STUBBED) media_type=%u, title_count=0x%08x", media_type,
-                am_titles_count[media_type]);
-}
-
-void FindContentInfos(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 media_type = cmd_buff[1] & 0xFF;
-    u64 title_id = (static_cast<u64>(cmd_buff[3]) << 32) | cmd_buff[2];
-    u32 content_ids_pointer = cmd_buff[6];
-    u32 content_info_pointer = cmd_buff[8];
-
-    am_content_count[media_type] = cmd_buff[4];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    LOG_WARNING(Service_AM, "(STUBBED) media_type=%u, title_id=0x%016llx, content_cound=%u, "
-                            "content_ids_pointer=0x%08x, content_info_pointer=0x%08x",
-                media_type, title_id, am_content_count[media_type], content_ids_pointer,
-                content_info_pointer);
-}
-
-void ListContentInfos(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 media_type = cmd_buff[2] & 0xFF;
-    u64 title_id = (static_cast<u64>(cmd_buff[4]) << 32) | cmd_buff[3];
-    u32 start_index = cmd_buff[5];
-    u32 content_info_pointer = cmd_buff[7];
-
-    am_content_count[media_type] = cmd_buff[1];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = am_content_count[media_type];
-    LOG_WARNING(Service_AM, "(STUBBED) media_type=%u, content_count=%u, title_id=0x%016" PRIx64
-                            ", start_index=0x%08x, content_info_pointer=0x%08X",
-                media_type, am_content_count[media_type], title_id, start_index,
-                content_info_pointer);
-}
-
-void DeleteContents(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 media_type = cmd_buff[1] & 0xFF;
-    u64 title_id = (static_cast<u64>(cmd_buff[3]) << 32) | cmd_buff[2];
-    u32 content_ids_pointer = cmd_buff[6];
-
-    am_content_count[media_type] = cmd_buff[4];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    LOG_WARNING(Service_AM, "(STUBBED) media_type=%u, title_id=0x%016" PRIx64
-                            ", content_count=%u, content_ids_pointer=0x%08x",
-                media_type, title_id, am_content_count[media_type], content_ids_pointer);
-}
-
-void GetProgramList(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 media_type = cmd_buff[2] & 0xFF;
-    u32 title_ids_output_pointer = cmd_buff[4];
-
-    am_titles_list_count[media_type] = cmd_buff[1];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = am_titles_list_count[media_type];
-    LOG_WARNING(
-        Service_AM,
-        "(STUBBED) media_type=%u, titles_list_count=0x%08X, title_ids_output_pointer=0x%08X",
-        media_type, am_titles_list_count[media_type], title_ids_output_pointer);
-}
-
-void GetProgramInfos(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 media_type = cmd_buff[1] & 0xFF;
-    u32 title_id_list_pointer = cmd_buff[4];
-    u32 title_list_pointer = cmd_buff[6];
-
-    am_titles_count[media_type] = cmd_buff[2];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    LOG_WARNING(Service_AM, "(STUBBED) media_type=%u, total_titles=0x%08X, "
-                            "title_id_list_pointer=0x%08X, title_list_pointer=0x%08X",
-                media_type, am_titles_count[media_type], title_id_list_pointer, title_list_pointer);
-}
-
-void GetDataTitleInfos(Service::Interface* self) {
-    GetProgramInfos(self);
-
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-}
-
-void ListDataTitleTicketInfos(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u64 title_id = (static_cast<u64>(cmd_buff[3]) << 32) | cmd_buff[2];
-    u32 start_index = cmd_buff[4];
-    u32 ticket_info_pointer = cmd_buff[6];
-
-    am_ticket_count = cmd_buff[1];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = am_ticket_count;
-    LOG_WARNING(Service_AM, "(STUBBED) ticket_count=0x%08X, title_id=0x%016" PRIx64
-                            ", start_index=0x%08X, ticket_info_pointer=0x%08X",
-                am_ticket_count, title_id, start_index, ticket_info_pointer);
-}
-
-void GetNumContentInfos(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = 1; // Number of content infos plus one
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-}
-
-void DeleteTicket(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u64 title_id = (static_cast<u64>(cmd_buff[2]) << 32) | cmd_buff[1];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    LOG_WARNING(Service_AM, "(STUBBED) called title_id=0x%016" PRIx64 "", title_id);
-}
-
-void GetNumTickets(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = am_ticket_count;
-    LOG_WARNING(Service_AM, "(STUBBED) called ticket_count=0x%08x", am_ticket_count);
-}
-
-void GetTicketList(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 num_of_skip = cmd_buff[2];
-    u32 ticket_list_pointer = cmd_buff[4];
-
-    am_ticket_list_count = cmd_buff[1];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = am_ticket_list_count;
-    LOG_WARNING(
-        Service_AM,
-        "(STUBBED) ticket_list_count=0x%08x, num_of_skip=0x%08x, ticket_list_pointer=0x%08x",
-        am_ticket_list_count, num_of_skip, ticket_list_pointer);
-}
-
-void Init() {
-    AddService(new AM_APP_Interface);
-    AddService(new AM_NET_Interface);
-    AddService(new AM_SYS_Interface);
-    AddService(new AM_U_Interface);
-}
-
-void Shutdown() {}
-
-} // namespace AM
-
-} // namespace Service
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
deleted file mode 100644
index 9bc2ca305..000000000
--- a/src/core/hle/service/am/am.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-namespace Service {
-
-class Interface;
-
-namespace AM {
-
-/**
- * AM::GetNumPrograms service function
- * Gets the number of installed titles in the requested media type
- *  Inputs:
- *      0 : Command header (0x00010040)
- *      1 : Media type to load the titles from
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- *      2 : The number of titles in the requested media type
- */
-void GetNumPrograms(Service::Interface* self);
-
-/**
- * AM::FindContentInfos service function
- *  Inputs:
- *      1 : MediaType
- *    2-3 : u64, Title ID
- *      4 : Content count
- *      6 : Content IDs pointer
- *      8 : Content Infos pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- */
-void FindContentInfos(Service::Interface* self);
-
-/**
- * AM::ListContentInfos service function
- *  Inputs:
- *      1 : Content count
- *      2 : MediaType
- *    3-4 : u64, Title ID
- *      5 : Start Index
- *      7 : Content Infos pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- *      2 : Number of content infos returned
- */
-void ListContentInfos(Service::Interface* self);
-
-/**
- * AM::DeleteContents service function
- *  Inputs:
- *      1 : MediaType
- *    2-3 : u64, Title ID
- *      4 : Content count
- *      6 : Content IDs pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- */
-void DeleteContents(Service::Interface* self);
-
-/**
- * AM::GetProgramList service function
- * Loads information about the desired number of titles from the desired media type into an array
- *  Inputs:
- *      1 : Title count
- *      2 : Media type to load the titles from
- *      4 : Title IDs output pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- *      2 : The number of titles loaded from the requested media type
- */
-void GetProgramList(Service::Interface* self);
-
-/**
- * AM::GetProgramInfos service function
- *  Inputs:
- *      1 : u8 Mediatype
- *      2 : Total titles
- *      4 : TitleIDList pointer
- *      6 : TitleList pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- */
-void GetProgramInfos(Service::Interface* self);
-
-/**
- * AM::GetDataTitleInfos service function
- * Wrapper for AM::GetProgramInfos
- *  Inputs:
- *      1 : u8 Mediatype
- *      2 : Total titles
- *      4 : TitleIDList pointer
- *      6 : TitleList pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- */
-void GetDataTitleInfos(Service::Interface* self);
-
-/**
- * AM::ListDataTitleTicketInfos service function
- *  Inputs:
- *      1 : Ticket count
- *    2-3 : u64, Title ID
- *      4 : Start Index?
- *      5 : (TicketCount * 24) << 8 | 0x4
- *      6 : Ticket Infos pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- *      2 : Number of ticket infos returned
- */
-void ListDataTitleTicketInfos(Service::Interface* self);
-
-/**
- * AM::GetNumContentInfos service function
- *  Inputs:
- *      0 : Command header (0x100100C0)
- *      1 : MediaType
- *    2-3 : u64, Title ID
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- *      2 : Number of content infos plus one
- */
-void GetNumContentInfos(Service::Interface* self);
-
-/**
- * AM::DeleteTicket service function
- *  Inputs:
- *    1-2 : u64, Title ID
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- */
-void DeleteTicket(Service::Interface* self);
-
-/**
- * AM::GetNumTickets service function
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- *      2 : Number of tickets
- */
-void GetNumTickets(Service::Interface* self);
-
-/**
- * AM::GetTicketList service function
- *  Inputs:
- *      1 : Number of TicketList
- *      2 : Number to skip
- *      4 : TicketList pointer
- *  Outputs:
- *      1 : Result, 0 on success, otherwise error code
- *      2 : Total TicketList
- */
-void GetTicketList(Service::Interface* self);
-
-/// Initialize AM service
-void Init();
-
-/// Shutdown AM service
-void Shutdown();
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_app.cpp b/src/core/hle/service/am/am_app.cpp
deleted file mode 100644
index 218375c8f..000000000
--- a/src/core/hle/service/am/am_app.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/am/am.h"
-#include "core/hle/service/am/am_app.h"
-
-namespace Service {
-namespace AM {
-
-const Interface::FunctionInfo FunctionTable[] = {
-    {0x100100C0, GetNumContentInfos, "GetNumContentInfos"},
-    {0x10020104, FindContentInfos, "FindContentInfos"},
-    {0x10030142, ListContentInfos, "ListContentInfos"},
-    {0x10040102, DeleteContents, "DeleteContents"},
-    {0x10050084, GetDataTitleInfos, "GetDataTitleInfos"},
-    {0x10060080, nullptr, "GetNumDataTitleTickets"},
-    {0x10070102, ListDataTitleTicketInfos, "ListDataTitleTicketInfos"},
-    {0x100801C2, nullptr, "GetItemRights"},
-    {0x100900C0, nullptr, "IsDataTitleInUse"},
-    {0x100A0000, nullptr, "IsExternalTitleDatabaseInitialized"},
-    {0x100B00C0, nullptr, "GetNumExistingContentInfos"},
-    {0x100C0142, nullptr, "ListExistingContentInfos"},
-    {0x100D0084, nullptr, "GetPatchTitleInfos"},
-};
-
-AM_APP_Interface::AM_APP_Interface() {
-    Register(FunctionTable);
-}
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_app.h b/src/core/hle/service/am/am_app.h
deleted file mode 100644
index fd6017d14..000000000
--- a/src/core/hle/service/am/am_app.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included..
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace AM {
-
-class AM_APP_Interface : public Service::Interface {
-public:
-    AM_APP_Interface();
-
-    std::string GetPortName() const override {
-        return "am:app";
-    }
-};
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_net.cpp b/src/core/hle/service/am/am_net.cpp
deleted file mode 100644
index f3cd1d23f..000000000
--- a/src/core/hle/service/am/am_net.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/am/am.h"
-#include "core/hle/service/am/am_net.h"
-
-namespace Service {
-namespace AM {
-
-const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010040, GetNumPrograms, "GetNumPrograms"},
-    {0x00020082, GetProgramList, "GetProgramList"},
-    {0x00030084, GetProgramInfos, "GetProgramInfos"},
-    {0x000400C0, nullptr, "DeleteUserProgram"},
-    {0x000500C0, nullptr, "GetProductCode"},
-    {0x000600C0, nullptr, "GetStorageId"},
-    {0x00070080, DeleteTicket, "DeleteTicket"},
-    {0x00080000, GetNumTickets, "GetNumTickets"},
-    {0x00090082, GetTicketList, "GetTicketList"},
-    {0x000A0000, nullptr, "GetDeviceID"},
-    {0x000B0040, nullptr, "GetNumImportTitleContexts"},
-    {0x000C0082, nullptr, "GetImportTitleContextList"},
-    {0x000D0084, nullptr, "GetImportTitleContexts"},
-    {0x000E00C0, nullptr, "DeleteImportTitleContext"},
-    {0x000F00C0, nullptr, "GetNumImportContentContexts"},
-    {0x00100102, nullptr, "GetImportContentContextList"},
-    {0x00110104, nullptr, "GetImportContentContexts"},
-    {0x00120102, nullptr, "DeleteImportContentContexts"},
-    {0x00130040, nullptr, "NeedsCleanup"},
-    {0x00140040, nullptr, "DoCleanup"},
-    {0x00150040, nullptr, "DeleteAllImportContexts"},
-    {0x00160000, nullptr, "DeleteAllTemporaryPrograms"},
-    {0x00170044, nullptr, "ImportTwlBackupLegacy"},
-    {0x00180080, nullptr, "InitializeTitleDatabase"},
-    {0x00190040, nullptr, "QueryAvailableTitleDatabase"},
-    {0x001A00C0, nullptr, "CalcTwlBackupSize"},
-    {0x001B0144, nullptr, "ExportTwlBackup"},
-    {0x001C0084, nullptr, "ImportTwlBackup"},
-    {0x001D0000, nullptr, "DeleteAllTwlUserPrograms"},
-    {0x001E00C8, nullptr, "ReadTwlBackupInfo"},
-    {0x001F0040, nullptr, "DeleteAllExpiredUserPrograms"},
-    {0x00200000, nullptr, "GetTwlArchiveResourceInfo"},
-    {0x00210042, nullptr, "GetPersonalizedTicketInfoList"},
-    {0x00220080, nullptr, "DeleteAllImportContextsFiltered"},
-    {0x00230080, nullptr, "GetNumImportTitleContextsFiltered"},
-    {0x002400C2, nullptr, "GetImportTitleContextListFiltered"},
-    {0x002500C0, nullptr, "CheckContentRights"},
-    {0x00260044, nullptr, "GetTicketLimitInfos"},
-    {0x00270044, nullptr, "GetDemoLaunchInfos"},
-    {0x00280108, nullptr, "ReadTwlBackupInfoEx"},
-    {0x00290082, nullptr, "DeleteUserProgramsAtomically"},
-    {0x002A00C0, nullptr, "GetNumExistingContentInfosSystem"},
-    {0x002B0142, nullptr, "ListExistingContentInfosSystem"},
-    {0x002C0084, nullptr, "GetProgramInfosIgnorePlatform"},
-    {0x002D00C0, nullptr, "CheckContentRightsIgnorePlatform"},
-    {0x04010080, nullptr, "UpdateFirmwareTo"},
-    {0x04020040, nullptr, "BeginImportProgram"},
-    {0x04030000, nullptr, "BeginImportProgramTemporarily"},
-    {0x04040002, nullptr, "CancelImportProgram"},
-    {0x04050002, nullptr, "EndImportProgram"},
-    {0x04060002, nullptr, "EndImportProgramWithoutCommit"},
-    {0x040700C2, nullptr, "CommitImportPrograms"},
-    {0x04080042, nullptr, "GetProgramInfoFromCia"},
-    {0x04090004, nullptr, "GetSystemMenuDataFromCia"},
-    {0x040A0002, nullptr, "GetDependencyListFromCia"},
-    {0x040B0002, nullptr, "GetTransferSizeFromCia"},
-    {0x040C0002, nullptr, "GetCoreVersionFromCia"},
-    {0x040D0042, nullptr, "GetRequiredSizeFromCia"},
-    {0x040E00C2, nullptr, "CommitImportProgramsAndUpdateFirmwareAuto"},
-    {0x040F0000, nullptr, "UpdateFirmwareAuto"},
-    {0x041000C0, nullptr, "DeleteProgram"},
-    {0x04110044, nullptr, "GetTwlProgramListForReboot"},
-    {0x04120000, nullptr, "GetSystemUpdaterMutex"},
-    {0x04130002, nullptr, "GetMetaSizeFromCia"},
-    {0x04140044, nullptr, "GetMetaDataFromCia"},
-    {0x04150080, nullptr, "CheckDemoLaunchRights"},
-    {0x041600C0, nullptr, "GetInternalTitleLocationInfo"},
-    {0x041700C0, nullptr, "PerpetuateAgbSaveData"},
-    {0x04180040, nullptr, "BeginImportProgramForOverWrite"},
-    {0x04190000, nullptr, "BeginImportSystemProgram"},
-    {0x08010000, nullptr, "BeginImportTicket"},
-    {0x08020002, nullptr, "CancelImportTicket"},
-    {0x08030002, nullptr, "EndImportTicket"},
-    {0x08040100, nullptr, "BeginImportTitle"},
-    {0x08050000, nullptr, "StopImportTitle"},
-    {0x080600C0, nullptr, "ResumeImportTitle"},
-    {0x08070000, nullptr, "CancelImportTitle"},
-    {0x08080000, nullptr, "EndImportTitle"},
-    {0x080900C2, nullptr, "CommitImportTitles"},
-    {0x080A0000, nullptr, "BeginImportTmd"},
-    {0x080B0002, nullptr, "CancelImportTmd"},
-    {0x080C0042, nullptr, "EndImportTmd"},
-    {0x080D0042, nullptr, "CreateImportContentContexts"},
-    {0x080E0040, nullptr, "BeginImportContent"},
-    {0x080F0002, nullptr, "StopImportContent"},
-    {0x08100040, nullptr, "ResumeImportContent"},
-    {0x08110002, nullptr, "CancelImportContent"},
-    {0x08120002, nullptr, "EndImportContent"},
-    {0x08130000, nullptr, "GetNumCurrentImportContentContexts"},
-    {0x08140042, nullptr, "GetCurrentImportContentContextList"},
-    {0x08150044, nullptr, "GetCurrentImportContentContexts"},
-    {0x08160146, nullptr, "Sign"},
-    {0x08170146, nullptr, "Verify"},
-    {0x08180042, nullptr, "GetDeviceCert"},
-    {0x08190108, nullptr, "ImportCertificates"},
-    {0x081A0042, nullptr, "ImportCertificate"},
-    {0x081B00C2, nullptr, "CommitImportTitlesAndUpdateFirmwareAuto"},
-    {0x081C0100, nullptr, "DeleteTicketId"},
-    {0x081D0080, nullptr, "GetNumTicketIds"},
-    {0x081E0102, nullptr, "GetTicketIdList"},
-    {0x081F0080, nullptr, "GetNumTicketsOfProgram"},
-    {0x08200102, nullptr, "ListTicketInfos"},
-    {0x08210142, nullptr, "GetRightsOnlyTicketData"},
-    {0x08220000, nullptr, "GetNumCurrentContentInfos"},
-    {0x08230044, nullptr, "FindCurrentContentInfos"},
-    {0x08240082, nullptr, "ListCurrentContentInfos"},
-    {0x08250102, nullptr, "CalculateContextRequiredSize"},
-    {0x08260042, nullptr, "UpdateImportContentContexts"},
-    {0x08270000, nullptr, "DeleteAllDemoLaunchInfos"},
-    {0x082800C0, nullptr, "BeginImportTitleForOverWrite"},
-};
-
-AM_NET_Interface::AM_NET_Interface() {
-    Register(FunctionTable);
-}
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_net.h b/src/core/hle/service/am/am_net.h
deleted file mode 100644
index 25d2c3f23..000000000
--- a/src/core/hle/service/am/am_net.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included..
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace AM {
-
-class AM_NET_Interface : public Service::Interface {
-public:
-    AM_NET_Interface();
-
-    std::string GetPortName() const override {
-        return "am:net";
-    }
-};
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_sys.cpp b/src/core/hle/service/am/am_sys.cpp
deleted file mode 100644
index 949b3591d..000000000
--- a/src/core/hle/service/am/am_sys.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/am/am.h"
-#include "core/hle/service/am/am_sys.h"
-
-namespace Service {
-namespace AM {
-
-const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010040, GetNumPrograms, "GetNumPrograms"},
-    {0x00020082, GetProgramList, "GetProgramList"},
-    {0x00030084, GetProgramInfos, "GetProgramInfos"},
-    {0x000400C0, nullptr, "DeleteUserProgram"},
-    {0x000500C0, nullptr, "GetProductCode"},
-    {0x000600C0, nullptr, "GetStorageId"},
-    {0x00070080, DeleteTicket, "DeleteTicket"},
-    {0x00080000, GetNumTickets, "GetNumTickets"},
-    {0x00090082, GetTicketList, "GetTicketList"},
-    {0x000A0000, nullptr, "GetDeviceID"},
-    {0x000B0040, nullptr, "GetNumImportTitleContexts"},
-    {0x000C0082, nullptr, "GetImportTitleContextList"},
-    {0x000D0084, nullptr, "GetImportTitleContexts"},
-    {0x000E00C0, nullptr, "DeleteImportTitleContext"},
-    {0x000F00C0, nullptr, "GetNumImportContentContexts"},
-    {0x00100102, nullptr, "GetImportContentContextList"},
-    {0x00110104, nullptr, "GetImportContentContexts"},
-    {0x00120102, nullptr, "DeleteImportContentContexts"},
-    {0x00130040, nullptr, "NeedsCleanup"},
-    {0x00140040, nullptr, "DoCleanup"},
-    {0x00150040, nullptr, "DeleteAllImportContexts"},
-    {0x00160000, nullptr, "DeleteAllTemporaryPrograms"},
-    {0x00170044, nullptr, "ImportTwlBackupLegacy"},
-    {0x00180080, nullptr, "InitializeTitleDatabase"},
-    {0x00190040, nullptr, "QueryAvailableTitleDatabase"},
-    {0x001A00C0, nullptr, "CalcTwlBackupSize"},
-    {0x001B0144, nullptr, "ExportTwlBackup"},
-    {0x001C0084, nullptr, "ImportTwlBackup"},
-    {0x001D0000, nullptr, "DeleteAllTwlUserPrograms"},
-    {0x001E00C8, nullptr, "ReadTwlBackupInfo"},
-    {0x001F0040, nullptr, "DeleteAllExpiredUserPrograms"},
-    {0x00200000, nullptr, "GetTwlArchiveResourceInfo"},
-    {0x00210042, nullptr, "GetPersonalizedTicketInfoList"},
-    {0x00220080, nullptr, "DeleteAllImportContextsFiltered"},
-    {0x00230080, nullptr, "GetNumImportTitleContextsFiltered"},
-    {0x002400C2, nullptr, "GetImportTitleContextListFiltered"},
-    {0x002500C0, nullptr, "CheckContentRights"},
-    {0x00260044, nullptr, "GetTicketLimitInfos"},
-    {0x00270044, nullptr, "GetDemoLaunchInfos"},
-    {0x00280108, nullptr, "ReadTwlBackupInfoEx"},
-    {0x00290082, nullptr, "DeleteUserProgramsAtomically"},
-    {0x002A00C0, nullptr, "GetNumExistingContentInfosSystem"},
-    {0x002B0142, nullptr, "ListExistingContentInfosSystem"},
-    {0x002C0084, nullptr, "GetProgramInfosIgnorePlatform"},
-    {0x002D00C0, nullptr, "CheckContentRightsIgnorePlatform"},
-    {0x100100C0, GetNumContentInfos, "GetNumContentInfos"},
-    {0x10020104, FindContentInfos, "FindContentInfos"},
-    {0x10030142, ListContentInfos, "ListContentInfos"},
-    {0x10040102, DeleteContents, "DeleteContents"},
-    {0x10050084, GetDataTitleInfos, "GetDataTitleInfos"},
-    {0x10060080, nullptr, "GetNumDataTitleTickets"},
-    {0x10070102, ListDataTitleTicketInfos, "ListDataTitleTicketInfos"},
-    {0x100801C2, nullptr, "GetItemRights"},
-    {0x100900C0, nullptr, "IsDataTitleInUse"},
-    {0x100A0000, nullptr, "IsExternalTitleDatabaseInitialized"},
-    {0x100B00C0, nullptr, "GetNumExistingContentInfos"},
-    {0x100C0142, nullptr, "ListExistingContentInfos"},
-    {0x100D0084, nullptr, "GetPatchTitleInfos"},
-};
-
-AM_SYS_Interface::AM_SYS_Interface() {
-    Register(FunctionTable);
-}
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_sys.h b/src/core/hle/service/am/am_sys.h
deleted file mode 100644
index b114f1d35..000000000
--- a/src/core/hle/service/am/am_sys.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included..
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace AM {
-
-class AM_SYS_Interface : public Service::Interface {
-public:
-    AM_SYS_Interface();
-
-    std::string GetPortName() const override {
-        return "am:sys";
-    }
-};
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_u.cpp b/src/core/hle/service/am/am_u.cpp
deleted file mode 100644
index 354d51610..000000000
--- a/src/core/hle/service/am/am_u.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/am/am.h"
-#include "core/hle/service/am/am_u.h"
-
-namespace Service {
-namespace AM {
-
-const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010040, GetNumPrograms, "GetNumPrograms"},
-    {0x00020082, GetProgramList, "GetProgramList"},
-    {0x00030084, GetProgramInfos, "GetProgramInfos"},
-    {0x000400C0, nullptr, "DeleteUserProgram"},
-    {0x000500C0, nullptr, "GetProductCode"},
-    {0x000600C0, nullptr, "GetStorageId"},
-    {0x00070080, DeleteTicket, "DeleteTicket"},
-    {0x00080000, GetNumTickets, "GetNumTickets"},
-    {0x00090082, GetTicketList, "GetTicketList"},
-    {0x000A0000, nullptr, "GetDeviceID"},
-    {0x000B0040, nullptr, "GetNumImportTitleContexts"},
-    {0x000C0082, nullptr, "GetImportTitleContextList"},
-    {0x000D0084, nullptr, "GetImportTitleContexts"},
-    {0x000E00C0, nullptr, "DeleteImportTitleContext"},
-    {0x000F00C0, nullptr, "GetNumImportContentContexts"},
-    {0x00100102, nullptr, "GetImportContentContextList"},
-    {0x00110104, nullptr, "GetImportContentContexts"},
-    {0x00120102, nullptr, "DeleteImportContentContexts"},
-    {0x00130040, nullptr, "NeedsCleanup"},
-    {0x00140040, nullptr, "DoCleanup"},
-    {0x00150040, nullptr, "DeleteAllImportContexts"},
-    {0x00160000, nullptr, "DeleteAllTemporaryPrograms"},
-    {0x00170044, nullptr, "ImportTwlBackupLegacy"},
-    {0x00180080, nullptr, "InitializeTitleDatabase"},
-    {0x00190040, nullptr, "QueryAvailableTitleDatabase"},
-    {0x001A00C0, nullptr, "CalcTwlBackupSize"},
-    {0x001B0144, nullptr, "ExportTwlBackup"},
-    {0x001C0084, nullptr, "ImportTwlBackup"},
-    {0x001D0000, nullptr, "DeleteAllTwlUserPrograms"},
-    {0x001E00C8, nullptr, "ReadTwlBackupInfo"},
-    {0x001F0040, nullptr, "DeleteAllExpiredUserPrograms"},
-    {0x00200000, nullptr, "GetTwlArchiveResourceInfo"},
-    {0x00210042, nullptr, "GetPersonalizedTicketInfoList"},
-    {0x00220080, nullptr, "DeleteAllImportContextsFiltered"},
-    {0x00230080, nullptr, "GetNumImportTitleContextsFiltered"},
-    {0x002400C2, nullptr, "GetImportTitleContextListFiltered"},
-    {0x002500C0, nullptr, "CheckContentRights"},
-    {0x00260044, nullptr, "GetTicketLimitInfos"},
-    {0x00270044, nullptr, "GetDemoLaunchInfos"},
-    {0x00280108, nullptr, "ReadTwlBackupInfoEx"},
-    {0x00290082, nullptr, "DeleteUserProgramsAtomically"},
-    {0x002A00C0, nullptr, "GetNumExistingContentInfosSystem"},
-    {0x002B0142, nullptr, "ListExistingContentInfosSystem"},
-    {0x002C0084, nullptr, "GetProgramInfosIgnorePlatform"},
-    {0x002D00C0, nullptr, "CheckContentRightsIgnorePlatform"},
-    {0x04010080, nullptr, "UpdateFirmwareTo"},
-    {0x04020040, nullptr, "BeginImportProgram"},
-    {0x04030000, nullptr, "BeginImportProgramTemporarily"},
-    {0x04040002, nullptr, "CancelImportProgram"},
-    {0x04050002, nullptr, "EndImportProgram"},
-    {0x04060002, nullptr, "EndImportProgramWithoutCommit"},
-    {0x040700C2, nullptr, "CommitImportPrograms"},
-    {0x04080042, nullptr, "GetProgramInfoFromCia"},
-    {0x04090004, nullptr, "GetSystemMenuDataFromCia"},
-    {0x040A0002, nullptr, "GetDependencyListFromCia"},
-    {0x040B0002, nullptr, "GetTransferSizeFromCia"},
-    {0x040C0002, nullptr, "GetCoreVersionFromCia"},
-    {0x040D0042, nullptr, "GetRequiredSizeFromCia"},
-    {0x040E00C2, nullptr, "CommitImportProgramsAndUpdateFirmwareAuto"},
-    {0x040F0000, nullptr, "UpdateFirmwareAuto"},
-    {0x041000C0, nullptr, "DeleteProgram"},
-    {0x04110044, nullptr, "GetTwlProgramListForReboot"},
-    {0x04120000, nullptr, "GetSystemUpdaterMutex"},
-    {0x04130002, nullptr, "GetMetaSizeFromCia"},
-    {0x04140044, nullptr, "GetMetaDataFromCia"},
-    {0x04150080, nullptr, "CheckDemoLaunchRights"},
-    {0x041600C0, nullptr, "GetInternalTitleLocationInfo"},
-    {0x041700C0, nullptr, "PerpetuateAgbSaveData"},
-    {0x04180040, nullptr, "BeginImportProgramForOverWrite"},
-    {0x04190000, nullptr, "BeginImportSystemProgram"},
-};
-
-AM_U_Interface::AM_U_Interface() {
-    Register(FunctionTable);
-}
-
-} // namespace AM
-} // namespace Service
diff --git a/src/core/hle/service/am/am_u.h b/src/core/hle/service/am/am_u.h
deleted file mode 100644
index 3b2454b6c..000000000
--- a/src/core/hle/service/am/am_u.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included..
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace AM {
-
-class AM_U_Interface : public Service::Interface {
-public:
-    AM_U_Interface();
-
-    std::string GetPortName() const override {
-        return "am:u";
-    }
-};
-
-} // namespace AM
-} // namespace Service