diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-27 18:29:04 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-27 18:29:04 +0000 |
| commit | 4511f9758bf8027c5ee01b654b3b1558ebb2d11a (patch) | |
| tree | 53266b0ceb89f5706fd21c7d83c824a329b0a002 /apps | |
| parent | bef5049f0198760cc241a0ef137e6c39e3edff8c (diff) | |
| download | nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.tar.gz nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.tar.bz2 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')
| -rw-r--r-- | apps/examples/nxhello/nxhello.h | 2 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello_bkgd.c | 2 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello_main.c | 2 | ||||
| -rw-r--r-- | apps/examples/nximage/nximage.h | 2 | ||||
| -rw-r--r-- | apps/examples/nximage/nximage_bkgd.c | 2 | ||||
| -rw-r--r-- | apps/examples/nximage/nximage_main.c | 2 |
6 files changed, 6 insertions, 6 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); diff --git a/apps/examples/nximage/nximage.h b/apps/examples/nximage/nximage.h index 117eff671..a614ddc65 100644 --- a/apps/examples/nximage/nximage.h +++ b/apps/examples/nximage/nximage.h @@ -196,7 +196,7 @@ extern struct nximage_data_s g_nximage; /* NX callback vtables */ -extern const struct nx_callback_s g_bgcb; +extern const struct nx_callback_s g_nximagecb; /**************************************************************************** * Public Function Prototypes diff --git a/apps/examples/nximage/nximage_bkgd.c b/apps/examples/nximage/nximage_bkgd.c index e724b3a31..9199b573d 100644 --- a/apps/examples/nximage/nximage_bkgd.c +++ b/apps/examples/nximage/nximage_bkgd.c @@ -153,7 +153,7 @@ static struct nximage_run_t g_runs[NINPUT_ROWS]; /* Background window call table */ -const struct nx_callback_s g_bgcb = +const struct nx_callback_s g_nximagecb = { nximage_redraw, /* redraw */ nximage_position /* position */ diff --git a/apps/examples/nximage/nximage_main.c b/apps/examples/nximage/nximage_main.c index 3ddfb1c02..861cf0e61 100644 --- a/apps/examples/nximage/nximage_main.c +++ b/apps/examples/nximage/nximage_main.c @@ -253,7 +253,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Get the background window */ - ret = nx_requestbkgd(g_nximage.hnx, &g_bgcb, NULL); + ret = nx_requestbkgd(g_nximage.hnx, &g_nximagecb, NULL); if (ret < 0) { message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); |