libusb 0.3.4 → 0.4.0

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

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libusb.h>
+#include "libusb.h"
 
 #define EP_INTR			(1 | LIBUSB_ENDPOINT_IN)
 #define EP_DATA			(2 | LIBUSB_ENDPOINT_IN)

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

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libusb.h>
+#include "libusb.h"
 
 #define EP_INTR			(1 | LIBUSB_ENDPOINT_IN)
 #define EP_DATA			(2 | LIBUSB_ENDPOINT_IN)

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

@@ -3,6 +3,7 @@
  * Copyright © 2001-2002 David Brownell (dbrownell@users.sourceforge.net)
  * Copyright © 2008 Roger Williams (rawqux@users.sourceforge.net)
  * Copyright © 2012 Pete Batard (pete@akeo.ie)
+ * Copyright © 2013 Federico Manzan (f.manzan@gmail.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -25,7 +26,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include <libusb.h>
+#include "libusb.h"
 #include "ezusb.h"
 
 extern void logerror(const char *format, ...)
@@ -46,7 +47,7 @@ extern void logerror(const char *format, ...)
  * The Cypress FX parts are largely compatible with the Anchorhip ones.
  */
 
-int verbose;
+int verbose = 1;
 
 /*
  * return true if [addr,addr+len] includes external RAM
@@ -126,7 +127,7 @@ static int ezusb_write(libusb_device_handle *device, const char *label,
 {
 	int status;
 
-	if (verbose)
+	if (verbose > 1)
 		logerror("%s, addr 0x%08x len %4u (0x%04x)\n", label, addr, (unsigned)len, (unsigned)len);
 	status = libusb_control_transfer(device,
 		LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,
@@ -141,6 +142,29 @@ static int ezusb_write(libusb_device_handle *device, const char *label,
 	return (status < 0) ? -EIO : 0;
 }
 
+/*
+ * Issues the specified vendor-specific read request.
+ */
+static int ezusb_read(libusb_device_handle *device, const char *label,
+	uint8_t opcode, uint32_t addr, const unsigned char *data, size_t len)
+{
+	int status;
+
+	if (verbose > 1)
+		logerror("%s, addr 0x%08x len %4u (0x%04x)\n", label, addr, (unsigned)len, (unsigned)len);
+	status = libusb_control_transfer(device,
+		LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,
+		opcode, addr & 0xFFFF, addr >> 16,
+		(unsigned char*)data, (uint16_t)len, 1000);
+	if (status != len) {
+		if (status < 0)
+			logerror("%s: %s\n", label, libusb_error_name(status));
+		else
+			logerror("%s ==> %d\n", label, status);
+	}
+	return (status < 0) ? -EIO : 0;
+}
+
 /*
  * Modifies the CPUCS register to stop or reset the CPU.
  * Returns false on error.
@@ -170,6 +194,33 @@ static bool ezusb_cpucs(libusb_device_handle *device, uint32_t addr, bool doRun)
 		return true;
 }
 
+/*
+ * Send an FX3 jumpt to address command
+ * Returns false on error.
+ */
+static bool ezusb_fx3_jump(libusb_device_handle *device, uint32_t addr)
+{
+	int status;
+
+	if (verbose)
+		logerror("transfer execution to Program Entry at 0x%08x\n", addr);
+	status = libusb_control_transfer(device,
+		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 */
+	if ((status != 0) && (status != LIBUSB_ERROR_IO))
+	{
+		const char *mesg = "failed to send jump command";
+		if (status < 0)
+			logerror("%s: %s\n", mesg, libusb_error_name(status));
+		else
+			logerror("%s\n", mesg);
+		return false;
+	} else
+		return true;
+}
+
 /*****************************************************************************/
 
 /*
@@ -248,7 +299,7 @@ static int parse_ihex(FILE *image, void *context,
 		/* Read the target offset (address up to 64KB) */
 		tmp = buf[7];
 		buf[7] = 0;
-		off = strtoul(buf+3, NULL, 16);
+		off = (int)strtoul(buf+3, NULL, 16);
 		buf[7] = tmp;
 
 		/* Initialize data_addr */
@@ -420,9 +471,9 @@ static int parse_iic(FILE *image, void *context,
 }
 
 /* the parse call will be selected according to the image type */
-int (*parse[IMG_TYPE_MAX])(FILE *image, void *context, bool (*is_external)(uint32_t addr, size_t len),
-	int (*poke)(void *context, uint32_t addr, bool external, const unsigned char *data, size_t len))
-	= { parse_ihex, parse_iic, parse_bin };
+static int (*parse[IMG_TYPE_MAX])(FILE *image, void *context, bool (*is_external)(uint32_t addr, size_t len),
+           int (*poke)(void *context, uint32_t addr, bool external, const unsigned char *data, size_t len))
+           = { parse_ihex, parse_iic, parse_bin };
 
 /*****************************************************************************/
 
@@ -502,6 +553,132 @@ static int ram_poke(void *context, uint32_t addr, bool external,
 	return rc;
 }
 
+/*
+ * Load a Cypress Image file into target RAM.
+ * See http://www.cypress.com/?docID=41351 (AN76405 PDF) for more info.
+ */
+static int fx3_load_ram(libusb_device_handle *device, const char *path)
+{
+	uint32_t dCheckSum, dExpectedCheckSum, dAddress, i, dLen, dLength;
+	uint32_t* dImageBuf;
+	unsigned char *bBuf, hBuf[4], blBuf[4], rBuf[4096];
+	FILE *image;
+
+	image = fopen(path, "rb");
+	if (image == NULL) {
+		logerror("unable to open '%s' for input\n", path);
+		return -2;
+	} else if (verbose)
+		logerror("open firmware image %s for RAM upload\n", path);
+
+	// Read header
+	if (fread(hBuf, sizeof(char), sizeof(hBuf), image) != sizeof(hBuf)) {
+		logerror("could not read image header");
+		return -3;
+	}
+
+	// check "CY" signature byte and format
+	if ((hBuf[0] != 'C') || (hBuf[1] != 'Y')) {
+		logerror("image doesn't have a CYpress signature\n");
+		return -3;
+	}
+
+	// Check bImageType
+	switch(hBuf[3]) {
+	case 0xB0:
+		if (verbose)
+			logerror("normal FW binary %s image with checksum\n", (hBuf[2]&0x01)?"data":"executable");
+		break;
+	case 0xB1:
+		logerror("security binary image is not currently supported\n");
+		return -3;
+	case 0xB2:
+		logerror("VID:PID image is not currently supported\n");
+		return -3;
+	default:
+		logerror("invalid image type 0x%02X\n", hBuf[3]);
+		return -3;
+	}
+
+	// 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;
+		}
+		logerror("FX3 bootloader version: 0x%02X%02X%02X%02X\n", blBuf[3], blBuf[2], blBuf[1], blBuf[0]);
+	}
+
+	dCheckSum = 0;
+	if (verbose)
+		logerror("writing image...\n");
+	while (1) {
+		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;
+		}
+		if (dLength == 0)
+			break; // done
+
+		dImageBuf = calloc(dLength, sizeof(uint32_t));
+		if (dImageBuf == NULL) {
+			logerror("could not allocate buffer for image chunk\n");
+			return -4;
+		}
+
+		// read sections
+		if (fread(dImageBuf, sizeof(uint32_t), dLength, image) != dLength) {
+			logerror("could not read image");
+			free(dImageBuf);
+			return -3;
+		}
+		for (i = 0; i < dLength; i++)
+			dCheckSum += dImageBuf[i];
+		dLength <<= 2; // convert to Byte length
+		bBuf = (unsigned char*) dImageBuf;
+
+		while (dLength > 0) {
+			dLen = 4096; // 4K max
+			if (dLen > dLength)
+				dLen = dLength;
+			if ((ezusb_write(device, "write firmware", RW_INTERNAL, dAddress, bBuf, dLen) < 0) ||
+				(ezusb_read(device, "read firmware", RW_INTERNAL, dAddress, rBuf, dLen) < 0)) {
+				logerror("R/W error\n");
+				free(dImageBuf);
+				return -5;
+			}
+			// Verify data: rBuf with bBuf
+			for (i = 0; i < dLen; i++) {
+				if (rBuf[i] != bBuf[i]) {
+					logerror("verify error");
+					free(dImageBuf);
+					return -6;
+				}
+			}
+
+			dLength -= dLen;
+			bBuf += dLen;
+			dAddress += dLen;
+		}
+		free(dImageBuf);
+	}
+
+	// read pre-computed checksum data
+	if ((fread(&dExpectedCheckSum, sizeof(uint32_t), 1, image) != 1) ||
+		(dCheckSum != dExpectedCheckSum)) {
+		logerror("checksum error\n");
+		return -7;
+	}
+
+	// transfer execution to Program Entry
+	if (!ezusb_fx3_jump(device, dAddress)) {
+		return -6;
+	}
+
+	return 0;
+}
+
 /*
  * Load a firmware file into target RAM. device is the open libusbx
  * device, and the path is the name of the source file. Open the file,
@@ -525,11 +702,14 @@ int ezusb_load_ram(libusb_device_handle *device, const char *path, int fx_type,
 	int status;
 	uint8_t iic_header[8] = { 0 };
 
+	if (fx_type == FX_TYPE_FX3)
+		return fx3_load_ram(device, path);
+
 	image = fopen(path, "rb");
 	if (image == NULL) {
 		logerror("%s: unable to open for input.\n", path);
 		return -2;
-	} else if (verbose)
+	} else if (verbose > 1)
 		logerror("open firmware image %s for RAM upload\n", path);
 
 	if (img_type == IMG_TYPE_IIC) {

data/ext/{libusbx-1.0.14 → libusbx-1.0.17}/examples/ezusb.h

@@ -3,6 +3,7 @@
 /*
  * Copyright © 2001 Stephen Williams (steve@icarus.com)
  * Copyright © 2002 David Brownell (dbrownell@users.sourceforge.net)
+ * Copyright © 2013 Federico Manzan (f.manzan@gmail.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -42,15 +43,21 @@
 #define FX_TYPE_FX1        1	/* Updated Cypress versions */
 #define FX_TYPE_FX2        2	/* USB 2.0 versions */
 #define FX_TYPE_FX2LP      3	/* Updated FX2 */
