More trailing whilespace removal

This commit is contained in:
Gregory Nutt 2014-04-13 16:24:28 -06:00
parent 7d961b6c93
commit b9cf7acb1a
285 changed files with 769 additions and 769 deletions

View File

@ -15,7 +15,7 @@ License for NuttX in general (authorship of individual files may vary):
Author: Gregory Nutt <gnutt@nuttx.org>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
@ -31,13 +31,13 @@ are met:
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

View File

@ -174,7 +174,7 @@ else
echo "* The external directory/link must be removed manually *"; \
echo "********************************************************"; \
fi; \
)
)
endif

View File

@ -133,7 +133,7 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
builtin = builtin_for_index(index);
if (builtin == NULL)
{
{
ret = ENOENT;
goto errout_with_errno;
}

View File

@ -40,7 +40,7 @@
SUBDIRS = adc buttons can cc3000 cxxtest dhcpd discover elf flash_test
SUBDIRS += ftpc ftpd hello helloxx hidkbd igmp i2schar json keypadtest
SUBDIRS += lcdrw mm modbus mount mtdpart nettest nrf24l01_term nsh null nx
SUBDIRS += nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest
SUBDIRS += nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest
SUBDIRS += pashello pipe poll posix_spawn pwm qencoder random relays rgmp
SUBDIRS += romfs sendmail serloop slcd smart smart_test tcpecho telnetd
SUBDIRS += thttpd tiff touchscreen udp uip usbserial usbterm watchdog

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -176,7 +176,7 @@ static void parse_args(FAR struct adc_state_s *adc, int argc, FAR char **argv)
long value;
int index;
int nargs;
for (index = 1; index < argc; )
{
ptr = argv[index];
@ -209,7 +209,7 @@ static void parse_args(FAR struct adc_state_s *adc, int argc, FAR char **argv)
case 'h':
adc_help(adc);
exit(0);
default:
message("Unsupported option: %s\n", ptr);
adc_help(adc);

View File

@ -18,7 +18,7 @@ config EXAMPLES_BUTTONS_MAX
int "Highest Button Number"
default 7
if ARCH_IRQBUTTONS
if ARCH_IRQBUTTONS
config EXAMPLES_IRQBUTTONS_MIN
int "Lowest Interrupting Button Number"
default 0

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -297,7 +297,7 @@ static void show_buttons(uint8_t oldset, uint8_t newset)
}
else
{
state = "released";
state = "released";
}
/* Use lowsyslog() because we make be executing from an

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -250,9 +250,9 @@ int can_main(int argc, char *argv[])
if (memcmp(&txmsg.cm_hdr, &rxmsg.cm_hdr, sizeof(struct can_hdr_s)) != 0)
{
message("ERROR: Sent header does not match received header:\n");
lib_dumpbuffer("Sent header", (FAR const uint8_t*)&txmsg.cm_hdr,
lib_dumpbuffer("Sent header", (FAR const uint8_t*)&txmsg.cm_hdr,
sizeof(struct can_hdr_s));
lib_dumpbuffer("Received header", (FAR const uint8_t*)&rxmsg.cm_hdr,
lib_dumpbuffer("Received header", (FAR const uint8_t*)&rxmsg.cm_hdr,
sizeof(struct can_hdr_s));
errval = 4;
goto errout_with_dev;
@ -270,7 +270,7 @@ int can_main(int argc, char *argv[])
}
/* Report success */
message(" ID: %4d DLC: %d -- OK\n", msgid, msgdlc);
#endif
@ -278,7 +278,7 @@ int can_main(int argc, char *argv[])
#ifndef CONFIG_EXAMPLES_CAN_READONLY
msgdata += msgdlc;
if (++msgid >= MAX_ID)
{
msgid = 1;

View File

@ -3,7 +3,7 @@
* This file is part of the ArduinoCC3000 library.
* Version 1.0.1b
*
*
* Copyright (C) 2013 Chris Magagna - cmagagna@yahoo.com
*
* Redistribution and use in source and binary forms, with or without
@ -15,10 +15,10 @@
*
* This file is the main module for the Arduino CC3000 library.
* Your program must call CC3000_Init() before any other API calls.
*
*
****************************************************************************/
/*
/*
Some things are different for the Teensy 3.0, so set a flag if we're using
that hardware.
*/
@ -39,7 +39,7 @@
to send the bits manually. For the Uno, Nano, etc. you can probably leave
this unchanged. If your Arduino can't talk to the CC3000 and you're sure
your wiring is OK then try changing this. */
#ifdef TEENSY3
#define USE_HARDWARE_SPI false
#else
@ -54,7 +54,7 @@
// These are the Arduino pins that connect to the CC3000
// These are the Arduino pins that connect to the CC3000
// (in addition to standard SPI pins MOSI, MISO, and SCK)
//
// The WLAN_IRQ pin must be supported by attachInterrupt
@ -95,7 +95,7 @@
/*
The timing between setting the CS pin and reading the IRQ pin is very
tight on the CC3000, and sometimes the default Arduino digitalRead()
and digitalWrite() functions are just too slow.
and digitalWrite() functions are just too slow.
For many of the CC3000 library functions this isn't a big deal because the
IRQ pin is tied to an interrupt routine but some of them of them disable
@ -170,26 +170,26 @@
/* If you uncomment the line below the library will leave out a lot of the
higher level functions but use a lot less memory. From:
http://processors.wiki.ti.com/index.php/Tiny_Driver_Support
CC3000's new driver has flexible memory compile options.
This feature comes in handy when we want to use a limited RAM size MCU.
Using The Tiny Driver Compilation option will create a tiny version of our
host driver with lower data, stack and code consumption.
By enabling this feature, host driver's RAM consumption can be reduced to
minimum of 251 bytes.
The Tiny host driver version will limit the host driver API to the most
essential ones.
Code size depends on actual APIs used.
RAM size depends on the largest packet sent and received.
CC3000 can now be used with ultra low cost MCUs, consuming 251 byte of RAM
and 2K to 6K byte of code size, depending on the API usage. */

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -70,7 +70,7 @@ STACKSIZE = 4096
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean chkcxx

View File

@ -259,7 +259,7 @@ extern "C"
#ifdef CONFIG_UCLIBCXX_EXCEPTION
test_exception();
#endif
return 0;
}
}

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -36,7 +36,7 @@
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
@ -124,7 +124,7 @@ int dhcpd_main(int argc, char *argv[])
uip_setnetmask("eth0", &addr);
/* Then start the server */
dhcpd_run();
return 0;
}

