drivers: Use fpi_ssm_next_state_delayed instead of custom callbacks

As per this fpi_ssm_next_state_timeout_cb can be removed
This commit is contained in:
Marco Trevisan (Treviño)
2019-11-22 18:22:50 +01:00
parent 7ec2df2405
commit 1ba95db379
7 changed files with 16 additions and 70 deletions

View File

@@ -369,16 +369,6 @@ async_load (FpiSsm *ssm,
async_load_cb, NULL);
}
/* Submit asynchronous sleep */
static void
async_sleep (unsigned int msec,
FpiSsm *ssm,
FpImageDevice *dev)
{
fpi_device_add_timeout (FP_DEVICE (dev), msec,
fpi_ssm_next_state_timeout_cb, ssm, NULL);
}
/* Swap ssm states */
enum {
M_SWAP_SEND,
@@ -795,7 +785,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
case M_LOOP_0_SLEEP:
/* Wait fingerprint scanning */
async_sleep (50, ssm, dev);
fpi_ssm_next_state_delayed (ssm, 50);
break;
case M_LOOP_0_GET_STATE:
@@ -838,7 +828,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
img_extract (ssm, dev);
/* Wait handling image */
async_sleep (10, ssm, dev);
fpi_ssm_next_state_delayed (ssm, 10);
break;
case M_LOOP_0_CHECK_ACTION:
@@ -861,7 +851,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
if (vfs_finger_state (self) == VFS_FINGER_PRESENT)
{
fpi_image_device_report_finger_status (dev, TRUE);
async_sleep (250, ssm, dev);
fpi_ssm_next_state_delayed (ssm, 250);
}
else
{
@@ -891,7 +881,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
case M_LOOP_1_SLEEP:
/* Wait fingerprint scanning */
async_sleep (10, ssm, dev);
fpi_ssm_next_state_delayed (ssm, 10);
break;
case M_LOOP_2_ABORT_PRINT:
@@ -927,7 +917,7 @@ m_loop_state (FpiSsm *ssm, FpDevice *_dev)
{
/* Wait aborting */
self->counter++;
async_sleep (100, ssm, dev);
fpi_ssm_next_state_delayed (ssm, 100);
}
else
{
@@ -1065,7 +1055,7 @@ m_init_state (FpiSsm *ssm, FpDevice *_dev)
{
/* Wait aborting */
self->counter++;
async_sleep (100, ssm, dev);
fpi_ssm_next_state_delayed (ssm, 100);
}
else
{
@@ -1094,7 +1084,7 @@ m_init_state (FpiSsm *ssm, FpDevice *_dev)
{
/* Wait removing finger */
self->counter++;
async_sleep (250, ssm, dev);
fpi_ssm_next_state_delayed (ssm, 250);
}
else
{