Examples: add xusb sample

* Also improvements to WDK build scripts:
  cd to original dir on error, use 2 cores if available

10 files changed, 1778 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index 88ea6d4..4ac3f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ config.sub
 *.swp
 doxygen.cfg
 listdevs
+xusb
 dpfp
 dpfp_threaded
 *.exe
diff --git a/examples/Makefile.am b/examples/Makefile.am
index c7630d2..3ff6cdc 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,9 +1,12 @@
 INCLUDES = -I$(top_srcdir)/libusb
-noinst_PROGRAMS = listdevs
+noinst_PROGRAMS = listdevs xusb
 
 listdevs_SOURCES = listdevs.c
 listdevs_LDADD = ../libusb/libusb-1.0.la
 
+xusb_SOURCES = xusb.c
+xusb_LDADD = ../libusb/libusb-1.0.la
+
 if HAVE_SIGACTION
 dpfp_SOURCES = dpfp.c
 dpfp_LDADD = ../libusb/libusb-1.0.la
@@ -18,4 +21,3 @@ dpfp_threaded_LDADD = ../libusb/libusb-1.0.la
 noinst_PROGRAMS += dpfp_threaded
 endif
 endif
-
diff --git a/examples/xusb.c b/examples/xusb.c
new file mode 100644
index 0000000..b94aa1f
--- /dev/null
+++ b/examples/xusb.c
@@ -0,0 +1,878 @@
+/*
+ * xusb: Generic USB test program
+ * Copyright (c) 2009-2011 Pete Batard <pbatard@gmail.com>
+ * Based on lsusb, copyright (c) 2007 Daniel Drake <dsd@gentoo.org>
+ * With contributions to Mass Storage test by Alan Stern.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "libusb.h"
+
+#if defined(_WIN32)
+#define msleep(msecs) Sleep(msecs)
+#else
+#include <unistd.h>
+#define msleep(msecs) usleep(1000*msecs)
+#endif
+
+#if !defined(_MSC_VER) || _MSC_VER<=1200
+#define sscanf_s sscanf
+#endif
+
+#if !defined(bool)
+#define bool int
+#endif
+#if !defined(true)
+#define true (1 == 1)
+#endif
+#if !defined(false)
+#define false (!true)
+#endif
+
+
+// Future versions of libusb will use usb_interface instead of interface
+// in libusb_config_descriptor => catter for that
+#define usb_interface interface
+
+// Global variables
+bool binary_dump = false;
+char binary_name[64];
+
+inline static int perr(char const *format, ...)
+{
+	va_list args;
+	int r;
+
+	va_start (args, format);
+	r = vfprintf(stderr, format, args);
+	va_end(args);
+
+	return r;
+}
+
+#define ERR_EXIT(errcode) do { perr("   %s\n", libusb_error_name((enum libusb_error)errcode)); return -1; } while (0)
+#define CALL_CHECK(fcall) do { r=fcall; if (r < 0) ERR_EXIT(r); } while (0);
+#define B(x) (((x)!=0)?1:0)
+#define be_to_int32(buf) (((buf)[0]<<24)|((buf)[1]<<16)|((buf)[2]<<8)|(buf)[3])
+
+#define RETRY_MAX                     5
+#define REQUEST_SENSE_LENGTH          0x12
+#define INQUIRY_LENGTH                0x24
+#define READ_CAPACITY_LENGTH          0x08
+
+// HID Class-Specific Requests values. See section 7.2 of the HID specifications
+#define HID_GET_REPORT                0x01
+#define HID_SET_REPORT                0x09
+#define HID_REPORT_TYPE_INPUT         0x01
+#define HID_REPORT_TYPE_OUTPUT        0x02
+
+// Mass Storage Requests values. See section 3 of the Bulk-Only Mass Storage Class specifications
+#define BOMS_RESET                    0xFF
+#define BOMS_GET_MAX_LUN              0xFE
+
+// Section 5.1: Command Block Wrapper (CBW)
+struct command_block_wrapper {
+	uint8_t dCBWSignature[4];
+	uint32_t dCBWTag;
+	uint32_t dCBWDataTransferLength;
+	uint8_t bmCBWFlags;
+	uint8_t bCBWLUN;
+	uint8_t bCBWCBLength;
+	uint8_t CBWCB[16];
+};
+
+// Section 5.2: Command Status Wrapper (CSW)
+struct command_status_wrapper {
+	uint8_t dCSWSignature[4];
+	uint32_t dCSWTag;
+	uint32_t dCSWDataResidue;
+	uint8_t bCSWStatus;
+};
+
+static uint8_t cdb_length[256] = {
+//	 0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+	06,06,06,06,06,06,06,06,06,06,06,06,06,06,06,06,  //  0
+	06,06,06,06,06,06,06,06,06,06,06,06,06,06,06,06,  //  1
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,  //  2
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,  //  3
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,  //  4
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,  //  5
+	00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,  //  6
+	00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,  //  7
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,  //  8
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,  //  9
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,  //  A
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,  //  B
+	00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,  //  C
+	00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,  //  D
+	00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,  //  E
+	00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,  //  F
+};
+
+enum test_type {
+	USE_GENERIC,
+	USE_PS3,
+	USE_XBOX,
+	USE_SCSI,
+} test_mode;
+uint16_t VID, PID;
+
+void display_buffer_hex(unsigned char *buffer, unsigned size)
+{
+	unsigned i, j, k;
+
+	for (i=0; i<size; i+=16) {
+		printf("\n  %08x  ", i);
+		for(j=0,k=0; k<16; j++,k++) {
+			if (i+j < size) {
+				printf("%02x", buffer[i+j]);
+			} else {
+				printf("  ");
+			}
+			printf(" ");
+		}
+		printf(" ");
+		for(j=0,k=0; k<16; j++,k++) {
+			if (i+j < size) {
+				if ((buffer[i+j] < 32) || (buffer[i+j] > 126)) {
+					printf(".");
+				} else {
+					printf("%c", buffer[i+j]);
+				}
+			}
+		}
+	}
+	printf("\n" );
+}
+
+// The PS3 Controller is really a HID device that got its HID Report Descriptors
+// removed by Sony
+int display_ps3_status(libusb_device_handle *handle)
+{
+	int r;
+	uint8_t input_report[49];
+	uint8_t master_bt_address[8];
+	uint8_t device_bt_address[18];
+
+	// Get the controller's bluetooth address of its master device
+	CALL_CHECK(libusb_control_transfer(handle, LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE,
+		HID_GET_REPORT, 0x03f5, 0, master_bt_address, sizeof(master_bt_address), 100));
+	printf("\nMaster's bluetooth address: %02X:%02X:%02X:%02X:%02X:%02X\n", master_bt_address[2], master_bt_address[3],
+		master_bt_address[4], master_bt_address[5], master_bt_address[6], master_bt_address[7]);
+
+	// Get the controller's bluetooth address
+	CALL_CHECK(libusb_control_transfer(handle, LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE,
+		HID_GET_REPORT, 0x03f2, 0, device_bt_address, sizeof(device_bt_address), 100));
+	printf("\nMaster's bluetooth address: %02X:%02X:%02X:%02X:%02X:%02X\n", device_bt_address[4], device_bt_address[5],
+		device_bt_address[6], device_bt_address[7], device_bt_address[8], device_bt_address[9]);
+
+	// Get the status of the controller's buttons via its HID report
+	printf("\nReading PS3 Input Report...\n");
+	CALL_CHECK(libusb_control_transfer(handle, LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE,
+		HID_GET_REPORT, (HID_REPORT_TYPE_INPUT<<8)|0x01, 0, input_report, sizeof(input_report), 1000));
+	switch(input_report[2]){	/** Direction pad plus start, select, and joystick buttons */
+		case 0x01:
+			printf("\tSELECT pressed\n");
+			break;
+		case 0x02:
+			printf("\tLEFT 3 pressed\n");
+			break;
+		case 0x04:
+			printf("\tRIGHT 3 pressed\n");
+			break;
+		case 0x08:
+			printf("\tSTART presed\n");
+			break;
+		case 0x10:
+			printf("\tUP pressed\n");
+			break;
+		case 0x20:
+			printf("\tRIGHT pressed\n");
+			break;
+		case 0x40:
+			printf("\tDOWN pressed\n");
+			break;
+		case 0x80:
+			printf("\tLEFT pressed\n");
+			break;
+	}
+	switch(input_report[3]){	/** Shapes plus top right and left buttons */
+		case 0x01:
+			printf("\tLEFT 2 pressed\n");
+			break;
+		case 0x02:
+			printf("\tRIGHT 2 pressed\n");
+			break;
+		case 0x04:
+			printf("\tLEFT 1 pressed\n");
+			break;
+		case 0x08:
+			printf("\tRIGHT 1 presed\n");
+			break;
+		case 0x10:
+			printf("\tTRIANGLE pressed\n");
+			break;
+		case 0x20:
+			printf("\tCIRCLE pressed\n");
+			break;
+		case 0x40:
+			printf("\tCROSS pressed\n");
+			break;
+		case 0x80:
+			printf("\tSQUARE pressed\n");
+			break;
+	}
+	printf("\tPS button: %d\n", input_report[4]);
+	printf("\tLeft Analog (X,Y): (%d,%d)\n", input_report[6], input_report[7]);
+	printf("\tRight Analog (X,Y): (%d,%d)\n", input_report[8], input_report[9]);
+	printf("\tL2 Value: %d\tR2 Value: %d\n", input_report[18], input_report[19]);
+	printf("\tL1 Value: %d\tR1 Value: %d\n", input_report[20], input_report[21]);
+	printf("\tRoll (x axis): %d Yaw (y axis): %d Pitch (z axis) %d\n",
+			//(((input_report[42] + 128) % 256) - 128),
+			(int8_t)(input_report[42]),
+			(int8_t)(input_report[44]),
+			(int8_t)(input_report[46]));
+	printf("\tAcceleration: %d\n\n", (int8_t)(input_report[48]));
+	return 0;
+}
+// The XBOX Controller is really a HID device that got its HID Report Descriptors
+// removed by Microsoft.
+// Input/Output reports described at http://euc.jp/periphs/xbox-controller.ja.html
+int display_xbox_status(libusb_device_handle *handle)
+{
+	int r;
+	uint8_t input_report[20];
+	printf("\nReading XBox Input Report...\n");
+	CALL_CHECK(libusb_control_transfer(handle, LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE,
+		HID_GET_REPORT, (HID_REPORT_TYPE_INPUT<<8)|0x00, 0, input_report, 20, 1000));
+	printf("   D-pad: %02X\n", input_report[2]&0x0F);
+	printf("   Start:%d, Back:%d, Left Stick Press:%d, Right Stick Press:%d\n", B(input_report[2]&0x10), B(input_report[2]&0x20),
+		B(input_report[2]&0x40), B(input_report[2]&0x80));
+	// A, B, X, Y, Black, White are pressure sensitive
+	printf("   A:%d, B:%d, X:%d, Y:%d, White:%d, Black:%d\n", input_report[4], input_report[5],
+		input_report[6], input_report[7], input_report[9], input_report[8]);
+	printf("   Left Trigger: %d, Right Trigger: %d\n", input_report[10], input_report[11]);
+	printf("   Left Analog (X,Y): (%d,%d)\n", (int16_t)((input_report[13]<<8)|input_report[12]),
+		(int16_t)((input_report[15]<<8)|input_report[14]));
+	printf("   Right Analog (X,Y): (%d,%d)\n", (int16_t)((input_report[17]<<8)|input_report[16]),
+		(int16_t)((input_report[19]<<8)|input_report[18]));
+	return 0;
+}
+
+int set_xbox_actuators(libusb_device_handle *handle, uint8_t left, uint8_t right)
+{
+	int r;
+	uint8_t output_report[6];
+
+	printf("\nWriting XBox Controller Output Report...\n");
+
+	memset(output_report, 0, sizeof(output_report));
+	output_report[1] = sizeof(output_report);
+	output_report[3] = left;
+	output_report[5] = right;
+
+	CALL_CHECK(libusb_control_transfer(handle, LIBUSB_ENDPOINT_OUT|LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE,
+		HID_SET_REPORT, (HID_REPORT_TYPE_OUTPUT<<8)|0x00, 0, output_report, 06, 1000));
+	return 0;
+}
+
+int send_mass_storage_command(libusb_device_handle *handle, uint8_t endpoint, uint8_t lun,
+	uint8_t *cdb, uint8_t direction, int data_length, uint32_t *ret_tag)
+{
+	static uint32_t tag = 1;
+	uint8_t cdb_len;
+	int i, r, size;
+	struct command_block_wrapper cbw;
+
+	if (cdb == NULL) {
+		return -1;
+	}
+
+	if (endpoint & LIBUSB_ENDPOINT_IN) {
+		perr("send_mass_storage_command: cannot send command on IN endpoint\n");
+		return -1;
+	}
+
+	cdb_len = cdb_length[cdb[0]];
+	if ((cdb_len == 0) || (cdb_len > sizeof(cbw.CBWCB))) {
+		perr("send_mass_storage_command: don't know how to handle this command (%02X, length %d)\n",
+			cdb[0], cdb_len);
+		return -1;
+	}
+
+	memset(&cbw, 0, sizeof(cbw));
+	cbw.dCBWSignature[0] = 'U';
+	cbw.dCBWSignature[1] = 'S';
+	cbw.dCBWSignature[2] = 'B';
+	cbw.dCBWSignature[3] = 'C';
+	*ret_tag = tag;
+	cbw.dCBWTag = tag++;
+	cbw.dCBWDataTransferLength = data_length;
+	cbw.bmCBWFlags = direction;
+	cbw.bCBWLUN = lun;
+	// Subclass is 1 or 6 => cdb_len
+	cbw.bCBWCBLength = cdb_len;
+	memcpy(cbw.CBWCB, cdb, cdb_len);
+
+	i = 0;
+	do {
+		// The transfer length must always be exactly 31 bytes.
+		r = libusb_bulk_transfer(handle, endpoint, (unsigned char*)&cbw, 31, &size, 1000);
+		if (r == LIBUSB_ERROR_PIPE) {
+			libusb_clear_halt(handle, endpoint);
+		}
+		i++;
+	} while ((r == LIBUSB_ERROR_PIPE) && (i<RETRY_MAX));
+	if (r != LIBUSB_SUCCESS) {
+		perr("   send_mass_storage_command: %s\n", libusb_error_name(r));
+		return -1;
+	}
+
+	printf("   sent %d CDB bytes\n", cdb_len);
+	return 0;
+}
+
+int get_mass_storage_status(libusb_device_handle *handle, uint8_t endpoint, uint32_t expected_tag)
+{
+	int i, r, size;
+	struct command_status_wrapper csw;
+
+	// The device is allowed to STALL this transfer. If it does, you have to
+	// clear the stall and try again.
+	i = 0;
+	do {
+		r = libusb_bulk_transfer(handle, endpoint, (unsigned char*)&csw, 13, &size, 1000);
+		if (r == LIBUSB_ERROR_PIPE) {
+			libusb_clear_halt(handle, endpoint);
+		}
+		i++;
+	} while ((r == LIBUSB_ERROR_PIPE) && (i<RETRY_MAX));
+	if (r != LIBUSB_SUCCESS) {
+		perr("   get_mass_storage_status: %s\n", libusb_error_name(r));
+		return -1;
+	}
+	if (size != 13) {
+		perr("   get_mass_storage_status: received %d bytes (expected 13)\n", size);
+		return -1;
+	}
+	if (csw.dCSWTag != expected_tag) {
+		perr("   get_mass_storage_status: mismatched tags (expected %08X, received %08X)\n",
+			expected_tag, csw.dCSWTag);
+		return -1;
+	}
+	// For this test, we ignore the dCSWSignature check for validity...
+	printf("   Mass Storage Status: %02X (%s)\n", csw.bCSWStatus, csw.bCSWStatus?"FAILED":"Success");
+	if (csw.dCSWTag != expected_tag)
+		return -1;
+	if (csw.bCSWStatus) {
+		// REQUEST SENSE is appropriate only if bCSWStatus is 1, meaning that the
+		// command failed somehow.  Larger values (2 in particular) mean that
+		// the command couldn't be understood.
+		if (csw.bCSWStatus == 1)
+			return -2;	// request Get Sense
+		else
+			return -1;
+	}
+
+	// In theory we also should check dCSWDataResidue.  But lots of devices
+	// set it wrongly.
+	return 0;
+}
+
+void get_sense(libusb_device_handle *handle, uint8_t endpoint_in, uint8_t endpoint_out)
+{
+	uint8_t cdb[16];	// SCSI Command Descriptor Block
+	uint8_t sense[18];
+	uint32_t expected_tag;
+	int size;
+
+	// Request Sense
+	printf("Request Sense:\n");
+	memset(sense, 0, sizeof(sense));
+	memset(cdb, 0, sizeof(cdb));
+	cdb[0] = 0x03;	// Request Sense
+	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);
+	printf("   received %d bytes\n", size);
+
+	if ((sense[0] != 0x70) && (sense[0] != 0x71)) {
+		perr("   ERROR No sense data\n");
+	} else {
+		perr("   ERROR Sense: %02X %02X %02X\n", sense[2]&0x0F, sense[12], sense[13]);
+	}
+	// Strictly speaking, the get_mass_storage_status() call should come
+	// before these perr() lines.  If the status is nonzero then we must
+	// assume there's no data in the buffer.  For xusb it doesn't matter.
+	get_mass_storage_status(handle, endpoint_in, expected_tag);
+}
+
+// Mass Storage device to test bulk transfers (non destructive test)
+int test_mass_storage(libusb_device_handle *handle, uint8_t endpoint_in, uint8_t endpoint_out)
+{
+	int r, size;
+	uint8_t lun;
+	uint32_t expected_tag;
+	uint32_t i, max_lba, block_size;
+	double device_size;
+	uint8_t cdb[16];	// SCSI Command Descriptor Block
+	uint8_t buffer[64];
+	char vid[9], pid[9], rev[5];
+	unsigned char *data;
+	FILE *fd;
+
+	printf("Reading Max LUN:\n");
+	r = libusb_control_transfer(handle, LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE,
+		BOMS_GET_MAX_LUN, 0, 0, &lun, 1, 1000);
+	// Some devices send a STALL instead of the actual value.
+	// In such cases we should set lun to 0.
+	if (r == 0) {
+		lun = 0;
+	} else if (r < 0) {
+		perr("   Failed: %s", libusb_error_name((enum libusb_error)r));
+	}
+	printf("   Max LUN = %d\n", lun);
+
+	// Send Inquiry
+	printf("Sending Inquiry:\n");
+	memset(buffer, 0, sizeof(buffer));
+	memset(cdb, 0, sizeof(cdb));
+	cdb[0] = 0x12;	// Inquiry
+	cdb[4] = INQUIRY_LENGTH;
+
+	send_mass_storage_command(handle, endpoint_out, lun, cdb, LIBUSB_ENDPOINT_IN, INQUIRY_LENGTH, &expected_tag);
+	CALL_CHECK(libusb_bulk_transfer(handle, endpoint_in, (unsigned char*)&buffer, INQUIRY_LENGTH, &size, 1000));
+	printf("   received %d bytes\n", size);
+	// The following strings are not zero terminated
+	for (i=0; i<8; i++) {
+		vid[i] = buffer[8+i];
+		pid[i] = buffer[16+i];
+		rev[i/2] = buffer[32+i/2];	// instead of another loop
+	}
+	vid[8] = 0;
+	pid[8] = 0;
+	rev[4] = 0;
+	printf("   VID:PID:REV \"%8s\":\"%8s\":\"%4s\"\n", vid, pid, rev);
+	if (get_mass_storage_status(handle, endpoint_in, expected_tag) == -2) {
+		get_sense(handle, endpoint_in, endpoint_out);
+	}
+
+	// Read capacity
+	printf("Reading Capacity:\n");
+	memset(buffer, 0, sizeof(buffer));
+	memset(cdb, 0, sizeof(cdb));
+	cdb[0] = 0x25;	// Read Capacity
+
+	send_mass_storage_command(handle, endpoint_out, lun, cdb, LIBUSB_ENDPOINT_IN, READ_CAPACITY_LENGTH, &expected_tag);
+	CALL_CHECK(libusb_bulk_transfer(handle, endpoint_in, (unsigned char*)&buffer, READ_CAPACITY_LENGTH, &size, 1000));
+	printf("   received %d bytes\n", size);
+	max_lba = be_to_int32(&buffer[0]);
+	block_size = be_to_int32(&buffer[4]);
+	device_size = ((double)(max_lba+1))*block_size/(1024*1024*1024);
+	printf("   Max LBA: %08X, Block Size: %08X (%.2f GB)\n", max_lba, block_size, device_size);
+	if (get_mass_storage_status(handle, endpoint_in, expected_tag) == -2) {
+		get_sense(handle, endpoint_in, endpoint_out);
+	}
+
+	data = (unsigned char*) calloc(1, block_size);
+	if (data == NULL) {
+		perr("   unable to allocate data buffer\n");
+		return -1;
+	}
+
+	// Send Read
+	printf("Attempting to read %d bytes:\n", block_size);
+	memset(cdb, 0, sizeof(cdb));
+
+	cdb[0] = 0x28;	// Read(10)
+	cdb[8] = 0x01;	// 1 block
+
+	send_mass_storage_command(handle, endpoint_out, lun, cdb, LIBUSB_ENDPOINT_IN, block_size, &expected_tag);
+	libusb_bulk_transfer(handle, endpoint_in, data, block_size, &size, 5000);
+	printf("   READ: received %d bytes\n", size);
+	if (get_mass_storage_status(handle, endpoint_in, expected_tag) == -2) {
+		get_sense(handle, endpoint_in, endpoint_out);
+	} else {
+		display_buffer_hex(data, size);
+		if ((binary_dump) && ((fd = fopen(binary_name, "w")) != NULL)) {
+			if (fwrite(data, 1, (size_t)size, fd) != (unsigned int)size) {
+				perr("   unable to write binary data\n");
+			}
+			fclose(fd);
+		}
+	}
+	free(data);
+
+	return 0;
+}
+
+// Read the MS WinUSB Feature Descriptors, that are used on Windows 8 for automated driver installation
+void read_ms_winsub_feature_descriptors(libusb_device_handle *handle, uint8_t bRequest, int iface_number)
+{
+#define MAX_OS_FD_LENGTH 256
+	int i, r;
+	uint8_t os_desc[MAX_OS_FD_LENGTH];
+	uint32_t length;
+	void* le_type_punning_IS_fine;
+	struct {
+		char* desc;
+		uint8_t recipient;
+		uint16_t index;
+		uint16_t header_size;
+	} os_fd[2] = {
+		{"Extended Compat ID", LIBUSB_RECIPIENT_DEVICE, 0x0004, 0x10},
+		{"Extended Properties", LIBUSB_RECIPIENT_DEVICE, 0x0005, 0x0A}
+		// NB: LIBUSB_RECIPIENT_INTERFACE should be used for the Extended Properties.
+		// However, for Interface requests, the WinUSB DLL forces the low byte of wIndex
+		// to the interface number, regardless of what you set it to, so we have to
+		// fallback to Device and hope the firmware answers both equally.
+		// See http://www.lvr.com/forum/index.php?topic=331
+	};
+
+	if (iface_number < 0) return;
+
+	for (i=0; i<2; i++) {
+		printf("\nReading %s OS Feature Descriptor (wIndex = 0x%04d):\n", os_fd[i].desc, os_fd[i].index);
+
+		// Read the header part
+		r = libusb_control_transfer(handle, (uint8_t)(LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_VENDOR|os_fd[i].recipient),
+			bRequest, (uint16_t)(((iface_number)<< 8)|0x00), os_fd[i].index, os_desc, os_fd[i].header_size, 1000);
+		if (r < os_fd[i].header_size) {
+			perr("   Failed: %s", (r<0)?libusb_error_name((enum libusb_error)r):"header size is too small");
+			return;
+		}
+		le_type_punning_IS_fine = (void*)os_desc;
+		length = *((uint32_t*)le_type_punning_IS_fine);
+		if (length > MAX_OS_FD_LENGTH) {
+			length = MAX_OS_FD_LENGTH;
+		}
+
+		// Read the full feature descriptor
+		r = libusb_control_transfer(handle, (uint8_t)(LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_VENDOR|os_fd[i].recipient),
+			bRequest, (uint16_t)(((iface_number)<< 8)|0x00), os_fd[i].index, os_desc, (uint16_t)length, 1000);
+		if (r < 0) {
+			perr("   Failed: %s", libusb_error_name((enum libusb_error)r));
+			return;
+		} else {
+			display_buffer_hex(os_desc, r);
+		}
+	}
+}
+
+int test_device(uint16_t vid, uint16_t pid)
+{
+	libusb_device_handle *handle;
+	libusb_device *dev;
+#ifdef HAS_GETPORTPATH	
+	uint8_t bus, port_path[8];
+#endif
+	struct libusb_config_descriptor *conf_desc;
+	const struct libusb_endpoint_descriptor *endpoint;
+	int i, j, k, r;
+	int iface, nb_ifaces, first_iface = -1;
+#if defined(__linux)
+	// Attaching/detaching the kernel driver is only relevant for Linux
+	int iface_detached = -1;
+#endif
+	struct libusb_device_descriptor dev_desc;
+	char* speed_name[5] = { "Unknown", "1.5 Mbit/s (USB 1.0 LowSpeed)", "12 Mbit/s (USB 1.0 FullSpeed)",
+		"480 Mbit/s (USB 2.0 HighSpeed)", "5000 Mbit/s (USB 3.0 SuperSpeed)"};
+	char string[128];
+	uint8_t string_index[3];	// indexes of the string descriptors
+	uint8_t endpoint_in = 0, endpoint_out = 0;	// default IN and OUT endpoints
+
+	printf("Opening device...\n");
+	handle = libusb_open_device_with_vid_pid(NULL, vid, pid);
+
+	if (handle == NULL) {
+		perr("  Failed.\n");
+		return -1;
+	}
+
+	dev = libusb_get_device(handle);
+#ifdef HAS_GETPORTPATH
+	bus = libusb_get_bus_number(dev);
+	r = libusb_get_port_path(NULL, dev, port_path, sizeof(port_path));
+	if (r > 0) {
+		printf("bus: %d, port path from HCD: %d", bus, port_path[0]);
+		for (i=1; i<r; i++) {
+			printf("->%d", port_path[i]);
+		}
+		printf("\n");
+	}
+#endif
+	r = libusb_get_device_speed(dev);
+	if ((r<0) || (r>4)) r=0;
+	printf("speed: %s\n", speed_name[r]);
+
+	printf("\nReading device descriptor:\n");
+	CALL_CHECK(libusb_get_device_descriptor(dev, &dev_desc));
+	printf("            length: %d\n", dev_desc.bLength);
+	printf("      device class: %d\n", dev_desc.bDeviceClass);
+	printf("               S/N: %d\n", dev_desc.iSerialNumber);
+	printf("           VID:PID: %04X:%04X\n", dev_desc.idVendor, dev_desc.idProduct);
+	printf("         bcdDevice: %04X\n", dev_desc.bcdDevice);
+	printf("   iMan:iProd:iSer: %d:%d:%d\n", dev_desc.iManufacturer, dev_desc.iProduct, dev_desc.iSerialNumber);
+	printf("          nb confs: %d\n", dev_desc.bNumConfigurations);
+	// Copy the string descriptors for easier parsing
+	string_index[0] = dev_desc.iManufacturer;
+	string_index[1] = dev_desc.iProduct;
+	string_index[2] = dev_desc.iSerialNumber;
+
+	printf("\nReading configuration descriptors:\n");
+	CALL_CHECK(libusb_get_config_descriptor(dev, 0, &conf_desc));
+	nb_ifaces = conf_desc->bNumInterfaces;
+	printf("             nb interfaces: %d\n", nb_ifaces);
+	if (nb_ifaces > 0)
+		first_iface = conf_desc->usb_interface[0].altsetting[0].bInterfaceNumber;
+	for (i=0; i<nb_ifaces; i++) {
+		printf("              interface[%d]: id = %d\n", i,
+			conf_desc->usb_interface[i].altsetting[0].bInterfaceNumber);
+		for (j=0; j<conf_desc->usb_interface[i].num_altsetting; j++) {
+			printf("interface[%d].altsetting[%d]: num endpoints = %d\n",
+				i, j, conf_desc->usb_interface[i].altsetting[j].bNumEndpoints);
+			printf("   Class.SubClass.Protocol: %02X.%02X.%02X\n",
+				conf_desc->usb_interface[i].altsetting[j].bInterfaceClass,
+				conf_desc->usb_interface[i].altsetting[j].bInterfaceSubClass,
+				conf_desc->usb_interface[i].altsetting[j].bInterfaceProtocol);
+			if ( (conf_desc->usb_interface[i].altsetting[j].bInterfaceClass == LIBUSB_CLASS_MASS_STORAGE)
+			  && ( (conf_desc->usb_interface[i].altsetting[j].bInterfaceSubClass == 0x01)
+			  || (conf_desc->usb_interface[i].altsetting[j].bInterfaceSubClass == 0x06) )
+			  && (conf_desc->usb_interface[i].altsetting[j].bInterfaceProtocol == 0x50) ) {
+				// Mass storage devices that can use basic SCSI commands
+				test_mode = USE_SCSI;
+			}
+			for (k=0; k<conf_desc->usb_interface[i].altsetting[j].bNumEndpoints; k++) {
+				endpoint = &conf_desc->usb_interface[i].altsetting[j].endpoint[k];
+				printf("       endpoint[%d].address: %02X\n", k, endpoint->bEndpointAddress);
+				// Use the first bulk IN/OUT endpoints found as default for testing
+				if ((endpoint->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) == LIBUSB_TRANSFER_TYPE_BULK) {
+					if (endpoint->bEndpointAddress & LIBUSB_ENDPOINT_IN) {
+						if (!endpoint_in)
+							endpoint_in = endpoint->bEndpointAddress;
+					} else {
+						if (!endpoint_out)
+							endpoint_out = endpoint->bEndpointAddress;
+					}
+				}
+				printf("           max packet size: %04X\n", endpoint->wMaxPacketSize);
+				printf("          polling interval: %02X\n", endpoint->bInterval);
+			}
+		}
+	}
+	libusb_free_config_descriptor(conf_desc);
+
+	for (iface = 0; iface < nb_ifaces; iface++)
+	{
+		printf("\nClaiming interface %d...\n", iface);
+		r = libusb_claim_interface(handle, iface);
+#if defined(__linux)
+		if ((r != LIBUSB_SUCCESS) && (iface == 0)) {
+			// Maybe we need to detach the driver
+			perr("   Failed. Trying to detach driver...\n");
+			libusb_detach_kernel_driver(handle, iface);
+			iface_detached = iface;
+			printf("   Claiming interface again...\n");
+			r = libusb_claim_interface(handle, iface);
+		}
+#endif
+		if (r != LIBUSB_SUCCESS) {
+			perr("   Failed.\n");
+		}
+	}
+
+	printf("\nReading string descriptors:\n");
+	for (i=0; i<3; i++) {
+		if (string_index[i] == 0) {
+			continue;
+		}
+		if (libusb_get_string_descriptor_ascii(handle, string_index[i], (unsigned char*)string, 128) >= 0) {
+			printf("   String (0x%02X): \"%s\"\n", string_index[i], string);
+		}
+	}
+	// Read the OS String Descriptor
+	if (libusb_get_string_descriptor_ascii(handle, 0xEE, (unsigned char*)string, 128) >= 0) {
+		printf("   String (0x%02X): \"%s\"\n", 0xEE, string);
+		// If this is a Microsoft OS String Descriptor,
+		// attempt to read the WinUSB extended Feature Descriptors
+		if (strncmp(string, "MSFT100", 7) == 0)
+			read_ms_winsub_feature_descriptors(handle, string[7], first_iface);
+	}
+
+	switch(test_mode) {
+	case USE_PS3:
+		CALL_CHECK(display_ps3_status(handle));
+		break;
+	case USE_XBOX:
+		CALL_CHECK(display_xbox_status(handle));
+		CALL_CHECK(set_xbox_actuators(handle, 128, 222));
+		msleep(2000);
+		CALL_CHECK(set_xbox_actuators(handle, 0, 0));
+		break;
+	case USE_SCSI:
+		CALL_CHECK(test_mass_storage(handle, endpoint_in, endpoint_out));
+	default:
+		break;
+	}
+
+	printf("\n");
+	for (iface = 0; iface<nb_ifaces; iface++) {
+		printf("Releasing interface %d...\n", iface);
+		libusb_release_interface(handle, iface);
+	}
+
+#if defined(__linux)
+	if (iface_detached >= 0) {
+		printf("Re-attaching kernel driver...\n");
+		libusb_attach_kernel_driver(handle, iface_detached);
+	}
+#endif
+
+	printf("Closing device...\n");
+	libusb_close(handle);
+
+	return 0;
+}
+
+int main(int argc, char** argv)
+{
+	bool show_help = false;
+	bool debug_mode = false;
+#ifdef HAS_GETVERSION	
+	const struct libusb_version* version;
+#endif
+	int j, r;
+	size_t i, arglen;
+	unsigned tmp_vid, tmp_pid;
+	uint16_t endian_test = 0xBE00;
+
+	// Default to generic, expecting VID:PID
+	VID = 0;
+	PID = 0;
+	test_mode = USE_GENERIC;
+
+	if (((uint8_t*)&endian_test)[0] == 0xBE) {
+		printf("Despite their natural superiority for end users, big endian\n"
+			"CPUs are not supported with this program, sorry.\n");
+		return 0;
+	}
+
+	if (argc >= 2) {
+		for (j = 1; j<argc; j++) {
+			arglen = strlen(argv[j]);
+			if ( ((argv[j][0] == '-') || (argv[j][0] == '/'))
+			  && (arglen >= 2) ) {
+				switch(argv[j][1]) {
+				case 'd':
+					debug_mode = true;
+					break;
+				case 'b':
+					strcat(binary_name, "raw.bin");
+					if (j+1 < argc) {
+						strncpy(binary_name, argv[j+1], 64);
+						j++;
+					}
+					binary_dump = true;
+					break;
+				case 'g':
+					break;
+				case 'j':
+					// OLIMEX ARM-USB-TINY JTAG, 2 channel composite device - 2 interfaces
+					if (!VID && !PID) {
+						VID = 0x15BA;
+						PID = 0x0004;
+					}
+					break;
+				case 'k':
+					// Generic 2 GB USB Key (SCSI Transparent/Bulk Only) - 1 interface
+					if (!VID && !PID) {
+						VID = 0x0204;
+						PID = 0x6025;
+					}
+					break;
+				// The following tests will force VID:PID if already provided
+				case 'p':
+					// Sony PS3 Controller - 1 interface
+					VID = 0x054C;
+					PID = 0x0268;
+					test_mode = USE_PS3;
+					break;
+				case 'x':
+					// Microsoft XBox Controller Type S - 1 interface
+					VID = 0x045E;
+					PID = 0x0289;
+					test_mode = USE_XBOX;
+					break;
+				default:
+					show_help = true;
+					break;
+				}
+			} else {
+				for (i=0; i<arglen; i++) {
+					if (argv[j][i] == ':')
+						break;
+				}
+				if (i != arglen) {
+					if (sscanf_s(argv[j], "%x:%x" , &tmp_vid, &tmp_pid) != 2) {
+						printf("   Please specify VID & PID as \"vid:pid\" in hexadecimal format\n");
+						return 1;
+					}
+					VID = (uint16_t)tmp_vid;
+					PID = (uint16_t)tmp_pid;
+				} else {
+					show_help = true;
+				}
+			}
+		}
+	}
+
+	if ((show_help) || (argc == 1) || (argc > 7)) {
+		printf("usage: %s [-d] [-b [file]] [-h] [-i] [-j] [-k] [-x] [vid:pid]\n", argv[0]);
+		printf("   -h: display usage\n");
+		printf("   -d: enable debug output (if library was compiled with debug enabled)\n");
+		printf("   -b: dump Mass Storage first block to binary file\n");
+		printf("   -g: short generic test (default)\n");
+		printf("   -k: test generic Mass Storage USB device (using WinUSB)\n");
+		printf("   -j: test FTDI based JTAG device (using WinUSB)\n");
+		printf("   -p: test Sony PS3 SixAxis controller (using WinUSB)\n");
+		printf("   -x: test Microsoft XBox Controller Type S (using WinUSB)\n");
+		return 0;
+	}
+
+#ifdef HAS_GETVERSION
+	version = libusb_getversion(); */
+	printf("Using libusb v%d.%d.%d.%d\n\n", version->major, version->minor, version->micro, version->nano);
+#endif
+	r = libusb_init(NULL);
+	if (r < 0)
+		return r;
+
+	// Info = 3, Debug = 4
+	libusb_set_debug(NULL, debug_mode?4:3);
+
+	test_device(VID, PID);
+
+	libusb_exit(NULL);
+
+	return 0;
+}
\ No newline at end of file
diff --git a/msvc/ddk_build.cmd b/msvc/ddk_build.cmd
index ed9b8a8..714945a 100644
--- a/msvc/ddk_build.cmd
+++ b/msvc/ddk_build.cmd
@@ -1,18 +1,20 @@
-@rem default builds static library.
-@rem you can pass the following arguments (case insensitive):
-@rem - "DLL" to build a DLL instead of a static library
-@rem - "/MT" to build a static library compatible with MSVC's /MT option (LIBCMT vs MSVCRT)
 @echo off
