From e312ed5dcc280e11aeb6e27b252569b22fd8ad0d Mon Sep 17 00:00:00 2001 From: Sam Chesney Date: Wed, 1 Oct 2014 16:12:14 +0100 Subject: [PATCH] Change to include iAP module header not conf The required iAP headers have been updated such that they can now be included from C, which allows us to build with a default string for IAP_EA_NATIVE_TRANS_PROTOCOL_NAME when it has not been defined in the user app rather than having to error. --- module_usb_audio/endpoint0/descriptors.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h index 7bf0ee20..ca50bbf3 100644 --- a/module_usb_audio/endpoint0/descriptors.h +++ b/module_usb_audio/endpoint0/descriptors.h @@ -13,16 +13,7 @@ #include "usb_std_descriptors.h" #ifdef IAP_EA_NATIVE_TRANS -/* - * NOTE, currently this will not build if IAP_EA_NATIVE_TRANS_PROTOCOL_NAME is not defined in iap_conf.h, - * would be nice if a default string was used instead, and a warning issued. - * - * Could get a default define by including the following line, but iap2.h cannot currently be included from C - */ -//#include "iap2.h" /* Defines iAP EA Native Transport protocol name */ -#ifdef __iap_conf_h_exists__ -#include "iap_conf.h" -#endif +#include "iap2.h" /* Defines iAP EA Native Transport protocol name */ #endif #define APPEND_VENDOR_STR(x) VENDOR_STR" "#x