aboutsummaryrefslogtreecommitdiff
path: root/embassy-usb-synopsys-otg
diff options
context:
space:
mode:
Diffstat (limited to 'embassy-usb-synopsys-otg')
-rw-r--r--embassy-usb-synopsys-otg/src/lib.rs16
1 files changed, 4 insertions, 12 deletions
diff --git a/embassy-usb-synopsys-otg/src/lib.rs b/embassy-usb-synopsys-otg/src/lib.rs
index b8750491d..d94209f45 100644
--- a/embassy-usb-synopsys-otg/src/lib.rs
+++ b/embassy-usb-synopsys-otg/src/lib.rs
@@ -23,7 +23,7 @@ use crate::fmt::Bytes;
23 23
24pub mod otg_v1; 24pub mod otg_v1;
25 25
26use otg_v1::{regs, vals, Otg}; 26use otg_v1::{Otg, regs, vals};
27 27
28/// Handle interrupts. 28/// Handle interrupts.
29pub unsafe fn on_interrupt<const MAX_EP_COUNT: usize>(r: Otg, state: &State<MAX_EP_COUNT>, ep_count: usize) { 29pub unsafe fn on_interrupt<const MAX_EP_COUNT: usize>(r: Otg, state: &State<MAX_EP_COUNT>, ep_count: usize) {
@@ -680,9 +680,7 @@ impl<'d, const MAX_EP_COUNT: usize> Bus<'d, MAX_EP_COUNT> {
680 if let Some(ep) = self.ep_in[i] { 680 if let Some(ep) = self.ep_in[i] {
681 trace!( 681 trace!(
682 "configuring tx fifo ep={}, offset={}, size={}", 682 "configuring tx fifo ep={}, offset={}, size={}",
683 i, 683 i, fifo_top, ep.fifo_size_words
684 fifo_top,
685 ep.fifo_size_words
686 ); 684 );
687 685
688 let dieptxf = if i == 0 { regs.dieptxf0() } else { regs.dieptxf(i - 1) }; 686 let dieptxf = if i == 0 { regs.dieptxf0() } else { regs.dieptxf(i - 1) };
@@ -1159,9 +1157,7 @@ impl<'d> embassy_usb_driver::EndpointIn for Endpoint<'d, In> {
1159 let dtxfsts = self.regs.dtxfsts(index).read(); 1157 let dtxfsts = self.regs.dtxfsts(index).read();
1160 trace!( 1158 trace!(
1161 "write ep={:?}: diepctl {:08x} ftxfsts {:08x}", 1159 "write ep={:?}: diepctl {:08x} ftxfsts {:08x}",
1162 self.info.addr, 1160 self.info.addr, diepctl.0, dtxfsts.0
1163 diepctl.0,
1164 dtxfsts.0
1165 ); 1161 );
1166 if !diepctl.usbaep() { 1162 if !diepctl.usbaep() {
1167 trace!("write ep={:?} wait for prev: error disabled", self.info.addr); 1163 trace!("write ep={:?} wait for prev: error disabled", self.info.addr);
@@ -1376,11 +1372,7 @@ fn ep_irq_mask(eps: &[Option<EndpointData>]) -> u16 {
1376 eps.iter().enumerate().fold( 1372 eps.iter().enumerate().fold(
1377 0, 1373 0,
1378 |mask, (index, ep)| { 1374 |mask, (index, ep)| {
1379 if ep.is_some() { 1375 if ep.is_some() { mask | (1 << index) } else { mask }
1380 mask | (1 << index)
1381 } else {
1382 mask
1383 }
1384 }, 1376 },
1385 ) 1377 )
1386} 1378}