From ae4fb433aef33cfc7993516f880de85d87fa37d8 Mon Sep 17 00:00:00 2001
From: Boris Faure <boris@fau.re>
Date: Mon, 15 Apr 2024 19:53:46 +0200
Subject: [PATCH] usb-hid: all the RequestHandler method accept &mut self
---
embassy-usb/src/class/hid.rs | 6 +++---
examples/nrf52840/src/bin/usb_hid_keyboard.rs | 6 +++---
examples/nrf52840/src/bin/usb_hid_mouse.rs | 6 +++---
examples/rp/src/bin/usb_hid_keyboard.rs | 6 +++---
examples/rp/src/bin/usb_hid_mouse.rs | 6 +++---
examples/stm32f4/src/bin/usb_hid_keyboard.rs | 6 +++---
examples/stm32f4/src/bin/usb_hid_mouse.rs | 6 +++---
examples/stm32l5/src/bin/usb_hid_mouse.rs | 6 +++---
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/embassy-usb/src/class/hid.rs b/embassy-usb/src/class/hid.rs
index 7d27c2578..6d9e0aced 100644
--- a/embassy-usb/src/class/hid.rs
+++ b/embassy-usb/src/class/hid.rs
@@ -378,7 +378,7 @@ pub trait RequestHandler {
/// Reads the value of report `id` into `buf` returning the size.
///
/// Returns `None` if `id` is invalid or no data is available.
- fn get_report(&self, id: ReportId, buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, buf: &mut [u8]) -> Option<usize> {
let _ = (id, buf);
None
}
@@ -394,7 +394,7 @@ pub trait RequestHandler {
/// If `id` is `None`, get the idle rate for all reports. Returning `None`
/// will reject the control request. Any duration at or above 1.024 seconds
/// or below 4ms will be returned as an indefinite idle rate.
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
let _ = id;
None
}
@@ -403,7 +403,7 @@ pub trait RequestHandler {
///
/// If `id` is `None`, set the idle rate of all input reports to `dur`. If
/// an indefinite duration is requested, `dur` will be set to `u32::MAX`.
- fn set_idle_ms(&self, id: Option<ReportId>, duration_ms: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, duration_ms: u32) {
let _ = (id, duration_ms);
}
}
diff --git a/examples/nrf52840/src/bin/usb_hid_keyboard.rs b/examples/nrf52840/src/bin/usb_hid_keyboard.rs
index 39b39dcd0..e33ee5866 100644
--- a/examples/nrf52840/src/bin/usb_hid_keyboard.rs
+++ b/examples/nrf52840/src/bin/usb_hid_keyboard.rs
@@ -148,7 +148,7 @@ async fn main(_spawner: Spawner) {
struct MyRequestHandler {}
impl RequestHandler for MyRequestHandler {
- fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
info!("Get report for {:?}", id);
None
}
@@ -158,11 +158,11 @@ impl RequestHandler for MyRequestHandler {
OutResponse::Accepted
}
- fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) {
info!("Set idle rate for {:?} to {:?}", id, dur);
}
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
info!("Get idle rate for {:?}", id);
None
}
diff --git a/examples/nrf52840/src/bin/usb_hid_mouse.rs b/examples/nrf52840/src/bin/usb_hid_mouse.rs
index d86e96270..8076ac283 100644
--- a/examples/nrf52840/src/bin/usb_hid_mouse.rs
+++ b/examples/nrf52840/src/bin/usb_hid_mouse.rs
@@ -105,7 +105,7 @@ async fn main(_spawner: Spawner) {
struct MyRequestHandler {}
impl RequestHandler for MyRequestHandler {
- fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
info!("Get report for {:?}", id);
None
}
@@ -115,11 +115,11 @@ impl RequestHandler for MyRequestHandler {
OutResponse::Accepted
}
- fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) {
info!("Set idle rate for {:?} to {:?}", id, dur);
}
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
info!("Get idle rate for {:?}", id);
None
}
diff --git a/examples/rp/src/bin/usb_hid_keyboard.rs b/examples/rp/src/bin/usb_hid_keyboard.rs
index 53385e929..a7cb322d8 100644
--- a/examples/rp/src/bin/usb_hid_keyboard.rs
+++ b/examples/rp/src/bin/usb_hid_keyboard.rs
@@ -125,7 +125,7 @@ async fn main(_spawner: Spawner) {
struct MyRequestHandler {}
impl RequestHandler for MyRequestHandler {
- fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
info!("Get report for {:?}", id);
None
}
@@ -135,11 +135,11 @@ impl RequestHandler for MyRequestHandler {
OutResponse::Accepted
}
- fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) {
info!("Set idle rate for {:?} to {:?}", id, dur);
}
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
info!("Get idle rate for {:?}", id);
None
}
diff --git a/examples/rp/src/bin/usb_hid_mouse.rs b/examples/rp/src/bin/usb_hid_mouse.rs
index 3c911511e..cce344fb0 100644
--- a/examples/rp/src/bin/usb_hid_mouse.rs
+++ b/examples/rp/src/bin/usb_hid_mouse.rs
@@ -117,7 +117,7 @@ async fn main(_spawner: Spawner) {
struct MyRequestHandler {}
impl RequestHandler for MyRequestHandler {
- fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
info!("Get report for {:?}", id);
None
}
@@ -127,11 +127,11 @@ impl RequestHandler for MyRequestHandler {
OutResponse::Accepted
}
- fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) {
info!("Set idle rate for {:?} to {:?}", id, dur);
}
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
info!("Get idle rate for {:?}", id);
None
}
diff --git a/examples/stm32f4/src/bin/usb_hid_keyboard.rs b/examples/stm32f4/src/bin/usb_hid_keyboard.rs
index 709f3dccc..f6d1395e8 100644
--- a/examples/stm32f4/src/bin/usb_hid_keyboard.rs
+++ b/examples/stm32f4/src/bin/usb_hid_keyboard.rs
@@ -159,7 +159,7 @@ async fn main(_spawner: Spawner) {
struct MyRequestHandler {}
impl RequestHandler for MyRequestHandler {
- fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
info!("Get report for {:?}", id);
None
}
@@ -169,11 +169,11 @@ impl RequestHandler for MyRequestHandler {
OutResponse::Accepted
}
- fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) {
info!("Set idle rate for {:?} to {:?}", id, dur);
}
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
info!("Get idle rate for {:?}", id);
None
}
diff --git a/examples/stm32f4/src/bin/usb_hid_mouse.rs b/examples/stm32f4/src/bin/usb_hid_mouse.rs
index 0d08d34a2..2cff9294a 100644
--- a/examples/stm32f4/src/bin/usb_hid_mouse.rs
+++ b/examples/stm32f4/src/bin/usb_hid_mouse.rs
@@ -126,7 +126,7 @@ async fn main(_spawner: Spawner) {
struct MyRequestHandler {}
impl RequestHandler for MyRequestHandler {
- fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
info!("Get report for {:?}", id);
None
}
@@ -136,11 +136,11 @@ impl RequestHandler for MyRequestHandler {
OutResponse::Accepted
}
- fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) {
info!("Set idle rate for {:?} to {:?}", id, dur);
}
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
info!("Get idle rate for {:?}", id);
None
}
diff --git a/examples/stm32l5/src/bin/usb_hid_mouse.rs b/examples/stm32l5/src/bin/usb_hid_mouse.rs
index b340c5df5..3f8c52b82 100644
--- a/examples/stm32l5/src/bin/usb_hid_mouse.rs
+++ b/examples/stm32l5/src/bin/usb_hid_mouse.rs
@@ -112,7 +112,7 @@ async fn main(_spawner: Spawner) {
struct MyRequestHandler {}
impl RequestHandler for MyRequestHandler {
- fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
+ fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> {
info!("Get report for {:?}", id);
None
}
@@ -122,11 +122,11 @@ impl RequestHandler for MyRequestHandler {
OutResponse::Accepted
}
- fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) {
+ fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) {
info!("Set idle rate for {:?} to {:?}", id, dur);
}
- fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> {
+ fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> {
info!("Get idle rate for {:?}", id);
None
}