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/libnxflat/libnxflat_bind.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/libnxflat/libnxflat_bind.c')
| -rw-r--r-- | nuttx/binfmt/libnxflat/libnxflat_bind.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nuttx/binfmt/libnxflat/libnxflat_bind.c b/nuttx/binfmt/libnxflat/libnxflat_bind.c index 84ef3a9a3..4e89a76ec 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_bind.c +++ b/nuttx/binfmt/libnxflat/libnxflat_bind.c @@ -54,17 +54,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) @@ -319,7 +317,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo) /* Dump the relocation got */ -#ifdef NXFLAT_DUMPBUFFER +#ifdef CONFIG_NXFLAT_DUMPBUFFER if (ret == OK && nrelocs > 0) { relocs = (FAR struct nxflat_reloc_s*)(offset - loadinfo->isize + loadinfo->dspace->region); @@ -421,14 +419,14 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo, imports[i].i_funcaddress = (uint32)symbol->sym_value; - bvdbg("Bound import %d (%08p) to export 's' (%08x)\n", + bvdbg("Bound import %d (%08p) to export '%s' (%08x)\n", i, &imports[i], symname, imports[i].i_funcaddress); } } /* Dump the relocation import table */ -#ifdef NXFLAT_DUMPBUFFER +#ifdef CONFIG_NXFLAT_DUMPBUFFER if (nimports > 0) { nxflat_dumpbuffer("Imports", (FAR const ubyte*)imports, nimports * sizeof(struct nxflat_import_s)); |