Make all counts 16-bit

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

2 files changed, 10 insertions, 5 deletions

diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c
index e600e4a94..30f98ee33 100644
--- a/misc/buildroot/toolchain/nxflat/ldnxflat.c
+++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c
@@ -2207,7 +2207,7 @@ int main(int argc, char **argv, char **envp)
   put_xflat32(&hdr.h_bssend, offset);
 
   put_xflat32(&hdr.h_stacksize, stack_size);
-  put_xflat32(&hdr.h_reloccount, ngot_offsets);
+  put_xflat16(&hdr.h_reloccount, ngot_offsets);
 
   put_entry_point(&hdr);
 
diff --git a/misc/buildroot/toolchain/nxflat/nxflat.h b/misc/buildroot/toolchain/nxflat/nxflat.h
index fcdc17b0d..994a68421 100644
--- a/misc/buildroot/toolchain/nxflat/nxflat.h
+++ b/misc/buildroot/toolchain/nxflat/nxflat.h
@@ -108,25 +108,30 @@ struct nxflat_hdr_s
    * h_relocstart - Offset to the beginning of an array of relocation
    *                records (struct nxflat_reloc).  The offset is
    *                relative to the start of the file
-   * h_reloccount - The number of relocation records in the arry
    */
 
   u_int32_t h_relocstart;     /* Offset of relocation records */
-  u_int32_t h_reloccount;     /* Number of relocation records */
 
   /* Imported symbol table (NOTE no symbols are exported):
    *
    * h_importsymbols - Offset to the beginning of an array of imported
-   *                   symbol structures (struct nxflat_import).  The
+   *                   symbol structures (struct nxflat_import_s).  The
    *                   h_importsymbols offset is relative to the
    *                   beginning of the file.  Each entry of the
    *                   array contains an uint32 offset (again from
    *                   the beginning of the file) to the name of
    *                   a symbol string.  This string is null-terminated.
-   * h_importcount   - The number of records in the h_exportsymbols array.
    */
 
   u_int32_t h_importsymbols;  /* Offset to list of imported symbols */
+
+  /* 16-bit counts
+   *
+   * h_reloccount  - The number of relocation records in the arry
+   * h_importcount - The number of records in the h_importsymbols array.
+   */
+
+  u_int16_t h_reloccount;     /* Number of relocation records */
   u_int16_t h_importcount;    /* Number of imported symbols */
 };