summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Mat M2016-12-07 22:22:38 -0500
committerGravatar GitHub2016-12-07 22:22:38 -0500
commit2d387d95a8f42a386ab9279e68d0d6edd1ba1aec (patch)
tree87facd23b493f735cec3d4f52709cccb7e963155 /src
parentMerge pull request #2232 from wwylele/other-save (diff)
parentUpdate AM service function tables (diff)
downloadyuzu-2d387d95a8f42a386ab9279e68d0d6edd1ba1aec.tar.gz
yuzu-2d387d95a8f42a386ab9279e68d0d6edd1ba1aec.tar.xz
yuzu-2d387d95a8f42a386ab9279e68d0d6edd1ba1aec.zip
Merge pull request #2282 from lioncash/svc
Update AM service function tables
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/am/am.cpp10
-rw-r--r--src/core/hle/service/am/am.h20
-rw-r--r--src/core/hle/service/am/am_app.cpp5
-rw-r--r--src/core/hle/service/am/am_net.cpp157
-rw-r--r--src/core/hle/service/am/am_sys.cpp71
-rw-r--r--src/core/hle/service/am/am_u.cpp96
6 files changed, 246 insertions, 113 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index f7a990d69..d344a622f 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -20,7 +20,7 @@ static std::array<u32, 3> am_titles_list_count = {0, 0, 0};
20static u32 am_ticket_count = 0; 20static u32 am_ticket_count = 0;
21static u32 am_ticket_list_count = 0; 21static u32 am_ticket_list_count = 0;
22 22
23void GetTitleCount(Service::Interface* self) { 23void GetNumPrograms(Service::Interface* self) {
24 u32* cmd_buff = Kernel::GetCommandBuffer(); 24 u32* cmd_buff = Kernel::GetCommandBuffer();
25 25
26 u32 media_type = cmd_buff[1] & 0xFF; 26 u32 media_type = cmd_buff[1] & 0xFF;
@@ -81,7 +81,7 @@ void DeleteContents(Service::Interface* self) {
81 media_type, title_id, am_content_count[media_type], content_ids_pointer); 81 media_type, title_id, am_content_count[media_type], content_ids_pointer);
82} 82}
83 83
84void GetTitleList(Service::Interface* self) { 84void GetProgramList(Service::Interface* self) {
85 u32* cmd_buff = Kernel::GetCommandBuffer(); 85 u32* cmd_buff = Kernel::GetCommandBuffer();
86 86
87 u32 media_type = cmd_buff[2] & 0xFF; 87 u32 media_type = cmd_buff[2] & 0xFF;
@@ -97,7 +97,7 @@ void GetTitleList(Service::Interface* self) {
97 media_type, am_titles_list_count[media_type], title_ids_output_pointer); 97 media_type, am_titles_list_count[media_type], title_ids_output_pointer);
98} 98}
99 99
100void GetTitleInfo(Service::Interface* self) { 100void GetProgramInfos(Service::Interface* self) {
101 u32* cmd_buff = Kernel::GetCommandBuffer(); 101 u32* cmd_buff = Kernel::GetCommandBuffer();
102 102
103 u32 media_type = cmd_buff[1] & 0xFF; 103 u32 media_type = cmd_buff[1] & 0xFF;
@@ -113,7 +113,7 @@ void GetTitleInfo(Service::Interface* self) {
113} 113}
114 114
115void GetDataTitleInfos(Service::Interface* self) { 115void GetDataTitleInfos(Service::Interface* self) {
116 GetTitleInfo(self); 116 GetProgramInfos(self);
117 117
118 LOG_WARNING(Service_AM, "(STUBBED) called"); 118 LOG_WARNING(Service_AM, "(STUBBED) called");
119} 119}
@@ -151,7 +151,7 @@ void DeleteTicket(Service::Interface* self) {
151 LOG_WARNING(Service_AM, "(STUBBED) called title_id=0x%016" PRIx64 "", title_id); 151 LOG_WARNING(Service_AM, "(STUBBED) called title_id=0x%016" PRIx64 "", title_id);
152} 152}
153 153
154void GetTicketCount(Service::Interface* self) { 154void GetNumTickets(Service::Interface* self) {
155 u32* cmd_buff = Kernel::GetCommandBuffer(); 155 u32* cmd_buff = Kernel::GetCommandBuffer();
156 156
157 cmd_buff[1] = RESULT_SUCCESS.raw; 157 cmd_buff[1] = RESULT_SUCCESS.raw;
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index 5676cdd5f..9bc2ca305 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -11,7 +11,7 @@ class Interface;
11namespace AM { 11namespace AM {
12 12
13/** 13/**
14 * AM::GetTitleCount service function 14 * AM::GetNumPrograms service function
15 * Gets the number of installed titles in the requested media type 15 * Gets the number of installed titles in the requested media type
16 * Inputs: 16 * Inputs:
17 * 0 : Command header (0x00010040) 17 * 0 : Command header (0x00010040)
@@ -20,7 +20,7 @@ namespace AM {
20 * 1 : Result, 0 on success, otherwise error code 20 * 1 : Result, 0 on success, otherwise error code
21 * 2 : The number of titles in the requested media type 21 * 2 : The number of titles in the requested media type
22 */ 22 */
23void GetTitleCount(Service::Interface* self); 23void GetNumPrograms(Service::Interface* self);
24 24
25/** 25/**
26 * AM::FindContentInfos service function 26 * AM::FindContentInfos service function
@@ -62,7 +62,7 @@ void ListContentInfos(Service::Interface* self);
62void DeleteContents(Service::Interface* self); 62void DeleteContents(Service::Interface* self);
63 63
64/** 64/**
65 * AM::GetTitleList service function 65 * AM::GetProgramList service function
66 * Loads information about the desired number of titles from the desired media type into an array 66 * Loads information about the desired number of titles from the desired media type into an array
67 * Inputs: 67 * Inputs:
68 * 1 : Title count 68 * 1 : Title count
@@ -72,10 +72,10 @@ void DeleteContents(Service::Interface* self);
72 * 1 : Result, 0 on success, otherwise error code 72 * 1 : Result, 0 on success, otherwise error code
73 * 2 : The number of titles loaded from the requested media type 73 * 2 : The number of titles loaded from the requested media type
74 */ 74 */
75void GetTitleList(Service::Interface* self); 75void GetProgramList(Service::Interface* self);
76 76
77/** 77/**
78 * AM::GetTitleInfo service function 78 * AM::GetProgramInfos service function
79 * Inputs: 79 * Inputs:
80 * 1 : u8 Mediatype 80 * 1 : u8 Mediatype
81 * 2 : Total titles 81 * 2 : Total titles
@@ -84,11 +84,11 @@ void GetTitleList(Service::Interface* self);
84 * Outputs: 84 * Outputs:
85 * 1 : Result, 0 on success, otherwise error code 85 * 1 : Result, 0 on success, otherwise error code
86 */ 86 */
87void GetTitleInfo(Service::Interface* self); 87void GetProgramInfos(Service::Interface* self);
88 88
89/** 89/**
90 * AM::GetDataTitleInfos service function 90 * AM::GetDataTitleInfos service function
91 * Wrapper for AM::GetTitleInfo 91 * Wrapper for AM::GetProgramInfos
92 * Inputs: 92 * Inputs:
93 * 1 : u8 Mediatype 93 * 1 : u8 Mediatype
94 * 2 : Total titles 94 * 2 : Total titles
@@ -135,12 +135,12 @@ void GetNumContentInfos(Service::Interface* self);
135void DeleteTicket(Service::Interface* self); 135void DeleteTicket(Service::Interface* self);
136 136
137/** 137/**
138 * AM::GetTicketCount service function 138 * AM::GetNumTickets service function
139 * Outputs: 139 * Outputs:
140 * 1 : Result, 0 on success, otherwise error code 140 * 1 : Result, 0 on success, otherwise error code
141 * 2 : Total titles 141 * 2 : Number of tickets
142 */ 142 */
143void GetTicketCount(Service::Interface* self); 143void GetNumTickets(Service::Interface* self);
144 144
145/** 145/**
146 * AM::GetTicketList service function 146 * AM::GetTicketList service function
diff --git a/src/core/hle/service/am/am_app.cpp b/src/core/hle/service/am/am_app.cpp
index bfc1ca6bd..218375c8f 100644
--- a/src/core/hle/service/am/am_app.cpp
+++ b/src/core/hle/service/am/am_app.cpp
@@ -14,9 +14,14 @@ const Interface::FunctionInfo FunctionTable[] = {
14 {0x10030142, ListContentInfos, "ListContentInfos"}, 14 {0x10030142, ListContentInfos, "ListContentInfos"},
15 {0x10040102, DeleteContents, "DeleteContents"}, 15 {0x10040102, DeleteContents, "DeleteContents"},
16 {0x10050084, GetDataTitleInfos, "GetDataTitleInfos"}, 16 {0x10050084, GetDataTitleInfos, "GetDataTitleInfos"},
17 {0x10060080, nullptr, "GetNumDataTitleTickets"},
17 {0x10070102, ListDataTitleTicketInfos, "ListDataTitleTicketInfos"}, 18 {0x10070102, ListDataTitleTicketInfos, "ListDataTitleTicketInfos"},
19 {0x100801C2, nullptr, "GetItemRights"},
18 {0x100900C0, nullptr, "IsDataTitleInUse"}, 20 {0x100900C0, nullptr, "IsDataTitleInUse"},
19 {0x100A0000, nullptr, "IsExternalTitleDatabaseInitialized"}, 21 {0x100A0000, nullptr, "IsExternalTitleDatabaseInitialized"},
22 {0x100B00C0, nullptr, "GetNumExistingContentInfos"},
23 {0x100C0142, nullptr, "ListExistingContentInfos"},
24 {0x100D0084, nullptr, "GetPatchTitleInfos"},
20}; 25};
21 26
22AM_APP_Interface::AM_APP_Interface() { 27AM_APP_Interface::AM_APP_Interface() {
diff --git a/src/core/hle/service/am/am_net.cpp b/src/core/hle/service/am/am_net.cpp
index 3a597a34c..f3cd1d23f 100644
--- a/src/core/hle/service/am/am_net.cpp
+++ b/src/core/hle/service/am/am_net.cpp
@@ -9,61 +9,116 @@ namespace Service {
9namespace AM { 9namespace AM {
10 10
11const Interface::FunctionInfo FunctionTable[] = { 11const Interface::FunctionInfo FunctionTable[] = {
12 {0x00010040, GetTitleCount, "GetTitleCount"}, 12 {0x00010040, GetNumPrograms, "GetNumPrograms"},
13 {0x00020082, GetTitleList, "GetTitleList"}, 13 {0x00020082, GetProgramList, "GetProgramList"},
14 {0x00030084, GetTitleInfo, "GetTitleInfo"}, 14 {0x00030084, GetProgramInfos, "GetProgramInfos"},
15 {0x000400C0, nullptr, "DeleteApplicationTitle"}, 15 {0x000400C0, nullptr, "DeleteUserProgram"},
16 {0x000500C0, nullptr, "GetTitleProductCode"}, 16 {0x000500C0, nullptr, "GetProductCode"},
17 {0x000600C0, nullptr, "GetTitleExtDataId"}, 17 {0x000600C0, nullptr, "GetStorageId"},
18 {0x00070080, DeleteTicket, "DeleteTicket"}, 18 {0x00070080, DeleteTicket, "DeleteTicket"},
19 {0x00080000, GetTicketCount, "GetTicketCount"}, 19 {0x00080000, GetNumTickets, "GetNumTickets"},
20 {0x00090082, GetTicketList, "GetTicketList"}, 20 {0x00090082, GetTicketList, "GetTicketList"},
21 {0x000A0000, nullptr, "GetDeviceID"}, 21 {0x000A0000, nullptr, "GetDeviceID"},
22 {0x000D0084, nullptr, "GetPendingTitleInfo"}, 22 {0x000B0040, nullptr, "GetNumImportTitleContexts"},
23 {0x000E00C0, nullptr, "DeletePendingTitle"}, 23 {0x000C0082, nullptr, "GetImportTitleContextList"},
24 {0x00140040, nullptr, "FinalizePendingTitles"}, 24 {0x000D0084, nullptr, "GetImportTitleContexts"},
25 {0x00150040, nullptr, "DeleteAllPendingTitles"}, 25 {0x000E00C0, nullptr, "DeleteImportTitleContext"},
26 {0x000F00C0, nullptr, "GetNumImportContentContexts"},
27 {0x00100102, nullptr, "GetImportContentContextList"},
28 {0x00110104, nullptr, "GetImportContentContexts"},
29 {0x00120102, nullptr, "DeleteImportContentContexts"},
30 {0x00130040, nullptr, "NeedsCleanup"},
31 {0x00140040, nullptr, "DoCleanup"},
32 {0x00150040, nullptr, "DeleteAllImportContexts"},
33 {0x00160000, nullptr, "DeleteAllTemporaryPrograms"},
34 {0x00170044, nullptr, "ImportTwlBackupLegacy"},
26 {0x00180080, nullptr, "InitializeTitleDatabase"}, 35 {0x00180080, nullptr, "InitializeTitleDatabase"},
27 {0x00190040, nullptr, "ReloadDBS"}, 36 {0x00190040, nullptr, "QueryAvailableTitleDatabase"},
28 {0x001A00C0, nullptr, "GetDSiWareExportSize"}, 37 {0x001A00C0, nullptr, "CalcTwlBackupSize"},
29 {0x001B0144, nullptr, "ExportDSiWare"}, 38 {0x001B0144, nullptr, "ExportTwlBackup"},
30 {0x001C0084, nullptr, "ImportDSiWare"}, 39 {0x001C0084, nullptr, "ImportTwlBackup"},
31 {0x00230080, nullptr, "TitleIDListGetTotal2"}, 40 {0x001D0000, nullptr, "DeleteAllTwlUserPrograms"},
32 {0x002400C2, nullptr, "GetTitleIDList2"}, 41 {0x001E00C8, nullptr, "ReadTwlBackupInfo"},
33 {0x04010080, nullptr, "InstallFIRM"}, 42 {0x001F0040, nullptr, "DeleteAllExpiredUserPrograms"},
34 {0x04020040, nullptr, "StartInstallCIADB0"}, 43 {0x00200000, nullptr, "GetTwlArchiveResourceInfo"},
35 {0x04030000, nullptr, "StartInstallCIADB1"}, 44 {0x00210042, nullptr, "GetPersonalizedTicketInfoList"},
36 {0x04040002, nullptr, "AbortCIAInstall"}, 45 {0x00220080, nullptr, "DeleteAllImportContextsFiltered"},
37 {0x04050002, nullptr, "CloseCIAFinalizeInstall"}, 46 {0x00230080, nullptr, "GetNumImportTitleContextsFiltered"},
38 {0x04060002, nullptr, "CloseCIA"}, 47 {0x002400C2, nullptr, "GetImportTitleContextListFiltered"},
39 {0x040700C2, nullptr, "FinalizeTitlesInstall"}, 48 {0x002500C0, nullptr, "CheckContentRights"},
40 {0x04080042, nullptr, "GetCiaFileInfo"}, 49 {0x00260044, nullptr, "GetTicketLimitInfos"},
41 {0x040E00C2, nullptr, "InstallTitlesFinish"}, 50 {0x00270044, nullptr, "GetDemoLaunchInfos"},
42 {0x040F0000, nullptr, "InstallNATIVEFIRM"}, 51 {0x00280108, nullptr, "ReadTwlBackupInfoEx"},
43 {0x041000C0, nullptr, "DeleteTitle"}, 52 {0x00290082, nullptr, "DeleteUserProgramsAtomically"},
44 {0x04120000, nullptr, "Initialize"}, 53 {0x002A00C0, nullptr, "GetNumExistingContentInfosSystem"},
45 {0x041700C0, nullptr, "MigrateAGBtoSAV"}, 54 {0x002B0142, nullptr, "ListExistingContentInfosSystem"},
46 {0x08010000, nullptr, "OpenTicket"}, 55 {0x002C0084, nullptr, "GetProgramInfosIgnorePlatform"},
47 {0x08020002, nullptr, "TicketAbortInstall"}, 56 {0x002D00C0, nullptr, "CheckContentRightsIgnorePlatform"},
48 {0x08030002, nullptr, "TicketFinalizeInstall"}, 57 {0x04010080, nullptr, "UpdateFirmwareTo"},
49 {0x08040100, nullptr, "InstallTitleBegin"}, 58 {0x04020040, nullptr, "BeginImportProgram"},
50 {0x08050000, nullptr, "InstallTitleAbort"}, 59 {0x04030000, nullptr, "BeginImportProgramTemporarily"},
51 {0x080600C0, nullptr, "InstallTitleResume"}, 60 {0x04040002, nullptr, "CancelImportProgram"},
52 {0x08070000, nullptr, "InstallTitleAbortTMD"}, 61 {0x04050002, nullptr, "EndImportProgram"},
53 {0x08080000, nullptr, "InstallTitleFinish"}, 62 {0x04060002, nullptr, "EndImportProgramWithoutCommit"},
54 {0x080A0000, nullptr, "OpenTMD"}, 63 {0x040700C2, nullptr, "CommitImportPrograms"},
55 {0x080B0002, nullptr, "TMDAbortInstall"}, 64 {0x04080042, nullptr, "GetProgramInfoFromCia"},
56 {0x080C0042, nullptr, "TMDFinalizeInstall"}, 65 {0x04090004, nullptr, "GetSystemMenuDataFromCia"},
57 {0x080E0040, nullptr, "OpenContentCreate"}, 66 {0x040A0002, nullptr, "GetDependencyListFromCia"},
58 {0x080F0002, nullptr, "ContentAbortInstall"}, 67 {0x040B0002, nullptr, "GetTransferSizeFromCia"},
59 {0x08100040, nullptr, "OpenContentResume"}, 68 {0x040C0002, nullptr, "GetCoreVersionFromCia"},
60 {0x08120002, nullptr, "ContentFinalizeInstall"}, 69 {0x040D0042, nullptr, "GetRequiredSizeFromCia"},
61 {0x08130000, nullptr, "GetTotalContents"}, 70 {0x040E00C2, nullptr, "CommitImportProgramsAndUpdateFirmwareAuto"},
62 {0x08140042, nullptr, "GetContentIndexes"}, 71 {0x040F0000, nullptr, "UpdateFirmwareAuto"},
63 {0x08150044, nullptr, "GetContentsInfo"}, 72 {0x041000C0, nullptr, "DeleteProgram"},
64 {0x08180042, nullptr, "GetCTCert"}, 73 {0x04110044, nullptr, "GetTwlProgramListForReboot"},
65 {0x08190108, nullptr, "SetCertificates"}, 74 {0x04120000, nullptr, "GetSystemUpdaterMutex"},
66 {0x081B00C2, nullptr, "InstallTitlesFinish"}, 75 {0x04130002, nullptr, "GetMetaSizeFromCia"},
76 {0x04140044, nullptr, "GetMetaDataFromCia"},
77 {0x04150080, nullptr, "CheckDemoLaunchRights"},
78 {0x041600C0, nullptr, "GetInternalTitleLocationInfo"},
79 {0x041700C0, nullptr, "PerpetuateAgbSaveData"},
80 {0x04180040, nullptr, "BeginImportProgramForOverWrite"},
81 {0x04190000, nullptr, "BeginImportSystemProgram"},
82 {0x08010000, nullptr, "BeginImportTicket"},
83 {0x08020002, nullptr, "CancelImportTicket"},
84 {0x08030002, nullptr, "EndImportTicket"},
85 {0x08040100, nullptr, "BeginImportTitle"},
86 {0x08050000, nullptr, "StopImportTitle"},
87 {0x080600C0, nullptr, "ResumeImportTitle"},
88 {0x08070000, nullptr, "CancelImportTitle"},
89 {0x08080000, nullptr, "EndImportTitle"},
90 {0x080900C2, nullptr, "CommitImportTitles"},
91 {0x080A0000, nullptr, "BeginImportTmd"},
92 {0x080B0002, nullptr, "CancelImportTmd"},
93 {0x080C0042, nullptr, "EndImportTmd"},
94 {0x080D0042, nullptr, "CreateImportContentContexts"},
95 {0x080E0040, nullptr, "BeginImportContent"},
96 {0x080F0002, nullptr, "StopImportContent"},
97 {0x08100040, nullptr, "ResumeImportContent"},
98 {0x08110002, nullptr, "CancelImportContent"},
99 {0x08120002, nullptr, "EndImportContent"},
100 {0x08130000, nullptr, "GetNumCurrentImportContentContexts"},
101 {0x08140042, nullptr, "GetCurrentImportContentContextList"},
102 {0x08150044, nullptr, "GetCurrentImportContentContexts"},
103 {0x08160146, nullptr, "Sign"},
104 {0x08170146, nullptr, "Verify"},
105 {0x08180042, nullptr, "GetDeviceCert"},
106 {0x08190108, nullptr, "ImportCertificates"},
107 {0x081A0042, nullptr, "ImportCertificate"},
108 {0x081B00C2, nullptr, "CommitImportTitlesAndUpdateFirmwareAuto"},
109 {0x081C0100, nullptr, "DeleteTicketId"},
110 {0x081D0080, nullptr, "GetNumTicketIds"},
111 {0x081E0102, nullptr, "GetTicketIdList"},
112 {0x081F0080, nullptr, "GetNumTicketsOfProgram"},
113 {0x08200102, nullptr, "ListTicketInfos"},
114 {0x08210142, nullptr, "GetRightsOnlyTicketData"},
115 {0x08220000, nullptr, "GetNumCurrentContentInfos"},
116 {0x08230044, nullptr, "FindCurrentContentInfos"},
117 {0x08240082, nullptr, "ListCurrentContentInfos"},
118 {0x08250102, nullptr, "CalculateContextRequiredSize"},
119 {0x08260042, nullptr, "UpdateImportContentContexts"},
120 {0x08270000, nullptr, "DeleteAllDemoLaunchInfos"},
121 {0x082800C0, nullptr, "BeginImportTitleForOverWrite"},
67}; 122};
68 123
69AM_NET_Interface::AM_NET_Interface() { 124AM_NET_Interface::AM_NET_Interface() {
diff --git a/src/core/hle/service/am/am_sys.cpp b/src/core/hle/service/am/am_sys.cpp
index a2268303c..949b3591d 100644
--- a/src/core/hle/service/am/am_sys.cpp
+++ b/src/core/hle/service/am/am_sys.cpp
@@ -9,27 +9,64 @@ namespace Service {
9namespace AM { 9namespace AM {
10 10
11const Interface::FunctionInfo FunctionTable[] = { 11const Interface::FunctionInfo FunctionTable[] = {
12 {0x00010040, GetTitleCount, "GetTitleCount"}, 12 {0x00010040, GetNumPrograms, "GetNumPrograms"},
13 {0x00020082, GetTitleList, "GetTitleList"}, 13 {0x00020082, GetProgramList, "GetProgramList"},
14 {0x00030084, GetTitleInfo, "GetTitleInfo"}, 14 {0x00030084, GetProgramInfos, "GetProgramInfos"},
15 {0x000400C0, nullptr, "DeleteApplicationTitle"}, 15 {0x000400C0, nullptr, "DeleteUserProgram"},
16 {0x000500C0, nullptr, "GetTitleProductCode"}, 16 {0x000500C0, nullptr, "GetProductCode"},
17 {0x000600C0, nullptr, "GetTitleExtDataId"}, 17 {0x000600C0, nullptr, "GetStorageId"},
18 {0x00070080, DeleteTicket, "DeleteTicket"}, 18 {0x00070080, DeleteTicket, "DeleteTicket"},
19 {0x00080000, GetTicketCount, "GetTicketCount"}, 19 {0x00080000, GetNumTickets, "GetNumTickets"},
20 {0x00090082, GetTicketList, "GetTicketList"}, 20 {0x00090082, GetTicketList, "GetTicketList"},
21 {0x000A0000, nullptr, "GetDeviceID"}, 21 {0x000A0000, nullptr, "GetDeviceID"},
22 {0x000D0084, nullptr, "GetPendingTitleInfo"}, 22 {0x000B0040, nullptr, "GetNumImportTitleContexts"},
23 {0x000E00C0, nullptr, "DeletePendingTitle"}, 23 {0x000C0082, nullptr, "GetImportTitleContextList"},
24 {0x00140040, nullptr, "FinalizePendingTitles"}, 24 {0x000D0084, nullptr, "GetImportTitleContexts"},
25 {0x00150040, nullptr, "DeleteAllPendingTitles"}, 25 {0x000E00C0, nullptr, "DeleteImportTitleContext"},
26 {0x000F00C0, nullptr, "GetNumImportContentContexts"},
27 {0x00100102, nullptr, "GetImportContentContextList"},
28 {0x00110104, nullptr, "GetImportContentContexts"},
29 {0x00120102, nullptr, "DeleteImportContentContexts"},
30 {0x00130040, nullptr, "NeedsCleanup"},
31 {0x00140040, nullptr, "DoCleanup"},
32 {0x00150040, nullptr, "DeleteAllImportContexts"},
33 {0x00160000, nullptr, "DeleteAllTemporaryPrograms"},
34 {0x00170044, nullptr, "ImportTwlBackupLegacy"},
26 {0x00180080, nullptr, "InitializeTitleDatabase"}, 35 {0x00180080, nullptr, "InitializeTitleDatabase"},
27 {0x00190040, nullptr, "ReloadDBS"}, 36 {0x00190040, nullptr, "QueryAvailableTitleDatabase"},
28 {0x001A00C0, nullptr, "GetDSiWareExportSize"}, 37 {0x001A00C0, nullptr, "CalcTwlBackupSize"},
29 {0x001B0144, nullptr, "ExportDSiWare"}, 38 {0x001B0144, nullptr, "ExportTwlBackup"},
30 {0x001C0084, nullptr, "ImportDSiWare"}, 39 {0x001C0084, nullptr, "ImportTwlBackup"},
31 {0x00230080, nullptr, "GetPendingTitleCount"}, 40 {0x001D0000, nullptr, "DeleteAllTwlUserPrograms"},
32 {0x002400C2, nullptr, "GetPendingTitleList"}, 41 {0x001E00C8, nullptr, "ReadTwlBackupInfo"},
42 {0x001F0040, nullptr, "DeleteAllExpiredUserPrograms"},
43 {0x00200000, nullptr, "GetTwlArchiveResourceInfo"},
44 {0x00210042, nullptr, "GetPersonalizedTicketInfoList"},
45 {0x00220080, nullptr, "DeleteAllImportContextsFiltered"},
46 {0x00230080, nullptr, "GetNumImportTitleContextsFiltered"},
47 {0x002400C2, nullptr, "GetImportTitleContextListFiltered"},
48 {0x002500C0, nullptr, "CheckContentRights"},
49 {0x00260044, nullptr, "GetTicketLimitInfos"},
50 {0x00270044, nullptr, "GetDemoLaunchInfos"},
51 {0x00280108, nullptr, "ReadTwlBackupInfoEx"},
52 {0x00290082, nullptr, "DeleteUserProgramsAtomically"},
53 {0x002A00C0, nullptr, "GetNumExistingContentInfosSystem"},
54 {0x002B0142, nullptr, "ListExistingContentInfosSystem"},
55 {0x002C0084, nullptr, "GetProgramInfosIgnorePlatform"},
56 {0x002D00C0, nullptr, "CheckContentRightsIgnorePlatform"},
57 {0x100100C0, GetNumContentInfos, "GetNumContentInfos"},
58 {0x10020104, FindContentInfos, "FindContentInfos"},
59 {0x10030142, ListContentInfos, "ListContentInfos"},
60 {0x10040102, DeleteContents, "DeleteContents"},
61 {0x10050084, GetDataTitleInfos, "GetDataTitleInfos"},
62 {0x10060080, nullptr, "GetNumDataTitleTickets"},
63 {0x10070102, ListDataTitleTicketInfos, "ListDataTitleTicketInfos"},
64 {0x100801C2, nullptr, "GetItemRights"},
65 {0x100900C0, nullptr, "IsDataTitleInUse"},
66 {0x100A0000, nullptr, "IsExternalTitleDatabaseInitialized"},
67 {0x100B00C0, nullptr, "GetNumExistingContentInfos"},
68 {0x100C0142, nullptr, "ListExistingContentInfos"},
69 {0x100D0084, nullptr, "GetPatchTitleInfos"},
33}; 70};
34 71
35AM_SYS_Interface::AM_SYS_Interface() { 72AM_SYS_Interface::AM_SYS_Interface() {
diff --git a/src/core/hle/service/am/am_u.cpp b/src/core/hle/service/am/am_u.cpp
index 151b5e42b..354d51610 100644
--- a/src/core/hle/service/am/am_u.cpp
+++ b/src/core/hle/service/am/am_u.cpp
@@ -9,40 +9,76 @@ namespace Service {
9namespace AM { 9namespace AM {
10 10
11const Interface::FunctionInfo FunctionTable[] = { 11const Interface::FunctionInfo FunctionTable[] = {
12 {0x00010040, GetTitleCount, "GetTitleCount"}, 12 {0x00010040, GetNumPrograms, "GetNumPrograms"},
13 {0x00020082, GetTitleList, "GetTitleList"}, 13 {0x00020082, GetProgramList, "GetProgramList"},
14 {0x00030084, GetTitleInfo, "GetTitleInfo"}, 14 {0x00030084, GetProgramInfos, "GetProgramInfos"},
15 {0x000400C0, nullptr, "DeleteApplicationTitle"}, 15 {0x000400C0, nullptr, "DeleteUserProgram"},
16 {0x000500C0, nullptr, "GetTitleProductCode"}, 16 {0x000500C0, nullptr, "GetProductCode"},
17 {0x000600C0, nullptr, "GetTitleExtDataId"}, 17 {0x000600C0, nullptr, "GetStorageId"},
18 {0x00070080, DeleteTicket, "DeleteTicket"}, 18 {0x00070080, DeleteTicket, "DeleteTicket"},
19 {0x00080000, GetTicketCount, "GetTicketCount"}, 19 {0x00080000, GetNumTickets, "GetNumTickets"},
20 {0x00090082, GetTicketList, "GetTicketList"}, 20 {0x00090082, GetTicketList, "GetTicketList"},
21 {0x000A0000, nullptr, "GetDeviceID"}, 21 {0x000A0000, nullptr, "GetDeviceID"},
22 {0x000D0084, nullptr, "GetPendingTitleInfo"}, 22 {0x000B0040, nullptr, "GetNumImportTitleContexts"},
23 {0x000E00C0, nullptr, "DeletePendingTitle"}, 23 {0x000C0082, nullptr, "GetImportTitleContextList"},
24 {0x00140040, nullptr, "FinalizePendingTitles"}, 24 {0x000D0084, nullptr, "GetImportTitleContexts"},
25 {0x00150040, nullptr, "DeleteAllPendingTitles"}, 25 {0x000E00C0, nullptr, "DeleteImportTitleContext"},
26 {0x000F00C0, nullptr, "GetNumImportContentContexts"},
27 {0x00100102, nullptr, "GetImportContentContextList"},
28 {0x00110104, nullptr, "GetImportContentContexts"},
29 {0x00120102, nullptr, "DeleteImportContentContexts"},
30 {0x00130040, nullptr, "NeedsCleanup"},
31 {0x00140040, nullptr, "DoCleanup"},
32 {0x00150040, nullptr, "DeleteAllImportContexts"},
33 {0x00160000, nullptr, "DeleteAllTemporaryPrograms"},
34 {0x00170044, nullptr, "ImportTwlBackupLegacy"},
26 {0x00180080, nullptr, "InitializeTitleDatabase"}, 35 {0x00180080, nullptr, "InitializeTitleDatabase"},
27 {0x00190040, nullptr, "ReloadDBS"}, 36 {0x00190040, nullptr, "QueryAvailableTitleDatabase"},
28 {0x001A00C0, nullptr, "GetDSiWareExportSize"}, 37 {0x001A00C0, nullptr, "CalcTwlBackupSize"},
29 {0x001B0144, nullptr, "ExportDSiWare"}, 38 {0x001B0144, nullptr, "ExportTwlBackup"},
30 {0x001C0084, nullptr, "ImportDSiWare"}, 39 {0x001C0084, nullptr, "ImportTwlBackup"},
31 {0x00230080, nullptr, "TitleIDListGetTotal2"}, 40 {0x001D0000, nullptr, "DeleteAllTwlUserPrograms"},
32 {0x002400C2, nullptr, "GetTitleIDList2"}, 41 {0x001E00C8, nullptr, "ReadTwlBackupInfo"},
33 {0x04010080, nullptr, "InstallFIRM"}, 42 {0x001F0040, nullptr, "DeleteAllExpiredUserPrograms"},
34 {0x04020040, nullptr, "StartInstallCIADB0"}, 43 {0x00200000, nullptr, "GetTwlArchiveResourceInfo"},
35 {0x04030000, nullptr, "StartInstallCIADB1"}, 44 {0x00210042, nullptr, "GetPersonalizedTicketInfoList"},
36 {0x04040002, nullptr, "AbortCIAInstall"}, 45 {0x00220080, nullptr, "DeleteAllImportContextsFiltered"},
37 {0x04050002, nullptr, "CloseCIAFinalizeInstall"}, 46 {0x00230080, nullptr, "GetNumImportTitleContextsFiltered"},
38 {0x04060002, nullptr, "CloseCIA"}, 47 {0x002400C2, nullptr, "GetImportTitleContextListFiltered"},
39 {0x040700C2, nullptr, "FinalizeTitlesInstall"}, 48 {0x002500C0, nullptr, "CheckContentRights"},
40 {0x04080042, nullptr, "GetCiaFileInfo"}, 49 {0x00260044, nullptr, "GetTicketLimitInfos"},
41 {0x040E00C2, nullptr, "InstallTitlesFinish"}, 50 {0x00270044, nullptr, "GetDemoLaunchInfos"},
42 {0x040F0000, nullptr, "InstallNATIVEFIRM"}, 51 {0x00280108, nullptr, "ReadTwlBackupInfoEx"},
43 {0x041000C0, nullptr, "DeleteTitle"}, 52 {0x00290082, nullptr, "DeleteUserProgramsAtomically"},
44 {0x04120000, nullptr, "Initialize"}, 53 {0x002A00C0, nullptr, "GetNumExistingContentInfosSystem"},
45 {0x041700C0, nullptr, "MigrateAGBtoSAV"}, 54 {0x002B0142, nullptr, "ListExistingContentInfosSystem"},
55 {0x002C0084, nullptr, "GetProgramInfosIgnorePlatform"},
56 {0x002D00C0, nullptr, "CheckContentRightsIgnorePlatform"},
57 {0x04010080, nullptr, "UpdateFirmwareTo"},
58 {0x04020040, nullptr, "BeginImportProgram"},
59 {0x04030000, nullptr, "BeginImportProgramTemporarily"},
60 {0x04040002, nullptr, "CancelImportProgram"},
61 {0x04050002, nullptr, "EndImportProgram"},
62 {0x04060002, nullptr, "EndImportProgramWithoutCommit"},
63 {0x040700C2, nullptr, "CommitImportPrograms"},
64 {0x04080042, nullptr, "GetProgramInfoFromCia"},
65 {0x04090004, nullptr, "GetSystemMenuDataFromCia"},
66 {0x040A0002, nullptr, "GetDependencyListFromCia"},
67 {0x040B0002, nullptr, "GetTransferSizeFromCia"},
68 {0x040C0002, nullptr, "GetCoreVersionFromCia"},
69 {0x040D0042, nullptr, "GetRequiredSizeFromCia"},
70 {0x040E00C2, nullptr, "CommitImportProgramsAndUpdateFirmwareAuto"},
71 {0x040F0000, nullptr, "UpdateFirmwareAuto"},
72 {0x041000C0, nullptr, "DeleteProgram"},
73 {0x04110044, nullptr, "GetTwlProgramListForReboot"},
74 {0x04120000, nullptr, "GetSystemUpdaterMutex"},
75 {0x04130002, nullptr, "GetMetaSizeFromCia"},
76 {0x04140044, nullptr, "GetMetaDataFromCia"},
77 {0x04150080, nullptr, "CheckDemoLaunchRights"},
78 {0x041600C0, nullptr, "GetInternalTitleLocationInfo"},
79 {0x041700C0, nullptr, "PerpetuateAgbSaveData"},
80 {0x04180040, nullptr, "BeginImportProgramForOverWrite"},
81 {0x04190000, nullptr, "BeginImportSystemProgram"},
46}; 82};
47 83
48AM_U_Interface::AM_U_Interface() { 84AM_U_Interface::AM_U_Interface() {
HIC SVNT DRACONES