From adfad3cffa2bed434fb9badc77f53730f94bfde8 Mon Sep 17 00:00:00 2001 From: Rajko Stojadinovic Date: Sat, 21 Jul 2018 03:02:08 +0200 Subject: [PATCH] Code style fixes. --- nx/include/switch/services/ncm.h | 8 ++++---- nx/source/services/ncm.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/nx/include/switch/services/ncm.h b/nx/include/switch/services/ncm.h index 7c4807b1..d9b2bc39 100644 --- a/nx/include/switch/services/ncm.h +++ b/nx/include/switch/services/ncm.h @@ -46,10 +46,10 @@ typedef struct { } NcmContentRecord; typedef struct { - u16 numExtraBytes; //of struct that comes after this one - u16 numContentRecords; //number of NcmContentRecord entries after the extra bytes - u16 numMetaRecords; //number of NcmMetaRecord entries that come after after the NcmContentRecords - u16 padding; //always zero + u16 numExtraBytes; //Size of optional struct that comes after this one. + u16 numContentRecords; //Number of NcmContentRecord entries after the extra bytes. + u16 numMetaRecords; //Number of NcmMetaRecord entries that come after the NcmContentRecords. + u16 padding; //Always zero. } NcmContentMetaRecordsHeader; typedef struct { diff --git a/nx/source/services/ncm.c b/nx/source/services/ncm.c index f86daaf7..2bd503ff 100644 --- a/nx/source/services/ncm.c +++ b/nx/source/services/ncm.c @@ -472,9 +472,9 @@ Result ncmContentMetaDatabaseList(NcmContentMetaDatabase* db, u32 titleType, u64 u64 magic; u64 cmd_id; u32 titleType; - u64 TID; - u64 TID_LOW; - u64 TID_HIGH; + u64 titleIdExact; + u64 titleIdLow; + u64 titleIdHigh; } *raw; raw = ipcPrepareHeader(&c, sizeof(*raw)); @@ -482,13 +482,12 @@ Result ncmContentMetaDatabaseList(NcmContentMetaDatabase* db, u32 titleType, u64 raw->magic = SFCI_MAGIC; raw->cmd_id = 5; raw->titleType = titleType; - raw->TID = titleIdExact; - raw->TID_LOW = titleIdLow; - raw->TID_HIGH = titleIdHigh; + raw->titleIdExact = titleIdExact; + raw->titleIdLow = titleIdLow; + raw->titleIdHigh = titleIdHigh; Result rc = serviceIpcDispatch(&db->s); - if (R_SUCCEEDED(rc)) - { + if (R_SUCCEEDED(rc)) { IpcParsedCommand r; ipcParse(&r); @@ -501,8 +500,7 @@ Result ncmContentMetaDatabaseList(NcmContentMetaDatabase* db, u32 titleType, u64 rc = resp->result; - if (R_SUCCEEDED(rc)) - { + if (R_SUCCEEDED(rc)) { if (numEntriesTotal) *numEntriesTotal = resp->numEntriesTotal; if (numEntriesWritten)