diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-25 21:59:30 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-25 21:59:30 +0000 |
| commit | ae9d6c8fa77b4f18594f11b603d27a9a8146a632 (patch) | |
| tree | f1c3ddab7c38ffff9f9e1ed662bed53bb6267625 /nuttx/binfmt/nxflat.c | |
| parent | 78ebab4466b64dcbfbef471e78827af90ee753e6 (diff) | |
| download | px4-nuttx-ae9d6c8fa77b4f18594f11b603d27a9a8146a632.tar.gz px4-nuttx-ae9d6c8fa77b4f18594f11b603d27a9a8146a632.tar.bz2 px4-nuttx-ae9d6c8fa77b4f18594f11b603d27a9a8146a632.zip | |
Mostly cosmetic integration changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1953 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/binfmt/nxflat.c')
| -rw-r--r-- | nuttx/binfmt/nxflat.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nuttx/binfmt/nxflat.c b/nuttx/binfmt/nxflat.c index 8b3677df5..f4eac0fcf 100644 --- a/nuttx/binfmt/nxflat.c +++ b/nuttx/binfmt/nxflat.c @@ -55,17 +55,15 @@ * Pre-processor Definitions ****************************************************************************/ -#undef NXFLAT_DUMPBUFFER /* Define to enable very verbose buffer dumping */ - /* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be - * defined or NXFLAT_DUMPBUFFER does nothing. + * defined or CONFIG_NXFLAT_DUMPBUFFER does nothing. */ #if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT) -# undef NXFLAT_DUMPBUFFER +# undef CONFIG_NXFLAT_DUMPBUFFER #endif -#ifdef NXFLAT_DUMPBUFFER +#ifdef CONFIG_NXFLAT_DUMPBUFFER # define nxflat_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n) #else # define nxflat_dumpbuffer(m,b,n) @@ -132,9 +130,6 @@ static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo) bdbg(" HANDLES:\n"); bdbg(" filfd: %d\n", loadinfo->filfd); - - bdbg(" NXFLT HEADER:\n"); - bdbg(" header: %p\n", loadinfo->header); } #else # define nxflat_dumploadinfo(i) @@ -151,7 +146,6 @@ static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo) static int nxflat_loadbinary(struct binary_s *binp) { - struct nxflat_hdr_s header; /* Just allocated memory */ struct nxflat_loadinfo_s loadinfo; /* Contains globals for libnxflat */ int ret; @@ -159,7 +153,7 @@ static int nxflat_loadbinary(struct binary_s *binp) /* Initialize the xflat library to load the program binary. */ - ret = nxflat_init(binp->filename, &header, &loadinfo); + ret = nxflat_init(binp->filename, &loadinfo); nxflat_dumploadinfo(&loadinfo); if (ret != 0) { @@ -196,7 +190,8 @@ static int nxflat_loadbinary(struct binary_s *binp) binp->isize = loadinfo.isize; binp->stacksize = loadinfo.stacksize; - nxflat_dumpbuffer("Entry code", (FAR const ubyte*)binp->entrypt, MIN(binp->isize,512)); + nxflat_dumpbuffer("Entry code", (FAR const ubyte*)binp->entrypt, + MIN(binp->isize - loadinfo.entryoffs,512)); nxflat_uninit(&loadinfo); return OK; } |