diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-30 22:49:08 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-30 22:49:08 +0000 |
| commit | 3d86917712f6c502e8edc640649e6f204376ba06 (patch) | |
| tree | 5cba9b70ef679b51a066c54102b96ee40f87126c /nuttx/graphics/nxconsole/nxcon_register.c | |
| parent | 6542745de8fbe0f90de06052821c6d78ab183250 (diff) | |
| download | px4-firmware-3d86917712f6c502e8edc640649e6f204376ba06.tar.gz px4-firmware-3d86917712f6c502e8edc640649e6f204376ba06.tar.bz2 px4-firmware-3d86917712f6c502e8edc640649e6f204376ba06.zip | |
More fixes for NxConsole driver
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4543 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/graphics/nxconsole/nxcon_register.c')
| -rw-r--r-- | nuttx/graphics/nxconsole/nxcon_register.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/nuttx/graphics/nxconsole/nxcon_register.c b/nuttx/graphics/nxconsole/nxcon_register.c index 78f6a1051..663764dce 100644 --- a/nuttx/graphics/nxconsole/nxcon_register.c +++ b/nuttx/graphics/nxconsole/nxcon_register.c @@ -124,27 +124,9 @@ FAR struct nxcon_state_s * priv->maxchars = CONFIG_NXCONSOLE_MXCHARS; - /* Set up the font glyph bitmap cache (if enabled) */ + /* Set up the font glyph bitmap cache */ -#ifdef CONFIG_NXCONSOLE_FONTCACHE priv->maxglyphs = CONFIG_NXCONSOLE_CACHESIZE; -#endif - - /* Pre-allocate maximal sized glyph bitmap memory (only if we are not - * using the glyph cache. - */ - -#ifndef CONFIG_NXCONSOLE_FONTCACHE - { - int allocsize = (priv->fheight * priv->fwidth * CONFIG_NXCONSOLE_BPP + 7) >> 3; - priv->glyph.bitmap = (FAR uint8_t *)kmalloc(allocsize); - if (!priv->glyph.bitmap) - { - gdbg("Failed to allocate glyph memory\n"); - goto errout; - } - } -#endif /* Set the initial display position */ |