You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/06/15 20:22:08 UTC

[incubator-nuttx-apps] branch master updated (49e2c5f -> 853439f)

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.


    from 49e2c5f  bmp180: enable use for BMP280 as well
     new 22d5712  composite: do not require CDCACM driver to be set, composite interface is generic
     new 853439f  composite: nxstyle fixes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 system/composite/composite.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)


[incubator-nuttx-apps] 01/02: composite: do not require CDCACM driver to be set, composite interface is generic

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit 22d5712a5a0460b0ac4d61fe605821b728119a44
Author: Matias Nitsche <mn...@dc.uba.ar>
AuthorDate: Mon Jun 15 12:24:43 2020 -0300

    composite: do not require CDCACM driver to be set, composite interface is generic
---
 system/composite/composite.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/system/composite/composite.h b/system/composite/composite.h
index 765ee4b..a14f401 100644
--- a/system/composite/composite.h
+++ b/system/composite/composite.h
@@ -57,14 +57,6 @@
 #  error "USB composite device support is not enabled (CONFIG_USBDEV_COMPOSITE)"
 #endif
 
-#ifndef CONFIG_CDCACM
-#  error "USB CDC/ACM serial device support is not enabled (CONFIG_CDCACM)"
-#endif
-
-#ifndef CONFIG_CDCACM_COMPOSITE
-#  error "USB CDC/ACM serial composite device support is not enabled (CONFIG_CDCACM_COMPOSITE)"
-#endif
-
 /* Trace initialization *****************************************************/
 
 #ifndef CONFIG_USBDEV_TRACE_INITIALIDSET


[incubator-nuttx-apps] 02/02: composite: nxstyle fixes

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit 853439f0e769cfb1b9a8277273b561e6e0cad988
Author: Matias Nitsche <mn...@dc.uba.ar>
AuthorDate: Mon Jun 15 15:20:41 2020 -0300

    composite: nxstyle fixes
---
 system/composite/composite.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/composite/composite.h b/system/composite/composite.h
index a14f401..aaa8bf7 100644
--- a/system/composite/composite.h
+++ b/system/composite/composite.h
@@ -46,7 +46,9 @@
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
+
 /* Configuration ************************************************************/
+
 /* OS/Driver configuration checks */
 
 #ifndef CONFIG_USBDEV
@@ -138,7 +140,7 @@ struct composite_state_s
 extern struct composite_state_s g_composite;
 
 /****************************************************************************
- * Public Functions
+ * Public Function Prototypes
  ****************************************************************************/
 
 #endif /* __SYSTEM_COMPOSITE_COMPOSITE_H */