depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lib: Remove fpi_imgdev_get_usb_dev()

Browse source 
We now use fpi_get_usb_dev(FP_DEV()) instead.
This commit is contained in:
Bastien Nocera 2018-09-15 00:53:25 +02:00
parent 57b38a2876
commit 3f64b2ea5a
23 changed files with 108 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libfprint/drivers/aes1610.c
View file

@ -233,7 +233,7 @@ static void finger_det_reqs_cb(struct fp_img_dev *dev, int result, void *user_da
} }
data = g_malloc(19); data = g_malloc(19);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, 19, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, 19,
finger_det_data_cb, dev, BULK_TIMEOUT); finger_det_data_cb, dev, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -677,7 +677,7 @@ static void capture_run_state(fpi_ssm *ssm)
} }
data = g_malloc(665); data = g_malloc(665);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, 665, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, 665,
capture_read_strip_cb, ssm, BULK_TIMEOUT); capture_read_strip_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -805,7 +805,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct aes1610_dev *aesdev; struct aes1610_dev *aesdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -822,7 +822,7 @@ static void dev_deinit(struct fp_img_dev *dev)
struct aes1610_dev *aesdev; struct aes1610_dev *aesdev;
aesdev = FP_INSTANCE_DATA(FP_DEV(dev)); aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(aesdev); g_free(aesdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

4
libfprint/drivers/aes1660.c
View file

@ -40,7 +40,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct aesX660_dev *aesdev; struct aesX660_dev *aesdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -67,7 +67,7 @@ static void dev_deinit(struct fp_img_dev *dev)
struct aesX660_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev)); struct aesX660_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(aesdev->buffer); g_free(aesdev->buffer);
g_free(aesdev); g_free(aesdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

10
libfprint/drivers/aes2501.c
View file

@ -122,7 +122,7 @@ static void read_regs_rq_cb(struct fp_img_dev *dev, int result, void *user_data)
} }
data = g_malloc(126); data = g_malloc(126);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, 126, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, 126,
read_regs_data_cb, rdata, BULK_TIMEOUT); read_regs_data_cb, rdata, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -333,7 +333,7 @@ static void finger_det_reqs_cb(struct fp_img_dev *dev, int result,
} }
data = g_malloc(20); data = g_malloc(20);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, 20, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, 20,
finger_det_data_cb, dev, BULK_TIMEOUT); finger_det_data_cb, dev, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -558,7 +558,7 @@ static void capture_run_state(fpi_ssm *ssm)
} }
data = g_malloc(1705); data = g_malloc(1705);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, 1705, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, 1705,
capture_read_strip_cb, ssm, BULK_TIMEOUT); capture_read_strip_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -842,7 +842,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct aes2501_dev *aesdev; struct aes2501_dev *aesdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -858,7 +858,7 @@ static void dev_deinit(struct fp_img_dev *dev)
{ {
struct aes2501_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev)); struct aes2501_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(aesdev); g_free(aesdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

22
libfprint/drivers/aes2550.c
View file

@ -133,7 +133,7 @@ static void finger_det_reqs_cb(struct libusb_transfer *t)
/* 2 bytes of result */ /* 2 bytes of result */
data = g_malloc(AES2550_EP_IN_BUF_SIZE); data = g_malloc(AES2550_EP_IN_BUF_SIZE);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, AES2550_EP_IN_BUF_SIZE, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, AES2550_EP_IN_BUF_SIZE,
finger_det_data_cb, dev, BULK_TIMEOUT); finger_det_data_cb, dev, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -163,7 +163,7 @@ static void start_finger_detection(struct fp_img_dev *dev)
fpi_imgdev_session_error(dev, -ENOMEM); fpi_imgdev_session_error(dev, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT, finger_det_reqs, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT, finger_det_reqs,
sizeof(finger_det_reqs), finger_det_reqs_cb, dev, BULK_TIMEOUT); sizeof(finger_det_reqs), finger_det_reqs_cb, dev, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
if (r < 0) { if (r < 0) {
@ -336,7 +336,7 @@ static void capture_run_state(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT, capture_reqs, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT, capture_reqs,
sizeof(capture_reqs), capture_reqs_cb, ssm, BULK_TIMEOUT); sizeof(capture_reqs), capture_reqs_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
if (r < 0) { if (r < 0) {
@ -356,7 +356,7 @@ static void capture_run_state(fpi_ssm *ssm)
} }
data = g_malloc(AES2550_EP_IN_BUF_SIZE); data = g_malloc(AES2550_EP_IN_BUF_SIZE);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, AES2550_EP_IN_BUF_SIZE, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, AES2550_EP_IN_BUF_SIZE,
capture_read_data_cb, ssm, BULK_TIMEOUT); capture_read_data_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -374,7 +374,7 @@ static void capture_run_state(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT, capture_set_idle_reqs, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT, capture_set_idle_reqs,
sizeof(capture_set_idle_reqs), capture_set_idle_reqs_cb, ssm, BULK_TIMEOUT); sizeof(capture_set_idle_reqs), capture_set_idle_reqs_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
if (r < 0) { if (r < 0) {
@ -496,7 +496,7 @@ static void activate_run_state(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT, init_reqs, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT, init_reqs,
sizeof(init_reqs), init_reqs_cb, ssm, BULK_TIMEOUT); sizeof(init_reqs), init_reqs_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
if (r < 0) { if (r < 0) {
@ -516,7 +516,7 @@ static void activate_run_state(fpi_ssm *ssm)
} }
data = g_malloc(AES2550_EP_IN_BUF_SIZE); data = g_malloc(AES2550_EP_IN_BUF_SIZE);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, AES2550_EP_IN_BUF_SIZE, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, AES2550_EP_IN_BUF_SIZE,
init_read_data_cb, ssm, BULK_TIMEOUT); init_read_data_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -534,7 +534,7 @@ static void activate_run_state(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT, calibrate_reqs, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT, calibrate_reqs,
sizeof(calibrate_reqs), init_reqs_cb, ssm, BULK_TIMEOUT); sizeof(calibrate_reqs), init_reqs_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
if (r < 0) { if (r < 0) {
@ -554,7 +554,7 @@ static void activate_run_state(fpi_ssm *ssm)
} }
data = g_malloc(AES2550_EP_IN_BUF_SIZE); data = g_malloc(AES2550_EP_IN_BUF_SIZE);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, data, AES2550_EP_IN_BUF_SIZE, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data, AES2550_EP_IN_BUF_SIZE,
calibrate_read_data_cb, ssm, BULK_TIMEOUT); calibrate_read_data_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -613,7 +613,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct aes2550_dev *aes2550_dev; struct aes2550_dev *aes2550_dev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -630,7 +630,7 @@ static void dev_deinit(struct fp_img_dev *dev)
struct aes2550_dev *aesdev; struct aes2550_dev *aesdev;
aesdev = FP_INSTANCE_DATA(FP_DEV(dev)); aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(aesdev); g_free(aesdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

4
libfprint/drivers/aes2660.c
View file

@ -40,7 +40,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct aesX660_dev *aesdev; struct aesX660_dev *aesdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -69,7 +69,7 @@ static void dev_deinit(struct fp_img_dev *dev)
aesdev = FP_INSTANCE_DATA(FP_DEV(dev)); aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(aesdev->buffer); g_free(aesdev->buffer);
g_free(aesdev); g_free(aesdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

4
libfprint/drivers/aes3500.c
View file

@ -122,7 +122,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct aes3k_dev *aesdev; struct aes3k_dev *aesdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -150,7 +150,7 @@ static void dev_deinit(struct fp_img_dev *dev)
{ {
struct aes3k_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev)); struct aes3k_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(aesdev); g_free(aesdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

2
libfprint/drivers/aes3k.c
View file

@ -123,7 +123,7 @@ static void do_capture(struct fp_img_dev *dev)
} }
data = g_malloc(aesdev->data_buflen); data = g_malloc(aesdev->data_buflen);
libusb_fill_bulk_transfer(aesdev->img_trf, fpi_imgdev_get_usb_dev(dev), EP_IN, data, libusb_fill_bulk_transfer(aesdev->img_trf, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, data,
aesdev->data_buflen, img_cb, dev, 0); aesdev->data_buflen, img_cb, dev, 0);
r = libusb_submit_transfer(aesdev->img_trf); r = libusb_submit_transfer(aesdev->img_trf);

4
libfprint/drivers/aes4000.c
View file

@ -119,7 +119,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct aes3k_dev *aesdev; struct aes3k_dev *aesdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -147,7 +147,7 @@ static void dev_deinit(struct fp_img_dev *dev)
{ {
struct aes3k_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev)); struct aes3k_dev *aesdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(aesdev); g_free(aesdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

4
libfprint/drivers/aesx660.c
View file

@ -49,7 +49,7 @@ static void aesX660_send_cmd_timeout(fpi_ssm *ssm, const unsigned char *cmd,
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT,
(unsigned char *)cmd, cmd_len, (unsigned char *)cmd, cmd_len,
callback, ssm, timeout); callback, ssm, timeout);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -80,7 +80,7 @@ static void aesX660_read_response(fpi_ssm *ssm, size_t buf_len,
} }
data = g_malloc(buf_len); data = g_malloc(buf_len);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN,
data, buf_len, data, buf_len,
callback, ssm, BULK_TIMEOUT); callback, ssm, BULK_TIMEOUT);

