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

@@ -390,7 +390,7 @@
* @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
*/
#ifndef BCD_DEVICE_M
#define BCD_DEVICE_M 7
#define BCD_DEVICE_M 8
#endif
/**
@@ -930,6 +930,27 @@
#undef IAP_INT_EP
#endif
/* IAP EA Native Transport */
#if defined(IAP_EA_NATIVE_TRANS) && (IAP_EA_NATIVE_TRANS == 0)
#undef IAP_EA_NATIVE_TRANS
#endif
#if defined(IAP_EA_NATIVE_TRANS) || defined(__DOXYGEN__)
/**
* @brief Number of supported EA Native Interface Alternative settings.
*
* Only 1 supported
*/
#ifndef IAP_EA_NATIVE_TRANS_ALT_COUNT
#define IAP_EA_NATIVE_TRANS_ALT_COUNT 1
#endif
#if (IAP_EA_NATIVE_TRANS_ALT_COUNT > 1)
/* Only 1 supported */
#error
#endif
#endif
/* Endpoint addresses enums */
enum USBEndpointNumber_In
{
@@ -950,6 +971,9 @@ enum USBEndpointNumber_In
ENDPOINT_NUMBER_IN_IAP_INT,
#endif
ENDPOINT_NUMBER_IN_IAP,
#ifdef IAP_EA_NATIVE_TRANS
ENDPOINT_NUMBER_IN_IAP_EA_NATIVE_TRANS,
#endif
#endif
ENDPOINT_COUNT_IN /* End marker */
};
@@ -963,6 +987,9 @@ enum USBEndpointNumber_Out
#endif
#ifdef IAP
ENDPOINT_NUMBER_OUT_IAP,
#ifdef IAP_EA_NATIVE_TRANS
ENDPOINT_NUMBER_OUT_IAP_EA_NATIVE_TRANS,
#endif
#endif
ENDPOINT_COUNT_OUT /* End marker */
};