Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-26 10:46:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More trailing whilespace removal

Browse Source
This commit is contained in:
Gregory Nutt
2014-04-13 16:22:22 -06:00
parent 3a1324741a
commit f8024cf409
1051 changed files with 3204 additions and 3207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/Makefile.host
+3 -3
View File
@@ -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)
tools/README.txt
+6 -6
View File
@@ -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"
tools/b16.c
+1 -1
View File
@@ -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;
}
tools/configure.sh
+3 -3
View File
@@ -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
tools/define.sh
+1 -1
View File
@@ -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
tools/discover.py
+2 -2
View File
@@ -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')
tools/incdir.sh
+1 -1
View File
@@ -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
tools/mkconfigvars.sh
+1 -1
View File
@@ -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
tools/mkctags.sh
+2 -2
View File
@@ -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
tools/mkdeps.bat
+1 -1
View File
@@ -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
tools/mkdeps.sh
+1 -1
View File
@@ -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
tools/mkexport.sh
+2 -2
View File
@@ -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}"
tools/mkimage.sh
+18 -18
View File
@@ -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.
# ---------------------------------
#
tools/mksymtab.c
+4 -4
View File
@@ -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 */
tools/mksyscall.c
+5 -5
View File
@@ -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 */
tools/pic32mx/mkpichex.c
+1 -1
View File
@@ -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 */
tools/version.sh
+1 -1
View File
@@ -43,7 +43,7 @@ unset VERSION
unset BUILD
unset OUTFILE
while [ ! -z "$1" ]; do
while [ ! -z "$1" ]; do
case $1 in
-b )
shift
tools/zipme.sh
+1 -1
View File
@@ -49,7 +49,7 @@ unset VERSIONOPT
unset BUILD
unset DEBUG
while [ ! -z "$1" ]; do
while [ ! -z "$1" ]; do
case $1 in
-b )
shift