-#define FX_TYPE_MAX        4
-#define FX_TYPE_NAMES      { "an21", "fx", "fx2", "fx2lp" }
+#define FX_TYPE_FX3        4	/* USB 3.0 versions */
+#define FX_TYPE_MAX        5
+#define FX_TYPE_NAMES      { "an21", "fx", "fx2", "fx2lp", "fx3" }
 
 #define IMG_TYPE_UNDEFINED -1
 #define IMG_TYPE_HEX       0	/* Intel HEX */
 #define IMG_TYPE_IIC       1	/* Cypress 8051 IIC */
 #define IMG_TYPE_BIX       2	/* Cypress 8051 BIX */
-#define IMG_TYPE_MAX       3
-#define IMG_TYPE_NAMES     { "Intel HEX", "Cypress 8051 IIC", "Cypress 8051 BIX" }
+#define IMG_TYPE_IMG       3	/* Cypress IMG format */
+#define IMG_TYPE_MAX       4
+#define IMG_TYPE_NAMES     { "Intel HEX", "Cypress 8051 IIC", "Cypress 8051 BIX", "Cypress IMG format" }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* 
  * Automatically identified devices (VID, PID, type, designation).
@@ -75,6 +82,7 @@ typedef struct {
 	{ 0x0547, 0x2236, FX_TYPE_AN21, "Cypress EZ-USB (2236)" },\
 	{ 0x04b4, 0x6473, FX_TYPE_FX1, "Cypress EZ-USB FX1" },\
 	{ 0x04b4, 0x8613, FX_TYPE_FX2LP, "Cypress EZ-USB FX2LP (68013A/68014A/68015A/68016A)" }, \
+	{ 0x04b4, 0x00f3, FX_TYPE_FX3, "Cypress FX3" },\
 }
 
 /*
@@ -102,6 +110,11 @@ extern int ezusb_load_ram(libusb_device_handle *device,
 extern int ezusb_load_eeprom(libusb_device_handle *device,
 	const char *path, int fx_type, int img_type, int config);
 
-/* boolean flag, says whether to write extra messages to stderr */
+/* Verbosity level (default 1). Can be increased or decreased with options v/q  */
 extern int verbose;
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

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

