diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-13 15:14:53 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-13 15:14:53 +0000 |
commit | c4c802e7b3845725ca80aaaefbe99ebd31489140 (patch) | |
tree | 88fccb94315649735f894db6185383b3d6756f30 | |
parent | 851773fdae49ba99c7780c7e64bbacd08a07fa16 (diff) | |
download | px4-firmware-c4c802e7b3845725ca80aaaefbe99ebd31489140.tar.gz px4-firmware-c4c802e7b3845725ca80aaaefbe99ebd31489140.tar.bz2 px4-firmware-c4c802e7b3845725ca80aaaefbe99ebd31489140.zip |
Add Calypso-related fixes
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4730 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-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 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_bkgd.c | 6 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_internal.h | 6 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_main.c | 6 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_popup.c | 4 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_putc.c | 4 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_server.c | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/calypso/calypso_spi.c | 2 |
10 files changed, 25 insertions, 25 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); diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c index 90cc19165..d457432db 100644 --- a/apps/examples/nxtext/nxtext_bkgd.c +++ b/apps/examples/nxtext/nxtext_bkgd.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxtext/nxtext_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 @@ -95,7 +95,7 @@ static struct nxtext_glyph_s g_bgglyph[CONFIG_EXAMPLES_NXTEXT_GLCACHE]; /* Background window call table */ -const struct nx_callback_s g_bgcb = +const struct nx_callback_s g_nxtextcb = { nxbg_redraw, /* redraw */ nxbg_position /* position */ diff --git a/apps/examples/nxtext/nxtext_internal.h b/apps/examples/nxtext/nxtext_internal.h index 7a8159c98..f0001e0bb 100644 --- a/apps/examples/nxtext/nxtext_internal.h +++ b/apps/examples/nxtext/nxtext_internal.h @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxtext/nxtext_internal.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 @@ -316,7 +316,7 @@ extern NXHANDLE g_puhfont; /* NX callback vtables */ -extern const struct nx_callback_s g_bgcb; +extern const struct nx_callback_s g_nxtextcb; /* The screen resolution */ diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c index b7e2a3356..437b03e5a 100644 --- a/apps/examples/nxtext/nxtext_main.c +++ b/apps/examples/nxtext/nxtext_main.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxtext/nxtext_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 @@ -409,7 +409,7 @@ int MAIN_NAME(int argc, char **argv) /* Get the background window */ bgstate = nxbg_getstate(); - ret = nx_requestbkgd(g_hnx, &g_bgcb, bgstate); + ret = nx_requestbkgd(g_hnx, &g_nxtextcb, bgstate); if (ret < 0) { message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index f00f6a040..4faaf3a35 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxtext/nxtext_popup.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 diff --git a/apps/examples/nxtext/nxtext_putc.c b/apps/examples/nxtext/nxtext_putc.c index dfecfe33f..13a441115 100644 --- a/apps/examples/nxtext/nxtext_putc.c +++ b/apps/examples/nxtext/nxtext_putc.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxtext/nxtext_putc.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 diff --git a/apps/examples/nxtext/nxtext_server.c b/apps/examples/nxtext/nxtext_server.c index 2049a3121..a464628e1 100644 --- a/apps/examples/nxtext/nxtext_server.c +++ b/apps/examples/nxtext/nxtext_server.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/nxtext/nxtext_server.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 diff --git a/nuttx/arch/arm/src/calypso/calypso_spi.c b/nuttx/arch/arm/src/calypso/calypso_spi.c index 1158c7f2f..d412fe791 100644 --- a/nuttx/arch/arm/src/calypso/calypso_spi.c +++ b/nuttx/arch/arm/src/calypso/calypso_spi.c @@ -213,7 +213,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din) else *(uint32_t *)din = tmp; } - dbg('\n'); + dbg("\n"); return 0; } |