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

misc

Browse Source
This commit is contained in:
applestash
2014-09-01 13:05:05 +10:00
parent b795e7579e
commit 030b638c92
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/ncch.c
+5 -12
View File
@@ -19,7 +19,6 @@ int CheckCFASignature(ncch_hdr *hdr, keys_struct *keys);
int SignCXI(ncch_hdr *hdr, keys_struct *keys); int SignCXI(ncch_hdr *hdr, keys_struct *keys);
int CheckCXISignature(ncch_hdr *hdr, u8 *pubk); int CheckCXISignature(ncch_hdr *hdr, u8 *pubk);
void InitNcchSettings(ncch_settings *set);
void FreeNcchSettings(ncch_settings *set); void FreeNcchSettings(ncch_settings *set);
int GetNcchSettings(ncch_settings *ncchset, user_settings *usrset); int GetNcchSettings(ncch_settings *ncchset, user_settings *usrset);
int GetBasicOptions(ncch_settings *ncchset, user_settings *usrset); int GetBasicOptions(ncch_settings *ncchset, user_settings *usrset);
@@ -71,7 +70,6 @@ int build_NCCH(user_settings *usrset)
fprintf(stderr,"[NCCH ERROR] Not enough memory\n"); fprintf(stderr,"[NCCH ERROR] Not enough memory\n");
return MEM_ERROR; return MEM_ERROR;
} }
InitNcchSettings(ncchset);
// Get Settings // Get Settings
result = GetNcchSettings(ncchset,usrset); result = GetNcchSettings(ncchset,usrset);
@@ -126,11 +124,6 @@ finish:
return result; return result;
} }
void InitNcchSettings(ncch_settings *set)
{
memset(set,0,sizeof(ncch_settings));
}
void FreeNcchSettings(ncch_settings *set) void FreeNcchSettings(ncch_settings *set)
{ {
if(set->componentFilePtrs.elf) fclose(set->componentFilePtrs.elf); if(set->componentFilePtrs.elf) fclose(set->componentFilePtrs.elf);
@@ -193,7 +186,7 @@ int GetBasicOptions(ncch_settings *ncchset, user_settings *usrset)
if(ncchset->options.IsCfa && !ncchset->options.UseRomFS){ if(ncchset->options.IsCfa && !ncchset->options.UseRomFS){
fprintf(stderr,"[NCCH ERROR] \"Rom/HostRoot\" must be set\n"); fprintf(stderr,"[NCCH ERROR] \"Rom/HostRoot\" must be set\n");
return NCCH_BAD_YAML_SET; return NCCH_BAD_RSF_SET;
} }
return result; return result;
@@ -352,7 +345,7 @@ int ImportLogo(ncch_settings *set)
} }
else if(strcasecmp(set->rsfSet->BasicInfo.Logo,"none") != 0){ else if(strcasecmp(set->rsfSet->BasicInfo.Logo,"none") != 0){
fprintf(stderr,"[NCCH ERROR] Invalid logo name\n"); fprintf(stderr,"[NCCH ERROR] Invalid logo name\n");
return NCCH_BAD_YAML_SET; return NCCH_BAD_RSF_SET;
} }
} }
return 0; return 0;
@@ -602,7 +595,7 @@ int SetCommonHeaderBasicData(ncch_settings *set, ncch_hdr *hdr)
if(set->rsfSet->BasicInfo.ProductCode){ if(set->rsfSet->BasicInfo.ProductCode){
if(!IsValidProductCode((char*)set->rsfSet->BasicInfo.ProductCode,set->options.FreeProductCode)){ if(!IsValidProductCode((char*)set->rsfSet->BasicInfo.ProductCode,set->options.FreeProductCode)){
fprintf(stderr,"[NCCH ERROR] Invalid Product Code\n"); fprintf(stderr,"[NCCH ERROR] Invalid Product Code\n");
return NCCH_BAD_YAML_SET; return NCCH_BAD_RSF_SET;
} }
memcpy(hdr->productCode,set->rsfSet->BasicInfo.ProductCode,strlen((char*)set->rsfSet->BasicInfo.ProductCode)); memcpy(hdr->productCode,set->rsfSet->BasicInfo.ProductCode,strlen((char*)set->rsfSet->BasicInfo.ProductCode));
} }
@@ -611,7 +604,7 @@ int SetCommonHeaderBasicData(ncch_settings *set, ncch_hdr *hdr)
if(set->rsfSet->BasicInfo.CompanyCode){ if(set->rsfSet->BasicInfo.CompanyCode){
if(strlen((char*)set->rsfSet->BasicInfo.CompanyCode) != 2){ if(strlen((char*)set->rsfSet->BasicInfo.CompanyCode) != 2){
fprintf(stderr,"[NCCH ERROR] CompanyCode length must be 2\n"); fprintf(stderr,"[NCCH ERROR] CompanyCode length must be 2\n");
return NCCH_BAD_YAML_SET; return NCCH_BAD_RSF_SET;
} }
memcpy(hdr->makerCode,set->rsfSet->BasicInfo.CompanyCode,2); memcpy(hdr->makerCode,set->rsfSet->BasicInfo.CompanyCode,2);
} }
@@ -657,7 +650,7 @@ int SetCommonHeaderBasicData(ncch_settings *set, ncch_hdr *hdr)
else if(strcmp(set->rsfSet->BasicInfo.ContentType,"Trial") == 0) hdr->flags[ncchflag_CONTENT_TYPE] |= content_Trial; else if(strcmp(set->rsfSet->BasicInfo.ContentType,"Trial") == 0) hdr->flags[ncchflag_CONTENT_TYPE] |= content_Trial;
else{ else{
fprintf(stderr,"[NCCH ERROR] Invalid ContentType '%s'\n",set->rsfSet->BasicInfo.ContentType); fprintf(stderr,"[NCCH ERROR] Invalid ContentType '%s'\n",set->rsfSet->BasicInfo.ContentType);
return NCCH_BAD_YAML_SET; return NCCH_BAD_RSF_SET;
} }
} }
makerom/ncch.h
+1 -1
View File
@@ -20,7 +20,7 @@ typedef enum
EXEFS_CORRUPT = -14, EXEFS_CORRUPT = -14,
ROMFS_CORRUPT = -15, ROMFS_CORRUPT = -15,
// Others // Others
NCCH_BAD_YAML_SET = -16, NCCH_BAD_RSF_SET = -16,
DATA_POS_DNE = -17, DATA_POS_DNE = -17,
} ncch_errors; } ncch_errors;