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

More name changes: USBSER->PL2303 CDCSER->CDCACM

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4337 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-01-25 23:04:17 +00:00
parent 29ecefa25a
commit 37b87116bf
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/README.txt
View File

@ -1160,7 +1160,7 @@ examples/usbterm
Error results are always shown in the trace output Error results are always shown in the trace output
Other relevant configuration options: CONFIG_CDCSER selected by the Other relevant configuration options: CONFIG_CDCACM selected by the
Prolifics emulation (not defined) and the CDC serial implementation Prolifics emulation (not defined) and the CDC serial implementation
(when defined). CONFIG_USBDEV_TRACE_INITIALIDSET. (when defined). CONFIG_USBDEV_TRACE_INITIALIDSET.

8
examples/usbserial/main.c
View File

@ -51,8 +51,8 @@
#include <nuttx/usb/usbdev.h> #include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h> #include <nuttx/usb/usbdev_trace.h>
#ifdef CONFIG_CDCSER #ifdef CONFIG_CDCACM
# include <nuttx/usb/cdc_serial.h> # include <nuttx/usb/cdcacm.h>
#endif #endif
/**************************************************************************** /****************************************************************************
@ -215,8 +215,8 @@ int user_start(int argc, char *argv[])
/* Initialize the USB serial driver */ /* Initialize the USB serial driver */
message("user_start: Registering USB serial driver\n"); message("user_start: Registering USB serial driver\n");
#ifdef CONFIG_CDCSER #ifdef CONFIG_CDCACM
ret = cdcser_initialize(0); ret = cdcacm_initialize(0);
#else #else
ret = usbdev_serialinitialize(0); ret = usbdev_serialinitialize(0);
#endif #endif

8
examples/usbterm/usbterm_main.c
View File

@ -53,8 +53,8 @@
#include <nuttx/usb/usbdev.h> #include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h> #include <nuttx/usb/usbdev_trace.h>
#ifdef CONFIG_CDCSER #ifdef CONFIG_CDCACM
# include <nuttx/usb/cdc_serial.h> # include <nuttx/usb/cdcacm.h>
#endif #endif
#include "usbterm.h" #include "usbterm.h"
@ -196,8 +196,8 @@ int MAIN_NAME(int argc, char *argv[])
/* Initialize the USB serial driver */ /* Initialize the USB serial driver */
message(MAIN_STRING "Registering USB serial driver\n"); message(MAIN_STRING "Registering USB serial driver\n");
#ifdef CONFIG_CDCSER #ifdef CONFIG_CDCACM
ret = cdcser_initialize(0); ret = cdcacm_initialize(0);
#else #else
ret = usbdev_serialinitialize(0); ret = usbdev_serialinitialize(0);
#endif #endif

4
nshlib/nsh.h
View File

@ -82,9 +82,9 @@
#undef HAVE_USB_CONSOLE #undef HAVE_USB_CONSOLE
#if defined(CONFIG_USBDEV) #if defined(CONFIG_USBDEV)
# if defined(CONFIG_USBSER) && defined(CONFIG_USBSER_CONSOLE) # if defined(CONFIG_PL2303) && defined(CONFIG_PL2303_CONSOLE)
# define HAVE_USB_CONSOLE 1 # define HAVE_USB_CONSOLE 1
# elif defined(CONFIG_CDCSER) && defined(CONFIG_CDCSER_CONSOLE) # elif defined(CONFIG_CDCACM) && defined(CONFIG_CDCACM_CONSOLE)
# define HAVE_USB_CONSOLE 1 # define HAVE_USB_CONSOLE 1
# endif # endif
#endif #endif