graphics/nxterm and configs/open1788: Various fixes to get the NxTerm example working in PROTECTED mode with the Open1788 knxterm configuration. Basically works until the screen becomes full and it starts scrolling. Then characters are missing from the display. Needs more debug and test.

TODO

@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated March 4, 2019)
+NuttX TODO List (Last updated March 7, 2019)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -16,7 +16,7 @@ nuttx/:
   (5)  Signals (sched/signal, arch/)
   (2)  pthreads (sched/pthread, libs/libc/pthread)
   (0)  Message Queues (sched/mqueue)
- (10)  Kernel/Protected Build
+  (9)  Kernel/Protected Build
   (3)  C++ Support
   (5)  Binary loaders (binfmt/)
  (18)  Network (net/, drivers/net)
@@ -939,15 +939,6 @@ o Kernel/Protected Build
   Priority:    Medium/High -- the kernel build configuration is not fully fielded
                yet.
 
-  Title:       NxTERM PARTITIONING.
-  Description: NxTerm is implemented (correctly) as a driver that resides
-               in the nuttx/ directory.  However, the user interfaces must be
-               moved into a NuttX library or into apps/.  Currently
-               applications calls to the NxTerm user interfaces are
-               undefined in the Kernel/Protected builds.
-  Status:      Open
-  Priority:    Medium
-
   Title:       C++ CONSTRUCTORS HAVE TOO MANY PRIVILEGES (PROTECTED MODE)
   Description: When a C++ ELF module is loaded, its C++ constructors are called
                via sched/task_starthook.c logic.  This logic runs in protected mode.
@@ -2479,14 +2470,15 @@ o Graphics Subsystem (graphics/)
                depth.  If such a beast ever shows up, then this priority would be
                higher.
 
-  Title:       RE-PARITITION NxTK AND NxTERM
-  Description: NxTK should not be a part of OS.  Move NxTK from nuttx/libs/libnx
-               to apps/graphics.  Then, later, convert NxTK to a C++ class.
-
-               Within the OS, NxTK currently used only in graphics/nxterm.  With
-               some effort, I think NxTerm could be moved to apps/ as well.
+  Title:       NXTERM BROKEN?
+  Description: Has NxTerm been broken.  Testing with the open1788/knxterm configuration
+               I am seeing some bad behaviors after scrolling.  Everything looks good
+               until the first call to nxterm_scroll().  After that, some characters
+               are missing on the display (replaced with spaced).
+               NOTE: This may be an issue only with the Open1788 configuration(?)
   Status:      Open
-  Priority:    Low
+  Priority:    Medium
+
 o Build system
   ^^^^^^^^^^^^
 

configs/open1788/README.txt

@@ -402,11 +402,13 @@ Configuration Directories
     configuration notes for instructions on building and loading this
     configuration.
 
-    STATUS:
-      2019-03-06:  This configuration was created.  It doew not yet link
-        correctly, however, because certain nxterm interfaces are improperly
-        exported: nxterm_redraw() and nxterm_kbdin().  There were replaced
-        with boardctl() calls but have not yet been verified.
+    This is a very minimal configuration intended only for low level testing.
+    To be useful, the font sizes, windows sizes, and line widths would need
+    to be optimized to make a friendlier display.
+
+    STATUS:  2019-03-08:  Currently I am seeing a problem.  The display looks
+      good until it begins scrolling when the display is full.  Then there are
+      missing characters.
 
   nsh
   ---

configs/open1788/knxterm/defconfig

@@ -20,16 +20,18 @@ CONFIG_BOARD_LOOPSPERMSEC=11934
 CONFIG_BUILD_PROTECTED=y
 CONFIG_DEV_LOOP=y
 CONFIG_EXAMPLES_NXTERM=y
-CONFIG_EXAMPLES_NXTERM_FONTID=6
+CONFIG_EXAMPLES_NXTERM_FONTID=1
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
+CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LPC17_EXTDRAM=y
 CONFIG_LPC17_EXTDRAMSIZE=67108864
 CONFIG_LPC17_GPDMA=y
 CONFIG_LPC17_LCD=y
