Skip to content

descriptor: make dc_filter_suunto descriptor-specific for each EON Steel model #142

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

Merged
mikeller merged 1 commit into from
Sep 30, 2026
+8 −2
Merged

descriptor: make dc_filter_suunto descriptor-specific for each EON Steel model #142

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
10 changes: 8 additions & 2 deletions src/descriptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,10 +770,16 @@ dc_filter_suunto (const dc_descriptor_t *descriptor, dc_transport_t transport, c
"EON Steel Black",
};

/* Both arrays are indexed by descriptor model number.
* Select only the entry for this specific descriptor. */
unsigned int model = dc_descriptor_get_model (descriptor);
if (model >= C_ARRAY_SIZE (usbhid) || model >= C_ARRAY_SIZE (bluetooth))
return 0;

if (transport == DC_TRANSPORT_USBHID) {
return DC_FILTER_INTERNAL (userdata, usbhid, 0, dc_match_usbhid);
return dc_match_usbhid (userdata, &usbhid[model]);
} else if (transport == DC_TRANSPORT_BLE) {
return DC_FILTER_INTERNAL (userdata, bluetooth, 0, dc_match_prefix);
return dc_match_prefix (userdata, &bluetooth[model]);
}

return 1;
Expand Down
Loading