From 927de7bbca32dc75de157d16a0c828c3ba97bdc1 Mon Sep 17 00:00:00 2001 From: Sam Chesney Date: Tue, 18 Feb 2014 15:07:21 +0000 Subject: [PATCH 1/2] Removed debug print --- module_usb_audio/usb_buffer/usb_buffer.xc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/module_usb_audio/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc index 9325a65f..c5383788 100644 --- a/module_usb_audio/usb_buffer/usb_buffer.xc +++ b/module_usb_audio/usb_buffer/usb_buffer.xc @@ -667,10 +667,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud { /* We have read an entire packet - Mark ready to receive another */ XUD_SetReady_Out(ep_iap_from_host, iap_from_host_buffer); - //{ - /* Ignore resets */ - // printintln(8000000); - //} } else { From 593ccd71727fcac3f2731f83b9a9caaef25006ea Mon Sep 17 00:00:00 2001 From: Sam Chesney Date: Tue, 18 Feb 2014 15:08:08 +0000 Subject: [PATCH 2/2] Changed reset result type (int -> XUD_Result_t) --- module_usb_audio/usb_buffer/usb_buffer.xc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module_usb_audio/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc index c5383788..d7ac1261 100644 --- a/module_usb_audio/usb_buffer/usb_buffer.xc +++ b/module_usb_audio/usb_buffer/usb_buffer.xc @@ -702,13 +702,13 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud /* Note we don't ack the last byte yet... */ if (iap_data_collected_from_device == iap_expected_data_length) { - int reset1 = 0, reset2; + XUD_Result_t result1 = XUD_RES_OKAY, result2; #ifdef IAP_INT_EP - reset1 = XUD_SetReady_In(ep_iap_to_host_int, gc_zero_buffer, 0); + result1 = XUD_SetReady_In(ep_iap_to_host_int, gc_zero_buffer, 0); #endif - reset2 = XUD_SetReady_In(ep_iap_to_host, iap_to_host_buffer, iap_data_collected_from_device); + result2 = XUD_SetReady_In(ep_iap_to_host, iap_to_host_buffer, iap_data_collected_from_device); - if((reset1 == -1) || (reset2 == -1)) + if((result1 == XUD_RES_RST) || (result2 == XUD_RES_RST)) { #ifdef IAP_INT_EP XUD_ResetEndpoint(ep_iap_to_host_int, null);