summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/ChangeLog2
-rwxr-xr-xnuttx/Documentation/NxWidgets.html4
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_serial.c2
-rw-r--r--nuttx/sched/os_start.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f86a29f6b..84828503b 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -2594,5 +2594,7 @@
* configs/compal_e88 and configs/compal_e99: Support for Compal e88 and e99 phones
Contributed by Denis Carilki and includes the work of Denis, Alan Carvalho de
Assis, and Stefan Richter.
+ * arch/arm/src/lpc17xx: Several fixes for error that have crept in for the LPC17xx
+ DAC. Contriburted by by Lzzy.
diff --git a/nuttx/Documentation/NxWidgets.html b/nuttx/Documentation/NxWidgets.html
index fdca78b5a..41f041162 100755
--- a/nuttx/Documentation/NxWidgets.html
+++ b/nuttx/Documentation/NxWidgets.html
@@ -15,7 +15,7 @@
<h1>NXWidgets</h1>
<p>
In order to better support NuttX based platforms, a special graphical userinterface has been created called NXWidgets.
- NXWidgets is written in C++ and integrates seamlessly with the NuttX NX graphics subsystem in order to provide graphic objects, or &quot;widgets,&quot; in the NX Graphics Subsystem
+ NXWidgets is written in C++ and integrates seamlessly with the NuttX <a href="NXGraphicsSubsystem.html">NX graphics subsystem</a> in order to provide graphic objects, or &quot;widgets,&quot; in the NX Graphics Subsystem
</p>
<p>
Some of the features of NXWidgets include:
@@ -26,7 +26,7 @@
No additional C++ support libraries are required.
</li>
<li><b>NX Integration</b>.
- NXWidgets integrate seamlessly with the NX graphics system.
+ NXWidgets integrate seamlessly with the <a href="NXGraphicsSubsystem.html">NX graphics subsystem</a>.
Think of the X server under Linux … the NX graphics system is like a tiny X server that provides windowing under NuttX.
By adding NXWidgets, you can support graphics objects like buttons and text boxes in the NX windows and toolbars.
</li>
diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c
index e91411272..de918efbe 100644
--- a/nuttx/arch/arm/src/stm32/stm32_serial.c
+++ b/nuttx/arch/arm/src/stm32/stm32_serial.c
@@ -163,7 +163,7 @@ static int up_interrupt_usart6(int irq, void *context);
* Private Variables
****************************************************************************/
-struct uart_ops_s g_uart_ops =
+static const struct uart_ops_s g_uart_ops =
{
.setup = up_setup,
.shutdown = up_shutdown,
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c
index 889c28fb8..05a7330f3 100644
--- a/nuttx/sched/os_start.c
+++ b/nuttx/sched/os_start.c
@@ -208,7 +208,7 @@ static FAR _TCB g_idletcb;
/* This is the name of the idle task */
-static FAR char g_idlename[] = "Idle Task";
+static FAR const char g_idlename[] = "Idle Task";
/****************************************************************************
* Private Function Prototypes