Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'iosaudioaccessory' of git://git/apps/sc_usb_audio into iosaudioaccessory

Browse Source
This commit is contained in:
Russell
2011-11-18 12:15:53 +00:00
parent ef78f7ff30 80d85d0d4c
commit b5faf8a621
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module_usb_aud_shared/usb_buffer/decouple.xc
View File

@@ -1191,7 +1191,8 @@ void decouple(chanend c_mix_out,
#ifdef IAP
GET_SHARED_GLOBAL(iap_reset, g_iap_reset);
if (iap_reset) {
if (iap_reset)
{
iap_send_reset(c_iap); // What if this happen in the middle of a send/ack?
iap_reset = 0;
iap_expecting_length = 1;

27
module_usb_aud_shared/usb_buffer/usb_buffer.xc
View File

@@ -134,6 +134,10 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
set_thread_fast_mode_on();
#ifdef IAP
XUD_ResetEndpoint(ep_iap_to_host_int, null);
#endif
#if defined(SPDIF_RX) || defined(ADAT_RX)
asm("stw %0, dp[int_usb_ep]"::"r"(ep_int));
#endif
@@ -615,15 +619,20 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
/* IAP interrupt IN to host */
case testct_byref(c_iap_to_host_int, tmp):
asm("#iap interrupt d->h");
if (tmp) {
// Is a control token so reset
} else {
inuint(c_iap_to_host_int); // And discard
// fill in the data
XUD_SetData_Inline(ep_iap_to_host_int, c_iap_to_host_int);
XUD_SetNotReady(ep_iap_to_host_int);
// Don't need to handle data here as always ZLP
if (tmp)
{
// Is a control token so reset
//printint(1);
XUD_ResetEndpoint(ep_iap_to_host_int, null);
XUD_SetNotReady(ep_iap_to_host_int);
}
else
{
inuint(c_iap_to_host_int); // And discard
// fill in the data
XUD_SetData_Inline(ep_iap_to_host_int, c_iap_to_host_int);
XUD_SetNotReady(ep_iap_to_host_int);
// Don't need to handle data here as always ZLP
}
break;
#endif