summaryrefslogtreecommitdiff
path: root/apps/examples/usbterm
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-28 18:14:55 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-28 18:14:55 +0000
commit6875348aa9e7edca7e3404cf25135ded052cde5c (patch)
tree299af02425127a965549141a2b9155d43e99e52a /apps/examples/usbterm
parent933dda93fc98d3cfd445371c9ea29363ce26f085 (diff)
downloadnuttx-6875348aa9e7edca7e3404cf25135ded052cde5c.tar.gz
nuttx-6875348aa9e7edca7e3404cf25135ded052cde5c.tar.bz2
nuttx-6875348aa9e7edca7e3404cf25135ded052cde5c.zip
Extend CDC/ACM driver so that can be connected/disconnected under software control; Add new NSH commands sercon and serdis that will connect and disconnect the CDC/ACM serial device
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4436 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/usbterm')
-rw-r--r--apps/examples/usbterm/usbterm.h4
-rw-r--r--apps/examples/usbterm/usbterm_main.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/examples/usbterm/usbterm.h b/apps/examples/usbterm/usbterm.h
index 241db610a..1dc2085dd 100644
--- a/apps/examples/usbterm/usbterm.h
+++ b/apps/examples/usbterm/usbterm.h
@@ -1,8 +1,8 @@
/****************************************************************************
* examples/usbterm/usbterm.h
*
- * Copyright (C) 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/apps/examples/usbterm/usbterm_main.c b/apps/examples/usbterm/usbterm_main.c
index 066c6f548..5bad8fffe 100644
--- a/apps/examples/usbterm/usbterm_main.c
+++ b/apps/examples/usbterm/usbterm_main.c
@@ -1,7 +1,7 @@
/****************************************************************************
* examples/usbterm/usbterm_main.c
*
- * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -199,7 +199,7 @@ int MAIN_NAME(int argc, char *argv[])
message(MAIN_STRING "Registering USB serial driver\n");
#ifdef CONFIG_CDCACM
- ret = cdcacm_initialize(0);
+ ret = cdcacm_initialize(0, NULL);
#else
ret = usbdev_serialinitialize(0);
#endif