Skip to content

iio: adc: talise: Fix unused variable warnings #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
commodo merged 1 commit into from
Mar 4, 2019
Merged

iio: adc: talise: Fix unused variable warnings #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions drivers/iio/adc/talise/talise_cals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ uint32_t TALISE_runInitCals(taliseDevice_t *device, uint32_t calMask)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t payload[4] = {0};

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_runInitCals()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -55,14 +56,15 @@ uint32_t TALISE_waitInitCals(taliseDevice_t *device, uint32_t timeoutMs, uint8_t
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t cmdStatusByte = 0;
uint8_t _errFlag = 0;

static const uint16_t TIMEOUT_MS_FACTOR = 1000;
static const uint32_t CODECHECK_PARAM_WAITINITCALS_ERR = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_waitInitCals()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -121,13 +123,14 @@ uint32_t TALISE_waitInitCals(taliseDevice_t *device, uint32_t timeoutMs, uint8_t
uint32_t TALISE_checkInitCalComplete(taliseDevice_t *device, uint8_t *areCalsRunning, uint8_t *errorFlag)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t cmdStatusByte = 0;
uint8_t armErrorFlag = 0;

static const uint32_t CODECHECK_PARAM_CHECKINITCALCOMPLETE_ERR3 = 3;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_checkInitCalComplete()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -192,7 +195,6 @@ uint32_t TALISE_abortInitCals(taliseDevice_t *device, uint32_t *calsCompleted)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t cmdStatusByte = 0;
uint8_t calCompleteBitField[4] = {0};
uint8_t extData[1] = {TALISE_ARM_OBJECTID_INITCAL_STATUS};
Expand All @@ -202,6 +204,8 @@ uint32_t TALISE_abortInitCals(taliseDevice_t *device, uint32_t *calsCompleted)
static const uint32_t CODECHECK_PARAM_ABORTINITCALS_ERR3 = 3;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_abortInitCals()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -277,7 +281,6 @@ uint32_t TALISE_getInitCalStatus(taliseDevice_t *device, uint32_t *calsSincePowe
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t cmdStatusByte = 0;
uint8_t calBitField[14] = {0};
static const uint8_t talInitCalDoneObjectID = 0x43;
Expand All @@ -286,6 +289,8 @@ uint32_t TALISE_getInitCalStatus(taliseDevice_t *device, uint32_t *calsSincePowe
static const uint32_t CODECHECK_PARAM_GETINITCALSTATUS_ERR2 = 7;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getInitCalStatus()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -389,7 +394,6 @@ uint32_t TALISE_enableTrackingCals(taliseDevice_t *device, uint32_t enableMask)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t armData[4] = {0};
uint8_t cmdStatusByte = 0;
uint32_t radioStatus = 0;
Expand All @@ -401,6 +405,8 @@ uint32_t TALISE_enableTrackingCals(taliseDevice_t *device, uint32_t enableMask)
static const uint32_t CODECHECK_PARAM_ENABLETRACKINGCALS_ERR2 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_enableTrackingCals()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -474,10 +480,11 @@ uint32_t TALISE_enableTrackingCals(taliseDevice_t *device, uint32_t enableMask)
uint32_t TALISE_getEnabledTrackingCals(taliseDevice_t *device, uint32_t *enableMask)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t armData[4] = {0};

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getEnabledTrackingCals()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -533,13 +540,14 @@ uint32_t TALISE_getPendingTrackingCals(taliseDevice_t *device, uint32_t *pending
uint32_t TALISE_rescheduleTrackingCal(taliseDevice_t *device, taliseTrackingCalibrations_t trackingCal)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[3] = {0};
uint8_t cmdStatusByte = 0;

static const uint32_t CODECHECK_PARAM_RESCHEDULETRACKINGCAL_ERR1 = 1;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_rescheduleTrackingCal()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -621,14 +629,15 @@ uint32_t TALISE_setAllTrackCalState(taliseDevice_t *device, uint32_t calSubsetMa
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t cfgData[8] = {0};
uint8_t extData[2] = {TALISE_ARM_OBJECTID_TRACKING_CAL_SUSPEND_RESUME, 0x0F};
uint8_t cmdStatusByte = 0;

static const uint32_t CODECHECK_PARAM_SETALLTRACKCALSTATE_ERR1 = 1;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_setAllTrackCalState()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -695,14 +704,15 @@ uint32_t TALISE_getAllTrackCalState(taliseDevice_t *device, uint32_t *resumeCalM
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[1] = {TALISE_ARM_OBJECTID_TRACKING_CAL_SUSPEND_RESUME};
uint8_t armData[4] = {0};
uint8_t cmdStatusByte = 0;

static const uint32_t CODECHECK_PARAM_GETALLTRACKCALSTATE_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getAllTrackCalState()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -762,14 +772,15 @@ uint32_t TALISE_getAllTrackCalState(taliseDevice_t *device, uint32_t *resumeCalM
uint32_t TALISE_getTxLolStatus(taliseDevice_t *device, taliseTxChannels_t channelSel, taliseTxLolStatus_t *txLolStatus)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[3] = {TALISE_ARM_OBJECTID_CAL_STATUS, TALISE_ARM_OBJECTID_TXLOL_TRACKING, 0};
uint8_t cmdStatusByte = 0;
uint8_t armReadBack[20] = {0};

static const uint32_t CODECHECK_PARAM_GETTXLOWSTATUS_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getTxLolStatus()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -838,14 +849,15 @@ uint32_t TALISE_getTxLolStatus(taliseDevice_t *device, taliseTxChannels_t channe
uint32_t TALISE_getTxQecStatus(taliseDevice_t *device, taliseTxChannels_t channelSel, taliseTxQecStatus_t *txQecStatus)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[3] = {TALISE_ARM_OBJECTID_CAL_STATUS, TALISE_ARM_OBJECTID_TXQEC_TRACKING, 0};
uint8_t cmdStatusByte = 0;
uint8_t armReadBack[20] = {0};

static const uint32_t CODECHECK_PARAM_GETTXQECSTATUS_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getTxQecStatus()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -914,14 +926,15 @@ uint32_t TALISE_getTxQecStatus(taliseDevice_t *device, taliseTxChannels_t channe
uint32_t TALISE_getRxQecStatus(taliseDevice_t *device, taliseRxChannels_t channelSel, taliseRxQecStatus_t *rxQecStatus)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[3] = {TALISE_ARM_OBJECTID_CAL_STATUS, TALISE_ARM_OBJECTID_RXQEC_TRACKING, 0};
uint8_t cmdStatusByte = 0;
uint8_t armReadBack[20] = {0};

static const uint32_t CODECHECK_PARAM_GETRXQECSTATUS_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getRxQecStatus()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -990,14 +1003,15 @@ uint32_t TALISE_getRxQecStatus(taliseDevice_t *device, taliseRxChannels_t channe
uint32_t TALISE_getOrxQecStatus(taliseDevice_t *device, taliseObsRxChannels_t channelSel, taliseOrxQecStatus_t *orxQecStatus)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[3] = {TALISE_ARM_OBJECTID_CAL_STATUS, TALISE_ARM_OBJECTID_ORXQEC_TRACKING, 0};
uint8_t cmdStatusByte = 0;
uint8_t armReadBack[20] = {0};

static const uint32_t CODECHECK_PARAM_GETORXQECSTATUS_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getOrxQecStatus()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -1066,14 +1080,15 @@ uint32_t TALISE_getOrxQecStatus(taliseDevice_t *device, taliseObsRxChannels_t ch
uint32_t TALISE_getRxHd2Status(taliseDevice_t *device, taliseRxChannels_t channelSel, taliseRxHd2Status_t *rxHd2Status)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[3] = {TALISE_ARM_OBJECTID_CAL_STATUS, TALISE_ARM_OBJECTID_RXHD2_TRACKING, 0};
uint8_t cmdStatusByte = 0;
uint8_t armReadBack[20] = {0};

static const uint32_t CODECHECK_PARAM_GETRXHD2STATUS_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getRxHd2Status()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -1365,12 +1380,13 @@ uint32_t TALISE_resetExtTxLolChannel(taliseDevice_t *device, taliseTxChannels_t
static const uint32_t CODECHECK_PARAM_RESETEXTTXLOLCHANNEL_ERR2 = 2;

talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t extData[3] = {TALISE_ARM_OBJECTID_TRACKING_CAL_CTRL, TXLOL_RESET_CHANNEL_ESTIMATE, 0};
uint8_t cmdStatusByte = 0;
uint32_t radioStatus = 0;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_resetExtTxLolChannel()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -1437,7 +1453,6 @@ uint32_t TALISE_setRxHd2Config(taliseDevice_t *device, taliseRxHd2Config_t *hd2C
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;

uint8_t armFieldValue[4] = {0};
uint32_t radioStatus = 0;
Expand All @@ -1446,6 +1461,8 @@ uint32_t TALISE_setRxHd2Config(taliseDevice_t *device, taliseRxHd2Config_t *hd2C
static const uint32_t CODECHECK_PARAM_SETRXHD2CONFIG_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_setRxHd2Config()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down Expand Up @@ -1499,7 +1516,6 @@ uint32_t TALISE_getRxHd2Config(taliseDevice_t *device, taliseRxHd2Config_t *hd2C
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
talRecoveryActions_t retValWarn = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;

uint8_t armFieldValue[4] = {0};
uint32_t radioStatus = 0;
Expand All @@ -1508,6 +1524,8 @@ uint32_t TALISE_getRxHd2Config(taliseDevice_t *device, taliseRxHd2Config_t *hd2C
static const uint32_t CODECHECK_PARAM_GETRXHD2CONFIG_ERR1 = 2;

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getRxHd2Config()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down
3 changes: 2 additions & 1 deletion drivers/iio/adc/talise/talise_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,6 @@ uint32_t TALISE_getGpIntStatus(taliseDevice_t *device, uint16_t *gpIntStatus)
uint32_t TALISE_getTemperature(taliseDevice_t *device, int16_t *temperatureDegC)
{
talRecoveryActions_t retVal = TALACT_NO_ACTION;
adiHalErr_t halError = ADIHAL_OK;
uint8_t armExtData[1] = {TALISE_ARM_OBJECTID_TEMP_SENSOR};
uint8_t cmdStatusByte = 0;
uint8_t armReadBack[2] = {0};
Expand All @@ -445,6 +444,8 @@ uint32_t TALISE_getTemperature(taliseDevice_t *device, int16_t *temperatureDegC)
static const int16_t CODE_TO_DEGREE_CELSIUS = 359; /* Nominal 25C value = code 384, Scale by 384-25 to normalize */

#if TALISE_VERBOSE
adiHalErr_t halError = ADIHAL_OK;

halError = talWriteToLog(device->devHalInfo, ADIHAL_LOG_MSG, TAL_ERR_OK, "TALISE_getTemperature()\n");
retVal = talApiErrHandler(device, TAL_ERRHDL_HAL_LOG, halError, retVal, TALACT_WARN_RESET_LOG);
#endif
Expand Down
Loading