+::# default builds static library. 
+::# you can pass the following arguments (case insensitive):
+::# - "DLL" to build a DLL instead of a static library
+::# - "/MT" to build a static library compatible with MSVC's /MT option (LIBCMT vs MSVCRT)
 
 if Test%BUILD_ALT_DIR%==Test goto usage
 
-rem process commandline parameters
+::# process commandline parameters
 set TARGET=LIBRARY
 set STATIC_LIBC=
 set version=1.0
+set PWD=%~dp0
+set BUILD_CMD=build -bcwgZ -M2
 
 if "%1" == "" goto no_more_args
-rem /I for case insensitive
+::# /I for case insensitive
 if /I Test%1==TestDLL set TARGET=DYNLINK
 if /I Test%1==Test/MT set STATIC_LIBC=1
 :no_more_args
@@ -22,7 +24,7 @@ echo TARGETTYPE=%TARGET% > target
 copy target+..\..\msvc\libusb_sources sources >NUL 2>&1
 del target
 @echo on
-build -cwgZ
+%BUILD_CMD%
 @echo off
 if errorlevel 1 goto builderror
 cd ..\..
@@ -73,9 +75,9 @@ md examples\listdevs_ddkbuild
 cd examples\listdevs_ddkbuild
 copy ..\..\msvc\listdevs_sources sources >NUL 2>&1
 @echo on
