|
@@ -226,7 +226,7 @@ int GfaBlmBUCmdReset(HGFABLM hBlm, uint8_t nNodeAddr, uint32_t nInitialBaudrate)
|
|
|
}
|
|
|
|
|
|
if( (ack[0] == 0) &&
|
|
|
- (ack[1] == COMMAND_ACK))
|
|
|
+ ((uint8_t)ack[1] == COMMAND_ACK))
|
|
|
{
|
|
|
#if 0
|
|
|
do
|
|
@@ -318,7 +318,7 @@ int GfaBlmBUCmdPing(HGFABLM hBlm, uint8_t nNodeAddr)
|
|
|
|
|
|
if(ack[0] == 0)
|
|
|
{
|
|
|
- return (ack[1] == COMMAND_ACK) ? 0 : -1;
|
|
|
+ return ((uint8_t)ack[1] == COMMAND_ACK) ? 0 : -1;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -378,7 +378,7 @@ int GfaBlmBUCmdGetStatus(HGFABLM hBlm, uint8_t nNodeAddr, uint8_t *pbStatus)
|
|
|
|
|
|
if(ack[0] == 0)
|
|
|
{
|
|
|
- if(ack[1] == COMMAND_ACK)
|
|
|
+ if((uint8_t)ack[1] == COMMAND_ACK)
|
|
|
{
|
|
|
if((nRet = GfaBlmBUCmdPollData(hBlm, nNodeAddr, stat, 3, 500)) != 3)
|
|
|
return -1;
|
|
@@ -1168,10 +1168,13 @@ int GfaBlmGetImgInfo(HGFABLM hBlm, uint8_t nNodeAddr, uint32_t nDumpAddr, bool b
|
|
|
|
|
|
pii->nImgLength = aih.nImgLength;
|
|
|
pii->nImgCRC32 = aih.nImgCRC32;
|
|
|
+#pragma GCC diagnostic push
|
|
|
+#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
|
|
|
if((nRet = GfaBlmBootloaderDump(hBlm, nNodeAddr, (uint32_t)aih.app.pszImgMaterialNum, GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH / sizeof(uint32_t), pii->szImgMaterialNum, GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH)) != 0)
|
|
|
return -1;
|
|
|
if((nRet = GfaBlmBootloaderDump(hBlm, nNodeAddr, (uint32_t)aih.app.pszImgNameBuild, GFA_APP_MAX_IMG_NAME_BUILD_LENGTH / sizeof(uint32_t), pii->szImgNameBuild, GFA_APP_MAX_IMG_NAME_BUILD_LENGTH)) != 0)
|
|
|
return -1;
|
|
|
+#pragma GCC diagnostic pop
|
|
|
pii->szImgMaterialNum[GFA_APP_MAX_IMG_MATERIAL_NUM_LENGTH - 1] = '\0';
|
|
|
pii->szImgNameBuild[GFA_APP_MAX_IMG_NAME_BUILD_LENGTH - 1] = '\0';
|
|
|
return 0;
|