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

vfs0050: Rename "udev" to "usb_dev"

Browse source 
To reduce confusion with possible future udev usage.
This commit is contained in:
Bastien Nocera 2018-05-29 13:37:19 +02:00
parent 1a376c1bfa
commit ba49677794
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libfprint/drivers/vfs0050.c
View file

@ -54,12 +54,12 @@ static void async_write_callback(struct libusb_transfer *transfer)
static void async_write(struct fpi_ssm *ssm, void *data, int len) static void async_write(struct 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 *udev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev);
struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev); struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev);
vdev->transfer = libusb_alloc_transfer(0); vdev->transfer = libusb_alloc_transfer(0);
vdev->transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER; vdev->transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
libusb_fill_bulk_transfer(vdev->transfer, udev, 0x01, data, len, libusb_fill_bulk_transfer(vdev->transfer, usb_dev, 0x01, data, len,
async_write_callback, ssm, VFS_USB_TIMEOUT); async_write_callback, ssm, VFS_USB_TIMEOUT);
libusb_submit_transfer(vdev->transfer); libusb_submit_transfer(vdev->transfer);
} }
@ -96,7 +96,7 @@ static void async_read_callback(struct libusb_transfer *transfer)
static void async_read(struct fpi_ssm *ssm, int ep, void *data, int len) static void async_read(struct 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 *udev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev);
struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev); struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev);
ep |= LIBUSB_ENDPOINT_IN; ep |= LIBUSB_ENDPOINT_IN;
@ -106,11 +106,11 @@ static void async_read(struct fpi_ssm *ssm, int ep, void *data, int len)
/* 0x83 is the only interrupt endpoint */ /* 0x83 is the only interrupt endpoint */
if (ep == EP3_IN) if (ep == EP3_IN)
libusb_fill_interrupt_transfer(vdev->transfer, udev, ep, data, libusb_fill_interrupt_transfer(vdev->transfer, usb_dev, ep, data,
len, async_read_callback, ssm, len, async_read_callback, ssm,
VFS_USB_TIMEOUT); VFS_USB_TIMEOUT);
else else
libusb_fill_bulk_transfer(vdev->transfer, udev, ep, data, len, libusb_fill_bulk_transfer(vdev->transfer, usb_dev, ep, data, len,
async_read_callback, ssm, async_read_callback, ssm,
VFS_USB_TIMEOUT); VFS_USB_TIMEOUT);
libusb_submit_transfer(vdev->transfer); libusb_submit_transfer(vdev->transfer);
@ -150,7 +150,7 @@ static void async_abort_callback(struct libusb_transfer *transfer)
static void async_abort(struct fpi_ssm *ssm, int ep) static void async_abort(struct 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 *udev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev);
struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev); struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev);
int len = VFS_USB_BUFFER_SIZE; int len = VFS_USB_BUFFER_SIZE;
@ -164,11 +164,11 @@ static void async_abort(struct fpi_ssm *ssm, int ep)
/* 0x83 is the only interrupt endpoint */ /* 0x83 is the only interrupt endpoint */
if (ep == EP3_IN) if (ep == EP3_IN)
libusb_fill_interrupt_transfer(vdev->transfer, udev, ep, data, libusb_fill_interrupt_transfer(vdev->transfer, usb_dev, ep, data,
len, async_abort_callback, ssm, len, async_abort_callback, ssm,
VFS_USB_ABORT_TIMEOUT); VFS_USB_ABORT_TIMEOUT);
else else
libusb_fill_bulk_transfer(vdev->transfer, udev, ep, data, len, libusb_fill_bulk_transfer(vdev->transfer, usb_dev, ep, data, len,
async_abort_callback, ssm, async_abort_callback, ssm,
VFS_USB_ABORT_TIMEOUT); VFS_USB_ABORT_TIMEOUT);
libusb_submit_transfer(vdev->transfer); libusb_submit_transfer(vdev->transfer);
@ -521,7 +521,7 @@ static void scan_completed(void *data)
static void activate_ssm(struct fpi_ssm *ssm) static void activate_ssm(struct 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 *udev = fpi_imgdev_get_usb_dev(idev); struct libusb_device_handle *usb_dev = fpi_imgdev_get_usb_dev(idev);
struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev); struct vfs_dev_t *vdev = fpi_imgdev_get_user_data(idev);
switch (fpi_ssm_get_cur_state(ssm)) { switch (fpi_ssm_get_cur_state(ssm)) {
@ -577,7 +577,7 @@ static void activate_ssm(struct fpi_ssm *ssm)
/* Asyncronously enquire an interrupt */ /* Asyncronously enquire an interrupt */
vdev->transfer = libusb_alloc_transfer(0); vdev->transfer = libusb_alloc_transfer(0);
vdev->transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER; vdev->transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
libusb_fill_interrupt_transfer(vdev->transfer, udev, 0x83, libusb_fill_interrupt_transfer(vdev->transfer, usb_dev, 0x83,
vdev->interrupt, vdev->interrupt,
VFS_INTERRUPT_SIZE, VFS_INTERRUPT_SIZE,
interrupt_callback, ssm, 0); interrupt_callback, ssm, 0);
@ -627,7 +627,7 @@ static void activate_ssm(struct fpi_ssm *ssm)
/* Receive chunk of data */ /* Receive chunk of data */
vdev->transfer = libusb_alloc_transfer(0); vdev->transfer = libusb_alloc_transfer(0);
vdev->transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER; vdev->transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
libusb_fill_bulk_transfer(vdev->transfer, udev, 0x82, libusb_fill_bulk_transfer(vdev->transfer, usb_dev, 0x82,
(void *)vdev->lines_buffer + (void *)vdev->lines_buffer +
vdev->bytes, VFS_USB_BUFFER_SIZE, vdev->bytes, VFS_USB_BUFFER_SIZE,
receive_callback, ssm, receive_callback, ssm,