View File

@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -76,7 +76,7 @@ $(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all)))
$(foreach DIR, $(ALL_SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean)))
$(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install)))
# Build program(s) in each sud-directory
# Build program(s) in each sud-directory
build: $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_build)
@ -103,7 +103,7 @@ $(ROMFS_IMG): populate
$(ROMFS_HDR) : $(ROMFS_IMG)
$(Q) (cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@)
# Create the dirlist.h header file from the romfs directory
# Create the dirlist.h header file from the romfs directory
$(DIRLIST_HDR) : populate
$(Q) $(TESTS_DIR)/mkdirlist.sh $(ROMFS_DIR) >$@

View File

@ -50,7 +50,7 @@ $(BIN): $(OBJS)
@echo "LD: $<"
$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call CLEAN)

View File

@ -104,7 +104,7 @@ endif
# @echo "LD: $<"
# $(Q) $(LD) $(LDELFFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN1))
$(call DELFILE, $(BIN2))
$(call DELFILE, $(BIN3))

View File

@ -61,7 +61,7 @@ public:
printf("CThingSayer::CThingSayer: I am!\n");
szWhatToSay = (const char*)NULL;
}
~CThingSayer(void)
{
printf("CThingSayer::~CThingSayer: I cease to be\n");

View File

@ -50,7 +50,7 @@ $(BIN): $(OBJS)
@echo "LD: $<"
$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call CLEAN)

View File

@ -77,7 +77,7 @@ static int leaf(int *some_arg)
/* We should not get here */
return -ERROR;
return -ERROR;
}
static int function(int some_arg)

