Skip to content

hid-service: use HID descriptor registers #666

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
jerrysxie merged 6 commits into from
Jan 13, 2026
Merged

hid-service: use HID descriptor registers #666

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6de8c1
Use HID descriptor regs
Jan 4, 2026
744a20c
Merge branch 'main' of https://github.com/OpenDevicePartnership/embed…
Jan 4, 2026
fe36010
Remove unnecessary comment + add error print in case of failed retri…
Jan 4, 2026
c124c5f
Fix fmt
Jan 4, 2026
2e2df23
propagate error from get hid desc
Jan 7, 2026
78f1712
Merge branch 'main' into personal/razbenhemo/hid_device_handle_cmds
jerrysxie Jan 13, 2026
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
15 changes: 12 additions & 3 deletions hid-service/src/i2c/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ impl<A: AddressMode + Copy, B: I2c<A>> Device<A, B> {
})))?;

let mut bus = self.bus.lock().await;
if let Err(e) = bus.read(self.address, buf).await {
let reg = desc.w_input_register.to_le_bytes();
if let Err(e) = bus.write_read(self.address, &reg, buf).await {
error!("Failed to read input report");
return Err(Error::Bus(e));
}
Expand All @@ -140,6 +141,14 @@ impl<A: AddressMode + Copy, B: I2c<A>> Device<A, B> {
) -> Result<Option<Response<'static>>, Error<B::Error>> {
info!("Handling command");

let (command_reg, data_reg) = match self.get_hid_descriptor().await {
Ok(desc) => (desc.w_command_register, desc.w_data_register),
Err(_) => {
error!("Failed to get HID descriptor, falling back to default registers");
(self.device.regs.command_reg, self.device.regs.data_reg)
}
};

let mut borrow = self.buffer.borrow_mut().map_err(Error::Buffer)?;
let buf: &mut [u8] = borrow.borrow_mut();
let buffer_len = buf.len();
Expand All @@ -148,9 +157,9 @@ impl<A: AddressMode + Copy, B: I2c<A>> Device<A, B> {
let len = cmd
.encode_into_slice(
buf,
Some(self.device.regs.command_reg),
Some(command_reg),
if opcode.has_response() || opcode.requires_host_data() {
Some(self.device.regs.data_reg)
Some(data_reg)
} else {
None
},
Expand Down