[Fingerforce-commits] [libfprint] 17/20: vfs101: drop nr_enroll_stages override

[Didier Raboud]

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

odyx pushed a commit to branch master
in repository libfprint.

commit e0966cb20fb7cf1c9ee8165428f5d3810e2e8c4e
Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Mon Mar 4 17:50:54 2013 +0300

    vfs101: drop nr_enroll_stages override
    
    Imaging drivers aren't allowed to change number of enroll stages anymore,
    all that imaging driver does is providing image to the upper layer.
    Upper layer decides if it needs more scans.
---
 libfprint/drivers/vfs101.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c
index 95e654f..db0b06e 100644
--- a/libfprint/drivers/vfs101.c
+++ b/libfprint/drivers/vfs101.c
@@ -64,9 +64,6 @@
 /* Best image contrast */
 #define VFS_IMG_BEST_CONRAST	128
 
-/* Number of enroll stages */
-#define VFS_NR_ENROLL		3
-
 /* Device parameters address */
 #define VFS_PAR_000E			0x000e
 #define VFS_PAR_0011			0x0011
@@ -656,7 +653,7 @@ static int action_completed(struct fp_img_dev *dev)
 	struct vfs101_dev *vdev = dev->priv;
 
 	if ((dev->action == IMG_ACTION_ENROLL) &&
-		(vdev->enroll_stage < VFS_NR_ENROLL))
+		(vdev->enroll_stage < 1))
 		/* Enroll not completed, return false */
 		return FALSE;
 
@@ -1511,9 +1508,6 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
 		return r;
 	}
 
-	/* Set enroll stage number */
-	dev->dev->nr_enroll_stages = VFS_NR_ENROLL;
-
 	/* Initialize private structure */
 	vdev = g_malloc0(sizeof(struct vfs101_dev));
 	vdev->seqnum = -1;

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