8
libfprint/drivers/elan.c
View file

@ -391,7 +391,7 @@ static void elan_cmd_read(fpi_ssm *ssm)
g_free(elandev->last_read); g_free(elandev->last_read);
elandev->last_read = g_malloc(response_len); elandev->last_read = g_malloc(response_len);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)),
elandev->cmd->response_in, elandev->cmd->response_in,
elandev->last_read, response_len, elan_cmd_cb, elandev->last_read, response_len, elan_cmd_cb,
ssm, elandev->cmd_timeout); ssm, elandev->cmd_timeout);
@ -426,7 +426,7 @@ static void elan_run_cmd(fpi_ssm *ssm, const struct elan_cmd *cmd,
} }
elandev->cur_transfer = transfer; elandev->cur_transfer = transfer;
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), ELAN_EP_CMD_OUT, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), ELAN_EP_CMD_OUT,
(char *) cmd->cmd, ELAN_CMD_LEN, elan_cmd_cb, ssm, (char *) cmd->cmd, ELAN_CMD_LEN, elan_cmd_cb, ssm,
elandev->cmd_timeout); elandev->cmd_timeout);
transfer->flags = LIBUSB_TRANSFER_FREE_TRANSFER; transfer->flags = LIBUSB_TRANSFER_FREE_TRANSFER;
@ -803,7 +803,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
G_DEBUG_HERE(); G_DEBUG_HERE();
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -843,7 +843,7 @@ static void dev_deinit(struct fp_img_dev *dev)
elan_dev_reset(elandev); elan_dev_reset(elandev);
g_free(elandev->background); g_free(elandev->background);
g_free(elandev); g_free(elandev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

6
libfprint/drivers/etes603.c
View file

@ -656,7 +656,7 @@ static int async_tx(struct fp_img_dev *idev, unsigned int ep, void *cb,
} else { } else {
return -EIO; return -EIO;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(idev), ep, buffer, length, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(idev)), ep, buffer, length,
cb, cb_arg, BULK_TIMEOUT); cb, cb_arg, BULK_TIMEOUT);
if (libusb_submit_transfer(transfer)) { if (libusb_submit_transfer(transfer)) {
@ -1456,7 +1456,7 @@ static int dev_open(struct fp_img_dev *idev, unsigned long driver_data)
dev->ans = g_malloc(FE_SIZE); dev->ans = g_malloc(FE_SIZE);
dev->fp = g_malloc(FE_SIZE * 4); dev->fp = g_malloc(FE_SIZE * 4);
ret = libusb_claim_interface(fpi_imgdev_get_usb_dev(idev), 0); ret = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(idev)), 0);
if (ret != LIBUSB_SUCCESS) { if (ret != LIBUSB_SUCCESS) {
fp_err("libusb_claim_interface failed on interface 0: %s", libusb_error_name(ret)); fp_err("libusb_claim_interface failed on interface 0: %s", libusb_error_name(ret));
return ret; return ret;
@ -1475,7 +1475,7 @@ static void dev_close(struct fp_img_dev *idev)
g_free(dev->fp); g_free(dev->fp);
g_free(dev); g_free(dev);
libusb_release_interface(fpi_imgdev_get_usb_dev(idev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(idev)), 0);
fpi_imgdev_close_complete(idev); fpi_imgdev_close_complete(idev);
} }

