diff options
| author | Frédéric Boisnard <fredericx.boisnard@intel.com> | 2012-05-30 16:15:02 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-12 17:03:10 +0100 |
| commit | 9620e44c6c7605bf589f60331eb5b05b71336853 (patch) | |
| tree | 24de41296b6da730e70f1ced0ad633bb4a7c7da3 /parameter/BitParameterType.cpp | |
| parent | 8b01852701d50869318663f568270f977d93dbdf (diff) | |
| download | external_parameter-framework-9620e44c6c7605bf589f60331eb5b05b71336853.zip external_parameter-framework-9620e44c6c7605bf589f60331eb5b05b71336853.tar.gz external_parameter-framework-9620e44c6c7605bf589f60331eb5b05b71336853.tar.bz2 | |
PFW: Fixed bug on BitParameterTypes
BZ: 44148
The save and restore operation would not work correctly when BitParameters
of a BitParameterBlock were used in more than a single Domain.
This patch aims to fixup this bug and introduces a new class: BitwiseAreaConfiguration.
Change-Id: I0aaccd57cf1cce33400f94a8879565171d283425
Orig-Change-Id: I7107f7db9f01cfff3c38cbac606a8c1e9bca8b5e
Signed-off-by: Frédéric Boisnard <fredericx.boisnard@intel.com>
Reviewed-on: http://android.intel.com:8080/58363
Reviewed-by: Mendi, EduardoX <eduardox.mendi@intel.com>
Tested-by: Mendi, EduardoX <eduardox.mendi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/BitParameterType.cpp')
| -rw-r--r-- | parameter/BitParameterType.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/parameter/BitParameterType.cpp b/parameter/BitParameterType.cpp index 9a09a59..9a9b06b 100644 --- a/parameter/BitParameterType.cpp +++ b/parameter/BitParameterType.cpp @@ -197,6 +197,12 @@ void CBitParameterType::fromBlackboard(uint32_t& uiUserValue, uint32_t uiValue, uiUserValue = (uiValue & getMask()) >> _uiBitPos; } +// Access from area configuration +uint32_t CBitParameterType::merge(uint32_t uiOriginData, uint32_t uiNewData) const +{ + return (uiOriginData & ~getMask()) | (uiNewData & getMask()); +} + // Bit Size uint32_t CBitParameterType::getBitSize() const { |