mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib: Add fp_dev argument to timeout callback

Browse Source 
To cut down on the fpi_ssm_get_user_data() usage again.
This commit is contained in:
Bastien Nocera
2018-09-18 18:51:14 +02:00
parent 0c3a22758b
commit f68e7fcb9f
8 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libfprint/drivers/elan.c
View File

@@ -583,7 +583,9 @@ static void elan_capture(struct fp_img_dev *dev)
fpi_ssm_start(ssm, capture_complete);
}
static void fpi_ssm_next_state_async(void *data)
static void
fpi_ssm_next_state_async(struct fp_dev *dev,
void *data)
{
fpi_ssm_next_state((fpi_ssm *)data);
}
@@ -678,7 +680,7 @@ static void calibrate_run_state(fpi_ssm *ssm, struct fp_dev *_dev, void *user_da
if (elandev->calib_status == 0x00
&& elandev->last_read[0] == 0x01)
elandev->calib_status = 0x01;
if (!fpi_timeout_add(50, fpi_ssm_next_state_async, ssm))
if (!fpi_timeout_add(50, fpi_ssm_next_state_async, _dev, ssm))
fpi_ssm_mark_failed(ssm, -ETIME);
}
break;
@@ -884,9 +886,11 @@ static void elan_change_state(struct fp_img_dev *dev)
elandev->dev_state = next_state;
}
static void elan_change_state_async(void *data)
static void
elan_change_state_async(struct fp_dev *dev,
void *data)
{
elan_change_state((struct fp_img_dev *)data);
elan_change_state(FP_IMG_DEV (dev));
}
static int dev_change_state(struct fp_img_dev *dev, enum fp_imgdev_state state)
@@ -902,7 +906,7 @@ static int dev_change_state(struct fp_img_dev *dev, enum fp_imgdev_state state)
/* schedule state change instead of calling it directly to allow all actions
* related to the previous state to complete */
elandev->dev_state_next = state;
if (!fpi_timeout_add(10, elan_change_state_async, dev)) {
if (!fpi_timeout_add(10, elan_change_state_async, FP_DEV(dev), NULL)) {
fpi_imgdev_session_error(dev, -ETIME);
return -ETIME;
}