28
libfprint/drivers/fdu2000.c
View file

@ -169,25 +169,25 @@ capture(struct fp_img_dev *dev, gboolean unconditional,
image = g_malloc0(RAW_IMAGE_SIZE); image = g_malloc0(RAW_IMAGE_SIZE);
if ((r = bulk_write_safe(fpi_imgdev_get_usb_dev(dev), LED_ON))) { if ((r = bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), LED_ON))) {
fp_err("Command: LED_ON"); fp_err("Command: LED_ON");
goto out; goto out;
} }
if ((r = bulk_write_safe(fpi_imgdev_get_usb_dev(dev), CAPTURE_READY))) { if ((r = bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), CAPTURE_READY))) {
fp_err("Command: CAPTURE_READY"); fp_err("Command: CAPTURE_READY");
goto out; goto out;
} }
read: read:
if ((r = bulk_write_safe(fpi_imgdev_get_usb_dev(dev), CAPTURE_READ))) { if ((r = bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), CAPTURE_READ))) {
fp_err("Command: CAPTURE_READ"); fp_err("Command: CAPTURE_READ");
goto out; goto out;
} }
/* Now we are ready to read from dev */ /* Now we are ready to read from dev */
r = libusb_bulk_transfer(fpi_imgdev_get_usb_dev(dev), &msg, &bytes, BULK_TIMEOUT * 10); r = libusb_bulk_transfer(fpi_dev_get_usb_dev(FP_DEV(dev)), &msg, &bytes, BULK_TIMEOUT * 10);
if (r < 0 || bytes < 1) if (r < 0 || bytes < 1)
goto read; goto read;
@ -228,12 +228,12 @@ read:
} }
} }
if ((r = bulk_write_safe(fpi_imgdev_get_usb_dev(dev), CAPTURE_END))) { if ((r = bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), CAPTURE_END))) {
fp_err("Command: CAPTURE_END"); fp_err("Command: CAPTURE_END");
goto out; goto out;
} }
if ((r = bulk_write_safe(fpi_imgdev_get_usb_dev(dev), LED_OFF))) { if ((r = bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), LED_OFF))) {
fp_err("Command: LED_OFF"); fp_err("Command: LED_OFF");
goto out; goto out;
} }
@ -254,27 +254,27 @@ static
gint dev_init(struct fp_img_dev *dev, unsigned long driver_data) gint dev_init(struct fp_img_dev *dev, unsigned long driver_data)
{ {
gint r; gint r;
//if ( (r = usb_set_configuration(fpi_imgdev_get_usb_dev(dev), 1)) < 0 ) //if ( (r = usb_set_configuration(fpi_dev_get_usb_dev(FP_DEV(dev)), 1)) < 0 )
// goto out; // goto out;
if ( (r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0)) < 0 ) { if ( (r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0)) < 0 ) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
} }
//if ( (r = usb_set_altinterface(fpi_imgdev_get_usb_dev(dev), 1)) < 0 ) //if ( (r = usb_set_altinterface(fpi_dev_get_usb_dev(FP_DEV(dev)), 1)) < 0 )
// goto out; // goto out;
//if ( (r = usb_clear_halt(fpi_imgdev_get_usb_dev(dev), EP_CMD)) < 0 ) //if ( (r = usb_clear_halt(fpi_dev_get_usb_dev(FP_DEV(dev)), EP_CMD)) < 0 )
// goto out; // goto out;
/* Make sure sensor mode is not capture_{ready|read} */ /* Make sure sensor mode is not capture_{ready|read} */
if ((r = bulk_write_safe(fpi_imgdev_get_usb_dev(dev), CAPTURE_END))) { if ((r = bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), CAPTURE_END))) {
fp_err("Command: CAPTURE_END"); fp_err("Command: CAPTURE_END");
goto out; goto out;
} }
if ((r = bulk_write_safe(fpi_imgdev_get_usb_dev(dev), LED_OFF))) { if ((r = bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), LED_OFF))) {
fp_err("Command: LED_OFF"); fp_err("Command: LED_OFF");
goto out; goto out;
} }
@ -289,10 +289,10 @@ out:
static static
void dev_exit(struct fp_img_dev *dev) void dev_exit(struct fp_img_dev *dev)
{ {
if (bulk_write_safe(fpi_imgdev_get_usb_dev(dev), CAPTURE_END)) if (bulk_write_safe(fpi_dev_get_usb_dev(FP_DEV(dev)), CAPTURE_END))
fp_err("Command: CAPTURE_END"); fp_err("Command: CAPTURE_END");
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
} }
static const struct usb_id id_table[] = { static const struct usb_id id_table[] = {

14
libfprint/drivers/upeksonly.c
View file

@ -629,7 +629,7 @@ static void sm_write_reg(fpi_ssm *ssm, uint8_t reg, uint8_t value)
fp_dbg("set %02x=%02x", reg, value); fp_dbg("set %02x=%02x", reg, value);
data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + 1); data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + 1);
libusb_fill_control_setup(data, 0x40, 0x0c, 0, reg, 1); libusb_fill_control_setup(data, 0x40, 0x0c, 0, reg, 1);
libusb_fill_control_transfer(transfer, fpi_imgdev_get_usb_dev(dev), libusb_fill_control_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)),
data, sm_write_reg_cb, data, sm_write_reg_cb,
ssm, CTRL_TIMEOUT); ssm, CTRL_TIMEOUT);
@ -677,7 +677,7 @@ static void sm_read_reg(fpi_ssm *ssm, uint8_t reg)
fp_dbg("read reg %02x", reg); fp_dbg("read reg %02x", reg);
data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + 8); data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + 8);
libusb_fill_control_setup(data, 0xc0, 0x0c, 0, reg, 8); libusb_fill_control_setup(data, 0xc0, 0x0c, 0, reg, 8);
libusb_fill_control_transfer(transfer, fpi_imgdev_get_usb_dev(dev), libusb_fill_control_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)),
data, sm_read_reg_cb, data, sm_read_reg_cb,
ssm, CTRL_TIMEOUT); ssm, CTRL_TIMEOUT);
transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK | transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK |
@ -727,7 +727,7 @@ static void sm_await_intr(fpi_ssm *ssm)
G_DEBUG_HERE(); G_DEBUG_HERE();
data = g_malloc(4); data = g_malloc(4);
libusb_fill_interrupt_transfer(transfer, fpi_imgdev_get_usb_dev(dev), libusb_fill_interrupt_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)),
0x83, data, 4, 0x83, data, 4,
sm_await_intr_cb, ssm, 0); sm_await_intr_cb, ssm, 0);
transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK | transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK |
@ -1307,7 +1307,7 @@ static int dev_activate(struct fp_img_dev *dev, enum fp_imgdev_state state)
sdev->img_transfer_data[i].idx = i; sdev->img_transfer_data[i].idx = i;
sdev->img_transfer_data[i].dev = dev; sdev->img_transfer_data[i].dev = dev;
data = g_malloc(4096); data = g_malloc(4096);
libusb_fill_bulk_transfer(sdev->img_transfer[i], fpi_imgdev_get_usb_dev(dev), libusb_fill_bulk_transfer(sdev->img_transfer[i], fpi_dev_get_usb_dev(FP_DEV(dev)),
0x81, data, 0x81, data,
4096, img_data_cb, &sdev->img_transfer_data[i], 0); 4096, img_data_cb, &sdev->img_transfer_data[i], 0);
} }
@ -1335,7 +1335,7 @@ static void dev_deinit(struct fp_img_dev *dev)
void *user_data; void *user_data;
user_data = FP_INSTANCE_DATA(FP_DEV(dev)); user_data = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(user_data); g_free(user_data);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }
@ -1387,13 +1387,13 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct sonly_dev *sdev; struct sonly_dev *sdev;
r = libusb_set_configuration(fpi_imgdev_get_usb_dev(dev), 1); r = libusb_set_configuration(fpi_dev_get_usb_dev(FP_DEV(dev)), 1);
if (r < 0) { if (r < 0) {
fp_err("could not set configuration 1"); fp_err("could not set configuration 1");
return r; return r;
} }
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;

