andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2514 from camilaodsouza/sdk_3.2_update

Browse Source 
Changes required for new SDK 3.2.0
This commit is contained in:
Ha Thach
2024-04-03 23:58:18 +07:00
committed by GitHub
parent b8d4684683 11722cc533
commit 66cdf6d097
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/portable/sony/cxd56/dcd_cxd56.c
View File

@@ -102,17 +102,25 @@ static int _dcd_bind(FAR struct usbdevclass_driver_s *driver, FAR struct usbdev_
usbdev = dev; usbdev = dev;
usbdcd_driver.ep[0] = dev->ep0; usbdcd_driver.ep[0] = dev->ep0;
#ifdef EP_ALLOCREQ
// SDK v2
usbdcd_driver.req[0] = EP_ALLOCREQ(usbdcd_driver.ep[0]); usbdcd_driver.req[0] = EP_ALLOCREQ(usbdcd_driver.ep[0]);
if (usbdcd_driver.req[0] != NULL) if (usbdcd_driver.req[0] != NULL) {
{
usbdcd_driver.req[0]->len = 64; usbdcd_driver.req[0]->len = 64;
usbdcd_driver.req[0]->buf = EP_ALLOCBUFFER(usbdcd_driver.ep[0], 64); usbdcd_driver.req[0]->buf = EP_ALLOCBUFFER(usbdcd_driver.ep[0], 64);
if (!usbdcd_driver.req[0]->buf) if (!usbdcd_driver.req[0]->buf) {
{
EP_FREEREQ(usbdcd_driver.ep[0], usbdcd_driver.req[0]); EP_FREEREQ(usbdcd_driver.ep[0], usbdcd_driver.req[0]);
usbdcd_driver.req[0] = NULL; usbdcd_driver.req[0] = NULL;
return ENOMEM;
} }
} }
#else
// SDK v3
usbdcd_driver.req[0] = usbdev_allocreq(usbdcd_driver.ep[0], 64);
if (usbdcd_driver.req[0] == NULL) {
return ENOMEM;
}
#endif
usbdcd_driver.req[0]->callback = usbdcd_ep0incomplete; usbdcd_driver.req[0]->callback = usbdcd_ep0incomplete;
@@ -295,13 +303,19 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const *p_endpoint_desc)
} }
usbdcd_driver.req[epnum] = NULL; usbdcd_driver.req[epnum] = NULL;
#ifdef EP_ALLOCREQ
// sdk v2
usbdcd_driver.req[epnum] = EP_ALLOCREQ(usbdcd_driver.ep[epnum]); usbdcd_driver.req[epnum] = EP_ALLOCREQ(usbdcd_driver.ep[epnum]);
if (usbdcd_driver.req[epnum] != NULL) if (usbdcd_driver.req[epnum] != NULL) {
{
usbdcd_driver.req[epnum]->len = ep_mps; usbdcd_driver.req[epnum]->len = ep_mps;
} }
else #else
{ // sdk v3
usbdcd_driver.req[epnum] = usbdev_allocreq(usbdcd_driver.ep[epnum], ep_mps);
#endif
if(usbdcd_driver.req[epnum] == NULL) {
return false; return false;
} }