Upgrade reset APIs

Delete old reset_set/get APIs and replace them with three
separate APIs perfectly aligned to device AN to perform
reboot, power-on-reset and software-reset operations.

Please note that this commit introduces a software
incompatibility.

Signed-off-by: Armando Visconti <armando.visconti@st.com>

Author: avisconti

lsm6dsv320x_reg.c

@@ -518,80 +518,133 @@ int32_t lsm6dsv320x_hg_xl_offset_mg_get(const stmdev_ctx_t *ctx,
   */
 
 /**
-  * @brief  Reset of the device.[set]
+  * @brief  Perform reboot of the device.
   *
   * @param  ctx      read / write interface definitions
-  * @param  val      Reset of the device.
-  * @retval          interface status (MANDATORY: return 0 -> no Error)
+  * @retval          0: reboot has been performed, -1: error
   *
   */
-int32_t lsm6dsv320x_reset_set(const stmdev_ctx_t *ctx, lsm6dsv320x_reset_t val)
+int32_t lsm6dsv320x_reboot(const stmdev_ctx_t *ctx)
 {
-  lsm6dsv320x_func_cfg_access_t func_cfg_access;
   lsm6dsv320x_ctrl3_t ctrl3;
   int32_t ret;
 
+  if (ctx->mdelay == NULL)
+  {
+    ret = -1;
+    goto exit;
+  }
+
   ret = lsm6dsv320x_read_reg(ctx, LSM6DSV320X_CTRL3, (uint8_t *)&ctrl3, 1);
-  ret += lsm6dsv320x_read_reg(ctx, LSM6DSV320X_FUNC_CFG_ACCESS, (uint8_t *)&func_cfg_access, 1);
   if (ret != 0)
   {
-    return ret;
+    goto exit;
   }
 
-  ctrl3.boot = (val == LSM6DSV320X_RESTORE_CAL_PARAM) ? 1 : 0;
-  ctrl3.sw_reset = (val == LSM6DSV320X_RESTORE_CTRL_REGS) ? 1 : 0;
-  func_cfg_access.sw_por = (val == LSM6DSV320X_GLOBAL_RST) ? 1 : 0;
+  /* 1. Set the low-g accelerometer, high-g accelerometer, and gyroscope in power-down mode */
+  ret = lsm6dsv320x_xl_data_rate_set(ctx, LSM6DSV320X_ODR_OFF);
+  ret += lsm6dsv320x_gy_data_rate_set(ctx, LSM6DSV320X_ODR_OFF);
+  ret += lsm6dsv320x_hg_xl_data_rate_set(ctx, LSM6DSV320X_HG_XL_ODR_OFF, 0);
+  if (ret != 0)
+  {
+    goto exit;
+  }
 
+  /* 2. Set the BOOT bit of the CTRL3 register to 1. */
+  ctrl3.boot = 1;
   ret = lsm6dsv320x_write_reg(ctx, LSM6DSV320X_CTRL3, (uint8_t *)&ctrl3, 1);
-  ret += lsm6dsv320x_write_reg(ctx, LSM6DSV320X_FUNC_CFG_ACCESS, (uint8_t *)&func_cfg_access, 1);
+  if (ret != 0)
+  {
+    goto exit;
+  }
 
+  /* 3. Wait 30 ms. */
+  ctx->mdelay(30);
+
+exit:
   return ret;
 }
 
 /**
-  * @brief  Global reset of the device.[get]
+  * @brief  Perform power-on-reset of the device.
   *
   * @param  ctx      read / write interface definitions
-  * @param  val      Global reset of the device.
-  * @retval          interface status (MANDATORY: return 0 -> no Error)
+  * @retval          0: power-on-reset has been performed, -1: error
   *
   */
-int32_t lsm6dsv320x_reset_get(const stmdev_ctx_t *ctx, lsm6dsv320x_reset_t *val)
+int32_t lsm6dsv320x_sw_por(const stmdev_ctx_t *ctx)
 {
-  lsm6dsv320x_func_cfg_access_t func_cfg_access;
-  lsm6dsv320x_ctrl3_t ctrl3;
+  lsm6dsv320x_func_cfg_access_t func_cfg_access = {0};
   int32_t ret;
 
-  ret = lsm6dsv320x_read_reg(ctx, LSM6DSV320X_CTRL3, (uint8_t *)&ctrl3, 1);
-  ret += lsm6dsv320x_read_reg(ctx, LSM6DSV320X_FUNC_CFG_ACCESS, (uint8_t *)&func_cfg_access, 1);
-  if (ret != 0)
+  if (ctx->mdelay == NULL)
   {
-    return ret;
+    ret = -1;
+    goto exit;
   }
 
-  switch ((ctrl3.sw_reset << 2) + (ctrl3.boot << 1) + func_cfg_access.sw_por)
+  /* 1. Set the SW_POR bit of the FUNC_CFG_ACCESS register to 1. */
+  func_cfg_access.sw_por = 1;
+  ret = lsm6dsv320x_write_reg(ctx, LSM6DSV320X_FUNC_CFG_ACCESS, (uint8_t *)&func_cfg_access, 1);
+  if (ret != 0)
   {
-    case LSM6DSV320X_READY:
-      *val = LSM6DSV320X_READY;
-      break;
+    goto exit;
+  }
 
-    case LSM6DSV320X_GLOBAL_RST:
-      *val = LSM6DSV320X_GLOBAL_RST;
-      break;
+  /* 2. Wait 30 ms. */
+  ctx->mdelay(30);
 
-    case LSM6DSV320X_RESTORE_CAL_PARAM:
-      *val = LSM6DSV320X_RESTORE_CAL_PARAM;
-      break;
+exit:
+  return ret;
+}
 
-    case LSM6DSV320X_RESTORE_CTRL_REGS:
-      *val = LSM6DSV320X_RESTORE_CTRL_REGS;
-      break;
+/**
+  * @brief  Perform s/w reset of the device.
+  *
+  * @param  ctx      read / write interface definitions
+  * @retval          0: s/w reset has been performed, -1: error
+  *
+  */
+int32_t lsm6dsv320x_sw_reset(const stmdev_ctx_t *ctx)
+{
+  lsm6dsv320x_ctrl3_t ctrl3 = {0};
+  uint8_t retry = 0;
+  int32_t ret;
 
-    default:
-      *val = LSM6DSV320X_GLOBAL_RST;
-      break;
+  if (ctx->mdelay == NULL)
+  {
+    ret = -1;
+    goto exit;
   }
 
+  /* 1. Set the low-g accelerometer, high-g accelerometer, and gyroscope in power-down mode */
+  ret = lsm6dsv320x_xl_data_rate_set(ctx, LSM6DSV320X_ODR_OFF);
+  ret += lsm6dsv320x_gy_data_rate_set(ctx, LSM6DSV320X_ODR_OFF);
+  ret += lsm6dsv320x_hg_xl_data_rate_set(ctx, LSM6DSV320X_HG_XL_ODR_OFF, 0);
+  if (ret != 0)
+  {
+    goto exit;
+  }
+
+  /* 2. Set the SW_RESET bit of the CTRL3 register to 1. */
+  ctrl3.sw_reset = 1;
+  ret = lsm6dsv320x_write_reg(ctx, LSM6DSV320X_CTRL3, (uint8_t *)&ctrl3, 1);
+
+  /* 3. Poll the SW_RESET bit of the CTRL3 register until it returns to 0. */
+  do
+  {
+    ret += lsm6dsv320x_read_reg(ctx, LSM6DSV320X_CTRL3, (uint8_t *)&ctrl3, 1);
+    if (ret != 0)
+    {
+      goto exit;
+    }
+
+    ctx->mdelay(1);
+  } while (ctrl3.sw_reset == 1 && retry++ < 3);
+
+  return (ctrl3.sw_reset == 0) ? 0 : -1;
+
+exit:
   return ret;
 }
 

lsm6dsv320x_reg.h

@@ -4365,15 +4365,9 @@ int32_t lsm6dsv320x_hg_xl_offset_mg_set(const stmdev_ctx_t *ctx,
 int32_t lsm6dsv320x_hg_xl_offset_mg_get(const stmdev_ctx_t *ctx,
                                         lsm6dsv320x_xl_offset_mg_t *val);
 
-typedef enum
-{
-  LSM6DSV320X_READY             = 0x0,
-  LSM6DSV320X_GLOBAL_RST        = 0x1,
-  LSM6DSV320X_RESTORE_CAL_PARAM = 0x2,
-  LSM6DSV320X_RESTORE_CTRL_REGS = 0x4,
-} lsm6dsv320x_reset_t;
-int32_t lsm6dsv320x_reset_set(const stmdev_ctx_t *ctx, lsm6dsv320x_reset_t val);
-int32_t lsm6dsv320x_reset_get(const stmdev_ctx_t *ctx, lsm6dsv320x_reset_t *val);
+int32_t lsm6dsv320x_reboot(const stmdev_ctx_t *ctx);
+int32_t lsm6dsv320x_sw_por(const stmdev_ctx_t *ctx);
+int32_t lsm6dsv320x_sw_reset(const stmdev_ctx_t *ctx);
 
 typedef enum
 {