libusb 0.4.0 → 0.4.1

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/examples/dpfp.c

@@ -1,5 +1,5 @@
 /*
- * libusbx example program to manipulate U.are.U 4000B fingerprint scanner.
+ * libusb example program to manipulate U.are.U 4000B fingerprint scanner.
  * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
  *
  * Basic image capture program only, does not consider the powerup quirks or

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/examples/dpfp_threaded.c

@@ -1,5 +1,5 @@
 /*
- * libusbx example program to manipulate U.are.U 4000B fingerprint scanner.
+ * libusb example program to manipulate U.are.U 4000B fingerprint scanner.
  * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
  *
  * Basic image capture program only, does not consider the powerup quirks or

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/examples/ezusb.c

@@ -181,7 +181,7 @@ static bool ezusb_cpucs(libusb_device_handle *device, uint32_t addr, bool doRun)
 		RW_INTERNAL, addr & 0xFFFF, addr >> 16,
 		&data, 1, 1000);
 	if ((status != 1) &&
-		/* We may get an I/O error from libusbx as the device disappears */
+		/* We may get an I/O error from libusb as the device disappears */
 		((!doRun) || (status != LIBUSB_ERROR_IO)))
 	{
 		const char *mesg = "can't modify CPUCS";
@@ -208,7 +208,7 @@ static bool ezusb_fx3_jump(libusb_device_handle *device, uint32_t addr)
 		LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,
 		RW_INTERNAL, addr & 0xFFFF, addr >> 16,
 		NULL, 0, 1000);