-build -cwgZ
+%BUILD_CMD%
 @echo off
-if errorlevel 1 goto buildlistdevserror
+if errorlevel 1 goto builderror
 cd ..\..
 
 set srcPath=examples\listdevs_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
@@ -84,18 +86,29 @@ set srcPath=examples\listdevs_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
 copy %srcPath%\listdevs.exe %dstPath%\examples
 copy %srcPath%\listdevs.pdb %dstPath%\examples
 
-cd msvc
-goto done
+@echo off
 
+if exist examples\xusb_ddkbuild goto md8
+md examples\xusb_ddkbuild
+:md8
 
-:builderror
-cd ..\..\msvc
-echo Build failed
-goto done
+cd examples\xusb_ddkbuild
+copy ..\..\msvc\xusb_sources sources >NUL 2>&1
+@echo on
+%BUILD_CMD%
+@echo off
+if errorlevel 1 goto builderror
+cd ..\..
+
+set srcPath=examples\xusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
+@echo on
+
+copy %srcPath%\xusb.exe %dstPath%\examples
+copy %srcPath%\xusb.pdb %dstPath%\examples
+
+@echo off
 
-:buildlistdevserror
-cd ..\..\msvc
-echo listdevs build failed
+cd msvc
 goto done
 
 :usage
@@ -103,4 +116,8 @@ echo ddk_build must be run in a WDK build environment
 pause
 goto done
 
