sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename usbhost_storageinit() to usbhost_msc_initialize(). Add calls to usbhost_cdcacm_initialize() is CONFIG_USBHOST_CDCACM is selected.

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-06 14:11:29 -06:00
parent 651c79327c
commit 691d7c9819
21 changed files with 294 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/NuttxPortingGuide.html
View File

@ -5523,7 +5523,7 @@ int kbd_decode(FAR struct lib_instream_s *stream, FAR struct kbd_getstate_s *sta
</p>
<p>
<b>Examples</b>:
The function <code>usbhost_storageinit()</code> in the file <code>drivers/usbhost/usbhost_storage.c</code>
The function <code>usbhost_msc_initialize()</code> in the file <code>drivers/usbhost/usbhost_storage.c</code>
</p>
</li>
<li>

19
configs/cloudctrl/src/stm32_usb.c
View File

@ -178,11 +178,26 @@ int stm32_usbhost_initialize(void)
*/
uvdbg("Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB mass storage class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class\n");
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class\n");
}
#endif
/* Then get an instance of the USB host interface */

16
configs/ea3131/src/lpc31_usbhost.c
View File

@ -190,12 +190,22 @@ int lpc31_usbhost_initialize(void)
#endif
#ifdef CONFIG_USBHOST_MSC
/* Register theUSB host Mass Storage Class */
/* Register the USB host Mass Storage Class */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
usyslog(LOG_ERR, "ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class\n");
}
#endif

19
configs/mikroe-stm32f4/src/stm32_usb.c
View File

@ -177,11 +177,26 @@ int stm32_usbhost_initialize(void)
*/
uvdbg("Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB host Mass Storage Class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

12
configs/olimex-lpc-h3131/src/lpc31_usbhost.c
View File

@ -191,13 +191,23 @@ int lpc31_usbhost_initialize(void)
#ifdef CONFIG_USBHOST_MSC
/* Register theUSB host Mass Storage Class */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class\n");
}
#endif
#ifdef CONFIG_USBHOST_HIDKBD
/* Register the USB host HID keyboard class driver */

16
configs/olimex-lpc1766stk/src/lpc17_nsh.c
View File

@ -257,13 +257,25 @@ static int nsh_usbhostinitialize(void)
}
#endif
#ifdef CONFIG_USBHOST_MSC
/* Initialize mass storage support */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class\n");
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the CDC/ACM serial class: %d\n", eret);
}
#endif
/* Then get an instance of the USB host interface */

21
configs/olimex-stm32-p207/src/stm32_usb.c
View File

@ -175,6 +175,8 @@ int stm32_usbhost_initialize(void)
* that we care about:
*/
uvdbg("Register class drivers\n");
#ifdef CONFIG_USBHOST_HUB
/* Initialize USB hub class support */
@ -185,14 +187,25 @@ int stm32_usbhost_initialize(void)
}
#endif
/* Initialize Mass Storage Class support */
#ifdef CONFIG_USBHOST_MSC
/* Register the USB host Mass Storage Class */
uvdbg("Register class drivers\n");
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

19
configs/open1788/src/lpc17_nsh.c
View File

@ -312,11 +312,26 @@ static int nsh_usbhostinitialize(void)
*/
syslog(LOG_INFO, "Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB host Mass Storage Class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class\n");
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

19
configs/pic32mx-starterkit/src/pic32mx_nsh.c
View File

@ -276,11 +276,26 @@ static int nsh_usbhostinitialize(void)
*/
syslog(LOG_INFO, "Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB host Mass Storage Class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class\n");
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

19
configs/pic32mx7mmb/src/pic32_nsh.c
View File

@ -286,11 +286,26 @@ static int nsh_usbhostinitialize(void)
*/
syslog(LOG_INFO, "Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB host Mass Storage Class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class\n");
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

12
configs/sama5d3-xplained/src/sam_usb.c
View File

@ -315,13 +315,23 @@ int sam_usbhost_initialize(void)
#ifdef CONFIG_USBHOST_MSC
/* Register theUSB host Mass Storage Class */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_HIDKBD
/* Register the USB host HID keyboard class driver */

12
configs/sama5d3x-ek/src/sam_usb.c
View File

