You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by "raiden00pl (via GitHub)" <gi...@apache.org> on 2023/04/03 14:21:14 UTC
[GitHub] [nuttx] raiden00pl opened a new pull request, #8952: boards/stm32: add composite device configurations
raiden00pl opened a new pull request, #8952:
URL: https://github.com/apache/nuttx/pull/8952
## Summary
- stm32f4discovery: add composite device configuration
- stm32f4discovery/stm32_usbmsc.c: fix SD card initialization
- stm32f4discovery/stm32_mmcsd.c: remove redundant SCK pin configuration, it's already selected in board.h
- nucleo-144: add composite device configuration
- nucleo-h743zi: add composite device configuration
## Impact
## Testing
Added configuration
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] xiaoxiang781216 commented on pull request #8952: boards/stm32: add composite device configurations
Posted by "xiaoxiang781216 (via GitHub)" <gi...@apache.org>.
xiaoxiang781216 commented on PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#issuecomment-1518151748
@raiden00pl please fix the conflict.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] xiaoxiang781216 commented on pull request #8952: boards/stm32: add composite device configurations
Posted by "xiaoxiang781216 (via GitHub)" <gi...@apache.org>.
xiaoxiang781216 commented on PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#issuecomment-1534695196
@raiden00pl will you fix the remaining comment from @pkarashchenko ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] pkarashchenko commented on a diff in pull request #8952: boards/stm32: add composite device configurations
Posted by "pkarashchenko (via GitHub)" <gi...@apache.org>.
pkarashchenko commented on code in PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#discussion_r1183688102
##########
boards/arm/stm32f7/nucleo-144/src/stm32_composite.c:
##########
@@ -0,0 +1,347 @@
+/****************************************************************************
+ * boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <debug.h>
+#include <assert.h>
+
+#include <nuttx/usb/usbdev.h>
+#include <nuttx/usb/rndis.h>
+#include <nuttx/usb/cdcacm.h>
+#include <nuttx/usb/usbmsc.h>
+#include <nuttx/usb/composite.h>
+
+#include "stm32_otg.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define COMPOSITE0_DEV (3)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void *g_mschandle;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_mscclassobject
+ *
+ * Description:
+ * If the mass storage class driver is part of composite device, then
+ * its instantiation and configuration is a multi-step, board-specific,
+ * process (See comments for usbmsc_configure below). In this case,
+ * board-specific logic must provide board_mscclassobject().
+ *
+ * board_mscclassobject() is called from the composite driver. It must
+ * encapsulate the instantiation and configuration of the mass storage
+ * class and the return the mass storage device's class driver instance
+ * to the composite driver.
+ *
+ * Input Parameters:
+ * classdev - The location to return the mass storage class' device
+ * instance.
+ *
+ * Returned Value:
+ * 0 on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static int board_mscclassobject(int minor,
+ struct usbdev_devinfo_s *devinfo,
+ struct usbdevclass_driver_s **classdev)
+{
+ int ret;
+
+ DEBUGASSERT(g_mschandle == NULL);
+
+ /* Configure the mass storage device */
+
+ uinfo("Configuring with NLUNS=1\n");
+ ret = usbmsc_configure(1, &g_mschandle);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_configure failed: %d\n", -ret);
+ return ret;
+ }
+
+ uinfo("MSC handle=%p\n", g_mschandle);
+
+ /* Bind the LUN(s) */
+
+ uinfo("Bind LUN=0 to /dev/mmcsd0\n");
+ ret = usbmsc_bindlun(g_mschandle, "/dev/mmcsd0", 0, 0, 0, false);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_bindlun failed for LUN 1 at /dev/mmcsd0: %d\n",
+ ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ return ret;
+ }
+
+ /* Get the mass storage device's class object */
+
+ ret = usbmsc_classobject(g_mschandle, devinfo, classdev);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_classobject failed: %d\n", -ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ }
+
+ return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_mscuninitialize
+ *
+ * Description:
+ * Un-initialize the USB storage class driver.
+ * This is just an application specific wrapper for usbmsc_unitialize()
+ * that is called form the composite device logic.
+ *
+ * Input Parameters:
+ * classdev - The class driver instrance previously give to the composite
+ * driver by board_mscclassobject().
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void board_mscuninitialize(struct usbdevclass_driver_s *classdev)
+{
+ if (g_mschandle)
+ {
+ usbmsc_uninitialize(g_mschandle);
+ }
+
+ g_mschandle = NULL;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_composite_connect
+ *
+ * Description:
+ * Connect the USB composite device on the specified USB device port for
+ * configuration 0.
+ *
+ * Input Parameters:
+ * port - The USB device port.
+ *
+ * Returned Value:
+ * A non-NULL handle value is returned on success. NULL is returned on
+ * any failure.
+ *
+ ****************************************************************************/
+
+static void *board_composite0_connect(int port)
+{
+ struct composite_devdesc_s dev[COMPOSITE0_DEV];
+ int ifnobase = 0;
+ int strbase = COMPOSITE_NSTRIDS;
Review Comment:
```suggestion
int strbase = COMPOSITE_NSTRIDS;
```
##########
boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c:
##########
@@ -0,0 +1,347 @@
+/****************************************************************************
+ * boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <debug.h>
+#include <assert.h>
+
+#include <nuttx/usb/usbdev.h>
+#include <nuttx/usb/rndis.h>
+#include <nuttx/usb/cdcacm.h>
+#include <nuttx/usb/usbmsc.h>
+#include <nuttx/usb/composite.h>
+
+#include "stm32_otg.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define COMPOSITE0_DEV (3)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void *g_mschandle;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_mscclassobject
+ *
+ * Description:
+ * If the mass storage class driver is part of composite device, then
+ * its instantiation and configuration is a multi-step, board-specific,
+ * process (See comments for usbmsc_configure below). In this case,
+ * board-specific logic must provide board_mscclassobject().
+ *
+ * board_mscclassobject() is called from the composite driver. It must
+ * encapsulate the instantiation and configuration of the mass storage
+ * class and the return the mass storage device's class driver instance
+ * to the composite driver.
+ *
+ * Input Parameters:
+ * classdev - The location to return the mass storage class' device
+ * instance.
+ *
+ * Returned Value:
+ * 0 on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static int board_mscclassobject(int minor,
+ struct usbdev_devinfo_s *devinfo,
+ struct usbdevclass_driver_s **classdev)
+{
+ int ret;
+
+ DEBUGASSERT(g_mschandle == NULL);
+
+ /* Configure the mass storage device */
+
+ uinfo("Configuring with NLUNS=1\n");
+ ret = usbmsc_configure(1, &g_mschandle);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_configure failed: %d\n", -ret);
+ return ret;
+ }
+
+ uinfo("MSC handle=%p\n", g_mschandle);
+
+ /* Bind the LUN(s) */
+
+ uinfo("Bind LUN=0 to /dev/mmcsd0\n");
+ ret = usbmsc_bindlun(g_mschandle, "/dev/mmcsd0", 0, 0, 0, false);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_bindlun failed for LUN 1 at /dev/mmcsd0: %d\n",
+ ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ return ret;
+ }
+
+ /* Get the mass storage device's class object */
+
+ ret = usbmsc_classobject(g_mschandle, devinfo, classdev);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_classobject failed: %d\n", -ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ }
+
+ return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_mscuninitialize
+ *
+ * Description:
+ * Un-initialize the USB storage class driver.
+ * This is just an application specific wrapper for usbmsc_unitialize()
+ * that is called form the composite device logic.
+ *
+ * Input Parameters:
+ * classdev - The class driver instrance previously give to the composite
+ * driver by board_mscclassobject().
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void board_mscuninitialize(struct usbdevclass_driver_s *classdev)
+{
+ if (g_mschandle)
+ {
+ usbmsc_uninitialize(g_mschandle);
+ }
+
+ g_mschandle = NULL;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_composite_connect
+ *
+ * Description:
+ * Connect the USB composite device on the specified USB device port for
+ * configuration 0.
+ *
+ * Input Parameters:
+ * port - The USB device port.
+ *
+ * Returned Value:
+ * A non-NULL handle value is returned on success. NULL is returned on
+ * any failure.
+ *
+ ****************************************************************************/
+
+static void *board_composite0_connect(int port)
+{
+ struct composite_devdesc_s dev[COMPOSITE0_DEV];
+ int ifnobase = 0;
+ int strbase = COMPOSITE_NSTRIDS;
Review Comment:
```suggestion
int strbase = COMPOSITE_NSTRIDS;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] raiden00pl commented on pull request #8952: boards/stm32: add composite device configurations
Posted by "raiden00pl (via GitHub)" <gi...@apache.org>.
raiden00pl commented on PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#issuecomment-1496254106
Yes, they were all tested. They are based on the same IP core (dwc2 from Synopsys) and I hoped that one stm32 would work as a composite device. Unfortunately, the main problems were in USB drivers but at least some new configs were created.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] davids5 commented on a diff in pull request #8952: boards/stm32: add composite device configurations
Posted by "davids5 (via GitHub)" <gi...@apache.org>.
davids5 commented on code in PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#discussion_r1184660225
##########
boards/arm/stm32/stm32f4discovery/src/stm32_usbmsc.c:
##########
@@ -63,7 +63,7 @@ int board_usbmsc_initialize(int port)
*/
#ifndef CONFIG_NSH_BUILTIN_APPS
- return stm32_sdinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1);
+ return stm32_mmcsd_initialize(2, CONFIG_SYSTEM_USBMSC_DEVMINOR1)
Review Comment:
```suggestion
return stm32_mmcsd_initialize(2, CONFIG_SYSTEM_USBMSC_DEVMINOR1);
```
##########
boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h:
##########
@@ -196,6 +196,16 @@
GPIO_OUTPUT_CLEAR | GPIO_PORTF | GPIO_PIN12)
#define GPIO_NRF24L01_IRQ (GPIO_INPUT | GPIO_FLOAT | GPIO_PORTD | GPIO_PIN15)
+/* MMC/SD
+ * CS - PD15 (D9)
+ * NCD - PF12 (D8)
+ */
+
+#define GPIO_MMCSD_CS (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_50MHz | \
+ GPIO_OUTPUT_SET | GPIO_PORTD | GPIO_PIN15)
Review Comment:
```suggestion
GPIO_OUTPUT_SET | GPIO_PORTD | GPIO_PIN15)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] raiden00pl commented on pull request #8952: boards/stm32: add composite device configurations
Posted by "raiden00pl (via GitHub)" <gi...@apache.org>.
raiden00pl commented on PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#issuecomment-1538723693
@xiaoxiang781216 I prefer to keep the code as it is now.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] xiaoxiang781216 merged pull request #8952: boards/stm32: add composite device configurations
Posted by "xiaoxiang781216 (via GitHub)" <gi...@apache.org>.
xiaoxiang781216 merged PR #8952:
URL: https://github.com/apache/nuttx/pull/8952
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] pkarashchenko commented on a diff in pull request #8952: boards/stm32: add composite device configurations
Posted by "pkarashchenko (via GitHub)" <gi...@apache.org>.
pkarashchenko commented on code in PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#discussion_r1157569097
##########
boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c:
##########
@@ -0,0 +1,347 @@
+/****************************************************************************
+ * boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <debug.h>
+#include <assert.h>
+
+#include <nuttx/usb/usbdev.h>
+#include <nuttx/usb/rndis.h>
+#include <nuttx/usb/cdcacm.h>
+#include <nuttx/usb/usbmsc.h>
+#include <nuttx/usb/composite.h>
+
+#include "stm32_otg.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define COMPOSITE0_DEV (3)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void *g_mschandle;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_mscclassobject
+ *
+ * Description:
+ * If the mass storage class driver is part of composite device, then
+ * its instantiation and configuration is a multi-step, board-specific,
+ * process (See comments for usbmsc_configure below). In this case,
+ * board-specific logic must provide board_mscclassobject().
+ *
+ * board_mscclassobject() is called from the composite driver. It must
+ * encapsulate the instantiation and configuration of the mass storage
+ * class and the return the mass storage device's class driver instance
+ * to the composite driver.
+ *
+ * Input Parameters:
+ * classdev - The location to return the mass storage class' device
+ * instance.
+ *
+ * Returned Value:
+ * 0 on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static int board_mscclassobject(int minor,
+ struct usbdev_devinfo_s *devinfo,
+ struct usbdevclass_driver_s **classdev)
+{
+ int ret;
+
+ DEBUGASSERT(g_mschandle == NULL);
+
+ /* Configure the mass storage device */
+
+ uinfo("Configuring with NLUNS=1\n");
+ ret = usbmsc_configure(1, &g_mschandle);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_configure failed: %d\n", -ret);
+ return ret;
+ }
+
+ uinfo("MSC handle=%p\n", g_mschandle);
+
+ /* Bind the LUN(s) */
+
+ uinfo("Bind LUN=0 to /dev/mmcsd0\n");
+ ret = usbmsc_bindlun(g_mschandle, "/dev/mmcsd0", 0, 0, 0, false);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_bindlun failed for LUN 1 at /dev/mmcsd0: %d\n",
+ ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ return ret;
+ }
+
+ /* Get the mass storage device's class object */
+
+ ret = usbmsc_classobject(g_mschandle, devinfo, classdev);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_classobject failed: %d\n", -ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ }
+
+ return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_mscuninitialize
+ *
+ * Description:
+ * Un-initialize the USB storage class driver.
+ * This is just an application specific wrapper for usbmsc_unitialize()
+ * that is called form the composite device logic.
+ *
+ * Input Parameters:
+ * classdev - The class driver instrance previously give to the composite
+ * driver by board_mscclassobject().
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void board_mscuninitialize(struct usbdevclass_driver_s *classdev)
+{
+ if (g_mschandle)
+ {
+ usbmsc_uninitialize(g_mschandle);
+ }
+
+ g_mschandle = NULL;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_composite_connect
+ *
+ * Description:
+ * Connect the USB composite device on the specified USB device port for
+ * configuration 0.
+ *
+ * Input Parameters:
+ * port - The USB device port.
+ *
+ * Returned Value:
+ * A non-NULL handle value is returned on success. NULL is returned on
+ * any failure.
+ *
+ ****************************************************************************/
+
+static void *board_composite0_connect(int port)
+{
+ struct composite_devdesc_s dev[COMPOSITE0_DEV];
+ int ifnobase = 0;
+ int strbase = COMPOSITE_NSTRIDS;
+ int dev_idx = 0;
+ int epin = 1;
+ int epout = 1;
+
+#ifdef CONFIG_RNDIS_COMPOSITE
+ /* Configure the RNDIS USB device */
+
+ /* Ask the rndis driver to fill in the constants we didn't
+ * know here.
+ */
+
+ usbdev_rndis_get_composite_devdesc(&dev[dev_idx]);
+
+ /* Interfaces */
+
+ dev[dev_idx].devinfo.ifnobase = ifnobase;
+ dev[dev_idx].minor = 0;
+
+ /* Strings */
+
+ dev[dev_idx].devinfo.strbase = strbase;
+
+ /* Endpoints */
+
+ dev[dev_idx].devinfo.epno[RNDIS_EP_INTIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[RNDIS_EP_BULKIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[RNDIS_EP_BULKOUT_IDX] = epout++;
+
+ /* Count up the base numbers */
+
+ ifnobase += dev[dev_idx].devinfo.ninterfaces;
+ strbase += dev[dev_idx].devinfo.nstrings;
+
+ dev_idx += 1;
+#endif
+
+#ifdef CONFIG_CDCACM_COMPOSITE
+ /* Configure the CDC/ACM device */
+
+ /* Ask the cdcacm driver to fill in the constants we didn't
+ * know here.
+ */
+
+ cdcacm_get_composite_devdesc(&dev[dev_idx]);
+
+ /* Overwrite and correct some values... */
+
+ /* The callback functions for the CDC/ACM class */
+
+ dev[dev_idx].classobject = cdcacm_classobject;
+ dev[dev_idx].uninitialize = cdcacm_uninitialize;
+
+ /* Interfaces */
+
+ dev[dev_idx].devinfo.ifnobase = ifnobase; /* Offset to Interface-IDs */
+ dev[dev_idx].minor = 0; /* The minor interface number */
+
+ /* Strings */
+
+ dev[dev_idx].devinfo.strbase = strbase; /* Offset to String Numbers */
+
+ /* Endpoints */
+
+ dev[dev_idx].devinfo.epno[CDCACM_EP_INTIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[CDCACM_EP_BULKIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[CDCACM_EP_BULKOUT_IDX] = epout++;
+
+ /* Count up the base numbers */
+
+ ifnobase += dev[dev_idx].devinfo.ninterfaces;
+ strbase += dev[dev_idx].devinfo.nstrings;
+
+ dev_idx += 1;
Review Comment:
Nitpick:
```suggestion
dev_idx++;
```
##########
boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c:
##########
@@ -0,0 +1,347 @@
+/****************************************************************************
+ * boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <debug.h>
+#include <assert.h>
+
+#include <nuttx/usb/usbdev.h>
+#include <nuttx/usb/rndis.h>
+#include <nuttx/usb/cdcacm.h>
+#include <nuttx/usb/usbmsc.h>
+#include <nuttx/usb/composite.h>
+
+#include "stm32_otg.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define COMPOSITE0_DEV (3)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void *g_mschandle;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_mscclassobject
+ *
+ * Description:
+ * If the mass storage class driver is part of composite device, then
+ * its instantiation and configuration is a multi-step, board-specific,
+ * process (See comments for usbmsc_configure below). In this case,
+ * board-specific logic must provide board_mscclassobject().
+ *
+ * board_mscclassobject() is called from the composite driver. It must
+ * encapsulate the instantiation and configuration of the mass storage
+ * class and the return the mass storage device's class driver instance
+ * to the composite driver.
+ *
+ * Input Parameters:
+ * classdev - The location to return the mass storage class' device
+ * instance.
+ *
+ * Returned Value:
+ * 0 on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static int board_mscclassobject(int minor,
+ struct usbdev_devinfo_s *devinfo,
+ struct usbdevclass_driver_s **classdev)
+{
+ int ret;
+
+ DEBUGASSERT(g_mschandle == NULL);
+
+ /* Configure the mass storage device */
+
+ uinfo("Configuring with NLUNS=1\n");
+ ret = usbmsc_configure(1, &g_mschandle);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_configure failed: %d\n", -ret);
+ return ret;
+ }
+
+ uinfo("MSC handle=%p\n", g_mschandle);
+
+ /* Bind the LUN(s) */
+
+ uinfo("Bind LUN=0 to /dev/mmcsd0\n");
+ ret = usbmsc_bindlun(g_mschandle, "/dev/mmcsd0", 0, 0, 0, false);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_bindlun failed for LUN 1 at /dev/mmcsd0: %d\n",
+ ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ return ret;
+ }
+
+ /* Get the mass storage device's class object */
+
+ ret = usbmsc_classobject(g_mschandle, devinfo, classdev);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_classobject failed: %d\n", -ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ }
+
+ return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_mscuninitialize
+ *
+ * Description:
+ * Un-initialize the USB storage class driver.
+ * This is just an application specific wrapper for usbmsc_unitialize()
+ * that is called form the composite device logic.
+ *
+ * Input Parameters:
+ * classdev - The class driver instrance previously give to the composite
+ * driver by board_mscclassobject().
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void board_mscuninitialize(struct usbdevclass_driver_s *classdev)
+{
+ if (g_mschandle)
+ {
+ usbmsc_uninitialize(g_mschandle);
+ }
+
+ g_mschandle = NULL;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_composite_connect
+ *
+ * Description:
+ * Connect the USB composite device on the specified USB device port for
+ * configuration 0.
+ *
+ * Input Parameters:
+ * port - The USB device port.
+ *
+ * Returned Value:
+ * A non-NULL handle value is returned on success. NULL is returned on
+ * any failure.
+ *
+ ****************************************************************************/
+
+static void *board_composite0_connect(int port)
+{
+ struct composite_devdesc_s dev[COMPOSITE0_DEV];
+ int ifnobase = 0;
+ int strbase = COMPOSITE_NSTRIDS;
+ int dev_idx = 0;
+ int epin = 1;
+ int epout = 1;
+
+#ifdef CONFIG_RNDIS_COMPOSITE
+ /* Configure the RNDIS USB device */
+
+ /* Ask the rndis driver to fill in the constants we didn't
+ * know here.
+ */
+
+ usbdev_rndis_get_composite_devdesc(&dev[dev_idx]);
+
+ /* Interfaces */
+
+ dev[dev_idx].devinfo.ifnobase = ifnobase;
+ dev[dev_idx].minor = 0;
+
+ /* Strings */
+
+ dev[dev_idx].devinfo.strbase = strbase;
+
+ /* Endpoints */
+
+ dev[dev_idx].devinfo.epno[RNDIS_EP_INTIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[RNDIS_EP_BULKIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[RNDIS_EP_BULKOUT_IDX] = epout++;
+
+ /* Count up the base numbers */
+
+ ifnobase += dev[dev_idx].devinfo.ninterfaces;
+ strbase += dev[dev_idx].devinfo.nstrings;
+
+ dev_idx += 1;
Review Comment:
```suggestion
dev_idx++;
```
##########
boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c:
##########
@@ -0,0 +1,347 @@
+/****************************************************************************
+ * boards/arm/stm32h7/nucleo-h743zi/src/stm32_composite.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <debug.h>
+#include <assert.h>
+
+#include <nuttx/usb/usbdev.h>
+#include <nuttx/usb/rndis.h>
+#include <nuttx/usb/cdcacm.h>
+#include <nuttx/usb/usbmsc.h>
+#include <nuttx/usb/composite.h>
+
+#include "stm32_otg.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define COMPOSITE0_DEV (3)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void *g_mschandle;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_mscclassobject
+ *
+ * Description:
+ * If the mass storage class driver is part of composite device, then
+ * its instantiation and configuration is a multi-step, board-specific,
+ * process (See comments for usbmsc_configure below). In this case,
+ * board-specific logic must provide board_mscclassobject().
+ *
+ * board_mscclassobject() is called from the composite driver. It must
+ * encapsulate the instantiation and configuration of the mass storage
+ * class and the return the mass storage device's class driver instance
+ * to the composite driver.
+ *
+ * Input Parameters:
+ * classdev - The location to return the mass storage class' device
+ * instance.
+ *
+ * Returned Value:
+ * 0 on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static int board_mscclassobject(int minor,
+ struct usbdev_devinfo_s *devinfo,
+ struct usbdevclass_driver_s **classdev)
+{
+ int ret;
+
+ DEBUGASSERT(g_mschandle == NULL);
+
+ /* Configure the mass storage device */
+
+ uinfo("Configuring with NLUNS=1\n");
+ ret = usbmsc_configure(1, &g_mschandle);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_configure failed: %d\n", -ret);
+ return ret;
+ }
+
+ uinfo("MSC handle=%p\n", g_mschandle);
+
+ /* Bind the LUN(s) */
+
+ uinfo("Bind LUN=0 to /dev/mmcsd0\n");
+ ret = usbmsc_bindlun(g_mschandle, "/dev/mmcsd0", 0, 0, 0, false);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_bindlun failed for LUN 1 at /dev/mmcsd0: %d\n",
+ ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ return ret;
+ }
+
+ /* Get the mass storage device's class object */
+
+ ret = usbmsc_classobject(g_mschandle, devinfo, classdev);
+ if (ret < 0)
+ {
+ uerr("ERROR: usbmsc_classobject failed: %d\n", -ret);
+ usbmsc_uninitialize(g_mschandle);
+ g_mschandle = NULL;
+ }
+
+ return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_mscuninitialize
+ *
+ * Description:
+ * Un-initialize the USB storage class driver.
+ * This is just an application specific wrapper for usbmsc_unitialize()
+ * that is called form the composite device logic.
+ *
+ * Input Parameters:
+ * classdev - The class driver instrance previously give to the composite
+ * driver by board_mscclassobject().
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+static void board_mscuninitialize(struct usbdevclass_driver_s *classdev)
+{
+ if (g_mschandle)
+ {
+ usbmsc_uninitialize(g_mschandle);
+ }
+
+ g_mschandle = NULL;
+}
+#endif
+
+/****************************************************************************
+ * Name: board_composite_connect
+ *
+ * Description:
+ * Connect the USB composite device on the specified USB device port for
+ * configuration 0.
+ *
+ * Input Parameters:
+ * port - The USB device port.
+ *
+ * Returned Value:
+ * A non-NULL handle value is returned on success. NULL is returned on
+ * any failure.
+ *
+ ****************************************************************************/
+
+static void *board_composite0_connect(int port)
+{
+ struct composite_devdesc_s dev[COMPOSITE0_DEV];
+ int ifnobase = 0;
+ int strbase = COMPOSITE_NSTRIDS;
+ int dev_idx = 0;
+ int epin = 1;
+ int epout = 1;
+
+#ifdef CONFIG_RNDIS_COMPOSITE
+ /* Configure the RNDIS USB device */
+
+ /* Ask the rndis driver to fill in the constants we didn't
+ * know here.
+ */
+
+ usbdev_rndis_get_composite_devdesc(&dev[dev_idx]);
+
+ /* Interfaces */
+
+ dev[dev_idx].devinfo.ifnobase = ifnobase;
+ dev[dev_idx].minor = 0;
+
+ /* Strings */
+
+ dev[dev_idx].devinfo.strbase = strbase;
+
+ /* Endpoints */
+
+ dev[dev_idx].devinfo.epno[RNDIS_EP_INTIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[RNDIS_EP_BULKIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[RNDIS_EP_BULKOUT_IDX] = epout++;
+
+ /* Count up the base numbers */
+
+ ifnobase += dev[dev_idx].devinfo.ninterfaces;
+ strbase += dev[dev_idx].devinfo.nstrings;
+
+ dev_idx += 1;
+#endif
+
+#ifdef CONFIG_CDCACM_COMPOSITE
+ /* Configure the CDC/ACM device */
+
+ /* Ask the cdcacm driver to fill in the constants we didn't
+ * know here.
+ */
+
+ cdcacm_get_composite_devdesc(&dev[dev_idx]);
+
+ /* Overwrite and correct some values... */
+
+ /* The callback functions for the CDC/ACM class */
+
+ dev[dev_idx].classobject = cdcacm_classobject;
+ dev[dev_idx].uninitialize = cdcacm_uninitialize;
+
+ /* Interfaces */
+
+ dev[dev_idx].devinfo.ifnobase = ifnobase; /* Offset to Interface-IDs */
+ dev[dev_idx].minor = 0; /* The minor interface number */
+
+ /* Strings */
+
+ dev[dev_idx].devinfo.strbase = strbase; /* Offset to String Numbers */
+
+ /* Endpoints */
+
+ dev[dev_idx].devinfo.epno[CDCACM_EP_INTIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[CDCACM_EP_BULKIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[CDCACM_EP_BULKOUT_IDX] = epout++;
+
+ /* Count up the base numbers */
+
+ ifnobase += dev[dev_idx].devinfo.ninterfaces;
+ strbase += dev[dev_idx].devinfo.nstrings;
+
+ dev_idx += 1;
+#endif
+
+#ifdef CONFIG_USBMSC_COMPOSITE
+ /* Configure the mass storage device device */
+
+ /* Ask the usbmsc driver to fill in the constants we didn't
+ * know here.
+ */
+
+ usbmsc_get_composite_devdesc(&dev[dev_idx]);
+
+ /* Overwrite and correct some values... */
+
+ /* The callback functions for the USBMSC class */
+
+ dev[dev_idx].classobject = board_mscclassobject;
+ dev[dev_idx].uninitialize = board_mscuninitialize;
+
+ /* Interfaces */
+
+ dev[dev_idx].devinfo.ifnobase = ifnobase; /* Offset to Interface-IDs */
+ dev[dev_idx].minor = 0; /* The minor interface number */
+
+ /* Strings */
+
+ dev[dev_idx].devinfo.strbase = strbase; /* Offset to String Numbers */
+
+ /* Endpoints */
+
+ dev[dev_idx].devinfo.epno[USBMSC_EP_BULKIN_IDX] = epin++;
+ dev[dev_idx].devinfo.epno[USBMSC_EP_BULKOUT_IDX] = epout++;
+
+ /* Count up the base numbers */
+
+ ifnobase += dev[dev_idx].devinfo.ninterfaces;
+ strbase += dev[dev_idx].devinfo.nstrings;
+
+ dev_idx += 1;
Review Comment:
```suggestion
dev_idx++;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] raiden00pl commented on pull request #8952: boards/stm32: add composite device configurations
Posted by "raiden00pl (via GitHub)" <gi...@apache.org>.
raiden00pl commented on PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#issuecomment-1532924843
@xiaoxiang781216 conflict fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nuttx] davids5 commented on pull request #8952: boards/stm32: add composite device configurations
Posted by "davids5 (via GitHub)" <gi...@apache.org>.
davids5 commented on PR #8952:
URL: https://github.com/apache/nuttx/pull/8952#issuecomment-1496224839
@raiden00pl Did you rest this on the all the effected HW?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org