From 8c9ef2eef4f876204701140d2ef9fb1725987636 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Fri, 17 Apr 2015 23:16:55 +0300 Subject: [PATCH] Compilation fix --- rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp | 262 ++++++++++---------- rpcs3/Emu/SysCalls/Modules/cellVdec.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellVdec.h | 12 +- 3 files changed, 138 insertions(+), 138 deletions(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp index 18f311c135..f9beb90c6b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp @@ -200,7 +200,7 @@ __noinline s32 savedata_op( if (funcList) { vm::stackvar listSet(CPU); - + // List Callback funcList(CPU, result, listGet, listSet); @@ -340,161 +340,163 @@ __noinline s32 savedata_op( save_entry.dirName = std::move(save_entries[selected < save_entries.size() ? selected : throw __FUNCTION__].dirName); } } - + if (dirName) { save_entry.dirName = dirName.get_ptr(); } // get save stats - vm::stackvar statGet(CPU); - vm::stackvar statSet(CPU); - std::string dir_path = base_dir + save_entry.dirName + "/"; std::string sfo_path = dir_path + "PARAM.SFO"; - vfsFile f(sfo_path); - PSFLoader psf(f); - f.Close(); - - std::string dir_local_path; - - Emu.GetVFS().GetDevice(dir_path, dir_local_path); - - FileInfo dir_info = {}; - - get_file_info(dir_local_path, dir_info); - - statGet->hddFreeSizeKB = 40 * 1024 * 1024; // 40 GB - statGet->isNewData = save_entry.isNew = !psf; - - statGet->dir.atime = save_entry.atime = dir_info.atime; - statGet->dir.mtime = save_entry.mtime = dir_info.mtime; - statGet->dir.ctime = save_entry.ctime = dir_info.ctime; - strcpy_trunc(statGet->dir.dirName, save_entry.dirName); - - statGet->getParam.attribute = psf.GetInteger("ATTRIBUTE"); // ??? - strcpy_trunc(statGet->getParam.title, save_entry.title = psf.GetString("TITLE")); - strcpy_trunc(statGet->getParam.subTitle, save_entry.subtitle = psf.GetString("SUB_TITLE")); - strcpy_trunc(statGet->getParam.detail, save_entry.details = psf.GetString("DETAIL")); - strcpy_trunc(statGet->getParam.listParam, save_entry.listParam = psf.GetString("SAVEDATA_LIST_PARAM")); - - statGet->bind = 0; - statGet->sizeKB = save_entry.size / 1024; - statGet->sysSizeKB = 0; // This is the size of system files, but PARAM.SFO is very small and PARAM.PDF is not used - - statGet->fileNum = 0; - statGet->fileList.set(setBuf->buf.addr()); - statGet->fileListNum = 0; - memset(statGet->reserved, 0, sizeof(statGet->reserved)); - - auto file_list = statGet->fileList.get_ptr(); - - for (const auto entry : vfsDir(dir_path)) { - // only files, system files ignored, fileNum is limited by setBuf->fileListMax - if (entry->flags & DirEntry_TypeFile && entry->name != "PARAM.SFO" && statGet->fileListNum++ < setBuf->fileListMax) - { - statGet->fileNum++; + vm::stackvar statGet(CPU); + vm::stackvar statSet(CPU); - auto& file = *file_list++; + vfsFile f(sfo_path); + PSFLoader psf(f); + f.Close(); - if (entry->name == "ICON0.PNG") - { - file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_ICON0; - } - else if (entry->name == "ICON1.PAM") - { - file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_ICON1; - } - else if (entry->name == "PIC1.PNG") - { - file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_PIC1; - } - else if (entry->name == "SND0.AT3") - { - file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_SND0; - } - else - { - file.fileType = CELL_SAVEDATA_FILETYPE_NORMALFILE; // protected files are not supported - } + std::string dir_local_path; - file.size = entry->size; - file.atime = entry->access_time; - file.mtime = entry->modify_time; - file.ctime = entry->create_time; - strcpy_trunc(file.fileName, entry->name); - } - } + Emu.GetVFS().GetDevice(dir_path, dir_local_path); - // Stat Callback - funcStat(CPU, result, statGet, statSet); + FileInfo dir_info = {}; - if (result->result < 0) - { - return CELL_SAVEDATA_ERROR_CBRESULT; - } + get_file_info(dir_local_path, dir_info); - // Update PARAM.SFO - if (statSet->setParam) - { - psf.Clear(); - psf.SetString("ACCOUNT_ID", ""); // ??? - psf.SetInteger("ATTRIBUTE", statSet->setParam->attribute); - psf.SetString("CATEGORY", "SD"); // ??? - psf.SetString("PARAMS", ""); // ??? - psf.SetString("PARAMS2", ""); // ??? - psf.SetInteger("PARENTAL_LEVEL", 0); // ??? - psf.SetString("DETAIL", statSet->setParam->detail); - psf.SetString("SAVEDATA_DIRECTORY", save_entry.dirName); - psf.SetString("SAVEDATA_LIST_PARAM", statSet->setParam->listParam); - psf.SetString("SUB_TITLE", statSet->setParam->subTitle); - psf.SetString("TITLE", statSet->setParam->title); - } + statGet->hddFreeSizeKB = 40 * 1024 * 1024; // 40 GB + statGet->isNewData = save_entry.isNew = !psf; + + statGet->dir.atime = save_entry.atime = dir_info.atime; + statGet->dir.mtime = save_entry.mtime = dir_info.mtime; + statGet->dir.ctime = save_entry.ctime = dir_info.ctime; + strcpy_trunc(statGet->dir.dirName, save_entry.dirName); + + statGet->getParam.attribute = psf.GetInteger("ATTRIBUTE"); // ??? + strcpy_trunc(statGet->getParam.title, save_entry.title = psf.GetString("TITLE")); + strcpy_trunc(statGet->getParam.subTitle, save_entry.subtitle = psf.GetString("SUB_TITLE")); + strcpy_trunc(statGet->getParam.detail, save_entry.details = psf.GetString("DETAIL")); + strcpy_trunc(statGet->getParam.listParam, save_entry.listParam = psf.GetString("SAVEDATA_LIST_PARAM")); + + statGet->bind = 0; + statGet->sizeKB = save_entry.size / 1024; + statGet->sysSizeKB = 0; // This is the size of system files, but PARAM.SFO is very small and PARAM.PDF is not used + + statGet->fileNum = 0; + statGet->fileList.set(setBuf->buf.addr()); + statGet->fileListNum = 0; + memset(statGet->reserved, 0, sizeof(statGet->reserved)); + + auto file_list = statGet->fileList.get_ptr(); - switch (const auto mode = statSet->reCreateMode & 0xffff) - { - case CELL_SAVEDATA_RECREATE_NO: - case CELL_SAVEDATA_RECREATE_NO_NOBROKEN: - { - break; - } - case CELL_SAVEDATA_RECREATE_YES: - case CELL_SAVEDATA_RECREATE_YES_RESET_OWNER: - { - // kill it with fire for (const auto entry : vfsDir(dir_path)) { - if (entry->flags & DirEntry_TypeFile) + // only files, system files ignored, fileNum is limited by setBuf->fileListMax + if (entry->flags & DirEntry_TypeFile && entry->name != "PARAM.SFO" && statGet->fileListNum++ < setBuf->fileListMax) { - Emu.GetVFS().RemoveFile(dir_path + entry->name); + statGet->fileNum++; + + auto& file = *file_list++; + + if (entry->name == "ICON0.PNG") + { + file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_ICON0; + } + else if (entry->name == "ICON1.PAM") + { + file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_ICON1; + } + else if (entry->name == "PIC1.PNG") + { + file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_PIC1; + } + else if (entry->name == "SND0.AT3") + { + file.fileType = CELL_SAVEDATA_FILETYPE_CONTENT_SND0; + } + else + { + file.fileType = CELL_SAVEDATA_FILETYPE_NORMALFILE; // protected files are not supported + } + + file.size = entry->size; + file.atime = entry->access_time; + file.mtime = entry->modify_time; + file.ctime = entry->create_time; + strcpy_trunc(file.fileName, entry->name); } } - break; - } - default: - { - cellSysutil.Error("savedata_op(): unknown statSet->reCreateMode (0x%x)", statSet->reCreateMode); - return CELL_SAVEDATA_ERROR_PARAM; - } - } + // Stat Callback + funcStat(CPU, result, statGet, statSet); - // Create save directory if necessary - if (save_entry.isNew && !Emu.GetVFS().CreateDir(dir_path)) - { - // error - } + if (result->result < 0) + { + return CELL_SAVEDATA_ERROR_CBRESULT; + } - // Write PARAM.SFO - if (psf) - { - Emu.GetVFS().CreateFile(sfo_path, true); + // Update PARAM.SFO + if (statSet->setParam) + { + psf.Clear(); + psf.SetString("ACCOUNT_ID", ""); // ??? + psf.SetInteger("ATTRIBUTE", statSet->setParam->attribute); + psf.SetString("CATEGORY", "SD"); // ??? + psf.SetString("PARAMS", ""); // ??? + psf.SetString("PARAMS2", ""); // ??? + psf.SetInteger("PARENTAL_LEVEL", 0); // ??? + psf.SetString("DETAIL", statSet->setParam->detail); + psf.SetString("SAVEDATA_DIRECTORY", save_entry.dirName); + psf.SetString("SAVEDATA_LIST_PARAM", statSet->setParam->listParam); + psf.SetString("SUB_TITLE", statSet->setParam->subTitle); + psf.SetString("TITLE", statSet->setParam->title); + } - f.Open(sfo_path, vfsWrite); - psf.Save(f); - f.Close(); + switch (const auto mode = statSet->reCreateMode & 0xffff) + { + case CELL_SAVEDATA_RECREATE_NO: + case CELL_SAVEDATA_RECREATE_NO_NOBROKEN: + { + break; + } + case CELL_SAVEDATA_RECREATE_YES: + case CELL_SAVEDATA_RECREATE_YES_RESET_OWNER: + { + // kill it with fire + for (const auto entry : vfsDir(dir_path)) + { + if (entry->flags & DirEntry_TypeFile) + { + Emu.GetVFS().RemoveFile(dir_path + entry->name); + } + } + + break; + } + default: + { + cellSysutil.Error("savedata_op(): unknown statSet->reCreateMode (0x%x)", statSet->reCreateMode); + return CELL_SAVEDATA_ERROR_PARAM; + } + } + + // Create save directory if necessary + if (save_entry.isNew && !Emu.GetVFS().CreateDir(dir_path)) + { + // error + } + + // Write PARAM.SFO + if (psf) + { + Emu.GetVFS().CreateFile(sfo_path, true); + + f.Open(sfo_path, vfsWrite); + psf.Save(f); + f.Close(); + } } // Enter the loop where the save files are read/created/deleted diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp index f729a19429..f0f2f2247b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp @@ -713,7 +713,7 @@ s32 cellVdecGetPicture(u32 handle, vm::ptr format, vm:: std::unique_ptr alpha_plane; - switch (const auto type = format->formatType) + switch (const u32 type = format->formatType) { case CELL_VDEC_PICFMT_ARGB32_ILV: out_f = AV_PIX_FMT_ARGB; alpha_plane.reset(new u8[w * h]); break; case CELL_VDEC_PICFMT_RGBA32_ILV: out_f = AV_PIX_FMT_RGBA; alpha_plane.reset(new u8[w * h]); break; diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.h b/rpcs3/Emu/SysCalls/Modules/cellVdec.h index dabcee24ff..66de0968fe 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.h @@ -12,7 +12,7 @@ enum CELL_VDEC_ERROR_FATAL = 0x80610180, }; -enum CellVdecCodecType +enum CellVdecCodecType : u32 { CELL_VDEC_CODEC_TYPE_MPEG2 = 0x00000000, CELL_VDEC_CODEC_TYPE_AVC = 0x00000001, @@ -20,7 +20,7 @@ enum CellVdecCodecType }; // Callback Messages -enum CellVdecMsgType +enum CellVdecMsgType : u32 { CELL_VDEC_MSG_TYPE_AUDONE, // decoding finished CELL_VDEC_MSG_TYPE_PICOUT, // picture done @@ -37,7 +37,7 @@ enum CellVdecDecodeMode : u32 }; // Output Picture Format Type -enum CellVdecPicFormatType +enum CellVdecPicFormatType : u32 { CELL_VDEC_PICFMT_ARGB32_ILV, CELL_VDEC_PICFMT_RGBA32_ILV, @@ -46,13 +46,13 @@ enum CellVdecPicFormatType }; // Output Color Matrix Coef -enum CellVdecColorMatrixType +enum CellVdecColorMatrixType : u32 { CELL_VDEC_COLOR_MATRIX_TYPE_BT601, CELL_VDEC_COLOR_MATRIX_TYPE_BT709, }; -enum CellVdecPicAttr +enum CellVdecPicAttr : u32 { CELL_VDEC_PICITEM_ATTR_NORMAL, CELL_VDEC_PICITEM_ATTR_SKIPPED, @@ -358,8 +358,6 @@ struct CellVdecAvcInfo be_t reserved[2]; }; -const int sz = sizeof(CellVdecAvcInfo); - // DIVX Profile enum DIVX_level : u8 {