diff options
| author | Patrick Benavoli <patrickx.benavoli@intel.com> | 2011-10-04 15:32:57 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-10 17:14:56 +0100 |
| commit | 11e6498a4fa3b27ca34d2fcb76bd6365da9d5c1b (patch) | |
| tree | 51a757715ce03dac4cadb51cf742991c650c09a6 /parameter/ParameterType.cpp | |
| parent | 930075cd752694f173605fccde1bac1f2bc1e8e7 (diff) | |
| download | external_parameter-framework-11e6498a4fa3b27ca34d2fcb76bd6365da9d5c1b.zip external_parameter-framework-11e6498a4fa3b27ca34d2fcb76bd6365da9d5c1b.tar.gz external_parameter-framework-11e6498a4fa3b27ca34d2fcb76bd6365da9d5c1b.tar.bz2 | |
parameter-framework: import/export XML
BZ: 10948
- Max value handling on integers corrected
- Left-justified Qn.m numbers
- Corrections after code review: removed fixed numbers from the code and unified byte to bit conversions
Change-Id: Iaf54e413201eae61013735580e046c5ab1874700
Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/22316
Reviewed-by: Centelles, Sylvain <sylvain.centelles@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/26777
Reviewed-by: Barthes, FabienX <fabienx.barthes@intel.com>
Diffstat (limited to 'parameter/ParameterType.cpp')
| -rw-r--r-- | parameter/ParameterType.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/parameter/ParameterType.cpp b/parameter/ParameterType.cpp index 0d3dac5..b22cde4 100644 --- a/parameter/ParameterType.cpp +++ b/parameter/ParameterType.cpp @@ -113,8 +113,8 @@ CInstanceConfigurableElement* CParameterType::doInstantiate() const // Sign extension void CParameterType::signExtend(int32_t& iData) const { - uint32_t uiSizeInBits = _uiSize << 3; - uint32_t uiShift = 32 - uiSizeInBits; + uint32_t uiSizeInBits = _uiSize * 8; + uint32_t uiShift = 8 * sizeof(iData) - uiSizeInBits; if (uiShift) { @@ -125,13 +125,9 @@ void CParameterType::signExtend(int32_t& iData) const // Check data has no bit set outside available range bool CParameterType::isEncodable(uint32_t uiData) const { - return isEncodable(uiData, _uiSize << 3); -} + uint32_t uiSizeInBits = _uiSize * 8; -// Check data has no bit set outside available range -bool CParameterType::isEncodable(uint32_t uiData, uint32_t uiSizeInBits) const -{ - if (uiSizeInBits == 32) { + if (uiSizeInBits == 8 * sizeof(uiData)) { return true; } @@ -147,7 +143,7 @@ uint32_t CParameterType::makeEncodable(uint32_t uiData) const return uiData; } - uint32_t uiSizeInBits = _uiSize << 3; + uint32_t uiSizeInBits = _uiSize * 8; uint32_t uiMask = (1 << uiSizeInBits) - 1; |