diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-28 19:02:44 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-28 19:02:44 -0600 |
| commit | 5eb00d56107de10e5bbba7a7fd2fc8001d6e9ae8 (patch) | |
| tree | 89b7fd4dc1b61ece1c8ac21d111b29988882f03a /apps | |
| parent | 8e49f14ea01b3dc52536546c0e7662ebaa312599 (diff) | |
| download | nuttx-5eb00d56107de10e5bbba7a7fd2fc8001d6e9ae8.tar.gz nuttx-5eb00d56107de10e5bbba7a7fd2fc8001d6e9ae8.tar.bz2 nuttx-5eb00d56107de10e5bbba7a7fd2fc8001d6e9ae8.zip | |
apps/system/composite: Fix some corrupted conditional compilation that crept in. Looks like some automatated update gone awry.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/system/composite/composite_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/system/composite/composite_main.c b/apps/system/composite/composite_main.c index e05059093..5e5902319 100644 --- a/apps/system/composite/composite_main.c +++ b/apps/system/composite/composite_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * system/composite/composite_main.c * - * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -56,7 +56,7 @@ #include "composite.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -509,7 +509,7 @@ static int echo_serial(void) * board_mscclassobject() is called from the composite driver. It must * encapsulate the instantiation and configuration of the mass storage * class and the return the mass storage device's class driver instance - * to the composite dirver. + * to the composite driver. * * Input Parameters: * classdev - The location to return the mass storage class' device @@ -845,19 +845,19 @@ errout: * disconn_main * * Description: - * This is a program entry point that will disconnet the USB mass storage + * This is a program entry point that will disconnect the USB mass storage * device. This program is only available if CONFIG_NSH_BUILTIN_APPS * is defined in the NuttX configuration. In that case, this program can * be executed by entering the "msdis" command at the NSH console. -#ifdef CONFIG_BUILD_KERNEL * -int main(int argc, FAR char **argv) ****************************************************************************/ -#else #ifdef CONFIG_NSH_BUILTIN_APPS -#endif +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char **argv) +#else int disconn_main(int argc, char *argv[]) +#endif { /* First check if the USB mass storage device is already connected */ |