-	/* We may get an I/O error from libusbx as the device disappears */
+	/* We may get an I/O error from libusb as the device disappears */
 	if ((status != 0) && (status != LIBUSB_ERROR_IO))
 	{
 		const char *mesg = "failed to send jump command";
@@ -436,7 +436,11 @@ static int parse_iic(FILE *image, void *context,
 	uint8_t block_header[4];
 	int rc;
 	bool external = false;
-	long file_size, initial_pos = ftell(image);
+	long file_size, initial_pos;
+
+	initial_pos = ftell(image);
+	if (initial_pos < 0)
+		return -1;
 
 	fseek(image, 0L, SEEK_END);
 	file_size = ftell(image);
@@ -453,7 +457,7 @@ static int parse_iic(FILE *image, void *context,
 		data_addr = (block_header[2] << 8) + block_header[3];
 		if (data_len > sizeof(data)) {
 			/* If this is ever reported as an error, switch to using malloc/realloc */
-			logerror("IIC data block too small - please report this error to libusbx.org\n");
+			logerror("IIC data block too small - please report this error to libusb.info\n");
 			return -1;
 		}
 		read_len = fread(data, 1, data_len, image);
@@ -563,6 +567,7 @@ static int fx3_load_ram(libusb_device_handle *device, const char *path)
 	uint32_t* dImageBuf;
 	unsigned char *bBuf, hBuf[4], blBuf[4], rBuf[4096];
 	FILE *image;
+	int ret = 0;
 
 	image = fopen(path, "rb");
 	if (image == NULL) {
@@ -574,13 +579,15 @@ static int fx3_load_ram(libusb_device_handle *device, const char *path)
 	// Read header
 	if (fread(hBuf, sizeof(char), sizeof(hBuf), image) != sizeof(hBuf)) {
 		logerror("could not read image header");
-		return -3;
+		ret = -3;
+		goto exit;
 	}
 
 	// check "CY" signature byte and format
 	if ((hBuf[0] != 'C') || (hBuf[1] != 'Y')) {
 		logerror("image doesn't have a CYpress signature\n");
-		return -3;
+		ret = -3;
+		goto exit;
 	}
 
 	// Check bImageType
@@ -591,20 +598,24 @@ static int fx3_load_ram(libusb_device_handle *device, const char *path)
 		break;
 	case 0xB1:
 		logerror("security binary image is not currently supported\n");
-		return -3;
+		ret = -3;
+		goto exit;
 	case 0xB2:
 		logerror("VID:PID image is not currently supported\n");
-		return -3;
+		ret = -3;
+		goto exit;
 	default:
 		logerror("invalid image type 0x%02X\n", hBuf[3]);
-		return -3;
+		ret = -3;
+		goto exit;
 	}
 
 	// Read the bootloader version
 	if (verbose) {
 		if ((ezusb_read(device, "read bootloader version", RW_INTERNAL, 0xFFFF0020, blBuf, 4) < 0)) {
 			logerror("Could not read bootloader version\n");
-			return -8;
+			ret = -8;
+			goto exit;
 		}
 		logerror("FX3 bootloader version: 0x%02X%02X%02X%02X\n", blBuf[3], blBuf[2], blBuf[1], blBuf[0]);
 	}
@@ -616,7 +627,8 @@ static int fx3_load_ram(libusb_device_handle *device, const char *path)
 		if ((fread(&dLength, sizeof(uint32_t), 1, image) != 1) ||  // read dLength
 			(fread(&dAddress, sizeof(uint32_t), 1, image) != 1)) { // read dAddress
 			logerror("could not read image");
-			return -3;
+			ret = -3;
+			goto exit;
 		}
 		if (dLength == 0)
 			break; // done
@@ -624,14 +636,16 @@ static int fx3_load_ram(libusb_device_handle *device, const char *path)
 		dImageBuf = calloc(dLength, sizeof(uint32_t));
 		if (dImageBuf == NULL) {
 			logerror("could not allocate buffer for image chunk\n");
-			return -4;
+			ret = -4;
+			goto exit;
 		}
 
 		// read sections
 		if (fread(dImageBuf, sizeof(uint32_t), dLength, image) != dLength) {
 			logerror("could not read image");
 			free(dImageBuf);
-			return -3;
+			ret = -3;
+			goto exit;
 		}
 		for (i = 0; i < dLength; i++)
 			dCheckSum += dImageBuf[i];
@@ -646,14 +660,16 @@ static int fx3_load_ram(libusb_device_handle *device, const char *path)
 				(ezusb_read(device, "read firmware", RW_INTERNAL, dAddress, rBuf, dLen) < 0)) {
 				logerror("R/W error\n");
 				free(dImageBuf);
-				return -5;
+				ret = -5;
+				goto exit;
 			}
 			// Verify data: rBuf with bBuf
 			for (i = 0; i < dLen; i++) {
 				if (rBuf[i] != bBuf[i]) {
 					logerror("verify error");
 					free(dImageBuf);
-					return -6;
+					ret = -6;
+					goto exit;
 				}
 			}
 
@@ -668,19 +684,22 @@ static int fx3_load_ram(libusb_device_handle *device, const char *path)
 	if ((fread(&dExpectedCheckSum, sizeof(uint32_t), 1, image) != 1) ||
 		(dCheckSum != dExpectedCheckSum)) {
 		logerror("checksum error\n");
-		return -7;
+		ret = -7;
+		goto exit;
 	}
 
 	// transfer execution to Program Entry
 	if (!ezusb_fx3_jump(device, dAddress)) {
-		return -6;
+		ret = -6;
 	}
 
-	return 0;
+exit:
+	fclose(image);
+	return ret;
 }
 
 /*
- * Load a firmware file into target RAM. device is the open libusbx
+ * Load a firmware file into target RAM. device is the open libusb
  * device, and the path is the name of the source file. Open the file,
  * parse the bytes, and write them in one or two phases.
  *
@@ -701,6 +720,7 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 	struct ram_poke_context ctx;
 	int status;
 	uint8_t iic_header[8] = { 0 };
+	int ret = 0;
 
 	if (fx_type == FX_TYPE_FX3)
 		return fx3_load_ram(device, path);
@@ -718,7 +738,8 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 		  || ((fx_type == FX_TYPE_AN21) && (iic_header[0] != 0xB2))
 		  || ((fx_type == FX_TYPE_FX1) && (iic_header[0] != 0xB6)) ) {
 			logerror("IIC image does not contain executable code - cannot load to RAM.\n");
-			return -1;
+			ret = -1;
+			goto exit;
 		}
 	}
 
@@ -744,7 +765,10 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 
 		/* if required, halt the CPU while we overwrite its code/data */
 		if (cpucs_addr && !ezusb_cpucs(device, cpucs_addr, false))
-			return -1;
+		{
+			ret = -1;
+			goto exit;
+		}
 
 		/* 2nd stage, first part? loader was already uploaded */
 	} else {
@@ -761,7 +785,8 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 	status = parse[img_type](image, &ctx, is_external, ram_poke);
 	if (status < 0) {
 		logerror("unable to upload %s\n", path);
-		return status;
+		ret = status;
+		goto exit;
 	}
 
 	/* second part of 2nd stage: rescan */
@@ -771,7 +796,10 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 
 		/* if needed, halt the CPU while we overwrite the 1st stage loader */
 		if (cpucs_addr && !ezusb_cpucs(device, cpucs_addr, false))
-			return -1;
+		{
+			ret = -1;
+			goto exit;
+		}
 
 		/* at least write the interrupt vectors (at 0x0000) for reset! */
 		rewind(image);
@@ -780,7 +808,8 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 		status = parse_ihex(image, &ctx, is_external, ram_poke);
 		if (status < 0) {
 			logerror("unable to completely upload %s\n", path);
-			return status;
+			ret = status;
+			goto exit;
 		}
 	}
 
