From 9d2b779fee600838e0817c82aabd20a287a55cab Mon Sep 17 00:00:00 2001
From: bbx10node <bbx10node@gmail.com>
Date: Wed, 20 Jan 2016 14:44:23 -1000
Subject: [PATCH] Replace assignments to epAttribs
https://github.com/felis/USB_Host_Shield_2.0/pull/185
---
libraries/USBHost/src/Usb.cpp | 3 ++-
libraries/USBHost/src/adk.cpp | 5 ++++-
libraries/USBHost/src/hidboot.h | 6 ++++--
libraries/USBHost/src/hiduniversal.cpp | 6 ++++--
libraries/USBHost/src/usbhub.cpp | 6 ++++--
5 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/libraries/USBHost/src/Usb.cpp b/libraries/USBHost/src/Usb.cpp
index de6d5ace..956958d5 100644
--- a/libraries/USBHost/src/Usb.cpp
+++ b/libraries/USBHost/src/Usb.cpp
@@ -722,7 +722,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);
diff --git a/libraries/USBHost/src/adk.cpp b/libraries/USBHost/src/adk.cpp
index 165f50c3..8602e1a6 100644
--- a/libraries/USBHost/src/adk.cpp
+++ b/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++...
@@ -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++;
diff --git a/libraries/USBHost/src/hidboot.h b/libraries/USBHost/src/hidboot.h
index 1aa98e1a..83c9792c 100644
--- a/libraries/USBHost/src/hidboot.h
+++ b/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++;
diff --git a/libraries/USBHost/src/hiduniversal.cpp b/libraries/USBHost/src/hiduniversal.cpp
index 69630893..7c6764b9 100644
--- a/libraries/USBHost/src/hiduniversal.cpp
+++ b/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
diff --git a/libraries/USBHost/src/usbhub.cpp b/libraries/USBHost/src/usbhub.cpp
index 1f6aa712..670c848c 100644
--- a/libraries/USBHost/src/usbhub.cpp
+++ b/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)
--
GitLab