diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-17 14:43:55 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-17 14:43:55 +0000 |
| commit | d8d9cc8a96cdc2219af7bec8142e7633779fd685 (patch) | |
| tree | d9cf39f88361f174a2350d354ffb5584d43e2fc4 /apps/builtin/builtin.c | |
| parent | 4f0e8b1249c1550bac83f9db61c67094bc6afc2d (diff) | |
| download | nuttx-d8d9cc8a96cdc2219af7bec8142e7633779fd685.tar.gz nuttx-d8d9cc8a96cdc2219af7bec8142e7633779fd685.tar.bz2 nuttx-d8d9cc8a96cdc2219af7bec8142e7633779fd685.zip | |
Add logic to automatically unload module on exit; Several patches from Mike Smith
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5528 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/builtin/builtin.c')
| -rw-r--r-- | apps/builtin/builtin.c | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/apps/builtin/builtin.c b/apps/builtin/builtin.c index 7655a531d..d26f0a044 100644 --- a/apps/builtin/builtin.c +++ b/apps/builtin/builtin.c @@ -55,27 +55,8 @@ * Public Data ****************************************************************************/ -#undef EXTERN -#if defined(__cplusplus) -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - -#include "builtin_proto.h" - -const struct builtin_s g_builtins[] = -{ -# include "builtin_list.h" - { NULL, 0, 0, 0 } -}; - -#undef EXTERN -#if defined(__cplusplus) -} -#endif - +extern const struct builtin_s g_builtins[]; +extern const int g_builtin_count; /**************************************************************************** * Private Data @@ -89,9 +70,11 @@ const struct builtin_s g_builtins[] = * Public Functions ****************************************************************************/ -int number_builtins(void) +FAR const struct builtin_s *builtin_for_index(int index) { - return sizeof(g_builtins)/sizeof(struct builtin_s) - 1; + if (index < g_builtin_count) + { + return &g_builtins[index]; + } + return NULL; } - - |