16
libfprint/drivers/upektc.c
View file

@ -112,7 +112,7 @@ static void activate_run_state(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), upekdev->ep_out, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), upekdev->ep_out,
(unsigned char*)upekdev->setup_commands[upekdev->init_idx].cmd, (unsigned char*)upekdev->setup_commands[upekdev->init_idx].cmd,
UPEKTC_CMD_LEN, write_init_cb, ssm, BULK_TIMEOUT); UPEKTC_CMD_LEN, write_init_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -133,7 +133,7 @@ static void activate_run_state(fpi_ssm *ssm)
} }
data = g_malloc(upekdev->setup_commands[upekdev->init_idx].response_len); data = g_malloc(upekdev->setup_commands[upekdev->init_idx].response_len);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), upekdev->ep_in, data, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), upekdev->ep_in, data,
upekdev->setup_commands[upekdev->init_idx].response_len, upekdev->setup_commands[upekdev->init_idx].response_len,
read_init_data_cb, ssm, BULK_TIMEOUT); read_init_data_cb, ssm, BULK_TIMEOUT);
@ -233,7 +233,7 @@ static void finger_det_cmd_cb(struct libusb_transfer *t)
} }
data = g_malloc(IMAGE_SIZE); data = g_malloc(IMAGE_SIZE);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), upekdev->ep_in, data, IMAGE_SIZE, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), upekdev->ep_in, data, IMAGE_SIZE,
finger_det_data_cb, dev, BULK_TIMEOUT); finger_det_data_cb, dev, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -263,7 +263,7 @@ static void start_finger_detection(struct fp_img_dev *dev)
fpi_imgdev_session_error(dev, -ENOMEM); fpi_imgdev_session_error(dev, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), upekdev->ep_out, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), upekdev->ep_out,
(unsigned char *)scan_cmd, UPEKTC_CMD_LEN, (unsigned char *)scan_cmd, UPEKTC_CMD_LEN,
finger_det_cmd_cb, dev, BULK_TIMEOUT); finger_det_cmd_cb, dev, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -335,7 +335,7 @@ static void capture_run_state(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), upekdev->ep_out, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), upekdev->ep_out,
(unsigned char *)scan_cmd, UPEKTC_CMD_LEN, (unsigned char *)scan_cmd, UPEKTC_CMD_LEN,
capture_cmd_cb, ssm, BULK_TIMEOUT); capture_cmd_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -356,7 +356,7 @@ static void capture_run_state(fpi_ssm *ssm)
} }
data = g_malloc(IMAGE_SIZE); data = g_malloc(IMAGE_SIZE);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), upekdev->ep_in, data, IMAGE_SIZE, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), upekdev->ep_in, data, IMAGE_SIZE,
capture_read_data_cb, ssm, BULK_TIMEOUT); capture_read_data_cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -434,7 +434,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct upektc_dev *upekdev; struct upektc_dev *upekdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -473,7 +473,7 @@ static void dev_deinit(struct fp_img_dev *dev)
void *user_data; void *user_data;
user_data = FP_INSTANCE_DATA(FP_DEV(dev)); user_data = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(user_data); g_free(user_data);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

