summaryrefslogtreecommitdiff
path: root/nuttx/graphics/nxconsole/nxcon_font.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-30 18:42:40 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-30 18:42:40 +0000
commit7b4b14ec2acf251ba72ef2929011037bfc26e714 (patch)
tree5ab49f724ed67d3506856d404b0cd3c03f8fea86 /nuttx/graphics/nxconsole/nxcon_font.c
parentef881d69ec4bd4b9d5cd2783418e506ce7fb8444 (diff)
downloadpx4-nuttx-7b4b14ec2acf251ba72ef2929011037bfc26e714.tar.gz
px4-nuttx-7b4b14ec2acf251ba72ef2929011037bfc26e714.tar.bz2
px4-nuttx-7b4b14ec2acf251ba72ef2929011037bfc26e714.zip
Add framework in NxConsole to support VT100 escape sequences
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4542 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics/nxconsole/nxcon_font.c')
-rw-r--r--nuttx/graphics/nxconsole/nxcon_font.c58
1 files changed, 6 insertions, 52 deletions
diff --git a/nuttx/graphics/nxconsole/nxcon_font.c b/nuttx/graphics/nxconsole/nxcon_font.c
index 140da4ad7..cb5320d25 100644
--- a/nuttx/graphics/nxconsole/nxcon_font.c
+++ b/nuttx/graphics/nxconsole/nxcon_font.c
@@ -39,20 +39,9 @@
#include <nuttx/config.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
+#include <assert.h>
#include <debug.h>
-#include <nuttx/kmalloc.h>
-
-#include <nuttx/nx/nx.h>
-#include <nuttx/nx/nxtk.h>
-#include <nuttx/nx/nxfonts.h>
-
#include "nxcon_internal.h"
/****************************************************************************
@@ -411,6 +400,10 @@ nxcon_getglyph(NXHANDLE hfont, FAR struct nxcon_state_s *priv, uint8_t ch)
}
/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
* Name: nxcon_addchar
*
* Description:
@@ -419,7 +412,7 @@ nxcon_getglyph(NXHANDLE hfont, FAR struct nxcon_state_s *priv, uint8_t ch)
*
****************************************************************************/
-static FAR const struct nxcon_bitmap_s *
+FAR const struct nxcon_bitmap_s *
nxcon_addchar(NXHANDLE hfont, FAR struct nxcon_state_s *priv, uint8_t ch)
{
FAR struct nxcon_bitmap_s *bm = NULL;
@@ -466,10 +459,6 @@ nxcon_addchar(NXHANDLE hfont, FAR struct nxcon_state_s *priv, uint8_t ch)
}
/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
* Name: nxcon_home
*
* Description:
@@ -508,41 +497,6 @@ void nxcon_newline(FAR struct nxcon_state_s *priv)
}
/****************************************************************************
- * Name: nxcon_putc
- *
- * Description:
- * Render the specified character at the current display position.
- *
- ****************************************************************************/
-
-void nxcon_putc(FAR struct nxcon_state_s *priv, uint8_t ch)
-{
- FAR const struct nxcon_bitmap_s *bm;
-
- /* If it is a newline character, then just perform the logical newline
- * operation.
- */
-
- if (ch == '\n')
- {
- nxcon_newline(priv);
- }
-
- /* Otherwise, find the glyph associated with the character and render it
- * onto the display.
- */
-
- else
- {
- bm = nxcon_addchar(priv->font, priv, ch);
- if (bm)
- {
- nxcon_fillchar(priv, NULL, bm);
- }
- }
-}
-
-/****************************************************************************
* Name: nxcon_fillchar
*
* Description: