From 0709860f48966181d027cd8b76910909c2301ffa Mon Sep 17 00:00:00 2001 From: Ed Clarke Date: Mon, 5 Nov 2018 11:14:03 +0000 Subject: [PATCH] Ensure behaviour is correct when UAC_FORCE_FEEDBACK_EP and XUA_ADAPTIVE features defined as 0 --- lib_xua/api/xua_conf_default.h | 4 ++++ lib_xua/src/core/endpoint0/xua_ep0_descriptors.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lib_xua/api/xua_conf_default.h b/lib_xua/api/xua_conf_default.h index d2908342..677fad9e 100644 --- a/lib_xua/api/xua_conf_default.h +++ b/lib_xua/api/xua_conf_default.h @@ -1158,6 +1158,10 @@ #endif +#if (defined(UAC_FORCE_FEEDBACK_EP) && UAC_FORCE_FEEDBACK_EP == 0) +#undef UAC_FORCE_FEEDBACK_EP +#endif + #ifndef __ASSEMBLER__ /* Endpoint addresses enums */ enum USBEndpointNumber_In diff --git a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h index 5e1b6464..a0a8703f 100644 --- a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h +++ b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h @@ -33,6 +33,9 @@ #define ISO_EP_IMPL_ATTRIBUTES_ASYNCH 0x25 //ISO, ASYNCH, IMPLICIT FB DATA EP #define ISO_EP_IMPL_ATTRIBUTES_ADAPTIVE 0x29 //ISO, ADAPTIVE, IMPLICIT FB DATA EP +#if (defined(XUA_ADAPTIVE) && (XUA_ADAPTIVE == 0)) +#undef XUA_ADAPTIVE +#endif #if __STDC__ typedef struct