Eliminate use of apps/system/usbmonitor. Use drivers/usbmonitor instead.

This commit is contained in:
Gregory Nutt
2016-06-30 13:09:22 -06:00
parent 7c34a77b54
commit a897fd4ccf
27 changed files with 168 additions and 43 deletions
+2 -2
View File
@@ -56,7 +56,7 @@
#endif
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_MIKROE_FLASH_CONFIG_PART
@@ -347,7 +347,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -47,7 +47,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include "lpc31.h"
@@ -137,7 +137,7 @@ int board_app_initialize(uintptr_t arg)
/* Start the USB Monitor */
syslog(LOG_ERR, "ERROR: Failed to start the USB monitor\n");
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
@@ -47,7 +47,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_STM32_OTGFS
@@ -225,7 +225,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
@@ -47,7 +47,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_STM32_OTGFS
@@ -47,7 +47,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_STM32_OTGFS
@@ -47,7 +47,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_STM32_OTGFS
@@ -152,7 +152,7 @@ int stm32_bringup(void)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR,
@@ -47,7 +47,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_STM32_OTGFS
@@ -172,7 +172,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/mmcsd.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_USBDEV
+2 -2
View File
@@ -49,7 +49,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include "sam4e-ek.h"
@@ -118,7 +118,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -64,7 +64,7 @@
#endif
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include "sam4s-xplained-pro.h"
@@ -169,7 +169,7 @@ int board_app_initialize(uintptr_t arg)
/* Start the USB Monitor */
syslog(LOG_INFO, "Starting USB Monitor\n");
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d (%d)\n", ret, errno);
+2 -2
View File
@@ -49,7 +49,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include "sama5d3-xplained.h"
@@ -155,7 +155,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -49,7 +49,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include "sama5d3x-ek.h"
@@ -170,7 +170,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Start USB monitor: %d\n", ret);
+2 -2
View File
@@ -47,7 +47,7 @@
#include <debug.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include <nuttx/fs/ramdisk.h>
@@ -286,7 +286,7 @@ int sam_bringup(void)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
_err("ERROR: Failed to start the USB monitor: %d\n", ret);
+2 -2
View File
@@ -47,7 +47,7 @@
#include <debug.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include <nuttx/fs/fs.h>
@@ -311,7 +311,7 @@ int sam_bringup(void)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
_err("ERROR: Failed to start the USB monitor: %d\n", ret);
+2 -2
View File
@@ -47,7 +47,7 @@
#include <debug.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include <nuttx/fs/fs.h>
@@ -477,7 +477,7 @@ int sam_bringup(void)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
_err("ERROR: Failed to start the USB monitor: %d\n", ret);
+2 -2
View File
@@ -55,7 +55,7 @@
#endif
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_USBDEV
@@ -305,7 +305,7 @@ int board_app_initialize(uintptr_t arg)
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -55,7 +55,7 @@
#endif
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifdef CONFIG_USBDEV
@@ -269,7 +269,7 @@ static int stm32_composite_initialize(void)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
ferr("ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -47,7 +47,7 @@
#include <nuttx/board.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include "stm32.h"
@@ -120,7 +120,7 @@ int board_app_initialize(uintptr_t arg)
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -56,7 +56,7 @@
#endif
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#ifndef CONFIG_STM32F429I_DISCO_FLASH_MINOR
@@ -371,7 +371,7 @@ int board_app_initialize(uintptr_t arg)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -46,7 +46,7 @@
#include <errno.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include <nuttx/binfmt/elf.h>
@@ -151,7 +151,7 @@ int stm32_bringup(void)
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
if (ret != OK)
{
uerr("ERROR: Failed to start USB monitor: %d\n", ret);
+2 -2
View File
@@ -52,7 +52,7 @@
#include <nuttx/usb/usbhost.h>
#ifdef CONFIG_USBMONITOR
# include <apps/usbmonitor.h>
# include <nuttx/usb/usbmonitor.h>
#endif
#include "pic32mx.h"
@@ -415,7 +415,7 @@ int board_app_initialize(uintptr_t arg)
{
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
ret = usbmonitor_start();
}
#endif