View File

@ -50,7 +50,7 @@ $(BIN): $(OBJS)
@echo "LD: $<"
$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call CLEAN)

View File

@ -50,7 +50,7 @@ $(BIN): $(OBJS)
@echo "LD: $<"
$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call CLEAN)

View File

@ -50,7 +50,7 @@ $(BIN): $(OBJS)
@echo "LD: $<"
$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call CLEAN)

View File

@ -51,7 +51,7 @@ $(BIN): $(OBJS)
@echo "LD: $<"
$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call CLEAN)

View File

@ -46,7 +46,7 @@
* Public Data
****************************************************************************/
const struct struct_dummy_s dummy_struct =
const struct struct_dummy_s dummy_struct =
{
DUMMY_SCALAR_VALUE3
};

View File

@ -71,7 +71,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context depend clean distclean

View File

@ -12,7 +12,7 @@ NOTE: This test uses internal OS interfaces and so is not available in the NUTT
Usage:
flash_test mtdblock_device
Additional options:
--force to replace existing installation

View File

@ -100,9 +100,9 @@ int flash_test_main(int argc, char *argv[])
goto errout_with_driver;
}
/* Test if the device is formatted. If not, then we must do a
/* Test if the device is formatted. If not, then we must do a
* low-level format first */
if (!(fmt.flags & SMART_FMT_ISFORMATTED))
{
/* Perform a low-level format */
@ -160,16 +160,16 @@ int flash_test_main(int argc, char *argv[])
{
/* Allocate a new sector */
logsector = inode->u.i_bops->ioctl(inode, BIOC_ALLOCSECT,
logsector = inode->u.i_bops->ioctl(inode, BIOC_ALLOCSECT,
(unsigned long) -1);
if (logsector < 0)
{
fprintf(stderr, "Error allocating sector: %d\n", logsector);
goto errout_with_driver;
goto errout_with_driver;
}
/* Save the sector in our array */
sectors[x] = (uint16_t) logsector;
seqs[x] = seq++;
@ -190,7 +190,7 @@ int flash_test_main(int argc, char *argv[])
printf("\r%d ", sectors[x]);
}
/* Now read the data back to validate everything was written and can
/* Now read the data back to validate everything was written and can
* be read. */
printf("\nDoing read verify test\n");

View File

@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context depend clean distclean

View File

@ -243,7 +243,7 @@ static int ftpc_execute(SESSION handle, int argc, char *argv[])
*/
cmd = argv[0];
/* See if the command is one that we understand */
for (cmdmap = g_cmdmap; cmdmap->cmd; cmdmap++)

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built

View File

@ -226,7 +226,7 @@ int ftpd_main(int s_argc, char **s_argv)
if (!g_ftpdglob.initialized)
{
/* Bring up the network */
printf("Initializing the network\n");
@ -256,7 +256,7 @@ int ftpd_main(int s_argc, char **s_argv)
{
printf("Starting the FTP daemon\n");
g_ftpdglob.pid = TASK_CREATE("FTP daemon", CONFIG_EXAMPLES_FTPD_PRIO,
CONFIG_EXAMPLES_FTPD_STACKSIZE,
CONFIG_EXAMPLES_FTPD_STACKSIZE,
ftpd_daemon, NULL);
if (g_ftpdglob.pid < 0)
{

View File

@ -68,7 +68,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -70,7 +70,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean chkcxx

View File

@ -123,7 +123,7 @@ class CHelloWorld
// Define a statically constructed CHellowWorld instance if C++ static
// initializers are supported by the platform
#ifdef CONFIG_HAVE_CXXINITIALIZE
#ifdef CONFIG_HAVE_CXXINITIALIZE
static CHelloWorld g_HelloWorld;
#endif

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -74,7 +74,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -173,7 +173,7 @@ static void parse_args(FAR struct i2schar_state_s *i2schar, int argc, FAR char *
long value;
int index;
int nargs;
for (index = 1; index < argc; )
{
ptr = argv[index];
@ -218,7 +218,7 @@ static void parse_args(FAR struct i2schar_state_s *i2schar, int argc, FAR char *
case 'h':
i2schar_help(i2schar);
exit(0);
default:
message("Unsupported option: %s\n", ptr);
i2schar_help(i2schar);

View File

@ -114,7 +114,7 @@ pthread_addr_t i2schar_receiver(pthread_addr_t arg)
for (i = 0; i < CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS; i++)
{
/* Allocate an audio buffer of the configured size */
desc.numbytes = CONFIG_EXAMPLES_I2SCHAR_BUFSIZE;
desc.u.ppBuffer = &apb;

View File

@ -117,7 +117,7 @@ pthread_addr_t i2schar_transmitter(pthread_addr_t arg)
for (i = 0, crap = 0; i < CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS; i++)
{
/* Allocate an audio buffer of the configured size */
desc.numbytes = CONFIG_EXAMPLES_I2SCHAR_BUFSIZE;
desc.u.ppBuffer = &apb;

View File

@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -89,7 +89,7 @@ int igmp_main(int argc, char *argv[])
#endif
message("Configuring Ethernet...\n");
/* Many embedded network interfaces must have a software assigned MAC */
#ifdef CONFIG_EXAMPLES_IGMP_NOMAC

View File

@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -66,12 +66,12 @@ philosophy as JSON itself. Simple, dumb, out of the way.
Some JSON:
{
"name": "Jack (\"Bee\") Nimble",
"name": "Jack (\"Bee\") Nimble",
"format": {
"type": "rect",
"width": 1920,
"height": 1080,
"interlace": false,
"type": "rect",
"width": 1920,
"height": 1080,
"interlace": false,
"frame rate": 24
}
}
@ -99,7 +99,7 @@ Finished? Delete the root (this takes care of everything else).
That's AUTO mode. If you're going to use Auto mode, you really ought to check pointers
before you dereference them. If you want to see how you'd build this struct in code?
cJSON *root,*fmt;
root=cJSON_CreateObject();
root=cJSON_CreateObject();
cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
cJSON_AddItemToObject(root, "format", fmt=cJSON_CreateObject());
cJSON_AddStringToObject(fmt,"type", "rect");
@ -198,7 +198,7 @@ void parse_object(cJSON *item)
int i; for (i=0;i<cJSON_GetArraySize(item);i++)
{
cJSON *subitem=cJSON_GetArrayItem(item,i);
// handle subitem.
// handle subitem.
}
}
@ -211,7 +211,7 @@ void parse_object(cJSON *item)
{
// handle subitem
if (subitem->child) parse_object(subitem->child);
subitem=subitem->next;
}
}
@ -240,7 +240,7 @@ cJSON *Create_array_of_anything(cJSON **items,int num)
}
return root;
}
and simply: Create_array_of_anything(objects,24);
cJSON doesn't make any assumptions about what order you create things in.

View File

@ -130,7 +130,7 @@ static void create_objects(void)
int i;
/* Our "days of the week" array */
static const char *strings[7] =
{
"Sunday", "Monday", "Tuesday", "Wednesday",
@ -138,7 +138,7 @@ static void create_objects(void)
};
/* Our matrix: */
static const int numbers[3][3] = { {0, -1, 0}, {1, 0, 0}, {0, 0, 1} };
/* Our "gallery" item: */
@ -229,10 +229,10 @@ static void create_objects(void)
* Public Functions
****************************************************************************/
/****************************************************************************
* Name:
* Name:
*
* Description:
*
*
*
****************************************************************************/
@ -252,7 +252,7 @@ int json_main(int argc, const char *argv[])
" }\n"
"}";
static const char text2[] =
static const char text2[] =
"[\"Sunday\", \"Monday\", \"Tuesday\", \"Wednesday\", \"Thursday\", \"Friday\", \"Saturday\"]";
static const char text3[] =
@ -261,7 +261,7 @@ int json_main(int argc, const char *argv[])
" [1, 0, 0],\n"
" [0, 0, 1]\n"
"]\n";
static const char text4[] =
"{\n"
" \"Image\": {\n"

View File

@ -61,14 +61,14 @@ endif
ROOTDEPPATH = --dep-path .
# LCD R/W built-in application info
APPNAME = lcdrw
PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -181,7 +181,7 @@ int lcdrw_main(int argc, char *argv[])
/* Create a dummy row. The important thing is to try all
* bit combinations in a predictable way.
*/
ptr = (FAR uint16_t*)inst.pinfo.buffer;
for (col = 0; col < CONFIG_EXAMPLES_LDCRW_XRES; col++)
{
@ -214,7 +214,7 @@ int lcdrw_main(int argc, char *argv[])
for (row = 0; row < CONFIG_EXAMPLES_LDCRW_YRES; row++)
{
/* Read the row */
ret = inst.pinfo.getrun(row, 0, inst.pinfo.buffer,
CONFIG_EXAMPLES_LDCRW_XRES);
if (ret < 0)

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -68,7 +68,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -33,7 +33,7 @@
*
****************************************************************************
* Leveraged from:
*
*
* FreeModbus Libary: Linux Demo Application
* Copyright (C) 2006 Christian Walter <wolti@sil.at>
*
@ -149,7 +149,7 @@ static const uint8_t g_slaveid[] = { 0xaa, 0xbb, 0xcc };
* Name: modbus_initialize
*
* Description:
* Called from the ModBus polling thread in order to initialized the
* Called from the ModBus polling thread in order to initialized the
* FreeModBus interface.
*
****************************************************************************/
@ -197,7 +197,7 @@ static inline int modbus_initialize(void)
"ERROR: eMBInit failed: %d\n", mberr);
goto errout_with_mutex;
}
/* Set the slave ID
*
* 0x34 = Slave ID
@ -274,7 +274,7 @@ static void *modbus_pollthread(void *pvarg)
do
{
/* Poll */
mberr = eMBPoll();
if (mberr != MB_ENOERR)
{

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -75,7 +75,7 @@ static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -231,7 +231,7 @@ int mtdpart_main(int argc, char *argv[])
message(" blocksize: %lu\n", (unsigned long)geo.blocksize);
message(" erasesize: %lu\n", (unsigned long)geo.erasesize);
message(" neraseblocks: %lu\n", (unsigned long)geo.neraseblocks);
/* Determine the size of each partition. Make each partition an even
* multiple of the erase block size (perhaps not using some space at the
* end of the FLASH).

View File

@ -39,7 +39,7 @@ include $(APPDIR)/Make.defs
# Basic TCP networking test
TARG_ASRCS =
TARG_ASRCS =
TARG_AOBJS = $(TARG_ASRCS:.S=$(OBJEXT))
TARG_CSRCS = nettest.c
@ -93,7 +93,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built $(HOST_BIN)
.PHONY: clean depend distclean

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -71,7 +71,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -337,7 +337,7 @@ int nxcon_main(int argc, char **argv)
}
/* Sleep a little bit to allow the server to catch up */
sleep(2);
/* NxConsole Configuration ************************************************/
@ -388,7 +388,7 @@ int nxcon_main(int argc, char **argv)
/* And start the console task. It will inherit stdin, stdout, and stderr
* from this task.
*/
g_nxcon_vars.pid = TASK_CREATE("NxConsole", CONFIG_EXAMPLES_NXCONSOLE_PRIO,
CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE,
nxcon_task, NULL);

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -279,7 +279,7 @@ static inline void nxffs_randname(FAR struct nxffs_filedesc_s *file)
{
file->name[i] = nxffs_randchar();
}
file->name[alloclen] = '\0';
}

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: headers clean depend distclean

View File

@ -57,7 +57,7 @@ $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all)))
$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean)))
$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install)))
# Build program(s) in each sud-directory
# Build program(s) in each sud-directory
build: $(foreach DIR, $(SUBDIRS), $(DIR)_build)
@ -84,7 +84,7 @@ $(ROMFS_IMG): populate
$(ROMFS_HDR) : $(ROMFS_IMG)
@(cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@)
# Create the dirlist.h header file from the romfs directory
# Create the dirlist.h header file from the romfs directory
$(ROMFS_DIRLIST) : populate
@$(TESTS_DIR)/mkdirlist.sh $(ROMFS_DIR) >$@

