summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNick Sanders <nsanders@chromium.org>2018-05-08 17:02:38 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-05-10 02:27:11 -0700
commit1356a1a5b747bb9159e8e71db03a9f93a196b245 (patch)
treed4c3d425976fe06162b42394b9611c77c30d4b0a /extra
parent3db5a829b05a90f357fa32729c76a72728787ba4 (diff)
downloadchrome-ec-1356a1a5b747bb9159e8e71db03a9f93a196b245.tar.gz
usb_updater2: match by serial number
Add a serial number match to allow update of servo or other usb devices, where mutliple devices may be attached to one system. BRANCH=None BUG=chromium:718688 TEST=usb_updater2 -d 18d1:501b --serial=[C1706311869|fail] Signed-off-by: Nick Sanders <nsanders@chromium.org> Change-Id: Id6ec944139e685948433af703555fd185e91a9d4 Reviewed-on: https://chromium-review.googlesource.com/1050971 Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'extra')
-rw-r--r--extra/usb_updater/usb_updater2.c78
1 files changed, 70 insertions, 8 deletions
diff --git a/extra/usb_updater/usb_updater2.c b/extra/usb_updater/usb_updater2.c
index 7e27125f02..957881feb0 100644
--- a/extra/usb_updater/usb_updater2.c
+++ b/extra/usb_updater/usb_updater2.c
@@ -72,7 +72,7 @@ static struct first_response_pdu targ;
static uint16_t protocol_version;
static uint16_t header_type;
static char *progname;
-static char *short_opts = "bd:efg:hjp:rstuw";
+static char *short_opts = "bd:efg:hjp:rsS:tuw";
static const struct option long_opts[] = {
/* name hasarg *flag val */
{"binvers", 1, NULL, 'b'},
@@ -85,6 +85,7 @@ static const struct option long_opts[] = {
{"tp_update", 1, NULL, 'p'},
{"reboot", 0, NULL, 'r'},
{"stay_in_ro", 0, NULL, 's'},
+ {"serial", 1, NULL, 'S'},
{"tp_info", 0, NULL, 't'},
{"unlock_rollback", 0, NULL, 'u'},
{"unlock_rw", 0, NULL, 'w'},
@@ -119,6 +120,7 @@ static void usage(int errs)
" -p,--tp_update file Update touchpad FW\n"
" -r,--reboot Tell EC to reboot\n"
" -s,--stay_in_ro Tell EC to stay in RO\n"
+ " -S,--serial Device serial number\n"
" -t,--tp_info Get touchpad information\n"
" -u,--unlock_rollback Tell EC to unlock the rollback region\n"
" -w,--unlock_rw Tell EC to unlock the RW region\n"
@@ -348,10 +350,53 @@ static int parse_vidpid(const char *input, uint16_t *vid_ptr, uint16_t *pid_ptr)
return 1;
}
+static libusb_device_handle *check_device(libusb_device *dev,
+ uint16_t vid, uint16_t pid, char *serialno)
+{
+ struct libusb_device_descriptor desc;
+ libusb_device_handle *handle = NULL;
+ char sn[256];
+ int ret;
+ int match = 1;
+ int snvalid = 0;
+
+ ret = libusb_get_device_descriptor(dev, &desc);
+ if (ret < 0)
+ return NULL;
+
+ ret = libusb_open(dev, &handle);
+
+ if (ret != LIBUSB_SUCCESS)
+ return NULL;
+
+ if (desc.iSerialNumber) {
+ ret = libusb_get_string_descriptor_ascii(handle,
+ desc.iSerialNumber, (unsigned char *)sn, sizeof(sn));
+ if (ret > 0)
+ snvalid = 1;
+ }
+
+ if (vid != 0 && vid != desc.idVendor)
+ match = 0;
+ if (pid != 0 && pid != desc.idProduct)
+ match = 0;
+ if (serialno != NULL && (!snvalid || strstr(sn, serialno) == NULL))
+ match = 0;
+
+ if (match)
+ return handle;
-static void usb_findit(uint16_t vid, uint16_t pid, struct usb_endpoint *uep)
+ libusb_close(handle);
+ return NULL;
+}
+
+static void usb_findit(uint16_t vid, uint16_t pid,
+ char *serialno, struct usb_endpoint *uep)
{
- int iface_num, r;
+ int iface_num, r, i;
+ libusb_device **devs;
+ libusb_device_handle *devh = NULL;
+ ssize_t count;
memset(uep, 0, sizeof(*uep));
@@ -361,14 +406,27 @@ static void usb_findit(uint16_t vid, uint16_t pid, struct usb_endpoint *uep)
exit(update_error);
}
- printf("open_device %04x:%04x\n", vid, pid);
- /* NOTE: This doesn't handle multiple matches! */
- uep->devh = libusb_open_device_with_vid_pid(NULL, vid, pid);
- if (!uep->devh) {
+ count = libusb_get_device_list(NULL, &devs);
+ if (count < 0)
+ return;
+
+ for (i = 0; devs[i]; i++) {
+ devh = check_device(devs[i], vid, pid, serialno);
+ if (devh) {
+ printf("Found device.\n");
+ break;
+ }
+ }
+
+ libusb_free_device_list(devs, 1);
+
+ if (!devh) {
fprintf(stderr, "Can't find device\n");
exit(update_error);
}
+ uep->devh = devh;
+
iface_num = find_interface(uep);
if (iface_num < 0) {
fprintf(stderr, "USB FW update not supported by that device\n");
@@ -909,6 +967,7 @@ int main(int argc, char *argv[])
uint8_t *data = 0;
size_t data_len = 0;
uint16_t vid = VID, pid = PID;
+ char *serialno = NULL;
int i;
size_t j;
int transferred_sections = 0;
@@ -980,6 +1039,9 @@ int main(int argc, char *argv[])
case 's':
extra_command = UPDATE_EXTRA_CMD_STAY_IN_RO;
break;
+ case 'S':
+ serialno = optarg;
+ break;
case 't':
extra_command = UPDATE_EXTRA_CMD_TOUCHPAD_INFO;
extra_command_answer_len =
@@ -1034,7 +1096,7 @@ int main(int argc, char *argv[])
printf("Ignoring binary image %s\n", argv[optind]);
}
- usb_findit(vid, pid, &td.uep);
+ usb_findit(vid, pid, serialno, &td.uep);
setup_connection(&td);