Resolving conficted merge

2014-02-19 12:29:42 +00:00
parent 3fbb537d31 9150813b3e
commit 9cc53f1736
1 changed files with 0 additions and 8 deletions
--- a/module_usb_audio/usb_buffer/usb_buffer.xc
+++ b/module_usb_audio/usb_buffer/usb_buffer.xc
@@ -179,14 +179,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
    
    xc_ptr p_inZeroBuff = array_to_xc_ptr(inZeroBuff);

-#ifdef IAP
-    //XUD_ResetEndpoint(ep_iap_to_host, null);
-#ifdef IAP_INT_EP
-    //XUD_ResetEndpoint(ep_iap_to_host_int, null);
-#endif
-    //iap_send_reset(c_iap);
-#endif
-
 #if defined(SPDIF_RX) || defined(ADAT_RX)
    asm("stw %0, dp[int_usb_ep]"::"r"(ep_int));
 #endif