Remove references to epAttribs

felis/USB_Host_Shield_2.0#185

Author: bbx10

libraries/USBHost/src/Usb.cpp

@@ -143,7 +143,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;
 	}
 
@@ -710,7 +710,8 @@ uint32_t USBHost::Configuring(uint32_t parent, uint32_t port, uint32_t lowspeed)
 
         epInfo.epAddr = 0;
         epInfo.maxPktSize = 8;
-        epInfo.epAttribs = 0;
+        epInfo.bmSndToggle = 0;
+        epInfo.bmRcvToggle = 0;
         epInfo.bmNakPower = USB_NAK_MAX_POWER;
 
         //delay(2000);

libraries/USBHost/src/adk.cpp

@@ -45,7 +45,8 @@ ready(false) {
 	for (uint32_t i = 0; i < ADK_MAX_ENDPOINTS; i++) {
 		epInfo[i].epAddr	= 0;
 		epInfo[i].maxPktSize	= (i) ? 0 : 8;
-		epInfo[i].epAttribs		= 0;
+		epInfo[i].bmSndToggle   = 0;
+		epInfo[i].bmRcvToggle   = 0;
 		epInfo[i].bmNakPower  	= (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
         }//for(uint32_t i=0; i<ADK_MAX_ENDPOINTS; i++...
 
@@ -221,15 +222,15 @@ uint32_t ADK::Init(uint32_t parent, uint32_t port, uint32_t lowspeed) {
 		USBTRACE("\r\nEP0:");
 		USBTRACE2("\r\nAddr: ", epInfo[0].epAddr);
 		USBTRACE2("\r\nMax.pkt.size: ", epInfo[0].maxPktSize);
-		USBTRACE2("\r\nAttr: ", epInfo[0].epAttribs);
+		USBTRACE2("\r\nAttr: ", epInfo[0].bmNakPower);
 		USBTRACE("\r\nEpout:");
 		USBTRACE2("\r\nAddr: ", epInfo[epDataOutIndex].epAddr);
 		USBTRACE2("\r\nMax.pkt.size: ", epInfo[epDataOutIndex].maxPktSize);
-		USBTRACE2("\r\nAttr: ", epInfo[epDataOutIndex].epAttribs);
+		USBTRACE2("\r\nAttr: ", epInfo[epDataOutIndex].bmNakPower);
 		USBTRACE("\r\nEpin:");
 		USBTRACE2("\r\nAddr: ", epInfo[epDataInIndex].epAddr);
 		USBTRACE2("\r\nMax.pkt.size: ", epInfo[epDataInIndex].maxPktSize);
-		USBTRACE2("\r\nAttr: ", epInfo[epDataInIndex].epAttribs);
+		USBTRACE2("\r\nAttr: ", epInfo[epDataInIndex].bmNakPower);
 
 
 		USBTRACE("\r\nConfiguration successful");
@@ -364,6 +365,8 @@ void ADK::EndpointXtract(uint32_t conf, uint32_t /* iface */, uint32_t /* alt */
                 // Fill in the endpoint info structure
                 epInfo[index].epAddr = (pep->bEndpointAddress & 0x0F);
                 epInfo[index].maxPktSize = (uint8_t)pep->wMaxPacketSize;
+                epInfo[index].bmSndToggle = 0;
+                epInfo[index].bmRcvToggle = 0;
 
                 bNumEP++;
 

libraries/USBHost/src/hidboot.h

@@ -240,7 +240,8 @@ void HIDBoot<BOOT_PROTOCOL>::Initialize() {
         for(int i = 0; i < totalEndpoints(BOOT_PROTOCOL); i++) {
                 epInfo[i].epAddr = 0;
 		epInfo[i].maxPktSize	= (i) ? 0 : 8;
-		epInfo[i].epAttribs		= 0;
+		epInfo[i].bmSndToggle   = 0;
+		epInfo[i].bmRcvToggle   = 0;
 		epInfo[i].bmNakPower	= (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
 	}
 	bNumEP		= 1;
@@ -535,7 +536,8 @@ void HIDBoot<BOOT_PROTOCOL>::EndpointXtract(uint32_t conf, uint32_t iface, uint3
 		// Fill in the endpoint info structure
 		epInfo[bNumEP].epAddr		= (pep->bEndpointAddress & 0x0F);
 		epInfo[bNumEP].maxPktSize	= (uint8_t)pep->wMaxPacketSize;
-		epInfo[bNumEP].epAttribs		= 0;
+		epInfo[bNumEP].bmSndToggle = 0;
+		epInfo[bNumEP].bmRcvToggle = 0;
                 epInfo[bNumEP].bmNakPower = USB_NAK_NOWAIT;
 		bNumEP++;
 

libraries/USBHost/src/hiduniversal.cpp

@@ -60,7 +60,8 @@ void HIDUniversal::Initialize() {
         for(uint8_t i = 0; i < totalEndpoints; i++) {
                 epInfo[i].epAddr = 0;
                 epInfo[i].maxPktSize = (i) ? 0 : 8;
-                epInfo[i].epAttribs = 0;
+                epInfo[i].bmSndToggle = 0;
+                epInfo[i].bmRcvToggle = 0;
                 epInfo[i].bmNakPower = (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
         }
         bNumEP = 1;
@@ -324,7 +325,8 @@ void HIDUniversal::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t alt, u
                 // Fill in the endpoint info structure
                 epInfo[bNumEP].epAddr = (pep->bEndpointAddress & 0x0F);
                 epInfo[bNumEP].maxPktSize = (uint8_t)pep->wMaxPacketSize;
-                epInfo[bNumEP].epAttribs = 0;
+                epInfo[bNumEP].bmSndToggle = 0;
+                epInfo[bNumEP].bmRcvToggle = 0;
                 epInfo[bNumEP].bmNakPower = USB_NAK_NOWAIT;
 
                 // Fill in the endpoint index list

libraries/USBHost/src/usbhub.cpp

@@ -28,12 +28,14 @@ qNextPollTime(0),
 bPollEnable(false) {
         epInfo[0].epAddr = 0;
         epInfo[0].maxPktSize = 8;
-        epInfo[0].epAttribs = 0;
+        epInfo[0].bmSndToggle = 0;
+        epInfo[0].bmRcvToggle = 0;
         epInfo[0].bmNakPower = USB_NAK_MAX_POWER;
 
         epInfo[1].epAddr = 1;
         epInfo[1].maxPktSize = 8; //kludge
-        epInfo[1].epAttribs = 0;
+        epInfo[1].bmSndToggle = 0;
+        epInfo[1].bmRcvToggle = 0;
         epInfo[1].bmNakPower = USB_NAK_NOWAIT;
 
         if(pUsb)