View File

@ -69,7 +69,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -162,7 +162,7 @@ $(BIN3): $(BIN3).r2
# @echo "LD: $<"
# $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN1))
$(call DELFILE, $(BIN2))
$(call DELFILE, $(BIN3))

View File

@ -61,7 +61,7 @@ public:
printf("CThingSayer::CThingSayer: I am!\n");
szWhatToSay = (const char*)NULL;
}
~CThingSayer(void)
{
printf("CThingSayer::~CThingSayer: I cease to be\n");

View File

@ -69,7 +69,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -69,7 +69,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -77,7 +77,7 @@ static int leaf(int *some_arg)
/* We should not get here */
return -ERROR;
return -ERROR;
}
static int function(int some_arg)

View File

@ -69,7 +69,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -70,7 +70,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -69,7 +69,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -71,7 +71,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -46,7 +46,7 @@
* Public Data
****************************************************************************/
const struct struct_dummy_s dummy_struct =
const struct struct_dummy_s dummy_struct =
{
DUMMY_SCALAR_VALUE3
};

View File

@ -69,7 +69,7 @@ $(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -1075,7 +1075,7 @@ static const struct pix_run_s g_nuttx[] =
{ 77, 0},
{ 76, 0}, { 1, 5}, { 4, 4}, { 1, 5}, { 78, 0} /* Row 159 */
};
#elif CONFIG_EXAMPLES_NXIMAGE_BPP == 16
static const struct pix_run_s g_nuttx[] =
@ -3545,7 +3545,7 @@ nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1, nxgl_mxpixel_t color2)
{
b1 = 0xff;
}
/* Multiplex */
color1 = r1 << 16 | g1 << 8 | b1;
@ -3586,7 +3586,7 @@ nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1, nxgl_mxpixel_t color2)
{
b1 = 0x1f;
}
/* Multiplex */
color1 = r1 << 11 | g1 << 5 | b1;
@ -3629,7 +3629,7 @@ nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1, nxgl_mxpixel_t color2)
{
b1 = 0x03;
}
/* Multiplex */
color1 = r1 << 5 | g1 << 2 | b1;

