aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <[email protected]>2024-04-14 16:06:21 +0200
committerBoris Faure <[email protected]>2024-04-15 19:57:18 +0200
commit9341ef3b47f67b549b3d202974a2d4a0d62587f1 (patch)
tree9fb5759a5b5e2fb0fa9a50b17fb3b71ec204a79f
parent41415fae0de4eade937f36c908d5cacdc06588bd (diff)
examples: request_handler is mutable
-rw-r--r--examples/nrf52840/src/bin/usb_hid_keyboard.rs8
-rw-r--r--examples/nrf52840/src/bin/usb_hid_mouse.rs6
-rw-r--r--examples/rp/src/bin/usb_hid_keyboard.rs8
-rw-r--r--examples/rp/src/bin/usb_hid_mouse.rs8
-rw-r--r--examples/stm32f4/src/bin/usb_hid_keyboard.rs8
-rw-r--r--examples/stm32f4/src/bin/usb_hid_mouse.rs6
-rw-r--r--examples/stm32l5/src/bin/usb_hid_mouse.rs6
7 files changed, 25 insertions, 25 deletions
diff --git a/examples/nrf52840/src/bin/usb_hid_keyboard.rs b/examples/nrf52840/src/bin/usb_hid_keyboard.rs
index 52f081487..39b39dcd0 100644
--- a/examples/nrf52840/src/bin/usb_hid_keyboard.rs
+++ b/examples/nrf52840/src/bin/usb_hid_keyboard.rs
@@ -54,7 +54,7 @@ async fn main(_spawner: Spawner) {
54 let mut bos_descriptor = [0; 256]; 54 let mut bos_descriptor = [0; 256];
55 let mut msos_descriptor = [0; 256]; 55 let mut msos_descriptor = [0; 256];
56 let mut control_buf = [0; 64]; 56 let mut control_buf = [0; 64];
57 let request_handler = MyRequestHandler {}; 57 let mut request_handler = MyRequestHandler {};
58 let mut device_handler = MyDeviceHandler::new(); 58 let mut device_handler = MyDeviceHandler::new();
59 59
60 let mut state = State::new(); 60 let mut state = State::new();
@@ -73,7 +73,7 @@ async fn main(_spawner: Spawner) {
73 // Create classes on the builder. 73 // Create classes on the builder.
74 let config = embassy_usb::class::hid::Config { 74 let config = embassy_usb::class::hid::Config {
75 report_descriptor: KeyboardReport::desc(), 75 report_descriptor: KeyboardReport::desc(),
76 request_handler: Some(&request_handler), 76 request_handler: None,
77 poll_ms: 60, 77 poll_ms: 60,
78 max_packet_size: 64, 78 max_packet_size: 64,
79 }; 79 };
@@ -137,7 +137,7 @@ async fn main(_spawner: Spawner) {
137 }; 137 };
138 138
139 let out_fut = async { 139 let out_fut = async {
140 reader.run(false, &request_handler).await; 140 reader.run(false, &mut request_handler).await;
141 }; 141 };
142 142
143 // Run everything concurrently. 143 // Run everything concurrently.
@@ -153,7 +153,7 @@ impl RequestHandler for MyRequestHandler {
153 None 153 None
154 } 154 }
155 155
156 fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { 156 fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
157 info!("Set report for {:?}: {=[u8]}", id, data); 157 info!("Set report for {:?}: {=[u8]}", id, data);
158 OutResponse::Accepted 158 OutResponse::Accepted
159 } 159 }
diff --git a/examples/nrf52840/src/bin/usb_hid_mouse.rs b/examples/nrf52840/src/bin/usb_hid_mouse.rs
index 5d2837793..d86e96270 100644
--- a/examples/nrf52840/src/bin/usb_hid_mouse.rs
+++ b/examples/nrf52840/src/bin/usb_hid_mouse.rs
@@ -47,7 +47,7 @@ async fn main(_spawner: Spawner) {
47 let mut bos_descriptor = [0; 256]; 47 let mut bos_descriptor = [0; 256];
48 let mut msos_descriptor = [0; 256]; 48 let mut msos_descriptor = [0; 256];
49 let mut control_buf = [0; 64]; 49 let mut control_buf = [0; 64];
50 let request_handler = MyRequestHandler {}; 50 let mut request_handler = MyRequestHandler {};
51 51
52 let mut state = State::new(); 52 let mut state = State::new();
53 53
@@ -63,7 +63,7 @@ async fn main(_spawner: Spawner) {
63 // Create classes on the builder. 63 // Create classes on the builder.
64 let config = embassy_usb::class::hid::Config { 64 let config = embassy_usb::class::hid::Config {
65 report_descriptor: MouseReport::desc(), 65 report_descriptor: MouseReport::desc(),
66 request_handler: Some(&request_handler), 66 request_handler: Some(&mut request_handler),
67 poll_ms: 60, 67 poll_ms: 60,
68 max_packet_size: 8, 68 max_packet_size: 8,
69 }; 69 };
@@ -110,7 +110,7 @@ impl RequestHandler for MyRequestHandler {
110 None 110 None
111 } 111 }
112 112
113 fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { 113 fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
114 info!("Set report for {:?}: {=[u8]}", id, data); 114 info!("Set report for {:?}: {=[u8]}", id, data);
115 OutResponse::Accepted 115 OutResponse::Accepted
116 } 116 }
diff --git a/examples/rp/src/bin/usb_hid_keyboard.rs b/examples/rp/src/bin/usb_hid_keyboard.rs
index 710be8d13..53385e929 100644
--- a/examples/rp/src/bin/usb_hid_keyboard.rs
+++ b/examples/rp/src/bin/usb_hid_keyboard.rs
@@ -41,7 +41,7 @@ async fn main(_spawner: Spawner) {
41 // You can also add a Microsoft OS descriptor. 41 // You can also add a Microsoft OS descriptor.
42 let mut msos_descriptor = [0; 256]; 42 let mut msos_descriptor = [0; 256];
43 let mut control_buf = [0; 64]; 43 let mut control_buf = [0; 64];
44 let request_handler = MyRequestHandler {}; 44 let mut request_handler = MyRequestHandler {};
45 let mut device_handler = MyDeviceHandler::new(); 45 let mut device_handler = MyDeviceHandler::new();
46 46
47 let mut state = State::new(); 47 let mut state = State::new();
@@ -60,7 +60,7 @@ async fn main(_spawner: Spawner) {
60 // Create classes on the builder. 60 // Create classes on the builder.
61 let config = embassy_usb::class::hid::Config { 61 let config = embassy_usb::class::hid::Config {
62 report_descriptor: KeyboardReport::desc(), 62 report_descriptor: KeyboardReport::desc(),
63 request_handler: Some(&request_handler), 63 request_handler: None,
64 poll_ms: 60, 64 poll_ms: 60,
65 max_packet_size: 64, 65 max_packet_size: 64,
66 }; 66 };
@@ -114,7 +114,7 @@ async fn main(_spawner: Spawner) {
114 }; 114 };
115 115
116 let out_fut = async { 116 let out_fut = async {
117 reader.run(false, &request_handler).await; 117 reader.run(false, &mut request_handler).await;
118 }; 118 };
119 119
120 // Run everything concurrently. 120 // Run everything concurrently.
@@ -130,7 +130,7 @@ impl RequestHandler for MyRequestHandler {
130 None 130 None
131 } 131 }
132 132
133 fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { 133 fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
134 info!("Set report for {:?}: {=[u8]}", id, data); 134 info!("Set report for {:?}: {=[u8]}", id, data);
135 OutResponse::Accepted 135 OutResponse::Accepted
136 } 136 }
diff --git a/examples/rp/src/bin/usb_hid_mouse.rs b/examples/rp/src/bin/usb_hid_mouse.rs
index e8b399cb1..3c911511e 100644
--- a/examples/rp/src/bin/usb_hid_mouse.rs
+++ b/examples/rp/src/bin/usb_hid_mouse.rs
@@ -44,7 +44,7 @@ async fn main(_spawner: Spawner) {
44 // You can also add a Microsoft OS descriptor. 44 // You can also add a Microsoft OS descriptor.
45 let mut msos_descriptor = [0; 256]; 45 let mut msos_descriptor = [0; 256];
46 let mut control_buf = [0; 64]; 46 let mut control_buf = [0; 64];
47 let request_handler = MyRequestHandler {}; 47 let mut request_handler = MyRequestHandler {};
48 let mut device_handler = MyDeviceHandler::new(); 48 let mut device_handler = MyDeviceHandler::new();
49 49
50 let mut state = State::new(); 50 let mut state = State::new();
@@ -63,7 +63,7 @@ async fn main(_spawner: Spawner) {
63 // Create classes on the builder. 63 // Create classes on the builder.
64 let config = embassy_usb::class::hid::Config { 64 let config = embassy_usb::class::hid::Config {
65 report_descriptor: MouseReport::desc(), 65 report_descriptor: MouseReport::desc(),
66 request_handler: Some(&request_handler), 66 request_handler: None,
67 poll_ms: 60, 67 poll_ms: 60,
68 max_packet_size: 64, 68 max_packet_size: 64,
69 }; 69 };
@@ -106,7 +106,7 @@ async fn main(_spawner: Spawner) {
106 }; 106 };
107 107
108 let out_fut = async { 108 let out_fut = async {
109 reader.run(false, &request_handler).await; 109 reader.run(false, &mut request_handler).await;
110 }; 110 };
111 111
112 // Run everything concurrently. 112 // Run everything concurrently.
@@ -122,7 +122,7 @@ impl RequestHandler for MyRequestHandler {
122 None 122 None
123 } 123 }
124 124
125 fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { 125 fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
126 info!("Set report for {:?}: {=[u8]}", id, data); 126 info!("Set report for {:?}: {=[u8]}", id, data);
127 OutResponse::Accepted 127 OutResponse::Accepted
128 } 128 }
diff --git a/examples/stm32f4/src/bin/usb_hid_keyboard.rs b/examples/stm32f4/src/bin/usb_hid_keyboard.rs
index d6e0be5ea..709f3dccc 100644
--- a/examples/stm32f4/src/bin/usb_hid_keyboard.rs
+++ b/examples/stm32f4/src/bin/usb_hid_keyboard.rs
@@ -76,7 +76,7 @@ async fn main(_spawner: Spawner) {
76 let mut msos_descriptor = [0; 256]; 76 let mut msos_descriptor = [0; 256];
77 let mut control_buf = [0; 64]; 77 let mut control_buf = [0; 64];
78 78
79 let request_handler = MyRequestHandler {}; 79 let mut request_handler = MyRequestHandler {};
80 let mut device_handler = MyDeviceHandler::new(); 80 let mut device_handler = MyDeviceHandler::new();
81 81
82 let mut state = State::new(); 82 let mut state = State::new();
@@ -95,7 +95,7 @@ async fn main(_spawner: Spawner) {
95 // Create classes on the builder. 95 // Create classes on the builder.
96 let config = embassy_usb::class::hid::Config { 96 let config = embassy_usb::class::hid::Config {
97 report_descriptor: KeyboardReport::desc(), 97 report_descriptor: KeyboardReport::desc(),
98 request_handler: Some(&request_handler), 98 request_handler: None,
99 poll_ms: 60, 99 poll_ms: 60,
100 max_packet_size: 8, 100 max_packet_size: 8,
101 }; 101 };
@@ -148,7 +148,7 @@ async fn main(_spawner: Spawner) {
148 }; 148 };
149 149
150 let out_fut = async { 150 let out_fut = async {
151 reader.run(false, &request_handler).await; 151 reader.run(false, &mut request_handler).await;
152 }; 152 };
153 153
154 // Run everything concurrently. 154 // Run everything concurrently.
@@ -164,7 +164,7 @@ impl RequestHandler for MyRequestHandler {
164 None 164 None
165 } 165 }
166 166
167 fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { 167 fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
168 info!("Set report for {:?}: {=[u8]}", id, data); 168 info!("Set report for {:?}: {=[u8]}", id, data);
169 OutResponse::Accepted 169 OutResponse::Accepted
170 } 170 }
diff --git a/examples/stm32f4/src/bin/usb_hid_mouse.rs b/examples/stm32f4/src/bin/usb_hid_mouse.rs
index 0bc236119..0d08d34a2 100644
--- a/examples/stm32f4/src/bin/usb_hid_mouse.rs
+++ b/examples/stm32f4/src/bin/usb_hid_mouse.rs
@@ -68,7 +68,7 @@ async fn main(_spawner: Spawner) {
68 let mut bos_descriptor = [0; 256]; 68 let mut bos_descriptor = [0; 256];
69 let mut control_buf = [0; 64]; 69 let mut control_buf = [0; 64];
70 70
71 let request_handler = MyRequestHandler {}; 71 let mut request_handler = MyRequestHandler {};
72 72
73 let mut state = State::new(); 73 let mut state = State::new();
74 74
@@ -84,7 +84,7 @@ async fn main(_spawner: Spawner) {
84 // Create classes on the builder. 84 // Create classes on the builder.
85 let config = embassy_usb::class::hid::Config { 85 let config = embassy_usb::class::hid::Config {
86 report_descriptor: MouseReport::desc(), 86 report_descriptor: MouseReport::desc(),
87 request_handler: Some(&request_handler), 87 request_handler: Some(&mut request_handler),
88 poll_ms: 60, 88 poll_ms: 60,
89 max_packet_size: 8, 89 max_packet_size: 8,
90 }; 90 };
@@ -131,7 +131,7 @@ impl RequestHandler for MyRequestHandler {
131 None 131 None
132 } 132 }
133 133
134 fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { 134 fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
135 info!("Set report for {:?}: {=[u8]}", id, data); 135 info!("Set report for {:?}: {=[u8]}", id, data);
136 OutResponse::Accepted 136 OutResponse::Accepted
137 } 137 }
diff --git a/examples/stm32l5/src/bin/usb_hid_mouse.rs b/examples/stm32l5/src/bin/usb_hid_mouse.rs
index 9d30205bb..b340c5df5 100644
--- a/examples/stm32l5/src/bin/usb_hid_mouse.rs
+++ b/examples/stm32l5/src/bin/usb_hid_mouse.rs
@@ -54,7 +54,7 @@ async fn main(_spawner: Spawner) {
54 let mut config_descriptor = [0; 256]; 54 let mut config_descriptor = [0; 256];
55 let mut bos_descriptor = [0; 256]; 55 let mut bos_descriptor = [0; 256];
56 let mut control_buf = [0; 64]; 56 let mut control_buf = [0; 64];
57 let request_handler = MyRequestHandler {}; 57 let mut request_handler = MyRequestHandler {};
58 58
59 let mut state = State::new(); 59 let mut state = State::new();
60 60
@@ -70,7 +70,7 @@ async fn main(_spawner: Spawner) {
70 // Create classes on the builder. 70 // Create classes on the builder.
71 let config = embassy_usb::class::hid::Config { 71 let config = embassy_usb::class::hid::Config {
72 report_descriptor: MouseReport::desc(), 72 report_descriptor: MouseReport::desc(),
73 request_handler: Some(&request_handler), 73 request_handler: Some(&mut request_handler),
74 poll_ms: 60, 74 poll_ms: 60,
75 max_packet_size: 8, 75 max_packet_size: 8,
76 }; 76 };
@@ -117,7 +117,7 @@ impl RequestHandler for MyRequestHandler {
117 None 117 None
118 } 118 }
119 119
120 fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { 120 fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse {
121 info!("Set report for {:?}: {=[u8]}", id, data); 121 info!("Set report for {:?}: {=[u8]}", id, data);
122 OutResponse::Accepted 122 OutResponse::Accepted
123 } 123 }