sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Panda: check libusb_open status (#23622)

Browse Source 
old-commit-hash: 703efb9275
commatwo_master
Igor Biletskyy 4 years ago committed by GitHub
parent eac8bd839a
commit b294249932
1 changed files with 8 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      selfdrive/boardd/panda.cc

14
selfdrive/boardd/panda.cc
Unescape View File

@ -45,11 +45,11 @@ Panda::Panda(std::string serial, uint32_t bus_offset) : bus_offset(bus_offset) {
libusb_device_descriptor desc; libusb_device_descriptor desc;
libusb_get_device_descriptor(dev_list[i], &desc); libusb_get_device_descriptor(dev_list[i], &desc);
if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) { if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) {
libusb_open(dev_list[i], &dev_handle); int ret = libusb_open(dev_list[i], &dev_handle);
if (dev_handle == NULL) { goto fail; } if (dev_handle == NULL || ret < 0) { goto fail; }
unsigned char desc_serial[26] = { 0 }; unsigned char desc_serial[26] = { 0 };
int ret = libusb_get_string_descriptor_ascii(dev_handle, desc.iSerialNumber, desc_serial, std::size(desc_serial)); ret = libusb_get_string_descriptor_ascii(dev_handle, desc.iSerialNumber, desc_serial, std::size(desc_serial));
if (ret < 0) { goto fail; } if (ret < 0) { goto fail; }
usb_serial = std::string((char *)desc_serial, ret).c_str(); usb_serial = std::string((char *)desc_serial, ret).c_str();
@ -130,12 +130,14 @@ std::vector<std::string> Panda::list() {
libusb_get_device_descriptor(device, &desc); libusb_get_device_descriptor(device, &desc);
if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) { if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) {
libusb_device_handle *handle = NULL; libusb_device_handle *handle = NULL;
libusb_open(device, &handle); int ret = libusb_open(device, &handle);
if (ret < 0) { goto finish; }
unsigned char desc_serial[26] = { 0 }; unsigned char desc_serial[26] = { 0 };
int ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, desc_serial, std::size(desc_serial)); ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, desc_serial, std::size(desc_serial));
libusb_close(handle); libusb_close(handle);
if (ret < 0) { goto finish; } if (ret < 0) { goto finish; }
serials.push_back(std::string((char *)desc_serial, ret).c_str()); serials.push_back(std::string((char *)desc_serial, ret).c_str());
} }
} }

Write Preview
Loading…
Cancel
Save