CHROMIUM: Fix compiler warnings
Fix multiple instances of -Wdeprecated-enum-enum-conversion
BUG=None
TEST=emerge-rex-uwb uwbd
Change-Id: Iee84c2970ded3b6471837b2f96ca415c74d8a473
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/hardware/nxp/uwb/+/5086988
Tested-by: Harshad Phule <[email protected]>
Auto-Submit: Harshad Phule <[email protected]>
Reviewed-by: Madhav <[email protected]>
Commit-Queue: Madhav <[email protected]>
diff --git a/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc b/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc
index 12cff4a..3d2c422 100644
--- a/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc
+++ b/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc
@@ -183,7 +183,7 @@
ALOGD("phHbci_GeneralStatus Enter\n");
switch (gphHbci_MisoApdu.cls)
{
- case phHbci_Class_General | phHbci_SubClass_Answer:
+ case (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Answer:
switch (gphHbci_MisoApdu.ins)
{
case phHbci_General_Ans_HBCI_Ready:
@@ -235,7 +235,7 @@
}
break;
- case phHbci_Class_General | phHbci_SubClass_Ack:
+ case (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Ack:
switch (gphHbci_MisoApdu.ins)
{
case phHbci_Invlaid_Class:
@@ -303,7 +303,8 @@
}
}
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Ack);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Ack;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_Valid_APDU;
if (gphHbci_MisoApdu.cls != expCls)
@@ -362,7 +363,8 @@
phHbci_Status_t phHbci_GetGeneralInfo(uint8_t *pInfo, uint32_t *pInfoSz)
{
ALOGD("phHbci_GetGeneralInfo\n");
- if (gphHbci_MosiApdu.cls != (uint8_t)(phHbci_Class_General | phHbci_SubClass_Query))
+ if (gphHbci_MosiApdu.cls != ((uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Query))
{
ALOGD("ERROR: Invalid General Info Class = 0x%02x\n", gphHbci_MosiApdu.cls);
return phHbci_Failure;
@@ -400,7 +402,7 @@
ALOGD("phHbci_GetInfo Enter\n");
switch (gphHbci_MosiApdu.cls)
{
- case phHbci_Class_General | phHbci_SubClass_Query:
+ case (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Query:
return phHbci_GetGeneralInfo(pInfo, pInfoSz);
break;
@@ -419,7 +421,7 @@
uint16_t lrc, dataSz, payloadSz;
phHbci_Status_t ret = phHbci_Failure;
- ackCls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Ack);
+ ackCls = (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Ack;
ackIns = (uint8_t)phHbci_Valid_APDU;
do
@@ -497,7 +499,8 @@
ALOGD("phHbci_MasterPatchROM enter");
phHbci_Status_t ret = phHbci_Failure;
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Query);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Query;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_General_Qry_Status;
while (1)
@@ -509,14 +512,15 @@
switch (gphHbci_MisoApdu.cls)
{
- case phHbci_Class_General | phHbci_SubClass_Answer:
- case phHbci_Class_General | phHbci_SubClass_Ack:
+ case (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Answer:
+ case (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Ack:
if (phHbci_Success != (ret = phHbci_GeneralStatus(phHbci_General_Cmd_Mode_Patch_ROM)))
{
return ret;
}
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_Patch_ROM | phHbci_SubClass_Command);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_Patch_ROM |
+ (uint8_t)phHbci_SubClass_Command;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_Patch_ROM_Cmd_Download_Patch;
/* Reset GPIO event flag */
@@ -533,11 +537,12 @@
ALOGD("ERROR: GPIO notification timeout!\n");
}*/
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_Patch_ROM | phHbci_SubClass_Query);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_Patch_ROM |
+ (uint8_t)phHbci_SubClass_Query;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_Patch_ROM_Qry_Patch_Status;
break;
- case phHbci_Class_Patch_ROM | phHbci_SubClass_Answer:
+ case (uint8_t)phHbci_Class_Patch_ROM | (uint8_t)phHbci_SubClass_Answer:
switch (gphHbci_MisoApdu.ins)
{
case phHbci_Patch_ROM_Ans_Patch_Success:
@@ -577,7 +582,8 @@
ALOGD("phHbci_MasterHIFImage enter");
phHbci_Status_t ret = phHbci_Failure;
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Query);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Query;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_General_Qry_Status;
while (1)
@@ -589,14 +595,15 @@
switch (gphHbci_MisoApdu.cls)
{
- case phHbci_Class_General | phHbci_SubClass_Answer:
- case phHbci_Class_General | phHbci_SubClass_Ack:
+ case (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Answer:
+ case (uint8_t)phHbci_Class_General | (uint8_t)phHbci_SubClass_Ack:
if (phHbci_Success != (ret = phHbci_GeneralStatus(phHbci_General_Cmd_Mode_HIF_Image)))
{
return ret;
}
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_HIF_Image | phHbci_SubClass_Command);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_HIF_Image |
+ (uint8_t)phHbci_SubClass_Command;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_HIF_Image_Cmd_Download_Image;
/* Reset GPIO event flag */
@@ -614,11 +621,12 @@
}*/
usleep(100000);
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_HIF_Image | phHbci_SubClass_Query);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_HIF_Image |
+ (uint8_t)phHbci_SubClass_Query;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_HIF_Image_Qry_Image_Status;
break;
- case phHbci_Class_HIF_Image | phHbci_SubClass_Answer:
+ case (uint8_t)phHbci_Class_HIF_Image | (uint8_t)phHbci_SubClass_Answer:
switch (gphHbci_MisoApdu.ins)
{
case phHbci_HIF_Image_Ans_Image_Success:
@@ -675,7 +683,8 @@
// uint32_t infoSz = 0;
phHbci_Status_t ret = phHbci_Failure;
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Query);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Query;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_General_Qry_Status;
if (phHbci_Success != (ret = phHbci_GetStatus()))
@@ -688,7 +697,8 @@
return ret;
}
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Command);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Command;
gphHbci_MosiApdu.ins = (uint8_t)mode;
ALOGD("STARTING FW DOWNLOAD.....\n");
if (phHbci_Success != (ret = phHbci_PutCommand(pImg, 0)))
@@ -837,7 +847,8 @@
uint16_t totalBtyesToRead = 0;
uint8_t hbciData[PHHBCI_MAX_LEN_PAYLOAD_MISO];
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Query);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Query;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_General_Qry_Chip_ID;
gphHbci_MosiApdu.len = 0;
@@ -892,7 +903,8 @@
uint16_t totalBtyesToRead = 0;
uint8_t hbciData[PHHBCI_MAX_LEN_PAYLOAD_MISO];
- gphHbci_MosiApdu.cls = (uint8_t)(phHbci_Class_General | phHbci_SubClass_Query);
+ gphHbci_MosiApdu.cls = (uint8_t)phHbci_Class_General |
+ (uint8_t)phHbci_SubClass_Query;
gphHbci_MosiApdu.ins = (uint8_t)phHbci_General_Qry_OTP_AutoLoad_Info;
gphHbci_MosiApdu.len = 0;
