Skip to content

Commit 66cdf6d

Browse files
authored
Merge pull request #2514 from camilaodsouza/sdk_3.2_update
Changes required for new SDK 3.2.0
2 parents b8d4684 + 11722cc commit 66cdf6d

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

src/portable/sony/cxd56/dcd_cxd56.c

+22-8
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,25 @@ static int _dcd_bind(FAR struct usbdevclass_driver_s *driver, FAR struct usbdev_
102102
usbdev = dev;
103103
usbdcd_driver.ep[0] = dev->ep0;
104104

105+
#ifdef EP_ALLOCREQ
106+
// SDK v2
105107
usbdcd_driver.req[0] = EP_ALLOCREQ(usbdcd_driver.ep[0]);
106-
if (usbdcd_driver.req[0] != NULL)
107-
{
108+
if (usbdcd_driver.req[0] != NULL) {
108109
usbdcd_driver.req[0]->len = 64;
109110
usbdcd_driver.req[0]->buf = EP_ALLOCBUFFER(usbdcd_driver.ep[0], 64);
110-
if (!usbdcd_driver.req[0]->buf)
111-
{
111+
if (!usbdcd_driver.req[0]->buf) {
112112
EP_FREEREQ(usbdcd_driver.ep[0], usbdcd_driver.req[0]);
113113
usbdcd_driver.req[0] = NULL;
114+
return ENOMEM;
114115
}
115116
}
117+
#else
118+
// SDK v3
119+
usbdcd_driver.req[0] = usbdev_allocreq(usbdcd_driver.ep[0], 64);
120+
if (usbdcd_driver.req[0] == NULL) {
121+
return ENOMEM;
122+
}
123+
#endif
116124

117125
usbdcd_driver.req[0]->callback = usbdcd_ep0incomplete;
118126

@@ -295,13 +303,19 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const *p_endpoint_desc)
295303
}
296304

297305
usbdcd_driver.req[epnum] = NULL;
306+
307+
#ifdef EP_ALLOCREQ
308+
// sdk v2
298309
usbdcd_driver.req[epnum] = EP_ALLOCREQ(usbdcd_driver.ep[epnum]);
299-
if (usbdcd_driver.req[epnum] != NULL)
300-
{
310+
if (usbdcd_driver.req[epnum] != NULL) {
301311
usbdcd_driver.req[epnum]->len = ep_mps;
302312
}
303-
else
304-
{
313+
#else
314+
// sdk v3
315+
usbdcd_driver.req[epnum] = usbdev_allocreq(usbdcd_driver.ep[epnum], ep_mps);
316+
#endif
317+
318+
if(usbdcd_driver.req[epnum] == NULL) {
305319
return false;
306320
}
307321

0 commit comments

Comments
 (0)