@ -313,13 +313,23 @@ int sam_usbhost_initialize(void)
#ifdef CONFIG_USBHOST_MSC
/* Register the USB host Mass Storage Class */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_HIDKBD
/* Register the USB host HID keyboard class driver */

12
configs/sama5d4-ek/src/sam_usb.c
View File

@ -314,13 +314,23 @@ int sam_usbhost_initialize(void)
#ifdef CONFIG_USBHOST_MSC
/* Register the USB host Mass Storage Class */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_HIDKBD
/* Register the USB host HID keyboard class driver */

19
configs/shenzhou/src/stm32_usb.c
View File

@ -177,11 +177,26 @@ int stm32_usbhost_initialize(void)
*/
uvdbg("Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB mass storage class class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

19
configs/stm3220g-eval/src/stm32_usb.c
View File

@ -177,11 +177,26 @@ int stm32_usbhost_initialize(void)
*/
uvdbg("Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB mass storage class class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

19
configs/stm3240g-eval/src/stm32_usb.c
View File

@ -177,11 +177,26 @@ int stm32_usbhost_initialize(void)
*/
uvdbg("Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB mass storage class class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

18
configs/stm32f429i-disco/src/stm32_usb.c
View File

@ -184,13 +184,25 @@ int stm32_usbhost_initialize(void)
}
#endif
/* Register the USB host Mass Storage Class */
#ifdef CONFIG_USBHOST_MSC
/* Register the USB mass storage class class */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

16
configs/stm32f4discovery/src/stm32_usb.c
View File

@ -188,12 +188,22 @@ int stm32_usbhost_initialize(void)
#endif
#ifdef CONFIG_USBHOST_MSC
/* Initialize the mass storage class */
/* Register the USB mass storage class class */
ret = usbhost_storageinit();
ret = usbhost_msc_initialize();
if (ret != OK)
{
udbg("Failed to register the mass storage class\n");
udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif

18
configs/sure-pic32mx/src/pic32mx_nsh.c
View File

@ -278,11 +278,25 @@ static int nsh_usbhostinitialize(void)
syslog(LOG_INFO, "Register class drivers\n");
ret = usbhost_storageinit();
#ifdef CONFIG_USBHOST_MSC
/* Register the USB mass storage class class */
ret = usbhost_msc_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class\n");
syslog(LOG_ERR, "ERROR: Failed to register the mass storage class: %d\n", ret);
}
#endif
#ifdef CONFIG_USBHOST_CDCACM
/* Register the CDC/ACM serial class */
ret = usbhost_cdcacm_initialize();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
}
#endif
/* Then get an instance of the USB host interface */

4
drivers/usbhost/usbhost_storage.c
View File

@ -2268,7 +2268,7 @@ static int usbhost_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
****************************************************************************/
/****************************************************************************
* Name: usbhost_storageinit
* Name: usbhost_msc_initialize
*
* Description:
* Initialize the USB host storage class. This function should be called
@ -2284,7 +2284,7 @@ static int usbhost_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
*
****************************************************************************/
int usbhost_storageinit(void)
int usbhost_msc_initialize(void)
{
/* If we have been configured to use pre-allocated storage class instances,
* then place all of the pre-allocated USB host storage class instances

25
include/nuttx/usb/usbhost.h
View File

@ -1005,7 +1005,7 @@ int usbhost_hub_initialize(void);
#ifdef CONFIG_USBHOST_MSC
/****************************************************************************
* Name: usbhost_storageinit
* Name: usbhost_msc_initialize
*
* Description:
* Initialize the USB host storage class. This function should be called
@ -1021,7 +1021,28 @@ int usbhost_hub_initialize(void);
*
****************************************************************************/
int usbhost_storageinit(void);
int usbhost_msc_initialize(void);
#endif
#ifdef CONFIG_USBHOST_CDCACM
/****************************************************************************
* Name: usbhost_cdcacm_initialize
*
* Description:
* Initialize the USB host CDC/ACM class. This function should be called
* be platform-specific code in order to initialize and register support
* for the USB host CDC/ACM class.
*
* Input Parameters:
* None
*
* Returned Value:
* On success this function will return zero (OK); A negated errno value
* will be returned on failure.
*
****************************************************************************/
int usbhost_cdcacm_initialize(void);
#endif
#ifdef CONFIG_USBHOST_HIDKBD