phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Add Calypso-related fixes 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4730 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-05-13 15:14:53 +00:00
parent 193f6fa176
commit 1aa4a0750b
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/examples/nxlines/nxlines.h
View File

@ -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

6
apps/examples/nxlines/nxlines_bkgd.c
View File

@ -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 */

6
apps/examples/nxlines/nxlines_main.c
View File

@ -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);

6
apps/examples/nxtext/nxtext_bkgd.c
View File

@ -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 */

6
apps/examples/nxtext/nxtext_internal.h
View File

@ -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 */

6
apps/examples/nxtext/nxtext_main.c
View File

@ -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);

4
apps/examples/nxtext/nxtext_popup.c
View File

@ -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

4
apps/examples/nxtext/nxtext_putc.c
View File

@ -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

4
apps/examples/nxtext/nxtext_server.c
View File

@ -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

2
nuttx/arch/arm/src/calypso/calypso_spi.c
View File

@ -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;
}