summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NxWidgets/Kconfig2
-rw-r--r--NxWidgets/libnxwidgets/include/cbuttonarray.hxx2
-rw-r--r--NxWidgets/libnxwidgets/src/cbuttonarray.cxx2
-rw-r--r--apps/NxWidgets/Kconfig2
-rw-r--r--apps/examples/nx/nx_main.c4
-rw-r--r--apps/examples/nxtext/nxtext_popup.c2
-rw-r--r--misc/buildroot/toolchain/nxflat/ldnxflat.c2
-rw-r--r--misc/uClibc++/ChangeLog.txt2
-rwxr-xr-xnuttx/Documentation/NuttXCCodingStandard.html2
-rw-r--r--nuttx/configs/stm3220g-eval/src/up_stmpe811.c2
-rw-r--r--nuttx/configs/stm3240g-eval/src/up_stmpe811.c2
-rw-r--r--nuttx/drivers/usbdev/Kconfig2
-rw-r--r--nuttx/drivers/usbhost/usbhost_skeleton.c2
-rw-r--r--nuttx/drivers/usbhost/usbhost_storage.c2
-rw-r--r--nuttx/graphics/nxglib/fb/nxglib_moverectangle.c2
-rw-r--r--nuttx/libc/wqueue/work_thread.c2
-rw-r--r--nuttx/sched/task_reparent.c4
-rw-r--r--nuttx/tools/configure.c2
18 files changed, 20 insertions, 20 deletions
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig
index 5f956df54..a0f95ad82 100644
--- a/NxWidgets/Kconfig
+++ b/NxWidgets/Kconfig
@@ -901,7 +901,7 @@ config NXWM_CALIBRATION_MESSAGES
default n
---help---
By default, the calibration screen is clear excecpt for the
- calibratino touchpoints. If this options are enabled, then
+ calibration touchpoints. If this options are enabled, then
instructions when to touch and when to release the touch will
be added in the center of the display,
diff --git a/NxWidgets/libnxwidgets/include/cbuttonarray.hxx b/NxWidgets/libnxwidgets/include/cbuttonarray.hxx
index b45e1ece1..9ff669de5 100644
--- a/NxWidgets/libnxwidgets/include/cbuttonarray.hxx
+++ b/NxWidgets/libnxwidgets/include/cbuttonarray.hxx
@@ -296,7 +296,7 @@ namespace NXWidgets
*
* @param column The column of the button to check.
* @param row The row of the button to check.
- * @return True if this button is at the cursor postion and highlighted.
+ * @return True if this button is at the cursor position and highlighted.
*/
virtual bool isCursorPosition(int column, int row) const;
diff --git a/NxWidgets/libnxwidgets/src/cbuttonarray.cxx b/NxWidgets/libnxwidgets/src/cbuttonarray.cxx
index 4efc99f13..0c1df9f08 100644
--- a/NxWidgets/libnxwidgets/src/cbuttonarray.cxx
+++ b/NxWidgets/libnxwidgets/src/cbuttonarray.cxx
@@ -313,7 +313,7 @@ bool CButtonArray::setCursorPosition(int column, int row)
*
* @param column The column of the button to check.
* @param row The row of the button to check.
- * @return True if this button is at the cursor postion and highlighted.
+ * @return True if this button is at the cursor position and highlighted.
*/
bool CButtonArray::isCursorPosition(int column, int row) const
diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig
index 5f956df54..a0f95ad82 100644
--- a/apps/NxWidgets/Kconfig
+++ b/apps/NxWidgets/Kconfig
@@ -901,7 +901,7 @@ config NXWM_CALIBRATION_MESSAGES
default n
---help---
By default, the calibration screen is clear excecpt for the
- calibratino touchpoints. If this options are enabled, then
+ calibration touchpoints. If this options are enabled, then
instructions when to touch and when to release the touch will
be added in the center of the display,
diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c
index 92328d2a1..7bfd19732 100644
--- a/apps/examples/nx/nx_main.c
+++ b/apps/examples/nx/nx_main.c
@@ -703,7 +703,7 @@ int nx_main(int argc, char *argv[])
pt.x = g_xres / 8;
pt.y = g_yres / 8;
- message("nx_main: Set window #1 postion to (%d,%d)\n", pt.x, pt.y);
+ message("nx_main: Set window #1 position to (%d,%d)\n", pt.x, pt.y);
ret = nxeg_setposition(hwnd1, &pt);
if (ret < 0)
{
@@ -766,7 +766,7 @@ int nx_main(int argc, char *argv[])
pt.x = g_xres - size.w - pt.x;
pt.y = g_yres - size.h - pt.y;
- message("nx_main: Set hwnd2 postion to (%d,%d)\n", pt.x, pt.y);
+ message("nx_main: Set hwnd2 position to (%d,%d)\n", pt.x, pt.y);
ret = nxeg_setposition(hwnd2, &pt);
if (ret < 0)
{
diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c
index f708292e5..4fcc80c13 100644
--- a/apps/examples/nxtext/nxtext_popup.c
+++ b/apps/examples/nxtext/nxtext_popup.c
@@ -364,7 +364,7 @@ NXWINDOW nxpu_open(void)
/* Set the position for the pop-up window */
- message("nxpu_open: Set pop-up postion to (%d,%d)\n", pt.x, pt.y);
+ message("nxpu_open: Set pop-up position to (%d,%d)\n", pt.x, pt.y);
ret = nxpu_setposition(hwnd, &pt);
if (ret < 0)
{
diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c
index 92af6f767..b3ff262f7 100644
--- a/misc/buildroot/toolchain/nxflat/ldnxflat.c
+++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c
@@ -1872,7 +1872,7 @@ static void output_got(int fd)
asection *rel_section = rel_sym->section;
symvalue sym_value = rel_sym->value;
- /* j is the offset index into the relocatino table */
+ /* j is the offset index into the relocation table */
j = i + nxflat_nrelocs;
diff --git a/misc/uClibc++/ChangeLog.txt b/misc/uClibc++/ChangeLog.txt
index 2de53129c..ba86a597c 100644
--- a/misc/uClibc++/ChangeLog.txt
+++ b/misc/uClibc++/ChangeLog.txt
@@ -10,5 +10,5 @@ uClibc++-1.1 2011-xx-xx <gnutt@nuttx.org>
and feof() to determine if fopen() and fread() were successful.
The NuttX version of ferror() is only fragmentary. The usage of
ferror() in this file exceeds the capability of the current
- implementatino (2013-6-20).
+ implementation (2013-6-20).
diff --git a/nuttx/Documentation/NuttXCCodingStandard.html b/nuttx/Documentation/NuttXCCodingStandard.html
index 56eea5aaf..7b17b054b 100755
--- a/nuttx/Documentation/NuttXCCodingStandard.html
+++ b/nuttx/Documentation/NuttXCCodingStandard.html
@@ -1392,7 +1392,7 @@ struct xyz_info_s
<h2>2.7 <a name="enumerations">Enumerations</a></h2>
<p>
<b>Enumeration Naming</b>.
- Naming of enumeratinos follow the same naming rules as for <a href="#structures">structure</a> and <a href=#unions">union</a> naming.
+ Naming of enumerations follow the same naming rules as for <a href="#structures">structure</a> and <a href=#unions">union</a> naming.
The only difference is that the suffix <code>_e</code> is used to identify an enumeration.
</p>
<p>
diff --git a/nuttx/configs/stm3220g-eval/src/up_stmpe811.c b/nuttx/configs/stm3220g-eval/src/up_stmpe811.c
index 06be67bb5..721650a3d 100644
--- a/nuttx/configs/stm3220g-eval/src/up_stmpe811.c
+++ b/nuttx/configs/stm3220g-eval/src/up_stmpe811.c
@@ -227,7 +227,7 @@ static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable)
/* Attach and enable, or detach and disable. Enabling and disabling GPIO
* interrupts is a multi-step process so the safest thing is to keep
- * interrupts disabled during the reconfiguratino.
+ * interrupts disabled during the reconfiguration.
*/
flags = irqsave();
diff --git a/nuttx/configs/stm3240g-eval/src/up_stmpe811.c b/nuttx/configs/stm3240g-eval/src/up_stmpe811.c
index f6c7d1e27..8e4aed307 100644
--- a/nuttx/configs/stm3240g-eval/src/up_stmpe811.c
+++ b/nuttx/configs/stm3240g-eval/src/up_stmpe811.c
@@ -227,7 +227,7 @@ static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable)
/* Attach and enable, or detach and disable. Enabling and disabling GPIO
* interrupts is a multi-step process so the safest thing is to keep
- * interrupts disabled during the reconfiguratino.
+ * interrupts disabled during the reconfiguration.
*/
flags = irqsave();
diff --git a/nuttx/drivers/usbdev/Kconfig b/nuttx/drivers/usbdev/Kconfig
index 9fdc6c92c..c034c62bc 100644
--- a/nuttx/drivers/usbdev/Kconfig
+++ b/nuttx/drivers/usbdev/Kconfig
@@ -552,7 +552,7 @@ config USBMSC_BULKOUTREQLEN
the completed READ request to the caller as each packet is received.
Therefore, there is no benefit in increasing the size of this buffer
beyond the maximum size of one packet. Default: 512 or 64 bytes
- (depending upon if dual speed operatino is supported or not).
+ (depending upon if dual speed operation is supported or not).
config USBMSC_VENDORID
hex "Mass storage Vendor ID"
diff --git a/nuttx/drivers/usbhost/usbhost_skeleton.c b/nuttx/drivers/usbhost/usbhost_skeleton.c
index 806990375..0603221c6 100644
--- a/nuttx/drivers/usbhost/usbhost_skeleton.c
+++ b/nuttx/drivers/usbhost/usbhost_skeleton.c
@@ -175,7 +175,7 @@ static int usbhost_disconnected(FAR struct usbhost_class_s *class);
* Private Data
****************************************************************************/
-/* This structure provides the registry entry ID informatino that will be
+/* This structure provides the registry entry ID information that will be
* used to associate the USB class driver to a connected USB device.
*/
diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c
index 7c57371ee..2a8a2e961 100644
--- a/nuttx/drivers/usbhost/usbhost_storage.c
+++ b/nuttx/drivers/usbhost/usbhost_storage.c
@@ -257,7 +257,7 @@ static int usbhost_ioctl(FAR struct inode *inode, int cmd,
* Private Data
****************************************************************************/
-/* This structure provides the registry entry ID informatino that will be
+/* This structure provides the registry entry ID information that will be
* used to associate the USB host mass storage class to a connected USB
* device.
*/
diff --git a/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c b/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c
index 7b64e1304..1535e6475 100644
--- a/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c
+++ b/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c
@@ -189,7 +189,7 @@ void NXGL_FUNCNAME(nxgl_moverectangle,NXGLIB_SUFFIX)
/* Case 1: Is the destination position above the displayed position?
* If the destination position is less then then the src address, then the
- * destination is offset to a postion below (and or to the left) of the
+ * destination is offset to a position below (and or to the left) of the
* source in framebuffer memory.
*/
diff --git a/nuttx/libc/wqueue/work_thread.c b/nuttx/libc/wqueue/work_thread.c
index c0474ad69..ed26ca3ff 100644
--- a/nuttx/libc/wqueue/work_thread.c
+++ b/nuttx/libc/wqueue/work_thread.c
@@ -233,7 +233,7 @@ static void work_process(FAR struct wqueue_s *wqueue)
* These worker threads are started by the OS during normal bringup.
*
* work_usrthread: This is a user mode work queue. It must be built into
- * the applicatino blob during the user phase of a kernel build. The
+ * the application blob during the user phase of a kernel build. The
* user work thread will then automatically be started when the system
* boots by calling through the pointer found in the header on the user
* space blob.
diff --git a/nuttx/sched/task_reparent.c b/nuttx/sched/task_reparent.c
index d5c03b347..8bd1f9767 100644
--- a/nuttx/sched/task_reparent.c
+++ b/nuttx/sched/task_reparent.c
@@ -85,7 +85,7 @@ int task_reparent(pid_t ppid, pid_t chpid)
irqstate_t flags;
int ret;
- /* Disable interrupts so that nothing can change in the relatinoship of
+ /* Disable interrupts so that nothing can change in the relationship of
* the three task: Child, current parent, and new parent.
*/
@@ -217,7 +217,7 @@ int task_reparent(pid_t ppid, pid_t chpid)
irqstate_t flags;
int ret;
- /* Disable interrupts so that nothing can change in the relatinoship of
+ /* Disable interrupts so that nothing can change in the relationship of
* the three task: Child, current parent, and new parent.
*/
diff --git a/nuttx/tools/configure.c b/nuttx/tools/configure.c
index 5f8fbdddc..a17cf6496 100644
--- a/nuttx/tools/configure.c
+++ b/nuttx/tools/configure.c
@@ -80,7 +80,7 @@ static const char *g_boarddir = NULL; /* Name of board subdirectory */
static char *g_configdir = NULL; /* Name of configuration subdirectory */
static char *g_topdir = NULL; /* Full path to top-level NuttX build directory */
-static char *g_apppath = NULL; /* Full path to the applicatino directory */
+static char *g_apppath = NULL; /* Full path to the application directory */
static char *g_configtop = NULL; /* Full path to the top-level configuration directory */
static char *g_configpath = NULL; /* Full path to the configuration sub-directory */
static char *g_verstring = "0.0"; /* Version String */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 18:47:46 +0000