@@ -790,7 +819,9 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 
 	/* if required, reset the CPU so it runs what we just uploaded */
 	if (cpucs_addr && !ezusb_cpucs(device, cpucs_addr, true))
-		return -1;
+		ret = -1;
 
-	return 0;
+exit:
+	fclose(image);
+	return ret;
 }

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/examples/fxload.c

@@ -40,7 +40,7 @@ static bool dosyslog = false;
 #endif
 
 #ifndef FXLOAD_VERSION
-#define FXLOAD_VERSION (__DATE__ " (libusbx)")
+#define FXLOAD_VERSION (__DATE__ " (libusb)")
 #endif
 
 #ifndef ARRAYSIZE
@@ -69,7 +69,7 @@ static int print_usage(int error_code) {
 	fprintf(stderr, "  -i <path>       -- Firmware to upload\n");
 	fprintf(stderr, "  -t <type>       -- Target type: an21, fx, fx2, fx2lp, fx3\n");
 	fprintf(stderr, "  -d <vid:pid>    -- Target device, as an USB VID:PID\n");
-	fprintf(stderr, "  -p <bus,addr>   -- Target device, as a libusbx bus number and device address path\n");
+	fprintf(stderr, "  -p <bus,addr>   -- Target device, as a libusb bus number and device address path\n");
 	fprintf(stderr, "  -v              -- Increase verbosity\n");
 	fprintf(stderr, "  -q              -- Decrease verbosity (silent mode)\n");
 	fprintf(stderr, "  -V              -- Print program version\n");
@@ -165,7 +165,7 @@ int main(int argc, char*argv[])
 		}
 	}
 