+CONFIG_LPC17_LCD_BPP16=y
 CONFIG_LPC17_SDCARD=y
 CONFIG_LPC17_UART0=y
 CONFIG_MAX_TASKS=16
@@ -40,17 +42,22 @@ CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
+CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
+CONFIG_NSH_DISABLE_PS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x00040000
 CONFIG_NX=y
-CONFIG_NXFONT_SANS28X37B=y
+CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXTERM=y
+CONFIG_NXTERM_CURSORCHAR=95
+CONFIG_NXTERM_MXCHARS=512
+CONFIG_NXTERM_NOWRAP=y
 CONFIG_NX_BLOCKING=y
 CONFIG_PASS1_BUILDIR="configs/open1788/kernel"
 CONFIG_PIPES=y
-CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
 CONFIG_RAM_SIZE=65536

configs/open1788/scripts/memory.ld

@@ -39,9 +39,11 @@
  * 0x20000000 bank0 first and 8KB at 0x20002000 at bank0 second. And 16KB
  * at 0x20004000 on bank1.
  *
- * For MPU support, the kernel-mode NuttX section is assumed to be 128KB of
+ * For MPU support, the kernel-mode NuttX section is assumed to be 256KB of
  * FLASH and 4KB of SRAM.  That, of course, can be optimized as needed (See
- * also configs/open1788/scripts/kernel-space.ld).
+ * also configs/open1788/scripts/kernel-space.ld); 256KB is probably much
+ * more than is needed by the RTOS!  That size is selected only because it
+ * is available due to alignment issues for the user space FLASH memory.
  *
  * Alignment of the user space FLASH partition is a critical factor: The
  * user space FLASH partition will be spanned with a single region of size
