summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-21 12:19:12 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-21 12:19:12 -0600
commitd69015c33388480a8e3b2e7e76e9cadd7afec8b8 (patch)
treec92281223df74b11f3b5de2484b896113f588242
parentd97330a208ff6c2c3d1bbef437f83edc9fb59daa (diff)
downloadnuttx-d69015c33388480a8e3b2e7e76e9cadd7afec8b8.tar.gz
nuttx-d69015c33388480a8e3b2e7e76e9cadd7afec8b8.tar.bz2
nuttx-d69015c33388480a8e3b2e7e76e9cadd7afec8b8.zip
Cosmetic changes to USB host class driver files
-rw-r--r--nuttx/drivers/usbhost/usbhost_hidkbd.c1
-rw-r--r--nuttx/include/nuttx/usb/ohci.h2
-rw-r--r--nuttx/include/nuttx/usb/usbmsc.h19
3 files changed, 11 insertions, 11 deletions
diff --git a/nuttx/drivers/usbhost/usbhost_hidkbd.c b/nuttx/drivers/usbhost/usbhost_hidkbd.c
index e2995628f..dc09b919d 100644
--- a/nuttx/drivers/usbhost/usbhost_hidkbd.c
+++ b/nuttx/drivers/usbhost/usbhost_hidkbd.c
@@ -2198,6 +2198,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
tail = 0;
}
}
+
ret = nbytes;
/* Update the tail index (pehaps marking the buffer empty) */
diff --git a/nuttx/include/nuttx/usb/ohci.h b/nuttx/include/nuttx/usb/ohci.h
index c5f15246b..9f5315bbf 100644
--- a/nuttx/include/nuttx/usb/ohci.h
+++ b/nuttx/include/nuttx/usb/ohci.h
@@ -416,7 +416,7 @@ struct ohci_hcca_s
{
/* HccaInterrruptTable: 32x32-bit pointers to interrupt EDs */
- volatile uint32_t inttbl[HCCA_INTTBL_WSIZE];
+ volatile uint32_t inttbl[HCCA_INTTBL_WSIZE];
/* HccaFrameNumber: Current frame number and
* HccaPad1: Zero when frame no. updated
diff --git a/nuttx/include/nuttx/usb/usbmsc.h b/nuttx/include/nuttx/usb/usbmsc.h
index 325c665c5..140d2907f 100644
--- a/nuttx/include/nuttx/usb/usbmsc.h
+++ b/nuttx/include/nuttx/usb/usbmsc.h
@@ -102,7 +102,7 @@ extern "C"
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
struct usbdevclass_driver_s;
-EXTERN int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev);
+int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev);
#endif
/****************************************************************************
@@ -124,7 +124,7 @@ EXTERN int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev);
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
struct usbdevclass_driver_s;
-EXTERN void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev);
+void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev);
#endif
/************************************************************************************
@@ -149,7 +149,7 @@ EXTERN void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev);
*
************************************************************************************/
-EXTERN int usbmsc_configure(unsigned int nluns, void **handle);
+int usbmsc_configure(unsigned int nluns, void **handle);
/************************************************************************************
* Name: usbmsc_bindlun
@@ -171,9 +171,8 @@ EXTERN int usbmsc_configure(unsigned int nluns, void **handle);
*
************************************************************************************/
-EXTERN int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
- unsigned int lunno, off_t startsector, size_t nsectors,
- bool readonly);
+int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath, unsigned int lunno,
+ off_t startsector, size_t nsectors, bool readonly);
/************************************************************************************
* Name: usbmsc_unbindlun
@@ -190,7 +189,7 @@ EXTERN int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
*
************************************************************************************/
-EXTERN int usbmsc_unbindlun(FAR void *handle, unsigned int lunno);
+int usbmsc_unbindlun(FAR void *handle, unsigned int lunno);
/************************************************************************************
* Name: usbmsc_exportluns
@@ -208,7 +207,7 @@ EXTERN int usbmsc_unbindlun(FAR void *handle, unsigned int lunno);
************************************************************************************/
#if !defined(CONFIG_USBDEV_COMPOSITE) || !defined(CONFIG_USBMSC_COMPOSITE)
-EXTERN int usbmsc_exportluns(FAR void *handle);
+int usbmsc_exportluns(FAR void *handle);
#endif
/************************************************************************************
@@ -229,7 +228,7 @@ EXTERN int usbmsc_exportluns(FAR void *handle);
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
struct usbdevclass_driver_s;
-EXTERN int usbmsc_classobject(FAR void *handle, FAR struct usbdevclass_driver_s **classdev);
+int usbmsc_classobject(FAR void *handle, FAR struct usbdevclass_driver_s **classdev);
#endif
/************************************************************************************
@@ -249,7 +248,7 @@ EXTERN int usbmsc_classobject(FAR void *handle, FAR struct usbdevclass_driver_s
*
***********************************************************************************/
-EXTERN void usbmsc_uninitialize(FAR void *handle);
+void usbmsc_uninitialize(FAR void *handle);
#undef EXTERN
#if defined(__cplusplus)