fix random init() call, set debug output to Serial1

Author: ladyada

libraries/USBHost/src/Usb.cpp

@@ -36,7 +36,6 @@ USBHost::USBHost() : bmHubPre(0) {
 uint32_t USBHost::Init() {
 	//devConfigIndex	= 0;
 	// Init host stack
-	init();
 	bmHubPre		= 0;
 	UHD_Init();
 	return 0;
@@ -124,7 +123,7 @@ uint32_t USBHost::SetPipeAddress(uint32_t addr, uint32_t ep, EpInfo **ppep, uint
 /* 01-0f    =   non-zero HRSLT  */
 uint32_t USBHost::ctrlReq(uint32_t addr, uint32_t ep, uint8_t bmReqType, uint8_t bRequest, uint8_t wValLo, uint8_t wValHi,
                           uint16_t wInd, uint16_t total, uint32_t nbytes, uint8_t* dataptr, USBReadParser *p) {
-	
+
 	uint32_t direction = 0; // Request direction, IN or OUT
 	uint32_t rcode;
 	SETUP_PKT setup_pkt;
@@ -143,7 +142,7 @@ uint32_t USBHost::ctrlReq(uint32_t addr, uint32_t ep, uint8_t bmReqType, uint8_t
 	if (rcode)
 	{
 		TRACE_USBHOST(printf("/!\\ USBHost::ctrlReq : EP0 allocation error: %lu\r\n", rcode);)
-		//USBTRACE2("\n\rUSBHost::ctrlReq : EP0 allocation error: ", rcode");
+		//USBTRACE2("\n\rUSBHost::ctrlReq : EP0 allocation error: ", rcode");
 		return rcode;
 	}
 
@@ -195,14 +194,14 @@ uint32_t USBHost::ctrlReq(uint32_t addr, uint32_t ep, uint8_t bmReqType, uint8_t
 				((USBReadParser*)p)->Parse(read, dataptr, total - left);
 		}
 		else // OUT transfer
-		{			
+		{
 			pep->bmSndToggle = 1; //bmSNDTOG1;
 			rcode = OutTransfer(pep, nak_limit, nbytes, dataptr);
 		}
 		if(rcode) //return error
 			return (rcode);
 	}
-	
+
 	// Status stage
 	UHD_Pipe_CountZero(pep->epAddr);
 	USB->HOST.HostPipe[pep->epAddr].PSTATUSSET.reg = USB_HOST_PSTATUSSET_DTGL;
@@ -268,11 +267,11 @@ uint32_t USBHost::InTransfer(EpInfo *pep, uint32_t nak_limit, uint8_t *nbytesptr
         }
         /* check for RCVDAVIRQ and generate error if not present */
         /* the only case when absence of RCVDAVIRQ makes sense is when toggle error occurred. Need to add handling for that */
-				
+
 		pktsize = uhd_byte_count(pep->epAddr); // Number of received bytes
-		
+
 		USB->HOST.HostPipe[pep->epAddr].PSTATUSCLR.reg = USB_HOST_PSTATUSCLR_BK0RDY;
-        
+
 		//printf("Got %i bytes \r\n", pktsize);
 		// This would be OK, but...
 		//assert(pktsize <= nbytes);
@@ -297,7 +296,7 @@ uint32_t USBHost::InTransfer(EpInfo *pep, uint32_t nak_limit, uint8_t *nbytesptr
         /* 1. The device sent a short packet (L.T. maxPacketSize)   */
         /* 2. 'nbytes' have been transferred.                       */
         if((pktsize < maxpktsize) || (*nbytesptr >= nbytes)) // have we transferred 'nbytes' bytes?
-		{					 
+		{
             // Save toggle value
             pep->bmRcvToggle = USB_HOST_DTGL(pep->epAddr);
             //printf("\r\n");
@@ -494,8 +493,7 @@ void USBHost::Task(void) //USB state machine
 			TRACE_USBHOST(printf(" + USB_DETACHED_SUBSTATE_INITIALIZE\r\n");)
 
 			// Init USB stack and driver
-			UHD_Init();
-			init();
+			Init();
 
 			// Free all USB resources
 			for (uint32_t i = 0; i < USB_NUMDEVICES; ++i)

libraries/USBHost/src/Usb.h

@@ -27,7 +27,7 @@ e-mail   :  support@circuitsathome.com
 // None of these should ever be included by a driver, or a user's sketch.
 
 #include "variant.h"
-#define USB_HOST_SERIAL SERIAL_PORT_MONITOR
+#define USB_HOST_SERIAL Serial1
 #include "Print.h"
 #include "printhex.h"
 #include "message.h"