diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-15 12:40:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-15 12:40:59 +0000 |
| commit | a778f0c7e076b4bab911945ee2630d767448d147 (patch) | |
| tree | 09b07d102f0fc5d4d08f5233f0a17e47f44f5150 /nuttx/graphics | |
| parent | c1a162433f5694f2ff3bea4258bdbd3141712ba1 (diff) | |
| download | px4-nuttx-a778f0c7e076b4bab911945ee2630d767448d147.tar.gz px4-nuttx-a778f0c7e076b4bab911945ee2630d767448d147.tar.bz2 px4-nuttx-a778f0c7e076b4bab911945ee2630d767448d147.zip | |
NX for 4bpp
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2671 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics')
| -rw-r--r-- | nuttx/graphics/nxglib/nxglib_fillrun.h | 6 | ||||
| -rw-r--r-- | nuttx/graphics/nxtk/nxtk_internal.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nuttx/graphics/nxglib/nxglib_fillrun.h b/nuttx/graphics/nxglib/nxglib_fillrun.h index d427cd4b3..b1d8a3a7f 100644 --- a/nuttx/graphics/nxglib/nxglib_fillrun.h +++ b/nuttx/graphics/nxglib/nxglib_fillrun.h @@ -101,7 +101,7 @@ static inline void nxgl_fillrun_1bpp(FAR uint8_t *run, nxgl_mxpixel_t color, uint8_t wide = (color & 1) != 0 ? 0xff : 0x00; /* Fill the run with the color (it is okay to run a fractional byte over - * the end + * the end) */ memset(run, wide, nbytes); @@ -120,7 +120,7 @@ static inline void nxgl_fillrun_2bpp(FAR uint8_t *run, nxgl_mxpixel_t color, uint8_t wide = g_wide_2bpp[color & 3]; /* Fill the run with the color (it is okay to run a fractional byte over - * the end + * the end) */ memset(run, wide, nbytes); @@ -140,7 +140,7 @@ static inline void nxgl_fillrun_4bpp(FAR uint8_t *run, nxgl_mxpixel_t color, uint8_t wide = narrow | (narrow << 4); /* Fill the run with the color (it is okay to run a fractional byte over - * the end + * the end) */ memset(run, wide, nbytes); diff --git a/nuttx/graphics/nxtk/nxtk_internal.h b/nuttx/graphics/nxtk/nxtk_internal.h index b02bb94ce..fe7792476 100644 --- a/nuttx/graphics/nxtk/nxtk_internal.h +++ b/nuttx/graphics/nxtk/nxtk_internal.h @@ -61,6 +61,8 @@ # define CONFIG_NXTK_BORDERCOLOR1 0x00a9a9a9 # elif !defined(CONFIG_NX_DISABLE_16BPP) # define CONFIG_NXTK_BORDERCOLOR1 0xad55 +# elif !defined(CONFIG_NX_DISABLE_4BPP) +# define CONFIG_NXTK_BORDERCOLOR1 6 # else # define CONFIG_NXTK_BORDERCOLOR1 'B' # endif @@ -71,6 +73,8 @@ # define CONFIG_NXTK_BORDERCOLOR2 0x00696969 # elif !defined(CONFIG_NX_DISABLE_16BPP) # define CONFIG_NXTK_BORDERCOLOR2 0x6b4d +# elif !defined(CONFIG_NX_DISABLE_4BPP) +# define CONFIG_NXTK_BORDERCOLOR2 4 # else # define CONFIG_NXTK_BORDERCOLOR2 'b' # endif |