8
libfprint/drivers/upektc_img.c
View file

@ -93,7 +93,7 @@ static void upektc_img_submit_req(fpi_ssm *ssm,
upektc_img_cmd_fix_seq(upekdev->cmd, seq); upektc_img_cmd_fix_seq(upekdev->cmd, seq);
upektc_img_cmd_update_crc(upekdev->cmd, buf_size); upektc_img_cmd_update_crc(upekdev->cmd, buf_size);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT, upekdev->cmd, buf_size, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT, upekdev->cmd, buf_size,
cb, ssm, BULK_TIMEOUT); cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -119,7 +119,7 @@ static void upektc_img_read_data(fpi_ssm *ssm, size_t buf_size, size_t buf_offse
transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER; transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, upekdev->response + buf_offset, buf_size, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN, upekdev->response + buf_offset, buf_size,
cb, ssm, BULK_TIMEOUT); cb, ssm, BULK_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -601,7 +601,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
struct upektc_img_dev *upekdev; struct upektc_img_dev *upekdev;
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r; return r;
@ -617,7 +617,7 @@ static void dev_deinit(struct fp_img_dev *dev)
{ {
struct upektc_img_dev *upekdev = FP_INSTANCE_DATA(FP_DEV(dev)); struct upektc_img_dev *upekdev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(upekdev); g_free(upekdev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

14
libfprint/drivers/uru4000.c
View file

@ -201,7 +201,7 @@ static int write_regs(struct fp_img_dev *dev, uint16_t first_reg,
data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + num_regs); data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + num_regs);
memcpy(data + LIBUSB_CONTROL_SETUP_SIZE, values, num_regs); memcpy(data + LIBUSB_CONTROL_SETUP_SIZE, values, num_regs);
libusb_fill_control_setup(data, CTRL_OUT, USB_RQ, first_reg, 0, num_regs); libusb_fill_control_setup(data, CTRL_OUT, USB_RQ, first_reg, 0, num_regs);
libusb_fill_control_transfer(transfer, fpi_imgdev_get_usb_dev(dev), data, write_regs_cb, libusb_fill_control_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), data, write_regs_cb,
wrdata, CTRL_TIMEOUT); wrdata, CTRL_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -267,7 +267,7 @@ static int read_regs(struct fp_img_dev *dev, uint16_t first_reg,
data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + num_regs); data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + num_regs);
libusb_fill_control_setup(data, CTRL_IN, USB_RQ, first_reg, 0, num_regs); libusb_fill_control_setup(data, CTRL_IN, USB_RQ, first_reg, 0, num_regs);
libusb_fill_control_transfer(transfer, fpi_imgdev_get_usb_dev(dev), data, read_regs_cb, libusb_fill_control_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), data, read_regs_cb,
rrdata, CTRL_TIMEOUT); rrdata, CTRL_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
@ -435,7 +435,7 @@ static int start_irq_handler(struct fp_img_dev *dev)
return -ENOMEM; return -ENOMEM;
data = g_malloc(IRQ_LENGTH); data = g_malloc(IRQ_LENGTH);
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_INTR, data, IRQ_LENGTH, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_INTR, data, IRQ_LENGTH,
irq_handler, dev, 0); irq_handler, dev, 0);
urudev->irq_transfer = transfer; urudev->irq_transfer = transfer;
@ -702,7 +702,7 @@ static void imaging_run_state(fpi_ssm *ssm)
case IMAGING_CAPTURE: case IMAGING_CAPTURE:
urudev->img_lines_done = 0; urudev->img_lines_done = 0;
urudev->img_block = 0; urudev->img_block = 0;
libusb_fill_bulk_transfer(urudev->img_transfer, fpi_imgdev_get_usb_dev(dev), EP_DATA, libusb_fill_bulk_transfer(urudev->img_transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_DATA,
urudev->img_data, sizeof(struct uru4k_image), image_transfer_cb, ssm, 0); urudev->img_data, sizeof(struct uru4k_image), image_transfer_cb, ssm, 0);
r = libusb_submit_transfer(urudev->img_transfer); r = libusb_submit_transfer(urudev->img_transfer);
if (r < 0) if (r < 0)
@ -1257,7 +1257,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
/* Find fingerprint interface */ /* Find fingerprint interface */
r = libusb_get_config_descriptor(libusb_get_device(fpi_imgdev_get_usb_dev(dev)), 0, &config); r = libusb_get_config_descriptor(libusb_get_device(fpi_dev_get_usb_dev(FP_DEV(dev))), 0, &config);
if (r < 0) { if (r < 0) {
fp_err("Failed to get config descriptor"); fp_err("Failed to get config descriptor");
return r; return r;
@ -1311,7 +1311,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
/* Device looks like a supported reader */ /* Device looks like a supported reader */
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), iface_desc->bInterfaceNumber); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), iface_desc->bInterfaceNumber);
if (r < 0) { if (r < 0) {
fp_err("interface claim failed: %s", libusb_error_name(r)); fp_err("interface claim failed: %s", libusb_error_name(r));
goto out; goto out;
@ -1368,7 +1368,7 @@ static void dev_deinit(struct fp_img_dev *dev)
SECITEM_FreeItem(urudev->param, PR_TRUE); SECITEM_FreeItem(urudev->param, PR_TRUE);
if (urudev->slot) if (urudev->slot)
PK11_FreeSlot(urudev->slot); PK11_FreeSlot(urudev->slot);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), urudev->interface); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), urudev->interface);
g_free(urudev); g_free(urudev);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

10
libfprint/drivers/vcom5s.c
View file

