summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNikolai Kondrashov <spbnick@gmail.com>2010-11-17 20:51:48 +0300
committerNikolai Kondrashov <spbnick@gmail.com>2010-11-17 20:51:48 +0300
commit65c2e2a78aa4f26d2abcc12b500ee1b85b48abbe (patch)
tree2246a1ead7dcc4514f5776509a50b96564163a77 /lib
parent4fb9dfd60bd99c1ddaad1f33c8d02ab3dd6182a6 (diff)
downloadusbhid-dump-65c2e2a78aa4f26d2abcc12b500ee1b85b48abbe.tar.gz
Minor naming cleanup in uhd_dev_list_open
Renamed vendor/product parameters to uhd_dev_list_open to vid/pid.
Diffstat (limited to 'lib')
-rw-r--r--lib/dev_list.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/dev_list.c b/lib/dev_list.c
index e23686e..d6c1192 100644
--- a/lib/dev_list.c
+++ b/lib/dev_list.c
@@ -69,7 +69,7 @@ uhd_dev_list_close(uhd_dev *list)
enum libusb_error
uhd_dev_list_open(libusb_context *ctx,
uint8_t bus_num, uint8_t dev_addr,
- uint16_t vendor, uint16_t product,
+ uint16_t vid, uint16_t pid,
uhd_dev **plist)
{
enum libusb_error err = LIBUSB_ERROR_OTHER;
@@ -104,14 +104,14 @@ uhd_dev_list_open(libusb_context *ctx,
continue;
/* Skip devices not matching vendor/product mask */
- if (vendor != UHD_VID_ANY || product != UHD_PID_ANY)
+ if (vid != UHD_VID_ANY || pid != UHD_PID_ANY)
{
err = libusb_get_device_descriptor(lusb_dev, &desc);
if (err != LIBUSB_SUCCESS)
goto cleanup;
- if ((vendor != UHD_VID_ANY && vendor != desc.idVendor) ||
- (product != UHD_PID_ANY && product != desc.idProduct))
+ if ((vid != UHD_VID_ANY && vid != desc.idVendor) ||
+ (pid != UHD_PID_ANY && pid != desc.idProduct))
continue;
}