Move binfmt.h, nxflat.h, elf.h, and symtab.h to include/nuttx/binfmt/

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5252 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 21 insertions, 21 deletions

diff --git a/nuttx/include/nuttx/binfmt.h b/nuttx/include/nuttx/binfmt/binfmt.h
index 70beda393..82e5f3557 100644
--- a/nuttx/include/nuttx/binfmt.h
+++ b/nuttx/include/nuttx/binfmt/binfmt.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/binfmt.h
+ * include/nuttx/binfmt/binfmt.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2012 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 __INCLUDE_NUTTX_BINFMT_H
-#define __INCLUDE_NUTTX_BINFMT_H
+#ifndef __INCLUDE_NUTTX_BINFMT_BINFMT_H
+#define __INCLUDE_NUTTX_BINFMT_BINFMT_H
 
 /****************************************************************************
  * Included Files
@@ -205,5 +205,5 @@ EXTERN int exec(FAR const char *filename, FAR const char **argv,
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_BINFMT_H */
+#endif /* __INCLUDE_NUTTX_BINFMT_BINFMT_H */
 
diff --git a/nuttx/include/nuttx/elf.h b/nuttx/include/nuttx/binfmt/elf.h
index 4be2c23a0..8937790b1 100644
--- a/nuttx/include/nuttx/elf.h
+++ b/nuttx/include/nuttx/binfmt/elf.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/elf.h
+ * include/nuttx/binfmt/elf.h
  *
- *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012 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 __INCLUDE_NUTTX_ELF_H
-#define __INCLUDE_NUTTX_ELF_H
+#ifndef __INCLUDE_NUTTX_BINFMT_ELF_H
+#define __INCLUDE_NUTTX_BINFMT_ELF_H
 
 /****************************************************************************
  * Included Files
@@ -89,9 +89,9 @@ struct elf_loadinfo_s
 
   int    filfd;                /* Descriptor for the file being loaded */
 
-  /* This is a copy of the ELF header (still in network order) */
+  /* This is a copy of the ELF header */
 
-  FAR struct elf_hdr_s header;
+  Elf32_Ehdr header;
 };
 
 /****************************************************************************
@@ -123,7 +123,7 @@ extern "C" {
  *
  ****************************************************************************/
 
-EXTERN int elf_verifyheader(FAR const struct elf_hdr_s *header);
+EXTERN int elf_verifyheader(FAR const Elf32_Ehdr *header);
 
 /****************************************************************************
  * Name: elf_init
@@ -256,4 +256,4 @@ EXTERN void elf_uninitialize(void);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_ELF_H */
+#endif /* __INCLUDE_NUTTX_BINFMT_ELF_H */
diff --git a/nuttx/include/nuttx/nxflat.h b/nuttx/include/nuttx/binfmt/nxflat.h
index 59dcea854..89e28fbcc 100644
--- a/nuttx/include/nuttx/nxflat.h
+++ b/nuttx/include/nuttx/binfmt/nxflat.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/nxflat.h
+ * include/nuttx/binfmt/nxflat.h
  *
  *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_NXFLAT_H
-#define __INCLUDE_NUTTX_NXFLAT_H
+#ifndef __INCLUDE_NUTTX_BINFMT_NXFLAT_H
+#define __INCLUDE_NUTTX_BINFMT_NXFLAT_H
 
 /****************************************************************************
  * Included Files
@@ -261,4 +261,4 @@ EXTERN void nxflat_uninitialize(void);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_NXFLAT_H */
+#endif /* __INCLUDE_NUTTX_BINFMT_NXFLAT_H */
diff --git a/nuttx/include/nuttx/symtab.h b/nuttx/include/nuttx/binfmt/symtab.h
index b302ab20a..497327031 100644
--- a/nuttx/include/nuttx/symtab.h
+++ b/nuttx/include/nuttx/binfmt/symtab.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/symtab.h
+ * include/nuttx/binfmt/symtab.h
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_SYMTAB_H
-#define __INCLUDE_NUTTX_SYMTAB_H
+#ifndef __INCLUDE_NUTTX_BINFMT_SYMTAB_H
+#define __INCLUDE_NUTTX_BINFMT_SYMTAB_H
 
 /****************************************************************************
  * Included Files
@@ -159,5 +159,5 @@ symtab_findorderedbyvalue(FAR const struct symtab_s *symtab,
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_SYMTAB_H */
+#endif /* __INCLUDE_NUTTX_BINFMT_SYMTAB_H */