7b9ec306db
commit 99b41a291b78da39d530381db1aab688ef2469e0
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 11:04:13 2017 -0600
apps/system/composite: Remove configuration settings that are no longer used.
commit 668179495f0e5204ba51108ccbe7aad71a960367
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 09:26:49 2017 -0600
apps/system/composite: Restore USB tracing; remove unused field in a structure.
commit 23f1dd5e48b2e4eb6629f6e99a7de014627cdf89
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 08:58:14 2017 -0600
system/composite: Remove CDC/ACM and MSC configuration logic. This belongs in the OS composite initialization. Add and argument so that you can select the USB composite configuration to be attached.
commit f8711488f1eaeca777407fe09fb2967331f7f211
Merge: 00896040 234afcd8
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jul 14 16:25:48 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 00896040441da1b187d0b39cb2a9e3c393b28865
Merge: f913ea01 ae1eeada
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jul 13 13:59:25 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit f913ea0179da7a387414145b27d77524c6cbee88
Merge: bcbdd798 915b42f8
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jul 10 11:08:46 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit bcbdd798c60bb24fe03b884e32b892ce805cb093
Merge: 2219c02d 1657d1ff
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jul 7 20:28:30 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 2219c02ddb89c65e5257f681b73da5d6acc1513b
Merge: fe1e52a8 d81d9c41
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Wed Jul 5 11:12:09 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit fe1e52a83a4a419671b388ada7ed2c79d20604d4
Merge: 94f82d47 75f29d9d
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jun 30 16:14:36 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 94f82d473dc78157a38490edcc7ede010e106394
Merge: a11806ee ffe0640d
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 29 10:19:55 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit a11806ee5f45dd0534d00c85950ef2812098ead7
Merge: f29dc985 5f5f8878
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jun 26 11:57:00 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit f29dc98512c8945d839aaebacbf4a27205b988e4
Merge: 70faf0d1 d8759ffe
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jun 19 17:26:00 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 70faf0d17066f91dc53200bafcdf3ece41737db2
Merge: 7d3b1581 a7770590
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jun 16 17:33:46 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 7d3b1581427fae75d84348ccfc116f7669fc76af
Merge: b2c392d4 c8ae5f16
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jun 16 17:30:39 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit b2c392d4fe1d9f630e018d750319d1d9707c3b8a
Merge: 95eb2034 f3dc5bea
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jun 5 17:41:02 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 95eb20343b8ee856cf174157322797123cfeb573
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jun 2 07:09:44 2017 -0600
apps/system/composite: Add a configuration option to the boardctl() calls to support multiple composite device configurations dynamically.
commit 7652b678824a2edc6924c333ae4f2ed54ceae640
Author: Frank Benkert <Frank.Benkert@avat.de>
Date: Thu Jun 1 15:19:40 2017 -0600
Update to apps/system/compsite assocated with big changes to the composite device logic
229 lines
7.8 KiB
C
229 lines
7.8 KiB
C
/****************************************************************************
|
|
* system/composite/composite.h
|
|
*
|
|
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
|
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
* used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
****************************************************************************/
|
|
|
|
#ifndef __SYSTEM_COMPOSITE_COMPOSITE_H
|
|
#define __SYSTEM_COMPOSITE_COMPOSITE_H
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
#include <stdlib.h>
|
|
|
|
/****************************************************************************
|
|
* Pre-Processor Definitions
|
|
****************************************************************************/
|
|
/* Configuration ************************************************************/
|
|
/* OS/Driver configuration checkes */
|
|
|
|
#ifndef CONFIG_USBDEV
|
|
# error "USB device support is not enabled (CONFIG_USBDEV)"
|
|
#endif
|
|
|
|
#ifndef CONFIG_USBDEV_COMPOSITE
|
|
# 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
|
|
|
|
#ifndef CONFIG_USBMSC
|
|
# error "USB mass storage device support is not enabled (CONFIG_USBMSC)"
|
|
#endif
|
|
|
|
#ifndef CONFIG_USBMSC_COMPOSITE
|
|
# error "USB mass storage composite device support is not enabled (CONFIG_USBMSC_COMPOSITE)"
|
|
#endif
|
|
|
|
/* Add-on Mass Storagte Class default values */
|
|
|
|
#ifndef CONFIG_SYSTEM_COMPOSITE_NLUNS
|
|
# define CONFIG_SYSTEM_COMPOSITE_NLUNS 1
|
|
#endif
|
|
|
|
#ifndef CONFIG_SYSTEM_COMPOSITE_DEVMINOR1
|
|
# define CONFIG_SYSTEM_COMPOSITE_DEVMINOR1 0
|
|
#endif
|
|
|
|
#ifndef CONFIG_SYSTEM_COMPOSITE_DEVPATH1
|
|
# define CONFIG_SYSTEM_COMPOSITE_DEVPATH1 "/dev/mmcsd0"
|
|
#endif
|
|
|
|
#if CONFIG_SYSTEM_COMPOSITE_NLUNS > 1
|
|
# ifndef CONFIG_SYSTEM_COMPOSITE_DEVMINOR2
|
|
# error "CONFIG_SYSTEM_COMPOSITE_DEVMINOR2 for LUN=2"
|
|
# endif
|
|
# ifndef CONFIG_SYSTEM_COMPOSITE_DEVPATH2
|
|
# error "CONFIG_SYSTEM_COMPOSITE_DEVPATH2 for LUN=2"
|
|
# endif
|
|
# if CONFIG_SYSTEM_COMPOSITE_NLUNS > 2
|
|
# ifndef CONFIG_SYSTEM_COMPOSITE_DEVMINOR3
|
|
# error "CONFIG_SYSTEM_COMPOSITE_DEVMINOR2 for LUN=3"
|
|
# endif
|
|
# ifndef CONFIG_SYSTEM_COMPOSITE_DEVPATH2
|
|
# error "CONFIG_SYSTEM_COMPOSITE_DEVPATH2 for LUN=3"
|
|
# endif
|
|
# if CONFIG_SYSTEM_COMPOSITE_NLUNS > 3
|
|
# error "CONFIG_SYSTEM_COMPOSITE_NLUNS must be {1,2,3}"
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
/* Add-on CDC/ACM default values */
|
|
|
|
#ifndef CONFIG_SYSTEM_COMPOSITE_TTYUSB
|
|
# define CONFIG_SYSTEM_COMPOSITE_TTYUSB 0
|
|
#endif
|
|
|
|
#ifndef CONFIG_SYSTEM_COMPOSITE_SERDEV
|
|
# if CONFIG_SYSTEM_COMPOSITE_TTYUSB != 0
|
|
# error "Serial device unknown (CONFIG_SYSTEM_COMPOSITE_SERDEV)"
|
|
# elif defined(CONFIG_CDCACM)
|
|
# define CONFIG_SYSTEM_COMPOSITE_SERDEV "/dev/ttyACM0"
|
|
# else
|
|
# define CONFIG_SYSTEM_COMPOSITE_SERDEV "/dev/ttyUSB0"
|
|
# endif
|
|
#endif
|
|
|
|
#ifndef CONFIG_SYSTEM_COMPOSITE_BUFSIZE
|
|
# define CONFIG_SYSTEM_COMPOSITE_BUFSIZE 256
|
|
#endif
|
|
|
|
/* Trace initialization *****************************************************/
|
|
|
|
#ifndef CONFIG_USBDEV_TRACE_INITIALIDSET
|
|
# define CONFIG_USBDEV_TRACE_INITIALIDSET 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYSTEM_COMPOSITE_TRACEINIT
|
|
# define TRACE_INIT_BITS (TRACE_INIT_BIT)
|
|
#else
|
|
# define TRACE_INIT_BITS (0)
|
|
#endif
|
|
|
|
#define TRACE_ERROR_BITS (TRACE_DEVERROR_BIT|TRACE_CLSERROR_BIT)
|
|
|
|
#ifdef CONFIG_SYSTEM_COMPOSITE_TRACECLASS
|
|
# define TRACE_CLASS_BITS (TRACE_CLASS_BIT|TRACE_CLASSAPI_BIT|TRACE_CLASSSTATE_BIT)
|
|
#else
|
|
# define TRACE_CLASS_BITS (0)
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYSTEM_COMPOSITE_TRACETRANSFERS
|
|
# define TRACE_TRANSFER_BITS (TRACE_OUTREQQUEUED_BIT|TRACE_INREQQUEUED_BIT|TRACE_READ_BIT|\
|
|
TRACE_WRITE_BIT|TRACE_COMPLETE_BIT)
|
|
#else
|
|
# define TRACE_TRANSFER_BITS (0)
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYSTEM_COMPOSITE_TRACECONTROLLER
|
|
# define TRACE_CONTROLLER_BITS (TRACE_EP_BIT|TRACE_DEV_BIT)
|
|
#else
|
|
# define TRACE_CONTROLLER_BITS (0)
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYSTEM_COMPOSITE_TRACEINTERRUPTS
|
|
# define TRACE_INTERRUPT_BITS (TRACE_INTENTRY_BIT|TRACE_INTDECODE_BIT|TRACE_INTEXIT_BIT)
|
|
#else
|
|
# define TRACE_INTERRUPT_BITS (0)
|
|
#endif
|
|
|
|
#define TRACE_BITSET (TRACE_INIT_BITS|TRACE_ERROR_BITS|TRACE_CLASS_BITS|\
|
|
TRACE_TRANSFER_BITS|TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS)
|
|
|
|
/****************************************************************************
|
|
* Public Types
|
|
****************************************************************************/
|
|
|
|
/* All global variables used by this add-on are packed into a structure in
|
|
* order to avoid name collisions.
|
|
*/
|
|
|
|
struct composite_state_s
|
|
{
|
|
/* This is the handle that references to this particular USB composite
|
|
* driver instance. It is only needed if the add-on is built using
|
|
* CONFIG_NSH_BUILTIN_APPS. In this case, the value of the driver handle
|
|
* must be remembered between the 'conn' and 'disconn' commands.
|
|
*/
|
|
|
|
FAR void *cmphandle; /* Composite device handle */
|
|
|
|
/* Serial file descriptors */
|
|
|
|
#if !defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_DISABLE_SIGNALS)
|
|
int outfd; /* Blocking write-only */
|
|
int infd; /* Non-blockig read-only */
|
|
#endif
|
|
|
|
/* Heap usage samples. These are useful for checking USB storage memory
|
|
* usage and for tracking down memoryh leaks.
|
|
*/
|
|
|
|
#ifdef CONFIG_SYSTEM_COMPOSITE_DEBUGMM
|
|
struct mallinfo mmstart; /* Memory usage before the connection */
|
|
struct mallinfo mmprevious; /* The last memory usage sample */
|
|
struct mallinfo mmcurrent; /* The current memory usage sample */
|
|
#endif
|
|
|
|
/* Serial I/O buffer */
|
|
|
|
#if !defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_DISABLE_SIGNALS)
|
|
uint8_t serbuf[CONFIG_SYSTEM_COMPOSITE_BUFSIZE];
|
|
#endif
|
|
};
|
|
|
|
/****************************************************************************
|
|
* Public Data
|
|
****************************************************************************/
|
|
|
|
/* All global variables used by this add-on are packed into a structure in
|
|
* order to avoid name collisions.
|
|
*/
|
|
|
|
extern struct composite_state_s g_composite;
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
#endif /* __SYSTEM_COMPOSITE_COMPOSITE_H */
|