diff options
| author | Guillaume Denneulin <guillaume.denneulin@intel.com> | 2012-09-27 15:13:10 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-12 17:03:14 +0100 |
| commit | 9533156ebad9b5989703db70be3f6bd22c9811c4 (patch) | |
| tree | 13be07f704900c328300f8a386a212be0e9883d1 /parameter/BitParameterType.h | |
| parent | 8b243f50a38a26e6b373287e07cb7e4743a8cd28 (diff) | |
| download | external_parameter-framework-9533156ebad9b5989703db70be3f6bd22c9811c4.zip external_parameter-framework-9533156ebad9b5989703db70be3f6bd22c9811c4.tar.gz external_parameter-framework-9533156ebad9b5989703db70be3f6bd22c9811c4.tar.bz2 | |
Allow 64bits bitParameterBlocks
BZ: 59348
bitParameterBlocks are limited to 32 bits, extend it to 64 bits.
This change includes:
- PFW code change
- XML schema update
Change-Id: I9861cea0538a17fcba77fa7d573faae36d8731e0
Signed-off-by: Guillaume Denneulin <guillaume.denneulin@intel.com>
Reviewed-on: http://android.intel.com:8080/68189
Reviewed-by: Gozalvez Herrero, Juan AntonioX <juan.antoniox.gozalvez.herrero@intel.com>
Tested-by: Gozalvez Herrero, Juan AntonioX <juan.antoniox.gozalvez.herrero@intel.com>
Diffstat (limited to 'parameter/BitParameterType.h')
| -rw-r--r-- | parameter/BitParameterType.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/parameter/BitParameterType.h b/parameter/BitParameterType.h index 08201da..abf3c47 100644 --- a/parameter/BitParameterType.h +++ b/parameter/BitParameterType.h @@ -42,13 +42,13 @@ public: virtual void toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const; /// Conversion // String - bool toBlackboard(const string& strValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; - void fromBlackboard(string& strValue, const uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; + bool toBlackboard(const string& strValue, uint64_t& uiValue, CParameterAccessContext& parameterAccessContext) const; + void fromBlackboard(string& strValue, const uint64_t& uiValue, CParameterAccessContext& parameterAccessContext) const; // Integer - bool toBlackboard(uint32_t uiUserValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; - void fromBlackboard(uint32_t& uiUserValue, uint32_t uiValue, CParameterAccessContext& parameterAccessContext) const; + bool toBlackboard(uint64_t uiUserValue, uint64_t& uiValue, CParameterAccessContext& parameterAccessContext) const; + void fromBlackboard(uint64_t& uiUserValue, uint64_t uiValue, CParameterAccessContext& parameterAccessContext) const; // Access from area configuration - uint32_t merge(uint32_t uiOriginData, uint32_t uiNewData) const; + uint64_t merge(uint64_t uiOriginData, uint64_t uiNewData) const; // Bit Size uint32_t getBitSize() const; @@ -62,16 +62,16 @@ private: // Instantiation virtual CInstanceConfigurableElement* doInstantiate() const; // Max encodable value - uint32_t getMaxEncodableValue() const; + uint64_t getMaxEncodableValue() const; // Biwise mask - uint32_t getMask() const; + uint64_t getMask() const; // Check data has no bit set outside available range - bool isEncodable(uint32_t uiData) const; + bool isEncodable(uint64_t uiData) const; // Pos in bits uint32_t _uiBitPos; // Size in bits uint32_t _uiBitSize; // Max value - uint32_t _uiMax; + uint64_t _uiMax; }; |