master -> REINSTATE_ADAT_INPUT

This commit is contained in:
Ross Owen
2014-09-11 12:41:07 +01:00
12 changed files with 750 additions and 250 deletions

View File

@@ -214,7 +214,10 @@ XUD_EpType epTypeTableOut[ENDPOINT_COUNT_OUT] = { XUD_EPTYPE_CTL | XUD_STATUS_EN
XUD_EPTYPE_BUL, /* MIDI */
#endif
#ifdef IAP
XUD_EPTYPE_BUL /* iAP */
XUD_EPTYPE_BUL, /* iAP */
#ifdef IAP_EA_NATIVE_TRANS
XUD_EPTYPE_BUL, /* EA Native Transport */
#endif
#endif
};
@@ -235,6 +238,9 @@ XUD_EpType epTypeTableIn[ENDPOINT_COUNT_IN] = { XUD_EPTYPE_CTL | XUD_STATUS_ENAB
#ifdef IAP_INT_EP
XUD_EPTYPE_BUL | XUD_STATUS_ENABLE,
#endif
#ifdef IAP_EA_NATIVE_TRANS
XUD_EPTYPE_BUL | XUD_STATUS_ENABLE,
#endif
#endif
};
@@ -265,6 +271,9 @@ void usb_audio_core(chanend c_mix_out
#endif
#ifdef IAP
, chanend c_iap
#ifdef IAP_EA_NATIVE_TRANS
, chanend c_ea_data
#endif
#endif
#ifdef MIXER
, chanend c_mix_ctl
@@ -284,6 +293,12 @@ void usb_audio_core(chanend c_mix_out
#ifndef MIXER
#define c_mix_ctl null
#endif
#ifdef IAP_EA_NATIVE_TRANS
chan c_EANativeTransport_ctrl;
#else
#define c_EANativeTransport_ctrl null
#endif
par
@@ -351,7 +366,7 @@ void usb_audio_core(chanend c_mix_out
/* Endpoint 0 Core */
{
thread_speed();
Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, c_clk_ctl);
Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, null, c_EANativeTransport_ctrl);
}
/* Decoupling core */
@@ -363,6 +378,18 @@ void usb_audio_core(chanend c_mix_out
#endif
);
}
#if defined(IAP_EA_NATIVE_TRANS)
/* EA Native Transport Endpoint manager */
/* TODO This core can be merged with buffer() */
{
thread_speed();
iAP2_EANativeTransport_EPManager(
c_xud_out[ENDPOINT_NUMBER_OUT_IAP_EA_NATIVE_TRANS],
c_xud_in[ENDPOINT_NUMBER_IN_IAP_EA_NATIVE_TRANS],
c_EANativeTransport_ctrl, c_ea_data);
}
#endif
//:
}
}
@@ -381,7 +408,11 @@ chanend ?c_clk_int
chan c_mix_out;
#endif
#if defined(SPDIF_RX) || defined(ADAT_RX)
chan c_dig_rx;
#else
#define c_dig_rx null
#endif
par
{
@@ -431,6 +462,9 @@ int main()
#endif
#ifdef IAP
chan c_iap;
#ifdef IAP_EA_NATIVE_TRANS
chan c_ea_data;
#endif
#endif
#ifdef SU1_ADC_ENABLE
chan c_adc;
@@ -453,7 +487,6 @@ int main()
chan c_clk_ctl;
chan c_clk_int;
#else
#define c_dig_rx null
#define c_clk_int null
#define c_clk_ctl null
#define c_spdif_rx null
@@ -469,6 +502,9 @@ int main()
#endif
#ifdef IAP
, c_iap
#ifdef IAP_EA_NATIVE_TRANS
, c_ea_data
#endif
#endif
#ifdef MIXER
, c_mix_ctl