@ -101,7 +101,7 @@ static void sm_write_reg(fpi_ssm *ssm, unsigned char reg,
fp_dbg("set %02x=%02x", reg, value); fp_dbg("set %02x=%02x", reg, value);
data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE); data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE);
libusb_fill_control_setup(data, CTRL_OUT, reg, value, 0, 0); libusb_fill_control_setup(data, CTRL_OUT, reg, value, 0, 0);
libusb_fill_control_transfer(transfer, fpi_imgdev_get_usb_dev(dev), data, sm_write_reg_cb, libusb_fill_control_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), data, sm_write_reg_cb,
ssm, CTRL_TIMEOUT); ssm, CTRL_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
if (r < 0) { if (r < 0) {
@ -140,7 +140,7 @@ static void sm_exec_cmd(fpi_ssm *ssm, unsigned char cmd,
fp_dbg("cmd %02x param %02x", cmd, param); fp_dbg("cmd %02x param %02x", cmd, param);
data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE); data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE);
libusb_fill_control_setup(data, CTRL_IN, cmd, param, 0, 0); libusb_fill_control_setup(data, CTRL_IN, cmd, param, 0, 0);
libusb_fill_control_transfer(transfer, fpi_imgdev_get_usb_dev(dev), data, sm_exec_cmd_cb, libusb_fill_control_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), data, sm_exec_cmd_cb,
ssm, CTRL_TIMEOUT); ssm, CTRL_TIMEOUT);
r = libusb_submit_transfer(transfer); r = libusb_submit_transfer(transfer);
if (r < 0) { if (r < 0) {
@ -231,7 +231,7 @@ static void capture_iterate(fpi_ssm *ssm)
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(dev), EP_IN, libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN,
vdev->capture_img->data + (RQ_SIZE * iteration), RQ_SIZE, vdev->capture_img->data + (RQ_SIZE * iteration), RQ_SIZE,
capture_cb, ssm, CTRL_TIMEOUT); capture_cb, ssm, CTRL_TIMEOUT);
transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK; transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK;
@ -341,7 +341,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
v5s_dev = g_malloc0(sizeof(struct v5s_dev)); v5s_dev = g_malloc0(sizeof(struct v5s_dev));
fp_dev_set_instance_data(FP_DEV(dev), v5s_dev); fp_dev_set_instance_data(FP_DEV(dev), v5s_dev);
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) if (r < 0)
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
@ -356,7 +356,7 @@ static void dev_deinit(struct fp_img_dev *dev)
struct v5s_dev *v5s_dev; struct v5s_dev *v5s_dev;
v5s_dev = FP_INSTANCE_DATA(FP_DEV(dev)); v5s_dev = FP_INSTANCE_DATA(FP_DEV(dev));
g_free(v5s_dev); g_free(v5s_dev);
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);
} }

12
libfprint/drivers/vfs0050.c
View file

