OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erpt: remove deprecated fields, they didn't actually change IDs, just the mapping between id and name table index

Browse Source
This commit is contained in:
Michael Scire
2023-10-11 17:48:40 -07:00
parent cefedb4055
commit 0569392faf
10 changed files with 719 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libraries/libstratosphere/include/stratosphere/erpt/srv/erpt_srv_types.hpp
View File

@@ -49,10 +49,6 @@ namespace ams::erpt::srv {
AMS_ERPT_FOREACH_FIELD(STRINGIZE_HANDLER)
};
constexpr inline const char * const DeprecatedFieldString[] = {
AMS_ERPT_FOREACH_DEPRECATED_FIELD(STRINGIZE_HANDLER)
};
constexpr inline const char * const CategoryString[] = {
AMS_ERPT_FOREACH_CATEGORY(STRINGIZE_HANDLER)
};
@@ -80,49 +76,16 @@ namespace ams::erpt::srv {
};
#undef GET_FIELD_FLAG
#define GET_FIELD_CATEGORY(FIELD, ID, CATEGORY, TYPE, FLAG) [DeprecatedFieldId_##FIELD] = CategoryId_##CATEGORY,
constexpr inline const CategoryId DeprecatedFieldToCategoryMap[] = {
AMS_ERPT_FOREACH_DEPRECATED_FIELD(GET_FIELD_CATEGORY)
};
#undef GET_FIELD_CATEGORY
#define GET_FIELD_TYPE(FIELD, ID, CATEGORY, TYPE, FLAG) [DeprecatedFieldId_##FIELD] = TYPE,
constexpr inline const FieldType DeprecatedFieldToTypeMap[] = {
AMS_ERPT_FOREACH_DEPRECATED_FIELD(GET_FIELD_TYPE)
};
#undef GET_FIELD_TYPE
#define GET_FIELD_FLAG(FIELD, ID, CATEGORY, TYPE, FLAG) [DeprecatedFieldId_##FIELD] = FLAG,
constexpr inline const FieldFlag DeprecatedFieldToFlagMap[] = {
AMS_ERPT_FOREACH_DEPRECATED_FIELD(GET_FIELD_FLAG)
};
#undef GET_FIELD_FLAG
inline CategoryId ConvertFieldToCategory(FieldId id) {
if (hos::GetVersion() >= hos::Version_17_0_0) {
return FieldToCategoryMap[id];
} else {
AMS_ABORT_UNLESS(util::ToUnderlying(id) < util::ToUnderlying(DeprecatedFieldId_Count));
return DeprecatedFieldToCategoryMap[id];
}
return FieldToCategoryMap[id];
}
inline FieldType ConvertFieldToType(FieldId id) {
if (hos::GetVersion() >= hos::Version_17_0_0) {
return FieldToTypeMap[id];
} else {
AMS_ABORT_UNLESS(util::ToUnderlying(id) < util::ToUnderlying(DeprecatedFieldId_Count));
return DeprecatedFieldToTypeMap[id];
}
return FieldToTypeMap[id];
}
inline FieldFlag ConvertFieldToFlag(FieldId id) {
if (hos::GetVersion() >= hos::Version_17_0_0) {
return FieldToFlagMap[id];
} else {
AMS_ABORT_UNLESS(util::ToUnderlying(id) < util::ToUnderlying(DeprecatedFieldId_Count));
return DeprecatedFieldToFlagMap[id];
}
return FieldToFlagMap[id];
}
constexpr inline ReportFlagSet MakeNoReportFlags() {