Fixes to SOF_Timer wakeup.

- Initialize code with SOF_Timer asleep.
- Enable SOF_Timer prior to start of frame generation.

Author: marcio-ao

libraries/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h

@@ -240,16 +240,13 @@ e-mail   :  [email protected]
 
 // NOTE: On the max3421e the irq enable and irq bits are in the same position.
 
-// IRQs used if CPU polls
-#define   ENIBITSPOLLED (bmCONDETIE | bmBUSEVENTIE  | bmFRAMEIE)
-// IRQs used if CPU is interrupted
-#define      ENIBITSISR (bmCONDETIE | bmBUSEVENTIE | bmFRAMEIE /* | bmRCVDAVIRQ | bmSNDBAVIRQ | bmHXFRDNIRQ */ )
-
 #if !USB_HOST_SHIELD_USE_ISR
-#define IRQ_CHECK_MASK (ENIBITSPOLLED & ICLRALLBITS)
-#define IRQ_IS_EDGE 0
+        // IRQs used if CPU polls
+        #define IRQ_CHECK_MASK (bmCONDETIE | bmBUSEVENTIE | bmFRAMEIE)
+        #define IRQ_IS_EDGE 0
 #else
-#define IRQ_CHECK_MASK (ENIBITSISR & ICLRALLBITS)
+        // IRQs used if CPU is interrupted
+        #define IRQ_CHECK_MASK (bmCONDETIE | bmBUSEVENTIE | bmFRAMEIE /* | bmRCVDAVIRQ | bmSNDBAVIRQ | bmHXFRDNIRQ */ )
 #endif
 
 #if IRQ_IS_EDGE
@@ -303,7 +300,7 @@ public UHS_USB_HOST_BASE
                 private:
                         MAX3421E_HOST &host;
                         volatile uint16_t countdown = 0;
-                        volatile bool asleep = false;
+                        volatile bool asleep = true;
 
                 public:
                         SOF_Timer(MAX3421E_HOST &h) : host(h) {

libraries/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h

@@ -208,6 +208,7 @@ void UHS_NI MAX3421E_HOST::busprobe(void) {
                                 regWr(rMODE, MODE_LS_HOST); // start low-speed host
                                 vbusState = LSHOST;
                         }
+                        sof_timer.wake();
                         tmpdata = regRd(rMODE) | bmSOFKAENAB; // start SOF generation
                         regWr(rHIRQ, bmFRAMEIRQ); // see data sheet.
                         regWr(rMODE, tmpdata);
@@ -221,6 +222,7 @@ void UHS_NI MAX3421E_HOST::busprobe(void) {
                                 regWr(rMODE, MODE_FS_HOST); // start full-speed host
                                 vbusState = FSHOST;
                         }
+                        sof_timer.wake();
                         tmpdata = regRd(rMODE) | bmSOFKAENAB; // start SOF generation
                         regWr(rHIRQ, bmFRAMEIRQ); // see data sheet.
                         regWr(rMODE, tmpdata);
@@ -306,7 +308,7 @@ int16_t UHS_NI MAX3421E_HOST::Init(int16_t mseconds) {
         uint32_t spd = UHS_MAX3421E_SPD;
 again:
         MAX3421E_SPI_Settings = SPISettings(spd, MSBFIRST, SPI_MODE0);
-        /* MAX3421E - full-duplex SPIclass, interrupt kind, vbus off */
+        /* MAX3421E - full-duplex SPI, interrupt kind, vbus off */
         regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE | GPX_VBDET));
         if(reset() == 0) {
                 MAX_HOST_DEBUG("Fail SPI speed %lu\r\n", spd);
@@ -340,6 +342,7 @@ int16_t UHS_NI MAX3421E_HOST::Init(int16_t mseconds) {
 #endif
         /* MAX3421E - full-duplex SPI, interrupt kind, vbus off */
         if(reset() == 0) { //OSCOKIRQ hasn't asserted in time
+                MAX_HOST_DEBUG("OSCOKIRQ hasn't asserted in time");
                 return ( -1);
         }
         regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE | GPX_VBDET));
@@ -353,9 +356,9 @@ int16_t UHS_NI MAX3421E_HOST::Init(int16_t mseconds) {
 
         regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST); // set pull-downs, Host
 
-        // Enable interrupts on the MAX3421e
-        regWr(rHIEN, IRQ_CHECK_MASK);
-        // Enable interrupt pin on the MAX3421e, set pulse width for edge
+        // Enable interrupts on condition detections and bus events
+        regWr(rHIEN, bmCONDETIE | bmBUSEVENTIE);
+        // Enable interrupt pin, set pulse width for edge
         regWr(rCPUCTL, (bmIE | bmPULSEWIDTH));
 
         /* check if device is connected */
@@ -870,7 +873,6 @@ void UHS_NI MAX3421E_HOST::ISRTask(void)
 {
         DDSB();
 
-        counted = false;
         if(!UHS_PIN_READ(irq_pin)) {
                 uint8_t HIRQALL = regRd(rHIRQ); //determine interrupt source
                 uint8_t HIRQ = HIRQALL & IRQ_CHECK_MASK;
@@ -911,6 +913,7 @@ void UHS_NI MAX3421E_HOST::ISRTask(void)
                 }
 #endif
 
+                counted = false;
                 if(HIRQ & bmFRAMEIRQ) {
                         HIRQ_sendback |= bmFRAMEIRQ;
                         counted = sof_timer.decrement();
@@ -919,10 +922,6 @@ void UHS_NI MAX3421E_HOST::ISRTask(void)
                         //        usb_task_state = UHS_USB_HOST_STATE_WAIT_BUS_READY;
                         //}
                         sofevent = false;
-                } else {
-                        // Any event other than a FRAMEIRQ should start
-                        // the timer so state transitions can happen
-                        sof_timer.wake();
                 }
 
                 //MAX_HOST_DEBUG("\r\n%s%s%s\r\n",