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

fix: add clearing interrupts

This commit is contained in:
doryan 2025-02-13 00:29:02 +04:00
parent 9b4f758045
commit 30850a473d
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/lib.rs
View File

@ -161,9 +161,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
let (udint, udien, usbint) = (usb.udint.read(), usb.udien.read(), usb.usbint.read());
if usbint.vbusti().bit_is_set() {
usb.usbint.write(|w|
// unsafe { w.bits(0x01) }
w.vbusti().clear_bit());
usb.usbint
.write(|w| unsafe { w.bits(0x01) }.vbusti().clear_bit());
if usb.usbsta.read().vbus().bit_is_set() {
return PollResult::Resume;
} else {
@ -184,9 +183,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
}
if udint.sofi().bit_is_set() {
usb.udint.write(|w|
// unsafe { w.bits(0x7d) }
w.sofi().clear_bit());
usb.udint
.write(|w| unsafe { w.bits(0x7d) }.sofi().clear_bit());
}
if usb.usbcon.read().frzclk().bit_is_clear() {
@ -250,8 +248,11 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
}
usb.ueintx.write(|w| {
/* unsafe { w.bits(0xdf) } */
w.rxouti().clear_bit().rxstpi().clear_bit()
unsafe { w.bits(0xdf) }
.rxouti()
.clear_bit()
.rxstpi()
.clear_bit()
});
Ok(buf_size)
@ -259,9 +260,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
if usb.ueintx.read().rxouti().bit_is_clear() {
return Err(UsbError::WouldBlock);
}
usb.ueintx.write(|w|
// unsafe { w.bits(0xdf) }
w.rxouti().clear_bit());
usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.rxouti().clear_bit());
let mut bytes_read = 0;
for slot in buf {
@ -276,9 +276,8 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
return Err(UsbError::BufferOverflow);
}
usb.ueintx.write(|w|
// unsafe { w.bits(0xdf) }
w.fifocon().clear_bit());
usb.ueintx
.write(|w| unsafe { w.bits(0xdf) }.fifocon().clear_bit());
Ok(bytes_read)
}
}
@ -298,8 +297,11 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
// Clear resume informations. //
usb.udint.write(|w| {
// unsafe { w.bits(0x7d) }
w.wakeupi().clear_bit().suspi().clear_bit()
unsafe { w.bits(0x7d) }
.wakeupi()
.clear_bit()
.suspi()
.clear_bit()
});
usb.udien
@ -323,8 +325,11 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
usb.usbcon.modify(|_, w| w.frzclk().clear_bit());
usb.udint.write(|w| {
// unsafe { w.bits(0x7d) }
w.wakeupi().clear_bit().suspi().clear_bit()
unsafe { w.bits(0x7d) }
.wakeupi()
.clear_bit()
.suspi()
.clear_bit()
});
usb.udien
@ -364,8 +369,11 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
let (usb, pll) = (self.usb.borrow(cs), self.pll.borrow(cs));
usb.udint.write(|w| {
// unsafe { w.bits(0x7d) }
w.wakeupi().clear_bit().suspi().clear_bit()
unsafe { w.bits(0x7d) }
.wakeupi()
.clear_bit()
.suspi()
.clear_bit()
});
// Suspend. //
@ -407,16 +415,18 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
usb.uedatx.write(|w| w.bits(byte));
}
usb.ueintx.write(|w|
// unsafe { w.bits(0xdf) }
w.txini().clear_bit());
usb.ueintx
.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| {
// unsafe { w.bits(0xdf) }
w.txini().clear_bit().rxouti().clear_bit()
unsafe { w.bits(0xdf) }
.txini()
.clear_bit()
.rxouti()
.clear_bit()
});
for &byte in buf {
@ -428,8 +438,11 @@ impl<const L: usize> UsbBus for UsbDevice<L> {
}
usb.ueintx.write(|w| {
// unsafe { w.bits(0xdf) }
w.rxouti().clear_bit().fifocon().clear_bit()
unsafe { w.bits(0xdf) }
.rxouti()
.clear_bit()
.fifocon()
.clear_bit()
});
}