@@ -3,6 +3,7 @@
  * Copyright © 2001-2002 David Brownell (dbrownell@users.sourceforge.net)
  * Copyright © 2008 Roger Williams (rawqux@users.sourceforge.net)
  * Copyright © 2012 Pete Batard (pete@akeo.ie)
+ * Copyright © 2013 Federico Manzan (f.manzan@gmail.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -20,16 +21,6 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-/*
- * This program supports uploading firmware into a target USB device.
- *
- *     -I <path>       -- Upload this firmware
- *     -t <type>       -- uController type: an21, fx, fx2, fx2lp
- *
- *     -D <vid:pid>    -- Use this device, instead of $DEVICE
- *
- *     -V              -- Print version ID for program
- */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -38,7 +29,7 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include <libusb.h>
+#include "libusb.h"
 #include "ezusb.h"
 
 #if !defined(_WIN32) || defined(__CYGWIN__ )
@@ -49,7 +40,7 @@ static bool dosyslog = false;
 #endif
 
 #ifndef FXLOAD_VERSION
-#define FXLOAD_VERSION (__DATE__ " (development)")
+#define FXLOAD_VERSION (__DATE__ " (libusbx)")
 #endif
 
 #ifndef ARRAYSIZE
@@ -73,30 +64,57 @@ void logerror(const char *format, ...)
 	va_end(ap);
 }
 
