X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/602ac4d7c541eff9bd228bd306886f0db93a363c..18d4eec685bba58f60c19cd7ad6fdf60000e73ba:/client/proxusb.c diff --git a/client/proxusb.c b/client/proxusb.c index 8eedd2e6..3c2b20b4 100644 --- a/client/proxusb.c +++ b/client/proxusb.c @@ -151,9 +151,10 @@ usb_dev_handle* findProxmark(int verbose, unsigned int *iface) fprintf(stdout, "\nConnected units:\n"); - for (int i = 0; i < iUnit; i++) - fprintf(stdout, "\t%d. SN: %s\n", i+1, units[i].serial_number); - + for (int i = 0; i < iUnit; i++) { + struct usb_device * dev = usb_device(units[i].handle); + fprintf(stdout, "\t%d. SN: %s [%s/%s]\n", i+1, units[i].serial_number, dev->bus->dirname, dev->filename); + } if (iUnit > 1) { while (iSelection < 1 || iSelection > iUnit) { fprintf(stdout, "Which unit do you want to connect to? "); @@ -182,15 +183,6 @@ usb_dev_handle* OpenProxmark(int verbose) usb_dev_handle *handle = NULL; unsigned int iface; -#ifdef __linux__ - handle = findProxmark(verbose, &iface); - if (!handle) - return NULL; - - /* Whatever... */ - usb_reset(handle); -#endif - handle = findProxmark(verbose, &iface); if (!handle) return NULL;