diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-13 15:14:53 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-13 15:14:53 +0000 |
commit | 1aa4a0750b0705fefbb1cd2819dbc30684d25353 (patch) | |
tree | 88fccb94315649735f894db6185383b3d6756f30 /apps/examples/nxlines | |
parent | 193f6fa1764c7d1d88efced8af88c785ebff891f (diff) | |
download | px4-nuttx-1aa4a0750b0705fefbb1cd2819dbc30684d25353.tar.gz px4-nuttx-1aa4a0750b0705fefbb1cd2819dbc30684d25353.tar.bz2 px4-nuttx-1aa4a0750b0705fefbb1cd2819dbc30684d25353.zip |
Add Calypso-related fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4730 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/nxlines')
-rw-r--r-- | apps/examples/nxlines/nxlines.h | 6 | ||||
-rw-r--r-- | apps/examples/nxlines/nxlines_bkgd.c | 6 | ||||
-rw-r--r-- | apps/examples/nxlines/nxlines_main.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/apps/examples/nxlines/nxlines.h b/apps/examples/nxlines/nxlines.h index fb91f23a3..a26db9f29 100644 --- a/apps/examples/nxlines/nxlines.h +++ b/apps/examples/nxlines/nxlines.h @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxlines/nxlines.h * - * 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 @@ -180,7 +180,7 @@ extern struct nxlines_data_s g_nxlines; /* NX callback vtables */ -extern const struct nx_callback_s g_bgcb; +extern const struct nx_callback_s g_nxlinescb; /**************************************************************************** * Public Function Prototypes diff --git a/apps/examples/nxlines/nxlines_bkgd.c b/apps/examples/nxlines/nxlines_bkgd.c index c9cbc921d..4c09519ed 100644 --- a/apps/examples/nxlines/nxlines_bkgd.c +++ b/apps/examples/nxlines/nxlines_bkgd.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxlines/nxlines_bkgd.c * - * 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 @@ -94,7 +94,7 @@ static void nxlines_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, /* Background window call table */ -const struct nx_callback_s g_bgcb = +const struct nx_callback_s g_nxlinescb = { nxlines_redraw, /* redraw */ nxlines_position /* position */ diff --git a/apps/examples/nxlines/nxlines_main.c b/apps/examples/nxlines/nxlines_main.c index c1485e0ef..df946b868 100644 --- a/apps/examples/nxlines/nxlines_main.c +++ b/apps/examples/nxlines/nxlines_main.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxlines/nxlines_main.c * - * 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 @@ -242,7 +242,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Get the background window */ - ret = nx_requestbkgd(g_nxlines.hnx, &g_bgcb, NULL); + ret = nx_requestbkgd(g_nxlines.hnx, &g_nxlinescb, NULL); if (ret < 0) { message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); |