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

Remove IAP_BUFFERED as this is the only option now.

Browse Source
This commit is contained in:
Russell Gallop
2011-09-06 12:22:28 +01:00
parent f8af92041d
commit 5c6dd16a3c
5 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_usb_aud_shared/usb_buffer/usb_buffer.xc
View File

@@ -74,7 +74,7 @@ extern unsigned g_numUsbChanIn;
void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud_fb,
chanend c_midi_from_host,
chanend c_midi_to_host,
#ifdef IAP_BUFFERED
#ifdef IAP
chanend c_iap_from_host,
chanend c_iap_to_host,
chanend c_iap_to_host_int,
@@ -92,12 +92,10 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
XUD_ep ep_midi_to_host = XUD_Init_Ep(c_midi_to_host);
#endif
#ifdef IAP
#ifdef IAP_BUFFERED
XUD_ep ep_iap_from_host = XUD_Init_Ep(c_iap_from_host);
XUD_ep ep_iap_to_host = XUD_Init_Ep(c_iap_to_host);
XUD_ep ep_iap_to_host_int = XUD_Init_Ep(c_iap_to_host_int);
#endif
#endif
#if defined(SPDIF_RX) || defined(ADAT_RX)
XUD_ep ep_int = XUD_Init_Ep(c_int);
#endif
@@ -129,11 +127,9 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
#endif
#ifdef IAP
#ifdef IAP_BUFFERED
xc_ptr iap_from_host_buffer = 0;
xc_ptr iap_to_host_buffer = 0;
xc_ptr iap_to_host_waiting_buffer = 0;
#endif
#endif
set_thread_fast_mode_on();
@@ -184,7 +180,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
#endif
#ifdef IAP
#ifdef IAP_BUFFERED
// get the two buffers to use for iap device->host
asm("ldaw %0, dp[g_iap_to_host_buffer_A]":"=r"(iap_to_host_buffer));
asm("ldaw %0, dp[g_iap_to_host_buffer_B]":"=r"(iap_to_host_waiting_buffer));
@@ -199,7 +194,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
swap(iap_to_host_buffer, iap_to_host_waiting_buffer);
SET_SHARED_GLOBAL(g_iap_from_host_flag, 1);
#endif
#endif
#ifdef OUTPUT
SET_SHARED_GLOBAL(g_aud_from_host_flag, 1);
@@ -545,7 +539,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
#endif
#ifdef IAP
#ifdef IAP_BUFFERED
case inuint_byref(c_iap_from_host, tmp):
asm("#iap h->d");
@@ -625,7 +618,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
// Don't need to handle data here as always ZLP
break;
#endif
#endif
}