commit 99810e76d440c5fdbe91a5b5cbb9083deecbd850
author George Chang <georgekgchang@google.com> Tue Jul 11 22:39:54 2023 +0800
committer George Chang <georgekgchang@google.com> Thu Jul 13 09:39:29 2023 +0000
tree 3a03e060e378f40d28cb862f0c780a79664f8e09
parent e5c3b03ee76ca654076c6b4b9d142032b3165b18

Abort when entering timeout recovery with I2cResetPulse/I2cRecovery

Sometimes HAL got stucked after a I2cResetPulse due to unexpected reasons
abort the HAL directly before we figure out a better recovery flow

Bug: 287712288
Test: manual
Change-Id: Iba64a513ed63fec30ce624db63aabc3fcea527d2

st21nfc/hal_wrapper.cc

diff --git a/st21nfc/hal_wrapper.cc b/st21nfc/hal_wrapper.cc
index 3560ace..571991f 100644
--- a/st21nfc/hal_wrapper.cc
+++ b/st21nfc/hal_wrapper.cc
@@ -693,6 +693,7 @@
         STLOG_HAL_D("NFC-NCI HAL: %s  Timeout accessing the CLF.", __func__);
         HalSendDownstreamStopTimer(mHalHandle);
         I2cRecovery();
+        abort(); // TODO: fix it when we have a better recovery method.
         return;
       }
       break;
@@ -709,6 +710,7 @@
       if (event == HAL_WRAPPER_TIMEOUT_EVT) {
         STLOG_HAL_E("%s - Timer for FW update procedure timeout, retry",
                     __func__);
+        abort(); // TODO: fix it when we have a better recovery method.
         HalSendDownstreamStopTimer(mHalHandle);
         resetHandlerState();
         I2cResetPulse();
@@ -730,6 +732,7 @@
     case HAL_WRAPPER_STATE_PROP_CONFIG:
       if (event == HAL_WRAPPER_TIMEOUT_EVT) {
         STLOG_HAL_E("%s - Timer when sending conf parameters, retry", __func__);
+        abort(); // TODO: fix it when we have a better recovery method.
         HalSendDownstreamStopTimer(mHalHandle);
         resetHandlerState();
         I2cResetPulse();