+:builderror
+echo Build failed
+
 :done
+cd %PWD%
diff --git a/msvc/libusb.dsw b/msvc/libusb.dsw
index fbe3015..14569a6 100644
--- a/msvc/libusb.dsw
+++ b/msvc/libusb.dsw
@@ -42,6 +42,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "xusb"=".\xusb.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libusb_static
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/msvc/lsusb.vcproj b/msvc/lsusb.vcproj
new file mode 100644
index 0000000..ead8f2b
--- /dev/null
+++ b/msvc/lsusb.vcproj
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="lsusb"
+	ProjectGUID="{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
+	RootNamespace="examples"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\lsusb.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/lsusb_sources b/msvc/lsusb_sources
new file mode 100644
index 0000000..dbfefbb
--- /dev/null
+++ b/msvc/lsusb_sources
@@ -0,0 +1,19 @@
+TARGETNAME=lsusb
+TARGETTYPE=PROGRAM
+386_STDCALL=0
+
+_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP)
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+!IFDEF STATIC_LIBC
+USE_LIBCMT=1
+!ELSE
+USE_MSVCRT=1
+!ENDIF
+
+UMTYPE=console
+INCLUDES=..\..\libusb;$(DDK_INC_PATH)
+UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
+SOURCES=..\lsusb.c
diff --git a/msvc/xusb.dsp b/msvc/xusb.dsp
new file mode 100644
index 0000000..0e5c13b
--- /dev/null
+++ b/msvc/xusb.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="xusb" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xusb - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "xusb.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "xusb.mak" CFG="xusb - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "xusb - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xusb - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xusb - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../Win32/Release/examples"
+# PROP Intermediate_Dir "../Win32/Release/examples/xusb"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /EHsc /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "xusb - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "xusb___Win32_Debug"
+# PROP BASE Intermediate_Dir "xusb___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../Win32/Debug/examples"
+# PROP Intermediate_Dir "../Win32/Debug/examples/xusb"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /GZ /EHsc /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/poll_windows.sbr" "../Win32/Debug/dll/threads_windows.sbr" "../Win32/Debug/dll/windows_usb.sbr"
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+
+!ENDIF 
+
+# Begin Target
+
+# Name "xusb - Win32 Release"
+# Name "xusb - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\xusb.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/msvc/xusb.vcproj b/msvc/xusb.vcproj
new file mode 100644
index 0000000..6ad9b7c
--- /dev/null
+++ b/msvc/xusb.vcproj
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="xusb"
+	ProjectGUID="{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}"
+	RootNamespace="examples"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\xusb.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvc/xusb_sources b/msvc/xusb_sources
new file mode 100644
index 0000000..b43f94f
--- /dev/null
+++ b/msvc/xusb_sources
@@ -0,0 +1,20 @@
+TARGETNAME=xusb
+TARGETTYPE=PROGRAM
+386_STDCALL=0
+
+_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP)
+
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+!IFDEF STATIC_LIBC
+USE_LIBCMT=1
+!ELSE
+USE_MSVCRT=1
+!ENDIF
+
+UMTYPE=console
+INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH)
+UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
+SOURCES=..\xusb.c