summaryrefslogtreecommitdiffstats
path: root/firmware/main.c
diff options
context:
space:
mode:
authorcpldcpu <cpldcpu@gmail.com>2014-03-06 11:32:18 +0100
committercpldcpu <cpldcpu@gmail.com>2014-03-06 11:32:18 +0100
commit7a1beac2f9daf4e538453b86db2311f85038ccb0 (patch)
treea27be2169c7abc522665e591476b8e297ae9a4e2 /firmware/main.c
parentf920c73ff3f855a8b52cae07bffef752cc496c64 (diff)
downloadmicronucleus-7a1beac2f9daf4e538453b86db2311f85038ccb0.tar.gz
micronucleus-7a1beac2f9daf4e538453b86db2311f85038ccb0.tar.bz2
micronucleus-7a1beac2f9daf4e538453b86db2311f85038ccb0.zip
firmware: Extend timeout with any USB traffic, set timeout to 6s
fixed weird bug with USB3.0 hub where MN is only recognized after 5s
Diffstat (limited to 'firmware/main.c')
-rw-r--r--firmware/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/main.c b/firmware/main.c
index 59e4616..1c265c7 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -176,8 +176,6 @@ static void writeWordToPageBuffer(uint16_t data) {
static uint8_t usbFunctionSetup(uint8_t data[8]) {
usbRequest_t *rq = (void *)data;
- idlePolls.b[1]=0; // reset idle polls when we get usb traffic
-
if (rq->bRequest == cmd_device_info) { // get device info
usbMsgPtr = (usbMsgPtr_t)configurationReply;
return sizeof(configurationReply);
@@ -281,7 +279,8 @@ int main(void) {
if (USB_INTR_PENDING & (1<<USB_INTR_PENDING_BIT)) {
USB_INTR_VECTOR(); // clears INT_PENDING (See se0: in asmcommon.inc)
- break;
+ idlePolls.b[1]=0; // reset idle polls when we get usb traffic
+ break;
}
} while(--fastctr);