|
 |
73b847 |
From d830d88463dc9ecdb1943662910692fd4cb7bdf3 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Mon, 25 Nov 2019 21:23:31 +0100
|
|
|
73b847 |
Subject: [PATCH 024/181] drivers: Use clearer messages using parameters
|
|
|
73b847 |
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/drivers/aesx660.c | 16 +++++++++++-----
|
|
|
73b847 |
libfprint/drivers/synaptics/synaptics.c | 17 ++++++++++++-----
|
|
|
73b847 |
libfprint/drivers/upekts.c | 8 +++++---
|
|
|
73b847 |
3 files changed, 28 insertions(+), 13 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c
|
|
|
73b847 |
index 8540a06..8ad4c63 100644
|
|
|
73b847 |
--- a/libfprint/drivers/aesx660.c
|
|
|
73b847 |
+++ b/libfprint/drivers/aesx660.c
|
|
|
73b847 |
@@ -131,7 +131,9 @@ aesX660_read_calibrate_data_cb (FpiUsbTransfer *transfer,
|
|
|
73b847 |
fp_dbg ("Bogus calibrate response: %.2x\n", data[0]);
|
|
|
73b847 |
fpi_ssm_mark_failed (transfer->ssm,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Bogus calibrate response"));
|
|
|
73b847 |
+ "Bogus calibrate "
|
|
|
73b847 |
+ "response: %.2x",
|
|
|
73b847 |
+ data[0]));
|
|
|
73b847 |
return;
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
@@ -175,7 +177,8 @@ finger_det_read_fd_data_cb (FpiUsbTransfer *transfer,
|
|
|
73b847 |
fp_dbg ("Bogus FD response: %.2x\n", data[0]);
|
|
|
73b847 |
fpi_ssm_mark_failed (transfer->ssm,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Bogus FD response"));
|
|
|
73b847 |
+ "Bogus FD response %.2x",
|
|
|
73b847 |
+ data[0]));
|
|
|
73b847 |
return;
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
@@ -538,7 +541,8 @@ activate_read_id_cb (FpiUsbTransfer *transfer, FpDevice *device,
|
|
|
73b847 |
fp_dbg ("Bogus read ID response: %.2x\n", data[AESX660_RESPONSE_TYPE_OFFSET]);
|
|
|
73b847 |
fpi_ssm_mark_failed (transfer->ssm,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Bogus read ID response"));
|
|
|
73b847 |
+ "Bogus read ID response %.2x",
|
|
|
73b847 |
+ data[AESX660_RESPONSE_TYPE_OFFSET]));
|
|
|
73b847 |
return;
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
@@ -565,7 +569,8 @@ activate_read_id_cb (FpiUsbTransfer *transfer, FpDevice *device,
|
|
|
73b847 |
fp_dbg ("Failed to init device! init status: %.2x\n", data[7]);
|
|
|
73b847 |
fpi_ssm_mark_failed (transfer->ssm,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Failed to init device"));
|
|
|
73b847 |
+ "Failed to init device %.2x",
|
|
|
73b847 |
+ data[7]));
|
|
|
73b847 |
break;
|
|
|
73b847 |
}
|
|
|
73b847 |
}
|
|
|
73b847 |
@@ -594,7 +599,8 @@ activate_read_init_cb (FpiUsbTransfer *transfer, FpDevice *device,
|
|
|
73b847 |
data[3]);
|
|
|
73b847 |
fpi_ssm_mark_failed (transfer->ssm,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Bogus read init response"));
|
|
|
73b847 |
+ "Bogus read init response: "
|
|
|
73b847 |
+ "%.2x %.2x", data[0], data[3]));
|
|
|
73b847 |
return;
|
|
|
73b847 |
}
|
|
|
73b847 |
priv->init_cmd_idx++;
|
|
|
73b847 |
diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
|
|
|
73b847 |
index 8eba852..f6faf11 100644
|
|
|
73b847 |
--- a/libfprint/drivers/synaptics/synaptics.c
|
|
|
73b847 |
+++ b/libfprint/drivers/synaptics/synaptics.c
|
|
|
73b847 |
@@ -137,7 +137,8 @@ cmd_recieve_cb (FpiUsbTransfer *transfer,
|
|
|
73b847 |
fp_warn ("Received General Error %d from the sensor", (guint) err);
|
|
|
73b847 |
fpi_ssm_mark_failed (transfer->ssm,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Received general error from device"));
|
|
|
73b847 |
+ "Received general error %u from device",
|
|
|
73b847 |
+ (guint) err));
|
|
|
73b847 |
//fpi_ssm_jump_to_state (transfer->ssm, fpi_ssm_get_cur_state (transfer->ssm));
|
|
|
73b847 |
return;
|
|
|
73b847 |
}
|
|
|
73b847 |
@@ -472,7 +473,8 @@ list_msg_cb (FpiDeviceSynaptics *self,
|
|
|
73b847 |
fpi_device_list_complete (FP_DEVICE (self),
|
|
|
73b847 |
NULL,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
|
|
|
73b847 |
- "Failed to query enrolled users"));
|
|
|
73b847 |
+ "Failed to query enrolled users: %d",
|
|
|
73b847 |
+ resp->result));
|
|
|
73b847 |
}
|
|
|
73b847 |
break;
|
|
|
73b847 |
|
|
|
73b847 |
@@ -770,7 +772,8 @@ enroll_msg_cb (FpiDeviceSynaptics *self,
|
|
|
73b847 |
fpi_device_enroll_complete (device,
|
|
|
73b847 |
NULL,
|
|
|
73b847 |
fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
|
|
|
73b847 |
- "Enrollment failed"));
|
|
|
73b847 |
+ "Enrollment failed (%d)",
|
|
|
73b847 |
+ resp->result));
|
|
|
73b847 |
}
|
|
|
73b847 |
break;
|
|
|
73b847 |
}
|
|
|
73b847 |
@@ -1052,7 +1055,11 @@ dev_probe (FpDevice *device)
|
|
|
73b847 |
self->mis_version.build_num);
|
|
|
73b847 |
|
|
|
73b847 |
error = fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
|
|
|
73b847 |
- "Unsupported firmware version");
|
|
|
73b847 |
+ "Unsupported firmware version "
|
|
|
73b847 |
+ "(%d.%d with build number %d)",
|
|
|
73b847 |
+ self->mis_version.version_major,
|
|
|
73b847 |
+ self->mis_version.version_minor,
|
|
|
73b847 |
+ self->mis_version.build_num);
|
|
|
73b847 |
goto err_close;
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
@@ -1120,7 +1127,7 @@ fps_deinit_cb (FpiDeviceSynaptics *self,
|
|
|
73b847 |
case BMKT_RSP_POWER_DOWN_FAIL:
|
|
|
73b847 |
fp_info ("Failed to go to power down mode: %d", resp->result);
|
|
|
73b847 |
error = fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
|
|
|
73b847 |
- "Power down failed");
|
|
|
73b847 |
+ "Power down failed: %d", resp->result);
|
|
|
73b847 |
|
|
|
73b847 |
break;
|
|
|
73b847 |
}
|
|
|
73b847 |
diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c
|
|
|
73b847 |
index 2426907..b3481aa 100644
|
|
|
73b847 |
--- a/libfprint/drivers/upekts.c
|
|
|
73b847 |
+++ b/libfprint/drivers/upekts.c
|
|
|
73b847 |
@@ -288,7 +288,7 @@ __handle_incoming_msg (FpDevice *device,
|
|
|
73b847 |
{
|
|
|
73b847 |
fp_warn ("cmd response too short (%d)", len);
|
|
|
73b847 |
error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "CMD response too short");
|
|
|
73b847 |
+ "CMD response too short (%d)", len);
|
|
|
73b847 |
goto err;
|
|
|
73b847 |
}
|
|
|
73b847 |
if (innerbuf[0] != 0x28)
|
|
|
73b847 |
@@ -371,7 +371,8 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
|
|
|
73b847 |
fp_err ("async msg read too short (%d)",
|
|
|
73b847 |
(gint) transfer->actual_length);
|
|
|
73b847 |
error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Packet from device was too short");
|
|
|
73b847 |
+ "Packet from device was too short (%lu)",
|
|
|
73b847 |
+ transfer->actual_length);
|
|
|
73b847 |
goto err;
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
@@ -798,7 +799,8 @@ read_msg01_cb (FpDevice *dev, enum read_msg_type type,
|
|
|
73b847 |
{
|
|
|
73b847 |
fp_err ("expected seq=1, got %x", seq);
|
|
|
73b847 |
fpi_ssm_mark_failed (ssm, fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
|
|
|
73b847 |
- "Got wrong sequence number"));
|
|
|
73b847 |
+ "Got wrong sequence number (%x)",
|
|
|
73b847 |
+ seq));
|
|
|
73b847 |
return;
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|