View File

@ -295,7 +295,7 @@ void nximage_image(NXWINDOW hwnd)
dest.pt1.x = pos.x;
dest.pt2.x = pos.x + SCALED_WIDTH - 1;
/* Now output the rows */
for (row = 0; row < IMAGE_HEIGHT; row += NINPUT_ROWS)

View File

@ -68,7 +68,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -254,7 +254,7 @@ int nxlines_main(int argc, char *argv[])
message("nxlines_main: Screen resolution (%d,%d)\n", g_nxlines.xres, g_nxlines.yres);
/* Now, say perform the lines (these test does not return so the remaining
* logic is cosmetic).
* logic is cosmetic).
*/
nxlines_test(g_nxlines.hbkgd);

View File

@ -72,7 +72,7 @@ STACKSIZE = 2048
# Common build
VPATH =
VPATH =
all: .built
.PHONY: context clean depend distclean

View File

@ -329,7 +329,7 @@ static inline void nxbg_scroll(NXWINDOW hwnd, int lineheight)
bm->pos.y -= lineheight;
/* We are keeping this one so increment to the next character */
i++;
}
}

View File

@ -455,7 +455,7 @@ int nxtext_main(int argc, char **argv)
else if (popcnt == 5)
{
/* Destroy the pop-up window and restart the sequence */
message("nxtext_main: Close pop-up\n");
(void)nxpu_close(hwnd);
popcnt = 0;

View File

@ -137,7 +137,7 @@ static fb_coord_t nxpu_randpos(fb_coord_t value)
{
ndx = 0;
}
return (fb_coord_t)(((uint32_t)value * (uint32_t)rand8) >> 8);
}

