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/BitParameter.cpp | |
| 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/BitParameter.cpp')
| -rw-r--r-- | parameter/BitParameter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/parameter/BitParameter.cpp b/parameter/BitParameter.cpp index 1ee3178..1f1b3b7 100644 --- a/parameter/BitParameter.cpp +++ b/parameter/BitParameter.cpp @@ -81,7 +81,7 @@ bool CBitParameter::accessAsBoolean(bool& bValue, bool bSet, CParameterAccessCon } // Rely on integer access - uint32_t uiValue; + uint64_t uiValue; if (bSet) { @@ -102,7 +102,7 @@ bool CBitParameter::accessAsBoolean(bool& bValue, bool bSet, CParameterAccessCon } // Integer Access -bool CBitParameter::accessAsInteger(uint32_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const +bool CBitParameter::accessAsInteger(uint64_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const { uint32_t uiOffset = getOffset(); @@ -127,7 +127,7 @@ bool CBitParameter::accessAsInteger(uint32_t& uiValue, bool bSet, CParameterAcce template <typename type> bool CBitParameter::doSet(type value, uint32_t uiOffset, CParameterAccessContext& parameterAccessContext) const { - uint32_t uiData = 0; + uint64_t uiData = 0; // Read/modify/write CParameterBlackboard* pBlackboard = parameterAccessContext.getParameterBlackboard(); @@ -149,7 +149,7 @@ bool CBitParameter::doSet(type value, uint32_t uiOffset, CParameterAccessContext template <typename type> void CBitParameter::doGet(type& value, uint32_t uiOffset, CParameterAccessContext& parameterAccessContext) const { - uint32_t uiData = 0; + uint64_t uiData = 0; // Read blackboard const CParameterBlackboard* pBlackboard = parameterAccessContext.getParameterBlackboard(); @@ -168,7 +168,7 @@ CAreaConfiguration* CBitParameter::createAreaConfiguration(const CSyncerSet* pSy } // Access from area configuration -uint32_t CBitParameter::merge(uint32_t uiOriginData, uint32_t uiNewData) const +uint64_t CBitParameter::merge(uint64_t uiOriginData, uint64_t uiNewData) const { // Convert return static_cast<const CBitParameterType*>(getTypeElement())->merge(uiOriginData, uiNewData); |