Compare commits
No commits in common. "c5788c5b2e1f930fa5de87cf7d14cb3de0d251c8" and "8416bd0fa4fa0eccde2aa782c7d711a7489ff520" have entirely different histories.
c5788c5b2e
...
8416bd0fa4
45
src/lib.rs
45
src/lib.rs
|
|
@ -133,24 +133,24 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
|
||||
fn force_reset(&self) -> UsbResult<()> {
|
||||
free(|cs| {
|
||||
self.usb.borrow(cs).usbcon.modify(|_, w| w.usbe().set_bit());
|
||||
let usbcon = &self.usb.borrow(cs).usbcon;
|
||||
usbcon.modify(|_, w| w.usbe().set_bit());
|
||||
});
|
||||
|
||||
delay_cycles(ONE_MS_16_MGHZ);
|
||||
|
||||
free(|cs| {
|
||||
self.usb.borrow(cs).usbcon.modify(|_, w| w.usbe().set_bit());
|
||||
let usbcon = &self.usb.borrow(cs).usbcon;
|
||||
usbcon.modify(|_, w| w.usbe().set_bit());
|
||||
});
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn is_stalled(&self, ep_addr: EndpointAddress) -> bool {
|
||||
free(|cs| {
|
||||
if self.select_endpoint(cs, ep_addr.index()).is_ok() {
|
||||
return self.usb.borrow(cs).ueconx.read().stallrq().bit_is_set();
|
||||
}
|
||||
false
|
||||
free(|cs| match self.select_endpoint(cs, ep_addr.index()) {
|
||||
Ok(_) => self.usb.borrow(cs).ueconx.read().stallrq().bit_is_set(),
|
||||
Err(_) => false,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -162,7 +162,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
|
||||
if usbint.vbusti().bit_is_set() {
|
||||
usb.usbint
|
||||
.write(|w| w.clear_interrupts().vbusti().clear_bit());
|
||||
.write(|w| unsafe { w.bits(0x01) }.vbusti().clear_bit());
|
||||
if usb.usbsta.read().vbus().bit_is_set() {
|
||||
return PollResult::Resume;
|
||||
} else {
|
||||
|
|
@ -183,7 +183,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
}
|
||||
|
||||
if udint.sofi().bit_is_set() {
|
||||
usb.udint.write(|w| w.clear_interrupts().sofi().clear_bit());
|
||||
usb.udint
|
||||
.write(|w| unsafe { w.bits(0x7d) }.sofi().clear_bit());
|
||||
}
|
||||
|
||||
if usb.usbcon.read().frzclk().bit_is_clear() {
|
||||
|
|
@ -225,8 +226,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
free(|cs| {
|
||||
let usb = self.usb.borrow(cs);
|
||||
|
||||
if let Err(usb_error) = self.select_endpoint(cs, ep_addr.index()) {
|
||||
Err(usb_error)
|
||||
if let Err(error) = self.select_endpoint(cs, ep_addr.index()) {
|
||||
Err(error)
|
||||
} else {
|
||||
let ep = &self.ep_table[ep_addr.index()];
|
||||
|
||||
|
|
@ -247,7 +248,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
}
|
||||
|
||||
usb.ueintx.write(|w| {
|
||||
w.clear_interrupts()
|
||||
unsafe { w.bits(0xdf) }
|
||||
.rxouti()
|
||||
.clear_bit()
|
||||
.rxstpi()
|
||||
|
|
@ -260,14 +261,14 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
return Err(UsbError::WouldBlock);
|
||||
}
|
||||
usb.ueintx
|
||||
.write(|w| w.clear_interrupts().rxouti().clear_bit());
|
||||
.write(|w| unsafe { w.bits(0xdf) }.rxouti().clear_bit());
|
||||
|
||||
let mut bytes_read = 0;
|
||||
for data in buf {
|
||||
for slot in buf {
|
||||
if usb.ueintx.read().rwal().bit_is_clear() {
|
||||
break;
|
||||
}
|
||||
*data = usb.uedatx.read().bits();
|
||||
*slot = usb.uedatx.read().bits();
|
||||
bytes_read += 1;
|
||||
}
|
||||
|
||||
|
|
@ -276,7 +277,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
}
|
||||
|
||||
usb.ueintx
|
||||
.write(|w| w.clear_interrupts().fifocon().clear_bit());
|
||||
.write(|w| unsafe { w.bits(0xdf) }.fifocon().clear_bit());
|
||||
Ok(bytes_read)
|
||||
}
|
||||
}
|
||||
|
|
@ -296,7 +297,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
// Clear resume informations. //
|
||||
|
||||
usb.udint.write(|w| {
|
||||
w.clear_interrupts()
|
||||
unsafe { w.bits(0x7d) }
|
||||
.wakeupi()
|
||||
.clear_bit()
|
||||
.suspi()
|
||||
|
|
@ -324,7 +325,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
usb.usbcon.modify(|_, w| w.frzclk().clear_bit());
|
||||
|
||||
usb.udint.write(|w| {
|
||||
w.clear_interrupts()
|
||||
unsafe { w.bits(0x7d) }
|
||||
.wakeupi()
|
||||
.clear_bit()
|
||||
.suspi()
|
||||
|
|
@ -368,7 +369,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
let (usb, pll) = (self.usb.borrow(cs), self.pll.borrow(cs));
|
||||
|
||||
usb.udint.write(|w| {
|
||||
w.clear_interrupts()
|
||||
unsafe { w.bits(0x7d) }
|
||||
.wakeupi()
|
||||
.clear_bit()
|
||||
.suspi()
|
||||
|
|
@ -415,13 +416,13 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
}
|
||||
|
||||
usb.ueintx
|
||||
.write(|w| w.clear_interrupts().txini().clear_bit());
|
||||
.write(|w| unsafe { w.bits(0xdf) }.txini().clear_bit());
|
||||
} else {
|
||||
if usb.ueintx.read().txini().bit_is_clear() {
|
||||
return Err(UsbError::WouldBlock);
|
||||
}
|
||||
usb.ueintx.write(|w| {
|
||||
w.clear_interrupts()
|
||||
unsafe { w.bits(0xdf) }
|
||||
.txini()
|
||||
.clear_bit()
|
||||
.rxouti()
|
||||
|
|
@ -437,7 +438,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
|
|||
}
|
||||
|
||||
usb.ueintx.write(|w| {
|
||||
w.clear_interrupts()
|
||||
unsafe { w.bits(0xdf) }
|
||||
.rxouti()
|
||||
.clear_bit()
|
||||
.fifocon()
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
use core::cell::Cell;
|
||||
|
||||
use avr_device::{
|
||||
atmega32u4::usb_device::{
|
||||
udint::W as UDINTWriter, ueintx::W as UEINTXWriter, usbint::W as USBINTWriter,
|
||||
},
|
||||
atmega32u4::{PLL, USB_DEVICE},
|
||||
interrupt::{CriticalSection, Mutex},
|
||||
};
|
||||
|
|
@ -84,36 +81,6 @@ pub(crate) const DPRAM_SIZE: u16 = 832;
|
|||
pub(crate) const ENDPOINTS_ALLOC_LAYOUT: [u16; MAX_ENDPOINTS] = [64, 256, 64, 64, 64, 64, 64];
|
||||
pub(crate) const ONE_MS_16_MGHZ: u32 = 16000;
|
||||
|
||||
const UDINT_BYTE: u8 = 0x7d;
|
||||
const USBINT_BYTE: u8 = 0x01;
|
||||
const UEINTX_BYTE: u8 = 0xdf;
|
||||
const UENUM_MASK: u8 = 0b111;
|
||||
|
||||
pub(crate) trait InterruptCleaner {
|
||||
fn clear_interrupts(&mut self) -> &mut Self;
|
||||
}
|
||||
|
||||
impl InterruptCleaner for UDINTWriter {
|
||||
#[inline]
|
||||
fn clear_interrupts(&mut self) -> &mut Self {
|
||||
unsafe { self.bits(UDINT_BYTE) }
|
||||
}
|
||||
}
|
||||
|
||||
impl InterruptCleaner for USBINTWriter {
|
||||
#[inline]
|
||||
fn clear_interrupts(&mut self) -> &mut Self {
|
||||
unsafe { self.bits(USBINT_BYTE) }
|
||||
}
|
||||
}
|
||||
|
||||
impl InterruptCleaner for UEINTXWriter {
|
||||
#[inline]
|
||||
fn clear_interrupts(&mut self) -> &mut Self {
|
||||
unsafe { self.bits(UEINTX_BYTE) }
|
||||
}
|
||||
}
|
||||
|
||||
impl<const L: usize> UsbDevice<L> {
|
||||
#[inline]
|
||||
pub(crate) fn get_size(&self, cs: CriticalSection<'_>) -> usize {
|
||||
|
|
@ -147,8 +114,9 @@ impl<const L: usize> UsbDevice<L> {
|
|||
endpoint_index: usize,
|
||||
) -> Result<(), UsbError> {
|
||||
let usb = self.usb.borrow(cs);
|
||||
let endpoint_index = endpoint_index as u8;
|
||||
|
||||
if endpoint_index >= MAX_ENDPOINTS {
|
||||
if endpoint_index >= 7 {
|
||||
return Err(UsbError::InvalidEndpoint);
|
||||
}
|
||||
|
||||
|
|
@ -156,9 +124,9 @@ impl<const L: usize> UsbDevice<L> {
|
|||
return Err(UsbError::InvalidState);
|
||||
}
|
||||
|
||||
usb.uenum.write(|w| w.bits(endpoint_index as u8));
|
||||
usb.uenum.write(|w| w.bits(endpoint_index));
|
||||
|
||||
if usb.uenum.read().bits() & UENUM_MASK != endpoint_index as u8 {
|
||||
if usb.uenum.read().bits() & 7 /* 0b111 */ != endpoint_index {
|
||||
return Err(UsbError::InvalidEndpoint);
|
||||
}
|
||||
|
||||
|
|
@ -173,11 +141,8 @@ impl<const L: usize> UsbDevice<L> {
|
|||
let usb = self.usb.borrow(cs);
|
||||
let current_endpoint = self.ep_table[endpoint_index];
|
||||
|
||||
let select_endpoint_result = self.select_endpoint(cs, endpoint_index);
|
||||
|
||||
if select_endpoint_result.is_err() {
|
||||
select_endpoint_result
|
||||
} else {
|
||||
match self.select_endpoint(cs, endpoint_index) {
|
||||
Ok(_) => {
|
||||
// Enable endpoint. //
|
||||
|
||||
usb.ueconx.modify(|_, w| w.epen().set_bit());
|
||||
|
|
@ -207,8 +172,10 @@ impl<const L: usize> UsbDevice<L> {
|
|||
usb.ueienx
|
||||
.modify(|_, w| w.rxoute().set_bit().rxstpe().set_bit());
|
||||
|
||||
select_endpoint_result
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
Err(exception) => Err(exception),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue