diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-29 21:53:28 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-29 21:53:28 +0000 |
commit | b34d35b3284b3c7aae5a7190afea6ba7ef9b6f05 (patch) | |
tree | 358673f55511cec814532fbf08a11847936c38cf /apps/examples/usbserial | |
parent | 157e80bb9dd6959a83a8f844318b42b0dc8b7beb (diff) | |
download | px4-firmware-b34d35b3284b3c7aae5a7190afea6ba7ef9b6f05.tar.gz px4-firmware-b34d35b3284b3c7aae5a7190afea6ba7ef9b6f05.tar.bz2 px4-firmware-b34d35b3284b3c7aae5a7190afea6ba7ef9b6f05.zip |
A little more work (but not much progress) on the PIC32 USB device driver
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4440 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'apps/examples/usbserial')
-rw-r--r-- | apps/examples/usbserial/host.c | 6 | ||||
-rw-r--r-- | apps/examples/usbserial/main.c | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/apps/examples/usbserial/host.c b/apps/examples/usbserial/host.c index 751b7530c..dfa288f44 100644 --- a/apps/examples/usbserial/host.c +++ b/apps/examples/usbserial/host.c @@ -66,7 +66,11 @@ # endif #endif -#define DEFAULT_TTYDEV "/dev/ttyUSB0" +#ifdef CONFIG_CDCACM +# define DEFAULT_TTYDEV "/dev/ttyACM0" +#else +# define DEFAULT_TTYDEV "/dev/ttyUSB0" +#endif #define BUFFER_SIZE 1024 /**************************************************************************** diff --git a/apps/examples/usbserial/main.c b/apps/examples/usbserial/main.c index 7ad9d0d9c..eea905c98 100644 --- a/apps/examples/usbserial/main.c +++ b/apps/examples/usbserial/main.c @@ -125,6 +125,12 @@ # endif #endif +#ifdef CONFIG_CDCACM +# define USBSER_DEVNAME "/dev/ttyACM0" +#else +# define USBSER_DEVNAME "/dev/ttyUSB0" +#endif + #define IOBUFFER_SIZE 256 /**************************************************************************** @@ -246,11 +252,11 @@ int user_start(int argc, char *argv[]) do { message("user_start: Opening USB serial driver\n"); - outfd = open("/dev/ttyUSB0", O_WRONLY); + outfd = open(USBSER_DEVNAME, O_WRONLY); if (outfd < 0) { int errcode = errno; - message("user_start: ERROR: Failed to open /dev/ttyUSB0 for writing: %d\n", errcode); + message("user_start: ERROR: Failed to open " USBSER_DEVNAME " for writing: %d\n", errcode); /* ENOTCONN means that the USB device is not yet connected */ @@ -279,21 +285,21 @@ int user_start(int argc, char *argv[]) #ifndef CONFIG_EXAMPLES_USBSERIAL_INONLY #ifndef CONFIG_EXAMPLES_USBSERIAL_OUTONLY - infd = open("/dev/ttyUSB0", O_RDONLY|O_NONBLOCK); + infd = open(USBSER_DEVNAME, O_RDONLY|O_NONBLOCK); if (infd < 0) { - message("user_start: ERROR: Failed to open /dev/ttyUSB0 for reading: %d\n", errno); + message("user_start: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno); close(outfd); return 3; } #else do { - infd = open("/dev/ttyUSB0", O_RDONLY|O_NONBLOCK); + infd = open(USBSER_DEVNAME, O_RDONLY|O_NONBLOCK); if (infd < 0) { int errcode = errno; - message("user_start: ERROR: Failed to open /dev/ttyUSB0 for reading: %d\n", errno); + message("user_start: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno); /* ENOTCONN means that the USB device is not yet connected */ |