Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add Calypso-related fixes

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4730 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-05-13 15:14:53 +00:00
parent 851773fdae
commit c4c802e7b3
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/examples/nxlines/nxlines.h
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxlines/nxlines.h * examples/nxlines/nxlines.h
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -180,7 +180,7 @@ extern struct nxlines_data_s g_nxlines;
/* NX callback vtables */ /* NX callback vtables */
extern const struct nx_callback_s g_bgcb; extern const struct nx_callback_s g_nxlinescb;
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
apps/examples/nxlines/nxlines_bkgd.c
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxlines/nxlines_bkgd.c * examples/nxlines/nxlines_bkgd.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * 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 */ /* Background window call table */
const struct nx_callback_s g_bgcb = const struct nx_callback_s g_nxlinescb =
{ {
nxlines_redraw, /* redraw */ nxlines_redraw, /* redraw */
nxlines_position /* position */ nxlines_position /* position */
apps/examples/nxlines/nxlines_main.c
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxlines/nxlines_main.c * examples/nxlines/nxlines_main.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -242,7 +242,7 @@ int MAIN_NAME(int argc, char *argv[])
/* Get the background window */ /* 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) if (ret < 0)
{ {
message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno);
apps/examples/nxtext/nxtext_bkgd.c
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxtext/nxtext_bkgd.c * examples/nxtext/nxtext_bkgd.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * 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 */ /* Background window call table */
const struct nx_callback_s g_bgcb = const struct nx_callback_s g_nxtextcb =
{ {
nxbg_redraw, /* redraw */ nxbg_redraw, /* redraw */
nxbg_position /* position */ nxbg_position /* position */
apps/examples/nxtext/nxtext_internal.h
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxtext/nxtext_internal.h * examples/nxtext/nxtext_internal.h
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -316,7 +316,7 @@ extern NXHANDLE g_puhfont;
/* NX callback vtables */ /* NX callback vtables */
extern const struct nx_callback_s g_bgcb; extern const struct nx_callback_s g_nxtextcb;
/* The screen resolution */ /* The screen resolution */
apps/examples/nxtext/nxtext_main.c
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxtext/nxtext_main.c * examples/nxtext/nxtext_main.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -409,7 +409,7 @@ int MAIN_NAME(int argc, char **argv)
/* Get the background window */ /* Get the background window */
bgstate = nxbg_getstate(); bgstate = nxbg_getstate();
ret = nx_requestbkgd(g_hnx, &g_bgcb, bgstate); ret = nx_requestbkgd(g_hnx, &g_nxtextcb, bgstate);
if (ret < 0) if (ret < 0)
{ {
message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno);
apps/examples/nxtext/nxtext_popup.c
+2 -2
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxtext/nxtext_popup.c * examples/nxtext/nxtext_popup.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
apps/examples/nxtext/nxtext_putc.c
+2 -2
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxtext/nxtext_putc.c * examples/nxtext/nxtext_putc.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
apps/examples/nxtext/nxtext_server.c
+2 -2
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* examples/nxtext/nxtext_server.c * examples/nxtext/nxtext_server.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
nuttx/arch/arm/src/calypso/calypso_spi.c
+1 -1
View File
@@ -213,7 +213,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din)
else else
*(uint32_t *)din = tmp; *(uint32_t *)din = tmp;
} }
dbg('\n'); dbg("\n");
return 0; return 0;
} }