+static int print_usage(int error_code) {
+	fprintf(stderr, "\nUsage: fxload [-v] [-V] [-t type] [-d vid:pid] [-p bus,addr] -i firmware\n");
+	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, "  -v              -- Increase verbosity\n");
+	fprintf(stderr, "  -q              -- Decrease verbosity (silent mode)\n");
+	fprintf(stderr, "  -V              -- Print program version\n");
+	return error_code;
+}
+
 #define FIRMWARE 0
 #define LOADER 1
 int main(int argc, char*argv[])
 {
 	fx_known_device known_device[] = FX_KNOWN_DEVICES;
 	const char *path[] = { NULL, NULL };
-	const char *device_id = getenv("DEVICE");
+	const char *device_id = NULL;
+	const char *device_path = getenv("DEVICE");
 	const char *type = NULL;
 	const char *fx_name[FX_TYPE_MAX] = FX_TYPE_NAMES;
 	const char *ext, *img_name[] = IMG_TYPE_NAMES;
 	int fx_type = FX_TYPE_UNDEFINED, img_type[ARRAYSIZE(path)];
 	int i, j, opt, status;
 	unsigned vid = 0, pid = 0;
+	unsigned busnum = 0, devaddr = 0, _busnum, _devaddr;
 	libusb_device *dev, **devs;
 	libusb_device_handle *device = NULL;
 	struct libusb_device_descriptor desc;
 
-	while ((opt = getopt(argc, argv, "vV?D:I:c:s:t:")) != EOF)
+	while ((opt = getopt(argc, argv, "qvV?hd:p:i:I:t:")) != EOF)
 		switch (opt) {
 
-		case 'D':
+		case 'd':
 			device_id = optarg;
+			if (sscanf(device_id, "%x:%x" , &vid, &pid) != 2 ) {
+				fputs ("please specify VID & PID as \"vid:pid\" in hexadecimal format\n", stderr);
+				return -1;
+			}
+			break;
+
+		case 'p':
+			device_path = optarg;
+			if (sscanf(device_path, "%u,%u", &busnum, &devaddr) != 2 ) {
+				fputs ("please specify bus number & device number as \"bus,dev\" in decimal format\n", stderr);
+				return -1;
+			}
 			break;
 
+		case 'i':
 		case 'I':
 			path[FIRMWARE] = optarg;
 			break;
@@ -113,23 +131,24 @@ int main(int argc, char*argv[])
 			verbose++;
 			break;
 
+		case 'q':
+			verbose--;
+			break;
+
 		case '?':
+		case 'h':
 		default:
-			goto usage;
+			return print_usage(-1);
 
 	}
 
 	if (path[FIRMWARE] == NULL) {
 		logerror("no firmware specified!\n");
-usage:
-		fprintf(stderr, "\nusage: %s [-vV] [-t type] [-D vid:pid] -I firmware\n", argv[0]);
-		fprintf(stderr, "      type: one of an21, fx, fx2, fx2lp\n");
-		return -1;
+		return print_usage(-1);
 	}
-
-	if ((device_id != NULL) && (sscanf(device_id, "%x:%x" , &vid, &pid) != 2 )) {
-		fputs ("please specify VID & PID as \"vid:pid\" in hexadecimal format\n", stderr);
-		return -1;
+	if ((device_id != NULL) && (device_path != NULL)) {
+		logerror("only one of -d or -a can be specified\n");
+		return print_usage(-1);
 	}
 
 	/* determine the target type */
@@ -142,7 +161,7 @@ usage:
 		}
 		if (i >= FX_TYPE_MAX) {
 			logerror("illegal microcontroller type: %s\n", type);
-			goto usage;
+			return print_usage(-1);
 		}
 	}
 
