From 1ab52617c7d857acb01368938b713595af078b4e Mon Sep 17 00:00:00 2001 From: Azzie Date: Sat, 29 Mar 2008 18:11:17 +0000 Subject: [PATCH] Update for latest libusb constant names --- libfprint/drivers/upekts.c | 2 +- libfprint/drivers/uru4000.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c index e0e7d1a..859469f 100644 --- a/libfprint/drivers/upekts.c +++ b/libfprint/drivers/upekts.c @@ -711,7 +711,7 @@ static void initsm_run_state(struct fpi_ssm *ssm) data = g_malloc(LIBUSB_CONTROL_SETUP_SIZE + 1); libusb_fill_control_setup(data, - LIBUSB_TYPE_VENDOR | LIBUSB_RECIP_DEVICE, 0x0c, 0x100, 0x0400, 1); + LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, 0x0c, 0x100, 0x0400, 1); libusb_fill_control_transfer(transfer, ssm->dev->udev, data, ctrl400_cb, ssm, TIMEOUT); diff --git a/libfprint/drivers/uru4000.c b/libfprint/drivers/uru4000.c index bcaa025..c508cc6 100644 --- a/libfprint/drivers/uru4000.c +++ b/libfprint/drivers/uru4000.c @@ -31,8 +31,8 @@ #define EP_INTR (1 | LIBUSB_ENDPOINT_IN) #define EP_DATA (2 | LIBUSB_ENDPOINT_IN) #define USB_RQ 0x04 -#define CTRL_IN (LIBUSB_TYPE_VENDOR | LIBUSB_ENDPOINT_IN) -#define CTRL_OUT (LIBUSB_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT) +#define CTRL_IN (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN) +#define CTRL_OUT (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT) #define CTRL_TIMEOUT 5000 #define BULK_TIMEOUT 5000 #define DATABLK_RQLEN 0x1b340