From 0c4e3bb1c44263fe0e37eb6d7254bbbcbabcfdd0 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 28 May 2018 16:21:47 +0200 Subject: [PATCH] lib: Remove drivers definitions from drivers API --- libfprint/drivers/upeksonly.c | 85 ++++++++++++++++++----------------- libfprint/drivers_api.h | 2 - 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c index 3827e1fc..9cccb865 100644 --- a/libfprint/drivers/upeksonly.c +++ b/libfprint/drivers/upeksonly.c @@ -1328,47 +1328,7 @@ static int dev_activate(struct fp_img_dev *dev, enum fp_imgdev_state state) return 0; } -static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) -{ - int r; - struct sonly_dev *sdev; - - r = libusb_set_configuration(fpi_imgdev_get_usb_dev(dev), 1); - if (r < 0) { - fp_err("could not set configuration 1"); - return r; - } - - r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); - if (r < 0) { - fp_err("could not claim interface 0: %s", libusb_error_name(r)); - return r; - } - - sdev = g_malloc0(sizeof(struct sonly_dev)); - fpi_imgdev_set_user_data(dev, sdev); - sdev->dev_model = (int)driver_data; - switch (driver_data) { - case UPEKSONLY_1000: - sdev->img_width = IMG_WIDTH_1000; - upeksonly_driver.img_width = IMG_WIDTH_1000; - assembling_ctx.line_width = IMG_WIDTH_1000; - break; - case UPEKSONLY_1001: - sdev->img_width = IMG_WIDTH_1001; - upeksonly_driver.img_width = IMG_WIDTH_1001; - upeksonly_driver.bz3_threshold = 25; - assembling_ctx.line_width = IMG_WIDTH_1001; - break; - case UPEKSONLY_2016: - sdev->img_width = IMG_WIDTH_2016; - upeksonly_driver.img_width = IMG_WIDTH_2016; - assembling_ctx.line_width = IMG_WIDTH_2016; - break; - } - fpi_imgdev_open_complete(dev, 0); - return 0; -} +static int dev_init(struct fp_img_dev *dev, unsigned long driver_data); static void dev_deinit(struct fp_img_dev *dev) { @@ -1422,3 +1382,46 @@ struct fp_img_driver upeksonly_driver = { .deactivate = dev_deactivate, }; +static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) +{ + int r; + struct sonly_dev *sdev; + + r = libusb_set_configuration(fpi_imgdev_get_usb_dev(dev), 1); + if (r < 0) { + fp_err("could not set configuration 1"); + return r; + } + + r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); + if (r < 0) { + fp_err("could not claim interface 0: %s", libusb_error_name(r)); + return r; + } + + sdev = g_malloc0(sizeof(struct sonly_dev)); + fpi_imgdev_set_user_data(dev, sdev); + sdev->dev_model = (int)driver_data; + switch (driver_data) { + case UPEKSONLY_1000: + sdev->img_width = IMG_WIDTH_1000; + upeksonly_driver.img_width = IMG_WIDTH_1000; + assembling_ctx.line_width = IMG_WIDTH_1000; + break; + case UPEKSONLY_1001: + sdev->img_width = IMG_WIDTH_1001; + upeksonly_driver.img_width = IMG_WIDTH_1001; + upeksonly_driver.bz3_threshold = 25; + assembling_ctx.line_width = IMG_WIDTH_1001; + break; + case UPEKSONLY_2016: + sdev->img_width = IMG_WIDTH_2016; + upeksonly_driver.img_width = IMG_WIDTH_2016; + assembling_ctx.line_width = IMG_WIDTH_2016; + break; + } + fpi_imgdev_open_complete(dev, 0); + return 0; +} + + diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h index 63332633..fb885e71 100644 --- a/libfprint/drivers_api.h +++ b/libfprint/drivers_api.h @@ -178,8 +178,6 @@ struct fp_img_driver { void (*deactivate)(struct fp_img_dev *dev); }; -#include "drivers_definitions.h" - enum fp_print_data_type { PRINT_DATA_RAW = 0, /* memset-imposed default */ PRINT_DATA_NBIS_MINUTIAE,