Conflicted merge: master -> DEV_X200_BRINGUP

2015-04-07 14:52:51 +01:00
parent 160dac773a e1726efd17
commit 3558bc6049
14 changed files with 1579 additions and 1579 deletions
--- a/module_usb_audio/usb_buffer/decouple.xc
+++ b/module_usb_audio/usb_buffer/decouple.xc
@@ -130,7 +130,7 @@ void handle_audio_request(chanend c_mix_out)

    /* Input word that triggered interrupt and handshake back */
    unsigned underflowSample = inuint(c_mix_out);
-    
+
    outuint(c_mix_out, 0);

    /* If in overflow condition then receive samples and throw away */