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

Merge pull request 'Merge first (maybe) stable version usb-avr for atmega32u4/atmega16u4' (#1) from test into main 

Reviewed-on: #1
This commit is contained in:
doryan 2025-05-18 22:52:52 +03:00
parent 4a90b9a6c8 c510d908d3
commit 5ac1a07c6b
1 changed files with 134 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/lib.rs
View File

@ -14,6 +14,10 @@ pub use types::*;
use types::{DPRAM_SIZE, ENDPOINTS_ALLOC_LAYOUT, ONE_MS_16_MGHZ}; use types::{DPRAM_SIZE, ENDPOINTS_ALLOC_LAYOUT, ONE_MS_16_MGHZ};
const RESTRICT_RW_FLAG: u8 = !(1 << 5);
const USBINT_CLEAR: u8 = 1 << 0;
const UDINT_CLEAR: u8 = !(1 << 7 | 1 << 1);
impl<const L: usize> UsbBus for UsbDevice<L> { impl<const L: usize> UsbBus for UsbDevice<L> {
fn alloc_ep( fn alloc_ep(
&mut self, &mut self,
@ -24,9 +28,9 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
_interval: u8, _interval: u8,
) -> UsbResult<EndpointAddress> { ) -> UsbResult<EndpointAddress> {
// Handle first endpoint. // // Handle first endpoint. //
free(|_cs| {
if ep_addr == Some(EndpointAddress::from_parts(0, UsbDirection::In)) { if ep_addr == Some(EndpointAddress::from_parts(0, UsbDirection::In)) {
Ok(ep_addr.unwrap()) ep_addr.ok_or(UsbError::InvalidState)
} else { } else {
let address = match ep_addr { let address = match ep_addr {
// If current endpoint doesn't allocated, assign ep_addr to variable. // // If current endpoint doesn't allocated, assign ep_addr to variable. //
@ -40,8 +44,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
.enumerate() .enumerate()
.skip(1) .skip(1)
.find(|(index, ep)| { .find(|(index, ep)| {
!ep.is_allocated !ep.is_allocated && max_packet_size <= ENDPOINTS_ALLOC_LAYOUT[*index]
&& max_packet_size <= ENDPOINTS_ALLOC_LAYOUT[*index]
}) })
.ok_or(UsbError::EndpointOverflow)? .ok_or(UsbError::EndpointOverflow)?
.0; .0;
@ -77,7 +80,6 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
Ok(address) Ok(address)
} }
} }
})
} }
fn enable(&mut self) { fn enable(&mut self) {
@ -116,7 +118,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
// Endpoint configuration // // Endpoint configuration //
self.allocated_endpoints().for_each(|(i, _ep)| { self.allocated_endpoints().for_each(|(i, _ep)| {
self.configure_endpoint(cs, i).unwrap(); let _ = self.configure_endpoint(cs, i);
}); });
// Set high speed and attach the USB. // // Set high speed and attach the USB. //
@ -132,17 +134,15 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
fn force_reset(&self) -> UsbResult<()> { fn force_reset(&self) -> UsbResult<()> {
let set_detach = |bit| {
free(|cs| { free(|cs| {
let usbcon = &self.usb.borrow(cs).usbcon; self.usb.borrow(cs).udcon.modify(|_, w| w.detach().bit(bit));
usbcon.modify(|_, w| w.usbe().set_bit());
}); });
};
set_detach(true);
delay_cycles(ONE_MS_16_MGHZ); delay_cycles(ONE_MS_16_MGHZ);
set_detach(false);
free(|cs| {
let usbcon = &self.usb.borrow(cs).usbcon;
usbcon.modify(|_, w| w.usbe().set_bit());
});
Ok(()) Ok(())
} }
@ -162,7 +162,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
if usbint.vbusti().bit_is_set() { if usbint.vbusti().bit_is_set() {
usb.usbint usb.usbint
.write(|w| unsafe { w.bits(0x01) }.vbusti().clear_bit()); .write(|w| unsafe { w.bits(USBINT_CLEAR) }.vbusti().clear_bit());
if usb.usbsta.read().vbus().bit_is_set() { if usb.usbsta.read().vbus().bit_is_set() {
return PollResult::Resume; return PollResult::Resume;
} else { } else {
@ -184,7 +185,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
if udint.sofi().bit_is_set() { if udint.sofi().bit_is_set() {
usb.udint usb.udint
.write(|w| unsafe { w.bits(0x7d) }.sofi().clear_bit()); .write(|w| unsafe { w.bits(UDINT_CLEAR) }.sofi().clear_bit());
} }
if usb.usbcon.read().frzclk().bit_is_clear() { if usb.usbcon.read().frzclk().bit_is_clear() {
@ -226,9 +227,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
free(|cs| { free(|cs| {
let usb = self.usb.borrow(cs); let usb = self.usb.borrow(cs);
if let Err(error) = self.select_endpoint(cs, ep_addr.index()) { self.select_endpoint(cs, ep_addr.index())?;
Err(error)
} else {
let ep = &self.ep_table[ep_addr.index()]; let ep = &self.ep_table[ep_addr.index()];
if ep.ep_type == 0 { if ep.ep_type == 0 {
@ -239,6 +239,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
let buf_size = self.get_size(cs); let buf_size = self.get_size(cs);
if buf.len() < buf_size { if buf.len() < buf_size {
return Err(UsbError::BufferOverflow); return Err(UsbError::BufferOverflow);
} }
@ -248,7 +249,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx.write(|w| { usb.ueintx.write(|w| {
unsafe { w.bits(0xdf) } unsafe { w.bits(RESTRICT_RW_FLAG) }
.rxouti() .rxouti()
.clear_bit() .clear_bit()
.rxstpi() .rxstpi()
@ -260,10 +261,12 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
if usb.ueintx.read().rxouti().bit_is_clear() { if usb.ueintx.read().rxouti().bit_is_clear() {
return Err(UsbError::WouldBlock); return Err(UsbError::WouldBlock);
} }
usb.ueintx usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.rxouti().clear_bit()); .write(|w| unsafe { w.bits(RESTRICT_RW_FLAG) }.rxouti().clear_bit());
let mut bytes_read = 0; let mut bytes_read = 0;
for slot in buf { for slot in buf {
if usb.ueintx.read().rwal().bit_is_clear() { if usb.ueintx.read().rwal().bit_is_clear() {
break; break;
@ -277,10 +280,10 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.fifocon().clear_bit()); .write(|w| unsafe { w.bits(RESTRICT_RW_FLAG) }.fifocon().clear_bit());
Ok(bytes_read) Ok(bytes_read)
} }
}
}) })
} }
@ -291,13 +294,13 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
usb.udint.modify(|_, w| w.eorsti().clear_bit()); usb.udint.modify(|_, w| w.eorsti().clear_bit());
self.allocated_endpoints().for_each(|(i, _)| { self.allocated_endpoints().for_each(|(i, _)| {
self.configure_endpoint(cs, i).unwrap(); let _ = self.configure_endpoint(cs, i);
}); });
// Clear resume informations. // // Clear resume informations. //
usb.udint.write(|w| { usb.udint.write(|w| {
unsafe { w.bits(0x7d) } unsafe { w.bits(UDINT_CLEAR) }
.wakeupi() .wakeupi()
.clear_bit() .clear_bit()
.suspi() .suspi()
@ -325,7 +328,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
usb.usbcon.modify(|_, w| w.frzclk().clear_bit()); usb.usbcon.modify(|_, w| w.frzclk().clear_bit());
usb.udint.write(|w| { usb.udint.write(|w| {
unsafe { w.bits(0x7d) } unsafe { w.bits(UDINT_CLEAR) }
.wakeupi() .wakeupi()
.clear_bit() .clear_bit()
.suspi() .suspi()
@ -369,7 +372,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
let (usb, pll) = (self.usb.borrow(cs), self.pll.borrow(cs)); let (usb, pll) = (self.usb.borrow(cs), self.pll.borrow(cs));
usb.udint.write(|w| { usb.udint.write(|w| {
unsafe { w.bits(0x7d) } unsafe { w.bits(UDINT_CLEAR) }
.wakeupi() .wakeupi()
.clear_bit() .clear_bit()
.suspi() .suspi()
@ -395,14 +398,14 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
free(|cs| { free(|cs| {
let usb = self.usb.borrow(cs); let usb = self.usb.borrow(cs);
if let Err(error) = self.select_endpoint(cs, ep_addr.index()) { self.select_endpoint(cs, ep_addr.index())?;
Err(error)
} else {
let ep = &self.ep_table[ep_addr.index()]; let ep = &self.ep_table[ep_addr.index()];
// Endpoint type confitions // // Endpoint type confitions //
if ep.ep_type == 0 { match ep.ep_type {
0 => {
if usb.ueintx.read().txini().bit_is_clear() { if usb.ueintx.read().txini().bit_is_clear() {
return Err(UsbError::WouldBlock); return Err(UsbError::WouldBlock);
} }
@ -416,13 +419,15 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.txini().clear_bit()); .write(|w| unsafe { w.bits(RESTRICT_RW_FLAG) }.txini().clear_bit());
} else { }
_ => {
if usb.ueintx.read().txini().bit_is_clear() { if usb.ueintx.read().txini().bit_is_clear() {
return Err(UsbError::WouldBlock); return Err(UsbError::WouldBlock);
} }
usb.ueintx.write(|w| { usb.ueintx.write(|w| {
unsafe { w.bits(0xdf) } unsafe { w.bits(RESTRICT_RW_FLAG) }
.txini() .txini()
.clear_bit() .clear_bit()
.rxouti() .rxouti()
@ -438,19 +443,19 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx.write(|w| { usb.ueintx.write(|w| {
unsafe { w.bits(0xdf) } unsafe { w.bits(RESTRICT_RW_FLAG) }
.rxouti() .rxouti()
.clear_bit() .clear_bit()
.fifocon() .fifocon()
.clear_bit() .clear_bit()
}); });
} }
};
let pending_ins = self.pending_ins.borrow(cs); let pending_ins = self.pending_ins.borrow(cs);
pending_ins.set(pending_ins.get() | 1 << ep_addr.index()); pending_ins.set(pending_ins.get() | 1 << ep_addr.index());
Ok(buf.len()) Ok(buf.len())
}
}) })
} }
} }