View File

@ -128,7 +128,7 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st)
* track of the least used glyph as well. We need that if we have to replace
* a glyph in the cache.
*/
for (i = 0; i < st->maxglyphs; i++)
{
/* Is this glyph in use? */
@ -153,7 +153,7 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st)
/* If we get here, the glyph cache is full. We replace the least used
* glyph with the one we need now. (luglyph can't be NULL).
*/
luusecnt = luglyph->usecnt;
nxtext_freeglyph(luglyph);
@ -164,7 +164,7 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st)
if (luusecnt > 1)
{
uint8_t decr = luusecnt - 1;
for (i = 0; i < st->maxglyphs; i++)
{
/* Is this glyph in use? */

View File

@ -77,9 +77,9 @@ endif # CONFIG_DISABLE_SIGNALS
ifneq ($(CONFIG_DISABLE_MQUEUE),y)
ifneq ($(CONFIG_DISABLE_PTHREAD),y)
CSRCS += mqueue.c
CSRCS += mqueue.c
ifneq ($(CONFIG_DISABLE_CLOCK),y)
CSRCS += timedmqueue.c
CSRCS += timedmqueue.c
endif # CONFIG_DISABLE_CLOCK
endif # CONFIG_DISABLE_PTHREAD
endif # CONFIG_DISABLE_MQUEUE
@ -122,7 +122,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -215,7 +215,7 @@ static int fpu_task(int argc, char *argv[])
printf("FPU#%d: pass %d\n", id, i+1);
fflush(stdout);
/* Set the FPU register save arrays to a known-but-illogical values so
/* Set the FPU register save arrays to a known-but-illogical values so
* that we can verify that reading of the registers actually occurs.
*/

View File

@ -306,7 +306,7 @@ static int user_main(int argc, char *argv[])
#endif
/* Top of test loop */
#if CONFIG_EXAMPLES_OSTEST_LOOPS > 1
for (i = 0; i < CONFIG_EXAMPLES_OSTEST_LOOPS; i++)
#elif CONFIG_EXAMPLES_OSTEST_LOOPS == 0

View File

@ -115,7 +115,7 @@ static int nhighpri_waiting(void)
{
int n = 0;
int i;
for (i = 0; i < NHIGHPRI_THREADS; i++)
{
if (g_highstate[i] == WAITING)
@ -134,7 +134,7 @@ static int nhighpri_running(void)
{
int n = 0;
int i;
for (i = 0; i < NHIGHPRI_THREADS; i++)
{
if (g_highstate[i] != DONE)
@ -268,7 +268,7 @@ static void *lowpri_thread(void *parameter)
if (sparam.sched_priority != g_lowpri)
{
printf(" ERROR should have been %d\n", g_lowpri);
}
}
}
g_lowstate[threadno-1] = WAITING;
@ -378,14 +378,14 @@ static void *lowpri_thread(void *parameter)
if (sparam.sched_priority != g_lowpri)
{
printf(" ERROR should have been %d\n", g_lowpri);
}
}
}
sem_enumholders(&g_sem);
printf("lowpri_thread-%d: Okay... I'm done!\n", threadno);
FFLUSH();
g_lowstate[threadno-1] = DONE;
return retval;
return retval;
}
#endif /* CONFIG_PRIORITY_INHERITANCE && !CONFIG_DISABLE_SIGNALS && !CONFIG_DISABLE_PTHREAD */

View File

@ -64,7 +64,7 @@ static void thread_inner(int id, int level)
printf("thread_inner[%d, %d]: Locked\n", id, level);
/* Give the other threads a chance */
pthread_yield();
thread_inner(id, level+1);
pthread_yield();
@ -127,7 +127,7 @@ void recursive_mutex_test(void)
{
printf("recursive_mutex_test: ERROR pthread_mutexattr_gettype return type=%d\n", type);
}
/* Initialize the mutex */
printf("recursive_mutex_test: Initializing mutex\n");

View File

@ -235,7 +235,7 @@ void sem_test(void)
printf(" Canceling waiter threads\n");
pthread_cancel(waiter_thread1);
pthread_cancel(waiter_thread2);
pthread_cancel(waiter_thread2);
}
#ifdef SDCC

View File

@ -70,7 +70,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

View File

@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean

Some files were not shown because too many files have changed in this diff Show More