[nstool|hac] Fix typo in cnmt AocExtendedHeader field.

This commit is contained in:
jakcron 2018-09-10 16:52:23 +08:00
parent 4bf1ca40a4
commit b6a451442e
4 changed files with 6 additions and 6 deletions

View file

@ -120,18 +120,18 @@ namespace hac
struct AddOnContentMetaExtendedHeader struct AddOnContentMetaExtendedHeader
{ {
uint64_t application_id; uint64_t application_id;
uint32_t required_system_version; uint32_t required_application_version;
void operator=(const AddOnContentMetaExtendedHeader& other) void operator=(const AddOnContentMetaExtendedHeader& other)
{ {
application_id = other.application_id; application_id = other.application_id;
required_system_version = other.required_system_version; required_application_version = other.required_application_version;
} }
bool operator==(const AddOnContentMetaExtendedHeader& other) const bool operator==(const AddOnContentMetaExtendedHeader& other) const
{ {
return (application_id == other.application_id) \ return (application_id == other.application_id) \
&& (required_system_version == other.required_system_version); && (required_application_version == other.required_application_version);
} }
bool operator!=(const AddOnContentMetaExtendedHeader& other) const bool operator!=(const AddOnContentMetaExtendedHeader& other) const

View file

@ -118,7 +118,7 @@ namespace hac
struct sAddOnContentMetaExtendedHeader struct sAddOnContentMetaExtendedHeader
{ {
le_uint64_t application_id; le_uint64_t application_id;
le_uint32_t required_system_version; le_uint32_t required_application_version;
byte_t reserved[4]; byte_t reserved[4];
}; };

View file

@ -100,7 +100,7 @@ void nn::hac::ContentMetaBinary::fromBytes(const byte_t* data, size_t len)
break; break;
case (cnmt::METATYPE_ADD_ON_CONTENT): case (cnmt::METATYPE_ADD_ON_CONTENT):
mAddOnContentMetaExtendedHeader.application_id = ((sAddOnContentMetaExtendedHeader*)mExtendedHeader.data())->application_id.get(); mAddOnContentMetaExtendedHeader.application_id = ((sAddOnContentMetaExtendedHeader*)mExtendedHeader.data())->application_id.get();
mAddOnContentMetaExtendedHeader.required_system_version = ((sAddOnContentMetaExtendedHeader*)mExtendedHeader.data())->required_system_version.get(); mAddOnContentMetaExtendedHeader.required_application_version = ((sAddOnContentMetaExtendedHeader*)mExtendedHeader.data())->required_application_version.get();
break; break;
case (cnmt::METATYPE_DELTA): case (cnmt::METATYPE_DELTA):
mDeltaMetaExtendedHeader.application_id = ((sDeltaMetaExtendedHeader*)mExtendedHeader.data())->application_id.get(); mDeltaMetaExtendedHeader.application_id = ((sDeltaMetaExtendedHeader*)mExtendedHeader.data())->application_id.get();

View file

@ -90,7 +90,7 @@ void CnmtProcess::displayCnmt()
break; break;
case (nn::hac::cnmt::METATYPE_ADD_ON_CONTENT): case (nn::hac::cnmt::METATYPE_ADD_ON_CONTENT):
std::cout << " AddOnContentMetaExtendedHeader:" << std::endl; std::cout << " AddOnContentMetaExtendedHeader:" << std::endl;
std::cout << " RequiredSystemVersion: v" << std::dec << mCnmt.getAddOnContentMetaExtendedHeader().required_system_version << " (" << _SPLIT_VER(mCnmt.getAddOnContentMetaExtendedHeader().required_system_version) << ")"<< std::endl; std::cout << " RequiredApplicationVersion: v" << std::dec << mCnmt.getAddOnContentMetaExtendedHeader().required_application_version << " (" << _SPLIT_VER(mCnmt.getAddOnContentMetaExtendedHeader().required_application_version) << ")" << std::endl;
std::cout << " ApplicationId: 0x" << std::hex << std::setw(16) << std::setfill('0') << mCnmt.getAddOnContentMetaExtendedHeader().application_id << std::endl; std::cout << " ApplicationId: 0x" << std::hex << std::setw(16) << std::setfill('0') << mCnmt.getAddOnContentMetaExtendedHeader().application_id << std::endl;
break; break;
case (nn::hac::cnmt::METATYPE_DELTA): case (nn::hac::cnmt::METATYPE_DELTA):