3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr: Disable usb serial interrupts while processing data 

There's no need to keep taking interrupts if the high-level code is
busy processing messages.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-10-02 21:54:46 -04:00
parent 7c7573f69f
commit 978b321f80
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/avr/usbserial.c
View File

@ -48,12 +48,14 @@ int_fast8_t
usb_read_bulk_out(void *data, uint_fast8_t max_len) usb_read_bulk_out(void *data, uint_fast8_t max_len)
{ {
UENUM = USB_CDC_EP_BULK_OUT; UENUM = USB_CDC_EP_BULK_OUT;
if (!(UEINTX & (1<<RWAL))) if (!(UEINTX & (1<<RXOUTI))) {
// No data ready // No data ready
UEIENX = 1<<RXOUTE;
return -1; return -1;
}
uint8_t len = UEBCLX; uint8_t len = UEBCLX;
usb_read_packet(data, len); usb_read_packet(data, len);
UEINTX = (uint8_t)~(1<<FIFOCON); UEINTX = (uint8_t)~((1<<FIFOCON) | (1<<RXOUTI));
return len; return len;
} }
@ -61,11 +63,13 @@ int_fast8_t
usb_send_bulk_in(void *data, uint_fast8_t len) usb_send_bulk_in(void *data, uint_fast8_t len)
{ {
UENUM = USB_CDC_EP_BULK_IN; UENUM = USB_CDC_EP_BULK_IN;
if (!(UEINTX & (1<<RWAL))) if (!(UEINTX & (1<<TXINI))) {
// Buffer full // Buffer full
UEIENX = 1<<TXINE;
return -1; return -1;
}
usb_write_packet(data, len); usb_write_packet(data, len);
UEINTX = (uint8_t)~((1<<FIFOCON) | (1<<RXOUTI)); UEINTX = (uint8_t)~((1<<FIFOCON) | (1<<TXINI) | (1<<RXOUTI));
return len; return len;
} }
@ -231,12 +235,12 @@ ISR(USB_COM_vect)
} }
if (ueint & (1<<USB_CDC_EP_BULK_OUT)) { if (ueint & (1<<USB_CDC_EP_BULK_OUT)) {
UENUM = USB_CDC_EP_BULK_OUT; UENUM = USB_CDC_EP_BULK_OUT;
UEINTX = ~(1<<RXOUTI); UEIENX = 0;
usb_notify_bulk_out(); usb_notify_bulk_out();
} }
if (ueint & (1<<USB_CDC_EP_BULK_IN)) { if (ueint & (1<<USB_CDC_EP_BULK_IN)) {
UENUM = USB_CDC_EP_BULK_IN; UENUM = USB_CDC_EP_BULK_IN;
UEINTX = ~((1<<RXOUTI) | (1<<TXINI)); UEIENX = 0;
usb_notify_bulk_in(); usb_notify_bulk_in();
} }
UENUM = old_uenum; UENUM = old_uenum;