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

feat(cleaner): use interrupt cleaner

This commit is contained in:
doryan 2025-02-14 00:12:27 +04:00
parent 685ed323f7
commit 5b3cce5ea5
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib.rs
View File

@ -162,7 +162,7 @@ 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| w.clear_interrupts().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 {
@ -183,8 +183,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| w.clear_interrupts().sofi().clear_bit());
.write(|w| unsafe { w.bits(0x7d) }.sofi().clear_bit());
} }
if usb.usbcon.read().frzclk().bit_is_clear() { if usb.usbcon.read().frzclk().bit_is_clear() {
@ -248,7 +247,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx.write(|w| { usb.ueintx.write(|w| {
unsafe { w.bits(0xdf) } w.clear_interrupts()
.rxouti() .rxouti()
.clear_bit() .clear_bit()
.rxstpi() .rxstpi()
@ -261,7 +260,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
return Err(UsbError::WouldBlock); return Err(UsbError::WouldBlock);
} }
usb.ueintx usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.rxouti().clear_bit()); .write(|w| w.clear_interrupts().rxouti().clear_bit());
let mut bytes_read = 0; let mut bytes_read = 0;
for slot in buf { for slot in buf {
@ -277,7 +276,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.fifocon().clear_bit()); .write(|w| w.clear_interrupts().fifocon().clear_bit());
Ok(bytes_read) Ok(bytes_read)
} }
} }
@ -297,7 +296,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
// Clear resume informations. // // Clear resume informations. //
usb.udint.write(|w| { usb.udint.write(|w| {
unsafe { w.bits(0x7d) } w.clear_interrupts()
.wakeupi() .wakeupi()
.clear_bit() .clear_bit()
.suspi() .suspi()
@ -325,7 +324,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) } w.clear_interrupts()
.wakeupi() .wakeupi()
.clear_bit() .clear_bit()
.suspi() .suspi()
@ -369,7 +368,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) } w.clear_interrupts()
.wakeupi() .wakeupi()
.clear_bit() .clear_bit()
.suspi() .suspi()
@ -416,13 +415,13 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.txini().clear_bit()); .write(|w| w.clear_interrupts().txini().clear_bit());
} else { } 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) } w.clear_interrupts()
.txini() .txini()
.clear_bit() .clear_bit()
.rxouti() .rxouti()
@ -438,7 +437,7 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
} }
usb.ueintx.write(|w| { usb.ueintx.write(|w| {
unsafe { w.bits(0xdf) } w.clear_interrupts()
.rxouti() .rxouti()
.clear_bit() .clear_bit()
.fifocon() .fifocon()