DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #179 from profi200/great-refactor

Browse Source 
Renamed TitleList to AM_TitleEntry.
This commit is contained in:
fincs 2015-10-03 18:41:10 +02:00
commit 167f27cdc4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libctru/include/3ds/services/am.h
View File

@ -9,9 +9,9 @@ typedef struct
{ {
u64 titleID; u64 titleID;
u64 size; u64 size;
u16 titleVersion; u16 version;
u8 unknown2[6]; u8 unk[6];
} TitleList; } AM_TitleEntry;
Result amInit(void); Result amInit(void);
@ -48,9 +48,9 @@ About: Get a list with details about the installed titles
mediatype mediatype of title mediatype mediatype of title
titleCount number of titles to list titleCount number of titles to list
titleIdList pointer to a title ID list titleIdList pointer to a title ID list
titleList pointer for the output TitleList array titleList pointer for the output AM_TitleEntry array
*/ */
Result AM_ListTitles(u8 mediatype, u32 titleCount, u64 *titleIdList, TitleList *titleList); Result AM_ListTitles(u8 mediatype, u32 titleCount, u64 *titleIdList, AM_TitleEntry *titleList);
/**** Title Install Methods ****/ /**** Title Install Methods ****/
/* AM_StartCiaInstall() /* AM_StartCiaInstall()
@ -119,10 +119,10 @@ About: Gets the product code of a title based on its title id.
Result AM_GetTitleProductCode(u8 mediatype, u64 titleID, char* productCode); Result AM_GetTitleProductCode(u8 mediatype, u64 titleID, char* productCode);
/* AM_GetCiaFileInfo() /* AM_GetCiaFileInfo()
About: Reads a CIA file and returns a TitleList entry for it. About: Reads a CIA file and returns a AM_TitleEntry instance for it.
mediatype destination mediatype mediatype destination mediatype
titleEntry ptr to a TitleList entry titleEntry ptr to a AM_TitleEntry instance
fileHandle a fs:USER file handle for a CIA file fileHandle a fs:USER file handle for a CIA file
*/ */
Result AM_GetCiaFileInfo(u8 mediatype, TitleList *titleEntry, Handle fileHandle); Result AM_GetCiaFileInfo(u8 mediatype, AM_TitleEntry *titleEntry, Handle fileHandle);

8
libctru/source/services/am.c
View File

@ -61,7 +61,7 @@ Result AM_GetTitleIdList(u8 mediatype, u32 count, u64 *titleIDs)
return (Result)cmdbuf[1]; return (Result)cmdbuf[1];
} }
Result AM_ListTitles(u8 mediatype, u32 titleCount, u64 *titleIdList, TitleList *titleList) Result AM_ListTitles(u8 mediatype, u32 titleCount, u64 *titleIdList, AM_TitleEntry *titleList)
{ {
Result ret = 0; Result ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
@ -71,7 +71,7 @@ Result AM_ListTitles(u8 mediatype, u32 titleCount, u64 *titleIdList, TitleList *
cmdbuf[2] = titleCount; cmdbuf[2] = titleCount;
cmdbuf[3] = IPC_Desc_Buffer(titleCount*sizeof(u64),IPC_BUFFER_R); cmdbuf[3] = IPC_Desc_Buffer(titleCount*sizeof(u64),IPC_BUFFER_R);
cmdbuf[4] = (u32)titleIdList; cmdbuf[4] = (u32)titleIdList;
cmdbuf[5] = IPC_Desc_Buffer(titleCount*sizeof(TitleList),IPC_BUFFER_W); cmdbuf[5] = IPC_Desc_Buffer(titleCount*sizeof(AM_TitleEntry),IPC_BUFFER_W);
cmdbuf[6] = (u32)titleList; cmdbuf[6] = (u32)titleList;
if((ret = svcSendSyncRequest(amHandle))!=0) return ret; if((ret = svcSendSyncRequest(amHandle))!=0) return ret;
@ -210,7 +210,7 @@ Result AM_GetTitleProductCode(u8 mediatype, u64 titleID, char* productCode)
return (Result)cmdbuf[1]; return (Result)cmdbuf[1];
} }
Result AM_GetCiaFileInfo(u8 mediatype, TitleList *titleEntry, Handle fileHandle) Result AM_GetCiaFileInfo(u8 mediatype, AM_TitleEntry *titleEntry, Handle fileHandle)
{ {
Result ret = 0; Result ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
@ -222,7 +222,7 @@ Result AM_GetCiaFileInfo(u8 mediatype, TitleList *titleEntry, Handle fileHandle)
if((ret = svcSendSyncRequest(amHandle))!=0) return ret; if((ret = svcSendSyncRequest(amHandle))!=0) return ret;
if(titleEntry) memcpy(titleEntry, &cmdbuf[2], sizeof(TitleList)); if(titleEntry) memcpy(titleEntry, &cmdbuf[2], sizeof(AM_TitleEntry));
return (Result)cmdbuf[1]; return (Result)cmdbuf[1];
} }