r3106 - in trunk/src/host/dfu-util: . src
werner at sita.openmoko.org
werner at sita.openmoko.org
Mon Oct 8 03:26:55 CEST 2007
Author: werner
Date: 2007-10-08 03:26:48 +0200 (Mon, 08 Oct 2007)
New Revision: 3106
Modified:
trunk/src/host/dfu-util/configure.ac
trunk/src/host/dfu-util/src/main.c
Log:
configure.ac: added libusbpath.a and usbpath.h dependency
src/main.c: added search filter DFU_IFF_DEVNUM (bus, devnum)
src/main.c: added pseudo search filter DFU_IFF_PATH (path)
src/main.c (get_first_dfu_device, count_dfu_devices): abstracted common code
into iterate_dfu_devices
src/main.c (iterate_dfu_devices): added filtering by USB device number
src/main.c (resolve_device_path): new function to resolve physical USB path to
device number suitable for filtering
src/main.c (main): new option "-p bus-port. ... .port" to specify physical USB
path
src/main.c (main): repeat resolution after bus reset
Modified: trunk/src/host/dfu-util/configure.ac
===================================================================
--- trunk/src/host/dfu-util/configure.ac 2007-10-07 16:54:47 UTC (rev 3105)
+++ trunk/src/host/dfu-util/configure.ac 2007-10-08 01:26:48 UTC (rev 3106)
@@ -17,12 +17,14 @@
PKG_CHECK_MODULES(USB, libusb >= 0.1.4,,
AC_MSG_ERROR([*** Required libusb >= 0.1.4 not installed ***]))
+AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb)
+
LIBS="$LIBS $USB_LIBS"
CFLAGS="$CFLAGS $USB_CFLAGS"
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h stdio.h])
+AC_CHECK_HEADERS([stdlib.h string.h stdio.h usbpath.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
Modified: trunk/src/host/dfu-util/src/main.c
===================================================================
--- trunk/src/host/dfu-util/src/main.c 2007-10-07 16:54:47 UTC (rev 3105)
+++ trunk/src/host/dfu-util/src/main.c 2007-10-08 01:26:48 UTC (rev 3106)
@@ -37,7 +37,11 @@
#include "config.h"
#endif
+#ifdef HAVE_USBPATH_H
+#include <usbpath.h>
+#endif
+
int debug;
static int verbose = 0;
@@ -47,6 +51,8 @@
#define DFU_IFF_CONFIG 0x0400
#define DFU_IFF_IFACE 0x0800
#define DFU_IFF_ALT 0x1000
+#define DFU_IFF_DEVNUM 0x2000
+#define DFU_IFF_PATH 0x4000
struct usb_vendprod {
u_int16_t vendor;
@@ -59,6 +65,9 @@
u_int8_t configuration;
u_int8_t interface;
u_int8_t altsetting;
+ int bus;
+ u_int8_t devnum;
+ const char *path;
unsigned int flags;
struct usb_device *dev;
@@ -211,53 +220,74 @@
return num_found;
}
-/* Find the first DFU-capable device, save it in dfu_if->dev */
-static int get_first_dfu_device(struct dfu_if *dif)
+
+/* Iterate over all matching DFU capable devices within system */
+static int iterate_dfu_devices(struct dfu_if *dif,
+ int (*action)(struct usb_device *dev, void *user), void *user)
{
struct usb_bus *usb_bus;
struct usb_device *dev;
+ /* Walk the tree and find our device. */
for (usb_bus = usb_get_busses(); NULL != usb_bus;
usb_bus = usb_bus->next) {
for (dev = usb_bus->devices; NULL != dev; dev = dev->next) {
- if (!dif ||
- (dif->flags & (DFU_IFF_VENDOR|DFU_IFF_PRODUCT)) == 0 ||
- (dev->descriptor.idVendor == dif->vendor &&
- dev->descriptor.idProduct == dif->product)) {
- if (count_dfu_interfaces(dev) >= 1) {
- dif->dev = dev;
- return 1;
- }
- }
+ int retval;
+
+ if (dif && (dif->flags &
+ (DFU_IFF_VENDOR|DFU_IFF_PRODUCT)) &&
+ (dev->descriptor.idVendor != dif->vendor ||
+ dev->descriptor.idProduct != dif->product))
+ continue;
+ if (dif && (dif->flags & DFU_IFF_DEVNUM) &&
+ (atoi(usb_bus->dirname) != dif->bus ||
+ dev->devnum != dif->devnum))
+ continue;
+
+ retval = action(dev, user);
+ if (retval)
+ return retval;
}
}
+ return 0;
+}
+
+static int found_dfu_device(struct usb_device *dev, void *user)
+{
+ struct dfu_if *dif = user;
+
+ dif->dev = dev;
+ return 1;
+}
+
+
+/* Find the first DFU-capable device, save it in dfu_if->dev */
+static int get_first_dfu_device(struct dfu_if *dif)
+{
+ return iterate_dfu_devices(dif, found_dfu_device, dif);
+}
+
+
+static int count_one_dfu_device(struct usb_device *dev, void *user)
+{
+ int *num = user;
+
+ (*num)++;
return 0;
}
+
/* Count DFU capable devices within system */
static int count_dfu_devices(struct dfu_if *dif)
{
- struct usb_bus *usb_bus;
- struct usb_device *dev;
int num_found = 0;
- /* Walk the tree and find our device. */
- for (usb_bus = usb_get_busses(); NULL != usb_bus;
- usb_bus = usb_bus->next) {
- for (dev = usb_bus->devices; NULL != dev; dev = dev->next) {
- if (!dif ||
- (dif->flags & (DFU_IFF_VENDOR|DFU_IFF_PRODUCT)) == 0 ||
- (dev->descriptor.idVendor == dif->vendor &&
- dev->descriptor.idProduct == dif->product)) {
- if (count_dfu_interfaces(dev) >= 1)
- num_found++;
- }
- }
- }
+ iterate_dfu_devices(dif, count_one_dfu_device, &num_found);
return num_found;
}
+
static int list_dfu_interfaces(void)
{
struct usb_bus *usb_bus;
@@ -294,6 +324,40 @@
return 0;
}
+
+#ifdef HAVE_USBPATH_H
+
+static int resolve_device_path(struct dfu_if *dif)
+{
+ int res;
+
+ if (!(dif->flags & DFU_IFF_PATH))
+ return 0;
+
+ res = usb_path2devnum(dif->path);
+ if (res < 0)
+ return -EINVAL;
+ if (!res)
+ return 0;
+
+ dif->bus = atoi(dif->path);
+ dif->devnum = res;
+ dif->flags |= DFU_IFF_DEVNUM;
+ return res;
+}
+
+#else /* HAVE_USBPATH_H */
+
+static int resolve_device_path(struct dfu_if *dif)
+{
+ fprintf(stderr,
+ "USB device paths are not supported by this dfu-util.\n");
+ exit(1);
+}
+
+#endif /* !HAVE_USBPATH_H */
+
+
static void help(void)
{
printf("Usage: dfu-util [options] ...\n"
@@ -301,6 +365,7 @@
" -V --version\t\t\tPrint the version number\n"
" -l --list\t\t\tList the currently attached DFU capable USB devices\n"
" -d --device vendor:product\tSpecify Vendor/Product ID of DFU device\n"
+ " -p --path bus-port. ... .port\tSpecify path to DFU device\n"
" -c --cfg config_nr\t\tSpecify the Configuration of DFU device\n"
" -i --intf intf_nr\t\tSpecify the DFU Interface number\n"
" -a --alt alt\t\t\tSpecify the Altsetting of the DFU Interface\n"
@@ -323,6 +388,7 @@
{ "verbose", 0, 0, 'v' },
{ "list", 0, 0, 'l' },
{ "device", 1, 0, 'd' },
+ { "path", 1, 0, 'p' },
{ "configuration", 1, 0, 'c' },
{ "cfg", 1, 0, 'c' },
{ "interface", 1, 0, 'i' },
@@ -370,7 +436,7 @@
while (1) {
int c, option_index = 0;
- c = getopt_long(argc, argv, "hVvld:c:i:a:t:U:D:R", opts, &option_index);
+ c = getopt_long(argc, argv, "hVvld:p:c:i:a:t:U:D:R", opts, &option_index);
if (c == -1)
break;
@@ -400,6 +466,21 @@
dif->product = vendprod.product;
dif->flags |= (DFU_IFF_VENDOR | DFU_IFF_PRODUCT);
break;
+ case 'p':
+ /* Parse device path */
+ dif->path = optarg;
+ dif->flags |= DFU_IFF_PATH;
+ ret = resolve_device_path(dif);
+ if (ret < 0) {
+ fprintf(stderr, "unable to parse `%s'\n",
+ optarg);
+ exit(2);
+ }
+ if (!ret) {
+ fprintf(stderr, "cannot find `%s'\n", optarg);
+ exit(1);
+ }
+ break;
case 'c':
/* Configuration */
dif->configuration = atoi(optarg);
@@ -535,6 +616,18 @@
if (usb_find_devices() < 2)
printf("not at least 2 device changes found ?!?\n");
+ ret = resolve_device_path(dif);
+ if (ret < 0) {
+ fprintf(stderr,
+ "internal error: cannot re-parse `%s'\n",
+ dif->path);
+ abort();
+ }
+ if (!ret) {
+ fprintf(stderr, "Can't resolve path after RESET?\n");
+ exit(1);
+ }
+
num_devs = count_dfu_devices(dif);
if (num_devs == 0) {
fprintf(stderr, "Lost device after RESET?\n");
More information about the commitlog
mailing list
