diff options
1051 files changed, 3206 insertions, 3209 deletions
diff --git a/nuttx/COPYING b/nuttx/COPYING index 8acaa714c..8b294040a 100644 --- a/nuttx/COPYING +++ b/nuttx/COPYING @@ -11,14 +11,14 @@ NuttX License for NuttX in general (authorship of individual files may vary): /************************************************************************* - * + * * Copyright (C) 2007-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -32,13 +32,13 @@ License for NuttX in general (authorship of individual files may vary): * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * @@ -66,7 +66,7 @@ FAT Long File Names o "U.S. Patent 6,286,013 (http://www.google.com/patents?vid=6286013) - Method and system for providing a common name space for long and short file names in an operating system. ... - + "Many technical commentators have concluded that these patents only cover FAT implementations that include support for long filenames, and that removable solid state media and consumer devices only using short names @@ -74,7 +74,7 @@ FAT Long File Names This Wikipedia entry has been updated with recent legal decisions in favor of Microsoft. Refer to: - + http://en.wikipedia.org/wiki/File_Allocation_Table#Legal_issues So you have been forewarned: Use the long filename at your own risk! @@ -129,7 +129,7 @@ fs/nfs: ^^^^^^^ NFS: - + Copyright (c) 1989, 1991, 1993, 1995 The Regents of the University of California. All rights reserved. @@ -178,20 +178,20 @@ libc/string/lib_vikmemcpy.c Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - + 3. This notice may not be removed or altered from any source distribution. - + libc/math ^^^^^^^^^ @@ -202,11 +202,11 @@ libc/math compatible MIT license: Copyright (C) 2009-2011 Nick Johnson <nickbjohnson4224 at gmail.com> - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index 7aa8ab03c..743e0368a 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -326,7 +326,7 @@ <p> NX is organized into 6 (and perhaps someday 7 or 8) logical modules. These logical modules also correspond to the directory organization. - That NuttX directory organization is discussed in + That NuttX directory organization is discussed in <a href="#grapicsdirs">Appendix B</a> of this document. The logic modules are discussed in the following sub-paragraphs. </p> @@ -622,7 +622,7 @@ void nxgl_rectunion(FAR struct nxgl_rect_s *dest, </pre></ul> <p> <b>Description:</b> - Given two rectanges, <code>src1</code> and <code>src2</code>, return the larger rectangle that + Given two rectanges, <code>src1</code> and <code>src2</code>, return the larger rectangle that contains both, <code>dest</code>. </p> @@ -766,7 +766,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, FAR struct nxgl_trapezoid_s <b>Description:</b> In the general case, a line with width can be represented as a parallelogram with a triangle at the top and bottom. Triangles and parallelograms are both degenerate versions of a trapezoid. - This function breaks a wide line into triangles and trapezoids. + This function breaks a wide line into triangles and trapezoids. This function also detects other degenerate cases: </p> <ol> @@ -801,7 +801,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, FAR struct nxgl_trapezoid_s </p> <ul> <p> - <code>0</code>: Line successfully broken up into three trapezoids. + <code>0</code>: Line successfully broken up into three trapezoids. Values in <code>traps[0]</code>, <code>traps[1]</code>, and <code>traps[2]</code> are valid. </p> <p> @@ -1551,7 +1551,7 @@ int nx_setposition(NXWINDOW hwnd, FAR struct nxgl_point_s *pos); <ul><dl> <dt><code>hwnd</code> <dd>The handle returned by <a href="#nxopenwindow"><code>nx_openwindow()</code></a>. - This handle must not have been created by + This handle must not have been created by <a href="#nxrequestbkgd"><code>nx_requestbkgd()</code></a>. <dt><code>pos</code> <dd>The new position of the window @@ -1579,7 +1579,7 @@ int nx_setsize(NXWINDOW hwnd, FAR struct nxgl_size_s *size); <ul><dl> <dt><code>hwnd</code> <dd>The handle returned by <a href="#nxopenwindow"><code>nx_openwindow()</code></a>. - This handle must not have been created by + This handle must not have been created by <a href="#nxrequestbkgd"><code>nx_requestbkgd()</code></a>. <dt><code>size</code> <dd>The new size of the window (in pixels). @@ -1607,7 +1607,7 @@ int nx_raise(NXWINDOW hwnd); <ul><dl> <dt><code>hwnd</code> <dd>The handle returned by <a href="#nxopenwindow"><code>nx_openwindow()</code></a>. - This handle must not have been created by + This handle must not have been created by <a href="#nxrequestbkgd"><code>nx_requestbkgd()</code></a>. <dt><code></code> <dd> @@ -1635,7 +1635,7 @@ int nx_lower(NXWINDOW hwnd); <ul><dl> <dt><code>hwnd</code> <dd>The handle returned by <a href="#nxopenwindow"><code>nx_openwindow()</code></a>. - This handle must not have been created by + This handle must not have been created by <a href="#nxrequestbkgd"><code>nx_requestbkgd()</code></a>. <dt><code></code> <dd> @@ -3132,7 +3132,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <p><b>Building <code>apps/examples/nx</code></b>. Testing was performed using the Linux/Cygwin-based NuttX simulator. - Instructions are provided for building that simulation are provided in + Instructions are provided for building that simulation are provided in <a href="#testcoverage">Appendix C</a> of this document. </p> @@ -3299,7 +3299,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <dd>Specify the colors of the border used with framed windows. <dt><code>CONFIG_NXTK_BORDERCOLOR2</code> <dd>The shadow side color and so is normally darker. - <dt><code>CONFIG_NXTK_BORDERCOLOR3</code> + <dt><code>CONFIG_NXTK_BORDERCOLOR3</code> <dd>The shiny side color and so is normally brighter. The default is medium, dark, and light grey, respectively <dt><code>CONFIG_NXTK_AUTORAISE</code>: @@ -3426,7 +3426,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <dt><code>CONFIG_NXCONSOLE_NXKBDIN</code>: <dd>Take input from the NX keyboard input callback. By default, keyboard input is taken from stdin (<code>/dev/console</code>). - If this option is set, then the interface<code>nxcon_kdbin()</code> is enabled. + If this option is set, then the interface<code>nxcon_kdbin()</code> is enabled. That interface may be driven by window callback functions so that keyboard input <i>only</i> goes to the top window. <dt><code>CONFIG__NXCONSOLE_KBDBUFSIZE</code>: <dd>If <code>CONFIG_NXCONSOLE_NXKBDIN</code> is enabled, then this value may be used to @@ -3467,7 +3467,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <p> Locate a font in BDF format. There are many good BDF bitmap fonts bundled with X-11. - See <a href="http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html">this link</a>, as an example, + See <a href="http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html">this link</a>, as an example, </p> </li> <li> @@ -3703,7 +3703,7 @@ sudo ln -s libXext.so.6.4.0 libXext.so This is because the sim target is based upon some assembly language setjmp/longjmp logic that only works on 32-bit systems. </p> <p><small> - <b>NOTE</b>: There is a workaround in this case: + <b>NOTE</b>: There is a workaround in this case: You can build for 32-bit execution on a 64-bit machine by adding <code>-m3</code> to the <code>CFLAGS</code> and <code>-m32 -m elf_i386</code> to the <code>LDFLAGS</code>. See the patch file <code>0001-Quick-hacks-to-build-sim-nsh-ostest-on-x86_64-as-32-.patch</code> that can be found in NuttX <a href="http://tech.groups.yahoo.com/group/nuttx/files">files</a>. diff --git a/nuttx/Documentation/NXOrganization.gif b/nuttx/Documentation/NXOrganization.gif Binary files differindex 6bae8e552..1039d30bd 100644 --- a/nuttx/Documentation/NXOrganization.gif +++ b/nuttx/Documentation/NXOrganization.gif diff --git a/nuttx/Documentation/NuttX2-a.png b/nuttx/Documentation/NuttX2-a.png Binary files differindex 20c2fd6e7..f0b1abfd2 100644 --- a/nuttx/Documentation/NuttX2-a.png +++ b/nuttx/Documentation/NuttX2-a.png diff --git a/nuttx/Documentation/NuttXBinfmt.html b/nuttx/Documentation/NuttXBinfmt.html index 0dd566587..3f3bdbc0a 100644 --- a/nuttx/Documentation/NuttXBinfmt.html +++ b/nuttx/Documentation/NuttXBinfmt.html @@ -107,7 +107,7 @@ <h2>2.1 <a name="binfmthdr">Binary Loader Header Files</a></h2> <p> - The interface to the binary loader is described in the header file + The interface to the binary loader is described in the header file <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/include/nuttx/binfmt/binfmt.h"> <code>include/nuttx/binfmt/binfmt.h</code></a>. A brief summary of the data structurs and interfaces prototyped in that header file are listed below. @@ -457,7 +457,7 @@ void exepath_release(EXEPATH_HANDLE handle); <h2>3.1 <a name="symtabhdr">Symbol Table Header Files</a></h2> <p> - The interface to the symbol table logic is described in the header file + The interface to the symbol table logic is described in the header file <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/include/nuttx/binfmt/symtab.h"> <code>include/nuttx/binfmt/symtab.h</code></a>. A brief summary of the data structurs and interfaces prototyped in that header file are listed below. @@ -477,7 +477,7 @@ struct symtab_s </pre></ul> </p> - A symbol table is a fixed size array of <code>struct symtab_s</code>. + A symbol table is a fixed size array of <code>struct symtab_s</code>. The information is intentionally minimal and supports only: </p> <ol> diff --git a/nuttx/Documentation/NuttXCCodingStandard.html b/nuttx/Documentation/NuttXCCodingStandard.html index 0693efc50..4cb4a9517 100755 --- a/nuttx/Documentation/NuttXCCodingStandard.html +++ b/nuttx/Documentation/NuttXCCodingStandard.html @@ -136,7 +136,7 @@ </p> <ul> <li> - A line that consists of the opening C comment (<code>/*</code>) followed by a series of asterisks extending to the length of the line (usually to column 78). + A line that consists of the opening C comment (<code>/*</code>) followed by a series of asterisks extending to the length of the line (usually to column 78). </li> <li> The name of the grouping, starting at column 4. @@ -310,7 +310,7 @@ /* The forward link to the next instance of struct * some_long_struct_name_s in a singly linked list */ - + struct some_long_struct_name_s *flink; int short_name1; /* Short comment 1 */ int short_name2; /* This is a very long comment describing subtle @@ -2157,7 +2157,7 @@ x++; { ptr++; } - + </ul></pre></font> </td></tr> </table></center> diff --git a/nuttx/Documentation/NuttXDemandPaging.html b/nuttx/Documentation/NuttXDemandPaging.html index e1ef29b24..2e1ebaf3e 100644 --- a/nuttx/Documentation/NuttXDemandPaging.html +++ b/nuttx/Documentation/NuttXDemandPaging.html @@ -243,7 +243,7 @@ </li> <li> <b>Boost the page fill worker thread priority</b>. - Check the priority of the task at the head of the <code>g_waitingforfill</code> list. + Check the priority of the task at the head of the <code>g_waitingforfill</code> list. If the priority of that task is higher than the current priority of the page fill worker thread, then boost the priority of the page fill worker thread to that priority. Thus, the page fill worker thread will always run at the priority of the highest priority task that is waiting for a fill. </li> @@ -370,7 +370,7 @@ The architecture-specific functions, <code>up_checkmapping()</code>, <code>up_allocpage(tcb, &vpage)</code> and <code>up_fillpage(page, pg_callback)</code> will be prototyped in <code>include/nuttx/arch.h</code> </p> - + <a name="FillComplete"><h2>Fill Complete</h2></a> <p> @@ -379,7 +379,7 @@ <p> For the non-blocking <code>up_fillpage()</code>, the architecture-specific driver call the <code>pg_callback()</code> that was provided to <code>up_fillpage()</code> when the fill completes. In this case, the <code>pg_callback()</code> will probably be called from driver interrupt-level logic. - The driver will provide the result of the fill as an argument to the callback function. + The driver will provide the result of the fill as an argument to the callback function. NOTE: <code>pg_callback()</code> must also be <a href="#MemoryOrg">locked</a> in memory. </p> <p> @@ -404,7 +404,7 @@ </li> </ul> </p> - + <a name="TaskResumption"><h2>Task Resumption</h2></a> <p> @@ -600,7 +600,7 @@ <li> In the first phase, create a partially linked objected containing all interrupt/exception handling logic, the page fill worker thread plus all parts of the IDLE thread (which must always be available for execution). </li> - <li> + <li> All of the <code>.text</code> and <code>.rodata</code> sections of this partial link should be collected into a single section. </li> <li> @@ -625,7 +625,7 @@ The currently executing task at the head of the ready to run list must be stopped. Save its context and move it to the inactive list specified by task_state. This function is called by the on-demand paging logic in order to block the task that requires the - page fill, and to + page fill, and to </dd> <dt> <code>void up_unblock_task(FAR struct tcb_s *tcb);</code> @@ -671,4 +671,4 @@ </dl></ul> </body> </html> - + diff --git a/nuttx/Documentation/NuttXNxFlat.html b/nuttx/Documentation/NuttXNxFlat.html index 55280ad44..2036cc723 100644 --- a/nuttx/Documentation/NuttXNxFlat.html +++ b/nuttx/Documentation/NuttXNxFlat.html @@ -229,7 +229,7 @@ <li><b>Read-Only Data in RAM</b> <ul> <p> - With older GCC compilers (at least up to 4.3.3), read-only data must reside in RAM. + With older GCC compilers (at least up to 4.3.3), read-only data must reside in RAM. In code generated by GCC, all data references are indexed by the PIC<sup>2</sup> base register (that is usually R10 or <i>sl</i> for the ARM processors). The includes read-only data (<code>.rodata</code>). Embedded firmware developers normally like to keep <code>.rodata</code> in FLASH with the code sections. @@ -304,7 +304,7 @@ <p> In order to use NXFLAT, you must use special NXFLAT tools to create the binary module in FLASH. To do this, you will need to download the buildroot package and build it on your Linux or Cygwin machine. - The buildroot can be downloaded from + The buildroot can be downloaded from <a https://sourceforge.net/projects/nuttx/files/">Sourceforge</a>. You will need version 0.1.7 or later. </p> @@ -486,7 +486,7 @@ cat ../syscall/syscall.csv ../libc/lib.csv | sort >tmp.csv <p><b>Target 1</b>. This target links all of the module's object files together into one relocatable object. Two relocatable objects will be generated; this is the first one (hence, the suffic <code>.r1</code>). - In this "Hello, World!" case, there is only a single object file, <code>hello.o</code>, + In this "Hello, World!" case, there is only a single object file, <code>hello.o</code>, that is linked to produce the <code>hello.r1</code> object. </p> @@ -553,7 +553,7 @@ cat ../syscall/syscall.csv ../libc/lib.csv | sort >tmp.csv <p><b>Relevant Header Files:</b></p> <ul> <li> - The interface to the binary loader is described in the header file + The interface to the binary loader is described in the header file <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/include/nuttx/binfmt/binfmt.h"> <code>include/nuttx/binfmt/binfmt.h</code></a>. A brief summary of the APIs prototyped in that header file are listed below. @@ -787,7 +787,7 @@ cat ../syscall/syscall.csv ../libc/lib.csv | sort >tmp.csv The PIC base register needs to point to the base of the <code>.got</code> and only addresses in the <code>.got</code>, <code>.data</code>, and <code>.bss</code> sections can be accessed as an offset from the PIC base register. - See also this + See also this <a href="http://xflat.cvs.sourceforge.net/viewvc/*checkout*/xflat/xflat/gcc/README?revision=1.1.1.1">XFLAT discussion</a>. </p> <p> diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 5155294c5..dad21f6cd 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -1620,7 +1620,7 @@ The system can be re-made subsequently by just typing <code>make</code>. <p> There is also a <code>arch/<architecture>/include/<chip>/chip.h</code> header file that can be used to communicate other microprocessor-specific information between the board logic and even application logic. Application logic may, for example, need to know specific capabilities of the chip. - Prototypes in that <code>chip.h</code> header file should follow the microprocessor-specific naming convention. + Prototypes in that <code>chip.h</code> header file should follow the microprocessor-specific naming convention. </p> </li> <li> diff --git a/nuttx/Documentation/UsbTrace.html b/nuttx/Documentation/UsbTrace.html index 767b58736..7efb7ebcc 100644 --- a/nuttx/Documentation/UsbTrace.html +++ b/nuttx/Documentation/UsbTrace.html @@ -107,7 +107,7 @@ </p> <ul> <li> - For the USB serial and mass storage class, the 8-bit event data is provided in <code>include/nuttx/usb/usbdev_trace.h</code>. + For the USB serial and mass storage class, the 8-bit event data is provided in <code>include/nuttx/usb/usbdev_trace.h</code>. </li> <li> For the USB device driver, that 8-bit event data is provided within the USB device driver itself. diff --git a/nuttx/Documentation/pm.png b/nuttx/Documentation/pm.png Binary files differindex d84d8642d..febece0f5 100644 --- a/nuttx/Documentation/pm.png +++ b/nuttx/Documentation/pm.png diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix index 1b123bd62..b4a4fbbf8 100644 --- a/nuttx/Makefile.unix +++ b/nuttx/Makefile.unix @@ -707,12 +707,12 @@ download: $(BIN) # pass1dep: Create pass1 build dependencies # pass2dep: Create pass2 build dependencies -pass1dep: context tools/mkdeps$(HOSTEXEEXT) +pass1dep: context tools/mkdeps$(HOSTEXEEXT) $(Q) for dir in $(USERDEPDIRS) ; do \ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \ done -pass2dep: context tools/mkdeps$(HOSTEXEEXT) +pass2dep: context tools/mkdeps$(HOSTEXEEXT) $(Q) for dir in $(KERNDEPDIRS) ; do \ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" EXTRADEFINES=$(KDEFINE) depend; \ done diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes index be8747902..fea3eb3a5 100644 --- a/nuttx/ReleaseNotes +++ b/nuttx/ReleaseNotes @@ -5923,7 +5923,7 @@ Additional new features and extended functionality: * TI Tiva TMC4C123G: - Added architecture support for the TI Tiva TM4C123G parts. This was - merged into the existing support for the LM3S and LM4F families. + merged into the existing support for the LM3S and LM4F families. All directory, file, and function references changed from lm to tiva. * TI Tiva TMC4C123G Board Support: @@ -5949,7 +5949,7 @@ Additional new features and extended functionality: * Documentation: - - Added a coding standards document. See + - Added a coding standards document. See http://www.nuttx.org/doku.php?id=documentation:codingstandard * Configuration/Build System: @@ -6013,7 +6013,7 @@ Bugfixes (see the ChangeLog for details). Some of these are very important: - Fix one place where the connection reference count was not being decremented in the socket close() logic. This is really a cosmetic change BUT when CONFIG_DEBUG_NET is enabled, it will cause assertions. - - Backed out a small part of the NuttX 6.33 write buffering changed. + - Backed out a small part of the NuttX 6.33 write buffering changed. David G says that this causes problems in connecting to a server. - In DHCPD, there was a place where the logic was calling ntohl() inappropriately; the address was already in the correct order. How @@ -6054,7 +6054,7 @@ Bugfixes (see the ChangeLog for details). Some of these are very important: * Configuration/Build System: - - Several changes to restore the broken native Windows build + - Several changes to restore the broken native Windows build * NuttShell (NSH): diff --git a/nuttx/TODO b/nuttx/TODO index cb2324dd4..29cea8ef6 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -1254,9 +1254,9 @@ o File system / Generic drivers (fs/, drivers/) AtEsT.tXt aTeSt.TxT nsh> cat /tmp/aTeSt.TxT - Test2 + Test2 nsh> cat /tmp/AtEsT.tXt - Test1 + Test1 Status: Open Priority: Low diff --git a/nuttx/arch/8051/include/irq.h b/nuttx/arch/8051/include/irq.h index ce6334dd0..da7513530 100644 --- a/nuttx/arch/8051/include/irq.h +++ b/nuttx/arch/8051/include/irq.h @@ -160,7 +160,7 @@ struct xcptcontext uint8_t nbytes; - /* This is the saved stack. Space is allocated for the + /* This is the saved stack. Space is allocated for the * entire 256 byte IRAM (minus register and bit usage at * the beginning). */ diff --git a/nuttx/arch/8051/include/limits.h b/nuttx/arch/8051/include/limits.h index fd8c086aa..5c8116e07 100644 --- a/nuttx/arch/8051/include/limits.h +++ b/nuttx/arch/8051/include/limits.h @@ -33,8 +33,8 @@ * ************************************************************/ -#ifndef __ARCH_8051_INCLUDE_LIMITS_H -#define __ARCH_8051_INCLUDE_LIMITS_H +#ifndef __ARCH_8051_INCLUDE_LIMITS_H +#define __ARCH_8051_INCLUDE_LIMITS_H /************************************************************ * Included Files diff --git a/nuttx/arch/8051/include/types.h b/nuttx/arch/8051/include/types.h index 4a528c7d0..a3865e978 100644 --- a/nuttx/arch/8051/include/types.h +++ b/nuttx/arch/8051/include/types.h @@ -37,8 +37,8 @@ * only indirectly through sys/types.h */ -#ifndef __ARCH_8051_INCLUDE_TYPES_H -#define __ARCH_8051_INCLUDE_TYPES_H +#ifndef __ARCH_8051_INCLUDE_TYPES_H +#define __ARCH_8051_INCLUDE_TYPES_H /************************************************************************ * Included Files diff --git a/nuttx/arch/8051/src/Makefile.sdccl b/nuttx/arch/8051/src/Makefile.sdccl index e90ef23e9..ee6fc69e3 100644 --- a/nuttx/arch/8051/src/Makefile.sdccl +++ b/nuttx/arch/8051/src/Makefile.sdccl @@ -200,7 +200,7 @@ up_mem.h: pass1.mem libarch$(LIBEXT): up_mem.h $(OBJS) $(call ARCHIVE, $@, $(OBJS)) -# This builds the libboard library in the board/ subdirectory +# This builds the libboard library in the board/ subdirectory board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/nuttx/arch/8051/src/up_blocktask.c b/nuttx/arch/8051/src/up_blocktask.c index 018577477..1ae7a78a4 100644 --- a/nuttx/arch/8051/src/up_blocktask.c +++ b/nuttx/arch/8051/src/up_blocktask.c @@ -131,7 +131,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) up_saveirqcontext(&tcb->xcp); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -152,7 +152,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) else if (!up_savecontext(&rtcb->xcp)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/8051/src/up_head.S b/nuttx/arch/8051/src/up_head.S index ee39cd54d..d4e2ba6e7 100644 --- a/nuttx/arch/8051/src/up_head.S +++ b/nuttx/arch/8051/src/up_head.S @@ -178,7 +178,7 @@ _up_timer0: push ie clr ea - /* Save the remaining registers with interrupts disabled + /* Save the remaining registers with interrupts disabled * * a, ie, and dptr go on the stack. */ @@ -232,7 +232,7 @@ _up_interrupt: push ie clr ea - /* Save the remaining registers with interrupts disabled + /* Save the remaining registers with interrupts disabled * * a, ie, and dptr go on the stack. */ diff --git a/nuttx/arch/8051/src/up_initialize.c b/nuttx/arch/8051/src/up_initialize.c index d812552a6..30c17053f 100644 --- a/nuttx/arch/8051/src/up_initialize.c +++ b/nuttx/arch/8051/src/up_initialize.c @@ -86,7 +86,7 @@ FAR struct xcptcontext *g_irqcontext; * to comput them. */ -const uint8_t g_ntobit[8] = +const uint8_t g_ntobit[8] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; /************************************************************************ diff --git a/nuttx/arch/8051/src/up_irqtest.c b/nuttx/arch/8051/src/up_irqtest.c index 21b558c67..be8f6d00b 100644 --- a/nuttx/arch/8051/src/up_irqtest.c +++ b/nuttx/arch/8051/src/up_irqtest.c @@ -72,7 +72,7 @@ bool g_irqtest; volatile uint8_t g_irqtos; uint8_t g_irqregs[REGS_SIZE]; int g_nirqs; -FAR struct xcptcontext *g_irqcontext; +FAR struct xcptcontext *g_irqcontext; /************************************************************************ * Private Functions diff --git a/nuttx/arch/8051/src/up_putc.c b/nuttx/arch/8051/src/up_putc.c index 66979ce4a..bf2edb5e1 100644 --- a/nuttx/arch/8051/src/up_putc.c +++ b/nuttx/arch/8051/src/up_putc.c @@ -76,6 +76,6 @@ int up_putc(int ch) { _up_putc('\r'); } - return ch; + return ch; } diff --git a/nuttx/arch/8051/src/up_releasepending.c b/nuttx/arch/8051/src/up_releasepending.c index 0d87608cf..e26b4bcbb 100644 --- a/nuttx/arch/8051/src/up_releasepending.c +++ b/nuttx/arch/8051/src/up_releasepending.c @@ -98,7 +98,7 @@ void up_release_pending(void) up_saveirqcontext(&rtcb->xcp); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -114,13 +114,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if up_savecontext returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!up_savecontext(&rtcb->xcp)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/8051/src/up_reprioritizertr.c b/nuttx/arch/8051/src/up_reprioritizertr.c index 649db3a43..2807b1141 100644 --- a/nuttx/arch/8051/src/up_reprioritizertr.c +++ b/nuttx/arch/8051/src/up_reprioritizertr.c @@ -70,7 +70,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -153,7 +153,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) up_saveirqcontext(&tcb->xcp); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -174,7 +174,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) else if (!up_savecontext(&rtcb->xcp)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/8051/src/up_restorecontext.c b/nuttx/arch/8051/src/up_restorecontext.c index d1aaae182..6966866ee 100644 --- a/nuttx/arch/8051/src/up_restorecontext.c +++ b/nuttx/arch/8051/src/up_restorecontext.c @@ -276,7 +276,7 @@ void up_restorecontext(FAR struct xcptcontext *context) __naked /* Restore registers from the new stack */ pop dph - pop dpl + pop dpl /* Restore the interrupt state per the stored IE value */ diff --git a/nuttx/arch/8051/src/up_unblocktask.c b/nuttx/arch/8051/src/up_unblocktask.c index 621c8a783..d285ddbd2 100644 --- a/nuttx/arch/8051/src/up_unblocktask.c +++ b/nuttx/arch/8051/src/up_unblocktask.c @@ -112,7 +112,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (g_irqtos) @@ -123,7 +123,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) up_saveirqcontext(&rtcb->xcp); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -138,7 +138,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) } /* We are not in an interrupt andler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_savecontext returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/README.txt b/nuttx/arch/README.txt index d70db1179..e7ef76ddf 100644 --- a/nuttx/arch/README.txt +++ b/nuttx/arch/README.txt @@ -171,7 +171,7 @@ arch/arm - ARM-based micro-controllers is complete on the basic port (timer, serial console, SPI). arch/arm/include/lm and arch/arm/src/lm - These directories contain support for the Luminary LM3S/4F family. The + These directories contain support for the Luminary LM3S/4F family. The initial, release of this port was included in NuttX version 0.4.6. The current port includes timer, serial console, Ethernet, SSI, and microSD support. There are working configurations the NuttX OS test, to run the @@ -211,7 +211,7 @@ arch/arm - ARM-based micro-controllers STATUS: The basic AT91SAM3U port was released in NuttX version 5.1. The basic port includes boot-up logic, interrupt driven serial console, and system timer interrupts. That release passes the - NuttX OS test and is proven to have a valid OS implementation. A + NuttX OS test and is proven to have a valid OS implementation. A onfiguration to support the NuttShell is also included. arch/arm/include/stm32 and arch/arm/src/stm32 diff --git a/nuttx/arch/arm/include/a1x/a10_irq.h b/nuttx/arch/arm/include/a1x/a10_irq.h index 4cd291d20..29dbb5452 100644 --- a/nuttx/arch/arm/include/a1x/a10_irq.h +++ b/nuttx/arch/arm/include/a1x/a10_irq.h @@ -48,7 +48,7 @@ * Pre-Processor Definitions ****************************************************************************************/ -/* External interrupts numbers */ +/* External interrupts numbers */ #define A1X_IRQ_NMI 0 /* External Non-Mask Interrupt */ # define A1X_IRQ_POWER 0 /* Power module */ diff --git a/nuttx/arch/arm/include/armv7-a/irq.h b/nuttx/arch/arm/include/armv7-a/irq.h index 09880f450..2f90e7499 100755 --- a/nuttx/arch/arm/include/armv7-a/irq.h +++ b/nuttx/arch/arm/include/armv7-a/irq.h @@ -60,7 +60,7 @@ * (1) stmia rx, {r0-r14} * (2) then the PC and CPSR * - * This results in the following set of indices that can be used to access + * This results in the following set of indices that can be used to access * individual registers in the xcp.regs array: */ diff --git a/nuttx/arch/arm/include/armv7-m/irq_cmnvector.h b/nuttx/arch/arm/include/armv7-m/irq_cmnvector.h index bc67004ed..8a577d491 100644 --- a/nuttx/arch/arm/include/armv7-m/irq_cmnvector.h +++ b/nuttx/arch/arm/include/armv7-m/irq_cmnvector.h @@ -70,7 +70,7 @@ #ifdef CONFIG_ARCH_FPU /* If the MCU supports a floating point unit, then it will be necessary - * to save the state of the non-volatile registers before calling code + * to save the state of the non-volatile registers before calling code * that may save and overwrite them. */ diff --git a/nuttx/arch/arm/include/elf.h b/nuttx/arch/arm/include/elf.h index 21b2c1c2c..9928a85a7 100644 --- a/nuttx/arch/arm/include/elf.h +++ b/nuttx/arch/arm/include/elf.h @@ -64,7 +64,7 @@ #define EF_ARM_EABI_VER4 0x04000000 #define EF_ARM_EABI_VER5 0x05000000 -#define EF_ARM_BE8 0x00800000 +#define EF_ARM_BE8 0x00800000 /* Table 4-4, Processor specific section types */ diff --git a/nuttx/arch/arm/include/lpc2378/irq.h b/nuttx/arch/arm/include/lpc2378/irq.h index 807c99119..de580c68b 100644 --- a/nuttx/arch/arm/include/lpc2378/irq.h +++ b/nuttx/arch/arm/include/lpc2378/irq.h @@ -56,7 +56,7 @@ /**************************************************************************** * Definitions ****************************************************************************/ - + /* LPC2378 Interrupts */ #define WDT_IRQ 0 /* Watchdog */ diff --git a/nuttx/arch/arm/include/lpc43xx/irq.h b/nuttx/arch/arm/include/lpc43xx/irq.h index 37c1e9c29..88b83390f 100644 --- a/nuttx/arch/arm/include/lpc43xx/irq.h +++ b/nuttx/arch/arm/include/lpc43xx/irq.h @@ -51,7 +51,7 @@ /******************************************************************************************** * Pre-processor Definitions ********************************************************************************************/ - + /* IRQ numbers. The IRQ number corresponds vector number and hence map directly to bits in * the NVIC. This does, however, waste several words of memory in the IRQ to handle mapping * tables. diff --git a/nuttx/arch/arm/include/nuc1xx/nuc120_irq.h b/nuttx/arch/arm/include/nuc1xx/nuc120_irq.h index 5dcd1606c..8b04167f3 100644 --- a/nuttx/arch/arm/include/nuc1xx/nuc120_irq.h +++ b/nuttx/arch/arm/include/nuc1xx/nuc120_irq.h @@ -82,7 +82,7 @@ #define NUC_IRQ_ADC (45) /* ADC */ /* 46: Reserved */ #define NUC_IRQ_RTC (47) /* Real time clock */ - + #define NR_IRQS (48) /************************************************************************************ diff --git a/nuttx/arch/arm/include/sama5/chip.h b/nuttx/arch/arm/include/sama5/chip.h index 92a8ca2a4..709bf6c46 100644 --- a/nuttx/arch/arm/include/sama5/chip.h +++ b/nuttx/arch/arm/include/sama5/chip.h @@ -46,7 +46,7 @@ * Pre-processor Definitions ****************************************************************************************************/ /* SAMA5D3 Family - * + * * ATSAMA5D31 ATSAMA5D33 ATSAMA5D34 ATSAMA5D35 ATSAMA5D36 * ------------------------- ------------- ------------- ------------- ------------- ------------- * Pin Count 324 324 324 324 324 diff --git a/nuttx/arch/arm/src/a1x/a1x_pio.c b/nuttx/arch/arm/src/a1x/a1x_pio.c index cd1167b34..9817314df 100644 --- a/nuttx/arch/arm/src/a1x/a1x_pio.c +++ b/nuttx/arch/arm/src/a1x/a1x_pio.c @@ -113,7 +113,7 @@ static int a1x_pio_interrupt(int irq, void *context) int irq; /* Read the set of pending GPIO interrupts */ - + status = getreg32(A1X_PIO_INT_STA); mask = getreg32(A1X_PIO_INT_CTL); pending = status & mask; diff --git a/nuttx/arch/arm/src/a1x/a1x_timerisr.c b/nuttx/arch/arm/src/a1x/a1x_timerisr.c index 4e35af9d4..5487b7252 100644 --- a/nuttx/arch/arm/src/a1x/a1x_timerisr.c +++ b/nuttx/arch/arm/src/a1x/a1x_timerisr.c @@ -120,7 +120,7 @@ void up_timerinit(void) uint32_t regval; /* Set the timer reload interval value */ - + putreg32(TMR_INTERVAL, A1X_TMR0_INTV_VALUE); /* Configure timer 0: diff --git a/nuttx/arch/arm/src/arm/arm.h b/nuttx/arch/arm/src/arm/arm.h index 2ad31fc46..68036ef2e 100644 --- a/nuttx/arch/arm/src/arm/arm.h +++ b/nuttx/arch/arm/src/arm/arm.h @@ -332,7 +332,7 @@ static inline unsigned int get_cp15c3(void) * ARM926EJ-S operation: Invalidate set-associative * Data: Should be zero */ - + static inline void tlb_invalidate(void) { unsigned int sbz = 0; diff --git a/nuttx/arch/arm/src/arm/pg_macros.h b/nuttx/arch/arm/src/arm/pg_macros.h index e461ced41..622b14202 100644 --- a/nuttx/arch/arm/src/arm/pg_macros.h +++ b/nuttx/arch/arm/src/arm/pg_macros.h @@ -183,7 +183,7 @@ * larger than the size of the physical paged region. That is the * core of what the On-Demanding Paging feature provides. */ - + #define PG_L1_PAGED_PADDR (PGTABLE_BASE_PADDR + ((PG_PAGED_VBASE >> 20) << 2)) #define PG_L1_PAGED_VADDR (PGTABLE_BASE_VADDR + ((PG_PAGED_VBASE >> 20) << 2)) @@ -261,10 +261,10 @@ /* Case 2: Vectors are in low memory and the locked text region starts at * the beginning of SRAM (which will be aliased to address 0x00000000). * However, the beginning of SRAM may not be aligned to the beginning - * of the L2 page table (because the beginning of RAM is offset into + * of the L2 page table (because the beginning of RAM is offset into * the table. */ - + #elif defined(CONFIG_ARCH_LOWVECTORS) && !defined(CONFIG_PAGING_LOCKED_PBASE) # define PG_VECT_PBASE PG_LOCKED_PBASE # define PG_L2_VECT_OFFSET (((PG_LOCKED_VBASE & 0x000fffff) >> PAGESHIFT) << 2) @@ -327,7 +327,7 @@ * text region (the address at the beginning of * the page). * PG_POOL_MAXL2NDX - This is the maximum value+1 of such an index. - * + * * PG_POOL_PGPADDR(ndx) - Converts an page index into the corresponding * (physical) address of the backing page memory. * PG_POOL_PGVADDR(ndx) - Converts an page index into the corresponding @@ -340,7 +340,7 @@ * written. */ -#define PG_POOL_VA2L1OFFSET(va) (((va) >> 20) << 2) +#define PG_POOL_VA2L1OFFSET(va) (((va) >> 20) << 2) #define PG_POOL_VA2L1VADDR(va) (PGTABLE_BASE_VADDR + PG_POOL_VA2L1OFFSET(va)) #define PG_POOL_L12PPTABLE(L1) ((L1) & PG_L1_PADDRMASK) #define PG_POOL_L12VPTABLE(L1) (PG_POOL_L12PPTABLE(L1) - PGTABLE_BASE_PADDR + PGTABLE_BASE_VADDR) @@ -442,7 +442,7 @@ * follows: * * ldr r0, =PG_L1_PGTABLE_PADDR <-- Address in the L1 table - * ldr r1, =PG_L2_PGTABLE_PADDR <-- Physical address of L2 page table + * ldr r1, =PG_L2_PGTABLE_PADDR <-- Physical address of L2 page table * ldr r2, =PG_PGTABLE_NPAGES <-- Total number of pages * ldr r3, =PG_PGTABLE_NPAGE1 <-- Number of pages in the first PTE * ldr r4, =MMU_L1_PGTABFLAGS <-- L1 MMU flags diff --git a/nuttx/arch/arm/src/arm/up_allocpage.c b/nuttx/arch/arm/src/arm/up_allocpage.c index 8ec99b09c..da3c441f3 100644 --- a/nuttx/arch/arm/src/arm/up_allocpage.c +++ b/nuttx/arch/arm/src/arm/up_allocpage.c @@ -171,7 +171,7 @@ int up_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) uintptr_t paddr; uint32_t *pte; unsigned int pgndx; - + /* Since interrupts are disabled, we don't need to anything special. */ DEBUGASSERT(tcb && vpage); @@ -199,7 +199,7 @@ int up_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) if (g_pgwrap) { /* Yes.. Get a pointer to the L2 entry corresponding to the previous - * mapping -- then zero it! + * mapping -- then zero it! */ uintptr_t oldvaddr = PG_POOL_NDX2VA(g_ptemap[pgndx]); @@ -214,7 +214,7 @@ int up_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) * case: The I-Cache uses a virtual address index and, hence, since the * NuttX address space is flat, the cached instruction value should be * correct even if the page mapping is no longer in place. - */ + */ } /* Then convert the index to a (physical) page address. */ @@ -231,7 +231,7 @@ int up_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) *pte = (paddr | MMU_L2_ALLOCFLAGS); /* And save the new L1 index */ - + g_ptemap[pgndx] = PG_POOL_VA2L2NDX(vaddr); /* Finally, return the virtual address of allocated page */ diff --git a/nuttx/arch/arm/src/arm/up_blocktask.c b/nuttx/arch/arm/src/arm/up_blocktask.c index 04caa4481..d0e35e558 100644 --- a/nuttx/arch/arm/src/arm/up_blocktask.c +++ b/nuttx/arch/arm/src/arm/up_blocktask.c @@ -130,7 +130,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -148,7 +148,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/arm/up_cache.S b/nuttx/arch/arm/src/arm/up_cache.S index 74f337e95..e03099ce0 100644 --- a/nuttx/arch/arm/src/arm/up_cache.S +++ b/nuttx/arch/arm/src/arm/up_cache.S @@ -88,7 +88,7 @@ * Wait for interrupt SBZ MCR p15, 0, <Rd>, c7, c0, 4 */ -/* Esure coherency between the Icache and the Dcache in the region described +/* Esure coherency between the Icache and the Dcache in the region described * by r0=start and r1=end. Cleans the corresponding D-cache lines and invalidates * the corresponding I-Cache lines. */ diff --git a/nuttx/arch/arm/src/arm/up_dataabort.c b/nuttx/arch/arm/src/arm/up_dataabort.c index d5e652856..2b05abdeb 100644 --- a/nuttx/arch/arm/src/arm/up_dataabort.c +++ b/nuttx/arch/arm/src/arm/up_dataabort.c @@ -56,7 +56,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ @@ -139,7 +139,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) * the exception occurred, this address was provided in the FAR register. * (It has not yet been saved in the register context save area). */ - + pgllvdbg("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND); if (far < PG_PAGED_VBASE || far >= PG_PAGED_VEND) { diff --git a/nuttx/arch/arm/src/arm/up_prefetchabort.c b/nuttx/arch/arm/src/arm/up_prefetchabort.c index c75a92a49..ae8af72bc 100644 --- a/nuttx/arch/arm/src/arm/up_prefetchabort.c +++ b/nuttx/arch/arm/src/arm/up_prefetchabort.c @@ -56,7 +56,7 @@ /* Debug ********************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/arm/src/arm/up_releasepending.c b/nuttx/arch/arm/src/arm/up_releasepending.c index 169262e95..215397706 100644 --- a/nuttx/arch/arm/src/arm/up_releasepending.c +++ b/nuttx/arch/arm/src/arm/up_releasepending.c @@ -97,7 +97,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -111,13 +111,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if up_saveusercontext returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/arm/up_reprioritizertr.c b/nuttx/arch/arm/src/arm/up_reprioritizertr.c index 9d898ed7b..cd5955c24 100644 --- a/nuttx/arch/arm/src/arm/up_reprioritizertr.c +++ b/nuttx/arch/arm/src/arm/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -171,7 +171,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/arm/up_syscall.c b/nuttx/arch/arm/src/arm/up_syscall.c index db3231646..35f7027dd 100644 --- a/nuttx/arch/arm/src/arm/up_syscall.c +++ b/nuttx/arch/arm/src/arm/up_syscall.c @@ -50,7 +50,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/arm/src/arm/up_unblocktask.c b/nuttx/arch/arm/src/arm/up_unblocktask.c index 2e373f38e..64536d959 100644 --- a/nuttx/arch/arm/src/arm/up_unblocktask.c +++ b/nuttx/arch/arm/src/arm/up_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -132,7 +132,7 @@ void up_unblock_task(struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_saveusercontext returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/arm/src/arm/up_undefinedinsn.c b/nuttx/arch/arm/src/arm/up_undefinedinsn.c index dd4f15e35..fa0da7352 100644 --- a/nuttx/arch/arm/src/arm/up_undefinedinsn.c +++ b/nuttx/arch/arm/src/arm/up_undefinedinsn.c @@ -48,7 +48,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/arm/src/arm/up_vectors.S b/nuttx/arch/arm/src/arm/up_vectors.S index 1dfdf623c..a167b1726 100644 --- a/nuttx/arch/arm/src/arm/up_vectors.S +++ b/nuttx/arch/arm/src/arm/up_vectors.S @@ -156,7 +156,7 @@ up_vectorirq: /************************************************************************************ * Function: up_vectorswi - * + * * Description: * SWI interrupt. We enter the SWI in SVC mode. * diff --git a/nuttx/arch/arm/src/arm/vfork.S b/nuttx/arch/arm/src/arm/vfork.S index 7c3c8b727..2f0edac82 100644 --- a/nuttx/arch/arm/src/arm/vfork.S +++ b/nuttx/arch/arm/src/arm/vfork.S @@ -64,7 +64,7 @@ * undefined if the process created by vfork() either modifies any data other than * a variable of type pid_t used to store the return value from vfork(), or returns * from the function in which vfork() was called, or calls any other function before - * successfully calling _exit() or one of the exec family of functions. + * successfully calling _exit() or one of the exec family of functions. * * This thin layer implements vfork by simply calling up_vfork() with the vfork() * context as an argument. The overall sequence is: @@ -93,7 +93,7 @@ * Upon successful completion, vfork() returns 0 to the child process and returns * the process ID of the child process to the parent process. Otherwise, -1 is * returned to the parent, no child process is created, and errno is set to - * indicate the error. + * indicate the error. * ************************************************************************************/ diff --git a/nuttx/arch/arm/src/armv6-m/nvic.h b/nuttx/arch/arm/src/armv6-m/nvic.h index d088d7827..945d5c433 100644 --- a/nuttx/arch/arm/src/armv6-m/nvic.h +++ b/nuttx/arch/arm/src/armv6-m/nvic.h @@ -368,7 +368,7 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" +extern "C" { #else #define EXTERN extern diff --git a/nuttx/arch/arm/src/armv6-m/up_blocktask.c b/nuttx/arch/arm/src/armv6-m/up_blocktask.c index 57db2b4aa..c51308cfc 100644 --- a/nuttx/arch/arm/src/armv6-m/up_blocktask.c +++ b/nuttx/arch/arm/src/armv6-m/up_blocktask.c @@ -129,7 +129,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv6-m/up_elf.c b/nuttx/arch/arm/src/armv6-m/up_elf.c index 367c93515..d24641005 100644 --- a/nuttx/arch/arm/src/armv6-m/up_elf.c +++ b/nuttx/arch/arm/src/armv6-m/up_elf.c @@ -296,7 +296,7 @@ int arch_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, S = (offset >> 24) & 1; J1 = S ^ (~(offset >> 23) & 1); J2 = S ^ (~(offset >> 22) & 1); - + upper_insn = ((upper_insn & 0xf800) | (S << 10) | ((offset >> 12) & 0x03ff)); *(uint16_t*)addr = (uint16_t)upper_insn; diff --git a/nuttx/arch/arm/src/armv6-m/up_initialstate.c b/nuttx/arch/arm/src/armv6-m/up_initialstate.c index 62c1d2780..6dc000d12 100644 --- a/nuttx/arch/arm/src/armv6-m/up_initialstate.c +++ b/nuttx/arch/arm/src/armv6-m/up_initialstate.c @@ -96,7 +96,7 @@ void up_initial_state(struct tcb_s *tcb) /* Save the task entry point (stripping off the thumb bit) */ xcp->regs[REG_PC] = (uint32_t)tcb->start & ~1; - + /* Specify thumb mode */ xcp->regs[REG_XPSR] = ARMV6M_XPSR_T; diff --git a/nuttx/arch/arm/src/armv6-m/up_releasepending.c b/nuttx/arch/arm/src/armv6-m/up_releasepending.c index 08c87ae47..5300f7598 100644 --- a/nuttx/arch/arm/src/armv6-m/up_releasepending.c +++ b/nuttx/arch/arm/src/armv6-m/up_releasepending.c @@ -96,7 +96,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c b/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c index 07eeef14b..a90aa9835 100644 --- a/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c +++ b/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -153,7 +153,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv6-m/up_systemreset.c b/nuttx/arch/arm/src/armv6-m/up_systemreset.c index a02a0abd2..b1c70b3e5 100644 --- a/nuttx/arch/arm/src/armv6-m/up_systemreset.c +++ b/nuttx/arch/arm/src/armv6-m/up_systemreset.c @@ -68,7 +68,7 @@ void up_systemreset(void) regval = ((0x5fa << SYSCON_AIRCR_VECTKEY_SHIFT) | SYSCON_AIRCR_SYSRESETREQ); putreg32(regval, ARMV6M_SYSCON_AIRCR); - /* Ensure completion of memory accesses */ + /* Ensure completion of memory accesses */ __asm volatile ("dsb"); diff --git a/nuttx/arch/arm/src/armv6-m/up_unblocktask.c b/nuttx/arch/arm/src/armv6-m/up_unblocktask.c index e4bfede97..0d51d21ca 100644 --- a/nuttx/arch/arm/src/armv6-m/up_unblocktask.c +++ b/nuttx/arch/arm/src/armv6-m/up_unblocktask.c @@ -108,7 +108,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -119,7 +119,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv6-m/up_vectors.c b/nuttx/arch/arm/src/armv6-m/up_vectors.c index bb98b0a79..c1d57f2fd 100644 --- a/nuttx/arch/arm/src/armv6-m/up_vectors.c +++ b/nuttx/arch/arm/src/armv6-m/up_vectors.c @@ -84,7 +84,7 @@ extern char _ebss; * Note that the [ ... ] desginated initialiser is a GCC extension. */ -unsigned _vectors[] __attribute__((section(".vectors"))) = +unsigned _vectors[] __attribute__((section(".vectors"))) = { /* Initial stack */ diff --git a/nuttx/arch/arm/src/armv6-m/vfork.S b/nuttx/arch/arm/src/armv6-m/vfork.S index 112d2d88d..5bee4c5e1 100644 --- a/nuttx/arch/arm/src/armv6-m/vfork.S +++ b/nuttx/arch/arm/src/armv6-m/vfork.S @@ -65,7 +65,7 @@ * undefined if the process created by vfork() either modifies any data other than * a variable of type pid_t used to store the return value from vfork(), or returns * from the function in which vfork() was called, or calls any other function before - * successfully calling _exit() or one of the exec family of functions. + * successfully calling _exit() or one of the exec family of functions. * * This thin layer implements vfork by simply calling up_vfork() with the vfork() * context as an argument. The overall sequence is: @@ -94,7 +94,7 @@ * Upon successful completion, vfork() returns 0 to the child process and returns * the process ID of the child process to the parent process. Otherwise, -1 is * returned to the parent, no child process is created, and errno is set to - * indicate the error. + * indicate the error. * ************************************************************************************/ diff --git a/nuttx/arch/arm/src/armv7-a/arm_allocpage.c b/nuttx/arch/arm/src/armv7-a/arm_allocpage.c index cb8710b47..baf2ca111 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_allocpage.c +++ b/nuttx/arch/arm/src/armv7-a/arm_allocpage.c @@ -171,7 +171,7 @@ int arm_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) uintptr_t paddr; uint32_t *pte; unsigned int pgndx; - + /* Since interrupts are disabled, we don't need to anything special. */ DEBUGASSERT(tcb && vpage); @@ -199,7 +199,7 @@ int arm_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) if (g_pgwrap) { /* Yes.. Get a pointer to the L2 entry corresponding to the previous - * mapping -- then zero it! + * mapping -- then zero it! */ uintptr_t oldvaddr = PG_POOL_NDX2VA(g_ptemap[pgndx]); @@ -214,7 +214,7 @@ int arm_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) * case: The I-Cache uses a virtual address index and, hence, since the * NuttX address space is flat, the cached instruction value should be * correct even if the page mapping is no longer in place. - */ + */ } /* Then convert the index to a (physical) page address. */ @@ -231,7 +231,7 @@ int arm_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) *pte = (paddr | MMU_L2_ALLOCFLAGS); /* And save the new L1 index */ - + g_ptemap[pgndx] = PG_POOL_VA2L2NDX(vaddr); /* Finally, return the virtual address of allocated page */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_blocktask.c b/nuttx/arch/arm/src/armv7-a/arm_blocktask.c index eac95984b..2cc52240e 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_blocktask.c +++ b/nuttx/arch/arm/src/armv7-a/arm_blocktask.c @@ -130,7 +130,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -148,7 +148,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_dataabort.c b/nuttx/arch/arm/src/armv7-a/arm_dataabort.c index 06ff0ba35..7a4d2bea1 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_dataabort.c +++ b/nuttx/arch/arm/src/armv7-a/arm_dataabort.c @@ -56,7 +56,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ @@ -136,7 +136,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) * the exception occurred, this address was provided in the DFAR register. * (It has not yet been saved in the register context save area). */ - + pgllvdbg("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND); if (dfar < PG_PAGED_VBASE || dfar >= PG_PAGED_VEND) { diff --git a/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c b/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c index 89a6bf904..4a8e820ab 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c +++ b/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c @@ -56,7 +56,7 @@ /* Debug ********************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_releasepending.c b/nuttx/arch/arm/src/armv7-a/arm_releasepending.c index 4dccc7e09..004ef51aa 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_releasepending.c +++ b/nuttx/arch/arm/src/armv7-a/arm_releasepending.c @@ -97,7 +97,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -111,13 +111,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if up_saveusercontext returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c b/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c index 2055d395b..e14b5744b 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c +++ b/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -171,7 +171,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_syscall.c b/nuttx/arch/arm/src/armv7-a/arm_syscall.c index 656a3170c..2c9c951d8 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_syscall.c +++ b/nuttx/arch/arm/src/armv7-a/arm_syscall.c @@ -50,7 +50,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c b/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c index 4906a4a8b..f08ceeca3 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c +++ b/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -132,7 +132,7 @@ void up_unblock_task(struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_saveusercontext returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c b/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c index af240cf56..5143f9bd5 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c +++ b/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c @@ -48,7 +48,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_vfork.S b/nuttx/arch/arm/src/armv7-a/arm_vfork.S index d8fa0e14c..b7abc1c0f 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_vfork.S +++ b/nuttx/arch/arm/src/armv7-a/arm_vfork.S @@ -66,7 +66,7 @@ * any data other than a variable of type pid_t used to store the return * value from vfork(), or returns from the function in which vfork() was * called, or calls any other function before successfully calling _exit() - * or one of the exec family of functions. + * or one of the exec family of functions. * * This thin layer implements vfork by simply calling up_vfork() with the * vfork() context as an argument. The overall sequence is: @@ -95,7 +95,7 @@ * Upon successful completion, vfork() returns 0 to the child process and * returns the process ID of the child process to the parent process. * Otherwise, -1 is returned to the parent, no child process is created, - * and errno is set to indicate the error. + * and errno is set to indicate the error. * ****************************************************************************/ diff --git a/nuttx/arch/arm/src/armv7-a/sctlr.h b/nuttx/arch/arm/src/armv7-a/sctlr.h index beb115b32..30b14bb31 100644 --- a/nuttx/arch/arm/src/armv7-a/sctlr.h +++ b/nuttx/arch/arm/src/armv7-a/sctlr.h @@ -256,7 +256,7 @@ nop .endm #endif /* __ASSEMBLY__ */ - + /************************************************************************************ * Inline Functions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/armv7-m/exc_return.h b/nuttx/arch/arm/src/armv7-m/exc_return.h index 9490a3c8a..a84b8a7d4 100644 --- a/nuttx/arch/arm/src/armv7-m/exc_return.h +++ b/nuttx/arch/arm/src/armv7-m/exc_return.h @@ -50,10 +50,10 @@ * exception mechanism relies on this value to detect when the processor has * completed an exception handler. * - * Bits [31:28] of an EXC_RETURN value are always 1. When the processor loads a - * value matching this pattern to the PC it detects that the operation is a not - * a normal branch operation and instead, that the exception is complete. - * Therefore, it starts the exception return sequence. + * Bits [31:28] of an EXC_RETURN value are always 1. When the processor loads a + * value matching this pattern to the PC it detects that the operation is a not + * a normal branch operation and instead, that the exception is complete. + * Therefore, it starts the exception return sequence. * * Bits[4:0] of the EXC_RETURN value indicate the required return stack and eventual * processor mode. The remaining bits of the EXC_RETURN value should be set to 1. @@ -64,23 +64,23 @@ #define EXC_RETURN_BASE 0xffffffe1 /* EXC_RETURN_PROCESS_STACK: The exception saved (and will restore) the hardware - * context using the process stack pointer (if not set, the context was saved + * context using the process stack pointer (if not set, the context was saved * using the main stack pointer) */ - + #define EXC_RETURN_PROCESS_STACK (1 << 2) /* EXC_RETURN_THREAD_MODE: The exception will return to thread mode (if not set, * return stays in handler mode) */ - + #define EXC_RETURN_THREAD_MODE (1 << 3) -/* EXC_RETURN_STD_CONTEXT: The state saved on the stack does not include the +/* EXC_RETURN_STD_CONTEXT: The state saved on the stack does not include the * volatile FP registers and FPSCR. If this bit is clear, the state does include * these registers. */ - + #define EXC_RETURN_STD_CONTEXT (1 << 4) /* EXC_RETURN_HANDLER: Return to handler mode. Exception return gets state from diff --git a/nuttx/arch/arm/src/armv7-m/mpu.h b/nuttx/arch/arm/src/armv7-m/mpu.h index e6929cecf..f6b61816b 100644 --- a/nuttx/arch/arm/src/armv7-m/mpu.h +++ b/nuttx/arch/arm/src/armv7-m/mpu.h @@ -79,19 +79,19 @@ /* MPU Region Number Register Bit Definitions */ -#define MPU_RNR_MASK (0xff) +#define MPU_RNR_MASK (0xff) /* MPU Region Base Address Register Bit Definitions */ #define MPU_RBAR_REGION_SHIFT (0) /* Bits 0-3: MPU region */ #define MPU_RBAR_REGION_MASK (15 << MPU_RBAR_REGION_SHIFT) -#define MPU_RBAR_VALID (1 << 4) /* Bit 4: MPU Region Number valid */ +#define MPU_RBAR_VALID (1 << 4) /* Bit 4: MPU Region Number valid */ #define MPU_RBAR_ADDR_MASK 0xffffffe0 /* Bits N-31: Region base addrese */ /* MPU Region Attributes and Size Register Bit Definitions */ #define MPU_RASR_ENABLE (1 << 0) /* Bit 0: Region enable */ -#define MPU_RASR_SIZE_SHIFT (1) /* Bits 1-5: Size of the MPU protection region */ +#define MPU_RASR_SIZE_SHIFT (1) /* Bits 1-5: Size of the MPU protection region */ #define MPU_RASR_SIZE_MASK (31 << MPU_RASR_SIZE_SHIFT) # define MPU_RASR_SIZE_LOG2(n) ((n-1) << MPU_RASR_SIZE_SHIFT) #define MPU_RASR_SRD_SHIFT (8) /* Bits 8-15: Subregion disable */ diff --git a/nuttx/arch/arm/src/armv7-m/up_blocktask.c b/nuttx/arch/arm/src/armv7-m/up_blocktask.c index 8caf4a2b6..d7965d4c4 100644 --- a/nuttx/arch/arm/src/armv7-m/up_blocktask.c +++ b/nuttx/arch/arm/src/armv7-m/up_blocktask.c @@ -130,7 +130,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv7-m/up_elf.c b/nuttx/arch/arm/src/armv7-m/up_elf.c index b838a6905..539873d45 100644 --- a/nuttx/arch/arm/src/armv7-m/up_elf.c +++ b/nuttx/arch/arm/src/armv7-m/up_elf.c @@ -296,7 +296,7 @@ int arch_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, S = (offset >> 24) & 1; J1 = S ^ (~(offset >> 23) & 1); J2 = S ^ (~(offset >> 22) & 1); - + upper_insn = ((upper_insn & 0xf800) | (S << 10) | ((offset >> 12) & 0x03ff)); *(uint16_t*)addr = (uint16_t)upper_insn; diff --git a/nuttx/arch/arm/src/armv7-m/up_fpu.S b/nuttx/arch/arm/src/armv7-m/up_fpu.S index f43367fa4..ea8a4995e 100644 --- a/nuttx/arch/arm/src/armv7-m/up_fpu.S +++ b/nuttx/arch/arm/src/armv7-m/up_fpu.S @@ -83,7 +83,7 @@ * * Returned Value: * None - * + * ************************************************************************************/ .thumb_func @@ -189,7 +189,7 @@ up_savefpu: * Returned Value: * This function does not return anything explicitly. However, it is called from * interrupt level assembly logic that assumes that r0 is preserved. - * + * ************************************************************************************/ .thumb_func diff --git a/nuttx/arch/arm/src/armv7-m/up_mpu.c b/nuttx/arch/arm/src/armv7-m/up_mpu.c index 5df3f4ec8..233e62147 100644 --- a/nuttx/arch/arm/src/armv7-m/up_mpu.c +++ b/nuttx/arch/arm/src/armv7-m/up_mpu.c @@ -67,7 +67,7 @@ * all subregions are available (0x00). */ -static const uint8_t g_ms_regionmask[9] = +static const uint8_t g_ms_regionmask[9] = { 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00 }; @@ -77,7 +77,7 @@ static const uint8_t g_ms_regionmask[9] = * and 8 means all subregions must be disabled (0xff). */ -static const uint8_t g_ls_regionmask[9] = +static const uint8_t g_ls_regionmask[9] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; diff --git a/nuttx/arch/arm/src/armv7-m/up_releasepending.c b/nuttx/arch/arm/src/armv7-m/up_releasepending.c index 21c79bfc7..0b3fc6247 100644 --- a/nuttx/arch/arm/src/armv7-m/up_releasepending.c +++ b/nuttx/arch/arm/src/armv7-m/up_releasepending.c @@ -96,7 +96,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c b/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c index a0d54a688..c2cb07530 100644 --- a/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c +++ b/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -153,7 +153,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv7-m/up_systemreset.c b/nuttx/arch/arm/src/armv7-m/up_systemreset.c index 0d7bd2736..ef6da0b9f 100644 --- a/nuttx/arch/arm/src/armv7-m/up_systemreset.c +++ b/nuttx/arch/arm/src/armv7-m/up_systemreset.c @@ -69,7 +69,7 @@ void up_systemreset(void) regval |= ((0x5fa << NVIC_AIRCR_VECTKEY_SHIFT) | NVIC_AIRCR_SYSRESETREQ); putreg32(regval, NVIC_AIRCR); - /* Ensure completion of memory accesses */ + /* Ensure completion of memory accesses */ __asm volatile ("dsb"); diff --git a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c index 8c6551b8e..551e5b67b 100644 --- a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c +++ b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/arm/src/armv7-m/up_vectors.c b/nuttx/arch/arm/src/armv7-m/up_vectors.c index b3f393f3b..dddccac31 100644 --- a/nuttx/arch/arm/src/armv7-m/up_vectors.c +++ b/nuttx/arch/arm/src/armv7-m/up_vectors.c @@ -79,7 +79,7 @@ extern char _ebss; * Note that the [ ... ] designated initialiser is a GCC extension. */ -unsigned _vectors[] __attribute__((section(".vectors"))) = +unsigned _vectors[] __attribute__((section(".vectors"))) = { /* Initial stack */ diff --git a/nuttx/arch/arm/src/armv7-m/vfork.S b/nuttx/arch/arm/src/armv7-m/vfork.S index f36ff23aa..c6a0f2401 100644 --- a/nuttx/arch/arm/src/armv7-m/vfork.S +++ b/nuttx/arch/arm/src/armv7-m/vfork.S @@ -66,7 +66,7 @@ * undefined if the process created by vfork() either modifies any data other than * a variable of type pid_t used to store the return value from vfork(), or returns * from the function in which vfork() was called, or calls any other function before - * successfully calling _exit() or one of the exec family of functions. + * successfully calling _exit() or one of the exec family of functions. * * This thin layer implements vfork by simply calling up_vfork() with the vfork() * context as an argument. The overall sequence is: @@ -95,7 +95,7 @@ * Upon successful completion, vfork() returns 0 to the child process and returns * the process ID of the child process to the parent process. Otherwise, -1 is * returned to the parent, no child process is created, and errno is set to - * indicate the error. + * indicate the error. * ************************************************************************************/ diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index 2799eb2ab..94b392153 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -413,7 +413,7 @@ static inline void c5471_dumpbuffer(const char *msg, const uint8_t *buffer, unsi /* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_NET have to be * defined or the following does nothing. */ - + nvdbgdumpbuffer(msg, buffer, nbytes); } #else @@ -723,7 +723,7 @@ static int c5471_phyinit (void) /* Next, request a chip reset */ - c5471_mdwrite(0, MD_PHY_CONTROL_REG, 0x8000); + c5471_mdwrite(0, MD_PHY_CONTROL_REG, 0x8000); while (c5471_mdread(0, MD_PHY_CONTROL_REG) & 0x8000) { /* wait for chip reset to complete */ @@ -743,15 +743,15 @@ static int c5471_phyinit (void) #ifdef CONFIG_C5471_AUTONEGOTIATION ndbg("Setting PHY Transceiver for Autonegotiation\n"); c5471_mdwrite(0, MD_PHY_CONTROL_REG, MODE_AUTONEG); -#endif +#endif #ifdef CONFIG_C5471_BASET100 ndbg("Setting PHY Transceiver for 100BaseT FullDuplex\n"); c5471_mdwrite(0, MD_PHY_CONTROL_REG, MODE_100MBIT_FULLDUP); -#endif +#endif #ifdef CONFIG_C5471_BASET10 ndbg("Setting PHY Transceiver for 10BaseT FullDuplex\n"); c5471_mdwrite(0, MD_PHY_CONTROL_REG, MODE_10MBIT_FULLDUP); -#endif +#endif status = c5471_mdread(0, MD_PHY_CTRL_STAT_REG); return status; @@ -1479,7 +1479,7 @@ static int c5471_interrupt(int irq, FAR void *context) c5471_txdone(c5471); } - /* Enable Ethernet interrupts (perhaps excluding the TX done interrupt if + /* Enable Ethernet interrupts (perhaps excluding the TX done interrupt if * there are no pending transmissions. */ @@ -1567,7 +1567,7 @@ static void c5471_polltimer(int argc, uint32_t arg, ...) * * Description: * NuttX Callback: Bring up the Ethernet interface when an IP address is - * provided + * provided * * Parameters: * dev - Reference to the NuttX driver state structure @@ -1680,7 +1680,7 @@ static int c5471_ifdown(struct uip_driver_s *dev) * Function: c5471_txavail * * Description: - * Driver callback invoked when new TX data is available. This is a + * Driver callback invoked when new TX data is available. This is a * stimulus perform an out-of-cycle poll and, thereby, reduce the TX * latency. * @@ -1732,7 +1732,7 @@ static int c5471_txavail(struct uip_driver_s *dev) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be added + * mac - The MAC address to be added * * Returned Value: * None @@ -1762,7 +1762,7 @@ static int c5471_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be removed + * mac - The MAC address to be removed * * Returned Value: * None @@ -1973,7 +1973,7 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471) // putreg32(EIM_FILTER_LOGICAL|EIM_FILTER_UNICAST|EIM_FILTER_MULTICAST| // EIM_FILTER_BROADCAST, EIM_CPU_FILTER); putreg32(EIM_FILTER_UNICAST|EIM_FILTER_MULTICAST|EIM_FILTER_BROADCAST, EIM_CPU_FILTER); -#endif +#endif /* Disable all Ethernet interrupts */ @@ -1984,16 +1984,16 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471) #if 1 putreg32(EIM_CTRL_ENET0_EN|EIM_CTRL_RXENET0_EN|EIM_CTRL_TXENET0_EN| EIM_CTRL_RXCPU_EN|EIM_CTRL_TXCPU_EN, EIM_CTRL); -#else +#else putreg32(EIM_CTRL_ENET0_EN|EIM_CTRL_ENET0_FLW|EIM_CTRL_RXENET0_EN| EIM_CTRL_TXENET0_EN|EIM_CTRL_RXCPU_EN|EIM_CTRL_TXCPU_EN, EIM_CTRL); #endif -#if 1 +#if 1 putreg32(0x00000000, EIM_MFVHI); #else putreg32(0x0000ff00, EIM_MFVHI); -#endif +#endif putreg32(0x00000000, EIM_MFVLO); putreg32(0x00000000, EIM_MFMHI); @@ -2007,16 +2007,16 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471) putreg32(ENET_MODE_RJCT_SFE|ENET_MODE_MWIDTH|ENET_MODE_FULLDUPLEX, ENET0_MODE); #else putreg32(ENET_MODE_RJCT_SFE|ENET_MODE_MWIDTH|ENET_MODE_HALFDUPLEX, ENET0_MODE); -#endif +#endif putreg32(0x00000000, ENET0_BOFFSEED); putreg32(0x00000000, ENET0_FLWPAUSE); putreg32(0x00000000, ENET0_FLWCONTROL); putreg32(0x00000000, ENET0_VTYPE); -#if 0 +#if 0 putreg32(ENET_ADR_BROADCAST|ENET_ADR_PROMISCUOUS, ENET0_ADRMODE_EN); -#else +#else /* The CPU port is not PROMISCUOUS, it wants a no-promiscuous address * match yet the SWITCH receives packets from the PROMISCUOUS ENET0 * which routes all packets for filter matching at the CPU port which @@ -2026,7 +2026,7 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471) */ putreg32(ENET_ADR_PROMISCUOUS, ENET0_ADRMODE_EN); -#endif +#endif putreg32(0x00000000, ENET0_DRP); up_mdelay(500); @@ -2093,7 +2093,7 @@ static void c5471_macassign(struct c5471_driver_s *c5471) putreg32(getreg32(EIM_CPU_DALO), ENET0_LARLO); #else - /* ENET MAC assignment not needed for its PROMISCUOUS mode */ + /* ENET MAC assignment not needed for its PROMISCUOUS mode */ putreg32(0x00000000, ENET0_PARHI); putreg32(0x00000000, ENET0_PARLO); diff --git a/nuttx/arch/arm/src/c5471/c5471_serial.c b/nuttx/arch/arm/src/c5471/c5471_serial.c index 09018cb28..b993ee8bc 100644 --- a/nuttx/arch/arm/src/c5471/c5471_serial.c +++ b/nuttx/arch/arm/src/c5471/c5471_serial.c @@ -805,7 +805,7 @@ static bool up_txempty(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/arch/arm/src/c5471/c5471_vectors.S b/nuttx/arch/arm/src/c5471/c5471_vectors.S index ba4b5e3ee..511193f42 100644 --- a/nuttx/arch/arm/src/c5471/c5471_vectors.S +++ b/nuttx/arch/arm/src/c5471/c5471_vectors.S @@ -185,7 +185,7 @@ up_vectorirq: /************************************************************************************ * Function: up_vectorswi - * + * * Description: * SWI interrupt. We enter the SWI in SVC mode ************************************************************************************/ diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h index 615af320e..2f0309b4f 100644 --- a/nuttx/arch/arm/src/common/up_internal.h +++ b/nuttx/arch/arm/src/common/up_internal.h @@ -248,7 +248,7 @@ extern uint32_t _ebss; /* End+1 of .bss */ * * will create a function named foo that will execute from RAM. */ - + #ifdef CONFIG_ARCH_RAMFUNCS # define __ramfunc__ __attribute__ ((section(".ramfunc"),long_call)) diff --git a/nuttx/arch/arm/src/common/up_signal_dispatch.c b/nuttx/arch/arm/src/common/up_signal_dispatch.c index 7755ca7e4..d46b77928 100644 --- a/nuttx/arch/arm/src/common/up_signal_dispatch.c +++ b/nuttx/arch/arm/src/common/up_signal_dispatch.c @@ -73,7 +73,7 @@ * * Normally the a user-mode signalling handling stub will also execute * before the ultimate signal handler is called. See - * arch/arm/src/armv[6\7]/up_signal_handler. This function is the + * arch/arm/src/armv[6\7]/up_signal_handler. This function is the * user-space, signal handler trampoline function. It is called from * up_signal_dispatch() in user-mode. * diff --git a/nuttx/arch/arm/src/common/up_stackframe.c b/nuttx/arch/arm/src/common/up_stackframe.c index 2a38f1db8..086d6cadc 100644 --- a/nuttx/arch/arm/src/common/up_stackframe.c +++ b/nuttx/arch/arm/src/common/up_stackframe.c @@ -127,7 +127,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/arm/src/common/up_vfork.c b/nuttx/arch/arm/src/common/up_vfork.c index 4e9f76718..56b061b53 100644 --- a/nuttx/arch/arm/src/common/up_vfork.c +++ b/nuttx/arch/arm/src/common/up_vfork.c @@ -90,7 +90,7 @@ * any data other than a variable of type pid_t used to store the return * value from vfork(), or returns from the function in which vfork() was * called, or calls any other function before successfully calling _exit() - * or one of the exec family of functions. + * or one of the exec family of functions. * * The overall sequence is: * @@ -120,7 +120,7 @@ * Upon successful completion, vfork() returns 0 to the child process and * returns the process ID of the child process to the parent process. * Otherwise, -1 is returned to the parent, no child process is created, - * and errno is set to indicate the error. + * and errno is set to indicate the error. * ****************************************************************************/ @@ -180,7 +180,7 @@ pid_t up_vfork(const struct vfork_s *context) DEBUGASSERT((uint32_t)parent->adj_stack_ptr > context->sp); stackutil = (uint32_t)parent->adj_stack_ptr - context->sp; - svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil); + svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil); /* Make some feeble effort to perserve the stack contents. This is * feeble because the stack surely contains invalid pointers and other diff --git a/nuttx/arch/arm/src/dm320/dm320_boot.c b/nuttx/arch/arm/src/dm320/dm320_boot.c index e8041923a..f68f3ca36 100644 --- a/nuttx/arch/arm/src/dm320/dm320_boot.c +++ b/nuttx/arch/arm/src/dm320/dm320_boot.c @@ -74,21 +74,21 @@ extern uint32_t _vector_end; /* End+1 of vector block */ static const struct section_mapping_s section_mapping[] = { - { DM320_PERIPHERALS_PSECTION, DM320_PERIPHERALS_VSECTION, + { DM320_PERIPHERALS_PSECTION, DM320_PERIPHERALS_VSECTION, DM320_PERIPHERALS_MMUFLAGS, DM320_PERIPHERALS_NSECTIONS}, - { DM320_FLASH_PSECTION, DM320_FLASH_VSECTION, + { DM320_FLASH_PSECTION, DM320_FLASH_VSECTION, DM320_FLASH_MMUFLAGS, DM320_FLASH_NSECTIONS}, - { DM320_CFI_PSECTION, DM320_CFI_VSECTION, + { DM320_CFI_PSECTION, DM320_CFI_VSECTION, DM320_CFI_MMUFLAGS, DM320_CFI_NSECTIONS}, - { DM320_SSFDC_PSECTION, DM320_SSFDC_VSECTION, + { DM320_SSFDC_PSECTION, DM320_SSFDC_VSECTION, DM320_SSFDC_MMUFLAGS, DM320_SSFDC_NSECTIONS}, - { DM320_CE1_PSECTION, DM320_CE1_VSECTION, + { DM320_CE1_PSECTION, DM320_CE1_VSECTION, DM320_CE1_MMUFLAGS, DM320_CE1_NSECTIONS}, - { DM320_CE2_PSECTION, DM320_CE2_VSECTION, + { DM320_CE2_PSECTION, DM320_CE2_VSECTION, DM320_CE2_MMUFLAGS, DM320_CE2_NSECTIONS}, - { DM320_VLYNQ_PSECTION, DM320_VLYNQ_VSECTION, + { DM320_VLYNQ_PSECTION, DM320_VLYNQ_VSECTION, DM320_VLYNQ_MMUFLAGS, DM320_VLYNQ_NSECTIONS}, - { DM320_USBOTG_PSECTION, DM320_USBOTG_VSECTION, + { DM320_USBOTG_PSECTION, DM320_USBOTG_VSECTION, DM320_USBOTG_MMUFLAGS, DM320_USBOTG_NSECTIONS} }; #define NMAPPINGS (sizeof(section_mapping) / sizeof(struct section_mapping_s)) diff --git a/nuttx/arch/arm/src/dm320/dm320_memorymap.h b/nuttx/arch/arm/src/dm320/dm320_memorymap.h index edcf4312c..67923b150 100644 --- a/nuttx/arch/arm/src/dm320/dm320_memorymap.h +++ b/nuttx/arch/arm/src/dm320/dm320_memorymap.h @@ -67,7 +67,7 @@ * section address for most regions can be overriden if the same setting is * defined in the board.h file (These defaults correspond to the product Neuros * OSD memory configuration). - * + * * 2. The DM320 only has a single control line for external peripherals. To support * more than one peripheral, most hardware will use external memory decode logic, * so that physical memory regions is in the board-specific files. @@ -125,7 +125,7 @@ #define DM320_CFI_NSECTIONS 16 /* 16Mb 16 sections -- */ #define DM320_CFI_SIZE (16*1024*1024) #define DM320_SSFDC_NSECTIONS 16 /* 16Mb 16 sections -- */ -#define DM320_SSFDC_SIZE (16*1024*1024) +#define DM320_SSFDC_SIZE (16*1024*1024) #define DM320_CE1_NSECTIONS 16 /* 16Mb 16 sections -- */ #define DM320_CE1_SIZE (16*1024*1024) #define DM320_CE2_NSECTIONS 16 /* 16Mb 16 sections -- */ diff --git a/nuttx/arch/arm/src/dm320/dm320_serial.c b/nuttx/arch/arm/src/dm320/dm320_serial.c index abea36d57..daf711d69 100644 --- a/nuttx/arch/arm/src/dm320/dm320_serial.c +++ b/nuttx/arch/arm/src/dm320/dm320_serial.c @@ -502,7 +502,7 @@ static int up_interrupt(int irq, void *context) status = up_serialin(priv, UART_SR); status &= (UART_SR_RFTI | UART_SR_TFTI); - if (status == 0 || passes > 256) + if (status == 0 || passes > 256) { return OK; } @@ -719,7 +719,7 @@ static bool up_txempty(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/arch/arm/src/dm320/dm320_timerisr.c b/nuttx/arch/arm/src/dm320/dm320_timerisr.c index 59efa53d3..4914a8306 100644 --- a/nuttx/arch/arm/src/dm320/dm320_timerisr.c +++ b/nuttx/arch/arm/src/dm320/dm320_timerisr.c @@ -56,24 +56,24 @@ /* DM320 Timers * * Each of the general-purpose timers can run in one of two modes: one- - * shot mode and free-run mode. In one-shot mode, an interrupt only - * occurs once and then the timer must be explicitly reset to begin the - * timing operation again. In free-run mode, when the timer generates an - * interrupt, the timer counter is automatically reloaded to start the count - * operation again. Use the bit field MODE in TMMDx to configure the + * shot mode and free-run mode. In one-shot mode, an interrupt only + * occurs once and then the timer must be explicitly reset to begin the + * timing operation again. In free-run mode, when the timer generates an + * interrupt, the timer counter is automatically reloaded to start the count + * operation again. Use the bit field MODE in TMMDx to configure the * timer for one-shot more or free-run mode. The bit field MODE in TMMDx * also allows you to stop the timer. - * - * Either the ARM clock divided by 2 (CLK_ARM/2) or an external clock - * connected to the M27XI pin can be selected as the clock source of the + * + * Either the ARM clock divided by 2 (CLK_ARM/2) or an external clock + * connected to the M27XI pin can be selected as the clock source of the * timer. * - * The actual clock frequency used in the timer count operation is the input - * clock divided by: 1 plus the value set in the bit field PRSCL of the - * register TMPRSCLx (10 bits). The timer expires when it reaches the - * value set in the bit field DIV of the register TMDIVx (16 bits) plus 1. - * PRSCL+1 is the source clock frequency divide factor and DIV+1 is the - * timer count value. The frequency of a timer interrupt is given by the + * The actual clock frequency used in the timer count operation is the input + * clock divided by: 1 plus the value set in the bit field PRSCL of the + * register TMPRSCLx (10 bits). The timer expires when it reaches the + * value set in the bit field DIV of the register TMDIVx (16 bits) plus 1. + * PRSCL+1 is the source clock frequency divide factor and DIV+1 is the + * timer count value. The frequency of a timer interrupt is given by the * following equation: * * Interrupt Frequency = (Source Clock Frequency) / (PRSCL+1) / (DIV+1) diff --git a/nuttx/arch/arm/src/dm320/dm320_usbdev.c b/nuttx/arch/arm/src/dm320/dm320_usbdev.c index 97804b492..699a68edf 100644 --- a/nuttx/arch/arm/src/dm320/dm320_usbdev.c +++ b/nuttx/arch/arm/src/dm320/dm320_usbdev.c @@ -827,7 +827,7 @@ static int dm320_epread(uint8_t epphy, uint8_t *buf, uint16_t nbytes) bytesleft = nbytes; } } - else + else { bytesleft = dm320_getreg8(DM320_USB_RXCOUNT2); bytesleft = (bytesleft << 8) + dm320_getreg8(DM320_USB_RXCOUNT1); @@ -1562,7 +1562,7 @@ static int dm320_ctlrinterrupt(int irq, FAR void *context) { /* Now ignore these unknown interrupts */ - dm320_putreg8(USB_PERCSR0_CLRRXRDY | USB_PERCSR0_DATAEND, DM320_USB_PERCSR0); + dm320_putreg8(USB_PERCSR0_CLRRXRDY | USB_PERCSR0_DATAEND, DM320_USB_PERCSR0); usbtrace(TRACE_INTENTRY(DM320_TRACEINTID_UNKNOWN), csr0); } } @@ -1719,7 +1719,7 @@ static inline void dm320_epinitialize(struct dm320_usbdev_s *priv) /* Initialize endpoint 0 */ - dm320_putreg8(USB_EP0_SELECT, DM320_USB_INDEX); + dm320_putreg8(USB_EP0_SELECT, DM320_USB_INDEX); dm320_putreg8(USB_PERCSR0_CLRSETEND|USB_PERCSR0_CLRRXRDY, DM320_USB_PERCSR0); dm320_putreg8(USB_CSR2_FLFIFO, DM320_USB_CSR2); dm320_putreg8(USB_CSR2_FLFIFO, DM320_USB_CSR2); @@ -1837,7 +1837,7 @@ static void dm320_ctrlinitialize(FAR struct dm320_usbdev_s *priv) dm320_putreg8((DM320_EPBULKIN << 1), DM320_USB_INTRRX1E); dm320_putreg8((DM320_EPBULKOUT << 1) | USB_EP0, DM320_USB_INTRTX1E); dm320_putreg8(USB_INT_RESET|USB_INT_RESUME|USB_INT_SUSPEND|USB_INT_SESSRQ|USB_INT_SOF, - DM320_USB_INTRUSBE); + DM320_USB_INTRUSBE); /* Initialize endpoints ******************************************************/ @@ -2288,7 +2288,7 @@ static int dm320_wakeup(struct usbdev_s *dev) * Name: dm320_selfpowered * * Description: - * Sets/clears the device selfpowered feature + * Sets/clears the device selfpowered feature * *******************************************************************************/ @@ -2375,7 +2375,7 @@ void up_usbinitialize(void) /* Enable USB clock & GIO clock */ - dm320_putreg16(dm320_getreg16(DM320_CLKC_MOD2) | 0x0060, DM320_CLKC_MOD2); + dm320_putreg16(dm320_getreg16(DM320_CLKC_MOD2) | 0x0060, DM320_CLKC_MOD2); dm320_putreg16(dm320_getreg16(DM320_CLKC_DIV4) | (((4) - 1) << 8) | ((1) - 1), DM320_CLKC_DIV4); /* Initialize D+ pullup control GIO */ diff --git a/nuttx/arch/arm/src/imx/imx_aitc.h b/nuttx/arch/arm/src/imx/imx_aitc.h index 5b83c5f46..81da15ef8 100644 --- a/nuttx/arch/arm/src/imx/imx_aitc.h +++ b/nuttx/arch/arm/src/imx/imx_aitc.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_boot.c b/nuttx/arch/arm/src/imx/imx_boot.c index 2ab89b94e..e1dfb7846 100644 --- a/nuttx/arch/arm/src/imx/imx_boot.c +++ b/nuttx/arch/arm/src/imx/imx_boot.c @@ -78,19 +78,19 @@ extern uint32_t _vector_end; /* End+1 of vector block */ static const struct section_mapping_s section_mapping[] = { - { IMX_PERIPHERALS_PSECTION, IMX_PERIPHERALS_VSECTION, + { IMX_PERIPHERALS_PSECTION, IMX_PERIPHERALS_VSECTION, IMX_PERIPHERALS_MMUFLAGS, IMX_PERIPHERALS_NSECTIONS}, - { IMX_FLASH_PSECTION, IMX_FLASH_VSECTION, + { IMX_FLASH_PSECTION, IMX_FLASH_VSECTION, IMX_FLASH_MMUFLAGS, IMX_FLASH_NSECTIONS}, - { IMX_CS1_PSECTION, IMX_CS1_VSECTION, + { IMX_CS1_PSECTION, IMX_CS1_VSECTION, IMX_PERIPHERALS_MMUFLAGS, IMX_CS1_NSECTIONS}, - { IMX_CS2_PSECTION, IMX_CS2_VSECTION, + { IMX_CS2_PSECTION, IMX_CS2_VSECTION, IMX_PERIPHERALS_MMUFLAGS, IMX_CS2_NSECTIONS}, - { IMX_CS3_PSECTION, IMX_CS3_VSECTION, + { IMX_CS3_PSECTION, IMX_CS3_VSECTION, IMX_PERIPHERALS_MMUFLAGS, IMX_CS3_NSECTIONS}, - { IMX_CS4_PSECTION, IMX_CS4_VSECTION, + { IMX_CS4_PSECTION, IMX_CS4_VSECTION, IMX_PERIPHERALS_MMUFLAGS, IMX_CS4_NSECTIONS}, - { IMX_CS5_PSECTION, IMX_CS5_VSECTION, + { IMX_CS5_PSECTION, IMX_CS5_VSECTION, IMX_PERIPHERALS_MMUFLAGS, IMX_CS5_NSECTIONS}, }; diff --git a/nuttx/arch/arm/src/imx/imx_cspi.h b/nuttx/arch/arm/src/imx/imx_cspi.h index 0c8c0f9d9..14f95e7ed 100644 --- a/nuttx/arch/arm/src/imx/imx_cspi.h +++ b/nuttx/arch/arm/src/imx/imx_cspi.h @@ -182,7 +182,7 @@ extern "C" { * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) are * provided by common logic. To use this common SPI logic on your board: * - * 1. Provide imx_spiselect() and imx_spistatus() functions in your board-specific + * 1. Provide imx_spiselect() and imx_spistatus() functions in your board-specific * logic. This function will perform chip selection and status operations using * GPIOs in the way your board is configured. * 2. If CONFIG_SPI_CMDDATA is defined in your NuttX configuration, provide the diff --git a/nuttx/arch/arm/src/imx/imx_dma.h b/nuttx/arch/arm/src/imx/imx_dma.h index 2d5d553ce..13ad5ad70 100644 --- a/nuttx/arch/arm/src/imx/imx_dma.h +++ b/nuttx/arch/arm/src/imx/imx_dma.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_eim.h b/nuttx/arch/arm/src/imx/imx_eim.h index decd54e46..8a048259e 100644 --- a/nuttx/arch/arm/src/imx/imx_eim.h +++ b/nuttx/arch/arm/src/imx/imx_eim.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ @@ -62,18 +62,18 @@ /* EIM Register Addresses ***********************************************************/ -#define IMX_EIM_CS0H (EIM_BASE_ADDR + EIM_CS0H_OFFSET) -#define IMX_EIM_CS0L (EIM_BASE_ADDR + EIM_CS0L_OFFSET) -#define IMX_EIM_CS1H (EIM_BASE_ADDR + EIM_CS1H_OFFSET) -#define IMX_EIM_CS1L (EIM_BASE_ADDR + EIM_CS1L_OFFSET) -#define IMX_EIM_CS2H (EIM_BASE_ADDR + EIM_CS2H_OFFSET) -#define IMX_EIM_CS2L (EIM_BASE_ADDR + EIM_CS2L_OFFSET) -#define IMX_EIM_CS3H (EIM_BASE_ADDR + EIM_CS3H_OFFSET) -#define IMX_EIM_CS3L (EIM_BASE_ADDR + EIM_CS3L_OFFSET) -#define IMX_EIM_CS4H (EIM_BASE_ADDR + EIM_CS4H_OFFSET) -#define IMX_EIM_CS4L (EIM_BASE_ADDR + EIM_CS4L_OFFSET) -#define IMX_EIM_CS5H (EIM_BASE_ADDR + EIM_CS5H_OFFSET) -#define IMX_EIM_CS5L (EIM_BASE_ADDR + EIM_CS5L_OFFSET) +#define IMX_EIM_CS0H (EIM_BASE_ADDR + EIM_CS0H_OFFSET) +#define IMX_EIM_CS0L (EIM_BASE_ADDR + EIM_CS0L_OFFSET) +#define IMX_EIM_CS1H (EIM_BASE_ADDR + EIM_CS1H_OFFSET) +#define IMX_EIM_CS1L (EIM_BASE_ADDR + EIM_CS1L_OFFSET) +#define IMX_EIM_CS2H (EIM_BASE_ADDR + EIM_CS2H_OFFSET) +#define IMX_EIM_CS2L (EIM_BASE_ADDR + EIM_CS2L_OFFSET) +#define IMX_EIM_CS3H (EIM_BASE_ADDR + EIM_CS3H_OFFSET) +#define IMX_EIM_CS3L (EIM_BASE_ADDR + EIM_CS3L_OFFSET) +#define IMX_EIM_CS4H (EIM_BASE_ADDR + EIM_CS4H_OFFSET) +#define IMX_EIM_CS4L (EIM_BASE_ADDR + EIM_CS4L_OFFSET) +#define IMX_EIM_CS5H (EIM_BASE_ADDR + EIM_CS5H_OFFSET) +#define IMX_EIM_CS5L (EIM_BASE_ADDR + EIM_CS5L_OFFSET) #define IMX_EIM_WEIM (EIM_BASE_ADDR + EIM_WEIM_OFFSET) /* EIM Register Bit Definitions *****************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_gpio.h b/nuttx/arch/arm/src/imx/imx_gpio.h index dcdf9c68e..415d16679 100644 --- a/nuttx/arch/arm/src/imx/imx_gpio.h +++ b/nuttx/arch/arm/src/imx/imx_gpio.h @@ -45,7 +45,7 @@ # include <stdint.h> #endif #include "up_arch.h" /* getreg32(), putreg32() */ - + /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_i2c.h b/nuttx/arch/arm/src/imx/imx_i2c.h index 8b1c065e2..990199e1f 100644 --- a/nuttx/arch/arm/src/imx/imx_i2c.h +++ b/nuttx/arch/arm/src/imx/imx_i2c.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ @@ -54,11 +54,11 @@ /* I2C Register Addresses ***********************************************************/ -#define IMX_I2C_IADR (IMX_I2C_VBASE + I2C_IADR_OFFSET) +#define IMX_I2C_IADR (IMX_I2C_VBASE + I2C_IADR_OFFSET) #define IMX_I2C_IFDR (IMX_I2C_VBASE + I2C_IFDR_OFFSET) #define IMX_I2C_I2CR (IMX_I2C_VBASE + I2C_I2CR_OFFSET) -#define IMX_I2C_I2SR (IMX_I2C_VBASE + I2C_I2SR_OFFSET) -#define IMX_I2C_I2DR (IMX_I2C_VBASE + I2C_I2DR_OFFSET) +#define IMX_I2C_I2SR (IMX_I2C_VBASE + I2C_I2SR_OFFSET) +#define IMX_I2C_I2DR (IMX_I2C_VBASE + I2C_I2DR_OFFSET) /* I2C Register Bit Definitions *****************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_lowputc.S b/nuttx/arch/arm/src/imx/imx_lowputc.S index b0c8163a3..2845dc3b9 100644 --- a/nuttx/arch/arm/src/imx/imx_lowputc.S +++ b/nuttx/arch/arm/src/imx/imx_lowputc.S @@ -93,7 +93,7 @@ up_lowputc: ldr r2, =IMX_UART2_VBASE /* r2=UART0 base */ #endif - /* Poll the TX fifo trigger level bit of the UART status register #2 . + /* Poll the TX fifo trigger level bit of the UART status register #2 . * When the bit is non-zero, the TX Buffer FIFO is empty. */ diff --git a/nuttx/arch/arm/src/imx/imx_memorymap.h b/nuttx/arch/arm/src/imx/imx_memorymap.h index 3a86ce943..9a063b368 100644 --- a/nuttx/arch/arm/src/imx/imx_memorymap.h +++ b/nuttx/arch/arm/src/imx/imx_memorymap.h @@ -85,7 +85,7 @@ * - All vector addresses are FLASH absolute addresses, * - DRAM cannot reside at address zero, * - Vectors at address zero (CR_V is not set), - * - The boot logic must configure SDRAM and, + * - The boot logic must configure SDRAM and, * - The .data section in RAM must be initialized. * * 2. We boot in FLASH but copy ourselves to DRAM from better performance. @@ -140,7 +140,7 @@ /* Peripheral Register Offsets ******************************************************/ #define IMX_AIPI1_OFFSET 0x00000000 /* -0x00000fff AIPI1 4Kb */ -#define IMX_WDOG_OFFSET 0x00001000 /* -0x00001fff WatchDog 4Kb */ +#define IMX_WDOG_OFFSET 0x00001000 /* -0x00001fff WatchDog 4Kb */ #define IMX_TIMER1_OFFSET 0x00002000 /* -0x00002fff Timer1 4Kb */ #define IMX_TIMER2_OFFSET 0x00003000 /* -0x00003fff Timer2 4Kb */ #define IMX_RTC_OFFSET 0x00004000 /* -0x00004fff RTC 4Kb */ diff --git a/nuttx/arch/arm/src/imx/imx_rtc.h b/nuttx/arch/arm/src/imx/imx_rtc.h index 249e7a40d..f07c00c91 100644 --- a/nuttx/arch/arm/src/imx/imx_rtc.h +++ b/nuttx/arch/arm/src/imx/imx_rtc.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_serial.c b/nuttx/arch/arm/src/imx/imx_serial.c index c866a53f9..d5423ff4a 100644 --- a/nuttx/arch/arm/src/imx/imx_serial.c +++ b/nuttx/arch/arm/src/imx/imx_serial.c @@ -514,7 +514,7 @@ static int up_setup(struct uart_dev_s *dev) if (priv->hwfc) { ucr2 |= UART_UCR2_IRTS; - + /* CTS controled by Rx FIFO */ ucr2 |= UART_UCR2_CTSC; @@ -533,7 +533,7 @@ static int up_setup(struct uart_dev_s *dev) up_serialout(priv, UART_UCR2, ucr2); - /* Set the baud. + /* Set the baud. * * baud * 16 / REFFREQ = NUM/DEN * UBIR = NUM-1; @@ -628,7 +628,7 @@ static int up_setup(struct uart_dev_s *dev) /* Set the TX trigger level to interrupt when the TxFIFO has 2 or fewer characters. * Set the RX trigger level to interrupt when the RxFIFO has 1 character. */ - + regval |= ((2 << UART_UFCR_TXTL_SHIFT) | (1 << UART_UFCR_RXTL_SHIFT)); up_serialout(priv, UART_UFCR, regval); @@ -803,7 +803,7 @@ static inline struct uart_dev_s *up_mapirq(int irq) break; } return dev; -} +} /**************************************************************************** * Name: up_interrupt (and front-ends) @@ -841,7 +841,7 @@ static int up_interrupt(int irq, void *context) usr1 = up_serialin(priv, UART_USR1); usr1 &= (UART_USR1_RRDY | UART_USR1_TRDY); - if (usr1 == 0 || passes > 256) + if (usr1 == 0 || passes > 256) { return OK; } @@ -971,7 +971,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable) static bool up_rxavailable(struct uart_dev_s *dev) { struct up_dev_s *priv = (struct up_dev_s*)dev->priv; - + /* Return true is data is ready in the Rx FIFO */ return ((up_serialin(priv, UART_USR2) & UART_USR2_RDR) != 0); @@ -1062,7 +1062,7 @@ static bool up_txempty(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/arch/arm/src/imx/imx_spi.c b/nuttx/arch/arm/src/imx/imx_spi.c index 5b89ac18d..f51bfd734 100644 --- a/nuttx/arch/arm/src/imx/imx_spi.c +++ b/nuttx/arch/arm/src/imx/imx_spi.c @@ -140,7 +140,7 @@ struct imx_spidev_s ****************************************************************************/ /* SPI register access */ - + static inline uint32_t spi_getreg(struct imx_spidev_s *priv, unsigned int offset); static inline void spi_putreg(struct imx_spidev_s *priv, unsigned int offset, uint32_t value); @@ -1083,7 +1083,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) imxgpio_configinput(GPIOD, 31); imxgpio_ocrbin(GPIOD, 31); imxgpio_dirout(GPIOD, 31); -#else +#else imxgpio_configoutput(GPIOD, 10); #endif break; @@ -1101,7 +1101,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) /* Initialize control register: min frequency, ignore ready, master mode, mode=0, 8-bit */ - spi_putreg(priv, CSPI_CTRL_OFFSET, + spi_putreg(priv, CSPI_CTRL_OFFSET, CSPI_CTRL_DIV512 | /* Lowest frequency */ CSPI_CTRL_DRCTL_IGNRDY | /* Ignore ready */ CSPI_CTRL_MODE | /* Master mode */ diff --git a/nuttx/arch/arm/src/imx/imx_system.h b/nuttx/arch/arm/src/imx/imx_system.h index ad363f14a..c66a81699 100644 --- a/nuttx/arch/arm/src/imx/imx_system.h +++ b/nuttx/arch/arm/src/imx/imx_system.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ @@ -170,13 +170,13 @@ /* SDRAMC Register Offsets **********************************************************/ -#define SDRAMC_SDCTL0_OFFSET 0x0000 -#define SDRAMC_SDCTL1_OFFSET 0x0004 +#define SDRAMC_SDCTL0_OFFSET 0x0000 +#define SDRAMC_SDCTL1_OFFSET 0x0004 /* SDRAMC Register Addresses ********************************************************/ -#define IMX_SDRAMC_SDCTL0 (IMX_SDRAMC_VBASE + SDRAMC_SDCTL0_OFFSET) -#define IMX_SDRAMC_SDCTL1 (IMX_SDRAMC_VBASE + SDRAMC_SDCTL1_OFFSET)) +#define IMX_SDRAMC_SDCTL0 (IMX_SDRAMC_VBASE + SDRAMC_SDCTL0_OFFSET) +#define IMX_SDRAMC_SDCTL1 (IMX_SDRAMC_VBASE + SDRAMC_SDCTL1_OFFSET)) /* SDRAMC Register Bit Definitions **************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_timer.h b/nuttx/arch/arm/src/imx/imx_timer.h index 9d91d3c0d..e83bb84a1 100644 --- a/nuttx/arch/arm/src/imx/imx_timer.h +++ b/nuttx/arch/arm/src/imx/imx_timer.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_timerisr.c b/nuttx/arch/arm/src/imx/imx_timerisr.c index 896dc86e5..b5ce77b39 100644 --- a/nuttx/arch/arm/src/imx/imx_timerisr.c +++ b/nuttx/arch/arm/src/imx/imx_timerisr.c @@ -135,7 +135,7 @@ void up_timerinit(void) /* The timer is driven by PERCLK1. Set prescaler for division by one * so that the clock is driven at PERCLK1. * - * putreg(0, IMX_TIMER1_TPRER); -- already the case + * putreg(0, IMX_TIMER1_TPRER); -- already the case * * Set the compare register so that the COMP interrupt is generated * with a period of MSEC_PER_TICK. The value IMX_PERCLK1_FREQ/1000 diff --git a/nuttx/arch/arm/src/imx/imx_uart.h b/nuttx/arch/arm/src/imx/imx_uart.h index 5646e83f7..17b0d7261 100644 --- a/nuttx/arch/arm/src/imx/imx_uart.h +++ b/nuttx/arch/arm/src/imx/imx_uart.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_usbd.h b/nuttx/arch/arm/src/imx/imx_usbd.h index 8c810cacf..eb0e2b7a3 100644 --- a/nuttx/arch/arm/src/imx/imx_usbd.h +++ b/nuttx/arch/arm/src/imx/imx_usbd.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/imx/imx_wdog.h b/nuttx/arch/arm/src/imx/imx_wdog.h index 4ee6438b3..2976ea4ef 100644 --- a/nuttx/arch/arm/src/imx/imx_wdog.h +++ b/nuttx/arch/arm/src/imx/imx_wdog.h @@ -39,7 +39,7 @@ /************************************************************************************ * Included Files ************************************************************************************/ - + /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c b/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c index ad6e42884..c4012d8bc 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_clockconfig.c @@ -62,7 +62,7 @@ /**************************************************************************** * Private Function Prototypes ****************************************************************************/ - + void __ramfunc__ kinesis_setdividers(uint32_t div1, uint32_t div2, uint32_t div3, uint32_t div4); @@ -205,8 +205,8 @@ void kinetis_pllconfig(void) * Flash clock = MCG / BOARD_OUTDIV4 */ - kinesis_setdividers(BOARD_OUTDIV1, BOARD_OUTDIV2, BOARD_OUTDIV3, BOARD_OUTDIV4); - + kinesis_setdividers(BOARD_OUTDIV1, BOARD_OUTDIV2, BOARD_OUTDIV3, BOARD_OUTDIV4); + /* Set the VCO divider, VDIV, is defined in the board.h file. VDIV * selects the amount to divide the VCO output of the PLL. The VDIV bits * establish the multiplication factor applied to the reference clock @@ -352,7 +352,7 @@ kinesis_setdividers(uint32_t div1, uint32_t div2, uint32_t div3, uint32_t div4) /* Save the current value of the Flash Access Protection Register */ regval = getreg32(KINETIS_FMC_PFAPR); - + /* Set M0PFD through M7PFD to 1 to disable prefetch */ putreg32(FMC_PFAPR_M7PFD | FMC_PFAPR_M6PFD | FMC_PFAPR_M5PFD | @@ -369,7 +369,7 @@ kinesis_setdividers(uint32_t div1, uint32_t div2, uint32_t div3, uint32_t div4) /* Wait for dividers to change */ for (i = 0 ; i < div4 ; i++); - + /* Re-store the saved value of FMC_PFAPR */ putreg32(regval, KINETIS_FMC_PFAPR); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c b/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c index 2837d867f..97ae5a610 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_clrpend.c @@ -71,7 +71,7 @@ * * Description: * Clear a pending interrupt at the NVIC. This does not seem to be required - * for most interrupts. Don't know why... + * for most interrupts. Don't know why... * * I keep it in a separate file so that it will not increase the footprint * on Kinetis platforms that do not need this function. diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.h b/nuttx/arch/arm/src/kinetis/kinetis_enet.h index 0a5e78ea9..1843afcd0 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.h @@ -295,7 +295,7 @@ /* Receive Descriptor Ring Start Register */ /* Bits 0-2: Reserved */ #define ENET_RDSR_SHIFT (3) /* Bits 3-31: Start of the receive buffer descriptor queue */ -#define ENET_RDSR_MASK (0xfffffff8) +#define ENET_RDSR_MASK (0xfffffff8) /* Transmit Buffer Descriptor Ring Start Register */ /* Bits 0-2: Reserved */ @@ -476,9 +476,9 @@ #ifdef CONFIG_ENDIAN_BIG # define TXDESC_TSE (1 << 8) -# define TXDESC_OE (1 << 9) -# define TXDESC_LCE (1 << 10) -# define TXDESC_FE (1 << 11) +# define TXDESC_OE (1 << 9) +# define TXDESC_LCE (1 << 10) +# define TXDESC_FE (1 << 11) # define TXDESC_EE (1 << 12) # define TXDESC_UE (1 << 13) # define TXDESC_TXE (1 << 15) @@ -495,15 +495,15 @@ # define TXDESC_TS (1 << 5) # define TXDESC_INT (1 << 6) -# define TXDESC_TSE (1 << 16) -# define TXDESC_OE (1 << 17) -# define TXDESC_LCE (1 << 18) -# define TXDESC_FE (1 << 19) +# define TXDESC_TSE (1 << 16) +# define TXDESC_OE (1 << 17) +# define TXDESC_LCE (1 << 18) +# define TXDESC_FE (1 << 19) # define TXDESC_EE (1 << 20) # define TXDESC_UE (1 << 21) # define TXDESC_TXE (1 << 23) -# define TXDESC_BDU (1 << 7) +# define TXDESC_BDU (1 << 7) #endif /* Legacy (and Common) RX Buffer Descriptor Bit Definitions */ @@ -552,7 +552,7 @@ # define RXDESC_PE (1 << 26) # define RXDESC_ME (1 << 31) -# define RXDESC_BDU (1 << 31) +# define RXDESC_BDU (1 << 31) #else # define RXDESC_UC (1 << 0) # define RXDESC_CE (1 << 1) diff --git a/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h b/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h index 2c77dd4ba..199a02a0d 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_k60pinmux.h @@ -47,7 +47,7 @@ /******************************************************************************************** * Pre-processor Definitions ********************************************************************************************/ -/* Reference: Paragraph 10.3.1, p 258, of FreeScale document K60P144M100SF2RM +/* Reference: Paragraph 10.3.1, p 258, of FreeScale document K60P144M100SF2RM * * In most cases, there are alternative configurations for various pins. Those alternative * pins are labeled with a suffix like _1, _2, etc. in order to distinguish them. Logic in diff --git a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c index f52d3ba35..c3599618c 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c @@ -56,7 +56,7 @@ /************************************************************************** * Private Definitions **************************************************************************/ - + /* Select UART parameters for the selected console */ #if defined(CONFIG_UART0_SERIAL_CONSOLE) @@ -126,7 +126,7 @@ static uint8_t g_sizemap[8] = {1, 4, 8, 16, 32, 64, 128, 0}; /************************************************************************** * Private Functions **************************************************************************/ - + /************************************************************************** * Public Functions **************************************************************************/ @@ -347,7 +347,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, { regval |= UART_C1_M; } - + /* The only other option is 8-bit operation */ else @@ -361,7 +361,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, sbr = clock / (baud << 4); DEBUGASSERT(sbr < 0x2000); - + /* Save the new baud divisor, retaining other bits in the UARTx_BDH * register. */ @@ -373,7 +373,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, regval = sbr & 0xff; putreg8(regval, uart_base+KINETIS_UART_BDL_OFFSET); - + /* Calculate a fractional divider to get closer to the requested baud. * The fractional divider, BRFA, is a 5 bit fractional value that is * logically added to the SBR: @@ -386,7 +386,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, tmp = clock - (sbr * (baud << 4)); brfa = (tmp << 5) / (baud << 4); - + /* Set the BRFA field (retaining other bits in the UARTx_C4 register) */ regval = getreg8(uart_base+KINETIS_UART_C4_OFFSET) & UART_C4_BRFA_MASK; @@ -412,14 +412,14 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, depth = (3 * depth) >> 2; } putreg8(depth , uart_base+KINETIS_UART_RWFIFO_OFFSET); - + depth = g_sizemap[(regval & UART_PFIFO_TXFIFOSIZE_MASK) >> UART_PFIFO_TXFIFOSIZE_SHIFT]; if (depth > 3) { depth = (depth >> 2); } putreg8(depth, uart_base+KINETIS_UART_TWFIFO_OFFSET); - + /* Enable RX and TX FIFOs */ putreg8(UART_PFIFO_RXFE | UART_PFIFO_TXFE, uart_base+KINETIS_UART_PFIFO_OFFSET); @@ -431,8 +431,8 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, * (1 in this case) is less than or equal to 0. * RWFIFO[RXWATER] = 1: RDRF will be set when the number of queued bytes * (1 in this case) is greater than or equal to 1. - * - * Set the watermarks to one/zero and disable the FIFOs + * + * Set the watermarks to one/zero and disable the FIFOs */ putreg8(1, uart_base+KINETIS_UART_RWFIFO_OFFSET); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h b/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h index 7253717bd..ef1d22265 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h @@ -185,7 +185,7 @@ # define KINETIS_MCM_BASE 0xe0080000 /* Miscellaneous Control Module (including ETB Almost Full) */ # define KINETIS_ROMTAB_BASE 0xe00ff000 /* ROM Table - allows auto-detection of debug components */ -/* K60 Family +/* K60 Family * * The memory map for the following parts is defined in Freescale document * K60P144M100SF2RM diff --git a/nuttx/arch/arm/src/kinetis/kinetis_serial.c b/nuttx/arch/arm/src/kinetis/kinetis_serial.c index fc74f22ba..4cf414fd6 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_serial.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_serial.c @@ -707,7 +707,7 @@ static int up_attach(struct uart_dev_s *dev) static void up_detach(struct uart_dev_s *dev) { struct up_dev_s *priv = (struct up_dev_s*)dev->priv; - + /* Disable interrupts */ up_restoreuartint(priv, 0); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c b/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c index 9f9f14ba6..8dd514a9c 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c @@ -126,7 +126,7 @@ void up_timerinit(void) regval |= (NVIC_SYSH_PRIORITY_DEFAULT << NVIC_SYSH_PRIORITY_PR15_SHIFT); putreg32(regval, NVIC_SYSH12_15_PRIORITY); - /* Note that is should not be neccesary to set the SYSTICK clock source: + /* Note that is should not be neccesary to set the SYSTICK clock source: * "The CLKSOURCE bit in SysTick Control and Status register is always set * to select the core clock." */ diff --git a/nuttx/arch/arm/src/kinetis/kinetis_userspace.c b/nuttx/arch/arm/src/kinetis/kinetis_userspace.c index 75b3c08fd..d0d57145d 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_userspace.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_userspace.c @@ -98,7 +98,7 @@ void kinetis_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/kl/chip/kl_tpm.h b/nuttx/arch/arm/src/kl/chip/kl_tpm.h index d9c8a9b70..7d185934b 100644 --- a/nuttx/arch/arm/src/kl/chip/kl_tpm.h +++ b/nuttx/arch/arm/src/kl/chip/kl_tpm.h @@ -176,7 +176,7 @@ #define TPM_CONF_CSOT (1 << 16) /* Bit 16: Counter Start On Trigger */ #define TPM_CONF_CSOO (1 << 17) /* Bit 17: Counter Stop On Overflow */ #define TPM_CONF_CROT (1 << 18) /* Bit 18: Counter Reload On Trigger */ - /* Bits 19-23: Reserved */ + /* Bits 19-23: Reserved */ #define TPM_CONF_TRGSEL_SHIFT 24 #define TPM_CONF_TRGSEL_MASK (15 << TPM_CONF_TRGSEL_SHIFT) # define TPM_CONF_TRGSEL_EXTRG_IN (0 << TPM_CONF_TRGSEL_SHIFT) /* External trigger pin input */ diff --git a/nuttx/arch/arm/src/kl/kl_config.h b/nuttx/arch/arm/src/kl/kl_config.h index 1a6d1f1e2..fd7cc592c 100644 --- a/nuttx/arch/arm/src/kl/kl_config.h +++ b/nuttx/arch/arm/src/kl/kl_config.h @@ -64,7 +64,7 @@ /* Are any UARTs enabled? */ #undef HAVE_UART_DEVICE -#if defined(CONFIG_KL_UART0) || defined(CONFIG_KL_UART1) || defined(CONFIG_KL_UART2) +#if defined(CONFIG_KL_UART0) || defined(CONFIG_KL_UART1) || defined(CONFIG_KL_UART2) # define HAVE_UART_DEVICE 1 #endif diff --git a/nuttx/arch/arm/src/kl/kl_gpio.c b/nuttx/arch/arm/src/kl/kl_gpio.c index 58de0eea1..78fba619a 100644 --- a/nuttx/arch/arm/src/kl/kl_gpio.c +++ b/nuttx/arch/arm/src/kl/kl_gpio.c @@ -145,7 +145,7 @@ int kl_configgpio(uint32_t cfgset) { regval |= PORT_PCR_ODE; } - + /* Check for high drive output */ if ((cfgset & _PIN_OUTPUT_DRIVE_MASK) == _PIN_OUTPUT_HIGHDRIVE) diff --git a/nuttx/arch/arm/src/kl/kl_gpio.h b/nuttx/arch/arm/src/kl/kl_gpio.h index e1db46d9a..d2d181b13 100644 --- a/nuttx/arch/arm/src/kl/kl_gpio.h +++ b/nuttx/arch/arm/src/kl/kl_gpio.h @@ -241,7 +241,7 @@ #define PIN_PASV_FILTER (1 << 18) /* Bit 18: Enable passive filter */ #define PIN_DIG_FILTER (1 << 17) /* Bit 17: Enable digital filter */ - + /* Three bits are used to define the port number: * * ---- ---- ---- ---- ---- -ppp ---- ---- diff --git a/nuttx/arch/arm/src/kl/kl_idle.c b/nuttx/arch/arm/src/kl/kl_idle.c index 6ec2ab46f..688a002bd 100644 --- a/nuttx/arch/arm/src/kl/kl_idle.c +++ b/nuttx/arch/arm/src/kl/kl_idle.c @@ -87,7 +87,7 @@ static void up_idlepm(void) enum pm_state_e newstate; irqstate_t flags; int ret; - + /* Decide, which power saving level can be obtained */ newstate = pm_checkstate(); diff --git a/nuttx/arch/arm/src/kl/kl_userspace.c b/nuttx/arch/arm/src/kl/kl_userspace.c index 00d0f5338..8949a90d2 100644 --- a/nuttx/arch/arm/src/kl/kl_userspace.c +++ b/nuttx/arch/arm/src/kl/kl_userspace.c @@ -97,7 +97,7 @@ void kl_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig index 20b4b37e6..d1e76062d 100644 --- a/nuttx/arch/arm/src/lpc17xx/Kconfig +++ b/nuttx/arch/arm/src/lpc17xx/Kconfig @@ -493,7 +493,7 @@ config ADC_CHANLIST config ADC_NCHANNELS int "ADC0 number of channels" depends on ADC_CHANLIST - default 0 + default 0 ---help--- If ADC_CHANLIST is enabled, then the platform specific code must do two things: (1) define ADC_NCHANNELS in the configuration @@ -606,7 +606,7 @@ config SDIO_DMA default y if LPC17_GPDMA depends on LPC17_GPDMA ---help--- - Support DMA data transfers. + Support DMA data transfers. Enable SD card DMA data transfers. This is a marginally optional. For most usages, SD accesses will cause data overruns if used without DMA. Requires LPC17_SDCARD and config LPC17_GPDMA. diff --git a/nuttx/arch/arm/src/lpc17xx/Make.defs b/nuttx/arch/arm/src/lpc17xx/Make.defs index be695a777..a7fa299df 100644 --- a/nuttx/arch/arm/src/lpc17xx/Make.defs +++ b/nuttx/arch/arm/src/lpc17xx/Make.defs @@ -36,7 +36,7 @@ # The start-up, "head", file ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) -HEAD_ASRC = +HEAD_ASRC = else HEAD_ASRC = lpc17_vectors.S endif diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h index fcf0fa3d4..bc3ae3c92 100644 --- a/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h +++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h @@ -60,12 +60,12 @@ /* Clocking and power control - Phase locked loops */ -#define LPC17_SYSCON_PLL0CON_OFFSET 0x0080 /* PLL0 Control Register */ +#define LPC17_SYSCON_PLL0CON_OFFSET 0x0080 /* PLL0 Control Register */ #define LPC17_SYSCON_PLL0CFG_OFFSET 0x0084 /* PLL0 Configuration Register */ #define LPC17_SYSCON_PLL0STAT_OFFSET 0x0088 /* PLL0 Status Register */ #define LPC17_SYSCON_PLL0FEED_OFFSET 0x008c /* PLL0 Feed Register */ -#define LPC17_SYSCON_PLL1CON_OFFSET 0x00a0 /* PLL1 Control Register */ +#define LPC17_SYSCON_PLL1CON_OFFSET 0x00a0 /* PLL1 Control Register */ #define LPC17_SYSCON_PLL1CFG_OFFSET 0x00a4 /* PLL1 Configuration Register */ #define LPC17_SYSCON_PLL1STAT_OFFSET 0x00a8 /* PLL1 Status Register */ #define LPC17_SYSCON_PLL1FEED_OFFSET 0x00ac /* PLL1 Feed Register */ diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h index 84b019d61..74a210944 100644 --- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h +++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_can.h @@ -377,7 +377,7 @@ /* Error Warning Limit */ -#define CAN_EWL_SHIFT (0) /* Bits 0-7: Error warning limit */ +#define CAN_EWL_SHIFT (0) /* Bits 0-7: Error warning limit */ #define CAN_EWL_MASK (0xff << CAN_EWL_SHIFT) /* Bits 8-31: Reserved */ /* Status Register */ @@ -482,7 +482,7 @@ #define CAN_TDA_DATA4_SHIFT (24) /* Bits 24-31: RTR=0 && DLC >= 4 */ #define CAN_TDA_DATA4_MASK (0x0ff << CAN_TDA_DATA4_SHIFT) -/* Transmit data bytes 5-8 (Tx Buffer 1), Transmit data bytes 5-8 (Tx Buffer 2), and +/* Transmit data bytes 5-8 (Tx Buffer 1), Transmit data bytes 5-8 (Tx Buffer 2), and * Transmit data bytes 5-8 (Tx Buffer 3) common bit field definitions. */ diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h index d7b919cb6..ef334a1a6 100644 --- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h +++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_lcd.h @@ -71,7 +71,7 @@ /* Cursor Image registers, n=0-255 */ -#define LPC17_LCD_CRSR_IMG_OFFSET(n) (0x0800 + ((n) << 2)) +#define LPC17_LCD_CRSR_IMG_OFFSET(n) (0x0800 + ((n) << 2)) #define LPC17_LCD_CRSR_CRTL_OFFSET (0x0c00) /* Cursor Control register */ #define LPC17_LCD_CRSR_CFG_OFFSET (0x0c04) /* Cursor Configuration register */ diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h index 10abbd232..16a21a162 100644 --- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h +++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h @@ -263,7 +263,7 @@ #define MCPWM_CAPCLR_MCCLR0 (1 << 0) /* Bit 0: Clear MCCAP0 register */ #define MCPWM_CAPCLR_MCCLR1 (1 << 1) /* Bit 1: Clear MCCAP1 register */ #define MCPWM_CAPCLR_MCCLR2 (1 << 2) /* Bit 2: Clear MCCAP2 register */ - /* Bits 2-31: Reserved */ + /* Bits 2-31: Reserved */ /************************************************************************************ * Public Types diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h index d1e6dd013..32b02455c 100644 --- a/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h +++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc17_usb.h @@ -49,7 +49,7 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ - + /* Register offsets *****************************************************************/ /* USB Host Controller (OHCI) *******************************************************/ /* See include/nuttx/usb/ohci.h */ @@ -326,7 +326,7 @@ /* USB Device Interrupt Status, USB Device Interrupt Enable, USB Device Interrupt * Clear, USB Device Interrupt Set, and USB Device Interrupt Priority */ - + #define USBDEV_INT_FRAME (1 << 0) /* Bit 0: frame interrupt (every 1 ms) */ #define USBDEV_INT_EPFAST (1 << 1) /* Bit 1: Fast endpoint interrupt */ #define USBDEV_INT_EPSLOW (1 << 2) /* Bit 2: Slow endpoints interrupt */ diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h b/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h index a1bd9fe4d..d7736b979 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_adc.h @@ -53,7 +53,7 @@ * the ADC0_MASK within the board-specific library. */ -#ifdef CONFIG_ADC_CHANLIST +#ifdef CONFIG_ADC_CHANLIST # if !defined(CONFIG_ADC_NCHANNELS) # error "CONFIG_ADC_CHANLIST must defined in this configuration" # elif CONFIG_ADC_NCHANNELS < 1 @@ -92,7 +92,7 @@ extern "C" * the ADC0_MASK within the board-specific library. */ -#ifdef CONFIG_ADC_CHANLIST +#ifdef CONFIG_ADC_CHANLIST EXTERN uint8_t g_adc_chanlist[CONFIG_ADC_NCHANNELS]; #endif diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c b/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c index 4f3e5a512..87cc6a717 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_dac.c @@ -4,7 +4,7 @@ * Copyright (C) 2011 Li Zhuoyi. All rights reserved. * Author: Li Zhuoyi <lzyy.cn@gmail.com> * History: 0.1 2011-08-05 initial version - * + * * This file is a part of NuttX: * * Copyright (C) 2010 Gregory Nutt. All rights reserved. @@ -117,7 +117,7 @@ static void dac_reset(FAR struct dac_dev_s *dev) { irqstate_t flags; uint32_t regval; - + flags = irqsave(); regval = getreg32(LPC17_SYSCON_PCLKSEL0); diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c index d5ff51f61..7876da0ac 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c @@ -163,7 +163,7 @@ int lpc17_dumpgpio(lpc17_pinset_t pinset, const char *msg) #if defined(LPC176x) lldbg(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n", pinsel, pinsel ? getreg32(pinsel) : 0, - pinmode, pinmode ? getreg32(pinmode) : 0, + pinmode, pinmode ? getreg32(pinmode) : 0, g_odmode[port], getreg32(g_odmode[port])); #elif defined(LPC178x) lldbg(" IOCON[%08x]: %08x\n", iocon, getreg32(iocon)); diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c b/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c index 1d6b4b1d6..7cb51ed07 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpioint.c @@ -396,7 +396,7 @@ static void lpc17_gpiodemux(uint32_t intbase, uint32_t intmask, * * Description: * Handle the GPIO interrupt. For the LPC176x family, that interrupt could - * also that also indicates that an EINT3 interrupt has occurred. NOTE: + * also that also indicates that an EINT3 interrupt has occurred. NOTE: * This logic would have to be extended if EINT3 is actually used for * External Interrupt 3 on an LPC176x platform. * diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h index c508ddf6a..5e039dad7 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h @@ -141,11 +141,11 @@ #define LPC17_TD_SIZE 32 /* Configurable number of user transfer descriptors (TDs). */ - + #ifndef CONFIG_USBHOST_NTDS # define CONFIG_USBHOST_NTDS 3 #endif - + #if CONFIG_USBHOST_NTDS < 2 # error "Insufficent TDs" #endif diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h index 66eb68b9b..12c2fba9d 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h @@ -88,7 +88,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno); * * Input Parameters: * dev - An instance of the SDIO driver device state structure. - * cardinslot - true is a card has been detected in the slot; false if a + * cardinslot - true is a card has been detected in the slot; false if a * card has been removed from the slot. Only transitions * (inserted->removed or removed->inserted should be reported) * diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c b/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c index 57a775a6a..7c0f0e04a 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c @@ -611,7 +611,7 @@ static inline uint32_t lpc17_uartcclkdiv(uint32_t baud) { return SYSCON_PCLKSEL_CCLK; } - + /* Check divisor == 2. This works if: * * 2 * CCLK / BAUD / 16 < 0xffff, or @@ -636,7 +636,7 @@ static inline uint32_t lpc17_uartcclkdiv(uint32_t baud) * And * * 4 * CCLK / BAUD / 16 >= MinDL, or - * BAUD <= CCLK / 4 / MinDL + * BAUD <= CCLK / 4 / MinDL */ else if (baud < (LPC17_CCLK / 4 / UART_MINDL )) @@ -652,7 +652,7 @@ static inline uint32_t lpc17_uartcclkdiv(uint32_t baud) * And * * 8 * CCLK / BAUD / 16 >= MinDL, or - * BAUD <= CCLK / 2 / MinDL + * BAUD <= CCLK / 2 / MinDL */ else /* if (baud < (LPC17_CCLK / 2 / UART_MINDL )) */ @@ -942,7 +942,7 @@ static int up_setup(struct uart_dev_s *dev) (UART_FCR_RXTRIGGER_8|UART_FCR_TXRST|UART_FCR_RXRST|UART_FCR_FIFOEN)); /* Enable Auto-RTS and Auto-CS Flow Control in the Modem Control Register */ - + #if defined(CONFIG_UART1_IFLOWCONTROL) || defined(CONFIG_UART1_OFLOWCONTROL) if (priv->uartbase == LPC17_UART1_BASE) { diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c index 08599e68e..aae65f651 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -73,7 +73,7 @@ /* Debug ********************************************************************/ /* The following enable debug output from this file: - * + * * CONFIG_DEBUG - Define to enable general debug features * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG) * CONFIG_DEBUG_VERBOSE - Define to enable verbose SSP debug @@ -212,7 +212,7 @@ static struct lpc17_sspdev_s g_ssp0dev = #ifdef CONFIG_LPC17_SSP_INTERRUPTS .sspirq = LPC17_IRQ_SSP0, #endif -}; +}; #endif /* CONFIG_LPC17_SSP0 */ #ifdef CONFIG_LPC17_SSP1 @@ -246,7 +246,7 @@ static struct lpc17_sspdev_s g_ssp1dev = #ifdef CONFIG_LPC17_SSP_INTERRUPTS .sspirq = LPC17_IRQ_SSP1, #endif -}; +}; #endif /* CONFIG_LPC17_SSP1 */ #ifdef CONFIG_LPC17_SSP2 @@ -280,7 +280,7 @@ static struct lpc17_sspdev_s g_ssp2dev = #ifdef CONFIG_LPC17_SSP_INTERRUPTS .sspirq = LPC17_IRQ_SSP2, #endif -}; +}; #endif /* CONFIG_LPC17_SSP2 */ /**************************************************************************** @@ -462,7 +462,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) cpsdvsr = (cpsdvsr + 1) & ~1; /* Save the new CPSDVSR and SCR values */ - + ssp_putreg(priv, LPC17_SSP_CPSR_OFFSET, cpsdvsr); regval = ssp_getreg(priv, LPC17_SSP_CR0_OFFSET); @@ -520,19 +520,19 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) { case SPIDEV_MODE0: /* CPOL=0; CPHA=0 */ break; - + case SPIDEV_MODE1: /* CPOL=0; CPHA=1 */ regval |= SSP_CR0_CPHA; break; - + case SPIDEV_MODE2: /* CPOL=1; CPHA=0 */ regval |= SSP_CR0_CPOL; break; - + case SPIDEV_MODE3: /* CPOL=1; CPHA=1 */ regval |= (SSP_CR0_CPOL|SSP_CR0_CPHA); break; - + default: sspdbg("Bad mode: %d\n", mode); DEBUGASSERT(FALSE); diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_start.c b/nuttx/arch/arm/src/lpc17xx/lpc17_start.c index 7f8756f4c..80f136f11 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_start.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_start.c @@ -122,7 +122,7 @@ static inline void lpc17_fpuconfig(void) * with the volatile FP registers stacked above the basic context. */ - regval = getcontrol(); + regval = getcontrol(); regval |= (1 << 2); setcontrol(regval); @@ -152,7 +152,7 @@ static inline void lpc17_fpuconfig(void) * with the volatile FP registers stacked in the saved context. */ - regval = getcontrol(); + regval = getcontrol(); regval &= ~(1 << 2); setcontrol(regval); diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c index 938d0c8a7..7dbb2170b 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c @@ -1490,7 +1490,7 @@ static void lpc17_usbreset(struct lpc17_usbdev_s *priv) lpc17_putreg(USB_SLOW_INT|USB_DEVSTATUS_INT|USB_FAST_INT|USB_FRAME_INT|USB_ERROR_INT, LPC17_USBDEV_INTEN); - /* Tell the class driver that we are disconnected. The class + /* Tell the class driver that we are disconnected. The class * driver should then accept any new configurations. */ @@ -3130,7 +3130,7 @@ static int lpc17_wakeup(struct usbdev_s *dev) * Name: lpc17_selfpowered * * Description: - * Sets/clears the device selfpowered feature + * Sets/clears the device selfpowered feature * *******************************************************************************/ diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c index 1e1681ee5..c9e1a3a7a 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -271,13 +271,13 @@ static void lpc17_setinttab(uint32_t value, unsigned int interval, unsigned int #endif static inline int lpc17_addinted(struct lpc17_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, + FAR const struct usbhost_epdesc_s *epdesc, struct lpc17_ed_s *ed); static inline int lpc17_reminted(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed); static inline int lpc17_addisoced(struct lpc17_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, + FAR const struct usbhost_epdesc_s *epdesc, struct lpc17_ed_s *ed); static inline int lpc17_remisoced(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed); @@ -724,7 +724,7 @@ static void lpc17_freeio(uint8_t *buffer) * Helper function to add an ED to the bulk list. * *******************************************************************************/ - + static inline int lpc17_addbulked(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed) { @@ -757,7 +757,7 @@ static inline int lpc17_addbulked(struct lpc17_usbhost_s *priv, * Helper function remove an ED from the bulk list. * *******************************************************************************/ - + static inline int lpc17_rembulked(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed) { @@ -891,9 +891,9 @@ static void lpc17_setinttab(uint32_t value, unsigned int interval, unsigned int * 2. Some devices may get polled at a much higher rate than they request. * *******************************************************************************/ - + static inline int lpc17_addinted(struct lpc17_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, + FAR const struct usbhost_epdesc_s *epdesc, struct lpc17_ed_s *ed) { #ifndef CONFIG_USBHOST_INT_DISABLE @@ -1000,7 +1000,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv, * 2. Some devices may get polled at a much higher rate than they request. * *******************************************************************************/ - + static inline int lpc17_reminted(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed) { @@ -1088,7 +1088,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv, uvdbg("min interval: %d offset: %d\n", interval, offset); /* Save the new minimum interval */ - + if ((ed->hw.ctrl && ED_CONTROL_D_MASK) == ED_CONTROL_D_IN) { priv->ininterval = interval; @@ -1127,9 +1127,9 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv, * Helper functions to add an ED to the periodic table. * *******************************************************************************/ - + static inline int lpc17_addisoced(struct lpc17_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, + FAR const struct usbhost_epdesc_s *epdesc, struct lpc17_ed_s *ed) { #ifndef CONFIG_USBHOST_ISOC_DISABLE @@ -1146,7 +1146,7 @@ static inline int lpc17_addisoced(struct lpc17_usbhost_s *priv, * Helper functions to remove an ED from the periodic table. * *******************************************************************************/ - + static inline int lpc17_remisoced(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed) { @@ -1302,7 +1302,7 @@ static int lpc17_ctrltd(struct lpc17_usbhost_s *priv, uint32_t dirpid, { ret = OK; } - else + else { uvdbg("Bad TD completion status: %d\n", EDCTRL->tdstatus); ret = EDCTRL->tdstatus == TD_CC_STALL ? -EPERM : -EIO; @@ -1397,7 +1397,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context) } /* Check if we are now disconnected */ - + else if (priv->connected) { /* Yes.. disconnect the device */ @@ -1446,7 +1446,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context) } /* Writeback Done Head interrupt */ - + if ((pending & OHCI_INT_WDH) != 0) { struct lpc17_gtd_s *td; @@ -1617,7 +1617,7 @@ static int lpc17_enumerate(FAR struct usbhost_connection_s *conn, int rphndx) udbg("Not connected\n"); return -ENODEV; } - + /* USB 2.0 spec says at least 50ms delay before port reset */ (void)usleep(100*1000); @@ -1681,7 +1681,7 @@ static int lpc17_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcadd /* Set the EP0 ED control word */ - EDCTRL->hw.ctrl = (uint32_t)funcaddr << ED_CONTROL_FA_SHIFT | + EDCTRL->hw.ctrl = (uint32_t)funcaddr << ED_CONTROL_FA_SHIFT | (uint32_t)maxpacketsize << ED_CONTROL_MPS_SHIFT; if (priv->lowspeed) @@ -1780,9 +1780,9 @@ static int lpc17_epalloc(FAR struct usbhost_driver_s *drvr, g_edfree = ((struct lpc17_list_s*)ed)->flink; /* Configure the endpoint descriptor. */ - + memset((void*)ed, 0, sizeof(struct lpc17_ed_s)); - ed->hw.ctrl = (uint32_t)(epdesc->funcaddr) << ED_CONTROL_FA_SHIFT | + ed->hw.ctrl = (uint32_t)(epdesc->funcaddr) << ED_CONTROL_FA_SHIFT | (uint32_t)(epdesc->addr) << ED_CONTROL_EN_SHIFT | (uint32_t)(epdesc->mxpacketsize) << ED_CONTROL_MPS_SHIFT; @@ -2259,7 +2259,7 @@ static int lpc17_ctrlout(FAR struct usbhost_driver_s *drvr, * - Never called from an interrupt handler. * *******************************************************************************/ - + static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, FAR uint8_t *buffer, size_t buflen) { @@ -2277,10 +2277,10 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, in = (ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN; uvdbg("EP%d %s toggle:%d maxpacket:%d buflen:%d\n", - (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT, + (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT, in ? "IN" : "OUT", (ed->hw.headp & ED_HEADP_C) != 0 ? 1 : 0, - (ed->hw.ctrl & ED_CONTROL_MPS_MASK) >> ED_CONTROL_MPS_SHIFT, + (ed->hw.ctrl & ED_CONTROL_MPS_MASK) >> ED_CONTROL_MPS_SHIFT, buflen); /* We must have exclusive access to the endpoint, the TD pool, the I/O buffer @@ -2360,7 +2360,7 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, /* BulkListFilled. This bit is used to indicate whether there are any * TDs on the Bulk list. */ - + regval = lpc17_getreg(LPC17_USBHOST_CMDST); regval |= OHCI_CMDST_BLF; lpc17_putreg(regval, LPC17_USBHOST_CMDST); @@ -2375,7 +2375,7 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, { ret = OK; } - else + else { uvdbg("Bad TD completion status: %d\n", ed->tdstatus); ret = -EIO; @@ -2443,7 +2443,7 @@ static void lpc17_disconnect(FAR struct usbhost_driver_s *drvr) priv->class = NULL; } - + /******************************************************************************* * Initialization *******************************************************************************/ @@ -2687,11 +2687,11 @@ FAR struct usbhost_connection_s *lpc17_usbhost_initialize(int controller) /* Software reset */ lpc17_putreg(OHCI_CMDST_HCR, LPC17_USBHOST_CMDST); - + /* Write Fm interval (FI), largest data packet counter (FSMPS), and * periodic start. */ - + lpc17_putreg(DEFAULT_FMINTERVAL, LPC17_USBHOST_FMINT); lpc17_putreg(DEFAULT_PERSTART, LPC17_USBHOST_PERSTART); diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c b/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c index a9bddfc8c..8a2d23dde 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_userspace.c @@ -98,7 +98,7 @@ void lpc17_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/lpc214x/README.txt b/nuttx/arch/arm/src/lpc214x/README.txt index 9cfc99593..752060c05 100644 --- a/nuttx/arch/arm/src/lpc214x/README.txt +++ b/nuttx/arch/arm/src/lpc214x/README.txt @@ -9,7 +9,7 @@ microcontroller with embedded high-speed flash memory ranging from 32 kB to 512 kB. A 128-bit wide memory interface and a unique accelerator architecture enable 32-bit code execution at the maximum clock rate. For critical code size applications, the alternative 16-bit Thumb mode reduces code by more than 30 pct -with minimal performance penalty. +with minimal performance penalty. Due to their tiny size and low power consumption, LPC2141/42/44/46/48 are ideal for applications where miniaturization is a key requirement, such as access @@ -20,42 +20,42 @@ protocol converters, soft modems, voice recognition and low end imaging, providi both large buffer size and high processing power. Various 32-bit timers, single or dual 10-bit ADC(s), 10-bit DAC, PWM channels and 45 fast GPIO lines with up to nine edge or level sensitive external interrupt pins make these microcontrollers -suitable for industrial control and medical systems. +suitable for industrial control and medical systems. Features ^^^^^^^^ -o 16-bit/32-bit ARM7TDMI-S microcontroller in a tiny LQFP64 package. +o 16-bit/32-bit ARM7TDMI-S microcontroller in a tiny LQFP64 package. o 8 kB to 40 kB of on-chip static RAM and 32 kB to 512 kB of on-chip flash memory. - 128-bit wide interface/accelerator enables high-speed 60 MHz operation. + 128-bit wide interface/accelerator enables high-speed 60 MHz operation. o In-System Programming/In-Application Programming (ISP/IAP) via on-chip boot loader software. Single flash sector or full chip erase in 400 ms and programming - of 256 B in 1 ms. + of 256 B in 1 ms. o EmbeddedICE RT and Embedded Trace interfaces offer real-time debugging with the - on-chip RealMonitor software and high-speed tracing of instruction execution. + on-chip RealMonitor software and high-speed tracing of instruction execution. o USB 2.0 Full-speed compliant device controller with 2 kB of endpoint RAM. In addition, - the LPC2146/48 provides 8 kB of on-chip RAM accessible to USB by DMA. + the LPC2146/48 provides 8 kB of on-chip RAM accessible to USB by DMA. o One or two (LPC2141/42 vs. LPC2144/46/48) 10-bit ADCs provide a total of 6/14 analog - inputs, with conversion times as low as 2.44 us per channel. -o Single 10-bit DAC provides variable analog output (LPC2142/44/46/48 only). + inputs, with conversion times as low as 2.44 us per channel. +o Single 10-bit DAC provides variable analog output (LPC2142/44/46/48 only). o Two 32-bit timers/external event counters (with four capture and four compare - channels each), PWM unit (six outputs) and watchdog. -o Low power Real-Time Clock (RTC) with independent power and 32 kHz clock input. + channels each), PWM unit (six outputs) and watchdog. +o Low power Real-Time Clock (RTC) with independent power and 32 kHz clock input. o Multiple serial interfaces including two UARTs (16C550), two Fast I2C-bus (400 - kbit/s), SPI and SSP with buffering and variable data length capabilities. -o Vectored Interrupt Controller (VIC) with configurable priorities and vector addresses. -o Up to 45 of 5 V tolerant fast general purpose I/O pins in a tiny LQFP64 package. -o Up to 21 external interrupt pins available. + kbit/s), SPI and SSP with buffering and variable data length capabilities. +o Vectored Interrupt Controller (VIC) with configurable priorities and vector addresses. +o Up to 45 of 5 V tolerant fast general purpose I/O pins in a tiny LQFP64 package. +o Up to 21 external interrupt pins available. o 60 MHz maximum CPU clock available from programmable on-chip PLL with settling - time of 100 us. -o On-chip integrated oscillator operates with an external crystal from 1 MHz to 25 MHz. -o Power saving modes include Idle and Power-down. + time of 100 us. +o On-chip integrated oscillator operates with an external crystal from 1 MHz to 25 MHz. +o Power saving modes include Idle and Power-down. o Individual enable/disable of peripheral functions as well as peripheral clock scaling - for additional power optimization. -o Processor wake-up from Power-down mode via external interrupt or BOD. -o Single power supply chip with POR and BOD circuits: + for additional power optimization. +o Processor wake-up from Power-down mode via external interrupt or BOD. +o Single power supply chip with POR and BOD circuits: o CPU operating voltage range of 3.0 V to 3.6 V (3.3 V +- 10 pct) with 5 V tolerant - I/O pads. + I/O pads. + - diff --git a/nuttx/arch/arm/src/lpc214x/chip.h b/nuttx/arch/arm/src/lpc214x/chip.h index d469aae8b..725cd520e 100644 --- a/nuttx/arch/arm/src/lpc214x/chip.h +++ b/nuttx/arch/arm/src/lpc214x/chip.h @@ -90,7 +90,7 @@ #define LPC214X_PLL_BASE 0xe01fc080 /* Phase Locked Loop (PLL) base address */ #define LPC214X_PCON_BASE 0xe01fc0c0 /* Power Control (PCON) base address */ #define LPC214X_APBDIV 0xe01fc100 /* APBDIV Address */ -#define LPC214X_EXT_BASE 0xe01fc140 /* External Interrupt base address */ +#define LPC214X_EXT_BASE 0xe01fc140 /* External Interrupt base address */ /* AHB Register block base addresses */ diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S index 25986def8..a29b78eb5 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S @@ -90,7 +90,7 @@ * * Bit 0:4 MSEL: PLL Multiplier "M" Value * CCLK = M * Fosc - * Bit 5:6 PSEL: PLL Divider "P" Value + * Bit 5:6 PSEL: PLL Divider "P" Value * Fcco = CCLK * 2 * P * 156MHz <= Fcco <= 320MHz */ @@ -403,9 +403,9 @@ #ifdef CONFIG_MAM_SETUP ldr \base, =LPC214X_MAM_BASE mov \val, #CONFIG_MAMTIM_VALUE - str \val, [\base, #LPC214x_MAM_TIM_OFFSET] + str \val, [\base, #LPC214x_MAM_TIM_OFFSET] mov \val, #CONFIG_MAMCR_VALUE - str \val, [\base, #LPC214X_MAM_CR_OFFSET] + str \val, [\base, #LPC214X_MAM_CR_OFFSET] #endif .endm diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S b/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S index b53e7aa78..d863c9e2f 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S @@ -199,7 +199,7 @@ up_lowsetup: /* Configure the FIFOs */ - mov r1, #LPC214X_FCR_VALUE + mov r1, #LPC214X_FCR_VALUE strb r1, [r0, #LPC214X_UART_FCR_OFFSET] /* And return */ diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c index 7b3192b31..5df5264fe 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c @@ -742,7 +742,7 @@ static bool up_txempty(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/arch/arm/src/lpc214x/lpc214x_usbdev.c b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c index da55c67db..fcc6d90c6 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -3094,7 +3094,7 @@ static int lpc214x_wakeup(struct usbdev_s *dev) * Name: lpc214x_selfpowered * * Description: - * Sets/clears the device selfpowered feature + * Sets/clears the device selfpowered feature * *******************************************************************************/ diff --git a/nuttx/arch/arm/src/lpc2378/chip.h b/nuttx/arch/arm/src/lpc2378/chip.h index 6113f21e8..e39ceed72 100644 --- a/nuttx/arch/arm/src/lpc2378/chip.h +++ b/nuttx/arch/arm/src/lpc2378/chip.h @@ -44,7 +44,7 @@ /**************************************************************************************************** * Included Files ****************************************************************************************************/ - + #include <sys/types.h> /**************************************************************************************************** @@ -57,7 +57,7 @@ #define LPC23XX_FIO_BASE 0x3fffc000 #define LPC23XX_ONCHIP_RAM_BASE 0x40000000 #define LPC23XX_USBDMA_RAM_BASE 0x7fd00000 -#define LPC23XX_ETHERNET_RAM_BASE 0x7fe00000 +#define LPC23XX_ETHERNET_RAM_BASE 0x7fe00000 #define LPC23XX_BOOT_BLOCK 0x7fffd000 #define LPC23XX_EXTMEM_BASE 0x80000000 #define LPC23XX_APB_BASE 0xe0000000 @@ -101,7 +101,7 @@ #define LPC23XX_EMAC_BASE 0xFFE00000 /* Ethernet MAC base address */ #define LPC23XX_USB_BASE 0xFFE0C200 /* USB base address */ #define LPC23XX_SCB_BASE 0xE01FC000 /* System Control Block (SBC) base address */ -#define LPC23XX_EXT_BASE 0xe01fc140 /* External Interrupt base address */ +#define LPC23XX_EXT_BASE 0xe01fc140 /* External Interrupt base address */ /* AHB Register block base addresses */ @@ -513,7 +513,7 @@ #define USB_SYS_ERR_INT_SET_OFFSET 0xC0 /* System Control Block(SCB) modules include Memory Accelerator Module, -Phase Locked Loop, VPB divider, Power Control, External Interrupt, +Phase Locked Loop, VPB divider, Power Control, External Interrupt, Reset, and Code Security/Debugging */ #define SCB_BASE_ADDR 0xE01FC000 @@ -556,7 +556,7 @@ Reset, and Code Security/Debugging */ //~ /* External Memory Controller (EMC) definitions */ -/* MPMC(EMC) registers, note: all the external memory controller(EMC) registers +/* MPMC(EMC) registers, note: all the external memory controller(EMC) registers are for LPC24xx only. */ #define STATIC_MEM0_BASE 0x80000000 #define STATIC_MEM1_BASE 0x81000000 diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_lowputc.S b/nuttx/arch/arm/src/lpc2378/lpc23xx_lowputc.S index cc332a961..45dae1338 100755 --- a/nuttx/arch/arm/src/lpc2378/lpc23xx_lowputc.S +++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_lowputc.S @@ -81,7 +81,7 @@ # define UARTx2STOP CONFIG_UART1_2STOP #elif defined(CONFIG_UART2_SERIAL_CONSOLE) # define UARTxBASE UART2_BASE_ADDR -# define PINSELECT LPC23XX_PINSEL0 +# define PINSELECT LPC23XX_PINSEL0 # define UARTxPCLKSEL 0xE01FC1AC # define PCLKSEL_MASK U2_PCLKSEL_MASK # define UARTxPINSEL UART2_PINSEL @@ -249,7 +249,7 @@ up_lowsetup: /* Configure the FIFOs */ - mov r1, #FCR_VALUE + mov r1, #FCR_VALUE strb r1, [r0, #UART_FCR_OFFSET] mov r1, #LCR_VALUE diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c index a7fce9739..dcd630eee 100644 --- a/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c +++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c @@ -348,7 +348,7 @@ static inline void up_configbaud(struct up_dev_s *priv) for (tmulval = 1; tmulval <= 15 && err > 0; tmulval++) { - /* Try every valid pre-scale div, tdivaddval (or until a perfect match is + /* Try every valid pre-scale div, tdivaddval (or until a perfect match is * found). */ @@ -481,7 +481,7 @@ static int up_setup(struct uart_dev_s *dev) (FCR_FIFO_TRIG8 | FCR_TX_FIFO_RESET | FCR_RX_FIFO_RESET | FCR_FIFO_ENABLE)); - /* The NuttX serial driver waits for the first THRE interrrupt before sending + /* The NuttX serial driver waits for the first THRE interrrupt before sending * serial data... However, it appears that the LPC2378 hardware too does not * generate that interrupt until a transition from not-empty to empty. So, * the current kludge here is to send one NULL at startup to kick things off. diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_allocateheap.c b/nuttx/arch/arm/src/lpc31xx/lpc31_allocateheap.c index 47136fdb8..6606f5a80 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_allocateheap.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_allocateheap.c @@ -129,15 +129,15 @@ #ifdef CONFIG_PAGING # ifdef PGTABLE_IN_HIGHSRAM -# define LPC31_HEAP_VEND (PG_LOCKED_VBASE + PG_TOTAL_VSIZE - PGTABLE_SIZE) +# define LPC31_HEAP_VEND (PG_LOCKED_VBASE + PG_TOTAL_VSIZE - PGTABLE_SIZE) # else -# define LPC31_HEAP_VEND (PG_LOCKED_VBASE + PG_TOTAL_VSIZE) +# define LPC31_HEAP_VEND (PG_LOCKED_VBASE + PG_TOTAL_VSIZE) # endif #else # ifdef PGTABLE_IN_HIGHSRAM -# define LPC31_HEAP_VEND (LPC31_INTSRAM_VSECTION + LPC31_ISRAM_SIZE - PGTABLE_SIZE) +# define LPC31_HEAP_VEND (LPC31_INTSRAM_VSECTION + LPC31_ISRAM_SIZE - PGTABLE_SIZE) # else -# define LPC31_HEAP_VEND (LPC31_INTSRAM_VSECTION + LPC31_ISRAM_SIZE) +# define LPC31_HEAP_VEND (LPC31_INTSRAM_VSECTION + LPC31_ISRAM_SIZE) # endif #endif diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_boot.c b/nuttx/arch/arm/src/lpc31xx/lpc31_boot.c index 24beb87fa..3e8b1949d 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_boot.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_boot.c @@ -90,40 +90,40 @@ extern uint32_t _vector_end; /* End+1 of vector block */ #ifndef CONFIG_ARCH_ROMPGTABLE static const struct section_mapping_s section_mapping[] = { - { LPC31_SHADOWSPACE_PSECTION, LPC31_SHADOWSPACE_VSECTION, + { LPC31_SHADOWSPACE_PSECTION, LPC31_SHADOWSPACE_VSECTION, LPC31_SHADOWSPACE_MMUFLAGS, LPC31_SHADOWSPACE_NSECTIONS}, #ifndef CONFIG_PAGING /* SRAM is already fully mapped */ - { LPC31_INTSRAM_PSECTION, LPC31_INTSRAM_VSECTION, + { LPC31_INTSRAM_PSECTION, LPC31_INTSRAM_VSECTION, LPC31_INTSRAM_MMUFLAGS, LPC31_INTSRAM_NSECTIONS}, #endif #ifdef CONFIG_ARCH_ROMPGTABLE - { LPC31_INTSROM0_PSECTION, LPC31_INTSROM0_VSECTION, + { LPC31_INTSROM0_PSECTION, LPC31_INTSROM0_VSECTION, LPC31_INTSROM_MMUFLAGS, LPC31_INTSROM0_NSECTIONS}, #endif - { LPC31_APB01_PSECTION, LPC31_APB01_VSECTION, + { LPC31_APB01_PSECTION, LPC31_APB01_VSECTION, LPC31_APB01_MMUFLAGS, LPC31_APB01_NSECTIONS}, - { LPC31_APB2_PSECTION, LPC31_APB2_VSECTION, + { LPC31_APB2_PSECTION, LPC31_APB2_VSECTION, LPC31_APB2_MMUFLAGS, LPC31_APB2_NSECTIONS}, - { LPC31_APB3_PSECTION, LPC31_APB3_VSECTION, + { LPC31_APB3_PSECTION, LPC31_APB3_VSECTION, LPC31_APB3_MMUFLAGS, LPC31_APB3_NSECTIONS}, - { LPC31_APB4MPMC_PSECTION, LPC31_APB4MPMC_VSECTION, + { LPC31_APB4MPMC_PSECTION, LPC31_APB4MPMC_VSECTION, LPC31_APB4MPMC_MMUFLAGS, LPC31_APB4MPMC_NSECTIONS}, - { LPC31_MCI_PSECTION, LPC31_MCI_VSECTION, + { LPC31_MCI_PSECTION, LPC31_MCI_VSECTION, LPC31_MCI_MMUFLAGS, LPC31_MCI_NSECTIONS}, - { LPC31_USBOTG_PSECTION, LPC31_USBOTG_VSECTION, + { LPC31_USBOTG_PSECTION, LPC31_USBOTG_VSECTION, LPC31_USBOTG_MMUFLAGS, LPC31_USBOTG_NSECTIONS}, #if defined(CONFIG_LPC31_EXTSRAM0) && CONFIG_LPC31_EXTSRAM0SIZE > 0 - { LPC31_EXTSRAM_PSECTION, LPC31_EXTSRAM_VSECTION, + { LPC31_EXTSRAM_PSECTION, LPC31_EXTSRAM_VSECTION, LPC31_EXTSDRAM_MMUFLAGS, LPC31_EXTSRAM_NSECTIONS}, #endif #if defined(CONFIG_LPC31_EXTDRAM) && CONFIG_LPC31_EXTDRAMSIZE > 0 - { LPC31_EXTSDRAM0_PSECTION, LPC31_EXTSDRAM0_VSECTION, + { LPC31_EXTSDRAM0_PSECTION, LPC31_EXTSDRAM0_VSECTION, LPC31_EXTSDRAM_MMUFLAGS, LPC31_EXTSDRAM0_NSECTIONS}, #endif - { LPC31_INTC_PSECTION, LPC31_INTC_VSECTION, + { LPC31_INTC_PSECTION, LPC31_INTC_VSECTION, LPC31_INTC_MMUFLAGS, LPC31_INTC_NSECTIONS}, #ifdef CONFIG_LPC31_EXTNAND - { LPC31_NAND_PSECTION, LPC31_NAND_VSECTION + { LPC31_NAND_PSECTION, LPC31_NAND_VSECTION LPC31_NAND_MMUFLAGS, LPC31_NAND_NSECTIONS}, #endif }; @@ -218,7 +218,7 @@ static void up_vectorpermissions(uint32_t mmuflags) pte = *ptr; if (pte == 0) { - pte = PG_VECT_PBASE; + pte = PG_VECT_PBASE; } else { @@ -372,10 +372,10 @@ void up_boot(void) lpc31_hp1pllconfig(); lpc31_hp0pllconfig(); - + /* Initialize clocking to settings provided by board-specific logic */ - lpc31_clkinit(&g_boardclks); + lpc31_clkinit(&g_boardclks); /* Map first 4KB of ARM space to ISRAM area */ diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_cgu.h b/nuttx/arch/arm/src/lpc31xx/lpc31_cgu.h index 0d1d7b7fb..15c16e8a8 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_cgu.h +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_cgu.h @@ -1121,7 +1121,7 @@ #define CGU_FREQIN_I2SRXWS1 4 /* I2SRX_WS1 */ #define CGU_FREQIN_HPPLL0 5 /* HPPLL0 (Audio/I2S PLL) */ #define CGU_FREQIN_HPPLL1 6 /* HPPLL1 (System PLL) */ -#define CGU_NFREQIN 7 +#define CGU_NFREQIN 7 /* CGU clock switchbox register bit definitions *************************************************/ @@ -1569,7 +1569,7 @@ Nandflash Controller */ /* HP0 Bandwith Selection register HP0_INSELR, address 0x13004d10, * HP1 bandwith Selection register HP1_INSELR, address 0x13004d48 */ - + #define CGU_HPINSELR_SHIFT (0) /* Bits 0-3: Pins to select the bandwidth */ #define CGU_HPINSELR_MASK (15 << CGU_HPINSELR_SHIFT) diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_cgudrvr.h b/nuttx/arch/arm/src/lpc31xx/lpc31_cgudrvr.h index 8aae207ed..19078cf3f 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_cgudrvr.h +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_cgudrvr.h @@ -229,7 +229,7 @@ enum lpc31_clockid_e CLKID_DMACLKGATED, /* 9 DMA_CLK_GATED */ CLKID_NANDFLASHS0CLK, /* 10 NANDFLASH_S0_CLK */ CLKID_NANDFLASHECCCLK, /* 11 NANDFLASH_ECC_CLK */ - CLKID_NANDFLASHAESCLK, /* 12 NANDFLASH_AES_CLK (Reserved on LPC313x) */ + CLKID_NANDFLASHAESCLK, /* 12 NANDFLASH_AES_CLK (Reserved on LPC313x) */ CLKID_NANDFLASHNANDCLK, /* 13 NANDFLASH_NAND_CLK */ CLKID_NANDFLASHPCLK, /* 14 NANDFLASH_PCLK */ CLKID_CLOCKOUT, /* 15 CLOCK_OUT */ @@ -307,7 +307,7 @@ enum lpc31_clockid_e /* Domain 6: UART_BASE */ CLKID_UARTUCLK, /* 72 UART_U_CLK */ - + /* Domain 7: CLK1024FS_BASE */ CLKID_I2SEDGEDETECTCLK, /* 73 I2S_EDGE_DETECT_CLK */ @@ -383,11 +383,11 @@ enum lpc31_resetid_e RESETID_I2SRXIF0RST, /* 33 I2SRX_IF_0 */ RESETID_I2SRXFF1RST, /* 34 I2SRX_FIFO_1 */ RESETID_I2SRXIF1RST, /* 35 I2SRX_IF_1 */ - RESETID_RESERVED40, /* 36 Reserved */ - RESETID_RESERVED41, /* 37 Reserved */ - RESETID_RESERVED42, /* 38 Reserved */ - RESETID_RESERVED43, /* 39 Reserved */ - RESETID_RESERVED44, /* 40 Reserved */ + RESETID_RESERVED40, /* 36 Reserved */ + RESETID_RESERVED41, /* 37 Reserved */ + RESETID_RESERVED42, /* 38 Reserved */ + RESETID_RESERVED43, /* 39 Reserved */ + RESETID_RESERVED44, /* 40 Reserved */ RESETID_LCDRST, /* 41 LCD Interface */ RESETID_SPIRSTAPB, /* 42 apb_clk domain of SPI */ RESETID_SPIRSTIP, /* 43 ip_clk domain of SPI */ diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_clkexten.c b/nuttx/arch/arm/src/lpc31xx/lpc31_clkexten.c index 4ed0e5f73..770bfb6a8 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_clkexten.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_clkexten.c @@ -64,7 +64,7 @@ /**************************************************************************** * Public Functions ****************************************************************************/ - + /**************************************************************************** * Name: lpc31_enableexten * @@ -77,7 +77,7 @@ void lpc31_enableexten(enum lpc31_clockid_e clkid) { uint32_t regaddr; uint32_t regval; - + switch (clkid) { case CLKID_DMACLKGATED: /* 9 DMA_CLK_GATED */ @@ -120,7 +120,7 @@ void lpc31_disableexten(enum lpc31_clockid_e clkid) { uint32_t regaddr; uint32_t regval; - + switch (clkid) { case CLKID_DMACLKGATED: /* 9 DMA_CLK_GATED */ diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_clkinit.c b/nuttx/arch/arm/src/lpc31xx/lpc31_clkinit.c index b0e032281..0f2c1141f 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_clkinit.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_clkinit.c @@ -107,7 +107,7 @@ static void lpc31_domaininit(struct lpc31_domainconfig_s* dmn) } /* Configure the fractional dividers in this domain */ - + for (fdndx = 0; fdndx < dmn->nfdiv; fdndx++, sub++) { /* Set fractional divider confiruation but don't enable it yet */ @@ -125,7 +125,7 @@ static void lpc31_domaininit(struct lpc31_domainconfig_s* dmn) for (clkndx = 0; clkndx <= dmn->nclks; clkndx++) { /* Does this clock have an ESR register? */ - + esrndx = lpc31_esrndx((enum lpc31_clockid_e)(clkndx + dmn->clk1)); if (esrndx != ESRNDX_INVALID) { diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_defclk.c b/nuttx/arch/arm/src/lpc31xx/lpc31_defclk.c index 1f0ec194b..4670253f4 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_defclk.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_defclk.c @@ -85,7 +85,7 @@ bool lpc31_defclk(enum lpc31_clockid_e clkid) /* Check if this clock should be enabled. This is determined by * 3 bitsets provided by board-specific logic in board/board.h. */ - + if ((int)clkid < 32) { enable = ((BOARD_CLKS_0_31 & (1 << (int)clkid)) != 0); diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c b/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c index e41485b4d..46a4b4951 100755 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -4320,7 +4320,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller) /* Enable USB OTG PLL and wait for lock */ putreg32(0, LPC31_SYSCREG_USB_ATXPLLPDREG); - + uint32_t bank = EVNTRTR_BANK(EVENTRTR_USBATXPLLLOCK); uint32_t bit = EVNTRTR_BIT(EVENTRTR_USBATXPLLLOCK); diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_esrndx.c b/nuttx/arch/arm/src/lpc31xx/lpc31_esrndx.c index e29fe937d..a868dc57a 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_esrndx.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_esrndx.c @@ -89,7 +89,7 @@ int lpc31_esrndx(enum lpc31_clockid_e clkid) /* There ar 89 Enable Select Registers (ESR). Indexing for these * registers is identical to indexing to other registers (like PCR), - * except that there are no ESR registers for + * except that there are no ESR registers for * * * CLKID_I2SRXBCK0 Clock ID 87: I2SRX_BCK0 diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_fdivinit.c b/nuttx/arch/arm/src/lpc31xx/lpc31_fdivinit.c index f8ecb00f3..488a802f9 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_fdivinit.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_fdivinit.c @@ -110,7 +110,7 @@ lpc31_bitwidth(unsigned int value, unsigned int fdwid) /* Is this bit set? If so, then the width of the value is 0 to bit, * or bit+1. */ - + if ((value & (1 << bit)) != 0) { width = bit + 1; @@ -148,7 +148,7 @@ uint32_t lpc31_fdivinit(int fdcndx, * consumption, the lpc313x user manual recommends that madd and msub * be shifted right to have as many trailing zero's as possible. */ - + madd = fdiv->m - fdiv->n; msub = -fdiv->n; @@ -170,7 +170,7 @@ uint32_t lpc31_fdivinit(int fdcndx, } /* Find maximum bit width of madd & msub. Here we calculate the width of the OR - * of the two values. The width of the OR will be the width of the wider value + * of the two values. The width of the OR will be the width of the wider value */ fdshift = fdwid - lpc31_bitwidth((unsigned int)madd | (unsigned int)fdiv->n, fdwid); @@ -181,7 +181,7 @@ uint32_t lpc31_fdivinit(int fdcndx, madd = (madd << fdshift) & fdmask; msub = (msub << fdshift) & fdmask; regval = (madd << maddshift) | (msub << msubshift); - + /* Check if 50% duty cycle is needed for this divider */ if (fdiv->stretch) diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h b/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h index 6b784cd6d..4730fd439 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h @@ -193,7 +193,7 @@ void lpc31_clockconfig(void); * 4. Add a calls to up_spiinitialize() in your low level application * initialization logic * 5. 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). * @@ -318,7 +318,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno); * * Input Parameters: * dev - An instance of the SDIO driver device state structure. - * cardinslot - true is a card has been detected in the slot; false if a + * cardinslot - true is a card has been detected in the slot; false if a * card has been removed from the slot. Only transitions * (inserted->removed or removed->inserted should be reported) * diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c b/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c index 4418ebc08..ec1f7bbdb 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c @@ -102,7 +102,7 @@ void up_irqinitialize(void) putreg32(0, LPC31_INTC_PRIORITYMASK0); /* Proc interrupt request 0: IRQ */ putreg32(0, LPC31_INTC_PRIORITYMASK1); /* Proc interrupt request 1: FIQ */ - + /* Disable all interrupts. Start from index 1 since 0 is unused.*/ for (irq = 0; irq < NR_IRQS; irq++) diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_lowputc.c b/nuttx/arch/arm/src/lpc31xx/lpc31_lowputc.c index 12e368db7..e031ef10d 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_lowputc.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_lowputc.c @@ -113,7 +113,7 @@ static inline void up_waittxready(void) for (tmp = 1000 ; tmp > 0 ; tmp--) { /* Check if the tranmitter holding register (THR) is empty */ - + if ((getreg32(LPC31_UART_LSR) & UART_LSR_THRE) != 0) { /* The THR is empty, return */ @@ -169,7 +169,7 @@ static inline void up_configbaud(void) */ /* Get UART block clock divided by 16 */ - + qtrclk = lpc31_clkfreq(CLKID_UARTUCLK, DOMAINID_UART) >> 4; /* Try every valid multiplier, tmulval (or until a perfect diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_pllconfig.c b/nuttx/arch/arm/src/lpc31xx/lpc31_pllconfig.c index fc6d4dc3b..427606b02 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_pllconfig.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_pllconfig.c @@ -143,7 +143,7 @@ lpc31_restoredomains(const struct lpc31_pllconfig_s * const cfg, /**************************************************************************** * Public Functions ****************************************************************************/ - + /**************************************************************************** * Name: lpc31_pllconfig * @@ -171,13 +171,13 @@ void lpc31_pllconfig(const struct lpc31_pllconfig_s * const cfg) */ putreg32(CGU_HPMODE_PD, pllbase + LPC31_CGU_HPMODE_OFFSET); - + /* Select PLL input frequency source */ putreg32(cfg->finsel, pllbase + LPC31_CGU_HPFINSEL_OFFSET); /* Set M divider */ - + putreg32(cfg->mdec & CGU_HPMDEC_MASK, pllbase + LPC31_CGU_HPMDEC_OFFSET); /* Set N divider */ @@ -195,7 +195,7 @@ void lpc31_pllconfig(const struct lpc31_pllconfig_s * const cfg) putreg32(cfg->selp, pllbase + LPC31_CGU_HPSELP_OFFSET); /* Power up pll */ - + putreg32((cfg->mode & ~CGU_HPMODE_PD) | CGU_HPMODE_CLKEN, pllbase + LPC31_CGU_HPMODE_OFFSET); /* Save the estimated freq in driver data for future clk calcs */ @@ -221,7 +221,7 @@ void lpc31_pllconfig(const struct lpc31_pllconfig_s * const cfg) void lpc31_hp0pllconfig(void) { - struct lpc31_pllconfig_s cfg = + struct lpc31_pllconfig_s cfg = { .hppll = CGU_HP0PLL, .finsel = BOARD_HPLL0_FINSEL, @@ -248,7 +248,7 @@ void lpc31_hp0pllconfig(void) void lpc31_hp1pllconfig(void) { - struct lpc31_pllconfig_s cfg = + struct lpc31_pllconfig_s cfg = { .hppll = CGU_HP1PLL, .finsel = BOARD_HPLL1_FINSEL, diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c b/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c index b79295488..46e91aba4 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c @@ -238,7 +238,7 @@ static inline void up_configbaud(void) */ /* Get UART block clock divided by 16 */ - + qtrclk = lpc31_clkfreq(CLKID_UARTUCLK, DOMAINID_UART) >> 4; /* Try every valid multiplier, tmulval (or until a perfect diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_setfdiv.c b/nuttx/arch/arm/src/lpc31xx/lpc31_setfdiv.c index 196118b18..c532dcf97 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_setfdiv.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_setfdiv.c @@ -84,7 +84,7 @@ void lpc31_setfdiv(enum lpc31_domainid_e dmnid, unsigned int basefreq; int fdcndx; int bcrndx; - + /* Get the frequency divider associated with this clock */ fdcndx = lpc31_fdcndx(clkid, dmnid); @@ -97,7 +97,7 @@ void lpc31_setfdiv(enum lpc31_domainid_e dmnid, regaddr = LPC31_CGU_SSR((int)dmnid); basefreq = (getreg32(regaddr) & CGU_SSR_FS_MASK) >> CGU_SSR_FS_SHIFT; - + /* Switch domain to FFAST input */ lpc31_selectfreqin(dmnid, CGU_FS_FFAST); diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c index 19e3e3592..ee9034c54 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c @@ -91,7 +91,7 @@ struct lpc31_spidev_s uint32_t actual; /* Actual clock frequency */ uint8_t nbits; /* Width of work in bits (8 or 16) */ uint8_t mode; /* Mode 0,1,2,3 */ - + uint32_t slv1; uint32_t slv2; }; @@ -156,7 +156,7 @@ static const struct spi_ops_s g_spiops = .registercallback = 0, }; -static struct lpc31_spidev_s g_spidev = +static struct lpc31_spidev_s g_spidev = { .spidev = { &g_spiops }, }; @@ -299,7 +299,7 @@ static inline void spi_drive_cs(FAR struct lpc31_spidev_s *priv, uint8_t slave, } spi_putreg(IOCONFIG_SPI_CSOUT0, LPC31_IOCONFIG_SPI_MODE1SET); break; - + case 1: if (val == 0) { @@ -350,7 +350,7 @@ static inline void spi_select_slave(FAR struct lpc31_spidev_s *priv, uint8_t sla spi_putreg(priv->slv2, LPC31_SPI_SLV0_2); spi_putreg(SPI_SLVENABLE1_ENABLED, LPC31_SPI_SLVENABLE); break; - + case 1: spi_putreg(priv->slv1, LPC31_SPI_SLV1_1); spi_putreg(priv->slv2, LPC31_SPI_SLV1_2); @@ -483,7 +483,7 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel { struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *) dev; uint8_t slave = 0; - + /* FIXME: map the devid to the SPI slave - this should really * be in board specific code..... */ switch (devid) @@ -503,19 +503,19 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel default: return; } - + /* - * Since we don't use sequential multi-slave mode, but rather - * perform the transfer piecemeal by consecutive calls to - * SPI_SEND, then we must manually assert the chip select - * across the whole transfer + * Since we don't use sequential multi-slave mode, but rather + * perform the transfer piecemeal by consecutive calls to + * SPI_SEND, then we must manually assert the chip select + * across the whole transfer */ if (selected) { spi_drive_cs(priv, slave, 0); spi_select_slave(priv, slave); - + /* Enable SPI as master and notify of slave enables change */ spi_putreg((1 << SPI_CONFIG_INTERSLVDELAY_SHIFT) | SPI_CONFIG_UPDENABLE | SPI_CONFIG_SPIENABLE, LPC31_SPI_CONFIG); @@ -523,11 +523,11 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel else { spi_drive_cs(priv, slave, 1); - + /* Disable all slaves */ spi_putreg(0, LPC31_SPI_SLVENABLE); - + /* Disable SPI as master */ spi_putreg(SPI_CONFIG_UPDENABLE, LPC31_SPI_CONFIG); @@ -553,18 +553,18 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) { FAR struct lpc31_spidev_s *priv = (FAR struct lpc31_spidev_s *)dev; uint32_t spi_clk, div, div1, div2; - + if (priv->frequency != frequency) { /* The SPI clock is derived from the (main system oscillator / 2), * so compute the best divider from that clock */ - + spi_clk = lpc31_clkfreq(CLKID_SPICLK, DOMAINID_SPI); - + /* Find closest divider to get at or under the target frequency */ - + div = (spi_clk + frequency / 2) / frequency; - + if (div > SPI_MAX_DIVIDER) { div = SPI_MAX_DIVIDER; @@ -573,7 +573,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) { div = SPI_MIN_DIVIDER; } - + div2 = (((div-1) / 512) + 2) * 2; div1 = ((((div + div2 / 2) / div2) - 1)); @@ -619,22 +619,22 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) setbits = 0; clrbits = SPI_SLV_2_SPO|SPI_SLV_2_SPH; break; - + case SPIDEV_MODE1: /* SPO=0; SPH=1 */ setbits = SPI_SLV_2_SPH; clrbits = SPI_SLV_2_SPO; break; - + case SPIDEV_MODE2: /* SPO=1; SPH=0 */ setbits = SPI_SLV_2_SPO; clrbits = SPI_SLV_2_SPH; break; - + case SPIDEV_MODE3: /* SPO=1; SPH=1 */ setbits = SPI_SLV_2_SPO|SPI_SLV_2_SPH; clrbits = 0; break; - + default: return; } @@ -689,7 +689,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - /* FIXME: is there anyway to determine this + /* FIXME: is there anyway to determine this * it should probably be board dependant anyway */ return SPI_STATUS_PRESENT; @@ -789,7 +789,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, *dest++ = word; } } - } + } } else { diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.h b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.h index 6d63fe65d..a83734b3f 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.h +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.h @@ -230,13 +230,13 @@ * Interrupt clear status register INTCLRSTATUS, address 0x15002fe8, * Interrupt set status register INTSETSTATUS, address 0x15002fec */ - + #define SPI_INT_SMS (1 << 4) /* Bit 4: Sequential multi-slave mode ready interrupt bit */ #define SPI_INT_TX (1 << 3) /* Bit 3: Transmit threshold level interrupt bit */ #define SPI_INT_RX (1 << 2) /* Bit 3: Receive threshold level interrupt bit */ #define SPI_INT_TO (1 << 1) /* Bit 1: Receive timeout interrupt bit */ #define SPI_INT_OV (1 << 0) /* Bit 0: Receive overrtun interrrupt bit */ - + /************************************************************************************************ * Public Types ************************************************************************************************/ diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_syscreg.h b/nuttx/arch/arm/src/lpc31xx/lpc31_syscreg.h index c14c7267c..72b08c9d9 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_syscreg.h +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_syscreg.h @@ -375,7 +375,7 @@ #define SYSCREG_EBI_TIMEOUT_SHIFT (0) /* Bits 0-9: Time MPMC, NAND or unused channel */ #define SYSCREG_EBI_TIMEOUT_MASK (0x3ff << SYSCREG_EBI_TIMEOUT_SHIFT) - + /* RINGOSCCFG address 0x13002814 */ #define SYSCREG_RINGOSCCFG_OSC1EN (1 << 1) /* Bit 1: Enable ring oscillator 1 */ diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c b/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c index bdfca4654..ba1e0c240 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -635,7 +635,7 @@ static bool lpc31_rqenqueue(FAR struct lpc31_ep_s *privep, FAR struct lpc31_req_s *req) { bool is_empty = !privep->head; - + req->flink = NULL; if (is_empty) { @@ -689,7 +689,7 @@ static void lpc31_queuedtd(uint8_t epphy, struct lpc31_dtd_s *dtd) uint32_t bit = LPC31_ENDPTMASK(epphy); lpc31_setbits (bit, LPC31_USBDEV_ENDPTPRIME); - + while (lpc31_getreg (LPC31_USBDEV_ENDPTPRIME) & bit) ; } @@ -707,7 +707,7 @@ static inline void lpc31_ep0xfer(uint8_t epphy, uint8_t *buf, uint32_t nbytes) struct lpc31_dtd_s *dtd = &g_td[epphy]; lpc31_writedtd(dtd, buf, nbytes); - + lpc31_queuedtd(epphy, dtd); } @@ -730,9 +730,9 @@ static void lpc31_readsetup(uint8_t epphy, struct usb_ctrlreq_s *ctrl) /* copy the request... */ for (i = 0; i < 8; i++) ((uint8_t *) ctrl)[i] = ((uint8_t *) dqh->setup)[i]; - + } while (!(lpc31_getreg(LPC31_USBDEV_USBCMD) & USBDEV_USBCMD_SUTW)); - + /* Clear the trip wire */ lpc31_clrbits(USBDEV_USBCMD_SUTW, LPC31_USBDEV_USBCMD); @@ -753,7 +753,7 @@ static inline void lpc31_set_address(struct lpc31_usbdev_s *priv, uint16_t addre priv->paddr = address; priv->paddrset = address != 0; - lpc31_chgbits(USBDEV_DEVICEADDR_MASK, priv->paddr << USBDEV_DEVICEADDR_SHIFT, + lpc31_chgbits(USBDEV_DEVICEADDR_MASK, priv->paddr << USBDEV_DEVICEADDR_SHIFT, LPC31_USBDEV_DEVICEADDR); } @@ -804,7 +804,7 @@ static int lpc31_progressep(struct lpc31_ep_s *privep) if (privreq->req.len == 0) { - /* If the class driver is responding to a setup packet, then wait for the + /* If the class driver is responding to a setup packet, then wait for the * host to illicit thr response */ if (privep->epphy == LPC31_EP0_IN && privep->dev->ep0state == EP0STATE_SETUP_OUT) @@ -816,7 +816,7 @@ static int lpc31_progressep(struct lpc31_ep_s *privep) else usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_EPOUTNULLPACKET), 0); } - + lpc31_reqcomplete(privep, lpc31_rqdequeue(privep), OK); return OK; } @@ -1013,10 +1013,10 @@ static void lpc31_ep0configure(struct lpc31_usbdev_s *priv) g_qh[LPC31_EP0_IN ].capability = (DQH_CAPABILITY_MAX_PACKET(CONFIG_LPC31_USBDEV_EP0_MAXSIZE) | DQH_CAPABILITY_IOS | DQH_CAPABILITY_ZLT); - + g_qh[LPC31_EP0_OUT].currdesc = DTD_NEXTDESC_INVALID; g_qh[LPC31_EP0_IN ].currdesc = DTD_NEXTDESC_INVALID; - + /* Enable EP0 */ lpc31_setbits (USBDEV_ENDPTCTRL0_RXE | USBDEV_ENDPTCTRL0_TXE, LPC31_USBDEV_ENDPTCTRL0); } @@ -1064,7 +1064,7 @@ static void lpc31_usbreset(struct lpc31_usbdev_s *priv) privep->stalled = false; } - /* Tell the class driver that we are disconnected. The class + /* Tell the class driver that we are disconnected. The class * driver should then accept any new configurations. */ if (priv->driver) @@ -1089,7 +1089,7 @@ static void lpc31_usbreset(struct lpc31_usbdev_s *priv) lpc31_ep0configure(priv); /* Enable Device interrupts */ - lpc31_putreg(USB_FRAME_INT | USB_ERROR_INT | + lpc31_putreg(USB_FRAME_INT | USB_ERROR_INT | USBDEV_USBINTR_NAKE | USBDEV_USBINTR_SLE | USBDEV_USBINTR_URE | USBDEV_USBINTR_PCE | USBDEV_USBINTR_UE, LPC31_USBDEV_USBINTR); } @@ -1105,7 +1105,7 @@ static void lpc31_usbreset(struct lpc31_usbdev_s *priv) static inline void lpc31_ep0state(struct lpc31_usbdev_s *priv, uint16_t state) { priv->ep0state = state; - + switch (state) { case EP0STATE_WAIT_NAK_IN: @@ -1137,7 +1137,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) uint16_t index; uint16_t len; - /* Terminate any pending requests - since all DTDs will have been retired + /* Terminate any pending requests - since all DTDs will have been retired * because of the setup packet */ lpc31_cancelrequests(&priv->eplist[LPC31_EP0_OUT], -EPROTO); @@ -1179,7 +1179,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) * index: zero interface endpoint * len: 2; data = status */ - + usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_GETSTATUS), 0); if (!priv->paddrset || len != 2 || (ctrl.type & USB_REQ_DIR_IN) == 0 || value != 0) @@ -1206,21 +1206,21 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) else priv->ep0buf[0] = 0; /* Not stalled */ priv->ep0buf[1] = 0; - + lpc31_ep0xfer (LPC31_EP0_IN, priv->ep0buf, 2); lpc31_ep0state (priv, EP0STATE_SHORTWRITE); } } break; - + case USB_REQ_RECIPIENT_DEVICE: { if (index == 0) { usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_DEVGETSTATUS), 0); - + /* Features: Remote Wakeup=YES; selfpowered=? */ - + priv->ep0buf[0] = (priv->selfpowered << USB_FEATURE_SELFPOWERED) | (1 << USB_FEATURE_REMOTEWAKEUP); priv->ep0buf[1] = 0; @@ -1235,7 +1235,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_RECIPIENT_INTERFACE: { usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_IFGETSTATUS), 0); @@ -1246,7 +1246,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) lpc31_ep0state (priv, EP0STATE_SHORTWRITE); } break; - + default: { usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_BADGETSTATUS), 0); @@ -1257,7 +1257,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_CLEARFEATURE: { /* type: host-to-device; recipient = device, interface or endpoint @@ -1265,7 +1265,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) * index: zero interface endpoint; * len: zero, data = none */ - + usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_CLEARFEATURE), 0); if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -1284,7 +1284,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_SETFEATURE: { /* type: host-to-device; recipient = device, interface, endpoint @@ -1292,7 +1292,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) * index: zero interface endpoint; * len: 0; data = none */ - + usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_SETFEATURE), 0); if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) && value == USB_FEATURE_TESTMODE) @@ -1316,7 +1316,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_SETADDRESS: { /* type: host-to-device; recipient = device @@ -1330,7 +1330,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) { /* Save the address. We cannot actually change to the next address until * the completion of the status phase. */ - + priv->paddr = ctrl.value[0]; priv->paddrset = false; lpc31_ep0state (priv, EP0STATE_WAIT_NAK_IN); @@ -1342,7 +1342,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_GETDESCRIPTOR: /* type: device-to-host; recipient = device * value: descriptor type and index @@ -1368,7 +1368,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_GETCONFIGURATION: /* type: device-to-host; recipient = device * value: 0; @@ -1389,7 +1389,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_SETCONFIGURATION: /* type: host-to-device; recipient = device * value: configuration value @@ -1410,7 +1410,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) } } break; - + case USB_REQ_GETINTERFACE: /* type: device-to-host; recipient = interface * value: 0 @@ -1428,7 +1428,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) lpc31_dispatchrequest(priv, &ctrl); } break; - + case USB_REQ_SYNCHFRAME: /* type: device-to-host; recipient = endpoint * value: 0 @@ -1439,7 +1439,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_SYNCHFRAME), 0); } break; - + default: { usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDCTRLREQ), 0); @@ -1470,7 +1470,7 @@ static void lpc31_ep0complete(struct lpc31_usbdev_s *priv, uint8_t epphy) struct lpc31_ep_s *privep = &priv->eplist[epphy]; usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_EP0COMPLETE), (uint16_t)priv->ep0state); - + switch (priv->ep0state) { case EP0STATE_DATA_IN: @@ -1484,15 +1484,15 @@ static void lpc31_ep0complete(struct lpc31_usbdev_s *priv, uint8_t epphy) case EP0STATE_DATA_OUT: if (lpc31_rqempty(privep)) return; - + if (lpc31_epcomplete (priv, epphy)) lpc31_ep0state (priv, EP0STATE_WAIT_NAK_IN); break; - + case EP0STATE_SHORTWRITE: lpc31_ep0state (priv, EP0STATE_WAIT_NAK_OUT); break; - + case EP0STATE_WAIT_STATUS_IN: lpc31_ep0state (priv, EP0STATE_IDLE); @@ -1591,9 +1591,9 @@ bool lpc31_epcomplete(struct lpc31_usbdev_s *priv, uint8_t epphy) usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_EPOUTQEMPTY), 0); return true; } - + int xfrd = dtd->xfer_len - (dtd->config >> 16); - + privreq->req.xfrd += xfrd; bool complete = true; @@ -1620,7 +1620,7 @@ bool lpc31_epcomplete(struct lpc31_usbdev_s *priv, uint8_t epphy) { privreq = lpc31_rqdequeue (privep); } - + if (!lpc31_rqempty(privep)) { lpc31_progressep(privep); @@ -1671,7 +1671,7 @@ static int lpc31_usbinterrupt(int irq, FAR void *context) /* When the device controller enters a suspend state from an active state, * the SLI bit will be set to a one. */ - + if (!priv->suspended && (disr & USBDEV_USBSTS_SLI) != 0) { usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_SUSPENDED),0); @@ -1718,30 +1718,30 @@ static int lpc31_usbinterrupt(int irq, FAR void *context) if (portsc1 & USBDEV_PRTSC1_FPR) { /* FIXME: this occurs because of a J-to-K transition detected - * while the port is in SUSPEND state - presumambly this + * while the port is in SUSPEND state - presumambly this * is where the host is resuming the device? * * - but do we need to "ack" the interrupt */ } } - + #ifdef CONFIG_LPC31_USBDEV_FRAME_INTERRUPT if (disr & USBDEV_USBSTT_SRI) { usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_FRAME), 0); - - priv->sof = (int)lpc31_getreg(LPC31_USBDEV_FRINDEX_OFFSET); + + priv->sof = (int)lpc31_getreg(LPC31_USBDEV_FRINDEX_OFFSET); } #endif if (disr & USBDEV_USBSTS_UEI) { /* FIXME: these occur when a transfer results in an error condition - * it is set alongside USBINT if the DTD also had its IOC + * it is set alongside USBINT if the DTD also had its IOC * bit set. */ } - + if (disr & USBDEV_USBSTS_UI) { /* Handle completion interrupts */ @@ -1752,12 +1752,12 @@ static int lpc31_usbinterrupt(int irq, FAR void *context) /* Clear any NAK interrupt and completion interrupts */ lpc31_putreg (mask, LPC31_USBDEV_ENDPTNAK); lpc31_putreg (mask, LPC31_USBDEV_ENDPTCOMPLETE); - + if (mask & LPC31_ENDPTMASK(0)) lpc31_ep0complete(priv, 0); if (mask & LPC31_ENDPTMASK(1)) lpc31_ep0complete(priv, 1); - + for (n = 1; n < LPC31_NLOGENDPOINTS; n++) { if (mask & LPC31_ENDPTMASK((n<<1))) @@ -1772,9 +1772,9 @@ static int lpc31_usbinterrupt(int irq, FAR void *context) if (setupstat) { /* Clear the endpoint complete CTRL OUT and IN when a Setup is received */ - lpc31_putreg(LPC31_ENDPTMASK(LPC31_EP0_IN) | LPC31_ENDPTMASK(LPC31_EP0_OUT), + lpc31_putreg(LPC31_ENDPTMASK(LPC31_EP0_IN) | LPC31_ENDPTMASK(LPC31_EP0_OUT), LPC31_USBDEV_ENDPTCOMPLETE); - + if (setupstat & LPC31_ENDPTMASK(LPC31_EP0_OUT)) { usbtrace(TRACE_INTDECODE(LPC31_TRACEINTID_EP0SETUP), setupstat); @@ -1832,7 +1832,7 @@ static int lpc31_epconfigure(FAR struct usbdev_ep_s *ep, DEBUGASSERT(desc->addr == ep->eplog); /* Initialise EP capabilities */ - + uint16_t maxsize = GETUINT16(desc->mxpacketsize); if ((desc->attr & USB_EP_ATTR_XFERTYPE_MASK) == USB_EP_ATTR_XFER_ISOC) { @@ -1886,7 +1886,7 @@ static int lpc31_epconfigure(FAR struct usbdev_ep_s *ep, lpc31_setbits (USBDEV_ENDPTCTRL_TXE, LPC31_USBDEV_ENDPTCTRL(privep->epphy)); else lpc31_setbits (USBDEV_ENDPTCTRL_RXE, LPC31_USBDEV_ENDPTCTRL(privep->epphy)); - + return OK; } @@ -2076,7 +2076,7 @@ static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r { ret = -EBUSY; } - else + else { /* Add the new request to the request queue for the endpoint */ @@ -2121,7 +2121,7 @@ static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r priv = privep->dev; flags = irqsave(); - + /* FIXME: if the request is the first, then we need to flush the EP * otherwise just remove it from the list * @@ -2379,7 +2379,7 @@ static int lpc31_wakeup(struct usbdev_s *dev) * Name: lpc31_selfpowered * * Description: - * Sets/clears the device selfpowered feature + * Sets/clears the device selfpowered feature * *******************************************************************************/ @@ -2449,7 +2449,7 @@ void up_usbinitialize(void) usbtrace(TRACE_DEVINIT, 0); /* Disable USB interrupts */ - + lpc31_putreg(0, LPC31_USBDEV_USBINTR); /* Initialize the device state structure */ @@ -2519,7 +2519,7 @@ void up_usbinitialize(void) /* Enable USB OTG PLL and wait for lock */ lpc31_putreg (0, LPC31_SYSCREG_USB_ATXPLLPDREG); - + uint32_t bank = EVNTRTR_BANK(EVENTRTR_USBATXPLLLOCK); uint32_t bit = EVNTRTR_BIT(EVENTRTR_USBATXPLLLOCK); @@ -2655,7 +2655,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver) up_enable_irq(LPC31_IRQ_USBOTG); /* FIXME: nothing seems to call DEV_CONNECT(), but we need to set - * the RS bit to enable the controller. It kind of makes sense + * the RS bit to enable the controller. It kind of makes sense * to do this after the class has bound to us... * GEN: This bug is really in the class driver. It should make the * soft connect when it is ready to be enumerated. I have added diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_usbotg.h b/nuttx/arch/arm/src/lpc31xx/lpc31_usbotg.h index 28a7fe7ee..c8e7c25fb 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_usbotg.h +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_usbotg.h @@ -381,12 +381,12 @@ #define USBDEV_BURSTSIZE_TXPBURST_SHIFT (8) /* Bits 8-15: Programmable TX burst length */ #define USBDEV_BURSTSIZE_TXPBURST_MASK (255 << USBDEV_BURSTSIZE_TXPBURST_SHIFT) #define USBDEV_BURSTSIZE_RXPBURST_SHIFT (0) /* Bits 0-7: RXPBURST Programmable RX burst length */ -#define USBDEV_BURSTSIZE_RXPBURST_MASK (255 << USBDEV_BURSTSIZE_RXPBURST_SHIFT) +#define USBDEV_BURSTSIZE_RXPBURST_MASK (255 << USBDEV_BURSTSIZE_RXPBURST_SHIFT) #define USBHOST_BURSTSIZE_TXPBURST_SHIFT (8) /* Bits 8-15: Programmable TX burst length */ #define USBHOST_BURSTSIZE_TXPBURST_MASK (255 << USBHOST_BURSTSIZE_TXPBURST_SHIFT) #define USBHOST_BURSTSIZE_RXPBURST_SHIFT (0) /* Bits 0-7: RXPBURST Programmable RX burst length */ -#define USBHOST_BURSTSIZE_RXPBURST_MASK (255 << USBHOST_BURSTSIZE_RXPBURST_SHIFT) +#define USBHOST_BURSTSIZE_RXPBURST_MASK (255 << USBHOST_BURSTSIZE_RXPBURST_SHIFT) /* USB Transfer buffer Fill Tuning register TXFIFOFILLTUNING (address 0x19000164) -- Host Mode */ diff --git a/nuttx/arch/arm/src/lpc43xx/Make.defs b/nuttx/arch/arm/src/lpc43xx/Make.defs index e2d5ea0b1..366c051df 100644 --- a/nuttx/arch/arm/src/lpc43xx/Make.defs +++ b/nuttx/arch/arm/src/lpc43xx/Make.defs @@ -82,7 +82,7 @@ CMN_CSRCS += up_copyarmstate.c endif endif -CHIP_ASRCS = +CHIP_ASRCS = CHIP_CSRCS = lpc43_allocateheap.c lpc43_cgu.c lpc43_clrpend.c lpc43_gpio.c CHIP_CSRCS += lpc43_irq.c lpc43_pinconfig.c lpc43_rgu.c lpc43_serial.c CHIP_CSRCS += lpc43_start.c lpc43_timerisr.c lpc43_uart.c diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_aes.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_aes.h index 74e53d616..e5f66d5f1 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_aes.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_aes.h @@ -58,9 +58,9 @@ enum lpc43_aescmd_e { AES_API_CMD_ENCODE_ECB = 0, - AES_API_CMD_DECODE_ECB = 1, - AES_API_CMD_ENCODE_CBC = 2, - AES_API_CMD_DECODE_CBC = 3 + AES_API_CMD_DECODE_ECB = 1, + AES_API_CMD_ENCODE_CBC = 2, + AES_API_CMD_DECODE_CBC = 3 }; struct lpc43_aes_s @@ -89,7 +89,7 @@ struct lpc43_aes_s void (*aes_LoadKeySW)(unsigned char *key); /* Loads 128-bit AES initialization vector (16 bytes) */ - + void (*aes_LoadIV_SW)(unsigned char *iv); /* Loads 128-bit AES IC specific initialization vector, which is used to decrypt diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h index e7d16fe26..275f896ad 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h @@ -606,7 +606,7 @@ /* Ethernet TX DMA Descriptor. Descriptor size can be 4 DWORDS (16 bytes) or 8 DWORDS (32 bytes) * depending on the setting of the ATDS bit in the DMA Bus Mode register. - */ + */ struct eth_txdesc_s { @@ -629,7 +629,7 @@ struct eth_txdesc_s /* Ethernet RX DMA Descriptor. Descriptor size can be 4 DWORDS (16 bytes) or 8 DWORDS (32 bytes) * depending on the setting of the ATDS bit in the DMA Bus Mode register. - */ + */ struct eth_rxdesc_s { diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h index 644e6758e..1287dfd87 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h @@ -90,7 +90,7 @@ #define EVNTRTR_SOURCE_TIM6 14 /* Combined timer output 6 (SCT output 6 | TIMER1 Ch2) */ #define EVNTRTR_SOURCE_QEI 15 /* QEI interrupt */ #define EVNTRTR_SOURCE_TIM14 16 /* Combined timer output 14 (SCT output 14 | TIMER3 Ch2) */ - /* 17-18: Reserved */ + /* 17-18: Reserved */ #define EVNTRTR_SOURCE_RESET 19 /* Reset event */ #define EVNTRTR_WAKEUP0 (1 << EVNTRTR_SOURCE_WAKEUP0) diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_gpdma.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_gpdma.h index f885c1387..2139e0976 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_gpdma.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_gpdma.h @@ -252,7 +252,6 @@ #define GPDMA_SOFTLBREQ(n) (1 << (n)) /* Bits 0-15: Software last burst request flags for source n */ /* Bits 16-31: Reserved */ - /* DMA Software Last Single Request Register */ #define GPDMA_SOFTLSREQ(n) (1 << (n)) /* Bits 0-15: Software last single burst request flags for source n */ diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_mcpwm.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_mcpwm.h index 6344c24c9..720b8affc 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_mcpwm.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_mcpwm.h @@ -257,7 +257,7 @@ #define MCPWM_CAPCLR_CLR0 (1 << 0) /* Bit 0: Clear CAP0 register */ #define MCPWM_CAPCLR_CLR1 (1 << 1) /* Bit 1: Clear CAP1 register */ #define MCPWM_CAPCLR_CLR2 (1 << 2) /* Bit 2: Clear CAP2 register */ - /* Bits 2-31: Reserved */ + /* Bits 2-31: Reserved */ /************************************************************************************ * Public Types diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_otp.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_otp.h index 67b5af319..45a777fd9 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_otp.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_otp.h @@ -59,7 +59,7 @@ #define LPC43_OTP_MEM20_OFFSET 0x0034 /* General purpose OTP memory 2, word 0 */ #define LPC43_OTP_MEM21_OFFSET 0x0038 /* General purpose OTP memory 2, word 1 */ -#define LPC43_OTP_MEM22_OFFSET 0x003c /* General purpose OTP memory 2, word 2 */ +#define LPC43_OTP_MEM22_OFFSET 0x003c /* General purpose OTP memory 2, word 2 */ #define LPC43_OTP_AES00_OFFSET 0x0010 /* AES key 0, word 0 */ #define LPC43_OTP_AES01_OFFSET 0x0014 /* AES key 0, word 1 */ diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_spifi.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_spifi.h index a0bec7592..26cf82734 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_spifi.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_spifi.h @@ -88,7 +88,7 @@ #define SPIFI_PROG_INST 2 #define SPIFI_CHIP_ERASE 3 -/* Bit definitions in options operands (MODE3, RCVCLK, and FULLCLK +/* Bit definitions in options operands (MODE3, RCVCLK, and FULLCLK * have the same relationship as in the Control register) */ @@ -117,7 +117,7 @@ /* SPI ROM driver table pointer */ -#define SPIFI_ROM_PTR LPC43_ROM_DRIVER_TABLE6 +#define SPIFI_ROM_PTR LPC43_ROM_DRIVER_TABLE6 #define pSPIFI *((struct spifi_driver_s **)SPIFI_ROM_PTR) /**************************************************************************** diff --git a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_usb0.h b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_usb0.h index 6d18dd41c..42ef4ba8d 100644 --- a/nuttx/arch/arm/src/lpc43xx/chip/lpc43_usb0.h +++ b/nuttx/arch/arm/src/lpc43xx/chip/lpc43_usb0.h @@ -147,25 +147,25 @@ /* Device side naming of common register offsets */ -#define LPC43_USBDEV_USBCMD LPC43_USBOTG_USBCMD -#define LPC43_USBDEV_USBSTS LPC43_USBOTG_USBSTS -#define LPC43_USBDEV_USBINTR LPC43_USBOTG_USBINTR -#define LPC43_USBDEV_FRINDEX LPC43_USBOTG_FRINDEX -#define LPC43_USBDEV_BURSTSIZE LPC43_USBOTG_BURSTSIZE -#define LPC43_USBDEV_BINTERVAL LPC43_USBOTG_BINTERVAL -#define LPC43_USBDEV_PORTSC1 LPC43_USBOTG_USBMODE -#define LPC43_USBDEV_USBMODE LPC43_USBOTG_USBMODE +#define LPC43_USBDEV_USBCMD LPC43_USBOTG_USBCMD +#define LPC43_USBDEV_USBSTS LPC43_USBOTG_USBSTS +#define LPC43_USBDEV_USBINTR LPC43_USBOTG_USBINTR +#define LPC43_USBDEV_FRINDEX LPC43_USBOTG_FRINDEX +#define LPC43_USBDEV_BURSTSIZE LPC43_USBOTG_BURSTSIZE +#define LPC43_USBDEV_BINTERVAL LPC43_USBOTG_BINTERVAL +#define LPC43_USBDEV_PORTSC1 LPC43_USBOTG_USBMODE +#define LPC43_USBDEV_USBMODE LPC43_USBOTG_USBMODE /* Host side naming of common registers */ -#define LPC43_USBHOST_USBCMD LPC43_USBOTG_USBCMD -#define LPC43_USBHOST_USBSTS LPC43_USBOTG_USBSTS -#define LPC43_USBHOST_USBINTR LPC43_USBOTG_USBINTR -#define LPC43_USBHOST_FRINDEX LPC43_USBOTG_FRINDEX -#define LPC43_USBHOST_BURSTSIZE LPC43_USBOTG_BURSTSIZE -#define LPC43_USBHOST_BINTERVAL LPC43_USBOTG_BINTERVAL -#define LPC43_USBHOST_PORTSC1 LPC43_USBOTG_USBMODE -#define LPC43_USBHOST_USBMODE LPC43_USBOTG_USBMODE +#define LPC43_USBHOST_USBCMD LPC43_USBOTG_USBCMD +#define LPC43_USBHOST_USBSTS LPC43_USBOTG_USBSTS +#define LPC43_USBHOST_USBINTR LPC43_USBOTG_USBINTR +#define LPC43_USBHOST_FRINDEX LPC43_USBOTG_FRINDEX +#define LPC43_USBHOST_BURSTSIZE LPC43_USBOTG_BURSTSIZE +#define LPC43_USBHOST_BINTERVAL LPC43_USBOTG_BINTERVAL +#define LPC43_USBHOST_PORTSC1 LPC43_USBOTG_USBMODE +#define LPC43_USBHOST_USBMODE LPC43_USBOTG_USBMODE /* Device endpoint registers */ @@ -381,13 +381,13 @@ /* USB burst size register BURSTSIZE -- Device/Host Mode */ #define USBHOST_BURSTSIZE_RXPBURST_SHIFT (0) /* Bits 0-7: RXPBURST Programmable RX burst length */ -#define USBHOST_BURSTSIZE_RXPBURST_MASK (255 << USBHOST_BURSTSIZE_RXPBURST_SHIFT) +#define USBHOST_BURSTSIZE_RXPBURST_MASK (255 << USBHOST_BURSTSIZE_RXPBURST_SHIFT) #define USBHOST_BURSTSIZE_TXPBURST_SHIFT (8) /* Bits 8-15: Programmable TX burst length */ #define USBHOST_BURSTSIZE_TXPBURST_MASK (255 << USBHOST_BURSTSIZE_TXPBURST_SHIFT) /* Bits 16-31: Reserved */ #define USBDEV_BURSTSIZE_RXPBURST_SHIFT (0) /* Bits 0-7: RXPBURST Programmable RX burst length */ -#define USBDEV_BURSTSIZE_RXPBURST_MASK (255 << USBDEV_BURSTSIZE_RXPBURST_SHIFT) +#define USBDEV_BURSTSIZE_RXPBURST_MASK (255 << USBDEV_BURSTSIZE_RXPBURST_SHIFT) #define USBDEV_BURSTSIZE_TXPBURST_SHIFT (8) /* Bits 8-15: Programmable TX burst length */ #define USBDEV_BURSTSIZE_TXPBURST_MASK (255 << USBDEV_BURSTSIZE_TXPBURST_SHIFT) /* Bits 16-31: Reserved */ diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c b/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c index d03abb162..71f1181e6 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c @@ -9,7 +9,7 @@ * Copyright (C) 2011 Li Zhuoyi. All rights reserved. * Author: Li Zhuoyi <lzyy.cn@gmail.com> * History: 0.1 2011-08-05 initial version - * + * * This file is a part of NuttX: * * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. @@ -181,7 +181,7 @@ static void adc_reset(FAR struct adc_dev_s *dev) lpc43_configgpio(GPIO_AD0p6); else if (priv->mask&0x80) lpc43_configgpio(GPIO_AD0p7); - + irqrestore(flags); } @@ -244,7 +244,7 @@ static int adc_interrupt(int irq, void *context) FAR struct up_dev_s *priv = (FAR struct up_dev_s *)g_adcdev.ad_priv; unsigned char ch; int32_t value; - + regval = getreg32(LPC43_ADC_GDR); ch = (regval >> 24) & 0x07; priv->buf[ch] += regval & 0xfff0; diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c index d5d12aa54..0dd84e1ae 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_allocateheap.c @@ -266,7 +266,7 @@ void up_addregion(void) { #if CONFIG_MM_REGIONS > 1 /* Add the next SRAM region (which should exist) */ - + kmm_addregion((FAR void*)MM_REGION2_BASE, MM_REGION2_SIZE); #ifdef MM_REGION3_BASE @@ -274,12 +274,12 @@ void up_addregion(void) #if CONFIG_MM_REGIONS > 2 /* Add the third SRAM region (which may not exist) */ - + kmm_addregion((FAR void*)MM_REGION3_BASE, MM_REGION3_SIZE); #if CONFIG_MM_REGIONS > 3 && defined(MM_DMAHEAP_BASE) /* Add the DMA region (which may not be available) */ - + kmm_addregion((FAR void*)MM_DMAHEAP_BASE, MM_DMAHEAP_SIZE); #endif /* CONFIG_MM_REGIONS > 3 && defined(MM_DMAHEAP_BASE) */ @@ -288,7 +288,7 @@ void up_addregion(void) #if CONFIG_MM_REGIONS > 2 && defined(MM_DMAHEAP_BASE) /* Add the DMA region (which may not be available) */ - + kmm_addregion((FAR void*)MM_DMAHEAP_BASE, MM_DMAHEAP_SIZE); #endif /* CONFIG_MM_REGIONS > 3 && defined(MM_DMAHEAP_BASE) */ diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c b/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c index 61c4112ae..dcb446648 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c @@ -350,7 +350,7 @@ static inline void lpc43_pll1config(uint32_t ctrlvalue) regval &= ~(PLL1_CTRL_BYPASS | PLL1_CTRL_FBSEL | PLL1_CTRL_DIRECT | PLL1_CTRL_PSEL_MASK | PLL1_CTRL_NSEL_MASK | PLL1_CTRL_MSEL_MASK); - + /* Set selected PLL1 controls: * * - PLL1_CTRL_FBSEL: Set in both integer and direct modes @@ -380,7 +380,7 @@ static inline void lpc43_pll1enable(void) /* Take PLL1 out of power down mode. The reset state of the PD bit * is one, i.e., powered down. */ - + regval = getreg32(LPC43_PLL1_CTRL); regval &= ~PLL1_CTRL_PD; putreg32(regval, LPC43_PLL1_CTRL); @@ -441,7 +441,7 @@ void lpc43_clockconfig(void) /* Enable PLL1 */ lpc43_pll1enable(); - + /* Set up PLL1 output as the M4 clock */ lpc43_m4clkselect(BASE_M4_CLKSEL_PLL1); @@ -477,6 +477,6 @@ void lpc43_clockconfig(void) /* Go to the final, full-speed PLL1 configuration */ - lpc43_pll1config(PLL_CONTROLS); + lpc43_pll1config(PLL_CONTROLS); #endif } diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_dac.c b/nuttx/arch/arm/src/lpc43xx/lpc43_dac.c index 5fcceaa1e..ba102c185 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_dac.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_dac.c @@ -9,7 +9,7 @@ * Copyright (C) 2011 Li Zhuoyi. All rights reserved. * Author: Li Zhuoyi <lzyy.cn@gmail.com> * History: 0.1 2011-08-05 initial version - * + * * This file is a part of NuttX: * * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. @@ -121,7 +121,7 @@ static void dac_reset(FAR struct dac_dev_s *dev) { irqstate_t flags; uint32_t regval; - + flags = irqsave(); regval = getreg32(LPC43_SYSCON_PCLKSEL0); diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_gpio.c b/nuttx/arch/arm/src/lpc43xx/lpc43_gpio.c index 2b2c88f31..aaa18eccd 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_gpio.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_gpio.c @@ -92,7 +92,7 @@ static inline void lpc43_configinput(uint16_t gpiocfg, regval = getreg32(regaddr); regval &= ~GPIO_DIR(pin); putreg32(regval, regaddr); - + /* To be able to read the signal on the GPIO input, the input * buffer must be enabled in the syscon block for the corresponding pin. * This should have been done when the pin was configured as a GPIO. @@ -147,7 +147,7 @@ static inline void lpc43_configoutput(uint16_t gpiocfg, * * Description: * Configure a GPIO based on bit-encoded description of the pin. NOTE: - * The pin *must* have first been configured for GPIO usage with a + * The pin *must* have first been configured for GPIO usage with a * corresponding call to lpc43_pin_config(). * * Returned Value: diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_idle.c b/nuttx/arch/arm/src/lpc43xx/lpc43_idle.c index e7be94e51..55631bc35 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_idle.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_idle.c @@ -86,7 +86,7 @@ static void up_idlepm(void) enum pm_state_e newstate; irqstate_t flags; int ret; - + /* Decide, which power saving level can be obtained */ newstate = pm_checkstate(); diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.c b/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.c index fb5173339..77b979607 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.c @@ -120,7 +120,7 @@ int lpc43_pin_config(uint32_t pinconf) { regval |= SCU_NDPIN_EHS; /* 0=slow; 1=fast */ } - + /* Only high drive pins suppose drive strength */ switch (pinconf & PINCONF_DRIVE_MASK) diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.h b/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.h index 293f838e9..fba0e1e49 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.h +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_pinconfig.h @@ -183,7 +183,7 @@ * ---- ---- ---- ---- ---- * .... .... .... ...P PPPP */ - + #define PINCONF_PIN_SHIFT (0) /* Bits 0-4: Pin number */ #define PINCONF_PIN_MASK (31 << PINCONF_PIN_SHIFT) # define PINCONF_PIN_0 (0 << PINCONF_PIN_SHIFT) diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c b/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c index a4d60dc15..df68c1301 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c @@ -617,7 +617,7 @@ static int up_setup(struct uart_dev_s *dev) (UART_FCR_RXTRIGGER_8|UART_FCR_TXRST|UART_FCR_RXRST|UART_FCR_FIFOEN)); /* Enable Auto-RTS and Auto-CS Flow Control in the Modem Control Register */ - + #ifdef CONFIG_UART1_FLOWCONTROL if (priv->id == 1) { @@ -896,7 +896,7 @@ static int up_interrupt(int irq, void *context) * de-asserted (driven HIGH) once the last bit of data has been transmitted. * * RS485/EIA-485 driver delay time -- Supported - * + * * The driver delay time is the delay between the last stop bit leaving * the TXFIFO and the de-assertion of the DIR pin. This delay time can be * programmed in the 8-bit RS485DLY register. The delay time is in periods @@ -931,21 +931,21 @@ static inline int up_set_rs485_mode(struct up_dev_s *priv, else { /* Set the RS-485/EIA-485 Control register: - * + * * NMMEN 0 = Normal Multidrop Mode (NMM) disabled * RXDIS 0 = Receiver is not disabled * AADEN 0 = Auto Address Detect (ADD) is disabled * DCTRL 1 = Auto Direction Control is enabled - * OINV ? = Value control by user mode settings + * OINV ? = Value control by user mode settings */ regval = UART_RS485CTRL_DCTRL; /* Logic levels are controlled by the SER_RS485_RTS_ON_SEND and - * SER_RS485_RTS_AFTER_SEND bits in the mode flags. + * SER_RS485_RTS_AFTER_SEND bits in the mode flags. * SER_RS485_RTS_AFTER_SEND is ignored. * - * By default, DIR will go logic low on send, but this can + * By default, DIR will go logic low on send, but this can * be inverted. */ diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c index 1058c85c9..6f51f1272 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c @@ -161,7 +161,7 @@ static const struct spi_ops_s g_spiops = static struct lpc43_spidev_s g_spidev = { .spidev = { &g_spiops }, -}; +}; /**************************************************************************** * Public Data @@ -269,7 +269,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) divisor = (divisor + 1) & ~1; /* Save the new divisor value */ - + putreg32(divisor, LPC43_SPI_CCR); /* Calculate the new actual */ @@ -322,19 +322,19 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) { case SPIDEV_MODE0: /* CPOL=0; CPHA=0 */ break; - + case SPIDEV_MODE1: /* CPOL=0; CPHA=1 */ regval |= SPI_CR_CPHA; break; - + case SPIDEV_MODE2: /* CPOL=1; CPHA=0 */ regval |= SPI_CR_CPOL; break; - + case SPIDEV_MODE3: /* CPOL=1; CPHA=1 */ regval |= (SPI_CR_CPOL|SPI_CR_CPHA); break; - + default: DEBUGASSERT(FALSE); return; @@ -517,7 +517,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw (void)getreg32(LPC43_SPI_SR); - /* Read the received data from the SPI Data Register */ + /* Read the received data from the SPI Data Register */ *ptr++ = (uint8_t)getreg32(LPC43_SPI_DR); nwords--; @@ -575,7 +575,7 @@ FAR struct spi_dev_s *lpc43_spiinitialize(int port) regval |= SYSCON_PCONP_PCSPI; putreg32(regval, LPC43_SYSCON_PCONP); irqrestore(flags); - + /* Configure 8-bit SPI mode and master mode */ putreg32(SPI_CR_BITS_8BITS|SPI_CR_BITENABLE|SPI_CR_MSTR, LPC43_SPI_CR); diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_spifi.c b/nuttx/arch/arm/src/lpc43xx/lpc43_spifi.c index f7a7e41b7..fcaae5ea8 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_spifi.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_spifi.c @@ -241,7 +241,7 @@ * Compute this from the SPIFI clock period and the minimum high time of CS * from the serial flash data sheet: * - * csHigh = ceiling( min CS high / SPIFI clock period ) - 1 + * csHigh = ceiling( min CS high / SPIFI clock period ) - 1 * * where ceiling means round up to the next higher integer if the argument * isn’t an integer. @@ -381,7 +381,7 @@ static void lpc43_blockerase(struct lpc43_dev_s *priv, off_t sector) priv->operands.dest = SPIFI_BASE + (sector << SPIFI_BLKSHIFT); priv->operands.length = SPIFI_BLKSIZE; - fvdbg("SPIFI_ERASE: dest=%p length=%d\n", + fvdbg("SPIFI_ERASE: dest=%p length=%d\n", priv->operands.dest, priv->operands.length); result = SPIFI_ERASE(priv, &priv->rom, &priv->operands); @@ -456,7 +456,7 @@ static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, priv->operands.dest = dest; priv->operands.length = nbytes; - fvdbg("SPIFI_PROGRAM: src=%p dest=%p length=%d\n", + fvdbg("SPIFI_PROGRAM: src=%p dest=%p length=%d\n", src, priv->operands.dest, priv->operands.length); result = SPIFI_PROGRAM(priv, &priv->rom, src, &priv->operands); @@ -543,7 +543,7 @@ static FAR uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector) FAR const uint8_t *src; off_t blkno; int index; - + /* Convert from the 512 byte sector to the erase sector size of the device. For * exmample, if the actual erase sector size if 4Kb (1 << 12), then we first * shift to the right by 3 to get the sector number in 4096 increments. @@ -881,7 +881,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) ret = lpc43_chiperase(priv); } break; - + case MTDIOC_XIPBASE: default: ret = -ENOTTY; /* Bad command */ @@ -1156,7 +1156,7 @@ FAR struct mtd_dev_s *lpc43_spifi_initialize(void) priv->operands.protect = -1; /* Save and restore protection */ priv->operands.options = S_CALLER_ERASE; /* This driver will do erasure */ - + /* Initialize the SPIFI. Interrupts must be disabled here because shared * CGU registers will be modified. */ @@ -1230,7 +1230,7 @@ void pullMISO(int high) /* Control MISO pull-up/down state Assume pull down by clearing: * - * EPD = Enable pull-down connect (bit + * EPD = Enable pull-down connect (bit */ pinconfig = PINCONF_SPIFI_MISO & ~(PINCONF_PULLUP | PINCONF_PULLDOWN); diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c index a7efe8471..5edc03c06 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c @@ -66,7 +66,7 @@ ****************************************************************************/ /* 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 */ @@ -192,7 +192,7 @@ static struct lpc43_sspdev_s g_ssp0dev = #ifdef CONFIG_LPC43_SSP_INTERRUPTS .sspirq = LPC43_IRQ_SSP0, #endif -}; +}; #endif /* CONFIG_LPC43_SSP0 */ #ifdef CONFIG_LPC43_SSP1 @@ -226,7 +226,7 @@ static struct lpc43_sspdev_s g_ssp1dev = #ifdef CONFIG_LPC43_SSP_INTERRUPTS .sspirq = LPC43_IRQ_SSP1, #endif -}; +}; #endif /* CONFIG_LPC43_SSP1 */ /**************************************************************************** @@ -376,7 +376,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) divisor = (divisor + 1) & ~1; /* Save the new divisor value */ - + ssp_putreg(priv, LPC43_SSP_CPSR_OFFSET, divisor); /* Calculate the new actual */ @@ -429,19 +429,19 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) { case SPIDEV_MODE0: /* CPOL=0; CPHA=0 */ break; - + case SPIDEV_MODE1: /* CPOL=0; CPHA=1 */ regval |= SSP_CR0_CPHA; break; - + case SPIDEV_MODE2: /* CPOL=1; CPHA=0 */ regval |= SSP_CR0_CPOL; break; - + case SPIDEV_MODE3: /* CPOL=1; CPHA=1 */ regval |= (SSP_CR0_CPOL|SSP_CR0_CPHA); break; - + default: sspdbg("Bad mode: %d\n", mode); DEBUGASSERT(FALSE); diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c b/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c index 4491830f9..f37387db5 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c @@ -58,7 +58,7 @@ /************************************************************************** * Private Definitions **************************************************************************/ - + /* Select UART parameters for the selected console */ #if defined(CONFIG_USART0_SERIAL_CONSOLE) @@ -199,7 +199,7 @@ void up_lowputc(char ch) * PCLK_UART1; in the PCLKSEL1 register, select PCLK_USART2 and PCLK_USART3. * 3. Baud rate: In the LCR register, set bit DLAB = 1. This enables access * to registers DLL and DLM for setting the baud rate. Also, if needed, - * set the fractional baud rate in the fractional divider + * set the fractional baud rate in the fractional divider * 4. UART FIFO: Use bit FIFO enable (bit 0) in FCR register to * enable FIFO. * 5. Pins: Select UART pins through the PINSEL registers and pin modes @@ -496,7 +496,7 @@ void lpc43_setbaud(uintptr_t uartbase, uint32_t basefreq, uint32_t baud) uint32_t errval; /* Error value associated with the candidate */ /* The U[S]ART buad is given by: - * + * * Fbaud = Fbase * mul / (mul + divadd) / (16 * dl) * dl = Fbase * mul / (mul + divadd) / Fbaud / 16 * = Fbase * mul / ((mul + divadd) * Fbaud * 16) @@ -507,7 +507,7 @@ void lpc43_setbaud(uintptr_t uartbase, uint32_t basefreq, uint32_t baud) * 0 < mul < 16 * 0 <= divadd < mul */ - + best = UINT32_MAX; divadd = 0; mul = 0; diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/nuttx/arch/arm/src/lpc43xx/lpc43_usb0dev.c index 379dbc435..c17f075b6 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_usb0dev.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_usb0dev.c @@ -638,7 +638,7 @@ static bool lpc43_rqenqueue(FAR struct lpc43_ep_s *privep, FAR struct lpc43_req_s *req) { bool is_empty = !privep->head; - + req->flink = NULL; if (is_empty) { @@ -692,7 +692,7 @@ static void lpc43_queuedtd(uint8_t epphy, struct lpc43_dtd_s *dtd) uint32_t bit = LPC43_ENDPTMASK(epphy); lpc43_setbits (bit, LPC43_USBDEV_ENDPTPRIME); - + while (lpc43_getreg (LPC43_USBDEV_ENDPTPRIME) & bit) ; } @@ -710,7 +710,7 @@ static inline void lpc43_ep0xfer(uint8_t epphy, uint8_t *buf, uint32_t nbytes) struct lpc43_dtd_s *dtd = &g_td[epphy]; lpc43_writedtd(dtd, buf, nbytes); - + lpc43_queuedtd(epphy, dtd); } @@ -733,9 +733,9 @@ static void lpc43_readsetup(uint8_t epphy, struct usb_ctrlreq_s *ctrl) /* copy the request... */ for (i = 0; i < 8; i++) ((uint8_t *) ctrl)[i] = ((uint8_t *) dqh->setup)[i]; - + } while (!(lpc43_getreg(LPC43_USBDEV_USBCMD) & USBDEV_USBCMD_SUTW)); - + /* Clear the trip wire */ lpc43_clrbits(USBDEV_USBCMD_SUTW, LPC43_USBDEV_USBCMD); @@ -756,7 +756,7 @@ static inline void lpc43_set_address(struct lpc43_usbdev_s *priv, uint16_t addre priv->paddr = address; priv->paddrset = address != 0; - lpc43_chgbits(USBDEV_DEVICEADDR_MASK, priv->paddr << USBDEV_DEVICEADDR_SHIFT, + lpc43_chgbits(USBDEV_DEVICEADDR_MASK, priv->paddr << USBDEV_DEVICEADDR_SHIFT, LPC43_USBDEV_DEVICEADDR); } @@ -807,7 +807,7 @@ static int lpc43_progressep(struct lpc43_ep_s *privep) if (privreq->req.len == 0) { - /* If the class driver is responding to a setup packet, then wait for the + /* If the class driver is responding to a setup packet, then wait for the * host to illicit thr response */ if (privep->epphy == LPC43_EP0_IN && privep->dev->ep0state == EP0STATE_SETUP_OUT) @@ -819,7 +819,7 @@ static int lpc43_progressep(struct lpc43_ep_s *privep) else usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_EPOUTNULLPACKET), 0); } - + lpc43_reqcomplete(privep, lpc43_rqdequeue(privep), OK); return OK; } @@ -1016,10 +1016,10 @@ static void lpc43_ep0configure(struct lpc43_usbdev_s *priv) g_qh[LPC43_EP0_IN ].capability = (DQH_CAPABILITY_MAX_PACKET(CONFIG_USBDEV_EP0_MAXSIZE) | DQH_CAPABILITY_IOS | DQH_CAPABILITY_ZLT); - + g_qh[LPC43_EP0_OUT].currdesc = DTD_NEXTDESC_INVALID; g_qh[LPC43_EP0_IN ].currdesc = DTD_NEXTDESC_INVALID; - + /* Enable EP0 */ lpc43_setbits (USBDEV_ENDPTCTRL0_RXE | USBDEV_ENDPTCTRL0_TXE, LPC43_USBDEV_ENDPTCTRL0); } @@ -1067,7 +1067,7 @@ static void lpc43_usbreset(struct lpc43_usbdev_s *priv) privep->stalled = false; } - /* Tell the class driver that we are disconnected. The class + /* Tell the class driver that we are disconnected. The class * driver should then accept any new configurations. */ if (priv->driver) @@ -1090,7 +1090,7 @@ static void lpc43_usbreset(struct lpc43_usbdev_s *priv) lpc43_ep0configure(priv); /* Enable Device interrupts */ - lpc43_putreg(USB_FRAME_INT | USB_ERROR_INT | + lpc43_putreg(USB_FRAME_INT | USB_ERROR_INT | USBDEV_USBINTR_NAKE | USBDEV_USBINTR_SLE | USBDEV_USBINTR_URE | USBDEV_USBINTR_PCE | USBDEV_USBINTR_UE, LPC43_USBDEV_USBINTR); } @@ -1106,7 +1106,7 @@ static void lpc43_usbreset(struct lpc43_usbdev_s *priv) static inline void lpc43_ep0state(struct lpc43_usbdev_s *priv, uint16_t state) { priv->ep0state = state; - + switch (state) { case EP0STATE_WAIT_NAK_IN: @@ -1138,7 +1138,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) uint16_t index; uint16_t len; - /* Terminate any pending requests - since all DTDs will have been retired + /* Terminate any pending requests - since all DTDs will have been retired * because of the setup packet */ lpc43_cancelrequests(&priv->eplist[LPC43_EP0_OUT], -EPROTO); @@ -1180,7 +1180,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) * index: zero interface endpoint * len: 2; data = status */ - + usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_GETSTATUS), 0); if (!priv->paddrset || len != 2 || (ctrl.type & USB_REQ_DIR_IN) == 0 || value != 0) @@ -1207,21 +1207,21 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) else priv->ep0buf[0] = 0; /* Not stalled */ priv->ep0buf[1] = 0; - + lpc43_ep0xfer (LPC43_EP0_IN, priv->ep0buf, 2); lpc43_ep0state (priv, EP0STATE_SHORTWRITE); } } break; - + case USB_REQ_RECIPIENT_DEVICE: { if (index == 0) { usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_DEVGETSTATUS), 0); - + /* Features: Remote Wakeup=YES; selfpowered=? */ - + priv->ep0buf[0] = (priv->selfpowered << USB_FEATURE_SELFPOWERED) | (1 << USB_FEATURE_REMOTEWAKEUP); priv->ep0buf[1] = 0; @@ -1236,7 +1236,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_RECIPIENT_INTERFACE: { usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_IFGETSTATUS), 0); @@ -1247,7 +1247,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) lpc43_ep0state (priv, EP0STATE_SHORTWRITE); } break; - + default: { usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_BADGETSTATUS), 0); @@ -1258,7 +1258,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_CLEARFEATURE: { /* type: host-to-device; recipient = device, interface or endpoint @@ -1266,7 +1266,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) * index: zero interface endpoint; * len: zero, data = none */ - + usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_CLEARFEATURE), 0); if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -1285,7 +1285,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_SETFEATURE: { /* type: host-to-device; recipient = device, interface, endpoint @@ -1293,7 +1293,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) * index: zero interface endpoint; * len: 0; data = none */ - + usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_SETFEATURE), 0); if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) && value == USB_FEATURE_TESTMODE) @@ -1317,7 +1317,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_SETADDRESS: { /* type: host-to-device; recipient = device @@ -1331,7 +1331,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) { /* Save the address. We cannot actually change to the next address until * the completion of the status phase. */ - + priv->paddr = ctrl.value[0]; priv->paddrset = false; lpc43_ep0state (priv, EP0STATE_WAIT_NAK_IN); @@ -1343,7 +1343,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_GETDESCRIPTOR: /* type: device-to-host; recipient = device * value: descriptor type and index @@ -1369,7 +1369,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_GETCONFIGURATION: /* type: device-to-host; recipient = device * value: 0; @@ -1390,7 +1390,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_SETCONFIGURATION: /* type: host-to-device; recipient = device * value: configuration value @@ -1411,7 +1411,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) } } break; - + case USB_REQ_GETINTERFACE: /* type: device-to-host; recipient = interface * value: 0 @@ -1429,7 +1429,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) lpc43_dispatchrequest(priv, &ctrl); } break; - + case USB_REQ_SYNCHFRAME: /* type: device-to-host; recipient = endpoint * value: 0 @@ -1440,7 +1440,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_SYNCHFRAME), 0); } break; - + default: { usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDCTRLREQ), 0); @@ -1471,7 +1471,7 @@ static void lpc43_ep0complete(struct lpc43_usbdev_s *priv, uint8_t epphy) struct lpc43_ep_s *privep = &priv->eplist[epphy]; usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_EP0COMPLETE), (uint16_t)priv->ep0state); - + switch (priv->ep0state) { case EP0STATE_DATA_IN: @@ -1485,15 +1485,15 @@ static void lpc43_ep0complete(struct lpc43_usbdev_s *priv, uint8_t epphy) case EP0STATE_DATA_OUT: if (lpc43_rqempty(privep)) return; - + if (lpc43_epcomplete (priv, epphy)) lpc43_ep0state (priv, EP0STATE_WAIT_NAK_IN); break; - + case EP0STATE_SHORTWRITE: lpc43_ep0state (priv, EP0STATE_WAIT_NAK_OUT); break; - + case EP0STATE_WAIT_STATUS_IN: lpc43_ep0state (priv, EP0STATE_IDLE); @@ -1592,9 +1592,9 @@ bool lpc43_epcomplete(struct lpc43_usbdev_s *priv, uint8_t epphy) usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_EPOUTQEMPTY), 0); return true; } - + int xfrd = dtd->xfer_len - (dtd->config >> 16); - + privreq->req.xfrd += xfrd; bool complete = true; @@ -1621,7 +1621,7 @@ bool lpc43_epcomplete(struct lpc43_usbdev_s *priv, uint8_t epphy) { privreq = lpc43_rqdequeue (privep); } - + if (!lpc43_rqempty(privep)) { lpc43_progressep(privep); @@ -1667,11 +1667,11 @@ static int lpc43_usbinterrupt(int irq, FAR void *context) usbtrace(TRACE_INTEXIT(LPC43_TRACEINTID_USB), 0); return OK; } - + /* When the device controller enters a suspend state from an active state, * the SLI bit will be set to a one. */ - + if (!priv->suspended && (disr & USBDEV_USBSTS_SLI) != 0) { usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_SUSPENDED),0); @@ -1718,30 +1718,30 @@ static int lpc43_usbinterrupt(int irq, FAR void *context) if (portsc1 & USBDEV_PRTSC1_FPR) { /* FIXME: this occurs because of a J-to-K transition detected - * while the port is in SUSPEND state - presumambly this + * while the port is in SUSPEND state - presumambly this * is where the host is resuming the device? * * - but do we need to "ack" the interrupt */ } } - + #ifdef CONFIG_LPC43_USBDEV_FRAME_INTERRUPT if (disr & USBDEV_USBSTT_SRI) { usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_FRAME), 0); - - priv->sof = (int)lpc43_getreg(LPC43_USBDEV_FRINDEX_OFFSET); + + priv->sof = (int)lpc43_getreg(LPC43_USBDEV_FRINDEX_OFFSET); } #endif if (disr & USBDEV_USBSTS_UEI) { /* FIXME: these occur when a transfer results in an error condition - * it is set alongside USBINT if the DTD also had its IOC + * it is set alongside USBINT if the DTD also had its IOC * bit set. */ } - + if (disr & USBDEV_USBSTS_UI) { /* Handle completion interrupts */ @@ -1752,12 +1752,12 @@ static int lpc43_usbinterrupt(int irq, FAR void *context) /* Clear any NAK interrupt and completion interrupts */ lpc43_putreg (mask, LPC43_USBDEV_ENDPTNAK); lpc43_putreg (mask, LPC43_USBDEV_ENDPTCOMPLETE); - + if (mask & LPC43_ENDPTMASK(0)) lpc43_ep0complete(priv, 0); if (mask & LPC43_ENDPTMASK(1)) lpc43_ep0complete(priv, 1); - + for (n = 1; n < LPC43_NLOGENDPOINTS; n++) { if (mask & LPC43_ENDPTMASK((n<<1))) @@ -1772,9 +1772,9 @@ static int lpc43_usbinterrupt(int irq, FAR void *context) if (setupstat) { /* Clear the endpoint complete CTRL OUT and IN when a Setup is received */ - lpc43_putreg(LPC43_ENDPTMASK(LPC43_EP0_IN) | LPC43_ENDPTMASK(LPC43_EP0_OUT), + lpc43_putreg(LPC43_ENDPTMASK(LPC43_EP0_IN) | LPC43_ENDPTMASK(LPC43_EP0_OUT), LPC43_USBDEV_ENDPTCOMPLETE); - + if (setupstat & LPC43_ENDPTMASK(LPC43_EP0_OUT)) { usbtrace(TRACE_INTDECODE(LPC43_TRACEINTID_EP0SETUP), setupstat); @@ -1832,7 +1832,7 @@ static int lpc43_epconfigure(FAR struct usbdev_ep_s *ep, DEBUGASSERT(desc->addr == ep->eplog); /* Initialise EP capabilities */ - + uint16_t maxsize = GETUINT16(desc->mxpacketsize); if ((desc->attr & USB_EP_ATTR_XFERTYPE_MASK) == USB_EP_ATTR_XFER_ISOC) { @@ -1886,7 +1886,7 @@ static int lpc43_epconfigure(FAR struct usbdev_ep_s *ep, lpc43_setbits (USBDEV_ENDPTCTRL_TXE, LPC43_USBDEV_ENDPTCTRL(privep->epphy)); else lpc43_setbits (USBDEV_ENDPTCTRL_RXE, LPC43_USBDEV_ENDPTCTRL(privep->epphy)); - + return OK; } @@ -2076,7 +2076,7 @@ static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r { ret = -EBUSY; } - else + else { /* Add the new request to the request queue for the endpoint */ @@ -2121,7 +2121,7 @@ static int lpc43_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r priv = privep->dev; flags = irqsave(); - + /* FIXME: if the request is the first, then we need to flush the EP * otherwise just remove it from the list * @@ -2379,7 +2379,7 @@ static int lpc43_wakeup(struct usbdev_s *dev) * Name: lpc43_selfpowered * * Description: - * Sets/clears the device selfpowered feature + * Sets/clears the device selfpowered feature * *******************************************************************************/ @@ -2449,7 +2449,7 @@ void up_usbinitialize(void) usbtrace(TRACE_DEVINIT, 0); /* Disable USB interrupts */ - + lpc43_putreg(0, LPC43_USBDEV_USBINTR); /* Initialize the device state structure */ @@ -2519,7 +2519,7 @@ void up_usbinitialize(void) /* Enable USB OTG PLL and wait for lock */ lpc43_putreg (0, LPC43_SYSCREG_USB_ATXPLLPDREG); - + uint32_t bank = EVNTRTR_BANK(EVENTRTR_USBATXPLLLOCK); uint32_t bit = EVNTRTR_BIT(EVENTRTR_USBATXPLLLOCK); @@ -2657,7 +2657,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver) up_enable_irq(LPC43_IRQ_USBOTG); /* FIXME: nothing seems to call DEV_CONNECT(), but we need to set - * the RS bit to enable the controller. It kind of makes sense + * the RS bit to enable the controller. It kind of makes sense * to do this after the class has bound to us... * GEN: This bug is really in the class driver. It should make the * soft connect when it is ready to be enumerated. I have added diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c b/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c index c5c62f716..7bc7f1c25 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_userspace.c @@ -98,7 +98,7 @@ void lpc43_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/nuc1xx/Make.defs b/nuttx/arch/arm/src/nuc1xx/Make.defs index 669d0877e..dd5895148 100644 --- a/nuttx/arch/arm/src/nuc1xx/Make.defs +++ b/nuttx/arch/arm/src/nuc1xx/Make.defs @@ -33,7 +33,7 @@ # ############################################################################ -HEAD_ASRC = +HEAD_ASRC = CMN_ASRCS = up_exception.S up_saveusercontext.S up_fullcontextrestore.S CMN_ASRCS += up_switchcontext.S vfork.S @@ -67,7 +67,7 @@ ifeq ($(CONFIG_DEBUG),y) CMN_CSRCS += up_dumpnvic.c endif -CHIP_ASRCS = +CHIP_ASRCS = CHIP_CSRCS = nuc_clockconfig.c nuc_gpio.c nuc_idle.c nuc_irq.c nuc_lowputc.c CHIP_CSRCS += nuc_serial.c nuc_start.c nuc_timerisr.c diff --git a/nuttx/arch/arm/src/nuc1xx/chip/nuc_gcr.h b/nuttx/arch/arm/src/nuc1xx/chip/nuc_gcr.h index cf09cac81..c9ad2df98 100644 --- a/nuttx/arch/arm/src/nuc1xx/chip/nuc_gcr.h +++ b/nuttx/arch/arm/src/nuc1xx/chip/nuc_gcr.h @@ -158,167 +158,167 @@ /* Multiple function pin GPIOA control register */ #define GCR_GPA_MFP(n) (1 << (n)) /* Bits 0-15: PAn pin function selection */ -# define GCR_GPA_MFP0 (1 << 0) -# define GCR_GPA_MFP1 (1 << 1) -# define GCR_GPA_MFP2 (1 << 2) -# define GCR_GPA_MFP3 (1 << 3) -# define GCR_GPA_MFP4 (1 << 4) -# define GCR_GPA_MFP5 (1 << 5) -# define GCR_GPA_MFP6 (1 << 6) -# define GCR_GPA_MFP7 (1 << 7) -# define GCR_GPA_MFP8 (1 << 8) -# define GCR_GPA_MFP9 (1 << 9) -# define GCR_GPA_MFP10 (1 << 10) -# define GCR_GPA_MFP11 (1 << 11) -# define GCR_GPA_MFP12 (1 << 12) -# define GCR_GPA_MFP13 (1 << 13) -# define GCR_GPA_MFP14 (1 << 14) -# define GCR_GPA_MFP15 (1 << 15) +# define GCR_GPA_MFP0 (1 << 0) +# define GCR_GPA_MFP1 (1 << 1) +# define GCR_GPA_MFP2 (1 << 2) +# define GCR_GPA_MFP3 (1 << 3) +# define GCR_GPA_MFP4 (1 << 4) +# define GCR_GPA_MFP5 (1 << 5) +# define GCR_GPA_MFP6 (1 << 6) +# define GCR_GPA_MFP7 (1 << 7) +# define GCR_GPA_MFP8 (1 << 8) +# define GCR_GPA_MFP9 (1 << 9) +# define GCR_GPA_MFP10 (1 << 10) +# define GCR_GPA_MFP11 (1 << 11) +# define GCR_GPA_MFP12 (1 << 12) +# define GCR_GPA_MFP13 (1 << 13) +# define GCR_GPA_MFP14 (1 << 14) +# define GCR_GPA_MFP15 (1 << 15) #define GCR_GPA_TYPE(n) (1 << ((n)+16)) /* Bits 16-31: Enable Schmitt trigger function */ -# define GCR_GPA_TYPE0 (1 << 0) -# define GCR_GPA_TYPE1 (1 << 1) -# define GCR_GPA_TYPE2 (1 << 2) -# define GCR_GPA_TYPE3 (1 << 3) -# define GCR_GPA_TYPE4 (1 << 4) -# define GCR_GPA_TYPE5 (1 << 5) -# define GCR_GPA_TYPE6 (1 << 6) -# define GCR_GPA_TYPE7 (1 << 7) -# define GCR_GPA_TYPE8 (1 << 8) -# define GCR_GPA_TYPE9 (1 << 9) -# define GCR_GPA_TYPE10 (1 << 10) -# define GCR_GPA_TYPE11 (1 << 11) -# define GCR_GPA_TYPE12 (1 << 12) -# define GCR_GPA_TYPE13 (1 << 13) -# define GCR_GPA_TYPE14 (1 << 14) -# define GCR_GPA_TYPE15 (1 << 15) +# define GCR_GPA_TYPE0 (1 << 0) +# define GCR_GPA_TYPE1 (1 << 1) +# define GCR_GPA_TYPE2 (1 << 2) +# define GCR_GPA_TYPE3 (1 << 3) +# define GCR_GPA_TYPE4 (1 << 4) +# define GCR_GPA_TYPE5 (1 << 5) +# define GCR_GPA_TYPE6 (1 << 6) +# define GCR_GPA_TYPE7 (1 << 7) +# define GCR_GPA_TYPE8 (1 << 8) +# define GCR_GPA_TYPE9 (1 << 9) +# define GCR_GPA_TYPE10 (1 << 10) +# define GCR_GPA_TYPE11 (1 << 11) +# define GCR_GPA_TYPE12 (1 << 12) +# define GCR_GPA_TYPE13 (1 << 13) +# define GCR_GPA_TYPE14 (1 << 14) +# define GCR_GPA_TYPE15 (1 << 15) /* Multiple function pin GPIOB control register */ #define GCR_GPB_MFP(n) (1 << (n)) /* Bits 0-15: PBn pin function selection */ -# define GCR_GPB_MFP0 (1 << 0) -# define GCR_GPB_MFP1 (1 << 1) -# define GCR_GPB_MFP2 (1 << 2) -# define GCR_GPB_MFP3 (1 << 3) -# define GCR_GPB_MFP4 (1 << 4) -# define GCR_GPB_MFP5 (1 << 5) -# define GCR_GPB_MFP6 (1 << 6) -# define GCR_GPB_MFP7 (1 << 7) -# define GCR_GPB_MFP8 (1 << 8) -# define GCR_GPB_MFP9 (1 << 9) -# define GCR_GPB_MFP10 (1 << 10) -# define GCR_GPB_MFP11 (1 << 11) -# define GCR_GPB_MFP12 (1 << 12) -# define GCR_GPB_MFP13 (1 << 13) -# define GCR_GPB_MFP14 (1 << 14) -# define GCR_GPB_MFP15 (1 << 15) +# define GCR_GPB_MFP0 (1 << 0) +# define GCR_GPB_MFP1 (1 << 1) +# define GCR_GPB_MFP2 (1 << 2) +# define GCR_GPB_MFP3 (1 << 3) +# define GCR_GPB_MFP4 (1 << 4) +# define GCR_GPB_MFP5 (1 << 5) +# define GCR_GPB_MFP6 (1 << 6) +# define GCR_GPB_MFP7 (1 << 7) +# define GCR_GPB_MFP8 (1 << 8) +# define GCR_GPB_MFP9 (1 << 9) +# define GCR_GPB_MFP10 (1 << 10) +# define GCR_GPB_MFP11 (1 << 11) +# define GCR_GPB_MFP12 (1 << 12) +# define GCR_GPB_MFP13 (1 << 13) +# define GCR_GPB_MFP14 (1 << 14) +# define GCR_GPB_MFP15 (1 << 15) #define GCR_GPB_TYPE(n) (1 << ((n)+16)) /* Bits 16-31: Enable Schmitt trigger function */ -# define GCR_GPB_TYPE0 (1 << 0) -# define GCR_GPB_TYPE1 (1 << 1) -# define GCR_GPB_TYPE2 (1 << 2) -# define GCR_GPB_TYPE3 (1 << 3) -# define GCR_GPB_TYPE4 (1 << 4) -# define GCR_GPB_TYPE5 (1 << 5) -# define GCR_GPB_TYPE6 (1 << 6) -# define GCR_GPB_TYPE7 (1 << 7) -# define GCR_GPB_TYPE8 (1 << 8) -# define GCR_GPB_TYPE9 (1 << 9) -# define GCR_GPB_TYPE10 (1 << 10) -# define GCR_GPB_TYPE11 (1 << 11) -# define GCR_GPB_TYPE12 (1 << 12) -# define GCR_GPB_TYPE13 (1 << 13) -# define GCR_GPB_TYPE14 (1 << 14) -# define GCR_GPB_TYPE15 (1 << 15) +# define GCR_GPB_TYPE0 (1 << 0) +# define GCR_GPB_TYPE1 (1 << 1) +# define GCR_GPB_TYPE2 (1 << 2) +# define GCR_GPB_TYPE3 (1 << 3) +# define GCR_GPB_TYPE4 (1 << 4) +# define GCR_GPB_TYPE5 (1 << 5) +# define GCR_GPB_TYPE6 (1 << 6) +# define GCR_GPB_TYPE7 (1 << 7) +# define GCR_GPB_TYPE8 (1 << 8) +# define GCR_GPB_TYPE9 (1 << 9) +# define GCR_GPB_TYPE10 (1 << 10) +# define GCR_GPB_TYPE11 (1 << 11) +# define GCR_GPB_TYPE12 (1 << 12) +# define GCR_GPB_TYPE13 (1 << 13) +# define GCR_GPB_TYPE14 (1 << 14) +# define GCR_GPB_TYPE15 (1 << 15) /* Multiple function pin GPIOC control register */ #define GCR_GPC_MFP(n) (1 << (n)) /* Bits 0-15: PCn pin function selection */ -# define GCR_GPC_MFP0 (1 << 0) -# define GCR_GPC_MFP1 (1 << 1) -# define GCR_GPC_MFP2 (1 << 2) -# define GCR_GPC_MFP3 (1 << 3) -# define GCR_GPC_MFP4 (1 << 4) -# define GCR_GPC_MFP5 (1 << 5) -# define GCR_GPC_MFP6 (1 << 6) -# define GCR_GPC_MFP7 (1 << 7) -# define GCR_GPC_MFP8 (1 << 8) -# define GCR_GPC_MFP9 (1 << 9) -# define GCR_GPC_MFP10 (1 << 10) -# define GCR_GPC_MFP11 (1 << 11) -# define GCR_GPC_MFP12 (1 << 12) -# define GCR_GPC_MFP13 (1 << 13) -# define GCR_GPC_MFP14 (1 << 14) -# define GCR_GPC_MFP15 (1 << 15) +# define GCR_GPC_MFP0 (1 << 0) +# define GCR_GPC_MFP1 (1 << 1) +# define GCR_GPC_MFP2 (1 << 2) +# define GCR_GPC_MFP3 (1 << 3) +# define GCR_GPC_MFP4 (1 << 4) +# define GCR_GPC_MFP5 (1 << 5) +# define GCR_GPC_MFP6 (1 << 6) +# define GCR_GPC_MFP7 (1 << 7) +# define GCR_GPC_MFP8 (1 << 8) +# define GCR_GPC_MFP9 (1 << 9) +# define GCR_GPC_MFP10 (1 << 10) +# define GCR_GPC_MFP11 (1 << 11) +# define GCR_GPC_MFP12 (1 << 12) +# define GCR_GPC_MFP13 (1 << 13) +# define GCR_GPC_MFP14 (1 << 14) +# define GCR_GPC_MFP15 (1 << 15) #define GCR_GPC_TYPE(n) (1 << ((n)+16)) /* Bits 16-31: Enable Schmitt trigger function */ -# define GCR_GPC_TYPE0 (1 << 0) -# define GCR_GPC_TYPE1 (1 << 1) -# define GCR_GPC_TYPE2 (1 << 2) -# define GCR_GPC_TYPE3 (1 << 3) -# define GCR_GPC_TYPE4 (1 << 4) -# define GCR_GPC_TYPE5 (1 << 5) -# define GCR_GPC_TYPE6 (1 << 6) -# define GCR_GPC_TYPE7 (1 << 7) -# define GCR_GPC_TYPE8 (1 << 8) -# define GCR_GPC_TYPE9 (1 << 9) -# define GCR_GPC_TYPE10 (1 << 10) -# define GCR_GPC_TYPE11 (1 << 11) -# define GCR_GPC_TYPE12 (1 << 12) -# define GCR_GPC_TYPE13 (1 << 13) -# define GCR_GPC_TYPE14 (1 << 14) -# define GCR_GPC_TYPE15 (1 << 15) +# define GCR_GPC_TYPE0 (1 << 0) +# define GCR_GPC_TYPE1 (1 << 1) +# define GCR_GPC_TYPE2 (1 << 2) +# define GCR_GPC_TYPE3 (1 << 3) +# define GCR_GPC_TYPE4 (1 << 4) +# define GCR_GPC_TYPE5 (1 << 5) +# define GCR_GPC_TYPE6 (1 << 6) +# define GCR_GPC_TYPE7 (1 << 7) +# define GCR_GPC_TYPE8 (1 << 8) +# define GCR_GPC_TYPE9 (1 << 9) +# define GCR_GPC_TYPE10 (1 << 10) +# define GCR_GPC_TYPE11 (1 << 11) +# define GCR_GPC_TYPE12 (1 << 12) +# define GCR_GPC_TYPE13 (1 << 13) +# define GCR_GPC_TYPE14 (1 << 14) +# define GCR_GPC_TYPE15 (1 << 15) /* Multiple function pin GPIOD control register */ #define GCR_GPD_MFP(n) (1 << (n)) /* Bits 0-15: PDn pin function selection */ -# define GCR_GPD_MFP0 (1 << 0) -# define GCR_GPD_MFP1 (1 << 1) -# define GCR_GPD_MFP2 (1 << 2) -# define GCR_GPD_MFP3 (1 << 3) -# define GCR_GPD_MFP4 (1 << 4) -# define GCR_GPD_MFP5 (1 << 5) -# define GCR_GPD_MFP6 (1 << 6) -# define GCR_GPD_MFP7 (1 << 7) -# define GCR_GPD_MFP8 (1 << 8) -# define GCR_GPD_MFP9 (1 << 9) -# define GCR_GPD_MFP10 (1 << 10) -# define GCR_GPD_MFP11 (1 << 11) -# define GCR_GPD_MFP12 (1 << 12) -# define GCR_GPD_MFP13 (1 << 13) -# define GCR_GPD_MFP14 (1 << 14) -# define GCR_GPD_MFP15 (1 << 15) +# define GCR_GPD_MFP0 (1 << 0) +# define GCR_GPD_MFP1 (1 << 1) +# define GCR_GPD_MFP2 (1 << 2) +# define GCR_GPD_MFP3 (1 << 3) +# define GCR_GPD_MFP4 (1 << 4) +# define GCR_GPD_MFP5 (1 << 5) +# define GCR_GPD_MFP6 (1 << 6) +# define GCR_GPD_MFP7 (1 << 7) +# define GCR_GPD_MFP8 (1 << 8) +# define GCR_GPD_MFP9 (1 << 9) +# define GCR_GPD_MFP10 (1 << 10) +# define GCR_GPD_MFP11 (1 << 11) +# define GCR_GPD_MFP12 (1 << 12) +# define GCR_GPD_MFP13 (1 << 13) +# define GCR_GPD_MFP14 (1 << 14) +# define GCR_GPD_MFP15 (1 << 15) #define GCR_GPD_TYPE(n) (1 << ((n)+16)) /* Bits 16-31: Enable Schmitt trigger function */ -# define GCR_GPD_TYPE0 (1 << 0) -# define GCR_GPD_TYPE1 (1 << 1) -# define GCR_GPD_TYPE2 (1 << 2) -# define GCR_GPD_TYPE3 (1 << 3) -# define GCR_GPD_TYPE4 (1 << 4) -# define GCR_GPD_TYPE5 (1 << 5) -# define GCR_GPD_TYPE6 (1 << 6) -# define GCR_GPD_TYPE7 (1 << 7) -# define GCR_GPD_TYPE8 (1 << 8) -# define GCR_GPD_TYPE9 (1 << 9) -# define GCR_GPD_TYPE10 (1 << 10) -# define GCR_GPD_TYPE11 (1 << 11) -# define GCR_GPD_TYPE12 (1 << 12) -# define GCR_GPD_TYPE13 (1 << 13) -# define GCR_GPD_TYPE14 (1 << 14) -# define GCR_GPD_TYPE15 (1 << 15) +# define GCR_GPD_TYPE0 (1 << 0) +# define GCR_GPD_TYPE1 (1 << 1) +# define GCR_GPD_TYPE2 (1 << 2) +# define GCR_GPD_TYPE3 (1 << 3) +# define GCR_GPD_TYPE4 (1 << 4) +# define GCR_GPD_TYPE5 (1 << 5) +# define GCR_GPD_TYPE6 (1 << 6) +# define GCR_GPD_TYPE7 (1 << 7) +# define GCR_GPD_TYPE8 (1 << 8) +# define GCR_GPD_TYPE9 (1 << 9) +# define GCR_GPD_TYPE10 (1 << 10) +# define GCR_GPD_TYPE11 (1 << 11) +# define GCR_GPD_TYPE12 (1 << 12) +# define GCR_GPD_TYPE13 (1 << 13) +# define GCR_GPD_TYPE14 (1 << 14) +# define GCR_GPD_TYPE15 (1 << 15) /* Multiple function pin GPIOE control register */ #define GCR_GPE_MFP(n) (1 << (n)) /* Bits 0-15: PDn pin function selection */ -# define GCR_GPE_MFP0 (1 << 0) -# define GCR_GPE_MFP1 (1 << 1) -# define GCR_GPE_MFP2 (1 << 2) -# define GCR_GPE_MFP3 (1 << 3) -# define GCR_GPE_MFP4 (1 << 4) -# define GCR_GPE_MFP5 (1 << 5) +# define GCR_GPE_MFP0 (1 << 0) +# define GCR_GPE_MFP1 (1 << 1) +# define GCR_GPE_MFP2 (1 << 2) +# define GCR_GPE_MFP3 (1 << 3) +# define GCR_GPE_MFP4 (1 << 4) +# define GCR_GPE_MFP5 (1 << 5) #define GCR_GPE_TYPE(n) (1 << ((n)+16)) /* Bits 16-31: Enable Schmitt trigger function */ -# define GCR_GPE_TYPE0 (1 << 0) -# define GCR_GPE_TYPE1 (1 << 1) -# define GCR_GPE_TYPE2 (1 << 2) -# define GCR_GPE_TYPE3 (1 << 3) -# define GCR_GPE_TYPE4 (1 << 4) -# define GCR_GPE_TYPE5 (1 << 5) +# define GCR_GPE_TYPE0 (1 << 0) +# define GCR_GPE_TYPE1 (1 << 1) +# define GCR_GPE_TYPE2 (1 << 2) +# define GCR_GPE_TYPE3 (1 << 3) +# define GCR_GPE_TYPE4 (1 << 4) +# define GCR_GPE_TYPE5 (1 << 5) /* Alternative multiple function pin control register */ diff --git a/nuttx/arch/arm/src/nuc1xx/chip/nuc_gpio.h b/nuttx/arch/arm/src/nuc1xx/chip/nuc_gpio.h index aea16ab0c..7d99118e0 100644 --- a/nuttx/arch/arm/src/nuc1xx/chip/nuc_gpio.h +++ b/nuttx/arch/arm/src/nuc1xx/chip/nuc_gpio.h @@ -428,56 +428,56 @@ #define GPIO_PMD_OPENDRAIN 2 /* Open drain output */ #define GPIO_PMD_BIDI 3 /* Quasi bi-directional */ -#define GPIO_PMD_SHIFT(n) ((n) << 1) /* Bits 2n-2n+1: GPIOx Pin[n] mode control */ +#define GPIO_PMD_SHIFT(n) ((n) << 1) /* Bits 2n-2n+1: GPIOx Pin[n] mode control */ #define GPIO_PMD_MASK(n) (3 << GPIO_PMD_SHIFT(n)) # define GPIO_PMD(n,v) ((v) << GPIO_PMD_SHIFT(n)) -#define GPIO_PMD0_SHIFT (0) /* Bits 0-1: GPIOx Pin0 mode control */ +#define GPIO_PMD0_SHIFT (0) /* Bits 0-1: GPIOx Pin0 mode control */ #define GPIO_PMD0_MASK (3 << GPIO_PMD0_SHIFT) # define GPIO_PMD0(v) ((v) << GPIO_PMD0_SHIFT) -#define GPIO_PMD1_SHIFT (2) /* Bits 2-3: GPIOx Pin1 mode control */ +#define GPIO_PMD1_SHIFT (2) /* Bits 2-3: GPIOx Pin1 mode control */ #define GPIO_PMD1_MASK (3 << GPIO_PMD1_SHIFT) # define GPIO_PMD1(v) ((v) << GPIO_PMD1_SHIFT) -#define GPIO_PMD2_SHIFT (4) /* Bits 4-5: GPIOx Pin2 mode control */ +#define GPIO_PMD2_SHIFT (4) /* Bits 4-5: GPIOx Pin2 mode control */ #define GPIO_PMD2_MASK (3 << GPIO_PMD2_SHIFT) # define GPIO_PMD2(v) ((v) << GPIO_PMD2_SHIFT) -#define GPIO_PMD3_SHIFT (6) /* Bits 6-7: GPIOx Pin3 mode control */ +#define GPIO_PMD3_SHIFT (6) /* Bits 6-7: GPIOx Pin3 mode control */ #define GPIO_PMD3_MASK (3 << GPIO_PMD3_SHIFT) # define GPIO_PMD3(v) ((v) << GPIO_PMD3_SHIFT) -#define GPIO_PMD4_SHIFT (8) /* Bits 8-9: GPIOx Pin4 mode control */ +#define GPIO_PMD4_SHIFT (8) /* Bits 8-9: GPIOx Pin4 mode control */ #define GPIO_PMD4_MASK (3 << GPIO_PMD4_SHIFT) # define GPIO_PMD4(v) ((v) << GPIO_PMD4_SHIFT) -#define GPIO_PMD5_SHIFT (10) /* Bits 10-11: GPIOx Pin5 mode control */ +#define GPIO_PMD5_SHIFT (10) /* Bits 10-11: GPIOx Pin5 mode control */ #define GPIO_PMD5_MASK (3 << GPIO_PMD5_SHIFT) # define GPIO_PMD5(v) ((v) << GPIO_PMD5_SHIFT) -#define GPIO_PMD6_SHIFT (12) /* Bits 12-13: GPIOx Pin6 mode control */ +#define GPIO_PMD6_SHIFT (12) /* Bits 12-13: GPIOx Pin6 mode control */ #define GPIO_PMD6_MASK (3 << GPIO_PMD6_SHIFT) # define GPIO_PMD6(v) ((v) << GPIO_PMD6_SHIFT) -#define GPIO_PMD7_SHIFT (14) /* Bits 14-15: GPIOx Pin7 mode control */ +#define GPIO_PMD7_SHIFT (14) /* Bits 14-15: GPIOx Pin7 mode control */ #define GPIO_PMD7_MASK (3 << GPIO_PMD7_SHIFT) # define GPIO_PMD7(v) ((v) << GPIO_PMD7_SHIFT) -#define GPIO_PMD8_SHIFT (16) /* Bits 16-17: GPIOx Pin8 mode control */ +#define GPIO_PMD8_SHIFT (16) /* Bits 16-17: GPIOx Pin8 mode control */ #define GPIO_PMD8_MASK (3 << GPIO_PMD8_SHIFT) # define GPIO_PMD8(v) ((v) << GPIO_PMD8_SHIFT) -#define GPIO_PMD9_SHIFT (18) /* Bits 18-19: GPIOx Pin9 mode control */ +#define GPIO_PMD9_SHIFT (18) /* Bits 18-19: GPIOx Pin9 mode control */ #define GPIO_PMD9_MASK (3 << GPIO_PMD9_SHIFT) # define GPIO_PMD9(v) ((v) << GPIO_PMD9_SHIFT) -#define GPIO_PMD10_SHIFT (20) /* Bits 20-21: GPIOx Pin0 mode control */ +#define GPIO_PMD10_SHIFT (20) /* Bits 20-21: GPIOx Pin0 mode control */ #define GPIO_PMD10_MASK (3 << GPIO_PMD10_SHIFT) # define GPIO_PMD10(v) ((v) << GPIO_PMD10_SHIFT) -#define GPIO_PMD11_SHIFT (22) /* Bits 22-23: GPIOx Pin1 mode control */ +#define GPIO_PMD11_SHIFT (22) /* Bits 22-23: GPIOx Pin1 mode control */ #define GPIO_PMD11_MASK (3 << GPIO_PMD11_SHIFT) # define GPIO_PMD11(v) ((v) << GPIO_PMD11_SHIFT) -#define GPIO_PMD12_SHIFT (24) /* Bits 24-25: GPIOx Pin2 mode control */ +#define GPIO_PMD12_SHIFT (24) /* Bits 24-25: GPIOx Pin2 mode control */ #define GPIO_PMD12_MASK (3 << GPIO_PMD12_SHIFT) # define GPIO_PMD12(v) ((v) << GPIO_PMD12_SHIFT) -#define GPIO_PMD13_SHIFT (26) /* Bits 26-27: GPIOx Pin3 mode control */ +#define GPIO_PMD13_SHIFT (26) /* Bits 26-27: GPIOx Pin3 mode control */ #define GPIO_PMD13_MASK (3 << GPIO_PMD13_SHIFT) # define GPIO_PMD13(v) ((v) << GPIO_PMD13_SHIFT) -#define GPIO_PMD14_SHIFT (28) /* Bits 28-29: GPIOx Pin4 mode control */ +#define GPIO_PMD14_SHIFT (28) /* Bits 28-29: GPIOx Pin4 mode control */ #define GPIO_PMD14_MASK (3 << GPIO_PMD14_SHIFT) # define GPIO_PMD14(v) ((v) << GPIO_PMD14_SHIFT) -#define GPIO_PMD15_SHIFT (30) /* Bits 30-31: GPIOx Pin5 mode control */ +#define GPIO_PMD15_SHIFT (30) /* Bits 30-31: GPIOx Pin5 mode control */ #define GPIO_PMD15_MASK (3 << GPIO_PMD15_SHIFT) # define GPIO_PMD15(v) ((v) << GPIO_PMD15_SHIFT) diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_gpio.c b/nuttx/arch/arm/src/nuc1xx/nuc_gpio.c index 95f1ff143..9c4c79a90 100644 --- a/nuttx/arch/arm/src/nuc1xx/nuc_gpio.c +++ b/nuttx/arch/arm/src/nuc1xx/nuc_gpio.c @@ -140,7 +140,7 @@ int nuc_configgpio(gpio_cfgset_t cfgset) { regval |= GPIO_OFFD(pin); } - + putreg32(regval, regaddr); /* Check if we need to enable debouncing */ @@ -153,7 +153,7 @@ int nuc_configgpio(gpio_cfgset_t cfgset) { regval |= GPIO_DBEN(pin); } - + putreg32(regval, regaddr); /* Configure interrupting pins */ diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_idle.c b/nuttx/arch/arm/src/nuc1xx/nuc_idle.c index 7daa5ca95..bc9fe7c6b 100644 --- a/nuttx/arch/arm/src/nuc1xx/nuc_idle.c +++ b/nuttx/arch/arm/src/nuc1xx/nuc_idle.c @@ -87,7 +87,7 @@ static void up_idlepm(void) enum pm_state_e newstate; irqstate_t flags; int ret; - + /* Decide, which power saving level can be obtained */ newstate = pm_checkstate(); diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_lowputc.c b/nuttx/arch/arm/src/nuc1xx/nuc_lowputc.c index f8fe44145..c66a20d87 100644 --- a/nuttx/arch/arm/src/nuc1xx/nuc_lowputc.c +++ b/nuttx/arch/arm/src/nuc1xx/nuc_lowputc.c @@ -174,7 +174,7 @@ void nuc_lowsetup(void) #ifdef CONFIG_NUC_UART1 #ifdef CONFIG_UART1_FLOW_CONTROL - regval |= (GCR_GPB_MFP4 | GCR_GPB_MFP5 | GCR_GPB_MFP6| GCR_GPB_MFP7) + regval |= (GCR_GPB_MFP4 | GCR_GPB_MFP5 | GCR_GPB_MFP6| GCR_GPB_MFP7) #else regval |= (GCR_GPB_MFP4 | GCR_GPB_MFP5); #endif @@ -364,11 +364,11 @@ void nuc_setbaud(uintptr_t base, uint32_t baud) uint32_t divx; regval = getreg32(base + NUC_UART_BAUD_OFFSET); - + /* Mode 0: Source Clock mod 16 < 3 => Using Divider X = 16 */ clksperbit = (NUC_UART_CLK + (baud >> 1)) / baud; - if ((clksperbit & 15) < 3) + if ((clksperbit & 15) < 3) { regval &= ~(UART_BAUD_DIV_X_ONE | UART_BAUD_DIV_X_EN); brd = (clksperbit >> 4) - 2; @@ -390,7 +390,7 @@ void nuc_setbaud(uintptr_t base, uint32_t baud) /* Mode 1: Try to Set Divider X up 10 */ regval &= ~UART_BAUD_DIV_X_ONE; - + for (divx = 8; divx < 16; divx++) { brd = clksperbit % (divx + 1); diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_serial.c b/nuttx/arch/arm/src/nuc1xx/nuc_serial.c index 10acca0b1..ee774b9ae 100644 --- a/nuttx/arch/arm/src/nuc1xx/nuc_serial.c +++ b/nuttx/arch/arm/src/nuc1xx/nuc_serial.c @@ -705,7 +705,7 @@ static int up_interrupt(int irq, void *context) * generated after several bytes have been recevied and enable * the RX timout. */ - + up_rxto_enable(priv); } @@ -727,7 +727,7 @@ static int up_interrupt(int irq, void *context) regval = up_serialin(priv, NUC_UART_MCR_OFFSET); up_serialout(priv, NUC_UART_MCR_OFFSET, regval | UART_MSR_DCTSF); } - + /* Check for line status or buffer errors*/ if ((isr & UART_ISR_RLS_INT) != 0 || diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_userspace.c b/nuttx/arch/arm/src/nuc1xx/nuc_userspace.c index 0a60059ba..88a50695c 100644 --- a/nuttx/arch/arm/src/nuc1xx/nuc_userspace.c +++ b/nuttx/arch/arm/src/nuc1xx/nuc_userspace.c @@ -97,7 +97,7 @@ void nuc_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/sam34/chip/sam_acc.h b/nuttx/arch/arm/src/sam34/chip/sam_acc.h index 7747a5ac0..1e546ac14 100644 --- a/nuttx/arch/arm/src/sam34/chip/sam_acc.h +++ b/nuttx/arch/arm/src/sam34/chip/sam_acc.h @@ -134,7 +134,7 @@ #define ACC_WPMR_WPKEY_SHIFT (8) /* Bits 8-31: Write Protect KEY */ #define ACC_WPMR_WPKEY_MASK (0x00ffffff << ACC_WPMR_WPKEY_SHIFT) # define ACC_WPMR_WPKEY (0x00414343 << ACC_WPMR_WPKEY_SHIFT) - + /* Write Protect Status Register */ #define ACC_WPSR_WPROTERR (1 << 0) /* Bit 0: Write protection error */ diff --git a/nuttx/arch/arm/src/sam34/chip/sam_can.h b/nuttx/arch/arm/src/sam34/chip/sam_can.h index c6c140bf0..22548314e 100644 --- a/nuttx/arch/arm/src/sam34/chip/sam_can.h +++ b/nuttx/arch/arm/src/sam34/chip/sam_can.h @@ -63,7 +63,7 @@ /* CAN register offsets *****************************************************************/ -#define SAM_CAN_MR_OFFSET 0x0000 /* Mode Register */ +#define SAM_CAN_MR_OFFSET 0x0000 /* Mode Register */ #define SAM_CAN_IER_OFFSET 0x0004 /* Interrupt Enable Register */ #define SAM_CAN_IDR_OFFSET 0x0008 /* Interrupt Disable Register */ #define SAM_CAN_IMR_OFFSET 0x000c /* Interrupt Mask Register */ @@ -146,7 +146,7 @@ /* CAN register bit definitions *********************************************************/ -/* Mode Register */ +/* Mode Register */ #define CAN_MR_CANEN (1 << 0) /* Bit 0: CAN controller enable */ #define CAN_MR_LPM (1 << 1) /* Bit 1: Disable/enable low power mode */ diff --git a/nuttx/arch/arm/src/sam34/chip/sam_dacc.h b/nuttx/arch/arm/src/sam34/chip/sam_dacc.h index 86768fc30..4581289ed 100644 --- a/nuttx/arch/arm/src/sam34/chip/sam_dacc.h +++ b/nuttx/arch/arm/src/sam34/chip/sam_dacc.h @@ -210,7 +210,7 @@ #define DACC_WPMR_WPKEY_SHIFT (8) /* Bits 8-31: Write Protect KEY */ #define DACC_WPMR_WPKEY_MASK (0x00ffffff << DACC_WPMR_WPKEY_SHIFT) # define DACC_WPMR_WPKEY_MASK (0x00444143 << DACC_WPMR_WPKEY_SHIFT) - + /* Write Protect Status register */ #define DACC_WPSR_WPROTERR (1 << 0) /* Bit 0: Write protection error */ diff --git a/nuttx/arch/arm/src/sam34/sam4l_gpio.h b/nuttx/arch/arm/src/sam34/sam4l_gpio.h index e4aa8e8f1..49860adae 100644 --- a/nuttx/arch/arm/src/sam34/sam4l_gpio.h +++ b/nuttx/arch/arm/src/sam34/sam4l_gpio.h @@ -218,7 +218,7 @@ * GPIO Input: .... .... .... II.. .... .... * GPIO Output: .... .... .... .... .... .... * Peripheral: .... .... .... II.. .... .... - */ + */ #define GPIO_INT_SHIFT (10) /* Bits 10-11: Interrupting input control */ #define GPIO_INT_MASK (3 << GPIO_INT_SHIFT) diff --git a/nuttx/arch/arm/src/sam34/sam_userspace.c b/nuttx/arch/arm/src/sam34/sam_userspace.c index 7fd274be3..fc266fe8f 100644 --- a/nuttx/arch/arm/src/sam34/sam_userspace.c +++ b/nuttx/arch/arm/src/sam34/sam_userspace.c @@ -98,7 +98,7 @@ void sam_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/sama5/chip/sam_pwm.h b/nuttx/arch/arm/src/sama5/chip/sam_pwm.h index 308ef1e4f..f967043da 100644 --- a/nuttx/arch/arm/src/sama5/chip/sam_pwm.h +++ b/nuttx/arch/arm/src/sama5/chip/sam_pwm.h @@ -92,7 +92,7 @@ #define SAM_PWM_CMPV_OFFSET(n) (0x0130 + ((int)(n) << 4)) /* n=0..7 */ #define SAM_PWM_CMPVUPD_OFFSET(n) (0x0134 + ((int)(n) << 4)) /* n=0-7 */ #define SAM_PWM_CMPM_OFFSET(n) (0x0138 + ((int)(n) << 4)) /* n=0-7 */ -#define SAM_PWM_CMPMUPD_OFFSET(n) (0x013c + ((int)(n) << 4)) /* n=0-7 */ +#define SAM_PWM_CMPMUPD_OFFSET(n) (0x013c + ((int)(n) << 4)) /* n=0-7 */ #define SAM_PWM_CMPV0_OFFSET 0x0130 /* PWM Comparison 0 Value Register */ #define SAM_PWM_CMPVUPD0_OFFSET 0x0134 /* PWM Comparison 0 Value Update Register */ diff --git a/nuttx/arch/arm/src/sama5/sam_gf512.c b/nuttx/arch/arm/src/sama5/sam_gf512.c index 55ca77bdf..bdbbc6780 100644 --- a/nuttx/arch/arm/src/sama5/sam_gf512.c +++ b/nuttx/arch/arm/src/sama5/sam_gf512.c @@ -56,7 +56,7 @@ /* Gallois Field tables for 512 bytes sectors. First raw is "index_of" and second one is "alpha_to" */ -const uint16_t pmecc_gf512[2][PMECC_GF_SIZEOF_512] = +const uint16_t pmecc_gf512[2][PMECC_GF_SIZEOF_512] = { /* "index_of" table */ { diff --git a/nuttx/arch/arm/src/sama5/sam_pck.c b/nuttx/arch/arm/src/sama5/sam_pck.c index 06ddd29a1..a77480853 100644 --- a/nuttx/arch/arm/src/sama5/sam_pck.c +++ b/nuttx/arch/arm/src/sama5/sam_pck.c @@ -122,7 +122,7 @@ uint32_t sam_pck_configure(enum pckid_e pckid, uint32_t frequency) regval = PMC_PCK_CSS_PLLA; clkin = BOARD_PLLA_FREQUENCY; } - + /* The the larger smallest divisor that does not exceed the requested * frequency. */ diff --git a/nuttx/arch/arm/src/sama5/sam_pwm.c b/nuttx/arch/arm/src/sama5/sam_pwm.c index 5d389a221..377d704b7 100644 --- a/nuttx/arch/arm/src/sama5/sam_pwm.c +++ b/nuttx/arch/arm/src/sama5/sam_pwm.c @@ -1132,7 +1132,7 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, pwm_chan_putreg(chan, SAM_PWM_CMR_OFFSET, PWM_CMR_CPRE_CLKA); - /* Set the PWM period. + /* Set the PWM period. * * If the waveform is left-aligned, then the output waveform period * depends on the channel counter source clock and can be calculated @@ -1368,7 +1368,7 @@ FAR struct pwm_lowerhalf_s *sam_pwminitialize(int channel) { pwmdbg("ERROR: Failed to attach IRQ%d\n", channel); return NULL; - + } #endif diff --git a/nuttx/arch/arm/src/sama5/sam_tc.h b/nuttx/arch/arm/src/sama5/sam_tc.h index ba5657503..50585f7a1 100644 --- a/nuttx/arch/arm/src/sama5/sam_tc.h +++ b/nuttx/arch/arm/src/sama5/sam_tc.h @@ -107,7 +107,7 @@ extern "C" * On success, a non-NULL handle value is returned. This handle may be * used with subsequent timer/counter interfaces to manage the timer. A * NULL handle value is returned on a failure. - * + * ****************************************************************************/ TC_HANDLE sam_tc_allocate(int channel, int mode); @@ -123,7 +123,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode); * * Returned Value: * None - * + * ****************************************************************************/ void sam_tc_free(TC_HANDLE handle); @@ -139,7 +139,7 @@ void sam_tc_free(TC_HANDLE handle); * handle Channel handle previously allocated by sam_tc_allocate() * * Returned Value: - * + * ****************************************************************************/ void sam_tc_start(TC_HANDLE handle); @@ -154,7 +154,7 @@ void sam_tc_start(TC_HANDLE handle); * handle Channel handle previously allocated by sam_tc_allocate() * * Returned Value: - * + * ****************************************************************************/ void sam_tc_stop(TC_HANDLE handle); @@ -167,7 +167,7 @@ void sam_tc_stop(TC_HANDLE handle); * setting in the register will be the TC input frequency divided by * the provided divider (which should derive from the divider returned * by sam_tc_divider). - * + * * * Input Parameters: * handle Channel handle previously allocated by sam_tc_allocate() diff --git a/nuttx/arch/arm/src/sama5/sam_trng.c b/nuttx/arch/arm/src/sama5/sam_trng.c index c93393bbe..3f0d701fd 100644 --- a/nuttx/arch/arm/src/sama5/sam_trng.c +++ b/nuttx/arch/arm/src/sama5/sam_trng.c @@ -172,7 +172,7 @@ static int sam_interrupt(int irq, void *context) /* This is not the first sample. Check if the new sample differs from * the preceding sample. */ - + else if (odata == g_trngdev.samples[g_trngdev.nsamples - 1]) { /* Two samples with the same value. Discard this one and try again. */ diff --git a/nuttx/arch/arm/src/sama5/sam_tsd.c b/nuttx/arch/arm/src/sama5/sam_tsd.c index 915e082b2..c3d45307f 100644 --- a/nuttx/arch/arm/src/sama5/sam_tsd.c +++ b/nuttx/arch/arm/src/sama5/sam_tsd.c @@ -434,7 +434,7 @@ errout: * Input Parameters * priv - The touchscreen private data structure * tsav - The new (shifted) value of the TSAV field of the ADC TSMR regsiter. - * + * * Returned Value: * None * @@ -495,7 +495,7 @@ static void sam_tsd_setaverage(struct sam_tsd_s *priv, uint32_t tsav) * * Input Parameters * arg - The touchscreen private data structure cast to (void *) - * + * * Returned Value: * None * diff --git a/nuttx/arch/arm/src/samd/Make.defs b/nuttx/arch/arm/src/samd/Make.defs index 602a0fbed..d1630b414 100644 --- a/nuttx/arch/arm/src/samd/Make.defs +++ b/nuttx/arch/arm/src/samd/Make.defs @@ -33,7 +33,7 @@ # ############################################################################ -HEAD_ASRC = +HEAD_ASRC = CMN_ASRCS = up_exception.S up_saveusercontext.S up_fullcontextrestore.S CMN_ASRCS += up_switchcontext.S vfork.S @@ -67,7 +67,7 @@ ifeq ($(CONFIG_DEBUG),y) CMN_CSRCS += up_dumpnvic.c endif -CHIP_ASRCS = +CHIP_ASRCS = CHIP_CSRCS = sam_clockconfig.c sam_idle.c sam_irq.c sam_lowputc.c CHIP_CSRCS += sam_port.c sam_sercom.c sam_serial.c sam_start.c CHIP_CSRCS += sam_timerisr.c sam_usart.c diff --git a/nuttx/arch/arm/src/samd/sam_clockconfig.c b/nuttx/arch/arm/src/samd/sam_clockconfig.c index 7556d3b79..0fef4a3b3 100644 --- a/nuttx/arch/arm/src/samd/sam_clockconfig.c +++ b/nuttx/arch/arm/src/samd/sam_clockconfig.c @@ -821,7 +821,7 @@ static inline void sam_gclk_config(FAR const struct sam_gclkconfig_s *config) /* Wait for synchronization */ sam_gclck_waitsyncbusy(); - + /* Select the generator */ putreg32(((uint32_t)config->gclk << GCLK_GENDIV_ID_SHIFT), @@ -897,7 +897,7 @@ static inline void sam_config_gclks(void) /* Wait for the reset to complete */ while ((getreg8(SAM_GCLK_CTRL) & GCLK_CTRL_SWRST) != 0); - + /* Configure all GCLK generators, skipping GLCK_MAIN which is configured * below. */ diff --git a/nuttx/arch/arm/src/samd/sam_idle.c b/nuttx/arch/arm/src/samd/sam_idle.c index ea18904bf..8b8d3565b 100644 --- a/nuttx/arch/arm/src/samd/sam_idle.c +++ b/nuttx/arch/arm/src/samd/sam_idle.c @@ -87,7 +87,7 @@ static void up_idlepm(void) enum pm_state_e newstate; irqstate_t flags; int ret; - + /* Decide, which power saving level can be obtained */ newstate = pm_checkstate(); diff --git a/nuttx/arch/arm/src/samd/sam_port.c b/nuttx/arch/arm/src/samd/sam_port.c index 42a732227..8614383ee 100644 --- a/nuttx/arch/arm/src/samd/sam_port.c +++ b/nuttx/arch/arm/src/samd/sam_port.c @@ -177,8 +177,8 @@ static inline void sam_configinput(uintptr_t base, port_pinset_t pinset) break; } - /* Configure the pin as an input */ - + /* Configure the pin as an input */ + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } @@ -281,8 +281,8 @@ static inline void sam_configoutput(uintptr_t base, port_pinset_t pinset) regval |= PORT_WRCONFIG_DRVSTR; } - /* Configure the pin as an output */ - + /* Configure the pin as an output */ + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } @@ -356,8 +356,8 @@ static inline void sam_configperiph(uintptr_t base, port_pinset_t pinset) break; } - /* Configure the pin for the peripheral function */ - + /* Configure the pin for the peripheral function */ + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } @@ -410,7 +410,7 @@ static inline void sam_configreset(uintptr_t base, port_pinset_t pinset) /* Disable the peripheral multiplexor, disable the input, disable * pull-up/down, reset driver strength, etc. */ - + putreg32(regval, base + SAM_PORT_WRCONFIG_OFFSET); } diff --git a/nuttx/arch/arm/src/samd/sam_userspace.c b/nuttx/arch/arm/src/samd/sam_userspace.c index 71bbb1ba3..0f40d617e 100644 --- a/nuttx/arch/arm/src/samd/sam_userspace.c +++ b/nuttx/arch/arm/src/samd/sam_userspace.c @@ -97,7 +97,7 @@ void sam_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_eth.h b/nuttx/arch/arm/src/stm32/chip/stm32_eth.h index 92a229ccc..e074c520c 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_eth.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_eth.h @@ -754,7 +754,7 @@ #define ETH_RDES4_IPPT_SHIFT (0) /* Bits 0-2: IP payload type */ #define ETH_RDES4_IPPT_MASK (7 << ETH_RDES4_IPPT_SHIFT) # define ETH_RDES4_IPPT_UDP (1 << ETH_RDES4_IPPT_SHIFT) /* UDP payload in IP datagram */ -# define ETH_RDES4_IPPT_TCP (2 << ETH_RDES4_IPPT_SHIFT) /* TCP payload in IP datagram */ +# define ETH_RDES4_IPPT_TCP (2 << ETH_RDES4_IPPT_SHIFT) /* TCP payload in IP datagram */ # define ETH_RDES4_IPPT_ICMP (3 << ETH_RDES4_IPPT_SHIFT) /* ICMP payload in IP datagram */ #define ETH_RDES4_IPHE (1 << 3) /* Bit 3: IP header error */ #define ETH_RDES4_IPPE (1 << 4) /* Bit 4: IP payload error */ @@ -791,7 +791,7 @@ #ifndef __ASSEMBLY__ -/* Ethernet TX DMA Descriptor */ +/* Ethernet TX DMA Descriptor */ struct eth_txdesc_s { @@ -812,7 +812,7 @@ struct eth_txdesc_s #endif }; -/* Ethernet RX DMA Descriptor */ +/* Ethernet RX DMA Descriptor */ struct eth_rxdesc_s { diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h index 7c574f3b0..b9ec9cfa8 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h @@ -160,7 +160,7 @@ #define STM32_OTGFS_DVBUSPULSE_OFFSET 0x082c /* Device VBUS pulsing time register */ #define STM32_OTGFS_DIEPEMPMSK_OFFSET 0x0834 /* Device IN endpoint FIFO empty interrupt mask register */ -#define STM32_OTGFS_DIEP_OFFSET(n) (0x0900 + ((n) << 5)) +#define STM32_OTGFS_DIEP_OFFSET(n) (0x0900 + ((n) << 5)) #define STM32_OTGFS_DIEPCTL_EPOFFSET 0x0000 /* Device endpoint control register */ #define STM32_OTGFS_DIEPINT_EPOFFSET 0x0008 /* Device endpoint interrupt register */ #define STM32_OTGFS_DIEPTSIZ_EPOFFSET 0x0010 /* Device IN endpoint transfer size register */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_rtc.h b/nuttx/arch/arm/src/stm32/chip/stm32_rtc.h index f96f704b1..e5004c5ab 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_rtc.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_rtc.h @@ -44,7 +44,7 @@ #define STM32_RTC_CRH_OFFSET 0x0000 /* RTC control register High (16-bit) */ #define STM32_RTC_CRL_OFFSET 0x0004 /* RTC control register low (16-bit) */ -#define STM32_RTC_PRLH_OFFSET 0x0008 /* RTC prescaler load register high (16-bit) */ +#define STM32_RTC_PRLH_OFFSET 0x0008 /* RTC prescaler load register high (16-bit) */ #define STM32_RTC_PRLL_OFFSET 0x000c /* RTC prescaler load register low (16-bit) */ #define STM32_RTC_DIVH_OFFSET 0x0010 /* RTC prescaler divider register high (16-bit) */ #define STM32_RTC_DIVL_OFFSET 0x0014 /* RTC prescaler divider register low (16-bit) */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_gpio.h b/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_gpio.h index d339fc15e..11c333434 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_gpio.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_gpio.h @@ -271,12 +271,12 @@ #define AFIO_MAPR_USART1_REMAP (1 << 2) /* Bit 2: USART1 remapping */ #define AFIO_MAPR_USART2_REMAP (1 << 3) /* Bit 3: USART2 remapping */ #define AFIO_MAPR_USART3_REMAP_SHIFT (4) /* Bits 5-4: USART3 remapping */ -#define AFIO_MAPR_USART3_REMAP_MASK (3 << AFIO_MAPR_USART3_REMAP_SHIFT) +#define AFIO_MAPR_USART3_REMAP_MASK (3 << AFIO_MAPR_USART3_REMAP_SHIFT) # define AFIO_MAPR_USART3_NOREMAP (0 << AFIO_MAPR_USART3_REMAP_SHIFT) /* 00: No remap */ # define AFIO_MAPR_USART3_PARTREMAP (1 << AFIO_MAPR_USART3_REMAP_SHIFT) /* 01: Partial remap */ # define AFIO_MAPR_USART3_FULLREMAP (3 << AFIO_MAPR_USART3_REMAP_SHIFT) /* 11: Full remap */ #define AFIO_MAPR_TIM1_REMAP_SHIFT (6) /* Bits 7-6: TIM1 remapping */ -#define AFIO_MAPR_TIM1_REMAP_MASK (3 << AFIO_MAPR_TIM1_REMAP_SHIFT) +#define AFIO_MAPR_TIM1_REMAP_MASK (3 << AFIO_MAPR_TIM1_REMAP_SHIFT) # define AFIO_MAPR_TIM1_NOREMAP (0 << AFIO_MAPR_TIM1_REMAP_SHIFT) /* 00: No remap */ # define AFIO_MAPR_TIM1_PARTREMAP (1 << AFIO_MAPR_TIM1_REMAP_SHIFT) /* 01: Partial remap */ # define AFIO_MAPR_TIM1_FULLREMAP (3 << AFIO_MAPR_TIM1_REMAP_SHIFT) /* 11: Full remap */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_dma.h b/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_dma.h index af4b361c2..1389c0eef 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_dma.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_dma.h @@ -89,7 +89,7 @@ #define STM32_DMA_S4CR_OFFSET 0x0070 /* DMA stream 4 configuration register */ #define STM32_DMA_S5CR_OFFSET 0x0088 /* DMA stream 5 configuration register */ #define STM32_DMA_S6CR_OFFSET 0x00a0 /* DMA stream 6 configuration register */ -#define STM32_DMA_S7CR_OFFSET 0x00b8 /* DMA stream 7 configuration register */ +#define STM32_DMA_S7CR_OFFSET 0x00b8 /* DMA stream 7 configuration register */ #define STM32_DMA_S0NDTR_OFFSET 0x0014 /* DMA stream 0 number of data register */ #define STM32_DMA_S1NDTR_OFFSET 0x002c /* DMA stream 1 number of data register */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f30xxx_memorymap.h b/nuttx/arch/arm/src/stm32/chip/stm32f30xxx_memorymap.h index 5fd8288bb..dc291ad29 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f30xxx_memorymap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f30xxx_memorymap.h @@ -39,7 +39,7 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ - + /* STM32F40XXX Address Blocks *******************************************************/ #define STM32_CODE_BASE 0x00000000 /* 0x00000000-0x1fffffff: 512Mb code block */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_dma.h b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_dma.h index 6ba868b96..b7bf7b1a8 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_dma.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_dma.h @@ -89,7 +89,7 @@ #define STM32_DMA_S4CR_OFFSET 0x0070 /* DMA stream 4 configuration register */ #define STM32_DMA_S5CR_OFFSET 0x0088 /* DMA stream 5 configuration register */ #define STM32_DMA_S6CR_OFFSET 0x00a0 /* DMA stream 6 configuration register */ -#define STM32_DMA_S7CR_OFFSET 0x00b8 /* DMA stream 7 configuration register */ +#define STM32_DMA_S7CR_OFFSET 0x00b8 /* DMA stream 7 configuration register */ #define STM32_DMA_S0NDTR_OFFSET 0x0014 /* DMA stream 0 number of data register */ #define STM32_DMA_S1NDTR_OFFSET 0x002c /* DMA stream 1 number of data register */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h index 6647c8851..3e4c9f6a0 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h @@ -39,7 +39,7 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ - + /* STM32F40XXX Address Blocks *******************************************************/ #define STM32_CODE_BASE 0x00000000 /* 0x00000000-0x1fffffff: 512Mb code block */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_memorymap.h b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_memorymap.h index cb37a16f6..4ada87f0d 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_memorymap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_memorymap.h @@ -41,7 +41,7 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ - + /* STM32F40XXX Address Blocks *******************************************************/ #define STM32_CODE_BASE 0x00000000 /* 0x00000000-0x1fffffff: 512Mb code block */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_pinmap.h b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_pinmap.h index f0547c9ef..1a9264c38 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_pinmap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_pinmap.h @@ -45,7 +45,7 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ -/* Alternate Pin Functions. +/* Alternate Pin Functions. * * Alternative pin selections are provided with a numeric suffix like _1, _2, etc. * Drivers, however, will use the pin selection without the numeric suffix. diff --git a/nuttx/arch/arm/src/stm32/stm32_allocateheap.c b/nuttx/arch/arm/src/stm32/stm32_allocateheap.c index 7ffa2e042..50fb9037e 100644 --- a/nuttx/arch/arm/src/stm32/stm32_allocateheap.c +++ b/nuttx/arch/arm/src/stm32/stm32_allocateheap.c @@ -112,7 +112,7 @@ # define CONFIG_STM32_CCMEXCLUDE 1 /* Only one memory region can be support (internal SRAM) */ - + # if CONFIG_MM_REGIONS > 1 # error "CONFIG_MM_REGIONS > 1. The STM32L15X has only one memory region." # endif @@ -239,7 +239,7 @@ * regions are contiguous and treated as one in this logic that extends to * 0x2002:0000 (or 0x2003:0000 for the F427/F437/F429/F439). * - * As a complication, CCM SRAM cannot be used for DMA. So, if STM32 DMA is enabled, + * As a complication, CCM SRAM cannot be used for DMA. So, if STM32 DMA is enabled, * CCM SRAM should probably be excluded from the heap or the application must take * extra care to ensure that DMA buffers are not allocated in CCM SRAM. * @@ -347,7 +347,7 @@ # undef CONFIG_STM32_CCMEXCLUDE # define CONFIG_STM32_CCMEXCLUDE 1 # endif - + # elif !defined(CONFIG_STM32_CCMEXCLUDE) /* Configuration 2: FSMC SRAM is not used, but CCM SRAM is requested. DMA diff --git a/nuttx/arch/arm/src/stm32/stm32_dac.h b/nuttx/arch/arm/src/stm32/stm32_dac.h index 44404e6fb..0be2b6b37 100644 --- a/nuttx/arch/arm/src/stm32/stm32_dac.h +++ b/nuttx/arch/arm/src/stm32/stm32_dac.h @@ -52,7 +52,7 @@ ************************************************************************************/ /* Configuration ********************************************************************/ /* Timer devices may be used for different purposes. One special purpose is to - * control periodic DAC outputs. If CONFIG_STM32_TIMn is defined then + * control periodic DAC outputs. If CONFIG_STM32_TIMn is defined then * CONFIG_STM32_TIMn_DAC must also be defined to indicate that timer "n" is intended * to be used for that purpose. */ diff --git a/nuttx/arch/arm/src/stm32/stm32_idle.c b/nuttx/arch/arm/src/stm32/stm32_idle.c index e8b51caa5..54e18101e 100644 --- a/nuttx/arch/arm/src/stm32/stm32_idle.c +++ b/nuttx/arch/arm/src/stm32/stm32_idle.c @@ -88,7 +88,7 @@ static void up_idlepm(void) enum pm_state_e newstate; irqstate_t flags; int ret; - + /* Decide, which power saving level can be obtained */ newstate = pm_checkstate(); @@ -192,7 +192,7 @@ void up_idle(void) * perform any AHB master accesses during sleep mode." * * Workaround - * Enable DMA1 or DMA2 clocks in the RCC_AHBENR register before + * Enable DMA1 or DMA2 clocks in the RCC_AHBENR register before * executing the WFI/WFE instruction." * * Here the workaround is just to avoid SLEEP mode for the connectivity diff --git a/nuttx/arch/arm/src/stm32/stm32_iwdg.c b/nuttx/arch/arm/src/stm32/stm32_iwdg.c index e81f93949..e72165018 100644 --- a/nuttx/arch/arm/src/stm32/stm32_iwdg.c +++ b/nuttx/arch/arm/src/stm32/stm32_iwdg.c @@ -418,7 +418,7 @@ static int stm32_keepalive(FAR struct watchdog_lowerhalf_s *lower) irqstate_t flags; wdvdbg("Entry\n"); - + /* Reload the IWDG timer */ flags = irqsave(); @@ -600,7 +600,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, * So we want: * timeout = 1000 * reload / Fiwdg */ - + priv->timeout = (1000 * (uint32_t)reload) / fiwdg; /* Save setup values for later use */ @@ -619,7 +619,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, /* If CONFIG_STM32_IWDG_DEFERREDSETUP is selected, then perform the register * configuration only if the timer has been started. */ - + #ifdef CONFIG_STM32_IWDG_DEFERREDSETUP if (priv->started) #endif diff --git a/nuttx/arch/arm/src/stm32/stm32_ltdc.c b/nuttx/arch/arm/src/stm32/stm32_ltdc.c index d9cf1f7f4..bd27ee1f0 100644 --- a/nuttx/arch/arm/src/stm32/stm32_ltdc.c +++ b/nuttx/arch/arm/src/stm32/stm32_ltdc.c @@ -219,7 +219,7 @@ #define STM32_LTDC_BUFFER_L1 STM32_LTDC_BUFFER_START #define STM32_LTDC_ENDBUF_L1 (STM32_LTDC_BUFFER_L1 + STM32_L1_FBSIZE) -#ifdef CONFIG_STM32_LTDC_L2 +#ifdef CONFIG_STM32_LTDC_L2 # define STM32_LTDC_BUFFER_L2 STM32_LTDC_ENDBUF_L1 # define STM32_LTDC_ENDBUF_L2 (STM32_LTDC_BUFFER_L2 + STM32_L2_FBSIZE) #else @@ -728,7 +728,7 @@ static void stm32_config_lcd_clock(void) * Name: stm32_show_layer * * Description: - * Show the given layer with the specified window + * Show the given layer with the specified window * ****************************************************************************/ diff --git a/nuttx/arch/arm/src/stm32/stm32_pm.h b/nuttx/arch/arm/src/stm32/stm32_pm.h index be040d296..d6dbe5245 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pm.h +++ b/nuttx/arch/arm/src/stm32/stm32_pm.h @@ -75,7 +75,7 @@ extern "C" { * Name: stm32_pmstop * * Description: - * Enter STOP mode. + * Enter STOP mode. * * Input Parameters: * lpds - true: To further reduce power consumption in Stop mode, put the @@ -115,11 +115,11 @@ EXTERN int stm32_pmstandby(void); * Name: stm32_pmsleep * * Description: - * Enter SLEEP mode. + * Enter SLEEP mode. * * Input Parameters: * sleeponexit - true: SLEEPONEXIT bit is set when the WFI instruction is - * executed, the MCU enters Sleep mode as soon as it + * executed, the MCU enters Sleep mode as soon as it * exits the lowest priority ISR. * - false: SLEEPONEXIT bit is cleared, the MCU enters Sleep mode * as soon as WFI or WFE instruction is executed. diff --git a/nuttx/arch/arm/src/stm32/stm32_pmsleep.c b/nuttx/arch/arm/src/stm32/stm32_pmsleep.c index 3027b99a7..49ebf1ce7 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pmsleep.c +++ b/nuttx/arch/arm/src/stm32/stm32_pmsleep.c @@ -68,11 +68,11 @@ * Name: stm32_pmsleep * * Description: - * Enter SLEEP mode. + * Enter SLEEP mode. * * Input Parameters: * sleeponexit - true: SLEEPONEXIT bit is set when the WFI instruction is - * executed, the MCU enters Sleep mode as soon as it + * executed, the MCU enters Sleep mode as soon as it * exits the lowest priority ISR. * - false: SLEEPONEXIT bit is cleared, the MCU enters Sleep mode * as soon as WFI or WFE instruction is executed. diff --git a/nuttx/arch/arm/src/stm32/stm32_pmstandby.c b/nuttx/arch/arm/src/stm32/stm32_pmstandby.c index 467edaec2..2b4de6a6f 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pmstandby.c +++ b/nuttx/arch/arm/src/stm32/stm32_pmstandby.c @@ -101,7 +101,7 @@ int stm32_pmstandby(void) regval = getreg32(NVIC_SYSCON); regval |= NVIC_SYSCON_SLEEPDEEP; putreg32(regval, NVIC_SYSCON); - + /* Sleep until the wakeup reset occurs */ asm("wfi"); diff --git a/nuttx/arch/arm/src/stm32/stm32_pmstop.c b/nuttx/arch/arm/src/stm32/stm32_pmstop.c index 14ce63b55..bde0334ec 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pmstop.c +++ b/nuttx/arch/arm/src/stm32/stm32_pmstop.c @@ -66,7 +66,7 @@ * Name: stm32_pmstop * * Description: - * Enter STOP mode. + * Enter STOP mode. * * Input Parameters: * lpds - true: To further reduce power consumption in Stop mode, put the @@ -98,7 +98,7 @@ int stm32_pmstop(bool lpds) { regval |= PWR_CR_LPDS; } - + putreg32(regval, STM32_PWR_CR); /* Set SLEEPDEEP bit of Cortex System Control Register */ @@ -106,7 +106,7 @@ int stm32_pmstop(bool lpds) regval = getreg32(NVIC_SYSCON); regval |= NVIC_SYSCON_SLEEPDEEP; putreg32(regval, NVIC_SYSCON); - + /* Sleep until the wakeup interrupt or event occurs */ #ifdef CONFIG_PM_WFE @@ -116,7 +116,7 @@ int stm32_pmstop(bool lpds) #else /* Mode: SLEEP + Entry with WFI */ - asm("wfi"); + asm("wfi"); #endif return OK; } diff --git a/nuttx/arch/arm/src/stm32/stm32_pwr.h b/nuttx/arch/arm/src/stm32/stm32_pwr.h index 63ae14429..2ec3de6dc 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pwr.h +++ b/nuttx/arch/arm/src/stm32/stm32_pwr.h @@ -62,7 +62,7 @@ extern "C" { /************************************************************************************ * Public Functions ************************************************************************************/ - + /************************************************************************************ * Name: stm32_pwr_enablebkp * diff --git a/nuttx/arch/arm/src/stm32/stm32_qencoder.c b/nuttx/arch/arm/src/stm32/stm32_qencoder.c index 5e99b05a8..4e19d4c2e 100644 --- a/nuttx/arch/arm/src/stm32/stm32_qencoder.c +++ b/nuttx/arch/arm/src/stm32/stm32_qencoder.c @@ -589,7 +589,7 @@ static void stm32_dumpregs(struct stm32_lowerhalf_s *priv, FAR const char *msg) * Name: stm32_tim2lower * * Description: - * Map a timer number to a device structure + * Map a timer number to a device structure * ************************************************************************************/ @@ -671,7 +671,7 @@ static int stm32_interrupt(FAR struct stm32_lowerhalf_s *priv) * Name: stm32_intNinterrupt * * Description: - * TIMN interrupt handler + * TIMN interrupt handler * ************************************************************************************/ @@ -723,7 +723,7 @@ static int stm32_tim8interrupt(int irq, FAR void *context) * Description: * This method is called when the driver is opened. The lower half driver * should configure and initialize the device so that it is ready for use. - * The initial position value should be zero. * + * The initial position value should be zero. * * ************************************************************************************/ @@ -779,7 +779,7 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) stm32_putreg16(priv, STM32_GTIM_PSC_OFFSET, (uint16_t)priv->config->psc); #if defined(CONFIG_STM32_TIM1_QE) || defined(CONFIG_STM32_TIM8_QE) - if (priv->config->timid == 1 || priv->config->timid == 8) + if (priv->config->timid == 1 || priv->config->timid == 8) { /* Clear the Repetition Counter value */ @@ -797,7 +797,7 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) stm32_configgpio(priv->config->ti1cfg); stm32_configgpio(priv->config->ti2cfg); - + /* Set the encoder Mode 3 */ smcr = stm32_getreg16(priv, STM32_GTIM_SMCR_OFFSET); @@ -830,7 +830,7 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) stm32_putreg16(priv, STM32_GTIM_CCMR1_OFFSET, ccmr1); stm32_putreg16(priv, STM32_GTIM_CCER_OFFSET, ccer); - + /* Set the Input Capture Prescaler value: Capture performed each time an * edge is detected on the capture input. */ @@ -896,7 +896,7 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) stm32_shutdown(lower); return ret; } - + /* Enable the update/global interrupt at the NVIC */ up_enable_irq(priv->config->irq); @@ -908,7 +908,7 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) cr1 = stm32_getreg16(priv, STM32_GTIM_CR1_OFFSET); cr1 &= ~GTIM_CR1_UDIS; stm32_putreg16(priv, STM32_GTIM_CR1_OFFSET, cr1); - + /* Reset the URS Bit */ cr1 &= ~GTIM_CR1_URS; @@ -949,7 +949,7 @@ static int stm32_setup(FAR struct qe_lowerhalf_s *lower) * Description: * This method is called when the driver is closed. The lower half driver * should stop data collection, free any resources, disable timer hardware, and - * put the system into the lowest possible power usage state * + * put the system into the lowest possible power usage state * * ************************************************************************************/ @@ -964,9 +964,9 @@ static int stm32_shutdown(FAR struct qe_lowerhalf_s *lower) /* Disable the update/global interrupt at the NVIC */ - flags = irqsave(); + flags = irqsave(); up_disable_irq(priv->config->irq); - + /* Detach the interrupt handler */ (void)irq_detach(priv->config->irq); diff --git a/nuttx/arch/arm/src/stm32/stm32_rtcounter.c b/nuttx/arch/arm/src/stm32/stm32_rtcounter.c index 0238582e4..5ffb1a313 100644 --- a/nuttx/arch/arm/src/stm32/stm32_rtcounter.c +++ b/nuttx/arch/arm/src/stm32/stm32_rtcounter.c @@ -41,16 +41,16 @@ /* The STM32 RTC Driver offers standard precision of 1 Hz or High Resolution * operating at rate up to 16384 Hz. It provides UTC time and alarm interface * with external output pin (for wake-up). - * - * RTC is based on hardware RTC module which is located in a separate power - * domain. The 32-bit counter is extended by 16-bit registers in BKP domain + * + * RTC is based on hardware RTC module which is located in a separate power + * domain. The 32-bit counter is extended by 16-bit registers in BKP domain * STM32_BKP_DR1 to provide system equiv. function to the: time_t time(time_t *). - * - * Notation: + * + * Notation: * - clock refers to 32-bit hardware counter * - time is a combination of clock and upper bits stored in backuped domain * with unit of 1 [s] - * + * * TODO: Error Handling in case LSE fails during start-up or during operation. */ @@ -164,7 +164,7 @@ static alarmcb_t g_alarmcb; * Public Data ************************************************************************************/ -/* Variable determines the state of the LSE oscilator. +/* Variable determines the state of the LSE oscilator. * Possible errors: * - on start-up * - during operation, reported by LSE interrupt @@ -267,7 +267,7 @@ static void up_rtc_breakout(FAR const struct timespec *tp, uint64_t frac; uint32_t cnt; uint16_t ovf; - + /* Break up the time in seconds + milleconds into the correct values for our use */ frac = ((uint64_t)tp->tv_nsec * CONFIG_RTC_FREQUENCY) / 1000000000; @@ -331,8 +331,8 @@ static int stm32_rtc_interrupt(int irq, void *context) #endif /* Clear pending flags, leave RSF high */ - - putreg16(RTC_CRL_RSF, STM32_RTC_CRL); + + putreg16(RTC_CRL_RSF, STM32_RTC_CRL); return 0; } #endif @@ -365,8 +365,8 @@ int up_rtcinitialize(void) stm32_pwr_enablebkp(); stm32_rcc_enablelse(); - - /* TODO: Get state from this function, if everything is + + /* TODO: Get state from this function, if everything is * okay and whether it is already enabled (if it was disabled * reset upper time register) */ @@ -541,7 +541,7 @@ int up_rtc_gettime(FAR struct timespec *tp) ls = (uint32_t)cnth << 16 | (uint32_t)cntl; ms = (uint32_t)ovf << 16 | (uint32_t)cnth; - + /* Then we can save the time in seconds and fractional seconds. */ tp->tv_sec = (ms << (32-RTC_CLOCKS_SHIFT-16)) | (ls >> (RTC_CLOCKS_SHIFT+16)); @@ -623,11 +623,11 @@ int up_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) g_alarmcb = callback; /* Break out the time values */ - + up_rtc_breakout(tp, ®vals); /* Enable RTC alarm */ - + cr = getreg16(STM32_RTC_CRH); cr |= RTC_CRH_ALRIE; putreg16(cr, STM32_RTC_CRH); @@ -651,7 +651,7 @@ int up_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) * Name: up_rtc_cancelalarm * * Description: - * Cancel a pending alarm alarm + * Cancel a pending alarm alarm * * Input Parameters: * none @@ -682,7 +682,7 @@ int up_rtc_cancelalarm(void) stm32_rtc_endwr(); irqrestore(flags); - ret = OK; + ret = OK; } return ret; } diff --git a/nuttx/arch/arm/src/stm32/stm32_sdio.h b/nuttx/arch/arm/src/stm32/stm32_sdio.h index ceeb56f0d..61046dad0 100644 --- a/nuttx/arch/arm/src/stm32/stm32_sdio.h +++ b/nuttx/arch/arm/src/stm32/stm32_sdio.h @@ -88,7 +88,7 @@ EXTERN FAR struct sdio_dev_s *sdio_initialize(int slotno); * * Input Parameters: * dev - An instance of the SDIO driver device state structure. - * cardinslot - true is a card has been detected in the slot; false if a + * cardinslot - true is a card has been detected in the slot; false if a * card has been removed from the slot. Only transitions * (inserted->removed or removed->inserted should be reported) * diff --git a/nuttx/arch/arm/src/stm32/stm32_spi.h b/nuttx/arch/arm/src/stm32/stm32_spi.h index 62f304dfb..2ee090958 100644 --- a/nuttx/arch/arm/src/stm32/stm32_spi.h +++ b/nuttx/arch/arm/src/stm32/stm32_spi.h @@ -88,13 +88,13 @@ enum spi_dev_e; * board-specific logic. These functions will perform chip selection and * status operations using GPIOs in the way your board is configured. * 3. If CONFIG_SPI_CMDDATA is defined in your NuttX configuration file, then - * provide stm32_spi1/2/...cmddata() functions in your board-specific logic. + * provide stm32_spi1/2/...cmddata() functions in your board-specific logic. * These functions will perform cmd/data selection operations using GPIOs in the * way your board is configured. * 4. Add a calls to up_spiinitialize() in your low level application * initialization logic * 5. 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/arch/arm/src/stm32/stm32_userspace.c b/nuttx/arch/arm/src/stm32/stm32_userspace.c index c51e9e725..b68705dce 100644 --- a/nuttx/arch/arm/src/stm32/stm32_userspace.c +++ b/nuttx/arch/arm/src/stm32/stm32_userspace.c @@ -98,7 +98,7 @@ void stm32_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/arm/src/stm32/stm32_waste.h b/nuttx/arch/arm/src/stm32/stm32_waste.h index fa734f432..6906c7aa4 100644 --- a/nuttx/arch/arm/src/stm32/stm32_waste.h +++ b/nuttx/arch/arm/src/stm32/stm32_waste.h @@ -57,7 +57,7 @@ extern "C" { ****************************************************************************/ /** Waste CPU Time - * + * * up_waste() is the logic that will be executed when portions of kernel * or user-app is polling some register or similar, waiting for desired * status. This time is wasted away. This function offers a measure of diff --git a/nuttx/arch/arm/src/stm32/stm32_wwdg.c b/nuttx/arch/arm/src/stm32/stm32_wwdg.c index dc6967215..2b4f54868 100644 --- a/nuttx/arch/arm/src/stm32/stm32_wwdg.c +++ b/nuttx/arch/arm/src/stm32/stm32_wwdg.c @@ -456,7 +456,7 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower, { status->flags |= WDFLAGS_ACTIVE; } - + if (priv->handler) { status->flags |= WDFLAGS_CAPTURE; @@ -595,7 +595,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, wdvdbg("wdgtb=%d fwwdg=%d reload=%d timout=%d\n", wdgtb, fwwdg, reload, priv->timeout); - + /* Set WDGTB[1:0] bits according to calculated value */ regval = stm32_getreg(STM32_WWDG_CFR); @@ -662,7 +662,7 @@ static xcpt_t stm32_capture(FAR struct watchdog_lowerhalf_s *lower, regval |= WWDG_CFR_EWI; stm32_putreg(regval, STM32_WWDG_CFR); - + up_enable_irq(STM32_IRQ_WWDG); } else @@ -716,7 +716,7 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, if (cmd == WDIOC_MINTIME) { uint32_t mintime = (uint32_t)arg; - + /* The minimum time should be strictly less than the total delay * which, in turn, will be less than or equal to WWDG_CR_T_MAX */ diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c index 4c74fa912..46e847e54 100644 --- a/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c +++ b/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c @@ -86,7 +86,7 @@ static inline void rcc_reset(void) regval = getreg32(STM32_RCC_CR); regval &= ~(RCC_CR_HSEON|RCC_CR_CSSON|RCC_CR_PLLON); putreg32(regval, STM32_RCC_CR); - + /* Reset PLLCFGR register to reset default */ putreg32(RCC_PLLCFG_RESET, STM32_RCC_PLLCFG); @@ -586,7 +586,7 @@ static inline void rcc_enableapb2(void) * * Description: * Called to change to new clock based on settings in board.h - * + * * NOTE: This logic would need to be extended if you need to select low- * power clocking modes! ****************************************************************************/ @@ -598,7 +598,7 @@ static void stm32_stdclockconfig(void) volatile int32_t timeout; /* Enable External High-Speed Clock (HSE) */ - + regval = getreg32(STM32_RCC_CR); regval |= RCC_CR_HSEON; /* Enable HSE */ putreg32(regval, STM32_RCC_CR); @@ -642,7 +642,7 @@ static void stm32_stdclockconfig(void) putreg32(regval, STM32_PWR_CR); /* Set the HCLK source/divider */ - + regval = getreg32(STM32_RCC_CFGR); regval &= ~RCC_CFGR_HPRE_MASK; regval |= STM32_RCC_CFGR_HPRE; @@ -654,7 +654,7 @@ static void stm32_stdclockconfig(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); @@ -673,13 +673,13 @@ static void stm32_stdclockconfig(void) 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) { } - + #if defined(CONFIG_STM32_STM32F429) /* Enable the Over-drive to extend the clock frequency to 180 Mhz */ @@ -716,7 +716,7 @@ static void stm32_stdclockconfig(void) putreg32(regval, STM32_RCC_CFGR); /* Wait until the PLL source is used as the system clock source */ - + while ((getreg32(STM32_RCC_CFGR) & RCC_CFGR_SWS_MASK) != RCC_CFGR_SWS_PLL) { } diff --git a/nuttx/arch/arm/src/str71x/Make.defs b/nuttx/arch/arm/src/str71x/Make.defs index 5da6fd5b7..1978c2dff 100644 --- a/nuttx/arch/arm/src/str71x/Make.defs +++ b/nuttx/arch/arm/src/str71x/Make.defs @@ -56,7 +56,7 @@ ifeq ($(CONFIG_DEBUG_STACK),y) CMN_CSRCS += up_checkstack.c endif -CHIP_ASRCS = +CHIP_ASRCS = CHIP_CSRCS = str71x_prccu.c str71x_lowputc.c str71x_decodeirq.c str71x_irq.c \ str71x_timerisr.c str71x_serial.c diff --git a/nuttx/arch/arm/src/str71x/str71x_head.S b/nuttx/arch/arm/src/str71x/str71x_head.S index d5b40de3d..098d238ff 100644 --- a/nuttx/arch/arm/src/str71x/str71x_head.S +++ b/nuttx/arch/arm/src/str71x/str71x_head.S @@ -265,7 +265,7 @@ * * IRQs and FIQs are disabled * IVR set to zero - * All channels are disabled + * All channels are disabled * Channels set to priority 0 * All SIR[n] registers contain the NuttX IRQ number in the MS 16-bits * diff --git a/nuttx/arch/arm/src/str71x/str71x_lowputc.c b/nuttx/arch/arm/src/str71x/str71x_lowputc.c index fde33adb4..6473e60be 100644 --- a/nuttx/arch/arm/src/str71x/str71x_lowputc.c +++ b/nuttx/arch/arm/src/str71x/str71x_lowputc.c @@ -295,7 +295,7 @@ void up_lowsetup(void) #endif /* Configure GPIO0 pins to enable all UARTs in the configuration - * (the serial driver later depends on this configuration) + * (the serial driver later depends on this configuration) */ #if HAVE_UART diff --git a/nuttx/arch/arm/src/str71x/str71x_serial.c b/nuttx/arch/arm/src/str71x/str71x_serial.c index 2f4e56ff0..a3351eb5f 100644 --- a/nuttx/arch/arm/src/str71x/str71x_serial.c +++ b/nuttx/arch/arm/src/str71x/str71x_serial.c @@ -925,7 +925,7 @@ static bool up_txempty(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/arch/arm/src/str71x/str71x_xti.c b/nuttx/arch/arm/src/str71x/str71x_xti.c index 3ef0a803d..118b0448b 100644 --- a/nuttx/arch/arm/src/str71x/str71x_xti.c +++ b/nuttx/arch/arm/src/str71x/str71x_xti.c @@ -205,9 +205,9 @@ int str71x_xticonfig(int irq, bool rising) /* Make sure that the interrupt is disabled */ str71x_disable_xtiirq(irq); - + /* Decide if we use the lower or upper regiser */ - + bit = irq - STR71X_IRQ_FIRSTXTI; ndx = 0; if (bit > 7) @@ -257,7 +257,7 @@ void str71x_enable_xtiirq(int irq) if (irq >= STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) { /* Decide if we use the lower or upper regiser */ - + bit = irq - STR71X_IRQ_FIRSTXTI; ndx = 0; if (bit > 7) @@ -297,7 +297,7 @@ void str71x_disable_xtiirq(int irq) if (irq >= STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) { /* Decide if we use the lower or upper regiser */ - + bit = irq - STR71X_IRQ_FIRSTXTI; ndx = 0; if (bit > 7) diff --git a/nuttx/arch/arm/src/tiva/chip/lm3s_memorymap.h b/nuttx/arch/arm/src/tiva/chip/lm3s_memorymap.h index b70b3a8aa..36dee7215 100644 --- a/nuttx/arch/arm/src/tiva/chip/lm3s_memorymap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm3s_memorymap.h @@ -47,7 +47,7 @@ ************************************************************************************/ /* Memory map ***********************************************************************/ - + #if defined(CONFIG_ARCH_CHIP_LM3S6918) || defined(CONFIG_ARCH_CHIP_LM3S6432) || \ defined(CONFIG_ARCH_CHIP_LM3S6965) || defined(CONFIG_ARCH_CHIP_LM3S8962) # define TIVA_FLASH_BASE 0x00000000 /* -0x0003ffff: On-chip FLASH */ @@ -272,7 +272,7 @@ # define TIVA_FLASHCON_BASE (TIVA_PERIPH_BASE + 0xfd000) /* -0xfdfff: FLASH Control */ # define TIVA_SYSCON_BASE (TIVA_PERIPH_BASE + 0xfe000) /* -0xfefff: System Control */ /* -0x1ffffff: Reserved */ -#elif defined(CONFIG_ARCH_CHIP_LM3S9B96) +#elif defined(CONFIG_ARCH_CHIP_LM3S9B96) /* FiRM Peripheral Base Addresses */ # define TIVA_WDOG_BASE (TIVA_PERIPH_BASE + 0x00000) /* -0x00fff: Watchdog Timer */ diff --git a/nuttx/arch/arm/src/tiva/chip/lm3s_pinmap.h b/nuttx/arch/arm/src/tiva/chip/lm3s_pinmap.h index 8c8da05ba..6f170ad19 100644 --- a/nuttx/arch/arm/src/tiva/chip/lm3s_pinmap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm3s_pinmap.h @@ -169,7 +169,7 @@ # define GPIO_ETHPHY_LED0 (GPIO_FUNC_PFOUTPUT | GPIO_PORTF | 3) /* PF3: LED0 */ # define GPIO_UART2_RX (GPIO_FUNC_PFINPUT | GPIO_PORTG | 0) /* PA0: UART 0 receive (UGRx) */ # define GPIO_UART2_TX (GPIO_FUNC_PFOUTPUT | GPIO_PORTG | 1) /* PA1: UART 0 transmit (UGTx) */ -#elif defined(CONFIG_ARCH_CHIP_LM3S9B96) +#elif defined(CONFIG_ARCH_CHIP_LM3S9B96) # define GPIO_UART0_RX (GPIO_FUNC_PFINPUT | GPIO_PORTA | 0) /* PA0: UART 0 receive (U0Rx) */ # define GPIO_UART0_TX (GPIO_FUNC_PFOUTPUT | GPIO_PORTA | 1) /* PA1: UART 0 transmit (U0Tx) */ # define GPIO_SSI0_CLK (GPIO_FUNC_PFIO | GPIO_PORTA | 2) /* PA2: SSI0 clock (SSI0Clk) */ diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c index 6afd0a2f9..070236827 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c @@ -71,7 +71,7 @@ #ifdef CONFIG_TIVA_ETHHDUPLEX # define TIVA_DUPLEX_SETBITS 0 # define TIVA_DUPLEX_CLRBITS MAC_TCTL_DUPLEX -#else +#else # define TIVA_DUPLEX_SETBITS MAC_TCTL_DUPLEX # define TIVA_DUPLEX_CLRBITS 0 #endif @@ -81,7 +81,7 @@ #ifdef CONFIG_TIVA_ETHNOAUTOCRC # define TIVA_CRC_SETBITS 0 # define TIVA_CRC_CLRBITS MAC_TCTL_CRC -#else +#else # define TIVA_CRC_SETBITS MAC_TCTL_CRC # define TIVA_CRC_CLRBITS 0 #endif @@ -91,7 +91,7 @@ #ifdef CONFIG_TIVA_ETHNOPAD # define TIVA_PADEN_SETBITS 0 # define TIVA_PADEN_CLRBITS MAC_TCTL_PADEN -#else +#else # define TIVA_PADEN_SETBITS MAC_TCTL_PADEN # define TIVA_PADEN_CLRBITS 0 #endif @@ -104,7 +104,7 @@ #ifdef CONFIG_TIVA_MULTICAST # define TIVA_AMUL_SETBITS MAC_RCTL_AMUL # define TIVA_AMUL_CLRBITS 0 -#else +#else # define TIVA_AMUL_SETBITS 0 # define TIVA_AMUL_CLRBITS MAC_RCTL_AMUL #endif @@ -114,7 +114,7 @@ #ifdef CONFIG_TIVA_PROMISCUOUS # define TIVA_PRMS_SETBITS MAC_RCTL_PRMS # define TIVA_PRMS_CLRBITS 0 -#else +#else # define TIVA_PRMS_SETBITS 0 # define TIVA_PRMS_CLRBITS MAC_RCTL_PRMS #endif @@ -124,7 +124,7 @@ #ifdef CONFIG_TIVA_BADCRC # define TIVA_BADCRC_SETBITS MAC_RCTL_BADCRC # define TIVA_BADCRC_CLRBITS 0 -#else +#else # define TIVA_BADCRC_SETBITS 0 # define TIVA_BADCRC_CLRBITS MAC_RCTL_BADCRC #endif @@ -921,7 +921,7 @@ static int tiva_interrupt(int irq, FAR void *context) tiva_txdone(priv); } - /* Enable Ethernet interrupts (perhaps excluding the TX done interrupt if + /* Enable Ethernet interrupts (perhaps excluding the TX done interrupt if * there are no pending transmissions). */ @@ -1012,7 +1012,7 @@ static void tiva_polltimer(int argc, uint32_t arg, ...) * * Description: * NuttX Callback: Bring up the Ethernet interface when an IP address is - * provided + * provided * * Parameters: * dev - Reference to the NuttX driver state structure @@ -1055,7 +1055,7 @@ static int tiva_ifup(struct uip_driver_s *dev) tiva_ethout(priv, TIVA_MAC_MDV_OFFSET, div); nllvdbg("MDV: %08x\n", div); - /* Then configure the Ethernet Controller for normal operation + /* Then configure the Ethernet Controller for normal operation * * Setup the transmit control register (Full duplex, TX CRC Auto Generation, * TX Padding Enabled). @@ -1250,7 +1250,7 @@ static int tiva_ifdown(struct uip_driver_s *dev) * Function: tiva_txavail * * Description: - * Driver callback invoked when new TX data is available. This is a + * Driver callback invoked when new TX data is available. This is a * stimulus perform an out-of-cycle poll and, thereby, reduce the TX * latency. * @@ -1301,7 +1301,7 @@ static int tiva_txavail(struct uip_driver_s *dev) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be added + * mac - The MAC address to be added * * Returned Value: * None @@ -1331,7 +1331,7 @@ static int tiva_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be removed + * mac - The MAC address to be removed * * Returned Value: * None @@ -1416,7 +1416,7 @@ static inline int tiva_ethinitialize(int intf) /* If the board can provide us with a MAC address, get the address * from the board now. The MAC will not be applied until tiva_ifup() - * is caleld (and the MAC can be overwritten with a netdev ioctl call). + * is caleld (and the MAC can be overwritten with a netdev ioctl call). */ #ifdef CONFIG_TIVA_BOARDMAC diff --git a/nuttx/arch/arm/src/tiva/tiva_gpio.c b/nuttx/arch/arm/src/tiva/tiva_gpio.c index 335142ae9..e61d9f1b1 100644 --- a/nuttx/arch/arm/src/tiva/tiva_gpio.c +++ b/nuttx/arch/arm/src/tiva/tiva_gpio.c @@ -903,7 +903,7 @@ void tiva_gpiowrite(uint32_t pinset, bool value) * * "In order to write to GPIO DATA, the corresponding bits in the mask, * resulting from the address bus bits [9:2], must be High. Otherwise, the - * bit values remain unchanged by the write. + * bit values remain unchanged by the write. * * "... All bits are cleared by a reset." */ diff --git a/nuttx/arch/arm/src/tiva/tiva_serial.c b/nuttx/arch/arm/src/tiva/tiva_serial.c index 81b50f05e..c14edfad0 100644 --- a/nuttx/arch/arm/src/tiva/tiva_serial.c +++ b/nuttx/arch/arm/src/tiva/tiva_serial.c @@ -1250,7 +1250,7 @@ static bool up_txempty(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/arch/arm/src/tiva/tiva_ssi.c b/nuttx/arch/arm/src/tiva/tiva_ssi.c index d77a2edd6..8f1c0c79d 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ssi.c +++ b/nuttx/arch/arm/src/tiva/tiva_ssi.c @@ -735,7 +735,7 @@ static inline void ssi_performrx(struct tiva_ssidev_s *priv) { /* There are no more outgoing words to send, but there are * additional incoming words expected (I would think that this - * a real corner case, be we will handle it with an extra + * a real corner case, be we will handle it with an extra * interrupt, probably an Rx timeout). */ @@ -1092,7 +1092,7 @@ static uint32_t ssi_setfrequencyinternal(struct tiva_ssidev_s *priv, * (FSysClk). The clock is first divided by an even prescale value * CPSDVSR from 2 to 254, which is programmed in the SSI Clock Prescale * (SSI_CPSR) register ... The clock is further divided by a value - * from 1 to 256, which is 1 + SCR, where SCR is the value programmed + * from 1 to 256, which is 1 + SCR, where SCR is the value programmed * i n the SSI Control0 (SSICR0) register ... * * "The frequency of the output clock SSIClk is defined by: @@ -1462,7 +1462,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) uint8_t regval; ssidbg("port: %d\n", port); - + /* Set up for the selected port */ flags = irqsave(); diff --git a/nuttx/arch/arm/src/tiva/tiva_ssi.h b/nuttx/arch/arm/src/tiva/tiva_ssi.h index 7f8f87bb7..cac0f6cdc 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ssi.h +++ b/nuttx/arch/arm/src/tiva/tiva_ssi.h @@ -92,7 +92,7 @@ extern "C" * 4. Add a call to up_spiinitialize() in your low level application * initialization logic * 5. 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/arch/arm/src/tiva/tiva_userspace.c b/nuttx/arch/arm/src/tiva/tiva_userspace.c index 973fe44d8..e2b278024 100644 --- a/nuttx/arch/arm/src/tiva/tiva_userspace.c +++ b/nuttx/arch/arm/src/tiva/tiva_userspace.c @@ -98,7 +98,7 @@ void tiva_userspace(void) /* Initialize all of user-space .data */ DEBUGASSERT(USERSPACE->us_datasource != 0 && - USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && + USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 && USERSPACE->us_datastart <= USERSPACE->us_dataend); src = (uint8_t*)USERSPACE->us_datasource; diff --git a/nuttx/arch/avr/include/at32uc3/irq.h b/nuttx/arch/avr/include/at32uc3/irq.h index 00802ebab..64861001e 100644 --- a/nuttx/arch/avr/include/at32uc3/irq.h +++ b/nuttx/arch/avr/include/at32uc3/irq.h @@ -63,7 +63,7 @@ # undef CONFIG_AVR32_GPIOIRQSETA # undef CONFIG_AVR32_GPIOIRQSETB #endif - + /* IRQ numbers **************************************************************/ /* Events. These exclude: * @@ -287,7 +287,7 @@ #if (CONFIG_AVR32_GPIOIRQSETA & 0x00000001) != 0 # define AVR32_IRQ_GPIO_PA0 __IRQ_GPPIO_PA0 # define __IRQ_GPIO_PA1 (__IRQ_GPPIO_PA0+1) -#else +#else # define __IRQ_GPIO_PA1 __IRQ_GPPIO_PA0 #endif diff --git a/nuttx/arch/avr/include/avr/irq.h b/nuttx/arch/avr/include/avr/irq.h index 9a84d1aa7..c237ded68 100644 --- a/nuttx/arch/avr/include/avr/irq.h +++ b/nuttx/arch/avr/include/avr/irq.h @@ -168,7 +168,7 @@ static inline irqstate_t irqsave(void) ( "\tin %0, __SREG__\n" "\tcli\n" - : "=&r" (sreg) :: + : "=&r" (sreg) :: ); return sreg; } diff --git a/nuttx/arch/avr/include/avr32/irq.h b/nuttx/arch/avr/include/avr32/irq.h index 09ee0296a..13326f0b7 100644 --- a/nuttx/arch/avr/include/avr32/irq.h +++ b/nuttx/arch/avr/include/avr32/irq.h @@ -66,7 +66,7 @@ * this makes it easier to following the ordering of pushing on a push-down * stack. */ - + #define REG_R8 16 #define REG_R9 15 #define REG_R10 14 diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c b/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c index a0e39e19d..2a2996740 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c @@ -151,13 +151,13 @@ int at32uc3_configgpio(uint16_t cfgset) if ((cfgset & GPIO_ENABLE) != 0) { /* Its a GPIO. Input or output? */ - + if ((cfgset & GPIO_OUTPUT) != 0) { /* Its a GPIO output. Set up the initial output value and enable * the output driver. */ - + if ((cfgset & GPIO_VALUE) != 0) { putreg32(pinmask, base + AVR32_GPIO_OVRS_OFFSET); @@ -222,7 +222,7 @@ int at32uc3_configgpio(uint16_t cfgset) putreg32(pinmask, base + AVR32_GPIO_IERS_OFFSET); } - + return OK; } diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c index c55ba3d13..d0442babc 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c @@ -177,7 +177,7 @@ static inline int gpio_pin(unsigned int irq) pinset >>= 1; } - + return -EINVAL; } @@ -309,7 +309,7 @@ void gpio_irqinitialize(void) } /* Then attach the GPIO interrupt handlers */ - + #if CONFIG_AVR32_GPIOIRQSETA != 0 irq_attach(AVR32_IRQ_GPIO0, gpio0_interrupt); #endif diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_lowconsole.c b/nuttx/arch/avr/src/at32uc3/at32uc3_lowconsole.c index 509d389af..d58558852 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_lowconsole.c +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_lowconsole.c @@ -164,7 +164,7 @@ static void usart_setbaudrate(uintptr_t usart_base, uint32_t baudrate) mr &= ~USART_MR_SYNC; mr |= USART_MR_OVER; - + /* Calculate the clock divider assuming 16x oversampling */ cd = (AVR32_PBA_CLOCK + (baudrate << 2)) / (baudrate << 3); @@ -177,7 +177,7 @@ static void usart_setbaudrate(uintptr_t usart_base, uint32_t baudrate) /* Use the undivided PBA clock */ - cd = AVR32_PBA_CLOCK / baudrate; + cd = AVR32_PBA_CLOCK / baudrate; } DEBUGASSERT(cd > 0 && cd < 65536); @@ -202,7 +202,7 @@ static void usart_setbaudrate(uintptr_t usart_base, uint32_t baudrate) void usart_reset(uintptr_t usart_base) { irqstate_t flags; - + /* Disable all USART interrupts */ flags = irqsave(); @@ -275,7 +275,7 @@ void usart_configure(uintptr_t usart_base, uint32_t baud, unsigned int parity, { regval |= USART_MR_CHRL_BITS(nbits); } - + usart_putreg(usart_base, AVR32_USART_MR_OFFSET, regval); /* Set the baud rate generation register */ diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_tc.h b/nuttx/arch/avr/src/at32uc3/at32uc3_tc.h index 821b35b33..f3773c161 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_tc.h +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_tc.h @@ -355,7 +355,7 @@ # define TC_BMR_TC2XC2S_NONE (1 << TC_BMR_TC2XC2S_SHIFT) /* None */ # define TC_BMR_TC2XC2S_TIOA0 (2 << TC_BMR_TC2XC2S_SHIFT) /* TIOA0 */ # define TC_BMR_TC2XC2S_TIOA1 (3 << TC_BMR_TC2XC2S_SHIFT) /* TIOA1 */ - + /************************************************************************************ * Public Types ************************************************************************************/ diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c b/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c index 711cef3c9..361fb8ec2 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c @@ -121,7 +121,7 @@ * Therefore, the TOP interrupt should occur after 143+1=144 counts * at a rate of 69.57us x 144 = 10.02 ms */ - + #ifdef AVR32_CLOCK_OSC32 # define AV32_PSEL 1 # define AV32_TOP (82-1) @@ -168,7 +168,7 @@ static void rtc_waitnotbusy(void) int up_timerisr(int irq, uint32_t *regs) { /* Clear the pending timer interrupt */ - + putreg32(RTC_INT_TOPI, AVR32_RTC_ICR); /* Process timer interrupt */ @@ -228,7 +228,7 @@ void up_timerinit(void) /* Enable RTC interrupts */ putreg32(RTC_INT_TOPI, AVR32_RTC_IER); - + /* Enable the RTC */ rtc_waitnotbusy(); diff --git a/nuttx/arch/avr/src/at90usb/at90usb_head.S b/nuttx/arch/avr/src/at90usb/at90usb_head.S index 1e705ba71..6d850b7f2 100755 --- a/nuttx/arch/avr/src/at90usb/at90usb_head.S +++ b/nuttx/arch/avr/src/at90usb/at90usb_head.S @@ -227,7 +227,7 @@ __do_copy_data: .Lcopyloop: lpm r0, Z+ st X+, r0 - + .Lcopystart: cpi r26, lo8(_edata) cpc r27, r17 @@ -246,7 +246,7 @@ __do_clear_bss: .Lclearloop: st X+, r1 - + .Lclearstart: cpi r26, lo8(_ebss) cpc r27, r17 diff --git a/nuttx/arch/avr/src/at90usb/at90usb_lowconsole.c b/nuttx/arch/avr/src/at90usb/at90usb_lowconsole.c index 64fd50fe1..b45f119d9 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_lowconsole.c +++ b/nuttx/arch/avr/src/at90usb/at90usb_lowconsole.c @@ -77,7 +77,7 @@ * AVR_NORMAL_UBRR1 = 52 (rounded), actual baud = 9615 * AVR_DBLSPEED_UBRR1 = 104 (rounded), actual baud = 9615 */ - + #undef UART1_DOUBLE_SPEED #if BOARD_CPU_CLOCK <= 4000000 # if CONFIG_USART1_BAUD <= 9600 @@ -194,7 +194,7 @@ void usart1_configure(void) ucsr1b = ((1 << TXEN1) | (1 << RXEN1)); ucsr1c = 0; - + /* Select parity */ #if CONFIG_USART1_PARITY == 1 diff --git a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c index 5f8964f6c..89de8b8ca 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c +++ b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c @@ -50,7 +50,7 @@ **************************************************************************/ #if defined(CONFIG_WDTO_15MS) -# define WDTO_VALUE WDTO_15MS +# define WDTO_VALUE WDTO_15MS #elif defined(CONFIG_WDTO_30MS) # define WDTO_VALUE WDTO_30MS #elif defined(CONFIG_WDTO_60MS) diff --git a/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c b/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c index a5fb64c36..57741250a 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c +++ b/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c @@ -624,7 +624,7 @@ static inline int avr_epNsend(FAR struct avr_ep_s *privep, } /* Send the USB data. The outer loop handles for each packet of data - * (including zero-length packets) + * (including zero-length packets) */ do @@ -1531,7 +1531,7 @@ static inline void avr_ep0setup(void) case USB_REQ_RECIPIENT_ENDPOINT: if (g_usbdev.paddrset != 0 && value == USB_FEATURE_ENDPOINTHALT && - len == 0 && + len == 0 && (privep = avr_epfindbyaddr(index)) != NULL) { avr_epstall(&privep->ep, false); @@ -1579,7 +1579,7 @@ static inline void avr_ep0setup(void) case USB_REQ_RECIPIENT_ENDPOINT: if (g_usbdev.paddrset != 0 && value == USB_FEATURE_ENDPOINTHALT && - len == 0 && + len == 0 && (privep = avr_epfindbyaddr(index)) != NULL) { avr_epstall(&privep->ep, true); @@ -2493,8 +2493,8 @@ static int avr_epcancel(FAR struct usbdev_ep_s *ep, usbtrace(TRACE_EPCANCEL, privep->ep.eplog); - /* FIXME: if the request is the first, then we need to flush the EP otherwise - * just remove it from the list but ... all other implementations cancel all + /* FIXME: if the request is the first, then we need to flush the EP otherwise + * just remove it from the list but ... all other implementations cancel all * requests ... */ flags = irqsave(); @@ -2716,7 +2716,7 @@ static int avr_wakeup(struct usbdev_s *dev) * Name: avr_selfpowered * * Description: - * Sets/clears the device selfpowered feature + * Sets/clears the device selfpowered feature * *******************************************************************************/ @@ -2949,7 +2949,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) * * Description: * Sample VBUS to see if there are changes in our connection status. There - * is actually an interrupt to signal this case so it should not be necessary + * is actually an interrupt to signal this case so it should not be necessary * to poll our connection status. However, on certain "noisy" systems, VBUS * may bounce and provide inaccurate information in the interrupt handler * (especially if a relay is used to switch VBUS!). This poll is, then, diff --git a/nuttx/arch/avr/src/atmega/Make.defs b/nuttx/arch/avr/src/atmega/Make.defs index a7d3a881b..826d372a1 100644 --- a/nuttx/arch/avr/src/atmega/Make.defs +++ b/nuttx/arch/avr/src/atmega/Make.defs @@ -74,7 +74,7 @@ CHIP_CSRCS = atmega_lowconsole.c atmega_lowinit.c atmega_serial.c atmega_timeris # Configuration-dependent ATMEGA files ifeq ($(CONFIG_AVR_GPIOIRQ),y) -CHIP_CSRCS += +CHIP_CSRCS += endif diff --git a/nuttx/arch/avr/src/atmega/atmega_head.S b/nuttx/arch/avr/src/atmega/atmega_head.S index dc35cd879..b272e54c3 100755 --- a/nuttx/arch/avr/src/atmega/atmega_head.S +++ b/nuttx/arch/avr/src/atmega/atmega_head.S @@ -240,7 +240,7 @@ __do_clear_bss: .Lclearloop: st X+, r1 - + .Lclearstart: cpi r26, lo8(_ebss) cpc r27, r17 diff --git a/nuttx/arch/avr/src/atmega/atmega_lowconsole.c b/nuttx/arch/avr/src/atmega/atmega_lowconsole.c index ccf56dc33..ba3255741 100644 --- a/nuttx/arch/avr/src/atmega/atmega_lowconsole.c +++ b/nuttx/arch/avr/src/atmega/atmega_lowconsole.c @@ -76,7 +76,7 @@ * AVR_NORMAL_UBRR1 = 52 (rounded), actual baud = 9615 * AVR_DBLSPEED_UBRR1 = 104 (rounded), actual baud = 9615 */ - + #undef UART0_DOUBLE_SPEED #if BOARD_CPU_CLOCK <= 4000000 # if CONFIG_USART0_BAUD <= 9600 @@ -136,7 +136,7 @@ * AVR_NORMAL_UBRR1 = 52 (rounded), actual baud = 9615 * AVR_DBLSPEED_UBRR1 = 104 (rounded), actual baud = 9615 */ - + #undef UART1_DOUBLE_SPEED #if BOARD_CPU_CLOCK <= 4000000 # if CONFIG_USART1_BAUD <= 9600 @@ -275,7 +275,7 @@ void usart0_configure(void) ucsr0b = ((1 << TXEN0) | (1 << RXEN0)); ucsr0c = 0; - + /* Select parity */ #if CONFIG_USART0_PARITY == 1 @@ -352,7 +352,7 @@ void usart1_configure(void) ucsr1b = ((1 << TXEN1) | (1 << RXEN1)); ucsr1c = 0; - + /* Select parity */ #if CONFIG_USART1_PARITY == 1 diff --git a/nuttx/arch/avr/src/atmega/atmega_lowinit.c b/nuttx/arch/avr/src/atmega/atmega_lowinit.c index 075a6413a..1ac5661f6 100644 --- a/nuttx/arch/avr/src/atmega/atmega_lowinit.c +++ b/nuttx/arch/avr/src/atmega/atmega_lowinit.c @@ -50,7 +50,7 @@ **************************************************************************/ #if defined(CONFIG_WDTO_15MS) -# define WDTO_VALUE WDTO_15MS +# define WDTO_VALUE WDTO_15MS #elif defined(CONFIG_WDTO_30MS) # define WDTO_VALUE WDTO_30MS #elif defined(CONFIG_WDTO_60MS) diff --git a/nuttx/arch/avr/src/avr/avr_internal.h b/nuttx/arch/avr/src/avr/avr_internal.h index 8fb3fae28..f74d682e5 100644 --- a/nuttx/arch/avr/src/avr/avr_internal.h +++ b/nuttx/arch/avr/src/avr/avr_internal.h @@ -54,7 +54,7 @@ ****************************************************************************/ /* Macros to handle saving and restore interrupt state. The state is copied - * from the stack to the TCB, but only a referenced is passed to get the + * from the stack to the TCB, but only a referenced is passed to get the * state from the TCB. */ @@ -142,7 +142,7 @@ uint8_t *up_doirq(uint8_t irq, uint8_t *regs); * 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 LPC17xx logic. To use * this common SPI logic on your board: * diff --git a/nuttx/arch/avr/src/avr/excptmacros.h b/nuttx/arch/avr/src/avr/excptmacros.h index 730f02acc..c46e0024a 100644 --- a/nuttx/arch/avr/src/avr/excptmacros.h +++ b/nuttx/arch/avr/src/avr/excptmacros.h @@ -92,7 +92,7 @@ * * Description: * This macro provides the exception entry logic. It is called with the PC already on the - * stack. It simply saves one register on the stack (r24) and passes the IRQ number to + * stack. It simply saves one register on the stack (r24) and passes the IRQ number to * common logic (see EXCPT_PROLOGUE). * * On Entry: @@ -437,7 +437,7 @@ out _SFR_IO_ADDR(SPH), r25 /* (SPH then SPL) */ ld r24, x+ out _SFR_IO_ADDR(SPL), r24 - + /* Fetch the return address and save it at the bottom of the new stack so * that we can iret to switch contexts. The new stack is now: * diff --git a/nuttx/arch/avr/src/avr/up_blocktask.c b/nuttx/arch/avr/src/avr/up_blocktask.c index 82fcd65db..004bf6e44 100644 --- a/nuttx/arch/avr/src/avr/up_blocktask.c +++ b/nuttx/arch/avr/src/avr/up_blocktask.c @@ -130,7 +130,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/avr/src/avr/up_createstack.c b/nuttx/arch/avr/src/avr/up_createstack.c index 521213126..1dd7e5006 100644 --- a/nuttx/arch/avr/src/avr/up_createstack.c +++ b/nuttx/arch/avr/src/avr/up_createstack.c @@ -118,7 +118,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), diff --git a/nuttx/arch/avr/src/avr/up_releasepending.c b/nuttx/arch/avr/src/avr/up_releasepending.c index 0a63189fe..a3646f6f9 100644 --- a/nuttx/arch/avr/src/avr/up_releasepending.c +++ b/nuttx/arch/avr/src/avr/up_releasepending.c @@ -97,7 +97,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/avr/src/avr/up_reprioritizertr.c b/nuttx/arch/avr/src/avr/up_reprioritizertr.c index 4c510f4ea..773b0ede8 100644 --- a/nuttx/arch/avr/src/avr/up_reprioritizertr.c +++ b/nuttx/arch/avr/src/avr/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/avr/src/avr/up_spi.c b/nuttx/arch/avr/src/avr/up_spi.c index 8a243c2d9..78a4fa9ba 100644 --- a/nuttx/arch/avr/src/avr/up_spi.c +++ b/nuttx/arch/avr/src/avr/up_spi.c @@ -140,7 +140,7 @@ static const struct spi_ops_s g_spiops = static struct avr_spidev_s g_spidev = { .spidev = { &g_spiops }, -}; +}; /**************************************************************************** * Public Data @@ -319,19 +319,19 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) { case SPIDEV_MODE0: /* CPOL=0; CPHA=0 */ break; - + case SPIDEV_MODE1: /* CPOL=0; CPHA=1 */ regval |= (1 << CPHA); break; - + case SPIDEV_MODE2: /* CPOL=1; CPHA=0 */ regval |= (1 << CPOL); break; - + case SPIDEV_MODE3: /* CPOL=1; CPHA=1 */ regval |= ((1 << CPOL) | (1 << CPHA)); break; - + default: DEBUGASSERT(FALSE); return; diff --git a/nuttx/arch/avr/src/avr/up_unblocktask.c b/nuttx/arch/avr/src/avr/up_unblocktask.c index 970deedd6..305e057a8 100644 --- a/nuttx/arch/avr/src/avr/up_unblocktask.c +++ b/nuttx/arch/avr/src/avr/up_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/avr/src/avr32/Toolchain.defs b/nuttx/arch/avr/src/avr32/Toolchain.defs index 9c3bed04c..51fe4fbba 100644 --- a/nuttx/arch/avr/src/avr32/Toolchain.defs +++ b/nuttx/arch/avr/src/avr32/Toolchain.defs @@ -44,7 +44,7 @@ # that we are operating on a Windows platform. But in the case where we # have an AVR32 toolchain built under Cygwin, the correct setting would be # GNU, not AVRTOOLSW. -# +# CROSSDEV = avr32- ARCHCPUFLAGS = -mpart=uc3b0256 diff --git a/nuttx/arch/avr/src/avr32/avr32_internal.h b/nuttx/arch/avr/src/avr32/avr32_internal.h index 906cffc78..c98f0b5cc 100644 --- a/nuttx/arch/avr/src/avr32/avr32_internal.h +++ b/nuttx/arch/avr/src/avr32/avr32_internal.h @@ -52,7 +52,7 @@ ****************************************************************************/ /* Macros to handle saving and restore interrupt state. The state is copied - * from the stack to the TCB, but only a referenced is passed to get the + * from the stack to the TCB, but only a referenced is passed to get the * state from the TCB. */ diff --git a/nuttx/arch/avr/src/avr32/up_blocktask.c b/nuttx/arch/avr/src/avr32/up_blocktask.c index 1da4eb573..955d3b1d2 100644 --- a/nuttx/arch/avr/src/avr32/up_blocktask.c +++ b/nuttx/arch/avr/src/avr32/up_blocktask.c @@ -130,7 +130,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/avr/src/avr32/up_createstack.c b/nuttx/arch/avr/src/avr32/up_createstack.c index f9968d555..fd1af6782 100644 --- a/nuttx/arch/avr/src/avr32/up_createstack.c +++ b/nuttx/arch/avr/src/avr32/up_createstack.c @@ -117,7 +117,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), diff --git a/nuttx/arch/avr/src/avr32/up_exceptions.S b/nuttx/arch/avr/src/avr32/up_exceptions.S index 53a5b9c4f..b4d399cdb 100755 --- a/nuttx/arch/avr/src/avr32/up_exceptions.S +++ b/nuttx/arch/avr/src/avr32/up_exceptions.S @@ -179,7 +179,7 @@ avr32_intcommon: /* On entry to each, the context save area looks like this: */ /* xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx SR PC */ /* ^ ^+2*4 */ - + HANDLER avr32_unrec, AVR32_IRQ_UNREC /* Unrecoverable xcptn */ HANDLER avr32_tlbmult, AVR32_IRQ_TLBMULT /* TLB multiple hit */ HANDLER avr32_busdata, AVR32_IRQ_BUSDATA /* Bus error data fetch */ @@ -240,7 +240,7 @@ avr32_xcptcommon: /* Save r8 and r8: */ /* xx xx xx xx xx xx xx xx xx SR PC LI 12 11 10 SR PC */ /* ^ ^+6*4 ^+8*4 */ - + st.w sp[6*4], r9 st.w sp[7*4], r8 diff --git a/nuttx/arch/avr/src/avr32/up_initialstate.c b/nuttx/arch/avr/src/avr32/up_initialstate.c index adfc95596..86138b616 100644 --- a/nuttx/arch/avr/src/avr32/up_initialstate.c +++ b/nuttx/arch/avr/src/avr32/up_initialstate.c @@ -91,7 +91,7 @@ void up_initial_state(struct tcb_s *tcb) /* No pending signal delivery */ xcp->sigdeliver = NULL; - + /* Clear the frame pointer and link register since this is the outermost * frame. */ diff --git a/nuttx/arch/avr/src/avr32/up_releasepending.c b/nuttx/arch/avr/src/avr32/up_releasepending.c index 00956e442..e144ca904 100644 --- a/nuttx/arch/avr/src/avr32/up_releasepending.c +++ b/nuttx/arch/avr/src/avr32/up_releasepending.c @@ -97,7 +97,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/avr/src/avr32/up_reprioritizertr.c b/nuttx/arch/avr/src/avr32/up_reprioritizertr.c index 621f08613..07ee9c6a4 100644 --- a/nuttx/arch/avr/src/avr32/up_reprioritizertr.c +++ b/nuttx/arch/avr/src/avr32/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/avr/src/avr32/up_stackframe.c b/nuttx/arch/avr/src/avr32/up_stackframe.c index a38370801..e53eee5ae 100644 --- a/nuttx/arch/avr/src/avr32/up_stackframe.c +++ b/nuttx/arch/avr/src/avr32/up_stackframe.c @@ -53,7 +53,7 @@ * Pre-processor Macros ****************************************************************************/ -/* The AVR32 stack must be aligned at word (4 byte) boundaries. If necessary +/* The AVR32 stack must be aligned at word (4 byte) boundaries. If necessary * frame_size must be rounded up to the next boundary */ @@ -116,7 +116,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/avr/src/avr32/up_unblocktask.c b/nuttx/arch/avr/src/avr32/up_unblocktask.c index 1fcfa1dd7..42dc3d52a 100644 --- a/nuttx/arch/avr/src/avr32/up_unblocktask.c +++ b/nuttx/arch/avr/src/avr32/up_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/hc/src/common/up_blocktask.c b/nuttx/arch/hc/src/common/up_blocktask.c index 5a2986291..58dd3360c 100644 --- a/nuttx/arch/hc/src/common/up_blocktask.c +++ b/nuttx/arch/hc/src/common/up_blocktask.c @@ -130,7 +130,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -148,7 +148,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/hc/src/common/up_createstack.c b/nuttx/arch/hc/src/common/up_createstack.c index 3272fda13..aad1557fc 100644 --- a/nuttx/arch/hc/src/common/up_createstack.c +++ b/nuttx/arch/hc/src/common/up_createstack.c @@ -114,7 +114,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), diff --git a/nuttx/arch/hc/src/common/up_releasepending.c b/nuttx/arch/hc/src/common/up_releasepending.c index b8da18d60..7a55254e7 100644 --- a/nuttx/arch/hc/src/common/up_releasepending.c +++ b/nuttx/arch/hc/src/common/up_releasepending.c @@ -96,7 +96,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -110,13 +110,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if up_saveusercontext returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/hc/src/common/up_reprioritizertr.c b/nuttx/arch/hc/src/common/up_reprioritizertr.c index d9689a0f3..ee8ed4e3c 100644 --- a/nuttx/arch/hc/src/common/up_reprioritizertr.c +++ b/nuttx/arch/hc/src/common/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -171,7 +171,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/hc/src/common/up_stackframe.c b/nuttx/arch/hc/src/common/up_stackframe.c index bc3f996b2..4ced22c4a 100644 --- a/nuttx/arch/hc/src/common/up_stackframe.c +++ b/nuttx/arch/hc/src/common/up_stackframe.c @@ -116,7 +116,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/hc/src/common/up_unblocktask.c b/nuttx/arch/hc/src/common/up_unblocktask.c index de787418a..08cefc1d4 100644 --- a/nuttx/arch/hc/src/common/up_unblocktask.c +++ b/nuttx/arch/hc/src/common/up_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -132,7 +132,7 @@ void up_unblock_task(struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_saveusercontext returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/hc/src/m9s12/Make.defs b/nuttx/arch/hc/src/m9s12/Make.defs index 0f70c42ab..7ca06b436 100644 --- a/nuttx/arch/hc/src/m9s12/Make.defs +++ b/nuttx/arch/hc/src/m9s12/Make.defs @@ -35,7 +35,7 @@ HEAD_ASRC = m9s12_vectors.S -CMN_ASRCS = +CMN_ASRCS = CMN_CSRCS = up_allocateheap.c up_blocktask.c up_copystate.c up_createstack.c \ up_doirq.c up_exit.c up_idle.c up_initialize.c up_interruptcontext.c \ up_mdelay.c up_modifyreg16.c up_modifyreg32.c up_modifyreg8.c \ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_assert.c b/nuttx/arch/hc/src/m9s12/m9s12_assert.c index b977f8822..7834d9800 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_assert.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_assert.c @@ -63,7 +63,7 @@ # undef CONFIG_ARCH_USBDUMP #endif -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c b/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c index c43d4439e..b958092b8 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c @@ -143,7 +143,7 @@ static const struct gpio_mebiinfo_s mebiinfo[HCS12_MEBI_NPORTS] = {HCS12_MEBI_PORTE, HCS12_MEBI_DDRE, 'E', MEBIPORT_E}, /* Port E */ {HCS12_MEBI_PORTK, HCS12_MEBI_DDRK, 'K', MEBIPORT_K} /* Port K */ }; - + /**************************************************************************** * Private Data ****************************************************************************/ @@ -223,7 +223,7 @@ static inline void hcs12_mebidump(uint8_t portndx) lldbg(" Illegal MEBI port index: %d\n", portndx); return; } - + ptr = &mebiinfo[portndx]; lldbg(" MEBI Port%c:\n", ptr->name); diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index d380f7757..b01bc1284 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -440,7 +440,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...) * * Description: * NuttX Callback: Bring up the Ethernet interface when an IP address is - * provided + * provided * * Parameters: * dev - Reference to the NuttX driver state structure @@ -520,7 +520,7 @@ static int emac_ifdown(struct uip_driver_s *dev) * Function: emac_txavail * * Description: - * Driver callback invoked when new TX data is available. This is a + * Driver callback invoked when new TX data is available. This is a * stimulus perform an out-of-cycle poll and, thereby, reduce the TX * latency. * @@ -570,7 +570,7 @@ static int emac_txavail(struct uip_driver_s *dev) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be added + * mac - The MAC address to be added * * Returned Value: * None @@ -599,7 +599,7 @@ static int emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be removed + * mac - The MAC address to be removed * * Returned Value: * None diff --git a/nuttx/arch/hc/src/m9s12/m9s12_gpio.c b/nuttx/arch/hc/src/m9s12/m9s12_gpio.c index 280202da5..464169ed7 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_gpio.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_gpio.c @@ -286,7 +286,7 @@ static inline void pim_interrupt(uint8_t portndx, unsigned pin, uint8_t type) { gpio_writebit(HCS12_PIM_PORT_IE(portndx), pin, false); } -} +} /**************************************************************************** * Name: pim_configgpio @@ -308,7 +308,7 @@ static inline void pim_configgpio(uint16_t cfgset, uint8_t portndx, uint8_t pin) if ((cfgset & GPIO_INT_ENABLE) != 0) { /* Yes.. then it must not be tagged as an output */ - + ASSERT((cfgset & GPIO_DIRECTION) != GPIO_OUTPUT); /* If the pull-driver is also enabled, it must be enabled with a diff --git a/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c b/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c index 017292a26..02b8146c0 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c @@ -164,7 +164,7 @@ static int hcs12_interrupt(uint16_t base, int irq0, uint8_t valid, void *context */ putreg8(bit, base+HCS12_PIM_IF_OFFSET); - + /* Re-deliver the IRQ (recurses! We got here from irq_dispatch!) */ irq_dispatch(irq, context); diff --git a/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c b/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c index 3259cbb9a..678b26c90 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_initialstate.c @@ -115,7 +115,7 @@ void up_initial_state(struct tcb_s *tcb) # ifdef CONFIG_SUPPRESS_INTERRUPTS /* Disable STOP, Mask I- and Z- interrupts */ - xcp->regs[REG_CCR] = HCS12_CCR_S|HCS12_CCR_X|HCS12_CCR_I; + xcp->regs[REG_CCR] = HCS12_CCR_S|HCS12_CCR_X|HCS12_CCR_I; # else /* Disable STOP, Enable I- and Z-interrupts */ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_internal.h b/nuttx/arch/hc/src/m9s12/m9s12_internal.h index 9076e490d..104dfd362 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_internal.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_internal.h @@ -163,7 +163,7 @@ * Ports A, B, E, and K reside in the MEBI block * Ports T,S,G,H,J, and L reside in the PIM block. */ - + #define GPIO_PORT_SHIFT 3 #define GPIO_PORT_MASK (15 << GPIO_PORT_SHIFT) # define GPIO_PORT_A (0 << GPIO_PORT_SHIFT) @@ -341,7 +341,7 @@ EXTERN int hcs12_ethinitialize(int intf); * 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/arch/hc/src/m9s12/m9s12_irq.c b/nuttx/arch/hc/src/m9s12/m9s12_irq.c index 56e357a2e..ad859dc51 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_irq.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_irq.c @@ -87,7 +87,7 @@ void up_irqinitialize(void) /* Initialize logic to support a second level of interrupt decoding for * GPIO pins. */ - + #ifdef CONFIG_GPIO_IRQ hcs12_gpioirqinitialize(); #endif diff --git a/nuttx/arch/hc/src/m9s12/m9s12_mebi.h b/nuttx/arch/hc/src/m9s12/m9s12_mebi.h index f7426a3e5..99bd23510 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_mebi.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_mebi.h @@ -99,7 +99,7 @@ /* Port K Data Register Bit-Field Definitions */ /* Data Direction Register K Bit-Field Definitions */ -#define MEBI_PIN(n) (1 << (n)) +#define MEBI_PIN(n) (1 << (n)) #define MEBI_PIN0 (1 << 0) #define MEBI_PIN1 (1 << 1) #define MEBI_PIN2 (1 << 2) diff --git a/nuttx/arch/hc/src/m9s12/m9s12_serial.c b/nuttx/arch/hc/src/m9s12/m9s12_serial.c index bb61d7dbc..b83659f3f 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_serial.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_serial.c @@ -250,7 +250,7 @@ static inline void up_serialout(struct up_dev_s *priv, int offset, uint8_t value static inline void up_setsciint(struct up_dev_s *priv) { uint8_t regval; - + regval = up_serialin(priv, HCS12_SCI_CR2_OFFSET); regval &= ~SCI_CR2_ALLINTS; regval |= priv->im; @@ -264,7 +264,7 @@ static inline void up_setsciint(struct up_dev_s *priv) static inline void up_disablesciint(struct up_dev_s *priv, uint8_t *im) { uint8_t regval; - + /* Return the current interrupt mask value */ if (im) @@ -348,7 +348,7 @@ static int up_setup(struct uart_dev_s *dev) up_serialout(priv, HCS12_SCI_BDH_OFFSET, (uint8_t)(tmp >> 8)); up_serialout(priv, HCS12_SCI_BDL_OFFSET, (uint8_t)(tmp & 0xff)); - + /* Set up the SCICR1 register */ cr1 = 0; @@ -422,7 +422,7 @@ static int up_attach(struct uart_dev_s *dev) if (ret == OK) { /* Enable the Rx interrupt (the TX interrupt is still disabled - * until we have something to send). + * until we have something to send). */ priv->im = SCI_CR2_RIE; @@ -567,7 +567,7 @@ static int up_receive(struct uart_dev_s *dev, uint32_t *status) /* Return the error indications */ *status = (uint32_t)(priv->sr1 & ~SCI_CR2_ALLINTS); - + /* Get the Rx data */ rxd = (int)up_serialin(priv, HCS12_SCI_DRL_OFFSET); diff --git a/nuttx/arch/hc/src/m9s12/m9s12_serial.h b/nuttx/arch/hc/src/m9s12/m9s12_serial.h index f38377982..0c5f70041 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_serial.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_serial.h @@ -77,7 +77,7 @@ #ifndef CONFIG_SCI0_DISABLE # ifndef CONFIG_SCI0_PARITY # warning "CONFIG_SCI0_PARITY not defined -- Assuming none" -# define CONFIG_SCI0_PARITY 0 +# define CONFIG_SCI0_PARITY 0 # elif CONFIG_SCI0_PARITY != 0 && CONFIG_SCI0_PARITY != 2 && CONFIG_SCI0_PARITY != 2 # error "CONFIG_SCI0_PARITY value not recognized" # endif @@ -95,7 +95,7 @@ #ifndef CONFIG_SCI1_DISABLE # ifndef CONFIG_SCI1_PARITY # warning "CONFIG_SCI1_PARITY not defined -- Assuming none" -# define CONFIG_SCI1_PARITY 0 +# define CONFIG_SCI1_PARITY 0 # elif CONFIG_SCI1_PARITY != 0 && CONFIG_SCI1_PARITY != 2 && CONFIG_SCI1_PARITY != 2 # error "CONFIG_SCI1_PARITY value not recognized" # endif diff --git a/nuttx/arch/hc/src/m9s12/m9s12_spi.h b/nuttx/arch/hc/src/m9s12/m9s12_spi.h index 931e0efcf..b3d6f3cef 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_spi.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_spi.h @@ -52,7 +52,7 @@ #define HCS12_SPI_CR1_OFFSET 0x00 /* SPI Control Register 1 */ #define HCS12_SPI_CR2_OFFSET 0x01 /* SPI Control Register 2 */ #define HCS12_SPI_BR_OFFSET 0x02 /* SPI Baud Rate Register */ -#define HCS12_SPI_SR_OFFSET 0x03 /* SPI Status Register */ +#define HCS12_SPI_SR_OFFSET 0x03 /* SPI Status Register */ #define HCS12_SPI_DR_OFFSET 0x05 /* SPI Data Register */ /* Register Addresses ***************************************************************/ @@ -90,7 +90,7 @@ #define SPI_BR_SPPR_SHIFT (4) /* Bits 4-6: SPI Baud Rate Preselection */ #define SPI_BR_SPPR_MASK (7 << SPI_BR_SPPR_SHIFT) -/* SPI Status Register Bit-Field Definitions */ +/* SPI Status Register Bit-Field Definitions */ #define SPI_SR_MODF (1 << 4) /* Bit 4: Mode Fault */ #define SPI_SR_SPTEF (1 << 5) /* Bit 5: SPI Transmit Empty Interrupt */ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_start.S b/nuttx/arch/hc/src/m9s12/m9s12_start.S index c79388030..890786270 100755 --- a/nuttx/arch/hc/src/m9s12/m9s12_start.S +++ b/nuttx/arch/hc/src/m9s12/m9s12_start.S @@ -96,7 +96,7 @@ * * The MC9S12NE64 has 64K bytes of FLASH EEPROM and 8K bytes of RAM. */ - + .macro MMCINIT /* Registers are always positioned at address 0x0000 */ @@ -126,7 +126,7 @@ * already been configured at 24 MHz */ - .macro PLLINIT + .macro PLLINIT #ifndef CONFIG_HCS12_SERIALMON /* Select the clock source from crystal */ @@ -137,7 +137,7 @@ bclr *HCS12_CRG_PLLCTL #CRG_PLLCTL_PLLON ldab #HCS12_SYNR_VALUE stab HCS12_CRG_SYNR - ldab #HCS12_REFDV_VALUE + ldab #HCS12_REFDV_VALUE stab HCS12_CRG_REFDV bset *HCS12_CRG_PLLCTL #CRG_PLLCTL_PLLON diff --git a/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c b/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c index dcefa1dc6..46733da01 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c @@ -75,7 +75,7 @@ #define MIN_PRER 1024 /* 2**10, B=1 */ #define MAX_PRER 65536 /* 2**16, B=7 */ - + #define MIN_MODCNT 1 /* A=0 */ #define MAX_MODCNT 16 /* A=15 */ diff --git a/nuttx/arch/hc/src/m9s12/m9s12_vectors.S b/nuttx/arch/hc/src/m9s12/m9s12_vectors.S index 4b10ed62a..d7d929b65 100755 --- a/nuttx/arch/hc/src/m9s12/m9s12_vectors.S +++ b/nuttx/arch/hc/src/m9s12/m9s12_vectors.S @@ -80,7 +80,7 @@ * PCH * High Address PCL <-- SP before interrupt */ - + .macro HANDLER, label, irqno \label: ldab #\irqno /* Load B=IRQ number */ @@ -293,7 +293,7 @@ vcommon: #endif /* Save the PPAGE register */ - + #ifndef CONFIG_HCS12_NONBANKED movb HCS12_MMC_PPAGE, 1, -sp #endif @@ -318,7 +318,7 @@ vcommon: bne up_fullcontextrestore /* Restore registers and return */ - + /* Restore the PPAGE register */ #ifndef CONFIG_HCS12_NONBANKED diff --git a/nuttx/arch/mips/include/mips32/irq.h b/nuttx/arch/mips/include/mips32/irq.h index 8a3a71352..d42dbcfd2 100644 --- a/nuttx/arch/mips/include/mips32/irq.h +++ b/nuttx/arch/mips/include/mips32/irq.h @@ -430,7 +430,7 @@ static inline void cp0_putstatus(irqstate_t status) "\tnop\n" "\tnop\n" /* Plus one for good measure */ "\t.set pop\n" - : + : : "r" (status) : "memory" ); @@ -490,7 +490,7 @@ static inline void cp0_putcause(uint32_t cause) "\t.set noreorder\n" "\tmtc0 %0, $13, 0\n" /* Set the cause to the provided value */ "\t.set pop\n" - : + : : "r" (cause) : "memory" ); diff --git a/nuttx/arch/mips/include/mips32/registers.h b/nuttx/arch/mips/include/mips32/registers.h index 70279cb6f..659cd3397 100644 --- a/nuttx/arch/mips/include/mips32/registers.h +++ b/nuttx/arch/mips/include/mips32/registers.h @@ -83,7 +83,7 @@ #define t9 $25 /* Static registers: Registers that must be saved and restored if used */ - + #define s0 $16 #define s1 $17 #define s2 $18 diff --git a/nuttx/arch/mips/include/mips32/syscall.h b/nuttx/arch/mips/include/mips32/syscall.h index 349fba9bd..bf2a7847f 100644 --- a/nuttx/arch/mips/include/mips32/syscall.h +++ b/nuttx/arch/mips/include/mips32/syscall.h @@ -62,7 +62,7 @@ * a SYS call in kernel mode. The first four syscall values must, therefore, be * reserved (0 is not used). */ - + #ifdef CONFIG_NUTTX_KERNEL # ifndef CONFIG_SYS_RESERVED # error "CONFIG_SYS_RESERVED must be defined to the value 4" diff --git a/nuttx/arch/mips/include/pic32mx/irq.h b/nuttx/arch/mips/include/pic32mx/irq.h index 91fde196d..7c9da7099 100644 --- a/nuttx/arch/mips/include/pic32mx/irq.h +++ b/nuttx/arch/mips/include/pic32mx/irq.h @@ -123,7 +123,7 @@ static inline void cp0_putintctl(uint32_t intctl) "\t.set noreorder\n" "\tmtc0 %0, $12, 1\n" /* Set the IntCtl to the provided value */ "\t.set pop\n" - : + : : "r" (intctl) : "memory" ); @@ -183,7 +183,7 @@ static inline void cp0_putebase(uint32_t ebase) "\t.set noreorder\n" "\tmtc0 %0, $15, 1\n" /* Set the EBASE to the provided value */ "\t.set pop\n" - : + : : "r" (ebase) : "memory" ); diff --git a/nuttx/arch/mips/src/common/up_createstack.c b/nuttx/arch/mips/src/common/up_createstack.c index 7961ef3d9..506ece44d 100644 --- a/nuttx/arch/mips/src/common/up_createstack.c +++ b/nuttx/arch/mips/src/common/up_createstack.c @@ -55,7 +55,7 @@ * Pre-processor Macros ****************************************************************************/ -/* MIPS requires at least a 4-byte stack alignment. For floating point use, +/* MIPS requires at least a 4-byte stack alignment. For floating point use, * however, the stack must be aligned to 8-byte addresses. */ @@ -135,7 +135,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), @@ -202,7 +202,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) /* The MIPS stack must be aligned at word (4 byte) boundaries; for * floating point use, the stack must be aligned to 8-byte addresses. * If necessary top_of_stack must be rounded down to the next - * boundary to meet these alignment requirements. + * boundary to meet these alignment requirements. */ top_of_stack = STACK_ALIGN_DOWN(top_of_stack); diff --git a/nuttx/arch/mips/src/common/up_stackframe.c b/nuttx/arch/mips/src/common/up_stackframe.c index 8f0fa66cd..87f13bc42 100644 --- a/nuttx/arch/mips/src/common/up_stackframe.c +++ b/nuttx/arch/mips/src/common/up_stackframe.c @@ -51,7 +51,7 @@ /**************************************************************************** * Pre-processor Macros ****************************************************************************/ -/* MIPS requires at least a 4-byte stack alignment. For floating point use, +/* MIPS requires at least a 4-byte stack alignment. For floating point use, * however, the stack must be aligned to 8-byte addresses. */ @@ -118,7 +118,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/mips/src/common/up_usestack.c b/nuttx/arch/mips/src/common/up_usestack.c index 934ac8ed1..89cff7ff9 100644 --- a/nuttx/arch/mips/src/common/up_usestack.c +++ b/nuttx/arch/mips/src/common/up_usestack.c @@ -53,7 +53,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* MIPS requires at least a 4-byte stack alignment. For floating point use, +/* MIPS requires at least a 4-byte stack alignment. For floating point use, * however, the stack must be aligned to 8-byte addresses. */ diff --git a/nuttx/arch/mips/src/mips32/Toolchain.defs b/nuttx/arch/mips/src/mips32/Toolchain.defs index dc34b8c76..4f031f3e0 100644 --- a/nuttx/arch/mips/src/mips32/Toolchain.defs +++ b/nuttx/arch/mips/src/mips32/Toolchain.defs @@ -91,7 +91,7 @@ endif # Each toolchain definition should set: # # CROSSDEV The GNU toolchain triple (command prefix) -# ARCROSSDEV If required, an alternative prefix used when +# ARCROSSDEV If required, an alternative prefix used when # invoking ar and nm. # ARCHCPUFLAGS CPU-specific flags selecting the instruction set # FPU options, etc. diff --git a/nuttx/arch/mips/src/mips32/up_blocktask.c b/nuttx/arch/mips/src/mips32/up_blocktask.c index e0d1cf247..62c0c126e 100644 --- a/nuttx/arch/mips/src/mips32/up_blocktask.c +++ b/nuttx/arch/mips/src/mips32/up_blocktask.c @@ -131,7 +131,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_initialstate.c b/nuttx/arch/mips/src/mips32/up_initialstate.c index a4d204b30..ca981ffaf 100644 --- a/nuttx/arch/mips/src/mips32/up_initialstate.c +++ b/nuttx/arch/mips/src/mips32/up_initialstate.c @@ -100,7 +100,7 @@ void up_initial_state(struct tcb_s *tcb) /* Save the task entry point */ xcp->regs[REG_EPC] = (uint32_t)tcb->start; - + /* If this task is running PIC, then set the PIC base register to the * address of the allocated D-Space region. */ diff --git a/nuttx/arch/mips/src/mips32/up_releasepending.c b/nuttx/arch/mips/src/mips32/up_releasepending.c index 7999bffeb..1c2ac638d 100644 --- a/nuttx/arch/mips/src/mips32/up_releasepending.c +++ b/nuttx/arch/mips/src/mips32/up_releasepending.c @@ -99,7 +99,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_reprioritizertr.c b/nuttx/arch/mips/src/mips32/up_reprioritizertr.c index a8f0158b9..71a082fd8 100644 --- a/nuttx/arch/mips/src/mips32/up_reprioritizertr.c +++ b/nuttx/arch/mips/src/mips32/up_reprioritizertr.c @@ -71,7 +71,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -154,7 +154,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_swint0.c b/nuttx/arch/mips/src/mips32/up_swint0.c index 34a8a1dde..0f9bde459 100644 --- a/nuttx/arch/mips/src/mips32/up_swint0.c +++ b/nuttx/arch/mips/src/mips32/up_swint0.c @@ -310,7 +310,7 @@ int up_swint0(int irq, FAR void *context) #endif /* Clear the pending software interrupt 0 in the PIC32 interrupt block */ - + up_clrpend_irq(PIC32MX_IRQSRC_CS0); /* And reset the software interrupt bit in the MIPS CAUSE register */ diff --git a/nuttx/arch/mips/src/mips32/up_unblocktask.c b/nuttx/arch/mips/src/mips32/up_unblocktask.c index 99cd25052..277ec79cf 100644 --- a/nuttx/arch/mips/src/mips32/up_unblocktask.c +++ b/nuttx/arch/mips/src/mips32/up_unblocktask.c @@ -111,7 +111,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -122,7 +122,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/mips/src/mips32/up_vfork.c b/nuttx/arch/mips/src/mips32/up_vfork.c index 82b097a26..af76c0779 100644 --- a/nuttx/arch/mips/src/mips32/up_vfork.c +++ b/nuttx/arch/mips/src/mips32/up_vfork.c @@ -77,7 +77,7 @@ * any data other than a variable of type pid_t used to store the return * value from vfork(), or returns from the function in which vfork() was * called, or calls any other function before successfully calling _exit() - * or one of the exec family of functions. + * or one of the exec family of functions. * * The overall sequence is: * @@ -107,7 +107,7 @@ * Upon successful completion, vfork() returns 0 to the child process and * returns the process ID of the child process to the parent process. * Otherwise, -1 is returned to the parent, no child process is created, - * and errno is set to indicate the error. + * and errno is set to indicate the error. * ****************************************************************************/ @@ -185,7 +185,7 @@ pid_t up_vfork(const struct vfork_s *context) DEBUGASSERT((uint32_t)parent->adj_stack_ptr > context->sp); stackutil = (uint32_t)parent->adj_stack_ptr - context->sp; - svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil); + svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil); /* Make some feeble effort to perserve the stack contents. This is * feeble because the stack surely contains invalid pointers and other diff --git a/nuttx/arch/mips/src/mips32/up_vfork.h b/nuttx/arch/mips/src/mips32/up_vfork.h index 556633072..079a744c8 100644 --- a/nuttx/arch/mips/src/mips32/up_vfork.h +++ b/nuttx/arch/mips/src/mips32/up_vfork.h @@ -72,7 +72,7 @@ * then this is the frame pointer. * r31 ra Return address. */ - + #define VFORK_S0_OFFSET (0*4) /* Saved register s0 */ #define VFORK_S1_OFFSET (1*4) /* Saved register s1 */ #define VFORK_S2_OFFSET (2*4) /* Saved register s2 */ diff --git a/nuttx/arch/mips/src/mips32/vfork.S b/nuttx/arch/mips/src/mips32/vfork.S index 2b7d180d3..8aba77326 100644 --- a/nuttx/arch/mips/src/mips32/vfork.S +++ b/nuttx/arch/mips/src/mips32/vfork.S @@ -64,7 +64,7 @@ * undefined if the process created by vfork() either modifies any data other than * a variable of type pid_t used to store the return value from vfork(), or returns * from the function in which vfork() was called, or calls any other function before - * successfully calling _exit() or one of the exec family of functions. + * successfully calling _exit() or one of the exec family of functions. * * This thin layer implements vfork by simply calling up_vfork() with the vfork() * context as an argument. The overall sequence is: @@ -93,7 +93,7 @@ * Upon successful completion, vfork() returns 0 to the child process and returns * the process ID of the child process to the parent process. Otherwise, -1 is * returned to the parent, no child process is created, and errno is set to - * indicate the error. + * indicate the error. * ************************************************************************************/ diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h index d64caf5fb..058b02f68 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h @@ -806,7 +806,7 @@ #undef CONFIG_PIC32MX_FCKSM #if defined(BOARD_POSC_SWITCH) -# if defined(BOARD_POSC_FSCM) +# if defined(BOARD_POSC_FSCM) # define CONFIG_PIC32MX_FCKSM DEVCFG1_FCKSM_BOTH # else # define CONFIG_PIC32MX_FCKSM DEVCFG1_FCKSM_CSONLY diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index 81ace7b9b..fedf20b04 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -651,7 +651,7 @@ static void pic32mx_dumprxdesc(struct pic32mx_rxdesc_s *rxdesc, const char *msg) * Initialize the buffers by placing them all in a free list * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None @@ -670,7 +670,7 @@ static inline void pic32mx_bufferinit(struct pic32mx_driver_s *priv) sq_addlast((sq_entry_t*)buffer, &priv->pd_freebuffers); /* Get the address of the next buffer */ - + buffer += PIC32MX_ALIGNED_BUFSIZE; } } @@ -682,7 +682,7 @@ static inline void pic32mx_bufferinit(struct pic32mx_driver_s *priv) * Allocate one buffer by removing it from the free list * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * Pointer to the allocated buffer (or NULL on failure) @@ -703,7 +703,7 @@ static uint8_t *pic32mx_allocbuffer(struct pic32mx_driver_s *priv) * Free one buffer by returning it to the free list * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * Pointer to the allocated buffer (or NULL on failure) @@ -724,7 +724,7 @@ static void pic32mx_freebuffer(struct pic32mx_driver_s *priv, uint8_t *buffer) * Initialize the EMAC Tx descriptor table * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None @@ -792,7 +792,7 @@ static inline void pic32mx_txdescinit(struct pic32mx_driver_s *priv) * Initialize the EMAC Rx descriptor table * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None @@ -885,7 +885,7 @@ static inline struct pic32mx_txdesc_s *pic32mx_txdesc(struct pic32mx_driver_s *p * done condition has been processed when the buffer has been freed and * reset to zero. */ - + if ((txdesc->status & TXDESC_STATUS_EOWN) == 0 && txdesc->address == 0) { /* Yes.. return a pointer to the descriptor */ @@ -1280,10 +1280,10 @@ static void pic32mx_timerpoll(struct pic32mx_driver_s *priv) * possibly a response to the incoming packet (but probably not, in reality). * However, since the Rx and Tx operations are decoupled, there is no * guarantee that there will be a Tx descriptor available at that time. - * This function will perform that check and, if no Tx descriptor is + * This function will perform that check and, if no Tx descriptor is * available, this function will (1) stop incoming Rx processing (bad), and * (2) hold the outgoing packet in a pending state until the next Tx - * interrupt occurs. + * interrupt occurs. * * Parameters: * priv - Reference to the driver state structure @@ -1314,7 +1314,7 @@ static void pic32mx_response(struct pic32mx_driver_s *priv) /* No.. mark the Tx as pending and halt further Rx interrupts */ DEBUGASSERT((priv->pd_inten & ETH_INT_TXDONE) != 0); - + priv->pd_txpending = true; priv->pd_inten &= ~ETH_RXINTS; pic32mx_putreg(priv->pd_inten, PIC32MX_ETH_IEN); @@ -1351,7 +1351,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) { /* Check if any RX descriptor has the EOWN bit cleared meaning that the * this descriptor is now under software control and a message was - * received. + * received. */ rxdesc = pic32mx_rxdesc(priv); @@ -1387,7 +1387,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) * be the same size as our max packet size, any fragments also * imply that the packet is too big. */ - + else if (priv->pd_dev.d_len > CONFIG_NET_BUFSIZE) { nlldbg("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); @@ -1408,7 +1408,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) uint8_t *rxbuffer; /* Get the Rx buffer address from the Rx descriptor */ - + priv->pd_dev.d_buf = (uint8_t*)VIRT_ADDR(rxdesc->address); DEBUGASSERT(priv->pd_dev.d_buf != NULL); @@ -1744,7 +1744,7 @@ static int pic32mx_interrupt(int irq, void *context) * has no effect. */ - /* FWMARK: Full Watermark Interrupt. This bit is set when the RX + /* FWMARK: Full Watermark Interrupt. This bit is set when the RX * escriptor Buffer Count is greater than or equal to the value in the * RXFWM bit (ETHRXWM:16-23) field. It is cleared by writing the BUFCDEC * (ETHCON1:0) bit to decrement the BUFCNT counter. Writing a ‘0’ or a @@ -1852,7 +1852,7 @@ static void pic32mx_polltimer(int argc, uint32_t arg, ...) * * Description: * NuttX Callback: Bring up the Ethernet interface when an IP address is - * provided + * provided * * Parameters: * dev - Reference to the NuttX driver state structure @@ -2197,7 +2197,7 @@ static int pic32mx_ifdown(struct uip_driver_s *dev) * Function: pic32mx_txavail * * Description: - * Driver callback invoked when new TX data is available. This is a + * Driver callback invoked when new TX data is available. This is a * stimulus perform an out-of-cycle poll and, thereby, reduce the TX * latency. * @@ -2252,7 +2252,7 @@ static int pic32mx_txavail(struct uip_driver_s *dev) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be added + * mac - The MAC address to be added * * Returned Value: * None @@ -2282,7 +2282,7 @@ static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be removed + * mac - The MAC address to be removed * * Returned Value: * None @@ -2364,7 +2364,7 @@ static void pic32mx_phybusywait(void) * Parameters: * phyaddr - The device address where the PHY was discovered * regaddr - The address of the PHY register to be written - * phydata - The data to write to the PHY register + * phydata - The data to write to the PHY register * * Returned Value: * None @@ -2630,7 +2630,7 @@ static int pic32mx_phymode(uint8_t phyaddr, uint8_t mode) * Initialize the PHY * * Parameters: - * priv - Pointer to EMAC device driver structure + * priv - Pointer to EMAC device driver structure * * Returned Value: * None directly. As a side-effect, it will initialize priv->pd_phyaddr @@ -2761,7 +2761,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv) } /* Are we configured to do auto-negotiation? - * + * * Preferably the auto-negotiation should be selected if the PHY supports * it. Expose the supported capabilities: Half/Full Duplex, 10BaseT/100Base * TX, etc. (Extended Register 4). Start the negotiation (Control Register @@ -2773,7 +2773,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv) #ifdef CONFIG_PHY_AUTONEG /* Setup the Auto-negotiation advertisement: 100 or 10, and HD or FD */ - pic32mx_phywrite(phyaddr, MII_ADVERTISE, + pic32mx_phywrite(phyaddr, MII_ADVERTISE, (MII_ADVERTISE_100BASETXFULL | MII_ADVERTISE_100BASETXHALF | MII_ADVERTISE_10BASETXFULL | MII_ADVERTISE_10BASETXHALF | MII_ADVERTISE_CSMA)); @@ -2944,7 +2944,7 @@ static void pic32mx_macmode(uint8_t mode) if ((mode & PIC32MX_DUPLEX_MASK) == PIC32MX_DUPLEX_FULL) { /* Set the back-to-back inter-packet gap */ - + pic32mx_putreg(21, PIC32MX_EMAC1_IPGT); /* Set MAC to operate in full duplex mode with CRC and Pad enabled */ @@ -2955,7 +2955,7 @@ static void pic32mx_macmode(uint8_t mode) else { /* Set the back-to-back inter-packet gap */ - + pic32mx_putreg(18, PIC32MX_EMAC1_IPGT); /* Set MAC to operate in half duplex mode with CRC and Pad enabled */ diff --git a/nuttx/arch/rgmp/include/arm/arch/subarch/arch.h b/nuttx/arch/rgmp/include/arm/arch/subarch/arch.h index 8b92c6bfe..e5f3fff10 100644 --- a/nuttx/arch/rgmp/include/arm/arch/subarch/arch.h +++ b/nuttx/arch/rgmp/include/arm/arch/subarch/arch.h @@ -45,12 +45,12 @@ static inline void up_mdelay(uint32_t msec) { - + } static inline void up_udelay(uint32_t usec) { - + } #endif /* !__ASSEMBLY__ */ diff --git a/nuttx/arch/rgmp/include/limits.h b/nuttx/arch/rgmp/include/limits.h index a4458e301..51a17a330 100644 --- a/nuttx/arch/rgmp/include/limits.h +++ b/nuttx/arch/rgmp/include/limits.h @@ -33,8 +33,8 @@ * ************************************************************/ -#ifndef __ARCH_RGMP_INCLUDE_LIMITS_H -#define __ARCH_RGMP_INCLUDE_LIMITS_H +#ifndef __ARCH_RGMP_INCLUDE_LIMITS_H +#define __ARCH_RGMP_INCLUDE_LIMITS_H /************************************************************ * Included Files diff --git a/nuttx/arch/rgmp/src/arm/Make.defs b/nuttx/arch/rgmp/src/arm/Make.defs index 8185980c6..e21b046e8 100644 --- a/nuttx/arch/rgmp/src/arm/Make.defs +++ b/nuttx/arch/rgmp/src/arm/Make.defs @@ -5,7 +5,7 @@ # Author: Yu Qiang <yuq825@gmail.com> # # This file is a part of NuttX: -# +# # Copyright (C) 2011 Gregory Nutt. All rights reserved. # # diff --git a/nuttx/arch/rgmp/src/arm/arch_nuttx.c b/nuttx/arch/rgmp/src/arm/arch_nuttx.c index e916c5520..93d4e447a 100644 --- a/nuttx/arch/rgmp/src/arm/arch_nuttx.c +++ b/nuttx/arch/rgmp/src/arm/arch_nuttx.c @@ -47,7 +47,7 @@ void nuttx_arch_init(void) { - + } void nuttx_arch_exit(void) diff --git a/nuttx/arch/rgmp/src/nuttx.c b/nuttx/arch/rgmp/src/nuttx.c index a154ea34a..e6fee5de1 100644 --- a/nuttx/arch/rgmp/src/nuttx.c +++ b/nuttx/arch/rgmp/src/nuttx.c @@ -176,7 +176,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = (frame_size + 3) & ~3; - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) { @@ -280,7 +280,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) } // If there are any pending tasks, then add them to the g_readytorun // task list now. It should be the up_realease_pending() called from - // sched_unlock() to do this for disable preemption. But it block + // sched_unlock() to do this for disable preemption. But it block // itself, so it's OK. if (g_pendingtasks.head) { warn("Disable preemption failed for task block itself\n"); @@ -328,7 +328,7 @@ void up_unblock_task(struct tcb_s *tcb) #if CONFIG_RR_INTERVAL > 0 tcb->timeslice = CONFIG_RR_INTERVAL / MSEC_PER_TICK; #endif - + // Add the task in the correct location in the prioritized // g_readytorun task list. if (sched_addreadytorun(tcb) && !up_interrupt_context()) { @@ -402,7 +402,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *nexttcb; // If there are any pending tasks, then add them to the g_readytorun // task list now. It should be the up_realease_pending() called from - // sched_unlock() to do this for disable preemption. But it block + // sched_unlock() to do this for disable preemption. But it block // itself, so it's OK. if (g_pendingtasks.head) { warn("Disable preemption failed for reprioritize task\n"); @@ -439,7 +439,7 @@ void up_assert(const uint8_t *filename, int line) { fprintf(stderr, "Assertion failed at file:%s line: %d\n", filename, line); - // in interrupt context or idle task means kernel error + // in interrupt context or idle task means kernel error // which will stop the OS // if in user space just terminate the task if (up_interrupt_context() || current_task->pid == 0) { @@ -523,7 +523,7 @@ int up_prioritize_irq(int irq, int priority) void up_sigdeliver(struct Trapframe *tf) { sig_deliver_t sigdeliver; - + pop_xcptcontext(¤t_task->xcp); sigdeliver = current_task->xcp.sigdeliver; current_task->xcp.sigdeliver = NULL; diff --git a/nuttx/arch/rgmp/src/rgmp.c b/nuttx/arch/rgmp/src/rgmp.c index e71782112..495c5e05c 100644 --- a/nuttx/arch/rgmp/src/rgmp.c +++ b/nuttx/arch/rgmp/src/rgmp.c @@ -88,7 +88,7 @@ void rtos_kfree(void *addr) /** * The interrupt can be nested. The pair of rtos_enter_interrupt() - * and rtos_exit_interrupt() make sure the context switch is + * and rtos_exit_interrupt() make sure the context switch is * performed only in the last IRQ exit. */ void rtos_enter_interrupt(void) diff --git a/nuttx/arch/rgmp/src/x86/Make.defs b/nuttx/arch/rgmp/src/x86/Make.defs index 5fb40006e..fcf3180d8 100644 --- a/nuttx/arch/rgmp/src/x86/Make.defs +++ b/nuttx/arch/rgmp/src/x86/Make.defs @@ -5,7 +5,7 @@ # Author: Yu Qiang <yuq825@gmail.com> # # This file is a part of NuttX: -# +# # Copyright (C) 2011 Gregory Nutt. All rights reserved. # # diff --git a/nuttx/arch/rgmp/src/x86/com.c b/nuttx/arch/rgmp/src/x86/com.c index 7983bb1bc..5a946db52 100644 --- a/nuttx/arch/rgmp/src/x86/com.c +++ b/nuttx/arch/rgmp/src/x86/com.c @@ -310,7 +310,7 @@ static int up_attach(struct uart_dev_s *dev) int err; err = rgmp_request_irq(priv->irq, &priv->action, 0); - + return err; } @@ -374,7 +374,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) struct inode *inode = filep->f_inode; struct uart_dev_s *dev = inode->i_private; struct up_dev_s *priv = (struct up_dev_s*)dev->priv; - + switch (cmd) { case COM_SET_BAUD: priv->baud = arg; @@ -546,7 +546,7 @@ static bool up_txempty(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. * @@ -554,7 +554,7 @@ static bool up_txempty(struct uart_dev_s *dev) void up_earlyserialinit(void) { - + } /**************************************************************************** diff --git a/nuttx/arch/sh/include/m16c/irq.h b/nuttx/arch/sh/include/m16c/irq.h index b134428a7..b24a62443 100644 --- a/nuttx/arch/sh/include/m16c/irq.h +++ b/nuttx/arch/sh/include/m16c/irq.h @@ -208,7 +208,7 @@ * - Save FLG register * - Clear I, D, and U flags in FLG register * - Builds stack frame like: - * + * * sp -> PC bits 0-7 * sp+1 -> PC bits 8-15 * sp+2 -> FLG bits 0-7 diff --git a/nuttx/arch/sh/include/m16c/types.h b/nuttx/arch/sh/include/m16c/types.h index bd23a9a5f..4c68391b0 100644 --- a/nuttx/arch/sh/include/m16c/types.h +++ b/nuttx/arch/sh/include/m16c/types.h @@ -62,7 +62,7 @@ * the user prefers to use the definitions provided by their toolchain header * files * - * int is 16-bits and long is 32-bits + * int is 16-bits and long is 32-bits */ typedef signed char _int8_t; diff --git a/nuttx/arch/sh/src/common/up_assert.c b/nuttx/arch/sh/src/common/up_assert.c index 1c4016665..77dfae286 100644 --- a/nuttx/arch/sh/src/common/up_assert.c +++ b/nuttx/arch/sh/src/common/up_assert.c @@ -63,7 +63,7 @@ # undef CONFIG_ARCH_USBDUMP #endif -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/sh/src/common/up_blocktask.c b/nuttx/arch/sh/src/common/up_blocktask.c index 9959e71df..81e1789fc 100644 --- a/nuttx/arch/sh/src/common/up_blocktask.c +++ b/nuttx/arch/sh/src/common/up_blocktask.c @@ -129,7 +129,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_copystate(rtcb->xcp.regs, current_regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -147,7 +147,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/sh/src/common/up_createstack.c b/nuttx/arch/sh/src/common/up_createstack.c index 280b5a6b9..4c2d36ae9 100644 --- a/nuttx/arch/sh/src/common/up_createstack.c +++ b/nuttx/arch/sh/src/common/up_createstack.c @@ -114,7 +114,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), diff --git a/nuttx/arch/sh/src/common/up_releasepending.c b/nuttx/arch/sh/src/common/up_releasepending.c index b3960972d..f1cde5075 100644 --- a/nuttx/arch/sh/src/common/up_releasepending.c +++ b/nuttx/arch/sh/src/common/up_releasepending.c @@ -97,7 +97,7 @@ void up_release_pending(void) up_copystate(rtcb->xcp.regs, current_regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -111,13 +111,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if up_saveusercontext returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/sh/src/common/up_reprioritizertr.c b/nuttx/arch/sh/src/common/up_reprioritizertr.c index 64f5d9969..8ef6c06c4 100644 --- a/nuttx/arch/sh/src/common/up_reprioritizertr.c +++ b/nuttx/arch/sh/src/common/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_copystate(rtcb->xcp.regs, current_regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -171,7 +171,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/sh/src/common/up_stackframe.c b/nuttx/arch/sh/src/common/up_stackframe.c index 16837f62f..736402b81 100644 --- a/nuttx/arch/sh/src/common/up_stackframe.c +++ b/nuttx/arch/sh/src/common/up_stackframe.c @@ -114,7 +114,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/sh/src/common/up_unblocktask.c b/nuttx/arch/sh/src/common/up_unblocktask.c index 455c50ce2..5ba0173fb 100644 --- a/nuttx/arch/sh/src/common/up_unblocktask.c +++ b/nuttx/arch/sh/src/common/up_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -120,7 +120,7 @@ void up_unblock_task(struct tcb_s *tcb) up_copystate(rtcb->xcp.regs, current_regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -132,7 +132,7 @@ void up_unblock_task(struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_saveusercontext returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/sh/src/common/up_usestack.c b/nuttx/arch/sh/src/common/up_usestack.c index e0f348045..b489762b6 100644 --- a/nuttx/arch/sh/src/common/up_usestack.c +++ b/nuttx/arch/sh/src/common/up_usestack.c @@ -104,7 +104,7 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size) } /* Save the new stack allocation */ - + tcb->stack_alloc_ptr = stack; /* The SH family uses a push-down stack: the stack grows toward lower diff --git a/nuttx/arch/sh/src/m16c/Make.defs b/nuttx/arch/sh/src/m16c/Make.defs index 6d5877b8b..be8f160ea 100644 --- a/nuttx/arch/sh/src/m16c/Make.defs +++ b/nuttx/arch/sh/src/m16c/Make.defs @@ -35,7 +35,7 @@ HEAD_ASRC = m16c_head.S -CMN_ASRCS = +CMN_ASRCS = CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c \ up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \ up_interruptcontext.c up_lowputs.c up_mdelay.c up_puts.c \ diff --git a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c index 8083f62bd..d0ee37b04 100644 --- a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c +++ b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c @@ -181,7 +181,7 @@ void up_dumpstate(void) } /* Get the limits on the interrupt stack memory. The near RAM memory map is as follows: - * + * * 0x00400 - DATA Size: Determined by linker * BSS Size: Determined by linker * Interrupt stack Size: CONFIG_ARCH_INTERRUPTSTACK diff --git a/nuttx/arch/sh/src/m16c/m16c_head.S b/nuttx/arch/sh/src/m16c/m16c_head.S index e1eca90f1..cd1a3aa7d 100644 --- a/nuttx/arch/sh/src/m16c/m16c_head.S +++ b/nuttx/arch/sh/src/m16c/m16c_head.S @@ -70,7 +70,7 @@ ************************************************************************************/ /* The near RAM memory map is as follows: - * + * * 0x00400 - DATA Size: Determined by linker * BSS Size: Determined by linker * Interrupt stack Size: CONFIG_ARCH_INTERRUPTSTACK diff --git a/nuttx/arch/sh/src/m16c/m16c_irq.c b/nuttx/arch/sh/src/m16c/m16c_irq.c index b62f55b54..5c4645053 100644 --- a/nuttx/arch/sh/src/m16c/m16c_irq.c +++ b/nuttx/arch/sh/src/m16c/m16c_irq.c @@ -78,7 +78,7 @@ volatile uint32_t *current_regs; /* Actually a pointer to the beginning of a uin void up_irqinitialize(void) { current_regs = NULL; - + /* And finally, enable interrupts */ #ifndef CONFIG_SUPPRESS_INTERRUPTS diff --git a/nuttx/arch/sh/src/m16c/m16c_serial.c b/nuttx/arch/sh/src/m16c/m16c_serial.c index a936dd922..b0afc22fe 100644 --- a/nuttx/arch/sh/src/m16c/m16c_serial.c +++ b/nuttx/arch/sh/src/m16c/m16c_serial.c @@ -613,7 +613,7 @@ static int up_setup(struct uart_dev_s *dev) { dbg("Invalid bits=%d\n", priv->bits); } - + if (priv->parity != 0) { regval |= UART_MR_PRYE; @@ -1075,7 +1075,7 @@ static bool up_txready(struct uart_dev_s *dev) * Name: up_earlyconsoleinit * * 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_consoleinit. * diff --git a/nuttx/arch/sh/src/m16c/m16c_timerisr.c b/nuttx/arch/sh/src/m16c/m16c_timerisr.c index ee61d7601..dfc7f4d91 100644 --- a/nuttx/arch/sh/src/m16c/m16c_timerisr.c +++ b/nuttx/arch/sh/src/m16c/m16c_timerisr.c @@ -161,13 +161,13 @@ void up_timerinit(void) putreg8(0, M16C_TB2IC); /* Set up timer 0 mode register for timer mode with the calculated prescaler value */ - + putreg8(M16C_TA0MODE_CONFIG, M16C_TA0MR); /* Set the calculated reload value */ putreg16(M16C_RELOAD_VALUE, M16C_TA0); - + /* Attach the interrupt handler */ irq_attach(M16C_SYSTIMER_IRQ, (xcpt_t)up_timerisr); @@ -175,7 +175,7 @@ void up_timerinit(void) /* Enable timer interrupts */ putreg8(1, M16C_TA0IC); - + /* Set the interrupt priority */ putreg8(M16C_TA0_PRIO, M16C_TA0IC); diff --git a/nuttx/arch/sh/src/m16c/m16c_vectors.S b/nuttx/arch/sh/src/m16c/m16c_vectors.S index 8a99148e4..f0f151fc3 100644 --- a/nuttx/arch/sh/src/m16c/m16c_vectors.S +++ b/nuttx/arch/sh/src/m16c/m16c_vectors.S @@ -228,7 +228,7 @@ * - Save FLG register * - Clear I, D, and U flags in FLG register * - Builds stack frame like (on the push-down, interrupt stack): - * + * * sp -> PC bits 0-7 * sp+1 -> PC bits 8-15 * sp+2 -> FLG bits 0-7 @@ -245,7 +245,7 @@ m16c_vector _m16c_unexpected_isr, NR_IRQS /* Variable vectors */ - + m16c_vector _m16c_brk_isr, M16C_BRK_IRQ m16c_vector _m16c_int3_isr, M16C_INT3_IRQ m16c_vector _m16c_int5_isr, M16C_INT5_IRQ @@ -372,11 +372,11 @@ _m16c_commonvector: * * Of the ISP to the end of the context array: */ - + ldc r0, isp /* ISP = address of base of new context info */ - + /* Restore the user stack pointer */ - + pop.w r0 /* R0 = saved user stack pointer */ fset u /* Switch to User stack */ ldc r0, sp /* Restore the user stack pointer */ @@ -416,7 +416,7 @@ _up_saveusercontext: * - Save FLG register * - Clear I, D, and U flags in FLG register * - Builds stack frame like (on the push-down, interrupt stack): - * + * * sp -> PC bits 0-7 * sp+1 -> PC bits 8-15 * sp+2 -> FLG bits 0-7 @@ -482,7 +482,7 @@ _up_fullcontextrestore: * - Save FLG register * - Clear I and D flags in FLG register (U is preserved) * - Builds stack frame like (on the push-down, interrupt stack): - * + * * sp -> PC bits 0-7 * sp+1 -> PC bits 8-15 * sp+2 -> FLG bits 0-7 @@ -497,9 +497,9 @@ _m16c_contextrestore: /* Set the USP to the beginning of the context save area */ ldc r1, sp /* USP = address of base of new context info */ - + /* Restore the user stack pointer */ - + fset b /* Switch to bank 1 */ pop.w r0 /* R0 = saved user stack pointer */ fclr b /* Back to bank 0 */ diff --git a/nuttx/arch/sh/src/sh1/Make.defs b/nuttx/arch/sh/src/sh1/Make.defs index d75fdf70d..ab96a3657 100644 --- a/nuttx/arch/sh/src/sh1/Make.defs +++ b/nuttx/arch/sh/src/sh1/Make.defs @@ -35,7 +35,7 @@ HEAD_ASRC = sh1_head.S -CMN_ASRCS = +CMN_ASRCS = CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c \ up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \ up_initialstate.c up_interruptcontext.c up_lowputs.c \ @@ -51,6 +51,6 @@ CMN_CSRCS += sh1_schedulesigaction.c sh1_sigdeliver.c endif ifeq ($(CONFIG_USBDEV),y) -CHIP_CSRCS += +CHIP_CSRCS += endif diff --git a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c index e9ffc4caa..849c406df 100644 --- a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c +++ b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c @@ -55,7 +55,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/sh/src/sh1/sh1_head.S b/nuttx/arch/sh/src/sh1/sh1_head.S index 89d6bf288..3654d0c60 100644 --- a/nuttx/arch/sh/src/sh1/sh1_head.S +++ b/nuttx/arch/sh/src/sh1/sh1_head.S @@ -477,7 +477,7 @@ __start0: .Ledata: .long _edata #endif -.Lsbss: +.Lsbss: .long _sbss .Lebss: .long _ebss diff --git a/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S b/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S index 56a43a2fb..a1b6bfff9 100644 --- a/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S +++ b/nuttx/arch/sh/src/sh1/sh1_saveusercontext.S @@ -81,7 +81,7 @@ _up_saveusercontext: * to populate. * * Re-position to the end of the structure (+4_ so that we can use - * auto decrement + * auto decrement */ add #(XCPTCONTEXT_SIZE), r4 /* R4: Address of last entry + 4 */ diff --git a/nuttx/arch/sh/src/sh1/sh1_serial.c b/nuttx/arch/sh/src/sh1/sh1_serial.c index 5f521fa5a..3719e0d5f 100644 --- a/nuttx/arch/sh/src/sh1/sh1_serial.c +++ b/nuttx/arch/sh/src/sh1/sh1_serial.c @@ -568,7 +568,7 @@ static int up_interrupt(int irq, void *context) struct up_dev_s *priv; #ifdef CONFIG_SH1_SCI0 - if ((irq >= g_sci0priv.irq) && + if ((irq >= g_sci0priv.irq) && (irq <= g_sci0priv.irq + SH1_SCI_NIRQS)) { dev = &g_sci0port; @@ -576,7 +576,7 @@ static int up_interrupt(int irq, void *context) else #endif #ifdef CONFIG_SH1_SCI1 - if ((irq >= g_sci1priv.irq) && + if ((irq >= g_sci1priv.irq) && (irq <= g_sci1priv.irq + SH1_SCI_NIRQS)) { dev = &g_sci1port; @@ -616,7 +616,7 @@ static int up_interrupt(int irq, void *context) /* Handle outgoing, transmit bytes (TDRE: Transmit Data Register Empty) * when TIE is enabled. TIE is only enabled when the driver is waiting with - * buffered data. Since TDRE is usually true, + * buffered data. Since TDRE is usually true, */ if ((priv->ssr & SH1_SCISSR_TDRE) != 0 && (priv->scr & SH1_SCISCR_TIE) != 0) @@ -836,7 +836,7 @@ static bool up_txready(struct uart_dev_s *dev) * Name: up_earlyconsoleinit * * Description: - * Performs the low level SCI initialization early in + * Performs the low level SCI initialization early in * debug so that the serial console will be available * during bootup. This must be called before up_consoleinit. * diff --git a/nuttx/arch/sim/include/limits.h b/nuttx/arch/sim/include/limits.h index 9288cb585..5a8d7c54e 100644 --- a/nuttx/arch/sim/include/limits.h +++ b/nuttx/arch/sim/include/limits.h @@ -33,8 +33,8 @@ * ************************************************************/ -#ifndef __ARCH_SIM_INCLUDE_LIMITS_H -#define __ARCH_SIM_INCLUDE_LIMITS_H +#ifndef __ARCH_SIM_INCLUDE_LIMITS_H +#define __ARCH_SIM_INCLUDE_LIMITS_H /************************************************************ * Included Files diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index 29eadb395..02eda68bd 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -111,7 +111,7 @@ STDLIBS += -lc # Determine which objects are required in the link. The # up_head object normally draws in all that is needed, but -# there are a fews that must be included because they +# there are a fews that must be included because they # are called only from the host OS-specific logic (HOSTOBJS) LINKOBJS = up_head$(OBJEXT) @@ -132,7 +132,7 @@ RELPATHS += -L"$(TOPDIR)/lib" # Add the board-specific library and directory -LIBPATHS += -L board +LIBPATHS += -L board RELPATHS += -L board RELLIBS += -lboard @@ -207,7 +207,7 @@ export_head: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS) depend: .depend -cleanrel: +cleanrel: $(Q) rm -f nuttx.rel GNU/Linux-names.dat Cygwin-names.dat clean: cleanrel diff --git a/nuttx/arch/sim/src/up_blocktask.c b/nuttx/arch/sim/src/up_blocktask.c index db9701434..6e0f94015 100644 --- a/nuttx/arch/sim/src/up_blocktask.c +++ b/nuttx/arch/sim/src/up_blocktask.c @@ -129,7 +129,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) if (!up_setjmp(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/sim/src/up_framebuffer.c b/nuttx/arch/sim/src/up_framebuffer.c index bf80e99a1..e20dd92e3 100644 --- a/nuttx/arch/sim/src/up_framebuffer.c +++ b/nuttx/arch/sim/src/up_framebuffer.c @@ -303,7 +303,7 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable, #endif /**************************************************************************** - * Name: + * Name: ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR diff --git a/nuttx/arch/sim/src/up_lcd.c b/nuttx/arch/sim/src/up_lcd.c index 4c2031dd2..abbb2a8e0 100644 --- a/nuttx/arch/sim/src/up_lcd.c +++ b/nuttx/arch/sim/src/up_lcd.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - + /**************************************************************************** * Included Files ****************************************************************************/ @@ -203,7 +203,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 = sim_putrun, /* Put a run into LCD memory */ .getrun = sim_getrun, /* Get a run from LCD memory */ @@ -213,12 +213,12 @@ static const struct lcd_planeinfo_s g_planeinfo = /* This is the standard, NuttX LCD driver object */ -static struct sim_dev_s g_lcddev = +static struct sim_dev_s g_lcddev = { .dev = { /* LCD Configuration */ - + .getvideoinfo = sim_getvideoinfo, .getplaneinfo = sim_getplaneinfo, diff --git a/nuttx/arch/sim/src/up_releasepending.c b/nuttx/arch/sim/src/up_releasepending.c index 036c65299..a1c2eb544 100644 --- a/nuttx/arch/sim/src/up_releasepending.c +++ b/nuttx/arch/sim/src/up_releasepending.c @@ -92,7 +92,7 @@ void up_release_pending(void) if (!up_setjmp(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/sim/src/up_reprioritizertr.c b/nuttx/arch/sim/src/up_reprioritizertr.c index 7423a7112..578fd5a97 100644 --- a/nuttx/arch/sim/src/up_reprioritizertr.c +++ b/nuttx/arch/sim/src/up_reprioritizertr.c @@ -70,7 +70,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -150,7 +150,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) if (!up_setjmp(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/sim/src/up_setjmp.S b/nuttx/arch/sim/src/up_setjmp.S index a65317c65..c40884352 100644 --- a/nuttx/arch/sim/src/up_setjmp.S +++ b/nuttx/arch/sim/src/up_setjmp.S @@ -46,7 +46,7 @@ /************************************************************************** * Private Definitions **************************************************************************/ - + #ifdef __CYGWIN__ # define SYMBOL(s) _##s #else diff --git a/nuttx/arch/sim/src/up_stackframe.c b/nuttx/arch/sim/src/up_stackframe.c index 3fc481fca..542403c9a 100644 --- a/nuttx/arch/sim/src/up_stackframe.c +++ b/nuttx/arch/sim/src/up_stackframe.c @@ -116,7 +116,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/sim/src/up_touchscreen.c b/nuttx/arch/sim/src/up_touchscreen.c index c65013738..9ee99cbe9 100644 --- a/nuttx/arch/sim/src/up_touchscreen.c +++ b/nuttx/arch/sim/src/up_touchscreen.c @@ -199,7 +199,7 @@ static void up_notify(FAR struct up_dev_s *priv) * is no longer avaialable. */ - sem_post(&priv->waitsem); + sem_post(&priv->waitsem); } /* If there are threads waiting on poll() for touchscreen data to become availabe, diff --git a/nuttx/arch/sim/src/up_unblocktask.c b/nuttx/arch/sim/src/up_unblocktask.c index 35961c5f8..04c2349e4 100644 --- a/nuttx/arch/sim/src/up_unblocktask.c +++ b/nuttx/arch/sim/src/up_unblocktask.c @@ -109,7 +109,7 @@ void up_unblock_task(struct tcb_s *tcb) if (sched_addreadytorun(tcb)) { /* The currently active task has changed! Copy the exception context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_setjmp returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/sim/src/up_x11framebuffer.c b/nuttx/arch/sim/src/up_x11framebuffer.c index a035e2f3a..f59320a46 100644 --- a/nuttx/arch/sim/src/up_x11framebuffer.c +++ b/nuttx/arch/sim/src/up_x11framebuffer.c @@ -276,7 +276,7 @@ static inline int up_x11mapsharedmem(int depth, unsigned int fblen) printf("Using shared memory.\n"); up_x11traperrors(); - g_image = XShmCreateImage(g_display, DefaultVisual(g_display, g_screen), + g_image = XShmCreateImage(g_display, DefaultVisual(g_display, g_screen), depth, ZPixmap, NULL, &g_xshminfo, g_fbpixelwidth, g_fbpixelheight); if (up_x11untraperrors()) diff --git a/nuttx/arch/x86/include/i486/arch.h b/nuttx/arch/x86/include/i486/arch.h index 6bb2418d7..adb457f82 100644 --- a/nuttx/arch/x86/include/i486/arch.h +++ b/nuttx/arch/x86/include/i486/arch.h @@ -160,7 +160,7 @@ * For example if we wanted to read the In-Service Register (ISR), then we * would set both bits 1 and 0 to 1. The next read to the base register, * (0x20 for PIC1 or 0xa0 for PIC2) will return the status of the In-Service - * Register. + * Register. */ #define PIC1_OCW3 0x20 @@ -179,7 +179,7 @@ /* If the PIC has been reset, it must be initialized with 2 to 4 Initialization * Command Words (ICW) before it will accept and process Interrupt Requests. The - * following outlines the four possible Initialization Command Words. + * following outlines the four possible Initialization Command Words. */ #define PIC1_ICW1 0x20 @@ -197,7 +197,7 @@ * released onto the bus, during the 2nd INTA Pulse. Using the 8086 mode, * only bits 7:3 need to be used. This will be 00001000 (0x08) for PIC1 and * 01110000 (0x70) for PIC2. If you wish to relocate the IRQ Vector Table, - * then you can use this register. + * then you can use this register. */ #define PIC1_ICW2 0x21 @@ -309,7 +309,7 @@ * * The Global Descriptor Table or GDT is a data structure used by Intel x86- * family processors starting with the 80286 in order to define the - * characteristics of the various memory areas used during program execution, + * characteristics of the various memory areas used during program execution, * for example the base address, the size and access privileges like * executability and writability. These memory areas are called segments in * Intel terminology. diff --git a/nuttx/arch/x86/include/i486/limits.h b/nuttx/arch/x86/include/i486/limits.h index aa167a0af..8bcc4c42d 100644 --- a/nuttx/arch/x86/include/i486/limits.h +++ b/nuttx/arch/x86/include/i486/limits.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_X86_INCLUDE_I486_LIMITS_H -#define __ARCH_X86_INCLUDE_I486_LIMITS_H +#ifndef __ARCH_X86_INCLUDE_I486_LIMITS_H +#define __ARCH_X86_INCLUDE_I486_LIMITS_H /**************************************************************************** * Included Files diff --git a/nuttx/arch/x86/src/common/up_assert.c b/nuttx/arch/x86/src/common/up_assert.c index 8f4f53b9a..ed9b0cdb2 100644 --- a/nuttx/arch/x86/src/common/up_assert.c +++ b/nuttx/arch/x86/src/common/up_assert.c @@ -64,7 +64,7 @@ # undef CONFIG_ARCH_USBDUMP #endif -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/x86/src/common/up_blocktask.c b/nuttx/arch/x86/src/common/up_blocktask.c index dba388cb0..f436c006f 100644 --- a/nuttx/arch/x86/src/common/up_blocktask.c +++ b/nuttx/arch/x86/src/common/up_blocktask.c @@ -129,7 +129,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -147,7 +147,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/x86/src/common/up_releasepending.c b/nuttx/arch/x86/src/common/up_releasepending.c index 3f9f9fc0b..9507ff898 100644 --- a/nuttx/arch/x86/src/common/up_releasepending.c +++ b/nuttx/arch/x86/src/common/up_releasepending.c @@ -97,7 +97,7 @@ void up_release_pending(void) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -111,13 +111,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if up_saveusercontext returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/x86/src/common/up_reprioritizertr.c b/nuttx/arch/x86/src/common/up_reprioritizertr.c index 8c83b0790..3c5115b72 100644 --- a/nuttx/arch/x86/src/common/up_reprioritizertr.c +++ b/nuttx/arch/x86/src/common/up_reprioritizertr.c @@ -69,7 +69,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -152,7 +152,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -171,7 +171,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) else if (!up_saveusercontext(rtcb->xcp.regs)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/x86/src/common/up_unblocktask.c b/nuttx/arch/x86/src/common/up_unblocktask.c index 873ff1420..43b93c4e6 100644 --- a/nuttx/arch/x86/src/common/up_unblocktask.c +++ b/nuttx/arch/x86/src/common/up_unblocktask.c @@ -108,7 +108,7 @@ void up_unblock_task(struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (current_regs) @@ -119,7 +119,7 @@ void up_unblock_task(struct tcb_s *tcb) up_savestate(rtcb->xcp.regs); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -131,7 +131,7 @@ void up_unblock_task(struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * up_saveusercontext returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/x86/src/i486/up_createstack.c b/nuttx/arch/x86/src/i486/up_createstack.c index a619ed19b..cdd7fec7c 100644 --- a/nuttx/arch/x86/src/i486/up_createstack.c +++ b/nuttx/arch/x86/src/i486/up_createstack.c @@ -116,7 +116,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), diff --git a/nuttx/arch/x86/src/i486/up_irq.c b/nuttx/arch/x86/src/i486/up_irq.c index a160379e2..6a56c361a 100644 --- a/nuttx/arch/x86/src/i486/up_irq.c +++ b/nuttx/arch/x86/src/i486/up_irq.c @@ -106,7 +106,7 @@ static void idt_outb(uint8_t val, uint16_t addr) * combine several sources of interrupt onto one or more CPU lines, while * allowing priority levels to be assigned to its interrupt outputs. When * the device has multiple interrupt outputs to assert, it will assert them - * in the order of their relative priority. + * in the order of their relative priority. * ****************************************************************************/ @@ -119,7 +119,7 @@ static void up_remappic(void) /* If the PIC has been reset, it must be initialized with 2 to 4 Initialization * Command Words (ICW) before it will accept and process Interrupt Requests. The - * following outlines the four possible Initialization Command Words. + * following outlines the four possible Initialization Command Words. */ /* Remap the irq table for primary: @@ -150,7 +150,7 @@ static void up_remappic(void) * Name up_idtentry * * Description: - * Initialize one IDT entry. + * Initialize one IDT entry. * ****************************************************************************/ @@ -293,7 +293,7 @@ void up_disable_irq(int irq) { unsigned int regaddr; uint8_t regbit; - + if (irq >= IRQ0) { /* Map the IRQ IMR regiser to a PIC and a bit number */ @@ -331,7 +331,7 @@ void up_enable_irq(int irq) { unsigned int regaddr; uint8_t regbit; - + if (irq >= IRQ0) { /* Map the IRQ IMR regiser to a PIC and a bit number */ diff --git a/nuttx/arch/x86/src/i486/up_savestate.c b/nuttx/arch/x86/src/i486/up_savestate.c index ce237efac..ad280e4fd 100644 --- a/nuttx/arch/x86/src/i486/up_savestate.c +++ b/nuttx/arch/x86/src/i486/up_savestate.c @@ -77,7 +77,7 @@ void up_savestate(uint32_t *regs) { uint8_t cpl; uint8_t rpl; - + /* First, just copy all of the registers */ up_copystate(regs, (uint32_t*)current_regs); diff --git a/nuttx/arch/x86/src/i486/up_stackframe.c b/nuttx/arch/x86/src/i486/up_stackframe.c index d8884b790..fd93ac48f 100644 --- a/nuttx/arch/x86/src/i486/up_stackframe.c +++ b/nuttx/arch/x86/src/i486/up_stackframe.c @@ -117,7 +117,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/x86/src/qemu/qemu_head.S b/nuttx/arch/x86/src/qemu/qemu_head.S index 8e9c8a1db..8c49b5fcd 100755 --- a/nuttx/arch/x86/src/qemu/qemu_head.S +++ b/nuttx/arch/x86/src/qemu/qemu_head.S @@ -44,7 +44,7 @@ /**************************************************************************** * Pre-processor definitions ****************************************************************************/ - + /* Memory Map: _sbss is the start of the BSS region (see ld.script) _ebss is * the end of the BSS regsion (see ld.script). The idle task stack starts at * the end of BSS and is of size CONFIG_IDLETHREAD_STACKSIZE. The IDLE thread diff --git a/nuttx/arch/x86/src/qemu/qemu_lowputc.c b/nuttx/arch/x86/src/qemu/qemu_lowputc.c index 9bfee18d0..9260884a3 100644 --- a/nuttx/arch/x86/src/qemu/qemu_lowputc.c +++ b/nuttx/arch/x86/src/qemu/qemu_lowputc.c @@ -46,7 +46,7 @@ ****************************************************************************/ /* COM1 port addresses */ - + #define COM1_PORT 0x3f8 /* COM1: I/O port 0x3f8, IRQ 4 */ #define COM2_PORT 0x2f8 /* COM2: I/O port 0x2f8, IRQ 3 */ #define COM3_PORT 0x3e8 /* COM3: I/O port 0x3e8, IRQ 4 */ diff --git a/nuttx/arch/x86/src/qemu/qemu_lowsetup.c b/nuttx/arch/x86/src/qemu/qemu_lowsetup.c index 3b58f696c..db2b01ef5 100644 --- a/nuttx/arch/x86/src/qemu/qemu_lowsetup.c +++ b/nuttx/arch/x86/src/qemu/qemu_lowsetup.c @@ -75,7 +75,7 @@ static void up_gdtentry(struct gdt_entry_s *entry, uint32_t base, entry->lowlimit = (limit & 0xffff); entry->granularity = (limit >> 16) & 0x0f; - + entry->granularity |= gran & 0xf0; entry->access = access; } diff --git a/nuttx/arch/x86/src/qemu/qemu_saveusercontext.S b/nuttx/arch/x86/src/qemu/qemu_saveusercontext.S index ab1244798..4ef68a383 100644 --- a/nuttx/arch/x86/src/qemu/qemu_saveusercontext.S +++ b/nuttx/arch/x86/src/qemu/qemu_saveusercontext.S @@ -161,7 +161,7 @@ up_saveusercontext: * function when context is switch back to this thread. The non-zero * return value is the indication that we have been resumed. */ - + movl $1, (4*REG_EAX)(%eax) /* Get and save the interrupt state */ diff --git a/nuttx/arch/z16/include/limits.h b/nuttx/arch/z16/include/limits.h index 6601c4737..0abbd6b29 100644 --- a/nuttx/arch/z16/include/limits.h +++ b/nuttx/arch/z16/include/limits.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_Z16_INCLUDE_LIMITS_H -#define __ARCH_Z16_INCLUDE_LIMITS_H +#ifndef __ARCH_Z16_INCLUDE_LIMITS_H +#define __ARCH_Z16_INCLUDE_LIMITS_H /**************************************************************************** * Included Files diff --git a/nuttx/arch/z16/include/types.h b/nuttx/arch/z16/include/types.h index e58a93ba1..a1d7c9eff 100644 --- a/nuttx/arch/z16/include/types.h +++ b/nuttx/arch/z16/include/types.h @@ -37,8 +37,8 @@ * only indirectly through sys/types.h */ -#ifndef __ARCH_Z16_INCLUDE_TYPES_H -#define __ARCH_Z16_INCLUDE_TYPES_H +#ifndef __ARCH_Z16_INCLUDE_TYPES_H +#define __ARCH_Z16_INCLUDE_TYPES_H /**************************************************************************** * Included Files diff --git a/nuttx/arch/z16/src/common/up_assert.c b/nuttx/arch/z16/src/common/up_assert.c index d2b64026e..051d8ca01 100644 --- a/nuttx/arch/z16/src/common/up_assert.c +++ b/nuttx/arch/z16/src/common/up_assert.c @@ -63,7 +63,7 @@ # undef CONFIG_ARCH_USBDUMP #endif -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z16/src/common/up_blocktask.c b/nuttx/arch/z16/src/common/up_blocktask.c index 56618ab3d..c8a8fae99 100644 --- a/nuttx/arch/z16/src/common/up_blocktask.c +++ b/nuttx/arch/z16/src/common/up_blocktask.c @@ -132,7 +132,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -153,7 +153,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) else if (!SAVE_USERCONTEXT(rtcb)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/z16/src/common/up_createstack.c b/nuttx/arch/z16/src/common/up_createstack.c index bdb6d2647..0a7fecd3b 100644 --- a/nuttx/arch/z16/src/common/up_createstack.c +++ b/nuttx/arch/z16/src/common/up_createstack.c @@ -115,7 +115,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), diff --git a/nuttx/arch/z16/src/common/up_doirq.c b/nuttx/arch/z16/src/common/up_doirq.c index 1009814ce..ffe15a114 100644 --- a/nuttx/arch/z16/src/common/up_doirq.c +++ b/nuttx/arch/z16/src/common/up_doirq.c @@ -81,7 +81,7 @@ FAR chipreg_t *up_doirq(int irq, FAR chipreg_t *regs) { FAR chipreg_t *ret = regs; - + board_led_on(LED_INIRQ); #ifdef CONFIG_SUPPRESS_INTERRUPTS PANIC(); diff --git a/nuttx/arch/z16/src/common/up_registerdump.c b/nuttx/arch/z16/src/common/up_registerdump.c index 178320dd2..c56658f16 100644 --- a/nuttx/arch/z16/src/common/up_registerdump.c +++ b/nuttx/arch/z16/src/common/up_registerdump.c @@ -52,7 +52,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z16/src/common/up_releasepending.c b/nuttx/arch/z16/src/common/up_releasepending.c index a25459730..7db0cd614 100644 --- a/nuttx/arch/z16/src/common/up_releasepending.c +++ b/nuttx/arch/z16/src/common/up_releasepending.c @@ -99,7 +99,7 @@ void up_release_pending(void) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -115,13 +115,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if SAVE_USERCONTEXT returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!SAVE_USERCONTEXT(rtcb)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/z16/src/common/up_reprioritizertr.c b/nuttx/arch/z16/src/common/up_reprioritizertr.c index bbfee7845..456d39010 100644 --- a/nuttx/arch/z16/src/common/up_reprioritizertr.c +++ b/nuttx/arch/z16/src/common/up_reprioritizertr.c @@ -71,7 +71,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -154,7 +154,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -175,7 +175,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) else if (!SAVE_USERCONTEXT(rtcb)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/z16/src/common/up_stackdump.c b/nuttx/arch/z16/src/common/up_stackdump.c index ef9eebb23..fd16cf238 100644 --- a/nuttx/arch/z16/src/common/up_stackdump.c +++ b/nuttx/arch/z16/src/common/up_stackdump.c @@ -49,7 +49,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z16/src/common/up_stackframe.c b/nuttx/arch/z16/src/common/up_stackframe.c index ea2d696c8..feb5c8578 100644 --- a/nuttx/arch/z16/src/common/up_stackframe.c +++ b/nuttx/arch/z16/src/common/up_stackframe.c @@ -115,7 +115,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/z16/src/common/up_unblocktask.c b/nuttx/arch/z16/src/common/up_unblocktask.c index a629b5066..984e514ad 100644 --- a/nuttx/arch/z16/src/common/up_unblocktask.c +++ b/nuttx/arch/z16/src/common/up_unblocktask.c @@ -113,7 +113,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (IN_INTERRUPT) @@ -124,7 +124,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -139,7 +139,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * SAVE_USERCONTEXT returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/z16/src/z16f/Make.defs b/nuttx/arch/z16/src/z16f/Make.defs index 4c47cf41b..4146c1221 100644 --- a/nuttx/arch/z16/src/z16f/Make.defs +++ b/nuttx/arch/z16/src/z16f/Make.defs @@ -35,7 +35,7 @@ HEAD_SSRC = z16f_head.S -CMN_SSRCS = +CMN_SSRCS = CMN_CSRCS = up_allocateheap.c up_initialize.c up_schedulesigaction.c \ up_assert.c up_initialstate.c up_sigdeliver.c up_blocktask.c \ up_interruptcontext.c up_stackdump.c up_copystate.c \ diff --git a/nuttx/arch/z16/src/z16f/chip.h b/nuttx/arch/z16/src/z16f/chip.h index f684652cb..05ce812c0 100644 --- a/nuttx/arch/z16/src/z16f/chip.h +++ b/nuttx/arch/z16/src/z16f/chip.h @@ -62,7 +62,7 @@ #endif /* Z16F Chip Variants ***************************************************************/ - + #if defined(CONFIG_ARCH_CHIP_Z16F2810) # define Z16F_INVMEM_SIZE (128*1024) # define Z16F_IRAM_SIZE (4*1024) @@ -122,7 +122,7 @@ * Internal non-volatile memory starts at address zero. The size * of the internal non-volatile memory is chip-dependent. */ - + #define Z16F_INVMEM_BASE _HX32(00000000) /* Most chip variants support external memory */ @@ -141,7 +141,7 @@ /* Internal RAM always ends at 0xffbfff. The IRAM base address depends * on the size of the IRAM supported by the chip. */ - + #define Z16F_IRAM_BASE (_HX32(ffffc000) - Z16F_IRAM_SIZE) /* External memory mapped peripherals, internal I/O memory and SFRS */ diff --git a/nuttx/arch/z16/src/z16f/z16f_clkinit.c b/nuttx/arch/z16/src/z16f/z16f_clkinit.c index d125d6143..4e6b80e80 100644 --- a/nuttx/arch/z16/src/z16f/z16f_clkinit.c +++ b/nuttx/arch/z16/src/z16f/z16f_clkinit.c @@ -77,7 +77,7 @@ extern _Erom unsigned long SYS_CLK_FREQ; * and the clock source is _DEFSRC. * * NOTE: The UART output is designed to work with 5.56 MHz internal and 20 MHz - * External clock frequencies at the Default Baud rate of 57.6K Baud. + * External clock frequencies at the Default Baud rate of 57.6K Baud. * Entering different clock frequencies may cause the UART to stop transmitting * unless the user makes changes to the UART routines. * diff --git a/nuttx/arch/z16/src/z16f/z16f_head.S b/nuttx/arch/z16/src/z16f/z16f_head.S index c1a69a18e..2a45095c5 100755 --- a/nuttx/arch/z16/src/z16f/z16f_head.S +++ b/nuttx/arch/z16/src/z16f/z16f_head.S @@ -121,7 +121,7 @@ vector C2=_c3_isr vector C1=_c2_isr vector C0=_c0_isr - + /************************************************************************** * Equates **************************************************************************/ @@ -129,7 +129,7 @@ /************************************************************************** * Data Allocation **************************************************************************/ - + /************************************************************************** * Code **************************************************************************/ diff --git a/nuttx/arch/z16/src/z16f/z16f_sysexec.c b/nuttx/arch/z16/src/z16f/z16f_sysexec.c index bd922237f..eb3c4065c 100644 --- a/nuttx/arch/z16/src/z16f/z16f_sysexec.c +++ b/nuttx/arch/z16/src/z16f/z16f_sysexec.c @@ -81,13 +81,13 @@ void z16f_sysexec(FAR chipreg_t *regs) { uint16_t excp; - + /* Save that register reference so that it can be used for built-in * diagnostics. */ current_regs = regs; - + /* The cause of the system exception is indicated in the SYSEXCPH&L * registers */ diff --git a/nuttx/arch/z80/include/ez80/limits.h b/nuttx/arch/z80/include/ez80/limits.h index 9e27b14e6..a049d37db 100644 --- a/nuttx/arch/z80/include/ez80/limits.h +++ b/nuttx/arch/z80/include/ez80/limits.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_Z80_INCLUDE_EZ80_LIMITS_H -#define __ARCH_Z80_INCLUDE_EZ80_LIMITS_H +#ifndef __ARCH_Z80_INCLUDE_EZ80_LIMITS_H +#define __ARCH_Z80_INCLUDE_EZ80_LIMITS_H /**************************************************************************** * Included Files diff --git a/nuttx/arch/z80/include/z180/chip.h b/nuttx/arch/z80/include/z180/chip.h index 1127e4e00..9a1ba8098 100644 --- a/nuttx/arch/z80/include/z180/chip.h +++ b/nuttx/arch/z80/include/z180/chip.h @@ -270,7 +270,7 @@ * 32 K ROM (185) * 1 Ch ESCC * IEEE 1284 Bi-Directional Centronics Parallel Port - * 7 or 24 Bits of I/O + * 7 or 24 Bits of I/O */ #elif defined(CONFIG_ARCH_CHIP_Z8019520FSG) || /* 100-pin QFP 20MHz 5V */ \ diff --git a/nuttx/arch/z80/include/z180/limits.h b/nuttx/arch/z80/include/z180/limits.h index a70118448..283c10e33 100644 --- a/nuttx/arch/z80/include/z180/limits.h +++ b/nuttx/arch/z80/include/z180/limits.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_Z80_INCLUDE_Z180_LIMITS_H -#define __ARCH_Z80_INCLUDE_Z180_LIMITS_H +#ifndef __ARCH_Z80_INCLUDE_Z180_LIMITS_H +#define __ARCH_Z80_INCLUDE_Z180_LIMITS_H /**************************************************************************** * Included Files diff --git a/nuttx/arch/z80/include/z8/irq.h b/nuttx/arch/z80/include/z8/irq.h index 3a0c75900..d1ceef7fd 100644 --- a/nuttx/arch/z80/include/z8/irq.h +++ b/nuttx/arch/z80/include/z8/irq.h @@ -198,7 +198,7 @@ # define NR_IRQS (29) -#endif +#endif #define Z8_IRQ_SYSTIMER Z8_TIMER0_IRQ diff --git a/nuttx/arch/z80/include/z8/limits.h b/nuttx/arch/z80/include/z8/limits.h index 724d8c98d..d71360bac 100644 --- a/nuttx/arch/z80/include/z8/limits.h +++ b/nuttx/arch/z80/include/z8/limits.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_Z80_INCLUDE_Z8_LIMITS_H -#define __ARCH_Z80_INCLUDE_Z8_LIMITS_H +#ifndef __ARCH_Z80_INCLUDE_Z8_LIMITS_H +#define __ARCH_Z80_INCLUDE_Z8_LIMITS_H /**************************************************************************** * Included Files diff --git a/nuttx/arch/z80/include/z80/limits.h b/nuttx/arch/z80/include/z80/limits.h index f1a1c1e17..dc9e0a70c 100644 --- a/nuttx/arch/z80/include/z80/limits.h +++ b/nuttx/arch/z80/include/z80/limits.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_Z80_INCLUDE_Z80_LIMITS_H -#define __ARCH_Z80_INCLUDE_Z80_LIMITS_H +#ifndef __ARCH_Z80_INCLUDE_Z80_LIMITS_H +#define __ARCH_Z80_INCLUDE_Z80_LIMITS_H /**************************************************************************** * Included Files diff --git a/nuttx/arch/z80/src/Makefile.sdccl b/nuttx/arch/z80/src/Makefile.sdccl index 44c3376c8..c444690e7 100644 --- a/nuttx/arch/z80/src/Makefile.sdccl +++ b/nuttx/arch/z80/src/Makefile.sdccl @@ -130,7 +130,7 @@ asm_mem.h: libarch$(LIBEXT): asm_mem.h $(OBJS) $(call ARCHIVE, $@, $(OBJS)) -# This builds the libboard library in the board/ subdirectory +# This builds the libboard library in the board/ subdirectory board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/nuttx/arch/z80/src/Makefile.sdccw b/nuttx/arch/z80/src/Makefile.sdccw index dbf437b48..79e1b002e 100644 --- a/nuttx/arch/z80/src/Makefile.sdccw +++ b/nuttx/arch/z80/src/Makefile.sdccw @@ -130,7 +130,7 @@ asm_mem.h: libarch$(LIBEXT): asm_mem.h $(OBJS) $(call ARCHIVE, $@, $(OBJS)) -# This builds the libboard library in the board\ subdirectory +# This builds the libboard library in the board\ subdirectory board\libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/nuttx/arch/z80/src/common/up_assert.c b/nuttx/arch/z80/src/common/up_assert.c index 9bdd5cdf5..55561db33 100644 --- a/nuttx/arch/z80/src/common/up_assert.c +++ b/nuttx/arch/z80/src/common/up_assert.c @@ -62,7 +62,7 @@ # undef CONFIG_ARCH_USBDUMP #endif -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z80/src/common/up_blocktask.c b/nuttx/arch/z80/src/common/up_blocktask.c index 875c0602c..418a09cc0 100644 --- a/nuttx/arch/z80/src/common/up_blocktask.c +++ b/nuttx/arch/z80/src/common/up_blocktask.c @@ -133,7 +133,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -154,7 +154,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) else if (!SAVE_USERCONTEXT(rtcb)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/z80/src/common/up_createstack.c b/nuttx/arch/z80/src/common/up_createstack.c index 4e4c458e8..1a058ec50 100644 --- a/nuttx/arch/z80/src/common/up_createstack.c +++ b/nuttx/arch/z80/src/common/up_createstack.c @@ -114,7 +114,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /* Do we need to allocate a new stack? */ - + if (!tcb->stack_alloc_ptr) { /* Allocate the stack. If DEBUG is enabled (but not stack debug), diff --git a/nuttx/arch/z80/src/common/up_releasepending.c b/nuttx/arch/z80/src/common/up_releasepending.c index 7e9eb9f18..81a2f2413 100644 --- a/nuttx/arch/z80/src/common/up_releasepending.c +++ b/nuttx/arch/z80/src/common/up_releasepending.c @@ -100,7 +100,7 @@ void up_release_pending(void) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -116,13 +116,13 @@ void up_release_pending(void) /* Copy the exception context into the TCB of the task that * was currently active. if SAVE_USERCONTEXT returns a non-zero - * value, then this is really the previously running task + * value, then this is really the previously running task * restarting! */ else if (!SAVE_USERCONTEXT(rtcb)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/z80/src/common/up_reprioritizertr.c b/nuttx/arch/z80/src/common/up_reprioritizertr.c index a5b3a18c8..0f0ca2fb6 100644 --- a/nuttx/arch/z80/src/common/up_reprioritizertr.c +++ b/nuttx/arch/z80/src/common/up_reprioritizertr.c @@ -72,7 +72,7 @@ * * Description: * Called when the priority of a running or - * ready-to-run task changes and the reprioritization will + * ready-to-run task changes and the reprioritization will * cause a context switch. Two cases: * * 1) The priority of the currently running task drops and the next @@ -155,7 +155,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -176,7 +176,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) else if (!SAVE_USERCONTEXT(rtcb)) { - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ diff --git a/nuttx/arch/z80/src/common/up_stackdump.c b/nuttx/arch/z80/src/common/up_stackdump.c index 6cb85dd38..21707889b 100644 --- a/nuttx/arch/z80/src/common/up_stackdump.c +++ b/nuttx/arch/z80/src/common/up_stackdump.c @@ -50,7 +50,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z80/src/common/up_stackframe.c b/nuttx/arch/z80/src/common/up_stackframe.c index fdc43a850..1db0bf470 100644 --- a/nuttx/arch/z80/src/common/up_stackframe.c +++ b/nuttx/arch/z80/src/common/up_stackframe.c @@ -114,7 +114,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Align the frame_size */ frame_size = STACK_ALIGN_UP(frame_size); - + /* Is there already a stack allocated? Is it big enough? */ if (!tcb->stack_alloc_ptr || tcb->adj_stack_size <= frame_size) diff --git a/nuttx/arch/z80/src/common/up_unblocktask.c b/nuttx/arch/z80/src/common/up_unblocktask.c index e6141d4fc..6c46b0a14 100644 --- a/nuttx/arch/z80/src/common/up_unblocktask.c +++ b/nuttx/arch/z80/src/common/up_unblocktask.c @@ -114,7 +114,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) /* The currently active task has changed! We need to do * a context switch to the new task. * - * Are we in an interrupt handler? + * Are we in an interrupt handler? */ if (IN_INTERRUPT()) @@ -125,7 +125,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) SAVE_IRQCONTEXT(rtcb); - /* Restore the exception context of the rtcb at the (new) head + /* Restore the exception context of the rtcb at the (new) head * of the g_readytorun task list. */ @@ -140,7 +140,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) } /* We are not in an interrupt handler. Copy the user C context - * into the TCB of the task that was previously active. if + * into the TCB of the task that was previously active. if * SAVE_USERCONTEXT returns a non-zero value, then this is really the * previously running task restarting! */ diff --git a/nuttx/arch/z80/src/ez80/Make.defs b/nuttx/arch/z80/src/ez80/Make.defs index fb2b3d48f..271ff0f9d 100644 --- a/nuttx/arch/z80/src/ez80/Make.defs +++ b/nuttx/arch/z80/src/ez80/Make.defs @@ -36,7 +36,7 @@ HEAD_ASRC = ez80_vectors.asm HEAD_SSRC = -CMN_SSRCS = +CMN_SSRCS = CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c \ up_releasestack.c up_interruptcontext.c up_blocktask.c \ up_unblocktask.c up_exit.c up_releasepending.c \ @@ -49,7 +49,7 @@ ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y) CHIP_ASRCS += ez80f91_init.asm endif -CHIP_SSRCS = +CHIP_SSRCS = CHIP_CSRCS = ez80_clock.c ez80_initialstate.c ez80_irq.c ez80_copystate.c \ ez80_schedulesigaction.c ez80_sigdeliver.c ez80_timerisr.c \ ez80_lowuart.c ez80_serial.c ez80_spi.c ez80_i2c.c \ diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index 727003677..4957a5bd8 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -470,7 +470,7 @@ static void ez80emac_miiwrite(FAR struct ez80emac_driver_s *priv, uint8_t offset static uint16_t ez80emac_miiread(FAR struct ez80emac_driver_s *priv, uint32_t offset) { uint8_t regval; - + /* Wait for any preceding MII management operation to complete */ ez80emac_waitmiibusy(); @@ -613,7 +613,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv) ndbg("Configure autonegotiation\n"); if (bauto) { - ez80emac_miiwrite(priv, MII_ADVERTISE, + ez80emac_miiwrite(priv, MII_ADVERTISE, MII_ADVERTISE_100BASETXFULL|MII_ADVERTISE_100BASETXHALF| MII_ADVERTISE_10BASETXFULL|MII_ADVERTISE_10BASETXHALF| MII_ADVERTISE_CSMA); @@ -1177,7 +1177,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) * RxDMA reads the next two bytes from the RxFIFO and writes them into * the Rx descriptor status LSB and MSB. The packet length counter is * stored into the descriptor table packet length field, the descriptor - * table next pointer is written into the Rx descriptor table and finally + * table next pointer is written into the Rx descriptor table and finally * the Rx_DONE_STAT bit in the EMAC Interrupt Status Register register is * set to 1. */ @@ -1223,7 +1223,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) { int nbytes = (int)((FAR uint8_t*)priv->rxendp1 - (FAR uint8_t*)psrc); nvdbg("RX wraps after %d bytes\n", nbytes + SIZEOF_EMACSDESC); - + memcpy(pdest, psrc, nbytes); memcpy(&pdest[nbytes], priv->rxstart, pktlen - nbytes); } @@ -1383,7 +1383,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context) } } - /* Save the new head. If it is NULL, then we have read all the way to + /* Save the new head. If it is NULL, then we have read all the way to * the terminating description with np==NULL. */ @@ -1616,7 +1616,7 @@ static void ez80emac_polltimer(int argc, uint32_t arg, ...) * * Description: * NuttX Callback: Bring up the Ethernet interface when an IP address is - * provided + * provided * * Parameters: * dev - Reference to the NuttX driver state structure @@ -1760,7 +1760,7 @@ static int ez80emac_ifdown(struct uip_driver_s *dev) * Function: ez80emac_txavail * * Description: - * Driver callback invoked when new TX data is available. This is a + * Driver callback invoked when new TX data is available. This is a * stimulus perform an out-of-cycle poll and, thereby, reduce the TX * latency. * @@ -1807,7 +1807,7 @@ static int ez80emac_txavail(struct uip_driver_s *dev) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be added + * mac - The MAC address to be added * * Returned Value: * None @@ -1837,7 +1837,7 @@ static int ez80emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) * * Parameters: * dev - Reference to the NuttX driver state structure - * mac - The MAC address to be removed + * mac - The MAC address to be removed * * Returned Value: * None @@ -1885,12 +1885,12 @@ static int ez80_emacinitialize(void) outp(EZ80_EMAC_RST, 0); /* Reset everything */ outp(EZ80_EMAC_RST, 0xff); outp(EZ80_EMAC_RST, 0); - + /* The ez80 has a fixed 8kb of EMAC SRAM memory (+ 8kb of * general purpose SRAM) located in the high address space. * Configure the GP and EMAC SRAM */ - + outp(EZ80_RAM_CTL, (RAMCTL_ERAMEN|RAMCTL_GPRAMEN)); outp(EZ80_RAM_ADDR_U, (CONFIG_EZ80_RAMADDR >> 16)); outp(EZ80_EMAC_BP_U, (CONFIG_EZ80_RAMADDR >> 16)); @@ -2014,7 +2014,7 @@ static int ez80_emacinitialize(void) outp(EZ80_EMAC_CFG3, EMAC_RETRY); /* EMAC_CFG4_TXFC - Pause control frames are allowed to be transmitted - * EMAC_CFG4_RXFC - Act on received pause control frames + * EMAC_CFG4_RXFC - Act on received pause control frames */ outp(EZ80_EMAC_CFG4, EMAC_CFG4_TXFC|EMAC_CFG4_RXFC); diff --git a/nuttx/arch/z80/src/ez80/ez80_i2c.c b/nuttx/arch/z80/src/ez80/ez80_i2c.c index 83942a542..329892d16 100644 --- a/nuttx/arch/z80/src/ez80/ez80_i2c.c +++ b/nuttx/arch/z80/src/ez80/ez80_i2c.c @@ -261,7 +261,7 @@ static uint16_t i2c_getccr(uint32_t fscl) fscl = ftmp; n = 7; } - + /* Finally, get M: * * M = (fsamp / 10) / fscl - 1 = ftmp / fscl - 1 @@ -340,7 +340,7 @@ static void i2c_clriflg(void) * None * ****************************************************************************/ - + static void i2c_start(void) { uint8_t regval = inp(EZ80_I2C_CTL); @@ -362,7 +362,7 @@ static void i2c_start(void) * None * ****************************************************************************/ - + static void i2c_stop(void) { uint8_t regval = inp(EZ80_I2C_CTL); @@ -382,11 +382,11 @@ static void i2c_stop(void) * * Returned Value: * 0: Success, IFLG is set and DATA can be sent or received. - + * Or <0: Negated error value. IFLG is cleared. * * -EIO: Irrecoverable (or unexpected) error occured - * -EAGAIN: And + * -EAGAIN: And * ****************************************************************************/ @@ -420,7 +420,7 @@ static int i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit) outp(EZ80_I2C_DR, (uint8_t)I2C_ADDR8(priv->addr) | readbit); i2c_clriflg(); - + /* And wait for the address transfer to complete */ sr = i2c_waitiflg(); @@ -659,7 +659,7 @@ static int i2c_write(FAR struct i2c_dev_s *dev, const uint8_t *buffer, int bufle if (sr == I2C_SR_ARBLOST1) { /* Arbitration lost, break out of the inner loop and - * try sending the message again + * try sending the message again */ break; @@ -745,7 +745,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) /* Retry as necessary to receive the whole message */ - for (retry = 0; retry < 100; retry++) + for (retry = 0; retry < 100; retry++) { /* Enter MASTER TRANSMIT mode by setting the STA bit in the I2C_CTL * register to 1. The I2C then tests the I2C bus and transmits a START @@ -784,7 +784,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) /* If the AAK bit is cleared to 0 during a transfer, the I2C * transmits a NACK bit after the next byte is received. */ - + regval &= ~I2C_CTL_AAK; } else @@ -798,7 +798,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) } outp(EZ80_I2C_CTL, regval); - /* Wait for IFLG to be set meaning that incoming data is + /* Wait for IFLG to be set meaning that incoming data is * available in the I2C_DR registers. */ @@ -851,7 +851,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) i2c_clriflg(); break; } - + /* Unexpected status response */ else @@ -881,7 +881,7 @@ failure: * Description: * Initialize the selected I2C port. And return a unique instance of struct * struct i2c_dev_s. This function may be called to obtain multiple - * instances of the interface, each of which may be set up with a + * instances of the interface, each of which may be set up with a * different frequency and slave address. * * Input Parameter: @@ -897,7 +897,7 @@ FAR struct i2c_dev_s *up_i2cinitialize(int port) FAR struct ez80_i2cdev_s *i2c; uint16_t ccr; uint8_t regval; - + if (!g_initialized) { /* Set up some initial BRG value */ @@ -906,7 +906,7 @@ FAR struct i2c_dev_s *up_i2cinitialize(int port) i2c_setccr(ccr); /* No GPIO setup is required -- I2C pints, SCL/SDA are not multiplexed */ - + /* This semaphore enforces serialized access for I2C transfers */ sem_init(&g_i2csem, 0, 1); @@ -929,4 +929,4 @@ FAR struct i2c_dev_s *up_i2cinitialize(int port) i2c->ccr = g_currccr; } return (FAR struct i2c_dev_s *)i2c; -} +} diff --git a/nuttx/arch/z80/src/ez80/ez80_irq.c b/nuttx/arch/z80/src/ez80/ez80_irq.c index 604e5c5b3..19c29b45d 100644 --- a/nuttx/arch/z80/src/ez80/ez80_irq.c +++ b/nuttx/arch/z80/src/ez80/ez80_irq.c @@ -78,7 +78,7 @@ volatile chipreg_t *current_regs; void up_irqinitialize(void) { current_regs = NULL; - + /* And finally, enable interrupts */ #ifndef CONFIG_SUPPRESS_INTERRUPTS diff --git a/nuttx/arch/z80/src/ez80/ez80_registerdump.c b/nuttx/arch/z80/src/ez80/ez80_registerdump.c index bf53f81f7..82c8cc8ad 100644 --- a/nuttx/arch/z80/src/ez80/ez80_registerdump.c +++ b/nuttx/arch/z80/src/ez80/ez80_registerdump.c @@ -52,7 +52,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z80/src/ez80/ez80_serial.c b/nuttx/arch/z80/src/ez80/ez80_serial.c index a178ecb19..06ca2753e 100644 --- a/nuttx/arch/z80/src/ez80/ez80_serial.c +++ b/nuttx/arch/z80/src/ez80/ez80_serial.c @@ -560,7 +560,7 @@ static void ez80_rxint(struct uart_dev_s *dev, bool enable) { struct ez80_dev_s *priv = (struct ez80_dev_s*)dev->priv; uint8_t ier = ez80_serialin(priv, EZ80_UART_IER); - + if (enable) { #ifndef CONFIG_SUPPRESS_SERIAL_INTS @@ -766,7 +766,7 @@ int up_putc(int ch) ez80_serialout(priv, EZ80_UART_THR, (uint8_t)ch); /* Wait for the character to be sent before re-enabling interrupts */ - + ez80_waittxready(priv); ez80_restoreuartint(priv, ier); return ch; diff --git a/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c b/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c index 7280835d1..0f2409b9c 100644 --- a/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c +++ b/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c @@ -105,7 +105,7 @@ void up_sigdeliver(void) regs[XCPT_I] = rtcb->xcp.saved_i; /* Get a local copy of the sigdeliver function pointer. We do this so - * that we can nullify the sigdeliver function pointer in the TCB and + * that we can nullify the sigdeliver function pointer in the TCB and * accept more signal deliveries while processing the current pending * signals. */ diff --git a/nuttx/arch/z80/src/ez80/ez80_spi.c b/nuttx/arch/z80/src/ez80/ez80_spi.c index 260bdc777..8a6eab663 100644 --- a/nuttx/arch/z80/src/ez80/ez80_spi.c +++ b/nuttx/arch/z80/src/ez80/ez80_spi.c @@ -174,7 +174,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) * * BRG >= System Clock Frequency / (2 * SPIR) */ - + uint32_t brg = ((EZ80_SYS_CLK_FREQ+1)/2 + frequency - 1) / frequency; /* "When configured as a Master, the 16-bit divisor value must be between diff --git a/nuttx/arch/z80/src/ez80/ez80_timerisr.c b/nuttx/arch/z80/src/ez80/ez80_timerisr.c index d29237e54..3cb3d029d 100644 --- a/nuttx/arch/z80/src/ez80/ez80_timerisr.c +++ b/nuttx/arch/z80/src/ez80/ez80_timerisr.c @@ -79,7 +79,7 @@ int up_timerisr(int irq, chipreg_t *regs) volatile uint8_t reg; /* Read the appropropriate timer0 registr to clear the interrupt */ - + #ifdef _EZ80F91 reg = inp(EZ80_TMR0_IIR); #else @@ -91,7 +91,7 @@ int up_timerisr(int irq, chipreg_t *regs) /* Process timer interrupt */ sched_process_timer(); - + /* Architecture specific hook into the timer interrupt handler */ #ifdef CONFIG_ARCH_TIMERHOOK @@ -147,7 +147,7 @@ void up_timerinit(void) outp(EZ80_TMR0_RRL, (uint8_t)(reload)); /* Clear any pending timer interrupts */ - + #if defined(_EZ80F91) reg = inp(EZ80_TMR0_IIR); #elif defined(_EZ80L92) || defined(_EZ80F92) ||defined(_EZ80F93) diff --git a/nuttx/arch/z80/src/ez80/ez80_vectors.asm b/nuttx/arch/z80/src/ez80/ez80_vectors.asm index eaec4b36f..107b570c4 100644 --- a/nuttx/arch/z80/src/ez80/ez80_vectors.asm +++ b/nuttx/arch/z80/src/ez80/ez80_vectors.asm @@ -137,71 +137,71 @@ _nmi: ; Symbol Val VecNo Addr ;----------------- --- ----- ----- _ez80_handlers: - irqhandler 0 ; EZ80_EMACRX_IRQ 0 0 0x040 + irqhandler 0 ; EZ80_EMACRX_IRQ 0 0 0x040 handlersize equ $-_ez80handlers - irqhandler 1 ; EZ80_EMACTX_IRQ 1 1 0x044 - irqhandler 2 ; EZ80_EMACSYS_IRQ 2 2 0x048 - irqhandler 3 ; EZ80_PLL_IRQ 3 3 0x04c - irqhandler 4 ; EZ80_FLASH_IRQ 4 4 0x050 - irqhandler 5 ; EZ80_TIMER0_IRQ 5 5 0x054 - irqhandler 6 ; EZ80_TIMER1_IRQ 6 6 0x058 - irqhandler 7 ; EZ80_TIMER2_IRQ 7 7 0x05c - irqhandler 8 ; EZ80_TIMER3_IRQ 8 8 0x060 - irqhandler EZ80_UNUSED ; 9 0x064 - irqhandler EZ80_UNUSED+1 ; 10 0x068 - irqhandler 9 ; EZ80_RTC_IRQ 9 11 0x06C - irqhandler 10 ; EZ80_UART0_IRQ 10 12 0x070 - irqhandler 11 ; EZ80_UART1_IRQ 11 13 0x074 - irqhandler 12 ; EZ80_I2C_IRQ 12 14 0x078 - irqhandler 13 ; EZ80_SPI_IRQ 13 15 0x07c - irqhandler 14 ; EZ80_PORTA0_IRQ 14 16 0x080 - irqhandler 15 ; EZ80_PORTA1_IRQ 15 17 0x084 - irqhandler 16 ; EZ80_PORTA2_IRQ 16 18 0x088 - irqhandler 17 ; EZ80_PORTA3_IRQ 17 19 0x08c - irqhandler 18 ; EZ80_PORTA4_IRQ 18 20 0x090 - irqhandler 19 ; EZ80_PORTA5_IRQ 19 21 0x094 - irqhandler 20 ; EZ80_PORTA6_IRQ 20 22 0x098 - irqhandler 21 ; EZ80_PORTA7_IRQ 21 23 0x09c - irqhandler 22 ; EZ80_PORTB0_IRQ 22 24 0x0a0 - irqhandler 23 ; EZ80_PORTB1_IRQ 23 25 0x0a4 - irqhandler 24 ; EZ80_PORTB2_IRQ 24 26 0x0a8 - irqhandler 25 ; EZ80_PORTB3_IRQ 25 27 0x0ac - irqhandler 26 ; EZ80_PORTB4_IRQ 26 28 0x0b0 - irqhandler 27 ; EZ80_PORTB5_IRQ 27 29 0x0b4 - irqhandler 28 ; EZ80_PORTB6_IRQ 28 20 0x0b8 - irqhandler 29 ; EZ80_PORTB7_IRQ 29 21 0x0bc - irqhandler 30 ; EZ80_PORTC0_IRQ 30 22 0x0c0 - irqhandler 31 ; EZ80_PORTC1_IRQ 31 23 0x0c4 - irqhandler 32 ; EZ80_PORTC2_IRQ 32 24 0x0c8 - irqhandler 33 ; EZ80_PORTC3_IRQ 33 25 0x0cc - irqhandler 34 ; EZ80_PORTC4_IRQ 34 26 0x0d0 - irqhandler 35 ; EZ80_PORTC5_IRQ 35 27 0x0d4 - irqhandler 36 ; EZ80_PORTC6_IRQ 36 28 0x0d8 - irqhandler 37 ; EZ80_PORTC7_IRQ 37 29 0x0dc - irqhandler 38 ; EZ80_PORTD0_IRQ 38 40 0x0e0 - irqhandler 39 ; EZ80_PORTD1_IRQ 39 41 0x0e4 - irqhandler 40 ; EZ80_PORTD2_IRQ 40 42 0x0e8 - irqhandler 41 ; EZ80_PORTD3_IRQ 41 43 0x0ec - irqhandler 42 ; EZ80_PORTD4_IRQ 42 44 0x0f0 - irqhandler 43 ; EZ80_PORTD5_IRQ 43 45 0x0f4 - irqhandler 44 ; EZ80_PORTD6_IRQ 44 46 0x0f8 - irqhandler 45 ; EZ80_PORTD7_IRQ 45 47 0x0fc - irqhandler EZ80_UNUSED+1 ; 48 0x100 - irqhandler EZ80_UNUSED+2 ; 49 0x104 - irqhandler EZ80_UNUSED+3 ; 50 0x108 - irqhandler EZ80_UNUSED+4 ; 51 0x10c - irqhandler EZ80_UNUSED+5 ; 52 0x110 - irqhandler EZ80_UNUSED+6 ; 53 0x114 - irqhandler EZ80_UNUSED+7 ; 54 0x118 - irqhandler EZ80_UNUSED+8 ; 55 0x11c - irqhandler EZ80_UNUSED+9 ; 56 0x120 - irqhandler EZ80_UNUSED+10 ; 57 0x124 - irqhandler EZ80_UNUSED+11 ; 58 0x128 - irqhandler EZ80_UNUSED+12 ; 59 0x12c - irqhandler EZ80_UNUSED+13 ; 60 0x130 - irqhandler EZ80_UNUSED+14 ; 61 0x134 - irqhandler EZ80_UNUSED+15 ; 62 0x138 - irqhandler EZ80_UNUSED+16 ; 63 0x13c + irqhandler 1 ; EZ80_EMACTX_IRQ 1 1 0x044 + irqhandler 2 ; EZ80_EMACSYS_IRQ 2 2 0x048 + irqhandler 3 ; EZ80_PLL_IRQ 3 3 0x04c + irqhandler 4 ; EZ80_FLASH_IRQ 4 4 0x050 + irqhandler 5 ; EZ80_TIMER0_IRQ 5 5 0x054 + irqhandler 6 ; EZ80_TIMER1_IRQ 6 6 0x058 + irqhandler 7 ; EZ80_TIMER2_IRQ 7 7 0x05c + irqhandler 8 ; EZ80_TIMER3_IRQ 8 8 0x060 + irqhandler EZ80_UNUSED ; 9 0x064 + irqhandler EZ80_UNUSED+1 ; 10 0x068 + irqhandler 9 ; EZ80_RTC_IRQ 9 11 0x06C + irqhandler 10 ; EZ80_UART0_IRQ 10 12 0x070 + irqhandler 11 ; EZ80_UART1_IRQ 11 13 0x074 + irqhandler 12 ; EZ80_I2C_IRQ 12 14 0x078 + irqhandler 13 ; EZ80_SPI_IRQ 13 15 0x07c + irqhandler 14 ; EZ80_PORTA0_IRQ 14 16 0x080 + irqhandler 15 ; EZ80_PORTA1_IRQ 15 17 0x084 + irqhandler 16 ; EZ80_PORTA2_IRQ 16 18 0x088 + irqhandler 17 ; EZ80_PORTA3_IRQ 17 19 0x08c + irqhandler 18 ; EZ80_PORTA4_IRQ 18 20 0x090 + irqhandler 19 ; EZ80_PORTA5_IRQ 19 21 0x094 + irqhandler 20 ; EZ80_PORTA6_IRQ 20 22 0x098 + irqhandler 21 ; EZ80_PORTA7_IRQ 21 23 0x09c + irqhandler 22 ; EZ80_PORTB0_IRQ 22 24 0x0a0 + irqhandler 23 ; EZ80_PORTB1_IRQ 23 25 0x0a4 + irqhandler 24 ; EZ80_PORTB2_IRQ 24 26 0x0a8 + irqhandler 25 ; EZ80_PORTB3_IRQ 25 27 0x0ac + irqhandler 26 ; EZ80_PORTB4_IRQ 26 28 0x0b0 + irqhandler 27 ; EZ80_PORTB5_IRQ 27 29 0x0b4 + irqhandler 28 ; EZ80_PORTB6_IRQ 28 20 0x0b8 + irqhandler 29 ; EZ80_PORTB7_IRQ 29 21 0x0bc + irqhandler 30 ; EZ80_PORTC0_IRQ 30 22 0x0c0 + irqhandler 31 ; EZ80_PORTC1_IRQ 31 23 0x0c4 + irqhandler 32 ; EZ80_PORTC2_IRQ 32 24 0x0c8 + irqhandler 33 ; EZ80_PORTC3_IRQ 33 25 0x0cc + irqhandler 34 ; EZ80_PORTC4_IRQ 34 26 0x0d0 + irqhandler 35 ; EZ80_PORTC5_IRQ 35 27 0x0d4 + irqhandler 36 ; EZ80_PORTC6_IRQ 36 28 0x0d8 + irqhandler 37 ; EZ80_PORTC7_IRQ 37 29 0x0dc + irqhandler 38 ; EZ80_PORTD0_IRQ 38 40 0x0e0 + irqhandler 39 ; EZ80_PORTD1_IRQ 39 41 0x0e4 + irqhandler 40 ; EZ80_PORTD2_IRQ 40 42 0x0e8 + irqhandler 41 ; EZ80_PORTD3_IRQ 41 43 0x0ec + irqhandler 42 ; EZ80_PORTD4_IRQ 42 44 0x0f0 + irqhandler 43 ; EZ80_PORTD5_IRQ 43 45 0x0f4 + irqhandler 44 ; EZ80_PORTD6_IRQ 44 46 0x0f8 + irqhandler 45 ; EZ80_PORTD7_IRQ 45 47 0x0fc + irqhandler EZ80_UNUSED+1 ; 48 0x100 + irqhandler EZ80_UNUSED+2 ; 49 0x104 + irqhandler EZ80_UNUSED+3 ; 50 0x108 + irqhandler EZ80_UNUSED+4 ; 51 0x10c + irqhandler EZ80_UNUSED+5 ; 52 0x110 + irqhandler EZ80_UNUSED+6 ; 53 0x114 + irqhandler EZ80_UNUSED+7 ; 54 0x118 + irqhandler EZ80_UNUSED+8 ; 55 0x11c + irqhandler EZ80_UNUSED+9 ; 56 0x120 + irqhandler EZ80_UNUSED+10 ; 57 0x124 + irqhandler EZ80_UNUSED+11 ; 58 0x128 + irqhandler EZ80_UNUSED+12 ; 59 0x12c + irqhandler EZ80_UNUSED+13 ; 60 0x130 + irqhandler EZ80_UNUSED+14 ; 61 0x134 + irqhandler EZ80_UNUSED+15 ; 62 0x138 + irqhandler EZ80_UNUSED+16 ; 63 0x13c ;************************************************************************** ; Common Interrupt handler diff --git a/nuttx/arch/z80/src/ez80/ez80f91_spi.h b/nuttx/arch/z80/src/ez80/ez80f91_spi.h index 1ef3a755d..16bc4648b 100644 --- a/nuttx/arch/z80/src/ez80/ez80f91_spi.h +++ b/nuttx/arch/z80/src/ez80/ez80f91_spi.h @@ -105,7 +105,7 @@ extern "C" { * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) are * provided by common logic. To use this common SPI logic on your board: * - * 1. Provide ez80_spiselect() and ez80_spistatus() functions in your board-specific + * 1. Provide ez80_spiselect() and ez80_spistatus() functions in your board-specific * logic. This function will perform chip selection and status operations using * GPIOs in the way your board is configured. * 2. If CONFIG_SPI_CMDDATA is defined in your NuttX configuration, provide the diff --git a/nuttx/arch/z80/src/z180/Make.defs b/nuttx/arch/z80/src/z180/Make.defs index 24d2cb64a..ad658094b 100644 --- a/nuttx/arch/z80/src/z180/Make.defs +++ b/nuttx/arch/z80/src/z180/Make.defs @@ -41,8 +41,8 @@ HEAD_ASRC = z180_head.asm endif endif -CMN_ASRCS = -CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_createstack.c +CMN_ASRCS = +CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_createstack.c CMN_CSRCS += up_doirq.c up_exit.c up_idle.c up_initialize.c CMN_CSRCS += up_interruptcontext.c up_mdelay.c up_releasepending.c CMN_CSRCS += up_releasestack.c up_reprioritizertr.c up_unblocktask.c diff --git a/nuttx/arch/z80/src/z180/README.txt b/nuttx/arch/z80/src/z180/README.txt index c06164cdd..b088470b6 100644 --- a/nuttx/arch/z80/src/z180/README.txt +++ b/nuttx/arch/z80/src/z180/README.txt @@ -46,4 +46,4 @@ z180_saveusercontext.asm, switch z180_schedulesigaction.c and z180_sigdeliver.c These files implement Z180 signal handling. - + diff --git a/nuttx/arch/z80/src/z180/z180_mmu.c b/nuttx/arch/z80/src/z180/z180_mmu.c index d6ed1ebcf..4306eaf5f 100644 --- a/nuttx/arch/z80/src/z180/z180_mmu.c +++ b/nuttx/arch/z80/src/z180/z180_mmu.c @@ -241,7 +241,7 @@ int up_addrenv_create(size_t envsize, FAR task_addrenv_t *addrenv) sdbg("ERROR: npages is zero\n"); return OK; } - + /* Allocate a structure in the common .bss to hold information about the * task's address environment. NOTE that this is not a part of the TCB, * but rather a break-away structure that can be shared by the task as @@ -287,7 +287,7 @@ int up_addrenv_create(size_t envsize, FAR task_addrenv_t *addrenv) errout_with_cbr: z180_mmu_freecbr(cbr); - + errout_with_irq: irqrestore(flags); return ret; diff --git a/nuttx/arch/z80/src/z180/z180_registerdump.c b/nuttx/arch/z80/src/z180/z180_registerdump.c index 17a44b059..ad67f12a3 100644 --- a/nuttx/arch/z80/src/z180/z180_registerdump.c +++ b/nuttx/arch/z80/src/z180/z180_registerdump.c @@ -52,7 +52,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z80/src/z180/z180_scc.c b/nuttx/arch/z80/src/z180/z180_scc.c index a2f0d4561..29d0c5239 100644 --- a/nuttx/arch/z80/src/z180/z180_scc.c +++ b/nuttx/arch/z80/src/z180/z180_scc.c @@ -278,7 +278,7 @@ static uart_dev_t g_escca_port = */ #undef CONSOLE_DEV -#undef TTYS0_DEV +#undef TTYS0_DEV #undef TTYS1_DEV #if defined(CONFIG_Z180_SCC_SERIAL_CONSOLE) diff --git a/nuttx/arch/z80/src/z180/z180_timerisr.c b/nuttx/arch/z80/src/z180/z180_timerisr.c index ceb7efb5f..bf041519e 100644 --- a/nuttx/arch/z80/src/z180/z180_timerisr.c +++ b/nuttx/arch/z80/src/z180/z180_timerisr.c @@ -98,7 +98,7 @@ int up_timerisr(int irq, chipreg_t *regs) /* "When TMDR0 decrements to 0, TIF0 is set to 1. This generates an interrupt * request if enabled by TIE0 = 1. TIF0 is reset to 0 when TCR is read and - * the higher or lower byte of TMDR0 is read." + * the higher or lower byte of TMDR0 is read." */ regval = inp(Z180_PRT_TCR); diff --git a/nuttx/arch/z80/src/z8/Make.defs b/nuttx/arch/z80/src/z8/Make.defs index 5d7a338be..781c82182 100644 --- a/nuttx/arch/z80/src/z8/Make.defs +++ b/nuttx/arch/z80/src/z8/Make.defs @@ -35,7 +35,7 @@ HEAD_SSRC = z8_head.S -CMN_SSRCS = +CMN_SSRCS = CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c \ up_releasestack.c up_interruptcontext.c up_blocktask.c \ up_unblocktask.c up_exit.c up_releasepending.c \ diff --git a/nuttx/arch/z80/src/z8/z8_head.S b/nuttx/arch/z80/src/z8/z8_head.S index bdd6593e0..9316c7f64 100755 --- a/nuttx/arch/z80/src/z8/z8_head.S +++ b/nuttx/arch/z80/src/z8/z8_head.S @@ -49,7 +49,7 @@ /* Assume the large model */ -#if !defined(CONFIG_Z8_MODEL_LARGE) && !defined(CONFIG_Z8_MODEL_SMALL) +#if !defined(CONFIG_Z8_MODEL_LARGE) && !defined(CONFIG_Z8_MODEL_SMALL) # define CONFIG_Z8_MODEL_LARGE 1 # undef CONFIG_Z8_MODEL_SMALL #endif @@ -96,7 +96,7 @@ **************************************************************************/ segment CODE - + /************************************************************************** * Interrupt Vectors **************************************************************************/ @@ -222,7 +222,7 @@ _z8_reset10: /* Start NuttX */ - ldx __intrp,#0 + ldx __intrp,#0 xor r15, r15 xor r14, r14 call _os_start diff --git a/nuttx/arch/z80/src/z8/z8_i2c.c b/nuttx/arch/z80/src/z8/z8_i2c.c index 59cd2fc2b..6239ad25b 100644 --- a/nuttx/arch/z80/src/z8/z8_i2c.c +++ b/nuttx/arch/z80/src/z8/z8_i2c.c @@ -160,7 +160,7 @@ static void i2c_semtake(void) static void i2c_waittxempty(void) { - int i; + int i; for (i = 0; i < 10000 && (I2CSTAT & I2C_STAT_TDRE) == 0; i++); } @@ -178,7 +178,7 @@ static void i2c_waittxempty(void) * ****************************************************************************/ -static void i2c_waitrxavail(void) +static void i2c_waitrxavail(void) { int i; for (i = 0; i <= 10000 && (I2CSTAT & (I2C_STAT_RDRF | I2C_STAT_NCKI)) == 0; i++); @@ -365,7 +365,7 @@ static int i2c_write(FAR struct i2c_dev_s *dev, const uint8_t *buffer, int bufle I2CD = I2C_WRITEADDR8(priv->addr); I2CCTL |= I2C_CTL_START; - + /* Wait for the xmt buffer to become empty */ i2c_waittxempty(); @@ -385,7 +385,7 @@ static int i2c_write(FAR struct i2c_dev_s *dev, const uint8_t *buffer, int bufle * the last bit.. Hmmm. If this true then we will never be * able to send more than one data byte??? */ - + if (count == 1) { I2CCTL |= I2C_CTL_STOP; @@ -470,7 +470,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) /* Retry as necessary to receive the whole message */ - for (retry = 0; retry < 100; retry++) + for (retry = 0; retry < 100; retry++) { /* Load the address into the transmit register. It is not sent * until the START bit is set. @@ -481,7 +481,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) /* If we want only a single byte of data, then set the NACK * bit now. */ - + I2CCTL |= I2C_CTL_NAK; /* The START bit begins the transaction */ @@ -553,7 +553,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) * Description: * Initialize the selected I2C port. And return a unique instance of struct * struct i2c_dev_s. This function may be called to obtain multiple - * instances of the interface, each of which may be set up with a + * instances of the interface, each of which may be set up with a * different frequency and slave address. * * Input Parameter: @@ -567,7 +567,7 @@ static int i2c_read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen) FAR struct i2c_dev_s *up_i2cinitialize(int port) { FAR struct z8_i2cdev_s *i2c; - + if (!g_initialized) { /* Set up some initial BRG value */ @@ -578,7 +578,7 @@ FAR struct i2c_dev_s *up_i2cinitialize(int port) /* Make sure that GPIOs are configured for the alternate function (this * varies with silicon revisions). */ - + PAADDR = 0x02; PACTL |= 0xc0; @@ -603,4 +603,4 @@ FAR struct i2c_dev_s *up_i2cinitialize(int port) } return (FAR struct i2c_dev_s *)i2c; -} +} diff --git a/nuttx/arch/z80/src/z8/z8_lowuart.c b/nuttx/arch/z80/src/z8/z8_lowuart.c index 730ed1b4c..ad4acb6e9 100644 --- a/nuttx/arch/z80/src/z8/z8_lowuart.c +++ b/nuttx/arch/z80/src/z8/z8_lowuart.c @@ -112,7 +112,7 @@ void up_lowserialinit(void) putreg8(brg & 0xff, U1BRL); /* Configure GPIO Port D pins 4 & 5 for alternate function */ - + putreg8(0x02, PAADDR); val = getreg8(PDCTL) | 0x30; /* Set bits in alternate function register */ putreg8(val, PDCTL); diff --git a/nuttx/arch/z80/src/z8/z8_registerdump.c b/nuttx/arch/z80/src/z8/z8_registerdump.c index f1ce13a24..d1319f93b 100644 --- a/nuttx/arch/z80/src/z8/z8_registerdump.c +++ b/nuttx/arch/z80/src/z8/z8_registerdump.c @@ -53,7 +53,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z80/src/z8/z8_serial.c b/nuttx/arch/z80/src/z8/z8_serial.c index 8e809988c..7dcf2f258 100644 --- a/nuttx/arch/z80/src/z8/z8_serial.c +++ b/nuttx/arch/z80/src/z8/z8_serial.c @@ -244,7 +244,7 @@ static uart_dev_t g_uart1port = /**************************************************************************** * Name: z8_putuart ****************************************************************************/ - + static inline void z8_putuart(FAR struct z8_uart_s *priv, uint8_t value, uint8_t offset) { @@ -254,7 +254,7 @@ static inline void z8_putuart(FAR struct z8_uart_s *priv, uint8_t value, /**************************************************************************** * Name: z8_getuart ****************************************************************************/ - + static inline uint8_t z8_getuart(FAR struct z8_uart_s *priv, uint8_t offset) { return getreg8(*(priv->uartbase + offset)); @@ -338,7 +338,7 @@ void z8_uartconfigure(void) #ifdef EZ8_UART1 /* Configure GPIO Port D pins 4 & 5 for alternate function */ - + putreg8(0x02, PAADDR); val = getreg8(PDCTL) | 0x30; /* Set bits in alternate function register */ putreg8(val, PDCTL); @@ -759,7 +759,7 @@ int up_putc(int ch) uint8_t state; /* Keep interrupts disabled so that we do not interfere with normal - * driver operation + * driver operation */ state = z8_disableuartirq(&CONSOLE_DEV); diff --git a/nuttx/arch/z80/src/z8/z8_timerisr.c b/nuttx/arch/z80/src/z8/z8_timerisr.c index 0ed61e283..14009fe2e 100644 --- a/nuttx/arch/z80/src/z8/z8_timerisr.c +++ b/nuttx/arch/z80/src/z8/z8_timerisr.c @@ -98,7 +98,7 @@ int up_timerisr(int irq, uint32_t *regs) void up_timerinit(void) { uint32_t reload; - + up_disable_irq(Z8_IRQ_SYSTIMER); /* Write to the timer control register to disable the timer, configure diff --git a/nuttx/arch/z80/src/z8/z8_vector.S b/nuttx/arch/z80/src/z8/z8_vector.S index 180241521..7c4761d04 100755 --- a/nuttx/arch/z80/src/z8/z8_vector.S +++ b/nuttx/arch/z80/src/z8/z8_vector.S @@ -228,7 +228,7 @@ endif xdef _z8_p4ap0a_handler xdef _z8_potrap_handler xdef _z8_wotrap_handler -#endif +#endif /************************************************************************** * Macros @@ -430,7 +430,7 @@ endif vector P4A = _z8_p4ap0a_handler vector POTRAP = _z8_potrap_handler vector WOTRAP = _z8_wotrap_handler -#endif +#endif /************************************************************************** * Name: _z16f_*_handler @@ -724,7 +724,7 @@ _z8_potrap_handler: ENTER(Z8_POTRAP_IRQ) _z8_wotrap_handler: ENTER(Z8_WOTRAP_IRQ) -#endif +#endif /************************************************************************** * Name: _z16f_common_handler diff --git a/nuttx/arch/z80/src/z80/Make.defs b/nuttx/arch/z80/src/z80/Make.defs index 4f8c291c4..c60e88be6 100644 --- a/nuttx/arch/z80/src/z80/Make.defs +++ b/nuttx/arch/z80/src/z80/Make.defs @@ -41,7 +41,7 @@ HEAD_ASRC = z80_head.asm endif endif -CMN_ASRCS = +CMN_ASRCS = CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c \ up_releasestack.c up_interruptcontext.c up_blocktask.c \ up_unblocktask.c up_exit.c up_releasepending.c \ diff --git a/nuttx/arch/z80/src/z80/README.txt b/nuttx/arch/z80/src/z80/README.txt index df8b36de9..f81605475 100644 --- a/nuttx/arch/z80/src/z80/README.txt +++ b/nuttx/arch/z80/src/z80/README.txt @@ -8,42 +8,41 @@ sub-directory contains logic unique to the classic Z80 chip. Files in this directory include: z80_head.asm - This is the main entry point into the Z80 program. This includes the - handler for the RESET, power-up interrupt vector and address zero and all - RST interrupts. + This is the main entry point into the Z80 program. This includes the + handler for the RESET, power-up interrupt vector and address zero and all + RST interrupts. z80_rom.asm - Some architectures may have ROM located at address zero. In this case, a - special version of the "head" logic must be used. This special "head" - file is probably board-specific and, hence, belongs in the board-specific - configs/<board-name>/src directory. This file may, however, be used as - a model for such a board-specific file. - - z80_rom.S is enabled by specifying CONFIG_LINKER_ROM_AT_0000 in the - configuration file. - - A board specific version in the configs/<board-name>/src directory can be - used by: - - 1. Define CONFIG_ARCH_HAVEHEAD - 2. Add the board-specific head file, say <filename>.asm, to - configs/<board-name>/src - 3. Add a file called Make.defs in the configs/<board-name>/src directory - containing the line: HEAD_ASRC = <file-name>.asm + Some architectures may have ROM located at address zero. In this case, a + special version of the "head" logic must be used. This special "head" + file is probably board-specific and, hence, belongs in the board-specific + configs/<board-name>/src directory. This file may, however, be used as + a model for such a board-specific file. + + z80_rom.S is enabled by specifying CONFIG_LINKER_ROM_AT_0000 in the + configuration file. + + A board specific version in the configs/<board-name>/src directory can be + used by: + + 1. Define CONFIG_ARCH_HAVEHEAD + 2. Add the board-specific head file, say <filename>.asm, to + configs/<board-name>/src + 3. Add a file called Make.defs in the configs/<board-name>/src directory + containing the line: HEAD_ASRC = <file-name>.asm Make.defs - This is the standard makefile fragment that must be provided in all - chip directories. This fragment identifies the chip-specific file to - be used in building libarch. + This is the standard makefile fragment that must be provided in all + chip directories. This fragment identifies the chip-specific file to + be used in building libarch. chip.h - This is the standard header file that must be provided in all chip - directories. + This is the standard header file that must be provided in all chip + directories. z80_initialstate.c, z80_copystate.c, z80_restoreusercontext.asm, and z80_saveusercontext.asm, switch - These files implement the Z80 context switching logic + These files implement the Z80 context switching logic z80_schedulesigaction.c and z80_sigdeliver.c - These files implement Z80 signal handling. -
\ No newline at end of file + These files implement Z80 signal handling. diff --git a/nuttx/arch/z80/src/z80/z80_head.asm b/nuttx/arch/z80/src/z80/z80_head.asm index 7074461c2..4dadc5ba4 100644 --- a/nuttx/arch/z80/src/z80/z80_head.asm +++ b/nuttx/arch/z80/src/z80/z80_head.asm @@ -78,7 +78,7 @@ ; 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/arch/z80/src/z80/z80_registerdump.c b/nuttx/arch/z80/src/z80/z80_registerdump.c index 7bf21a26f..a3271e61e 100644 --- a/nuttx/arch/z80/src/z80/z80_registerdump.c +++ b/nuttx/arch/z80/src/z80/z80_registerdump.c @@ -52,7 +52,7 @@ * Definitions ****************************************************************************/ -/* Output debug info if stack dump is selected -- even if +/* Output debug info if stack dump is selected -- even if * debug is not selected. */ diff --git a/nuttx/arch/z80/src/z80/z80_rom.asm b/nuttx/arch/z80/src/z80/z80_rom.asm index 70e698bf0..abc450bcd 100644 --- a/nuttx/arch/z80/src/z80/z80_rom.asm +++ b/nuttx/arch/z80/src/z80/z80_rom.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/binfmt/Makefile b/nuttx/binfmt/Makefile index 2f692beb1..4e4ad931a 100644 --- a/nuttx/binfmt/Makefile +++ b/nuttx/binfmt/Makefile @@ -41,7 +41,7 @@ INCDIROPT = -w endif CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(TOPDIR)$(DELIM)sched"} -# Basic BINFMT source files +# Basic BINFMT source files BINFMT_ASRCS = BINFMT_CSRCS = binfmt_globals.c binfmt_register.c binfmt_unregister.c @@ -63,7 +63,7 @@ BINFMT_CSRCS += symtab_findorderedbyname.c symtab_findorderedbyvalue.c # Add configured binary modules -VPATH = +VPATH = SUBDIRS = DEPPATH = --dep-path . diff --git a/nuttx/binfmt/binfmt_exepath.c b/nuttx/binfmt/binfmt_exepath.c index 4fd7ad918..5da242b4c 100644 --- a/nuttx/binfmt/binfmt_exepath.c +++ b/nuttx/binfmt/binfmt_exepath.c @@ -152,7 +152,7 @@ EXEPATH_HANDLE exepath_init(void) * * Input Parameters: * handle - The handle value returned by exepath_init - * relpath - The relative path to the file to be found. + * relpath - The relative path to the file to be found. * * Returned Value: * On success, a non-NULL pointer to a null-terminated string is provided. diff --git a/nuttx/binfmt/binfmt_loadmodule.c b/nuttx/binfmt/binfmt_loadmodule.c index f5e0f6003..8db96a49b 100644 --- a/nuttx/binfmt/binfmt_loadmodule.c +++ b/nuttx/binfmt/binfmt_loadmodule.c @@ -94,7 +94,7 @@ static int load_default_priority(FAR struct binary_s *bin) bdbg("ERROR: sched_getparam failed: %d\n", errno); return ERROR; } - + /* Save that as the priority of child thread */ bin->priority = param.sched_priority; diff --git a/nuttx/binfmt/binfmt_schedunload.c b/nuttx/binfmt/binfmt_schedunload.c index 8ccca8a00..7e7fa471f 100644 --- a/nuttx/binfmt/binfmt_schedunload.c +++ b/nuttx/binfmt/binfmt_schedunload.c @@ -318,7 +318,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin) { blldbg("ERROR: Failed to remove structure\n"); } - + goto errout; } diff --git a/nuttx/binfmt/binfmt_unloadmodule.c b/nuttx/binfmt/binfmt_unloadmodule.c index 50f8dcb43..0e87d743f 100644 --- a/nuttx/binfmt/binfmt_unloadmodule.c +++ b/nuttx/binfmt/binfmt_unloadmodule.c @@ -153,7 +153,7 @@ int unload_module(FAR const struct binary_s *binp) int ret; #endif int i; - + if (binp) { /* Execute C++ desctructors */ diff --git a/nuttx/binfmt/builtin.c b/nuttx/binfmt/builtin.c index e492f72e5..eb838db92 100644 --- a/nuttx/binfmt/builtin.c +++ b/nuttx/binfmt/builtin.c @@ -128,7 +128,7 @@ static int builtin_loadbinary(struct binary_s *binp) int errval = errno; bdbg("ERROR: %s is not a builtin application\n", filename); return -errval; - + } /* Return the load information. NOTE: that there is no way to configure diff --git a/nuttx/binfmt/libelf/Make.defs b/nuttx/binfmt/libelf/Make.defs index 93d95a23c..670ad01fa 100644 --- a/nuttx/binfmt/libelf/Make.defs +++ b/nuttx/binfmt/libelf/Make.defs @@ -41,7 +41,7 @@ BINFMT_CSRCS += elf.c # ELF library -BINFMT_CSRCS += libelf_bind.c libelf_init.c libelf_addrenv.c libelf_iobuffer.c +BINFMT_CSRCS += libelf_bind.c libelf_init.c libelf_addrenv.c libelf_iobuffer.c BINFMT_CSRCS += libelf_load.c libelf_read.c libelf_sections.c libelf_symbols.c BINFMT_CSRCS += libelf_uninit.c libelf_unload.c libelf_verify.c diff --git a/nuttx/binfmt/libelf/libelf_bind.c b/nuttx/binfmt/libelf/libelf_bind.c index ccdb5108e..8fd52a5e6 100644 --- a/nuttx/binfmt/libelf/libelf_bind.c +++ b/nuttx/binfmt/libelf/libelf_bind.c @@ -290,7 +290,7 @@ int elf_bind(FAR struct elf_loadinfo_s *loadinfo, for (i = 1; i < loadinfo->ehdr.e_shnum; i++) { /* Get the index to the relocation section */ - + int infosec = loadinfo->shdr[i].sh_info; if (infosec >= loadinfo->ehdr.e_shnum) { diff --git a/nuttx/binfmt/libelf/libelf_ctors.c b/nuttx/binfmt/libelf/libelf_ctors.c index af9c7bba4..0dfe64449 100644 --- a/nuttx/binfmt/libelf/libelf_ctors.c +++ b/nuttx/binfmt/libelf/libelf_ctors.c @@ -109,7 +109,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo) /* Find the index to the section named ".ctors." NOTE: On old ABI system, * .ctors is the name of the section containing the list of constructors; - * On newer systems, the similar section is called .init_array. It is + * On newer systems, the similar section is called .init_array. It is * expected that the linker script will force the section name to be ".ctors" * in either case. */ @@ -204,7 +204,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo) * loaded into memory. Since the .ctors lie in allocated memory, they * will be relocated via the normal mechanism. */ - + loadinfo->ctors = (binfmt_ctor_t*)shdr->sh_addr; } } diff --git a/nuttx/binfmt/libelf/libelf_dtors.c b/nuttx/binfmt/libelf/libelf_dtors.c index 638284f0b..5cbba4851 100644 --- a/nuttx/binfmt/libelf/libelf_dtors.c +++ b/nuttx/binfmt/libelf/libelf_dtors.c @@ -109,7 +109,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo) /* Find the index to the section named ".dtors." NOTE: On old ABI system, * .dtors is the name of the section containing the list of destructors; - * On newer systems, the similar section is called .fini_array. It is + * On newer systems, the similar section is called .fini_array. It is * expected that the linker script will force the section name to be ".dtors" * in either case. */ @@ -204,7 +204,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo) * loaded into memory. Since the .dtors lie in allocated memory, they * will be relocated via the normal mechanism. */ - + loadinfo->dtors = (binfmt_dtor_t*)shdr->sh_addr; } } diff --git a/nuttx/binfmt/libelf/libelf_init.c b/nuttx/binfmt/libelf/libelf_init.c index fa4b7983c..0e0cf8b35 100644 --- a/nuttx/binfmt/libelf/libelf_init.c +++ b/nuttx/binfmt/libelf/libelf_init.c @@ -167,7 +167,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo) { int errval = errno; bdbg("Failed to open ELF binary %s: %d\n", filename, errval); - return -errval; + return -errval; } /* Read the ELF ehdr from offset 0 */ diff --git a/nuttx/binfmt/libelf/libelf_iobuffer.c b/nuttx/binfmt/libelf/libelf_iobuffer.c index b2d54b3ca..14a365d69 100644 --- a/nuttx/binfmt/libelf/libelf_iobuffer.c +++ b/nuttx/binfmt/libelf/libelf_iobuffer.c @@ -83,7 +83,7 @@ int elf_allocbuffer(FAR struct elf_loadinfo_s *loadinfo) if (!loadinfo->iobuffer) { /* No.. allocate one now */ - + loadinfo->iobuffer = (FAR uint8_t *)kmalloc(CONFIG_ELF_BUFFERSIZE); if (!loadinfo->iobuffer) { diff --git a/nuttx/binfmt/libelf/libelf_sections.c b/nuttx/binfmt/libelf/libelf_sections.c index c6b9de286..1b749ba8b 100644 --- a/nuttx/binfmt/libelf/libelf_sections.c +++ b/nuttx/binfmt/libelf/libelf_sections.c @@ -265,7 +265,7 @@ int elf_findsection(FAR struct elf_loadinfo_s *loadinfo, bdbg("elf_sectname failed: %d\n", ret); return ret; } - + /* Check if the name of this section is 'sectname' */ bvdbg("%d. Comparing \"%s\" and .\"%s\"\n", diff --git a/nuttx/binfmt/libelf/libelf_unload.c b/nuttx/binfmt/libelf/libelf_unload.c index f19a32e1b..eadc24b15 100644 --- a/nuttx/binfmt/libelf/libelf_unload.c +++ b/nuttx/binfmt/libelf/libelf_unload.c @@ -86,7 +86,7 @@ int elf_unload(struct elf_loadinfo_s *loadinfo) /* Release memory holding the relocated ELF image */ elf_addrenv_free(loadinfo); - + /* Release memory used to hold static constructors and destructors */ #ifdef CONFIG_BINFMT_CONSTRUCTORS diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld index 3e7057be8..5cc33f6b2 100644 --- a/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld +++ b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld @@ -33,7 +33,7 @@ * ****************************************************************************/ -MEMORY +MEMORY { ISPACE : ORIGIN = 0x0, LENGTH = 2097152 DSPACE : ORIGIN = 0x0, LENGTH = 2097152 diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld index 71e4399ba..9c5c60b40 100644 --- a/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld +++ b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld @@ -33,7 +33,7 @@ * ****************************************************************************/ -MEMORY +MEMORY { ISPACE : ORIGIN = 0x0, LENGTH = 2097152 DSPACE : ORIGIN = 0x0, LENGTH = 2097152 diff --git a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c index 9a7274e1e..a60b3fe31 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c +++ b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c @@ -150,7 +150,7 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize) /* Success... save the fruits of our labor */ loadinfo->dspace = dspace; - dspace->crefs = 1; + dspace->crefs = 1; dspace->region = (FAR uint8_t *)vaddr; return OK; @@ -172,7 +172,7 @@ errout_with_dspace: } loadinfo->dspace = dspace; - dspace->crefs = 1; + dspace->crefs = 1; return OK; #endif } diff --git a/nuttx/binfmt/libnxflat/libnxflat_bind.c b/nuttx/binfmt/libnxflat/libnxflat_bind.c index 816810a46..8e381630e 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_bind.c +++ b/nuttx/binfmt/libnxflat/libnxflat_bind.c @@ -251,7 +251,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo) relocs = (FAR struct nxflat_reloc_s *) (offset - loadinfo->isize + loadinfo->dspace->region); - bvdbg("isize: %08lx dpsace: %p relocs: %p\n", + bvdbg("isize: %08lx dpsace: %p relocs: %p\n", (long)loadinfo->isize, loadinfo->dspace->region, relocs); /* All relocations are performed within the D-Space allocation. If diff --git a/nuttx/binfmt/libnxflat/libnxflat_init.c b/nuttx/binfmt/libnxflat/libnxflat_init.c index add645b54..d0b4e1cd4 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_init.c +++ b/nuttx/binfmt/libnxflat/libnxflat_init.c @@ -113,7 +113,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo) { int errval = errno; bdbg("Failed to open NXFLAT binary %s: %d\n", filename, errval); - return -errval; + return -errval; } /* Read the NXFLAT header from offset 0 */ @@ -143,7 +143,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo) return -ENOEXEC; } - /* Save all of the input values in the loadinfo structure + /* Save all of the input values in the loadinfo structure * and extract some additional information from the xflat * header. Note that the information in the xflat header is in * network order. diff --git a/nuttx/binfmt/libnxflat/libnxflat_load.c b/nuttx/binfmt/libnxflat/libnxflat_load.c index 5f13b577a..886c16147 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_load.c +++ b/nuttx/binfmt/libnxflat/libnxflat_load.c @@ -195,7 +195,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo) bdbg("Failed to read .data section: %d\n", ret); goto errout; } - + bvdbg("TEXT: %08x Entry point offset: %08x Data offset: %08x\n", loadinfo->ispace, loadinfo->entryoffs, doffset); diff --git a/nuttx/binfmt/libnxflat/libnxflat_verify.c b/nuttx/binfmt/libnxflat/libnxflat_verify.c index 20af5d2f7..e645fdf92 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_verify.c +++ b/nuttx/binfmt/libnxflat/libnxflat_verify.c @@ -84,11 +84,11 @@ int nxflat_verifyheader(const struct nxflat_hdr_s *header) } /* Check the FLT header -- magic number and revision. - * + * * If the magic number does not match. Just return * silently. This is not our binary. */ - + if (strncmp(header->h_magic, NXFLAT_MAGIC, 4) != 0) { bdbg("Unrecognized magic=\"%c%c%c%c\"\n", 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. * diff --git a/nuttx/fs/binfs/fs_binfs.c b/nuttx/fs/binfs/fs_binfs.c index 56ea472af..a130a0199 100644 --- a/nuttx/fs/binfs/fs_binfs.c +++ b/nuttx/fs/binfs/fs_binfs.c @@ -210,7 +210,7 @@ static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) if (cmd == FIOC_FILENAME) { - /* IN: FAR char const ** pointer + /* IN: FAR char const ** pointer * OUT: Pointer to a persistent file name (Guaranteed to persist while * the file is open). */ diff --git a/nuttx/fs/fat/fs_writefat.c b/nuttx/fs/fat/fs_writefat.c index 1d58db5f2..29dce1052 100644 --- a/nuttx/fs/fat/fs_writefat.c +++ b/nuttx/fs/fat/fs_writefat.c @@ -115,12 +115,12 @@ static inline void mkfatfs_initmbr(FAR struct fat_format_s *fmt, MBR_PUTTOTSEC16(var->fv_sect, (uint16_t)fmt->ff_nsectors); } - /* 1@21: Media code: f0, f8, f9-fa, fc-ff */ + /* 1@21: Media code: f0, f8, f9-fa, fc-ff */ MBR_PUTMEDIA(var->fv_sect, FAT_DEFAULT_MEDIA_TYPE); /* Only "hard drive" supported */ - + /* 2@22: FAT12/16: Must be 0, see BS32_FATSZ32 -- handled in FAT specific logic */ - + /* 2@24: Sectors per track geometry value and 2@26: Number of heads geometry value */ MBR_PUTSECPERTRK(var->fv_sect, FAT_DEFAULT_SECPERTRK); @@ -177,7 +177,7 @@ static inline void mkfatfs_initmbr(FAR struct fat_format_s *fmt, MBR_PUTFATSZ32(var->fv_sect, var->fv_nfatsects); - /* 2@40: 0-3:Active FAT, 7=0 both FATS, 7=1 one FAT -- left zero*/ + /* 2@40: 0-3:Active FAT, 7=0 both FATS, 7=1 one FAT -- left zero*/ /* 2@42: MSB:Major LSB:Minor revision number (0.0) -- left zero */ /* 4@44: Cluster no. of 1st cluster of root dir */ @@ -195,7 +195,7 @@ static inline void mkfatfs_initmbr(FAR struct fat_format_s *fmt, /* 1@64: Drive number for MSDOS bootstrap -- left zero */ /* 1@65: Reserved (zero) */ /* 1@66: Extended boot signature: 0x29 if following valid */ - + MBR_PUTBOOTSIG32(var->fv_sect, EXTBOOT_SIGNATURE); /* 4@67: Volume serial number */ @@ -286,7 +286,7 @@ static inline void mkfatfs_initrootdir(FAR struct fat_format_s *fmt, if (sectno == 0) { /* It is only necessary to set data in the first sector of the directory */ - + if (memcmp(fmt->ff_volumelabel, " ", 11)) { memcpy(&var->fv_sect[DIR_NAME], fmt->ff_volumelabel, 11); @@ -337,7 +337,7 @@ static inline int mkfatfs_writembr(FAR struct fat_format_s *fmt, { ret = DEV_WRITE(var->fv_sect, sectno, 1); } - + /* Write FAT32-specific sectors */ if (ret >= 0 && fmt->ff_fattype == 32) diff --git a/nuttx/fs/fs_fcntl.c b/nuttx/fs/fs_fcntl.c index db814f210..1ac9f070a 100644 --- a/nuttx/fs/fs_fcntl.c +++ b/nuttx/fs/fs_fcntl.c @@ -162,7 +162,7 @@ static inline int file_vfcntl(int fd, int cmd, va_list ap) case F_SETOWN: /* If fd refers to a socket, set the process or process group ID specified * to receive SIGURG signals when out-of-band data is available, using the value - * of the third argument, arg, taken as type int. Positive values indicate a + * of the third argument, arg, taken as type int. Positive values indicate a * process ID; negative values, other than -1, indicate a process group ID. If * fd does not refer to a socket, the results are unspecified. */ diff --git a/nuttx/fs/fs_fdopen.c b/nuttx/fs/fs_fdopen.c index 6544ee2b8..0b1b4338a 100644 --- a/nuttx/fs/fs_fdopen.c +++ b/nuttx/fs/fs_fdopen.c @@ -79,7 +79,7 @@ static inline int fs_checkfd(FAR struct tcb_s *tcb, int fd, int oflags) * called attempts to explictly stdin with fdopen(0) but stdin has * been closed. */ - + inode = flist->fl_files[fd].f_inode; if (!inode) { @@ -153,7 +153,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb) * Is this fd in the range of valid file descriptors? Socket descriptors * lie in a different range. */ - + #if CONFIG_NFILE_DESCRIPTORS > 0 if ((unsigned int)fd >= CONFIG_NFILE_DESCRIPTORS) #endif diff --git a/nuttx/fs/fs_files.c b/nuttx/fs/fs_files.c index e20e0e9ef..aff33d2bc 100644 --- a/nuttx/fs/fs_files.c +++ b/nuttx/fs/fs_files.c @@ -302,7 +302,7 @@ errout: * Name: files_allocate * * Description: - * Allocate a struct files instance and associate it with an inode instance. + * Allocate a struct files instance and associate it with an inode instance. * Returns the file descriptor == index into the files array. * ****************************************************************************/ diff --git a/nuttx/fs/fs_stat.c b/nuttx/fs/fs_stat.c index 4df25028f..109074dc6 100644 --- a/nuttx/fs/fs_stat.c +++ b/nuttx/fs/fs_stat.c @@ -109,7 +109,7 @@ static inline int statpseudo(FAR struct inode *inode, FAR struct stat *buf) static inline int statroot(FAR struct stat *buf) { /* There is no inode associated with the fake root directory */ - + memset(buf, 0, sizeof(struct stat) ); buf->st_mode = S_IFDIR|S_IROTH|S_IRGRP|S_IRUSR; return OK; diff --git a/nuttx/fs/fs_syslog.c b/nuttx/fs/fs_syslog.c index 12a3414c7..f17a1b0d6 100644 --- a/nuttx/fs/fs_syslog.c +++ b/nuttx/fs/fs_syslog.c @@ -178,7 +178,7 @@ static inline void syslog_givesem(void) g_sysdev.sl_holder = NO_HOLDER; sem_post(&g_sysdev.sl_sem); } - + /**************************************************************************** * Name: syslog_write * @@ -215,7 +215,7 @@ static inline void syslog_flush(void) if (INODE_IS_MOUNTPT(inode) && inode->u.i_mops->sync) { /* Yes... synchronize to the stream */ - + (void)inode->u.i_mops->sync(&g_sysdev.sl_file); } } @@ -413,7 +413,7 @@ int syslog_putc(int ch) if (g_sysdev.sl_state != SYSLOG_OPENED) { /* Case (1) and (2) */ - + if (g_sysdev.sl_state == SYSLOG_UNINITIALIZED || g_sysdev.sl_state == SYSLOG_INITIALIZING) { diff --git a/nuttx/fs/mmap/README.txt b/nuttx/fs/mmap/README.txt index 8fd974a24..4f6ba6c31 100644 --- a/nuttx/fs/mmap/README.txt +++ b/nuttx/fs/mmap/README.txt @@ -59,7 +59,7 @@ conditions where mmap() can be supported: c. All mapped files are read-only. You can write to the in-memory image, but the file contents will not change. - + d. There are no access privileges. e. Since there are no processes in NuttX, all mmap() and munmap() diff --git a/nuttx/fs/nfs/nfs.h b/nuttx/fs/nfs/nfs.h index af24357a4..edcfb676c 100644 --- a/nuttx/fs/nfs/nfs.h +++ b/nuttx/fs/nfs/nfs.h @@ -145,5 +145,5 @@ EXTERN void nfs_attrupdate(FAR struct nfsnode *np, #if defined(__cplusplus) } #endif - + #endif /* _NFS_NFS_H */ diff --git a/nuttx/fs/nfs/nfs_proto.h b/nuttx/fs/nfs/nfs_proto.h index 676ee6232..282706f21 100644 --- a/nuttx/fs/nfs/nfs_proto.h +++ b/nuttx/fs/nfs/nfs_proto.h @@ -230,7 +230,7 @@ typedef enum NFFIFO = 7 /* Named FIFO */ } nfstype; -/* File Handle variable is up to 64 bytes for version 3. This structures a +/* File Handle variable is up to 64 bytes for version 3. This structures a * ariable sized and are provided only for setting aside maximum memory * allocations for a file handle. */ @@ -324,7 +324,7 @@ struct nfs_statfs nfsuint64 sf_afiles; uint32_t sf_invarsec; }; - + struct post_attr { uint32_t obj_attributesfalse; @@ -519,12 +519,12 @@ struct MKDIR3resok struct wcc_data dir_wcc; }; -struct RMDIR3args +struct RMDIR3args { struct diropargs3 object; }; -struct RMDIR3resok +struct RMDIR3resok { struct wcc_data dir_wcc; }; @@ -533,7 +533,7 @@ struct RMDIR3resok * only useful in setting aside maximum memory usage for the LOOKUP arguments. */ -struct READDIR3args +struct READDIR3args { struct file_handle dir; /* Variable length */ nfsuint64 cookie; @@ -552,8 +552,8 @@ struct READDIR3args * Cookie (8 bytes) * next entry (4 bytes) */ - -struct READDIR3resok + +struct READDIR3resok { uint32_t attributes_follow; struct nfs_fattr dir_attributes; diff --git a/nuttx/fs/nfs/nfs_util.c b/nuttx/fs/nfs/nfs_util.c index e7d28b3d7..46ee56db6 100644 --- a/nuttx/fs/nfs/nfs_util.c +++ b/nuttx/fs/nfs/nfs_util.c @@ -199,7 +199,7 @@ int nfs_checkmount(struct nfsmount *nmp) * Name: nfs_request * * Desciption: - * Perform the NFS request. On successful receipt, it verifies the NFS level of the + * Perform the NFS request. On successful receipt, it verifies the NFS level of the * returned values. * * Return Value: @@ -305,7 +305,7 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename, *ptr++ = txdr_unsigned(fhandle->length); reqlen += sizeof(uint32_t); - + memcpy(ptr, &fhandle->handle, fhandle->length); reqlen += fhandle->length; ptr += uint32_increment(fhandle->length); diff --git a/nuttx/fs/nfs/nfs_vfsops.c b/nuttx/fs/nfs/nfs_vfsops.c index 2ff4ff9d3..6da88bb2c 100644 --- a/nuttx/fs/nfs/nfs_vfsops.c +++ b/nuttx/fs/nfs/nfs_vfsops.c @@ -1847,7 +1847,7 @@ bad: { kfree(nmp->nm_rpcclnt); } - + kfree(nmp); } diff --git a/nuttx/fs/nfs/rpc_clnt.c b/nuttx/fs/nfs/rpc_clnt.c index 9c2ada4f2..44817eb61 100644 --- a/nuttx/fs/nfs/rpc_clnt.c +++ b/nuttx/fs/nfs/rpc_clnt.c @@ -233,7 +233,7 @@ static int rpcclnt_reply(FAR struct rpcclnt *rpc, int procid, int prog, { fdbg("ERROR: rpcclnt_receive returned: %d\n", error); - /* If we failed because of a timeout, then try sending the CALL + /* If we failed because of a timeout, then try sending the CALL * message again. */ @@ -299,7 +299,7 @@ static uint32_t rpcclnt_newxid(void) * Name: rpcclnt_fmtheader * * Description: - * Format the common part of the call header + * Format the common part of the call header * ****************************************************************************/ @@ -728,7 +728,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog, rpc_statistics(rpcrequests); rpc->rc_timeout = false; - + /* Send the RPC CALL message */ error = rpcclnt_send(rpc, procnum, prog, request, reqlen); diff --git a/nuttx/fs/nfs/xdr_subs.h b/nuttx/fs/nfs/xdr_subs.h index 891af004c..f3f3c58cc 100644 --- a/nuttx/fs/nfs/xdr_subs.h +++ b/nuttx/fs/nfs/xdr_subs.h @@ -51,7 +51,7 @@ ****************************************************************************/ #include <arpa/inet.h> - + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ diff --git a/nuttx/fs/nxffs/Kconfig b/nuttx/fs/nxffs/Kconfig index b666bb1c7..6cc45906a 100644 --- a/nuttx/fs/nxffs/Kconfig +++ b/nuttx/fs/nxffs/Kconfig @@ -83,7 +83,7 @@ config NXFFS_ERASEDSTATE hex "FLASH erased state" default 0xff ---help--- - The erased state of FLASH. + The erased state of FLASH. This must have one of the values of 0xff or 0x00. Default: 0xff. diff --git a/nuttx/fs/nxffs/README.txt b/nuttx/fs/nxffs/README.txt index a10fb97a5..af631a94b 100644 --- a/nuttx/fs/nxffs/README.txt +++ b/nuttx/fs/nxffs/README.txt @@ -1,180 +1,180 @@ -NXFFS README
-^^^^^^^^^^^^
-
-This README file contains information about the implemenation of the NuttX
-wear-leveling FLASH file system, NXFFS.
-
-Contents:
-
- General NXFFS organization
- General operation
- Headers
- NXFFS Limitations
- Multiple Writers
- ioctls
- Things to Do
-
-General NXFFS organization
-==========================
-
-The following example assumes 4 logical blocks per FLASH erase block. The
-actual relationship is determined by the FLASH geometry reported by the MTD
-driver.
-
-ERASE LOGICAL Inodes begin with a inode header. inode may
-BLOCK BLOCK CONTENTS be marked as "deleted," pending re-packing.
- n 4*n --+--------------+
- |BBBBBBBBBBBBBB| Logic block header
- |IIIIIIIIIIIIII| Inodes begin with a inode header
- |DDDDDDDDDDDDDD| Data block containing inode data block
- | (Inode Data) |
- 4*n+1 --+--------------+
- |BBBBBBBBBBBBBB| Logic block header
- |DDDDDDDDDDDDDD| Inodes may consist of multiple data blocks
- | (Inode Data) |
- |IIIIIIIIIIIIII| Next inode header
- | | Possibly a few unused bytes at the end of a block
- 4*n+2 --+--------------+
- |BBBBBBBBBBBBBB| Logic block header
- |DDDDDDDDDDDDDD|
- | (Inode Data) |
- 4*n+3 --+--------------+
- |BBBBBBBBBBBBBB| Logic block header
- |IIIIIIIIIIIIII| Next inode header
- |DDDDDDDDDDDDDD|
- | (Inode Data) |
- n+1 4*(n+1) --+--------------+
- |BBBBBBBBBBBBBB| Logic block header
- | | All FLASH is unused after the end of the final
- | | inode.
- --+--------------+
-
-General operation
-=================
-
- Inodes are written starting at the beginning of FLASH. As inodes are
- deleted, they are marked as deleted but not removed. As new inodes are
- written, allocations proceed to toward the end of the FLASH -- thus,
- supporting wear leveling by using all FLASH blocks equally.
-
- When the FLASH becomes full (no more space at the end of the FLASH), a
- re-packing operation must be performed: All inodes marked deleted are
- finally removed and the remaining inodes are packed at the beginning of
- the FLASH. Allocations then continue at the freed FLASH memory at the
- end of the FLASH.
-
-Headers
-=======
- BLOCK HEADER:
- The block header is used to determine if the block has every been
- formatted and also indicates bad blocks which should never be used.
-
- INODE HEADER:
- Each inode begins with an inode header that contains, among other things,
- the name of the inode, the offset to the first data block, and the
- length of the inode data.
-
- At present, the only kind of inode support is a file. So for now, the
- term file and inode are interchangeable.
-
- INODE DATA HEADER:
- Inode data is enclosed in a data header. For a given inode, there
- is at most one inode data block per logical block. If the inode data
- spans more than one logical block, then the inode data may be enclosed
- in multiple data blocks, one per logical block.
-
-NXFFS Limitations
-=================
-
-This implementation is very simple as, as a result, has several limitations
-that you should be aware before opting to use NXFFS:
-
-1. Since the files are contiguous in FLASH and since allocations always
- proceed toward the end of the FLASH, there can only be one file opened
- for writing at a time. Multiple files may be opened for reading.
-
-2. Files may not be increased in size after they have been closed. The
- O_APPEND open flag is not supported.
-
-3. Files are always written sequential. Seeking within a file opened for
- writing will not work.
-
-4. There are no directories, however, '/' may be used within a file name
- string providing some illusion of directories.
-
-5. Files may be opened for reading or for writing, but not both: The O_RDWR
- open flag is not supported.
-
-6. The re-packing process occurs only during a write when the free FLASH
- memory at the end of the FLASH is exhausted. Thus, occasionally, file
- writing may take a long time.
-
-7. Another limitation is that there can be only a single NXFFS volume
- mounted at any time. This has to do with the fact that we bind to
- an MTD driver (instead of a block driver) and bypass all of the normal
- mount operations.
-
-Multiple Writers
-================
-
-As mentioned in the limitations above, there can be only one file opened
-for writing at a time. If one thread has a file opened for writing and
-another thread attempts to open a file for writing, then that second
-thread will be blocked and will have to wait for the first thread to
-close the file.
-
-Such behavior may or may not be a problem for your application, depending
-(1) how long the first thread keeps the file open for writing and (2) how
-critical the behavior of the second thread is. Note that writing to FLASH
-can always trigger a major FLASH reorganization and, hence, there is no
-way to guarantee the first condition: The first thread may have the file
-open for a long time even if it only intends to write a small amount.
-
-Also note that a deadlock condition would occur if the SAME thread
-attempted to open two files for writing. The thread would would be
-blocked waiting for itself to close the first file.
-
-ioctls
-======
-
-The file system supports to ioctls:
-
-FIOC_REFORMAT: Will force the flash to be erased and a fresh, empty
- NXFFS file system to be written on it.
-FIOC_OPTIMIZE: Will force immediate repacking of the file system. This
- will increase the amount of wear on the FLASH if you use this!
-
-Things to Do
-============
-
-- The statfs() implementation is minimal. It whould have some calcuation
- of the f_bfree, f_bavail, f_files, f_ffree return values.
-- There are too many allocs and frees. More structures may need to be
- pre-allocated.
-- The file name is always extracted and held in allocated, variable-length
- memory. The file name is not used during reading and eliminating the
- file name in the entry structure would improve performance.
-- There is a big inefficiency in reading. On each read, the logic searches
- for the read position from the beginning of the file each time. This
- may be necessary whenever an lseek() is done, but not in general. Read
- performance could be improved by keeping FLASH offset and read positional
- information in the read open file structure.
-- Fault tolerance must be improved. We need to be absolutely certain that
- any FLASH errors do not cause the file system to behavior incorrectly.
-- Wear leveling might be improved (?). Files are re-packed at the front
- of FLASH as part of the clean-up operation. However, that means the files
- that are not modified often become fixed in place at the beginning of
- FLASH. This reduces the size of the pool moving files at the end of the
- FLASH. As the file system becomes more filled with fixed files at the
- front of the device, the level of wear on the blocks at the end of the
- FLASH increases.
-- When the time comes to reorganization the FLASH, the system may be
- inavailable for a long time. That is a bad behavior. What is needed,
- I think, is a garbage collection task that runs periodically so that
- when the big reorganizaiton event occurs, most of the work is already
- done. That garbarge collection should search for valid blocks that no
- longer contain valid data. It should pre-erase them, put them in
- a good but empty state... all ready for file system re-organization.
-
-
-
+NXFFS README +^^^^^^^^^^^^ + +This README file contains information about the implemenation of the NuttX +wear-leveling FLASH file system, NXFFS. + +Contents: + + General NXFFS organization + General operation + Headers + NXFFS Limitations + Multiple Writers + ioctls + Things to Do + +General NXFFS organization +========================== + +The following example assumes 4 logical blocks per FLASH erase block. The +actual relationship is determined by the FLASH geometry reported by the MTD +driver. + +ERASE LOGICAL Inodes begin with a inode header. inode may +BLOCK BLOCK CONTENTS be marked as "deleted," pending re-packing. + n 4*n --+--------------+ + |BBBBBBBBBBBBBB| Logic block header + |IIIIIIIIIIIIII| Inodes begin with a inode header + |DDDDDDDDDDDDDD| Data block containing inode data block + | (Inode Data) | + 4*n+1 --+--------------+ + |BBBBBBBBBBBBBB| Logic block header + |DDDDDDDDDDDDDD| Inodes may consist of multiple data blocks + | (Inode Data) | + |IIIIIIIIIIIIII| Next inode header + | | Possibly a few unused bytes at the end of a block + 4*n+2 --+--------------+ + |BBBBBBBBBBBBBB| Logic block header + |DDDDDDDDDDDDDD| + | (Inode Data) | + 4*n+3 --+--------------+ + |BBBBBBBBBBBBBB| Logic block header + |IIIIIIIIIIIIII| Next inode header + |DDDDDDDDDDDDDD| + | (Inode Data) | + n+1 4*(n+1) --+--------------+ + |BBBBBBBBBBBBBB| Logic block header + | | All FLASH is unused after the end of the final + | | inode. + --+--------------+ + +General operation +================= + + Inodes are written starting at the beginning of FLASH. As inodes are + deleted, they are marked as deleted but not removed. As new inodes are + written, allocations proceed to toward the end of the FLASH -- thus, + supporting wear leveling by using all FLASH blocks equally. + + When the FLASH becomes full (no more space at the end of the FLASH), a + re-packing operation must be performed: All inodes marked deleted are + finally removed and the remaining inodes are packed at the beginning of + the FLASH. Allocations then continue at the freed FLASH memory at the + end of the FLASH. + +Headers +======= + BLOCK HEADER: + The block header is used to determine if the block has every been + formatted and also indicates bad blocks which should never be used. + + INODE HEADER: + Each inode begins with an inode header that contains, among other things, + the name of the inode, the offset to the first data block, and the + length of the inode data. + + At present, the only kind of inode support is a file. So for now, the + term file and inode are interchangeable. + + INODE DATA HEADER: + Inode data is enclosed in a data header. For a given inode, there + is at most one inode data block per logical block. If the inode data + spans more than one logical block, then the inode data may be enclosed + in multiple data blocks, one per logical block. + +NXFFS Limitations +================= + +This implementation is very simple as, as a result, has several limitations +that you should be aware before opting to use NXFFS: + +1. Since the files are contiguous in FLASH and since allocations always + proceed toward the end of the FLASH, there can only be one file opened + for writing at a time. Multiple files may be opened for reading. + +2. Files may not be increased in size after they have been closed. The + O_APPEND open flag is not supported. + +3. Files are always written sequential. Seeking within a file opened for + writing will not work. + +4. There are no directories, however, '/' may be used within a file name + string providing some illusion of directories. + +5. Files may be opened for reading or for writing, but not both: The O_RDWR + open flag is not supported. + +6. The re-packing process occurs only during a write when the free FLASH + memory at the end of the FLASH is exhausted. Thus, occasionally, file + writing may take a long time. + +7. Another limitation is that there can be only a single NXFFS volume + mounted at any time. This has to do with the fact that we bind to + an MTD driver (instead of a block driver) and bypass all of the normal + mount operations. + +Multiple Writers +================ + +As mentioned in the limitations above, there can be only one file opened +for writing at a time. If one thread has a file opened for writing and +another thread attempts to open a file for writing, then that second +thread will be blocked and will have to wait for the first thread to +close the file. + +Such behavior may or may not be a problem for your application, depending +(1) how long the first thread keeps the file open for writing and (2) how +critical the behavior of the second thread is. Note that writing to FLASH +can always trigger a major FLASH reorganization and, hence, there is no +way to guarantee the first condition: The first thread may have the file +open for a long time even if it only intends to write a small amount. + +Also note that a deadlock condition would occur if the SAME thread +attempted to open two files for writing. The thread would would be +blocked waiting for itself to close the first file. + +ioctls +====== + +The file system supports to ioctls: + +FIOC_REFORMAT: Will force the flash to be erased and a fresh, empty + NXFFS file system to be written on it. +FIOC_OPTIMIZE: Will force immediate repacking of the file system. This + will increase the amount of wear on the FLASH if you use this! + +Things to Do +============ + +- The statfs() implementation is minimal. It whould have some calcuation + of the f_bfree, f_bavail, f_files, f_ffree return values. +- There are too many allocs and frees. More structures may need to be + pre-allocated. +- The file name is always extracted and held in allocated, variable-length + memory. The file name is not used during reading and eliminating the + file name in the entry structure would improve performance. +- There is a big inefficiency in reading. On each read, the logic searches + for the read position from the beginning of the file each time. This + may be necessary whenever an lseek() is done, but not in general. Read + performance could be improved by keeping FLASH offset and read positional + information in the read open file structure. +- Fault tolerance must be improved. We need to be absolutely certain that + any FLASH errors do not cause the file system to behavior incorrectly. +- Wear leveling might be improved (?). Files are re-packed at the front + of FLASH as part of the clean-up operation. However, that means the files + that are not modified often become fixed in place at the beginning of + FLASH. This reduces the size of the pool moving files at the end of the + FLASH. As the file system becomes more filled with fixed files at the + front of the device, the level of wear on the blocks at the end of the + FLASH increases. +- When the time comes to reorganization the FLASH, the system may be + inavailable for a long time. That is a bad behavior. What is needed, + I think, is a garbage collection task that runs periodically so that + when the big reorganizaiton event occurs, most of the work is already + done. That garbarge collection should search for valid blocks that no + longer contain valid data. It should pre-erase them, put them in + a good but empty state... all ready for file system re-organization. + + + diff --git a/nuttx/fs/nxffs/nxffs.h b/nuttx/fs/nxffs/nxffs.h index 9b7bdc4ce..5882cf3e3 100644 --- a/nuttx/fs/nxffs/nxffs.h +++ b/nuttx/fs/nxffs/nxffs.h @@ -561,7 +561,7 @@ off_t nxffs_iotell(FAR struct nxffs_volume_s *volume); * Returned Value: * Zero is returned on success. Otherwise, a negated errno indicating the * nature of the failure. - * + * * Defined in nxffs_cache.c * ****************************************************************************/ @@ -603,7 +603,7 @@ void nxffs_freeentry(FAR struct nxffs_entry_s *entry); * offset - The FLASH memory offset to begin searching. * entry - A pointer to memory provided by the caller in which to return * the inode description. - * + * * Returned Value: * Zero is returned on success. Otherwise, a negated errno is returned * that indicates the nature of the failure. @@ -987,7 +987,7 @@ int nxffs_wrblkhdr(FAR struct nxffs_volume_s *volume, * Input Parameters: * volume - Describes the NXFFS volume. * datlen - A memory location to return the data block length. - * + * * Returned Value: * Zero is returned on success. Otherwise, a negated errno is returned * that indicates the nature of the failure. diff --git a/nuttx/fs/procfs/fs_skeleton.c b/nuttx/fs/procfs/fs_skeleton.c index e9b206941..5054cb49b 100644 --- a/nuttx/fs/procfs/fs_skeleton.c +++ b/nuttx/fs/procfs/fs_skeleton.c @@ -449,7 +449,7 @@ static int skel_stat(const char *relpath, struct stat *buf) buf->st_size = 0; buf->st_blksize = 0; buf->st_blocks = 0; - + return ret; } diff --git a/nuttx/fs/smartfs/smartfs_mksmartfs.c b/nuttx/fs/smartfs/smartfs_mksmartfs.c index bdf58b58b..292203979 100644 --- a/nuttx/fs/smartfs/smartfs_mksmartfs.c +++ b/nuttx/fs/smartfs/smartfs_mksmartfs.c @@ -97,7 +97,7 @@ int mksmartfs(FAR const char *pathname) struct smart_format_s fmt; int ret; int x; - uint8_t type; + uint8_t type; struct smart_read_write_s request; /* Find the inode of the block driver indentified by 'source' */ @@ -184,7 +184,7 @@ errout: if (ret < 0) { errno = -ret; - return ERROR; + return ERROR; } return OK; diff --git a/nuttx/fs/smartfs/smartfs_procfs.c b/nuttx/fs/smartfs/smartfs_procfs.c index f1c75c365..9bac410ea 100644 --- a/nuttx/fs/smartfs/smartfs_procfs.c +++ b/nuttx/fs/smartfs/smartfs_procfs.c @@ -446,7 +446,7 @@ static int smartfs_stat(const char *relpath, struct stat *buf) buf->st_size = 0; buf->st_blksize = 0; buf->st_blocks = 0; - + return OK; } diff --git a/nuttx/fs/smartfs/smartfs_smart.c b/nuttx/fs/smartfs/smartfs_smart.c index 50018a443..42878a779 100644 --- a/nuttx/fs/smartfs/smartfs_smart.c +++ b/nuttx/fs/smartfs/smartfs_smart.c @@ -104,7 +104,7 @@ static int smartfs_rename(struct inode *mountpt, const char *oldrelpath, const char *newrelpath); static int smartfs_stat(struct inode *mountpt, const char *relpath, struct stat *buf); -static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs, +static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs, struct smartfs_ofile_s *sf, off_t offset, int whence); @@ -261,12 +261,12 @@ static int smartfs_open(FAR struct file *filep, const char *relpath, } /* Yes... test if the parent directory is valid */ - + if (parentdirsector != 0xFFFF) { /* We can create in the given parent directory */ - ret = smartfs_createentry(fs, parentdirsector, filename, + ret = smartfs_createentry(fs, parentdirsector, filename, SMARTFS_DIRENT_TYPE_FILE, mode, &sf->entry, 0xFFFF); if (ret != OK) @@ -381,7 +381,7 @@ static int smartfs_close(FAR struct file *filep) { /* The file is opened more than once. Just decrement the * reference count and return. */ - + sf->crefs--; goto okout; } @@ -508,7 +508,7 @@ static ssize_t smartfs_read(FAR struct file *filep, char *buffer, size_t buflen) /* Calculate the number of bytes to read into the buffer */ - bytestoread = bytesinsector - (sf->curroffset - + bytestoread = bytesinsector - (sf->curroffset - sizeof(struct smartfs_chain_header_s)); if (bytestoread + bytesread > buflen) { @@ -566,7 +566,7 @@ errout_with_semaphore: * ****************************************************************************/ -static int smartfs_sync_internal(struct smartfs_mountpt_s *fs, +static int smartfs_sync_internal(struct smartfs_mountpt_s *fs, struct smartfs_ofile_s *sf) { struct smart_read_write_s readwrite; @@ -675,7 +675,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer, goto errout_with_semaphore; } - /* First test if we are overwriting an existing location or writing to + /* First test if we are overwriting an existing location or writing to * a new one. */ header = (struct smartfs_chain_header_s *) fs->fs_rwbuffer; @@ -754,7 +754,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer, while (buflen > 0) { - /* We will fill up the current sector. Write data to + /* We will fill up the current sector. Write data to * the current sector first. */ @@ -845,12 +845,12 @@ errout_with_semaphore: * * Description: Performs the logic of the seek function. This is an internal * function because it does not provide semaphore protection and - * therefore must be called from one of the other public + * therefore must be called from one of the other public * interface routines (open, seek, etc.). * ****************************************************************************/ -static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs, +static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs, struct smartfs_ofile_s *sf, off_t offset, int whence) { @@ -910,7 +910,7 @@ static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs, * sector and can skip the search to save time. */ - sectorstartpos = sf->filepos - (sf->curroffset - sizeof(struct + sectorstartpos = sf->filepos - (sf->curroffset - sizeof(struct smartfs_chain_header_s)); if (newpos >= sectorstartpos && newpos < sectorstartpos + fs->fs_llformat.availbytes - sizeof(struct smartfs_chain_header_s)) @@ -919,7 +919,7 @@ static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs, sf->curroffset = sizeof(struct smartfs_chain_header_s) + newpos-sectorstartpos; sf->filepos = newpos; - + return newpos; } @@ -939,7 +939,7 @@ static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs, } header = (struct smartfs_chain_header_s *) fs->fs_rwbuffer; - while ((sf->currsector != SMARTFS_ERASEDSTATE_16BIT) && + while ((sf->currsector != SMARTFS_ERASEDSTATE_16BIT) && (sf->filepos + fs->fs_llformat.availbytes - sizeof(struct smartfs_chain_header_s) < newpos)) { @@ -1182,7 +1182,7 @@ static int smartfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) /* Read sectors and search entries until one found or no more */ - entrysize = sizeof(struct smartfs_entry_header_s) + + entrysize = sizeof(struct smartfs_entry_header_s) + fs->fs_llformat.namesize; while (dir->u.smartfs.fs_currsector != SMARTFS_ERASEDSTATE_16BIT) { @@ -1217,7 +1217,7 @@ static int smartfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) /* This entry isn't valid, skip it */ dir->u.smartfs.fs_curroffset += entrysize; - entry = (struct smartfs_entry_header_s *) + entry = (struct smartfs_entry_header_s *) &fs->fs_rwbuffer[dir->u.smartfs.fs_curroffset]; continue; @@ -1256,7 +1256,7 @@ static int smartfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) header = (struct smartfs_chain_header_s *) fs->fs_rwbuffer; dir->u.smartfs.fs_currsector = SMARTFS_NEXTSECTOR(header); } - + /* Now exit */ ret = OK; @@ -1343,7 +1343,7 @@ static int smartfs_bind(FAR struct inode *blkdriver, const void *data, return -ENOMEM; } - /* If the global semaphore hasn't been initialized, then + /* If the global semaphore hasn't been initialized, then * initialized it now. */ fs->fs_sem = &g_sem; @@ -1589,7 +1589,7 @@ static int smartfs_mkdir(struct inode *mountpt, const char *relpath, mode_t mode /* Create the directory */ - ret = smartfs_createentry(fs, parentdirsector, filename, + ret = smartfs_createentry(fs, parentdirsector, filename, SMARTFS_DIRENT_TYPE_DIR, mode, &entry, 0xFFFF); if (ret != OK) { @@ -1826,14 +1826,14 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath, } /* Test if the new parent directory is valid */ - + if (newparentdirsector != 0xFFFF) { /* We can move to the given parent directory */ mode = oldentry.flags & SMARTFS_DIRENT_MODE; type = oldentry.flags & SMARTFS_DIRENT_TYPE; - ret = smartfs_createentry(fs, newparentdirsector, newfilename, + ret = smartfs_createentry(fs, newparentdirsector, newfilename, type, mode, &newentry, oldentry.firstsector); if (ret != OK) { @@ -1859,7 +1859,7 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath, #else direntry->flags |= SMARTFS_DIRENT_ACTIVE; #endif - + /* Now write the updated flags back to the device */ readwrite.offset = oldentry.doffset; @@ -1935,7 +1935,7 @@ static int smartfs_stat(struct inode *mountpt, const char *relpath, struct stat } /* Initialize the stat structure */ - + memset(buf, 0, sizeof(struct stat)); if (entry.firstsector == fs->fs_rootsector) { diff --git a/nuttx/graphics/Kconfig b/nuttx/graphics/Kconfig index aacd1e8c1..6c58478d8 100644 --- a/nuttx/graphics/Kconfig +++ b/nuttx/graphics/Kconfig @@ -194,7 +194,7 @@ config NXFONT_MONO5X8 default n ---help--- Tiny mono-spaced 5x8 font (font ID FONTID_MONO5X8 = 18) - + config NXFONT_SANS17X22 bool "Sans 17x22" default n diff --git a/nuttx/graphics/README.txt b/nuttx/graphics/README.txt index c9f8442b5..1532c66b5 100644 --- a/nuttx/graphics/README.txt +++ b/nuttx/graphics/README.txt @@ -131,7 +131,7 @@ Installing New Fonts Create a new NuttX configuration variable. For example, suppose you define the following variable: CONFIG_NXFONT_MYFONT. Then you would need to: - + 3. Define CONFIG_NXFONT_MYFONT=y in your NuttX configuration file. A font ID number has to be assigned for each new font. The font ID @@ -142,7 +142,7 @@ Installing New Fonts 4. include/nuttx/nx/nxfonts.h. Add you new font as a possible system default font: - + #if defined(CONFIG_NXFONT_SANS23X27) # define NXFONT_DEFAULT FONTID_SANS23X27 #elif defined(CONFIG_NXFONT_MYFONT) @@ -151,7 +151,7 @@ Installing New Fonts Then define the actual font ID. Make sure that the font ID value is unique: - + enum nx_fontid_e { FONTID_DEFAULT = 0 /* The default font */ @@ -162,7 +162,7 @@ Installing New Fonts , FONTID_MYFONT = 2 /* My shiny, new font */ #endif ... - + New Add the font to the NX build system. There are several files that you have to modify to to this. Look how the build system uses the font CONFIG_NXFONT_SANS23X27 for examaples: @@ -229,7 +229,7 @@ Installing New Fonts font. The lookup function is NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid). The new font information needs to be added to data structures used by that function: - + #ifdef CONFIG_NXFONT_SANS23X27 extern const struct nx_fontpackage_s g_sans23x27_package; #endif diff --git a/nuttx/graphics/nxbe/nxbe_bitmap.c b/nuttx/graphics/nxbe/nxbe_bitmap.c index 991b91d82..d4f135e0c 100644 --- a/nuttx/graphics/nxbe/nxbe_bitmap.c +++ b/nuttx/graphics/nxbe/nxbe_bitmap.c @@ -145,7 +145,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de return; } - /* Verify that the width of the destination rectangle does not exceed the + /* Verify that the width of the destination rectangle does not exceed the * width of the source bitmap data (taking into account the bitmap origin) */ diff --git a/nuttx/graphics/nxbe/nxbe_move.c b/nuttx/graphics/nxbe/nxbe_move.c index 193b174c2..fe6f3ced7 100644 --- a/nuttx/graphics/nxbe/nxbe_move.c +++ b/nuttx/graphics/nxbe/nxbe_move.c @@ -234,7 +234,7 @@ void nxbe_move(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *rect /* The clip order depends up the direction that the rectangle is being * moved. */ - + if (offset->y < 0) { /* Moving rectangle up */ diff --git a/nuttx/graphics/nxbe/nxbe_setpixel.c b/nuttx/graphics/nxbe/nxbe_setpixel.c index d333b9b76..e9ef77748 100644 --- a/nuttx/graphics/nxbe/nxbe_setpixel.c +++ b/nuttx/graphics/nxbe/nxbe_setpixel.c @@ -141,7 +141,7 @@ void nxbe_setpixel(FAR struct nxbe_window_s *wnd, rect.pt2.x = rect.pt1.x; rect.pt2.y = rect.pt1.y; - + #if CONFIG_NX_NPLANES > 1 for (i = 0; i < wnd->be->vinfo.nplanes; i++) #else diff --git a/nuttx/graphics/nxconsole/Make.defs b/nuttx/graphics/nxconsole/Make.defs index a57b22885..1d583ce89 100644 --- a/nuttx/graphics/nxconsole/Make.defs +++ b/nuttx/graphics/nxconsole/Make.defs @@ -37,12 +37,12 @@ NXCON_ASRCS = NXCON_CSRCS = nx_register.c nxcon_driver.c nxcon_font.c nxcon_putc.c NXCON_CSRCS += nxcon_redraw.c nxcon_register.c nxcon_scroll.c NXCON_CSRCS += nxcon_vt100.c nxcon_unregister.c nxtk_register.c -NXCON_CSRCS += nxtool_register.c +NXCON_CSRCS += nxtool_register.c ifeq ($(CONFIG_NXCONSOLE_NXKBDIN),y) NXCON_CSRCS += nxcon_kbdin.c endif ifeq ($(CONFIG_DEBUG),y) -NXCON_CSRCS += nxcon_sem.c +NXCON_CSRCS += nxcon_sem.c endif diff --git a/nuttx/graphics/nxconsole/nx_register.c b/nuttx/graphics/nxconsole/nx_register.c index 8ebe0c0d5..64eb878d9 100644 --- a/nuttx/graphics/nxconsole/nx_register.c +++ b/nuttx/graphics/nxconsole/nx_register.c @@ -182,7 +182,7 @@ static int nxcon_bitmap(FAR struct nxcon_state_s *priv, * minor - The device minor number * * Return: - * A non-NULL handle is returned on success. + * A non-NULL handle is returned on success. * ****************************************************************************/ diff --git a/nuttx/graphics/nxconsole/nxcon_driver.c b/nuttx/graphics/nxconsole/nxcon_driver.c index c647f97bb..eacf99215 100644 --- a/nuttx/graphics/nxconsole/nxcon_driver.c +++ b/nuttx/graphics/nxconsole/nxcon_driver.c @@ -209,7 +209,7 @@ static ssize_t nxcon_write(FAR struct file *filep, FAR const char *buffer, * (but the escape sequence is still incomplete. */ - case VT100_CONSUMED: + case VT100_CONSUMED: { /* Do nothing... the VT100 logic owns the character */ } diff --git a/nuttx/graphics/nxconsole/nxcon_font.c b/nuttx/graphics/nxconsole/nxcon_font.c index b696b266d..ad91b99db 100644 --- a/nuttx/graphics/nxconsole/nxcon_font.c +++ b/nuttx/graphics/nxconsole/nxcon_font.c @@ -148,7 +148,7 @@ nxcon_allocglyph(FAR struct nxcon_state_s *priv) /* If we get here, the glyph cache is full. We replace the least used * glyph with the one we need now. (luglyph can't be NULL). */ - + luusecnt = luglyph->usecnt; nxcon_freeglyph(luglyph); @@ -159,7 +159,7 @@ nxcon_allocglyph(FAR struct nxcon_state_s *priv) if (luusecnt > 1) { uint8_t decr = luusecnt - 1; - + for (i = 0; i < priv->maxglyphs; i++) { /* Is this glyph in use? */ @@ -512,7 +512,7 @@ int nxcon_backspace(FAR struct nxcon_state_s *priv) ret = nxcon_hidechar(priv, bm); /* The current position to the location where the last character was */ - + priv->fpos.x = bm->pos.x; priv->fpos.y = bm->pos.y; diff --git a/nuttx/graphics/nxconsole/nxcon_kbdin.c b/nuttx/graphics/nxconsole/nxcon_kbdin.c index c2633ebf0..4bc27608f 100644 --- a/nuttx/graphics/nxconsole/nxcon_kbdin.c +++ b/nuttx/graphics/nxconsole/nxcon_kbdin.c @@ -193,7 +193,7 @@ ssize_t nxcon_read(FAR struct file *filep, FAR char *buffer, size_t len) * mutual exclusion semaphore? */ - if (ret < 0) + if (ret < 0) { /* No.. One of the two sem_wait's failed. */ diff --git a/nuttx/graphics/nxconsole/nxcon_scroll.c b/nuttx/graphics/nxconsole/nxcon_scroll.c index c1a0fec95..e537be0cf 100644 --- a/nuttx/graphics/nxconsole/nxcon_scroll.c +++ b/nuttx/graphics/nxconsole/nxcon_scroll.c @@ -224,7 +224,7 @@ void nxcon_scroll(FAR struct nxcon_state_s *priv, int scrollheight) bm->pos.y -= scrollheight; /* We are keeping this one so increment to the next character */ - + i++; } } diff --git a/nuttx/graphics/nxconsole/nxcon_sem.c b/nuttx/graphics/nxconsole/nxcon_sem.c index 4cf960971..26036c2f4 100644 --- a/nuttx/graphics/nxconsole/nxcon_sem.c +++ b/nuttx/graphics/nxconsole/nxcon_sem.c @@ -80,7 +80,7 @@ * priv - Driver data structure * * Returned Value: - * + * * ****************************************************************************/ diff --git a/nuttx/graphics/nxconsole/nxtk_register.c b/nuttx/graphics/nxconsole/nxtk_register.c index 0a11fc6cf..b3c17e864 100644 --- a/nuttx/graphics/nxconsole/nxtk_register.c +++ b/nuttx/graphics/nxconsole/nxtk_register.c @@ -182,7 +182,7 @@ static int nxtkcon_bitmap(FAR struct nxcon_state_s *priv, * minor - The device minor number * * Return: - * A non-NULL handle is returned on success. + * A non-NULL handle is returned on success. * ****************************************************************************/ diff --git a/nuttx/graphics/nxconsole/nxtool_register.c b/nuttx/graphics/nxconsole/nxtool_register.c index b063d5a61..d7666e523 100644 --- a/nuttx/graphics/nxconsole/nxtool_register.c +++ b/nuttx/graphics/nxconsole/nxtool_register.c @@ -184,7 +184,7 @@ static int nxtool_bitmap(FAR struct nxcon_state_s *priv, * minor - The device minor number * * Return: - * A non-NULL handle is returned on success. + * A non-NULL handle is returned on success. * ****************************************************************************/ diff --git a/nuttx/graphics/nxglib/nxglib_copyrun.h b/nuttx/graphics/nxglib/nxglib_copyrun.h index f0cb9097a..74a23c986 100644 --- a/nuttx/graphics/nxglib/nxglib_copyrun.h +++ b/nuttx/graphics/nxglib/nxglib_copyrun.h @@ -112,7 +112,7 @@ nxgl_copyrun_1bpp(FAR const uint8_t *src, FAR uint8_t *dest, * * indata: AAAA AAxx maps to nextdata: xxAA AAAA */ - + nextdata = (indata >> remainder); #endif @@ -194,7 +194,7 @@ nxgl_copyrun_2bpp(FAR const uint8_t *src, FAR uint8_t *dest, */ nextdata = (indata << shift); - + #else /* If CONFIG_NX_PACKEDMSFIRST is NOT defined, then bits (7-2*remainder)-7 * are carried over to the first pass through the loop. For example @@ -202,7 +202,7 @@ nxgl_copyrun_2bpp(FAR const uint8_t *src, FAR uint8_t *dest, * * indata: AAAA AAxx maps to nextdata: xxAA AAAA */ - + nextdata = (indata >> shift); #endif @@ -282,14 +282,14 @@ nxgl_copyrun_4bpp(FAR const uint8_t *src, FAR uint8_t *dest, */ nextdata = (indata << 4); - + #else /* If CONFIG_NX_PACKEDMSFIRST is NOT defined, then bits 4-7 * are carried over to the first pass through the loop. For example: * * indata: AAAA xxxx maps to nextdata: xxxx AAAA */ - + nextdata = (indata >> 4); #endif diff --git a/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c index 2f7e54564..44034c10e 100644 --- a/nuttx/graphics/nxmu/nxmu_server.c +++ b/nuttx/graphics/nxmu/nxmu_server.c @@ -451,7 +451,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev) { FAR struct nxsvrmsg_getrectangle_s *getmsg = (FAR struct nxsvrmsg_getrectangle_s *)buffer; nxbe_getrectangle(getmsg->wnd, &getmsg->rect, getmsg->plane, getmsg->dest, getmsg->deststride); - + if (getmsg->sem_done) { sem_post(getmsg->sem_done); @@ -476,7 +476,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev) { FAR struct nxsvrmsg_bitmap_s *bmpmsg = (FAR struct nxsvrmsg_bitmap_s *)buffer; nxbe_bitmap(bmpmsg->wnd, &bmpmsg->dest, bmpmsg->src, &bmpmsg->origin, bmpmsg->stride); - + if (bmpmsg->sem_done) { sem_post(bmpmsg->sem_done); diff --git a/nuttx/graphics/nxsu/nx_kbdin.c b/nuttx/graphics/nxsu/nx_kbdin.c index 6acd96a72..6aae52570 100644 --- a/nuttx/graphics/nxsu/nx_kbdin.c +++ b/nuttx/graphics/nxsu/nx_kbdin.c @@ -77,7 +77,7 @@ * * Description: * Used by a thread or interrupt handler that manages some kind of keypad - * hardware to report text information to the NX server. + * hardware to report text information to the NX server. * ****************************************************************************/ diff --git a/nuttx/libxx/Kconfig b/nuttx/libxx/Kconfig index 9c78342c2..3593939cb 100644 --- a/nuttx/libxx/Kconfig +++ b/nuttx/libxx/Kconfig @@ -17,7 +17,7 @@ config HAVE_CXX bool "Have C++ compiler" default n ---help--- - Toolchain supports C++ and CXX, CXXFLAGS, and COMPILEXX have been + Toolchain supports C++ and CXX, CXXFLAGS, and COMPILEXX have been defined in the configurations Make.defs file. if HAVE_CXX @@ -27,7 +27,7 @@ config HAVE_CXXINITIALIZE default n ---help--- The platform-specific logic includes support for initialization - of static C++ instances for this architecture and for the selected + of static C++ instances for this architecture and for the selected toolchain (via up_cxxinitialize()). config CXX_NEWLONG diff --git a/nuttx/libxx/Makefile b/nuttx/libxx/Makefile index 2ab146e9c..261e40de8 100644 --- a/nuttx/libxx/Makefile +++ b/nuttx/libxx/Makefile @@ -37,8 +37,8 @@ # Sources -ASRCS = -CSRCS = +ASRCS = +CSRCS = CXXSRCS = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx libxx_cxa_atexit.cxx diff --git a/nuttx/libxx/README.txt b/nuttx/libxx/README.txt index 7a1c51fa7..59ea8d818 100644 --- a/nuttx/libxx/README.txt +++ b/nuttx/libxx/README.txt @@ -8,7 +8,7 @@ have a need for more extensive C++ support, the following libraries are recommended: - libstdc++ (part of GCC) - - STLport http://www.stlport.org/ + - STLport http://www.stlport.org/ - uClibc++ http://cxx.uclibc.org/ - uSTL http://ustl.sourceforge.net/ @@ -24,7 +24,7 @@ At present, only the following are supported here: - void __cxa_pure_virtual(void); - int __aeabi_atexit(void* object, void (*destroyer)(void*), void *dso_handle); - int __cxa_atexit(__cxa_exitfunc_t func, FAR void *arg, FAR void *dso_handle); - + operator new ------------ diff --git a/nuttx/libxx/libxx_stdthrow.cxx b/nuttx/libxx/libxx_stdthrow.cxx index 57f21b602..29cf5d5e9 100644 --- a/nuttx/libxx/libxx_stdthrow.cxx +++ b/nuttx/libxx/libxx_stdthrow.cxx @@ -59,19 +59,19 @@ namespace std dbg("C++: Vector .at() with argument out of range\n"); abort(); } - + void __throw_length_error(const char*) { dbg("C++: Vector resize to excessive length\n"); abort(); } - + void __throw_bad_alloc() { dbg("C++: Bad allocation\n"); abort(); } - + void __throw_bad_function_call() { dbg("C++: Bad function call\n"); diff --git a/nuttx/syscall/Makefile b/nuttx/syscall/Makefile index 20a83d0b0..14c0c4dea 100644 --- a/nuttx/syscall/Makefile +++ b/nuttx/syscall/Makefile @@ -45,7 +45,7 @@ CSVFILE = "$(TOPDIR)$(DELIM)syscall$(DELIM)syscall.csv" STUB_SRCS += syscall_funclookup.c syscall_stublookup.c syscall_nparms.c STUB_SRCS += syscall_clock_systimer.c -ASRCS = +ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) PROXY_OBJS = $(PROXY_SRCS:.c=$(OBJEXT)) diff --git a/nuttx/syscall/README.txt b/nuttx/syscall/README.txt index ed5e6081d..11942a7b7 100644 --- a/nuttx/syscall/README.txt +++ b/nuttx/syscall/README.txt @@ -96,7 +96,7 @@ Each type field has a format as follows: type name: For all simpler types - formal type | actual type: + formal type | actual type: For array types where the form of the formal (eg. int parm[2]) differs from the type of actual passed parameter (eg. int*). This is necessary because you cannot do simple casts to array types. diff --git a/nuttx/syscall/syscall_nparms.c b/nuttx/syscall/syscall_nparms.c index da417af7b..001091757 100644 --- a/nuttx/syscall/syscall_nparms.c +++ b/nuttx/syscall/syscall_nparms.c @@ -75,4 +75,3 @@ const uint8_t g_funcnparms[SYS_nsyscalls] = ****************************************************************************/ #endif /* CONFIG_NUTTX_KERNEL */ -
\ No newline at end of file diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host index 738e66ca1..1580ec8ed 100644 --- a/nuttx/tools/Makefile.host +++ b/nuttx/tools/Makefile.host @@ -62,7 +62,7 @@ endif all: b16$(HOSTEXEEXT) bdf-converter$(HOSTEXEEXT) cmpconfig$(HOSTEXEEXT) \ configure$(HOSTEXEEXT) mkconfig$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) mksymtab$(HOSTEXEEXT) \ - mksyscall$(HOSTEXEEXT) mkversion$(HOSTEXEEXT) + mksyscall$(HOSTEXEEXT) mkversion$(HOSTEXEEXT) default: mkconfig$(HOSTEXEEXT) mksyscall$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) ifdef HOSTEXEEXT @@ -73,8 +73,8 @@ endif # b16 - Fixed precision math conversion tool -b16$(HOSTEXEEXT): b16.c - $(Q) $(HOSTCC) $(HOSTCFLAGS) -o b16$(HOSTEXEEXT) b16.c +b16$(HOSTEXEEXT): b16.c + $(Q) $(HOSTCC) $(HOSTCFLAGS) -o b16$(HOSTEXEEXT) b16.c ifdef HOSTEXEEXT b16: b16$(HOSTEXEEXT) diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt index f0feff661..17416c651 100644 --- a/nuttx/tools/README.txt +++ b/nuttx/tools/README.txt @@ -240,7 +240,7 @@ bdf-convert.c Create a new NuttX configuration variable. For example, suppose you define the following variable: CONFIG_NXFONT_MYFONT. Then you would need to: - + 3. Define CONFIG_NXFONT_MYFONT=y in your NuttX configuration file. A font ID number has to be assigned for each new font. The font ID @@ -251,7 +251,7 @@ bdf-convert.c 4. include/nuttx/nx/nxfonts.h. Add you new font as a possible system default font: - + #if defined(CONFIG_NXFONT_SANS23X27) # define NXFONT_DEFAULT FONTID_SANS23X27 #elif defined(CONFIG_NXFONT_MYFONT) @@ -260,7 +260,7 @@ bdf-convert.c Then define the actual font ID. Make sure that the font ID value is unique: - + enum nx_fontid_e { FONTID_DEFAULT = 0 /* The default font */ @@ -271,7 +271,7 @@ bdf-convert.c , FONTID_MYFONT = 2 /* My shiny, new font */ #endif ... - + New Add the font to the NX build system. There are several files that you have to modify to to this. Look how the build system uses the font CONFIG_NXFONT_SANS23X27 for examaples: @@ -338,7 +338,7 @@ bdf-convert.c font. The lookup function is NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid). The new font information needs to be added to data structures used by that function: - + #ifdef CONFIG_NXFONT_SANS23X27 extern const struct nx_fontpackage_s g_sans23x27_package; #endif @@ -516,7 +516,7 @@ kconfig.bat variables from the Cygwin kconfig-mconf running in the CMD.exe shell. The following change to the top-level Kconfig file seems to work around these problems: - + config APPSDIR string - option env="APPSDIR" diff --git a/nuttx/tools/b16.c b/nuttx/tools/b16.c index 66d581ffa..835307116 100644 --- a/nuttx/tools/b16.c +++ b/nuttx/tools/b16.c @@ -116,6 +116,6 @@ int main(int argc, char **argv, char **envp) lvalue = 65536.0 * fvalue; printf("%10.5f -> 0x%08lx\n", fvalue, lvalue); } - + return 0; } diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh index 25f5afc15..a91da260e 100755 --- a/nuttx/tools/configure.sh +++ b/nuttx/tools/configure.sh @@ -162,7 +162,7 @@ if [ -z "${appdir}" ]; then fi # Check for an unversioned apps/ directory - + if [ -d "${TOPDIR}/../apps" ]; then appdir="../apps" @@ -171,7 +171,7 @@ if [ -z "${appdir}" ]; then if [ -d "${TOPDIR}/../apps-${CONFIG_VERSION_STRING}" ]; then appdir="../apps-${CONFIG_VERSION_STRING}" - fi + fi fi fi @@ -214,4 +214,4 @@ if [ "X${defappdir}" = "Xy" ]; then else echo "CONFIG_APPS_DIR=\"$posappdir\"" >> "${dest_config}" fi -fi +fi diff --git a/nuttx/tools/define.sh b/nuttx/tools/define.sh index ae2374118..d7be0d725 100755 --- a/nuttx/tools/define.sh +++ b/nuttx/tools/define.sh @@ -41,7 +41,7 @@ wintool=n usage="USAGE: $progname [-w] [-d] [-h] <compiler-path> <def1>[=val1] [<def2>[=val2] [<def3>[=val3] ...]]" advice="Try '$progname -h' for more information" -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -d ) set -x diff --git a/nuttx/tools/discover.py b/nuttx/tools/discover.py index cc82a0cad..3cff6ed73 100755 --- a/nuttx/tools/discover.py +++ b/nuttx/tools/discover.py @@ -62,7 +62,7 @@ def send_discover(socket): for c in cmd[:3]: chksum -= c; cmd[3] = chksum & 0xff - + socket.sendto(cmd, ('<broadcast>', PORT)) def read_responses(socket): @@ -75,7 +75,7 @@ def read_responses(socket): and response[0] == DISCOVER_PROTO_ID and response[1] == DISCOVER_RESPONSE and check_sum(response)): - + dev = {} dev['addr'] = src[0] dev['descr'] = response[2:-1].tostring().rstrip('\0') diff --git a/nuttx/tools/incdir.sh b/nuttx/tools/incdir.sh index 145bfe9bb..38aa98b03 100755 --- a/nuttx/tools/incdir.sh +++ b/nuttx/tools/incdir.sh @@ -40,7 +40,7 @@ pathtype=user usage="USAGE: $progname [-w] [-d] [-h] <compiler-path> <dir1> [<dir2> [<dir3> ...]]" advice="Try '$progname -h' for more information" -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -d ) set -x diff --git a/nuttx/tools/mkconfigvars.sh b/nuttx/tools/mkconfigvars.sh index feb188a32..b2101d3b0 100755 --- a/nuttx/tools/mkconfigvars.sh +++ b/nuttx/tools/mkconfigvars.sh @@ -37,7 +37,7 @@ ADVICE="Try '$0 -h' for more information" unset VERSION -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -v ) shift diff --git a/nuttx/tools/mkctags.sh b/nuttx/tools/mkctags.sh index 999aefbef..da278c846 100644 --- a/nuttx/tools/mkctags.sh +++ b/nuttx/tools/mkctags.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # mkctags.sh # # Copyright (C) 2013 Ken pettit All rights reserved. @@ -33,7 +33,7 @@ # WD=`pwd` -if [[ "$WD" =~ "nuttx/tools" ]] +if [[ "$WD" =~ "nuttx/tools" ]] then cd .. fi diff --git a/nuttx/tools/mkdeps.bat b/nuttx/tools/mkdeps.bat index 2b9ea3ce5..64b4429d1 100644 --- a/nuttx/tools/mkdeps.bat +++ b/nuttx/tools/mkdeps.bat @@ -156,7 +156,7 @@ goto :EOF :CheckPaths for %%H in (%altpath%) do ( set tmppath=%%H\%file% - if "%debug%"=="y" echo Checkfile: Checking %tmppath% + if "%debug%"=="y" echo Checkfile: Checking %tmppath% if exist %tmppath% ( set fullpath=%tmppath% goto :EOF diff --git a/nuttx/tools/mkdeps.sh b/nuttx/tools/mkdeps.sh index 14ac6080e..8a03ac571 100755 --- a/nuttx/tools/mkdeps.sh +++ b/nuttx/tools/mkdeps.sh @@ -192,7 +192,7 @@ if [ "X${winpaths}" = "Xy" ]; then show_usage exit 1 fi - + # Get the top dir expressed like the Windows GCC would use it, except # with forward slashs diff --git a/nuttx/tools/mkexport.sh b/nuttx/tools/mkexport.sh index 0c6b797dc..2c464c0b1 100755 --- a/nuttx/tools/mkexport.sh +++ b/nuttx/tools/mkexport.sh @@ -206,7 +206,7 @@ cp -f "${ARCHDIR}"/*.h "${EXPORTDIR}"/arch/. 2>/dev/null # Then look a list of possible places where other architecture-specific # header files might be found. If those places exist (as directories or -# as symbolic links to directories, then copy the header files from +# as symbolic links to directories, then copy the header files from # those directories into the EXPORTDIR ARCH_HDRDIRS="arm armv7-m avr avr32 board common chip mips32" @@ -323,4 +323,4 @@ fi # Clean up after ourselves -rm -rf "${EXPORTSUBDIR}" +rm -rf "${EXPORTSUBDIR}" diff --git a/nuttx/tools/mkimage.sh b/nuttx/tools/mkimage.sh index f64dfde85..0fc2f92c6 100755 --- a/nuttx/tools/mkimage.sh +++ b/nuttx/tools/mkimage.sh @@ -56,15 +56,15 @@ # Scenario #2 # ----------- # If the supplied image is not a standard binary -# executagle image then that is ok too, a header is +# executagle image then that is ok too, a header is # constructed and tacked onto the front of the supplied # binary data forming the new binary image (in rr format). -# In this case the EntryAddr is set to 0xFFFFFFFF by +# In this case the EntryAddr is set to 0xFFFFFFFF by # default and the LoadAddr is set to 0x00000000 by -# default unless otherwise indicated by command line +# default unless otherwise indicated by command line # arguments -LEntry and -LAddr which if used are assumed # to be in hexidecimal units. -# +# # ----------- # Scenario #3 # ----------- @@ -75,10 +75,10 @@ # # mkimage [--NoHeader ] <input-bin> <out-RR> # -# Usage: -# mkimage [--LAddr h] [--EAddr h] [--NoHeader] <input-bin> <out-RR> -# -# Examples: +# Usage: +# mkimage [--LAddr h] [--EAddr h] [--NoHeader] <input-bin> <out-RR> +# +# Examples: # $ mkimage linux linux.rr # ..or.. # $ mkimage -LAddr 10008000 -EAddr 10008000 vmlinux vmlinux.rr @@ -90,8 +90,8 @@ # $ mkimage --LAddr A00 fileSys.gz fileSys.gz.rr # ^ # | -# Assumed hex units. -# Please omit the +# Assumed hex units. +# Please omit the # leading "0x". ######################################################## @@ -185,7 +185,7 @@ if [ ! -z "$FileTypeExec" ] ; then image_file=${binary}.binary.gz fi # --------------------------------- - # Next | Create the header information (ascii) needed + # Next | Create the header information (ascii) needed # | by the TI925 bootloader. This includes the # | load address, entry address and byte count of # | the binary executable data which will follow it. @@ -211,8 +211,8 @@ if [ ! -z "$FileTypeExec" ] ; then numBytes=$(echo $numBytes | sed -e "s/^.*\(........\)$/\1/g") # --------------------------------- # Next | Combine the ascii header information - # | with the binary image to make the - # | final downloadable *mostly* binary + # | with the binary image to make the + # | final downloadable *mostly* binary # | image. # --------------------------------- rm -f ${outbin} @@ -235,12 +235,12 @@ else # ----------- # Scenario #2 # ----------- - # Just a binary image but not a standard executable + # Just a binary image but not a standard executable # style binary (like ELF, etc). Might be a compressed # filesystem image, etc. # So... # --------------------------------- - # Next | Create the header information (ascii) needed + # Next | Create the header information (ascii) needed # | by the TI925 bootloader. This includes the # | load address, entry address and byte count of # | the binary file which will follow it. @@ -255,7 +255,7 @@ else fi # # Note: The LoadAddr and EntryAddr are already established - # for us at this point, but we will need to compute the + # for us at this point, but we will need to compute the # byte length of binary portion next. # numBytes=$(wc --bytes ${image_file}) @@ -267,8 +267,8 @@ else # # --------------------------------- # Next | Combine the ascii header information - # | with the binary image to make the - # | final downloadable *mostly* binary + # | with the binary image to make the + # | final downloadable *mostly* binary # | image. # --------------------------------- # diff --git a/nuttx/tools/mksymtab.c b/nuttx/tools/mksymtab.c index 5074c2940..da60433dd 100644 --- a/nuttx/tools/mksymtab.c +++ b/nuttx/tools/mksymtab.c @@ -157,7 +157,7 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) { fprintf(stderr, "Missing <cvs-file> and <symtab-file>\n"); - show_usage(argv[0]); + show_usage(argv[0]); } csvpath = argv[optind]; @@ -166,7 +166,7 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) { fprintf(stderr, "Missing <symtab-file>\n"); - show_usage(argv[0]); + show_usage(argv[0]); } symtab = argv[optind]; @@ -175,8 +175,8 @@ int main(int argc, char **argv, char **envp) if (optind < argc) { fprintf(stderr, "Unexpected garbage at the end of the line\n"); - show_usage(argv[0]); - } + show_usage(argv[0]); + } /* Open the CSV file for reading */ diff --git a/nuttx/tools/mksyscall.c b/nuttx/tools/mksyscall.c index 8bcfcf1ee..07ee2261c 100644 --- a/nuttx/tools/mksyscall.c +++ b/nuttx/tools/mksyscall.c @@ -343,7 +343,7 @@ static void generate_proxy(int nparms) */ get_fieldname(g_parm[PARM1_INDEX+i], fieldname); - fprintf(stream, ", (uintptr_t)parm%d.%s", i+1, fieldname); + fprintf(stream, ", (uintptr_t)parm%d.%s", i+1, fieldname); } else { @@ -433,7 +433,7 @@ static void generate_stub(int nparms) { fprintf(stream, "static inline "); } - + fprintf(stream, "uintptr_t STUB_%s(int nbr", g_parm[NAME_INDEX]); /* Generate the formal parameter list */ @@ -615,15 +615,15 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) { fprintf(stderr, "Missing <CSV file>\n"); - show_usage(argv[0]); + show_usage(argv[0]); } csvpath = argv[optind]; if (++optind < argc) { fprintf(stderr, "Unexpected garbage at the end of the line\n"); - show_usage(argv[0]); - } + show_usage(argv[0]); + } /* Open the CSV file */ diff --git a/nuttx/tools/pic32mx/mkpichex.c b/nuttx/tools/pic32mx/mkpichex.c index 889dc2a0c..a8be22cda 100644 --- a/nuttx/tools/pic32mx/mkpichex.c +++ b/nuttx/tools/pic32mx/mkpichex.c @@ -301,7 +301,7 @@ int main(int argc, char **argv, char **envp) if (remove(srcfile) != 0) { fprintf(stderr, "Failed to remove the old '%s'\n", srcfile); - + } /* Rename the new nuttx.tmp file to nuttx.hex */ diff --git a/nuttx/tools/version.sh b/nuttx/tools/version.sh index bd9083309..5240eecc9 100755 --- a/nuttx/tools/version.sh +++ b/nuttx/tools/version.sh @@ -43,7 +43,7 @@ unset VERSION unset BUILD unset OUTFILE -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -b ) shift diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh index 706754be7..7f3a849ac 100755 --- a/nuttx/tools/zipme.sh +++ b/nuttx/tools/zipme.sh @@ -49,7 +49,7 @@ unset VERSIONOPT unset BUILD unset DEBUG -while [ ! -z "$1" ]; do +while [ ! -z "$1" ]; do case $1 in -b ) shift |