-	/* open the device using libusbx */
+	/* open the device using libusb */
 	status = libusb_init(NULL);
 	if (status < 0) {
 		logerror("libusb_init() failed: %s\n", libusb_error_name(status));

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/examples/hotplugtest.c

@@ -65,7 +65,12 @@ int main(int argc, char *argv[])
 	product_id = (argc > 2) ? strtol (argv[2], NULL, 0) : 0x5005;
 	class_id   = (argc > 3) ? strtol (argv[3], NULL, 0) : LIBUSB_HOTPLUG_MATCH_ANY;
 
-	libusb_init (NULL);
+	rc = libusb_init (NULL);
+	if (rc < 0)
+	{
+		printf("failed to initialise libusb: %s\n", libusb_error_name(rc));
+		return EXIT_FAILURE;
+	}
 
 	if (!libusb_has_capability (LIBUSB_CAP_HAS_HOTPLUG)) {
 		printf ("Hotplug capabilites are not supported on this platform\n");
@@ -90,7 +95,9 @@ int main(int argc, char *argv[])
 	}
 
 	while (done < 2) {
-		libusb_handle_events (NULL);
+		rc = libusb_handle_events (NULL);
+		if (rc < 0)
+			printf("libusb_handle_events() failed: %s\n", libusb_error_name(rc));
 	}
 
 	libusb_exit (NULL);

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/examples/listdevs.c

@@ -1,5 +1,5 @@
 /*
- * libusbx example program to list devices on the bus
+ * libusb example program to list devices on the bus
  * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
  *
  * This library is free software; you can redistribute it and/or

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/examples/xusb.c

@@ -43,13 +43,14 @@
 #define false (!true)
 #endif
 
-// Future versions of libusbx will use usb_interface instead of interface
+// Future versions of libusb will use usb_interface instead of interface
 // in libusb_config_descriptor => catter for that
 #define usb_interface interface
 
 // Global variables
 static bool binary_dump = false;
 static bool extra_info = false;
+static bool force_device_request = false;	// For WCID descriptor queries
 static const char* binary_name = NULL;
 
 static int perr(char const *format, ...)
@@ -415,6 +416,7 @@ static void get_sense(libusb_device_handle *handle, uint8_t endpoint_in, uint8_t
 	uint8_t sense[18];
 	uint32_t expected_tag;
 	int size;
+	int rc;
 
 	// Request Sense
 	printf("Request Sense:\n");
@@ -424,7 +426,12 @@ static void get_sense(libusb_device_handle *handle, uint8_t endpoint_in, uint8_t
 	cdb[4] = REQUEST_SENSE_LENGTH;
 
 	send_mass_storage_command(handle, endpoint_out, 0, cdb, LIBUSB_ENDPOINT_IN, REQUEST_SENSE_LENGTH, &expected_tag);
-	libusb_bulk_transfer(handle, endpoint_in, (unsigned char*)&sense, REQUEST_SENSE_LENGTH, &size, 1000);
+	rc = libusb_bulk_transfer(handle, endpoint_in, (unsigned char*)&sense, REQUEST_SENSE_LENGTH, &size, 1000);
+	if (rc < 0)
+	{
+		printf("libusb_bulk_transfer failed: %s\n", libusb_error_name(rc));
+		return;
+	}
 	printf("   received %d bytes\n", size);
 
 	if ((sense[0] != 0x70) && (sense[0] != 0x71)) {
@@ -707,6 +714,11 @@ static void read_ms_winsub_feature_descriptors(libusb_device_handle *handle, uin
 	};
 
 	if (iface_number < 0) return;
+	// WinUSB has a limitation that forces wIndex to the interface number when issuing
+	// an Interface Request. To work around that, we can force a Device Request for
+	// the Extended Properties, assuming the device answers both equally.
+	if (force_device_request)
+		os_fd[1].recipient = LIBUSB_RECIPIENT_DEVICE;
 
 	for (i=0; i<2; i++) {
 		printf("\nReading %s OS Feature Descriptor (wIndex = 0x%04d):\n", os_fd[i].desc, os_fd[i].index);
@@ -985,6 +997,9 @@ int main(int argc, char** argv)
 				case 'i':
 					extra_info = true;
 					break;
+				case 'w':
+					force_device_request = true;
+					break;
 				case 'b':
 					if ((j+1 >= argc) || (argv[j+1][0] == '-') || (argv[j+1][0] == '/')) {
 						printf("   Option -b requires a file name\n");
@@ -1057,7 +1072,7 @@ int main(int argc, char** argv)
 	}
 
 	if ((show_help) || (argc == 1) || (argc > 7)) {
-		printf("usage: %s [-h] [-d] [-i] [-k] [-b file] [-l lang] [-j] [-x] [-s] [-p] [vid:pid]\n", argv[0]);
+		printf("usage: %s [-h] [-d] [-i] [-k] [-b file] [-l lang] [-j] [-x] [-s] [-p] [-w] [vid:pid]\n", argv[0]);
 		printf("   -h      : display usage\n");
 		printf("   -d      : enable debug output\n");
 		printf("   -i      : print topology and speed info\n");
@@ -1068,12 +1083,13 @@ int main(int argc, char** argv)
 		printf("   -s      : test Microsoft Sidewinder Precision Pro (HID)\n");
 		printf("   -x      : test Microsoft XBox Controller Type S\n");
 		printf("   -l lang : language to report errors in (ISO 639-1)\n");
+		printf("   -w      : force the use of device requests when querying WCID descriptors\n");
 		printf("If only the vid:pid is provided, xusb attempts to run the most appropriate test\n");
 		return 0;
 	}
 
 	version = libusb_get_version();
-	printf("Using libusbx v%d.%d.%d.%d\n\n", version->major, version->minor, version->micro, version->nano);
+	printf("Using libusb v%d.%d.%d.%d\n\n", version->major, version->minor, version->micro, version->nano);
 	r = libusb_init(NULL);
 	if (r < 0)
 		return r;

data/ext/{libusbx-1.0.17 → libusb-1.0.18}/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-11-20.07; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
+	# Protect names problematic for `test' and other utilities.
 	case $dst_arg in
 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
+    # Protect names problematic for `test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call 'install-sh -d' without argument.
+  # It's OK to call `install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for 'test' and other utilities.
+  # Protect names problematic for `test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@ do
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
+		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in