diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 09:19:15 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 09:19:15 -0600 |
| commit | 47bea0e67e4093d4482e8781782b98abda134801 (patch) | |
| tree | 950f50b0f2119e9785e89becdaf239bb298d5146 /apps/system/composite/composite_main.c | |
| parent | dfbcec0bde2500b34356050537ca9d85c694412b (diff) | |
| download | nuttx-47bea0e67e4093d4482e8781782b98abda134801.tar.gz nuttx-47bea0e67e4093d4482e8781782b98abda134801.tar.bz2 nuttx-47bea0e67e4093d4482e8781782b98abda134801.zip | |
With kernel build, entry point to all tasks is main, not some xyz_main
Diffstat (limited to 'apps/system/composite/composite_main.c')
| -rw-r--r-- | apps/system/composite/composite_main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/system/composite/composite_main.c b/apps/system/composite/composite_main.c index 5bba46132..c4ab61855 100644 --- a/apps/system/composite/composite_main.c +++ b/apps/system/composite/composite_main.c @@ -673,7 +673,11 @@ void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev) * ****************************************************************************/ +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char **argv) +#else int conn_main(int argc, char *argv[]) +#endif { int ret; @@ -822,10 +826,14 @@ errout: * 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 int disconn_main(int argc, char *argv[]) { /* First check if the USB mass storage device is already connected */ |