You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/04/15 15:30:15 UTC
[incubator-nuttx] branch master updated (648a76b -> 6548b41)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 648a76b risc-v: add pm initialization functions.
new c2ecdae drivers/usbdev/usbmsc.c: Fix build error with DEBUGASSERT
new 6548b41 drivers/usbdev/usbmsc.c: Run nxstyle; fix complaints.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
drivers/usbdev/usbmsc.c | 46 ++++++++++++++++------------------------------
1 file changed, 16 insertions(+), 30 deletions(-)
[incubator-nuttx] 02/02: drivers/usbdev/usbmsc.c: Run nxstyle;
fix complaints.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6548b41cab6e9824baadeeef1e8cbd3be37f6020
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Wed Apr 15 08:41:49 2020 -0600
drivers/usbdev/usbmsc.c: Run nxstyle; fix complaints.
---
drivers/usbdev/usbmsc.c | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 2d31a12..b183cc0 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -74,10 +74,6 @@
#endif
/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
* Private Types
****************************************************************************/
@@ -146,15 +142,13 @@ static struct usbdevclass_driverops_s g_driverops =
NULL /* resume */
};
-/* Used to hand-off the state structure when the SCSI worker thread is started */
+/* Used to hand-off the state structure when the SCSI worker thread is
+ * started.
+ */
FAR struct usbmsc_dev_s *g_usbmsc_handoff;
/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
* Private Functions
****************************************************************************/
@@ -227,10 +221,6 @@ static void usbmsc_freereq(FAR struct usbdev_ep_s *ep,
}
/****************************************************************************
- * Class Driver Interfaces
- ****************************************************************************/
-
-/****************************************************************************
* Name: usbmsc_bind
*
* Description:
@@ -358,7 +348,9 @@ static int usbmsc_bind(FAR struct usbdevclass_driver_s *driver,
leave_critical_section(flags);
}
- /* Report if we are selfpowered (unless we are part of a composite device) */
+ /* Report if we are selfpowered (unless we are part of a composite
+ * device).
+ */
#ifndef CONFIG_USBMSC_COMPOSITE
#ifdef CONFIG_USBDEV_SELFPOWERED
@@ -896,10 +888,6 @@ static void usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
}
/****************************************************************************
- * Initialization/Un-Initialization
- ****************************************************************************/
-
-/****************************************************************************
* Name: usbmsc_lununinitialize
****************************************************************************/
@@ -922,10 +910,6 @@ static void usbmsc_lununinitialize(struct usbmsc_lun_s *lun)
****************************************************************************/
/****************************************************************************
- * Internal Interfaces
- ****************************************************************************/
-
-/****************************************************************************
* Name: usbmsc_setconfig
*
* Description:
@@ -1170,7 +1154,9 @@ void usbmsc_rdcomplete(FAR struct usbdev_ep_s *ep,
sq_addlast((FAR sq_entry_t *)privreq, &priv->rdreqlist);
leave_critical_section(flags);
- /* Signal the worker thread that there is received data to be processed */
+ /* Signal the worker thread that there is received data to be
+ * processed.
+ */
priv->theventset |= USBMSC_EVENT_RDCOMPLETE;
usbmsc_scsi_signal(priv);
@@ -1288,10 +1274,6 @@ static int usbmsc_sync_wait(FAR struct usbmsc_dev_s *priv)
}
/****************************************************************************
- * User Interfaces
- ****************************************************************************/
-
-/****************************************************************************
* Name: usbmsc_configure
*
* Description:
@@ -1562,7 +1544,9 @@ int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
lun->sectorsize = geo.geo_sectorsize;
lun->readonly = readonly;
- /* If the driver does not support the write method, then this is read-only */
+ /* If the driver does not support the write method, then this is read-
+ * only.
+ */
if (!inode->u.i_bops->write)
{
@@ -1724,7 +1708,9 @@ int usbmsc_exportluns(FAR void *handle)
DEBUGASSERT(g_usbmsc_handoff == NULL);
- /* Register the USB storage class driver (unless we are part of a composite device) */
+ /* Register the USB storage class driver (unless we are part of a composite
+ * device).
+ */
#ifndef CONFIG_USBMSC_COMPOSITE
ret = usbdev_register(&drvr->drvr);
[incubator-nuttx] 01/02: drivers/usbdev/usbmsc.c: Fix build error
with DEBUGASSERT
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c2ecdaecf7b32ad268cf9e65b437acb1bd4f45b2
Author: Juha Niskanen <ju...@haltian.com>
AuthorDate: Wed Apr 15 08:27:20 2020 -0600
drivers/usbdev/usbmsc.c: Fix build error with DEBUGASSERT
---
drivers/usbdev/usbmsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index a61a8b2..2d31a12 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -1856,7 +1856,7 @@ void usbmsc_uninitialize(FAR void *handle)
* have no option but to continue with the teardown.
*/
- DEBUGASSERT(ret == OK || ret == -ECANCLED);
+ DEBUGASSERT(ret == OK || ret == -ECANCELED);
}
while (ret < 0);