diff options
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_i2c.c | 2 | ||||
-rw-r--r-- | nuttx/configs/sim/nx/defconfig | 1 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/appconfig | 5 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/defconfig | 39 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nx/appconfig | 10 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nx/defconfig | 39 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nxlines/appconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nxlines/defconfig | 39 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nxtext/appconfig | 6 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nxtext/defconfig | 39 | ||||
-rw-r--r-- | nuttx/graphics/nxbe/nxbe_redrawbelow.c | 4 | ||||
-rwxr-xr-x | nuttx/graphics/nxconsole/nxcon_driver.c | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nx_openwindow.c | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nx_setposition.c | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nxsu_constructwindow.c | 6 | ||||
-rw-r--r-- | nuttx/graphics/nxtk/nxtk_internal.h | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxtk/nxtk_setposition.c | 4 |
17 files changed, 198 insertions, 19 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c index 11e6767ae..1865cd814 100644 --- a/nuttx/arch/arm/src/stm32/stm32_i2c.c +++ b/nuttx/arch/arm/src/stm32/stm32_i2c.c @@ -1069,7 +1069,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) { stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, I2C_CR1_ACK, 0); } - priv->dnct--; + priv->dcnt--; } } diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index b301f869b..fcac93e09 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -621,6 +621,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n # # Settings for examples/mount +# CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" #CONFIG_EXAMPLES_MOUNT_NSECTORS=2048 #CONFIG_EXAMPLES_MOUNT_SECTORSIZE=512 diff --git a/nuttx/configs/stm3210e-eval/nsh2/appconfig b/nuttx/configs/stm3210e-eval/nsh2/appconfig index ba078d58a..de15b0ddf 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/appconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/appconfig @@ -43,9 +43,14 @@ CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # The NX and NXHELLO examples configured as an NX built-in commands +# Various NX tests can be supported, simply comment-out examples/nx and +# uncomment the test you wish to perform CONFIGURED_APPS += examples/nx CONFIGURED_APPS += examples/nxhello +#CONFIGURED_APPS += examples/nxlines +#CONFIGURED_APPS += examples/nxtext +#CONFIGURED_APPS += examples/nxconsole CONFIGURED_APPS += examples/usbstorage ifeq ($(CONFIG_I2C),y) diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 5174d5101..09a701b8d 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -1041,6 +1041,45 @@ CONFIG_NX_MXSERVERMSGS=32 CONFIG_NX_MXCLIENTMSGS=16 # +# NxConsole Configuration Settings: +# +# CONFIG_NXCONSOLE_BPP +# Currently, NxConsole supports only a single pixel depth. This +# configuration setting must be provided to support that single pixel depth. +# Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) +# CONFIG_NXCONSOLE_NOGETRUN +# NxConsole needs to know if it can read from the LCD or not. If reading +# from the LCD is supported, then NxConsole can do more efficient +# scrolling. Default: Supported +# CONFIG_NXCONSOLE_MXCHARS +# NxConsole needs to remember every character written to the console so +# that it can redraw the window. This setting determines the size of some +# internal memory allocations used to hold the character data. Default: 128. +# CONFIG_NXCONSOLE_FONTCACHE +# If this setting is defined, then caching of fonts will be supported by +# NxConsole. Each font must be rendered from the tiny font storage format +# to the full display size and pixel depth. If this setting is defined, then +# the more recently used font glyphs will be retained in a cache of size +# CONFIG_NXCONSOLE_CACHESIZE. Default: No font caching. +# CONFIG_NXCONSOLE_CACHESIZE +# If CONFIG_NXCONSOLE_FONTCACHE, then this setting will control the size +# of the font cache (in number of glyphs). Default: 16. +# CONFIG_NXCONSOLE_LINESEPARATION +# This the space (in rows) between each row of test. Default: 2 +# CONFIG_NXCONSOLE_NOWRAP +# By default, lines will wrap when the test reaches the right hand side +# of the window. This setting can be defining to change this behavior so +# that the text is simply truncated until a new line is encountered. +# +CONFIG_NXCONSOLE_BPP=16 +# CONFIG_NXCONSOLE_NOGETRUN +# CONFIG_NXCONSOLE_MXCHARS +# CONFIG_NXCONSOLE_FONTCACHE +# CONFIG_NXCONSOLE_CACHESIZE +# CONFIG_NXCONSOLE_LINESEPARATION +# CONFIG_NXCONSOLE_NOWRAP + +# # STM3210E-EVAL LCD Hardware Configuration # # CONFIG_LCD_LANDSCAPE - Define for 320x240 display "landscape" diff --git a/nuttx/configs/stm3210e-eval/nx/appconfig b/nuttx/configs/stm3210e-eval/nx/appconfig index 07fed473b..7f660642c 100644 --- a/nuttx/configs/stm3210e-eval/nx/appconfig +++ b/nuttx/configs/stm3210e-eval/nx/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/stm3210e-eval/nx/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -34,6 +34,12 @@ ############################################################################ # Path to example in apps/examples containing the user_start entry point +# Various NX tests can be supported, simply comment-out examples/nx and +# uncomment the test you wish to perform CONFIGURED_APPS += examples/nx +#CONFIGURED_APPS += examples/nxhello +#CONFIGURED_APPS += examples/nxlines +#CONFIGURED_APPS += examples/nxtext +#CONFIGURED_APPS += examples/nxconsole diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index 823d67a5a..7532dab55 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/configs/stm3210e-eval/nx/defconfig @@ -891,6 +891,45 @@ CONFIG_NX_MXSERVERMSGS=32 CONFIG_NX_MXCLIENTMSGS=16 # +# NxConsole Configuration Settings: +# +# CONFIG_NXCONSOLE_BPP +# Currently, NxConsole supports only a single pixel depth. This +# configuration setting must be provided to support that single pixel depth. +# Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) +# CONFIG_NXCONSOLE_NOGETRUN +# NxConsole needs to know if it can read from the LCD or not. If reading +# from the LCD is supported, then NxConsole can do more efficient +# scrolling. Default: Supported +# CONFIG_NXCONSOLE_MXCHARS +# NxConsole needs to remember every character written to the console so +# that it can redraw the window. This setting determines the size of some +# internal memory allocations used to hold the character data. Default: 128. +# CONFIG_NXCONSOLE_FONTCACHE +# If this setting is defined, then caching of fonts will be supported by +# NxConsole. Each font must be rendered from the tiny font storage format +# to the full display size and pixel depth. If this setting is defined, then +# the more recently used font glyphs will be retained in a cache of size +# CONFIG_NXCONSOLE_CACHESIZE. Default: No font caching. +# CONFIG_NXCONSOLE_CACHESIZE +# If CONFIG_NXCONSOLE_FONTCACHE, then this setting will control the size +# of the font cache (in number of glyphs). Default: 16. +# CONFIG_NXCONSOLE_LINESEPARATION +# This the space (in rows) between each row of test. Default: 2 +# CONFIG_NXCONSOLE_NOWRAP +# By default, lines will wrap when the test reaches the right hand side +# of the window. This setting can be defining to change this behavior so +# that the text is simply truncated until a new line is encountered. +# +CONFIG_NXCONSOLE_BPP=16 +# CONFIG_NXCONSOLE_NOGETRUN +# CONFIG_NXCONSOLE_MXCHARS +# CONFIG_NXCONSOLE_FONTCACHE +# CONFIG_NXCONSOLE_CACHESIZE +# CONFIG_NXCONSOLE_LINESEPARATION +# CONFIG_NXCONSOLE_NOWRAP + +# # STM3210E-EVAL LCD Hardware Configuration # # CONFIG_LCD_LANDSCAPE - Define for 320x240 display "landscape" diff --git a/nuttx/configs/stm3210e-eval/nxlines/appconfig b/nuttx/configs/stm3210e-eval/nxlines/appconfig index c76306447..0446d56cb 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/appconfig +++ b/nuttx/configs/stm3210e-eval/nxlines/appconfig @@ -34,6 +34,11 @@ ############################################################################ # Path to example in apps/examples containing the user_start entry point +# Various NX tests can be supported, simply comment-out examples/nx and +# uncomment the test you wish to perform +#CONFIGURED_APPS += examples/nx +#CONFIGURED_APPS += examples/nxhello CONFIGURED_APPS += examples/nxlines - +#CONFIGURED_APPS += examples/nxtext +#CONFIGURED_APPS += examples/nxconsole diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig index f457cccbc..7f912995f 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/defconfig +++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig @@ -890,6 +890,45 @@ CONFIG_NX_MXSERVERMSGS=32 CONFIG_NX_MXCLIENTMSGS=16 # +# NxConsole Configuration Settings: +# +# CONFIG_NXCONSOLE_BPP +# Currently, NxConsole supports only a single pixel depth. This +# configuration setting must be provided to support that single pixel depth. +# Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) +# CONFIG_NXCONSOLE_NOGETRUN +# NxConsole needs to know if it can read from the LCD or not. If reading +# from the LCD is supported, then NxConsole can do more efficient +# scrolling. Default: Supported +# CONFIG_NXCONSOLE_MXCHARS +# NxConsole needs to remember every character written to the console so +# that it can redraw the window. This setting determines the size of some +# internal memory allocations used to hold the character data. Default: 128. +# CONFIG_NXCONSOLE_FONTCACHE +# If this setting is defined, then caching of fonts will be supported by +# NxConsole. Each font must be rendered from the tiny font storage format +# to the full display size and pixel depth. If this setting is defined, then +# the more recently used font glyphs will be retained in a cache of size +# CONFIG_NXCONSOLE_CACHESIZE. Default: No font caching. +# CONFIG_NXCONSOLE_CACHESIZE +# If CONFIG_NXCONSOLE_FONTCACHE, then this setting will control the size +# of the font cache (in number of glyphs). Default: 16. +# CONFIG_NXCONSOLE_LINESEPARATION +# This the space (in rows) between each row of test. Default: 2 +# CONFIG_NXCONSOLE_NOWRAP +# By default, lines will wrap when the test reaches the right hand side +# of the window. This setting can be defining to change this behavior so +# that the text is simply truncated until a new line is encountered. +# +CONFIG_NXCONSOLE_BPP=16 +# CONFIG_NXCONSOLE_NOGETRUN +# CONFIG_NXCONSOLE_MXCHARS +# CONFIG_NXCONSOLE_FONTCACHE +# CONFIG_NXCONSOLE_CACHESIZE +# CONFIG_NXCONSOLE_LINESEPARATION +# CONFIG_NXCONSOLE_NOWRAP + +# # STM3210E-EVAL LCD Hardware Configuration # # CONFIG_LCD_LANDSCAPE - Define for 320x240 display "landscape" diff --git a/nuttx/configs/stm3210e-eval/nxtext/appconfig b/nuttx/configs/stm3210e-eval/nxtext/appconfig index 73e9154ec..6c0928885 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/appconfig +++ b/nuttx/configs/stm3210e-eval/nxtext/appconfig @@ -34,6 +34,12 @@ ############################################################################ # Path to example in apps/examples containing the user_start entry point +# Various NX tests can be supported, simply comment-out examples/nx and +# uncomment the test you wish to perform +#CONFIGURED_APPS += examples/nx +#CONFIGURED_APPS += examples/nxhello +#CONFIGURED_APPS += examples/nxlines CONFIGURED_APPS += examples/nxtext +#CONFIGURED_APPS += examples/nxconsole diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig index b52c387d9..07a97e2c8 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/defconfig +++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig @@ -890,6 +890,45 @@ CONFIG_NX_MXSERVERMSGS=32 CONFIG_NX_MXCLIENTMSGS=16 # +# NxConsole Configuration Settings: +# +# CONFIG_NXCONSOLE_BPP +# Currently, NxConsole supports only a single pixel depth. This +# configuration setting must be provided to support that single pixel depth. +# Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) +# CONFIG_NXCONSOLE_NOGETRUN +# NxConsole needs to know if it can read from the LCD or not. If reading +# from the LCD is supported, then NxConsole can do more efficient +# scrolling. Default: Supported +# CONFIG_NXCONSOLE_MXCHARS +# NxConsole needs to remember every character written to the console so +# that it can redraw the window. This setting determines the size of some +# internal memory allocations used to hold the character data. Default: 128. +# CONFIG_NXCONSOLE_FONTCACHE +# If this setting is defined, then caching of fonts will be supported by +# NxConsole. Each font must be rendered from the tiny font storage format +# to the full display size and pixel depth. If this setting is defined, then +# the more recently used font glyphs will be retained in a cache of size +# CONFIG_NXCONSOLE_CACHESIZE. Default: No font caching. +# CONFIG_NXCONSOLE_CACHESIZE +# If CONFIG_NXCONSOLE_FONTCACHE, then this setting will control the size +# of the font cache (in number of glyphs). Default: 16. +# CONFIG_NXCONSOLE_LINESEPARATION +# This the space (in rows) between each row of test. Default: 2 +# CONFIG_NXCONSOLE_NOWRAP +# By default, lines will wrap when the test reaches the right hand side +# of the window. This setting can be defining to change this behavior so +# that the text is simply truncated until a new line is encountered. +# +CONFIG_NXCONSOLE_BPP=16 +# CONFIG_NXCONSOLE_NOGETRUN +# CONFIG_NXCONSOLE_MXCHARS +# CONFIG_NXCONSOLE_FONTCACHE +# CONFIG_NXCONSOLE_CACHESIZE +# CONFIG_NXCONSOLE_LINESEPARATION +# CONFIG_NXCONSOLE_NOWRAP + +# # STM3210E-EVAL LCD Hardware Configuration # # CONFIG_LCD_LANDSCAPE - Define for 320x240 display "landscape" diff --git a/nuttx/graphics/nxbe/nxbe_redrawbelow.c b/nuttx/graphics/nxbe/nxbe_redrawbelow.c index 2716a26bf..c795e5fed 100644 --- a/nuttx/graphics/nxbe/nxbe_redrawbelow.c +++ b/nuttx/graphics/nxbe/nxbe_redrawbelow.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxbe/nxbe_redraw.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/graphics/nxconsole/nxcon_driver.c b/nuttx/graphics/nxconsole/nxcon_driver.c index 60ed3242a..dc7d5f353 100755 --- a/nuttx/graphics/nxconsole/nxcon_driver.c +++ b/nuttx/graphics/nxconsole/nxcon_driver.c @@ -104,9 +104,9 @@ static int nxcon_open(FAR struct file *filep) /* Verify that the driver is opened for write-only access */ - if ((filep->f_oflags & O_WROK) != 0) + if ((filep->f_oflags & O_RDOK) != 0) { - gdbg("Attempted open with write access\n"); + gdbg("Attempted open with read access\n"); return -EACCES; } diff --git a/nuttx/graphics/nxsu/nx_openwindow.c b/nuttx/graphics/nxsu/nx_openwindow.c index 57b47251b..64f4ed76d 100644 --- a/nuttx/graphics/nxsu/nx_openwindow.c +++ b/nuttx/graphics/nxsu/nx_openwindow.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxsu/nx_openwindow.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/graphics/nxsu/nx_setposition.c b/nuttx/graphics/nxsu/nx_setposition.c index fc6d5bdc3..ed0e5e3f4 100644 --- a/nuttx/graphics/nxsu/nx_setposition.c +++ b/nuttx/graphics/nxsu/nx_setposition.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxsu/nx_setposition.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/graphics/nxsu/nxsu_constructwindow.c b/nuttx/graphics/nxsu/nxsu_constructwindow.c index 8ad803005..f812b3f83 100644 --- a/nuttx/graphics/nxsu/nxsu_constructwindow.c +++ b/nuttx/graphics/nxsu/nxsu_constructwindow.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxsu/nx_openwindow.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -125,7 +125,7 @@ int nxfe_constructwindow(NXHANDLE handle, FAR struct nxbe_window_s *wnd, wnd->cb = cb; wnd->arg = arg; - /* Insert the new window at the top on the display. topwind is + /* Insert the new window at the top on the display. topwnd is * never NULL (it may point only at the background window, however) */ diff --git a/nuttx/graphics/nxtk/nxtk_internal.h b/nuttx/graphics/nxtk/nxtk_internal.h index f76304b78..5351048cf 100644 --- a/nuttx/graphics/nxtk/nxtk_internal.h +++ b/nuttx/graphics/nxtk/nxtk_internal.h @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxtk/nxtk_internal.h * - * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2011-1021 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/graphics/nxtk/nxtk_setposition.c b/nuttx/graphics/nxtk/nxtk_setposition.c index 3c744112b..2a2a60665 100644 --- a/nuttx/graphics/nxtk/nxtk_setposition.c +++ b/nuttx/graphics/nxtk/nxtk_setposition.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxtk/nxtk_setposition.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |