From cd741c82cf409b99b5986d6f8f748cd3706c6820 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 1 Jul 2016 06:48:22 -0600 Subject: [PATCH] apps/include: Move all header files associated with modules in apps/system to apps/include/system --- examples/ftpc/ftpc_main.c | 2 +- examples/nrf24l01_term/nrf24l01_term.c | 2 +- examples/usbterm/usbterm_main.c | 2 +- include/netutils/ftpc.h | 2 +- include/{ => system}/cle.h | 10 +++++----- include/{ => system}/nxplayer.h | 8 ++++---- include/{ => system}/prun.h | 10 +++++----- include/{ => system}/readline.h | 10 +++++----- include/{ => system}/symtab.h | 10 +++++----- include/{ => system}/zmodem.h | 10 +++++----- nshlib/nsh_command.c | 2 +- nshlib/nsh_init.c | 2 +- nshlib/nsh_login.c | 4 ++-- nshlib/nsh_session.c | 4 ++-- nshlib/nsh_stdlogin.c | 4 ++-- nshlib/nsh_stdsession.c | 4 ++-- system/cle/cle.c | 2 +- system/cu/cu_main.c | 2 +- system/nxplayer/nxplayer.c | 2 +- system/nxplayer/nxplayer_main.c | 4 ++-- system/prun/Kconfig | 2 +- system/prun/pexec_main.c | 2 +- system/prun/prun.c | 2 +- system/readline/readline.c | 2 +- system/readline/readline_common.c | 2 +- system/readline/std_readline.c | 2 +- system/sudoku/sudoku.c | 2 +- system/symtab/README.txt | 2 +- system/symtab/symtab.c | 2 +- system/zmodem/rz_main.c | 2 +- system/zmodem/sz_main.c | 2 +- system/zmodem/zm.h | 2 +- system/zmodem/zm_receive.c | 2 +- system/zmodem/zm_send.c | 2 +- 34 files changed, 62 insertions(+), 62 deletions(-) rename include/{ => system}/cle.h (93%) rename include/{ => system}/nxplayer.h (99%) rename include/{ => system}/prun.h (94%) rename include/{ => system}/readline.h (97%) rename include/{ => system}/symtab.h (94%) rename include/{ => system}/zmodem.h (98%) diff --git a/examples/ftpc/ftpc_main.c b/examples/ftpc/ftpc_main.c index 915087d0e..489af9206 100644 --- a/examples/ftpc/ftpc_main.c +++ b/examples/ftpc/ftpc_main.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "ftpc.h" diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c index cae95ed0b..78972bb8a 100644 --- a/examples/nrf24l01_term/nrf24l01_term.c +++ b/examples/nrf24l01_term/nrf24l01_term.c @@ -57,7 +57,7 @@ #include -#include +#include #ifdef CONFIG_DISABLE_POLL # error The poll interface is required for the nRF24L01 terminal example. You must disable config option DISABLE_POLL. diff --git a/examples/usbterm/usbterm_main.c b/examples/usbterm/usbterm_main.c index 12a3dcee6..9d40045b8 100644 --- a/examples/usbterm/usbterm_main.c +++ b/examples/usbterm/usbterm_main.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include diff --git a/include/netutils/ftpc.h b/include/netutils/ftpc.h index 759857820..1f8836ca4 100644 --- a/include/netutils/ftpc.h +++ b/include/netutils/ftpc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/include/ftpc.h + * apps/include/system/ftpc.h * * Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/include/cle.h b/include/system/cle.h similarity index 93% rename from include/cle.h rename to include/system/cle.h index 4218b29e6..82ec1c6e2 100644 --- a/include/cle.h +++ b/include/system/cle.h @@ -1,7 +1,7 @@ /**************************************************************************** - * apps/include/cle.h + * apps/include/system/cle.h * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_INCLUDE_CLE_H -#define __APPS_INCLUDE_CLE_H +#ifndef __APPS_INCLUDE_SYSTEM_CLE_H +#define __APPS_INCLUDE_SYSTEM_CLE_H /**************************************************************************** * Included Files @@ -84,4 +84,4 @@ int cle(FAR char *line, uint16_t linelen, FILE *instream, FILE *outstream); #endif #endif /* CONFIG_SYSTEM_CLE */ -#endif /* __APPS_INCLUDE_CLE_H */ +#endif /* __APPS_INCLUDE_SYSTEM_CLE_H */ diff --git a/include/nxplayer.h b/include/system/nxplayer.h similarity index 99% rename from include/nxplayer.h rename to include/system/nxplayer.h index 4487cfab5..e77cb16fb 100644 --- a/include/nxplayer.h +++ b/include/system/nxplayer.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/nxplayer/nxplayer.h + * apps/include/system/nxplayer.h * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -37,8 +37,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_NXPLAYER_NXPLAYER_H -#define __APPS_SYSTEM_NXPLAYER_NXPLAYER_H 1 +#ifndef __APPS_INCLUDE_SYSTEM_NXPLAYER_H +#define __APPS_INCLUDE_SYSTEM_NXPLAYER_H 1 /**************************************************************************** * Included Files @@ -474,4 +474,4 @@ int nxplayer_systemreset(FAR struct nxplayer_s *pPlayer); } #endif -#endif /* __APPS_SYSTEM_NXPLAYER_NXPLAYER_H */ +#endif /* __APPS_INCLUDE_SYSTEM_NXPLAYER_H */ diff --git a/include/prun.h b/include/system/prun.h similarity index 94% rename from include/prun.h rename to include/system/prun.h index 1f12028b2..9c83de6ba 100644 --- a/include/prun.h +++ b/include/system/prun.h @@ -1,7 +1,7 @@ /**************************************************************************** - * apps/include/prun.h + * apps/include/system/prun.h * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_INCLUDE_PRUN_H -#define __APPS_INCLUDE_PRUN_H +#ifndef __APPS_INCLUDE_SYSTEM_PRUN_H +#define __APPS_INCLUDE_SYSTEM_PRUN_H /**************************************************************************** * Included Files @@ -89,4 +89,4 @@ int prun(FAR char *exepath, size_t varsize, size_t strsize); } #endif -#endif /* __APPS_INCLUDE_PRUN_H */ +#endif /* __APPS_INCLUDE_SYSTEM_PRUN_H */ diff --git a/include/readline.h b/include/system/readline.h similarity index 97% rename from include/readline.h rename to include/system/readline.h index 5993c3be8..8020cf2c9 100644 --- a/include/readline.h +++ b/include/system/readline.h @@ -1,7 +1,7 @@ /**************************************************************************** - * apps/include/readline.h + * apps/include/system/readline.h * - * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_INCLUDE_READLINE_H -#define __APPS_INCLUDE_READLINE_H +#ifndef __APPS_INCLUDE_SYSTEM_READLINE_H +#define __APPS_INCLUDE_SYSTEM_READLINE_H /**************************************************************************** * Included Files @@ -228,4 +228,4 @@ ssize_t std_readline(FAR char *buf, int buflen); #endif #endif /* CONFIG_SYSTEM_READLINE */ -#endif /* __APPS_INCLUDE_READLINE_H */ +#endif /* __APPS_INCLUDE_SYSTEM_READLINE_H */ diff --git a/include/symtab.h b/include/system/symtab.h similarity index 94% rename from include/symtab.h rename to include/system/symtab.h index c1d59c51d..a1cb8b2dc 100644 --- a/include/symtab.h +++ b/include/system/symtab.h @@ -1,7 +1,7 @@ /**************************************************************************** - * apps/include/symtab.h + * apps/include/system/symtab.h * - * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_INCLUDE_SYMTAB_H -#define __APPS_INCLUDE_SYMTAB_H +#ifndef __APPS_INCLUDE_SYSTEM_SYMTAB_H +#define __APPS_INCLUDE_SYSTEM_SYMTAB_H /**************************************************************************** * Included Files @@ -98,5 +98,5 @@ void symtab_initialize(void); } #endif -#endif /* __APPS_INCLUDE_SYMTAB_H */ +#endif /* __APPS_INCLUDE_SYSTEM_SYMTAB_H */ diff --git a/include/zmodem.h b/include/system/zmodem.h similarity index 98% rename from include/zmodem.h rename to include/system/zmodem.h index 98eedcb2a..9987495d2 100644 --- a/include/zmodem.h +++ b/include/system/zmodem.h @@ -1,7 +1,7 @@ /**************************************************************************** - * apps/include/zmodem.h + * apps/include/system/zmodem.h * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -37,8 +37,8 @@ * ****************************************************************************/ -#ifndef __APPS_INCLUDE_ZMODEM_H -#define __APPS_INCLUDE_ZMODEM_H +#ifndef __APPS_INCLUDE_SYSTEM_ZMODEM_H +#define __APPS_INCLUDE_SYSTEM_ZMODEM_H /**************************************************************************** * Included Files @@ -345,4 +345,4 @@ int zms_release(ZMSHANDLE handle); } #endif -#endif /* __APPS_INCLUDE_ZMODEM_H */ +#endif /* __APPS_INCLUDE_SYSTEM_ZMODEM_H */ diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c index ad90b6b78..11c177ca4 100644 --- a/nshlib/nsh_command.c +++ b/nshlib/nsh_command.c @@ -46,7 +46,7 @@ #endif #if defined(CONFIG_SYSTEM_READLINE) && defined(CONFIG_READLINE_HAVE_EXTMATCH) -# include +# include #endif #include "nsh.h" diff --git a/nshlib/nsh_init.c b/nshlib/nsh_init.c index 24f3fce07..6c475f61c 100644 --- a/nshlib/nsh_init.c +++ b/nshlib/nsh_init.c @@ -41,7 +41,7 @@ #include -#include +#include #include #include "nsh.h" diff --git a/nshlib/nsh_login.c b/nshlib/nsh_login.c index 675f7a5f5..f814f210e 100644 --- a/nshlib/nsh_login.c +++ b/nshlib/nsh_login.c @@ -45,9 +45,9 @@ #include #ifdef CONFIG_NSH_CLE -# include +# include #else -# include +# include #endif #include "nsh.h" diff --git a/nshlib/nsh_session.c b/nshlib/nsh_session.c index 8c017d527..1632cac08 100644 --- a/nshlib/nsh_session.c +++ b/nshlib/nsh_session.c @@ -43,9 +43,9 @@ #include #ifdef CONFIG_NSH_CLE -# include +# include #else -# include +# include #endif #include "nsh.h" diff --git a/nshlib/nsh_stdlogin.c b/nshlib/nsh_stdlogin.c index 099994531..de0be90a6 100644 --- a/nshlib/nsh_stdlogin.c +++ b/nshlib/nsh_stdlogin.c @@ -45,9 +45,9 @@ #include #ifdef CONFIG_NSH_CLE -# include +# include #else -# include +# include #endif #include "nsh.h" diff --git a/nshlib/nsh_stdsession.c b/nshlib/nsh_stdsession.c index ebf76a687..23846b60e 100644 --- a/nshlib/nsh_stdsession.c +++ b/nshlib/nsh_stdsession.c @@ -43,9 +43,9 @@ #include #ifdef CONFIG_NSH_CLE -# include +# include #else -# include +# include #endif #include "nsh.h" diff --git a/system/cle/cle.c b/system/cle/cle.c index da8b79bf8..65ecd5f6a 100644 --- a/system/cle/cle.c +++ b/system/cle/cle.c @@ -53,7 +53,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c index 877c57d00..30d624d53 100644 --- a/system/cu/cu_main.c +++ b/system/cu/cu_main.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include "cu.h" diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c index fb16b1fdf..0ec150dd7 100644 --- a/system/nxplayer/nxplayer.c +++ b/system/nxplayer/nxplayer.c @@ -60,7 +60,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/system/nxplayer/nxplayer_main.c b/system/nxplayer/nxplayer_main.c index a6dd76ccc..ff820db25 100644 --- a/system/nxplayer/nxplayer_main.c +++ b/system/nxplayer/nxplayer_main.c @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/system/prun/Kconfig b/system/prun/Kconfig index dd0fb12e8..1fa76a791 100644 --- a/system/prun/Kconfig +++ b/system/prun/Kconfig @@ -10,7 +10,7 @@ menuconfig SYSTEM_PRUN ---help--- Build the Pascal P-Code interpreter / Virtual machine. This selection just builds a library of P-Code-related functions as described in - include/apps/prun.h. This selection is also necessary to enable other + include/apps/system/prun.h. This selection is also necessary to enable other P-Code related features. if SYSTEM_PRUN diff --git a/system/prun/pexec_main.c b/system/prun/pexec_main.c index f981af6a1..8a053c6ab 100644 --- a/system/prun/pexec_main.c +++ b/system/prun/pexec_main.c @@ -45,7 +45,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/system/prun/prun.c b/system/prun/prun.c index 0495954ee..e9c2f82fe 100644 --- a/system/prun/prun.c +++ b/system/prun/prun.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include "pexec.h" #include "pedefs.h" diff --git a/system/readline/readline.c b/system/readline/readline.c index 611f04364..92fb4f925 100644 --- a/system/readline/readline.c +++ b/system/readline/readline.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include "readline.h" /**************************************************************************** diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c index 140372a7c..ba6704f78 100644 --- a/system/readline/readline_common.c +++ b/system/readline/readline_common.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include "readline.h" /**************************************************************************** diff --git a/system/readline/std_readline.c b/system/readline/std_readline.c index ba064abaf..691cb3225 100644 --- a/system/readline/std_readline.c +++ b/system/readline/std_readline.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include "readline.h" diff --git a/system/sudoku/sudoku.c b/system/sudoku/sudoku.c index 7c04d7557..da5a373c3 100644 --- a/system/sudoku/sudoku.c +++ b/system/sudoku/sudoku.c @@ -41,7 +41,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/system/symtab/README.txt b/system/symtab/README.txt index 8de5e98ac..0070a008f 100644 --- a/system/symtab/README.txt +++ b/system/symtab/README.txt @@ -45,7 +45,7 @@ call traps. Your board-level start up code code then needs to select the symbol table by calling the function symtab_initialize(): - #include + #include ... symtab_initialize(); diff --git a/system/symtab/symtab.c b/system/symtab/symtab.c index d1142e67e..29c51a0ca 100644 --- a/system/symtab/symtab.c +++ b/system/symtab/symtab.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "symtab.inc" diff --git a/system/zmodem/rz_main.c b/system/zmodem/rz_main.c index 99866a96b..354a15d28 100644 --- a/system/zmodem/rz_main.c +++ b/system/zmodem/rz_main.c @@ -49,7 +49,7 @@ #include #include -#include +#include /**************************************************************************** * Private Functions diff --git a/system/zmodem/sz_main.c b/system/zmodem/sz_main.c index d531df582..4bfe1db49 100644 --- a/system/zmodem/sz_main.c +++ b/system/zmodem/sz_main.c @@ -49,7 +49,7 @@ #include #include -#include +#include /**************************************************************************** * Private Functions diff --git a/system/zmodem/zm.h b/system/zmodem/zm.h index 88c46a269..a50fe99da 100644 --- a/system/zmodem/zm.h +++ b/system/zmodem/zm.h @@ -53,7 +53,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/system/zmodem/zm_receive.c b/system/zmodem/zm_receive.c index 32066eee6..eb10bdc64 100644 --- a/system/zmodem/zm_receive.c +++ b/system/zmodem/zm_receive.c @@ -59,7 +59,7 @@ #include #include -#include +#include #include "zm.h" diff --git a/system/zmodem/zm_send.c b/system/zmodem/zm_send.c index 89d1663eb..80dbfb263 100644 --- a/system/zmodem/zm_send.c +++ b/system/zmodem/zm_send.c @@ -63,7 +63,7 @@ #include #include -#include +#include #include "zm.h"