@@ -155,48 +174,58 @@ usage:
 	libusb_set_debug(NULL, verbose);
 
 	/* try to pick up missing parameters from known devices */
-	if ((type == NULL) || (device_id == NULL)) {
+	if ((type == NULL) || (device_id == NULL) || (device_path != NULL)) {
 		if (libusb_get_device_list(NULL, &devs) < 0) {
 			logerror("libusb_get_device_list() failed: %s\n", libusb_error_name(status));
 			goto err;
 		}
 		for (i=0; (dev=devs[i]) != NULL; i++) {
-			status = libusb_get_device_descriptor(dev, &desc);
-			if (status >= 0) {
-				if (verbose >= 2)
-					logerror("trying to match against %04x:%04x\n", desc.idVendor, desc.idProduct);
-				for (j=0; j<ARRAYSIZE(known_device); j++) {
-					if ((desc.idVendor == known_device[j].vid)
-						&& (desc.idProduct == known_device[j].pid)) {
-						if ((type == NULL) && (device_id == NULL)) {
-							fx_type = known_device[j].type;
-							vid = desc.idVendor;
-							pid = desc.idProduct;
-							break;
-						} else if ((type == NULL) && (vid == desc.idVendor)
-							&& (pid == desc.idProduct)) {
-							fx_type = known_device[j].type;
-							break;
-						} else if ((device_id == NULL)
-							&& (fx_type == known_device[j].type)) {
-							vid = desc.idVendor;
-							pid = desc.idProduct;
-							break;
+			_busnum = libusb_get_bus_number(dev);
+			_devaddr = libusb_get_device_address(dev);
+			if ((type != NULL) && (device_path != NULL)) {
+				// if both a type and bus,addr were specified, we just need to find our match
+				if ((libusb_get_bus_number(dev) == busnum) && (libusb_get_device_address(dev) == devaddr))
+					break;
+			} else {
+				status = libusb_get_device_descriptor(dev, &desc);
+				if (status >= 0) {
+					if (verbose >= 3) {
+						logerror("examining %04x:%04x (%d,%d)\n",
+							desc.idVendor, desc.idProduct, _busnum, _devaddr);
+					}
+					for (j=0; j<ARRAYSIZE(known_device); j++) {
+						if ((desc.idVendor == known_device[j].vid)
+							&& (desc.idProduct == known_device[j].pid)) {
+							if (// nothing was specified
+								((type == NULL) && (device_id == NULL) && (device_path == NULL)) ||
+								// vid:pid was specified and we have a match
+								((type == NULL) && (device_id != NULL) && (vid == desc.idVendor) && (pid == desc.idProduct)) ||
+								// bus,addr was specified and we have a match
+								((type == NULL) && (device_path != NULL) && (busnum == _busnum) && (devaddr == _devaddr)) ||
+								// type was specified and we have a match
+								((type != NULL) && (device_id == NULL) && (device_path == NULL) && (fx_type == known_device[j].type)) ) {
+								fx_type = known_device[j].type;
+								vid = desc.idVendor;
+								pid = desc.idProduct;
+								busnum = _busnum;
+								devaddr = _devaddr;
+								break;
+							}
 						}
 					}
-				}
-				if (j < ARRAYSIZE(known_device)) {
-					if (verbose)
-						logerror("found device '%s' [%04x:%04x]\n",
-							known_device[j].designation, vid, pid);
-					break;
+					if (j < ARRAYSIZE(known_device)) {
+						if (verbose)
+							logerror("found device '%s' [%04x:%04x] (%d,%d)\n",
+								known_device[j].designation, vid, pid, busnum, devaddr);
+						break;
+					}
 				}
 			}
 		}
 		if (dev == NULL) {
 			libusb_free_device_list(devs, 1);
-			logerror("could not find a known device - please specify type and/or vid:pid\n");
-			goto usage;
+			logerror("could not find a known device - please specify type and/or vid:pid and/or bus,dev\n");
+			return print_usage(-1);
 		}
 		status = libusb_open(dev, &device);
 		if (status < 0) {
@@ -204,22 +233,17 @@ usage:
 			goto err;
 		}
 		libusb_free_device_list(devs, 1);
-	} else {
+	} else if (device_id != NULL) {
 		device = libusb_open_device_with_vid_pid(NULL, (uint16_t)vid, (uint16_t)pid);
 		if (device == NULL) {
 			logerror("libusb_open() failed\n");
 			goto err;
 		}
 	}
+
 	/* We need to claim the first interface */
+	libusb_set_auto_detach_kernel_driver(device, 1);
 	status = libusb_claim_interface(device, 0);
-#if defined(__linux__)
-	if (status != LIBUSB_SUCCESS) {
-		/* Maybe we need to detach the driver */
-		libusb_detach_kernel_driver(device, 0);
-		status = libusb_claim_interface(device, 0);
-	}
-#endif
 	if (status != LIBUSB_SUCCESS) {
 		logerror("libusb_claim_interface failed: %s\n", libusb_error_name(status));
 		goto err;
@@ -237,6 +261,8 @@ usage:
 				img_type[i] = IMG_TYPE_IIC;
 			else if (_stricmp(ext, ".bix") == 0)
 				img_type[i] = IMG_TYPE_BIX;
+			else if (_stricmp(ext, ".img") == 0)
+				img_type[i] = IMG_TYPE_IMG;
 			else {
 				logerror("%s is not a recognized image type\n", path[i]);
 				goto err;
@@ -247,7 +273,7 @@ usage:
 	}
 
 	/* single stage, put into internal memory */
-	if (verbose)
+	if (verbose > 1)
 		logerror("single stage: load on-chip memory\n");
 	status = ezusb_load_ram(device, path[FIRMWARE], fx_type, img_type[FIRMWARE], 0);