diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:22:22 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:22:22 -0600 |
commit | 70b6bb22af51defd713adfd452309f32f0e523aa (patch) | |
tree | b483c578cf6ae76888b89188bedb03f539ab4cd3 /nuttx/tools | |
parent | 3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff) | |
download | nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2 nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip |
More trailing whilespace removal
Diffstat (limited to 'nuttx/tools')
-rw-r--r-- | nuttx/tools/Makefile.host | 6 | ||||
-rw-r--r-- | nuttx/tools/README.txt | 12 | ||||
-rw-r--r-- | nuttx/tools/b16.c | 2 | ||||
-rwxr-xr-x | nuttx/tools/configure.sh | 6 | ||||
-rwxr-xr-x | nuttx/tools/define.sh | 2 | ||||
-rwxr-xr-x | nuttx/tools/discover.py | 4 | ||||
-rwxr-xr-x | nuttx/tools/incdir.sh | 2 | ||||
-rwxr-xr-x | nuttx/tools/mkconfigvars.sh | 2 | ||||
-rw-r--r-- | nuttx/tools/mkctags.sh | 4 | ||||
-rw-r--r-- | nuttx/tools/mkdeps.bat | 2 | ||||
-rwxr-xr-x | nuttx/tools/mkdeps.sh | 2 | ||||
-rwxr-xr-x | nuttx/tools/mkexport.sh | 4 | ||||
-rwxr-xr-x | nuttx/tools/mkimage.sh | 36 | ||||
-rw-r--r-- | nuttx/tools/mksymtab.c | 8 | ||||
-rw-r--r-- | nuttx/tools/mksyscall.c | 10 | ||||
-rw-r--r-- | nuttx/tools/pic32mx/mkpichex.c | 2 | ||||
-rwxr-xr-x | nuttx/tools/version.sh | 2 | ||||
-rwxr-xr-x | nuttx/tools/zipme.sh | 2 |
18 files changed, 54 insertions, 54 deletions
diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host index 738e66ca1..1580ec8ed 100644 --- a/nuttx/tools/Makefile.host +++ b/nuttx/tools/Makefile.host @@ -62,7 +62,7 @@ endif all: b16$(HOSTEXEEXT) bdf-converter$(HOSTEXEEXT) cmpconfig$(HOSTEXEEXT) \ configure$(HOSTEXEEXT) mkconfig$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) mksymtab$(HOSTEXEEXT) \ - mksyscall$(HOSTEXEEXT) mkversion$(HOSTEXEEXT) + mksyscall$(HOSTEXEEXT) mkversion$(HOSTEXEEXT) default: mkconfig$(HOSTEXEEXT) mksyscall$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) ifdef HOSTEXEEXT @@ -73,8 +73,8 @@ endif # b16 - Fixed precision math conversion tool -b16$(HOSTEXEEXT): b16.c - $(Q) $(HOSTCC) $(HOSTCFLAGS) -o b16$(HOSTEXEEXT) b16.c +b16$(HOSTEXEEXT): b16.c + $(Q) $(HOSTCC) $(HOSTCFLAGS) -o b16$(HOSTEXEEXT) b16.c ifdef HOSTEXEEXT b16: b16$(HOSTEXEEXT) diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt index f0feff661..17416c651 100644 --- a/nuttx/tools/README.txt +++ b/nuttx/tools/README.txt @@ -240,7 +240,7 @@ bdf-convert.c Create a new NuttX configuration variable. For example, suppose you define the following variable: CONFIG_NXFONT_MYFONT. Then you would need to: - + 3. Define CONFIG_NXFONT_MYFONT=y in your NuttX configuration file. A font ID number has to be assigned for each new font. The font ID @@ -251,7 +251,7 @@ bdf-convert.c 4. include/nuttx/nx/nxfonts.h. Add you new font as a possible system default font: - + #if defined(CONFIG_NXFONT_SANS23X27) # define NXFONT_DEFAULT FONTID_SANS23X27 #elif defined(CONFIG_NXFONT_MYFONT) @@ -260,7 +260,7 @@ bdf-convert.c Then define the actual font ID. Make sure that the font ID value is unique: - + enum nx_fontid_e { FONTID_DEFAULT = 0 /* The default font */ @@ -271,7 +271,7 @@ bdf-convert.c , FONTID_MYFONT = 2 /* My shiny, new font */ #endif ... - + New Add the font to the NX build system. There are several files that you have to modify to to this. Look how the build system uses the font CONFIG_NXFONT_SANS23X27 for examaples: @@ -338,7 +338,7 @@ bdf-convert.c font. The lookup function is NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid). The new font information needs to be added to data structures used by that function: - + #ifdef CONFIG_NXFONT_SANS23X27 extern const struct nx_fontpackage_s g_sans23x27_package; #endif @@ -516,7 +516,7 @@ kconfig.bat variables from the Cygwin kconfig-mconf running in the CMD.exe shell. The following change to the top-level Kconfig file seems to work around these problems: - + config APPSDIR string - option env="APPSDIR" diff --git a/nuttx/tools/b16.c b/nuttx/tools/b16.c index 66d581ffa..835307116 100644 --- a/nuttx/tools/b16.c +++ b/nuttx/tools/b16.c @@ -116,6 +116,6 @@ int main(int argc, char **argv, char **envp) lvalue = 65536.0 * fvalue; printf("%10.5f -> 0x%08lx\n", fvalue, lvalue); } - + return 0; } diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh index 25f5afc15..a91da260e 100755 --- a/nuttx/tools/configure.sh +++ b/nuttx/tools/configure.sh @@ -162,7 +162,7 @@ if [ -z "${appdir}" ]; then fi # Check for an unversioned apps/ directory - + if [ -d "${TOPDIR}/../apps" ]; then appdir="../apps" @@ -171,7 +171,7 @@ if [ -z "${appdir}" ]; then if [ -d "${TOPDIR}/../apps-${CONFIG_VERSION_STRING}" ]; then appdir="../apps-${CONFIG_VERSION_STRING}" - fi + fi fi fi @@ -214,4 +214,4 @@ if [ "X${defappdir}" = "Xy" ]; then else echo "CONFIG_APPS_DIR=\"$posappdir\"" >> "${dest_config}" fi -fi +fi diff --git a/nuttx/tools/define.sh b/nuttx/tools/define.sh index ae2374118..d7be0d725 100755 --- a/nuttx/tools/define.sh +++ b/nuttx/tools/define.sh @@ -41,7 +41,7 @@ wintool=n usage="USAGE: $progname [-w] [-d] [-h] <compiler-path> <def1>[=val1] [<def2>[=val2] [<def3>[=val3] ...]]" advice="Try '$progname -h' for more information" -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -d ) set -x diff --git a/nuttx/tools/discover.py b/nuttx/tools/discover.py index cc82a0cad..3cff6ed73 100755 --- a/nuttx/tools/discover.py +++ b/nuttx/tools/discover.py @@ -62,7 +62,7 @@ def send_discover(socket): for c in cmd[:3]: chksum -= c; cmd[3] = chksum & 0xff - + socket.sendto(cmd, ('<broadcast>', PORT)) def read_responses(socket): @@ -75,7 +75,7 @@ def read_responses(socket): and response[0] == DISCOVER_PROTO_ID and response[1] == DISCOVER_RESPONSE and check_sum(response)): - + dev = {} dev['addr'] = src[0] dev['descr'] = response[2:-1].tostring().rstrip('\0') diff --git a/nuttx/tools/incdir.sh b/nuttx/tools/incdir.sh index 145bfe9bb..38aa98b03 100755 --- a/nuttx/tools/incdir.sh +++ b/nuttx/tools/incdir.sh @@ -40,7 +40,7 @@ pathtype=user usage="USAGE: $progname [-w] [-d] [-h] <compiler-path> <dir1> [<dir2> [<dir3> ...]]" advice="Try '$progname -h' for more information" -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -d ) set -x diff --git a/nuttx/tools/mkconfigvars.sh b/nuttx/tools/mkconfigvars.sh index feb188a32..b2101d3b0 100755 --- a/nuttx/tools/mkconfigvars.sh +++ b/nuttx/tools/mkconfigvars.sh @@ -37,7 +37,7 @@ ADVICE="Try '$0 -h' for more information" unset VERSION -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -v ) shift diff --git a/nuttx/tools/mkctags.sh b/nuttx/tools/mkctags.sh index 999aefbef..da278c846 100644 --- a/nuttx/tools/mkctags.sh +++ b/nuttx/tools/mkctags.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # mkctags.sh # # Copyright (C) 2013 Ken pettit All rights reserved. @@ -33,7 +33,7 @@ # WD=`pwd` -if [[ "$WD" =~ "nuttx/tools" ]] +if [[ "$WD" =~ "nuttx/tools" ]] then cd .. fi diff --git a/nuttx/tools/mkdeps.bat b/nuttx/tools/mkdeps.bat index 2b9ea3ce5..64b4429d1 100644 --- a/nuttx/tools/mkdeps.bat +++ b/nuttx/tools/mkdeps.bat @@ -156,7 +156,7 @@ goto :EOF :CheckPaths for %%H in (%altpath%) do ( set tmppath=%%H\%file% - if "%debug%"=="y" echo Checkfile: Checking %tmppath% + if "%debug%"=="y" echo Checkfile: Checking %tmppath% if exist %tmppath% ( set fullpath=%tmppath% goto :EOF diff --git a/nuttx/tools/mkdeps.sh b/nuttx/tools/mkdeps.sh index 14ac6080e..8a03ac571 100755 --- a/nuttx/tools/mkdeps.sh +++ b/nuttx/tools/mkdeps.sh @@ -192,7 +192,7 @@ if [ "X${winpaths}" = "Xy" ]; then show_usage exit 1 fi - + # Get the top dir expressed like the Windows GCC would use it, except # with forward slashs diff --git a/nuttx/tools/mkexport.sh b/nuttx/tools/mkexport.sh index 0c6b797dc..2c464c0b1 100755 --- a/nuttx/tools/mkexport.sh +++ b/nuttx/tools/mkexport.sh @@ -206,7 +206,7 @@ cp -f "${ARCHDIR}"/*.h "${EXPORTDIR}"/arch/. 2>/dev/null # Then look a list of possible places where other architecture-specific # header files might be found. If those places exist (as directories or -# as symbolic links to directories, then copy the header files from +# as symbolic links to directories, then copy the header files from # those directories into the EXPORTDIR ARCH_HDRDIRS="arm armv7-m avr avr32 board common chip mips32" @@ -323,4 +323,4 @@ fi # Clean up after ourselves -rm -rf "${EXPORTSUBDIR}" +rm -rf "${EXPORTSUBDIR}" diff --git a/nuttx/tools/mkimage.sh b/nuttx/tools/mkimage.sh index f64dfde85..0fc2f92c6 100755 --- a/nuttx/tools/mkimage.sh +++ b/nuttx/tools/mkimage.sh @@ -56,15 +56,15 @@ # Scenario #2 # ----------- # If the supplied image is not a standard binary -# executagle image then that is ok too, a header is +# executagle image then that is ok too, a header is # constructed and tacked onto the front of the supplied # binary data forming the new binary image (in rr format). -# In this case the EntryAddr is set to 0xFFFFFFFF by +# In this case the EntryAddr is set to 0xFFFFFFFF by # default and the LoadAddr is set to 0x00000000 by -# default unless otherwise indicated by command line +# default unless otherwise indicated by command line # arguments -LEntry and -LAddr which if used are assumed # to be in hexidecimal units. -# +# # ----------- # Scenario #3 # ----------- @@ -75,10 +75,10 @@ # # mkimage [--NoHeader ] <input-bin> <out-RR> # -# Usage: -# mkimage [--LAddr h] [--EAddr h] [--NoHeader] <input-bin> <out-RR> -# -# Examples: +# Usage: +# mkimage [--LAddr h] [--EAddr h] [--NoHeader] <input-bin> <out-RR> +# +# Examples: # $ mkimage linux linux.rr # ..or.. # $ mkimage -LAddr 10008000 -EAddr 10008000 vmlinux vmlinux.rr @@ -90,8 +90,8 @@ # $ mkimage --LAddr A00 fileSys.gz fileSys.gz.rr # ^ # | -# Assumed hex units. -# Please omit the +# Assumed hex units. +# Please omit the # leading "0x". ######################################################## @@ -185,7 +185,7 @@ if [ ! -z "$FileTypeExec" ] ; then image_file=${binary}.binary.gz fi # --------------------------------- - # Next | Create the header information (ascii) needed + # Next | Create the header information (ascii) needed # | by the TI925 bootloader. This includes the # | load address, entry address and byte count of # | the binary executable data which will follow it. @@ -211,8 +211,8 @@ if [ ! -z "$FileTypeExec" ] ; then numBytes=$(echo $numBytes | sed -e "s/^.*\(........\)$/\1/g") # --------------------------------- # Next | Combine the ascii header information - # | with the binary image to make the - # | final downloadable *mostly* binary + # | with the binary image to make the + # | final downloadable *mostly* binary # | image. # --------------------------------- rm -f ${outbin} @@ -235,12 +235,12 @@ else # ----------- # Scenario #2 # ----------- - # Just a binary image but not a standard executable + # Just a binary image but not a standard executable # style binary (like ELF, etc). Might be a compressed # filesystem image, etc. # So... # --------------------------------- - # Next | Create the header information (ascii) needed + # Next | Create the header information (ascii) needed # | by the TI925 bootloader. This includes the # | load address, entry address and byte count of # | the binary file which will follow it. @@ -255,7 +255,7 @@ else fi # # Note: The LoadAddr and EntryAddr are already established - # for us at this point, but we will need to compute the + # for us at this point, but we will need to compute the # byte length of binary portion next. # numBytes=$(wc --bytes ${image_file}) @@ -267,8 +267,8 @@ else # # --------------------------------- # Next | Combine the ascii header information - # | with the binary image to make the - # | final downloadable *mostly* binary + # | with the binary image to make the + # | final downloadable *mostly* binary # | image. # --------------------------------- # diff --git a/nuttx/tools/mksymtab.c b/nuttx/tools/mksymtab.c index 5074c2940..da60433dd 100644 --- a/nuttx/tools/mksymtab.c +++ b/nuttx/tools/mksymtab.c @@ -157,7 +157,7 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) { fprintf(stderr, "Missing <cvs-file> and <symtab-file>\n"); - show_usage(argv[0]); + show_usage(argv[0]); } csvpath = argv[optind]; @@ -166,7 +166,7 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) { fprintf(stderr, "Missing <symtab-file>\n"); - show_usage(argv[0]); + show_usage(argv[0]); } symtab = argv[optind]; @@ -175,8 +175,8 @@ int main(int argc, char **argv, char **envp) if (optind < argc) { fprintf(stderr, "Unexpected garbage at the end of the line\n"); - show_usage(argv[0]); - } + show_usage(argv[0]); + } /* Open the CSV file for reading */ diff --git a/nuttx/tools/mksyscall.c b/nuttx/tools/mksyscall.c index 8bcfcf1ee..07ee2261c 100644 --- a/nuttx/tools/mksyscall.c +++ b/nuttx/tools/mksyscall.c @@ -343,7 +343,7 @@ static void generate_proxy(int nparms) */ get_fieldname(g_parm[PARM1_INDEX+i], fieldname); - fprintf(stream, ", (uintptr_t)parm%d.%s", i+1, fieldname); + fprintf(stream, ", (uintptr_t)parm%d.%s", i+1, fieldname); } else { @@ -433,7 +433,7 @@ static void generate_stub(int nparms) { fprintf(stream, "static inline "); } - + fprintf(stream, "uintptr_t STUB_%s(int nbr", g_parm[NAME_INDEX]); /* Generate the formal parameter list */ @@ -615,15 +615,15 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) { fprintf(stderr, "Missing <CSV file>\n"); - show_usage(argv[0]); + show_usage(argv[0]); } csvpath = argv[optind]; if (++optind < argc) { fprintf(stderr, "Unexpected garbage at the end of the line\n"); - show_usage(argv[0]); - } + show_usage(argv[0]); + } /* Open the CSV file */ diff --git a/nuttx/tools/pic32mx/mkpichex.c b/nuttx/tools/pic32mx/mkpichex.c index 889dc2a0c..a8be22cda 100644 --- a/nuttx/tools/pic32mx/mkpichex.c +++ b/nuttx/tools/pic32mx/mkpichex.c @@ -301,7 +301,7 @@ int main(int argc, char **argv, char **envp) if (remove(srcfile) != 0) { fprintf(stderr, "Failed to remove the old '%s'\n", srcfile); - + } /* Rename the new nuttx.tmp file to nuttx.hex */ diff --git a/nuttx/tools/version.sh b/nuttx/tools/version.sh index bd9083309..5240eecc9 100755 --- a/nuttx/tools/version.sh +++ b/nuttx/tools/version.sh @@ -43,7 +43,7 @@ unset VERSION unset BUILD unset OUTFILE -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -b ) shift diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh index 706754be7..7f3a849ac 100755 --- a/nuttx/tools/zipme.sh +++ b/nuttx/tools/zipme.sh @@ -49,7 +49,7 @@ unset VERSIONOPT unset BUILD unset DEBUG -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -b ) shift |