diff options
Diffstat (limited to 'nuttx/configs')
503 files changed, 1312 insertions, 1312 deletions
diff --git a/nuttx/configs/16z/README.txt b/nuttx/configs/16z/README.txt index f9659f9d4..fdd12f4a5 100644 --- a/nuttx/configs/16z/README.txt +++ b/nuttx/configs/16z/README.txt @@ -126,7 +126,7 @@ Other Versions If you use any version of ZDS-II other than 5.0.1 or if you install ZDS-II at any location other than the default location, you will have to modify - two files: (1) configs/16z/*/setenv.sh and (2) configs/16z/*/Make.defs. + two files: (1) configs/16z/*/setenv.sh and (2) configs/16z/*/Make.defs. Simply edit these two files, changing 5.0.1 to whatever. Patches diff --git a/nuttx/configs/16z/src/Makefile b/nuttx/configs/16z/src/Makefile index 8f37a25df..1632c6f88 100644 --- a/nuttx/configs/16z/src/Makefile +++ b/nuttx/configs/16z/src/Makefile @@ -49,7 +49,7 @@ endif INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) $(EXTRADEFINES) -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = z16f_lowinit.c z16f_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index b1464f340..3b4b65f2e 100644 --- a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch @@ -22,12 +22,12 @@ index ba7dbe7..b9f9991 100644 + FAR const char *fmt, va_list ap); +#endif static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl); - + #if CONFIG_NFILE_DESCRIPTORS > 0 @@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf * ****************************************************************************/ - + +#if 0 static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...) @@ -35,7 +35,7 @@ index ba7dbe7..b9f9991 100644 @@ -263,6 +270,51 @@ static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, #endif } - + +#else +static int nsh_consolevoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, va_list ap) +{ @@ -95,7 +95,7 @@ index ba7dbe7..b9f9991 100644 +#endif pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer; pstate->cn_vtbl.exit = nsh_consoleexit; - + @@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void) } return pstate; @@ -122,12 +122,12 @@ index c78362f..59bd8d7 100644 #include <stdbool.h> +#include <stdarg.h> #include <errno.h> - + /**************************************************************************** @@ -62,11 +63,13 @@ #define nsh_undirect(v,s) (v)->undirect(v,s) #define nsh_exit(v,s) (v)->exit(v,s) - + +#if 0 #ifdef CONFIG_CPP_HAVE_VARARGS # define nsh_output(v, fmt...) (v)->output(v, ##fmt) @@ -135,9 +135,9 @@ index c78362f..59bd8d7 100644 # define nsh_output vtbl->output #endif +#endif - + /* Size of info to be saved in call to nsh_redirect */ - + @@ -107,7 +110,11 @@ struct nsh_vtbl_s void (*release)(FAR struct nsh_vtbl_s *vtbl); #endif @@ -152,8 +152,8 @@ index c78362f..59bd8d7 100644 void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save); @@ -159,5 +166,6 @@ struct console_stdio_s /* Defined in nsh_console.c *************************************************/ - + FAR struct console_stdio_s *nsh_newconsole(void); +int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...); - + #endif /* __APPS_NSHLIB_NSH_CONSOLE_H */ diff --git a/nuttx/configs/amber/README.txt b/nuttx/configs/amber/README.txt index 5e8abd136..b706af396 100644 --- a/nuttx/configs/amber/README.txt +++ b/nuttx/configs/amber/README.txt @@ -120,21 +120,21 @@ Switches and Jumpers ^^^^^^^^^^^^^^^^^^^^ ISP/UART0 JP1 - DTE/DCE selection - JP2 - - JP5 - + JP2 - + JP5 - J11 - STK500 Enable ADC - JP8 - - JP9 - + JP8 - + JP9 - Networking - JP10 - + JP10 - RS-485 - J8 - - J9 - - J10 - + J8 - + J9 - + J10 - Atmel AVRISP mkII Connection ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -149,7 +149,7 @@ Atmel AVRISP mkII Connection (ISP10PIN Connector) ------------------- ------------------------- - + 1 2 MOSI o o Vcc - ISP-PDI: PE0/PDI/RX0 via 74HC5053 LED o o GND - ISP-PROG: J11/GND, to 74HC5053 and LED @@ -241,7 +241,7 @@ Windows Native Toolchains ^^^^^^^^^^^^^^^^^^^^^^^^^ The WinAVR toolchain is a Windows native toolchain. There are several - limitations to using a Windows native toolchain in a Cygwin environment. + limitations to using a Windows native toolchain in a Cygwin environment. The three biggest are: 1. The Windows toolchain cannot follow Cygwin paths. Path conversions are @@ -341,14 +341,14 @@ Build Notes: the flowing point library, then you may have to build avr-lib from sources. Below are instructions for building avr-lib from fresh sources: - 1. Download the avr-libc package from: + 1. Download the avr-libc package from: http://savannah.nongnu.org/projects/avr-libc/ I am using avr-lib-1.7.1.tar.bz2 - 2. Upack the tarball and cd into the - + 2. Upack the tarball and cd into the + tar jxf avr-lib-1.7.1.tar.bz2 cd avr-lib-1.7.1 diff --git a/nuttx/configs/amber/hello/Make.defs b/nuttx/configs/amber/hello/Make.defs index 55dae79e1..b05164648 100644 --- a/nuttx/configs/amber/hello/Make.defs +++ b/nuttx/configs/amber/hello/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" diff --git a/nuttx/configs/amber/src/Makefile b/nuttx/configs/amber/src/Makefile index 73d2ea2c7..4c38990eb 100644 --- a/nuttx/configs/amber/src/Makefile +++ b/nuttx/configs/amber/src/Makefile @@ -35,7 +35,7 @@ -include $(TOPDIR)/Make.defs -ASRCS = +ASRCS = CSRCS = up_boot.c ifeq ($(CONFIG_ARCH_LEDS),y) @@ -58,13 +58,13 @@ endif ifeq ($(WINTOOL),y) CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" else CFLAGS += -I "$(TOPDIR)/sched" CFLAGS += -I "$(ARCH_SRCDIR)/chip" - CFLAGS += -I "$(ARCH_SRCDIR)/common" + CFLAGS += -I "$(ARCH_SRCDIR)/common" CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)" endif diff --git a/nuttx/configs/arduino-due/nsh/Make.defs b/nuttx/configs/arduino-due/nsh/Make.defs index a25c95536..faa6336fb 100644 --- a/nuttx/configs/arduino-due/nsh/Make.defs +++ b/nuttx/configs/arduino-due/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/avr32dev1/README.txt b/nuttx/configs/avr32dev1/README.txt index f13f232bb..b97146950 100644 --- a/nuttx/configs/avr32dev1/README.txt +++ b/nuttx/configs/avr32dev1/README.txt @@ -155,7 +155,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -185,7 +185,7 @@ AVR32 Bootloader Boot Sequence ------------- - + "An AVR UC3 part having the bootloader programmed resets as any other part at 80000000h. Bootloader execution begins here. The bootloader first performs the boot process to know whether it should start the @@ -193,7 +193,7 @@ AVR32 Bootloader that the USB DFU ISP should be started, then execution continues in the bootloader area, i.e. between 80000000h and 80002000h, else the bootloader launches the application at 80002000h." - + Link Address ------------ @@ -234,7 +234,7 @@ AVR32 Bootloader will need to modify the setenv.sh files. Notes from "AVR32 UC3 USB DFU Bootloader" (doc7745.pdf) - + "To launch BatchISP, open a command prompt. Windows or Cygwin command prompt can be used provided that the bin folder of the FLIP installation directory is in the PATH (Windows’ or Cygwin’s) environment variable. @@ -247,7 +247,7 @@ AVR32 Bootloader "BatchISP works with an internal ISP buffer per target memory. These ISP buffers can be filled from several sources. All target operations (program, verify, read) are performed using these buffers." - + The following BatchISP command line will erase FLASH, write the nuttx binary into FLASH, and reset the AVR32. This command line is available in the script config/avr32dev1/tools/doisp.sh: @@ -256,7 +256,7 @@ AVR32 Bootloader blankcheck loadbuffer nuttx.elf program verify start reset 0 "BatchISP main commands available on AT32UC3xxxxx are: - + - ASSERT { PASS | FAIL } changes the displayed results of the following operations according to the expected behavior. - ONFAIL { ASK | ABORT | RETRY | IGNORE } changes the interactive behavior @@ -325,7 +325,7 @@ Make Tip changes when you run the program. That is because build is still using the version of the file in the copied directory, not your modified file! To work around this annoying behavior, do the following when you re-build: - + make clean_context all <-- Remove and re-copy all of the directories, then make all doisp.sh <-- Load the code onto the board. @@ -401,7 +401,7 @@ AVR32DEV1 Configuration Options the delay actually is 100 seconds. Individual subsystems can be enabled: - + CONFIG_AVR32_GPIOIRQ - GPIO interrupt support CONFIG_AVR32_GPIOIRQSETA - Set of GPIOs on PORTA that support interrupts CONFIG_AVR32_GPIOIRQSETB - Set of GPIOs on PORTB that support interrupts diff --git a/nuttx/configs/avr32dev1/nsh/Make.defs b/nuttx/configs/avr32dev1/nsh/Make.defs index 730a05f88..95ecde738 100644 --- a/nuttx/configs/avr32dev1/nsh/Make.defs +++ b/nuttx/configs/avr32dev1/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/avr32dev1/ostest/Make.defs b/nuttx/configs/avr32dev1/ostest/Make.defs index e231a5753..21d9d9a82 100644 --- a/nuttx/configs/avr32dev1/ostest/Make.defs +++ b/nuttx/configs/avr32dev1/ostest/Make.defs @@ -60,7 +60,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/avr32dev1/src/Makefile b/nuttx/configs/avr32dev1/src/Makefile index ccff5e062..d96334291 100644 --- a/nuttx/configs/avr32dev1/src/Makefile +++ b/nuttx/configs/avr32dev1/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += up_leds.c diff --git a/nuttx/configs/avr32dev1/src/avr32dev1_internal.h b/nuttx/configs/avr32dev1/src/avr32dev1_internal.h index eac54f414..4c2ea9044 100644 --- a/nuttx/configs/avr32dev1/src/avr32dev1_internal.h +++ b/nuttx/configs/avr32dev1/src/avr32dev1_internal.h @@ -53,15 +53,15 @@ #if (CONFIG_AVR32_GPIOIRQSETB & 4) == 1 # define CONFIG_AVR32DEV_BUTTON1_IRQ 1 -#endif +#endif #if (CONFIG_AVR32_GPIOIRQSETB & 8) == 1 # define CONFIG_AVR32DEV_BUTTON2_IRQ 1 -#endif +#endif /* AVRDEV1 GPIO Pin Definitions *****************************************************/ /* LEDs - * + * * The AVR32DEV1 board has 3 LEDs, two of which can be controlled through GPIO pins. * * PIN 13 PA7 LED1 diff --git a/nuttx/configs/avr32dev1/src/up_buttons.c b/nuttx/configs/avr32dev1/src/up_buttons.c index 9c9aafc90..3415973cd 100644 --- a/nuttx/configs/avr32dev1/src/up_buttons.c +++ b/nuttx/configs/avr32dev1/src/up_buttons.c @@ -79,7 +79,7 @@ static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler) { xcpt_t oldhandler; - + /* Attach the handler */ gpio_irqattach(irq, irqhandler, &oldhandler); diff --git a/nuttx/configs/c5471evm/doc/test-result.txt b/nuttx/configs/c5471evm/doc/test-result.txt index 9b7925912..a05a92e30 100644 --- a/nuttx/configs/c5471evm/doc/test-result.txt +++ b/nuttx/configs/c5471evm/doc/test-result.txt @@ -103,7 +103,7 @@ cond_test: signaler terminated, now cancel the waiter cond_test: Waiter Signaler cond_test: Loops 32 32 cond_test: Errors 0 0 -cond_test: +cond_test: 0 times, waiter did not have to wait for data cond_test: 0 times, data was already available when the signaler run cond_test: 0 times, the waiter was in an unexpected state when the signaler ran diff --git a/nuttx/configs/c5471evm/src/Makefile b/nuttx/configs/c5471evm/src/Makefile index cf920133e..fbb586caa 100644 --- a/nuttx/configs/c5471evm/src/Makefile +++ b/nuttx/configs/c5471evm/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/cloudctrl/README.txt b/nuttx/configs/cloudctrl/README.txt index 24d673726..7de88edf3 100644 --- a/nuttx/configs/cloudctrl/README.txt +++ b/nuttx/configs/cloudctrl/README.txt @@ -2,7 +2,7 @@ README ====== This README discusses issues unique to NuttX configurations for the CloudController -development board featuring the STMicro STM32F107VCT MCU. +development board featuring the STMicro STM32F107VCT MCU. Features of the CloudController board include: @@ -392,7 +392,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -700,14 +700,14 @@ Cloudctrl-specific Configuration Options STM32 USB OTG FS Host Driver Support Pre-requisites - + CONFIG_USBHOST - Enable USB host support CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block CONFIG_STM32_SYSCFG - Needed CONFIG_SCHED_WORKQUEUE - Worker thread support is required - + Options: - + CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. Default 128 (512 bytes) CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO @@ -760,7 +760,7 @@ Where <subdir> is one of the following: ADC1_IN10(PC0) Potentiometer External signals are also available on CON5 CN14: - + ADC_IN8 (PB0) CON5 CN14 Pin2 ADC_IN9 (PB1) CON5 CN14 Pin1 @@ -855,7 +855,7 @@ Where <subdir> is one of the following: -CONFIG_NX_WRITEONLY=y +# CONFIG_NX_WRITEONLY is not set - + thttpd ------ diff --git a/nuttx/configs/cloudctrl/include/board.h b/nuttx/configs/cloudctrl/include/board.h index aa47ad1d2..00c453fe4 100644 --- a/nuttx/configs/cloudctrl/include/board.h +++ b/nuttx/configs/cloudctrl/include/board.h @@ -112,7 +112,7 @@ /* MCO output driven by PLL3. From above, we already have PLL3 input frequency as: * - * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz + * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz */ #if defined(CONFIG_STM32_MII_MCO) || defined(CONFIG_STM32_RMII_MCO) @@ -160,7 +160,7 @@ #define BUTTON_KEY2 1 #define BUTTON_KEY3 2 #define NUM_BUTTONS 3 - + #define BUTTON_USERKEY BUTTON_KEY1 /* Names in schematic */ #define BUTTON_TAMPER BUTTON_KEY2 #define BUTTON_WAKEUP BUTTON_KEY3 @@ -196,7 +196,7 @@ * 56 PD9 MII_RXD0 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * 57 PD10 MII_RXD1 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * - * The board desdign can support a 50MHz external clock to drive the PHY + * The board desdign can support a 50MHz external clock to drive the PHY * (U9). However, on my board, U9 is not present. * * 67 PA8 MCO DM9161AEP diff --git a/nuttx/configs/cloudctrl/nsh/Make.defs b/nuttx/configs/cloudctrl/nsh/Make.defs index 63801f76d..b5474d9d1 100644 --- a/nuttx/configs/cloudctrl/nsh/Make.defs +++ b/nuttx/configs/cloudctrl/nsh/Make.defs @@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/cloudctrl/src/Makefile b/nuttx/configs/cloudctrl/src/Makefile index e04853115..248886fc3 100644 --- a/nuttx/configs/cloudctrl/src/Makefile +++ b/nuttx/configs/cloudctrl/src/Makefile @@ -38,7 +38,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_spi.c up_chipid.c diff --git a/nuttx/configs/cloudctrl/src/cloudctrl-internal.h b/nuttx/configs/cloudctrl/src/cloudctrl-internal.h index f731a455e..b31b873d8 100644 --- a/nuttx/configs/cloudctrl/src/cloudctrl-internal.h +++ b/nuttx/configs/cloudctrl/src/cloudctrl-internal.h @@ -84,7 +84,7 @@ * 56 PD9 MII_RXD0 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * 57 PD10 MII_RXD1 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * - * The board desdign can support a 50MHz external clock to drive the PHY + * The board desdign can support a 50MHz external clock to drive the PHY * (U9). However, on my board, U9 is not present. * * 67 PA8 MCO DM9161AEP diff --git a/nuttx/configs/cloudctrl/src/up_buttons.c b/nuttx/configs/cloudctrl/src/up_buttons.c index 18e4d9057..d823d28fc 100644 --- a/nuttx/configs/cloudctrl/src/up_buttons.c +++ b/nuttx/configs/cloudctrl/src/up_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for some pins but NOT used in this file */ diff --git a/nuttx/configs/cloudctrl/src/up_userleds.c b/nuttx/configs/cloudctrl/src/up_userleds.c index 633aa7d98..cac8c5045 100644 --- a/nuttx/configs/cloudctrl/src/up_userleds.c +++ b/nuttx/configs/cloudctrl/src/up_userleds.c @@ -76,9 +76,9 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { - GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 + GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 }; /**************************************************************************** diff --git a/nuttx/configs/compal_e86/README.txt b/nuttx/configs/compal_e86/README.txt index dd5a785b5..c82026790 100644 --- a/nuttx/configs/compal_e86/README.txt +++ b/nuttx/configs/compal_e86/README.txt @@ -27,11 +27,11 @@ directory at same level as the nuttx project: `- osmocom-bb If you attempt to build this configuration without osmocom-bb, and that -you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) -you will get compilation errors in drivers/sercomm due to header files that +you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) +you will get compilation errors in drivers/sercomm due to header files that are needed from the osmocom-bb directory. -By default, NuttX will not use sercomm (HDLC protocol) to communicate with +By default, NuttX will not use sercomm (HDLC protocol) to communicate with the host system. Sercomm is the transport used by osmocom-bb that runs on top of serial. See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed the usage of nuttx with sercomm. diff --git a/nuttx/configs/compal_e88/README.txt b/nuttx/configs/compal_e88/README.txt index 4b2ee45d2..1dfefc746 100644 --- a/nuttx/configs/compal_e88/README.txt +++ b/nuttx/configs/compal_e88/README.txt @@ -27,11 +27,11 @@ directory at same level as the nuttx project: `- osmocom-bb If you attempt to build this configuration without osmocom-bb, and that -you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) -you will get compilation errors in drivers/sercomm due to header files that +you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) +you will get compilation errors in drivers/sercomm due to header files that are needed from the osmocom-bb directory. -By default, NuttX will not use sercomm (HDLC protocol) to communicate with +By default, NuttX will not use sercomm (HDLC protocol) to communicate with the host system. Sercomm is the transport used by osmocom-bb that runs on top of serial. See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed the usage of nuttx with sercomm. diff --git a/nuttx/configs/compal_e99/README.txt b/nuttx/configs/compal_e99/README.txt index 38f63510d..7fb51cd53 100644 --- a/nuttx/configs/compal_e99/README.txt +++ b/nuttx/configs/compal_e99/README.txt @@ -27,11 +27,11 @@ directory at same level as the nuttx project: `- osmocom-bb If you attempt to build this configuration without osmocom-bb, and that -you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) -you will get compilation errors in drivers/sercomm due to header files that +you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) +you will get compilation errors in drivers/sercomm due to header files that are needed from the osmocom-bb directory. -By default, NuttX will not use sercomm (HDLC protocol) to communicate with +By default, NuttX will not use sercomm (HDLC protocol) to communicate with the host system. Sercomm is the transport used by osmocom-bb that runs on top of serial. See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed the usage of nuttx with sercomm. diff --git a/nuttx/configs/demo9s12ne64/README.txt b/nuttx/configs/demo9s12ne64/README.txt index 8b5ec8821..54fa1bca1 100644 --- a/nuttx/configs/demo9s12ne64/README.txt +++ b/nuttx/configs/demo9s12ne64/README.txt @@ -314,12 +314,12 @@ HCS12/DEMO9S12NEC64-specific Configuration Options the delay actually is 100 seconds. GPIO Interrupts - + CONFIG_GPIO_IRQ - Enable general support for GPIO IRQs CONFIG_HCS12_PORTG_INTS - Enable PortG IRQs CONFIG_HCS12_PORTH_INTS - Enable PortH IRQs CONFIG_HCS12_PORTJ_INTS - Enable PortJ IRQs - + HCS12 build options: CONFIG_HCS12_SERIALMON - Indicates that the target systems uses diff --git a/nuttx/configs/demo9s12ne64/ostest/Make.defs b/nuttx/configs/demo9s12ne64/ostest/Make.defs index dded50f88..e486d00d2 100644 --- a/nuttx/configs/demo9s12ne64/ostest/Make.defs +++ b/nuttx/configs/demo9s12ne64/ostest/Make.defs @@ -65,7 +65,7 @@ ifeq ($(WINTOOL),y) ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT)}" MAXOPTIMIZATION = -O2 else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/demo9s12ne64/src/Makefile b/nuttx/configs/demo9s12ne64/src/Makefile index ac99b0c6b..7e3ed436a 100644 --- a/nuttx/configs/demo9s12ne64/src/Makefile +++ b/nuttx/configs/demo9s12ne64/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c diff --git a/nuttx/configs/ea3131/include/board.h b/nuttx/configs/ea3131/include/board.h index ea8ee92f4..2d100122b 100644 --- a/nuttx/configs/ea3131/include/board.h +++ b/nuttx/configs/ea3131/include/board.h @@ -66,7 +66,7 @@ #define BOARD_HPLL0_SELI 8 /* SELI bandwidth selection */ #define BOARD_HPLL0_SELP 31 /* SELP bandwidth selection */ #define BOARD_HPLL0_MODE 0 /* PLL mode */ -#define BOARD_HPLL0_FREQ 406425600 /* Frequency of the PLL in MHz */ +#define BOARD_HPLL0_FREQ 406425600 /* Frequency of the PLL in MHz */ /* HPLL1 configuration */ @@ -78,12 +78,12 @@ #define BOARD_HPLL1_SELI 16 /* SELI bandwidth selection */ #define BOARD_HPLL1_SELP 8 /* SELP bandwidth selection */ #define BOARD_HPLL1_MODE 0 /* PLL mode */ -#define BOARD_HPLL1_FREQ 180000000 /* Frequency of the PLL in MHz */ +#define BOARD_HPLL1_FREQ 180000000 /* Frequency of the PLL in MHz */ /* The following 3 bitsets determine which clocks will be enabled at initialization * time. */ - + #define BOARD_CLKS_0_31 \ (_RBIT(CLKID_APB0CLK,0)|_RBIT(CLKID_APB1CLK,0)|_RBIT(CLKID_APB2CLK,0)|\ _RBIT(CLKID_APB3CLK,0)|_RBIT(CLKID_APB4CLK,0)|_RBIT(CLKID_AHB2INTCCLK,0)|\ diff --git a/nuttx/configs/ea3131/include/board_memorymap.h b/nuttx/configs/ea3131/include/board_memorymap.h index 69fe0ae96..029cefedc 100644 --- a/nuttx/configs/ea3131/include/board_memorymap.h +++ b/nuttx/configs/ea3131/include/board_memorymap.h @@ -58,7 +58,7 @@ * PGTABLE_BASE_VADDR - The mapped address of the page table in ROM, and * Mappings for each of the PSECTIONS in lpc31_memorymap.h */ - + #ifdef CONFIG_ARCH_ROMPGTABLE /* The LPC31xx ROM page table uses a 1-1 physical to virtual memory mapping */ diff --git a/nuttx/configs/ea3131/locked/Makefile b/nuttx/configs/ea3131/locked/Makefile index 21757036a..8de6a5107 100644 --- a/nuttx/configs/ea3131/locked/Makefile +++ b/nuttx/configs/ea3131/locked/Makefile @@ -65,7 +65,7 @@ ifeq ($(WINTOOL),y) PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)$(DELIM)lib"}" PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain PASS1_LIBPATHS += -L"(TOPDIR)$(DELIM)lib" PASS1_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc endif @@ -99,7 +99,7 @@ $(PASS1_LIBBOARD): locked.r: ld-locked.inc $(PASS1_LIBBOARD) @echo "LD: locked.r" - @$(LD) -o $@ $(PASS1_LDFLAGS) $(PASS1_LIBPATHS) --start-group $(PASS1_LDLIBS) --end-group $(PASS1_LIBGCC) + @$(LD) -o $@ $(PASS1_LDFLAGS) $(PASS1_LIBPATHS) --start-group $(PASS1_LDLIBS) --end-group $(PASS1_LIBGCC) @$(NM) $@ > locked.map @fgrep " U " locked.map | grep -v os_start @$(CROSSDEV)size $@ diff --git a/nuttx/configs/ea3131/nsh/Make.defs b/nuttx/configs/ea3131/nsh/Make.defs index 035475331..f405b12ab 100644 --- a/nuttx/configs/ea3131/nsh/Make.defs +++ b/nuttx/configs/ea3131/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ea3131/pgnsh/Make.defs b/nuttx/configs/ea3131/pgnsh/Make.defs index 42facbece..678d6786e 100644 --- a/nuttx/configs/ea3131/pgnsh/Make.defs +++ b/nuttx/configs/ea3131/pgnsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c index 43660ad18..34ed12c5c 100644 --- a/nuttx/configs/ea3131/src/up_fillpage.c +++ b/nuttx/configs/ea3131/src/up_fillpage.c @@ -96,15 +96,15 @@ #if defined(CONFIG_PAGING_M25PX) && defined(CONFIG_PAGING_AT45DB) # error "Both CONFIG_PAGING_M25PX and CONFIG_PAGING_AT45DB are defined" -# undef CONFIG_PAGING_M25PX +# undef CONFIG_PAGING_M25PX #endif #if defined(CONFIG_PAGING_BINPATH) && defined(CONFIG_PAGING_M25PX) # error "Both CONFIG_PAGING_BINPATH and CONFIG_PAGING_M25PX are defined" -# undef CONFIG_PAGING_BINPATH +# undef CONFIG_PAGING_BINPATH #endif #if defined(CONFIG_PAGING_BINPATH) && defined(CONFIG_PAGING_AT45DB) # error "Both CONFIG_PAGING_BINPATH and CONFIG_PAGING_AT45DB are defined" -# undef CONFIG_PAGING_BINPATH +# undef CONFIG_PAGING_BINPATH #endif /* Are we accessing the page source data through a file path? */ @@ -260,7 +260,7 @@ static inline void lpc31_initsrc(void) ret = mmcsd_slotinitialize(CONFIG_EA3131_PAGING_MINOR, sdio); DEBUGASSERT(ret == OK); - + /* Then let's guess and say that there is a card in the slot. * (We are basically jodido anyway if there is no card in the slot). */ @@ -427,7 +427,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) lpc31_initsrc(); - /* Create an offset into the binary image that corresponds to the + /* Create an offset into the binary image that corresponds to the * virtual address. File offset 0 corresponds to PG_LOCKED_VBASE. */ @@ -437,7 +437,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) pos = lseek(g_pgsrc.fd, offset, SEEK_SET); DEBUGASSERT(pos != (off_t)-1); - + /* And read the page data from that offset */ nbytes = read(g_pgsrc.fd, vpage, PAGESIZE); @@ -450,7 +450,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) lpc31_initsrc(); - /* Create an offset into the binary image that corresponds to the + /* Create an offset into the binary image that corresponds to the * virtual address. File offset 0 corresponds to PG_LOCKED_VBASE. */ diff --git a/nuttx/configs/ea3131/src/up_mem.c b/nuttx/configs/ea3131/src/up_mem.c index 3df8d6e65..db38c2ce3 100644 --- a/nuttx/configs/ea3131/src/up_mem.c +++ b/nuttx/configs/ea3131/src/up_mem.c @@ -110,7 +110,7 @@ * * Micron Initialization Sequence from their data sheet for the Micron * MT48LC32M16A2 32M x 16 SDRAM chip: - * + * * "SDRAMs must be powered up and initialized in a predefined manner. * Operational procedures other than those specified may result in * undefined operation. Once power is applied to VDD and VDDQ @@ -118,33 +118,33 @@ * a signal cycling within timing constraints specified for the clock * pin), the SDRAM requires a 100µs delay prior to issuing any command * other than a COMMAND INHIBIT or NOP. - * + * * "Starting at some point during this 100µs period and continuing at least * through the end of this period, COMMAND INHIBIT or NOP commands should * be applied. Once the 100µs delay has been satisfied with at least one * COMMAND INHIBIT or NOP command having been applied, a PRECHARGE command * should be applied. All banks must then be precharged, thereby placing * the device in the all banks idle state. - * + * * "Once in the idle state, two AUTO REFRESH cycles must be performed. After * the AUTO REFRESH cycles are complete, the SDRAM is ready for mode * register programming. - * + * * "Because the mode register will power up in an unknown state, it should * be loaded prior to applying any operational command." * * The JEDEC recommendation for initializing SDRAM is: - * + * * APPLY POWER (Vdd/Vddq equally, and CLK is stable) * Wait 200uS * PRECHARGE all * 8 AUTO REFRESH COMMANDS * LOAD MODE REGISTER * SDRAM is ready for operation - * + * * The Micron SDRAM parts will work fine with the JEDEC sequence, but also * allow for a quicker init sequence of: - * + * * APPLY POWER (Vdd/Vddq equally, and CLK is stable) * Wait at least 100uS (during which time start applying and * continue applying NOP or COMMAND INHIBIT) @@ -221,7 +221,7 @@ static void lpc31_sdraminitialize(void) putreg32(NS2HCLKS(EA3131_SDRAM_TMRD, HCLK2, MPMC_DYNTMRD_MASK), LPC31_MPMC_DYNTMRD); up_udelay(100); - + /* Issue continuous NOP commands */ putreg32((MPMC_DYNCONTROL_CE|MPMC_DYNCONTROL_CS|MPMC_DYNCONTROL_INOP), @@ -230,7 +230,7 @@ static void lpc31_sdraminitialize(void) /* Wait ~200us */ up_udelay(200); - + /* Issue a "pre-charge all" command */ putreg32((MPMC_DYNCONTROL_CE|MPMC_DYNCONTROL_CS|MPMC_DYNCONTROL_IPALL), @@ -246,7 +246,7 @@ static void lpc31_sdraminitialize(void) /* Wait ~250us */ up_udelay(250); - + /* Recommended refresh interval for normal operation of the Micron * MT48LC16LFFG = 7.8125usec (128KHz rate). ((HCLK / 128000) - 1) = * refresh counter interval rate, (subtract one for safety margin). @@ -267,7 +267,7 @@ static void lpc31_sdraminitialize(void) */ tmp = getreg32(LPC31_EXTSDRAM0_VSECTION | (0x23 << 13)); - + putreg32((MPMC_DYNCONFIG0_MDSDRAM|MPMC_DYNCONFIG_HP16_32MX16), LPC31_MPMC_DYNCONFIG0); putreg32((MPMC_DYNRASCAS0_RAS2CLK|MPMC_DYNRASCAS0_CAS2CLK), @@ -303,7 +303,7 @@ static void lpc31_sdraminitialize(void) void lpc31_meminitialize(void) { /* Configure the LCD pins in external bus interface (EBI/MPMC) memory mode. - * + * * LCD_CSB -> MPMC_NSTCS_0 * LCD_DB_1 -> MPMC_NSTCS_1 * LCD_DB_0 -> MPMC_CLKOUT @@ -331,7 +331,7 @@ void lpc31_meminitialize(void) /* Enable EBI clock */ lpc31_enableclock(CLKID_EBICLK); - + /* Enable MPMC controller clocks */ lpc31_enableclock(CLKID_MPMCCFGCLK); @@ -351,7 +351,7 @@ void lpc31_meminitialize(void) */ putreg32(EA3131_MPMC_DELAY, LPC31_SYSCREG_MPMC_DELAYMODES); - + /* Configure Micron MT48LC32M16A2 SDRAM on the EA3131 board */ lpc31_sdraminitialize(); diff --git a/nuttx/configs/ea3131/src/up_nsh.c b/nuttx/configs/ea3131/src/up_nsh.c index b763c26f0..67d2c4a14 100644 --- a/nuttx/configs/ea3131/src/up_nsh.c +++ b/nuttx/configs/ea3131/src/up_nsh.c @@ -153,7 +153,7 @@ int nsh_archinitialize(void) return ret; } message("nsh_archinitialize: Successfully bound SDIO to the MMC/SD driver\n"); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the LPC313X10E-EVAL board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/ea3131/src/up_usbmsc.c b/nuttx/configs/ea3131/src/up_usbmsc.c index 66bdda6f6..67e9d5afe 100644 --- a/nuttx/configs/ea3131/src/up_usbmsc.c +++ b/nuttx/configs/ea3131/src/up_usbmsc.c @@ -98,7 +98,7 @@ int usbmsc_archinitialize(void) } /* Register a RAMDISK device to manage this RAM image */ - + ret = ramdisk_register(CONFIG_SYSTEM_USBMSC_DEVMINOR1, pbuffer, USBMSC_NSECTORS, diff --git a/nuttx/configs/ea3131/tools/crc32.c b/nuttx/configs/ea3131/tools/crc32.c index 6e98e4724..11c8f5de4 100644 --- a/nuttx/configs/ea3131/tools/crc32.c +++ b/nuttx/configs/ea3131/tools/crc32.c @@ -50,7 +50,7 @@ /************************************************************************************************ * Private Data ************************************************************************************************/ - + static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, diff --git a/nuttx/configs/ea3131/tools/lpchdr.c b/nuttx/configs/ea3131/tools/lpchdr.c index d21cf3906..18f19e164 100644 --- a/nuttx/configs/ea3131/tools/lpchdr.c +++ b/nuttx/configs/ea3131/tools/lpchdr.c @@ -273,7 +273,7 @@ int main(int argc, char **argv, char **envp) padlen = g_hdr.imageLength - buf.st_size; /* Calculate CRCs */ - + g_hdr.execution_crc32 = infilecrc32(infd, buf.st_size, padlen); g_hdr.header_crc32 = crc32((const uint8_t*)&g_hdr, HDR_CRC_SIZE); @@ -294,4 +294,4 @@ int main(int argc, char **argv, char **envp) return 0; } - + diff --git a/nuttx/configs/ea3131/tools/lpchdr.h b/nuttx/configs/ea3131/tools/lpchdr.h index 7ada6bb35..958fc966d 100644 --- a/nuttx/configs/ea3131/tools/lpchdr.h +++ b/nuttx/configs/ea3131/tools/lpchdr.h @@ -69,7 +69,7 @@ struct lpc31_header_s * 0xB – Do CRC32 check on both header and * execution part of the image. */ uint32_t imageLength; /* 0x20 Total image length including header rounded - * up to the nearest 512 byte boundary. In C + * up to the nearest 512 byte boundary. In C * language the field can be computed as: * imageLength = (Actual length + 511) & ~0x1FF; */ uint32_t releaseID; /* 0x24 Release or version number of the image. Note, diff --git a/nuttx/configs/ea3131/usbserial/Make.defs b/nuttx/configs/ea3131/usbserial/Make.defs index f6841f9bd..d18c33b91 100644 --- a/nuttx/configs/ea3131/usbserial/Make.defs +++ b/nuttx/configs/ea3131/usbserial/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ea3152/README.txt b/nuttx/configs/ea3152/README.txt index b678f1a45..7186711e8 100644 --- a/nuttx/configs/ea3152/README.txt +++ b/nuttx/configs/ea3152/README.txt @@ -92,7 +92,7 @@ GNU Toolchain Options NOTE 2: The devkitARM toolchain includes a version of MSYS make. Make sure that the paths to Cygwin's /bin and /usr/bin directories appear BEFORE the devkitARM path or will get the wrong version of make. - + Generic arm-none-eabi GNU Toolchain ----------------------------------- There are a number of toolchain projects providing support for ARMv4/v5 @@ -219,7 +219,7 @@ Image Format - mklpc.sh # Make the bootloader binary (nuttx.lpc) NOTES: - + 1. setenv.sh just sets up pathes to the toolchain and also to configs/ea3152/tools where mklpc.sh resides. Use of setenv.sh is optional. If you don't use setenv.sh, then just set your PATH variable appropriately or @@ -265,7 +265,7 @@ Using OpenOCD and GDB I used to start the OpenOCD daemon on my system called oocd.sh. That script would probably require some modifications to work in another environment: - + - possibly the value of OPENOCD_PATH - If you are working under Linux you will need to change any occurances of `cygpath -w blablabla` to just blablabla diff --git a/nuttx/configs/ea3152/include/board.h b/nuttx/configs/ea3152/include/board.h index cf468a18e..b3fe23005 100644 --- a/nuttx/configs/ea3152/include/board.h +++ b/nuttx/configs/ea3152/include/board.h @@ -66,7 +66,7 @@ #define BOARD_HPLL0_SELI 8 /* SELI bandwidth selection */ #define BOARD_HPLL0_SELP 31 /* SELP bandwidth selection */ #define BOARD_HPLL0_MODE 0 /* PLL mode */ -#define BOARD_HPLL0_FREQ 406425600 /* Frequency of the PLL in MHz */ +#define BOARD_HPLL0_FREQ 406425600 /* Frequency of the PLL in MHz */ /* HPLL1 configuration */ @@ -78,12 +78,12 @@ #define BOARD_HPLL1_SELI 16 /* SELI bandwidth selection */ #define BOARD_HPLL1_SELP 8 /* SELP bandwidth selection */ #define BOARD_HPLL1_MODE 0 /* PLL mode */ -#define BOARD_HPLL1_FREQ 180000000 /* Frequency of the PLL in MHz */ +#define BOARD_HPLL1_FREQ 180000000 /* Frequency of the PLL in MHz */ /* The following 3 bitsets determine which clocks will be enabled at initialization * time. */ - + #define BOARD_CLKS_0_31 \ (_RBIT(CLKID_APB0CLK,0)|_RBIT(CLKID_APB1CLK,0)|_RBIT(CLKID_APB2CLK,0)|\ _RBIT(CLKID_APB3CLK,0)|_RBIT(CLKID_APB4CLK,0)|_RBIT(CLKID_AHB2INTCCLK,0)|\ diff --git a/nuttx/configs/ea3152/include/board_memorymap.h b/nuttx/configs/ea3152/include/board_memorymap.h index c9242e6d2..35993ceb3 100644 --- a/nuttx/configs/ea3152/include/board_memorymap.h +++ b/nuttx/configs/ea3152/include/board_memorymap.h @@ -58,7 +58,7 @@ * PGTABLE_BASE_VADDR - The mapped address of the page table in ROM, and * Mappings for each of the PSECTIONS in lpc31_memorymap.h */ - + #ifdef CONFIG_ARCH_ROMPGTABLE /* The LPC31xx ROM page table uses a 1-1 physical to virtual memory mapping */ diff --git a/nuttx/configs/ea3152/ostest/Make.defs b/nuttx/configs/ea3152/ostest/Make.defs index 78aadf455..606cc02dc 100644 --- a/nuttx/configs/ea3152/ostest/Make.defs +++ b/nuttx/configs/ea3152/ostest/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ea3152/src/Makefile b/nuttx/configs/ea3152/src/Makefile index df33bbcea..b5d743e2d 100644 --- a/nuttx/configs/ea3152/src/Makefile +++ b/nuttx/configs/ea3152/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_clkinit.c diff --git a/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/up_fillpage.c index 23a19b849..151d77533 100644 --- a/nuttx/configs/ea3152/src/up_fillpage.c +++ b/nuttx/configs/ea3152/src/up_fillpage.c @@ -96,15 +96,15 @@ #if defined(CONFIG_PAGING_M25PX) && defined(CONFIG_PAGING_AT45DB) # error "Both CONFIG_PAGING_M25PX and CONFIG_PAGING_AT45DB are defined" -# undef CONFIG_PAGING_M25PX +# undef CONFIG_PAGING_M25PX #endif #if defined(CONFIG_PAGING_BINPATH) && defined(CONFIG_PAGING_M25PX) # error "Both CONFIG_PAGING_BINPATH and CONFIG_PAGING_M25PX are defined" -# undef CONFIG_PAGING_BINPATH +# undef CONFIG_PAGING_BINPATH #endif #if defined(CONFIG_PAGING_BINPATH) && defined(CONFIG_PAGING_AT45DB) # error "Both CONFIG_PAGING_BINPATH and CONFIG_PAGING_AT45DB are defined" -# undef CONFIG_PAGING_BINPATH +# undef CONFIG_PAGING_BINPATH #endif /* Are we accessing the page source data through a file path? */ @@ -260,7 +260,7 @@ static inline void lpc31_initsrc(void) ret = mmcsd_slotinitialize(CONFIG_EA3152_PAGING_MINOR, sdio); DEBUGASSERT(ret == OK); - + /* Then let's guess and say that there is a card in the slot. * (We are basically jodido anyway if there is no card in the slot). */ @@ -427,7 +427,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) lpc31_initsrc(); - /* Create an offset into the binary image that corresponds to the + /* Create an offset into the binary image that corresponds to the * virtual address. File offset 0 corresponds to PG_LOCKED_VBASE. */ @@ -437,7 +437,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) pos = lseek(g_pgsrc.fd, offset, SEEK_SET); DEBUGASSERT(pos != (off_t)-1); - + /* And read the page data from that offset */ nbytes = read(g_pgsrc.fd, vpage, PAGESIZE); @@ -450,7 +450,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) lpc31_initsrc(); - /* Create an offset into the binary image that corresponds to the + /* Create an offset into the binary image that corresponds to the * virtual address. File offset 0 corresponds to PG_LOCKED_VBASE. */ diff --git a/nuttx/configs/ea3152/src/up_mem.c b/nuttx/configs/ea3152/src/up_mem.c index d4c0d8c8b..3bd826ec3 100644 --- a/nuttx/configs/ea3152/src/up_mem.c +++ b/nuttx/configs/ea3152/src/up_mem.c @@ -110,7 +110,7 @@ * * Micron Initialization Sequence from their data sheet for the Micron * MT48LC32M16A2 32M x 16 SDRAM chip: - * + * * "SDRAMs must be powered up and initialized in a predefined manner. * Operational procedures other than those specified may result in * undefined operation. Once power is applied to VDD and VDDQ @@ -118,33 +118,33 @@ * a signal cycling within timing constraints specified for the clock * pin), the SDRAM requires a 100µs delay prior to issuing any command * other than a COMMAND INHIBIT or NOP. - * + * * "Starting at some point during this 100µs period and continuing at least * through the end of this period, COMMAND INHIBIT or NOP commands should * be applied. Once the 100µs delay has been satisfied with at least one * COMMAND INHIBIT or NOP command having been applied, a PRECHARGE command * should be applied. All banks must then be precharged, thereby placing * the device in the all banks idle state. - * + * * "Once in the idle state, two AUTO REFRESH cycles must be performed. After * the AUTO REFRESH cycles are complete, the SDRAM is ready for mode * register programming. - * + * * "Because the mode register will power up in an unknown state, it should * be loaded prior to applying any operational command." * * The JEDEC recommendation for initializing SDRAM is: - * + * * APPLY POWER (Vdd/Vddq equally, and CLK is stable) * Wait 200uS * PRECHARGE all * 8 AUTO REFRESH COMMANDS * LOAD MODE REGISTER * SDRAM is ready for operation - * + * * The Micron SDRAM parts will work fine with the JEDEC sequence, but also * allow for a quicker init sequence of: - * + * * APPLY POWER (Vdd/Vddq equally, and CLK is stable) * Wait at least 100uS (during which time start applying and * continue applying NOP or COMMAND INHIBIT) @@ -221,7 +221,7 @@ static void lpc31_sdraminitialize(void) putreg32(NS2HCLKS(EA3152_SDRAM_TMRD, HCLK2, MPMC_DYNTMRD_MASK), LPC31_MPMC_DYNTMRD); up_udelay(100); - + /* Issue continuous NOP commands */ putreg32((MPMC_DYNCONTROL_CE|MPMC_DYNCONTROL_CS|MPMC_DYNCONTROL_INOP), @@ -230,7 +230,7 @@ static void lpc31_sdraminitialize(void) /* Load ~200us delay value to timer1 */ up_udelay(200); - + /* Issue a "pre-charge all" command */ putreg32((MPMC_DYNCONTROL_CE|MPMC_DYNCONTROL_CS|MPMC_DYNCONTROL_IPALL), @@ -246,7 +246,7 @@ static void lpc31_sdraminitialize(void) /* Load ~250us delay value to timer1 */ up_udelay(250); - + /* Recommended refresh interval for normal operation of the Micron * MT48LC16LFFG = 7.8125usec (128KHz rate). ((HCLK / 128000) - 1) = * refresh counter interval rate, (subtract one for safety margin). @@ -267,7 +267,7 @@ static void lpc31_sdraminitialize(void) */ tmp = getreg32(LPC31_EXTSDRAM0_VSECTION | (0x23 << 13)); - + putreg32((MPMC_DYNCONFIG0_MDSDRAM|MPMC_DYNCONFIG_HP16_32MX16), LPC31_MPMC_DYNCONFIG0); putreg32((MPMC_DYNRASCAS0_RAS2CLK|MPMC_DYNRASCAS0_CAS2CLK), @@ -303,7 +303,7 @@ static void lpc31_sdraminitialize(void) void lpc31_meminitialize(void) { /* Configure the LCD pins in external bus interface (EBI/MPMC) memory mode. - * + * * LCD_CSB -> MPMC_NSTCS_0 * LCD_DB_1 -> MPMC_NSTCS_1 * LCD_DB_0 -> MPMC_CLKOUT @@ -331,7 +331,7 @@ void lpc31_meminitialize(void) /* Enable EBI clock */ lpc31_enableclock(CLKID_EBICLK); - + /* Enable MPMC controller clocks */ lpc31_enableclock(CLKID_MPMCCFGCLK); @@ -351,7 +351,7 @@ void lpc31_meminitialize(void) */ putreg32(EA3152_MPMC_DELAY, LPC31_SYSCREG_MPMC_DELAYMODES); - + /* Configure Micron MT48LC32M16A2 SDRAM on the EA3152 board */ lpc31_sdraminitialize(); diff --git a/nuttx/configs/ea3152/src/up_nsh.c b/nuttx/configs/ea3152/src/up_nsh.c index d4ac3da27..5c94c053c 100644 --- a/nuttx/configs/ea3152/src/up_nsh.c +++ b/nuttx/configs/ea3152/src/up_nsh.c @@ -153,7 +153,7 @@ int nsh_archinitialize(void) return ret; } message("nsh_archinitialize: Successfully bound SDIO to the MMC/SD driver\n"); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the LPC313X10E-EVAL board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/ea3152/src/up_usbmsc.c b/nuttx/configs/ea3152/src/up_usbmsc.c index 6a358ca1d..e861ad48f 100644 --- a/nuttx/configs/ea3152/src/up_usbmsc.c +++ b/nuttx/configs/ea3152/src/up_usbmsc.c @@ -98,7 +98,7 @@ int usbmsc_archinitialize(void) } /* Register a RAMDISK device to manage this RAM image */ - + ret = ramdisk_register(CONFIG_SYSTEM_USBMSC_DEVMINOR1, pbuffer, USBMSC_NSECTORS, diff --git a/nuttx/configs/ea3152/tools/crc32.c b/nuttx/configs/ea3152/tools/crc32.c index 1b323fbcb..d1ff72bea 100644 --- a/nuttx/configs/ea3152/tools/crc32.c +++ b/nuttx/configs/ea3152/tools/crc32.c @@ -50,7 +50,7 @@ /************************************************************************************************ * Private Data ************************************************************************************************/ - + static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, diff --git a/nuttx/configs/ea3152/tools/lpc3152.cfg b/nuttx/configs/ea3152/tools/lpc3152.cfg index 6a741b5dc..8b63ce61d 100644 --- a/nuttx/configs/ea3152/tools/lpc3152.cfg +++ b/nuttx/configs/ea3152/tools/lpc3152.cfg @@ -22,7 +22,7 @@ if { [info exists CPUTAPID ] } { } # Scan Tap -# Wired to seperate STDO pin on the lpc3152, externally muxed to TDO on ea3152 module +# Wired to seperate STDO pin on the lpc3152, externally muxed to TDO on ea3152 module # JTAGSEL pin must be 0 to activate, which reassigns arm tdo to a pass through. if { [info exists SJCTAPID ] } { set _SJCTAPID $SJCTAPID @@ -58,7 +58,7 @@ jtag_nsrst_delay 1000 jtag_ntrst_delay 0 set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME +target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME $_TARGETNAME invoke-event halted diff --git a/nuttx/configs/ea3152/tools/lpchdr.c b/nuttx/configs/ea3152/tools/lpchdr.c index 522ceeedd..a77be9001 100644 --- a/nuttx/configs/ea3152/tools/lpchdr.c +++ b/nuttx/configs/ea3152/tools/lpchdr.c @@ -273,7 +273,7 @@ int main(int argc, char **argv, char **envp) padlen = g_hdr.imageLength - buf.st_size; /* Calculate CRCs */ - + g_hdr.execution_crc32 = infilecrc32(infd, buf.st_size, padlen); g_hdr.header_crc32 = crc32((const uint8_t*)&g_hdr, HDR_CRC_SIZE); @@ -294,4 +294,4 @@ int main(int argc, char **argv, char **envp) return 0; } - + diff --git a/nuttx/configs/ea3152/tools/lpchdr.h b/nuttx/configs/ea3152/tools/lpchdr.h index 33aa4eae0..33beda800 100644 --- a/nuttx/configs/ea3152/tools/lpchdr.h +++ b/nuttx/configs/ea3152/tools/lpchdr.h @@ -69,7 +69,7 @@ struct lpc31_header_s * 0xB – Do CRC32 check on both header and * execution part of the image. */ uint32_t imageLength; /* 0x20 Total image length including header rounded - * up to the nearest 512 byte boundary. In C + * up to the nearest 512 byte boundary. In C * language the field can be computed as: * imageLength = (Actual length + 511) & ~0x1FF; */ uint32_t releaseID; /* 0x24 Release or version number of the image. Note, diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt index 05ba18422..07ab5cdb2 100644 --- a/nuttx/configs/eagle100/README.txt +++ b/nuttx/configs/eagle100/README.txt @@ -139,7 +139,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -174,7 +174,7 @@ Ethernet-Bootloader - The board has no fixed IP address but uses DHCP to get an address. I used a D-link router; I can use a web browser to surf to the D-link - web page to get the address assigned by + web page to get the address assigned by - Then you can use this IP address in your browser to surf to the Eagle-100 board. It presents several interesting pages -- the most important is @@ -195,7 +195,7 @@ Ethernet-Bootloader it is not very informative. The Eagle100 User's Manual has the best information. - - Are there any special things I have to do in my code, other than setting + - Are there any special things I have to do in my code, other than setting the origin to 0x0000:2000 (APP_START_ADDRESS)? No. The bootloader assumes that you have a vector table at that address . The bootloader does the following each time it boots (after you have downloaded the first valid @@ -306,7 +306,7 @@ Eagle100-specific Configuration Options CONFIG_TIVA_DISABLE_GPIOG_IRQS=n CONFIG_TIVA_DISABLE_GPIOH_IRQS=y CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y - + LM3S6918 specific device driver settings CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -368,7 +368,7 @@ Common Configuration Notes b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration process. - + Configuration Sub-Directories ----------------------------- diff --git a/nuttx/configs/eagle100/src/Makefile b/nuttx/configs/eagle100/src/Makefile index bfff3a89b..cac971220 100644 --- a/nuttx/configs/eagle100/src/Makefile +++ b/nuttx/configs/eagle100/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/eagle100/src/up_ssi.c b/nuttx/configs/eagle100/src/up_ssi.c index e42a07c6b..4523b3cdf 100644 --- a/nuttx/configs/eagle100/src/up_ssi.c +++ b/nuttx/configs/eagle100/src/up_ssi.c @@ -124,7 +124,7 @@ void weak_function lm_ssiinitialize(void) * 2. Add a call to up_spiinitialize() in your low level initialization * logic * 3. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/ekk-lm3s9b96/README.txt b/nuttx/configs/ekk-lm3s9b96/README.txt index 52f5421b4..05a49ebbe 100644 --- a/nuttx/configs/ekk-lm3s9b96/README.txt +++ b/nuttx/configs/ekk-lm3s9b96/README.txt @@ -156,7 +156,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -251,7 +251,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -361,7 +361,7 @@ Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options CONFIG_TIVA_DISABLE_GPIOG_IRQS=n CONFIG_TIVA_DISABLE_GPIOH_IRQS=n CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y - + LM3S9B96 specific device driver settings CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs index 4f1333f50..e643ce414 100644 --- a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs +++ b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs @@ -47,7 +47,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ekk-lm3s9b96/src/Makefile b/nuttx/configs/ekk-lm3s9b96/src/Makefile index 4fb7fb63d..ee8356fb5 100644 --- a/nuttx/configs/ekk-lm3s9b96/src/Makefile +++ b/nuttx/configs/ekk-lm3s9b96/src/Makefile @@ -38,7 +38,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/ekk-lm3s9b96/src/up_boot.c b/nuttx/configs/ekk-lm3s9b96/src/up_boot.c index 43dc46368..bd4df316e 100644 --- a/nuttx/configs/ekk-lm3s9b96/src/up_boot.c +++ b/nuttx/configs/ekk-lm3s9b96/src/up_boot.c @@ -77,7 +77,7 @@ void tiva_boardinitialize(void) * lm_ssiinitialize() has been brought into the link. */ -#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE) +#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE) if (lm_ssiinitialize) { lm_ssiinitialize(); diff --git a/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c b/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c index f6d921cd6..9c26c7d85 100644 --- a/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c +++ b/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c @@ -53,7 +53,7 @@ #include "tiva_gpio.h" #include "ekklm3s9b96_internal.h" -#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE) +#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE) /************************************************************************************ * Definitions @@ -126,7 +126,7 @@ void weak_function lm_ssiinitialize(void) * 2. Add a call to up_spiinitialize() in your low level initialization * logic * 3. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/ez80f910200kitg/README.txt b/nuttx/configs/ez80f910200kitg/README.txt index 8d9086b4e..fa6200810 100644 --- a/nuttx/configs/ez80f910200kitg/README.txt +++ b/nuttx/configs/ez80f910200kitg/README.txt @@ -17,7 +17,7 @@ Version 4.11.0 The 5.1.1 version of the ZDS-II tools are currently configured for all ez80 boards. However, it is the older version 4.11.0 that this code has been verified against. - + Although it compiles without error, the 4.11.0 compiler generates bad code on one of the files, mm/mm_initialize.c. Below is a simple work- around. @@ -27,12 +27,12 @@ Version 4.11.0 @@ -94,8 +94,11 @@ { int i; - + +#if 0 /* DO NOT CHECK IN */ CHECK_ALLOCNODE_SIZE; CHECK_FREENODE_SIZE; +#endif - + /* Set up global variables */ UPDATE: I don't know if 4.11.1 has this same problem (I bet not since @@ -52,7 +52,7 @@ Version 5.1.1 to modify the versioning in Make.defs and setenv.sh; if you want to build on a different platform, you will need to change the path in the ZDS binaries in those same files. - + Other Versions If you use any version of ZDS-II other than 5.1.1 or if you install ZDS-II at any location other than the default location, you will have to modify @@ -108,7 +108,7 @@ available: CONFIG_APPS_DIR="..\apps" NOTES: - + a. If you need to change the toolchain path used in Make.defs, you will need to use the short 8.3 filenames to avoid spaces. On my PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is diff --git a/nuttx/configs/ez80f910200kitg/include/board.h b/nuttx/configs/ez80f910200kitg/include/board.h index 80a8afb23..19e4700d4 100644 --- a/nuttx/configs/ez80f910200kitg/include/board.h +++ b/nuttx/configs/ez80f910200kitg/include/board.h @@ -43,7 +43,7 @@ /**************************************************************************** * Definitions ****************************************************************************/ - + /* Clocking */ #define EZ80_SYS_CLK_FREQ 50000000 diff --git a/nuttx/configs/ez80f910200kitg/ostest/README.txt b/nuttx/configs/ez80f910200kitg/ostest/README.txt index 9714fb3ac..7bee0bf22 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/README.txt +++ b/nuttx/configs/ez80f910200kitg/ostest/README.txt @@ -4,9 +4,9 @@ README.txt ostest.zdsproj is a simple ZDS-II project that will allow you to use the ZDS-II debugger. Before using, copy the following files from the toplevel directory: - + nuttx.hex, nuttx.map, nuttx.lod - + to this directory as: - + ostest.hex, ostest.map, ostest.lod diff --git a/nuttx/configs/ez80f910200kitg/src/Makefile b/nuttx/configs/ez80f910200kitg/src/Makefile index f023e1418..d06435611 100644 --- a/nuttx/configs/ez80f910200kitg/src/Makefile +++ b/nuttx/configs/ez80f910200kitg/src/Makefile @@ -49,7 +49,7 @@ endif INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = ez80_lowinit.c ez80_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/ez80f910200zco/nsh/sample-run.txt b/nuttx/configs/ez80f910200zco/nsh/sample-run.txt index d5516040e..9e3940432 100644 --- a/nuttx/configs/ez80f910200zco/nsh/sample-run.txt +++ b/nuttx/configs/ez80f910200zco/nsh/sample-run.txt @@ -54,4 +54,4 @@ Where <cmd> is one of: unset <name> usleep <usec> xd <hex-address> <byte-count> -nsh>
\ No newline at end of file +nsh>
\ No newline at end of file diff --git a/nuttx/configs/ez80f910200zco/src/Makefile b/nuttx/configs/ez80f910200zco/src/Makefile index d9f028f11..168818942 100644 --- a/nuttx/configs/ez80f910200zco/src/Makefile +++ b/nuttx/configs/ez80f910200zco/src/Makefile @@ -49,7 +49,7 @@ endif INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = ez80_lowinit.c diff --git a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c index 61182ac68..f43192f15 100644 --- a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c +++ b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c @@ -124,7 +124,7 @@ void board_button_initialize(void) #if 0 /* Interrupts are not used */ /* Attach GIO interrupts */ - + irq_attach(EZ80_PB_IRQ, up_PBinterrupt); irq_attach(EZ80_PB1_IRQ, up_pb1interrupt); irq_attach(EZ80_PB2_IRQ, up_pb2interrupt); diff --git a/nuttx/configs/ez80f910200zco/src/ez80_leds.c b/nuttx/configs/ez80f910200zco/src/ez80_leds.c index 672940c1d..c54e6bd74 100644 --- a/nuttx/configs/ez80f910200zco/src/ez80_leds.c +++ b/nuttx/configs/ez80f910200zco/src/ez80_leds.c @@ -270,7 +270,7 @@ void board_led_on(int led) break; default: - return; + return; } g_prevglyph = tmp; diff --git a/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h b/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h index b26a0dd3c..52d46e7d2 100644 --- a/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h +++ b/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h @@ -117,7 +117,7 @@ * TX: * The TX signal at D4 indicates that data is tranmitted to the modem. */ - + /* Push buttons: * * PB0 SW1 Bit 0 of GPIO Port B @@ -130,7 +130,7 @@ #define EZ80_PB1_IRQ EZ80_PORTB1_IRQ /* Vector Oxa4 */ #define EZ80_PB2_IRQ EZ80_PORTB2_IRQ /* Vector Oxa8 */ - + /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/nuttx/configs/fire-stm32v2/Kconfig b/nuttx/configs/fire-stm32v2/Kconfig index 4249a3dbd..c731f97cc 100644 --- a/nuttx/configs/fire-stm32v2/Kconfig +++ b/nuttx/configs/fire-stm32v2/Kconfig @@ -11,7 +11,7 @@ choice prompt "Select Wildfire STM32 version" default ARCH_BOARD_FIRE_STM32V2 ---help--- - This port has logic differences to support either the Version 2 or + This port has logic differences to support either the Version 2 or Version 3 of the Wildfire board. config ARCH_BOARD_FIRE_STM32V2 diff --git a/nuttx/configs/fire-stm32v2/README.txt b/nuttx/configs/fire-stm32v2/README.txt index 8df4dcf89..afedd394c 100644 --- a/nuttx/configs/fire-stm32v2/README.txt +++ b/nuttx/configs/fire-stm32v2/README.txt @@ -369,7 +369,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. diff --git a/nuttx/configs/fire-stm32v2/include/board.h b/nuttx/configs/fire-stm32v2/include/board.h index 1166f0d83..f57f4531c 100644 --- a/nuttx/configs/fire-stm32v2/include/board.h +++ b/nuttx/configs/fire-stm32v2/include/board.h @@ -117,20 +117,20 @@ #define STM32_CFGR_USBPRE 0 /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ #define STM32_TIM18_FREQUENCY STM32_HCLK_FREQUENCY #define STM32_TIM27_FREQUENCY STM32_HCLK_FREQUENCY -/* SDIO dividers. Note that slower clocking is required when DMA is disabled +/* SDIO dividers. Note that slower clocking is required when DMA is disabled * in order to avoid RX overrun/TX underrun errors due to delayed responses * to service FIFOs in interrupt driven mode. These values have not been * tuned!!! * * HCLK=72MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(178+2)=400 KHz */ - + #define SDIO_INIT_CLKDIV (178 << SDIO_CLKCR_CLKDIV_SHIFT) /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(2+2)=18 MHz @@ -138,9 +138,9 @@ */ #ifdef CONFIG_SDIO_DMA -# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) #else -# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) #endif /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(1+2)=24 MHz diff --git a/nuttx/configs/fire-stm32v2/nsh/Make.defs b/nuttx/configs/fire-stm32v2/nsh/Make.defs index ac32a8178..8c7c0b7f6 100644 --- a/nuttx/configs/fire-stm32v2/nsh/Make.defs +++ b/nuttx/configs/fire-stm32v2/nsh/Make.defs @@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/fire-stm32v2/src/Makefile b/nuttx/configs/fire-stm32v2/src/Makefile index f37ec5103..76cc2384c 100644 --- a/nuttx/configs/fire-stm32v2/src/Makefile +++ b/nuttx/configs/fire-stm32v2/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_spi.c up_usbdev.c up_mmcsd.c diff --git a/nuttx/configs/fire-stm32v2/src/up_autoleds.c b/nuttx/configs/fire-stm32v2/src/up_autoleds.c index c16ef3208..51a8e810a 100644 --- a/nuttx/configs/fire-stm32v2/src/up_autoleds.c +++ b/nuttx/configs/fire-stm32v2/src/up_autoleds.c @@ -70,7 +70,7 @@ #endif /* The following definitions map the encoded LED setting to GPIO settings. - * + * * OFFBITS ONBITS * CLR SET CLR SET * 210 210 210 210 diff --git a/nuttx/configs/fire-stm32v2/src/up_buttons.c b/nuttx/configs/fire-stm32v2/src/up_buttons.c index b09ee0ad9..0150e2331 100644 --- a/nuttx/configs/fire-stm32v2/src/up_buttons.c +++ b/nuttx/configs/fire-stm32v2/src/up_buttons.c @@ -77,7 +77,7 @@ void board_button_initialize(void) { - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for some pins but NOT used in this file */ diff --git a/nuttx/configs/fire-stm32v2/src/up_mmcsd.c b/nuttx/configs/fire-stm32v2/src/up_mmcsd.c index e06a17e89..45bed9b6a 100644 --- a/nuttx/configs/fire-stm32v2/src/up_mmcsd.c +++ b/nuttx/configs/fire-stm32v2/src/up_mmcsd.c @@ -111,7 +111,7 @@ int stm32_sdinitialize(int minor) fvdbg("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n", STM32_MMCSDSLOTNO, minor); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the M3 Wildfire board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/fire-stm32v2/src/up_userleds.c b/nuttx/configs/fire-stm32v2/src/up_userleds.c index 4a996af9c..7f75be3d6 100644 --- a/nuttx/configs/fire-stm32v2/src/up_userleds.c +++ b/nuttx/configs/fire-stm32v2/src/up_userleds.c @@ -75,7 +75,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3 }; diff --git a/nuttx/configs/freedom-kl25z/scripts/ld.script b/nuttx/configs/freedom-kl25z/scripts/ld.script index b9dd95ca4..3e1b876b5 100644 --- a/nuttx/configs/freedom-kl25z/scripts/ld.script +++ b/nuttx/configs/freedom-kl25z/scripts/ld.script @@ -34,7 +34,7 @@ ****************************************************************************/ /* The MKL25Z128 has 128Kb of FLASH beginning at address 0x00000000 and - * 16Kb of SRAM at address 0x1ffff000. + * 16Kb of SRAM at address 0x1ffff000. */ MEMORY diff --git a/nuttx/configs/freedom-kl25z/src/Makefile b/nuttx/configs/freedom-kl25z/src/Makefile index 03f81ea5a..073fd3cb6 100644 --- a/nuttx/configs/freedom-kl25z/src/Makefile +++ b/nuttx/configs/freedom-kl25z/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = kl_boardinitialize.c diff --git a/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h b/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h index cc46a884c..6d732dac0 100644 --- a/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h +++ b/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h @@ -68,14 +68,14 @@ * SYMBOL Meaning LED state * Initially all LED is OFF * ------------------- ----------------------- -------------------------- - * LED_STARTED NuttX has been started - * LED_HEAPALLOCATE Heap has been allocated - * LED_IRQSENABLED Interrupts enabled - * LED_STACKCREATED Idle stack created - * LED_INIRQ In an interrupt - * LED_SIGNAL In a signal handler - * LED_ASSERTION An assertion failed - * LED_PANIC The system has crashed + * LED_STARTED NuttX has been started + * LED_HEAPALLOCATE Heap has been allocated + * LED_IRQSENABLED Interrupts enabled + * LED_STACKCREATED Idle stack created + * LED_INIRQ In an interrupt + * LED_SIGNAL In a signal handler + * LED_ASSERTION An assertion failed + * LED_PANIC The system has crashed * LED_IDLE K25Z1XX is in sleep mode (Optional, not used) */ diff --git a/nuttx/configs/freedom-kl25z/src/kl_tsi.c b/nuttx/configs/freedom-kl25z/src/kl_tsi.c index 18afb4580..e030caa9e 100644 --- a/nuttx/configs/freedom-kl25z/src/kl_tsi.c +++ b/nuttx/configs/freedom-kl25z/src/kl_tsi.c @@ -167,7 +167,7 @@ static ssize_t tsi_read(FAR struct file *filep, FAR char *buf, size_t buflen) regval = TSI_DATA_TSICH(g_chsensor[g_channel]); putreg32(regval, KL_TSI_DATA); - + regval |= TSI_DATA_SWTS; putreg32(regval, KL_TSI_DATA); diff --git a/nuttx/configs/hymini-stm32v/buttons/Make.defs b/nuttx/configs/hymini-stm32v/buttons/Make.defs index 8c11e7386..fedb3816a 100644 --- a/nuttx/configs/hymini-stm32v/buttons/Make.defs +++ b/nuttx/configs/hymini-stm32v/buttons/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/hymini-stm32v/include/board.h b/nuttx/configs/hymini-stm32v/include/board.h index 0e7427f6c..963ba037d 100644 --- a/nuttx/configs/hymini-stm32v/include/board.h +++ b/nuttx/configs/hymini-stm32v/include/board.h @@ -112,20 +112,20 @@ #define STM32_CFGR_USBPRE 0 /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ #define STM32_TIM18_FREQUENCY STM32_HCLK_FREQUENCY #define STM32_TIM27_FREQUENCY STM32_HCLK_FREQUENCY -/* SDIO dividers. Note that slower clocking is required when DMA is disabled +/* SDIO dividers. Note that slower clocking is required when DMA is disabled * in order to avoid RX overrun/TX underrun errors due to delayed responses * to service FIFOs in interrupt driven mode. These values have not been * tuned!!! * * HCLK=72MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(178+2)=400 KHz */ - + #define SDIO_INIT_CLKDIV (178 << SDIO_CLKCR_CLKDIV_SHIFT) /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(2+2)=18 MHz @@ -133,9 +133,9 @@ */ #ifdef CONFIG_SDIO_DMA -# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) #else -# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) #endif /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(1+2)=24 MHz diff --git a/nuttx/configs/hymini-stm32v/nsh/Make.defs b/nuttx/configs/hymini-stm32v/nsh/Make.defs index 35b481b9c..15d79633f 100644 --- a/nuttx/configs/hymini-stm32v/nsh/Make.defs +++ b/nuttx/configs/hymini-stm32v/nsh/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/hymini-stm32v/nsh2/Make.defs b/nuttx/configs/hymini-stm32v/nsh2/Make.defs index 1cc53824c..b806a41f0 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/Make.defs +++ b/nuttx/configs/hymini-stm32v/nsh2/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/hymini-stm32v/src/Makefile b/nuttx/configs/hymini-stm32v/src/Makefile index 0b2beb568..cae6fbbe8 100644 --- a/nuttx/configs/hymini-stm32v/src/Makefile +++ b/nuttx/configs/hymini-stm32v/src/Makefile @@ -38,7 +38,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c diff --git a/nuttx/configs/hymini-stm32v/src/up_nsh.c b/nuttx/configs/hymini-stm32v/src/up_nsh.c index a28ffb0e9..680271dc2 100644 --- a/nuttx/configs/hymini-stm32v/src/up_nsh.c +++ b/nuttx/configs/hymini-stm32v/src/up_nsh.c @@ -211,7 +211,7 @@ int nsh_archinitialize(void) return ret; } dbg("nsh_archinitialize: Successfully bound SDIO to the MMC/SD driver\n"); - + /* Use SD card detect pin to check if a card is inserted */ cd_status = !stm32_gpioread(GPIO_SD_CD); diff --git a/nuttx/configs/hymini-stm32v/src/up_usbmsc.c b/nuttx/configs/hymini-stm32v/src/up_usbmsc.c index 105aed5b5..7a47f7b9a 100644 --- a/nuttx/configs/hymini-stm32v/src/up_usbmsc.c +++ b/nuttx/configs/hymini-stm32v/src/up_usbmsc.c @@ -148,7 +148,7 @@ int usbmsc_archinitialize(void) } message("usbmsc_archinitialize: " "Successfully bound SDIO to the MMC/SD driver\n"); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the Hy-Mini STM32v board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/hymini-stm32v/usbmsc/Make.defs b/nuttx/configs/hymini-stm32v/usbmsc/Make.defs index d10db6e07..7ddeb3dd1 100644 --- a/nuttx/configs/hymini-stm32v/usbmsc/Make.defs +++ b/nuttx/configs/hymini-stm32v/usbmsc/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/hymini-stm32v/usbnsh/Make.defs b/nuttx/configs/hymini-stm32v/usbnsh/Make.defs index 7fb36efe4..6bc451f90 100644 --- a/nuttx/configs/hymini-stm32v/usbnsh/Make.defs +++ b/nuttx/configs/hymini-stm32v/usbnsh/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/hymini-stm32v/usbserial/Make.defs b/nuttx/configs/hymini-stm32v/usbserial/Make.defs index 228a3a799..195c6e1d5 100644 --- a/nuttx/configs/hymini-stm32v/usbserial/Make.defs +++ b/nuttx/configs/hymini-stm32v/usbserial/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/kwikstik-k40/README.txt b/nuttx/configs/kwikstik-k40/README.txt index aeacbd11b..2c92e3bbc 100644 --- a/nuttx/configs/kwikstik-k40/README.txt +++ b/nuttx/configs/kwikstik-k40/README.txt @@ -25,7 +25,7 @@ Contents o NuttX EABI "buildroot" Toolchain o NuttX OABI "buildroot" Toolchain o NXFLAT Toolchain - + Kinetis KwikStik-K40 Features: ============================== @@ -219,7 +219,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -316,7 +316,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. diff --git a/nuttx/configs/kwikstik-k40/ostest/Make.defs b/nuttx/configs/kwikstik-k40/ostest/Make.defs index 16487e754..6715f309a 100644 --- a/nuttx/configs/kwikstik-k40/ostest/Make.defs +++ b/nuttx/configs/kwikstik-k40/ostest/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/kwikstik-k40/src/Makefile b/nuttx/configs/kwikstik-k40/src/Makefile index e02cce78a..e4edfb0c5 100644 --- a/nuttx/configs/kwikstik-k40/src/Makefile +++ b/nuttx/configs/kwikstik-k40/src/Makefile @@ -37,17 +37,17 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_lcd.c up_spi.c ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_leds.c +CSRCS += up_leds.c endif ifeq ($(CONFIG_ARCH_BUTTONS),y) -CSRCS += up_buttons.c +CSRCS += up_buttons.c endif ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/kwikstik-k40/src/up_buttons.c b/nuttx/configs/kwikstik-k40/src/up_buttons.c index 3477c36cd..a82d55ca2 100644 --- a/nuttx/configs/kwikstik-k40/src/up_buttons.c +++ b/nuttx/configs/kwikstik-k40/src/up_buttons.c @@ -110,7 +110,7 @@ uint8_t board_buttons(void) * be called when a button is depressed or released. The ID value is a * button enumeration value that uniquely identifies a button resource. * See the BUTTON_* and JOYSTICK_* definitions in board.h for the meaning - * of enumeration value. The previous interrupt handler address is + * of enumeration value. The previous interrupt handler address is * returned (so that it may be restored, if so desired). * ****************************************************************************/ diff --git a/nuttx/configs/kwikstik-k40/src/up_lcd.c b/nuttx/configs/kwikstik-k40/src/up_lcd.c index c8a8a9008..ff2343c45 100644 --- a/nuttx/configs/kwikstik-k40/src/up_lcd.c +++ b/nuttx/configs/kwikstik-k40/src/up_lcd.c @@ -33,7 +33,7 @@ * POSSIBILITY OF SUCH DAMAGE. * **************************************************************************************/ - + /************************************************************************************** * Included Files **************************************************************************************/ diff --git a/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt index ef2e2bf52..eaf98ef7c 100644 --- a/nuttx/configs/lincoln60/README.txt +++ b/nuttx/configs/lincoln60/README.txt @@ -119,7 +119,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -214,7 +214,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -401,7 +401,7 @@ Lincoln 60 Configuration Options LPC17xx USB Device Configuration CONFIG_LPC17_USBDEV_FRAME_INTERRUPT - Handle USB Start-Of-Frame events. + Handle USB Start-Of-Frame events. Enable reading SOF from interrupt handler vs. simply reading on demand. Probably a bad idea... Unless there is some issue with sampling the SOF from hardware asynchronously. diff --git a/nuttx/configs/lincoln60/include/board.h b/nuttx/configs/lincoln60/include/board.h index ca6aeb7ba..0eafa454a 100644 --- a/nuttx/configs/lincoln60/include/board.h +++ b/nuttx/configs/lincoln60/include/board.h @@ -89,7 +89,7 @@ /* PLL0. PLL0 is used to generate the CPU clock divider input (PLLCLK). * * Source clock: Main oscillator - * PLL0 Multiplier value (M): 20 + * PLL0 Multiplier value (M): 20 * PLL0 Pre-divider value (N): 1 * * PLL0CLK = (2 * 20 * SYSCLK) / 1 = 480MHz diff --git a/nuttx/configs/lincoln60/nsh/Make.defs b/nuttx/configs/lincoln60/nsh/Make.defs index 5ba93b8c8..560fd794a 100644 --- a/nuttx/configs/lincoln60/nsh/Make.defs +++ b/nuttx/configs/lincoln60/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lincoln60/src/Makefile b/nuttx/configs/lincoln60/src/Makefile index 66862306a..1fc01490a 100644 --- a/nuttx/configs/lincoln60/src/Makefile +++ b/nuttx/configs/lincoln60/src/Makefile @@ -37,8 +37,8 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = -CSRCS = up_boot.c up_leds.c +ASRCS = +CSRCS = up_boot.c up_leds.c ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c diff --git a/nuttx/configs/lincoln60/src/up_leds.c b/nuttx/configs/lincoln60/src/up_leds.c index 59fb8f049..e3b763085 100644 --- a/nuttx/configs/lincoln60/src/up_leds.c +++ b/nuttx/configs/lincoln60/src/up_leds.c @@ -96,11 +96,11 @@ debug functionality (where NC means "No Change"). During the boot phases. LED1 and LED2 will show boot status. - LED1 LED2 -STARTED OFF OFF -HEAPALLOCATE BLUE OFF + LED1 LED2 +STARTED OFF OFF +HEAPALLOCATE BLUE OFF IRQSENABLED OFF BLUE -STACKCREATED OFF OFF +STACKCREATED OFF OFF After the system is booted, this logic will no longer use LEDs 1 & 2. They are available for use by applications using lpc17_led (prototyped below) diff --git a/nuttx/configs/lm3s6432-s2e/README.txt b/nuttx/configs/lm3s6432-s2e/README.txt index f81866a08..c7f90fb3d 100644 --- a/nuttx/configs/lm3s6432-s2e/README.txt +++ b/nuttx/configs/lm3s6432-s2e/README.txt @@ -78,7 +78,7 @@ C12 PB3 Transciever #ENABLE Development Environment ^^^^^^^^^^^^^^^^^^^^^^^ - Either Linux, Mac OS X or Cygwin on Windows can be used for the development + Either Linux, Mac OS X or Cygwin on Windows can be used for the development environment. The source has been built only using the GNU toolchain (see below). Other toolchains will likely cause problems. Testing was performed using GCC on @@ -146,7 +146,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -245,7 +245,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -355,7 +355,7 @@ Stellaris MDL-S2E Reference Design Configuration Options CONFIG_TIVA_DISABLE_GPIOG_IRQS=y CONFIG_TIVA_DISABLE_GPIOH_IRQS=y CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y - + LM3S6432 specific device driver settings CONFIG_UARTn_DISABLE diff --git a/nuttx/configs/lm3s6432-s2e/include/board.h b/nuttx/configs/lm3s6432-s2e/include/board.h index 6054786ba..af6144c23 100644 --- a/nuttx/configs/lm3s6432-s2e/include/board.h +++ b/nuttx/configs/lm3s6432-s2e/include/board.h @@ -129,8 +129,8 @@ void tiva_boardinitialize(void); * Name: tiva_ethernetmac * * Description: - * For the MDL-S2E Reference Design, the MAC address will be stored in the - * non-volatile USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, + * For the MDL-S2E Reference Design, the MAC address will be stored in the + * non-volatile USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, * this function will obtain the MAC address from these registers. * ************************************************************************************/ diff --git a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs index e0318a697..d3ef8449d 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs +++ b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lm3s6432-s2e/src/Makefile b/nuttx/configs/lm3s6432-s2e/src/Makefile index 2aa2eb14a..c149327dd 100644 --- a/nuttx/configs/lm3s6432-s2e/src/Makefile +++ b/nuttx/configs/lm3s6432-s2e/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/lm3s6432-s2e/src/up_boot.c b/nuttx/configs/lm3s6432-s2e/src/up_boot.c index 8d1d276ac..492924a47 100644 --- a/nuttx/configs/lm3s6432-s2e/src/up_boot.c +++ b/nuttx/configs/lm3s6432-s2e/src/up_boot.c @@ -96,7 +96,7 @@ void tiva_boardinitialize(void) #endif /* Configure serial transciever */ - + tiva_configgpio(XCVR_INV_GPIO); tiva_configgpio(XCVR_ENA_GPIO); tiva_configgpio(XCVR_ON_GPIO); diff --git a/nuttx/configs/lm3s6432-s2e/src/up_ssi.c b/nuttx/configs/lm3s6432-s2e/src/up_ssi.c index c5e5bc8b6..33dea280e 100644 --- a/nuttx/configs/lm3s6432-s2e/src/up_ssi.c +++ b/nuttx/configs/lm3s6432-s2e/src/up_ssi.c @@ -122,7 +122,7 @@ void weak_function lm_ssiinitialize(void) * 2. Add a call to up_spiinitialize() in your low level initialization * logic * 3. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt index e3824bb83..ddf2390a0 100644 --- a/nuttx/configs/lm3s6965-ek/README.txt +++ b/nuttx/configs/lm3s6965-ek/README.txt @@ -119,7 +119,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator I have been using the on-board FT2232 JTAG/SWD/SWO interface. OpenOCD requires a configuration file. I keep the one I used last here: - + configs/lm3s6965-ek/tools/lm3s6965-ek.cfg However, the "correct" configuration script to use with OpenOCD may @@ -135,7 +135,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator There is also a script on the tools/ directory that I use to start the OpenOCD daemon on my system called oocd.sh. That script will probably require some modifications to work in another environment: - + - Possibly the value of OPENOCD_PATH and TARGET_PATH - It assumes that the correct script to use is the one at configs/lm3s6965-ek/tools/lm3s6965-ek.cfg @@ -170,11 +170,11 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator .config file). 2. The MCU must be halted prior to loading code using 'mon reset' as described below. - + OpenOCD will support several special 'monitor' commands. These GDB commands will send comments to the OpenOCD monitor. Here are a couple that you will need to use: - + (gdb) monitor reset (gdb) monitor halt @@ -260,7 +260,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -355,7 +355,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -395,7 +395,7 @@ USB Device Controller Functions Debugging with JTAG/SWD - The FT2232 USB device performs JTAG/SWD serial operations under the control + The FT2232 USB device performs JTAG/SWD serial operations under the control of the debugger or the Luminary Flash Programmer. It also operate as an In-Circuit Debugger Interface (ICDI), allowing debugging of any external target board. Debugging modes: @@ -504,7 +504,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options CONFIG_TIVA_DISABLE_GPIOG_IRQS=n CONFIG_TIVA_DISABLE_GPIOH_IRQS=n CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y - + LM3S6965 specific device driver settings CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the diff --git a/nuttx/configs/lm3s6965-ek/nsh/Make.defs b/nuttx/configs/lm3s6965-ek/nsh/Make.defs index 0aac7fd3b..afa31e700 100644 --- a/nuttx/configs/lm3s6965-ek/nsh/Make.defs +++ b/nuttx/configs/lm3s6965-ek/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lm3s6965-ek/nx/Make.defs b/nuttx/configs/lm3s6965-ek/nx/Make.defs index c53610e25..2b53f8e25 100644 --- a/nuttx/configs/lm3s6965-ek/nx/Make.defs +++ b/nuttx/configs/lm3s6965-ek/nx/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lm3s6965-ek/src/Makefile b/nuttx/configs/lm3s6965-ek/src/Makefile index 42b1a037d..2a9ebb845 100644 --- a/nuttx/configs/lm3s6965-ek/src/Makefile +++ b/nuttx/configs/lm3s6965-ek/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/up_ssi.c index 869521d8f..0af04448e 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c +++ b/nuttx/configs/lm3s6965-ek/src/up_ssi.c @@ -127,7 +127,7 @@ void weak_function lm_ssiinitialize(void) * 2. Add a call to up_spiinitialize() in your low level initialization * logic * 3. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt index fd25170cc..022b8549f 100644 --- a/nuttx/configs/lm3s8962-ek/README.txt +++ b/nuttx/configs/lm3s8962-ek/README.txt @@ -259,7 +259,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -299,7 +299,7 @@ USB Device Controller Functions Debugging with JTAG/SWD - The FT2232 USB device performs JTAG/SWD serial operations under the control + The FT2232 USB device performs JTAG/SWD serial operations under the control of the debugger or the Luminary Flash Programmer. It also operate as an In-Circuit Debugger Interface (ICDI), allowing debugging of any external target board. Debugging modes: @@ -408,7 +408,7 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options CONFIG_TIVA_DISABLE_GPIOG_IRQS=n CONFIG_TIVA_DISABLE_GPIOH_IRQS=n CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y - + LM3S8962 specific device driver settings CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the diff --git a/nuttx/configs/lm3s8962-ek/nx/Make.defs b/nuttx/configs/lm3s8962-ek/nx/Make.defs index 1f98baa7f..c6e646172 100644 --- a/nuttx/configs/lm3s8962-ek/nx/Make.defs +++ b/nuttx/configs/lm3s8962-ek/nx/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lm3s8962-ek/src/Makefile b/nuttx/configs/lm3s8962-ek/src/Makefile index 8ab822af7..9181f103e 100644 --- a/nuttx/configs/lm3s8962-ek/src/Makefile +++ b/nuttx/configs/lm3s8962-ek/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/lm3s8962-ek/src/up_ssi.c b/nuttx/configs/lm3s8962-ek/src/up_ssi.c index d407a6590..9657dafa1 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_ssi.c +++ b/nuttx/configs/lm3s8962-ek/src/up_ssi.c @@ -127,7 +127,7 @@ void weak_function lm_ssiinitialize(void) * 2. Add a call to up_spiinitialize() in your low level initialization * logic * 3. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/lm4f120-launchpad/README.txt b/nuttx/configs/lm4f120-launchpad/README.txt index bca8a11f8..af2f73791 100644 --- a/nuttx/configs/lm4f120-launchpad/README.txt +++ b/nuttx/configs/lm4f120-launchpad/README.txt @@ -60,7 +60,7 @@ o Advanced motion control, featuring: eight Pulse Width Modulation (PWM) generator blocks, each with one 16-bit counter, two PWM comparators, a PWM signal generator, a dead-band generator, and an interrupt/ADC-trigger selector; two PWM fault inputs to promote low-latency shutdown; two - Quadrature Encoder Interface (QEI) modules, with position integrator to + Quadrature Encoder Interface (QEI) modules, with position integrator to rack encoder position and velocity capture using built-in timer o Two ARM FiRM-compliant watchdog timers; six 32-bit general-purpose timers (up to twelve 16-bit); six wide 64-bit general-purpose timers (up to twelve @@ -86,7 +86,7 @@ PIN SIGNAL(S) LanchPad Function 20 PA3/SSIOFSS GPIO, J2 pin 9 21 PA4/SSIORX GPIO, J2 pin 8 22 PA5/SSIOTX GPIO, J1 pin 8 - 23 PA6/I2CLSCL GPIO, J1 pin 9 + 23 PA6/I2CLSCL GPIO, J1 pin 9 24 PA7/I2CLSDA GPIO, J1 pin 10 45 PB0/T2CCP0/U1Rx GPIO, J1 pin 3 @@ -155,7 +155,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator git fetch http://openocd.zylin.com/openocd refs/changes/22/922/14 && git checkout FETCH_HEAD ./bootstrap ./configure --enable-maintainer-mode --enable-ti-icdi - make + make sudo make install For additional help, see http://processors.wiki.ti.com/index.php/Stellaris_Launchpad_with_OpenOCD_and_Linux @@ -164,7 +164,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator I have been using the on-board In-Circuit Debug Interface (ICDI) interface. OpenOCD requires a configuration file. I keep the one I used last here: - + configs/lm4f120-launchpad/tools/lm4f120-launchpad.cfg However, the "correct" configuration script to use with OpenOCD may @@ -180,7 +180,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator There is also a script on the tools/ directory that I use to start the OpenOCD daemon on my system called oocd.sh. That script will probably require some modifications to work in another environment: - + - Possibly the value of OPENOCD_PATH and TARGET_PATH - It assumes that the correct script to use is the one at configs/lm4f120-launchpad/tools/lm4f120-launchpad.cfg @@ -195,7 +195,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator The relative path to the oocd.sh script is configs/lm4f120-launchpad/tools, but that should have been added to your PATH variable when you sourced the setenv.sh script. - + Note that OpenOCD needs to be run with administrator privileges in some environments (sudo). @@ -223,11 +223,11 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator .config file). 2. The MCU must be halted prior to loading code using 'mon reset' as described below. - + OpenOCD will support several special 'monitor' commands. These GDB commands will send comments to the OpenOCD monitor. Here are a couple that you will need to use: - + (gdb) monitor reset (gdb) monitor halt @@ -314,7 +314,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -409,7 +409,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -526,7 +526,7 @@ USB Device Controller Functions Debugging with JTAG/SWD - The FT2232 USB device performs JTAG/SWD serial operations under the control + The FT2232 USB device performs JTAG/SWD serial operations under the control of the debugger or the Luminary Flash Programmer. It also operate as an In-Circuit Debugger Interface (ICDI), allowing debugging of any external target board. Debugging modes: @@ -635,7 +635,7 @@ LM4F120 LaunchPad Configuration Options CONFIG_TIVA_DISABLE_GPIOG_IRQS=n CONFIG_TIVA_DISABLE_GPIOH_IRQS=n CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y - + LM4F120 specific device driver settings CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -693,7 +693,7 @@ Where <subdir> is one of the following: builtin applications are selected. NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: diff --git a/nuttx/configs/lm4f120-launchpad/nsh/Make.defs b/nuttx/configs/lm4f120-launchpad/nsh/Make.defs index 1b9eadc65..00fe0c048 100644 --- a/nuttx/configs/lm4f120-launchpad/nsh/Make.defs +++ b/nuttx/configs/lm4f120-launchpad/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lm4f120-launchpad/scripts/ld.script b/nuttx/configs/lm4f120-launchpad/scripts/ld.script index bff22ec50..41b880e0a 100755 --- a/nuttx/configs/lm4f120-launchpad/scripts/ld.script +++ b/nuttx/configs/lm4f120-launchpad/scripts/ld.script @@ -97,7 +97,7 @@ SECTIONS *(COMMON) _ebss = ABSOLUTE(.); } > sram - + /* Stabs debugging sections. */ .stab 0 : { *(.stab) } diff --git a/nuttx/configs/lm4f120-launchpad/src/Makefile b/nuttx/configs/lm4f120-launchpad/src/Makefile index ba45657d0..be5bc10f9 100644 --- a/nuttx/configs/lm4f120-launchpad/src/Makefile +++ b/nuttx/configs/lm4f120-launchpad/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = lm4f_boot.c lm4f_ssi.c diff --git a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c index b26f07424..e7b5faf55 100644 --- a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c +++ b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c @@ -111,7 +111,7 @@ void weak_function lm4f_ssiinitialize(void) * 2. Add a call to tiva_spiinitialize() in your low level initialization * logic * 3. The handle returned by tiva_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt index 982c2b6e5..03b513bd8 100644 --- a/nuttx/configs/lpc4330-xplorer/README.txt +++ b/nuttx/configs/lpc4330-xplorer/README.txt @@ -74,9 +74,9 @@ Status - Remove LPC17xx power, clocking, and pin configuration logic. - Adding of clock source and frequency to the board.h file. - Adding of LPC43 clock connection and pin configuration logic. - + Within any luck, these drivers should come up very quickly: - + - lpc43_adc.c, - lpc43_dac.c, - lpc43_gpdma.c, @@ -238,7 +238,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project . - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -279,7 +279,7 @@ Code Red IDE/Tools $ /cygdrive/c/code_red/RedSuite_4.2.3_379/redsuite/bin/Scripts/bootLPCXpresso.cmd winusb Booting LPC-Link with LPCXpressoWIN.enc - Press any key to continue . . . + Press any key to continue . . . The same file logic can be found the less restrictive LPCXpresso package at: @@ -298,7 +298,7 @@ Code Red IDE/Tools $ lpc43xx Booting LPC-Link with LPCXpressoWIN.enc - Press any key to continue . . . + Press any key to continue . . . Using GDB --------- @@ -331,7 +331,7 @@ Code Red IDE/Tools And <options> are: -n set information level for the debug driver. n should be 2, 3 or 4. - 2 should be sufficient in most circumstances + 2 should be sufficient in most circumstances -p<part> is the target device to connect to and you should use <part>=LPC4330. @@ -355,7 +355,7 @@ Code Red IDE/Tools $ lpc43xx Booting LPC-Link with LPCXpressoWIN.enc - Press any key to continue . . . + Press any key to continue . . . $ arm-none-eabi-gdb nuttx (gdb) target extended-remote | crt_emu_lpc18_43_nxp -2 -pLPC4330 -wire=winusb @@ -380,7 +380,7 @@ Code Red IDE/Tools NOTE 4: Every time that you control-C out of the command line GDB, you leave a copy of the Code Red debugger (crt_emu_lpc18_43_nxp) running. I - have found that if you have these old copies of the debugger running, + have found that if you have these old copies of the debugger running, hen strange things can happen when start yet another copy of the debugger (I suspect that GDB may be talking with the wrong debugger). @@ -448,7 +448,7 @@ Code Red IDE/Tools # -wire=hid LPC-Link on Windows Vista/ Windows 7 # Add -g -4 for verbose output - crt_emu_lpc18_43_nxp -wire=hid -pLPC4330 -load-base=0x14000000 + crt_emu_lpc18_43_nxp -wire=hid -pLPC4330 -load-base=0x14000000 -flash-load-exec=nuttx.bin -flash-driver=LPC1850A_4350A_SPIFI.cfx USB DFU Booting @@ -526,7 +526,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -706,10 +706,10 @@ LPC4330-Xplorer Configuration Options CONFIG_ARCH_FPU - The LPC43xxx supports a floating point unit (FPU) CONFIG_ARCH_FPU=y - + CONFIG_LPC43_BOOT_xxx - The startup code needs to know if the code is running from internal FLASH, external FLASH, SPIFI, or SRAM in order to - initialize properly. Note that a boot device is not specified for + initialize properly. Note that a boot device is not specified for cases where the code is copied into SRAM; those cases are all covered by CONFIG_LPC43_BOOT_SRAM. @@ -797,7 +797,7 @@ LPC4330-Xplorer Configuration Options CONFIG_USARTn_RS485MODE - Support LPC43xx USART0,2,3 RS485 mode ioctls (TIOCSRS485 and TIOCGRS485) to enable and disable RS-485 mode. - + LPC43xx specific CAN device driver settings. These settings all require CONFIG_CAN: @@ -839,7 +839,7 @@ LPC4330-Xplorer Configuration Options LPC43xx USB Device Configuration CONFIG_LPC43_USBDEV_FRAME_INTERRUPT - Handle USB Start-Of-Frame events. + Handle USB Start-Of-Frame events. Enable reading SOF from interrupt handler vs. simply reading on demand. Probably a bad idea... Unless there is some issue with sampling the SOF from hardware asynchronously. diff --git a/nuttx/configs/lpc4330-xplorer/include/board.h b/nuttx/configs/lpc4330-xplorer/include/board.h index bf4c355e5..30adabce9 100644 --- a/nuttx/configs/lpc4330-xplorer/include/board.h +++ b/nuttx/configs/lpc4330-xplorer/include/board.h @@ -103,7 +103,7 @@ # define BOARD_FCLKOUT_FREQUENCY (72000000) /* 6 * 12,000,000 / 1 */ # define BOARD_FCCO_FREQUENCY (244000000) /* 2 * 2 * Fclkout */ - + #else /* NOTE: At 72MHz, the calibrated value of CONFIG_BOARD_LOOPSPERMSEC was @@ -115,7 +115,7 @@ */ /* Intermediate ramp-up clocking (Integer mode). If BOARD_PLL_RAMP_MSEL - * is not defined, there will be no ramp-up. + * is not defined, there will be no ramp-up. * * Fclkout = 9 * 12MHz / 1 = 108MHz * Fcco = 2 * 1 * 108MHz = 216MHz @@ -128,7 +128,7 @@ # define BOARD_RAMP_FCLKOUT (108000000) /* 9 * 12,000,000 / 1 */ # define BOARD_RAMP_FCCO (216000000) /* 2 * 1 * Fclkout */ -/* Final clocking (Direct mode). +/* Final clocking (Direct mode). * * Fclkout = 17 * 12MHz / 1 = 204MHz * Fcco = Fclockout = 204MHz @@ -206,7 +206,7 @@ * LED2 D3 GPIO1[11] * * LEDs are pulled high to a low output illuminates the LED. - * + * * LED index values for use with lpc43_setled() */ diff --git a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs index 30a361bd3..fc6831712 100644 --- a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs +++ b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs @@ -66,7 +66,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lpc4330-xplorer/src/Makefile b/nuttx/configs/lpc4330-xplorer/src/Makefile index b827c9434..8b433ab0c 100644 --- a/nuttx/configs/lpc4330-xplorer/src/Makefile +++ b/nuttx/configs/lpc4330-xplorer/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/lpc4330-xplorer/src/up_autoleds.c b/nuttx/configs/lpc4330-xplorer/src/up_autoleds.c index 23e23245d..a3a2ef190 100644 --- a/nuttx/configs/lpc4330-xplorer/src/up_autoleds.c +++ b/nuttx/configs/lpc4330-xplorer/src/up_autoleds.c @@ -68,7 +68,7 @@ * * If CONFIG_ARCH_LEDS is defined, the LEDs will be controlled as follows * for NuttX debug functionality (where NC means "No Change"). - * + * * ON OFF * LED1 LED2 LED1 LED2 * LED_STARTED 0 OFF OFF - - diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt index 5be42d413..7d9209dad 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/README.txt +++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt @@ -27,8 +27,8 @@ LCPXpresso LPC1768 Board P0[0]/RD1/TXD3/SDA1 J6-9 I2C E2PROM SDA TXD3/SDA1 P0[1]/TD1/RXD3/SCL J6-10 RXD3/SCL1 - P0[2]/TXD0/AD0[7] J6-21 - P0[3]/RXD0/AD0[6] J6-22 + P0[2]/TXD0/AD0[7] J6-21 + P0[3]/RXD0/AD0[6] J6-22 P0[4]/I2SRX-CLK/RD2/CAP2.0 J6-38 CAN_RX2 P0[5]/I2SRX-WS/TD2/CAP2.1 J6-39 CAN_TX2 P0[6]/I2SRX_SDA/SSEL1/MAT2[0] J6-8 SSEL1, OLED CS @@ -43,14 +43,14 @@ LCPXpresso LPC1768 Board P0[18]/DCD1/MOSI0/MOSI J6-11 MOSI0 P0[19]/DSR1/SDA1 PAD17 N/A P0[20]/DTR1/SCL1 PAD18 I2C E2PROM SCL N/A - P0[21]/RI1/MCIPWR/RD1 J6-23 - P0[22]/RTS1/TD1 J6-24 LED + P0[21]/RI1/MCIPWR/RD1 J6-23 + P0[22]/RTS1/TD1 J6-24 LED P0[23]/AD0[0]/I2SRX_CLK/CAP3[0] J6-15 AD0.0 P0[24]/AD0[1]/I2SRX_WS/CAP3[1] J6-16 AD0.1 P0[25]/AD0[2]/I2SRX_SDA/TXD3 J6-17 AD0.2 P0[26]/AD0[3]/AOUT/RXD3 J6-18 AD0.3/AOUT / RGB LED - P0[27]/SDA0/USB_SDA J6-25 - P0[28]/SCL0 J6-26 + P0[27]/SDA0/USB_SDA J6-25 + P0[28]/SCL0 J6-26 P0[29]/USB_D+ J6-37 USB_D+ P0[30]/USB_D- J6-36 USB_D- @@ -85,14 +85,14 @@ LCPXpresso LPC1768 Board P2[3]/PWM1.4/DCD1/TRACEDATA[2] J6-45 PWM1.4 P2[4]/PWM1.5/DSR1/TRACEDATA[1] J6-46 PWM1.5 P2[5]/PWM1[6]/DTR1/TRACEDATA[0] J6-47 PWM1.6 - P2[6]/PCAP1[0]/RI1/TRACECLK J6-48 + P2[6]/PCAP1[0]/RI1/TRACECLK J6-48 P2[7]/RD2/RTS1 J6-49 OLED command/data - P2[8]/TD2/TXD2 J6-50 + P2[8]/TD2/TXD2 J6-50 P2[9]/USB_CONNECT/RXD2 PAD19 USB Pullup N/A - P2[10]/EINT0/NMI J6-51 - P2[11]/EINT1/I2STX_CLK J6-52 - P2[12]/EINT2/I2STX_WS j6-53 - P2[13]/EINT3/I2STX_SDA J6-27 + P2[10]/EINT0/NMI J6-51 + P2[11]/EINT1/I2STX_CLK J6-52 + P2[12]/EINT2/I2STX_WS j6-53 + P2[13]/EINT3/I2STX_SDA J6-27 P3[25]/MAT0.0/PWM1.2 PAD13 N/A P3[26]/STCLK/MAT0.1/PWM1.3 PAD14 N/A @@ -129,10 +129,10 @@ SD Slot *J55 must be set to provide chip select PIO1_11 signal as the SD slot chip select. - + USB Device ---------- - + Base-board J4/J6 LPC1768 Signal Pin Pin ------------------- ----- -------- @@ -303,7 +303,7 @@ Code Red IDE NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Linux Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -334,7 +334,7 @@ Code Red IDE Under Cygwin, the Code Red command line tools (e.g., arm-non-eabi-gcc) cannot be executed because the they only have execut privileges for Administrators. I worked around this by: - + Opening a native Cygwin RXVT as Administrator (Right click, "Run as administrator"), then executing 'chmod 755 *.exe' in the following directories: @@ -471,7 +471,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -514,8 +514,8 @@ LEDs is as follows: - The LED is not illuminated until the LPCXpresso completes initialization. - - If the LED is stuck in the OFF state, this means that the LPCXpresso did not + + If the LED is stuck in the OFF state, this means that the LPCXpresso did not complete initializeation. - Each time the OS enters an interrupt (or a signal) it will turn the LED OFF and @@ -698,7 +698,7 @@ LPCXpresso Configuration Options LPC17xx USB Device Configuration CONFIG_LPC17_USBDEV_FRAME_INTERRUPT - Handle USB Start-Of-Frame events. + Handle USB Start-Of-Frame events. Enable reading SOF from interrupt handler vs. simply reading on demand. Probably a bad idea... Unless there is some issue with sampling the SOF from hardware asynchronously. @@ -713,7 +713,7 @@ LPCXpresso Configuration Options Define if the hardware implementation does not support the VBUS signal CONFIG_LPC17_USBDEV_NOLED Define if the hardware implementation does not support the LED output - + LPC17xx USB Host Configuration (the LPCXpresso does not support USB Host) CONFIG_USBHOST_OHCIRAM_SIZE @@ -806,7 +806,7 @@ Where <subdir> is one of the following: 2. Jumpers: There are several jumper settings needed by the OLED. All are the default settings: - + J42: Close to select the SPI interface (Default: closed) J43: Close to support OLED command/data select (Default: closed) J44: Close to allow control of OLED voltage (Default: closed) @@ -858,7 +858,7 @@ Where <subdir> is one of the following: 2. At present, the value for the SD SPI frequency is too high and the SD will fail. Setting that frequency to 400000 removes the problem. TODO: Tune this frequency to some optimal value. - + 3. Jumpers: J55 must be set to provide chip select PIO1_11 signal as the SD slot chip select. diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs index 8eddddb05..374d72d05 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lpcxpresso-lpc1768/include/board.h b/nuttx/configs/lpcxpresso-lpc1768/include/board.h index 086e30c81..48a46a24b 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/include/board.h +++ b/nuttx/configs/lpcxpresso-lpc1768/include/board.h @@ -84,7 +84,7 @@ /* PLL0. PLL0 is used to generate the CPU clock divider input (PLLCLK). * * Source clock: Main oscillator - * PLL0 Multiplier value (M): 20 + * PLL0 Multiplier value (M): 20 * PLL0 Pre-divider value (N): 1 * * PLL0CLK = (2 * 20 * SYSCLK) / 1 = 480MHz @@ -147,8 +147,8 @@ * -------------------------------- --------- -------------- --------------------- * P0[0]/RD1/TXD3/SDA1 J6-9 I2C E2PROM SDA TXD3/SDA1 * P0[1]/TD1/RXD3/SCL J6-10 RXD3/SCL1 - * P0[2]/TXD0/AD0[7] J6-21 - * P0[3]/RXD0/AD0[6] J6-22 + * P0[2]/TXD0/AD0[7] J6-21 + * P0[3]/RXD0/AD0[6] J6-22 * P0[4]/I2SRX-CLK/RD2/CAP2.0 J6-38 CAN_RX2 * P0[5]/I2SRX-WS/TD2/CAP2.1 J6-39 CAN_TX2 * P0[6]/I2SRX_SDA/SSEL1/MAT2[0] J6-8 SSEL1, OLED CS @@ -163,14 +163,14 @@ * P0[18]/DCD1/MOSI0/MOSI J6-11 MOSI0 * P0[19]/DSR1/SDA1 PAD17 N/A * P0[20]/DTR1/SCL1 PAD18 I2C E2PROM SCL N/A - * P0[21]/RI1/MCIPWR/RD1 J6-23 - * P0[22]/RTS1/TD1 J6-24 LED + * P0[21]/RI1/MCIPWR/RD1 J6-23 + * P0[22]/RTS1/TD1 J6-24 LED * P0[23]/AD0[0]/I2SRX_CLK/CAP3[0] J6-15 AD0.0 * P0[24]/AD0[1]/I2SRX_WS/CAP3[1] J6-16 AD0.1 * P0[25]/AD0[2]/I2SRX_SDA/TXD3 J6-17 AD0.2 * P0[26]/AD0[3]/AOUT/RXD3 J6-18 AD0.3/AOUT / RGB LED - * P0[27]/SDA0/USB_SDA J6-25 - * P0[28]/SCL0 J6-26 + * P0[27]/SDA0/USB_SDA J6-25 + * P0[28]/SCL0 J6-26 * P0[29]/USB_D+ J6-37 USB_D+ * P0[30]/USB_D- J6-36 USB_D- */ @@ -224,16 +224,16 @@ * P2[3]/PWM1.4/DCD1/TRACEDATA[2] J6-45 PWM1.4 * P2[4]/PWM1.5/DSR1/TRACEDATA[1] J6-46 PWM1.5 * P2[5]/PWM1[6]/DTR1/TRACEDATA[0] J6-47 PWM1.6 - * P2[6]/PCAP1[0]/RI1/TRACECLK J6-48 + * P2[6]/PCAP1[0]/RI1/TRACECLK J6-48 * P2[7]/RD2/RTS1 J6-49 OLED command/data - * P2[8]/TD2/TXD2 J6-50 + * P2[8]/TD2/TXD2 J6-50 * P2[9]/USB_CONNECT/RXD2 PAD19 USB Pullup N/A - * P2[10]/EINT0/NMI J6-51 - * P2[11]/EINT1/I2STX_CLK J6-52 - * P2[12]/EINT2/I2STX_WS J6-53 - * P2[13]/EINT3/I2STX_SDA J6-27 + * P2[10]/EINT0/NMI J6-51 + * P2[11]/EINT1/I2STX_CLK J6-52 + * P2[12]/EINT2/I2STX_WS J6-53 + * P2[13]/EINT3/I2STX_SDA J6-27 */ - + #define GPIO_PWM1p1 GPIO_PWM1p1_2 #define GPIO_PWM1p2 GPIO_PWM1p2_2 #define GPIO_PWM1p3 GPIO_PWM1p3_2 diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs index 912477ac4..749d311d7 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs index cdd88eec7..8de2ea5f3 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/Makefile b/nuttx/configs/lpcxpresso-lpc1768/src/Makefile index 6cc66793e..0ad6b33d2 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/Makefile +++ b/nuttx/configs/lpcxpresso-lpc1768/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c up_leds.c up_ssp.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h b/nuttx/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h index 01a838e1c..cf0f9c9a7 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h +++ b/nuttx/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h @@ -53,8 +53,8 @@ * -------------------------------- --------- -------------- --------------------- * P0[0]/RD1/TXD3/SDA1 J6-9 I2C E2PROM SDA TXD3/SDA1 * P0[1]/TD1/RXD3/SCL J6-10 RXD2/SCL1 - * P0[2]/TXD0/AD0[7] J6-21 - * P0[3]/RXD0/AD0[6] J6-22 + * P0[2]/TXD0/AD0[7] J6-21 + * P0[3]/RXD0/AD0[6] J6-22 * P0[4]/I2SRX-CLK/RD2/CAP2.0 J6-38 CAN_RX2 * P0[5]/I2SRX-WS/TD2/CAP2.1 J6-39 CAN_TX2 * P0[6]/I2SRX_SDA/SSEL1/MAT2[0] J6-8 SSEL1 @@ -69,14 +69,14 @@ * P0[18]/DCD1/MOSI0/MOSI J6-11 MOSI0 * P0[19]/DSR1/SDA1 PAD17 N/A * P0[20]/DTR1/SCL1 PAD18 I2C E2PROM SCL N/A - * P0[21]/RI1/MCIPWR/RD1 J6-23 - * P0[22]/RTS1/TD1 J6-24 LED + * P0[21]/RI1/MCIPWR/RD1 J6-23 + * P0[22]/RTS1/TD1 J6-24 LED * P0[23]/AD0[0]/I2SRX_CLK/CAP3[0] J6-15 AD0.0 * P0[24]/AD0[1]/I2SRX_WS/CAP3[1] J6-16 AD0.1 * P0[25]/AD0[2]/I2SRX_SDA/TXD3 J6-17 AD0.2 * P0[26]/AD0[3]/AOUT/RXD3 J6-18 AD0.3/AOUT - * P0[27]/SDA0/USB_SDA J6-25 - * P0[28]/SCL0 J6-26 + * P0[27]/SDA0/USB_SDA J6-25 + * P0[28]/SCL0 J6-26 * P0[29]/USB_D+ J6-37 USB_D+ * P0[30]/USB_D- J6-36 USB_D- */ @@ -116,14 +116,14 @@ * P2[3]/PWM1.4/DCD1/TRACEDATA[2] J6-45 PWM1.4 * P2[4]/PWM1.5/DSR1/TRACEDATA[1] J6-46 PWM1.5 * P2[5]/PWM1[6]/DTR1/TRACEDATA[0] J6-47 PWM1.6 - * P2[6]/PCAP1[0]/RI1/TRACECLK J6-48 - * P2[7]/RD2/RTS1 J6-49 - * P2[8]/TD2/TXD2 J6-50 + * P2[6]/PCAP1[0]/RI1/TRACECLK J6-48 + * P2[7]/RD2/RTS1 J6-49 + * P2[8]/TD2/TXD2 J6-50 * P2[9]/USB_CONNECT/RXD2 PAD19 USB Pullup N/A - * P2[10]/EINT0/NMI J6-51 - * P2[11]/EINT1/I2STX_CLK J6-52 - * P2[12]/EINT2/I2STX_WS J6-53 - * P2[13]/EINT3/I2STX_SDA J6-27 + * P2[10]/EINT0/NMI J6-51 + * P2[11]/EINT1/I2STX_CLK J6-52 + * P2[12]/EINT2/I2STX_WS J6-53 + * P2[13]/EINT3/I2STX_SDA J6-27 */ #define LPCXPRESSO_USB_PULLUP (GPIO_OUTPUT | GPIO_VALUE_ZERO | GPIO_PORT2 | GPIO_PIN9) @@ -134,7 +134,7 @@ * P4[28]/RX-MCLK/MAT2.0/TXD3 PAD15 N/A * P4[29]/TX-MCLK/MAT2.1/RXD3 PAD16 N/A */ - + /* SD Slot * * Base-board J4/J6 LPC1768 diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c index 89812fdee..00c5b37a8 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c +++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c @@ -114,7 +114,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) /* Configure the OLED GPIOs. For the SPI interface, insert jumpers in J42, * J43, J45 pin1-2 and J46 pin 1-2. */ - + oledcs_dumpgpio("up_nxdrvinit: After OLED CS setup"); oleddc_dumpgpio("up_nxdrvinit: On entry"); diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c index f5655e301..f16bc396c 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c +++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c @@ -131,7 +131,7 @@ void weak_function lpcxpresso_sspinitialize(void) * Name: lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * * Description: - * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status + * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) @@ -146,7 +146,7 @@ void weak_function lpcxpresso_sspinitialize(void) * 3. Add a calls to lpc17_sspinitialize() in your low level application * initialization logic * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs index 66f823782..c204301c1 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs @@ -47,7 +47,7 @@ ifeq ($(WINTOOL),y) ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbmsc/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/usbmsc/Make.defs index 8a912f66b..38b515f2f 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/usbmsc/Make.defs +++ b/nuttx/configs/lpcxpresso-lpc1768/usbmsc/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt index 67aff2340..a1383151e 100644 --- a/nuttx/configs/mbed/README.txt +++ b/nuttx/configs/mbed/README.txt @@ -89,7 +89,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -184,7 +184,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -371,7 +371,7 @@ mbed Configuration Options LPC17xx USB Device Configuration CONFIG_LPC17_USBDEV_FRAME_INTERRUPT - Handle USB Start-Of-Frame events. + Handle USB Start-Of-Frame events. Enable reading SOF from interrupt handler vs. simply reading on demand. Probably a bad idea... Unless there is some issue with sampling the SOF from hardware asynchronously. diff --git a/nuttx/configs/mbed/hidkbd/Make.defs b/nuttx/configs/mbed/hidkbd/Make.defs index 18ca23b32..195ceaddc 100644 --- a/nuttx/configs/mbed/hidkbd/Make.defs +++ b/nuttx/configs/mbed/hidkbd/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mbed/include/board.h b/nuttx/configs/mbed/include/board.h index eb35fbc3e..b490075da 100644 --- a/nuttx/configs/mbed/include/board.h +++ b/nuttx/configs/mbed/include/board.h @@ -84,7 +84,7 @@ /* PLL0. PLL0 is used to generate the CPU clock divider input (PLLCLK). * * Source clock: Main oscillator - * PLL0 Multiplier value (M): 20 + * PLL0 Multiplier value (M): 20 * PLL0 Pre-divider value (N): 1 * * PLL0CLK = (2 * 20 * SYSCLK) / 1 = 480MHz @@ -137,7 +137,7 @@ #define LED_STACKCREATED 3 /* OFF OFF */ /* After the system is booted, this logic will no longer use LEDs 1 & 2. They - * are available together with LED3 for use the application software using + * are available together with LED3 for use the application software using * lpc17_led (prototyped below) */ /* LED1 LED2 LED3 LED4 */ diff --git a/nuttx/configs/mbed/nsh/Make.defs b/nuttx/configs/mbed/nsh/Make.defs index d125af3b1..991a83f7f 100644 --- a/nuttx/configs/mbed/nsh/Make.defs +++ b/nuttx/configs/mbed/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mbed/src/Makefile b/nuttx/configs/mbed/src/Makefile index 02fee7649..97a678114 100644 --- a/nuttx/configs/mbed/src/Makefile +++ b/nuttx/configs/mbed/src/Makefile @@ -37,8 +37,8 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = -CSRCS = up_boot.c up_leds.c +ASRCS = +CSRCS = up_boot.c up_leds.c ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif diff --git a/nuttx/configs/mbed/src/up_leds.c b/nuttx/configs/mbed/src/up_leds.c index c4c28691a..520ef358d 100644 --- a/nuttx/configs/mbed/src/up_leds.c +++ b/nuttx/configs/mbed/src/up_leds.c @@ -96,14 +96,14 @@ debug functionality (where NC means "No Change"). During the boot phases. LED1 and LED2 will show boot status. LED3/4 Not used. - LED1 LED2 -STARTED OFF OFF -HEAPALLOCATE BLUE OFF + LED1 LED2 +STARTED OFF OFF +HEAPALLOCATE BLUE OFF IRQSENABLED OFF BLUE -STACKCREATED OFF OFF +STACKCREATED OFF OFF After the system is booted, this logic will no longer use LEDs 1 & 2. They -are available together with LED3 for use the application software using +are available together with LED3 for use the application software using lpc17_led (prototyped below) */ diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt index 86873a6a1..8ce4534ab 100644 --- a/nuttx/configs/mcu123-lpc214x/README.txt +++ b/nuttx/configs/mcu123-lpc214x/README.txt @@ -34,7 +34,7 @@ GNU Toolchain Options 1. The NuttX buildroot Toolchain (see below). 2. The CodeSourcery GNU toolchain, 3. The devkitARM GNU toolchain, or - + All testing has been conducted using the NuttX buildroot toolchain. To use the CodeSourcery or devkitARM GNU toolchain, you simply need to build the system as follows: @@ -163,7 +163,7 @@ Here are the detailed steps I use: 3. Start lpc21isp.sh -4. Reset the board to +4. Reset the board to FlashMagic (Windows/MAC) ------------------------ @@ -190,7 +190,7 @@ You download FlashMagic for Windows or MAC here: http://www.flashmagictool.com 5. Start and reset the board to entry ISP mode. Or hold the INT1 button down after reset after you press start. -NOTE: FlashMagic will complain if the data section overlaps +NOTE: FlashMagic will complain if the data section overlaps 0x4000000-0x400001ff. OpenOCD @@ -201,14 +201,14 @@ Cygwin, I can do the following: 1. Create a .cfg file: - $ cat /cygdrive/c/gccfd/openocd/lib/openocd/interface/arm-usb-ocd.cfg /cygdrive/c/gccfd/openocd/lib/openocd/target/lpc2148.cfg > lpc2148.cfg + $ cat /cygdrive/c/gccfd/openocd/lib/openocd/interface/arm-usb-ocd.cfg /cygdrive/c/gccfd/openocd/lib/openocd/target/lpc2148.cfg > lpc2148.cfg 2. Start OpenOCD: /cygdrive/c/gccfd/openocd/bin/openocd-ftd2xx.exe -f lpc2148.cfg -s . & 3. Start arm-*-gdb (whichever GDB your toolchain uses). - + ARM/LPC214X-specific Configuration Options ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -300,7 +300,7 @@ ARM/LPC214X-specific Configuration Options LPC214X USB Configuration CONFIG_LPC214X_USBDEV_FRAME_INTERRUPT - Handle USB Start-Of-Frame events. + Handle USB Start-Of-Frame events. Enable reading SOF from interrupt handler vs. simply reading on demand. Probably a bad idea... Unless there is some issue with sampling the SOF from hardware asynchronously. diff --git a/nuttx/configs/mcu123-lpc214x/lpc21isp-1.60.diff b/nuttx/configs/mcu123-lpc214x/lpc21isp-1.60.diff index 277b21921..9d329c6d2 100644 --- a/nuttx/configs/mcu123-lpc214x/lpc21isp-1.60.diff +++ b/nuttx/configs/mcu123-lpc214x/lpc21isp-1.60.diff @@ -2,82 +2,82 @@ diff -rub lpc21isp-1.60/lpc21isp.c lpc21isp-Linux//lpc21isp.c --- lpc21isp-1.60/lpc21isp.c 2008-07-21 15:17:06.000000000 -0600 +++ lpc21isp-Linux//lpc21isp.c 2008-09-16 09:21:20.000000000 -0600 @@ -22,6 +22,7 @@ - #include "adprog.h"
- #include "lpcprog.h"
- #include "lpcterm.h"
-+#include "errno.h"
-
- /*
- Change-History:
+ #include "adprog.h" + #include "lpcprog.h" + #include "lpcterm.h" ++#include "errno.h" + + /* + Change-History: @@ -319,10 +320,7 @@ -
- if (IspEnvironment->fdCom < 0)
- {
-- int* p_err = __error();
-- int err;
-- if (p_err) { err = *p_err; }
-- DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, err, err);
-+ DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, errno, errno);
- exit(2);
- }
-
+ + if (IspEnvironment->fdCom < 0) + { +- int* p_err = __error(); +- int err; +- if (p_err) { err = *p_err; } +- DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, err, err); ++ DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, errno, errno); + exit(2); + } + diff -rub lpc21isp-1.60/lpc21isp.h lpc21isp-Linux//lpc21isp.h --- lpc21isp-1.60/lpc21isp.h 2008-05-10 17:35:00.000000000 -0600 +++ lpc21isp-Linux//lpc21isp.h 2008-09-16 09:18:42.000000000 -0600 @@ -165,6 +165,7 @@ - #endif
-
- unsigned serial_timeout_count; /**< Local used to track timeouts on serial port read. */
-+ unsigned char DoNotStart; /* Do not start Code if this is set*/
-
- } ISP_ENVIRONMENT;
-
+ #endif + + unsigned serial_timeout_count; /**< Local used to track timeouts on serial port read. */ ++ unsigned char DoNotStart; /* Do not start Code if this is set*/ + + } ISP_ENVIRONMENT; + @@ -173,7 +174,6 @@ - #define DebugPrintf(in, ...)
-
- #else
--extern int debug_level;
-
- #if defined INTEGRATED_IN_WIN_APP
-
+ #define DebugPrintf(in, ...) + + #else +-extern int debug_level; + + #if defined INTEGRATED_IN_WIN_APP + @@ -191,7 +191,6 @@ -
- #else
- void DebugPrintf(int level, const char *fmt, ...);
--//#define DebugPrintf(level, ...) if (level <= debug_level) { TRACE( __VA_ARGS__ ); }
- #endif
-
- void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment);
+ + #else + void DebugPrintf(int level, const char *fmt, ...); +-//#define DebugPrintf(level, ...) if (level <= debug_level) { TRACE( __VA_ARGS__ ); } + #endif + + void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment); diff -rub lpc21isp-1.60/lpcprog.c lpc21isp-Linux//lpcprog.c --- lpc21isp-1.60/lpcprog.c 2008-07-21 14:39:50.000000000 -0600 +++ lpc21isp-Linux//lpcprog.c 2008-09-16 08:52:46.000000000 -0600 @@ -1062,15 +1062,16 @@ - }
- else
- {
-+ if (IspEnvironment->DoNotStart == 0)
-+ {
- DebugPrintf(2, "Now launching the brand new code\n");
- fflush(stdout);
--
- if (IspEnvironment->HalfDuplex == 0)
- sprintf(tmpString, "G %ld A\r\n", IspEnvironment->StartAddress);
- else
- sprintf(tmpString, "G %ld A\n", IspEnvironment->StartAddress);
--
- SendComPort(IspEnvironment, tmpString); //goto 0 : run this fresh new downloaded code code
-+
- if (IspEnvironment->BinaryOffset < LPC_RAMSTART)
- { // Skip response on G command - show response on Terminal instead
- ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2, 5000);
+ } + else + { ++ if (IspEnvironment->DoNotStart == 0) ++ { + DebugPrintf(2, "Now launching the brand new code\n"); + fflush(stdout); +- + if (IspEnvironment->HalfDuplex == 0) + sprintf(tmpString, "G %ld A\r\n", IspEnvironment->StartAddress); + else + sprintf(tmpString, "G %ld A\n", IspEnvironment->StartAddress); +- + SendComPort(IspEnvironment, tmpString); //goto 0 : run this fresh new downloaded code code ++ + if (IspEnvironment->BinaryOffset < LPC_RAMSTART) + { // Skip response on G command - show response on Terminal instead + ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2, 5000); @@ -1099,6 +1100,7 @@ - return (FAILED_RUN + GetAndReportErrorNumber(Answer));
- }
- }
-+ }
-
- fflush(stdout);
- }
+ return (FAILED_RUN + GetAndReportErrorNumber(Answer)); + } + } ++ } + + fflush(stdout); + } Only in lpc21isp-Linux/: lpcprog.c.orig diff -rub lpc21isp-1.60/Makefile lpc21isp-Linux//Makefile --- lpc21isp-1.60/Makefile 2008-04-07 00:23:00.000000000 -0600 @@ -85,18 +85,18 @@ diff -rub lpc21isp-1.60/Makefile lpc21isp-Linux//Makefile @@ -3,9 +3,9 @@ GLOBAL_DEP = adprog.h lpc21isp.h lpcprog.h lpcterm.h CC = gcc - + -ifneq ($findstring("freebsd", $(OSTYPE)),"") -CFLAGS+=-D__FREEBSD__ -endif +#ifneq ($findstring("freebsd", $(OSTYPE)),"") +#CFLAGS+=-D__FREEBSD__ +#endif - + adprog.o: adprog.c $(GLOBAL_DEP) $(CC) $(CDEBUG) $(CFLAGS) -c -o adprog.o adprog.c @@ -21,3 +21,4 @@ - + clean: $(RM) adprog.o lpcprog.o lpcterm.o lpc21isp + $(RM) *~ diff --git a/nuttx/configs/mcu123-lpc214x/src/Makefile b/nuttx/configs/mcu123-lpc214x/src/Makefile index 79f767fff..57630674d 100644 --- a/nuttx/configs/mcu123-lpc214x/src/Makefile +++ b/nuttx/configs/mcu123-lpc214x/src/Makefile @@ -45,7 +45,7 @@ else CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched endif -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_spi1.c up_leds.c diff --git a/nuttx/configs/micropendous3/README.txt b/nuttx/configs/micropendous3/README.txt index 074905ed9..7f7728dcc 100644 --- a/nuttx/configs/micropendous3/README.txt +++ b/nuttx/configs/micropendous3/README.txt @@ -59,7 +59,7 @@ Pin Usage (left) 1 (INT.6/AIN.0) PE6 J3-25 E6, CY7C1019D ^CE (Unpopulated) 2 (INT.7/AIN.1/UVcon) PE7 J3-26 E7, CY7C1019D A16 (Unpopulated) - 3 UVcc + 3 UVcc 4 D- USB DP 5 D+ USB DM 6 UGnd GND @@ -138,7 +138,7 @@ Atmel AVRISP mkII Connection Micropendous 3 JTAG (JTAG10PIN Connector) ------------------- --------------------- - + 1 2 1 2 TCK o o GND TCK o o GND TDO o o VCC TDO o o VTref @@ -254,7 +254,7 @@ Windows Native Toolchains ^^^^^^^^^^^^^^^^^^^^^^^^^ The WinAVR toolchain is a Windows native toolchain. There are several - limitations to using a Windows native toolchain in a Cygwin environment. + limitations to using a Windows native toolchain in a Cygwin environment. The three biggest are: 1. The Windows toolchain cannot follow Cygwin paths. Path conversions are @@ -354,14 +354,14 @@ Build Notes: the flowing point library, then you may have to build avr-lib from sources. Below are instructions for building avr-lib from fresh sources: - 1. Download the avr-libc package from: + 1. Download the avr-libc package from: http://savannah.nongnu.org/projects/avr-libc/ I am using avr-lib-1.7.1.tar.bz2 - 2. Upack the tarball and cd into the - + 2. Upack the tarball and cd into the + tar jxf avr-lib-1.7.1.tar.bz2 cd avr-lib-1.7.1 @@ -479,7 +479,7 @@ Micropendous3 Configuration Options CONFIG_AVR_ANACOMP=n CONFIG_AVR_ADC=n CONFIG_AVR_TWI=n - + If the watchdog is enabled, this specifies the initial timeout. Default is maximum supported value. diff --git a/nuttx/configs/micropendous3/hello/Make.defs b/nuttx/configs/micropendous3/hello/Make.defs index d046853b3..d92ec78c9 100644 --- a/nuttx/configs/micropendous3/hello/Make.defs +++ b/nuttx/configs/micropendous3/hello/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" diff --git a/nuttx/configs/micropendous3/src/Makefile b/nuttx/configs/micropendous3/src/Makefile index cb9a902a1..85c1a9314 100644 --- a/nuttx/configs/micropendous3/src/Makefile +++ b/nuttx/configs/micropendous3/src/Makefile @@ -35,7 +35,7 @@ -include $(TOPDIR)/Make.defs -ASRCS = +ASRCS = CSRCS = up_boot.c ifeq ($(CONFIG_ARCH_LEDS),y) @@ -58,13 +58,13 @@ endif ifeq ($(WINTOOL),y) CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" else CFLAGS += -I "$(TOPDIR)/sched" CFLAGS += -I "$(ARCH_SRCDIR)/chip" - CFLAGS += -I "$(ARCH_SRCDIR)/common" + CFLAGS += -I "$(ARCH_SRCDIR)/common" CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)" endif diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/Make.defs b/nuttx/configs/mikroe-stm32f4/fulldemo/Make.defs index 86433ae80..32aed265f 100644 --- a/nuttx/configs/mikroe-stm32f4/fulldemo/Make.defs +++ b/nuttx/configs/mikroe-stm32f4/fulldemo/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mikroe-stm32f4/kernel/Makefile b/nuttx/configs/mikroe-stm32f4/kernel/Makefile index b12996d85..c452e00d2 100644 --- a/nuttx/configs/mikroe-stm32f4/kernel/Makefile +++ b/nuttx/configs/mikroe-stm32f4/kernel/Makefile @@ -56,7 +56,7 @@ ifeq ($(WINTOOL),y) USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c # Create the nuttx_user.elf file containing all of the user-mode code nuttx_user.elf: $(OBJS) - $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) + $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) $(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf @echo "LD: nuttx_user.elf" diff --git a/nuttx/configs/mikroe-stm32f4/kernel/up_userspace.c b/nuttx/configs/mikroe-stm32f4/kernel/up_userspace.c index 39bb6660a..77092457c 100644 --- a/nuttx/configs/mikroe-stm32f4/kernel/up_userspace.c +++ b/nuttx/configs/mikroe-stm32f4/kernel/up_userspace.c @@ -88,7 +88,7 @@ extern uint32_t _ebss; /* End+1 of .bss */ int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]); -const struct userspace_s userspace __attribute__ ((section (".userspace"))) = +const struct userspace_s userspace __attribute__ ((section (".userspace"))) = { /* General memory map */ diff --git a/nuttx/configs/mikroe-stm32f4/kostest/Make.defs b/nuttx/configs/mikroe-stm32f4/kostest/Make.defs index 8c7ed82da..3b3747d07 100644 --- a/nuttx/configs/mikroe-stm32f4/kostest/Make.defs +++ b/nuttx/configs/mikroe-stm32f4/kostest/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mikroe-stm32f4/nx/Make.defs b/nuttx/configs/mikroe-stm32f4/nx/Make.defs index 86433ae80..32aed265f 100644 --- a/nuttx/configs/mikroe-stm32f4/nx/Make.defs +++ b/nuttx/configs/mikroe-stm32f4/nx/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mikroe-stm32f4/nxlines/Make.defs b/nuttx/configs/mikroe-stm32f4/nxlines/Make.defs index 86433ae80..32aed265f 100644 --- a/nuttx/configs/mikroe-stm32f4/nxlines/Make.defs +++ b/nuttx/configs/mikroe-stm32f4/nxlines/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mikroe-stm32f4/nxtext/Make.defs b/nuttx/configs/mikroe-stm32f4/nxtext/Make.defs index 86433ae80..32aed265f 100644 --- a/nuttx/configs/mikroe-stm32f4/nxtext/Make.defs +++ b/nuttx/configs/mikroe-stm32f4/nxtext/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mikroe-stm32f4/usbnsh/Make.defs b/nuttx/configs/mikroe-stm32f4/usbnsh/Make.defs index 86433ae80..32aed265f 100644 --- a/nuttx/configs/mikroe-stm32f4/usbnsh/Make.defs +++ b/nuttx/configs/mikroe-stm32f4/usbnsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mirtoo/nsh/Make.defs b/nuttx/configs/mirtoo/nsh/Make.defs index 0c8fed361..c210e3b5c 100644 --- a/nuttx/configs/mirtoo/nsh/Make.defs +++ b/nuttx/configs/mirtoo/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mirtoo/nxffs/Make.defs b/nuttx/configs/mirtoo/nxffs/Make.defs index 5f5379e6c..802fcf1cf 100644 --- a/nuttx/configs/mirtoo/nxffs/Make.defs +++ b/nuttx/configs/mirtoo/nxffs/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/mirtoo/src/Makefile b/nuttx/configs/mirtoo/src/Makefile index 88b4be12a..0306c9a41 100644 --- a/nuttx/configs/mirtoo/src/Makefile +++ b/nuttx/configs/mirtoo/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c up_leds.c ifeq ($(CONFIG_PIC32MX_SPI2),y) diff --git a/nuttx/configs/mirtoo/src/up_boot.c b/nuttx/configs/mirtoo/src/up_boot.c index 8acce6c45..46dbd8127 100644 --- a/nuttx/configs/mirtoo/src/up_boot.c +++ b/nuttx/configs/mirtoo/src/up_boot.c @@ -72,7 +72,7 @@ * When mounted on the DTX1-4000L EV-kit1 board, serial output is avaiable through * an FT230X device via the FUNC0 and FUNC1 module outputs. If CONFIG_PIC32MX_UART2 * is enabled, the src/up_boot will configure the UART2 pins as follows. - * + * * ---------- ------ ----- ------ ------------------------- * BOARD OUTPUT PIN SIGNAL NOTES * ---------- ------ ----- ------ ------------------------- diff --git a/nuttx/configs/mirtoo/src/up_leds.c b/nuttx/configs/mirtoo/src/up_leds.c index f87cf7b5b..c437b7b5b 100644 --- a/nuttx/configs/mirtoo/src/up_leds.c +++ b/nuttx/configs/mirtoo/src/up_leds.c @@ -142,7 +142,7 @@ static const struct led_setting_s g_ledoffvalues[LED_NVALUES] = {LED_NC, LED_NC, 0}, {LED_NC, LED_NC, 0}, {LED_NC, LED_NC, 0}, - {LED_NC, LED_NC, 0}, + {LED_NC, LED_NC, 0}, {LED_OFF, LED_NC, 0}, }; diff --git a/nuttx/configs/mirtoo/src/up_spi2.c b/nuttx/configs/mirtoo/src/up_spi2.c index 3add97c03..f6fcada5c 100644 --- a/nuttx/configs/mirtoo/src/up_spi2.c +++ b/nuttx/configs/mirtoo/src/up_spi2.c @@ -94,7 +94,7 @@ #define GPIO_SST25VF032B_CS (GPIO_OUTPUT|GPIO_VALUE_ONE|GPIO_PORTB|GPIO_PIN13) /* The following enable debug output from this file (needs CONFIG_DEBUG too). - * + * * CONFIG_DEBUG_SPI - Define to enable basic SPI debug */ @@ -149,7 +149,7 @@ void weak_function pic32mx_spi2initialize(void) * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * @@ -165,7 +165,7 @@ void weak_function pic32mx_spi2initialize(void) * 3. Add a call to up_spiinitialize() in your low level application * initialization logic * 4. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/mx1ads/README.txt b/nuttx/configs/mx1ads/README.txt index 6acd17f88..6c09df70f 100644 --- a/nuttx/configs/mx1ads/README.txt +++ b/nuttx/configs/mx1ads/README.txt @@ -113,7 +113,7 @@ ARM/i.MX1-specific Configuration Options CONFIG_IMX_GIO_USBATTACH GIO that detects USB attach/detach events CONFIG_IMX_GIO_USBDPPULLUP - GIO + GIO CONFIG_DMA320_USBDEV_DMA Enable IMX-specific DMA support CONFIG_IMX_GIO_USBATTACH=6 diff --git a/nuttx/configs/mx1ads/src/Makefile b/nuttx/configs/mx1ads/src/Makefile index 74bdca5d8..9bf2889ef 100644 --- a/nuttx/configs/mx1ads/src/Makefile +++ b/nuttx/configs/mx1ads/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_network.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/ne64badge/README.txt b/nuttx/configs/ne64badge/README.txt index d56dc881b..514ba3cfe 100644 --- a/nuttx/configs/ne64badge/README.txt +++ b/nuttx/configs/ne64badge/README.txt @@ -174,7 +174,7 @@ PIN PIN NAME BOARD SIGNAL NOTES 35 PS5/MOSI J3 SPI_MOSI " " " " "" " " 36 PS6/SCK J3 SPI_CLOCK " " " " "" " " 37 PS7/SS_B J3 SPI_SS " " " " "" " " - + 22 PG0/RXD0/KWG0 J3 GPIO0 Not used on board 23 PG1/RXD1/KWG1 J3 GPIO1 " " " " "" " " 24 PG2/RXD2/KWG2 J3 GPIO2 " " " " "" " " @@ -183,7 +183,7 @@ PIN PIN NAME BOARD SIGNAL NOTES 27 PG5/RXDV/KWG5 J3 GPIO5 " " " " "" " " 28 PG6/RXER/KWG6 J3 GPIO6 " " " " "" " " 29 PG7/KWG7 J3 GPIO7 " " " " "" " " - + 7 PH0/TXD0/KWH0 N/C N/C 6 PH1/TXD1/KWH1 N/C N/C 5 PH2/TXD2/KWH2 J4 XBEE_RESET Not used on board @@ -191,7 +191,7 @@ PIN PIN NAME BOARD SIGNAL NOTES 3 PH4/TXCLK/KWH4 BUTTON2 SW2 2 PH5/TXDV/KWH5 J5 XBEE_LOAD_H Not used on board 1 PH6/TXER/KWH6 J4 XBEE_LOAD_L Not used on board - + 8 PJ0/MDC/KWJ0 LED1 D21, red 9 PJ1/MDIO/KWJ1 LED2 D22, red 20 PJ2/CRS/KWJ2 J3 SPI_CS Not used on board @@ -421,12 +421,12 @@ HCS12/NE64BADGE-specific Configuration Options the delay actually is 100 seconds. GPIO Interrupts - + CONFIG_GPIO_IRQ - Enable general support for GPIO IRQs CONFIG_HCS12_PORTG_INTS - Enable PortG IRQs CONFIG_HCS12_PORTH_INTS - Enable PortH IRQs CONFIG_HCS12_PORTJ_INTS - Enable PortJ IRQs - + HCS12 build options: CONFIG_HCS12_SERIALMON - Indicates that the target systems uses diff --git a/nuttx/configs/ne64badge/ostest/Make.defs b/nuttx/configs/ne64badge/ostest/Make.defs index 296749c90..929fcb4c8 100644 --- a/nuttx/configs/ne64badge/ostest/Make.defs +++ b/nuttx/configs/ne64badge/ostest/Make.defs @@ -65,7 +65,7 @@ ifeq ($(WINTOOL),y) ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT)}" MAXOPTIMIZATION = -O2 else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ne64badge/src/Makefile b/nuttx/configs/ne64badge/src/Makefile index 4a3d5502c..0e391489a 100644 --- a/nuttx/configs/ne64badge/src/Makefile +++ b/nuttx/configs/ne64badge/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c diff --git a/nuttx/configs/ne64badge/src/ne64badge_internal.h b/nuttx/configs/ne64badge/src/ne64badge_internal.h index aee3fc67d..a6e3fba3a 100644 --- a/nuttx/configs/ne64badge/src/ne64badge_internal.h +++ b/nuttx/configs/ne64badge/src/ne64badge_internal.h @@ -55,18 +55,18 @@ * --- ------------------- -------------- ---------------------- * 44 RESET J3 RESET_L Also to SW3 * 57 BKGD/MODC/TAGHI_B BDM BKGD CON6A - * + * * 85 PAD0 VR1 Potentiometer * 86 PAD1 J3 ANALOG_IN0 Not used on board * 87 PAD2 J3 ANALOG_IN1 " " " " "" " " * 88 PAD3 J3 ANALOG_IN2 " " " " "" " " * 89 PAD4 J3 ANALOG_IN3 " " " " "" " " - * + * * 70 PHY_TXP J7 TD+ RJ45 connector * 71 PHY_TXN J7 TD- RJ45 connector * 73 PHY_RXP J7 RD+ RJ45 connector * 74 PHY_RXN J7 RD- RJ45 connector - * + * * Ports A,B,E,K managed by the MEBI block * --------------------------------------- * 60 PA0/ADDR8/DATA8 J3 ADDR_DATA8 Not used on board @@ -77,7 +77,7 @@ * 78 PA5/ADDR13/DATA13 J3 ADDR_DATA13 " " " " "" " " * 79 PA6/ADDR14/DATA14 J3 ADDR_DATA14 " " " " "" " " * 80 PA7/ADDR15/DATA15 J3 ADDR_DATA15 " " " " "" " " - * + * * 10 PB0/ADDR0/DATA0 J3 ADDR_DATA0 Not used on board * 11 PB1/ADDR1/DATA1 J3 ADDR_DATA1 " " " " "" " " * 12 PB2/ADDR2/DATA2 J3 ADDR_DATA2 " " " " "" " " @@ -86,7 +86,7 @@ * 17 PB5/ADDR5/DATA5 J3 ADDR_DATA5 " " " " "" " " * 18 PB6/ADDR6/DATA6 J3 ADDR_DATA6 " " " " "" " " * 19 PB7/ADDR7/DATA7 J3 ADDR_DATA7 " " " " "" " " - * + * * 56 PE0/XIRQ_B BUTTON1 SW1 * 55 PE1/IRQ_B J3 IRQ Not used on board * 54 PE2/R_W J3 RW " " " " "" " " @@ -107,14 +107,14 @@ * 104 PK5/XADR19 N/C N/C * 105 PK6/XCS_B J3 XCS Not used on board * 106 PK7/ECS_B/ROMCTL J3 ECS " " " " "" " " - * + * * Ports T,S,G,H,J,L managed by the PIM Block * ------------------------------------------ * 110 PT4/IOC1_4 J3 GPIO8 Not used on board * 109 PT5/IOC1_5 J3 GPIO9 " " " " "" " " * 108 PT6/IOC1_6 J3 GPIO10 " " " " "" " " * 107 PT7/IOC1_7 N/C N/C - * + * * 30 PS0/RXD0 RS232_RX Eventually maps to J2 RXD * 31 PS1/TXD0 RS232_TX Eventually maps to J2 TXD * 32 PS2/RXD1 J3&J4 UART_RX Not used on board @@ -123,7 +123,7 @@ * 35 PS5/MOSI J3 SPI_MOSI " " " " "" " " * 36 PS6/SCK J3 SPI_CLOCK " " " " "" " " * 37 PS7/SS_B J3 SPI_SS " " " " "" " " - * + * * 22 PG0/RXD0/KWG0 J3 GPIO0 Not used on board * 23 PG1/RXD1/KWG1 J3 GPIO1 " " " " "" " " * 24 PG2/RXD2/KWG2 J3 GPIO2 " " " " "" " " @@ -132,7 +132,7 @@ * 27 PG5/RXDV/KWG5 J3 GPIO5 " " " " "" " " * 28 PG6/RXER/KWG6 J3 GPIO6 " " " " "" " " * 29 PG7/KWG7 J3 GPIO7 " " " " "" " " - * + * * 7 PH0/TXD0/KWH0 N/C N/C * 6 PH1/TXD1/KWH1 N/C N/C * 5 PH2/TXD2/KWH2 J4 XBEE_RESET Not used on board @@ -143,7 +143,7 @@ */ #define NE64BADGE_BUTTON2 (GPIO_INPUT | GPIO_PULLUP | GPIO_PORT_H | GPIO_PIN_4) - + /* 8 PJ0/MDC/KWJ0 LED1 D21, red * 9 PJ1/MDIO/KWJ1 LED2 D22, red * 20 PJ2/CRS/KWJ2 J3 SPI_CS Not used on board diff --git a/nuttx/configs/ntosd-dm320/README.txt b/nuttx/configs/ntosd-dm320/README.txt index 181affa9b..45d6adc3f 100644 --- a/nuttx/configs/ntosd-dm320/README.txt +++ b/nuttx/configs/ntosd-dm320/README.txt @@ -29,7 +29,7 @@ Dev vs. Production Neuros OSD v1.0 boards available commercial v1.0 Boards, most notably in the amount of memory: 8Mb FLASH and 32Mb RAM vs. 16Mb and 64Mb as in the production board. See the following for more information: - + http://wiki.neurostechnology.com/index.php/OSD_Developer_Board_v1 NuttX operates on the ARM9EJS of this dual core processor. The DSP @@ -112,7 +112,7 @@ GNU Toolchain Options NOTE 2: The devkitARM toolchain includes a version of MSYS make. Make sure that the paths to Cygwin's /bin and /usr/bin directories appear BEFORE the devkitARM path or will get the wrong version of make. - + Generic arm-none-eabi GNU Toolchain ----------------------------------- There are a number of toolchain projects providing support for ARMv4/v5 @@ -135,7 +135,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -273,7 +273,7 @@ ARM/DM320-specific Configuration Options CONFIG_DM320_GIO_USBATTACH GIO that detects USB attach/detach events CONFIG_DM320_GIO_USBDPPULLUP - GIO + GIO CONFIG_DMA320_USBDEV_DMA Enable DM320-specific DMA support CONFIG_DM320_GIO_USBATTACH=6 @@ -393,5 +393,5 @@ DM320 USB Configuration Neuros OSD Configuration Options CONFIG_ARCH_NTOSD_DEVBOARD - Selects the old NTOSD development board. - The default is the production OSD board which differs in + The default is the production OSD board which differs in several ways. diff --git a/nuttx/configs/ntosd-dm320/doc/test-result.txt b/nuttx/configs/ntosd-dm320/doc/test-result.txt index 6b295e495..dfa844691 100644 --- a/nuttx/configs/ntosd-dm320/doc/test-result.txt +++ b/nuttx/configs/ntosd-dm320/doc/test-result.txt @@ -173,7 +173,7 @@ cond_test: signaler terminated, now cancel the waiter cond_test: Waiter Signaler cond_test: Loops 32 32 cond_test: Errors 0 0 -cond_test: +cond_test: 0 times, waiter did not have to wait for data cond_test: 0 times, data was already available when the signaler run cond_test: 0 times, the waiter was in an unexpected state when the signaler ran @@ -375,10 +375,10 @@ uordblks 53f0 53f0 fordblks fdbb20 fdbb20 user_main: round-robin scheduler test -rr_test: Starting sieve1 thread +rr_test: Starting sieve1 thread rr_test: Set thread priority to 1 rr_test: Set thread policty to SCHED_RR -rr_test: Starting sieve1 thread +rr_test: Starting sieve1 thread sieve1 started sieve1 finished rr_test: Waiting for sieves to complete -- this should take awhile diff --git a/nuttx/configs/ntosd-dm320/nettest/Make.defs b/nuttx/configs/ntosd-dm320/nettest/Make.defs index ae2d26f41..217b59638 100644 --- a/nuttx/configs/ntosd-dm320/nettest/Make.defs +++ b/nuttx/configs/ntosd-dm320/nettest/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nettest/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ntosd-dm320/nsh/Make.defs b/nuttx/configs/ntosd-dm320/nsh/Make.defs index 35cd1bc30..781e5e545 100644 --- a/nuttx/configs/ntosd-dm320/nsh/Make.defs +++ b/nuttx/configs/ntosd-dm320/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ntosd-dm320/poll/Make.defs b/nuttx/configs/ntosd-dm320/poll/Make.defs index 3542b8cc6..13f7c3830 100644 --- a/nuttx/configs/ntosd-dm320/poll/Make.defs +++ b/nuttx/configs/ntosd-dm320/poll/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/poll/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ntosd-dm320/src/Makefile b/nuttx/configs/ntosd-dm320/src/Makefile index c6e523073..f361628e5 100644 --- a/nuttx/configs/ntosd-dm320/src/Makefile +++ b/nuttx/configs/ntosd-dm320/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_leds.c up_network.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/ntosd-dm320/thttpd/Make.defs b/nuttx/configs/ntosd-dm320/thttpd/Make.defs index 590ee75fe..38378cb98 100644 --- a/nuttx/configs/ntosd-dm320/thttpd/Make.defs +++ b/nuttx/configs/ntosd-dm320/thttpd/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/thttpd/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ntosd-dm320/udp/Make.defs b/nuttx/configs/ntosd-dm320/udp/Make.defs index 333fa8d24..e17d7686f 100644 --- a/nuttx/configs/ntosd-dm320/udp/Make.defs +++ b/nuttx/configs/ntosd-dm320/udp/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/udp/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ntosd-dm320/uip/Make.defs b/nuttx/configs/ntosd-dm320/uip/Make.defs index f4fdaad67..e85d4f787 100644 --- a/nuttx/configs/ntosd-dm320/uip/Make.defs +++ b/nuttx/configs/ntosd-dm320/uip/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/uip/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt index bc16e9cfd..347d58028 100644 --- a/nuttx/configs/nucleus2g/README.txt +++ b/nuttx/configs/nucleus2g/README.txt @@ -149,7 +149,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -244,7 +244,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -483,7 +483,7 @@ Nucleus 2G Configuration Options LPC17xx USB Device Configuration CONFIG_LPC17_USBDEV_FRAME_INTERRUPT - Handle USB Start-Of-Frame events. + Handle USB Start-Of-Frame events. Enable reading SOF from interrupt handler vs. simply reading on demand. Probably a bad idea... Unless there is some issue with sampling the SOF from hardware asynchronously. diff --git a/nuttx/configs/nucleus2g/include/board.h b/nuttx/configs/nucleus2g/include/board.h index 6d72c0fa3..a60a565ec 100644 --- a/nuttx/configs/nucleus2g/include/board.h +++ b/nuttx/configs/nucleus2g/include/board.h @@ -84,7 +84,7 @@ /* PLL0. PLL0 is used to generate the CPU clock divider input (PLLCLK). * * Source clock: Main oscillator - * PLL0 Multiplier value (M): 20 + * PLL0 Multiplier value (M): 20 * PLL0 Pre-divider value (N): 1 * * PLL0CLK = (2 * 20 * SYSCLK) / 1 = 480MHz diff --git a/nuttx/configs/nucleus2g/nsh/Make.defs b/nuttx/configs/nucleus2g/nsh/Make.defs index 11d9bad75..72e110bde 100644 --- a/nuttx/configs/nucleus2g/nsh/Make.defs +++ b/nuttx/configs/nucleus2g/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/nucleus2g/src/Makefile b/nuttx/configs/nucleus2g/src/Makefile index 518a0daac..38df25bb5 100644 --- a/nuttx/configs/nucleus2g/src/Makefile +++ b/nuttx/configs/nucleus2g/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c up_leds.c up_ssp.c up_outputs.c ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c diff --git a/nuttx/configs/nucleus2g/src/nucleus2g_internal.h b/nuttx/configs/nucleus2g/src/nucleus2g_internal.h index 48f176697..b6b0e983f 100644 --- a/nuttx/configs/nucleus2g/src/nucleus2g_internal.h +++ b/nuttx/configs/nucleus2g/src/nucleus2g_internal.h @@ -85,7 +85,7 @@ * P1[19]-P[29] P[19]-P[29] * P1[30]/VBUS/AD0[4] USB_+5 * P1[31]/SCK1/AD0[5] AD5 - * + * * P2[0] P2[0]/LED1_A * P2[1] P2[1]/LED1_B * P2[2] P2[2]/LED2_A diff --git a/nuttx/configs/nucleus2g/src/up_leds.c b/nuttx/configs/nucleus2g/src/up_leds.c index 1f5ac96a8..31840bffb 100644 --- a/nuttx/configs/nucleus2g/src/up_leds.c +++ b/nuttx/configs/nucleus2g/src/up_leds.c @@ -93,7 +93,7 @@ * In normal usage, the two LEDs on the Babel CAN board would show CAN status, but if * CONFIG_ARCH_LEDS is defined, these LEDs will be controlled as follows for NuttX * debug functionality (where NC means "No Change"). - * + * * LED1 LED2 HEARTBEAT * +------- ------ ----------------------- * LED_STARTED | OFF OFF OFF diff --git a/nuttx/configs/nucleus2g/src/up_outputs.c b/nuttx/configs/nucleus2g/src/up_outputs.c index beb979ae0..bf0c53c16 100644 --- a/nuttx/configs/nucleus2g/src/up_outputs.c +++ b/nuttx/configs/nucleus2g/src/up_outputs.c @@ -63,19 +63,19 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ - + /**************************************************************************** * Private Data ****************************************************************************/ - + /**************************************************************************** * Private Functions ****************************************************************************/ - + /**************************************************************************** * Public Functions ****************************************************************************/ - + /**************************************************************************** * Name: nucleus_bms_relay 1-4 * @@ -84,7 +84,7 @@ * master BMS controller * ***************************************************************************/ - + void nucleus_bms_relay1(enum output_state state) { bool value = (state == (enum output_state)RELAY_OPEN); diff --git a/nuttx/configs/nucleus2g/src/up_ssp.c b/nuttx/configs/nucleus2g/src/up_ssp.c index 0847a2189..c3492614b 100644 --- a/nuttx/configs/nucleus2g/src/up_ssp.c +++ b/nuttx/configs/nucleus2g/src/up_ssp.c @@ -119,7 +119,7 @@ void weak_function nucleus2g_sspinitialize(void) #ifdef CONFIG_LPC17_SSP0 lpc17_configgpio(NUCLEUS2G_MMCSD_CS); #endif - + /* SSP1 goes off the Nucleus 2G board to the Babel CAN board along with 3 chip * select pins. However, it is currently not used on that board. */ @@ -134,7 +134,7 @@ void weak_function nucleus2g_sspinitialize(void) * Name: lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * * Description: - * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status + * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) @@ -149,7 +149,7 @@ void weak_function nucleus2g_sspinitialize(void) * 3. Add a calls to lpc17_sspinitialize() in your low level application * initialization logic * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/nucleus2g/usbmsc/Make.defs b/nuttx/configs/nucleus2g/usbmsc/Make.defs index f55312fb5..e519553c4 100644 --- a/nuttx/configs/nucleus2g/usbmsc/Make.defs +++ b/nuttx/configs/nucleus2g/usbmsc/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/nucleus2g/usbserial/Make.defs b/nuttx/configs/nucleus2g/usbserial/Make.defs index 6825195fa..41cc4ecb9 100644 --- a/nuttx/configs/nucleus2g/usbserial/Make.defs +++ b/nuttx/configs/nucleus2g/usbserial/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/nutiny-nuc120/README.txt b/nuttx/configs/nutiny-nuc120/README.txt index 7dd5f0014..ac14f0af9 100644 --- a/nuttx/configs/nutiny-nuc120/README.txt +++ b/nuttx/configs/nutiny-nuc120/README.txt @@ -291,7 +291,7 @@ Where <subdir> is one of the following: builtin applications is disabled. NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: diff --git a/nuttx/configs/nutiny-nuc120/nsh/Make.defs b/nuttx/configs/nutiny-nuc120/nsh/Make.defs index 330d4ac0e..dc977e56d 100644 --- a/nuttx/configs/nutiny-nuc120/nsh/Make.defs +++ b/nuttx/configs/nutiny-nuc120/nsh/Make.defs @@ -117,7 +117,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/nutiny-nuc120/scripts/ld.script b/nuttx/configs/nutiny-nuc120/scripts/ld.script index a380ba623..3709d1d8f 100644 --- a/nuttx/configs/nutiny-nuc120/scripts/ld.script +++ b/nuttx/configs/nutiny-nuc120/scripts/ld.script @@ -34,7 +34,7 @@ ****************************************************************************/ /* The NUC120LE3AN has 128Kb of FLASH beginning at address 0x0000:0000 and - * 16Kb of SRAM at address 0x20000000. + * 16Kb of SRAM at address 0x20000000. */ MEMORY diff --git a/nuttx/configs/nutiny-nuc120/src/Makefile b/nuttx/configs/nutiny-nuc120/src/Makefile index 7f05612d8..92fbae703 100644 --- a/nuttx/configs/nutiny-nuc120/src/Makefile +++ b/nuttx/configs/nutiny-nuc120/src/Makefile @@ -37,10 +37,10 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = nuc_boardinitialize.c +CSRCS = nuc_boardinitialize.c ifeq ($(CONFIG_HAVE_CXX),y) CSRCS += nuc_cxxinitialize.c diff --git a/nuttx/configs/nutiny-nuc120/src/nuc_boardinitialize.c b/nuttx/configs/nutiny-nuc120/src/nuc_boardinitialize.c index 490413d3b..60c387380 100644 --- a/nuttx/configs/nutiny-nuc120/src/nuc_boardinitialize.c +++ b/nuttx/configs/nutiny-nuc120/src/nuc_boardinitialize.c @@ -83,7 +83,7 @@ void nuc_boardinitialize(void) #endif /* Initialize USB if the 1) USB device controller is in the configuration and 2) - * disabled, and 3) the weak function nuc_usbinitialize() has been brought + * disabled, and 3) the weak function nuc_usbinitialize() has been brought * into the build. Presumeably either CONFIG_USBDEV is also selected. */ diff --git a/nuttx/configs/olimex-lpc-h3131/include/board.h b/nuttx/configs/olimex-lpc-h3131/include/board.h index b0f020ffb..dbe7a11fb 100644 --- a/nuttx/configs/olimex-lpc-h3131/include/board.h +++ b/nuttx/configs/olimex-lpc-h3131/include/board.h @@ -65,7 +65,7 @@ #define BOARD_HPLL0_SELI 8 /* SELI bandwidth selection */ #define BOARD_HPLL0_SELP 31 /* SELP bandwidth selection */ #define BOARD_HPLL0_MODE 0 /* PLL mode */ -#define BOARD_HPLL0_FREQ 406425600 /* Frequency of the PLL in MHz */ +#define BOARD_HPLL0_FREQ 406425600 /* Frequency of the PLL in MHz */ /* HPLL1 configuration */ @@ -77,12 +77,12 @@ #define BOARD_HPLL1_SELI 16 /* SELI bandwidth selection */ #define BOARD_HPLL1_SELP 8 /* SELP bandwidth selection */ #define BOARD_HPLL1_MODE 0 /* PLL mode */ -#define BOARD_HPLL1_FREQ 180000000 /* Frequency of the PLL in MHz */ +#define BOARD_HPLL1_FREQ 180000000 /* Frequency of the PLL in MHz */ /* The following 3 bitsets determine which clocks will be enabled at initialization * time. */ - + #define BOARD_CLKS_0_31 \ (_RBIT(CLKID_APB0CLK,0)|_RBIT(CLKID_APB1CLK,0)|_RBIT(CLKID_APB2CLK,0)|\ _RBIT(CLKID_APB3CLK,0)|_RBIT(CLKID_APB4CLK,0)|_RBIT(CLKID_AHB2INTCCLK,0)|\ diff --git a/nuttx/configs/olimex-lpc-h3131/include/board_memorymap.h b/nuttx/configs/olimex-lpc-h3131/include/board_memorymap.h index 24ecee7a9..847e2d653 100644 --- a/nuttx/configs/olimex-lpc-h3131/include/board_memorymap.h +++ b/nuttx/configs/olimex-lpc-h3131/include/board_memorymap.h @@ -57,7 +57,7 @@ * PGTABLE_BASE_VADDR - The mapped address of the page table in ROM, and * Mappings for each of the PSECTIONS in lpc31_memorymap.h */ - + #ifdef CONFIG_ARCH_ROMPGTABLE /* The LPC31xx ROM page table uses a 1-1 physical to virtual memory mapping */ diff --git a/nuttx/configs/olimex-lpc-h3131/nsh/Make.defs b/nuttx/configs/olimex-lpc-h3131/nsh/Make.defs index 6dce1ce42..d82a7686d 100644 --- a/nuttx/configs/olimex-lpc-h3131/nsh/Make.defs +++ b/nuttx/configs/olimex-lpc-h3131/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc-h3131/tools/armusbocd.cfg b/nuttx/configs/olimex-lpc-h3131/tools/armusbocd.cfg index 012aa783a..48fe376b6 100644 --- a/nuttx/configs/olimex-lpc-h3131/tools/armusbocd.cfg +++ b/nuttx/configs/olimex-lpc-h3131/tools/armusbocd.cfg @@ -52,7 +52,7 @@ if { [info exists CPUTAPID] } { } # Scan Tap -# Wired to seperate STDO pin on the lpc3131, externally muxed to TDO on ea3131 module +# Wired to seperate STDO pin on the lpc3131, externally muxed to TDO on ea3131 module # JTAGSEL pin must be 0 to activate, which reassigns arm tdo to a pass through. if { [info exists SJCTAPID] } { set _SJCTAPID $SJCTAPID @@ -86,7 +86,7 @@ adapter_nsrst_delay 1000 jtag_ntrst_delay 0 set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME +target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME $_TARGETNAME invoke-event halted diff --git a/nuttx/configs/olimex-lpc-h3131/tools/crc32.c b/nuttx/configs/olimex-lpc-h3131/tools/crc32.c index ccb141685..f6fd1b71c 100644 --- a/nuttx/configs/olimex-lpc-h3131/tools/crc32.c +++ b/nuttx/configs/olimex-lpc-h3131/tools/crc32.c @@ -50,7 +50,7 @@ /************************************************************************************************ * Private Data ************************************************************************************************/ - + static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, diff --git a/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.c b/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.c index 178cce21b..04905e70e 100644 --- a/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.c +++ b/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.c @@ -273,7 +273,7 @@ int main(int argc, char **argv, char **envp) padlen = g_hdr.imageLength - buf.st_size; /* Calculate CRCs */ - + g_hdr.execution_crc32 = infilecrc32(infd, buf.st_size, padlen); g_hdr.header_crc32 = crc32((const uint8_t*)&g_hdr, HDR_CRC_SIZE); @@ -294,4 +294,4 @@ int main(int argc, char **argv, char **envp) return 0; } - + diff --git a/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.h b/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.h index ea30df072..b338fb900 100644 --- a/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.h +++ b/nuttx/configs/olimex-lpc-h3131/tools/lpchdr.h @@ -69,7 +69,7 @@ struct lpc31_header_s * 0xB – Do CRC32 check on both header and * execution part of the image. */ uint32_t imageLength; /* 0x20 Total image length including header rounded - * up to the nearest 512 byte boundary. In C + * up to the nearest 512 byte boundary. In C * language the field can be computed as: * imageLength = (Actual length + 511) & ~0x1FF; */ uint32_t releaseID; /* 0x24 Release or version number of the image. Note, diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs index 96d91413e..0646c22ea 100644 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs index 675135e42..742d9dc2e 100644 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/hidmouse/Make.defs b/nuttx/configs/olimex-lpc1766stk/hidmouse/Make.defs index 2bda8a87f..a64d2ab83 100644 --- a/nuttx/configs/olimex-lpc1766stk/hidmouse/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/hidmouse/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/include/board.h b/nuttx/configs/olimex-lpc1766stk/include/board.h index ab2070a86..e29c84f81 100644 --- a/nuttx/configs/olimex-lpc1766stk/include/board.h +++ b/nuttx/configs/olimex-lpc1766stk/include/board.h @@ -89,7 +89,7 @@ /* PLL0. PLL0 is used to generate the CPU clock divider input (PLLCLK). * * Source clock: Main oscillator - * PLL0 Multiplier value (M): 20 + * PLL0 Multiplier value (M): 20 * PLL0 Pre-divider value (N): 1 * * PLL0CLK = (2 * 20 * SYSCLK) / 1 = 480MHz @@ -166,7 +166,7 @@ #define LED_ASSERTION 2 /* N/C ON = In an assertion */ #define LED_PANIC 2 /* N/C ON = Oops! We crashed. (flashing) */ #define LED_IDLE 3 /* OFF N/C = LPC17 in sleep mode (LED1 glowing) */ - + /* Button definitions ***************************************************************/ /* The LPC1766-STK supports several buttons. All will read "1" when open and "0" * when closed diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs index 8c6760b6d..d7fe0e228 100644 --- a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs index 84195b453..60f576b14 100644 --- a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs index 716fac420..73c2eb2ee 100644 --- a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs index 95aa18693..2c7a0157a 100644 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/src/Makefile b/nuttx/configs/olimex-lpc1766stk/src/Makefile index 2484a177d..0bfe4143c 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/Makefile +++ b/nuttx/configs/olimex-lpc1766stk/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/nuttx/configs/olimex-lpc1766stk/src/lpc17_lcd.c index 5f4740957..e44d9972b 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/lpc17_lcd.c +++ b/nuttx/configs/olimex-lpc1766stk/src/lpc17_lcd.c @@ -159,7 +159,7 @@ void nokia_blinitialize(void) putreg32(0, LPC17_PWM1_MR3); /* Enable PWM1 */ - + regval |= PWM_LER_M3EN; putreg32(regval, LPC17_PWM1_LER); @@ -254,7 +254,7 @@ int nokia_backlight(unsigned int power) uint32_t regval; putreg32(NOKIA_BACKLIGHT_OFF + power, LPC17_PWM1_MR3); - + regval = getreg32(LPC17_PWM1_LER); regval |= PWM_LER_M3EN; putreg32(regval, LPC17_PWM1_LER); diff --git a/nuttx/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/nuttx/configs/olimex-lpc1766stk/src/lpc17_ssp.c index 06ac2959d..ce7e12203 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/lpc17_ssp.c +++ b/nuttx/configs/olimex-lpc1766stk/src/lpc17_ssp.c @@ -71,7 +71,7 @@ /* Debug ********************************************************************/ /* The following enable debug output from this file (needs CONFIG_DEBUG too). - * + * * CONFIG_SSP_DEBUG - Define to enable basic SSP debug * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug */ @@ -254,7 +254,7 @@ void weak_function lpc1766stk_sspinitialize(void) * Name: lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * * Description: - * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status + * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) @@ -269,7 +269,7 @@ void weak_function lpc1766stk_sspinitialize(void) * 3. Add a calls to lpc17_sspinitialize() in your low level application * initialization logic * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs index d218a95f2..0857154f4 100644 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/usbmsc/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbmsc/Make.defs index 1caeb34d4..bb516b834 100644 --- a/nuttx/configs/olimex-lpc1766stk/usbmsc/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/usbmsc/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs index e694d9314..6e6910d40 100644 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc1766stk/zmodem/Make.defs b/nuttx/configs/olimex-lpc1766stk/zmodem/Make.defs index 639af4402..1e37defd8 100644 --- a/nuttx/configs/olimex-lpc1766stk/zmodem/Make.defs +++ b/nuttx/configs/olimex-lpc1766stk/zmodem/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc2378/include/board.h b/nuttx/configs/olimex-lpc2378/include/board.h index dc6770a8c..6d53ad448 100644 --- a/nuttx/configs/olimex-lpc2378/include/board.h +++ b/nuttx/configs/olimex-lpc2378/include/board.h @@ -77,7 +77,7 @@ #define LED_SIGNAL 5 #define LED_ASSERTION 6 #define LED_PANIC 7 - + /**************************************************************************** * Inline Functions ****************************************************************************/ diff --git a/nuttx/configs/olimex-lpc2378/nsh/Make.defs b/nuttx/configs/olimex-lpc2378/nsh/Make.defs index a4bd31572..dba7e4b77 100644 --- a/nuttx/configs/olimex-lpc2378/nsh/Make.defs +++ b/nuttx/configs/olimex-lpc2378/nsh/Make.defs @@ -51,7 +51,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-lpc2378/src/Makefile b/nuttx/configs/olimex-lpc2378/src/Makefile index f9624bead..a10e2b07d 100644 --- a/nuttx/configs/olimex-lpc2378/src/Makefile +++ b/nuttx/configs/olimex-lpc2378/src/Makefile @@ -50,7 +50,7 @@ else CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched endif -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = lpc2378_leds.c diff --git a/nuttx/configs/olimex-lpc2378/src/lpc2378_leds.c b/nuttx/configs/olimex-lpc2378/src/lpc2378_leds.c index 3afdd3a15..5675910a4 100644 --- a/nuttx/configs/olimex-lpc2378/src/lpc2378_leds.c +++ b/nuttx/configs/olimex-lpc2378/src/lpc2378_leds.c @@ -114,7 +114,7 @@ void board_led_off(int led) } /**************************************************************************** - * olimex board STATUS LED + * olimex board STATUS LED ****************************************************************************/ void lpc2378_statledoff(void) diff --git a/nuttx/configs/olimex-stm32-p107/include/board.h b/nuttx/configs/olimex-stm32-p107/include/board.h index d01c7dfcd..e82a41cb1 100644 --- a/nuttx/configs/olimex-stm32-p107/include/board.h +++ b/nuttx/configs/olimex-stm32-p107/include/board.h @@ -109,9 +109,9 @@ /* MCO output driven by PLL3. From above, we already have PLL3 input frequency as: * - * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz + * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz */ - + #if defined(CONFIG_STM32_MII_MCO) || defined(CONFIG_STM32_RMII_MCO) # define BOARD_CFGR_MCO_SOURCE RCC_CFGR_PLL3CLK /* Source: PLL3 */ # define STM32_PLL_PLL3MUL RCC_CFGR2_PLL3MULx10 /* MCO 5MHz * 10 = 50MHz */ diff --git a/nuttx/configs/olimex-stm32-p207/README.txt b/nuttx/configs/olimex-stm32-p207/README.txt index 44a169a2c..a543d00c9 100644 --- a/nuttx/configs/olimex-stm32-p207/README.txt +++ b/nuttx/configs/olimex-stm32-p207/README.txt @@ -13,20 +13,20 @@ loop. The following peripherals are enabled in this configuration. - LEDs: show the sytem status - + - Buttons: TAMPER-button, WKUP-button, J1-Joystick (consists of RIGHT-, UP-, LEFT-, DOWN-, and CENTER-button). Built in app 'buttons' works. - + - ADC: ADC1 samples the red trim potentiometer AN_TR Built in app 'adc' works. - + - USB-FS-OTG: enabled but not really tested, since there is only a USB-A-connector (host) connected to the full speed µC inputs. The other connector (device) is connected to the high speed µC inputs, but it seems that NuttX has currently no driver for it. - + - CAN: Built in app 'can' works, but appart from that not really tested. - + - Ethernet: Ping to other station on the network works.
\ No newline at end of file diff --git a/nuttx/configs/olimex-stm32-p207/nsh/Make.defs b/nuttx/configs/olimex-stm32-p207/nsh/Make.defs index c065889b7..c282c9d8f 100644 --- a/nuttx/configs/olimex-stm32-p207/nsh/Make.defs +++ b/nuttx/configs/olimex-stm32-p207/nsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/olimex-strp711/README.txt b/nuttx/configs/olimex-strp711/README.txt index 425613673..92b7dfb4a 100644 --- a/nuttx/configs/olimex-strp711/README.txt +++ b/nuttx/configs/olimex-strp711/README.txt @@ -19,7 +19,7 @@ Contents ENC28J60 Module Configurations STR71x-Specific Configuration Settings - + Olimex STR-P711 ^^^^^^^^^^^^^^^ Features: @@ -276,7 +276,7 @@ Windows OpenOCD will Olimex JTAG I used to start the OpenOCD daemon on my system called oocd.sh. That script would probably require some modifications to work in another environment: - + - possibly the value of OPENOCD_PATH - If you are working under Linux you will need to change any occurances of `cygpath -w blablabla` to just blablabla @@ -319,12 +319,12 @@ MMC/SD Slot P0.4/S1.MISO 7 DAT0/D0 MISO1 --- 8 DAT1/RES (Pulled up) --- 9 DAT2/RES (Pulled up) - + P1.10/USBCLK 10/14 WP P1.10 input P1.15/HTXD 13/15 CP P1.15 input Use of SPI1 doesn't conflict with anything. WP conflicts USB; CP conflicts - with NTXD. + with NTXD. ENC28J60 Module ^^^^^^^^^^^^^^^ @@ -419,8 +419,8 @@ STR71x-Specific Configuration Settings CONFIG_STR71X_I2C0, CONFIG_STR71X_I2C1, CONFIG_STR71X_UART0, CONFIG_STR71X_UART1, CONFIG_STR71X_UART2, CONFIG_STR71X_UART3, CONFIG_STR71X_USB, CONFIG_STR71X_CAN, - CONFIG_STR71X_BSPI0, CONFIG_STR71X_BSPI1, CONFIG_STR71X_HDLC, CONFIG_STR71X_XTI, - CONFIG_STR71X_GPIO0, CONFIG_STR71X_GPIO1, CONFIG_STR71X_GPIO2, CONFIG_STR71X_ADC12, + CONFIG_STR71X_BSPI0, CONFIG_STR71X_BSPI1, CONFIG_STR71X_HDLC, CONFIG_STR71X_XTI, + CONFIG_STR71X_GPIO0, CONFIG_STR71X_GPIO1, CONFIG_STR71X_GPIO2, CONFIG_STR71X_ADC12, CONFIG_STR71X_CKOUT, CONFIG_STR71X_TIM1, CONFIG_STR71X_TIM2, CONFIG_STR71X_TIM3, and CONFIG_STR71X_RTC Select peripherals to initialize (Timer0 and EIC are always initialized) diff --git a/nuttx/configs/olimex-strp711/scripts/oocd-reset b/nuttx/configs/olimex-strp711/scripts/oocd-reset index 11d7a3dd6..cd7bfb56c 100644 --- a/nuttx/configs/olimex-strp711/scripts/oocd-reset +++ b/nuttx/configs/olimex-strp711/scripts/oocd-reset @@ -1,4 +1,4 @@ -# +# # The following command wills be executed on # reset (because of run_and_init in the config-file) # - wait for target halt @@ -8,7 +8,7 @@ # # created by Martin Thomas 8/2007 # http://www.siwawi.arubi.uni-kl.de/avr_projects/arm_projects -# based on information from Dominic Rath +# based on information from Dominic Rath # arm7_9 dcc_downloads enable @@ -21,8 +21,8 @@ flash probe 0 #flash erase 0 0 9 # STR710FZ2 erase first 5 banks (0-4) flash erase 0 0 4 -# if flash earse is not available in your OpenOCD-version use -# flash erase_sector but also read the documentation on +# if flash earse is not available in your OpenOCD-version use +# flash erase_sector but also read the documentation on # flash auto_erase which can be used together with flash write_image flash write 0 main.bin 0x0 diff --git a/nuttx/configs/olimex-strp711/scripts/oocd.sh b/nuttx/configs/olimex-strp711/scripts/oocd.sh index f0ba81761..33924c93d 100755 --- a/nuttx/configs/olimex-strp711/scripts/oocd.sh +++ b/nuttx/configs/olimex-strp711/scripts/oocd.sh @@ -68,7 +68,7 @@ done export options="-d 1" -# Run OpenOCD -- here it is assumed (1) that you must have root priveleges to +# Run OpenOCD -- here it is assumed (1) that you must have root priveleges to # execute OpenOCD and (2) that your user is listed in the /etc/sudoers file. $SUDO $openocd $options -f $oocdcfg diff --git a/nuttx/configs/olimex-strp711/scripts/oocd_flash.script b/nuttx/configs/olimex-strp711/scripts/oocd_flash.script index d07067544..111a785b5 100644 --- a/nuttx/configs/olimex-strp711/scripts/oocd_flash.script +++ b/nuttx/configs/olimex-strp711/scripts/oocd_flash.script @@ -1,26 +1,26 @@ -#
-# The following command will be executed on reset
-# - wait for target halt
-# - erase memory
-# - flash content of file nuttx.bin into target-memory
-# - shutdown openocd
-#
-# Based on file originally created by Martin Thomas
-#
-
-arm7_9 dcc_downloads enable
-wait_halt
-sleep 10
-poll
-flash probe 0
-
-# STR710 erase all banks:
-#flash erase 0 0 9
-# STR710 erase first 4 banks (32kB)
-flash erase 0 0 4
-
-flash write 0 nuttx.bin 0x0
-reset run
-sleep 10
-shutdown
-
+# +# The following command will be executed on reset +# - wait for target halt +# - erase memory +# - flash content of file nuttx.bin into target-memory +# - shutdown openocd +# +# Based on file originally created by Martin Thomas +# + +arm7_9 dcc_downloads enable +wait_halt +sleep 10 +poll +flash probe 0 + +# STR710 erase all banks: +#flash erase 0 0 9 +# STR710 erase first 4 banks (32kB) +flash erase 0 0 4 + +flash write 0 nuttx.bin 0x0 +reset run +sleep 10 +shutdown + diff --git a/nuttx/configs/olimex-strp711/src/Makefile b/nuttx/configs/olimex-strp711/src/Makefile index 39067253a..97e42a134 100644 --- a/nuttx/configs/olimex-strp711/src/Makefile +++ b/nuttx/configs/olimex-strp711/src/Makefile @@ -45,7 +45,7 @@ else CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched endif -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_spi.c up_leds.c up_buttons.c ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c index 298f7140e..e11ecfa53 100644 --- a/nuttx/configs/olimex-strp711/src/up_spi.c +++ b/nuttx/configs/olimex-strp711/src/up_spi.c @@ -140,13 +140,13 @@ * (XTI) pin. The only easily accessible XTI pins are on SPI0/1 so you can't have * both SPI0 and 1 together with this configuration. * - * STR-P711 PIN PIN CONFIGURATION ENC28J60 CONNECTION + * STR-P711 PIN PIN CONFIGURATION ENC28J60 CONNECTION * ----------------------- ----------------- ----------------------- - * P0.3/S0.SS/I1.SDA P0.3 output CON5 1 J8-1 NET CS + * P0.3/S0.SS/I1.SDA P0.3 output CON5 1 J8-1 NET CS * P0.2/S0.SCLK/I1.SCL SCLK0 2 2 SCK * P0.0/S0.MOSI/U3.RX MOSI0 3 3 MOSI * P0.1/S0.MISO/U3.TX MISO0 4 4 MISO - * GND GND 5 5 GND + * GND GND 5 5 GND * 3.3V 3.3V 10 J9-1 3V3 * NC NC 9 2 WOL * P0.6/S1.SCLK P0.6 input 8 3 NET INT @@ -218,12 +218,12 @@ * P0.4/S1.MISO 7 DAT0/D0 MISO1 * --- 8 DAT1/RES (Pulled up) * --- 9 DAT2/RES (Pulled up) - * + * * P1.10/USBCLK 10/14 WP P1.10 input * P1.15/HTXD 13/15 CP P1.15 input * * Use of SPI1 doesn't conflict with anything. WP conflicts USB; CP conflicts - * with HTXD. + * with HTXD. */ /* MMC/SD additional pins */ @@ -958,7 +958,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) * PC0=1 PC1=1 PC2=1: Alternate function, push-pull * PC0=1 PC1=0 PC2=0: In, TTL * PC0=0 PC1=1 PC2=0: In, CMOS - * PC0=1 PC1=0 PC2=1: Output, push pull + * PC0=1 PC1=0 PC2=1: Output, push pull */ reg16 = getreg16(STR71X_GPIO0_PC0); @@ -1001,7 +1001,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) * * PC0=1 PC1=0 PC2=0: In, TTL * PC0=0 PC1=1 PC2=0: In, CMOS - * PC0=1 PC1=0 PC2=1: Output, push pull + * PC0=1 PC1=0 PC2=1: Output, push pull */ #ifdef BSPI0_GPIO1_ALL @@ -1043,7 +1043,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) * PC0=1 PC1=1 PC2=1: Alternate function, push-pull * PC0=1 PC1=0 PC2=0: In, TTL * PC0=0 PC1=1 PC2=0: In, CMOS - * PC0=1 PC1=0 PC2=1: Output, push pull + * PC0=1 PC1=0 PC2=1: Output, push pull */ reg16 = getreg16(STR71X_GPIO0_PC0); @@ -1082,7 +1082,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) * * PC0=1 PC1=0 PC2=0: In, TTL * PC0=0 PC1=1 PC2=0: In, CMOS - * PC0=1 PC1=0 PC2=1: Output, push pull + * PC0=1 PC1=0 PC2=1: Output, push pull */ #ifdef BSPI1_GPIO1_ALL diff --git a/nuttx/configs/open1788/include/board.h b/nuttx/configs/open1788/include/board.h index fd1d76d4d..24bddb138 100644 --- a/nuttx/configs/open1788/include/board.h +++ b/nuttx/configs/open1788/include/board.h @@ -386,7 +386,7 @@ * VD14 --- Connected to P1[24] * VD15 --- Connected to P1[25] */ - + #define GPIO_LCD_VD8 GPIO_LCD_VD8_1 #define GPIO_LCD_VD9 GPIO_LCD_VD9_1 #define GPIO_LCD_VD10 GPIO_LCD_VD10_1 diff --git a/nuttx/configs/open1788/kernel/Makefile b/nuttx/configs/open1788/kernel/Makefile index 0d1811d4e..0fb06a926 100644 --- a/nuttx/configs/open1788/kernel/Makefile +++ b/nuttx/configs/open1788/kernel/Makefile @@ -56,7 +56,7 @@ ifeq ($(WINTOOL),y) USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c # Create the nuttx_user.elf file containing all of the user-mode code nuttx_user.elf: $(OBJS) - $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) + $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) $(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf @echo "LD: nuttx_user.elf" diff --git a/nuttx/configs/open1788/kernel/up_userspace.c b/nuttx/configs/open1788/kernel/up_userspace.c index d2afe8c29..59e218492 100644 --- a/nuttx/configs/open1788/kernel/up_userspace.c +++ b/nuttx/configs/open1788/kernel/up_userspace.c @@ -88,7 +88,7 @@ extern uint32_t _ebss; /* End+1 of .bss */ int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]); -const struct userspace_s userspace __attribute__ ((section (".userspace"))) = +const struct userspace_s userspace __attribute__ ((section (".userspace"))) = { /* General memory map */ diff --git a/nuttx/configs/open1788/knsh/Make.defs b/nuttx/configs/open1788/knsh/Make.defs index 32b9e3abe..0e19aeb28 100644 --- a/nuttx/configs/open1788/knsh/Make.defs +++ b/nuttx/configs/open1788/knsh/Make.defs @@ -47,7 +47,7 @@ ifeq ($(WINTOOL),y) ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx diff --git a/nuttx/configs/open1788/nsh/Make.defs b/nuttx/configs/open1788/nsh/Make.defs index 7b1354414..b8a7c87e7 100644 --- a/nuttx/configs/open1788/nsh/Make.defs +++ b/nuttx/configs/open1788/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx diff --git a/nuttx/configs/open1788/nxlines/Make.defs b/nuttx/configs/open1788/nxlines/Make.defs index fbeb9f605..0851b216d 100644 --- a/nuttx/configs/open1788/nxlines/Make.defs +++ b/nuttx/configs/open1788/nxlines/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx diff --git a/nuttx/configs/open1788/src/Makefile b/nuttx/configs/open1788/src/Makefile index 44821e7fb..669d61a08 100644 --- a/nuttx/configs/open1788/src/Makefile +++ b/nuttx/configs/open1788/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = lpc17_boardinitialize.c lpc17_ssp.c ifeq ($(CONFIG_LPC17_EMC),y) diff --git a/nuttx/configs/open1788/src/lpc17_nandinitialize.c b/nuttx/configs/open1788/src/lpc17_nandinitialize.c index 75a6f5a31..5389aac57 100644 --- a/nuttx/configs/open1788/src/lpc17_nandinitialize.c +++ b/nuttx/configs/open1788/src/lpc17_nandinitialize.c @@ -90,8 +90,8 @@ void open1788_nand_initialize(void) putreg32(31, LPC17_EMC_STATICWAITPAGE1); putreg32(31, LPC17_EMC_STATICWAITWR1); putreg32(31, LPC17_EMC_STATICWAITTURN1); - - /* GPIO P2[21] connects to the Ready/Busy pin of the NAND part. We need to + + /* GPIO P2[21] connects to the Ready/Busy pin of the NAND part. We need to * reconfigure this pin as normal GPIO input. */ diff --git a/nuttx/configs/open1788/src/lpc17_sdraminitialize.c b/nuttx/configs/open1788/src/lpc17_sdraminitialize.c index 1b3063117..be4f275f4 100644 --- a/nuttx/configs/open1788/src/lpc17_sdraminitialize.c +++ b/nuttx/configs/open1788/src/lpc17_sdraminitialize.c @@ -80,7 +80,7 @@ #define CONFIG_LPC17_SDRAM_32BIT -#ifdef CONFIG_LPC17_SDRAM_16BIT +#ifdef CONFIG_LPC17_SDRAM_16BIT # define SDRAM_SIZE 0x02000000 /* 256Mbit */ #else /* if defined(CONFIG_LPC17_SDRAM_32BIT) */ # undef CONFIG_LPC17_SDRAM_32BIT @@ -196,7 +196,7 @@ void open1788_sdram_initialize(void) /* Wait 128 AHB clock cycles */ for (i = 0; i < 128; i++); - + /* 64ms/8192 = 7.8125us, nx16x8.33ns < 7.8125us, n < 58.6*/ regval = 64000000 / (1 << 13); diff --git a/nuttx/configs/open1788/src/lpc17_ssp.c b/nuttx/configs/open1788/src/lpc17_ssp.c index c27e3c85f..c35ee2cc0 100644 --- a/nuttx/configs/open1788/src/lpc17_ssp.c +++ b/nuttx/configs/open1788/src/lpc17_ssp.c @@ -134,7 +134,7 @@ void weak_function open1788_sspinitialize(void) * Name: lpc17_ssp0/1/2select and lpc17_ssp0/1/2status * * Description: - * The external functions, lpc17_ssp0/1/2select and lpc17_ssp0/1/2status + * The external functions, lpc17_ssp0/1/2select and lpc17_ssp0/1/2status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) @@ -149,7 +149,7 @@ void weak_function open1788_sspinitialize(void) * 3. Add a calls to lpc17_sspinitialize() in your low level application * initialization logic * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/open1788/tools/open1788.cfg b/nuttx/configs/open1788/tools/open1788.cfg index 54f699216..94c97c3c1 100755 --- a/nuttx/configs/open1788/tools/open1788.cfg +++ b/nuttx/configs/open1788/tools/open1788.cfg @@ -11,7 +11,7 @@ ft2232_layout olimex-jtag ft2232_vid_pid 0x15ba 0x0003 ### From /usr/local/share/openocd/scripts/targets/lpc1788.cfg -# NXP LPC1788 Cortex-M3 with 512kB Flash and 96kB Local On-Chip SRAM +# NXP LPC1788 Cortex-M3 with 512kB Flash and 96kB Local On-Chip SRAM # remember to place in the same folder as lpc17xx.cfg set CHIPNAME lpc1788 diff --git a/nuttx/configs/p112/src/Makefile b/nuttx/configs/p112/src/Makefile index 087e1ab2b..377910e23 100644 --- a/nuttx/configs/p112/src/Makefile +++ b/nuttx/configs/p112/src/Makefile @@ -39,9 +39,9 @@ CFLAGS += -I$(TOPDIR)$(DELIM)sched CFLAGS += -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)common CFLAGS += -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)z180 -ASRCS = +ASRCS = AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT)) -CSRCS = +CSRCS = COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs b/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs index 89485a989..f981f111f 100644 --- a/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs +++ b/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/pcduino-a10/README.txt b/nuttx/configs/pcduino-a10/README.txt index 9515d49ef..f83b743c6 100644 --- a/nuttx/configs/pcduino-a10/README.txt +++ b/nuttx/configs/pcduino-a10/README.txt @@ -7,7 +7,7 @@ README I have not compared these boards in detail, but I believe that the differences are cosmetic. This port was developed on the v1 board, but the others may be compatible: - + pcDuino Lite (See http://www.pcduino.com/?page_id=1707) ITEMS DETAILS diff --git a/nuttx/configs/pcduino-a10/nsh/Make.defs b/nuttx/configs/pcduino-a10/nsh/Make.defs index f64bb2394..2427b7edb 100644 --- a/nuttx/configs/pcduino-a10/nsh/Make.defs +++ b/nuttx/configs/pcduino-a10/nsh/Make.defs @@ -114,7 +114,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/pcduino-a10/nsh/pcduino-140107.patch b/nuttx/configs/pcduino-a10/nsh/pcduino-140107.patch index b5df28eb8..203db7f71 100644 --- a/nuttx/configs/pcduino-a10/nsh/pcduino-140107.patch +++ b/nuttx/configs/pcduino-a10/nsh/pcduino-140107.patch @@ -5,58 +5,58 @@ index 3cc6323..ad42790 100644 @@ -312,12 +312,14 @@ void up_boot(void) * for all IO regions (Including the vector region). */ - + +lowsyslog("Calling a1x_setupmappings\n"); // REMOVE ME a1x_setupmappings(); - + /* Provide a special mapping for the IRAM interrupt vector positioned in * high memory. */ - + +lowsyslog("Calling a1x_vectormapping\n"); // REMOVE ME a1x_vectormapping(); - + #endif /* CONFIG_ARCH_ROMPGTABLE */ @@ -326,16 +328,19 @@ void up_boot(void) * arm_vector.S */ - + +lowsyslog("Calling a1x_copyvectorblock\n"); // REMOVE ME a1x_copyvectorblock(); - + /* Initialize the FPU */ - + #ifdef CONFIG_ARCH_FPU +lowsyslog("Calling arm_fpuconfig\n"); // REMOVE ME arm_fpuconfig(); #endif - + /* Perform common, low-level chip initialization (might do nothing) */ - + +lowsyslog("Calling a1x_lowsetup\n"); // REMOVE ME a1x_lowsetup(); - + /* Perform early serial initialization if we are going to use the serial @@ -343,6 +348,7 @@ void up_boot(void) */ - + #ifdef USE_EARLYSERIALINIT +lowsyslog("Calling up_earlyserialinit\n"); // REMOVE ME up_earlyserialinit(); #endif - + @@ -353,6 +359,7 @@ void up_boot(void) */ - + #ifdef CONFIG_NUTTX_KERNEL +lowsyslog("Calling a1x_userspace\n"); // REMOVE ME a1x_userspace(); #endif - + @@ -362,5 +369,7 @@ void up_boot(void) * - Configuration of board specific resources (PIOs, LEDs, etc). */ - + +lowsyslog("Calling a1x_boardinitialize\n"); // REMOVE ME a1x_boardinitialize(); +lowsyslog("Returning\n"); // REMOVE ME @@ -68,7 +68,7 @@ index bce82d5..924bd24 100644 @@ -220,6 +220,12 @@ __start: teq r0, r2 bne .Lpgtableclear - + + movw r1, #0x0416 // REMOVE ME + movt r1, #0x01c0 + movw r2, #0x4070 @@ -83,11 +83,11 @@ index f82490c..5c16e48 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_mmu.c +++ b/nuttx/arch/arm/src/armv7-a/arm_mmu.c @@ -94,7 +94,7 @@ void mmu_l1_setentry(uint32_t paddr, uint32_t vaddr, uint32_t mmuflags) - + /* Invalidate the TLB cache associated with virtual address range */ - + - mmu_invalidate_region(vaddr, 1024*1024); +// mmu_invalidate_region(vaddr, 1024*1024); } #endif - + diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt index f056f5347..4982e72e3 100644 --- a/nuttx/configs/pic32-starterkit/README.txt +++ b/nuttx/configs/pic32-starterkit/README.txt @@ -5,8 +5,8 @@ configs/pic32-starterkit README This README file discusses the port of NuttX to the Microchip PIC32 Ethernet Starter Kit (DM320004) with either - 1) The Multimedia Expansion Board (MEB, DM320005), or - 2) The Starter Kit I/O Expansion Board + 1) The Multimedia Expansion Board (MEB, DM320005), or + 2) The Starter Kit I/O Expansion Board See www.microchip.com for further information. @@ -58,7 +58,7 @@ Contents PIC32MX795F512L Pin Out MEB Connector PICtail - Serial Output using the + Serial Output using the Toolchains Creating Compatible NuttX HEX files Serial Console: MEB @@ -103,7 +103,7 @@ PIN CONFIGURATIONS SIGNAL NAME ON-BOARD CONNE 18 AERXD0/INT1/RE8 ERXD0(2) Ethernet RXD_0/PHYAD1 19 AERXD1/INT2/RE9 ERXD1(2) Ethernet RXD_1/PHYAD2 20 AN5/C1IN+/CN7/RB5/VBUSON VBUSON/C1IN+/AN5/CN7/RB5 USB host power supply, TPS20x1B ~EN, - Low enables power to host port (J4) + Low enables power to host port (J4) USB OTG power supply, MCP1253_MSOP ~SHDN Enables power to device/OTG port (J5) J2 pin 63 (comparator 1) @@ -298,11 +298,11 @@ SDI1 pin 93 SDO1 pin 95 -------------------------- ------- ---------------------------------- RA6 pin 4 CPLD -RA7 pin 6 +RA7 pin 6 RG12 pin 5 RG14 pin 3 SCK2 pin 45 (see MRF24WBOMA) -SDI2 pin 47 (see MRF24WBOMA) +SDI2 pin 47 (see MRF24WBOMA) SDO2 pin 49 (see MRF24WBOMA) RG9 pin 51 (see MRF24WBOMA) SCK3A pin 106 (see PICtail) @@ -310,7 +310,7 @@ SDI3A pin 110 (see PICtail) SDO3A pin 112 (see PICtail) RF12 pin 108 (see PICtail) ~SSI pin 97 (see PICtail) -RD9 pin 54 +RD9 pin 54 -------------------------- ------- ---------------------------------- INT3 pin 81 MRF24WBOMA RA10 pin 115 (also Graphics Controller and PICtail) @@ -323,8 +323,8 @@ SCK2 pin 45 (see CPLD) SDI2 pin 47 (see CPLD) SDO2 pin 49 (see CPLD) RG9 pin 51 (see CPLD) -U1RX pin 88 -U1TX pin 90 +U1RX pin 88 +U1TX pin 90 ~U1RTS pin 92 ~U1CTS pin 94 RB9 pin 73 @@ -468,7 +468,7 @@ Toolchains Windows Native Toolchains ------------------------- - + NOTE: There are several limitations to using a Windows based toolchain in a Cygwin environment. The three biggest are: @@ -511,9 +511,9 @@ Powering the Board is powered up. Ethernet Starter Kit with MEB: - + Power can be supplied to the Multimedia Expansion Board through the DC - connector located on the Multimedia Expansion Board... By connecting + connector located on the Multimedia Expansion Board... By connecting 9-14V power supply to the DC connector, the Multimedia Expansion Board and starter kit will receive the proper voltages. The user can also supply power via the starter kit. However, if the application uses @@ -583,7 +583,7 @@ Serial Console: MEB gotten any serial UART output to work from the MEB.]] A serial console is not required to use NuttX. However, all of the - Nuttx example code in the apps/examples assumes that you have a + Nuttx example code in the apps/examples assumes that you have a serial console. The Ethernet Starter Kit(even with the MEB) does not have any RS-232 connector needed to drive the serial console. @@ -609,7 +609,7 @@ Serial Console: MEB 15 U1RX 17 U1TX 28 GND - + Here is a summary of the tortuous routes taken by the PIC32MX UART pins: --- ---------------------------------- -------------------------- ------------------------- @@ -635,8 +635,8 @@ Serial Console: MEB -------------------------- ------- ---------------------------------- Signal J3 -------------------------- ------- - U1RX pin 88 - U1TX pin 90 + U1RX pin 88 + U1TX pin 90 ~U1RTS pin 92 ~U1CTS pin 94 U2RX pin 110 @@ -682,7 +682,7 @@ Serial Console: Starter Kit I/O Expansion Board 48 AETXD1/CN21/RD15/SCK3/U1RTS/U4TX Not available N/A 52 RF2/SDA3/SDI3/U1RX J2 pin 88 J11 pin 41 53 RF8/SCL3/SDO3/U1TX J2 pin 90 J11 pin 43 - + U2: Ethernet Starter Kit Expansion I/O board --------------------------------------------- ------------------------- @@ -706,7 +706,7 @@ Serial Console: Starter Kit I/O Expansion Board J2 pin 119 J10 pin 56 12 PMA3/AECRSDV/AERXDV/CN10/ECRSDV/ Not available N/A ERXDV/RG8/SCL4/SDO2/U3TX - 14 PMA2/AEREFCLK/AERXCLK/CN11/ + 14 PMA2/AEREFCLK/AERXCLK/CN11/ EREFCLK/ERXCLK/RG9/SS2/U3CTS/ Not available N/A U6RX @@ -907,7 +907,7 @@ PIC32MX Configuration Options CONFIG_PIC32MX_CODEWP - Default 1 (disabled) DEVCFG1: (All settings determined by selections in board.h) DEVCFG2: (All settings determined by selections in board.h) - DEVCFG3: + DEVCFG3: CONFIG_PIC32MX_USBIDO - USB USBID Selection. Default 1 if USB enabled (USBID pin is controlled by the USB module), but 0 (GPIO) otherwise. CONFIG_PIC32MX_VBUSIO - USB VBUSON Selection (Default 1 if USB enabled @@ -1057,7 +1057,7 @@ Where <subdir> is one of the following: 3. SB Configurations Several USB device configurations can be enabled and included - as NSH built-in built in functions. + as NSH built-in built in functions. To use USB device, connect the starter kit to the host using a cable with a Type-B micro-plug to the starter kit’s micro-A/B port J5, located @@ -1067,7 +1067,7 @@ Where <subdir> is one of the following: All USB device configurations require the following basic setup in your NuttX configuration file to enable USB device support: - + CONFIG_USBDEV=y : Enable basic USB device support CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support @@ -1083,7 +1083,7 @@ Where <subdir> is one of the following: system/cdcacm - The system/cdcacm program can be included by adding the following to the configuration file: - + CONFIG_CDCACM=y : Enable the CDCACM device CONFIG_EXAMPLES_CDCACM=y @@ -1139,12 +1139,12 @@ Where <subdir> is one of the following: settings. 2. UART1 is disabled - + CONFIG_PIC32MX_UART1=n : UART1 is disabled (as well as other UARTs) CONFIG_UART1_SERIAL_CONSOLE=n : There is no serial console 3. The RAM log is enabled" - + CONFIG_SYSLOG=y : Enables the System Logging feature. CONFIG_RAMLOG=y : Enable the RAM-based logging feature. CONFIG_RAMLOG_CONSOLE=n : (there is no default console device) @@ -1173,7 +1173,7 @@ Where <subdir> is one of the following: a) Enable support for the PIC32 USB device - -CONFIG_PIC32MX_USBDEV=n + -CONFIG_PIC32MX_USBDEV=n +CONFIG_PIC32MX_USBDEV=y b) Enable NuttX USB device support @@ -1203,7 +1203,7 @@ Where <subdir> is one of the following: nsh> mkrd -s 512 128 b) Put a FAT file system on the RAM disk: - + nsh> mkfatfs /dev/ram0 b) Now the 'msconn' command will connect to the host and diff --git a/nuttx/configs/pic32-starterkit/nsh/Make.defs b/nuttx/configs/pic32-starterkit/nsh/Make.defs index fdecef095..8c5346646 100644 --- a/nuttx/configs/pic32-starterkit/nsh/Make.defs +++ b/nuttx/configs/pic32-starterkit/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/pic32-starterkit/nsh2/Make.defs b/nuttx/configs/pic32-starterkit/nsh2/Make.defs index 03c044ea6..d8bd81e0e 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/Make.defs +++ b/nuttx/configs/pic32-starterkit/nsh2/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh2/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/pic32-starterkit/src/Makefile b/nuttx/configs/pic32-starterkit/src/Makefile index 0f1fd5ebc..1b1e3536e 100644 --- a/nuttx/configs/pic32-starterkit/src/Makefile +++ b/nuttx/configs/pic32-starterkit/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c up_leds.c up_spi.c ifeq ($(CONFIG_PIC32MX_USBDEV),y) diff --git a/nuttx/configs/pic32-starterkit/src/up_leds.c b/nuttx/configs/pic32-starterkit/src/up_leds.c index 71e59343f..c7d61d15a 100644 --- a/nuttx/configs/pic32-starterkit/src/up_leds.c +++ b/nuttx/configs/pic32-starterkit/src/up_leds.c @@ -148,7 +148,7 @@ static const struct led_setting_s g_ledoffvalues[LED_NVALUES] = {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, - {LED_NC, LED_NC, LED_NC, LED_OFF}, + {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_OFF, LED_OFF}, {LED_OFF, LED_NC, LED_NC, LED_OFF}, }; diff --git a/nuttx/configs/pic32-starterkit/src/up_spi.c b/nuttx/configs/pic32-starterkit/src/up_spi.c index ca14501cc..962dac33d 100644 --- a/nuttx/configs/pic32-starterkit/src/up_spi.c +++ b/nuttx/configs/pic32-starterkit/src/up_spi.c @@ -60,7 +60,7 @@ ************************************************************************************/ /* The following enable debug output from this file (needs CONFIG_DEBUG too). - * + * * CONFIG_SPI_DEBUG - Define to enable basic SPI debug * CONFIG_SPI_VERBOSE - Define to enable verbose SPI debug */ @@ -107,7 +107,7 @@ void weak_function pic32mx_sspinitialize(void) * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * @@ -123,7 +123,7 @@ void weak_function pic32mx_sspinitialize(void) * 3. Add a call to up_spiinitialize() in your low level application * initialization logic * 4. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/pic32-starterkit/src/up_usbdev.c b/nuttx/configs/pic32-starterkit/src/up_usbdev.c index 6f04f43cb..4779bd33a 100644 --- a/nuttx/configs/pic32-starterkit/src/up_usbdev.c +++ b/nuttx/configs/pic32-starterkit/src/up_usbdev.c @@ -108,7 +108,7 @@ void weak_function pic32mx_usbdevinitialize(void) #ifdef CONFIG_USBHOST // pic32mx_configgpio(GPIO_USB_VBUSON); #endif - + /* "If the host PC sends a GetStatus (device) request, the firmware must respond * and let the host know if the USB peripheral device is currently bus powered * or self powered. See chapter 9 in the official USB specifications for details diff --git a/nuttx/configs/pic32mx7mmb/README.txt b/nuttx/configs/pic32mx7mmb/README.txt index 7e02b901b..133f33f2e 100644 --- a/nuttx/configs/pic32mx7mmb/README.txt +++ b/nuttx/configs/pic32mx7mmb/README.txt @@ -75,7 +75,7 @@ PIN CONFIGURATIONS SIGNAL NAME ON-BOARD CONNE 41 PMA11/AECRS/AN12/ERXD0/RB12 LCD-YU TFT display 42 PMA10/AECOL/AN13/ERXD1/RB13 LCD-XL TFT display 43 PMA1/AETXD3/AN14/ERXD2/PMALH/RB14 LCD-CS# TFT display, HDR2 pin 3 - 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display + 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display PMALL/RB15 45 VSS (grounded) --- 46 VDD P32_VDD --- @@ -138,8 +138,8 @@ PIN CONFIGURATIONS SIGNAL NAME ON-BOARD CONNE 85 VCAP/VCORE (capacitor to ground) --- 84 PMD15/CN16/ETXCLK/RD7 PMPD15 TFT display, HDR1 pin 3 83 PMD14/CN15/ETXEN/RD6 PMPD14 TFT display, HDR1 pin 4 - 82 CN14/PMRD/RD5 PMPRD - 81 CN13/OC5/PMWR/RD4 PMPWR + 82 CN14/PMRD/RD5 PMPRD + 81 CN13/OC5/PMWR/RD4 PMPWR 80 PMD13/CN19/ETXD3/RD13 PMPD13 TFT display, HDR1 pin 5 79 PMD12/ETXD2/IC5/RD12 PMPD12 TFT display, HDR1 pin 6 78 OC4/RD3 RD3 HDR2 pin 5 @@ -236,7 +236,7 @@ Toolchains Windows Native Toolchains ------------------------- - + NOTE: There are several limitations to using a Windows based toolchain in a Cygwin environment. The three biggest are: @@ -485,7 +485,7 @@ PIC32MX Configuration Options CONFIG_PIC32MX_CODEWP - Default 1 (disabled) DEVCFG1: (All settings determined by selections in board.h) DEVCFG2: (All settings determined by selections in board.h) - DEVCFG3: + DEVCFG3: CONFIG_PIC32MX_USBIDO - USB USBID Selection. Default 1 if USB enabled (USBID pin is controlled by the USB module), but 0 (GPIO) otherwise. CONFIG_PIC32MX_VBUSIO - USB VBUSON Selection (Default 1 if USB enabled @@ -633,7 +633,7 @@ Where <subdir> is one of the following: 3. SD Card Support SD card support is built into this example by default: - + CONFIG_PIC32MX_SPI1=y CONFIG_NSH_ARCHINIT=y @@ -653,7 +653,7 @@ Where <subdir> is one of the following: USB device support is enabled by default in this configuration. The following settings are defined by default (and can be set to 'n' to disabled USB device support). - + CONFIG_USBDEV=y : Enable basic USB device support CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support CONFIG_USBMSC=y : USB supports a mass storage device. @@ -663,7 +663,7 @@ Where <subdir> is one of the following: msconn : Connect the mass storage device, exportint the SD card as the USB mass storage logical unit. msdis : Disconnect the USB mass storage device - + NOTE: The SD card should *not* be mounted under NSH *and* exported by the mass storage device!!! That can result in corruption of the SD card format. This is the sequence of commands that you should @@ -677,7 +677,7 @@ Where <subdir> is one of the following: msdis : Disconnect the USB MSC mount -t vfat /dev/mmcsd0 /mnt/sdcard : Re-mount the SD card ... - + Other USB other device configurations can be enabled and included as NSH built-in built in functions. @@ -692,9 +692,9 @@ Where <subdir> is one of the following: CONFIG_PL2303=y : Enable the Prolifics PL2303 emulation CONFIG_CDCACM=y : or the CDC/ACM serial driver (not both) - system/cdcacm - The system/cdcacm program can be included as an + system/cdcacm - The system/cdcacm program can be included as an function by adding the following to the NuttX configuration file: - + CONFIG_SYSTEM_CDCACM=y and defining the following in your .config file: @@ -717,7 +717,7 @@ Where <subdir> is one of the following: CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host IP address 10.0.0.1 This will probably need to be customized for your network. - + NOTES: a. This logic will assume that a network is connected. During its @@ -752,7 +752,7 @@ Where <subdir> is one of the following: a) Enable support for the PIC32 USB device - -CONFIG_PIC32MX_USBDEV=n + -CONFIG_PIC32MX_USBDEV=n +CONFIG_PIC32MX_USBDEV=y b) Enable NuttX USB device support @@ -784,7 +784,7 @@ Where <subdir> is one of the following: nsh> mkrd -s 512 128 b) Put a FAT file system on the RAM disk: - + nsh> mkfatfs /dev/ram0 b) Now the 'msconn' command will connect to the host and @@ -808,7 +808,7 @@ Where <subdir> is one of the following: But you will have to enable a specific graphics example application in the NuttX configuration file in order to see anything. - + 8. Enabling touch screen support in the nsh configuaration In defconfig (or nuttx/.config), set: diff --git a/nuttx/configs/pic32mx7mmb/nsh/Make.defs b/nuttx/configs/pic32mx7mmb/nsh/Make.defs index c2010d2e1..aaf541d7d 100644 --- a/nuttx/configs/pic32mx7mmb/nsh/Make.defs +++ b/nuttx/configs/pic32mx7mmb/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/pic32mx7mmb/src/Makefile b/nuttx/configs/pic32mx7mmb/src/Makefile index d3f84745e..d21852aef 100644 --- a/nuttx/configs/pic32mx7mmb/src/Makefile +++ b/nuttx/configs/pic32mx7mmb/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c up_leds.c up_spi.c up_mio283qt2.c ifeq ($(CONFIG_PIC32MX_USBDEV),y) diff --git a/nuttx/configs/pic32mx7mmb/src/up_leds.c b/nuttx/configs/pic32mx7mmb/src/up_leds.c index 333ca0406..964f35387 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_leds.c +++ b/nuttx/configs/pic32mx7mmb/src/up_leds.c @@ -151,7 +151,7 @@ static const struct led_setting_s g_ledoffvalues[LED_NVALUES] = {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, - {LED_NC, LED_NC, LED_NC, LED_OFF}, + {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_OFF, LED_OFF}, {LED_OFF, LED_NC, LED_NC, LED_OFF}, }; diff --git a/nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c b/nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c index 7ab4353c6..61e861eb3 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c +++ b/nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * **************************************************************************************/ - + /************************************************************************************** * Included Files **************************************************************************************/ @@ -93,14 +93,14 @@ * 6 RC1/T2CK LCD_RST TFT display * 43 PMA1/AETXD3/AN14/ERXD2/PMALH/RB14 LCD-CS# TFT display, HDR2 pin 3 * 77 OC3/RD2 LCD_BLED LCD backlight LED - * 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display + * 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display * PMALL/RB15 * * 34 PMA13/AN10/RB10/CVREFOUT LCD-YD TFT display * 35 PMA12/AETXERR/AN11/ERXERR/RB11 LCD-XR TFT display * 41 PMA11/AECRS/AN12/ERXD0/RB12 LCD-YU TFT display * 42 PMA10/AECOL/AN13/ERXD1/RB13 LCD-XL TFT display - * + * * 93 PMD0/RE0 PMPD0 TFT display, HDR1 pin 18 * 94 PMD1/RE1 PMPD1 TFT display, HDR1 pin 17 * 98 PMD2/RE2 PMPD2 TFT display, HDR1 pin 16 @@ -117,9 +117,9 @@ * 80 PMD13/CN19/ETXD3/RD13 PMPD13 TFT display, HDR1 pin 5 * 83 PMD14/CN15/ETXEN/RD6 PMPD14 TFT display, HDR1 pin 4 * 84 PMD15/CN16/ETXCLK/RD7 PMPD15 TFT display, HDR1 pin 3 - * - * 82 CN14/PMRD/RD5 PMPRD - * 81 CN13/OC5/PMWR/RD4 PMPWR + * + * 82 CN14/PMRD/RD5 PMPRD + * 81 CN13/OC5/PMWR/RD4 PMPWR */ /* RC1, Reset -- Low value holds in reset */ diff --git a/nuttx/configs/pic32mx7mmb/src/up_spi.c b/nuttx/configs/pic32mx7mmb/src/up_spi.c index b5676a0ac..1b7345fc9 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_spi.c +++ b/nuttx/configs/pic32mx7mmb/src/up_spi.c @@ -77,7 +77,7 @@ #define GPIO_SD_CD (GPIO_INPUT|GPIO_INT|GPIO_PORTG|GPIO_PIN7) /* The following enable debug output from this file (needs CONFIG_DEBUG too). - * + * * CONFIG_DEBUG_SPI - Define to enable basic SPI debug */ @@ -123,7 +123,7 @@ void weak_function pic32mx_spiinitialize(void) * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * @@ -139,7 +139,7 @@ void weak_function pic32mx_spiinitialize(void) * 3. Add a call to up_spiinitialize() in your low level application * initialization logic * 4. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/pic32mx7mmb/src/up_touchscreen.c b/nuttx/configs/pic32mx7mmb/src/up_touchscreen.c index 2f1bce713..d29111f67 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_touchscreen.c +++ b/nuttx/configs/pic32mx7mmb/src/up_touchscreen.c @@ -146,7 +146,7 @@ #define TC_PENDOWN_POLL_TICKS (60 / MSEC_PER_TICK) /* Active polling rate: 60 MSec */ #define TC_DEBOUNCE_TICKS (30 / MSEC_PER_TICK) /* Delay before re-sampling: 30 MSec */ #define TC_SAMPLE_TICKS (4 / MSEC_PER_TICK) /* Delay for A/D sampling: 4 MSec */ -#define TC_RESAMPLE_TICKS TC_SAMPLE_TICKS +#define TC_RESAMPLE_TICKS TC_SAMPLE_TICKS /************************************************************************************ * Private Types @@ -493,7 +493,7 @@ static void tc_notify(FAR struct tc_dev_s *priv) * is no longer available. */ - sem_post(&priv->waitsem); + sem_post(&priv->waitsem); } /* If there are threads waiting on poll() for touchscreen data to become available, @@ -593,7 +593,7 @@ static int tc_waitsample(FAR struct tc_dev_s *priv, while (tc_sample(priv, sample) < 0) { /* Wait for a change in the touchscreen state */ - + priv->nwaiters++; ret = sem_wait(&priv->waitsem); priv->nwaiters--; @@ -657,14 +657,14 @@ static void tc_worker(FAR void *arg) tc_yminus_sample(); /* Allow time for the Y- pend down sampling */ - + priv->state = TC_YMPENDOWN; delay = TC_SAMPLE_TICKS; } break; /* The Y- sampling time has elapsed and the Y- value should be ready - * for conversion + * for conversion */ case TC_YMPENDOWN: @@ -684,7 +684,7 @@ static void tc_worker(FAR void *arg) else { /* Allow time for touch inputs to stabilize */ - + priv->state = TC_DEBOUNCE; delay = TC_DEBOUNCE_TICKS; } @@ -703,7 +703,7 @@ static void tc_worker(FAR void *arg) tc_yminus_sample(); /* Allow time for the Y- sampling */ - + priv->state = TC_YMSAMPLE; delay = TC_SAMPLE_TICKS; } @@ -736,7 +736,7 @@ static void tc_worker(FAR void *arg) tc_yplus_sample(); /* Allow time for the Y+ sampling */ - + priv->state = TC_YPSAMPLE; delay = TC_SAMPLE_TICKS; } @@ -778,7 +778,7 @@ static void tc_worker(FAR void *arg) tc_xplus_sample(); /* Allow time for the X+ sampling */ - + priv->state = TC_XPSAMPLE; delay = TC_SAMPLE_TICKS; } @@ -820,7 +820,7 @@ static void tc_worker(FAR void *arg) tc_xminus_sample(); /* Allow time for the X- pend down sampling */ - + priv->state = TC_XMSAMPLE; delay = TC_SAMPLE_TICKS; } diff --git a/nuttx/configs/pic32mx7mmb/src/up_usbdev.c b/nuttx/configs/pic32mx7mmb/src/up_usbdev.c index 5d82f5f65..c6e4cc3e0 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_usbdev.c +++ b/nuttx/configs/pic32mx7mmb/src/up_usbdev.c @@ -108,7 +108,7 @@ void weak_function pic32mx_usbdevinitialize(void) #ifdef CONFIG_USBHOST // pic32mx_configgpio(GPIO_USB_VBUSON); #endif - + /* "If the host PC sends a GetStatus (device) request, the firmware must respond * and let the host know if the USB peripheral device is currently bus powered * or self powered. See chapter 9 in the official USB specifications for details diff --git a/nuttx/configs/pjrc-8051/sdcc-2.6.0.patch b/nuttx/configs/pjrc-8051/sdcc-2.6.0.patch index beb8bf2ea..551e1ef49 100644 --- a/nuttx/configs/pjrc-8051/sdcc-2.6.0.patch +++ b/nuttx/configs/pjrc-8051/sdcc-2.6.0.patch @@ -9,20 +9,20 @@ diff -u sdcc/device/lib/Makefile.orig sdcc/device/lib/Makefile + $(MAKE) MODELFLAGS="--model-$$model --stack-auto --int-long-reent --float-reent" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi - -diff -u sdcc/device/include/stdarg.h.orig sdcc/device/include/stdarg.h + +diff -u sdcc/device/include/stdarg.h.orig sdcc/device/include/stdarg.h --- sdcc/device/include/stdarg.h.orig 2007-03-11 13:21:15.000000000 -0600 +++ sdcc/device/include/stdarg.h 2007-03-11 13:26:59.000000000 -0600 @@ -25,9 +25,9 @@ - + #else - + -typedef unsigned char __data * va_list ; -#define va_arg(marker,type) *((type __data * )(marker -= sizeof(type))) -#define va_start(marker,first) { marker = (va_list) ((char __data * )&first); } +typedef unsigned char * va_list ; +#define va_arg(marker,type) *((type * )(marker -= sizeof(type))) +#define va_start(marker,first) { marker = (va_list) ((char * )&first); } - + #endif - + diff --git a/nuttx/configs/pjrc-8051/src/Makefile b/nuttx/configs/pjrc-8051/src/Makefile index 706742317..0983153b0 100644 --- a/nuttx/configs/pjrc-8051/src/Makefile +++ b/nuttx/configs/pjrc-8051/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/px4fmu-v2_upstream/include/board.h b/nuttx/configs/px4fmu-v2_upstream/include/board.h index ad08baee3..a2748429a 100644 --- a/nuttx/configs/px4fmu-v2_upstream/include/board.h +++ b/nuttx/configs/px4fmu-v2_upstream/include/board.h @@ -146,21 +146,21 @@ #define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK1_FREQUENCY) /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ #define STM32_TIM18_FREQUENCY (2*STM32_PCLK2_FREQUENCY) #define STM32_TIM27_FREQUENCY (2*STM32_PCLK1_FREQUENCY) -/* SDIO dividers. Note that slower clocking is required when DMA is disabled +/* SDIO dividers. Note that slower clocking is required when DMA is disabled * in order to avoid RX overrun/TX underrun errors due to delayed responses * to service FIFOs in interrupt driven mode. These values have not been * tuned!!! * * HCLK=72MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(178+2)=400 KHz */ - + #define SDIO_INIT_CLKDIV (178 << SDIO_CLKCR_CLKDIV_SHIFT) /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(2+2)=18 MHz @@ -168,9 +168,9 @@ */ #ifdef CONFIG_SDIO_DMA -# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) #else -# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) #endif /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(1+2)=24 MHz @@ -229,7 +229,7 @@ /* CAN * - * CAN1 is routed to the onboard transceiver. + * CAN1 is routed to the onboard transceiver. * CAN2 is routed to the expansion connector. */ diff --git a/nuttx/configs/px4fmu-v2_upstream/nsh/Make.defs b/nuttx/configs/px4fmu-v2_upstream/nsh/Make.defs index 231ac9f78..923a19e74 100644 --- a/nuttx/configs/px4fmu-v2_upstream/nsh/Make.defs +++ b/nuttx/configs/px4fmu-v2_upstream/nsh/Make.defs @@ -79,7 +79,7 @@ else ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/px4fmu-v2_upstream/scripts/ld.script b/nuttx/configs/px4fmu-v2_upstream/scripts/ld.script index 2626d6ba4..1017c649a 100644 --- a/nuttx/configs/px4fmu-v2_upstream/scripts/ld.script +++ b/nuttx/configs/px4fmu-v2_upstream/scripts/ld.script @@ -60,7 +60,7 @@ OUTPUT_ARCH(arm) ENTRY(__start) /* treat __start as the anchor for dead code stripping */ EXTERN(_vectors) /* force the vectors to be included in the output */ -/* +/* * Ensure that abort() is present in the final object. The exception handling * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ @@ -71,17 +71,17 @@ SECTIONS .text : { _stext = ABSOLUTE(.); *(.vectors) - *(.text .text.*) + *(.text .text.*) *(.fixup) *(.gnu.warning) - *(.rodata .rodata.*) + *(.rodata .rodata.*) *(.gnu.linkonce.t.*) *(.got) *(.gcc_except_table) *(.gnu.linkonce.r.*) _etext = ABSOLUTE(.); - /* + /* * This is a hack to make the newlib libm __errno() call * use the NuttX get_errno_ptr() function. */ diff --git a/nuttx/configs/px4fmu-v2_upstream/src/Makefile b/nuttx/configs/px4fmu-v2_upstream/src/Makefile index 82b6864d3..a17688420 100644 --- a/nuttx/configs/px4fmu-v2_upstream/src/Makefile +++ b/nuttx/configs/px4fmu-v2_upstream/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = px4fmu_can.c px4fmu_spi.c px4fmu_usb.c px4fmu2_init.c px4fmu2_led.c diff --git a/nuttx/configs/qemu-i486/README.txt b/nuttx/configs/qemu-i486/README.txt index 9405b46b6..e730128cd 100644 --- a/nuttx/configs/qemu-i486/README.txt +++ b/nuttx/configs/qemu-i486/README.txt @@ -33,7 +33,7 @@ some links (which will probably be mostly outdated by the time your read this): Building QEMU ------------- - tar zxf qemu-0.14.0.tar.gz + tar zxf qemu-0.14.0.tar.gz cd qemu-0.14.0 ./configure --target-list=i386-softmmu make @@ -43,21 +43,21 @@ Cygwin Build Problems --------------------- Error: - + "gcc: The -mno-cygwin flag has been removed; use a mingw-targeted cross-compiler." Workaround: - + None known. It does not seem possible to build QEMU using the Cygwin gcc. I tried editing configure. Removing the following line will allow QEMU to configure: - + QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS" However, it then fails later during the compilation phase. Recommendation: - + 1. Google for "qemu windows download" and download some pre-built QEMU binaries. I found 0.14.0 here: http://dietpc.org/windows/qemu/, or 2. Try building QEMU with MingGW (I understand that this is difficult). @@ -75,11 +75,11 @@ Running QEMU The -nographic option redirects COM1 to your console. However, the -nographic option does not work under Cygwin. For simple testing under Cygwin, I use - + qemu -cpu 486 -m 2 -kernel nuttx.elf -serial file:test.txt which will send COM1 output to the file test.txt. - + Toolchains ========== diff --git a/nuttx/configs/qemu-i486/src/Makefile b/nuttx/configs/qemu-i486/src/Makefile index 61768bf97..16ed36505 100644 --- a/nuttx/configs/qemu-i486/src/Makefile +++ b/nuttx/configs/qemu-i486/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = qemu_boot.c AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/nuttx/configs/rgmp/arm/default/Make.defs b/nuttx/configs/rgmp/arm/default/Make.defs index 566aaefbb..187eb8142 100644 --- a/nuttx/configs/rgmp/arm/default/Make.defs +++ b/nuttx/configs/rgmp/arm/default/Make.defs @@ -83,7 +83,7 @@ else endif LDFLAGS += -nostdlib -EXTRA_LIBS = +EXTRA_LIBS = MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/nuttx/configs/rgmp/arm/nsh/Make.defs b/nuttx/configs/rgmp/arm/nsh/Make.defs index bc5419018..b7cd0639b 100644 --- a/nuttx/configs/rgmp/arm/nsh/Make.defs +++ b/nuttx/configs/rgmp/arm/nsh/Make.defs @@ -83,7 +83,7 @@ else endif LDFLAGS += -nostdlib -EXTRA_LIBS = +EXTRA_LIBS = MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/nuttx/configs/rgmp/x86/cxxtest/Make.defs b/nuttx/configs/rgmp/x86/cxxtest/Make.defs index 9c14dc783..7fd9215bb 100644 --- a/nuttx/configs/rgmp/x86/cxxtest/Make.defs +++ b/nuttx/configs/rgmp/x86/cxxtest/Make.defs @@ -52,7 +52,7 @@ endif #ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti ARCHCXXFLAGS = -fno-builtin -ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector +ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow ARCHWARNINGSXX = -Wall -Wshadow @@ -60,7 +60,7 @@ ARCHDEFINES = -D__RGMP_KERNEL__ -D__RTOS_KERNEL__ -D__SHARE_KERNEL__ ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -I$(RGMPINCDIR) \ -I$(TOPDIR)/configs/rgmp/include -I$(TOPDIR)/arch/rgmp/include/x86 -ARCHXXDEFINES = +ARCHXXDEFINES = ARCHXXINCLUDES = -I$(TOPDIR)/include/cxx -isystem $(TOPDIR)/include -I$(RGMPINCDIR) \ -I$(TOPDIR)/configs/rgmp/include -I$(TOPDIR)/arch/rgmp/include/x86 \ -I$(TOPDIR)/include/uClibc++ diff --git a/nuttx/configs/rgmp/x86/default/Make.defs b/nuttx/configs/rgmp/x86/default/Make.defs index 53853838d..903496a37 100644 --- a/nuttx/configs/rgmp/x86/default/Make.defs +++ b/nuttx/configs/rgmp/x86/default/Make.defs @@ -50,7 +50,7 @@ else ARCHOPTIMIZATION = -O2 endif -ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector +ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow ARCHDEFINES = -D__RGMP_KERNEL__ -D__RTOS_KERNEL__ -D__SHARE_KERNEL__ @@ -82,7 +82,7 @@ else endif LDFLAGS += -nostdlib -EXTRA_LIBS = +EXTRA_LIBS = MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/nuttx/configs/rgmp/x86/helloxx/Make.defs b/nuttx/configs/rgmp/x86/helloxx/Make.defs index b40db563a..b4d518e8c 100644 --- a/nuttx/configs/rgmp/x86/helloxx/Make.defs +++ b/nuttx/configs/rgmp/x86/helloxx/Make.defs @@ -51,7 +51,7 @@ else endif ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti -ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector +ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow ARCHWARNINGSXX = -Wall -Wshadow diff --git a/nuttx/configs/rgmp/x86/nsh/Make.defs b/nuttx/configs/rgmp/x86/nsh/Make.defs index cc9c3a8c4..f23f4e821 100644 --- a/nuttx/configs/rgmp/x86/nsh/Make.defs +++ b/nuttx/configs/rgmp/x86/nsh/Make.defs @@ -50,7 +50,7 @@ else ARCHOPTIMIZATION = -O2 endif -ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector +ARCHCPUFLAGS = -fno-builtin -nostdinc -fno-stack-protector ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow ARCHDEFINES = -D__RGMP_KERNEL__ -D__RTOS_KERNEL__ -D__SHARE_KERNEL__ @@ -82,7 +82,7 @@ else endif LDFLAGS += -nostdlib -EXTRA_LIBS = +EXTRA_LIBS = MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/nuttx/configs/sam3u-ek/kernel/Makefile b/nuttx/configs/sam3u-ek/kernel/Makefile index a4cff7987..8bf42273d 100644 --- a/nuttx/configs/sam3u-ek/kernel/Makefile +++ b/nuttx/configs/sam3u-ek/kernel/Makefile @@ -53,7 +53,7 @@ ifeq ($(WINTOOL),y) USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld @@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c # Create the nuttx_user.elf file containing all of the user-mode code nuttx_user.elf: $(OBJS) - $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) + $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) $(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf @echo "LD: nuttx_user.elf" diff --git a/nuttx/configs/sam3u-ek/kernel/up_userspace.c b/nuttx/configs/sam3u-ek/kernel/up_userspace.c index 2a4f73786..50a45838f 100644 --- a/nuttx/configs/sam3u-ek/kernel/up_userspace.c +++ b/nuttx/configs/sam3u-ek/kernel/up_userspace.c @@ -88,7 +88,7 @@ extern uint32_t _ebss; /* End+1 of .bss */ int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]); -const struct userspace_s userspace __attribute__ ((section (".userspace"))) = +const struct userspace_s userspace __attribute__ ((section (".userspace"))) = { /* General memory map */ diff --git a/nuttx/configs/sam3u-ek/knsh/Make.defs b/nuttx/configs/sam3u-ek/knsh/Make.defs index 5a9fb0bd3..a4bbed940 100644 --- a/nuttx/configs/sam3u-ek/knsh/Make.defs +++ b/nuttx/configs/sam3u-ek/knsh/Make.defs @@ -47,7 +47,7 @@ ifeq ($(WINTOOL),y) ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx diff --git a/nuttx/configs/sam3u-ek/nsh/Make.defs b/nuttx/configs/sam3u-ek/nsh/Make.defs index d441e82bb..e663457e1 100644 --- a/nuttx/configs/sam3u-ek/nsh/Make.defs +++ b/nuttx/configs/sam3u-ek/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sam3u-ek/nx/Make.defs b/nuttx/configs/sam3u-ek/nx/Make.defs index 453cdeafd..476f3e314 100644 --- a/nuttx/configs/sam3u-ek/nx/Make.defs +++ b/nuttx/configs/sam3u-ek/nx/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sam3u-ek/nxwm/Make.defs b/nuttx/configs/sam3u-ek/nxwm/Make.defs index 63472e2f5..35cab8263 100644 --- a/nuttx/configs/sam3u-ek/nxwm/Make.defs +++ b/nuttx/configs/sam3u-ek/nxwm/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sam4e-ek/include/board.h b/nuttx/configs/sam4e-ek/include/board.h index f9f56beb6..b31343378 100644 --- a/nuttx/configs/sam4e-ek/include/board.h +++ b/nuttx/configs/sam4e-ek/include/board.h @@ -190,7 +190,7 @@ * 4 86 MHz 96 MHz 88 MHz 107 MHz * 5 100 MHz 104 MHz 106 MHz 129 MHz * 6 124 MHz - + * (1) VDDCORE set at 1.08V and VDDIO 1.62V to 3.6V @105C * (2) VDDCORE set at 1.08V and VDDIO 2.7V to 3.6V @105C * (3) VDDCORE set at 1.20V and VDDIO 1.62V to 3.6V @ 105C diff --git a/nuttx/configs/sam4e-ek/nsh/Make.defs b/nuttx/configs/sam4e-ek/nsh/Make.defs index ac2d55439..af897e4c4 100644 --- a/nuttx/configs/sam4e-ek/nsh/Make.defs +++ b/nuttx/configs/sam4e-ek/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sam4e-ek/usbnsh/Make.defs b/nuttx/configs/sam4e-ek/usbnsh/Make.defs index 0b3573290..4e1a5ac40 100644 --- a/nuttx/configs/sam4e-ek/usbnsh/Make.defs +++ b/nuttx/configs/sam4e-ek/usbnsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sam4l-xplained/nsh/Make.defs b/nuttx/configs/sam4l-xplained/nsh/Make.defs index 1f5dc5688..afb15d4c8 100644 --- a/nuttx/configs/sam4l-xplained/nsh/Make.defs +++ b/nuttx/configs/sam4l-xplained/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sam4l-xplained/src/sam_slcd.c b/nuttx/configs/sam4l-xplained/src/sam_slcd.c index d8ed61bac..3b0d61bc3 100644 --- a/nuttx/configs/sam4l-xplained/src/sam_slcd.c +++ b/nuttx/configs/sam4l-xplained/src/sam_slcd.c @@ -1239,7 +1239,7 @@ int sam_slcd_initialize(void) * Number of segments (NSU): Controlled by board setting */ - regval = + regval = #ifdef BOARD_XBIAS LCDCA_CFG_XBIAS | #endif diff --git a/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c index e3900071e..c4a40b9c0 100644 --- a/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c +++ b/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c @@ -141,7 +141,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) /* Configure the OLED GPIOs. This initial configuration is RESET low, * putting the OLED into reset state. */ - + (void)sam_configgpio(GPIO_OLED_RST); /* Wait a bit then release the OLED from the reset state */ diff --git a/nuttx/configs/sam4s-xplained/README.txt b/nuttx/configs/sam4s-xplained/README.txt index 6f2716458..ab1ff674c 100644 --- a/nuttx/configs/sam4s-xplained/README.txt +++ b/nuttx/configs/sam4s-xplained/README.txt @@ -588,7 +588,7 @@ Configuration sub-directories 1. The configuration configuration can be modified to include support for the on-board SRAM (1MB). - System Type -> External Memory Configuration + System Type -> External Memory Configuration CONFIG_SAM34_EXTSRAM0=y : Select SRAM on CS0 CONFIG_SAM34_EXTSRAM0SIZE=1048576 : Size=1MB @@ -597,7 +597,7 @@ Configuration sub-directories a) To enable the NuttX RAM test that may be used to verify the external SRAM: - System Type -> External Memory Configuration + System Type -> External Memory Configuration CONFIG_SAM34_EXTSRAM0HEAP=n : Don't add to heap Application Configuration -> System NSH Add-Ons @@ -631,7 +631,7 @@ Configuration sub-directories b) To add this RAM to the NuttX heap, you would need to change the configuration as follows: - System Type -> External Memory Configuration + System Type -> External Memory Configuration CONFIG_SAM34_EXTSRAM0HEAP=y : Add external RAM to heap Memory Management diff --git a/nuttx/configs/sam4s-xplained/nsh/Make.defs b/nuttx/configs/sam4s-xplained/nsh/Make.defs index 3398ef65e..456958c5c 100644 --- a/nuttx/configs/sam4s-xplained/nsh/Make.defs +++ b/nuttx/configs/sam4s-xplained/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sam4s-xplained/src/sam_sram.c b/nuttx/configs/sam4s-xplained/src/sam_sram.c index b96cf07d6..28e9ae7ec 100644 --- a/nuttx/configs/sam4s-xplained/src/sam_sram.c +++ b/nuttx/configs/sam4s-xplained/src/sam_sram.c @@ -69,7 +69,7 @@ static const gpio_pinset_t g_srampins[NPINS] = GPIO_SMC_A4, GPIO_SMC_A5, GPIO_SMC_A6, GPIO_SMC_A7, GPIO_SMC_A8, GPIO_SMC_A9, GPIO_SMC_A10, GPIO_SMC_A11, GPIO_SMC_A12, GPIO_SMC_A13, GPIO_SMC_A14, GPIO_SMC_A15, - GPIO_SMC_A16, GPIO_SMC_A17, GPIO_SMC_A18, + GPIO_SMC_A16, GPIO_SMC_A17, GPIO_SMC_A18, GPIO_EBI_NLB }; diff --git a/nuttx/configs/sama5d3-xplained/nsh/Make.defs b/nuttx/configs/sama5d3-xplained/nsh/Make.defs index 7320653fe..4c9dca327 100644 --- a/nuttx/configs/sama5d3-xplained/nsh/Make.defs +++ b/nuttx/configs/sama5d3-xplained/nsh/Make.defs @@ -120,7 +120,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/sama5d3x-ek/demo/Make.defs b/nuttx/configs/sama5d3x-ek/demo/Make.defs index 438740052..b01b01096 100644 --- a/nuttx/configs/sama5d3x-ek/demo/Make.defs +++ b/nuttx/configs/sama5d3x-ek/demo/Make.defs @@ -140,7 +140,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/sama5d3x-ek/hello/Make.defs b/nuttx/configs/sama5d3x-ek/hello/Make.defs index 2accd8e83..ba63b59ac 100644 --- a/nuttx/configs/sama5d3x-ek/hello/Make.defs +++ b/nuttx/configs/sama5d3x-ek/hello/Make.defs @@ -140,7 +140,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/sama5d3x-ek/norboot/Make.defs b/nuttx/configs/sama5d3x-ek/norboot/Make.defs index 402ef121d..d71e3183f 100644 --- a/nuttx/configs/sama5d3x-ek/norboot/Make.defs +++ b/nuttx/configs/sama5d3x-ek/norboot/Make.defs @@ -140,7 +140,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/sama5d3x-ek/nsh/Make.defs b/nuttx/configs/sama5d3x-ek/nsh/Make.defs index 31471bd21..274fec598 100644 --- a/nuttx/configs/sama5d3x-ek/nsh/Make.defs +++ b/nuttx/configs/sama5d3x-ek/nsh/Make.defs @@ -140,7 +140,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/sama5d3x-ek/nx/Make.defs b/nuttx/configs/sama5d3x-ek/nx/Make.defs index 1f3a656d5..d9cb57111 100644 --- a/nuttx/configs/sama5d3x-ek/nx/Make.defs +++ b/nuttx/configs/sama5d3x-ek/nx/Make.defs @@ -140,7 +140,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/sama5d3x-ek/nxwm/Make.defs b/nuttx/configs/sama5d3x-ek/nxwm/Make.defs index afdccdb17..59f8e2a34 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/Make.defs +++ b/nuttx/configs/sama5d3x-ek/nxwm/Make.defs @@ -140,7 +140,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/sama5d3x-ek/ov2640/Make.defs b/nuttx/configs/sama5d3x-ek/ov2640/Make.defs index f54cfb433..8fe9ac217 100644 --- a/nuttx/configs/sama5d3x-ek/ov2640/Make.defs +++ b/nuttx/configs/sama5d3x-ek/ov2640/Make.defs @@ -140,7 +140,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/samd20-xplained/nsh/Make.defs b/nuttx/configs/samd20-xplained/nsh/Make.defs index 3fcb9de93..a5944b9c6 100644 --- a/nuttx/configs/samd20-xplained/nsh/Make.defs +++ b/nuttx/configs/samd20-xplained/nsh/Make.defs @@ -117,6 +117,6 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/nuttx/configs/samd20-xplained/src/sam_ug2832hsweg04.c index a031179c8..8b4754ab9 100644 --- a/nuttx/configs/samd20-xplained/src/sam_ug2832hsweg04.c +++ b/nuttx/configs/samd20-xplained/src/sam_ug2832hsweg04.c @@ -81,7 +81,7 @@ * SPI MISO SPI MISO * ----------------- ---------------------- ---------------------- * 18 SPI_SCK 18 PA07 SERCOM0 PAD[3] 18 PA19 SERCOM1 PAD[3] - * SPI SCK SPI SCK + * SPI SCK SPI SCK * ----------------- ---------------------- ---------------------- * 19 GND 19 GND GND * ----------------- ---------------------- ---------------------- @@ -171,7 +171,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) /* Configure the OLED PORTs. This initial configuration is RESET low, * putting the OLED into reset state. */ - + (void)sam_configport(PORT_OLED_RST); /* Wait a bit then release the OLED from the reset state */ diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt index bd25099e2..8cb75d9d3 100644 --- a/nuttx/configs/shenzhou/README.txt +++ b/nuttx/configs/shenzhou/README.txt @@ -409,7 +409,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -717,14 +717,14 @@ Shenzhou-specific Configuration Options STM32 USB OTG FS Host Driver Support Pre-requisites - + CONFIG_USBHOST - Enable USB host support CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block CONFIG_STM32_SYSCFG - Needed CONFIG_SCHED_WORKQUEUE - Worker thread support is required - + Options: - + CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. Default 128 (512 bytes) CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO @@ -777,7 +777,7 @@ Where <subdir> is one of the following: ADC1_IN10(PC0) Potentiometer External signals are also available on CON5 CN14: - + ADC_IN8 (PB0) CON5 CN14 Pin2 ADC_IN9 (PB1) CON5 CN14 Pin1 @@ -872,7 +872,7 @@ Where <subdir> is one of the following: -CONFIG_NX_WRITEONLY=y +# CONFIG_NX_WRITEONLY is not set - + thttpd ------ diff --git a/nuttx/configs/shenzhou/include/board.h b/nuttx/configs/shenzhou/include/board.h index 818e99ca6..dd0c8f957 100644 --- a/nuttx/configs/shenzhou/include/board.h +++ b/nuttx/configs/shenzhou/include/board.h @@ -111,7 +111,7 @@ /* MCO output driven by PLL3. From above, we already have PLL3 input frequency as: * - * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz + * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz */ #if defined(CONFIG_STM32_MII_MCO) || defined(CONFIG_STM32_RMII_MCO) @@ -199,7 +199,7 @@ * 56 PD9 MII_RXD0 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * 57 PD10 MII_RXD1 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * - * The board desdign can support a 50MHz external clock to drive the PHY + * The board desdign can support a 50MHz external clock to drive the PHY * (U9). However, on my board, U9 is not present. * * 67 PA8 MCO DM9161AEP diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs index b86405db2..2bf31972e 100644 --- a/nuttx/configs/shenzhou/nsh/Make.defs +++ b/nuttx/configs/shenzhou/nsh/Make.defs @@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs index 4bf903e1b..16a4e8dd9 100644 --- a/nuttx/configs/shenzhou/nxwm/Make.defs +++ b/nuttx/configs/shenzhou/nxwm/Make.defs @@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/shenzhou/src/Makefile b/nuttx/configs/shenzhou/src/Makefile index 28c42c392..888e470d7 100644 --- a/nuttx/configs/shenzhou/src/Makefile +++ b/nuttx/configs/shenzhou/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_spi.c up_mmcsd.c up_chipid.c diff --git a/nuttx/configs/shenzhou/src/shenzhou-internal.h b/nuttx/configs/shenzhou/src/shenzhou-internal.h index f28abcf60..35b6a27eb 100644 --- a/nuttx/configs/shenzhou/src/shenzhou-internal.h +++ b/nuttx/configs/shenzhou/src/shenzhou-internal.h @@ -83,7 +83,7 @@ * 56 PD9 MII_RXD0 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * 57 PD10 MII_RXD1 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP * - * The board desdign can support a 50MHz external clock to drive the PHY + * The board desdign can support a 50MHz external clock to drive the PHY * (U9). However, on my board, U9 is not present. * * 67 PA8 MCO DM9161AEP diff --git a/nuttx/configs/shenzhou/src/up_buttons.c b/nuttx/configs/shenzhou/src/up_buttons.c index 7d4a7f04e..ec84824c6 100644 --- a/nuttx/configs/shenzhou/src/up_buttons.c +++ b/nuttx/configs/shenzhou/src/up_buttons.c @@ -87,7 +87,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for some pins but NOT used in this file */ diff --git a/nuttx/configs/shenzhou/src/up_ili93xx.c b/nuttx/configs/shenzhou/src/up_ili93xx.c index be56a6d66..19ab2c014 100644 --- a/nuttx/configs/shenzhou/src/up_ili93xx.c +++ b/nuttx/configs/shenzhou/src/up_ili93xx.c @@ -220,7 +220,7 @@ /* Display/Color Properties ***********************************************************/ /* Display Resolution */ -#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE) +#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE) # define STM32_XRES 320 # define STM32_YRES 240 #else @@ -509,9 +509,9 @@ static const uint32_t g_lcdout[16] = static const uint32_t g_lcdin[16] = { - GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN, - GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN, - GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN, + GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN, + GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN, + GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN, GPIO_LCD_D12IN, GPIO_LCD_D13IN, GPIO_LCD_D14IN, GPIO_LCD_D15IN }; #endif @@ -548,7 +548,7 @@ static const struct fb_videoinfo_s g_videoinfo = /* This is the standard, NuttX Plane information object */ -static const struct lcd_planeinfo_s g_planeinfo = +static const struct lcd_planeinfo_s g_planeinfo = { .putrun = stm32_putrun, /* Put a run into LCD memory */ .getrun = stm32_getrun, /* Get a run from LCD memory */ @@ -558,12 +558,12 @@ static const struct lcd_planeinfo_s g_planeinfo = /* This is the standard, NuttX LCD driver object */ -static struct stm32_dev_s g_lcddev = +static struct stm32_dev_s g_lcddev = { .dev = { /* LCD Configuration */ - + .getvideoinfo = stm32_getvideoinfo, .getplaneinfo = stm32_getplaneinfo, @@ -674,9 +674,9 @@ static uint16_t stm32_readreg(FAR struct stm32_dev_s *priv, uint8_t regaddr) putreg32(1, LCD_RS_SET); putreg32(1, LCD_RD_CLEAR); putreg32(1, LCD_RD_SET); - regval = (uint16_t)getreg32(LCD_IDR); + regval = (uint16_t)getreg32(LCD_IDR); putreg32(1, LCD_CS_SET); - + return regval; } @@ -750,9 +750,9 @@ static inline uint16_t stm32_readgram(FAR struct stm32_dev_s *priv) putreg32(1, LCD_RS_SET); putreg32(1, LCD_RD_CLEAR); putreg32(1, LCD_RD_SET); - regval = (uint16_t)getreg32(LCD_IDR); + regval = (uint16_t)getreg32(LCD_IDR); putreg32(1, LCD_CS_SET); - + return regval; } @@ -767,7 +767,7 @@ static inline uint16_t stm32_readgram(FAR struct stm32_dev_s *priv) * - ILI932x: Discard first dummy read; no shift in the return data * ************************************************************************************/ - + static void stm32_readnosetup(FAR struct stm32_dev_s *priv, FAR uint16_t *accum) { /* Read-ahead one pixel */ @@ -782,7 +782,7 @@ static void stm32_readnosetup(FAR struct stm32_dev_s *priv, FAR uint16_t *accum) * Read one correctly aligned pixel from the GRAM memory. Possibly shifting the * data and possibly swapping red and green components. * - * - ILI932x: Unknown -- assuming colors are in the color order + * - ILI932x: Unknown -- assuming colors are in the color order * ************************************************************************************/ @@ -866,7 +866,7 @@ static int stm32_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe FAR struct stm32_dev_s *priv = &g_lcddev; FAR const uint16_t *src = (FAR const uint16_t*)buffer; int i; - + /* Buffer must be provided and aligned to a 16-bit address boundary */ lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -933,7 +933,7 @@ static int stm32_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe /* Convert coordinates */ row = (STM32_YRES-1) - row; - + /* Then write the GRAM data, manually incrementing Y (which is col) */ for (i = 0; i < npixels; i++) @@ -975,7 +975,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, uint16_t (*readgram)(FAR struct stm32_dev_s *priv, FAR uint16_t *accum); uint16_t accum; int i; - + /* Buffer must be provided and aligned to a 16-bit address boundary */ lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -1001,7 +1001,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, default: /* Shouldn't happen */ return -ENOSYS; } - + /* Read the run from GRAM */ #ifdef CONFIG_LCD_LANDSCAPE @@ -1071,7 +1071,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Convert coordinates */ row = (STM32_YRES-1) - row; - + /* Then write the GRAM data, manually incrementing Y (which is col) */ for (i = 0; i < npixels; i++) @@ -1158,7 +1158,7 @@ static int stm32_poweroff(FAR struct stm32_dev_s *priv) { /* Turn the display off */ - stm32_writereg(priv, LCD_REG_7, 0); + stm32_writereg(priv, LCD_REG_7, 0); /* Remember the power off state */ @@ -1963,7 +1963,7 @@ void stm32_lcdclear(uint16_t color) FAR struct stm32_dev_s *priv = &g_lcddev; uint32_t i = 0; - stm32_setcursor(priv, 0, 0); + stm32_setcursor(priv, 0, 0); stm32_gramselect(priv); /* Make sure that we are configured for output */ diff --git a/nuttx/configs/shenzhou/src/up_ssd1289.c b/nuttx/configs/shenzhou/src/up_ssd1289.c index 0443d970e..ed30bebd3 100644 --- a/nuttx/configs/shenzhou/src/up_ssd1289.c +++ b/nuttx/configs/shenzhou/src/up_ssd1289.c @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * ************************************************************************************/ - + /************************************************************************************ * Included Files ************************************************************************************/ @@ -230,9 +230,9 @@ static const uint32_t g_lcdout[16] = static const uint32_t g_lcdin[16] = { - GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN, - GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN, - GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN, + GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN, + GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN, + GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN, GPIO_LCD_D12IN, GPIO_LCD_D13IN, GPIO_LCD_D14IN, GPIO_LCD_D15IN }; #endif diff --git a/nuttx/configs/shenzhou/src/up_userleds.c b/nuttx/configs/shenzhou/src/up_userleds.c index 60fa7d9c3..0fc83fd1e 100644 --- a/nuttx/configs/shenzhou/src/up_userleds.c +++ b/nuttx/configs/shenzhou/src/up_userleds.c @@ -75,7 +75,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 }; diff --git a/nuttx/configs/shenzhou/thttpd/Make.defs b/nuttx/configs/shenzhou/thttpd/Make.defs index a1be960ef..1acc6b2a2 100644 --- a/nuttx/configs/shenzhou/thttpd/Make.defs +++ b/nuttx/configs/shenzhou/thttpd/Make.defs @@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sim/doc/test-results.txt b/nuttx/configs/sim/doc/test-results.txt index ebde2fa60..6a8fad677 100644 --- a/nuttx/configs/sim/doc/test-results.txt +++ b/nuttx/configs/sim/doc/test-results.txt @@ -1855,7 +1855,7 @@ cond_test: signaler terminated, now cancel the waiter cond_test: Waiter Signaler cond_test: Loops 32 32 cond_test: Errors 0 0 -cond_test: +cond_test: 0 times, waiter did not have to wait for data cond_test: 0 times, data was already available when the signaler run cond_test: 0 times, the waiter was in an unexpected state when the signaler ran diff --git a/nuttx/configs/sim/src/Makefile b/nuttx/configs/sim/src/Makefile index d7846788b..3dcbe6af3 100644 --- a/nuttx/configs/sim/src/Makefile +++ b/nuttx/configs/sim/src/Makefile @@ -37,10 +37,10 @@ include $(TOPDIR)/Make.defs CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = +CSRCS = ifeq ($(CONFIG_SIM_X11FB),y) ifeq ($(CONFIG_SIM_TOUCHSCREEN),y) CSRCS += up_touchscreen.c diff --git a/nuttx/configs/skp16c26/README.txt b/nuttx/configs/skp16c26/README.txt index 911175957..e853c487a 100644 --- a/nuttx/configs/skp16c26/README.txt +++ b/nuttx/configs/skp16c26/README.txt @@ -5,7 +5,7 @@ configs/skp16c26/README.txt buildroot can be downloaded from misc/buildroot in the NuttX GIT. Insructions for building the toolchain are provided below. - However, the target cannot be built because the GNU m16c-nuttx-elf-ld link fails with + However, the target cannot be built because the GNU m16c-nuttx-elf-ld link fails with the following message: m32c-nuttx-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482 @@ -18,7 +18,7 @@ configs/skp16c26/README.txt No workaround is known at this time. This is a show stopper for M16C. -2. A supported version of the M16C toolchain is available here: +2. A supported version of the M16C toolchain is available here: http://www.kpitgnutools.com/index.php @@ -51,13 +51,13 @@ NOTE: See the toolchain issues above -- you may not want to waste your time. rename the directory to buildroot b. Using GIT - + Check out the misc/buildroot module. GIT checkout instructions: http://sourceforge.net/p/nuttx/git/ci/master/tree/misc/buildroot/ Make the archive directory: - + mkdir archive The <nuttx-dir>/../buildroot is where the toolchain is built; @@ -67,7 +67,7 @@ NOTE: See the toolchain issues above -- you may not want to waste your time. cd <nuttx-dir>/tools ./configure.sh <nuttx-configuration> - + 4. Configure and Make the buildroot cd buildroot @@ -109,4 +109,4 @@ Cygwin GCC BUILD NOTES build, the workaround is the same except that the directory will be toolchain_build_m32c/gcc-4.2.4-final/gcc. - + diff --git a/nuttx/configs/skp16c26/include/board.h b/nuttx/configs/skp16c26/include/board.h index d656e1352..7ab724c74 100644 --- a/nuttx/configs/skp16c26/include/board.h +++ b/nuttx/configs/skp16c26/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/skp16c26/include/board.h + * configs/skp16c26/include/board.h * arch/board/board.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. diff --git a/nuttx/configs/skp16c26/src/Makefile b/nuttx/configs/skp16c26/src/Makefile index da35b246c..c5e6f5018 100644 --- a/nuttx/configs/skp16c26/src/Makefile +++ b/nuttx/configs/skp16c26/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_leds.c up_buttons.c up_lcd.c up_lcdconsole.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/skp16c26/src/skp16c26_internal.h b/nuttx/configs/skp16c26/src/skp16c26_internal.h index 048292048..5b81f49c2 100644 --- a/nuttx/configs/skp16c26/src/skp16c26_internal.h +++ b/nuttx/configs/skp16c26/src/skp16c26_internal.h @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/skp16c26/src/scp16c26_internal.h + * configs/skp16c26/src/scp16c26_internal.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/skp16c26/src/up_leds.c b/nuttx/configs/skp16c26/src/up_leds.c index 66e4bc009..3f8d0e0a9 100644 --- a/nuttx/configs/skp16c26/src/up_leds.c +++ b/nuttx/configs/skp16c26/src/up_leds.c @@ -116,7 +116,7 @@ static void up_setleds(uint8_t gybits, uint8_t rbit) regval &= ~GREENYELLOW_LED_MASK; regval |= gybits; putreg8(regval, GREENYELLOW_LED_PORT); - + regval = getreg8(RED_LED_PORT); regval &= ~RED_LED_MASK; regval |= rbit; @@ -140,17 +140,17 @@ void board_led_initialize(void) regval = getreg8(GREENYELLOW_LED_PORT); regval |= (GREEN_LED_OFF |YELLOW_LED_OFF); putreg8(regval, GREENYELLOW_LED_PORT); - + regval = getreg8(RED_LED_PORT); regval |= RED_LED_OFF; putreg8(regval, RED_LED_PORT); /* Set the direction to output */ - + regval = getreg8(GREENYELLOW_DIR_PORT); regval |= (GREEN_LED |YELLOW_LED); putreg8(regval, GREENYELLOW_DIR_PORT); - + regval = getreg8(RED_DIR_PORT); regval |= RED_LED; putreg8(regval, RED_DIR_PORT); diff --git a/nuttx/configs/spark/README.txt b/nuttx/configs/spark/README.txt index 1f82ce96c..334a2edb5 100644 --- a/nuttx/configs/spark/README.txt +++ b/nuttx/configs/spark/README.txt @@ -61,7 +61,7 @@ GNU Toolchain Options 4. Raisonance GNU toolchain, or 5. The NuttX buildroot Toolchain (see below). - All testing has been conducted using the CodeSourcery toolchain for Linux. + All testing has been conducted using the CodeSourcery toolchain for Linux. To use the Atollic, devkitARM, Raisonance GNU, or NuttX buildroot toolchain, you simply need to add one of the following configuration options to your .config (or defconfig) file: diff --git a/nuttx/configs/spark/composite/Make.defs b/nuttx/configs/spark/composite/Make.defs index 09b8ad420..dff434675 100644 --- a/nuttx/configs/spark/composite/Make.defs +++ b/nuttx/configs/spark/composite/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/spark/src/up_buttons.c b/nuttx/configs/spark/src/up_buttons.c index bdcaecb72..48ffbc549 100644 --- a/nuttx/configs/spark/src/up_buttons.c +++ b/nuttx/configs/spark/src/up_buttons.c @@ -77,7 +77,7 @@ void board_button_initialize(void) { - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/spark/src/up_io.c b/nuttx/configs/spark/src/up_io.c index 2517746c1..1400367c1 100644 --- a/nuttx/configs/spark/src/up_io.c +++ b/nuttx/configs/spark/src/up_io.c @@ -114,7 +114,7 @@ void up_leds(int r, int g ,int b, int freqs) void up_ioinit(void) { - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/spark/src/up_userleds.c b/nuttx/configs/spark/src/up_userleds.c index 6cb47d017..b562b58b8 100644 --- a/nuttx/configs/spark/src/up_userleds.c +++ b/nuttx/configs/spark/src/up_userleds.c @@ -75,7 +75,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 }; diff --git a/nuttx/configs/spark/usbmsc/Make.defs b/nuttx/configs/spark/usbmsc/Make.defs index 11cdd2411..8b98f58c4 100644 --- a/nuttx/configs/spark/usbmsc/Make.defs +++ b/nuttx/configs/spark/usbmsc/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/spark/usbserial/Make.defs b/nuttx/configs/spark/usbserial/Make.defs index 30fcf96f3..3f8a35654 100644 --- a/nuttx/configs/spark/usbserial/Make.defs +++ b/nuttx/configs/spark/usbserial/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/buttons/Make.defs b/nuttx/configs/stm3210e-eval/buttons/Make.defs index 18da2462f..8e77e00f4 100644 --- a/nuttx/configs/stm3210e-eval/buttons/Make.defs +++ b/nuttx/configs/stm3210e-eval/buttons/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/composite/Make.defs b/nuttx/configs/stm3210e-eval/composite/Make.defs index 172d2c882..f77b77c23 100644 --- a/nuttx/configs/stm3210e-eval/composite/Make.defs +++ b/nuttx/configs/stm3210e-eval/composite/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/include/board.h b/nuttx/configs/stm3210e-eval/include/board.h index 82653e07b..e13495403 100644 --- a/nuttx/configs/stm3210e-eval/include/board.h +++ b/nuttx/configs/stm3210e-eval/include/board.h @@ -108,20 +108,20 @@ #define STM32_CFGR_USBPRE 0 /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ #define STM32_TIM18_FREQUENCY STM32_HCLK_FREQUENCY #define STM32_TIM27_FREQUENCY STM32_HCLK_FREQUENCY -/* SDIO dividers. Note that slower clocking is required when DMA is disabled +/* SDIO dividers. Note that slower clocking is required when DMA is disabled * in order to avoid RX overrun/TX underrun errors due to delayed responses * to service FIFOs in interrupt driven mode. These values have not been * tuned!!! * * HCLK=72MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(178+2)=400 KHz */ - + #define SDIO_INIT_CLKDIV (178 << SDIO_CLKCR_CLKDIV_SHIFT) /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(2+2)=18 MHz @@ -129,9 +129,9 @@ */ #ifdef CONFIG_SDIO_DMA -# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) #else -# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) #endif /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(1+2)=24 MHz diff --git a/nuttx/configs/stm3210e-eval/nsh/Make.defs b/nuttx/configs/stm3210e-eval/nsh/Make.defs index 15110b0a6..2094843ae 100644 --- a/nuttx/configs/stm3210e-eval/nsh/Make.defs +++ b/nuttx/configs/stm3210e-eval/nsh/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/nsh2/Make.defs b/nuttx/configs/stm3210e-eval/nsh2/Make.defs index 2511d23ec..c273d33dd 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/Make.defs +++ b/nuttx/configs/stm3210e-eval/nsh2/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/nx/Make.defs b/nuttx/configs/stm3210e-eval/nx/Make.defs index a916070a6..bd73f4681 100644 --- a/nuttx/configs/stm3210e-eval/nx/Make.defs +++ b/nuttx/configs/stm3210e-eval/nx/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs index 9500422a1..923601e61 100644 --- a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs +++ b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/pm/Make.defs b/nuttx/configs/stm3210e-eval/pm/Make.defs index 2dffb3f26..12f7f461d 100644 --- a/nuttx/configs/stm3210e-eval/pm/Make.defs +++ b/nuttx/configs/stm3210e-eval/pm/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/src/Makefile b/nuttx/configs/stm3210e-eval/src/Makefile index b5de86eec..b84a94386 100644 --- a/nuttx/configs/stm3210e-eval/src/Makefile +++ b/nuttx/configs/stm3210e-eval/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c @@ -81,7 +81,7 @@ CSRCS += up_pm.c endif ifeq ($(CONFIG_PM_BUTTONS),y) -CSRCS += up_pmbuttons.c +CSRCS += up_pmbuttons.c endif ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y) diff --git a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h index fb179c00f..fb2180d59 100644 --- a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h +++ b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h @@ -112,7 +112,7 @@ * configured as CH1OUT for variable backlight control. Otherwise, the * following definition will be used to support a discrete backlight control. */ - + #define GPIO_LCD_BACKLIGHT (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\ GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN8) diff --git a/nuttx/configs/stm3210e-eval/src/up_buttons.c b/nuttx/configs/stm3210e-eval/src/up_buttons.c index 245fe832c..d3bf391ea 100644 --- a/nuttx/configs/stm3210e-eval/src/up_buttons.c +++ b/nuttx/configs/stm3210e-eval/src/up_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for some pins but NOT used in this file */ diff --git a/nuttx/configs/stm3210e-eval/src/up_composite.c b/nuttx/configs/stm3210e-eval/src/up_composite.c index 48afeda6b..daed11e70 100644 --- a/nuttx/configs/stm3210e-eval/src/up_composite.c +++ b/nuttx/configs/stm3210e-eval/src/up_composite.c @@ -147,7 +147,7 @@ int composite_archinitialize(void) return ret; } message("composite_archinitialize: Successfully bound SDIO to the MMC/SD driver\n"); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the STM3210E-EVAL board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/stm3210e-eval/src/up_deselectlcd.c b/nuttx/configs/stm3210e-eval/src/up_deselectlcd.c index e8642c2e0..e81429f3f 100644 --- a/nuttx/configs/stm3210e-eval/src/up_deselectlcd.c +++ b/nuttx/configs/stm3210e-eval/src/up_deselectlcd.c @@ -85,7 +85,7 @@ void stm32_deselectlcd(void) /* Bank1 NOR/SRAM timing register configuration */ putreg32(0x0fffffff, STM32_FSMC_BTR4); - + /* Disable AHB clocking to the FSMC */ stm32_disablefsmc(); diff --git a/nuttx/configs/stm3210e-eval/src/up_deselectnor.c b/nuttx/configs/stm3210e-eval/src/up_deselectnor.c index 135977023..3aeebb371 100644 --- a/nuttx/configs/stm3210e-eval/src/up_deselectnor.c +++ b/nuttx/configs/stm3210e-eval/src/up_deselectnor.c @@ -85,7 +85,7 @@ void stm32_deselectnor(void) /* Bank1 NOR/SRAM timing register configuration */ putreg32(0x0fffffff, STM32_FSMC_BTR2); - + /* Disable AHB clocking to the FSMC */ stm32_disablefsmc(); diff --git a/nuttx/configs/stm3210e-eval/src/up_deselectsram.c b/nuttx/configs/stm3210e-eval/src/up_deselectsram.c index 442524d80..11e51c273 100644 --- a/nuttx/configs/stm3210e-eval/src/up_deselectsram.c +++ b/nuttx/configs/stm3210e-eval/src/up_deselectsram.c @@ -85,7 +85,7 @@ void stm32_deselectsram(void) /* Bank1 NOR/SRAM timing register configuration */ putreg32(0x0fffffff, STM32_FSMC_BTR3); - + /* Disable AHB clocking to the FSMC */ stm32_disablefsmc(); diff --git a/nuttx/configs/stm3210e-eval/src/up_idle.c b/nuttx/configs/stm3210e-eval/src/up_idle.c index e3fb2c6c0..c270b6ed4 100644 --- a/nuttx/configs/stm3210e-eval/src/up_idle.c +++ b/nuttx/configs/stm3210e-eval/src/up_idle.c @@ -260,7 +260,7 @@ static void up_idlepm(void) * Logically, this code belongs at the end of the PM_STANDBY case below, * does not work in the position for some unkown reason. */ - + if (oldstate == PM_STANDBY) { /* Were we awakened by the alarm? */ diff --git a/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c index 6caa12dbd..58e7e6214 100644 --- a/nuttx/configs/stm3210e-eval/src/up_nsh.c +++ b/nuttx/configs/stm3210e-eval/src/up_nsh.c @@ -201,7 +201,7 @@ int nsh_archinitialize(void) return ret; } message("nsh_archinitialize: Successfully bound SDIO to the MMC/SD driver\n"); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the STM3210E-EVAL board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/stm3210e-eval/src/up_usbmsc.c b/nuttx/configs/stm3210e-eval/src/up_usbmsc.c index fe3cbb3ef..53fbabccc 100644 --- a/nuttx/configs/stm3210e-eval/src/up_usbmsc.c +++ b/nuttx/configs/stm3210e-eval/src/up_usbmsc.c @@ -148,7 +148,7 @@ int usbmsc_archinitialize(void) } message("usbmsc_archinitialize: " "Successfully bound SDIO to the MMC/SD driver\n"); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the STM3210E-EVAL board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/stm3210e-eval/usbmsc/Make.defs b/nuttx/configs/stm3210e-eval/usbmsc/Make.defs index ef5c3e6a3..e4cf2a370 100644 --- a/nuttx/configs/stm3210e-eval/usbmsc/Make.defs +++ b/nuttx/configs/stm3210e-eval/usbmsc/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3210e-eval/usbserial/Make.defs b/nuttx/configs/stm3210e-eval/usbserial/Make.defs index cc5951d24..a400f7caa 100644 --- a/nuttx/configs/stm3210e-eval/usbserial/Make.defs +++ b/nuttx/configs/stm3210e-eval/usbserial/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs index bcf352f58..681106bd2 100644 --- a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs +++ b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3220g-eval/nettest/Make.defs b/nuttx/configs/stm3220g-eval/nettest/Make.defs index 2aa7d790e..9e6ed0a14 100644 --- a/nuttx/configs/stm3220g-eval/nettest/Make.defs +++ b/nuttx/configs/stm3220g-eval/nettest/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3220g-eval/nsh2/Make.defs b/nuttx/configs/stm3220g-eval/nsh2/Make.defs index 2c5d27ed3..6c3acd70c 100644 --- a/nuttx/configs/stm3220g-eval/nsh2/Make.defs +++ b/nuttx/configs/stm3220g-eval/nsh2/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3220g-eval/nxwm/Make.defs b/nuttx/configs/stm3220g-eval/nxwm/Make.defs index 50b21d20f..cd08aa51e 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/Make.defs +++ b/nuttx/configs/stm3220g-eval/nxwm/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3220g-eval/src/Makefile b/nuttx/configs/stm3220g-eval/src/Makefile index 0cff420da..e7223993c 100644 --- a/nuttx/configs/stm3220g-eval/src/Makefile +++ b/nuttx/configs/stm3220g-eval/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_spi.c diff --git a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h index 27f0a004c..505c0bd38 100644 --- a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h +++ b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h @@ -70,8 +70,8 @@ /* You can't use CAN1 with FSMC: * - * PD0 = FSMC_D2 & CAN1_RX - * PD1 = FSMC_D3 & CAN1_TX + * PD0 = FSMC_D2 & CAN1_RX + * PD1 = FSMC_D3 & CAN1_TX */ #if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_FSMC) @@ -127,7 +127,7 @@ # endif #endif -/* USB OTG FS +/* USB OTG FS * * PA9 VBUS_FS * PH5 OTG_FS_PowerSwitchOn @@ -145,7 +145,7 @@ /* The STM3220G-EVAL has two STMPE811QTR I/O expanders on board both connected * to the STM32 via I2C1. They share a common interrupt line: PI2. - * + * * STMPE811 U24, I2C address 0x41 (7-bit) * ------ ---- ---------------- -------------------------------------------- * STPE11 PIN BOARD SIGNAL BOARD CONNECTION @@ -158,7 +158,7 @@ * IN2 EXP_IO10 * IN1 EXP_IO11 * IN0 EXP_IO12 - * + * * STMPE811 U29, I2C address 0x44 (7-bit) * ------ ---- ---------------- -------------------------------------------- * STPE11 PIN BOARD SIGNAL BOARD CONNECTION @@ -307,7 +307,7 @@ void stm32_disablefsmc(void); * Name: stm32_selectsram * * Description: - * Initialize to access external SRAM. SRAM will be visible at the FSMC Bank + * Initialize to access external SRAM. SRAM will be visible at the FSMC Bank * NOR/SRAM2 base address (0x64000000) * * General transaction rules. The requested AHB transaction data size can be 8-, diff --git a/nuttx/configs/stm3220g-eval/src/up_buttons.c b/nuttx/configs/stm3220g-eval/src/up_buttons.c index 091bb6216..e7aa92e7b 100644 --- a/nuttx/configs/stm3220g-eval/src/up_buttons.c +++ b/nuttx/configs/stm3220g-eval/src/up_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/stm3220g-eval/src/up_deselectlcd.c b/nuttx/configs/stm3220g-eval/src/up_deselectlcd.c index d1befac71..20e459bec 100644 --- a/nuttx/configs/stm3220g-eval/src/up_deselectlcd.c +++ b/nuttx/configs/stm3220g-eval/src/up_deselectlcd.c @@ -86,7 +86,7 @@ void stm32_deselectlcd(void) /* Bank1 NOR/SRAM timing register configuration */ putreg32(0x0fffffff, STM32_FSMC_BTR4); - + /* Disable AHB clocking to the FSMC */ stm32_disablefsmc(); diff --git a/nuttx/configs/stm3220g-eval/src/up_deselectsram.c b/nuttx/configs/stm3220g-eval/src/up_deselectsram.c index 3dd59ab41..d0eb5d59e 100644 --- a/nuttx/configs/stm3220g-eval/src/up_deselectsram.c +++ b/nuttx/configs/stm3220g-eval/src/up_deselectsram.c @@ -85,7 +85,7 @@ void stm32_deselectsram(void) /* Bank1 NOR/SRAM timing register configuration */ putreg32(FSMC_BTR_RSTVALUE, STM32_FSMC_BTR2); - + /* Disable AHB clocking to the FSMC */ stm32_disablefsmc(); diff --git a/nuttx/configs/stm3220g-eval/src/up_lcd.c b/nuttx/configs/stm3220g-eval/src/up_lcd.c index e03c89b03..e77206893 100644 --- a/nuttx/configs/stm3220g-eval/src/up_lcd.c +++ b/nuttx/configs/stm3220g-eval/src/up_lcd.c @@ -36,10 +36,10 @@ **************************************************************************************/ /* This driver supports the following LCDs on the STM324xG_EVAL board: * - * AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR + * AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR * AM-240320D5TOQW01H (LCD_ILI9325) */ - + /************************************************************************************** * Included Files **************************************************************************************/ @@ -126,7 +126,7 @@ /* Display/Color Properties ***********************************************************/ /* Display Resolution */ -#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE) +#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE) # define STM3220G_XRES 320 # define STM3220G_YRES 240 #else @@ -386,7 +386,7 @@ static const struct fb_videoinfo_s g_videoinfo = /* This is the standard, NuttX Plane information object */ -static const struct lcd_planeinfo_s g_planeinfo = +static const struct lcd_planeinfo_s g_planeinfo = { .putrun = stm3220g_putrun, /* Put a run into LCD memory */ .getrun = stm3220g_getrun, /* Get a run from LCD memory */ @@ -396,12 +396,12 @@ static const struct lcd_planeinfo_s g_planeinfo = /* This is the standard, NuttX LCD driver object */ -static struct stm3220g_dev_s g_lcddev = +static struct stm3220g_dev_s g_lcddev = { .dev = { /* LCD Configuration */ - + .getvideoinfo = stm3220g_getvideoinfo, .getplaneinfo = stm3220g_getplaneinfo, @@ -492,7 +492,7 @@ static inline void stm3220g_writegram(uint16_t rgbval) * - ILI932x: Discard first dummy read; no shift in the return data * **************************************************************************************/ - + static void stm3220g_readnosetup(FAR uint16_t *accum) { /* Read-ahead one pixel */ @@ -507,7 +507,7 @@ static void stm3220g_readnosetup(FAR uint16_t *accum) * Read one correctly aligned pixel from the GRAM memory. Possibly shifting the * data and possibly swapping red and green components. * - * - ILI932x: Unknown -- assuming colors are in the color order + * - ILI932x: Unknown -- assuming colors are in the color order * **************************************************************************************/ @@ -582,7 +582,7 @@ static int stm3220g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu { FAR const uint16_t *src = (FAR const uint16_t*)buffer; int i; - + /* Buffer must be provided and aligned to a 16-bit address boundary */ lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -659,7 +659,7 @@ static int stm3220g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu */ row = (STM3220G_YRES-1) - row; - + /* Then write the GRAM data, manually incrementing Y (which is col) */ for (i = 0; i < npixels; i++) @@ -700,7 +700,7 @@ static int stm3220g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, uint16_t (*readgram)(FAR uint16_t *accum); uint16_t accum; int i; - + /* Buffer must be provided and aligned to a 16-bit address boundary */ lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -719,7 +719,7 @@ static int stm3220g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, default: /* Shouldn't happen */ return -ENOSYS; } - + /* Read the run from GRAM. */ #ifdef CONFIG_LCD_LANDSCAPE @@ -796,7 +796,7 @@ static int stm3220g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, */ row = (STM3220G_YRES-1) - row; - + /* Then write the GRAM data, manually incrementing Y (which is col) */ for (i = 0; i < npixels; i++) @@ -880,7 +880,7 @@ static int stm3220g_poweroff(void) { /* Turn the display off */ - stm3220g_writereg(LCD_REG_7, 0); + stm3220g_writereg(LCD_REG_7, 0); /* Remember the power off state */ @@ -1197,8 +1197,8 @@ void up_lcduninitialize(void) void stm3220g_lcdclear(uint16_t color) { uint32_t i = 0; - - stm3220g_setcursor(0, STM3220G_XRES-1); + + stm3220g_setcursor(0, STM3220G_XRES-1); stm3220g_gramselect(); for (i = 0; i < STM3220G_XRES * STM3220G_YRES; i++) { diff --git a/nuttx/configs/stm3220g-eval/src/up_nsh.c b/nuttx/configs/stm3220g-eval/src/up_nsh.c index 37becd242..c0f74edbd 100644 --- a/nuttx/configs/stm3220g-eval/src/up_nsh.c +++ b/nuttx/configs/stm3220g-eval/src/up_nsh.c @@ -206,7 +206,7 @@ int nsh_archinitialize(void) message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret); return ret; } - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the STM3220G-EVAL board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/stm3220g-eval/src/up_selectlcd.c b/nuttx/configs/stm3220g-eval/src/up_selectlcd.c index f6c531270..4d23350df 100644 --- a/nuttx/configs/stm3220g-eval/src/up_selectlcd.c +++ b/nuttx/configs/stm3220g-eval/src/up_selectlcd.c @@ -91,7 +91,7 @@ * FSMC_CD * FSMC_CLK * FSMC_NCE2 - * FSMC_NCE3 + * FSMC_NCE3 * FSMC_NCE4_1 * FSMC_NCE4_2 * FSMC_NIORD @@ -139,7 +139,7 @@ void stm32_selectlcd(void) stm32_enablefsmc(); /* Color LCD configuration (LCD configured as follow): - * + * * - Data/Address MUX = Disable "FSMC_BCR_MUXEN" just not enable it. * - Extended Mode = Disable "FSMC_BCR_EXTMOD" * - Memory Type = SRAM "FSMC_BCR_SRAM" diff --git a/nuttx/configs/stm3220g-eval/src/up_selectsram.c b/nuttx/configs/stm3220g-eval/src/up_selectsram.c index 8f351223d..c70d7008b 100644 --- a/nuttx/configs/stm3220g-eval/src/up_selectsram.c +++ b/nuttx/configs/stm3220g-eval/src/up_selectsram.c @@ -118,7 +118,7 @@ static const uint32_t g_sramconfig[] = * Name: stm32_selectsram * * Description: - * Initialize to access external SRAM. SRAM will be visible at the FSMC Bank + * Initialize to access external SRAM. SRAM will be visible at the FSMC Bank * NOR/SRAM2 base address (0x64000000) * * General transaction rules. The requested AHB transaction data size can be 8-, diff --git a/nuttx/configs/stm3220g-eval/src/up_stmpe811.c b/nuttx/configs/stm3220g-eval/src/up_stmpe811.c index a64c86958..06be67bb5 100644 --- a/nuttx/configs/stm3220g-eval/src/up_stmpe811.c +++ b/nuttx/configs/stm3220g-eval/src/up_stmpe811.c @@ -95,7 +95,7 @@ /* Board definitions ********************************************************/ /* The STM3220G-EVAL has two STMPE811QTR I/O expanders on board both connected * to the STM32 via I2C1. They share a common interrupt line: PI2. - * + * * STMPE811 U24, I2C address 0x41 (7-bit) * ------ ---- ---------------- -------------------------------------------- * STPE11 PIN BOARD SIGNAL BOARD CONNECTION @@ -108,7 +108,7 @@ * IN2 EXP_IO10 * IN1 EXP_IO11 * IN0 EXP_IO12 - * + * * STMPE811 U29, I2C address 0x44 (7-bit) * ------ ---- ---------------- -------------------------------------------- * STPE11 PIN BOARD SIGNAL BOARD CONNECTION @@ -213,7 +213,7 @@ static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr) ivdbg("Saving handler %p\n", isr); DEBUGASSERT(priv); - + /* Just save the handler. We will use it when EXTI interruptsare enabled */ priv->handler = isr; diff --git a/nuttx/configs/stm3220g-eval/src/up_userleds.c b/nuttx/configs/stm3220g-eval/src/up_userleds.c index 682809afd..0e94b501b 100644 --- a/nuttx/configs/stm3220g-eval/src/up_userleds.c +++ b/nuttx/configs/stm3220g-eval/src/up_userleds.c @@ -75,7 +75,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 }; diff --git a/nuttx/configs/stm3220g-eval/telnetd/Make.defs b/nuttx/configs/stm3220g-eval/telnetd/Make.defs index ab8bab242..47e2e5a5f 100644 --- a/nuttx/configs/stm3220g-eval/telnetd/Make.defs +++ b/nuttx/configs/stm3220g-eval/telnetd/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs index 3f942e7c3..aede6bfdb 100644 --- a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs +++ b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/discover/Make.defs b/nuttx/configs/stm3240g-eval/discover/Make.defs index 20e3d05b2..41d44def4 100644 --- a/nuttx/configs/stm3240g-eval/discover/Make.defs +++ b/nuttx/configs/stm3240g-eval/discover/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/include/board.h b/nuttx/configs/stm3240g-eval/include/board.h index 0369d23f9..965a53687 100644 --- a/nuttx/configs/stm3240g-eval/include/board.h +++ b/nuttx/configs/stm3240g-eval/include/board.h @@ -155,21 +155,21 @@ #define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ #define STM32_TIM18_FREQUENCY STM32_HCLK_FREQUENCY #define STM32_TIM27_FREQUENCY STM32_HCLK_FREQUENCY -/* SDIO dividers. Note that slower clocking is required when DMA is disabled +/* SDIO dividers. Note that slower clocking is required when DMA is disabled * in order to avoid RX overrun/TX underrun errors due to delayed responses * to service FIFOs in interrupt driven mode. These values have not been * tuned!!! * * SDIOCLK=48MHz, SDIO_CK=SDIOCLK/(118+2)=400 KHz */ - + #define SDIO_INIT_CLKDIV (118 << SDIO_CLKCR_CLKDIV_SHIFT) /* DMA ON: SDIOCLK=48MHz, SDIO_CK=SDIOCLK/(1+2)=16 MHz @@ -177,9 +177,9 @@ */ #ifdef CONFIG_SDIO_DMA -# define SDIO_MMCXFR_CLKDIV (1 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (1 << SDIO_CLKCR_CLKDIV_SHIFT) #else -# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) #endif /* DMA ON: SDIOCLK=48MHz, SDIO_CK=SDIOCLK/(1+2)=16 MHz @@ -420,8 +420,8 @@ * * Mapping to STM32 GPIO pins: * - * PD0 = FSMC_D2 & CAN1_RX - * PD1 = FSMC_D3 & CAN1_TX + * PD0 = FSMC_D2 & CAN1_RX + * PD1 = FSMC_D3 & CAN1_TX * PB13 = ULPI_D6 & CAN2_TX * PB5 = ULPI_D7 & CAN2_RX */ @@ -438,7 +438,7 @@ * - PB6 is I2C1_SCL * - PB9 is I2C1_SDA */ - + #define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 #define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 diff --git a/nuttx/configs/stm3240g-eval/kernel/Makefile b/nuttx/configs/stm3240g-eval/kernel/Makefile index 327035336..1ca76cc61 100644 --- a/nuttx/configs/stm3240g-eval/kernel/Makefile +++ b/nuttx/configs/stm3240g-eval/kernel/Makefile @@ -56,7 +56,7 @@ ifeq ($(WINTOOL),y) USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c # Create the nuttx_user.elf file containing all of the user-mode code nuttx_user.elf: $(OBJS) - $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) + $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) $(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf @echo "LD: nuttx_user.elf" diff --git a/nuttx/configs/stm3240g-eval/kernel/up_userspace.c b/nuttx/configs/stm3240g-eval/kernel/up_userspace.c index a0e50d71d..0f57b3438 100644 --- a/nuttx/configs/stm3240g-eval/kernel/up_userspace.c +++ b/nuttx/configs/stm3240g-eval/kernel/up_userspace.c @@ -88,7 +88,7 @@ extern uint32_t _ebss; /* End+1 of .bss */ int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]); -const struct userspace_s userspace __attribute__ ((section (".userspace"))) = +const struct userspace_s userspace __attribute__ ((section (".userspace"))) = { /* General memory map */ diff --git a/nuttx/configs/stm3240g-eval/nettest/Make.defs b/nuttx/configs/stm3240g-eval/nettest/Make.defs index 39e3d0c68..857d748ae 100644 --- a/nuttx/configs/stm3240g-eval/nettest/Make.defs +++ b/nuttx/configs/stm3240g-eval/nettest/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/nsh/Make.defs b/nuttx/configs/stm3240g-eval/nsh/Make.defs index f52076c15..fe388949a 100644 --- a/nuttx/configs/stm3240g-eval/nsh/Make.defs +++ b/nuttx/configs/stm3240g-eval/nsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/nsh2/Make.defs b/nuttx/configs/stm3240g-eval/nsh2/Make.defs index 1f63de32e..9a46187b9 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/Make.defs +++ b/nuttx/configs/stm3240g-eval/nsh2/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs index 180f223f0..2782c6255 100644 --- a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs +++ b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/nxwm/Make.defs b/nuttx/configs/stm3240g-eval/nxwm/Make.defs index 9f14104f9..910fedc80 100644 --- a/nuttx/configs/stm3240g-eval/nxwm/Make.defs +++ b/nuttx/configs/stm3240g-eval/nxwm/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/src/Makefile b/nuttx/configs/stm3240g-eval/src/Makefile index 78b6edea2..82cd6d37e 100644 --- a/nuttx/configs/stm3240g-eval/src/Makefile +++ b/nuttx/configs/stm3240g-eval/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_spi.c diff --git a/nuttx/configs/stm3240g-eval/src/up_buttons.c b/nuttx/configs/stm3240g-eval/src/up_buttons.c index 253c31d55..0607e6e21 100644 --- a/nuttx/configs/stm3240g-eval/src/up_buttons.c +++ b/nuttx/configs/stm3240g-eval/src/up_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/stm3240g-eval/src/up_deselectlcd.c b/nuttx/configs/stm3240g-eval/src/up_deselectlcd.c index 93fdd97c4..8597c55ac 100644 --- a/nuttx/configs/stm3240g-eval/src/up_deselectlcd.c +++ b/nuttx/configs/stm3240g-eval/src/up_deselectlcd.c @@ -86,7 +86,7 @@ void stm32_deselectlcd(void) /* Bank1 NOR/SRAM timing register configuration */ putreg32(0x0fffffff, STM32_FSMC_BTR4); - + /* Disable AHB clocking to the FSMC */ stm32_disablefsmc(); diff --git a/nuttx/configs/stm3240g-eval/src/up_deselectsram.c b/nuttx/configs/stm3240g-eval/src/up_deselectsram.c index ab01303fb..e4ed3bb45 100644 --- a/nuttx/configs/stm3240g-eval/src/up_deselectsram.c +++ b/nuttx/configs/stm3240g-eval/src/up_deselectsram.c @@ -85,7 +85,7 @@ void stm32_deselectsram(void) /* Bank1 NOR/SRAM timing register configuration */ putreg32(FSMC_BTR_RSTVALUE, STM32_FSMC_BTR2); - + /* Disable AHB clocking to the FSMC */ stm32_disablefsmc(); diff --git a/nuttx/configs/stm3240g-eval/src/up_lcd.c b/nuttx/configs/stm3240g-eval/src/up_lcd.c index 2ad48e7f6..5aaa60a47 100644 --- a/nuttx/configs/stm3240g-eval/src/up_lcd.c +++ b/nuttx/configs/stm3240g-eval/src/up_lcd.c @@ -36,10 +36,10 @@ **************************************************************************************/ /* This driver supports the following LCDs on the STM324xG_EVAL board: * - * AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR + * AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR * AM-240320D5TOQW01H (LCD_ILI9325) */ - + /************************************************************************************** * Included Files **************************************************************************************/ @@ -126,7 +126,7 @@ /* Display/Color Properties ***********************************************************/ /* Display Resolution */ -#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE) +#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE) # define STM3240G_XRES 320 # define STM3240G_YRES 240 #else @@ -386,7 +386,7 @@ static const struct fb_videoinfo_s g_videoinfo = /* This is the standard, NuttX Plane information object */ -static const struct lcd_planeinfo_s g_planeinfo = +static const struct lcd_planeinfo_s g_planeinfo = { .putrun = stm3240g_putrun, /* Put a run into LCD memory */ .getrun = stm3240g_getrun, /* Get a run from LCD memory */ @@ -396,12 +396,12 @@ static const struct lcd_planeinfo_s g_planeinfo = /* This is the standard, NuttX LCD driver object */ -static struct stm3240g_dev_s g_lcddev = +static struct stm3240g_dev_s g_lcddev = { .dev = { /* LCD Configuration */ - + .getvideoinfo = stm3240g_getvideoinfo, .getplaneinfo = stm3240g_getplaneinfo, @@ -492,7 +492,7 @@ static inline void stm3240g_writegram(uint16_t rgbval) * - ILI932x: Discard first dummy read; no shift in the return data * **************************************************************************************/ - + static void stm3240g_readnosetup(FAR uint16_t *accum) { /* Read-ahead one pixel */ @@ -507,7 +507,7 @@ static void stm3240g_readnosetup(FAR uint16_t *accum) * Read one correctly aligned pixel from the GRAM memory. Possibly shifting the * data and possibly swapping red and green components. * - * - ILI932x: Unknown -- assuming colors are in the color order + * - ILI932x: Unknown -- assuming colors are in the color order * **************************************************************************************/ @@ -582,7 +582,7 @@ static int stm3240g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu { FAR const uint16_t *src = (FAR const uint16_t*)buffer; int i; - + /* Buffer must be provided and aligned to a 16-bit address boundary */ lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -659,7 +659,7 @@ static int stm3240g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu */ row = (STM3240G_YRES-1) - row; - + /* Then write the GRAM data, manually incrementing Y (which is col) */ for (i = 0; i < npixels; i++) @@ -700,7 +700,7 @@ static int stm3240g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, uint16_t (*readgram)(FAR uint16_t *accum); uint16_t accum; int i; - + /* Buffer must be provided and aligned to a 16-bit address boundary */ lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -719,7 +719,7 @@ static int stm3240g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, default: /* Shouldn't happen */ return -ENOSYS; } - + /* Read the run from GRAM. */ #ifdef CONFIG_LCD_LANDSCAPE @@ -796,7 +796,7 @@ static int stm3240g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, */ row = (STM3240G_YRES-1) - row; - + /* Then write the GRAM data, manually incrementing Y (which is col) */ for (i = 0; i < npixels; i++) @@ -880,7 +880,7 @@ static int stm3240g_poweroff(void) { /* Turn the display off */ - stm3240g_writereg(LCD_REG_7, 0); + stm3240g_writereg(LCD_REG_7, 0); /* Remember the power off state */ @@ -1197,8 +1197,8 @@ void up_lcduninitialize(void) void stm3240g_lcdclear(uint16_t color) { uint32_t i = 0; - - stm3240g_setcursor(0, STM3240G_XRES-1); + + stm3240g_setcursor(0, STM3240G_XRES-1); stm3240g_gramselect(); for (i = 0; i < STM3240G_XRES * STM3240G_YRES; i++) { diff --git a/nuttx/configs/stm3240g-eval/src/up_nsh.c b/nuttx/configs/stm3240g-eval/src/up_nsh.c index a0add13b4..6d297fcf6 100644 --- a/nuttx/configs/stm3240g-eval/src/up_nsh.c +++ b/nuttx/configs/stm3240g-eval/src/up_nsh.c @@ -209,7 +209,7 @@ int nsh_archinitialize(void) message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret); return ret; } - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the STM3240G-EVAL board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/stm3240g-eval/src/up_selectlcd.c b/nuttx/configs/stm3240g-eval/src/up_selectlcd.c index e5781a1ea..ff6fd7384 100644 --- a/nuttx/configs/stm3240g-eval/src/up_selectlcd.c +++ b/nuttx/configs/stm3240g-eval/src/up_selectlcd.c @@ -91,7 +91,7 @@ * FSMC_CD * FSMC_CLK * FSMC_NCE2 - * FSMC_NCE3 + * FSMC_NCE3 * FSMC_NCE4_1 * FSMC_NCE4_2 * FSMC_NIORD @@ -139,7 +139,7 @@ void stm32_selectlcd(void) stm32_enablefsmc(); /* Color LCD configuration (LCD configured as follow): - * + * * - Data/Address MUX = Disable "FSMC_BCR_MUXEN" just not enable it. * - Extended Mode = Disable "FSMC_BCR_EXTMOD" * - Memory Type = SRAM "FSMC_BCR_SRAM" diff --git a/nuttx/configs/stm3240g-eval/src/up_selectsram.c b/nuttx/configs/stm3240g-eval/src/up_selectsram.c index 65cdf62c5..479f63d7e 100644 --- a/nuttx/configs/stm3240g-eval/src/up_selectsram.c +++ b/nuttx/configs/stm3240g-eval/src/up_selectsram.c @@ -118,7 +118,7 @@ static const uint32_t g_sramconfig[] = * Name: stm32_selectsram * * Description: - * Initialize to access external SRAM. SRAM will be visible at the FSMC Bank + * Initialize to access external SRAM. SRAM will be visible at the FSMC Bank * NOR/SRAM2 base address (0x64000000) * * General transaction rules. The requested AHB transaction data size can be 8-, diff --git a/nuttx/configs/stm3240g-eval/src/up_stmpe811.c b/nuttx/configs/stm3240g-eval/src/up_stmpe811.c index f7f7adf05..f6c7d1e27 100644 --- a/nuttx/configs/stm3240g-eval/src/up_stmpe811.c +++ b/nuttx/configs/stm3240g-eval/src/up_stmpe811.c @@ -95,7 +95,7 @@ /* Board definitions ********************************************************/ /* The STM3240G-EVAL has two STMPE811QTR I/O expanders on board both connected * to the STM32 via I2C1. They share a common interrupt line: PI2. - * + * * STMPE811 U24, I2C address 0x41 (7-bit) * ------ ---- ---------------- -------------------------------------------- * STPE11 PIN BOARD SIGNAL BOARD CONNECTION @@ -108,7 +108,7 @@ * IN2 EXP_IO10 * IN1 EXP_IO11 * IN0 EXP_IO12 - * + * * STMPE811 U29, I2C address 0x44 (7-bit) * ------ ---- ---------------- -------------------------------------------- * STPE11 PIN BOARD SIGNAL BOARD CONNECTION @@ -213,7 +213,7 @@ static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr) ivdbg("Saving handler %p\n", isr); DEBUGASSERT(priv); - + /* Just save the handler. We will use it when EXTI interruptsare enabled */ priv->handler = isr; diff --git a/nuttx/configs/stm3240g-eval/src/up_userleds.c b/nuttx/configs/stm3240g-eval/src/up_userleds.c index 6607bb616..ffc7ef550 100644 --- a/nuttx/configs/stm3240g-eval/src/up_userleds.c +++ b/nuttx/configs/stm3240g-eval/src/up_userleds.c @@ -75,7 +75,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 }; diff --git a/nuttx/configs/stm3240g-eval/telnetd/Make.defs b/nuttx/configs/stm3240g-eval/telnetd/Make.defs index 9e25e7cd2..51a5b4d43 100644 --- a/nuttx/configs/stm3240g-eval/telnetd/Make.defs +++ b/nuttx/configs/stm3240g-eval/telnetd/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/webserver/Make.defs b/nuttx/configs/stm3240g-eval/webserver/Make.defs index 4e8071638..8281d4050 100644 --- a/nuttx/configs/stm3240g-eval/webserver/Make.defs +++ b/nuttx/configs/stm3240g-eval/webserver/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs index 5e81d46ba..26490dc8e 100644 --- a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs +++ b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32_tiny/README.txt b/nuttx/configs/stm32_tiny/README.txt index b4847b277..c6c9c740a 100644 --- a/nuttx/configs/stm32_tiny/README.txt +++ b/nuttx/configs/stm32_tiny/README.txt @@ -6,7 +6,7 @@ STM32 Tiny development board. This board is available from several vendors on the net, and may be sold under different names. It is based on a STM32 F103C8T6 MCU, and -is (always ?) bundled with a nRF24L01 wireless communication module. +is (always ?) bundled with a nRF24L01 wireless communication module. Contents ======== @@ -40,7 +40,7 @@ GNU Toolchain Options toolchain options. 1. The CodeSourcery GNU toolchain, - 2. The Atollic Toolchain, + 2. The Atollic Toolchain, 3. The devkitARM GNU toolchain, 4. Raisonance GNU toolchain, or 5. The NuttX buildroot Toolchain (see below). @@ -118,7 +118,7 @@ GNU Toolchain Options In order to compile successfully. Otherwise, you will get errors like: "C++ Compiler only available in TrueSTUDIO Professional" - + The make may then fail in some of the post link processing because of some of the other missing tools. The Make.defs file replaces the ar and nm with the default system x86 tool versions and these seem to work okay. Disable all @@ -140,7 +140,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -237,7 +237,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -267,10 +267,10 @@ LEDs The STM32Tiny board has only one software controllable LED. This LED can be used by the board port when CONFIG_ARCH_LEDS option is -enabled. +enabled. If enabled the LED is simply turned on when the board boots -succesfully, and is blinking on panic / assertion failed. +succesfully, and is blinking on panic / assertion failed. PWM === @@ -305,12 +305,12 @@ USART3 * theses IO lines are intended to be used by the wireless module on the board. - + Default USART/UART Configuration -------------------------------- - + USART1 (RX & TX only) is available through the RS-232 port on the board. A MAX232 chip converts -voltage to RS-232 level. This serial port can be used to flash a firmware using the boot loader +voltage to RS-232 level. This serial port can be used to flash a firmware using the boot loader integrated in the MCU. @@ -371,7 +371,7 @@ STM32 Tiny - specific Configuration Options configuration features. CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=n - + CONFIG_ARCH_BOARD - Identifies the configs subdirectory and hence, the board that supports the particular chip or SoC. @@ -462,7 +462,7 @@ STM32 Tiny - specific Configuration Options configuration settings: CONFIG_STM32_TIMx_CHANNEL - Specifies the timer output channel {1,..,4} - + NOTE: The STM32 timers are each capable of generating different signals on each of the four channels with different duty cycles. That capability is not supported by this driver: Only one output channel per timer. @@ -540,7 +540,7 @@ Where <subdir> is one of the following: builtin applications are selected (see NOTES below). NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: @@ -566,9 +566,9 @@ Where <subdir> is one of the following: CONFIG_STM32_TIM3_PWM=y : Use TIM3 to generate PWM output CONFIG_STM32_TIM3_PARTIAL_REMAP=y : Required to have the port B5 as timer PWM output (channel 2) CONFIG_STM32_TIM3_CHANNEL=2 - + See also apps/examples/README.txt - + Note that the only supported board configuration uses the board LED as PWM output. Special PWM-only debug options: @@ -629,7 +629,7 @@ Where <subdir> is one of the following: you can still use certain kinds of debug output (see include/debug.h, all of the interfaces based on lowsyslog will work in this configuration). - - But don't enable USB debug output! Since USB is console is used for + - But don't enable USB debug output! Since USB is console is used for USB debug output and you are using a USB console, there will be infinite loops and deadlocks: Debug output generates USB debug output which generatates USB debug output, etc. If you want USB @@ -644,9 +644,9 @@ Where <subdir> is one of the following: This is another NSH example. If differs from other 'nsh' configurations in that this configurations uses a USB serial device for console I/O. - + NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: diff --git a/nuttx/configs/stm32_tiny/nsh/Make.defs b/nuttx/configs/stm32_tiny/nsh/Make.defs index ae85ccda2..3be3401e8 100644 --- a/nuttx/configs/stm32_tiny/nsh/Make.defs +++ b/nuttx/configs/stm32_tiny/nsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32_tiny/src/Makefile b/nuttx/configs/stm32_tiny/src/Makefile index 491d345d5..56c466757 100644 --- a/nuttx/configs/stm32_tiny/src/Makefile +++ b/nuttx/configs/stm32_tiny/src/Makefile @@ -38,7 +38,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_spi.c up_usbdev.c diff --git a/nuttx/configs/stm32_tiny/usbnsh/Make.defs b/nuttx/configs/stm32_tiny/usbnsh/Make.defs index 059a0529c..bf440a4e0 100644 --- a/nuttx/configs/stm32_tiny/usbnsh/Make.defs +++ b/nuttx/configs/stm32_tiny/usbnsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f3discovery/README.txt b/nuttx/configs/stm32f3discovery/README.txt index d557c2fdf..75fb67bca 100644 --- a/nuttx/configs/stm32f3discovery/README.txt +++ b/nuttx/configs/stm32f3discovery/README.txt @@ -36,7 +36,7 @@ GNU Toolchain Options toolchain options. 1. The CodeSourcery GNU toolchain, - 2. The Atollic Toolchain, + 2. The Atollic Toolchain, 3. The devkitARM GNU toolchain, 4. Raisonance GNU toolchain, or 5. The NuttX buildroot Toolchain (see below). @@ -114,7 +114,7 @@ GNU Toolchain Options In order to compile successfully. Otherwise, you will get errors like: "C++ Compiler only available in TrueSTUDIO Professional" - + The make may then fail in some of the post link processing because of some of the other missing tools. The Make.defs file replaces the ar and nm with the default system x86 tool versions and these seem to work okay. Disable all @@ -136,7 +136,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -233,7 +233,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -458,7 +458,7 @@ STM32F3Discovery-specific Configuration Options configuration features. CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=n - + CONFIG_ARCH_BOARD - Identifies the configs subdirectory and hence, the board that supports the particular chip or SoC. @@ -582,7 +582,7 @@ STM32F3Discovery-specific Configuration Options configuration settings: CONFIG_STM32_TIMx_CHANNEL - Specifies the timer output channel {1,..,4} - + NOTE: The STM32 timers are each capable of generating different signals on each of the four channels with different duty cycles. That capability is not supported by this driver: Only one output channel per timer. @@ -660,7 +660,7 @@ Where <subdir> is one of the following: builtin applications are selected (see NOTES below). NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: @@ -687,13 +687,13 @@ Where <subdir> is one of the following: CONFIG_NSH_ARCHINIT=y : To perform USB initialization The CDC/ACM example is included as two NSH "built-in" commands.\ - + CONFIG_SYSTEM_CDCACM=y : Enable apps/system/cdcacm - + The two commands are: - + sercon : Connect the serial device a create /dev/ttyACM0 - serdis : Disconnect the serial device. + serdis : Disconnect the serial device. NOTE: The serial connections/disconnections do not work as advertised. This is because the STM32F3Discovery board does not provide circuitry for @@ -704,7 +704,7 @@ Where <subdir> is one of the following: 1) Start NSH with USB disconnected 2) enter to 'sercon' command to start the CDC/ACM device, then 3) Connect the USB device to the host. - + and to close the connection: 4) Disconnect the USB device from the host @@ -739,7 +739,7 @@ Where <subdir> is one of the following: There appears to be some kind of driver-related issue. NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: @@ -814,7 +814,7 @@ Where <subdir> is one of the following: 1) Start NSH with USB disconnected, then 2) Connect the USB device to the host. - + 6. Using the Prolifics PL2303 Emulation You could also use the non-standard PL2303 serial device instead of diff --git a/nuttx/configs/stm32f3discovery/include/board.h b/nuttx/configs/stm32f3discovery/include/board.h index bc0b9be86..0cdc9d272 100644 --- a/nuttx/configs/stm32f3discovery/include/board.h +++ b/nuttx/configs/stm32f3discovery/include/board.h @@ -146,7 +146,7 @@ #define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ diff --git a/nuttx/configs/stm32f3discovery/nsh/Make.defs b/nuttx/configs/stm32f3discovery/nsh/Make.defs index 43442bf10..4456b7586 100644 --- a/nuttx/configs/stm32f3discovery/nsh/Make.defs +++ b/nuttx/configs/stm32f3discovery/nsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f3discovery/scripts/ld.script b/nuttx/configs/stm32f3discovery/scripts/ld.script index b684bc54b..29830c5ef 100644 --- a/nuttx/configs/stm32f3discovery/scripts/ld.script +++ b/nuttx/configs/stm32f3discovery/scripts/ld.script @@ -34,7 +34,7 @@ ****************************************************************************/ /* The STM32F303VCT has 256Kb of FLASH beginning at address 0x0800:0000 and - * 40Kb of SRAM. + * 40Kb of SRAM. * * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 * where the code expects to begin execution by jumping to the entry point in diff --git a/nuttx/configs/stm32f3discovery/src/Makefile b/nuttx/configs/stm32f3discovery/src/Makefile index d47389e49..137ee536b 100644 --- a/nuttx/configs/stm32f3discovery/src/Makefile +++ b/nuttx/configs/stm32f3discovery/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_spi.c diff --git a/nuttx/configs/stm32f3discovery/src/up_autoleds.c b/nuttx/configs/stm32f3discovery/src/up_autoleds.c index 582b2e55e..cf6c90faf 100644 --- a/nuttx/configs/stm32f3discovery/src/up_autoleds.c +++ b/nuttx/configs/stm32f3discovery/src/up_autoleds.c @@ -74,7 +74,7 @@ /* This array maps an LED number to GPIO pin configuration */ -static const uint32_t g_ledcfg[BOARD_NLEDS] = +static const uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4, GPIO_LED5, GPIO_LED6, GPIO_LED7, GPIO_LED8 diff --git a/nuttx/configs/stm32f3discovery/src/up_boot.c b/nuttx/configs/stm32f3discovery/src/up_boot.c index 5d2c99697..b914676f8 100644 --- a/nuttx/configs/stm32f3discovery/src/up_boot.c +++ b/nuttx/configs/stm32f3discovery/src/up_boot.c @@ -83,7 +83,7 @@ void stm32_boardinitialize(void) #endif /* Initialize USB if the 1) USB device controller is in the configuration and 2) - * disabled, and 3) the weak function stm32_usbinitialize() has been brought + * disabled, and 3) the weak function stm32_usbinitialize() has been brought * into the build. Presumeably either CONFIG_USBDEV is also selected. */ diff --git a/nuttx/configs/stm32f3discovery/src/up_buttons.c b/nuttx/configs/stm32f3discovery/src/up_buttons.c index 2a17919b9..6a3323586 100644 --- a/nuttx/configs/stm32f3discovery/src/up_buttons.c +++ b/nuttx/configs/stm32f3discovery/src/up_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/stm32f3discovery/src/up_userleds.c b/nuttx/configs/stm32f3discovery/src/up_userleds.c index 85b8b8346..8d8f3326c 100644 --- a/nuttx/configs/stm32f3discovery/src/up_userleds.c +++ b/nuttx/configs/stm32f3discovery/src/up_userleds.c @@ -73,7 +73,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static const uint32_t g_ledcfg[BOARD_NLEDS] = +static const uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4, GPIO_LED5, GPIO_LED6, GPIO_LED7, GPIO_LED8 diff --git a/nuttx/configs/stm32f3discovery/usbnsh/Make.defs b/nuttx/configs/stm32f3discovery/usbnsh/Make.defs index ebd536ee3..5f5d87c9c 100644 --- a/nuttx/configs/stm32f3discovery/usbnsh/Make.defs +++ b/nuttx/configs/stm32f3discovery/usbnsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f429i-disco/extflash/Make.defs b/nuttx/configs/stm32f429i-disco/extflash/Make.defs index d65ff17fc..c4ceb0bde 100644 --- a/nuttx/configs/stm32f429i-disco/extflash/Make.defs +++ b/nuttx/configs/stm32f429i-disco/extflash/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f429i-disco/include/board.h b/nuttx/configs/stm32f429i-disco/include/board.h index bd6e0f521..607244105 100644 --- a/nuttx/configs/stm32f429i-disco/include/board.h +++ b/nuttx/configs/stm32f429i-disco/include/board.h @@ -150,7 +150,7 @@ #define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ diff --git a/nuttx/configs/stm32f429i-disco/nsh/Make.defs b/nuttx/configs/stm32f429i-disco/nsh/Make.defs index 20e541e2d..45e79fc1d 100644 --- a/nuttx/configs/stm32f429i-disco/nsh/Make.defs +++ b/nuttx/configs/stm32f429i-disco/nsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f429i-disco/src/Makefile b/nuttx/configs/stm32f429i-disco/src/Makefile index ee9e184bf..9c6b04791 100644 --- a/nuttx/configs/stm32f429i-disco/src/Makefile +++ b/nuttx/configs/stm32f429i-disco/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = stm32_boot.c stm32_spi.c diff --git a/nuttx/configs/stm32f429i-disco/src/stm32_boot.c b/nuttx/configs/stm32f429i-disco/src/stm32_boot.c index 9778b5a59..6e21112c8 100644 --- a/nuttx/configs/stm32f429i-disco/src/stm32_boot.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_boot.c @@ -83,7 +83,7 @@ void stm32_boardinitialize(void) #endif /* Initialize USB if the 1) OTG HS controller is in the configuration and 2) - * disabled, and 3) the weak function stm32_usbinitialize() has been brought + * disabled, and 3) the weak function stm32_usbinitialize() has been brought * into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also * selected. */ diff --git a/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c b/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c index db259ff63..9b8cd91cc 100644 --- a/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/stm32f429i-disco/src/stm32_extmem.c b/nuttx/configs/stm32f429i-disco/src/stm32_extmem.c index b56341a41..0ef3a9b32 100644 --- a/nuttx/configs/stm32f429i-disco/src/stm32_extmem.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_extmem.c @@ -187,7 +187,7 @@ void stm32_enablefsmc(void) /* Configure and enable the SDRAM bank1 * - * FMC clock = 180MHz/2 = 90MHz + * FMC clock = 180MHz/2 = 90MHz * 90MHz = 11,11 ns * All timings from the datasheet for Speedgrade -7 (=7ns) */ diff --git a/nuttx/configs/stm32f429i-disco/src/stm32_userleds.c b/nuttx/configs/stm32f429i-disco/src/stm32_userleds.c index 29ca346ec..7937cda52 100644 --- a/nuttx/configs/stm32f429i-disco/src/stm32_userleds.c +++ b/nuttx/configs/stm32f429i-disco/src/stm32_userleds.c @@ -75,7 +75,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2 }; diff --git a/nuttx/configs/stm32f429i-disco/usbmsc/Make.defs b/nuttx/configs/stm32f429i-disco/usbmsc/Make.defs index d65ff17fc..c4ceb0bde 100644 --- a/nuttx/configs/stm32f429i-disco/usbmsc/Make.defs +++ b/nuttx/configs/stm32f429i-disco/usbmsc/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f429i-disco/usbnsh/Make.defs b/nuttx/configs/stm32f429i-disco/usbnsh/Make.defs index d65ff17fc..c4ceb0bde 100644 --- a/nuttx/configs/stm32f429i-disco/usbnsh/Make.defs +++ b/nuttx/configs/stm32f429i-disco/usbnsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f4discovery/cxxtest/Make.defs b/nuttx/configs/stm32f4discovery/cxxtest/Make.defs index f0d7203fd..85608244e 100644 --- a/nuttx/configs/stm32f4discovery/cxxtest/Make.defs +++ b/nuttx/configs/stm32f4discovery/cxxtest/Make.defs @@ -65,7 +65,7 @@ ifeq ($(WINTOOL),y) -isystem "${shell cygpath -w $(TOPDIR)/include/uClibc++}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include \ diff --git a/nuttx/configs/stm32f4discovery/elf/Make.defs b/nuttx/configs/stm32f4discovery/elf/Make.defs index e5042bd2f..fb0e90906 100644 --- a/nuttx/configs/stm32f4discovery/elf/Make.defs +++ b/nuttx/configs/stm32f4discovery/elf/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f4discovery/include/board.h b/nuttx/configs/stm32f4discovery/include/board.h index dadde0fca..f3c583187 100644 --- a/nuttx/configs/stm32f4discovery/include/board.h +++ b/nuttx/configs/stm32f4discovery/include/board.h @@ -150,7 +150,7 @@ #define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. + * otherwise frequency is 2xAPBx. * Note: TIM1,8 are on APB2, others on APB1 */ diff --git a/nuttx/configs/stm32f4discovery/kernel/Makefile b/nuttx/configs/stm32f4discovery/kernel/Makefile index fb52b6f67..67da11088 100644 --- a/nuttx/configs/stm32f4discovery/kernel/Makefile +++ b/nuttx/configs/stm32f4discovery/kernel/Makefile @@ -56,7 +56,7 @@ ifeq ($(WINTOOL),y) USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c # Create the nuttx_user.elf file containing all of the user-mode code nuttx_user.elf: $(OBJS) - $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) + $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) $(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf @echo "LD: nuttx_user.elf" diff --git a/nuttx/configs/stm32f4discovery/kernel/up_userspace.c b/nuttx/configs/stm32f4discovery/kernel/up_userspace.c index 430d40b74..6dd84cbe3 100644 --- a/nuttx/configs/stm32f4discovery/kernel/up_userspace.c +++ b/nuttx/configs/stm32f4discovery/kernel/up_userspace.c @@ -88,7 +88,7 @@ extern uint32_t _ebss; /* End+1 of .bss */ int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]); -const struct userspace_s userspace __attribute__ ((section (".userspace"))) = +const struct userspace_s userspace __attribute__ ((section (".userspace"))) = { /* General memory map */ diff --git a/nuttx/configs/stm32f4discovery/kostest/Make.defs b/nuttx/configs/stm32f4discovery/kostest/Make.defs index 60f6cc723..3810f0857 100644 --- a/nuttx/configs/stm32f4discovery/kostest/Make.defs +++ b/nuttx/configs/stm32f4discovery/kostest/Make.defs @@ -117,7 +117,7 @@ ifeq ($(WINTOOL),y) DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh else - # Linux/Cygwin-native host tools + # Linux/Cygwin-native host tools MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) endif diff --git a/nuttx/configs/stm32f4discovery/nsh/Make.defs b/nuttx/configs/stm32f4discovery/nsh/Make.defs index 96beafa67..0e949076b 100644 --- a/nuttx/configs/stm32f4discovery/nsh/Make.defs +++ b/nuttx/configs/stm32f4discovery/nsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f4discovery/nxlines/Make.defs b/nuttx/configs/stm32f4discovery/nxlines/Make.defs index 6a12b20eb..3f58ea7b3 100644 --- a/nuttx/configs/stm32f4discovery/nxlines/Make.defs +++ b/nuttx/configs/stm32f4discovery/nxlines/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f4discovery/pm/Make.defs b/nuttx/configs/stm32f4discovery/pm/Make.defs index 7564844ae..60ecc3171 100644 --- a/nuttx/configs/stm32f4discovery/pm/Make.defs +++ b/nuttx/configs/stm32f4discovery/pm/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f4discovery/posix_spawn/Make.defs b/nuttx/configs/stm32f4discovery/posix_spawn/Make.defs index aa0876d94..4b6102e41 100644 --- a/nuttx/configs/stm32f4discovery/posix_spawn/Make.defs +++ b/nuttx/configs/stm32f4discovery/posix_spawn/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32f4discovery/src/Makefile b/nuttx/configs/stm32f4discovery/src/Makefile index e8be5eecd..e43601dbc 100644 --- a/nuttx/configs/stm32f4discovery/src/Makefile +++ b/nuttx/configs/stm32f4discovery/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = stm32_boot.c stm32_spi.c @@ -81,7 +81,7 @@ CSRCS += stm32_pm.c endif ifeq ($(CONFIG_PM_BUTTONS),y) -CSRCS += stm32_pm_buttons.c +CSRCS += stm32_pm_buttons.c endif ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y) diff --git a/nuttx/configs/stm32f4discovery/src/stm32_boot.c b/nuttx/configs/stm32f4discovery/src/stm32_boot.c index 3cca46450..b28713cf4 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_boot.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_boot.c @@ -82,7 +82,7 @@ void stm32_boardinitialize(void) #endif /* Initialize USB if the 1) OTG FS controller is in the configuration and 2) - * disabled, and 3) the weak function stm32_usbinitialize() has been brought + * disabled, and 3) the weak function stm32_usbinitialize() has been brought * into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also * selected. */ diff --git a/nuttx/configs/stm32f4discovery/src/stm32_buttons.c b/nuttx/configs/stm32f4discovery/src/stm32_buttons.c index 30fe6dde4..f6164bb91 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_buttons.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/stm32f4discovery/src/stm32_ssd1289.c b/nuttx/configs/stm32f4discovery/src/stm32_ssd1289.c index e485b9f0b..74c6ee22e 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_ssd1289.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_ssd1289.c @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. * **************************************************************************************/ - + /************************************************************************************** * Included Files **************************************************************************************/ @@ -87,14 +87,14 @@ /* STM32F4Discovery LCD Hardware Definitions ******************************************/ /* LCD /CS is CE1 == NOR/SRAM Bank 1 - * + * * Bank 1 = 0x60000000 | 0x00000000 * Bank 2 = 0x60000000 | 0x04000000 * Bank 3 = 0x60000000 | 0x08000000 * Bank 4 = 0x60000000 | 0x0c000000 * * FSMC address bit 16 is used to distinguish command and data. FSMC address bits - * 0-24 correspond to ARM address bits 1-25. + * 0-24 correspond to ARM address bits 1-25. */ #define STM32_LCDBASE ((uintptr_t)(0x60000000 | 0x00000000)) @@ -309,7 +309,7 @@ void stm32_selectlcd(void) stm32_enablefsmc(); /* Color LCD configuration (LCD configured as follow): - * + * * - Data/Address MUX = Disable "FSMC_BCR_MUXEN" just not enable it. * - Extended Mode = Disable "FSMC_BCR_EXTMOD" * - Memory Type = SRAM "FSMC_BCR_SRAM" diff --git a/nuttx/configs/stm32f4discovery/src/stm32_ug2864ambag01.c b/nuttx/configs/stm32f4discovery/src/stm32_ug2864ambag01.c index e0106e8f7..4aa01e40b 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_ug2864ambag01.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_ug2864ambag01.c @@ -120,7 +120,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) /* Configure the OLED GPIOs. This initial configuration is RESET low, * putting the OLED into reset state. */ - + (void)stm32_configgpio(GPIO_OLED_RESET); /* Wait a bit then release the OLED from the reset state */ diff --git a/nuttx/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c b/nuttx/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c index 8e8f3cdda..5a32a0e42 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c @@ -120,7 +120,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) /* Configure the OLED GPIOs. This initial configuration is RESET low, * putting the OLED into reset state. */ - + (void)stm32_configgpio(GPIO_OLED_RESET); /* Wait a bit then release the OLED from the reset state */ diff --git a/nuttx/configs/stm32f4discovery/src/stm32_userleds.c b/nuttx/configs/stm32f4discovery/src/stm32_userleds.c index 237704211..b5c2e9c27 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_userleds.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_userleds.c @@ -75,7 +75,7 @@ ****************************************************************************/ /* This array maps an LED number to GPIO pin configuration */ -static uint32_t g_ledcfg[BOARD_NLEDS] = +static uint32_t g_ledcfg[BOARD_NLEDS] = { GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 }; diff --git a/nuttx/configs/stm32f4discovery/usbnsh/Make.defs b/nuttx/configs/stm32f4discovery/usbnsh/Make.defs index 2c05aff2d..f59f4c24f 100644 --- a/nuttx/configs/stm32f4discovery/usbnsh/Make.defs +++ b/nuttx/configs/stm32f4discovery/usbnsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32ldiscovery/nsh/Make.defs b/nuttx/configs/stm32ldiscovery/nsh/Make.defs index 2992fe4b1..3372eb6ca 100644 --- a/nuttx/configs/stm32ldiscovery/nsh/Make.defs +++ b/nuttx/configs/stm32ldiscovery/nsh/Make.defs @@ -48,7 +48,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/stm32ldiscovery/src/Makefile b/nuttx/configs/stm32ldiscovery/src/Makefile index d3e0f5d3e..dae216414 100644 --- a/nuttx/configs/stm32ldiscovery/src/Makefile +++ b/nuttx/configs/stm32ldiscovery/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = stm32_boot.c stm32_spi.c diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c b/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c index d50523700..6c4df02cd 100644 --- a/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c +++ b/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c @@ -88,7 +88,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for all pins. */ diff --git a/nuttx/configs/sure-pic32mx/nsh/Make.defs b/nuttx/configs/sure-pic32mx/nsh/Make.defs index 198f7f08b..15aa057e2 100644 --- a/nuttx/configs/sure-pic32mx/nsh/Make.defs +++ b/nuttx/configs/sure-pic32mx/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/sure-pic32mx/src/Makefile b/nuttx/configs/sure-pic32mx/src/Makefile index a0cd0fdbe..1a26a83ee 100644 --- a/nuttx/configs/sure-pic32mx/src/Makefile +++ b/nuttx/configs/sure-pic32mx/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = pic32mx_boot.c pic32mx_spi.c # Only the DB_DP11215 PIC32 Storage Demo Board board has user controllable diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_autoleds.c b/nuttx/configs/sure-pic32mx/src/pic32mx_autoleds.c index 431190baf..e21d9bce6 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_autoleds.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_autoleds.c @@ -132,7 +132,7 @@ static const struct led_setting_s g_ledoffvalues[LED_NVALUES] = {LED_NC, LED_NC, LED_NC, LED_NC}, {LED_NC, LED_NC, LED_NC, LED_NC}, {LED_NC, LED_NC, LED_NC, LED_NC}, - {LED_NC, LED_NC, LED_NC, LED_NC}, + {LED_NC, LED_NC, LED_NC, LED_NC}, {LED_NC, LED_NC, LED_OFF, LED_NC}, {LED_NC, LED_NC, LED_NC, LED_OFF} }; diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c b/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c index b810fd488..2e91cf193 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c @@ -215,7 +215,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler) if (irqbuttron) { pic32mx_gpioirqenable(g_buttoncn[id]); - } + } } return oldhandler; } diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c b/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c index ca41dd793..c6be46dba 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c @@ -83,7 +83,7 @@ /* The Sure DB_DP11215 PIC32 Storage Demo Board has pads an SOIC (Flash or * EEPROM) connected on SPI2, however, U4 is not populated on my board. * - * + * * TMS/AN10/CVREFOUT/PMA13/RB10 UTIL_WP FLASH (U1) WP * SS2/PMA2/CN11/RG9 UTIL_CS FLASH (U1) CS */ @@ -92,7 +92,7 @@ # define GPIO_SOIC_WP (GPIO_INPUT|GPIO_PORTB|GPIO_PIN10) # define GPIO_SOIC_CS (GPIO_OUTPUT|GPIO_VALUE_ONE|GPIO_PORTG|GPIO_PIN0) - + /* Change notification numbers -- Not available for SD_CD. */ #endif @@ -108,7 +108,7 @@ /* The Sure DB-DP11212 PIC32 General Purpose Demo Board has an SOIC (Flash or * EEPROM) connected on SPI2: * - * + * * TMS/AN10/PMA13/RB10 UTIL_WP FLASH (U4) WP * TDO/AN11/PMA12/RB11 UTIL_CS FLASH (U4) CS */ @@ -120,7 +120,7 @@ #endif /* The following enable debug output from this file. - * + * * CONFIG_DEBUG_SPI && CONFIG_DEBUG - Define to enable basic SPI debug * CONFIG_DEBUG_VERBOSE - Define to enable verbose SPI debug */ @@ -180,7 +180,7 @@ void weak_function pic32mx_spiinitialize(void) * Name: pic32mx_spi2select and pic32mx_spi2status * * Description: - * The external functions, pic32mx_spi2select and pic32mx_spi2status + * The external functions, pic32mx_spi2select and pic32mx_spi2status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) @@ -195,7 +195,7 @@ void weak_function pic32mx_spiinitialize(void) * 3. Add a calls to up_spiinitialize() in your low level application * initialization logic * 4. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_usbdev.c b/nuttx/configs/sure-pic32mx/src/pic32mx_usbdev.c index d8230d427..38e5c56dd 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_usbdev.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_usbdev.c @@ -6,7 +6,7 @@ * * References: * - Sample code and schematics provided with the Sure Electronics PIC32 board. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -119,7 +119,7 @@ void weak_function pic32mx_usbdevinitialize(void) #ifdef CONFIG_USBHOST // pic32mx_configgpio(GPIO_USB_VBUSON); #endif - + /* "If the host PC sends a GetStatus (device) request, the firmware must respond * and let the host know if the USB peripheral device is currently bus powered * or self powered. See chapter 9 in the official USB specifications for details diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_usbterm.c b/nuttx/configs/sure-pic32mx/src/pic32mx_usbterm.c index 16fa4f1ee..f8cb84dc4 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_usbterm.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_usbterm.c @@ -6,7 +6,7 @@ * * References: * - Sample code and schematics provided with the Sure Electronics PIC32 board. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/nuttx/configs/teensy/hello/Make.defs b/nuttx/configs/teensy/hello/Make.defs index db8872fdb..78d5b3890 100644 --- a/nuttx/configs/teensy/hello/Make.defs +++ b/nuttx/configs/teensy/hello/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" diff --git a/nuttx/configs/teensy/nsh/Make.defs b/nuttx/configs/teensy/nsh/Make.defs index 97cf9ec57..f7e7d8648 100644 --- a/nuttx/configs/teensy/nsh/Make.defs +++ b/nuttx/configs/teensy/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" diff --git a/nuttx/configs/teensy/src/Makefile b/nuttx/configs/teensy/src/Makefile index 00707cae7..329ab0120 100644 --- a/nuttx/configs/teensy/src/Makefile +++ b/nuttx/configs/teensy/src/Makefile @@ -35,7 +35,7 @@ -include $(TOPDIR)/Make.defs -ASRCS = +ASRCS = CSRCS = up_boot.c ifeq ($(CONFIG_ARCH_LEDS),y) @@ -64,13 +64,13 @@ endif ifeq ($(WINTOOL),y) CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" else CFLAGS += -I "$(TOPDIR)/sched" CFLAGS += -I "$(ARCH_SRCDIR)/chip" - CFLAGS += -I "$(ARCH_SRCDIR)/common" + CFLAGS += -I "$(ARCH_SRCDIR)/common" CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)" endif diff --git a/nuttx/configs/teensy/src/up_spi.c b/nuttx/configs/teensy/src/up_spi.c index 828e30dbe..57a94c1ab 100644 --- a/nuttx/configs/teensy/src/up_spi.c +++ b/nuttx/configs/teensy/src/up_spi.c @@ -82,7 +82,7 @@ #define TEENSY_WP (1 << 5) /* The following enable debug output from this file (needs CONFIG_DEBUG too). - * + * * CONFIG_SPI_DEBUG - Define to enable basic SSP debug * CONFIG_SPI_VERBOSE - Define to enable verbose SSP debug */ @@ -189,7 +189,7 @@ uint8_t avr_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { ret |= SPI_STATUS_PRESENT; } - + if ((regval & TEENSY_WP) == 0) { ret |= SPI_STATUS_WRPROTECTED; diff --git a/nuttx/configs/teensy/usbmsc/Make.defs b/nuttx/configs/teensy/usbmsc/Make.defs index 86a4dcaf4..e96abacde 100644 --- a/nuttx/configs/teensy/usbmsc/Make.defs +++ b/nuttx/configs/teensy/usbmsc/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbmsc/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" diff --git a/nuttx/configs/tm4c123g-launchpad/nsh/Make.defs b/nuttx/configs/tm4c123g-launchpad/nsh/Make.defs index 551f706ae..e6b586a0d 100644 --- a/nuttx/configs/tm4c123g-launchpad/nsh/Make.defs +++ b/nuttx/configs/tm4c123g-launchpad/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/tm4c123g-launchpad/scripts/ld.script b/nuttx/configs/tm4c123g-launchpad/scripts/ld.script index f28cb2a52..4c5d85562 100755 --- a/nuttx/configs/tm4c123g-launchpad/scripts/ld.script +++ b/nuttx/configs/tm4c123g-launchpad/scripts/ld.script @@ -97,7 +97,7 @@ SECTIONS *(COMMON) _ebss = ABSOLUTE(.); } > sram - + /* Stabs debugging sections. */ .stab 0 : { *(.stab) } diff --git a/nuttx/configs/tm4c123g-launchpad/src/Makefile b/nuttx/configs/tm4c123g-launchpad/src/Makefile index e4bb06b6e..eef968947 100644 --- a/nuttx/configs/tm4c123g-launchpad/src/Makefile +++ b/nuttx/configs/tm4c123g-launchpad/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = tm4c_boot.c tm4c_ssi.c diff --git a/nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c index f0e456f5f..55c32786a 100644 --- a/nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c +++ b/nuttx/configs/tm4c123g-launchpad/src/tm4c_ssi.c @@ -110,7 +110,7 @@ void weak_function tm4c_ssiinitialize(void) * 2. Add a call to tiva_spiinitialize() in your low level initialization * logic * 3. The handle returned by tiva_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/twr-k60n512/README.txt b/nuttx/configs/twr-k60n512/README.txt index 39caaee83..86c5190d5 100644 --- a/nuttx/configs/twr-k60n512/README.txt +++ b/nuttx/configs/twr-k60n512/README.txt @@ -26,7 +26,7 @@ Contents o NuttX EABI "buildroot" Toolchain o NuttX OABI "buildroot" Toolchain o NXFLAT Toolchain - + Kinetis TWR-K60N512 Features: ============================= @@ -356,7 +356,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -453,7 +453,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -643,7 +643,7 @@ TWR-K60N512-specific Configuration Options buffer is determined by CONFIG_NET_BUFSIZE. Default: 2 CONFIG_ENET_USEMII - Use MII mode. Default: RMII mode. CONFIG_ENET_PHYADDR - PHY address - + Configurations ============== diff --git a/nuttx/configs/twr-k60n512/nsh/Make.defs b/nuttx/configs/twr-k60n512/nsh/Make.defs index cfaaf4191..7a89041df 100644 --- a/nuttx/configs/twr-k60n512/nsh/Make.defs +++ b/nuttx/configs/twr-k60n512/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/twr-k60n512/src/Makefile b/nuttx/configs/twr-k60n512/src/Makefile index 6ca9647b7..5bb3e0fc2 100644 --- a/nuttx/configs/twr-k60n512/src/Makefile +++ b/nuttx/configs/twr-k60n512/src/Makefile @@ -37,17 +37,17 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_spi.c ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_leds.c +CSRCS += up_leds.c endif ifeq ($(CONFIG_ARCH_BUTTONS),y) -CSRCS += up_buttons.c +CSRCS += up_buttons.c endif ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/twr-k60n512/src/twrk60-internal.h b/nuttx/configs/twr-k60n512/src/twrk60-internal.h index e9d8b798a..2f654a435 100644 --- a/nuttx/configs/twr-k60n512/src/twrk60-internal.h +++ b/nuttx/configs/twr-k60n512/src/twrk60-internal.h @@ -108,13 +108,13 @@ * TWRPI ID0 (J3 Pin 17) ? ADC1_DP1 * TWRPI ID1 (J3 Pin 18) ? ADC1_SE16 */ - + #define GPIO_SD_CARDDETECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN28) #define GPIO_SD_WRPROTECT (GPIO_PULLUP | PIN_PORTE | PIN27) #define GPIO_SW1 (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTA | PIN19) #define GPIO_SW2 (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN26) - + #define GPIO_LED1 (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN11) #define GPIO_LED2 (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN28) #define GPIO_LED3 (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN29) diff --git a/nuttx/configs/ubw32/README.txt b/nuttx/configs/ubw32/README.txt index ff0642f37..5c3c076e1 100644 --- a/nuttx/configs/ubw32/README.txt +++ b/nuttx/configs/ubw32/README.txt @@ -170,7 +170,7 @@ MAX3232 Connection RX -- J4 pin 30: U1RX/RF2 GND -- J4 pin 40: GND Vcc -- J4 pin 39: 5V - + Toolchains ========== @@ -262,7 +262,7 @@ Toolchains Windows Native Toolchains ------------------------- - + NOTE: There are several limitations to using a Windows based toolchain in a Cygwin environment. The three biggest are: @@ -342,7 +342,7 @@ LEDs ----- ----- ------------------------------------------------------------- LABEL COLOR CONTROL ----- ----- ------------------------------------------------------------- - USB Green RF3. This could be used by software if USB is not used. + USB Green RF3. This could be used by software if USB is not used. Otherwise, RF3 is used as the USBID signal. LED1 While RE2, Pulled up. Low value illuminates LED2 Red RE1, Pulled up. Low value illuminates @@ -369,7 +369,7 @@ Buttons RE6 User switch RE7 Program switch - + PIC32MX Configuration Options ============================= @@ -493,7 +493,7 @@ PIC32MX Configuration Options CONFIG_PIC32MX_CODEWP - Default 1 (disabled) DEVCFG1: (All settings determined by selections in board.h) DEVCFG2: (All settings determined by selections in board.h) - DEVCFG3: + DEVCFG3: CONFIG_PIC32MX_USBIDO - USB USBID Selection. Default 1 if USB enabled (USBID pin is controlled by the USB module), but 0 (GPIO) otherwise. CONFIG_PIC32MX_VBUSIO - USB VBUSON Selection (Default 1 if USB enabled @@ -604,7 +604,7 @@ Where <subdir> is one of the following: RX -- J4 pin 30: U1RX/RF2 GND -- J4 pin 40: GND Vcc -- J4 pin 39: 5V - + 3. USB Configuations Several USB device configurations can be enabled and included diff --git a/nuttx/configs/ubw32/include/board.h b/nuttx/configs/ubw32/include/board.h index 347e02a3e..039bedb8b 100644 --- a/nuttx/configs/ubw32/include/board.h +++ b/nuttx/configs/ubw32/include/board.h @@ -94,7 +94,7 @@ /* ----- ----- ------------------------------------------------------------- * LABEL COLOR CONTROL * ----- ----- ------------------------------------------------------------- - * USB Green RF3. This could be used by software if USB is not used. + * USB Green RF3. This could be used by software if USB is not used. * Otherwise, RF3 is used as the USBID signal. * LED1 While RE2, Pulled up. Low value illuminates * LED2 Red RE1, Pulled up. Low value illuminates diff --git a/nuttx/configs/ubw32/nsh/Make.defs b/nuttx/configs/ubw32/nsh/Make.defs index 58e22e9de..c8dc95476 100644 --- a/nuttx/configs/ubw32/nsh/Make.defs +++ b/nuttx/configs/ubw32/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/ubw32/src/Makefile b/nuttx/configs/ubw32/src/Makefile index e35626f6e..c9129a234 100644 --- a/nuttx/configs/ubw32/src/Makefile +++ b/nuttx/configs/ubw32/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c up_leds.c ifeq ($(CONFIG_ARCH_BUTTONS),y) diff --git a/nuttx/configs/ubw32/src/up_buttons.c b/nuttx/configs/ubw32/src/up_buttons.c index 9beede7cb..abc6e70f9 100644 --- a/nuttx/configs/ubw32/src/up_buttons.c +++ b/nuttx/configs/ubw32/src/up_buttons.c @@ -190,7 +190,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler) if (irqbuttron) { pic32mx_gpioirqenable(g_buttoncn[id]); - } + } } return oldhandler; } diff --git a/nuttx/configs/ubw32/src/up_leds.c b/nuttx/configs/ubw32/src/up_leds.c index a2d9cbd58..bf17a3f1f 100644 --- a/nuttx/configs/ubw32/src/up_leds.c +++ b/nuttx/configs/ubw32/src/up_leds.c @@ -60,7 +60,7 @@ /* ----- ----- ------------------------------------------------------------- * LABEL COLOR CONTROL * ----- ----- ------------------------------------------------------------- - * USB Green RF3. This could be used by software if USB is not used. + * USB Green RF3. This could be used by software if USB is not used. * Otherwise, RF3 is used as the USBID signal. * LED1 While RE2, Pulled up. Low value illuminates * LED2 Red RE1, Pulled up. Low value illuminates @@ -148,7 +148,7 @@ static const struct led_setting_s g_ledoffvalues[LED_NVALUES] = {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, - {LED_NC, LED_NC, LED_NC, LED_OFF}, + {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_OFF, LED_OFF}, {LED_OFF, LED_NC, LED_NC, LED_OFF}, }; diff --git a/nuttx/configs/ubw32/src/up_usbdev.c b/nuttx/configs/ubw32/src/up_usbdev.c index 3d14c9de1..102f6548d 100644 --- a/nuttx/configs/ubw32/src/up_usbdev.c +++ b/nuttx/configs/ubw32/src/up_usbdev.c @@ -94,7 +94,7 @@ void weak_function pic32mx_usbdevinitialize(void) #ifdef CONFIG_USBHOST #endif - + /* "If the host PC sends a GetStatus (device) request, the firmware must respond * and let the host know if the USB peripheral device is currently bus powered * or self powered. See chapter 9 in the official USB specifications for details diff --git a/nuttx/configs/us7032evb1/shterm/Makefile b/nuttx/configs/us7032evb1/shterm/Makefile index 67787148b..654e591a7 100644 --- a/nuttx/configs/us7032evb1/shterm/Makefile +++ b/nuttx/configs/us7032evb1/shterm/Makefile @@ -45,7 +45,7 @@ $(BIN)$(EXEEXT): $(SRC) ..$(DELIM)bin$(DELIM)$(BIN)$(EXEEXT): $(BIN)$(EXEEXT) install -m 0755 $^ $@ - + clean: $(call DELFILE, $(BIN)$(EXEEXT)) $(call DELFILE..$(DELIM)bin$(DELIM)$(BIN)$(EXEEXT)) diff --git a/nuttx/configs/us7032evb1/src/Makefile b/nuttx/configs/us7032evb1/src/Makefile index 2ace3df3f..b6f968ce8 100644 --- a/nuttx/configs/us7032evb1/src/Makefile +++ b/nuttx/configs/us7032evb1/src/Makefile @@ -38,7 +38,7 @@ ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c b/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c index 542181069..1e4766af5 100644 --- a/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c +++ b/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c @@ -87,7 +87,7 @@ void board_button_initialize(void) { int i; - /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for some pins but NOT used in this file */ diff --git a/nuttx/configs/viewtool-stm32f107/src/stm32_leds.c b/nuttx/configs/viewtool-stm32f107/src/stm32_leds.c index 3b468a9aa..1effb2efa 100644 --- a/nuttx/configs/viewtool-stm32f107/src/stm32_leds.c +++ b/nuttx/configs/viewtool-stm32f107/src/stm32_leds.c @@ -272,15 +272,15 @@ void stm32_setled(int led, bool ledon) case BOARD_LED1: pinset = GPIO_LED1; break; - + case BOARD_LED2: pinset = GPIO_LED2; break; - + case BOARD_LED3: pinset = GPIO_LED3; break; - + case BOARD_LED4: #ifndef CONFIG_ARCH_LEDS pinset = GPIO_LED4; diff --git a/nuttx/configs/vsn/README.txt b/nuttx/configs/vsn/README.txt index 7457800d9..a7096840d 100644 --- a/nuttx/configs/vsn/README.txt +++ b/nuttx/configs/vsn/README.txt @@ -94,7 +94,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -191,7 +191,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in <some-dir>/nuttx. @@ -247,7 +247,7 @@ VSN-specific Configuration Options CONFIG_ARCH_BOARD=vsn (for the VSN development board) CONFIG_ARCH_BOARD_name - For use in C code - + CONFIG_ARCH_BOARD_VSN=y CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation @@ -302,8 +302,8 @@ Where <subdir> is one of the following: Configures the NuttShell (nsh) located at examples/nsh. The Configuration enables both the serial and telnetd NSH interfaces. - The default configuration sets up a console on front-panel RS-232 - interface, sets up device driver of all supported equipment and + The default configuration sets up a console on front-panel RS-232 + interface, sets up device driver of all supported equipment and links in VSN default applications. NOTES: diff --git a/nuttx/configs/vsn/include/board.h b/nuttx/configs/vsn/include/board.h index 766b6197d..fc88bb302 100644 --- a/nuttx/configs/vsn/include/board.h +++ b/nuttx/configs/vsn/include/board.h @@ -4,7 +4,7 @@ * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2011 Uros Platise. All rights reserved - * + * * Authors: Gregory Nutt <gnutt@nuttx.org> * Uros Platise <uros.platise@isotel.eu> * @@ -62,8 +62,8 @@ /* Clocking *************************************************************************/ /* On-board external frequency source is 9MHz (HSE) provided by the CC1101, so it is - * not available on power-up. Instead we are about to run on HSI*9 = 36 MHz, see - * up_sysclock.c for details. + * not available on power-up. Instead we are about to run on HSI*9 = 36 MHz, see + * up_sysclock.c for details. */ #define STM32_BOARD_XTAL 9000000UL @@ -71,9 +71,9 @@ /* PLL source is either HSI or HSE * When HSI: PLL multiplier is 9, out frequency 36 MHz - * When HSE: PLL multiplier is 8: out frequency is 9 MHz x 8 = 72MHz + * When HSE: PLL multiplier is 8: out frequency is 9 MHz x 8 = 72MHz */ - + #define STM32_CFGR_PLLSRC_HSI 0 #define STM32_CFGR_PLLMUL_HSI RCC_CFGR_PLLMUL_CLKx9 @@ -125,17 +125,17 @@ #define STM32_CFGR_USBPRE 0 -/* SDIO dividers. Note that slower clocking is required when DMA is disabled +/* SDIO dividers. Note that slower clocking is required when DMA is disabled * in order to avoid RX overrun/TX underrun errors due to delayed responses - * to service FIFOs in interrupt driven mode. - * + * to service FIFOs in interrupt driven mode. + * * SDcard default speed has max SDIO_CK freq of 25 MHz (12.5 Mbps) * After selection of high speed freq may be 50 MHz (25 Mbps) * Recommended default voltage: 3.3 V * - * HCLK=36MHz, SDIOCLK=36 MHz, SDIO_CK=HCLK/(88+2)=400 KHz + * HCLK=36MHz, SDIOCLK=36 MHz, SDIO_CK=HCLK/(88+2)=400 KHz */ - + #define SDIO_INIT_CLKDIV (88 << SDIO_CLKCR_CLKDIV_SHIFT) /* DMA ON: HCLK=36 MHz, SDIOCLK=36MHz, SDIO_CK=HCLK/(0+2)=18 MHz @@ -143,7 +143,7 @@ */ #ifdef CONFIG_SDIO_DMA -# define SDIO_MMCXFR_CLKDIV (0 << SDIO_CLKCR_CLKDIV_SHIFT) +# define SDIO_MMCXFR_CLKDIV (0 << SDIO_CLKCR_CLKDIV_SHIFT) #else # ifndef CONFIG_DEBUG # define SDIO_MMCXFR_CLKDIV (1 << SDIO_CLKCR_CLKDIV_SHIFT) @@ -199,7 +199,7 @@ extern "C" { /************************************************************************************ * Board Clock Configuration, called immediatelly after boot ************************************************************************************/ - + /************************************************************************************ * Name: stm32_boardinitialize * diff --git a/nuttx/configs/vsn/include/muxbus.h b/nuttx/configs/vsn/include/muxbus.h index 595ded46f..ba22f8426 100644 --- a/nuttx/configs/vsn/include/muxbus.h +++ b/nuttx/configs/vsn/include/muxbus.h @@ -3,7 +3,7 @@ * include/arch/board/muxbus.h * * Copyright (C) 2011 Uros Platise. All rights reserved - * + * * Authors: Uros Platise <uros.platise@isotel.eu> * * Redistribution and use in source and binary forms, with or without @@ -56,20 +56,20 @@ extern "C" { */ void vsn_muxbus_init(void); -/** +/** * Simple Lock / Unlock Mechanism for the SDIO Interface - * + * * NOTE: This function is provided for the stm32_sdio driver. */ extern void stm32_muxbus_sdio_lock(bool lock); /** - * Set PGA Gain of the Analog Devices AD8231 on bus shared with the + * Set PGA Gain of the Analog Devices AD8231 on bus shared with the * SDIO interface - * + * * \param gain sets the front-end gain as 2^{gain}, where gain = 0..7. * Setting gain outside that range shutdowns the front-end. - * + * * \return gain set or -1 if front end is put into shutdown. */ extern int vsn_muxbus_setpgagain(int gain); diff --git a/nuttx/configs/vsn/include/power.h b/nuttx/configs/vsn/include/power.h index 23ec8e20c..30b9105c4 100644 --- a/nuttx/configs/vsn/include/power.h +++ b/nuttx/configs/vsn/include/power.h @@ -3,7 +3,7 @@ * include/arch/board/power.h * * Copyright (C) 2011 Uros Platise. All rights reserved - * + * * Authors: Uros Platise <uros.platise@isotel.eu> * * Redistribution and use in source and binary forms, with or without @@ -56,7 +56,7 @@ extern "C" { void board_power_reboot(void); /** Power off the board - * + * * If it returns, then it was not possible to power-off the board due to some * other constraints. In the case of VSN due to external power supply, press * of a push-button or RTC alarm. diff --git a/nuttx/configs/vsn/nsh/Make.defs b/nuttx/configs/vsn/nsh/Make.defs index 0e2541a93..db06a07d4 100644 --- a/nuttx/configs/vsn/nsh/Make.defs +++ b/nuttx/configs/vsn/nsh/Make.defs @@ -52,7 +52,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/vsn/src/Makefile b/nuttx/configs/vsn/src/Makefile index b0eba0a20..6ee276000 100644 --- a/nuttx/configs/vsn/src/Makefile +++ b/nuttx/configs/vsn/src/Makefile @@ -49,7 +49,7 @@ STACKSIZE = 4096 CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = sysclock.c boot.c leds.c buttons.c spi.c \ diff --git a/nuttx/configs/vsn/src/README.txt b/nuttx/configs/vsn/src/README.txt index 732ede5e6..3760d55b3 100644 --- a/nuttx/configs/vsn/src/README.txt +++ b/nuttx/configs/vsn/src/README.txt @@ -3,14 +3,14 @@ VSN Board Support Package, for the NuttX, Uros Platise <uros.platise@isotel.eu> =============================================================================== http://www.netClamps.com -The directory contains start-up and board level functions. +The directory contains start-up and board level functions. Execution starts in the following order: - sysclock, immediately after reset stm32_rcc calls external clock configuration when CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y is set. It must be set for the VSN board. - + - boot, performs initial chip and board initialization - sched/os_bringup.c then calls user entry defined in the .config file. @@ -20,39 +20,39 @@ Naming throughout the code - _init(): used to be called once only, after powerup, to perform board initialization - - _start() or called via FS _open(): starts peripheral power, puts it + - _start() or called via FS _open(): starts peripheral power, puts it into operation - _stop() or called via FS _close(): opposite to _start() - + System notifications (a sort of run-levels) =========================================== On the VSN, NSH represents the core application as it supports scripts -easily adaptable for any custom application configuration. NSH is +easily adaptable for any custom application configuration. NSH is invoked as follows (argument runs a script from the /etc/init.d directory): - nsh init: on system powerup called by the NuttX APP_START -TODOs: - +TODOs: + - nsh xpowerup: run on external power used to: - try to setup an USB serial connection - configure SLIP mode, internet - start other internet services, such as telnetd, ftpd, httpd - + - nsh xpowerdown: run whenever USB recevied suspend signal or external power has been removed. - used to stop internet services - + - nsh batdown: whenever battery is completely discharged - + Compile notes =============================== To link-in the sif_main() utility do, in this folder: - make context TOPDIR=<path to nuttx top dir> - + This will result in registering the application into the builtin application registry. diff --git a/nuttx/configs/vsn/src/buttons.c b/nuttx/configs/vsn/src/buttons.c index c8a9b6bac..9c4ad37b5 100644 --- a/nuttx/configs/vsn/src/buttons.c +++ b/nuttx/configs/vsn/src/buttons.c @@ -62,11 +62,11 @@ ****************************************************************************/ /** Called from an interrupt - * + * * \todo Measure the time button is being pressed, and then: * - if short signal all processes (tasks and threads) with 'button user request': SIGUSR1 * - if long (>0.5 s) signal all with 'power-off request': SIGTERM - **/ + **/ void buttons_callback(void) { } diff --git a/nuttx/configs/vsn/src/chipcon.c b/nuttx/configs/vsn/src/chipcon.c index c4428d66f..4e4ad3fec 100644 --- a/nuttx/configs/vsn/src/chipcon.c +++ b/nuttx/configs/vsn/src/chipcon.c @@ -2,7 +2,7 @@ * configs/vsn/src/chipcon.c * * Copyright (C) 2011 Uros Platise. All rights reserved. - * + * * Author: Uros Platise <uros.platise@isotel.eu> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/configs/vsn/src/leds.c b/nuttx/configs/vsn/src/leds.c index 141b39593..77a5fd7ea 100644 --- a/nuttx/configs/vsn/src/leds.c +++ b/nuttx/configs/vsn/src/leds.c @@ -72,7 +72,7 @@ /**************************************************************************** * Private Data ****************************************************************************/ - + irqstate_t irqidle_mask; /**************************************************************************** diff --git a/nuttx/configs/vsn/src/muxbus.c b/nuttx/configs/vsn/src/muxbus.c index 76304d67d..1a1ba02c2 100644 --- a/nuttx/configs/vsn/src/muxbus.c +++ b/nuttx/configs/vsn/src/muxbus.c @@ -66,7 +66,7 @@ sem_t vsn_muxbus_sem; void vsn_muxbus_takeownership(void) { while (sem_wait(&vsn_muxbus_sem) != 0) { - + /* The only case that an error should occr here is if the wait was * awakened by a signal. */ @@ -81,7 +81,7 @@ void vsn_muxbus_sdio_release(void) stm32_unconfiggpio(GPIO_SDIO_D0); stm32_unconfiggpio(GPIO_SDIO_CK); stm32_unconfiggpio(GPIO_SDIO_CMD); - + vsn_muxbus_ownedbysdio = FALSE; } @@ -108,18 +108,18 @@ void vsn_muxbus_init(void) stm32_configgpio(GPIO_PGIA_AEN); /* setup semaphore in non-locked condition */ - + sem_init(&vsn_muxbus_sem, 0, 1); - + /* by default give the bus to the SDIO */ - + vsn_muxbus_sdio_access(); } -/** +/** * We could do extra checks: who is the owner to prevent - * unlocking from SDIO side eventhough it was not locked + * unlocking from SDIO side eventhough it was not locked * by him, but temporarily by the PGA */ void stm32_muxbus_sdio_lock(bool lock) @@ -133,18 +133,18 @@ void stm32_muxbus_sdio_lock(bool lock) /** * The following rules apply for the SDcard: - * + * * - CMD serial line always starts with 0 (start-bit) and ends with 1 (stop-bit) - * The total length is always 48 bits protected by CRCs. When changing the + * The total length is always 48 bits protected by CRCs. When changing the * gain, CMD must be seen as 1 on CK changes. - * + * * - An alternative mechanism would be to use suspend/resume commands - * + * * - If SDcard internal shift-register is 8-bit oriented there might be a need - * to shift 7 dummy bits to properly detect invalid start of packet - * (with start bit set as 1) to invalidate bus transitions (in case CK + * to shift 7 dummy bits to properly detect invalid start of packet + * (with start bit set as 1) to invalidate bus transitions (in case CK * is changing). - * + * * SDIO returns the bus in HiZ states, where CLK = 0, D = CMD = external pull-up */ int vsn_muxbus_setpgagain(int gain) @@ -152,47 +152,47 @@ int vsn_muxbus_setpgagain(int gain) /* Shutdown the Analog Devices AD8231 and exit if gain is invalid */ stm32_gpiowrite(GPIO_PGIA_AEN, FALSE); - + if (gain < 0 || gain > 7) return -1; vsn_muxbus_takeownership(); vsn_muxbus_sdio_release(); - + /* If we have to set CLK = 1, made that first as D, CMD are 1 by pull-ups */ - + if (gain & 2) stm32_configgpio(GPIO_PGIA_A1_H); else stm32_configgpio(GPIO_PGIA_A1_L); - + /* Set the D and CMD bits */ - + if (gain & 1) stm32_configgpio(GPIO_PGIA_A0_H); else stm32_configgpio(GPIO_PGIA_A0_L); - + if (gain & 4) stm32_configgpio(GPIO_PGIA_A2_H); else stm32_configgpio(GPIO_PGIA_A2_L); - + /* Sample GAIN on rising edge */ - + stm32_gpiowrite(GPIO_PGIA_AEN, TRUE); - + /* Release D and CMD pins to 1; however shorten rising edge actively */ - + stm32_gpiowrite(GPIO_PGIA_A0_H, TRUE); stm32_gpiowrite(GPIO_PGIA_A2_H, TRUE); - + stm32_unconfiggpio(GPIO_PGIA_A0_H); stm32_unconfiggpio(GPIO_PGIA_A2_H); - + /* Release CLK by going down and return the bus */ - - stm32_unconfiggpio(GPIO_PGIA_A1_L); - + + stm32_unconfiggpio(GPIO_PGIA_A1_L); + vsn_muxbus_sdio_access(); sem_post(&vsn_muxbus_sem); - + return gain; } diff --git a/nuttx/configs/vsn/src/power.c b/nuttx/configs/vsn/src/power.c index 56991cf33..72659f026 100644 --- a/nuttx/configs/vsn/src/power.c +++ b/nuttx/configs/vsn/src/power.c @@ -54,11 +54,11 @@ /**************************************************************************** * Declarations and Structures - ****************************************************************************/ + ****************************************************************************/ /**************************************************************************** * Private Functions - ****************************************************************************/ + ****************************************************************************/ void board_power_register(void); void board_power_adjust(void); @@ -68,7 +68,7 @@ void board_power_status(void); /**************************************************************************** * Public Functions - ****************************************************************************/ + ****************************************************************************/ void board_power_init(void) { @@ -95,7 +95,7 @@ void board_power_off(void) // notifying that it is not possible to power-off the board // \todo - + // stop background processes irqsave(); diff --git a/nuttx/configs/vsn/src/rtac.c b/nuttx/configs/vsn/src/rtac.c index 68b94a169..3a6b81756 100644 --- a/nuttx/configs/vsn/src/rtac.c +++ b/nuttx/configs/vsn/src/rtac.c @@ -38,14 +38,14 @@ /** \file * \author Uros Platise * \brief Real Time Alarm Clock - * + * * Implementation of the Real-Time Alarm Clock as per SNP Specifications. - * It provides real-time and phase controlled timer module while it + * It provides real-time and phase controlled timer module while it * cooperates with hardware RTC for low-power operation. - * + * * It provides a replacement for a system 32-bit UTC time/date counter. - * - * It runs at maximum STM32 allowed precision of 16384 Hz, providing + * + * It runs at maximum STM32 allowed precision of 16384 Hz, providing * resolution of 61 us, required by the Sensor Network Protocol. */ @@ -83,22 +83,22 @@ int rtac_waitg(int group, int time) /** Power optimization of base systick timer - * + * * 1. Simple method to skip wake-ups: * - ask timers about the min. period, which is Ns * systick * - set the preload register with floor(Ns) * DEFAULT_PRELOAD * - on wake-up call routines Ns times. - * + * * 2. If intermediate ISR occuried then: * - check how many periods have passed by reading the counter: Np * - set the new counter value as (counter % DEFAULT_PRELOAD) * - call timer routines Np times; the next call is as usual, starting * at 1. point above - * + * * This is okay if ISR's do not read timers, if they read timers then: * - on ISR wake-up the code described under 2. must be called first * (on wake-up from IDLE) - * + * * BUT: the problem is that SYSTICK does not run in Stop mode but RTC * only, so it might be better to replace SYSTICK with RTAC (this * module) and do the job above, permitting ultra low power modes of diff --git a/nuttx/configs/vsn/src/spi.c b/nuttx/configs/vsn/src/spi.c index 173857948..2570e4292 100644 --- a/nuttx/configs/vsn/src/spi.c +++ b/nuttx/configs/vsn/src/spi.c @@ -92,14 +92,14 @@ /** Called to configure SPI chip select GPIO pins for the VSN board. */ - + void weak_function stm32_spiinitialize(void) { /* NOTE: Clocking for SPI1 and/or SPI2 and SPI3 was already provided in stm32_rcc.c. * Configurations of SPI pins is performed in stm32_spi.c. * Here, we only initialize chip select pins unique to the board architecture. */ - + #ifdef CONFIG_STM32_SPI2 stm32_configgpio(GPIO_CC1101_CS); #endif @@ -151,9 +151,9 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - + if (devid == SPIDEV_WIRELESS) { - + stm32_gpiowrite(GPIO_CC1101_CS, !selected); /* Wait for MISO to go low, indicates that Quart has stabilized */ @@ -162,7 +162,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele { while (stm32_gpioread(GPIO_SPI2_MISO) ) up_waste(); } - + } } diff --git a/nuttx/configs/vsn/src/sysclock.c b/nuttx/configs/vsn/src/sysclock.c index 8b1a0be34..abb05e613 100644 --- a/nuttx/configs/vsn/src/sysclock.c +++ b/nuttx/configs/vsn/src/sysclock.c @@ -2,7 +2,7 @@ * configs/vsn/src/sysclock.c * * Copyright (C) 2011 Uros Platise. All rights reserved. - * + * * Author: Uros Platise <uros.platise@isotel.eu> * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ /**************************************************************************** * Private Functions - ****************************************************************************/ + ****************************************************************************/ /** Selects internal HSI Clock, SYSCLK = 36 MHz, HCLK = 36 MHz * - HSI at 8 MHz, :2 enters DPLL * 9, to get 36 MHz @@ -53,14 +53,14 @@ * - Flash Wait State = 1, since it is 64-bit prefetch, it satisfies two 32-bit instructions * (and branch losses a single cycle only, I found this as the best performance vs. frequency) * - Sleep with peripherals disabled is about 2.5 mA @ 36 MHz, HSI - * + * * \todo: * - dynamic clock scalling according to cross-peripheral requirements, AHB prescaler could * change if all other prescalers increase, to maintain the ratio and to have min. HCLK * possible; This is of interest when peripherals consume 50% of all power, as for instance * in sleep mode @ 36 MHz, HSI with all peripherals enabled, i = 7 mA, on 24 Mhz 4.8 mA and - * on 16 MHz 3.2 mA only. - * + * on 16 MHz 3.2 mA only. + * * \return Nothing, operation is always successful. */ void sysclock_select_hsi(void) @@ -70,18 +70,18 @@ void sysclock_select_hsi(void) // Are we running on HSE? regval = getreg32(STM32_RCC_CR); if (regval & RCC_CR_HSEON) { - + // \todo: check is if we are running on HSE, we need the step down sequenuce from HSE -> HSI - + return; // do nothing at this time } - + // Set FLASH prefetch buffer and 1 wait state regval = getreg32(STM32_FLASH_ACR); regval &= ~FLASH_ACR_LATENCY_MASK; regval |= (FLASH_ACR_LATENCY_1|FLASH_ACR_PRTFBE); putreg32(regval, STM32_FLASH_ACR); - + // Set the HCLK source/divider regval = getreg32(STM32_RCC_CFGR); regval &= ~RCC_CFGR_HPRE_MASK; @@ -93,34 +93,34 @@ void sysclock_select_hsi(void) regval &= ~RCC_CFGR_PPRE2_MASK; regval |= STM32_RCC_CFGR_PPRE2; putreg32(regval, STM32_RCC_CFGR); - + // Set the PCLK1 divider regval = getreg32(STM32_RCC_CFGR); regval &= ~RCC_CFGR_PPRE1_MASK; regval |= STM32_RCC_CFGR_PPRE1; putreg32(regval, STM32_RCC_CFGR); - + // Set the TIM1..8 clock multipliers -#ifdef STM32_TIM27_FREQMUL2 +#ifdef STM32_TIM27_FREQMUL2 #endif #ifdef STM32_TIM18_FREQMUL2 #endif - + // Set the PLL source = HSI, divider (/2) and multipler (*9) regval = getreg32(STM32_RCC_CFGR); regval &= ~(RCC_CFGR_PLLSRC|RCC_CFGR_PLLXTPRE|RCC_CFGR_PLLMUL_MASK); regval |= (STM32_CFGR_PLLSRC_HSI|STM32_CFGR_PLLMUL_HSI); putreg32(regval, STM32_RCC_CFGR); - + // Enable the PLL regval = getreg32(STM32_RCC_CR); regval |= RCC_CR_PLLON; putreg32(regval, STM32_RCC_CR); - + // Wait until the PLL is ready while ((getreg32(STM32_RCC_CR) & RCC_CR_PLLRDY) == 0); - + // Select the system clock source (probably the PLL) regval = getreg32(STM32_RCC_CFGR); regval &= ~RCC_CFGR_SW_MASK; @@ -129,7 +129,7 @@ void sysclock_select_hsi(void) // Wait until the selected source is used as the system clock source while ((getreg32(STM32_RCC_CFGR) & RCC_CFGR_SWS_MASK) != STM32_SYSCLK_SWS); - + // map port PD0 and PD1 on OSC pins regval = getreg32(STM32_AFIO_MAPR); regval |= AFIO_MAPR_PD01_REMAP; @@ -139,11 +139,11 @@ void sysclock_select_hsi(void) /** Selects external HSE Clock, SYSCLK = 72 MHz, HCLK = 36/72 MHz * - HSE at 9 MHz, DPLL * 8, to get 72 MHz - * - Suitable for maximum performance and USB + * - Suitable for maximum performance and USB * - Sleep power consumption at HSE and at 72 MHz is 5.5 mA (3.1 @ 36 MHz) * - Option AHB prescaler is set to :2 to be compatible with HSI to remain on HCLK = 36 MHz * - Flash memory running on 72 MHz needs two wait states - * + * * \return Clock selection status * \retval 0 Successful * \retval -1 External clock is not provided @@ -160,17 +160,17 @@ int sysclock_select_hse(void) // if (is cc1101 9 MHz clock output enabled), otherwise return with -1 // I think that clock register provides HSE valid signal to detect that as well. - + return 0; } /**************************************************************************** * Interrupts, Callbacks - ****************************************************************************/ + ****************************************************************************/ -/** TODO: Interrupt on lost HSE clock, change it to HSI, ... restarting is +/** TODO: Interrupt on lost HSE clock, change it to HSI, ... restarting is * more complex as the step requires restart of CC1101 device driver; * so spawn a task for that... once cc1101 is restarted signal an event * to restart clock. @@ -182,7 +182,7 @@ void sysclock_hse_lost(void) /**************************************************************************** * Public Functions - ****************************************************************************/ + ****************************************************************************/ /** Setup system clock, enabled when: * - CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG diff --git a/nuttx/configs/vsn/src/usbmsc.c b/nuttx/configs/vsn/src/usbmsc.c index df263afd3..63948b177 100644 --- a/nuttx/configs/vsn/src/usbmsc.c +++ b/nuttx/configs/vsn/src/usbmsc.c @@ -143,7 +143,7 @@ int usbmsc_archinitialize(void) } message("usbmsc_archinitialize: " "Successfully bound SDIO to the MMC/SD driver\n"); - + /* Then let's guess and say that there is a card in the slot. I need to check to * see if the VSN board supports a GPIO to detect if there is a card in * the slot. diff --git a/nuttx/configs/vsn/src/vsn.h b/nuttx/configs/vsn/src/vsn.h index f8414f36c..e84f0acb4 100644 --- a/nuttx/configs/vsn/src/vsn.h +++ b/nuttx/configs/vsn/src/vsn.h @@ -51,12 +51,12 @@ /************************************************************************************ * PIN Definitions ************************************************************************************/ - + /* Board Peripheral Assignment - * + * * RS232/Power connector: * - USART1, is the default bootloader and console - * + * * Sensor Connector: * Digital: * - GPIOs: PB10, PB11 (or even TIM2 CH3 and CH4) @@ -70,14 +70,14 @@ * - Filtered Out (TIM3_CH4) * (TIM8 could run at lower frequency, while TIM3 must run at highest possible) * - Gain selection muxed with SDcard I/Os. - * + * * Radio connector: * - UART3 / UART4 * - SPI2 * - I2C1 (remapped pins vs. Expansion connector) * - CAN * - TIM4 CH[3:4] - * + * * Expansion connector: * - WakeUp Pin * - System Wide Reset @@ -88,7 +88,7 @@ * - ADC2 on pins [0:7] * - TIM2 Channels [1:4] * - TIM5 Channels [1:4] - * + * * Onboard Components: * - SPI3 has direct connection with FRAM * - SDCard, conencts the microSD and shares the control lines with Sensor Interface @@ -100,7 +100,7 @@ /* LED */ #define GPIO_LED (GPIO_OUTPUT|GPIO_CNF_OUTPP |GPIO_MODE_2MHz |GPIO_PORTB|GPIO_PIN2 |GPIO_OUTPUT_CLEAR) - + /* BUTTON - Note that after a good second button causes hardware reset */ #define GPIO_PUSHBUTTON (GPIO_INPUT |GPIO_CNF_INFLOAT |GPIO_MODE_INPUT|GPIO_PORTC|GPIO_PIN5 ) @@ -148,7 +148,7 @@ #define GPIO_OUT_HIGH (GPIO_OUTPUT|GPIO_CNF_OUTPP |GPIO_MODE_2MHz |GPIO_PORTB|GPIO_PIN1 |GPIO_OUTPUT_SET) #define GPIO_OUT_AIN (GPIO_INPUT |GPIO_CNF_ANALOGIN |GPIO_MODE_INPUT|GPIO_PORTB|GPIO_PIN1 ) #define GPIO_OUT_PWM (GPIO_ALT |GPIO_CNF_AFPP |GPIO_MODE_10MHz|GPIO_PORTB|GPIO_PIN1 ) -#define GPIO_OUT_PWM_TIM3_CH 4 /* TIM3.CH4 */ +#define GPIO_OUT_PWM_TIM3_CH 4 /* TIM3.CH4 */ #define GPIO_PGIA_A0_H (GPIO_OUTPUT|GPIO_CNF_OUTPP |GPIO_MODE_2MHz |GPIO_PORTC|GPIO_PIN8 |GPIO_OUTPUT_SET) #define GPIO_PGIA_A0_L (GPIO_OUTPUT|GPIO_CNF_OUTPP |GPIO_MODE_2MHz |GPIO_PORTC|GPIO_PIN8 |GPIO_OUTPUT_CLEAR) diff --git a/nuttx/configs/xtrs/README.txt b/nuttx/configs/xtrs/README.txt index f8b3d0e73..73319108c 100644 --- a/nuttx/configs/xtrs/README.txt +++ b/nuttx/configs/xtrs/README.txt @@ -24,10 +24,10 @@ This port uses a vintage computer based on the Z80, the TRS80. There's a main page describing the different models of TRS80. See: http://www.trs-80.com -An emulator for this computer is available to run TRS80 programs on a +An emulator for this computer is available to run TRS80 programs on a linux platform (http://www.tim-mann.org/xtrs.html). -Other emulators are available for other platforms. +Other emulators are available for other platforms. See http://www.trs-80.com, click on the link Emulators. TRSDOS, LDOS and other softwares are available at: @@ -185,7 +185,7 @@ by modifying the configuration file as follows: -CONFIG_HOST_WINDOWS=y -CONFIG_WINDOWS_NATIVE=y +CONFIG_HOST_LINUX=y - + -CONFIG_Z80_TOOLCHAIN_SDCCW=y +CONFIG_Z80_TOOLCHAIN_SDCCL=y diff --git a/nuttx/configs/xtrs/include/trs80-m3.h b/nuttx/configs/xtrs/include/trs80-m3.h index 1a23b2d7b..889c209f3 100644 --- a/nuttx/configs/xtrs/include/trs80-m3.h +++ b/nuttx/configs/xtrs/include/trs80-m3.h @@ -67,8 +67,8 @@ #define _TRS80_M3_PRCHAR 0x003B /* Call Input a line from the keyboard. B = max length of line. HL points at buffer. - * Buffer should be the length of B plus 1. To terminate, hit BREAK or ENTER. - * On exit, HL points at buffer and B = number of characters entered. + * Buffer should be the length of B plus 1. To terminate, hit BREAK or ENTER. + * On exit, HL points at buffer and B = number of characters entered. * Carry will be set if BREAK was pressed. */ @@ -86,13 +86,13 @@ #define _TRS80_M3_RSRCV 0x0050 -/* "Transmit character to RS-232. On entry, Accumulator or memory location 16880 +/* "Transmit character to RS-232. On entry, Accumulator or memory location 16880 * contains character. On exit, 16880 = 0 if no character sent. Wait status honored." */ #define _TRS80_M3_RSTX 0x0055 -/* Initialize RS-232 interface. On entry, memory location 16888 = send/receive baud +/* Initialize RS-232 interface. On entry, memory location 16888 = send/receive baud * rate code, location 16890 = wait/don't wait switch, location 16889 = RS-232 * characteristics switch. On exit, DE is altered. For more detail, consult Model 3 * reference manual. @@ -100,9 +100,9 @@ #define _TRS80_M3_RSINIT 0x005A -/* This is the routine that is Basic's SET, RESET, and POINT functions. Here's how - * to use it. Load HL with return address and push. Load register A with one of the - * following: 00H = POINT, 01H = RESET, and 80H = SET. Push AF onto stack. Load A with +/* This is the routine that is Basic's SET, RESET, and POINT functions. Here's how + * to use it. Load HL with return address and push. Load register A with one of the + * following: 00H = POINT, 01H = RESET, and 80H = SET. Push AF onto stack. Load A with * X coordinate and push onto stack. Load A with Y coordinate and JP GRAPH. */ @@ -122,7 +122,7 @@ #ifdef TRS80_MODEL1 -/* A register contains a 0 or 1 which is the cassette number. This routine defines +/* A register contains a 0 or 1 which is the cassette number. This routine defines * cassette number and turns on cassette. Model I only. */ @@ -136,7 +136,7 @@ #define _TRS80_M3_CSIN 0x0235 -/* Outputs data one byte at a time to cassette after you use CSHWR. A = the +/* Outputs data one byte at a time to cassette after you use CSHWR. A = the * output byte. */ @@ -178,7 +178,7 @@ #define _TRS80_M3_GETDAT 0x3033 -/* "Get time in ASCII format. Mod III TRSDOS, LDOS, & MULTIDOS." */ +/* "Get time in ASCII format. Mod III TRSDOS, LDOS, & MULTIDOS." */ #define _TRS80_M3_GETTIM 0x3036 diff --git a/nuttx/configs/xtrs/src/Makefile b/nuttx/configs/xtrs/src/Makefile index f673df5df..88062864b 100644 --- a/nuttx/configs/xtrs/src/Makefile +++ b/nuttx/configs/xtrs/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)$(DELIM)sched -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)common -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)z80 -ASRCS = +ASRCS = AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT)) CSRCS = xtr_irq.c xtr_serial.c xtr_timerisr.c xtr_lowputc.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/xtrs/src/xtr_serial.c b/nuttx/configs/xtrs/src/xtr_serial.c index c56aa8403..d42128352 100644 --- a/nuttx/configs/xtrs/src/xtr_serial.c +++ b/nuttx/configs/xtrs/src/xtr_serial.c @@ -370,7 +370,7 @@ static bool up_txempty(FAR struct uart_dev_s *dev) * Name: up_serialinit * * Description: - * Performs the low level UART initialization early in + * Performs the low level UART initialization early in * debug so that the serial console will be available * during bootup. This must be called before up_serialinit. * diff --git a/nuttx/configs/xtrs/src/xtrs_head.asm b/nuttx/configs/xtrs/src/xtrs_head.asm index c2122898e..db717ef09 100644 --- a/nuttx/configs/xtrs/src/xtrs_head.asm +++ b/nuttx/configs/xtrs/src/xtrs_head.asm @@ -109,7 +109,7 @@ _up_rstvectors: ; Other reset handlers ; ; Interrupt mode 1 behavior: -; +; ; 1. M1 cycle: 7 ticks ; Acknowledge interrupt and decrements SP ; 2. M2 cycle: 3 ticks diff --git a/nuttx/configs/z16f2800100zcog/pashello/README.txt b/nuttx/configs/z16f2800100zcog/pashello/README.txt index 97d326097..a1bcc2a10 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/README.txt +++ b/nuttx/configs/z16f2800100zcog/pashello/README.txt @@ -4,9 +4,9 @@ README.txt pashello.zfpproj is a simple ZDS-II project that will allow you to use the ZDS-II debugger. Before using, copy the following files from the toplevel directory: - + nuttx.hex, nuttx.map, nuttx.lod - + to this directory as: - + pashello.hex, pashello.map, pashello.lod diff --git a/nuttx/configs/z16f2800100zcog/src/Makefile b/nuttx/configs/z16f2800100zcog/src/Makefile index fcb4bac3a..604269c72 100644 --- a/nuttx/configs/z16f2800100zcog/src/Makefile +++ b/nuttx/configs/z16f2800100zcog/src/Makefile @@ -49,7 +49,7 @@ endif INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) $(EXTRADEFINES) -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = z16f_lowinit.c z16f_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index b1464f340..3b4b65f2e 100644 --- a/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch @@ -22,12 +22,12 @@ index ba7dbe7..b9f9991 100644 + FAR const char *fmt, va_list ap); +#endif static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl); - + #if CONFIG_NFILE_DESCRIPTORS > 0 @@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf * ****************************************************************************/ - + +#if 0 static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...) @@ -35,7 +35,7 @@ index ba7dbe7..b9f9991 100644 @@ -263,6 +270,51 @@ static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, #endif } - + +#else +static int nsh_consolevoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, va_list ap) +{ @@ -95,7 +95,7 @@ index ba7dbe7..b9f9991 100644 +#endif pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer; pstate->cn_vtbl.exit = nsh_consoleexit; - + @@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void) } return pstate; @@ -122,12 +122,12 @@ index c78362f..59bd8d7 100644 #include <stdbool.h> +#include <stdarg.h> #include <errno.h> - + /**************************************************************************** @@ -62,11 +63,13 @@ #define nsh_undirect(v,s) (v)->undirect(v,s) #define nsh_exit(v,s) (v)->exit(v,s) - + +#if 0 #ifdef CONFIG_CPP_HAVE_VARARGS # define nsh_output(v, fmt...) (v)->output(v, ##fmt) @@ -135,9 +135,9 @@ index c78362f..59bd8d7 100644 # define nsh_output vtbl->output #endif +#endif - + /* Size of info to be saved in call to nsh_redirect */ - + @@ -107,7 +110,11 @@ struct nsh_vtbl_s void (*release)(FAR struct nsh_vtbl_s *vtbl); #endif @@ -152,8 +152,8 @@ index c78362f..59bd8d7 100644 void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save); @@ -159,5 +166,6 @@ struct console_stdio_s /* Defined in nsh_console.c *************************************************/ - + FAR struct console_stdio_s *nsh_newconsole(void); +int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...); - + #endif /* __APPS_NSHLIB_NSH_CONSOLE_H */ diff --git a/nuttx/configs/z80sim/README.txt b/nuttx/configs/z80sim/README.txt index ad430d38a..12950f7bb 100644 --- a/nuttx/configs/z80sim/README.txt +++ b/nuttx/configs/z80sim/README.txt @@ -132,7 +132,7 @@ by modifying the configuration file as follows: -CONFIG_HOST_WINDOWS=y -CONFIG_WINDOWS_NATIVE=y +CONFIG_HOST_LINUX=y - + -CONFIG_Z80_TOOLCHAIN_SDCCW=y +CONFIG_Z80_TOOLCHAIN_SDCCL=y diff --git a/nuttx/configs/z80sim/src/Makefile b/nuttx/configs/z80sim/src/Makefile index 9ace92912..e35674fc4 100644 --- a/nuttx/configs/z80sim/src/Makefile +++ b/nuttx/configs/z80sim/src/Makefile @@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)$(DELIM)sched CFLAGS += -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)common CFLAGS += -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)z80 -ASRCS = +ASRCS = AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT)) CSRCS = z80_irq.c z80_serial.c z80_timerisr.c z80_lowputc.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c index e06ac96e7..4df2e0672 100644 --- a/nuttx/configs/z80sim/src/z80_serial.c +++ b/nuttx/configs/z80sim/src/z80_serial.c @@ -318,7 +318,7 @@ static bool up_txempty(FAR struct uart_dev_s *dev) * Name: up_serialinit * * Description: - * Performs the low level UART initialization early in + * Performs the low level UART initialization early in * debug so that the serial console will be available * during bootup. This must be called before up_serialinit. * diff --git a/nuttx/configs/z8encore000zco/README.txt b/nuttx/configs/z8encore000zco/README.txt index 70d62ea80..23eb6fc52 100644 --- a/nuttx/configs/z8encore000zco/README.txt +++ b/nuttx/configs/z8encore000zco/README.txt @@ -15,12 +15,12 @@ Version 4.10.1 @@ -94,8 +94,11 @@ { int i; - + +#if 0 /* DO NOT CHECK IN */ CHECK_ALLOCNODE_SIZE; CHECK_FREENODE_SIZE; +#endif - + /* Set up global variables */ Version 4.9.5 @@ -37,7 +37,7 @@ Version 5.0.0 to modify the versioning in Make.defs and setenv.sh; if you want to build on a different platform, you will need to change the path in the ZDS binaries in those same files. - + Other Versions If you use any version of ZDS-II other than 5.0.0 or if you install ZDS-II at any location other than the default location, you will have to modify @@ -93,7 +93,7 @@ available: CONFIG_APPS_DIR="..\apps" NOTES: - + a. If you need to change the toolchain path used in Make.defs, you will need to use the short 8.3 filenames to avoid spaces. On my PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is diff --git a/nuttx/configs/z8encore000zco/include/board.h b/nuttx/configs/z8encore000zco/include/board.h index 4690ee093..a41ae6dfe 100644 --- a/nuttx/configs/z8encore000zco/include/board.h +++ b/nuttx/configs/z8encore000zco/include/board.h @@ -43,7 +43,7 @@ /**************************************************************************** * Definitions ****************************************************************************/ - + /* LED pattern definitions */ #define LED_STARTED 0 diff --git a/nuttx/configs/z8encore000zco/ostest/README.txt b/nuttx/configs/z8encore000zco/ostest/README.txt index 214c3a9f1..6af9a8e76 100644 --- a/nuttx/configs/z8encore000zco/ostest/README.txt +++ b/nuttx/configs/z8encore000zco/ostest/README.txt @@ -4,9 +4,9 @@ README.txt ostest.zfpproj is a simple ZDS-II project that will allow you to use the ZDS-II debugger. Before using, copy the following files from the toplevel directory: - + nuttx.hex, nuttx.map, nuttx.lod - + to this directory as: - + ostest.hex, ostest.map, ostest.lod diff --git a/nuttx/configs/z8encore000zco/src/Makefile b/nuttx/configs/z8encore000zco/src/Makefile index 30a4a6285..76de8d4ae 100644 --- a/nuttx/configs/z8encore000zco/src/Makefile +++ b/nuttx/configs/z8encore000zco/src/Makefile @@ -49,7 +49,7 @@ endif INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = z8_lowinit.c z8_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/z8encore000zco/src/z8_leds.c b/nuttx/configs/z8encore000zco/src/z8_leds.c index c6f7f1819..0efc01feb 100644 --- a/nuttx/configs/z8encore000zco/src/z8_leds.c +++ b/nuttx/configs/z8encore000zco/src/z8_leds.c @@ -148,7 +148,7 @@ static const struct z8_ledbits_s g_ledarray[10][4] = static void z8_putled134(FAR const struct z8_ledbits_s *bits, uint8_t addr) { uint8_t porte; - + porte = bits->cathode; putreg8(porte, PEOD); /* Load porte data */ putreg8(bits->anode, PGOD); /* Load portg data */ @@ -203,7 +203,7 @@ void board_led_initialize(void) { putreg8(0x00, PEAF); /* PE Alt func = Port */ putreg8(0x00, PGAF); /* PG Alt func = Port */ - + putreg8(0x00, PEOC); /* PE Out Ctrl = push-pull */ putreg8(0x00, PGOC); /* PG Out Ctrl = push-pull */ @@ -213,7 +213,7 @@ void board_led_initialize(void) /*putreg8(0x00, PGDD); * PA Data Dir = output */ putreg8(0x01, PGADDR); /* PA Data Dir = output */ putreg8(0x00, PGCTL); /* OUTPUT */ - + z8_putarray(&g_ledarray[0][0]); } diff --git a/nuttx/configs/z8f64200100kit/README.txt b/nuttx/configs/z8f64200100kit/README.txt index e3c22d87b..f9fe14994 100644 --- a/nuttx/configs/z8f64200100kit/README.txt +++ b/nuttx/configs/z8f64200100kit/README.txt @@ -15,12 +15,12 @@ ZDS-II Compiler Versions @@ -94,8 +94,11 @@ { int i; - + +#if 0 /* DO NOT CHECK IN */ CHECK_ALLOCNODE_SIZE; CHECK_FREENODE_SIZE; +#endif - + /* Set up global variables */ Version 4.9.5 @@ -37,7 +37,7 @@ Version 5.0.0 to modify the versioning in Make.defs and setenv.sh; if you want to build on a different platform, you will need to change the path in the ZDS binaries in those same files. - + Other Versions If you use any version of ZDS-II other than 5.0.0 or if you install ZDS-II at any location other than the default location, you will have to modify @@ -93,7 +93,7 @@ available: CONFIG_APPS_DIR="..\apps" NOTES: - + a. If you need to change the toolchain path used in Make.defs, you will need to use the short 8.3 filenames to avoid spaces. On my PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is diff --git a/nuttx/configs/z8f64200100kit/include/board.h b/nuttx/configs/z8f64200100kit/include/board.h index 87ca98adc..4c7c5fb68 100644 --- a/nuttx/configs/z8f64200100kit/include/board.h +++ b/nuttx/configs/z8f64200100kit/include/board.h @@ -43,7 +43,7 @@ /**************************************************************************** * Definitions ****************************************************************************/ - + /* LED pattern definitions */ #define LED_STARTED 0 diff --git a/nuttx/configs/z8f64200100kit/ostest/README.txt b/nuttx/configs/z8f64200100kit/ostest/README.txt index 214c3a9f1..6af9a8e76 100644 --- a/nuttx/configs/z8f64200100kit/ostest/README.txt +++ b/nuttx/configs/z8f64200100kit/ostest/README.txt @@ -4,9 +4,9 @@ README.txt ostest.zfpproj is a simple ZDS-II project that will allow you to use the ZDS-II debugger. Before using, copy the following files from the toplevel directory: - + nuttx.hex, nuttx.map, nuttx.lod - + to this directory as: - + ostest.hex, ostest.map, ostest.lod diff --git a/nuttx/configs/z8f64200100kit/src/Makefile b/nuttx/configs/z8f64200100kit/src/Makefile index 21087e6b8..22e06fb5b 100644 --- a/nuttx/configs/z8f64200100kit/src/Makefile +++ b/nuttx/configs/z8f64200100kit/src/Makefile @@ -49,7 +49,7 @@ endif INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = z8_lowinit.c z8_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/zkit-arm-1769/README.txt b/nuttx/configs/zkit-arm-1769/README.txt index a50e6d3af..98be3fbd3 100644 --- a/nuttx/configs/zkit-arm-1769/README.txt +++ b/nuttx/configs/zkit-arm-1769/README.txt @@ -549,7 +549,7 @@ Where <subdir> is one of the following: apps/examples/README.txt for information about the examples. NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: @@ -569,7 +569,7 @@ Where <subdir> is one of the following: the apps/examples/thttpd application. NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: diff --git a/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c index 1c9e420a5..fec99ede6 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c +++ b/nuttx/configs/zkit-arm-1769/src/up_lcd.c @@ -146,7 +146,7 @@ FAR struct lcd_dev_s *up_lcdgetdev(int lcddev) (void)dev->setpower(dev, CONFIG_LCD_MAXPOWER); return dev; } - + return NULL; } diff --git a/nuttx/configs/zp214xpa/README.txt b/nuttx/configs/zp214xpa/README.txt index 2c0fb2585..f4bc38185 100644 --- a/nuttx/configs/zp214xpa/README.txt +++ b/nuttx/configs/zp214xpa/README.txt @@ -128,24 +128,24 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator ================================================== Downloading OpenOCD - + You can get information about OpenOCD here: http://openocd.berlios.de/web/ and you can download it from here. http://sourceforge.net/projects/openocd/files/. To get the latest OpenOCD with more mature lpc214x, you have to download from the GIT archive. - + git clone git://openocd.git.sourceforge.net/gitroot/openocd/openocd At present, there is only the older, frozen 0.4.0 version. These, of course, may have changed since I wrote this. - + Building OpenOCD under Cygwin: You can build OpenOCD for Windows using the Cygwin tools. Below are a few notes that worked as of November 7, 2010. Things may have changed by the time you read this, but perhaps the following will be helpful to you: - + 1. Install Cygwin (http://www.cygwin.com/). My recommendation is to install everything. There are many tools you will need and it is best just to waste a little disk space and have everthing you need. Everything will @@ -162,23 +162,23 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator CDM20802 WHQL Certified.zip $ mkdir ftd2xx $ cd ftd2xx - $ unzip ..CDM20802\ WHQL\ Certified.zip + $ unzip ..CDM20802\ WHQL\ Certified.zip Archive: CDM20802 WHQL Certified.zip ... 3. Get the latest OpenOCD source - + $ pwd /home/OpenOCD $ git clone git://openocd.git.sourceforge.net/gitroot/openocd/openocd - + You will then have the source code in /home/OpenOCD/openocd 4. Build OpenOCD for the FT22322 interface $ pwd /home/OpenOCD/openocd - $ ./bootstrap + $ ./bootstrap Jim is a tiny version of the Tcl scripting language. It is needed by more recent versions of OpenOCD. Build libjim.a using the following @@ -214,18 +214,18 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator I have been using the Olimex ARM-USB-OCD JTAG debugger with the ZP213X/4XPA. OpenOCD requires a configuration file. I keep the one I used last here: - + configs/zpa214xpa/tools/olimex.cfg However, the "correct" configuration script to use with OpenOCD may change as the features of OpenOCD evolve. So you should at least compare that olimex.cfg file with configuration files in /usr/local/share/openocd/scripts/target (or /home/OpenOCD/openocd/tcl/target). - + There is also a script on the tools/ directory that I use to start the OpenOCD daemon on my system called oocd.sh. That script will probably require some modifications to work in another environment: - + - Possibly the value of OPENOCD_PATH and TARGET_PATH - It assumes that the correct script to use is the one at configs/zp214xpa/tools/olimex.cfg @@ -266,11 +266,11 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator 1. Loading the symbol-file is only useful if you have built NuttX to include debug symbols (by setting CONFIG_DEBUG_SYMBOLS=y in the .config file). - + OpenOCD will support several special 'monitor' commands. These GDB commands will send comments to the OpenOCD monitor. Here are a couple that you will need to use: - + (gdb) monitor reset (gdb) monitor halt @@ -299,7 +299,7 @@ Configurations: Configuration enables only the serial NSH interfaces. NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: diff --git a/nuttx/configs/zp214xpa/src/Makefile b/nuttx/configs/zp214xpa/src/Makefile index 571b43b07..d7fabbac4 100644 --- a/nuttx/configs/zp214xpa/src/Makefile +++ b/nuttx/configs/zp214xpa/src/Makefile @@ -45,9 +45,9 @@ else CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched endif -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = +CSRCS = ifeq ($(CONFIG_LCD_UG2864AMBAG01),y) CSRCS += up_ug2864ambag01.c up_spi1.c diff --git a/nuttx/configs/zp214xpa/src/up_spi1.c b/nuttx/configs/zp214xpa/src/up_spi1.c index 35a56a426..6996109bc 100644 --- a/nuttx/configs/zp214xpa/src/up_spi1.c +++ b/nuttx/configs/zp214xpa/src/up_spi1.c @@ -52,7 +52,7 @@ * 3 SI P0.6/MOSI0/CAP0.2/AD1.0 - Alternate function 1 * 4 SO P0.5/MISO0/MAT0.1/AD0.7 - Alternate function 1 * 7 INT P1.25/EXTIN0 - Alternal function 1 - * 9 RST P1.24/TRACECLK + * 9 RST P1.24/TRACECLK * * This file provides support only for the LCD interface on SPI1. * |