apps/include: Move all header files associated with modules in apps/system to apps/include/system

2016-07-01 06:48:22 -06:00 · 2016-07-01 06:48:22 -06:00 · cd741c82cf
commit cd741c82cf
parent 4343a6ef8b
34 changed files with 62 additions and 62 deletions
--- a/examples/ftpc/ftpc_main.c
+++ b/examples/ftpc/ftpc_main.c
@ -46,7 +46,7 @@
 #include <arpa/inet.h>
 #include <apps/netutils/ftpc.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>

 #include "ftpc.h"

--- a/examples/nrf24l01_term/nrf24l01_term.c
+++ b/examples/nrf24l01_term/nrf24l01_term.c
@ -57,7 +57,7 @@

 #include <nuttx/wireless/nrf24l01.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>

 #ifdef CONFIG_DISABLE_POLL
 #  error The poll interface is required for the nRF24L01 terminal example. You must disable config option DISABLE_POLL.
--- a/examples/usbterm/usbterm_main.c
+++ b/examples/usbterm/usbterm_main.c
@ -51,7 +51,7 @@
 #include <errno.h>
 #include <debug.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>

 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
--- 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 <gnutt@nuttx.org>
--- a/include/system/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 <gnutt@nuttx.org>
 *
 * 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 */
--- a/include/system/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 <pettitkd@gmail.com>
@ -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 */
--- a/include/system/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 <gnutt@nuttx.org>
 *
 * 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 */
--- a/include/system/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 <gnutt@nuttx.org>
 *
 * 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 */
--- a/include/system/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 <gnutt@nuttx.org>
 *
 * 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 */

--- a/include/system/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 <gnutt@nuttx.org>
 *
 * 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 */
--- 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 <apps/readline.h>
+#  include <apps/system/readline.h>
 #endif

 #include "nsh.h"
--- a/nshlib/nsh_init.c
+++ b/nshlib/nsh_init.c
@ -41,7 +41,7 @@

 #include <sys/boardctl.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>
 #include <apps/nsh.h>

 #include "nsh.h"
--- a/nshlib/nsh_login.c
+++ b/nshlib/nsh_login.c
@ -45,9 +45,9 @@

 #include <apps/fsutils/passwd.h>
 #ifdef CONFIG_NSH_CLE
-#  include <apps/cle.h>
+#  include <apps/system/cle.h>
 #else
-#  include <apps/readline.h>
+#  include <apps/system/readline.h>
 #endif

 #include "nsh.h"
--- a/nshlib/nsh_session.c
+++ b/nshlib/nsh_session.c
@ -43,9 +43,9 @@
 #include <stdlib.h>

 #ifdef CONFIG_NSH_CLE
-#  include <apps/cle.h>
+#  include <apps/system/cle.h>
 #else
-#  include <apps/readline.h>
+#  include <apps/system/readline.h>
 #endif

 #include "nsh.h"
--- a/nshlib/nsh_stdlogin.c
+++ b/nshlib/nsh_stdlogin.c
@ -45,9 +45,9 @@

 #include <apps/fsutils/passwd.h>
 #ifdef CONFIG_NSH_CLE
-#  include <apps/cle.h>
+#  include <apps/system/cle.h>
 #else
-#  include <apps/readline.h>
+#  include <apps/system/readline.h>
 #endif

 #include "nsh.h"
--- a/nshlib/nsh_stdsession.c
+++ b/nshlib/nsh_stdsession.c
@ -43,9 +43,9 @@
 #include <stdlib.h>

 #ifdef CONFIG_NSH_CLE
-#  include <apps/cle.h>
+#  include <apps/system/cle.h>
 #else
-#  include <apps/readline.h>
+#  include <apps/system/readline.h>
 #endif

 #include "nsh.h"
--- a/system/cle/cle.c
+++ b/system/cle/cle.c
@ -53,7 +53,7 @@
 #include <nuttx/ascii.h>
 #include <nuttx/vt100.h>

