DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-03 00:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
applestash
2014-06-25 12:31:01 +10:00
parent 8411e7e533
commit efd71def1c
12 changed files with 177 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/Makefile
+2 -2
View File
@@ -3,8 +3,8 @@ UTILS_OBJS = utils.o dir.o utf.o keyset.o titleid.o
CIA_OBJS = cia.o cia_read.o certs.o tik.o tmd.o tmd_read.o CIA_OBJS = cia.o cia_read.o certs.o tik.o tmd.o tmd_read.o
NCCH_OBJS = ncch.o exheader.o accessdesc.o exefs.o elf.o romfs.o romfs_import.o romfs_binary.o NCCH_OBJS = ncch.o exheader.o accessdesc.o exefs.o elf.o romfs.o romfs_import.o romfs_binary.o
NCSD_OBJS = ncsd.o NCSD_OBJS = ncsd.o
SETTINGS_OBJS = usersettings.o yamlsettings.o SETTINGS_OBJS = user_settings.o rsf_settings.o
LIB_API_OBJS = crypto.o yaml_ctr.o blz.o LIB_API_OBJS = crypto.o yaml_parser.o blz.o
OBJS = makerom.o $(UTILS_OBJS) $(LIB_API_OBJS) $(SETTINGS_OBJS) $(NCSD_OBJS) $(NCCH_OBJS) $(CIA_OBJS) OBJS = makerom.o $(UTILS_OBJS) $(LIB_API_OBJS) $(SETTINGS_OBJS) $(NCSD_OBJS) $(NCCH_OBJS) $(CIA_OBJS)
makerom/lib.h
+2 -2
View File
@@ -29,8 +29,8 @@
#include "crypto.h" #include "crypto.h"
#include "keyset.h" #include "keyset.h"
#include "usersettings.h" #include "user_settings.h"
#include "libyaml/yaml.h" #include "libyaml/yaml.h"
#include "yaml_ctr.h" #include "yaml_parser.h"
makerom/ncch.c
+7 -18
View File
@@ -9,6 +9,8 @@
#include "logo_data.h" // Contains Logos #include "logo_data.h" // Contains Logos
const u32 MEDIA_UNIT = 0x200;
// Private Prototypes // Private Prototypes
int SignCFA(u8 *Signature, u8 *CFA_HDR, keys_struct *keys); int SignCFA(u8 *Signature, u8 *CFA_HDR, keys_struct *keys);
int CheckCFASignature(u8 *Signature, u8 *CFA_HDR, keys_struct *keys); int CheckCFASignature(u8 *Signature, u8 *CFA_HDR, keys_struct *keys);
@@ -173,27 +175,14 @@ int SetBasicOptions(ncch_settings *ncchset, user_settings *usrset)
int result = 0; int result = 0;
/* Options */ /* Options */
ncchset->options.mediaSize = 0x200; ncchset->options.mediaSize = MEDIA_UNIT;
ncchset->options.IncludeExeFsLogo = usrset->ncch.includeExefsLogo; ncchset->options.IncludeExeFsLogo = usrset->ncch.includeExefsLogo;
ncchset->options.CompressCode = usrset->common.rsfSet.Option.EnableCompress;
if(usrset->common.rsfSet.Option.EnableCompress != -1) ncchset->options.CompressCode = usrset->common.rsfSet.Option.EnableCompress; ncchset->options.UseOnSD = usrset->common.rsfSet.Option.UseOnSD;
else ncchset->options.CompressCode = true; ncchset->options.Encrypt = usrset->common.rsfSet.Option.EnableCrypt;
ncchset->options.FreeProductCode = usrset->common.rsfSet.Option.FreeProductCode;
if(usrset->common.rsfSet.Option.UseOnSD != -1) ncchset->options.UseOnSD = usrset->common.rsfSet.Option.UseOnSD;
else ncchset->options.UseOnSD = false;
usrset->common.rsfSet.Option.UseOnSD = ncchset->options.UseOnSD;
if(usrset->common.rsfSet.Option.EnableCrypt != -1) ncchset->options.Encrypt = usrset->common.rsfSet.Option.EnableCrypt;
else ncchset->options.Encrypt = true;
if(usrset->common.rsfSet.Option.FreeProductCode != -1) ncchset->options.FreeProductCode = usrset->common.rsfSet.Option.FreeProductCode;
else ncchset->options.FreeProductCode = false;
ncchset->options.IsCfa = (usrset->ncch.ncchType == CFA); ncchset->options.IsCfa = (usrset->ncch.ncchType == CFA);
ncchset->options.IsBuildingCodeSection = (usrset->ncch.elfPath != NULL); ncchset->options.IsBuildingCodeSection = (usrset->ncch.elfPath != NULL);
ncchset->options.UseRomFS = ((ncchset->rsfSet->Rom.HostRoot && strlen(ncchset->rsfSet->Rom.HostRoot) > 0) || usrset->ncch.romfsPath); ncchset->options.UseRomFS = ((ncchset->rsfSet->Rom.HostRoot && strlen(ncchset->rsfSet->Rom.HostRoot) > 0) || usrset->ncch.romfsPath);
if(ncchset->options.IsCfa && !ncchset->options.UseRomFS){ if(ncchset->options.IsCfa && !ncchset->options.UseRomFS){
makerom/ncsd.c
+18 -8
View File
@@ -222,20 +222,30 @@ int ImportNcchPartitions(cci_settings *cciset)
return 0; return 0;
} }
void WriteCCIDummyData(cci_settings *cciset)
{
// Creating Buffer of Dummy Bytes
u64 len = NCCH0_OFFSET - 0x1200;
u8 *dummy_bytes = malloc(len);
memset(dummy_bytes,0xff,len);
WriteBuffer(dummy_bytes,len,0x1200,cciset->out);
}
void WriteDevCardInfoData(cci_settings *cciset)
{
WriteBuffer((u8*)&ctx.devcardinfo,sizeof(devcardinfo_hdr),0x1200,cciset->out);
}
int WriteHeaderToFile(cci_settings *cciset) int WriteHeaderToFile(cci_settings *cciset)
{ {
WriteBuffer(ctx.signature,0x100,0,cciset->out); WriteBuffer(ctx.signature,0x100,0,cciset->out);
WriteBuffer((u8*)&ctx.cciHdr,sizeof(cci_hdr),0x100,cciset->out); WriteBuffer((u8*)&ctx.cciHdr,sizeof(cci_hdr),0x100,cciset->out);
WriteBuffer((u8*)&ctx.cardinfo,sizeof(cardinfo_hdr),0x200,cciset->out); WriteBuffer((u8*)&ctx.cardinfo,sizeof(cardinfo_hdr),0x200,cciset->out);
if(!cciset->option.useDevCardInfo){ if(cciset->option.useDevCardInfo)
// Creating Buffer of Dummy Bytes WriteDevCardInfoData(cciset);
u64 len = NCCH0_OFFSET - 0x1200;
u8 *dummy_bytes = malloc(len);
memset(dummy_bytes,0xff,len);
WriteBuffer(dummy_bytes,len,0x1200,cciset->out);
}
else else
WriteBuffer((u8*)&ctx.devcardinfo,sizeof(devcardinfo_hdr),0x1200,cciset->out); WriteCCIDummyData(cciset);
return 0; return 0;
} }
makerom/yamlsettings.c → makerom/rsf_settings.c
+20 -20
View File
@@ -1,5 +1,5 @@
#include "lib.h" #include "lib.h"
#include "yamlsettings.h" #include "rsf_settings.h"
void EvaluateRSF(rsf_settings *rsf, ctr_yaml_context *ctx) void EvaluateRSF(rsf_settings *rsf, ctr_yaml_context *ctx)
{ {
@@ -52,13 +52,13 @@ void GET_Option(ctr_yaml_context *ctx, rsf_settings *rsf)
while(ctx->Level == InitLevel){ while(ctx->Level == InitLevel){
if(ctx->error || ctx->done) return; if(ctx->error || ctx->done) return;
// Handle childs // Handle childs
if(cmpYamlValue("AllowUnalignedSection",ctx)) rsf->Option.AllowUnalignedSection = SetBoolYAMLValue("AllowUnalignedSection",ctx); if(cmpYamlValue("AllowUnalignedSection",ctx)) SetBoolYAMLValue(&rsf->Option.AllowUnalignedSection,"AllowUnalignedSection",ctx);
if(cmpYamlValue("MediaFootPadding",ctx)) rsf->Option.MediaFootPadding = SetBoolYAMLValue("MediaFootPadding",ctx); else if(cmpYamlValue("MediaFootPadding",ctx)) SetBoolYAMLValue(&rsf->Option.MediaFootPadding,"MediaFootPadding",ctx);
//else if(cmpYamlValue("NoPadding",ctx)) rsf->Option.NoPadding = SetBoolYAMLValue("NoPadding",ctx); //else if(cmpYamlValue("NoPadding",ctx)) SetBoolYAMLValue(&rsf->Option.NoPadding,"NoPadding",ctx);
else if(cmpYamlValue("EnableCrypt",ctx)) rsf->Option.EnableCrypt = SetBoolYAMLValue("EnableCrypt",ctx); else if(cmpYamlValue("EnableCrypt",ctx)) SetBoolYAMLValue(&rsf->Option.EnableCrypt,"EnableCrypt",ctx);
else if(cmpYamlValue("EnableCompress",ctx)) rsf->Option.EnableCompress = SetBoolYAMLValue("EnableCompress",ctx); else if(cmpYamlValue("EnableCompress",ctx)) SetBoolYAMLValue(&rsf->Option.EnableCompress,"EnableCompress",ctx);
else if(cmpYamlValue("FreeProductCode",ctx)) rsf->Option.FreeProductCode = SetBoolYAMLValue("FreeProductCode",ctx); else if(cmpYamlValue("FreeProductCode",ctx)) SetBoolYAMLValue(&rsf->Option.EnableCompress,"FreeProductCode",ctx);
else if(cmpYamlValue("UseOnSD",ctx)) rsf->Option.UseOnSD = SetBoolYAMLValue("UseOnSD",ctx); else if(cmpYamlValue("UseOnSD",ctx)) SetBoolYAMLValue(&rsf->Option.UseOnSD,"UseOnSD",ctx);
else if(cmpYamlValue("PageSize",ctx)) SetSimpleYAMLValue(&rsf->Option.PageSize,"PageSize",ctx,0); else if(cmpYamlValue("PageSize",ctx)) SetSimpleYAMLValue(&rsf->Option.PageSize,"PageSize",ctx,0);
//else if(cmpYamlValue("AppendSystemCall",ctx)) rsf->Option.AppendSystemCallNum = SetYAMLSequence(&rsf->Option.AppendSystemCall,"AppendSystemCall",ctx); //else if(cmpYamlValue("AppendSystemCall",ctx)) rsf->Option.AppendSystemCallNum = SetYAMLSequence(&rsf->Option.AppendSystemCall,"AppendSystemCall",ctx);
else{ else{
@@ -84,18 +84,18 @@ void GET_AccessControlInfo(ctr_yaml_context *ctx, rsf_settings *rsf)
while(ctx->Level == InitLevel){ while(ctx->Level == InitLevel){
if(ctx->error || ctx->done) return; if(ctx->error || ctx->done) return;
// Handle childs // Handle childs
if(cmpYamlValue("DisableDebug",ctx)) rsf->AccessControlInfo.DisableDebug = SetBoolYAMLValue("DisableDebug",ctx); if(cmpYamlValue("DisableDebug",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.DisableDebug,"DisableDebug",ctx);
else if(cmpYamlValue("EnableForceDebug",ctx)) rsf->AccessControlInfo.EnableForceDebug = SetBoolYAMLValue("EnableForceDebug",ctx); else if(cmpYamlValue("EnableForceDebug",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.EnableForceDebug,"EnableForceDebug",ctx);
else if(cmpYamlValue("CanWriteSharedPage",ctx)) rsf->AccessControlInfo.CanWriteSharedPage = SetBoolYAMLValue("CanWriteSharedPage",ctx); else if(cmpYamlValue("CanWriteSharedPage",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.CanWriteSharedPage,"CanWriteSharedPage",ctx);
else if(cmpYamlValue("CanUsePrivilegedPriority",ctx)) rsf->AccessControlInfo.CanUsePrivilegedPriority = SetBoolYAMLValue("CanUsePrivilegedPriority",ctx); else if(cmpYamlValue("CanUsePrivilegedPriority",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.CanUsePrivilegedPriority,"CanUsePrivilegedPriority",ctx);
else if(cmpYamlValue("CanUseNonAlphabetAndNumber",ctx)) rsf->AccessControlInfo.CanUseNonAlphabetAndNumber = SetBoolYAMLValue("CanUseNonAlphabetAndNumber",ctx); else if(cmpYamlValue("CanUseNonAlphabetAndNumber",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.CanUseNonAlphabetAndNumber,"CanUseNonAlphabetAndNumber",ctx);
else if(cmpYamlValue("PermitMainFunctionArgument",ctx)) rsf->AccessControlInfo.PermitMainFunctionArgument = SetBoolYAMLValue("PermitMainFunctionArgument",ctx); else if(cmpYamlValue("PermitMainFunctionArgument",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.PermitMainFunctionArgument,"PermitMainFunctionArgument",ctx);
else if(cmpYamlValue("CanShareDeviceMemory",ctx)) rsf->AccessControlInfo.CanShareDeviceMemory = SetBoolYAMLValue("CanShareDeviceMemory",ctx); else if(cmpYamlValue("CanShareDeviceMemory",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.CanShareDeviceMemory,"CanShareDeviceMemory",ctx);
else if(cmpYamlValue("UseOtherVariationSaveData",ctx)) rsf->AccessControlInfo.UseOtherVariationSaveData = SetBoolYAMLValue("UseOtherVariationSaveData",ctx); else if(cmpYamlValue("UseOtherVariationSaveData",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.UseOtherVariationSaveData,"UseOtherVariationSaveData",ctx);
else if(cmpYamlValue("UseExtSaveData",ctx)) rsf->AccessControlInfo.UseExtSaveData = SetBoolYAMLValue("UseExtSaveData",ctx); else if(cmpYamlValue("UseExtSaveData",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.UseExtSaveData,"UseExtSaveData",ctx);
else if(cmpYamlValue("UseExtendedSaveDataAccessControl",ctx)) rsf->AccessControlInfo.UseExtendedSaveDataAccessControl = SetBoolYAMLValue("UseExtendedSaveDataAccessControl",ctx); else if(cmpYamlValue("UseExtendedSaveDataAccessControl",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.UseExtendedSaveDataAccessControl,"UseExtendedSaveDataAccessControl",ctx);
else if(cmpYamlValue("RunnableOnSleep",ctx)) rsf->AccessControlInfo.RunnableOnSleep = SetBoolYAMLValue("RunnableOnSleep",ctx); else if(cmpYamlValue("RunnableOnSleep",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.RunnableOnSleep,"RunnableOnSleep",ctx);
else if(cmpYamlValue("SpecialMemoryArrange",ctx)) rsf->AccessControlInfo.SpecialMemoryArrange = SetBoolYAMLValue("SpecialMemoryArrange",ctx); else if(cmpYamlValue("SpecialMemoryArrange",ctx)) SetBoolYAMLValue(&rsf->AccessControlInfo.SpecialMemoryArrange,"SpecialMemoryArrange",ctx);
//else if(cmpYamlValue("ProgramId",ctx)) SetSimpleYAMLValue(&rsf->AccessControlInfo.ProgramId,"ProgramId",ctx,0); //else if(cmpYamlValue("ProgramId",ctx)) SetSimpleYAMLValue(&rsf->AccessControlInfo.ProgramId,"ProgramId",ctx,0);
makerom/yamlsettings.h → makerom/rsf_settings.h
View File
makerom/titleid.c
+109 -121
View File
@@ -2,141 +2,153 @@
#include "ncch.h" #include "ncch.h"
#include "titleid.h" #include "titleid.h"
u32 SetPIDCategoryFromName(char *Category); void SetPIDType(u16 *type);
u32 SetPIDCategoryFromFlags(char **CategoryFlags, u32 FlagNum); int SetPIDCategoryFromName(u16 *cat, char *CategoryStr);
u32 SetPIDCategoryFromFlag(u32 Category, u32 Flag, char *FlagName); int SetPIDCategoryFromFlags(u16 *cat, char **CategoryFlags, u32 FlagNum);
int SetPIDCategoryFromFlag(u16 *cat, u16 flag, char *flagName);
u32 SetPIDUniqueId(char *UniqueIdStr); u32 SetPIDUniqueId(char *UniqueIdStr);
u16 SetTitleVariation(u16 Category, rsf_settings *yaml_set); int SetTitleVariation(u8 *var, u16 cat, rsf_settings *rsf);
u64 ConvertTwlIdToCtrId(u64 pgid) u64 ConvertTwlIdToCtrId(u64 pgid)
{ {
return 0x0004800000000000 | (pgid & 0x00007FFFFFFFFFFF); return 0x0004800000000000 | (pgid & 0x00007FFFFFFFFFFF);
} }
int GetProgramID(u64 *dest, rsf_settings *yaml, bool IsForExheader) int GetProgramID(u64 *dest, rsf_settings *rsf, bool IsForExheader)
{ {
if(yaml->TitleInfo.Category && yaml->TitleInfo.CategoryFlags){ int ret;
fprintf(stderr,"[ID ERROR] Can not set \"Cateory\" and \"CategoryFlags\" at the same time.\n"); u32 uniqueId;
return PID_BAD_YAML_SET; u16 type,category;
} u8 variation;
u16 Type = 0x0004;
u32 m_Category = 0;
u32 UniqueId = 0;
u16 m_Variation = 0;
if(rsf->TitleInfo.Category && rsf->TitleInfo.CategoryFlags){
fprintf(stderr,"[ID ERROR] Can not set \"Cateory\" and \"CategoryFlags\" at the same time.\n");
return PID_BAD_RSF_SET;
}
// Getting Type
SetPIDType(&type);
// Getting Category // Getting Category
if(yaml->TitleInfo.Category) if(rsf->TitleInfo.Category)
m_Category = SetPIDCategoryFromName(yaml->TitleInfo.Category); ret = SetPIDCategoryFromName(&category,rsf->TitleInfo.Category);
else if(yaml->TitleInfo.CategoryFlags) else if(rsf->TitleInfo.CategoryFlags)
m_Category = SetPIDCategoryFromFlags(yaml->TitleInfo.CategoryFlags,yaml->TitleInfo.CategoryFlagsNum); ret = SetPIDCategoryFromFlags(&category,rsf->TitleInfo.CategoryFlags,rsf->TitleInfo.CategoryFlagsNum);
if(IsForExheader && yaml->TitleInfo.TargetCategory) if(IsForExheader && rsf->TitleInfo.TargetCategory)
m_Category = SetPIDCategoryFromName(yaml->TitleInfo.TargetCategory); ret = SetPIDCategoryFromName(&category,rsf->TitleInfo.TargetCategory);
if(m_Category == PID_INVALID_CATEGORY) // Error occured if(ret == PID_INVALID_CATEGORY) // Error occured
return PID_BAD_YAML_SET; return PID_BAD_RSF_SET;
// Getting UniqueId // Getting UniqueId
if(yaml->TitleInfo.UniqueId) UniqueId = SetPIDUniqueId(yaml->TitleInfo.UniqueId); if(rsf->TitleInfo.UniqueId)
GetUniqueID(&uniqueId,rsf);
else{ else{
fprintf(stderr,"[ID ERROR] ParameterNotFound: \"TitleInfo/UniqueId\"\n"); fprintf(stderr,"[ID ERROR] ParameterNotFound: \"TitleInfo/UniqueId\"\n");
return PID_BAD_YAML_SET; return PID_BAD_RSF_SET;
} }
m_Variation = SetTitleVariation(m_Category,yaml); // Getting Variation
if(m_Variation == PID_INVALID_VARIATION) // Error occured if(SetTitleVariation(&variation,category,rsf) == PID_INVALID_VARIATION)
return PID_BAD_YAML_SET; return PID_BAD_RSF_SET;
u16 Category = (u16)m_Category; u64 programId = 0;
u8 Variation = (u8)m_Variation; programId |= (u64)variation<<0;
programId |= (u64)uniqueId<<8;
programId |= (u64)category<<32;
programId |= (u64)type<<48;
u64 ProgramID = 0; *dest = programId;
ProgramID |= (u64)Variation<<0;
ProgramID |= (u64)UniqueId<<8;
ProgramID |= (u64)Category<<32;
ProgramID |= (u64)Type<<48;
*dest = ProgramID;
return 0; return 0;
} }
int GetUniqueID(u32 *dest, rsf_settings *yaml) void SetPIDType(u16 *type)
{ {
if(yaml->TitleInfo.UniqueId) *dest = 0xffffff & SetPIDUniqueId(yaml->TitleInfo.UniqueId); *type = 0x0004;
}
int GetUniqueID(u32 *uid, rsf_settings *rsf)
{
if(rsf->TitleInfo.UniqueId) *uid = 0xffffff & SetPIDUniqueId(rsf->TitleInfo.UniqueId);
else{ else{
fprintf(stderr,"[ID ERROR] ParameterNotFound: \"TitleInfo/UniqueId\"\n"); fprintf(stderr,"[ID ERROR] ParameterNotFound: \"TitleInfo/UniqueId\"\n");
return PID_BAD_YAML_SET; return PID_BAD_RSF_SET;
} }
return 0; return 0;
} }
u32 SetPIDCategoryFromName(char *Category) int SetPIDCategoryFromName(u16 *cat, char *CategoryStr)
{ {
if(strcmp(Category,"Application") == 0) return PROGRAM_ID_CATEGORY_APPLICATION; if(strcmp(CategoryStr,"Application") == 0) *cat = PROGRAM_ID_CATEGORY_APPLICATION;
else if(strcmp(Category,"SystemApplication") == 0) return PROGRAM_ID_CATEGORY_SYSTEM_APPLICATION; else if(strcmp(CategoryStr,"SystemApplication") == 0) *cat = PROGRAM_ID_CATEGORY_SYSTEM_APPLICATION;
else if(strcmp(Category,"Applet") == 0) return PROGRAM_ID_CATEGORY_APPLET; else if(strcmp(CategoryStr,"Applet") == 0) *cat = PROGRAM_ID_CATEGORY_APPLET;
else if(strcmp(Category,"Firmware") == 0) return PROGRAM_ID_CATEGORY_FIRMWARE; else if(strcmp(CategoryStr,"Firmware") == 0) *cat = PROGRAM_ID_CATEGORY_FIRMWARE;
else if(strcmp(Category,"Base") == 0) return PROGRAM_ID_CATEGORY_BASE; else if(strcmp(CategoryStr,"Base") == 0) *cat = PROGRAM_ID_CATEGORY_BASE;
else if(strcmp(Category,"DlpChild") == 0) return PROGRAM_ID_CATEGORY_DLP_CHILD; else if(strcmp(CategoryStr,"DlpChild") == 0) *cat = PROGRAM_ID_CATEGORY_DLP_CHILD;
else if(strcmp(Category,"Demo") == 0) return PROGRAM_ID_CATEGORY_DEMO; else if(strcmp(CategoryStr,"Demo") == 0) *cat = PROGRAM_ID_CATEGORY_DEMO;
else if(strcmp(Category,"Contents") == 0) return PROGRAM_ID_CATEGORY_CONTENTS; else if(strcmp(CategoryStr,"Contents") == 0) *cat = PROGRAM_ID_CATEGORY_CONTENTS;
else if(strcmp(Category,"SystemContents") == 0) return PROGRAM_ID_CATEGORY_SYSTEM_CONTENT; else if(strcmp(CategoryStr,"SystemContents") == 0) *cat = PROGRAM_ID_CATEGORY_SYSTEM_CONTENT;
else if(strcmp(Category,"SharedContents") == 0) return PROGRAM_ID_CATEGORY_SHARED_CONTENT; else if(strcmp(CategoryStr,"SharedContents") == 0) *cat = PROGRAM_ID_CATEGORY_SHARED_CONTENT;
else if(strcmp(Category,"AddOnContents") == 0) return PROGRAM_ID_CATEGORY_ADD_ON_CONTENTS; else if(strcmp(CategoryStr,"AddOnContents") == 0) *cat = PROGRAM_ID_CATEGORY_ADD_ON_CONTENTS;
else if(strcmp(Category,"Patch") == 0) return PROGRAM_ID_CATEGORY_PATCH; else if(strcmp(CategoryStr,"Patch") == 0) *cat = PROGRAM_ID_CATEGORY_PATCH;
else if(strcmp(Category,"AutoUpdateContents") == 0) return PROGRAM_ID_CATEGORY_AUTO_UPDATE_CONTENT; else if(strcmp(CategoryStr,"AutoUpdateContents") == 0) *cat = PROGRAM_ID_CATEGORY_AUTO_UPDATE_CONTENT;
else { else {
fprintf(stderr,"[ID ERROR] Invalid Category: \"%s\"\n",Category); fprintf(stderr,"[ID ERROR] Invalid Category: \"%s\"\n",CategoryStr);
return PID_INVALID_CATEGORY; return PID_INVALID_CATEGORY;
} }
return 0;
} }
u32 SetPIDCategoryFromFlags(char **CategoryFlags, u32 FlagNum) int SetPIDCategoryFromFlags(u16 *cat, char **CategoryFlags, u32 FlagNum)
{ {
u32 Category = 0; int ret = 0;
for(u32 i = 0; i < FlagNum; i++){ for(u32 i = 0; i < FlagNum; i++){
if(strcmp(CategoryFlags[i],"Normal") == 0) if(strcmp(CategoryFlags[i],"Normal") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_NORMAL,"Normal"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_NORMAL,"Normal");
else if(strcmp(CategoryFlags[i],"DlpChild") == 0) else if(strcmp(CategoryFlags[i],"DlpChild") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_DLP_CHILD,"DlpChild"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_DLP_CHILD,"DlpChild");
else if(strcmp(CategoryFlags[i],"Demo") == 0) else if(strcmp(CategoryFlags[i],"Demo") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_DEMO,"Demo"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_DEMO,"Demo");
else if(strcmp(CategoryFlags[i],"Contents") == 0) else if(strcmp(CategoryFlags[i],"Contents") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_CONTENTS,"Contents"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_CONTENTS,"Contents");
else if(strcmp(CategoryFlags[i],"AddOnContents") == 0) else if(strcmp(CategoryFlags[i],"AddOnContents") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_ADD_ON_CONTENTS,"AddOnContents"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_ADD_ON_CONTENTS,"AddOnContents");
else if(strcmp(CategoryFlags[i],"Patch") == 0) else if(strcmp(CategoryFlags[i],"Patch") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_PATCH,"Patch"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_PATCH,"Patch");
else if(strcmp(CategoryFlags[i],"CannotExecution") == 0) else if(strcmp(CategoryFlags[i],"CannotExecution") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_CANNOT_EXECUTION,"CannotExecution"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_CANNOT_EXECUTION,"CannotExecution");
else if(strcmp(CategoryFlags[i],"System") == 0) else if(strcmp(CategoryFlags[i],"System") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_SYSTEM,"System"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_SYSTEM,"System");
else if(strcmp(CategoryFlags[i],"RequireBatchUpdate") == 0) else if(strcmp(CategoryFlags[i],"RequireBatchUpdate") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_REQUIRE_BATCH_UPDATE,"RequireBatchUpdate"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_REQUIRE_BATCH_UPDATE,"RequireBatchUpdate");
else if(strcmp(CategoryFlags[i],"NotRequireUserApproval") == 0) else if(strcmp(CategoryFlags[i],"NotRequireUserApproval") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_NOT_REQUIRE_USER_APPROVAL,"NotRequireUserApproval"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_NOT_REQUIRE_USER_APPROVAL,"NotRequireUserApproval");
else if(strcmp(CategoryFlags[i],"NotRequireRightForMount") == 0) else if(strcmp(CategoryFlags[i],"NotRequireRightForMount") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_NOT_REQUIRE_RIGHT_FOR_MOUNT,"NotRequireRightForMount"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_NOT_REQUIRE_RIGHT_FOR_MOUNT,"NotRequireRightForMount");
else if(strcmp(CategoryFlags[i],"CanSkipConvertJumpId") == 0) else if(strcmp(CategoryFlags[i],"CanSkipConvertJumpId") == 0)
Category = SetPIDCategoryFromFlag(Category,PROGRAM_ID_CATEGORY_FLAG_CAN_SKIP_CONVERT_JUMP_ID,"CanSkipConvertJumpId"); ret = SetPIDCategoryFromFlag(cat,PROGRAM_ID_CATEGORY_FLAG_CAN_SKIP_CONVERT_JUMP_ID,"CanSkipConvertJumpId");
if(ret == PID_INVALID_CATEGORY) break;
else { else {
fprintf(stderr,"[ID ERROR] Invalid CategoryFlag: \"%s\"\n",CategoryFlags[i]); fprintf(stderr,"[ID ERROR] Invalid CategoryFlag: \"%s\"\n",CategoryFlags[i]);
return PID_INVALID_CATEGORY; return PID_INVALID_CATEGORY;
} }
if(Category == PID_INVALID_CATEGORY) return PID_INVALID_CATEGORY;
} }
return Category; return ret;
} }
u32 SetPIDCategoryFromFlag(u32 Category, u32 Flag, char *FlagName) int SetPIDCategoryFromFlag(u16 *cat, u16 flag, char *flagName)
{ {
if(!Flag) return Category; if(!flag) return 0;
if((Category & Flag) == Flag){ if((*cat & flag) == flag){
fprintf(stderr,"[ID ERROR] Failed to set \"%s\" for category. CategoryFlag was already set.\n",FlagName); fprintf(stderr,"[ID ERROR] Failed to set \"%s\" for category. CategoryFlag was already set.\n",flagName);
return PID_INVALID_CATEGORY; return PID_INVALID_CATEGORY;
} }
return Category |= Flag; *cat |= flag;
return 0;
} }
u32 SetPIDUniqueId(char *UniqueIdStr) u32 SetPIDUniqueId(char *UniqueIdStr)
@@ -144,16 +156,16 @@ u32 SetPIDUniqueId(char *UniqueIdStr)
return 0xffffff & strtoull(UniqueIdStr,NULL,0); return 0xffffff & strtoull(UniqueIdStr,NULL,0);
} }
u16 SetTitleVariation(u16 Category, rsf_settings *yaml_set) int SetTitleVariation(u8 *var, u16 cat, rsf_settings *rsf)
{ {
if(IsDemo(Category)){ if(IsDemo(cat)){
if(yaml_set->TitleInfo.DemoIndex){ if(rsf->TitleInfo.DemoIndex){
u16 DemoIndex = strtol(yaml_set->TitleInfo.DemoIndex,NULL,10); u8 DemoIndex = 0xff & strtol(rsf->TitleInfo.DemoIndex,NULL,10);
if(DemoIndex > 255 || DemoIndex == 0){ if(DemoIndex == 0){
fprintf(stderr,"[ID ERROR] Invalid demo index \"%d\"\n",DemoIndex); fprintf(stderr,"[ID ERROR] Invalid demo index \"%d\"\n",DemoIndex);
return PID_INVALID_VARIATION; return PID_INVALID_VARIATION;
} }
return DemoIndex; *var = DemoIndex;
} }
else{ else{
fprintf(stderr,"[ID ERROR] ParameterNotFound: \"TitleInfo/DemoIndex\"\n"); fprintf(stderr,"[ID ERROR] ParameterNotFound: \"TitleInfo/DemoIndex\"\n");
@@ -161,55 +173,31 @@ u16 SetTitleVariation(u16 Category, rsf_settings *yaml_set)
} }
} }
else if(IsDlpChild(Category)){ else if(IsDlpChild(cat)){
if(yaml_set->TitleInfo.ChildIndex){ if(rsf->TitleInfo.ChildIndex)
u16 ChildIndex = strtol(yaml_set->TitleInfo.ChildIndex,NULL,10); *var = 0xff & strtol(rsf->TitleInfo.ChildIndex,NULL,10);
if(ChildIndex > 255){
fprintf(stderr,"[ID ERROR] Invalid child index \"%d\"\n",ChildIndex);
return PID_INVALID_VARIATION;
}
return ChildIndex;
}
else else
return 0; *var = 0;
} }
else if(IsAddOnContent(Category)){ else if(IsAddOnContent(cat)){
if(yaml_set->TitleInfo.Variation){ // Might Rename to DataTitleIndex if(rsf->TitleInfo.Variation) // Might Rename to DataTitleIndex
u16 DataTitleIndex = strtol(yaml_set->TitleInfo.Variation,NULL,10); *var = 0xff & strtol(rsf->TitleInfo.Variation,NULL,10);
if(DataTitleIndex > 255){
fprintf(stderr,"[ID ERROR] Invalid variation \"%d\"\n",DataTitleIndex);
return PID_INVALID_VARIATION;
}
return DataTitleIndex;
}
else else
return 0; *var = 0;
} }
else if(IsContents(Category)){ else if(IsContents(cat)){
if(yaml_set->TitleInfo.ContentsIndex){ if(rsf->TitleInfo.ContentsIndex)
u16 ContentsIndex = strtol(yaml_set->TitleInfo.ContentsIndex,NULL,10); *var = 0xff & strtol(rsf->TitleInfo.ContentsIndex,NULL,10);
if(ContentsIndex > 255){
fprintf(stderr,"[ID ERROR] Invalid content index \"%d\"\n",ContentsIndex);
return PID_INVALID_VARIATION;
}
return ContentsIndex;
}
else else
return 0; *var = 0;
} }
else{ else{
if(yaml_set->TitleInfo.Version){ if(rsf->TitleInfo.Version)
u16 Version = strtol(yaml_set->TitleInfo.Version,NULL,10); *var = 0xff & strtol(rsf->TitleInfo.Version,NULL,10);
if(Version > 255){
fprintf(stderr,"[ID ERROR] Invalid Version \"%d\"\n",Version);
return PID_INVALID_VARIATION;
}
return Version;
}
else else
return 0; *var = 0;
} }
return PID_INVALID_VARIATION; return 0;
} }
bool IsDemo(u16 Category) bool IsDemo(u16 Category)
makerom/titleid.h
+6 -6
View File
@@ -2,10 +2,10 @@
typedef enum typedef enum
{ {
PID_BAD_YAML_SET = -1, PID_BAD_RSF_SET = -1,
PID_INVALID_CATEGORY = 0x10000, PID_INVALID_CATEGORY = -2,
PID_INVALID_UNIQUE_ID = 0x1000000, PID_INVALID_UNIQUE_ID = -3,
PID_INVALID_VARIATION = 0x100, PID_INVALID_VARIATION = -4,
} Pid_Errors; } Pid_Errors;
typedef enum typedef enum
@@ -85,8 +85,8 @@ typedef enum
u64 ConvertTwlIdToCtrId(u64 pgid); u64 ConvertTwlIdToCtrId(u64 pgid);
int GetProgramID(u64 *dest, rsf_settings *yaml, bool IsForExheader); int GetProgramID(u64 *dest, rsf_settings *rsf, bool IsForExheader);
int GetUniqueID(u32 *dest, rsf_settings *yaml); int GetUniqueID(u32 *dest, rsf_settings *rsf);
bool IsDemo(u16 Category); bool IsDemo(u16 Category);
bool IsSystem(u16 Category); bool IsSystem(u16 Category);
makerom/usersettings.c → makerom/user_settings.c
View File
makerom/usersettings.h → makerom/user_settings.h
View File
makerom/yaml_ctr.c → makerom/yaml_parser.c
+12 -8
View File
@@ -1,5 +1,5 @@
#include "lib.h" #include "lib.h"
#include "yamlsettings.h" #include "rsf_settings.h"
// Private Prototypes // Private Prototypes
void InitYamlContext(ctr_yaml_context *ctx); void InitYamlContext(ctr_yaml_context *ctx);
@@ -410,10 +410,10 @@ void SetSimpleYAMLValue(char **dest, char *key, ctr_yaml_context *ctx, u32 size_
} }
bool SetBoolYAMLValue(char *key, ctr_yaml_context *ctx) void SetBoolYAMLValue(bool *dest, char *key, ctr_yaml_context *ctx)
{ {
GetEvent(ctx); GetEvent(ctx);
if(ctx->error || ctx->done) return false; if(ctx->error || ctx->done) return;
if(!EventIsScalar(ctx)){ if(!EventIsScalar(ctx)){
fprintf(stderr,"[RSF ERROR] '%s' requires a value\n",key); fprintf(stderr,"[RSF ERROR] '%s' requires a value\n",key);
ctx->error = YAML_BAD_FORMATTING; ctx->error = YAML_BAD_FORMATTING;
@@ -425,12 +425,16 @@ bool SetBoolYAMLValue(char *key, ctr_yaml_context *ctx)
return false; return false;
} }
if(casecmpYamlValue("true",ctx)) return true; if(casecmpYamlValue("true",ctx))
if(casecmpYamlValue("false",ctx)) return false; *dest = true;
else if(casecmpYamlValue("false",ctx))
*dest = false;
else{
fprintf(stderr,"[RSF ERROR] Invalid '%s'\n",key);
ctx->error = YAML_BAD_FORMATTING;
}
fprintf(stderr,"[RSF ERROR] Invalid '%s'\n",key); return;
ctx->error = YAML_BAD_FORMATTING;
return false;
} }
makerom/yaml_ctr.h → makerom/yaml_parser.h
+1 -1
View File
@@ -54,7 +54,7 @@ bool CheckSequenceEvent(ctr_yaml_context *ctx); // With extra implement, use if
// Functions which store values // Functions which store values
void SetSimpleYAMLValue(char **dest, char *key, ctr_yaml_context *ctx, u32 size_limit); void SetSimpleYAMLValue(char **dest, char *key, ctr_yaml_context *ctx, u32 size_limit);
bool SetBoolYAMLValue(char *key, ctr_yaml_context *ctx); void SetBoolYAMLValue(bool *dest, char *key, ctr_yaml_context *ctx);
u32 SetYAMLSequence(char ***dest, char *key, ctr_yaml_context *ctx); u32 SetYAMLSequence(char ***dest, char *key, ctr_yaml_context *ctx);
u32 SetYAMLSequenceFromMapping(char ***dest, char *key, ctr_yaml_context *ctx, bool StoreKey); u32 SetYAMLSequenceFromMapping(char ***dest, char *key, ctr_yaml_context *ctx, bool StoreKey);
//void SkipYAMLGroup(ctr_yaml_context *ctx); //void SkipYAMLGroup(ctr_yaml_context *ctx);