mirror of
git://projects.qi-hardware.com/ben-wpan.git
synced 2025-04-21 12:27:27 +03:00
atusb/fw/: changed USB stack to use interrupts instead of polling
Note: this change surprisingly _increases_ the DFU wait in the boot loader. Not yet sure why. - boot.c (main): move the interrupt vectors to the boot loader section - atusb.c (main): move the interrupt vectors to the application section - boot.c (main): enable global interrupts while looping (disable them before jumping to the application) - board_app.c (__timer_read, timer_read): removed wrapped since we're now always called with interrupts disabled - usb/atu2.c (ep_init): enable endpoint interrupts - usb/atu2.c (usb_init): enable device interrupts - usb/atu2.c (usb_poll, USB_GEN_vect, USB_COM_vect): moved poll loop code into separate handlers for device and endpoint interrupts - boot.c (main), atusb.c (main): removed call to usb_poll
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
#include <util/delay.h>
|
||||
|
||||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#include "usb.h"
|
||||
#include "../board.h"
|
||||
|
||||
@@ -177,14 +178,17 @@ static void ep_init(void)
|
||||
|
||||
while (!(UESTA0X & (1 << CFGOK)));
|
||||
|
||||
UEIENX =
|
||||
(1 << RXSTPE) | (1 << RXOUTE) | (1 << STALLEDE) | (1 << TXINE);
|
||||
|
||||
eps[0].state = EP_IDLE;
|
||||
eps[0].size = 64;
|
||||
}
|
||||
|
||||
|
||||
void usb_poll(void)
|
||||
ISR(USB_GEN_vect)
|
||||
{
|
||||
uint8_t flags, i;
|
||||
uint8_t flags;
|
||||
|
||||
flags = UDINT;
|
||||
if (flags & (1 << EORSTI)) {
|
||||
@@ -193,11 +197,17 @@ void usb_poll(void)
|
||||
ep_init();
|
||||
UDINT = ~(1 << EORSTI);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ISR(USB_COM_vect)
|
||||
{
|
||||
uint8_t flags, i;
|
||||
|
||||
flags = UEINT;
|
||||
for (i = 0; i != NUM_EPS; i++)
|
||||
if (1 || flags & (1 << i))
|
||||
if (flags & (1 << i))
|
||||
handle_ep(i);
|
||||
/* @@@ USB bus reset */
|
||||
}
|
||||
|
||||
|
||||
@@ -223,6 +233,7 @@ void usb_init(void)
|
||||
USBCON &= ~(1 << FRZCLK); /* thaw the clock */
|
||||
|
||||
UDCON &= ~(1 << DETACH); /* attach the pull-up */
|
||||
UDIEN = 1 << EORSTE; /* enable device interrupts */
|
||||
// UDCON |= 1 << RSTCPU; /* reset CPU on bus reset */
|
||||
|
||||
ep_init();
|
||||
|
||||
Reference in New Issue
Block a user