From 41415fae0de4eade937f36c908d5cacdc06588bd Mon Sep 17 00:00:00 2001
From: Boris Faure <boris@fau.re>
Date: Sun, 14 Apr 2024 15:46:19 +0200
Subject: [PATCH] =?UTF-8?q?usb/hid:=20make=20RequestHandler::set=5Freport(?=
 =?UTF-8?q?&mut=20self,=E2=80=A6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

That way, it is possible to change some fields in the RequestHandler based
on outside report.
---
 embassy-usb/src/class/hid.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/embassy-usb/src/class/hid.rs b/embassy-usb/src/class/hid.rs
index 0000b5b2b..7d27c2578 100644
--- a/embassy-usb/src/class/hid.rs
+++ b/embassy-usb/src/class/hid.rs
@@ -37,7 +37,7 @@ pub struct Config<'d> {
     pub report_descriptor: &'d [u8],
 
     /// Handler for control requests.
-    pub request_handler: Option<&'d dyn RequestHandler>,
+    pub request_handler: Option<&'d mut dyn RequestHandler>,
 
     /// Configures how frequently the host should poll for reading/writing HID reports.
     ///
@@ -299,7 +299,7 @@ impl<'d, D: Driver<'d>, const N: usize> HidReader<'d, D, N> {
     ///
     /// If `use_report_ids` is true, the first byte of the report will be used as
     /// the `ReportId` value. Otherwise the `ReportId` value will be 0.
-    pub async fn run<T: RequestHandler>(mut self, use_report_ids: bool, handler: &T) -> ! {
+    pub async fn run<T: RequestHandler>(mut self, use_report_ids: bool, handler: &mut T) -> ! {
         let offset = self.offset.load(Ordering::Acquire);
         assert!(offset == 0);
         let mut buf = [0; N];
@@ -384,7 +384,7 @@ pub trait RequestHandler {
     }
 
     /// Sets the value of report `id` to `data`.
-    fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse {
+    fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
         let _ = (id, data);
         OutResponse::Rejected
     }
@@ -411,7 +411,7 @@ pub trait RequestHandler {
 struct Control<'d> {
     if_num: InterfaceNumber,
     report_descriptor: &'d [u8],
-    request_handler: Option<&'d dyn RequestHandler>,
+    request_handler: Option<&'d mut dyn RequestHandler>,
     out_report_offset: &'d AtomicUsize,
     hid_descriptor: [u8; 9],
 }
@@ -420,7 +420,7 @@ impl<'d> Control<'d> {
     fn new(
         if_num: InterfaceNumber,
         report_descriptor: &'d [u8],
-        request_handler: Option<&'d dyn RequestHandler>,
+        request_handler: Option<&'d mut dyn RequestHandler>,
         out_report_offset: &'d AtomicUsize,
     ) -> Self {
         Control {
@@ -468,7 +468,7 @@ impl<'d> Handler for Control<'d> {
         trace!("HID control_out {:?} {=[u8]:x}", req, data);
         match req.request {
             HID_REQ_SET_IDLE => {
-                if let Some(handler) = self.request_handler {
+                if let Some(handler) = self.request_handler.as_mut() {
                     let id = req.value as u8;
                     let id = (id != 0).then_some(ReportId::In(id));
                     let dur = u32::from(req.value >> 8);
@@ -477,7 +477,7 @@ impl<'d> Handler for Control<'d> {
                 }
                 Some(OutResponse::Accepted)
             }
-            HID_REQ_SET_REPORT => match (ReportId::try_from(req.value), self.request_handler) {
+            HID_REQ_SET_REPORT => match (ReportId::try_from(req.value), self.request_handler.as_mut()) {
                 (Ok(id), Some(handler)) => Some(handler.set_report(id, data)),
                 _ => Some(OutResponse::Rejected),
             },
@@ -513,7 +513,7 @@ impl<'d> Handler for Control<'d> {
                 match req.request {
                     HID_REQ_GET_REPORT => {
                         let size = match ReportId::try_from(req.value) {
-                            Ok(id) => self.request_handler.and_then(|x| x.get_report(id, buf)),
+                            Ok(id) => self.request_handler.as_mut().and_then(|x| x.get_report(id, buf)),
                             Err(_) => None,
                         };
 
@@ -524,7 +524,7 @@ impl<'d> Handler for Control<'d> {
                         }
                     }
                     HID_REQ_GET_IDLE => {
-                        if let Some(handler) = self.request_handler {
+                        if let Some(handler) = self.request_handler.as_mut() {
                             let id = req.value as u8;
                             let id = (id != 0).then_some(ReportId::In(id));
                             if let Some(dur) = handler.get_idle_ms(id) {