@ -54,7 +54,7 @@ static void async_write_callback(struct libusb_transfer *transfer)
static void async_write(fpi_ssm *ssm, void *data, int len) static void async_write(fpi_ssm *ssm, void *data, int len)
{ {
struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm); struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm);
struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_dev_get_usb_dev(FP_DEV(idev));
struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev)); struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev));
vdev->transfer = libusb_alloc_transfer(0); vdev->transfer = libusb_alloc_transfer(0);
@ -96,7 +96,7 @@ static void async_read_callback(struct libusb_transfer *transfer)
static void async_read(fpi_ssm *ssm, int ep, void *data, int len) static void async_read(fpi_ssm *ssm, int ep, void *data, int len)
{ {
struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm); struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm);
struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_dev_get_usb_dev(FP_DEV(idev));
struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev)); struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev));
ep |= LIBUSB_ENDPOINT_IN; ep |= LIBUSB_ENDPOINT_IN;
@ -150,7 +150,7 @@ static void async_abort_callback(struct libusb_transfer *transfer)
static void async_abort(fpi_ssm *ssm, int ep) static void async_abort(fpi_ssm *ssm, int ep)
{ {
struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm); struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm);
struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_dev_get_usb_dev(FP_DEV(idev));
struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev)); struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev));
int len = VFS_USB_BUFFER_SIZE; int len = VFS_USB_BUFFER_SIZE;
@ -521,7 +521,7 @@ static void scan_completed(void *data)
static void activate_ssm(fpi_ssm *ssm) static void activate_ssm(fpi_ssm *ssm)
{ {
struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm); struct fp_img_dev *idev = fpi_ssm_get_user_data(ssm);
struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_dev_get_usb_dev(FP_DEV(idev));
struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev)); struct vfs_dev_t *vdev = FP_INSTANCE_DATA(FP_DEV(idev));
switch (fpi_ssm_get_cur_state(ssm)) { switch (fpi_ssm_get_cur_state(ssm)) {
@ -726,7 +726,7 @@ static int dev_open(struct fp_img_dev *idev, unsigned long driver_data)
struct vfs_dev_t *vdev; struct vfs_dev_t *vdev;
/* Claim usb interface */ /* Claim usb interface */
int error = libusb_claim_interface(fpi_imgdev_get_usb_dev(idev), 0); int error = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(idev)), 0);
if (error < 0) { if (error < 0) {
/* Interface not claimed, return error */ /* Interface not claimed, return error */
fp_err("could not claim interface 0"); fp_err("could not claim interface 0");
@ -754,7 +754,7 @@ static void dev_close(struct fp_img_dev *idev)
g_free(vdev); g_free(vdev);
/* Release usb interface */ /* Release usb interface */
libusb_release_interface(fpi_imgdev_get_usb_dev(idev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(idev)), 0);
/* Notify close complete */ /* Notify close complete */
fpi_imgdev_close_complete(idev); fpi_imgdev_close_complete(idev);

10
libfprint/drivers/vfs101.c
View file

@ -265,7 +265,7 @@ static void async_send(fpi_ssm *ssm)
vdev->buffer[1] = byte(1, vdev->seqnum); vdev->buffer[1] = byte(1, vdev->seqnum);
/* Prepare bulk transfer */ /* Prepare bulk transfer */
libusb_fill_bulk_transfer(vdev->transfer, fpi_imgdev_get_usb_dev(dev), EP_OUT(1), vdev->buffer, vdev->length, async_send_cb, ssm, BULK_TIMEOUT); libusb_fill_bulk_transfer(vdev->transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_OUT(1), vdev->buffer, vdev->length, async_send_cb, ssm, BULK_TIMEOUT);
/* Submit transfer */ /* Submit transfer */
r = libusb_submit_transfer(vdev->transfer); r = libusb_submit_transfer(vdev->transfer);
@ -347,7 +347,7 @@ static void async_recv(fpi_ssm *ssm)
} }
/* Prepare bulk transfer */ /* Prepare bulk transfer */
libusb_fill_bulk_transfer(vdev->transfer, fpi_imgdev_get_usb_dev(dev), EP_IN(1), vdev->buffer, 0x0f, async_recv_cb, ssm, BULK_TIMEOUT); libusb_fill_bulk_transfer(vdev->transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN(1), vdev->buffer, 0x0f, async_recv_cb, ssm, BULK_TIMEOUT);
/* Submit transfer */ /* Submit transfer */
r = libusb_submit_transfer(vdev->transfer); r = libusb_submit_transfer(vdev->transfer);
@ -452,7 +452,7 @@ static void async_load(fpi_ssm *ssm)
buffer = vdev->buffer + vdev->length; buffer = vdev->buffer + vdev->length;
/* Prepare bulk transfer */ /* Prepare bulk transfer */
libusb_fill_bulk_transfer(vdev->transfer, fpi_imgdev_get_usb_dev(dev), EP_IN(2), buffer, VFS_BLOCK_SIZE, async_load_cb, ssm, BULK_TIMEOUT); libusb_fill_bulk_transfer(vdev->transfer, fpi_dev_get_usb_dev(FP_DEV(dev)), EP_IN(2), buffer, VFS_BLOCK_SIZE, async_load_cb, ssm, BULK_TIMEOUT);
/* Submit transfer */ /* Submit transfer */
r = libusb_submit_transfer(vdev->transfer); r = libusb_submit_transfer(vdev->transfer);
@ -1494,7 +1494,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
/* Claim usb interface */ /* Claim usb interface */
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) if (r < 0)
{ {
/* Interface not claimed, return error */ /* Interface not claimed, return error */
@ -1523,7 +1523,7 @@ static void dev_close(struct fp_img_dev *dev)
g_free(vdev); g_free(vdev);
/* Release usb interface */ /* Release usb interface */
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
/* Notify close complete */ /* Notify close complete */
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);

16
libfprint/drivers/vfs301.c
View file

@ -110,7 +110,7 @@ static void m_loop_state(fpi_ssm *ssm)
switch (fpi_ssm_get_cur_state(ssm)) { switch (fpi_ssm_get_cur_state(ssm)) {
case M_REQUEST_PRINT: case M_REQUEST_PRINT:
vfs301_proto_request_fingerprint(fpi_imgdev_get_usb_dev(dev), vdev); vfs301_proto_request_fingerprint(fpi_dev_get_usb_dev(FP_DEV(dev)), vdev);
fpi_ssm_next_state(ssm); fpi_ssm_next_state(ssm);
break; break;
@ -120,7 +120,7 @@ static void m_loop_state(fpi_ssm *ssm)
break; break;
case M_CHECK_PRINT: case M_CHECK_PRINT:
if (!vfs301_proto_peek_event(fpi_imgdev_get_usb_dev(dev), vdev)) if (!vfs301_proto_peek_event(fpi_dev_get_usb_dev(FP_DEV(dev)), vdev))
fpi_ssm_jump_to_state(ssm, M_WAIT_PRINT); fpi_ssm_jump_to_state(ssm, M_WAIT_PRINT);
else else
fpi_ssm_next_state(ssm); fpi_ssm_next_state(ssm);
@ -128,7 +128,7 @@ static void m_loop_state(fpi_ssm *ssm)
case M_READ_PRINT_START: case M_READ_PRINT_START:
fpi_imgdev_report_finger_status(dev, TRUE); fpi_imgdev_report_finger_status(dev, TRUE);
vfs301_proto_process_event_start(fpi_imgdev_get_usb_dev(dev), vdev); vfs301_proto_process_event_start(fpi_dev_get_usb_dev(FP_DEV(dev)), vdev);
fpi_ssm_next_state(ssm); fpi_ssm_next_state(ssm);
break; break;
@ -139,7 +139,7 @@ static void m_loop_state(fpi_ssm *ssm)
case M_READ_PRINT_POLL: case M_READ_PRINT_POLL:
{ {
int rv = vfs301_proto_process_event_poll(fpi_imgdev_get_usb_dev(dev), vdev); int rv = vfs301_proto_process_event_poll(fpi_dev_get_usb_dev(FP_DEV(dev)), vdev);
g_assert(rv != VFS301_FAILURE); g_assert(rv != VFS301_FAILURE);
if (rv == VFS301_ONGOING) if (rv == VFS301_ONGOING)
fpi_ssm_jump_to_state(ssm, M_READ_PRINT_WAIT); fpi_ssm_jump_to_state(ssm, M_READ_PRINT_WAIT);
@ -175,7 +175,7 @@ static void m_init_state(fpi_ssm *ssm)
g_assert(fpi_ssm_get_cur_state(ssm) == 0); g_assert(fpi_ssm_get_cur_state(ssm) == 0);
vfs301_proto_init(fpi_imgdev_get_usb_dev(dev), vdev); vfs301_proto_init(fpi_dev_get_usb_dev(FP_DEV(dev)), vdev);
fpi_ssm_mark_completed(ssm); fpi_ssm_mark_completed(ssm);
} }
@ -219,7 +219,7 @@ static void dev_deactivate(struct fp_img_dev *dev)
vfs301_dev_t *vdev; vfs301_dev_t *vdev;
vdev = FP_INSTANCE_DATA(FP_DEV(dev)); vdev = FP_INSTANCE_DATA(FP_DEV(dev));
vfs301_proto_deinit(fpi_imgdev_get_usb_dev(dev), vdev); vfs301_proto_deinit(fpi_dev_get_usb_dev(FP_DEV(dev)), vdev);
fpi_imgdev_deactivate_complete(dev); fpi_imgdev_deactivate_complete(dev);
} }
@ -229,7 +229,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
int r; int r;
/* Claim usb interface */ /* Claim usb interface */
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r < 0) { if (r < 0) {
/* Interface not claimed, return error */ /* Interface not claimed, return error */
fp_err("could not claim interface 0: %s", libusb_error_name(r)); fp_err("could not claim interface 0: %s", libusb_error_name(r));
@ -259,7 +259,7 @@ static void dev_close(struct fp_img_dev *dev)
g_free(vdev); g_free(vdev);
/* Release usb interface */ /* Release usb interface */
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
/* Notify close complete */ /* Notify close complete */
fpi_imgdev_close_complete(dev); fpi_imgdev_close_complete(dev);

12
libfprint/drivers/vfs5011.c
View file

@ -196,7 +196,7 @@ static void usbexchange_loop(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(data->device), libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(data->device)),
action->endpoint, action->data, action->endpoint, action->data,
action->size, async_send_cb, ssm, action->size, async_send_cb, ssm,
data->timeout); data->timeout);
@ -212,7 +212,7 @@ static void usbexchange_loop(fpi_ssm *ssm)
fpi_ssm_mark_failed(ssm, -ENOMEM); fpi_ssm_mark_failed(ssm, -ENOMEM);
return; return;
} }
libusb_fill_bulk_transfer(transfer, fpi_imgdev_get_usb_dev(data->device), libusb_fill_bulk_transfer(transfer, fpi_dev_get_usb_dev(FP_DEV(data->device)),
action->endpoint, data->receive_buf, action->endpoint, data->receive_buf,
action->size, async_recv_cb, ssm, action->size, async_recv_cb, ssm,
data->timeout); data->timeout);
@ -707,7 +707,7 @@ static void activate_loop(fpi_ssm *ssm)
break; break;
case DEV_ACTIVATE_READ_DATA: case DEV_ACTIVATE_READ_DATA:
r = capture_chunk_async(data, fpi_imgdev_get_usb_dev(dev), CAPTURE_LINES, r = capture_chunk_async(data, fpi_dev_get_usb_dev(FP_DEV(dev)), CAPTURE_LINES,
READ_TIMEOUT, ssm); READ_TIMEOUT, ssm);
if (r != 0) { if (r != 0) {
fp_err("Failed to capture data"); fp_err("Failed to capture data");
@ -817,13 +817,13 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
(unsigned char *)g_malloc0(CAPTURE_LINES * VFS5011_LINE_SIZE); (unsigned char *)g_malloc0(CAPTURE_LINES * VFS5011_LINE_SIZE);
fp_dev_set_instance_data(FP_DEV(dev), data); fp_dev_set_instance_data(FP_DEV(dev), data);
r = libusb_reset_device(fpi_imgdev_get_usb_dev(dev)); r = libusb_reset_device(fpi_dev_get_usb_dev(FP_DEV(dev)));
if (r != 0) { if (r != 0) {
fp_err("Failed to reset the device"); fp_err("Failed to reset the device");
return r; return r;
} }
r = libusb_claim_interface(fpi_imgdev_get_usb_dev(dev), 0); r = libusb_claim_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
if (r != 0) { if (r != 0) {
fp_err("Failed to claim interface: %s", libusb_error_name(r)); fp_err("Failed to claim interface: %s", libusb_error_name(r));
return r; return r;
@ -839,7 +839,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
static void dev_close(struct fp_img_dev *dev) static void dev_close(struct fp_img_dev *dev)
{ {
libusb_release_interface(fpi_imgdev_get_usb_dev(dev), 0); libusb_release_interface(fpi_dev_get_usb_dev(FP_DEV(dev)), 0);
struct vfs5011_data *data; struct vfs5011_data *data;
data = FP_INSTANCE_DATA(FP_DEV(dev)); data = FP_INSTANCE_DATA(FP_DEV(dev));
if (data != NULL) { if (data != NULL) {

1
libfprint/drivers_api.h
View file

@ -67,7 +67,6 @@ enum fp_imgdev_enroll_state {
IMG_ACQUIRE_STATE_DEACTIVATING, IMG_ACQUIRE_STATE_DEACTIVATING,
}; };
libusb_device_handle *fpi_imgdev_get_usb_dev(struct fp_img_dev *dev);
enum fp_imgdev_enroll_state fpi_imgdev_get_action_state(struct fp_img_dev *imgdev); enum fp_imgdev_enroll_state fpi_imgdev_get_action_state(struct fp_img_dev *imgdev);
enum fp_imgdev_action fpi_imgdev_get_action(struct fp_img_dev *imgdev); enum fp_imgdev_action fpi_imgdev_get_action(struct fp_img_dev *imgdev);
int fpi_imgdev_get_action_result(struct fp_img_dev *imgdev); int fpi_imgdev_get_action_result(struct fp_img_dev *imgdev);

6
libfprint/img.c
View file

@ -533,12 +533,6 @@ API_EXPORTED struct fp_minutia **fp_img_get_minutiae(struct fp_img *img,
return img->minutiae->list; return img->minutiae->list;
} }
libusb_device_handle *
fpi_imgdev_get_usb_dev(struct fp_img_dev *dev)
{
return FP_DEV(dev)->udev;
}
enum fp_imgdev_enroll_state enum fp_imgdev_enroll_state
fpi_imgdev_get_action_state(struct fp_img_dev *imgdev) fpi_imgdev_get_action_state(struct fp_img_dev *imgdev)
{ {