@@ -80,8 +82,7 @@ MEMORY
 {
     /* 256Kb FLASH */
 
-    kflash (rx)      : ORIGIN = 0x00000000, LENGTH = 128K
-    xflash (rx)      : ORIGIN = 0x00020000, LENGTH = 128K /* Wasted */
+    kflash (rx)      : ORIGIN = 0x00000000, LENGTH = 256K /* More than needed */
     uflash (rx)      : ORIGIN = 0x00040000, LENGTH = 256K
 
     /* 64Kb of SRAM in the CPU block */

configs/open1788/src/lpc17_bringup.c

@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <sys/mount.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <syslog.h>
@@ -378,6 +379,16 @@ int open1788_bringup(void)
 {
   int ret;
 
+#ifdef CONFIG_FS_PROCFS
+  /* Mount the procfs file system at the default location, /proc */
+
+  ret = mount(NULL, "/proc", "procfs", 0, NULL);
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to mount procfs: %d\n", ret);
+    }
+#endif
+
   /* Initialize SPI-based microSD */
 
   ret = nsh_sdinitialize();

configs/stm32l4r9ai-disco/README.txt

@@ -1,4 +1,3 @@
-XXX all this needs review and update
 README
 ======
 
@@ -47,10 +46,9 @@ Contents
   - Hardware
     - Button
     - LED
-    - USARTs and Serial Consoles
+    - U[S]ARTs and Serial Consoles
+  - Segger J-Link
   - LQFP64
-  - mbed
-  - Shields
   - Configurations
 
 mbed
@@ -106,8 +104,8 @@ Hardware
   running normally. If LD2 is flashing at approximately 2Hz, then a fatal error
   has been detected and the system has halted.
 
-Serial Consoles
-===============
+  U[S]ARTs and Serial Consoles
+  ----------------------------
 
   USART1
   ------
@@ -224,6 +222,21 @@ Serial Consoles
   As shipped, SB62 and SB63 are open and SB13 and SB14 closed, so the
   virtual COM port is enabled.
 
+Segger J-Link
+=============
+
+  Reference: https://www.segger.com/downloads/application-notes/AN00021
+
+  1. Connect J-Link VTref     (1) to pin VDD
+  2. Connect J-Link SWDIO     (7) to pin PA13
+  3. Connect J-Link SWCLK     (9) to pin PA14
+  4. Connect J-Link SWO      (13) to pin PB3
+  5. Connect J-Link RESET    (15) to pin NRST
+  6. Connect J-Link 5V-Supply (1) to pin 5V
+  7. Connect J-Link GND       (4) to pin GND
+
+  Jumpers on CN4 (ST-Link) must be removed for external debug.
+
 Configurations
 ==============
 

graphics/nxterm/nx_register.c

@@ -184,6 +184,5 @@ static int nxterm_bitmap(FAR struct nxterm_state_s *priv,
 
 NXTERM nx_register(NXWINDOW hwnd, FAR struct nxterm_window_s *wndo, int minor)
 {
-  return nxterm_register((NXTERM)hwnd, wndo, &g_nxops, minor);
+  return nxterm_register((NXTERM)hwnd, wndo, &wndo->wsize, &g_nxops, minor);
 }
-

graphics/nxterm/nxterm.h

@@ -124,6 +124,7 @@ struct nxterm_state_s
   FAR const struct nxterm_operations_s *ops; /* Window operations */
   FAR void *handle;                          /* The window handle */
   FAR struct nxterm_window_s wndo;           /* Describes the window and font */
+  struct nxgl_size_s wsize;                  /* NXTK main window size */
   sem_t exclsem;                             /* Forces mutually exclusive access */
 #ifdef CONFIG_DEBUG_FEATURES
   pid_t holder;                              /* Deadlock avoidance */
@@ -202,8 +203,8 @@ int nxterm_sempost(FAR struct nxterm_state_s *priv);
 /* Common device registration/un-registration */
 
 FAR struct nxterm_state_s *nxterm_register(NXTERM handle,
-    FAR struct nxterm_window_s *wndo, FAR const struct nxterm_operations_s *ops,
-    int minor);
+    FAR struct nxterm_window_s *wndo, FAR struct nxgl_size_s *wsize,
+    FAR const struct nxterm_operations_s *ops, int minor);
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
 void nxterm_unregister(FAR struct nxterm_state_s *priv);
 #endif

graphics/nxterm/nxterm_font.c

@@ -82,6 +82,59 @@ static int nxterm_fontsize(FAR struct nxterm_state_s *priv, uint8_t ch,
   return -ENOENT;
 }
 
+/****************************************************************************
+ * Name: nxterm_fillspace
+ ****************************************************************************/
+
+static void nxterm_fillspace(FAR struct nxterm_state_s *priv,
+                             FAR const struct nxgl_rect_s *rect,
+                             FAR const struct nxterm_bitmap_s *bm)
+{
+#if 0 /* Not necessary */
+  struct nxgl_rect_s bounds;
+  struct nxgl_rect_s intersection;
+  int ret;
+
+  /* Construct a bounding box for the glyph */
+
+  bounds.pt1.x = bm->pos.x;
+  bounds.pt1.y = bm->pos.y;
+  bounds.pt2.x = bm->pos.x + priv->spwidth - 1;
+  bounds.pt2.y = bm->pos.y + priv->fheight - 1;
+
+# /* Should this also be clipped to a region in the window? */
+
+  if (rect != NULL)
+    {
+      /* Get the intersection of the redraw region and the character bitmap */
+
+      nxgl_rectintersect(&intersection, rect, &bounds);
+    }
+  else
+    {
+      /* The intersection is the whole glyph */
+
+      nxgl_rectcopy(&intersection, &bounds);
+    }
+
+  /* Check for empty intersections */
+
+  if (!nxgl_nullrect(&intersection))
+    {
+      /* Fill the bitmap region with the background color, erasing the
+       * character from the display.  NOTE:  This region might actually
+       * be obscured... NX will handle that case.
+       */
+
+      ret = priv->ops->fill(priv, &intersection, priv->wndo.wcolor);
+      if (ret < 0)
+        {
+          gerr("ERROR: fill() method failed: %d\n", ret);
+        }
+    }
+#endif
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -150,7 +203,7 @@ nxterm_addchar(FAR struct nxterm_state_s *priv, uint8_t ch)
  ****************************************************************************/
 
 int nxterm_hidechar(FAR struct nxterm_state_s *priv,
-                   FAR const struct nxterm_bitmap_s *bm)
+                    FAR const struct nxterm_bitmap_s *bm)
 {
   struct nxgl_rect_s bounds;
   struct nxgl_size_s fsize;
@@ -285,6 +338,7 @@ void nxterm_fillchar(FAR struct nxterm_state_s *priv,
 
   if (BM_ISSPACE(bm))
     {
+      nxterm_fillspace(priv, rect, bm);
       return;
     }
 
@@ -311,7 +365,7 @@ void nxterm_fillchar(FAR struct nxterm_state_s *priv,
 
   /* Should this also be clipped to a region in the window? */
 
-  if (rect)
+  if (rect != NULL)
     {
       /* Get the intersection of the redraw region and the character bitmap */
 

graphics/nxterm/nxterm_putc.c

@@ -47,6 +47,10 @@
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 /****************************************************************************
  * Name: nxterm_putc
  *
@@ -77,7 +81,7 @@ void nxterm_putc(FAR struct nxterm_state_s *priv, uint8_t ch)
 
   /* Will another character fit on this line? */
 
-  if (priv->fpos.x + priv->fwidth > priv->wndo.wsize.w)
+  if (priv->fpos.x + priv->fwidth > priv->wsize.w)
     {
 #ifndef CONFIG_NXTERM_NOWRAP
       /* No.. move to the next line */
@@ -113,7 +117,7 @@ void nxterm_putc(FAR struct nxterm_state_s *priv, uint8_t ch)
   /* Check if we need to scroll up */
 
   lineheight = (priv->fheight + CONFIG_NXTERM_LINESEPARATION);
-  while (priv->fpos.y >= priv->wndo.wsize.h - lineheight)
+  while (priv->fpos.y >= priv->wsize.h - lineheight)
     {
       nxterm_scroll(priv, lineheight);
     }
@@ -143,7 +147,7 @@ void nxterm_showcursor(FAR struct nxterm_state_s *priv)
 
   /* Will another character fit on this line? */
 
-  if (priv->fpos.x + priv->fwidth > priv->wndo.wsize.w)
+  if (priv->fpos.x + priv->fwidth > priv->wsize.w)
     {
 #ifndef CONFIG_NXTERM_NOWRAP
       /* No.. move to the next line */
@@ -157,7 +161,7 @@ void nxterm_showcursor(FAR struct nxterm_state_s *priv)
   /* Check if we need to scroll up */
 
   lineheight = (priv->fheight + CONFIG_NXTERM_LINESEPARATION);
-  while (priv->fpos.y >= priv->wndo.wsize.h - lineheight)
+  while (priv->fpos.y >= priv->wsize.h - lineheight)
     {
       nxterm_scroll(priv, lineheight);
     }

graphics/nxterm/nxterm_register.c

@@ -63,7 +63,8 @@
 
 FAR struct nxterm_state_s *
   nxterm_register(NXTERM handle, FAR struct nxterm_window_s *wndo,
-                 FAR const struct nxterm_operations_s *ops, int minor)
+                  FAR struct nxgl_size_s *wsize,
+                  FAR const struct nxterm_operations_s *ops, int minor)
 {
   FAR struct nxterm_state_s *priv;
   FAR const struct nx_font_s *fontset;
@@ -87,7 +88,9 @@ FAR struct nxterm_state_s *
   priv->ops     = ops;
   priv->handle  = handle;
   priv->minor   = minor;
+
   memcpy(&priv->wndo, wndo, sizeof(struct nxterm_window_s));
+  memcpy(&priv->wsize, wsize, sizeof(struct nxgl_size_s));
 
   nxsem_init(&priv->exclsem, 0, 1);
 #ifdef CONFIG_DEBUG_FEATURES

graphics/nxterm/nxterm_scroll.c

@@ -85,7 +85,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
    */
 
   rect.pt1.x = 0;
-  rect.pt2.x = priv->wndo.wsize.w - 1;
+  rect.pt2.x = priv->wsize.w - 1;
 
   for (row = CONFIG_NXTERM_LINESEPARATION; row < bottom; row += scrollheight)
     {
@@ -107,7 +107,8 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
       for (i = 0; i < priv->nchars; i++)
         {
           bm = &priv->bm[i];
-          if (bm->pos.y <= rect.pt2.y && bm->pos.y + priv->fheight >= rect.pt1.y)
+          if (bm->pos.y <= rect.pt2.y &&
+              bm->pos.y + priv->fheight >= rect.pt1.y)
             {
               nxterm_fillchar(priv, &rect, bm);
             }
@@ -117,7 +118,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
   /* Finally, clear the vacated part of the display */
 
   rect.pt1.y = bottom;
-  rect.pt2.y = priv->wndo.wsize.h - 1;
+  rect.pt2.y = priv->wsize.h - 1;
 
   ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
   if (ret < 0)
@@ -145,8 +146,8 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
 
   rect.pt1.x = 0;
   rect.pt1.y = scrollheight;
-  rect.pt2.x = priv->wndo.wsize.w - 1;
-  rect.pt2.y = priv->wndo.wsize.h - 1;
+  rect.pt2.x = priv->wsize.w - 1;
+  rect.pt2.y = priv->wsize.h - 1;
 
   /* The offset that determines how far to move the source rectangle */
 
@@ -163,7 +164,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
 
   /* Finally, clear the vacated bottom part of the display */
 
-  rect.pt1.y = priv->wndo.wsize.h - scrollheight;
+  rect.pt1.y = priv->wsize.h - scrollheight;
 
   ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
   if (ret < 0)
@@ -198,9 +199,9 @@ void nxterm_scroll(FAR struct nxterm_state_s *priv, int scrollheight)
         {
           /* Yes... Delete the character by moving all of the data */
 
-          for (j = i; j < priv->nchars-1; j++)
+          for (j = i; j < priv->nchars - 1; j++)
             {
-              memcpy(&priv->bm[j], &priv->bm[j+1],
+              memcpy(&priv->bm[j], &priv->bm[j + 1],
                      sizeof(struct nxterm_bitmap_s));
             }
 
@@ -209,6 +210,8 @@ void nxterm_scroll(FAR struct nxterm_state_s *priv, int scrollheight)
            */
 
           priv->nchars--;
+          priv->bm[priv->nchars].code  = ' ';
+          priv->bm[priv->nchars].flags = BMFLAGS_NOGLYPH;
         }
 
       /* No.. just decrement its vertical position (moving it "up" the

graphics/nxterm/nxtk_register.c

@@ -160,6 +160,22 @@ static int nxtkcon_bitmap(FAR struct nxterm_state_s *priv,
   return nxtk_bitmapwindow((NXTKWINDOW)priv->handle, dest, src, origin, stride);
 }
 
+/****************************************************************************
+ * Name: nxterm_tbheight
+ *
+ * Description:
+ *   Get the current height of the toolbar.
+ *
+ ****************************************************************************/
+
+static nxgl_coord_t nxterm_tbheight(NXTKWINDOW hfwnd)
+{
+  FAR struct nxgl_rect_s bounds;
+
+  (void)nxtk_toolbarbounds(hfwnd, &bounds);
+  return bounds.pt2.y - bounds.pt1.y + 1;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -182,7 +198,16 @@ static int nxtkcon_bitmap(FAR struct nxterm_state_s *priv,
  *
  ****************************************************************************/
 
-NXTERM nxtk_register(NXTKWINDOW hfwnd, FAR struct nxterm_window_s *wndo, int minor)
+NXTERM nxtk_register(NXTKWINDOW hfwnd, FAR struct nxterm_window_s *wndo,
+                     int minor)
 {
-  return nxterm_register((NXTERM)hfwnd, wndo, &g_nxtkops, minor);
+  struct nxgl_size_s wsize;
+
+  /* REVISIT:  What if the window or toolbar size changes? */
+
+  wsize.w = wndo->wsize.w - 2 * CONFIG_NXTK_BORDERWIDTH;
+  wsize.h = wndo->wsize.h - nxterm_tbheight(hfwnd) -
+            2 * CONFIG_NXTK_BORDERWIDTH;
+
+  return nxterm_register((NXTERM)hfwnd, wndo, &wsize, &g_nxtkops, minor);
 }

graphics/nxterm/nxtool_register.c

@@ -160,6 +160,24 @@ static int nxtool_bitmap(FAR struct nxterm_state_s *priv,
   return nxtk_bitmaptoolbar((NXTKWINDOW)priv->handle, dest, src, origin, stride);
 }
 
+/****************************************************************************
+ * Name: nxterm_toolbar_size
+ *
+ * Description:
+ *   Get the current size of the toolbar.
+ *
+ ****************************************************************************/
+
+static void nxterm_toolbar_size(NXTKWINDOW hfwnd,
+                                FAR struct nxgl_size_s *size)
+{
+  FAR struct nxgl_rect_s bounds;
+
+  (void)nxtk_toolbarbounds(hfwnd, &bounds);
+  size->w = bounds.pt2.x - bounds.pt1.x + 1;
+  size->h = bounds.pt2.y - bounds.pt1.y + 1;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -186,6 +204,9 @@ static int nxtool_bitmap(FAR struct nxterm_state_s *priv,
 
 NXTERM nxtool_register(NXTKWINDOW hfwnd, FAR struct nxterm_window_s *wndo, int minor)
 {
-  return nxterm_register((NXTERM)hfwnd, wndo, &g_nxtoolops, minor);
+  FAR struct nxgl_size_s tbsize;
+
+  nxterm_toolbar_size(hfwnd, &tbsize);
+  return nxterm_register((NXTERM)hfwnd, wndo, &tbsize, &g_nxtoolops, minor);
 }
 

libs/libnx/nxtk/nxtk_bitmaptoolbar.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_closetoolbar.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_closewindow.c

@@ -49,26 +49,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_containerclip.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_drawcircletoolbar.c

@@ -49,6 +49,7 @@
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
+
 /* Named indices into the 16 circle points generated by nxgl_circlepts */
 
 #define POINT_0p0      0
@@ -69,22 +70,6 @@
 #define POINT_337p5    15
 #define NCIRCLE_POINTS 16
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_drawcirclewindow.c

@@ -49,6 +49,7 @@
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
+
 /* Named indices into the 16 circle points generated by nxgl_circlepts */
 
 #define POINT_0p0      0
@@ -69,22 +70,6 @@
 #define POINT_337p5    15
 #define NCIRCLE_POINTS 16
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_drawframe.c

@@ -49,22 +49,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_drawlinetoolbar.c

@@ -47,26 +47,6 @@
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxtk.h>
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_drawlinewindow.c

@@ -47,26 +47,6 @@
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxtk.h>
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_events.c

@@ -50,14 +50,6 @@
 #include <nuttx/nx/nx.h>
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/
@@ -78,10 +70,6 @@ static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
 #endif
 static void nxtk_blocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2);
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -99,10 +87,6 @@ const struct nx_callback_s g_nxtkcb =
   , nxtk_blocked  /* blocked */
 };
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Name: nxtk_redraw
  ****************************************************************************/

libs/libnx/nxtk/nxtk_fillcircletoolbar.c

@@ -52,22 +52,6 @@
 
 #define NCIRCLE_TRAPS 8
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_fillcirclewindow.c

@@ -52,22 +52,6 @@
 
 #define NCIRCLE_TRAPS 8
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_filltoolbar.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_filltraptoolbar.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_filltrapwindow.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_fillwindow.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_getposition.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_gettoolbar.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_getwindow.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_lower.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_movetoolbar.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_movewindow.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_opentoolbar.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_openwindow.c

@@ -48,18 +48,6 @@
 #include "nxcontext.h"
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -88,10 +76,6 @@ nxgl_mxpixel_t g_bordercolor3[CONFIG_NX_NPLANES] =
 #endif
 };
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_raise.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_setposition.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_setsize.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_setsubwindows.c

@@ -47,30 +47,6 @@
 #include <nuttx/nx/nx.h>
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_subwindowclip.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_subwindowmove.c

@@ -48,26 +48,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

libs/libnx/nxtk/nxtk_toolbarbounds.c

@@ -47,26 +47,6 @@
 
 #include "nxtk.h"
 
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/