Skip to content

Commit 9d2b779

Browse files
bbx10cmaglie
authored andcommitted
Replace assignments to epAttribs
felis/USB_Host_Shield_2.0#185
1 parent 31a647e commit 9d2b779

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

libraries/USBHost/src/Usb.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,8 @@ uint32_t USBHost::Configuring(uint32_t parent, uint32_t port, uint32_t lowspeed)
722722

723723
epInfo.epAddr = 0;
724724
epInfo.maxPktSize = 8;
725-
epInfo.epAttribs = 0;
725+
epInfo.bmSndToggle = 0;
726+
epInfo.bmRcvToggle = 0;
726727
epInfo.bmNakPower = USB_NAK_MAX_POWER;
727728

728729
//delay(2000);

libraries/USBHost/src/adk.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ ready(false) {
4545
for (uint32_t i = 0; i < ADK_MAX_ENDPOINTS; i++) {
4646
epInfo[i].epAddr = 0;
4747
epInfo[i].maxPktSize = (i) ? 0 : 8;
48-
epInfo[i].epAttribs = 0;
48+
epInfo[i].bmSndToggle = 0;
49+
epInfo[i].bmRcvToggle = 0;
4950
epInfo[i].bmNakPower = (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
5051
}//for(uint32_t i=0; i<ADK_MAX_ENDPOINTS; i++...
5152

@@ -364,6 +365,8 @@ void ADK::EndpointXtract(uint32_t conf, uint32_t /* iface */, uint32_t /* alt */
364365
// Fill in the endpoint info structure
365366
epInfo[index].epAddr = (pep->bEndpointAddress & 0x0F);
366367
epInfo[index].maxPktSize = (uint8_t)pep->wMaxPacketSize;
368+
epInfo[index].bmSndToggle = 0;
369+
epInfo[index].bmRcvToggle = 0;
367370

368371
bNumEP++;
369372

libraries/USBHost/src/hidboot.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,8 @@ void HIDBoot<BOOT_PROTOCOL>::Initialize() {
240240
for(int i = 0; i < totalEndpoints(BOOT_PROTOCOL); i++) {
241241
epInfo[i].epAddr = 0;
242242
epInfo[i].maxPktSize = (i) ? 0 : 8;
243-
epInfo[i].epAttribs = 0;
243+
epInfo[i].bmSndToggle = 0;
244+
epInfo[i].bmRcvToggle = 0;
244245
epInfo[i].bmNakPower = (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
245246
}
246247
bNumEP = 1;
@@ -535,7 +536,8 @@ void HIDBoot<BOOT_PROTOCOL>::EndpointXtract(uint32_t conf, uint32_t iface, uint3
535536
// Fill in the endpoint info structure
536537
epInfo[bNumEP].epAddr = (pep->bEndpointAddress & 0x0F);
537538
epInfo[bNumEP].maxPktSize = (uint8_t)pep->wMaxPacketSize;
538-
epInfo[bNumEP].epAttribs = 0;
539+
epInfo[bNumEP].bmSndToggle = 0;
540+
epInfo[bNumEP].bmRcvToggle = 0;
539541
epInfo[bNumEP].bmNakPower = USB_NAK_NOWAIT;
540542
bNumEP++;
541543

libraries/USBHost/src/hiduniversal.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ void HIDUniversal::Initialize() {
6060
for(uint8_t i = 0; i < totalEndpoints; i++) {
6161
epInfo[i].epAddr = 0;
6262
epInfo[i].maxPktSize = (i) ? 0 : 8;
63-
epInfo[i].epAttribs = 0;
63+
epInfo[i].bmSndToggle = 0;
64+
epInfo[i].bmRcvToggle = 0;
6465
epInfo[i].bmNakPower = (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
6566
}
6667
bNumEP = 1;
@@ -324,7 +325,8 @@ void HIDUniversal::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t alt, u
324325
// Fill in the endpoint info structure
325326
epInfo[bNumEP].epAddr = (pep->bEndpointAddress & 0x0F);
326327
epInfo[bNumEP].maxPktSize = (uint8_t)pep->wMaxPacketSize;
327-
epInfo[bNumEP].epAttribs = 0;
328+
epInfo[bNumEP].bmSndToggle = 0;
329+
epInfo[bNumEP].bmRcvToggle = 0;
328330
epInfo[bNumEP].bmNakPower = USB_NAK_NOWAIT;
329331

330332
// Fill in the endpoint index list

libraries/USBHost/src/usbhub.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ qNextPollTime(0),
2828
bPollEnable(false) {
2929
epInfo[0].epAddr = 0;
3030
epInfo[0].maxPktSize = 8;
31-
epInfo[0].epAttribs = 0;
31+
epInfo[0].bmSndToggle = 0;
32+
epInfo[0].bmRcvToggle = 0;
3233
epInfo[0].bmNakPower = USB_NAK_MAX_POWER;
3334

3435
epInfo[1].epAddr = 1;
3536
epInfo[1].maxPktSize = 8; //kludge
36-
epInfo[1].epAttribs = 0;
37+
epInfo[1].bmSndToggle = 0;
38+
epInfo[1].bmRcvToggle = 0;
3739
epInfo[1].bmNakPower = USB_NAK_NOWAIT;
3840

3941
if(pUsb)

0 commit comments

Comments
 (0)