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

IAP removed from decouple

Browse Source
This commit is contained in:
Ross Owen
2013-03-07 16:37:09 +00:00
parent bf58de3006
commit f6d95a5b60
2 changed files with 9 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
module_usb_audio/usb_buffer/decouple.xc
View File

@@ -19,12 +19,6 @@
**/
#include <xs1.h>
#include "xc_ptr.h"
#define NO_INLINE_MIDI_SELECT_HANDLER 1
#include "usb_midi.h"
#define NO_INLINE_IAP_SELECT_HANDLER 1
#ifdef IAP
#include "iAP.h"
#endif
#include "devicedefines.h"
#include "interrupt.h"
#include "clockcmds.h"
@@ -77,36 +71,11 @@ unsigned dir = 0;
void GetADCCounts(unsigned samFreq, int &min, int &mid, int &max);
#ifdef IAP
static inline void swap(xc_ptr &a, xc_ptr &b)
{
xc_ptr tmp;
tmp = a;
a = b;
b = tmp;
return;
}
unsigned g_iap_reset = 1;
unsigned g_iap_from_host_flag = 0;
unsigned g_iap_to_host_flag = 0;
int iap_to_host_usb_ep = 0;
int iap_to_host_int_usb_ep = 0;
int iap_from_host_usb_ep = 0;
unsigned int g_iap_to_host_buffer_A[MAX_IAP_PACKET_SIZE/4+4];
unsigned int g_iap_to_host_buffer_B[MAX_IAP_PACKET_SIZE/4+4];
int g_iap_from_host_buffer[MAX_IAP_PACKET_SIZE/4+4];
unsigned g_zero_buffer[1];
unsigned char gc_zero_buffer[4];
#endif
int aud_from_host_usb_ep = 0;
int aud_to_host_usb_ep = 0;
int int_usb_ep = 0;
/* Shared global audio buffering variables */
unsigned g_aud_from_host_buffer;
unsigned g_aud_to_host_buffer;
unsigned g_aud_to_host_flag = 0;
@@ -556,26 +525,6 @@ void decouple(chanend c_mix_out,
int aud_to_host_flag = 0;
#endif
#ifdef IAP
xc_ptr iap_from_host_rdptr;
xc_ptr iap_from_host_buffer;
xc_ptr iap_to_host_buffer_being_sent = array_to_xc_ptr(g_iap_to_host_buffer_A);
xc_ptr iap_to_host_buffer_being_collected = array_to_xc_ptr(g_iap_to_host_buffer_B);
xc_ptr zero_buffer = array_to_xc_ptr(g_zero_buffer);
int is_ack_iap;
int is_reset;
int iap_reset;
unsigned int datum_iap;
int iap_data_remaining_to_device = 0;
int iap_data_collected_from_device = 0;
int iap_waiting_on_send_to_host = 0;
int iap_to_host_flag = 0;
int iap_from_host_flag = 0;
int iap_expecting_length = 1;
int iap_expecting_data_length = 0;
#endif
int t = array_to_xc_ptr(outAudioBuff);
int aud_in_ready = 0;

12
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -58,10 +58,16 @@ int g_midi_from_host_buffer[MAX_USB_MIDI_PACKET_SIZE/4+4];
#endif
#ifdef IAP
extern unsigned int g_iap_to_host_buffer_A[MAX_IAP_PACKET_SIZE/4+4];
extern unsigned int g_iap_to_host_buffer_B[MAX_IAP_PACKET_SIZE/4+4];
extern int g_iap_from_host_buffer[MAX_IAP_PACKET_SIZE/4+4];
unsigned int g_iap_to_host_buffer_A[MAX_IAP_PACKET_SIZE/4+4];
unsigned int g_iap_to_host_buffer_B[MAX_IAP_PACKET_SIZE/4+4];
int g_iap_from_host_buffer[MAX_IAP_PACKET_SIZE/4+4];
unsigned char gc_zero_buffer2[4];
unsigned g_iap_reset = 1;
unsigned g_iap_from_host_flag = 0;
unsigned g_iap_to_host_flag = 0;
int iap_to_host_usb_ep = 0;
int iap_to_host_int_usb_ep = 0;
int iap_from_host_usb_ep = 0;
#endif
unsigned char fb_clocks[16];