sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move apps/builtins/builtin_forindex.c to nuttx/libs/libc/builtin since it is required by kernel logic as well. Other changes account for movement of builtin.h from nuttx/include/nuttx/binfmt/built.h to nuttx/include/lib/builtin.h.

Browse Source
This commit is contained in:
Gregory Nutt 2019-08-23 09:12:20 -06:00
parent 839efa6669
commit ac61c18fcc
8 changed files with 8 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/Makefile
View File

@ -37,7 +37,7 @@
# Source and object files
CSRCS = builtin_forindex.c builtin_list.c exec_builtin.c
CSRCS = builtin_list.c exec_builtin.c
# Registry entry lists

65
builtin/builtin_forindex.c
View File

@ -1,65 +0,0 @@
/****************************************************************************
* apps/builtin/builtin_forindex.c
*
* Copyright (C) 2011 Uros Platise. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Authors: Uros Platise <uros.platise@isotel.eu>
* Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/binfmt/builtin.h>
/****************************************************************************
* Public Data
****************************************************************************/
extern const struct builtin_s g_builtins[];
extern const int g_builtin_count;
/****************************************************************************
* Public Functions
****************************************************************************/
FAR const struct builtin_s *builtin_for_index(int index)
{
if (index < g_builtin_count)
{
return &g_builtins[index];
}
return NULL;
}

4
builtin/builtin_list.c
View File

@ -2,7 +2,7 @@
* apps/builtin/builtin_list.c
*
* Copyright (C) 2011 Uros Platise. All rights reserved.
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2019 Gregory Nutt. All rights reserved.
* Authors: Uros Platise <uros.platise@isotel.eu>
* Gregory Nutt <gnutt@nuttx.org>
*
@ -41,7 +41,7 @@
#include <nuttx/config.h>
#include <nuttx/binfmt/builtin.h>
#include <nuttx/lib/builtin.h>
/****************************************************************************
* Private Types

3
examples/chrono/chrono_main.c
View File

@ -121,7 +121,6 @@ static int button_daemon(int argc, char *argv[])
FAR struct slcd_chrono_s *priv = &g_slcd;
struct btn_notify_s btnevents;
btn_buttonset_t supported;
btn_buttonset_t sample = 0;
int ret;
int fd;
@ -197,8 +196,6 @@ static int button_daemon(int argc, char *argv[])
goto errout_with_fd;
}
sample = (btn_buttonset_t)value.si_value.sival_int;
if (priv->state == CHRONO_STOPPED)
{
(void)clock_gettime(CLOCK_MONOTONIC, &priv->ts_start);

2
include/builtin/builtin.h
View File

@ -51,7 +51,7 @@
#include <sys/types.h>
#include <nuttx/binfmt/builtin.h>
#include <nuttx/lib/builtin.h>
/****************************************************************************
* Pre-processor Definitions

4
nshlib/nsh_builtin.c
View File

@ -8,7 +8,7 @@
*
* With subsequent updates, modifications, and general maintenance by:
*
* Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
* Copyright (C) 2011-2013, 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -55,7 +55,7 @@
#include <errno.h>
#include <string.h>
#include <nuttx/binfmt/builtin.h>
#include <nuttx/lib/builtin.h>
#include "builtin/builtin.h"
#include "nsh.h"

2
nshlib/nsh_command.c
View File

@ -42,7 +42,7 @@
#include <string.h>
#ifdef CONFIG_NSH_BUILTIN_APPS
# include <nuttx/binfmt/builtin.h>
# include <nuttx/lib/builtin.h>
#endif
#if defined(CONFIG_SYSTEM_READLINE) && defined(CONFIG_READLINE_HAVE_EXTMATCH)

2
system/readline/readline_common.c
View File

@ -48,7 +48,7 @@
#include <nuttx/ascii.h>
#include <nuttx/vt100.h>
#include <nuttx/binfmt/builtin.h>
#include <nuttx/lib/builtin.h>
#include "system/readline.h"
#include "readline.h"