eacb4f0e84
commit69fcf3e849
Author: Alan Carvalho de Assis <acassis@gmail.com> Date: Sun Jul 16 08:39:33 2017 -0600 Fix spark/stm32_composite.c: board_composite_connect cannot be static commit28eb253401
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sun Jul 16 08:36:01 2017 -0600 Composite: Final review for coding style before merge commite6af1b9994
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sun Jul 16 07:41:38 2017 -0600 Composite: Simplify some intiialization of data structures. commit771c367411
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sun Jul 16 07:15:08 2017 -0600 Cosmetic changes to alignment. commit5d67ddda4e
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sun Jul 16 07:00:48 2017 -0600 USBMSC: Add missing logic to saved device description. commit0729151d29
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 17:11:41 2017 -0600 Trivial, costmetic commit74b916ff84
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 14:50:29 2017 -0600 Composite: Private functions need to be marked static. Move static functions out of 'Public Functions' to 'Private Functions' where they belong. Disable composite configuration 1 in all STM32 F1 configurations. commitcfaa4ece13
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 13:20:34 2017 -0600 Add some comments. commit8143563be6
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 12:33:10 2017 -0600 Spark: Need to condition out MSC logic in composite setup if there is no MSC in the composite. commit69d3a91ef1
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 11:03:33 2017 -0600 Composite: Remove all dependencies on CONFIG_SYSTEM_COMPOSITE_* configuration settings. Nothing in the OS can depend on external application settings. commit55a4388bbd
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 09:59:31 2017 -0600 All composite configurations now also support a dual CDC/ACM configuration. commit428f2147af
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 09:24:32 2017 -0600 Composite: Move board_msc* interfaces from apps/system/composite to the board specific OS logic where they belong. commitf1cc168a5c
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 08:56:33 2017 -0600 Refresh all composite configurations. commit246afcaa10
Merge:919877191d
02c6672868
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 08:22:26 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit919877191d
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jul 15 08:20:02 2017 -0600 Composite setup: Remove useless board_cdc* wrapper. commit82129cf8c6
Merge:f2cb8b252a
6537e4ea20
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jul 14 16:23:57 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commitf2cb8b252a
Author: Alan Carvalho de Assis <acassis@gmail.com> Date: Fri Jul 14 10:19:35 2017 -0600 Composite: Fix for another cloned typo. commit676cfd526a
Author: Alan Carvalho de Assis <acassis@gmail.com> Date: Fri Jul 14 09:11:37 2017 -0600 Composite: Fix some typos commit1ea0368c18
Author: Alan Carvalho de Assis <acassis@gmail.com> Date: Fri Jul 14 09:10:18 2017 -0600 Composite: ./stm3210e-eval/src/stm32_composite.c commite485caced9
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jul 14 09:08:17 2017 -0600 Composite: I don't think the original code should have forced minor=0. commit6443c29621
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jul 14 07:15:38 2017 -0600 Composite: Flesh out support for all of other configurations that support composite. commit23cbc28b05
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jul 14 06:59:45 2017 -0600 Detangle use of board_xyzclassobject() and board_xyzuninitialize() commit1674cb8c8e
Merge:6bc881a192
5033a6def7
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jul 13 13:57:40 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit6bc881a192
Merge:fe3af4941d
85b8d16d8c
Author: Gregory Nutt <gnutt@nuttx.org> Date: Tue Jul 11 12:24:07 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commitfe3af4941d
Merge:0f9ad16e18
1bc0eea143
Author: Gregory Nutt <gnutt@nuttx.org> Date: Mon Jul 10 11:07:36 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit0f9ad16e18
Merge:a4cd90d4ef
aa2e9c15a5
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jul 7 20:26:53 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commita4cd90d4ef
Merge:8a4be7175e
31f832d8c5
Author: Gregory Nutt <gnutt@nuttx.org> Date: Wed Jul 5 11:12:52 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit8a4be7175e
Merge:18a32ed2ca
ae1771454a
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jun 30 16:14:04 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit18a32ed2ca
Merge:aaa81ce497
6d8df90b79
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 29 10:18:16 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commitaaa81ce497
Merge:4eb548226b
8cb4636bb1
Author: Gregory Nutt <gnutt@nuttx.org> Date: Mon Jun 26 11:56:11 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit4eb548226b
Merge:2327f5a1b4
dc8eec0b61
Author: Gregory Nutt <gnutt@nuttx.org> Date: Mon Jun 19 17:27:00 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit2327f5a1b4
Merge:49cd279fc6
99bf0b522b
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jun 16 17:30:03 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit49cd279fc6
Merge:bb6a13f30a
46f86982ee
Author: Gregory Nutt <gnutt@nuttx.org> Date: Wed Jun 14 09:17:49 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commitbb6a13f30a
Merge:918480047a
ac93d4bda9
Author: Gregory Nutt <gnutt@nuttx.org> Date: Mon Jun 5 17:40:06 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit918480047a
Merge:e4d262436c
4526cd665e
Author: Gregory Nutt <gnutt@nuttx.org> Date: Sat Jun 3 08:52:31 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commite4d262436c
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jun 2 07:19:27 2017 -0600 SAMV71-Xult Composite: Now can switch between two different composite configurations dynamically. commit815257743d
Author: Gregory Nutt <gnutt@nuttx.org> Date: Fri Jun 2 07:11:57 2017 -0600 usbdev composite and SAMV7-Xult: Move board-specific USB composite configuration out of boardctl.c and into board-specific logic where it belongs. Add a configuration option to the boardctl() calls to support multiple composite device configurations dynamically. commitac13619dc5
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 17:03:58 2017 -0600 Cosmetic commit9dd41bdd2f
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 17:02:43 2017 -0600 Composite: More compile-related fixes commitfc1438c95d
Merge:049ccbfcbe
ff2b54a5e0
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 16:35:41 2017 -0600 Merge remote-tracking branch 'origin/master' into composite commit049ccbfcbe
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 16:35:16 2017 -0600 Composite: Add some structure definitions missed in first application of the patch. commitef33329e3a
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 16:14:46 2017 -0600 Add a warning commit89f77cd91a
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 16:11:27 2017 -0600 Fix some incomplete name changes commit0bb7af549a
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 15:09:50 2017 -0600 It is unnecessary to pack a structure that consists only of uint8_t data fields. commitbd9b548914
Author: Gregory Nutt <gnutt@nuttx.org> Date: Thu Jun 1 15:05:41 2017 -0600 Remove COMPILE_TIME_ASSERTION commit7e6f481581
Author: Frank Benkert <Frank.Benkert@avat.de> Date: Thu Jun 1 14:58:04 2017 -0600 Part II of the same big commit commitdcc9b07715
Author: Frank Benkert <Frank.Benkert@avat.de> Date: Thu Jun 1 14:08:22 2017 -0600 [[This is part 1 or several commits]] We developed a huge Changeset over a year ago to make USB Composite configuration dynamical and be able to instanciate the CDCACM multiple times inside this device. We use this feature to switch between one in normal and up to three CDCACMs in maintenance boot. The control path starts in “boardctl.c” where the configuration for the device is constructed. There are still a few issues which I’ll ask you to have a look at before this beast can be merged. 1. To be able to construct the data dynamically I have changed some USB-Structs to be packed. Maybe there are additional structs to change (just for completeness – not for current functionality). 2. I’ve added the Macro “COMPILE_TIME_ASSERTION” two times (in usbmsc_desc.c and in cdcacm_desc.c) to stay private. Maybe you’ll find a better place. It’s used to check the size of the structs against the assumptions. 3. I’ve changed the interface for some USB-Functions to receive also the dynamic configuration. Maybe this can be done more elegant. 4. The original NuttX (without the patch) seems to have problems with a Composite device holding a CDCACM and an MSC. The “USB SET CONFIGURATION” request does not to work at all. This makes the test fail under Windows and under Linux. Applying this patch doesn’t change anything – because it only changes the configuration – not the behavior. Maybe you’ll have a look at this problem before applying the patch.
244 lines
7.9 KiB
C
244 lines
7.9 KiB
C
/****************************************************************************
|
|
* drivers/usbdev/composite.h
|
|
*
|
|
* Copyright (C) 2011-2012, 2017 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 __DRIVERS_USBDEV_COMPOSITE_H
|
|
#define __DRIVERS_USBDEV_COMPOSITE_H 1
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <stdint.h>
|
|
|
|
#include <nuttx/usb/usb.h>
|
|
#include <nuttx/usb/usbdev.h>
|
|
#include <nuttx/usb/usbdev_trace.h>
|
|
|
|
#ifdef CONFIG_USBDEV_COMPOSITE
|
|
|
|
#ifdef CONFIG_CDCACM_COMPOSITE
|
|
# include <nuttx/usb/cdcacm.h>
|
|
# include "cdcacm.h"
|
|
#endif
|
|
|
|
#ifdef CONFIG_USBMSC_COMPOSITE
|
|
# include "usbmsc.h"
|
|
#endif
|
|
|
|
/****************************************************************************
|
|
* Pre-processor Definitions
|
|
****************************************************************************/
|
|
|
|
/* Configuration ************************************************************/
|
|
/* Packet sizes */
|
|
|
|
#ifndef CONFIG_COMPOSITE_EP0MAXPACKET
|
|
# define CONFIG_COMPOSITE_EP0MAXPACKET 64
|
|
#endif
|
|
|
|
/* Vendor and product IDs and strings */
|
|
|
|
#ifndef CONFIG_COMPOSITE_COMPOSITE
|
|
# ifndef CONFIG_COMPOSITE_VENDORID
|
|
# warning "CONFIG_COMPOSITE_VENDORID not defined"
|
|
# define CONFIG_COMPOSITE_VENDORID 0x03eb
|
|
# endif
|
|
|
|
# ifndef CONFIG_COMPOSITE_PRODUCTID
|
|
# warning "CONFIG_COMPOSITE_PRODUCTID not defined"
|
|
# define CONFIG_COMPOSITE_PRODUCTID 0x2022
|
|
# endif
|
|
|
|
# ifndef CONFIG_COMPOSITE_VERSIONNO
|
|
# define CONFIG_COMPOSITE_VERSIONNO (0x0101)
|
|
# endif
|
|
|
|
# ifndef CONFIG_COMPOSITE_VENDORSTR
|
|
# warning "No Vendor string specified"
|
|
# define CONFIG_COMPOSITE_VENDORSTR "NuttX"
|
|
# endif
|
|
|
|
# ifndef CONFIG_COMPOSITE_PRODUCTSTR
|
|
# warning "No Product string specified"
|
|
# define CONFIG_COMPOSITE_PRODUCTSTR "Composite Device"
|
|
# endif
|
|
|
|
# undef CONFIG_COMPOSITE_SERIALSTR
|
|
# define CONFIG_COMPOSITE_SERIALSTR "0101"
|
|
#endif
|
|
|
|
#undef CONFIG_COMPOSITE_CONFIGSTR
|
|
#define CONFIG_COMPOSITE_CONFIGSTR "Composite"
|
|
|
|
#ifdef CONFIG_USBDEV_SELFPOWERED
|
|
# define COMPOSITE_SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
|
|
#else
|
|
# define COMPOSITE_SELFPOWERED (0)
|
|
#endif
|
|
|
|
#ifdef CONFIG_USBDEV_REMOTEWAKEUP
|
|
# define COMPOSITE_REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
|
|
#else
|
|
# define COMPOSITE_REMOTEWAKEUP (0)
|
|
#endif
|
|
|
|
#define NUM_DEVICES_TO_HANDLE (4)
|
|
|
|
/* Descriptors **************************************************************/
|
|
/* These settings are not modifiable via the NuttX configuration */
|
|
|
|
#define COMPOSITE_CONFIGIDNONE (0) /* Config ID = 0 means to return to address mode */
|
|
#define COMPOSITE_CONFIGID (1) /* The only supported configuration ID */
|
|
|
|
/* String language */
|
|
|
|
#define COMPOSITE_STR_LANGUAGE (0x0409) /* en-us */
|
|
|
|
/* Descriptor strings */
|
|
|
|
#define COMPOSITE_MANUFACTURERSTRID (1)
|
|
#define COMPOSITE_PRODUCTSTRID (2)
|
|
#define COMPOSITE_SERIALSTRID (3)
|
|
#define COMPOSITE_CONFIGSTRID (4)
|
|
|
|
/* Everpresent MIN/MAX macros ***********************************************/
|
|
|
|
#ifndef MIN
|
|
# define MIN(a,b) ((a) < (b) ? (a) : (b))
|
|
#endif
|
|
|
|
#ifndef MAX
|
|
# define MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
#endif
|
|
|
|
/****************************************************************************
|
|
* Public Types
|
|
****************************************************************************/
|
|
|
|
struct composite_devobj_s
|
|
{
|
|
/* Device description given by the user code in the dynamic
|
|
* configuration.
|
|
*/
|
|
|
|
struct composite_devdesc_s compdesc;
|
|
|
|
/* Pointer to device class */
|
|
|
|
FAR struct usbdevclass_driver_s *dev;
|
|
};
|
|
|
|
/* This structure describes the internal state of the driver */
|
|
|
|
struct composite_dev_s
|
|
{
|
|
FAR struct usbdev_s *usbdev; /* usbdev driver pointer */
|
|
uint8_t config; /* Configuration number */
|
|
FAR struct usbdev_req_s *ctrlreq; /* Allocated control request */
|
|
uint8_t ndevices; /* Num devices in this composite device */
|
|
int cfgdescsize; /* Total size of the configuration descriptor: */
|
|
int ninterfaces; /* The total number of interfaces in this composite device */
|
|
|
|
struct composite_devobj_s device[NUM_DEVICES_TO_HANDLE]; /* Device class object */
|
|
};
|
|
|
|
/****************************************************************************
|
|
* Public Data
|
|
****************************************************************************/
|
|
|
|
extern const char g_compvendorstr[];
|
|
extern const char g_compproductstr[];
|
|
extern const char g_compserialstr[];
|
|
|
|
/****************************************************************************
|
|
* Public Function Prototypes
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: composite_mkstrdesc
|
|
*
|
|
* Description:
|
|
* Construct a string descriptor
|
|
*
|
|
****************************************************************************/
|
|
|
|
int composite_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc);
|
|
|
|
/****************************************************************************
|
|
* Name: composite_getepdesc
|
|
*
|
|
* Description:
|
|
* Return a pointer to the composite device descriptor
|
|
*
|
|
****************************************************************************/
|
|
|
|
#ifndef CONFIG_COMPOSITE_COMPOSITE
|
|
FAR const struct usb_devdesc_s *composite_getdevdesc(void);
|
|
#endif
|
|
|
|
/****************************************************************************
|
|
* Name: composite_mkcfgdesc
|
|
*
|
|
* Description:
|
|
* Construct the composite configuration descriptor
|
|
*
|
|
****************************************************************************/
|
|
|
|
#ifdef CONFIG_USBDEV_DUALSPEED
|
|
int16_t composite_mkcfgdesc(FAR struct composite_dev_s *priv,
|
|
FAR uint8_t *buf, uint8_t speed, uint8_t type);
|
|
#else
|
|
int16_t composite_mkcfgdesc(FAR struct composite_dev_s *priv,
|
|
FAR uint8_t *buf);
|
|
#endif
|
|
|
|
/****************************************************************************
|
|
* Name: composite_getqualdesc
|
|
*
|
|
* Description:
|
|
* Return a pointer to the composite qual descriptor
|
|
*
|
|
****************************************************************************/
|
|
|
|
#ifdef CONFIG_USBDEV_DUALSPEED
|
|
FAR const struct usb_qualdesc_s *composite_getqualdesc(void);
|
|
#endif
|
|
|
|
#endif /* CONFIG_USBDEV_COMPOSITE */
|
|
#endif /* __DRIVERS_USBDEV_COMPOSITE_H */
|