From 8f0c521b7b0bc4722d46ba380a7592171eae4420 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 25 Jan 2012 23:04:17 +0000
Subject: More name changes: USBSER->PL2303 CDCSER->CDCACM

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4337 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/examples/README.txt             | 2 +-
 apps/examples/usbserial/main.c       | 8 ++++----
 apps/examples/usbterm/usbterm_main.c | 8 ++++----
 apps/nshlib/nsh.h                    | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'apps')

diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 1955b7a7d..b123a9d7e 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -1160,7 +1160,7 @@ examples/usbterm
 
   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
   (when defined). CONFIG_USBDEV_TRACE_INITIALIDSET.
 
diff --git a/apps/examples/usbserial/main.c b/apps/examples/usbserial/main.c
index d7bc4c56a..1c2ebd067 100644
--- a/apps/examples/usbserial/main.c
+++ b/apps/examples/usbserial/main.c
@@ -51,8 +51,8 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#ifdef CONFIG_CDCSER
-#  include <nuttx/usb/cdc_serial.h>
+#ifdef CONFIG_CDCACM
+#  include <nuttx/usb/cdcacm.h>
 #endif
 
 /****************************************************************************
@@ -215,8 +215,8 @@ int user_start(int argc, char *argv[])
   /* Initialize the USB serial driver */
 
   message("user_start: Registering USB serial driver\n");
-#ifdef CONFIG_CDCSER
-  ret = cdcser_initialize(0);
+#ifdef CONFIG_CDCACM
+  ret = cdcacm_initialize(0);
 #else
   ret = usbdev_serialinitialize(0);
 #endif
diff --git a/apps/examples/usbterm/usbterm_main.c b/apps/examples/usbterm/usbterm_main.c
index cb8435788..d51101dd7 100644
--- a/apps/examples/usbterm/usbterm_main.c
+++ b/apps/examples/usbterm/usbterm_main.c
@@ -53,8 +53,8 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#ifdef CONFIG_CDCSER
-#  include <nuttx/usb/cdc_serial.h>
+#ifdef CONFIG_CDCACM
+#  include <nuttx/usb/cdcacm.h>
 #endif
 
 #include "usbterm.h"
@@ -196,8 +196,8 @@ int MAIN_NAME(int argc, char *argv[])
   /* Initialize the USB serial driver */
 
   message(MAIN_STRING "Registering USB serial driver\n");
-#ifdef CONFIG_CDCSER
-  ret = cdcser_initialize(0);
+#ifdef CONFIG_CDCACM
+  ret = cdcacm_initialize(0);
 #else
   ret = usbdev_serialinitialize(0);
 #endif
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h
index 2ade559b1..9a5a49d42 100644
--- a/apps/nshlib/nsh.h
+++ b/apps/nshlib/nsh.h
@@ -82,9 +82,9 @@
 
 #undef HAVE_USB_CONSOLE
 #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
-#  elif defined(CONFIG_CDCSER) && defined(CONFIG_CDCSER_CONSOLE)
+#  elif defined(CONFIG_CDCACM) && defined(CONFIG_CDCACM_CONSOLE)
 #    define HAVE_USB_CONSOLE 1
 #  endif
 #endif
-- 
cgit v1.2.3