laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Started adding length params and checking for XUD_Result_t

Browse Source
This commit is contained in:
Ross Owen
2014-02-14 16:19:41 +00:00
parent e21a42c26d
commit a7d88ae583
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -269,7 +269,8 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
int i_tmp; int i_tmp;
int unitID; int unitID;
int loop = 1; int loop = 1;
int datalength; XUD_Result_t result;
unsigned datalength;
/* Inspect request, NOTE: these are class specific requests */ /* Inspect request, NOTE: these are class specific requests */
switch( sp.bRequest ) switch( sp.bRequest )
@@ -298,12 +299,9 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D)
{ {
/* Get OUT data with Sample Rate into buffer*/ /* Get OUT data with Sample Rate into buffer*/
datalength = XUD_GetBuffer(ep0_out, buffer); if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
/* Check for reset/suspend */
if(datalength < 0)
{ {
return datalength; return result;
} }
if(datalength == 4) if(datalength == 4)
@@ -447,10 +445,10 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
/* Direction: Host-to-device */ /* Direction: Host-to-device */
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D ) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D )
{ {
datalength = XUD_GetBuffer(ep0_out, buffer); if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
if(datalength < 0) return result;
return datalength; }
/* Check for correct datalength for clock sel */ /* Check for correct datalength for clock sel */
if(datalength == 1) if(datalength == 1)
@@ -496,11 +494,10 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D)
{ {
/* Expect OUT here (with volume) */ /* Expect OUT here (with volume) */
loop = XUD_GetBuffer(ep0_out, buffer); if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
/* Check for reset */ return result;
if(loop < 0) }
return loop;
if(unitID == FU_USBOUT) if(unitID == FU_USBOUT)
{ {
@@ -549,10 +546,10 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D)
{ {
/* Expect OUT here with mute */ /* Expect OUT here with mute */
loop = XUD_GetBuffer(ep0_out, buffer); if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
if(loop < 0) return result;
return loop; }
if (unitID == FU_USBOUT) if (unitID == FU_USBOUT)
{ {
@@ -1003,6 +1000,7 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp
int retVal = 1; int retVal = 1;
unsigned char buffer[1024]; unsigned char buffer[1024];
unsigned length;
/* Host to Device */ /* Host to Device */
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D)
@@ -1015,7 +1013,7 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp
/* Check Control Selector */ /* Check Control Selector */
unsigned short controlSelector = sp.wValue>>8; unsigned short controlSelector = sp.wValue>>8;
retVal = XUD_GetBuffer(ep0_out, buffer); retVal = XUD_GetBuffer(ep0_out, buffer, length);
/* Inspect for reset */ /* Inspect for reset */
if(retVal < 0) if(retVal < 0)