-#include <apps/cle.h>
+#include <apps/system/cle.h>

 /****************************************************************************
 * Pre-processor Definitions
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@ -53,7 +53,7 @@
 #include <termios.h>
 #include <debug.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>

 #include "cu.h"

--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@ -60,7 +60,7 @@
 #include <debug.h>

 #include <nuttx/audio/audio.h>
-#include <apps/nxplayer.h>
+#include <apps/system/nxplayer.h>

 /****************************************************************************
 * Pre-processor Definitions
--- a/system/nxplayer/nxplayer_main.c
+++ b/system/nxplayer/nxplayer_main.c
@ -49,8 +49,8 @@
 #include <errno.h>
 #include <assert.h>

-#include <apps/readline.h>
-#include <apps/nxplayer.h>
+#include <apps/system/readline.h>
+#include <apps/system/nxplayer.h>

 /****************************************************************************
 * Pre-processor Definitions
--- 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
--- a/system/prun/pexec_main.c
+++ b/system/prun/pexec_main.c
@ -45,7 +45,7 @@
 #include <assert.h>
 #include <errno.h>

-#include <apps/prun.h>
+#include <apps/system/prun.h>

 /****************************************************************************
 * Pre-processor Definitions
--- a/system/prun/prun.c
+++ b/system/prun/prun.c
@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>

-#include <apps/prun.h>
+#include <apps/system/prun.h>

 #include "pexec.h"
 #include "pedefs.h"
--- a/system/readline/readline.c
+++ b/system/readline/readline.c
@ -45,7 +45,7 @@
 #include <errno.h>
 #include <assert.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>
 #include "readline.h"

 /****************************************************************************
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@ -50,7 +50,7 @@
 #include <nuttx/vt100.h>
 #include <nuttx/binfmt/builtin.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>
 #include "readline.h"

 /****************************************************************************
--- a/system/readline/std_readline.c
+++ b/system/readline/std_readline.c
@ -41,7 +41,7 @@

 #include <sys/types.h>
 #include <nuttx/arch.h>
-#include <apps/readline.h>
+#include <apps/system/readline.h>

 #include "readline.h"

--- a/system/sudoku/sudoku.c
+++ b/system/sudoku/sudoku.c
@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <string.h>

-#include <apps/readline.h>
+#include <apps/system/readline.h>

 /****************************************************************************
 * Pre-processor Definitions
--- 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 <apps/symtab.h>
+  #include <apps/system/symtab.h>
  ...
    symtab_initialize();

--- a/system/symtab/symtab.c
+++ b/system/symtab/symtab.c
@ -43,7 +43,7 @@

 #include <nuttx/compiler.h>
 #include <sys/boardctl.h>
-#include <apps/symtab.h>
+#include <apps/system/symtab.h>

 #include "symtab.inc"

--- a/system/zmodem/rz_main.c
+++ b/system/zmodem/rz_main.c
@ -49,7 +49,7 @@
 #include <time.h>
 #include <errno.h>

-#include <apps/zmodem.h>
+#include <apps/system/zmodem.h>

 /****************************************************************************
 * Private Functions
--- a/system/zmodem/sz_main.c
+++ b/system/zmodem/sz_main.c
@ -49,7 +49,7 @@
 #include <time.h>
 #include <errno.h>

-#include <apps/zmodem.h>
+#include <apps/system/zmodem.h>

 /****************************************************************************
 * Private Functions
--- a/system/zmodem/zm.h
+++ b/system/zmodem/zm.h
@ -53,7 +53,7 @@
 #include <nuttx/compiler.h>
 #include <nuttx/ascii.h>

-#include <apps/zmodem.h>
+#include <apps/system/zmodem.h>

 /****************************************************************************
 * Pre-processor Definitions
--- a/system/zmodem/zm_receive.c
+++ b/system/zmodem/zm_receive.c
@ -59,7 +59,7 @@
 #include <assert.h>
 #include <errno.h>

-#include <apps/zmodem.h>
+#include <apps/system/zmodem.h>

 #include "zm.h"

--- a/system/zmodem/zm_send.c
+++ b/system/zmodem/zm_send.c
@ -63,7 +63,7 @@
 #include <crc32.h>

 #include <nuttx/ascii.h>
-#include <apps/zmodem.h>
+#include <apps/system/zmodem.h>

 #include "zm.h"