You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ar...@apache.org on 2023/08/07 03:23:43 UTC
[nuttx] branch master updated (d55e0cce9c -> 98fba71998)
This is an automated email from the ASF dual-hosted git repository.
archer pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from d55e0cce9c Documentation: Add documentation about sim:alsa defconfig
new fe6b0619f9 usbdev: Use composite devices as universal devices
new f52f04e131 composite: return ok when host send a duplicate setconfig message
new 419207d23d adb: Use composite devices as universal devices
new 98fba71998 usbadb: add usbadb boardctl
The 4 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:
boards/boardctl.c | 34 +++
boards/sim/sim/sim/src/sim_bringup.c | 4 +-
drivers/usbdev/Make.defs | 5 +-
drivers/usbdev/adb.c | 454 +++++++++++------------------------
drivers/usbdev/composite.c | 32 ++-
drivers/usbdev/composite.h | 91 +------
drivers/usbdev/composite_desc.c | 79 ++++++
include/nuttx/usb/adb.h | 14 +-
include/nuttx/usb/composite.h | 3 -
include/nuttx/usb/usbdev.h | 4 +-
include/sys/boardctl.h | 3 +
11 files changed, 308 insertions(+), 415 deletions(-)
[nuttx] 01/04: usbdev: Use composite devices as universal devices
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fe6b0619f9f06e3692eac7187984ee528a4e541f
Author: zhangyuan21 <zh...@xiaomi.com>
AuthorDate: Wed Jul 5 09:23:26 2023 +0800
usbdev: Use composite devices as universal devices
The enumeration process for composite and non-composite devices
has a lot of duplicate code. Treating the code for composite
devices as universal enumeration code can reduce redundant code.
Signed-off-by: zhangyuan21 <zh...@xiaomi.com>
---
drivers/usbdev/Make.defs | 5 ++-
drivers/usbdev/composite.c | 26 ++++--------
drivers/usbdev/composite.h | 91 ++++++-----------------------------------
drivers/usbdev/composite_desc.c | 79 +++++++++++++++++++++++++++++++++++
include/nuttx/usb/composite.h | 3 --
include/nuttx/usb/usbdev.h | 4 +-
6 files changed, 103 insertions(+), 105 deletions(-)
diff --git a/drivers/usbdev/Make.defs b/drivers/usbdev/Make.defs
index 8b09b0fcb7..427f66cada 100644
--- a/drivers/usbdev/Make.defs
+++ b/drivers/usbdev/Make.defs
@@ -35,7 +35,7 @@ ifeq ($(CONFIG_USBMSC),y)
endif
ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
- CSRCS += composite.c composite_desc.c
+ CSRCS += composite_desc.c
endif
ifeq ($(CONFIG_USBDEV_TRACE_STRINGS),y)
@@ -58,7 +58,8 @@ ifeq ($(CONFIG_NET_CDCECM),y)
CSRCS += cdcecm.c
endif
-CSRCS += usbdev_req.c usbdev_trace.c usbdev_trprintf.c
+CSRCS += composite.c usbdev_req.c
+CSRCS += usbdev_trace.c usbdev_trprintf.c
# Include USB device build support
diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index 463282b419..2cc1ba3955 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -40,8 +40,6 @@
#include "composite.h"
-#ifdef CONFIG_USBDEV_COMPOSITE
-
/****************************************************************************
* Private Types
****************************************************************************/
@@ -108,16 +106,6 @@ static const struct usbdevclass_driverops_s g_driverops =
composite_resume, /* resume */
};
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-const char g_compvendorstr[] = CONFIG_COMPOSITE_VENDORSTR;
-const char g_compproductstr[] = CONFIG_COMPOSITE_PRODUCTSTR;
-#ifndef CONFIG_COMPOSITE_BOARD_SERIALSTR
-const char g_compserialstr[] = CONFIG_COMPOSITE_SERIALSTR;
-#endif
-
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -512,7 +500,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
{
#ifdef CONFIG_USBDEV_DUALSPEED
ret = composite_mkcfgdesc(priv, ctrlreq->buf, dev->speed,
- ctrl->value[1]);
+ ctrl->value[1]);
#else
ret = composite_mkcfgdesc(priv, ctrlreq->buf);
#endif
@@ -527,6 +515,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
FAR struct usb_strdesc_s *buf =
(FAR struct usb_strdesc_s *)ctrlreq->buf;
+#ifdef CONFIG_USBDEV_COMPOSITE
if (strid < COMPOSITE_NSTRIDS)
{
ret = composite_mkstrdesc(strid, buf);
@@ -571,6 +560,9 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
}
}
}
+#else
+ ret = composite_mkstrdesc(strid, buf);
+#endif
}
break;
@@ -587,7 +579,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
case USB_REQ_SETCONFIGURATION:
{
- if (ctrl->type == 0)
+ if (ctrl->type == 0 && value != priv->config)
{
int i;
@@ -622,7 +614,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
case USB_REQ_SETINTERFACE:
{
if (ctrl->type == USB_REQ_RECIPIENT_INTERFACE &&
- priv->config == COMPOSITE_CONFIGID)
+ priv->config != COMPOSITE_CONFIGIDNONE)
{
ret = composite_classsetup(priv, dev, ctrl, dataout, outlen);
dispatched = true;
@@ -957,7 +949,7 @@ FAR void *composite_initialize(uint8_t ndevices,
if (ret < 0)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_DEVREGISTER),
- (uint16_t)-ret);
+ (uint16_t)-ret);
goto errout_with_alloc;
}
@@ -1061,5 +1053,3 @@ int composite_ep0submit(FAR struct usbdevclass_driver_s *driver,
return 0;
}
}
-
-#endif /* CONFIG_USBDEV_COMPOSITE */
diff --git a/drivers/usbdev/composite.h b/drivers/usbdev/composite.h
index 6024000553..308501579c 100644
--- a/drivers/usbdev/composite.h
+++ b/drivers/usbdev/composite.h
@@ -35,86 +35,21 @@
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
-#ifdef CONFIG_USBDEV_COMPOSITE
-
/****************************************************************************
* 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
+#ifdef CONFIG_USBDEV_COMPOSITE
+# define NUM_DEVICES_TO_HANDLE (8)
#else
-# define COMPOSITE_REMOTEWAKEUP (0)
+# define NUM_DEVICES_TO_HANDLE (1)
#endif
-#define NUM_DEVICES_TO_HANDLE (8)
-
-/* 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)
-
/****************************************************************************
* Public Types
****************************************************************************/
@@ -136,23 +71,24 @@ struct composite_devobj_s
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 */
+ FAR struct usbdev_s *usbdev; /* usbdev driver pointer */
+ FAR struct usbdev_req_s *ctrlreq; /* Allocated control request */
+ int cfgdescsize; /* Total size of the configuration descriptor: */
+ int ninterfaces; /* The total number of interfaces in this composite device */
+ uint8_t config; /* Configuration number */
+ uint8_t ndevices; /* Num devices in this composite device */
+ struct composite_devobj_s device[NUM_DEVICES_TO_HANDLE]; /* Device class object */
};
/****************************************************************************
* Public Data
****************************************************************************/
+#ifdef CONFIG_USBDEV_COMPOSITE
extern const char g_compvendorstr[];
extern const char g_compproductstr[];
extern const char g_compserialstr[];
+#endif
/****************************************************************************
* Public Function Prototypes
@@ -176,9 +112,7 @@ int composite_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc);
*
****************************************************************************/
-#ifndef CONFIG_COMPOSITE_COMPOSITE
FAR const struct usb_devdesc_s *composite_getdevdesc(void);
-#endif
/****************************************************************************
* Name: composite_mkcfgdesc
@@ -208,5 +142,4 @@ int16_t composite_mkcfgdesc(FAR struct composite_dev_s *priv,
FAR const struct usb_qualdesc_s *composite_getqualdesc(void);
#endif
-#endif /* CONFIG_USBDEV_COMPOSITE */
#endif /* __DRIVERS_USBDEV_COMPOSITE_H */
diff --git a/drivers/usbdev/composite_desc.c b/drivers/usbdev/composite_desc.c
index 1621f8a991..fd4661b84e 100644
--- a/drivers/usbdev/composite_desc.c
+++ b/drivers/usbdev/composite_desc.c
@@ -42,6 +42,75 @@
#ifdef CONFIG_USBDEV_COMPOSITE
+/****************************************************************************
+ * 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_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"
+
+#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
+
+/* Descriptors **************************************************************/
+
+/* 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)
+
/****************************************************************************
* Private Data
****************************************************************************/
@@ -102,6 +171,16 @@ static const struct usb_qualdesc_s g_qualdesc =
};
#endif
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const char g_compvendorstr[] = CONFIG_COMPOSITE_VENDORSTR;
+const char g_compproductstr[] = CONFIG_COMPOSITE_PRODUCTSTR;
+#ifndef CONFIG_COMPOSITE_BOARD_SERIALSTR
+const char g_compserialstr[] = CONFIG_COMPOSITE_SERIALSTR;
+#endif
+
/****************************************************************************
* Private Functions
****************************************************************************/
diff --git a/include/nuttx/usb/composite.h b/include/nuttx/usb/composite.h
index dcf2552ebb..22a665dcd2 100644
--- a/include/nuttx/usb/composite.h
+++ b/include/nuttx/usb/composite.h
@@ -28,8 +28,6 @@
#include <nuttx/config.h>
#include <nuttx/usb/usbdev.h>
-#ifdef CONFIG_USBDEV_COMPOSITE
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -142,5 +140,4 @@ int composite_ep0submit(FAR struct usbdevclass_driver_s *driver,
}
#endif
-#endif /* CONFIG_USBDEV_COMPOSITE */
#endif /* __INCLUDE_NUTTX_USB_COMPOSITE_H */
diff --git a/include/nuttx/usb/usbdev.h b/include/nuttx/usb/usbdev.h
index d5d493aa7f..9c2dc3f9b6 100644
--- a/include/nuttx/usb/usbdev.h
+++ b/include/nuttx/usb/usbdev.h
@@ -182,7 +182,7 @@ struct usbdev_devinfo_s
int epno[5]; /* Array holding the endpoint configuration for this device */
};
-#ifdef CONFIG_USBDEV_COMPOSITE
+struct usbdevclass_driver_s;
struct composite_devdesc_s
{
#ifdef CONFIG_USBDEV_DUALSPEED
@@ -213,7 +213,6 @@ struct composite_devdesc_s
struct usbdev_devinfo_s devinfo;
};
-#endif
/* struct usbdev_req_s - describes one i/o request */
@@ -315,7 +314,6 @@ struct usbdev_s
/* USB Device Class Implementations *****************************************/
-struct usbdevclass_driver_s;
struct usbdevclass_driverops_s
{
CODE int (*bind)(FAR struct usbdevclass_driver_s *driver,
[nuttx] 04/04: usbadb: add usbadb boardctl
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 98fba7199836e617516ee076ca75997212a87a7e
Author: zhangyuan21 <zh...@xiaomi.com>
AuthorDate: Sat Jul 29 16:05:16 2023 +0800
usbadb: add usbadb boardctl
Signed-off-by: zhangyuan21 <zh...@xiaomi.com>
---
boards/boardctl.c | 34 ++++++++++++++++++++++++++++++++++
boards/sim/sim/sim/src/sim_bringup.c | 4 +++-
drivers/usbdev/adb.c | 21 ++++++++++++++++-----
include/nuttx/usb/adb.h | 14 ++++++++++++--
include/sys/boardctl.h | 3 +++
5 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/boards/boardctl.c b/boards/boardctl.c
index ce6db3f745..2707bb161c 100644
--- a/boards/boardctl.c
+++ b/boards/boardctl.c
@@ -45,6 +45,7 @@
#endif
#ifdef CONFIG_BOARDCTL_USBDEVCTRL
+# include <nuttx/usb/adb.h>
# include <nuttx/usb/cdcacm.h>
# include <nuttx/usb/pl2303.h>
# include <nuttx/usb/usbmsc.h>
@@ -88,6 +89,39 @@ static inline int
switch (ctrl->usbdev)
{
+#if defined(CONFIG_USBADB) && !defined(CONFIG_USBADB_COMPOSITE)
+ case BOARDIOC_USBDEV_ADB: /* ADB class */
+ switch (ctrl->action)
+ {
+ case BOARDIOC_USBDEV_INITIALIZE: /* Initialize ADB device */
+ break;
+
+ case BOARDIOC_USBDEV_CONNECT: /* Connect the ADB device */
+ {
+ DEBUGASSERT(ctrl->handle != NULL);
+
+ *ctrl->handle = usbdev_adb_initialize();
+ if (*ctrl->handle == NULL)
+ {
+ ret = -EIO;
+ }
+ }
+ break;
+
+ case BOARDIOC_USBDEV_DISCONNECT: /* Disconnect the ADB device */
+ {
+ DEBUGASSERT(ctrl->handle != NULL && *ctrl->handle != NULL);
+ usbdev_adb_uninitialize(*ctrl->handle);
+ }
+ break;
+
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ break;
+#endif
+
#ifdef CONFIG_CDCACM
case BOARDIOC_USBDEV_CDCACM: /* CDC/ACM, not in a composite */
switch (ctrl->action)
diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c
index da5cc9d083..4f3f31a308 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -499,7 +499,9 @@ int sim_bringup(void)
rc_dummy_initialize(0);
#endif
-#if defined(CONFIG_USBADB) && !defined(CONFIG_USBADB_COMPOSITE)
+#if defined(CONFIG_USBADB) && \
+ !defined(CONFIG_USBADB_COMPOSITE) && \
+ !defined(CONFIG_BOARDCTL_USBDEVCTRL)
usbdev_adb_initialize();
#endif
diff --git a/drivers/usbdev/adb.c b/drivers/usbdev/adb.c
index b10bba5203..d0fa562daf 100644
--- a/drivers/usbdev/adb.c
+++ b/drivers/usbdev/adb.c
@@ -1929,18 +1929,29 @@ static void adb_char_on_connect(FAR struct usbdev_adb_s *priv, int connect)
* Initialize the Android Debug Bridge USB device driver.
*
* Returned Value:
- * 0 on success, -errno on failure
+ * A non-NULL "handle" is returned on success.
*
****************************************************************************/
-int usbdev_adb_initialize(void)
+FAR void *usbdev_adb_initialize(void)
{
struct composite_devdesc_s devdesc;
- FAR void *cdev;
usbdev_adb_get_composite_devdesc(&devdesc);
- cdev = composite_initialize(1, &devdesc);
- return cdev != NULL ? OK : -EINVAL;
+ return composite_initialize(1, &devdesc);
+}
+
+/****************************************************************************
+ * Name: usbdev_adb_uninitialize
+ *
+ * Description:
+ * Uninitialize the Android Debug Bridge USB device driver.
+ *
+ ****************************************************************************/
+
+void usbdev_adb_uninitialize(FAR void *handle)
+{
+ composite_uninitialize(handle);
}
/****************************************************************************
diff --git a/include/nuttx/usb/adb.h b/include/nuttx/usb/adb.h
index a38f812e18..73294d6868 100644
--- a/include/nuttx/usb/adb.h
+++ b/include/nuttx/usb/adb.h
@@ -61,11 +61,21 @@ extern "C"
* Initialize the Android Debug Bridge USB device driver.
*
* Returned Value:
- * 0 on success, -errno on failure
+ * A non-NULL "handle" is returned on success.
*
****************************************************************************/
-int usbdev_adb_initialize(void);
+FAR void *usbdev_adb_initialize(void);
+
+/****************************************************************************
+ * Name: usbdev_adb_uninitialize
+ *
+ * Description:
+ * Uninitialize the Android Debug Bridge USB device driver.
+ *
+ ****************************************************************************/
+
+void usbdev_adb_uninitialize(FAR void *handle);
/****************************************************************************
* Name: usbdev_adb_get_composite_devdesc
diff --git a/include/sys/boardctl.h b/include/sys/boardctl.h
index 6fd41b209f..9e70770091 100644
--- a/include/sys/boardctl.h
+++ b/include/sys/boardctl.h
@@ -331,6 +331,9 @@ struct boardioc_builtin_s
enum boardioc_usbdev_identifier_e
{
BOARDIOC_USBDEV_NONE = 0 /* Not valid */
+#ifdef CONFIG_USBADB
+ , BOARDIOC_USBDEV_ADB /* ADB */
+#endif
#ifdef CONFIG_CDCACM
, BOARDIOC_USBDEV_CDCACM /* CDC/ACM */
#endif
[nuttx] 02/04: composite: return ok when host send a duplicate setconfig message
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit f52f04e131e7463704a2e008b8304b4ee9b3fd7e
Author: zhangyuan21 <zh...@xiaomi.com>
AuthorDate: Fri Aug 4 14:19:57 2023 +0800
composite: return ok when host send a duplicate setconfig message
Signed-off-by: zhangyuan21 <zh...@xiaomi.com>
---
drivers/usbdev/composite.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index 2cc1ba3955..11a9c09795 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -579,10 +579,18 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
case USB_REQ_SETCONFIGURATION:
{
- if (ctrl->type == 0 && value != priv->config)
+ if (ctrl->type == 0)
{
int i;
+ if (priv->config == value)
+ {
+ /* Already configured -- Do nothing */
+
+ ret = OK;
+ break;
+ }
+
/* Save the configuration and inform the constituent
* classes
*/
[nuttx] 03/04: adb: Use composite devices as universal devices
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 419207d23dbb21bbb411cf59b4648ddd7a107e97
Author: zhangyuan21 <zh...@xiaomi.com>
AuthorDate: Thu Jul 6 03:17:30 2023 +0800
adb: Use composite devices as universal devices
Signed-off-by: zhangyuan21 <zh...@xiaomi.com>
---
drivers/usbdev/adb.c | 439 ++++++++++++++++-----------------------------------
1 file changed, 133 insertions(+), 306 deletions(-)
diff --git a/drivers/usbdev/adb.c b/drivers/usbdev/adb.c
index 6a75b11113..b10bba5203 100644
--- a/drivers/usbdev/adb.c
+++ b/drivers/usbdev/adb.c
@@ -44,10 +44,8 @@
#include <nuttx/board.h>
#endif
-#ifdef CONFIG_USBADB_COMPOSITE
-# include <nuttx/usb/composite.h>
-# include "composite.h"
-#endif
+#include <nuttx/usb/composite.h>
+#include "composite.h"
/****************************************************************************
* Pre-processor Definitions
@@ -97,18 +95,17 @@
# define USBADB_SERIALSTRID (3)
# define USBADB_CONFIGSTRID (4)
# define USBADB_INTERFACESTRID (5)
+# define USBADB_NSTRIDS (5)
#else
# define USBADB_INTERFACESTRID (1)
# define USBADB_NSTRIDS (1)
#endif
-#define USBADB_NCONFIGS (1)
-#define USBADB_CONFIGID (1)
-#define USBADB_CONFIGIDNONE (0)
+#define USBADB_NCONFIGS (1)
/* Length of ADB descriptor */
-#define USBADB_DESC_TOTALLEN 32
+#define USBADB_DESC_TOTALLEN (32)
/****************************************************************************
* Private Types
@@ -141,18 +138,12 @@ struct usbadb_rdreq_s
struct usbdev_adb_s
{
- FAR struct usbdev_s *usbdev; /* usbdev driver pointer */
-#ifdef CONFIG_USBADB_COMPOSITE
+ FAR struct composite_dev_s *cdev; /* composite dev pointer */
struct usbdev_devinfo_s devinfo;
-#endif
FAR struct usbdev_ep_s *epbulkin; /* Bulk IN endpoint structure */
FAR struct usbdev_ep_s *epbulkout; /* Bulk OUT endpoint structure */
- FAR struct usbdev_req_s *ctrlreq; /* Preallocated control request */
-
- uint8_t config; /* USB Configuration number */
-
struct sq_queue_s txfree; /* Available write request containers */
struct sq_queue_s rxpending; /* Pending read request containers */
@@ -280,18 +271,38 @@ static const struct usb_devdesc_s g_adb_devdesc =
MSBYTE(CONFIG_USBADB_VENDORID)
},
.product = /* Product ID */
- { LSBYTE(CONFIG_USBADB_PRODUCTID),
+ {
+ LSBYTE(CONFIG_USBADB_PRODUCTID),
MSBYTE(CONFIG_USBADB_PRODUCTID)
},
.device = /* Device ID */
- { LSBYTE(USBADB_VERSIONNO),
+ {
+ LSBYTE(USBADB_VERSIONNO),
MSBYTE(USBADB_VERSIONNO)
},
.imfgr = USBADB_MANUFACTURERSTRID, /* Manufacturer */
.iproduct = USBADB_PRODUCTSTRID, /* Product */
.serno = USBADB_SERIALSTRID, /* Serial number */
- .nconfigs = 1 /* Number of configurations */
+ .nconfigs = USBADB_NCONFIGS, /* Number of configurations */
+};
+
+# ifdef CONFIG_USBDEV_DUALSPEED
+static const struct usb_qualdesc_s g_adb_qualdesc =
+{
+ USB_SIZEOF_QUALDESC, /* len */
+ USB_DESC_TYPE_DEVICEQUALIFIER, /* type */
+ { /* usb */
+ LSBYTE(0x0200),
+ MSBYTE(0x0200)
+ },
+ 0, /* classid */
+ 0, /* subclass */
+ 0, /* protocol */
+ CONFIG_USBADB_EP0MAXPACKET, /* mxpacketsize */
+ USBADB_NCONFIGS, /* nconfigs */
+ 0, /* reserved */
};
+# endif
#endif
static const struct adb_cfgdesc_s g_adb_cfgdesc =
@@ -360,11 +371,7 @@ static int usbclass_copy_epdesc(int epid, FAR struct usb_epdesc_s *epdesc,
{
/* Endpoint address */
-#ifdef CONFIG_USBADB_COMPOSITE
epdesc->addr = USB_EPIN(devinfo->epno[USBADB_EP_BULKIN_IDX]);
-#else
- epdesc->addr = USB_EPIN(CONFIG_USBADB_EPBULKIN);
-#endif
#ifdef CONFIG_USBDEV_DUALSPEED
if (hispeed)
@@ -387,11 +394,7 @@ static int usbclass_copy_epdesc(int epid, FAR struct usb_epdesc_s *epdesc,
{
/* Endpoint address */
-#ifdef CONFIG_USBADB_COMPOSITE
epdesc->addr = USB_EPOUT(devinfo->epno[USBADB_EP_BULKOUT_IDX]);
-#else
- epdesc->addr = USB_EPOUT(CONFIG_USBADB_EPBULKOUT);
-#endif
#ifdef CONFIG_USBDEV_DUALSPEED
if (hispeed)
@@ -630,7 +633,7 @@ static void usbclass_resetconfig(FAR struct usbdev_adb_s *priv)
{
/* Are we configured? */
- if (priv->config != USBADB_CONFIGIDNONE)
+ if (priv->cdev->config != COMPOSITE_CONFIGIDNONE)
{
/* Yes.. but not anymore */
@@ -643,8 +646,6 @@ static void usbclass_resetconfig(FAR struct usbdev_adb_s *priv)
EP_DISABLE(priv->epbulkin);
EP_DISABLE(priv->epbulkout);
}
-
- priv->config = USBADB_CONFIGIDNONE;
}
/****************************************************************************
@@ -672,24 +673,16 @@ static int usbclass_setconfig(FAR struct usbdev_adb_s *priv, uint8_t config)
#endif
#ifdef CONFIG_USBDEV_DUALSPEED
- hispeed = (priv->usbdev->speed == USB_SPEED_HIGH);
+ hispeed = (priv->cdev->usbdev->speed == USB_SPEED_HIGH);
#endif
- if (config == priv->config)
- {
- /* Already configured -- Do nothing */
-
- usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_ALREADYCONFIGURED), 0);
- return 0;
- }
-
/* Discard the previous configuration data */
usbclass_resetconfig(priv);
/* Was this a request to simply discard the current configuration? */
- if (config == USBADB_CONFIGIDNONE)
+ if (config == COMPOSITE_CONFIGIDNONE)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_CONFIGNONE), 0);
return 0;
@@ -697,7 +690,7 @@ static int usbclass_setconfig(FAR struct usbdev_adb_s *priv, uint8_t config)
/* We only accept one configuration */
- if (config != USBADB_CONFIGID)
+ if (config != COMPOSITE_CONFIGID)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_CONFIGIDBAD), 0);
return -EINVAL;
@@ -705,13 +698,8 @@ static int usbclass_setconfig(FAR struct usbdev_adb_s *priv, uint8_t config)
/* Configure the IN bulk endpoint */
-#ifdef CONFIG_USBADB_COMPOSITE
usbclass_copy_epdesc(USBADB_EP_BULKIN_IDX, &epdesc,
&priv->devinfo, hispeed);
-#else
- usbclass_copy_epdesc(USBADB_EP_BULKIN_IDX, &epdesc, NULL, hispeed);
-#endif
-
ret = EP_CONFIGURE(priv->epbulkin, &epdesc, false);
if (ret < 0)
@@ -724,12 +712,8 @@ static int usbclass_setconfig(FAR struct usbdev_adb_s *priv, uint8_t config)
/* Configure the OUT bulk endpoint */
-#ifdef CONFIG_USBADB_COMPOSITE
usbclass_copy_epdesc(USBADB_EP_BULKOUT_IDX, &epdesc,
&priv->devinfo, hispeed);
-#else
- usbclass_copy_epdesc(USBADB_EP_BULKOUT_IDX, &epdesc, NULL, hispeed);
-#endif
ret = EP_CONFIGURE(priv->epbulkout, &epdesc, true);
if (ret < 0)
@@ -756,7 +740,6 @@ static int usbclass_setconfig(FAR struct usbdev_adb_s *priv, uint8_t config)
/* We are successfully configured. Char device is now active */
- priv->config = config;
adb_char_on_connect(priv, 1);
return OK;
@@ -766,23 +749,13 @@ errout:
}
/****************************************************************************
- * Name: usbclass_ep0incomplete
+ * Name: usbclass_mkcfgdesc
*
* Description:
- * Handle completion of EP0 control operations
+ * Construct the configuration descriptor
*
****************************************************************************/
-static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
- FAR struct usbdev_req_s *req)
-{
- if (req->result || req->xfrd != req->len)
- {
- usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_REQRESULT),
- (uint16_t)-req->result);
- }
-}
-
#ifdef CONFIG_USBDEV_DUALSPEED
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
FAR struct usbdev_devinfo_s *devinfo,
@@ -812,13 +785,8 @@ static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
memcpy(dest, &g_adb_cfgdesc, sizeof(g_adb_cfgdesc));
-#ifdef CONFIG_USBADB_COMPOSITE
usbclass_copy_epdesc(USBADB_EP_BULKIN_IDX, &epdesc[0], devinfo, hispeed);
usbclass_copy_epdesc(USBADB_EP_BULKOUT_IDX, &epdesc[1], devinfo, hispeed);
-#else
- usbclass_copy_epdesc(USBADB_EP_BULKIN_IDX, &epdesc[0], NULL, hispeed);
- usbclass_copy_epdesc(USBADB_EP_BULKOUT_IDX, &epdesc[1], NULL, hispeed);
-#endif
#ifdef CONFIG_USBADB_COMPOSITE
/* For composite device, apply possible offset to the interface numbers */
@@ -830,6 +798,14 @@ static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
return sizeof(g_adb_cfgdesc)+2*USB_SIZEOF_EPDESC;
}
+/****************************************************************************
+ * Name: usbclass_mkstrdesc
+ *
+ * Description:
+ * Construct the string descriptor
+ *
+ ****************************************************************************/
+
static int usbclass_mkstrdesc(uint8_t id, FAR struct usb_strdesc_s *strdesc)
{
FAR uint8_t *data = (FAR uint8_t *)(strdesc + 1);
@@ -925,18 +901,9 @@ static int usbclass_bind(FAR struct usbdevclass_driver_s *driver,
irqstate_t flags;
FAR struct usbdev_adb_s *priv = &((FAR struct adb_driver_s *)driver)->dev;
- usbtrace(TRACE_CLASSBIND, 0);
+ /* Bind the composite device */
- priv->usbdev = dev;
-
- priv->ctrlreq = usbdev_allocreq(dev->ep0, USBADB_MXDESCLEN);
- if (priv->ctrlreq == NULL)
- {
- usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_ALLOCCTRLREQ), 0);
- return -ENOMEM;
- }
-
- priv->ctrlreq->callback = usbclass_ep0incomplete;
+ priv->cdev = dev->ep0->priv;
/* Pre-allocate all endpoints... the endpoints will not be functional
* until the SET CONFIGURATION request is processed in usbclass_setconfig.
@@ -948,11 +915,7 @@ static int usbclass_bind(FAR struct usbdevclass_driver_s *driver,
/* Pre-allocate the IN bulk endpoint */
priv->epbulkin = DEV_ALLOCEP(dev,
-#ifdef CONFIG_USBADB_COMPOSITE
USB_EPIN(priv->devinfo.epno[USBADB_EP_BULKIN_IDX]),
-#else
- USB_EPIN(CONFIG_USBADB_EPBULKIN),
-#endif
true,
USB_EP_ATTR_XFER_BULK);
@@ -968,11 +931,7 @@ static int usbclass_bind(FAR struct usbdevclass_driver_s *driver,
/* Pre-allocate the OUT bulk endpoint */
priv->epbulkout = DEV_ALLOCEP(dev,
-#ifdef CONFIG_USBADB_COMPOSITE
USB_EPOUT(priv->devinfo.epno[USBADB_EP_BULKOUT_IDX]),
-#else
- USB_EPOUT(CONFIG_USBADB_EPBULKOUT),
-#endif
false,
USB_EP_ATTR_XFER_BULK);
@@ -1040,21 +999,6 @@ static int usbclass_bind(FAR struct usbdevclass_driver_s *driver,
leave_critical_section(flags);
}
- /* Report if we are selfpowered (unless we are part of a
- * composite device)
- */
-
-#ifndef CONFIG_USBADB_COMPOSITE
-#ifdef CONFIG_USBDEV_SELFPOWERED
- DEV_SETSELFPOWERED(dev);
-#endif
-
- /* And pull-up the data line for the soft connect function (unless we are
- * part of a composite device)
- */
-
- DEV_CONNECT(dev);
-#endif
return OK;
errout:
@@ -1076,8 +1020,6 @@ static void usbclass_unbind(FAR struct usbdevclass_driver_s *driver,
FAR struct usbdev_adb_s *priv;
int i;
- usbtrace(TRACE_CLASSUNBIND, 0);
-
#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0)
{
@@ -1127,14 +1069,6 @@ static void usbclass_unbind(FAR struct usbdevclass_driver_s *driver,
priv->epbulkout = NULL;
}
- /* Free the pre-allocated control request */
-
- if (priv->ctrlreq != NULL)
- {
- usbdev_freereq(dev->ep0, priv->ctrlreq);
- priv->ctrlreq = NULL;
- }
-
/* Free write requests that are not in use (which should be all
* of them
*/
@@ -1177,16 +1111,10 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
FAR const struct usb_ctrlreq_s *ctrl,
FAR uint8_t *dataout, size_t outlen)
{
+ FAR struct usbdev_adb_s *priv;
uint16_t value;
- uint16_t len;
int ret = -EOPNOTSUPP;
- FAR struct usbdev_adb_s *priv;
-#ifndef CONFIG_USBADB_COMPOSITE
- FAR struct usbdev_req_s *ctrlreq;
- bool cfg_req = true;
-#endif
-
#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0 || !ctrl)
{
@@ -1197,28 +1125,19 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
/* Extract reference to private data */
- usbtrace(TRACE_CLASSSETUP, ctrl->req);
priv = &((FAR struct adb_driver_s *)driver)->dev;
#ifdef CONFIG_DEBUG_FEATURES
- if (!priv || !priv->ctrlreq)
+ if (!priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
return -ENODEV;
}
#endif
-#ifndef CONFIG_USBADB_COMPOSITE
- ctrlreq = priv->ctrlreq;
-#endif
-
/* Extract the little-endian 16-bit values to host order */
value = GETUINT16(ctrl->value);
- len = GETUINT16(ctrl->len);
-
- uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
- ctrl->type, ctrl->req, value, GETUINT16(ctrl->index), len);
switch (ctrl->type & USB_REQ_TYPE_MASK)
{
@@ -1226,100 +1145,11 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
{
switch (ctrl->req)
{
-#ifndef CONFIG_USBADB_COMPOSITE
- case USB_REQ_GETDESCRIPTOR:
- {
- /* The value field specifies the descriptor type in the
- * MS byte and the descriptor index in the LS byte
- * (order is little endian)
- */
-
- switch (ctrl->value[1])
- {
- /* If the device is used in as part of a composite
- * device, then the device descriptor is provided by logic
- * in the composite device implementation.
- */
-
- case USB_DESC_TYPE_DEVICE:
- {
- ret = USB_SIZEOF_DEVDESC;
- memcpy(ctrlreq->buf, &g_adb_devdesc, ret);
- }
- break;
-
-#ifdef CONFIG_USBDEV_DUALSPEED
- case USB_DESC_TYPE_DEVICEQUALIFIER:
- break;
- case USB_DESC_TYPE_OTHERSPEEDCONFIG:
-#endif /* CONFIG_USBDEV_DUALSPEED */
- /* If the serial device is used in as part of a composite
- * device, then the configuration descriptor is provided by
- * logic in the composite device implementation.
- */
-
- case USB_DESC_TYPE_CONFIG:
- {
-#ifndef CONFIG_USBDEV_DUALSPEED
- ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL);
-#else
- ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL,
- dev->speed, ctrl->req);
-#endif
- }
- break;
-
- /* If the serial device is used in as part of a composite
- * device, then the language string descriptor is provided
- * by logic in the composite device implementation.
- */
-
- case USB_DESC_TYPE_STRING:
- {
- /* index == language code. */
-
- ret =
- usbclass_mkstrdesc(ctrl->value[0],
- (FAR struct usb_strdesc_s *)
- ctrlreq->buf);
- }
- break;
-
- default:
- {
- usbtrace(
- TRACE_CLSERROR(USBSER_TRACEERR_GETUNKNOWNDESC),
- value);
- }
- break;
- }
- }
- break;
-
- /* If the serial device is used in as part of a composite device,
- * then the overall composite class configuration is managed by
- * logic in the composite device implementation.
- */
-
- case USB_REQ_GETCONFIGURATION:
- {
- if (ctrl->type == USB_DIR_IN)
- {
- *(FAR uint8_t *)ctrlreq->buf = priv->config;
- ret = 1;
- }
- }
- break;
-#endif /* !CONFIG_USBADB_COMPOSITE */
-
case USB_REQ_SETCONFIGURATION:
{
if (ctrl->type == 0)
{
ret = usbclass_setconfig(priv, value);
-#ifndef CONFIG_USBADB_COMPOSITE
- cfg_req = false;
-#endif
}
}
break;
@@ -1348,38 +1178,6 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
}
}
-#ifndef CONFIG_USBADB_COMPOSITE
- /* Respond to the setup command if data was returned. On an error return
- * value (ret < 0), the USB driver will stall.
- */
-
- if (ret >= 0 && cfg_req)
- {
- ctrlreq->len = (len < ret) ? len : ret;
- ctrlreq->flags = USBDEV_REQFLAGS_NULLPKT;
-
- /* Send the response -- either directly to the USB controller or
- * indirectly in the case where this class is a member of a composite
- * device.
- */
-
- ret = EP_SUBMIT(dev->ep0, ctrlreq);
-
- if (ret < 0)
- {
- usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPRESPQ), (uint16_t)-ret);
- ctrlreq->result = OK;
- usbclass_ep0incomplete(dev->ep0, ctrlreq);
- }
- }
-#else
- /* Composite should send only one request for USB_REQ_SETCONFIGURATION.
- * Hence ADB driver cannot submit to ep0; composite has to handle it.
- */
-
- #warning composite_ep0submit() seems broken so skip it in case of composite
-#endif /* !CONFIG_USBADB_COMPOSITE */
-
/* Returning a negative value will cause a STALL */
return ret;
@@ -1399,7 +1197,6 @@ static void usbclass_disconnect(FAR struct usbdevclass_driver_s *driver,
FAR struct usbdev_s *dev)
{
FAR struct usbdev_adb_s *priv;
- irqstate_t flags;
usbtrace(TRACE_CLASSDISCONNECT, 0);
@@ -1423,23 +1220,9 @@ static void usbclass_disconnect(FAR struct usbdevclass_driver_s *driver,
}
#endif
- /* FIXME do we have to lock interrupts here ? */
-
- flags = enter_critical_section();
-
/* Reset the configuration */
usbclass_resetconfig(priv);
-
- leave_critical_section(flags);
-
- /* Perform the soft connect function so that we will we can be
- * re-enumerated (unless we are part of a composite device)
- */
-
-#ifndef CONFIG_USBDEV_COMPOSITE
- DEV_CONNECT(dev);
-#endif
}
/****************************************************************************
@@ -1457,10 +1240,7 @@ static void usbclass_suspend(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSUSPEND, 0);
- if (priv->config != USBADB_CONFIGIDNONE)
- {
- adb_char_on_connect(priv, 0);
- }
+ adb_char_on_connect(priv, 0);
}
/****************************************************************************
@@ -1478,10 +1258,7 @@ static void usbclass_resume(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSRESUME, 0);
- if (priv->config != USBADB_CONFIGIDNONE)
- {
- adb_char_on_connect(priv, 1);
- }
+ adb_char_on_connect(priv, 1);
}
/****************************************************************************
@@ -1513,23 +1290,15 @@ static int usbclass_classobject(int minor,
/* Initialize the USB class driver structure */
-#ifdef CONFIG_USBDEV_DUALSPEED
- alloc->drvr.speed = USB_SPEED_HIGH;
-#else
- alloc->drvr.speed = USB_SPEED_FULL;
-#endif
-
- alloc->drvr.ops = &g_adb_driverops;
+ alloc->drvr.ops = &g_adb_driverops;
sq_init(&alloc->dev.rxpending);
sq_init(&alloc->dev.txfree);
-#ifdef CONFIG_USBADB_COMPOSITE
- /* Save the caller provided device description (composite only) */
+ /* Save the caller provided device description */
memcpy(&alloc->dev.devinfo, devinfo,
sizeof(struct usbdev_devinfo_s));
-#endif
/* Initialize the char device structure */
@@ -1787,7 +1556,7 @@ static ssize_t adb_char_read(FAR struct file *filep, FAR char *buffer,
assert(len > 0 && buffer != NULL);
- if (priv->config == USBADB_CONFIGIDNONE)
+ if (priv->cdev->config == COMPOSITE_CONFIGIDNONE)
{
/* USB device not connected */
@@ -1912,7 +1681,7 @@ static ssize_t adb_char_write(FAR struct file *filep,
irqstate_t flags;
- if (priv->config == USBADB_CONFIGIDNONE)
+ if (priv->cdev->config == COMPOSITE_CONFIGIDNONE)
{
/* USB device not connected */
@@ -2152,6 +1921,7 @@ static void adb_char_on_connect(FAR struct usbdev_adb_s *priv, int connect)
* Public Functions
****************************************************************************/
+#ifndef CONFIG_USBADB_COMPOSITE
/****************************************************************************
* Name: usbdev_adb_initialize
*
@@ -2163,32 +1933,82 @@ static void adb_char_on_connect(FAR struct usbdev_adb_s *priv, int connect)
*
****************************************************************************/
-#ifndef CONFIG_USBADB_COMPOSITE
int usbdev_adb_initialize(void)
{
- int ret;
- FAR struct usbdevclass_driver_s *classdev;
- FAR struct adb_driver_s *drvr;
+ struct composite_devdesc_s devdesc;
+ FAR void *cdev;
- ret = usbclass_classobject(0, NULL, &classdev);
- if (ret)
- {
- nerr("usbclass_classobject failed: %d\n", ret);
- return ret;
- }
+ usbdev_adb_get_composite_devdesc(&devdesc);
+ cdev = composite_initialize(1, &devdesc);
+ return cdev != NULL ? OK : -EINVAL;
+}
- drvr = (FAR struct adb_driver_s *)classdev;
+/****************************************************************************
+ * Name: composite_getepdesc
+ *
+ * Description:
+ * Return a pointer to the raw device descriptor
+ *
+ ****************************************************************************/
- ret = usbdev_register(&drvr->drvr);
- if (ret)
- {
- nerr("usbdev_register failed: %d\n", ret);
- usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_DEVREGISTER), (uint16_t)-ret);
- usbclass_uninitialize(classdev);
- return ret;
- }
+FAR const struct usb_devdesc_s *composite_getdevdesc(void)
+{
+ return &g_adb_devdesc;
+}
- return OK;
+/****************************************************************************
+ * Name: composite_getqualdesc
+ *
+ * Description:
+ * Return a pointer to the raw qual descriptor
+ *
+ ****************************************************************************/
+
+# ifdef CONFIG_USBDEV_DUALSPEED
+FAR const struct usb_qualdesc_s *composite_getqualdesc(void)
+{
+ return &g_adb_qualdesc;
+}
+# endif
+
+/****************************************************************************
+ * Name: composite_mkcfgdesc
+ *
+ * Description:
+ * Construct the 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
+{
+# ifdef CONFIG_USBDEV_DUALSPEED
+ return usbclass_mkcfgdesc(buf,
+ &priv->device[0].compdesc.devinfo,
+ speed, type);
+# else
+ return usbclass_mkcfgdesc(buf,
+ &priv->device[0].compdesc.devinfo);
+# endif
+}
+
+/****************************************************************************
+ * Name: composite_mkstrdesc
+ *
+ * Description:
+ * Construct a string descriptor
+ *
+ ****************************************************************************/
+
+int composite_mkstrdesc(uint8_t id, FAR struct usb_strdesc_s *strdesc)
+{
+ return usbclass_mkstrdesc(id, strdesc);
}
#endif
@@ -2207,7 +2027,6 @@ int usbdev_adb_initialize(void)
*
****************************************************************************/
-#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBADB_COMPOSITE)
void usbdev_adb_get_composite_devdesc(struct composite_devdesc_s *dev)
{
memset(dev, 0, sizeof(struct composite_devdesc_s));
@@ -2222,5 +2041,13 @@ void usbdev_adb_get_composite_devdesc(struct composite_devdesc_s *dev)
dev->devinfo.ninterfaces = 1;
dev->devinfo.nstrings = USBADB_NSTRIDS;
dev->devinfo.nendpoints = USBADB_NUM_EPS;
-}
+
+ /* Default endpoint indexes, board-specific logic can override these */
+
+#ifndef CONFIG_USBADB_COMPOSITE
+ dev->devinfo.epno[USBADB_EP_BULKIN_IDX] =
+ USB_EPNO(CONFIG_USBADB_EPBULKIN);
+ dev->devinfo.epno[USBADB_EP_BULKOUT_IDX] =
+ USB_EPNO(CONFIG_USBADB_EPBULKOUT);
#endif
+}