diff options
Diffstat (limited to 'nuttx/graphics/nxterm/nxtool_register.c')
| -rw-r--r-- | nuttx/graphics/nxterm/nxtool_register.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nuttx/graphics/nxterm/nxtool_register.c b/nuttx/graphics/nxterm/nxtool_register.c index 631339a17..f1618bd5b 100644 --- a/nuttx/graphics/nxterm/nxtool_register.c +++ b/nuttx/graphics/nxterm/nxtool_register.c @@ -42,7 +42,7 @@ #include <nuttx/nx/nxtk.h> #include <nuttx/nx/nxterm.h> -#include "nxcon_internal.h" +#include "nxterm.h" /**************************************************************************** * Pre-processor Definitions @@ -52,15 +52,15 @@ * Private Function Prototypes ****************************************************************************/ -static int nxtool_fill(FAR struct nxcon_state_s *priv, +static int nxtool_fill(FAR struct nxterm_state_s *priv, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t wcolor[CONFIG_NX_NPLANES]); #ifndef CONFIG_NX_WRITEONLY -static int nxtool_move(FAR struct nxcon_state_s *priv, +static int nxtool_move(FAR struct nxterm_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); #endif -static int nxtool_bitmap(FAR struct nxcon_state_s *priv, +static int nxtool_bitmap(FAR struct nxterm_state_s *priv, FAR const struct nxgl_rect_s *dest, FAR const void *src[CONFIG_NX_NPLANES], FAR const struct nxgl_point_s *origin, @@ -70,7 +70,7 @@ static int nxtool_bitmap(FAR struct nxcon_state_s *priv, * Private Data ****************************************************************************/ -static const struct nxcon_operations_s g_nxtoolops = +static const struct nxterm_operations_s g_nxtoolops = { nxtool_fill, #ifndef CONFIG_NX_WRITEONLY @@ -99,7 +99,7 @@ static const struct nxcon_operations_s g_nxtoolops = * ****************************************************************************/ -static int nxtool_fill(FAR struct nxcon_state_s *priv, +static int nxtool_fill(FAR struct nxterm_state_s *priv, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t wcolor[CONFIG_NX_NPLANES]) { @@ -124,7 +124,7 @@ static int nxtool_fill(FAR struct nxcon_state_s *priv, ****************************************************************************/ #ifndef CONFIG_NX_WRITEONLY -static int nxtool_move(FAR struct nxcon_state_s *priv, +static int nxtool_move(FAR struct nxterm_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset) { @@ -155,7 +155,7 @@ static int nxtool_move(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -static int nxtool_bitmap(FAR struct nxcon_state_s *priv, +static int nxtool_bitmap(FAR struct nxterm_state_s *priv, FAR const struct nxgl_rect_s *dest, FAR const void *src[CONFIG_NX_NPLANES], FAR const struct nxgl_point_s *origin, @@ -188,8 +188,8 @@ static int nxtool_bitmap(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -NXTERM nxtool_register(NXTKWINDOW hfwnd, FAR struct nxcon_window_s *wndo, int minor) +NXTERM nxtool_register(NXTKWINDOW hfwnd, FAR struct nxterm_window_s *wndo, int minor) { - return nxcon_register((NXTERM)hfwnd, wndo, &g_nxtoolops, minor); + return nxterm_register((NXTERM)hfwnd, wndo, &g_nxtoolops, minor); } |