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

Merged EA_NATIVE_DEV -> master with some tidy

Browse Source
This commit is contained in:
Ross Owen
2014-08-28 12:42:40 +01:00
parent 43c64c3921 193ae6eaff
commit d83b5b9a0d
5 changed files with 267 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
module_usb_audio/main.xc
View File

@@ -197,7 +197,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
};
@@ -218,6 +221,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
};
@@ -248,6 +254,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
@@ -267,6 +276,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
@@ -334,7 +349,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 */
@@ -346,6 +361,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
//:
}
}
@@ -418,6 +445,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;
@@ -455,6 +485,9 @@ int main()
#endif
#ifdef IAP
, c_iap
#ifdef IAP_EA_NATIVE_TRANS
, c_ea_data
#endif
#endif
#ifdef MIXER
, c_mix_ctl