[Fingerforce-commits] [libfprint] 05/11: upektc_img: handle 0x28 message better

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian
in repository libfprint.

commit a3c90f2b24434aa36f782aca3950fd89af01fce0
Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Fri Sep 6 16:31:15 2013 +0300

    upektc_img: handle 0x28 message better
---
 libfprint/drivers/upektc_img.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c
index 9bf099d..577d3ed 100644
--- a/libfprint/drivers/upektc_img.c
+++ b/libfprint/drivers/upektc_img.c
@@ -267,7 +267,22 @@ static void capture_read_data_cb(struct libusb_transfer *transfer)
 		switch (data[7]) {
 			/* No finger */
 			case 0x28:
-				fpi_ssm_jump_to_state(ssm, CAPTURE_ACK_00_28);
+				fp_dbg("18th byte is %.2x\n", data[18]);
+				switch (data[18]) {
+				case 0x0c:
+					/* no finger */
+					fpi_ssm_jump_to_state(ssm, CAPTURE_ACK_00_28);
+					break;
+				case 0x00:
+					/* finger is present! */
+					fpi_ssm_jump_to_state(ssm, CAPTURE_ACK_00_28);
+					break;
+				default:
+					/* some error happened, cancel scan */
+					fp_err("something bad happened, aborting scan :(\n");
+					fpi_ssm_mark_aborted(ssm, FP_VERIFY_RETRY_REMOVE_FINGER);
+					break;
+				}
 				break;
 			/* Image frame with additional info */
 			case 0x2c:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/fingerforce/libfprint.git