From d8d9cc8a96cdc2219af7bec8142e7633779fd685 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 17 Jan 2013 14:43:55 +0000
Subject: 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
---
 apps/builtin/builtin.c | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

(limited to 'apps/builtin/builtin.c')

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;
 }
-
-
-- 
cgit v1.2.3