Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DFU update crash on L515 #7334

Merged
merged 1 commit into from
Sep 14, 2020
Merged

Fix DFU update crash on L515 #7334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/l500/l500-fw-update-device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ namespace librealsense

std::string l500_update_device::parse_serial_number(const std::vector<uint8_t>& buffer) const
{
if (buffer.size() != sizeof(serial_number_data))
// Note that we are using a specific serial_number_data struct then the generic one.
// See comment in the struct definition for more details
if (buffer.size() != sizeof(l500_update_device::serial_number_data))
throw std::runtime_error("DFU - failed to parse serial number!");

auto rev = buffer;

const auto serial_num_data = (l500_update_device::serial_number_data *)buffer.data();
std::stringstream rv;
for (auto i = 0; i < ivcam2::module_serial_size; i++)
rv << std::setfill('0') << std::setw(2) << std::hex << static_cast<int>(rev[i]);
for (auto i = 0; i < ivcam2::module_asic_serial_size; i++)
rv << std::setfill('0') << std::setw(2) << std::hex << static_cast<int>(serial_num_data->serial[i]);

return rv.str();
}
Expand Down
8 changes: 8 additions & 0 deletions src/l500/l500-fw-update-device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ namespace librealsense
class l500_update_device : public update_device
{
public:
// The L515 device EEPROM has different bytes order then D4xx device.
// this struct overrides the generic serial_number_data struct at fw-update-device.h
struct serial_number_data
{
uint8_t spare[2];
uint8_t serial[6];
};

l500_update_device(std::shared_ptr<context> ctx, bool register_device_notifications, std::shared_ptr<platform::usb_device> usb_device);
virtual ~l500_update_device() = default;

Expand Down