TheEmbeddedRust
/
usb-avr-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: TheEmbeddedRust:5ac1a07c6bc821eb574de533b2373bcefdcbfc8b
Branches Tags
TheEmbeddedRust:main
..
compare: TheEmbeddedRust:29e5edde8abbb286d9fac38eeb0d8074589b1706
Branches Tags
TheEmbeddedRust:main

2 Commits
5ac1a07c6b ... 29e5edde8a

Author SHA1 Message Date
doryan 29e5edde8a feat(check): add check for endpoint table length 2025-05-26 10:24:51 +04:00
doryan 137fcc78e5 refactor: reduce Iterator methods usage 2025-05-26 10:24:19 +04:00
2 changed files with 14 additions and 12 deletions
Show Stats Expand all files Collapse all files

8
src/lib.rs
View File

@ -38,16 +38,14 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
// If ep_aadr not provided, or current endpoint is allocated, try to find next free endpoint, otherwise return UsbError. // // If ep_aadr not provided, or current endpoint is allocated, try to find next free endpoint, otherwise return UsbError. //
_ => { _ => {
let index = self let index = self.ep_table[1..]
.ep_table
.iter() .iter()
.enumerate() .enumerate()
.skip(1)
.find(|(index, ep)| { .find(|(index, ep)| {
!ep.is_allocated && max_packet_size <= ENDPOINTS_ALLOC_LAYOUT[*index] !ep.is_allocated && max_packet_size <= ENDPOINTS_ALLOC_LAYOUT[*index]
}) })
.ok_or(UsbError::EndpointOverflow)? .map(|(index, _)| index)
.0; .ok_or(UsbError::EndpointOverflow)?;
EndpointAddress::from_parts(index, ep_dir) EndpointAddress::from_parts(index, ep_dir)
} }

4
src/types/usb_device.rs
View File

@ -84,6 +84,7 @@ pub(crate) const ONE_MS_16_MGHZ: u32 = 16000;
impl<const L: usize> UsbDevice<L> { impl<const L: usize> UsbDevice<L> {
#[inline] #[inline]
pub fn new(pll: PLL, usb: USB_DEVICE) -> UsbBusAllocator<Self> { pub fn new(pll: PLL, usb: USB_DEVICE) -> UsbBusAllocator<Self> {
if L > 1 {
UsbBusAllocator::new(Self { UsbBusAllocator::new(Self {
pll: Mutex::new(pll), pll: Mutex::new(pll),
usb: Mutex::new(usb), usb: Mutex::new(usb),
@ -91,6 +92,9 @@ impl<const L: usize> UsbDevice<L> {
pending_ins: Mutex::new(Cell::new(0u8)), pending_ins: Mutex::new(Cell::new(0u8)),
dpram_already_used: 0, dpram_already_used: 0,
}) })
} else {
panic!("Endpoint table cannot be with length <= 1")
}
} }
#[inline(always)] #[inline(always)]