summaryrefslogtreecommitdiff
path: root/apps/examples/nxhello
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-27 18:29:04 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-27 18:29:04 +0000
commit4511f9758bf8027c5ee01b654b3b1558ebb2d11a (patch)
tree53266b0ceb89f5706fd21c7d83c824a329b0a002 /apps/examples/nxhello
parentbef5049f0198760cc241a0ef137e6c39e3edff8c (diff)
downloadpx4-nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.tar.gz
px4-nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.tar.bz2
px4-nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.zip
More STM3240G-EVAL LCD updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4665 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/nxhello')
-rw-r--r--apps/examples/nxhello/nxhello.h2
-rw-r--r--apps/examples/nxhello/nxhello_bkgd.c2
-rw-r--r--apps/examples/nxhello/nxhello_main.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/examples/nxhello/nxhello.h b/apps/examples/nxhello/nxhello.h
index 169285856..b4bff6c43 100644
--- a/apps/examples/nxhello/nxhello.h
+++ b/apps/examples/nxhello/nxhello.h
@@ -179,7 +179,7 @@ extern struct nxhello_data_s g_nxhello;
/* NX callback vtables */
-extern const struct nx_callback_s g_bgcb;
+extern const struct nx_callback_s g_nxhellocb;
/****************************************************************************
* Public Function Prototypes
diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c
index 93b7798e1..5c3ba68ae 100644
--- a/apps/examples/nxhello/nxhello_bkgd.c
+++ b/apps/examples/nxhello/nxhello_bkgd.c
@@ -116,7 +116,7 @@ static const char g_hello[] = "Hello, World!";
/* Background window call table */
-const struct nx_callback_s g_bgcb =
+const struct nx_callback_s g_nxhellocb =
{
nxhello_redraw, /* redraw */
nxhello_position /* position */
diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c
index e71df98d1..cf8373856 100644
--- a/apps/examples/nxhello/nxhello_main.c
+++ b/apps/examples/nxhello/nxhello_main.c
@@ -256,7 +256,7 @@ int MAIN_NAME(int argc, char *argv[])
/* Get the background window */
- ret = nx_requestbkgd(g_nxhello.hnx, &g_bgcb, NULL);
+ ret = nx_requestbkgd(g_nxhello.hnx, &g_nxhellocb, NULL);
if (ret < 0)
{
message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno);