alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

zfm20: fix narrowing conversions (c++11)

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Jon Trulson 2016-03-03 14:59:28 -07:00 committed by Mihai Tudor Panu
parent 611f72c491
commit 98f9dc54ff
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/zfm20/zfm20.cxx
View File

@ -323,10 +323,10 @@ bool ZFM20::verifyPassword()
{
const int pktLen = 5;
uint8_t pkt[pktLen] = {CMD_VERIFY_PASSWORD,
(m_password >> 24) & 0xff,
(m_password >> 16) & 0xff,
(m_password >> 8) & 0xff,
m_password & 0xff };
static_cast<uint8_t>((m_password >> 24) & 0xff),
static_cast<uint8_t>((m_password >> 16) & 0xff),
static_cast<uint8_t>((m_password >> 8) & 0xff),
static_cast<uint8_t>(m_password & 0xff) };
writeCmdPacket(pkt, pktLen);
@ -368,10 +368,10 @@ bool ZFM20::setNewPassword(uint32_t pwd)
{
const int pktLen = 5;
uint8_t pkt[pktLen] = {CMD_SET_PASSWORD,
(pwd >> 24) & 0xff,
(pwd >> 16) & 0xff,
(pwd >> 8) & 0xff,
pwd & 0xff };
static_cast<uint8_t>((pwd >> 24) & 0xff),
static_cast<uint8_t>((pwd >> 16) & 0xff),
static_cast<uint8_t>((pwd >> 8) & 0xff),
static_cast<uint8_t>(pwd & 0xff) };
writeCmdPacket(pkt, pktLen);
@ -398,10 +398,10 @@ bool ZFM20::setNewAddress(uint32_t addr)
{
const int pktLen = 5;
uint8_t pkt[pktLen] = {CMD_SET_ADDRESS,
(addr >> 24) & 0xff,
(addr >> 16) & 0xff,
(addr >> 8) & 0xff,
addr & 0xff };
static_cast<uint8_t>((addr >> 24) & 0xff),
static_cast<uint8_t>((addr >> 16) & 0xff),
static_cast<uint8_t>((addr >> 8) & 0xff),
static_cast<uint8_t>(addr & 0xff) };
writeCmdPacket(pkt, pktLen);
@ -451,7 +451,7 @@ uint8_t ZFM20::image2Tz(int slot)
const int pktLen = 2;
uint8_t pkt[pktLen] = {CMD_IMG2TZ,
(slot & 0xff)};
static_cast<uint8_t>(slot & 0xff)};
writeCmdPacket(pkt, pktLen);
@ -491,9 +491,9 @@ uint8_t ZFM20::storeModel(int slot, uint16_t id)
const int pktLen = 4;
uint8_t pkt[pktLen] = {CMD_STORE,
(slot & 0xff),
(id >> 8) & 0xff,
id & 0xff};
static_cast<uint8_t>(slot & 0xff),
static_cast<uint8_t>((id >> 8) & 0xff),
static_cast<uint8_t>(id & 0xff)};
writeCmdPacket(pkt, pktLen);
@ -510,8 +510,8 @@ uint8_t ZFM20::deleteModel(uint16_t id)
{
const int pktLen = 5;
uint8_t pkt[pktLen] = {CMD_DELETE_TMPL,
(id >> 8) & 0xff,
id & 0xff,
static_cast<uint8_t>((id >> 8) & 0xff),
static_cast<uint8_t>(id & 0xff),
0x00,
0x01};
@ -557,7 +557,7 @@ uint8_t ZFM20::search(int slot, uint16_t *id, uint16_t *score)
// search from page 0x0000 to page 0x00a3
const int pktLen = 6;
uint8_t pkt[pktLen] = {CMD_SEARCH,
(slot & 0xff),
static_cast<uint8_t>(slot & 0xff),
0x00,
0x00,
0x00,