diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-17 03:58:11 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-17 03:58:11 +0000 |
| commit | 5da90b889758aac235acf8c1dff93e90ddfbfe7d (patch) | |
| tree | d73fe9581f45296f026a24f991bc80cab5cd479d | |
| parent | aa7d9710dc9c125685b30dbc3c9ac33dd0e5567f (diff) | |
| download | nuttx-5da90b889758aac235acf8c1dff93e90ddfbfe7d.tar.gz nuttx-5da90b889758aac235acf8c1dff93e90ddfbfe7d.tar.bz2 nuttx-5da90b889758aac235acf8c1dff93e90ddfbfe7d.zip | |
Header file clean-up
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4948 42af7a65-404d-4744-a932-0658087f49c3
111 files changed, 525 insertions, 391 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index f00020bcd..54161979d 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -250,3 +250,4 @@ 6.21 2012-xx-xx Gregory Nutt <gnutt@nuttx.org> + * include/: Stylistic clean-up of all header files. diff --git a/apps/include/apps.h b/apps/include/apps.h index d494500d1..520128203 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/apps/apps.h + * apps/include/apps.h * * Copyright(C) 2011 Uros Platise. All rights reserved. * Author: Uros Platise <uros.platise@isotel.eu> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_APPS_APPS_H -#define __INCLUDE_APPS_APPS_H +#ifndef __APPS_INCLUDE_APPS_H +#define __APPS_INCLUDE_APPS_H /**************************************************************************** * Included Files @@ -54,10 +54,10 @@ struct namedapp_s { - const char *name; /* Invocation name and as seen under /sbin/ */ - int priority; /* Use: SCHED_PRIORITY_DEFAULT */ - int stacksize; /* Desired stack size */ - main_t main; /* Entry point: main(int argc, char *argv[]) */ + const char *name; /* Invocation name and as seen under /sbin/ */ + int priority; /* Use: SCHED_PRIORITY_DEFAULT */ + int stacksize; /* Desired stack size */ + main_t main; /* Entry point: main(int argc, char *argv[]) */ }; /**************************************************************************** @@ -145,4 +145,5 @@ EXTERN int exec_namedapp(FAR const char *appname, FAR const char **argv); #if defined(__cplusplus) } #endif -#endif /* __INCLUDE_APPS_APPS_H */ + +#endif /* __APPS_INCLUDE_APPS_H */ diff --git a/apps/include/ftpc.h b/apps/include/ftpc.h index ed5e3fab9..f9a73676a 100644 --- a/apps/include/ftpc.h +++ b/apps/include/ftpc.h @@ -2,7 +2,7 @@ * apps/include/ftpc.h * * Copyright (C) 2011 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 * modification, are permitted provided that the following conditions @@ -221,4 +221,5 @@ EXTERN FAR char *ftpc_response(SESSION handle); #ifdef __cplusplus } #endif + #endif /* __APPS_INCLUDE_FTPC_H */ diff --git a/apps/include/netutils/dhcpc.h b/apps/include/netutils/dhcpc.h index 994a6713e..a6c53dc30 100644 --- a/apps/include/netutils/dhcpc.h +++ b/apps/include/netutils/dhcpc.h @@ -1,8 +1,8 @@ /**************************************************************************** - * apps/netutils/dhcpc.n + * apps/include/netutils/dhcpc.h * * Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic was leveraged from uIP which also has a BSD-style license: * @@ -35,8 +35,8 @@ * SUCH DAMAGE. */ -#ifndef __APPS_NETUTILS_DHCPC_H -#define __APPS_NETUTILS_DHCPC_H +#ifndef __APPS_INCLUDE_NETUTILS_DHCPC_H +#define __APPS_INCLUDE_NETUTILS_DHCPC_H /**************************************************************************** * Included Files @@ -82,4 +82,4 @@ EXTERN void dhcpc_close(void *handle); } #endif -#endif /* __APPS_NETUTILS_DHCPC_H */ +#endif /* __APPS_INCLUDE_NETUTILS_DHCPC_H */ diff --git a/apps/include/netutils/dhcpd.h b/apps/include/netutils/dhcpd.h index b03415b20..f997fac30 100644 --- a/apps/include/netutils/dhcpd.h +++ b/apps/include/netutils/dhcpd.h @@ -1,8 +1,8 @@ /**************************************************************************** - * apps/netutils/dhcpd.h + * apps/include/netutils/dhcpd.h * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic was leveraged from uIP which also has a BSD-style license: * @@ -35,8 +35,8 @@ * SUCH DAMAGE. */ -#ifndef __APPS_NETUTILS_DHCPD_H -#define __APPS_NETUTILS_DHCPD_H +#ifndef __APPS_INCLUDE_NETUTILS_DHCPD_H +#define __APPS_INCLUDE_NETUTILS_DHCPD_H /**************************************************************************** * Included Files @@ -68,4 +68,4 @@ EXTERN int dhcpd_run(void); } #endif -#endif /* __APPS_NETUTILS_DHCPD_H */ +#endif /* __APPS_INCLUDE_NETUTILS_DHCPD_H */ diff --git a/apps/include/netutils/httpd.h b/apps/include/netutils/httpd.h index 12f2a1511..7cd002b66 100644 --- a/apps/include/netutils/httpd.h +++ b/apps/include/netutils/httpd.h @@ -1,8 +1,8 @@ /**************************************************************************** - * apps/netutils/httpd.h + * apps/include/netutils/httpd.h * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Based on uIP which also has a BSD style license: * @@ -37,8 +37,8 @@ * ****************************************************************************/ -#ifndef __APPS_NETUTILS_HTTPD_H -#define __APPS_NETUTILS_HTTPD_H +#ifndef __APPS_INCLUDE_NETUTILS_HTTPD_H +#define __APPS_INCLUDE_NETUTILS_HTTPD_H /**************************************************************************** * Included Files @@ -48,7 +48,19 @@ * Public Function Prototypes ****************************************************************************/ -extern void httpd_init(void); -extern int httpd_listen(void); +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif -#endif /* __APPS_NETUTILS_HTTPD_H */ +EXTERN void httpd_init(void); +EXTERN int httpd_listen(void); + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* __APPS_INCLUDE_NETUTILS_HTTPD_H */ diff --git a/apps/include/netutils/ipmsfilter.h b/apps/include/netutils/ipmsfilter.h index 56088eca7..2dcffa4a1 100755 --- a/apps/include/netutils/ipmsfilter.h +++ b/apps/include/netutils/ipmsfilter.h @@ -1,9 +1,9 @@ /**************************************************************************** - * apps/netutils/ipmsfilter.h + * apps/include/netutils/ipmsfilter.h * User interface to add/remove IP multicast address * * Copyright (C) 2009, 2011 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 * modification, are permitted provided that the following conditions @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __APPS_NETUTILS_IPMSFILTER_H -#define __APPS_NETUTILS_IPMSFILTER_H +#ifndef __APPS_INCLUDE_NETUTILS_IPMSFILTER_H +#define __APPS_INCLUDE_NETUTILS_IPMSFILTER_H /**************************************************************************** * Included Files @@ -98,4 +98,4 @@ EXTERN int ipmsfilter(FAR const char *ifname, #endif #endif /* CONFIG_NET_IGMP */ -#endif /* __APPS_NETUTILS_IPMSFILTER_H */ +#endif /* __APPS_INCLUDE_NETUTILS_IPMSFILTER_H */ diff --git a/apps/include/netutils/resolv.h b/apps/include/netutils/resolv.h index e1499afd7..81798558c 100644 --- a/apps/include/netutils/resolv.h +++ b/apps/include/netutils/resolv.h @@ -1,6 +1,7 @@ -/* includes/apps/netutils/resolv.h +/**************************************************************************** + * apps/include/netutils/resolv.h * DNS resolver code header file. - * Authtor Adam Dunkels <adam@dunkels.com> + * Author Adam Dunkels <adam@dunkels.com> * * Copyright (c) 2002-2003, Adam Dunkels. * All rights reserved. @@ -28,13 +29,22 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + * + ****************************************************************************/ + +#ifndef __APPS_INCLUDE_NETUTILS_RESOLVE_H +#define __APPS_INCLUDE_NETUTILS_RESOLVE_H -#ifndef __APPS_NETUTILS_RESOLVE_H -#define __APPS_NETUTILS_RESOLVE_H +/**************************************************************************** + * Included Files + ****************************************************************************/ #include <nuttx/net/uip/uipopt.h> +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" @@ -62,4 +72,4 @@ EXTERN int resolv_query(const char *name, struct sockaddr_in *addr); } #endif -#endif /* __APPS_NETUTILS_RESOLVE_H */ +#endif /* __APPS_INCLUDE_NETUTILS_RESOLVE_H */ diff --git a/apps/include/netutils/smtp.h b/apps/include/netutils/smtp.h index ef3864bf3..1bb0cc16f 100644 --- a/apps/include/netutils/smtp.h +++ b/apps/include/netutils/smtp.h @@ -1,9 +1,9 @@ /**************************************************************************** - * include/apps/netutils/smtp.h + * apps/include/netutils/smtp.h * SMTP header file * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Heavily leveraged from uIP 1.0 which also has a BSD-like license: * @@ -37,8 +37,8 @@ * ****************************************************************************/ -#ifndef __APPS_NETUTILS_SMTP_H -#define __APPS_NETUTILS_SMTP_H +#ifndef __APPS_INCLUDE_NETUTILS_SMTP_H +#define __APPS_INCLUDE_NETUTILS_SMTP_H /**************************************************************************** * Included Files @@ -55,12 +55,24 @@ * Public Function Prototypes ****************************************************************************/ -extern void *smtp_open(void); -extern void smtp_configure(void *handle, const char *localhostname, +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +EXTERN void *smtp_open(void); +EXTERN void smtp_configure(void *handle, const char *localhostname, const uip_ipaddr_t *paddr); -extern int smtp_send(void *handle, const char *to, const char *cc, +EXTERN int smtp_send(void *handle, const char *to, const char *cc, const char *from, const char *subject, const char *msg, int msglen); -extern void smtp_close(void *handle); +EXTERN void smtp_close(void *handle); + +#undef EXTERN +#ifdef __cplusplus +} +#endif -#endif /* __APPS_NETUTILS_SMTP_H */ +#endif /* __APPS_INCLUDE_NETUTILS_SMTP_H */ diff --git a/apps/include/netutils/telnetd.h b/apps/include/netutils/telnetd.h index 4cddd92dd..98721c023 100644 --- a/apps/include/netutils/telnetd.h +++ b/apps/include/netutils/telnetd.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/apps/netutils/telnetd.h + * apps/include/netutils/telnetd.h * * Copyright (C) 2007, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/apps/include/netutils/tftp.h b/apps/include/netutils/tftp.h index c00e37c72..276073aad 100644 --- a/apps/include/netutils/tftp.h +++ b/apps/include/netutils/tftp.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/apps/netutils/tftp.h + * apps/include/netutils/tftp.h * * Copyright (C) 2008-2009, 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_NETUTILS_TFTP_H -#define __APPS_NETUTILS_TFTP_H +#ifndef __APPS_INCLUDE_NETUTILS_TFTP_H +#define __APPS_INCLUDE_NETUTILS_TFTP_H /**************************************************************************** * Included Files @@ -70,4 +70,4 @@ EXTERN int tftpput(const char *local, const char *remote, in_addr_t addr, bool b } #endif -#endif /* __APPS_NETUTILS_TFTP_H */
\ No newline at end of file +#endif /* __APPS_INCLUDE_NETUTILS_TFTP_H */ diff --git a/apps/include/netutils/thttpd.h b/apps/include/netutils/thttpd.h index 959177219..92ed7ba97 100644 --- a/apps/include/netutils/thttpd.h +++ b/apps/include/netutils/thttpd.h @@ -1,8 +1,8 @@ /**************************************************************************** - * apps/netutils/thttpd.h + * apps/include/netutils/thttpd.h * * Copyright (C) 2009, 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_NETUTILS_THTTPD_H -#define __APPS_NETUTILS_THTTPD_H +#ifndef __APPS_INCLUDE_NETUTILS_THTTPD_H +#define __APPS_INCLUDE_NETUTILS_THTTPD_H /**************************************************************************** * Included Files @@ -98,4 +98,4 @@ EXTERN int thttpd_main(int argc, char **argv); } #endif -#endif /* __APPS_NETUTILS_THTTPD_H */ +#endif /* __APPS_INCLUDE_NETUTILS_THTTPD_H */ diff --git a/apps/include/netutils/uiplib.h b/apps/include/netutils/uiplib.h index 48a71a14c..219a5e9cc 100644 --- a/apps/include/netutils/uiplib.h +++ b/apps/include/netutils/uiplib.h @@ -1,10 +1,10 @@ /**************************************************************************** - * apps/netutils/uiplib.h + * apps/include/netutils/uiplib.h * Various non-standard APIs to support netutils. All non-standard and * intended only for internal use. * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Some of these APIs derive from uIP but all of them use the uip_ prefix * to identify them as members of this library. uIP also has a BSD style @@ -42,8 +42,8 @@ * ****************************************************************************/ -#ifndef __APPS_NETUTILS_UIPLIB_H -#define __APPS_NETUTILS_UIPLIB_H +#ifndef __APPS_INCLUDE_NETUTILS_UIPLIB_H +#define __APPS_INCLUDE_NETUTILS_UIPLIB_H /**************************************************************************** * Included Files @@ -77,6 +77,14 @@ * Public Function Prototypes ****************************************************************************/ +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + /* Convert a textual representation of an IP address to a numerical representation. * * This function takes a textual representation of an IP address in @@ -93,37 +101,42 @@ * Return: Non-zero If the IP address was parsed. */ -extern bool uiplib_ipaddrconv(const char *addrstr, uint8_t *addr); +EXTERN bool uiplib_ipaddrconv(const char *addrstr, uint8_t *addr); /* Get and set IP/MAC addresses (Ethernet L2 only) */ #ifdef CONFIG_NET_ETHERNET -extern int uip_setmacaddr(const char *ifname, const uint8_t *macaddr); -extern int uip_getmacaddr(const char *ifname, uint8_t *macaddr); +EXTERN int uip_setmacaddr(const char *ifname, const uint8_t *macaddr); +EXTERN int uip_getmacaddr(const char *ifname, uint8_t *macaddr); #endif /* IP address support */ #ifdef CONFIG_NET_IPv6 -extern int uip_gethostaddr(const char *ifname, struct in6_addr *addr); -extern int uip_sethostaddr(const char *ifname, const struct in6_addr *addr); -extern int uip_setdraddr(const char *ifname, const struct in6_addr *addr); -extern int uip_setnetmask(const char *ifname, const struct in6_addr *addr); +EXTERN int uip_gethostaddr(const char *ifname, struct in6_addr *addr); +EXTERN int uip_sethostaddr(const char *ifname, const struct in6_addr *addr); +EXTERN int uip_setdraddr(const char *ifname, const struct in6_addr *addr); +EXTERN int uip_setnetmask(const char *ifname, const struct in6_addr *addr); #else -extern int uip_gethostaddr(const char *ifname, struct in_addr *addr); -extern int uip_sethostaddr(const char *ifname, const struct in_addr *addr); -extern int uip_setdraddr(const char *ifname, const struct in_addr *addr); -extern int uip_setnetmask(const char *ifname, const struct in_addr *addr); +EXTERN int uip_gethostaddr(const char *ifname, struct in_addr *addr); +EXTERN int uip_sethostaddr(const char *ifname, const struct in_addr *addr); +EXTERN int uip_setdraddr(const char *ifname, const struct in_addr *addr); +EXTERN int uip_setnetmask(const char *ifname, const struct in_addr *addr); #endif /* HTTP support */ -extern int uip_parsehttpurl(const char *url, uint16_t *port, +EXTERN int uip_parsehttpurl(const char *url, uint16_t *port, char *hostname, int hostlen, char *filename, int namelen); /* Generic server logic */ -extern void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize); +EXTERN void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize); + +#undef EXTERN +#ifdef __cplusplus +} +#endif -#endif /* __APPS_NETUTILS_UIPLIB_H */ +#endif /* __APPS_INCLUDE_NETUTILS_UIPLIB_H */ diff --git a/apps/include/netutils/webclient.h b/apps/include/netutils/webclient.h index c80626e3b..5c07f20ab 100644 --- a/apps/include/netutils/webclient.h +++ b/apps/include/netutils/webclient.h @@ -1,9 +1,9 @@ /**************************************************************************** - * include/apps/netutils/webclient.h + * apps/include/netutils/webclient.h * Header file for the HTTP client * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Based remotely on the uIP webclient which also has a BSD style license: * @@ -39,8 +39,8 @@ * ****************************************************************************/ -#ifndef __APPS_NETUTILS_WEBCLIENT_H -#define __APPS_NETUTILS_WEBCLIENT_H +#ifndef __APPS_INCLUDE_NETUTILS_WEBCLIENT_H +#define __APPS_INCLUDE_NETUTILS_WEBCLIENT_H /**************************************************************************** * Included Files @@ -146,4 +146,4 @@ EXTERN int wget(FAR const char *url, FAR char *buffer, int buflen, } #endif -#endif /* __APPS_NETUTILS_WEBCLIENT_H */ +#endif /* __APPS_INCLUDE_NETUTILS_WEBCLIENT_H */ diff --git a/apps/include/nsh.h b/apps/include/nsh.h index 15f35963c..4b5a3cd31 100644 --- a/apps/include/nsh.h +++ b/apps/include/nsh.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/apps/nsh.h + * apps/include/nsh.h * * Copyright (C) 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_APPS_NSHLIB_H -#define __INCLUDE_APPS_NSHLIB_H +#ifndef __APPS_INCLUDE_NSH_H +#define __APPS_INCLUDE_NSH_H /**************************************************************************** * Included Files @@ -118,4 +118,4 @@ EXTERN int nsh_telnetstart(void); } #endif -#endif /* __INCLUDE_APPS_NSHLIB_H */ +#endif /* __APPS_INCLUDE_NSH_H */ diff --git a/apps/include/readline.h b/apps/include/readline.h index a53eaf5f6..647778210 100644 --- a/apps/include/readline.h +++ b/apps/include/readline.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/apps/readline.h + * apps/include/readline.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_APPS_READLINE_H -#define __INCLUDE_APPS_READLINE_H +#ifndef __APPS_INCLUDE_READLINE_H +#define __APPS_INCLUDE_READLINE_H /**************************************************************************** * Included Files @@ -97,4 +97,4 @@ EXTERN ssize_t readline(FAR char *buf, int buflen, FILE *instream, FILE *outstre } #endif -#endif /* __INCLUDE_APPS_READLINE_H */ +#endif /* __APPS_INCLUDE_READLINE_H */ diff --git a/apps/include/tiff.h b/apps/include/tiff.h index 353005599..378af9fe0 100644 --- a/apps/include/tiff.h +++ b/apps/include/tiff.h @@ -2,7 +2,7 @@ * apps/include/tiff.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Reference: * "TIFF, Revision 6.0, Final," June 3, 1992, Adobe Developers Association. diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c0f7ba653..5ca5aebcc 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3015,4 +3015,5 @@ to make a little room in the file name space. * arch/arm/src/stm32/stm32_exti_alarm.c: Add initial logic to attached the RTC alarm EXTI interrupt. This is work be performed mostly by Diego Sanchez. + * include/: More stylistic file clean-up. diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt index e3697f6e7..13805c0b1 100644 --- a/nuttx/configs/lpc4330-xplorer/README.txt +++ b/nuttx/configs/lpc4330-xplorer/README.txt @@ -381,8 +381,35 @@ Code Red IDE CONFIG_DEBUG=y CONFIG_DEBUG_SYMBOLS=y - Troubleshooting. This page provides some troubleshooting information that - you can use to verify that the LPCLink is working correctly: + NOTE 4: Every time that you control-C out of the command line GDB, you + leave a copy of the Code Red debugger (crt_emu_lpc18_43_nxp) running. I + have found that if you have these old copies of the debugger running, + hen strange things can happen when start yet another copy of the + debugger (I suspect that GDB may be talking with the wrong debugger). + + If you exit GDB with quit (not control-C), it seems to clean-up okay. + But I have taken to keeping a Process Explorer window open all of the + time to keep track of how many of these bad processes have been created. + + NOTE 5: There is also a certain function that is causing some problems. + The very first thing that the start-up logic does is call a function + called lpc43_softreset() which resets most of the peripherals. But it + also causes some crashes... I think because the resets are causing some + interrupts. + + I put a big delay in the soft reset logic between resetting and clearing + pending interrupts and that seems to help some but I am not confident + that that is a fix. I think that the real fix might be to just eliminated + this lpc43_softreset() function if we determine that it is not needed. + + If you step over lpc43_softreset() after loading the coding (using the 'n' + command), then everything seems work okay. + + Troubleshooting + --------------- + + This page provides some troubleshooting information that you can use to + verify that the LPCLink is working correctly: http://support.code-red-tech.com/CodeRedWiki/LPCLinkDiagnostics @@ -394,6 +421,11 @@ Code Red IDE found in the configs/lpc4330-xplorer/scripts directory can do that with a single command line command. + USB DFU Booting + --------------- + + To be provided. + NuttX buildroot Toolchain ========================= diff --git a/nuttx/include/arpa/inet.h b/nuttx/include/arpa/inet.h index a5d13b9d9..7428c76f2 100644 --- a/nuttx/include/arpa/inet.h +++ b/nuttx/include/arpa/inet.h @@ -2,7 +2,7 @@ * include/arpa/inet.h * * Copyright (C) 2007, 2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARPA_INET_H -#define __ARPA_INET_H +#ifndef __INCLUDE_ARPA_INET_H +#define __INCLUDE_ARPA_INET_H /**************************************************************************** * Included Files @@ -133,4 +133,4 @@ EXTERN const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen } #endif -#endif /* __ARPA_INET_H */ +#endif /* __INCLUDE_ARPA_INET_H */ diff --git a/nuttx/include/crc32.h b/nuttx/include/crc32.h index 7c463fb8c..1dd6fff13 100644 --- a/nuttx/include/crc32.h +++ b/nuttx/include/crc32.h @@ -2,7 +2,7 @@ * include/crc.h * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions @@ -54,23 +54,24 @@ extern "C" { #define EXTERN extern #endif -/************************************************************************************ +/**************************************************************************** * Name: crc32part * * Description: * Continue CRC calculation on a part of the buffer. * - ************************************************************************************/ + ****************************************************************************/ -EXTERN uint32_t crc32part(FAR const uint8_t *src, size_t len, uint32_t crc32val); +EXTERN uint32_t crc32part(FAR const uint8_t *src, size_t len, + uint32_t crc32val); -/************************************************************************************ +/**************************************************************************** * Name: crc32 * * Description: * Return a 32-bit CRC of the contents of the 'src' buffer, length 'len' * - ************************************************************************************/ + ****************************************************************************/ EXTERN uint32_t crc32(FAR const uint8_t *src, size_t len); diff --git a/nuttx/include/ctype.h b/nuttx/include/ctype.h index 70b55e179..6959a44b1 100644 --- a/nuttx/include/ctype.h +++ b/nuttx/include/ctype.h @@ -2,7 +2,7 @@ * include/ctype.h * * Copyright (C) 2007-2009, 2011 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 * modification, are permitted provided that the following conditions @@ -36,10 +36,9 @@ #ifndef __INCLUDE_CTYPE_H #define __INCLUDE_CTYPE_H -/* There is no consistent ctype implementation, just a - * smattering of functions. Individually, they are okay, but - * a more standard, data lookup approach would make more sense - * if used extensively. +/* There is no consistent ctype implementation, just a smattering of + * functions. Individually, they are okay, but a more standard, data lookup + * approach would make more sense if used extensively. */ /**************************************************************************** @@ -51,13 +50,12 @@ ****************************************************************************/ /**************************************************************************** - * Function: isspace + * Name: isspace * * Description: - * Checks for white-space characters. In the "C" and "POSIX" - * locales, these are: space, form-feed ('\f'), newline ('\n'), - * carriage return ('\r'), horizontal tab ('\t'), and vertical - * tab ('\v'). + * Checks for white-space characters. In the "C" and "POSIX" locales, + * these are: space, form-feed ('\f'), newline ('\n'), carriage return + * ('\r'), horizontal tab ('\t'), and vertical tab ('\v'). * ****************************************************************************/ @@ -66,113 +64,112 @@ (c) == '\r' || (c) == '\f' || c== '\v') /**************************************************************************** - * Function: isascii + * Name: isascii * * Description: - * Checks whether c is a 7-bit unsigned char value that - * fits into the ASCII character set. + * Checks whether c is a 7-bit unsigned char value that fits into the + * ASCII character set. * ****************************************************************************/ #define isascii(c) ((c) >= 0 && (c) <= 0x7f); /**************************************************************************** - * Function: isprint + * Name: isprint * * Description: - * Checks for a printable character (including space) + * Checks for a printable character (including space) * ****************************************************************************/ #define isprint(c) ((c) >= 0x20 && (c) < 0x7f) /**************************************************************************** - * Function: isgraph + * Name: isgraph * * Description: - * Checks for a printable character (excluding space) + * Checks for a printable character (excluding space) * ****************************************************************************/ #define isgraph(c) ((c) > 0x20 && (c) < 0x7f) /**************************************************************************** - * Function: iscntrl + * Name: iscntrl * * Description: - * Checks for control character. + * Checks for control character. * ****************************************************************************/ #define iscontrol(c) (!isprint(c)) /**************************************************************************** - * Function: islower + * Name: islower * * Description: - * Checks for an lowercase letter. + * Checks for an lowercase letter. * ****************************************************************************/ #define islower(c) ((c) >= 'a' && (c) <= 'z') /**************************************************************************** - * Function: isupper + * Name: isupper * * Description: - * Checks for an uppercase letter. + * Checks for an uppercase letter. * ****************************************************************************/ #define isupper(c) ((c) >= 'A' && (c) <= 'Z') /**************************************************************************** - * Function: isalpha + * Name: isalpha * * Description: - * Checks for an alphabetic character + * Checks for an alphabetic character * ****************************************************************************/ #define isalpha(c) (islower(c) || isupper(c)) /**************************************************************************** - * Function: isdigit + * Name: isdigit * * Description: - * ANSI standard isdigit implementation. + * ANSI standard isdigit implementation. * ****************************************************************************/ #define isdigit(c) ((c) >= '0' && (c) <= '9') /**************************************************************************** - * Function: isalnum + * Name: isalnum * * Description: - * Checks for an alphanumeric character + * Checks for an alphanumeric character * ****************************************************************************/ #define isalnum(c) (isalpha(c) || isdigit(c)) /**************************************************************************** - * Function: ispunct + * Name: ispunct * * Description: - * Checks for a printable character which is not a space - * or an alphanumeric character + * Checks for a printable character which is not a space or an + * alphanumeric character * ****************************************************************************/ #define ispunct(c) (isgraph(c) && !isalnum(c)) /**************************************************************************** - * Function: isxdigit + * Name: isxdigit * * Description: - * isxdigit() checks for a hexadecimal digits, i.e. one of - * {0-9,a-f,A-F} + * isxdigit() checks for a hexadecimal digits, i.e. one of {0-9,a-f,A-F} * ****************************************************************************/ @@ -182,7 +179,7 @@ ((c) >= 'A' && (c) <= 'F')) /**************************************************************************** - * Function: toupper + * Name: toupper * * Description: * toupper() converts the letter c to upper case, if possible. @@ -193,7 +190,7 @@ (((c) >= 'a' && (c) <= 'z') ? ((c) - 'a' + 'A') : (c)) /**************************************************************************** - * Function: tolower + * Name: tolower * * Description: * tolower() converts the letter c to lower case, if possible. diff --git a/nuttx/include/cxx/cassert b/nuttx/include/cxx/cassert index f44b6cd79..b67592c2b 100644 --- a/nuttx/include/cxx/cassert +++ b/nuttx/include/cxx/cassert @@ -2,7 +2,7 @@ // include/cxx/cassert // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/cctype b/nuttx/include/cxx/cctype index 043adad68..5d3b6dc70 100644 --- a/nuttx/include/cxx/cctype +++ b/nuttx/include/cxx/cctype @@ -2,7 +2,7 @@ // include/cxx/cctype // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/cerrno b/nuttx/include/cxx/cerrno index ba23e33ea..59847df3b 100644 --- a/nuttx/include/cxx/cerrno +++ b/nuttx/include/cxx/cerrno @@ -2,7 +2,7 @@ // include/cxx/cerrno // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/climits b/nuttx/include/cxx/climits index 73f565273..2cd543a0e 100644 --- a/nuttx/include/cxx/climits +++ b/nuttx/include/cxx/climits @@ -2,7 +2,7 @@ // include/cxx/climits // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/cmath b/nuttx/include/cxx/cmath index 3d348f2e9..7cb3a2109 100644 --- a/nuttx/include/cxx/cmath +++ b/nuttx/include/cxx/cmath @@ -2,7 +2,7 @@ // include/cxx/cmath // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/csignal b/nuttx/include/cxx/csignal index aaf385d9c..2303a864d 100644 --- a/nuttx/include/cxx/csignal +++ b/nuttx/include/cxx/csignal @@ -2,7 +2,7 @@ // include/cxx/csignal // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/cstdbool b/nuttx/include/cxx/cstdbool index 9c1d5a55b..d2f0639d2 100644 --- a/nuttx/include/cxx/cstdbool +++ b/nuttx/include/cxx/cstdbool @@ -2,7 +2,7 @@ // include/cxx/cstdbool // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/cstdio b/nuttx/include/cxx/cstdio index aeab44792..900d429cb 100644 --- a/nuttx/include/cxx/cstdio +++ b/nuttx/include/cxx/cstdio @@ -2,7 +2,7 @@ // include/cxx/cstdio // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/cstring b/nuttx/include/cxx/cstring index 29a3bb043..156e01856 100644 --- a/nuttx/include/cxx/cstring +++ b/nuttx/include/cxx/cstring @@ -2,7 +2,7 @@ // include/cxx/cstring // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/cxx/ctime b/nuttx/include/cxx/ctime index f1915a452..3d3dfaec1 100644 --- a/nuttx/include/cxx/ctime +++ b/nuttx/include/cxx/ctime @@ -2,7 +2,7 @@ // include/cxx/ctime // // Copyright (C) 2009 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 // modification, are permitted provided that the following conditions diff --git a/nuttx/include/debug.h b/nuttx/include/debug.h index c8666ff57..1f8c7d7ca 100644 --- a/nuttx/include/debug.h +++ b/nuttx/include/debug.h @@ -2,7 +2,7 @@ * include/debug.h * * Copyright (C) 2007-2011 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 * modification, are permitted provided that the following conditions @@ -579,10 +579,10 @@ extern "C" { #define EXTERN extern #endif -/* These low-level debug APIs are provided by the NuttX library. If - * the cross-compiler's pre-processor supports a variable number of - * macro arguments, then the macros above will map all debug statements - * on or the other of the following. +/* These low-level debug APIs are provided by the NuttX library. If the + * cross-compiler's pre-processor supports a variable number of macro + * arguments, then the macros below will map all debug statements to one + * or the other of the following. */ EXTERN int lib_rawprintf(FAR const char *format, ...); @@ -602,8 +602,8 @@ EXTERN void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, EXTERN void dbg_enable(bool enable); #endif -/* If the cross-compiler's pre-processor does not support variable - * length arguments, then these additional APIs will be built. +/* If the cross-compiler's pre-processor does not support variable length + * arguments, then these additional APIs will be built. */ #ifndef CONFIG_CPP_HAVE_VARARGS diff --git a/nuttx/include/dirent.h b/nuttx/include/dirent.h index 049b621a6..1eea999a1 100644 --- a/nuttx/include/dirent.h +++ b/nuttx/include/dirent.h @@ -2,7 +2,7 @@ * include/dirent.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -69,10 +69,9 @@ * Public Type Definitions ****************************************************************************/ -/* The POSIX specification requires that the caller of readdir_r - * provide storage "large enough for a dirent with the d_name - * member and an array of char containing at least {NAME_MAX} - * plus one elements. +/* The POSIX specification requires that the caller of readdir_r provide + * storage "large enough for a dirent with the d_name member and an array + * of char containing at least {NAME_MAX} plus one elements. */ struct dirent diff --git a/nuttx/include/errno.h b/nuttx/include/errno.h index 94a8b669c..ba4dcbd04 100644 --- a/nuttx/include/errno.h +++ b/nuttx/include/errno.h @@ -2,7 +2,7 @@ * include/errno.h * * Copyright (C) 2007-2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/fixedmath.h b/nuttx/include/fixedmath.h index 7109fa0b4..4456361c7 100644 --- a/nuttx/include/fixedmath.h +++ b/nuttx/include/fixedmath.h @@ -2,7 +2,7 @@ * include/fixedmath.h * * Copyright (C) 2008 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/inttypes.h b/nuttx/include/inttypes.h index f305d187d..caadbe5d1 100644 --- a/nuttx/include/inttypes.h +++ b/nuttx/include/inttypes.h @@ -2,7 +2,7 @@ * include/inttypes.h * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/libgen.h b/nuttx/include/libgen.h index 3eb83ace4..e65948376 100644 --- a/nuttx/include/libgen.h +++ b/nuttx/include/libgen.h @@ -2,7 +2,7 @@ * include/libgen.h * * Copyright (C) 2007, 2008 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/limits.h b/nuttx/include/limits.h index f0adf1923..3d075e731 100644 --- a/nuttx/include/limits.h +++ b/nuttx/include/limits.h @@ -2,7 +2,7 @@ * include/limits.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/mqueue.h b/nuttx/include/mqueue.h index 6eb3fad9c..67dd5842d 100644 --- a/nuttx/include/mqueue.h +++ b/nuttx/include/mqueue.h @@ -1,8 +1,8 @@ /******************************************************************************** - * ionclude/mqueue.h + * include/mqueue.h * * Copyright (C) 2007, 2008 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 * modification, are permitted provided that the following conditions @@ -107,4 +107,3 @@ EXTERN int mq_getattr(mqd_t mqdes, struct mq_attr *mq_stat); #endif #endif /* __INCLUDE_MQUEUE_H */ - diff --git a/nuttx/include/net/ethernet.h b/nuttx/include/net/ethernet.h index f93e86c1e..afbbe56fa 100644 --- a/nuttx/include/net/ethernet.h +++ b/nuttx/include/net/ethernet.h @@ -2,7 +2,7 @@ * include/net/ethernet.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NET_ETHERNET_H -#define __NET_ETHERNET_H +#ifndef __INCLUDE_NET_ETHERNET_H +#define __INCLUDE_NET_ETHERNET_H /**************************************************************************** * Included Files @@ -68,4 +68,4 @@ struct ether_header * Public Function Prototypes ****************************************************************************/ -#endif /* __NET_ETHERNET_H */ +#endif /* __INCLUDE_NET_ETHERNET_H */ diff --git a/nuttx/include/net/if.h b/nuttx/include/net/if.h index 247254786..e64b58563 100644 --- a/nuttx/include/net/if.h +++ b/nuttx/include/net/if.h @@ -33,8 +33,8 @@ * *******************************************************************************************/ -#ifndef __NET_IF_H -#define __NET_IF_H +#ifndef __INCLUDE_NET_IF_H +#define __INCLUDE_NET_IF_H /******************************************************************************************* * Included Files @@ -130,4 +130,4 @@ struct ifreq * Public Function Prototypes *******************************************************************************************/ -#endif /* __NET_IF_H */ +#endif /* __INCLUDE_NET_IF_H */ diff --git a/nuttx/include/netinet/ether.h b/nuttx/include/netinet/ether.h index 9264bbbbe..f11fef6db 100644 --- a/nuttx/include/netinet/ether.h +++ b/nuttx/include/netinet/ether.h @@ -1,8 +1,8 @@ /**************************************************************************** - * netinet/ether.h + * include/netinet/ether.h * * Copyright (C) 2007, 2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NETINET_ETHER_H -#define __NETINET_ETHER_H +#ifndef __INCLUDE_NETINET_ETHER_H +#define __INCLUDE_NETINET_ETHER_H /**************************************************************************** * Included Files @@ -74,4 +74,4 @@ EXTERN int ether_line(const char *line, struct ether_addr *addr, char *hostname) } #endif -#endif /* __NETINET_ETHER_H */ +#endif /* __INCLUDE_NETINET_ETHER_H */ diff --git a/nuttx/include/netinet/in.h b/nuttx/include/netinet/in.h index 066266ab9..547dc0968 100644 --- a/nuttx/include/netinet/in.h +++ b/nuttx/include/netinet/in.h @@ -1,8 +1,8 @@ /**************************************************************************** - * netinet/in.h + * include/netinet/in.h * * Copyright (C) 2007, 2009-2010 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NETINET_IP_H -#define __NETINET_IP_H +#ifndef __INCLUDE_NETINET_IP_H +#define __INCLUDE_NETINET_IP_H /**************************************************************************** * Included Files @@ -152,4 +152,4 @@ struct sockaddr_in6 * Public Function Prototypes ****************************************************************************/ -#endif /* __NETINET_IP_H */ +#endif /* __INCLUDE_NETINET_IP_H */ diff --git a/nuttx/include/netinet/ip.h b/nuttx/include/netinet/ip.h index 3d20c1249..e2a6aaf4f 100644 --- a/nuttx/include/netinet/ip.h +++ b/nuttx/include/netinet/ip.h @@ -1,8 +1,8 @@ /**************************************************************************** - * netinet/ip.h + * include/netinet/ip.h * * Copyright (C) 2007, 2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NETINET_IP_H -#define __NETINET_IP_H +#ifndef __INCLUDE_NETINET_IP_H +#define __INCLUDE_NETINET_IP_H /**************************************************************************** * Included Files @@ -51,4 +51,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __NETINET_IP_H */ +#endif /* __INCLUDE_NETINET_IP_H */ diff --git a/nuttx/include/netinet/ip6.h b/nuttx/include/netinet/ip6.h index c8c0e22e3..be16ae722 100644 --- a/nuttx/include/netinet/ip6.h +++ b/nuttx/include/netinet/ip6.h @@ -1,8 +1,8 @@ /**************************************************************************** - * netinet/ip6.h + * include/netinet/ip6.h * * Copyright (C) 2007, 2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NETINET_IP6_H -#define __NETINET_IP6_H +#ifndef __INCLUDE_NETINET_I6P_H +#define __INCLUDE_NETINET_I6P_H /**************************************************************************** * Included Files @@ -51,4 +51,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __NETINET_IP6_H */ +#endif /* __INCLUDE_NETINET_I6P_H */ diff --git a/nuttx/include/nuttx/analog/adc.h b/nuttx/include/nuttx/analog/adc.h index c1e78ff7e..873f5d9da 100644 --- a/nuttx/include/nuttx/analog/adc.h +++ b/nuttx/include/nuttx/analog/adc.h @@ -8,7 +8,7 @@ * * Derived from include/nuttx/can.h * Copyright (C) 2008, 2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/analog/dac.h b/nuttx/include/nuttx/analog/dac.h index 524c66507..655fdbfcf 100644 --- a/nuttx/include/nuttx/analog/dac.h +++ b/nuttx/include/nuttx/analog/dac.h @@ -8,7 +8,7 @@ * Derived from include/nuttx/can.h * * Copyright (C) 2008, 2009 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 * modification, are permitted provided that the following conditions @@ -39,8 +39,8 @@ * ************************************************************************************/ -#ifndef __NUTTX_DAC_H -#define __NUTTX_DAC_H +#ifndef __INCLUDE_NUTTX_ANALOG_DAC_H +#define __INCLUDE_NUTTX_ANALOG_DAC_H /************************************************************************************ * Included Files @@ -209,4 +209,4 @@ FAR struct dac_dev_s *up_ad5410initialize(FAR struct spi_dev_s *spi, unsigned in } #endif -#endif /* __NUTTX_DAC_H */ +#endif /* __INCLUDE_NUTTX_ANALOG_DAC_H */ diff --git a/nuttx/include/nuttx/binfmt.h b/nuttx/include/nuttx/binfmt.h index 7029ca161..70beda393 100644 --- a/nuttx/include/nuttx/binfmt.h +++ b/nuttx/include/nuttx/binfmt.h @@ -2,7 +2,7 @@ * include/nuttx/binfmt.h * * Copyright (C) 2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/compiler.h b/nuttx/include/nuttx/compiler.h index c672054dd..733d58eec 100644 --- a/nuttx/include/nuttx/compiler.h +++ b/nuttx/include/nuttx/compiler.h @@ -2,7 +2,7 @@ * include/nuttx/compiler.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __COMPILER_H -#define __COMPILER_H +#ifndef __INCLUDE_NUTTX_COMPILER_H +#define __INCLUDE_NUTTX_COMPILER_H /**************************************************************************** * Included Files @@ -445,4 +445,4 @@ extern "C" { } #endif -#endif /* __COMPILER_H */ +#endif /* __INCLUDE_NUTTX_COMPILER_H */ diff --git a/nuttx/include/nuttx/fb.h b/nuttx/include/nuttx/fb.h index 49ffaf37e..ddff4edf8 100644 --- a/nuttx/include/nuttx/fb.h +++ b/nuttx/include/nuttx/fb.h @@ -2,7 +2,7 @@ * include/nuttx/fb.h * * Copyright (C) 2008-2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/i2c.h b/nuttx/include/nuttx/i2c.h index d72b54b29..b2238b1cf 100644 --- a/nuttx/include/nuttx/i2c.h +++ b/nuttx/include/nuttx/i2c.h @@ -2,7 +2,7 @@ * include/nuttx/i2c.h * * Copyright(C) 2009-2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/init.h b/nuttx/include/nuttx/init.h index 722db85a4..ecdad702f 100644 --- a/nuttx/include/nuttx/init.h +++ b/nuttx/include/nuttx/init.h @@ -2,7 +2,7 @@ * include/nuttx/init.h * * Copyright (C) 2007, 2008, 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_INIT_H -#define __NUTTX_INIT_H +#ifndef __INCLUDE_NUTTX_INIT_H +#define __INCLUDE_NUTTX_INIT_H /**************************************************************************** * Included Files @@ -79,4 +79,4 @@ EXTERN void os_start(void); /* OS entry point called by boot logic */ } #endif -#endif /* __NUTTX_INIT_H */ +#endif /* __INCLUDE_NUTTX_INIT_H */ diff --git a/nuttx/include/nuttx/irq.h b/nuttx/include/nuttx/irq.h index c9c6109d5..0bbb4a18c 100644 --- a/nuttx/include/nuttx/irq.h +++ b/nuttx/include/nuttx/irq.h @@ -2,7 +2,7 @@ * include/nuttx/irq.h * * Copyright (C) 2007-2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/kmalloc.h b/nuttx/include/nuttx/kmalloc.h index acdfca1cd..767809f88 100644 --- a/nuttx/include/nuttx/kmalloc.h +++ b/nuttx/include/nuttx/kmalloc.h @@ -2,7 +2,7 @@ * include/nuttx/kmalloc.h * * Copyright (C) 2007, 2008, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/lcd/lcd.h b/nuttx/include/nuttx/lcd/lcd.h index 790896c91..45eb03b0d 100644 --- a/nuttx/include/nuttx/lcd/lcd.h +++ b/nuttx/include/nuttx/lcd/lcd.h @@ -2,7 +2,7 @@ * include/nuttx/lcd/lcd.h * * Copyright (C) 2010-2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/lcd/nokia6100.h b/nuttx/include/nuttx/lcd/nokia6100.h index d6fe2d3ed..0fb52a40d 100644 --- a/nuttx/include/nuttx/lcd/nokia6100.h +++ b/nuttx/include/nuttx/lcd/nokia6100.h @@ -3,7 +3,7 @@ * Application interface to the Nokia 6100 LCD display * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/lcd/p14201.h b/nuttx/include/nuttx/lcd/p14201.h index d605551ab..741d4f3de 100644 --- a/nuttx/include/nuttx/lcd/p14201.h +++ b/nuttx/include/nuttx/lcd/p14201.h @@ -3,7 +3,7 @@ * Application interface to the RiT P14201 OLED driver * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/lcd/ug-9664hswag01.h b/nuttx/include/nuttx/lcd/ug-9664hswag01.h index 61d53c369..696005b5d 100644 --- a/nuttx/include/nuttx/lcd/ug-9664hswag01.h +++ b/nuttx/include/nuttx/lcd/ug-9664hswag01.h @@ -4,7 +4,7 @@ * SSD1305 LCD controller. * * Copyright (C) 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/mm.h b/nuttx/include/nuttx/mm.h index a38620966..cabab2619 100644 --- a/nuttx/include/nuttx/mm.h +++ b/nuttx/include/nuttx/mm.h @@ -2,7 +2,7 @@ * include/nuttx/mm.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_MM_H -#define __NUTTX_MM_H +#ifndef __INCLUDE_NUTTX_MM_H +#define __INCLUDE_NUTTX_MM_H /**************************************************************************** * Included Files @@ -81,4 +81,4 @@ EXTERN void mm_givesemaphore(void); } #endif -#endif /* __NUTTX_MM_H */ +#endif /* __INCLUDE_NUTTX_MM_H */ diff --git a/nuttx/include/nuttx/mmcsd.h b/nuttx/include/nuttx/mmcsd.h index e91c51e0d..819613ede 100644 --- a/nuttx/include/nuttx/mmcsd.h +++ b/nuttx/include/nuttx/mmcsd.h @@ -2,7 +2,7 @@ * include/nuttx/mmcsd.h * * Copyright (C) 2008-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_MMCSD_H -#define __NUTTX_MMCSD_H +#ifndef __INCLUDE_NUTTX_MMCSD_H +#define __INCLUDE_NUTTX_MMCSD_H /**************************************************************************** * Included Files @@ -103,4 +103,5 @@ EXTERN int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s * #if defined(__cplusplus) } #endif -#endif /* __NUTTX_MMCSD_H */ + +#endif /* __INCLUDE_NUTTX_MMCSD_H */ diff --git a/nuttx/include/nuttx/mqueue.h b/nuttx/include/nuttx/mqueue.h index 77ddd4981..43c0aab6e 100644 --- a/nuttx/include/nuttx/mqueue.h +++ b/nuttx/include/nuttx/mqueue.h @@ -2,7 +2,7 @@ * include/nuttx/mqueue.h * * Copyright (C) 2007, 2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/net/enc28j60.h b/nuttx/include/nuttx/net/enc28j60.h index 6cc911ce5..2507b1cf6 100644 --- a/nuttx/include/nuttx/net/enc28j60.h +++ b/nuttx/include/nuttx/net/enc28j60.h @@ -2,7 +2,7 @@ * include/nuttx/net/enc28j60.h * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index 584d887ef..b79dda755 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/net/net.h + * include/nuttx/net/net.h * * Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/include/nuttx/net/uip/uip-arp.h b/nuttx/include/nuttx/net/uip/uip-arp.h index 8484c7d5a..ba704cc13 100644 --- a/nuttx/include/nuttx/net/uip/uip-arp.h +++ b/nuttx/include/nuttx/net/uip/uip-arp.h @@ -38,8 +38,8 @@ * ****************************************************************************/ -#ifndef __UIP_ARP_H__ -#define __UIP_ARP_H__ +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ARP_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_ARP_H /**************************************************************************** * Included Files @@ -259,4 +259,4 @@ EXTERN struct arp_entry *uip_arp_find(in_addr_t ipaddr); } #endif -#endif /* __UIP_ARP_H__ */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ARP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-ipopt.h b/nuttx/include/nuttx/net/uip/uip-ipopt.h index 5e600d8b1..2d7393c02 100644 --- a/nuttx/include/nuttx/net/uip/uip-ipopt.h +++ b/nuttx/include/nuttx/net/uip/uip-ipopt.h @@ -4,7 +4,7 @@ * Defines values for the IP header options * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/net/uip/uipopt.h b/nuttx/include/nuttx/net/uip/uipopt.h index eee1dac4c..4eff56fe8 100644 --- a/nuttx/include/nuttx/net/uip/uipopt.h +++ b/nuttx/include/nuttx/net/uip/uipopt.h @@ -17,7 +17,7 @@ * be changed, but rather the per-project defconfig file. * * Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic was leveraged from uIP which also has a BSD-style license: * diff --git a/nuttx/include/nuttx/nx/nxfonts.h b/nuttx/include/nuttx/nx/nxfonts.h index c7b2b3713..f1aecb9e5 100644 --- a/nuttx/include/nuttx/nx/nxfonts.h +++ b/nuttx/include/nuttx/nx/nxfonts.h @@ -2,7 +2,7 @@ * include/nuttx/nx/nxfonts.h * * Copyright (C) 2008, 2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/nxflat.h b/nuttx/include/nuttx/nxflat.h index 9f00f8951..b6501522e 100644 --- a/nuttx/include/nuttx/nxflat.h +++ b/nuttx/include/nuttx/nxflat.h @@ -2,7 +2,7 @@ * include/nuttx/nxflat.h * * Copyright (C) 2009 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 * modification, are permitted provided that the following conditions @@ -139,7 +139,7 @@ EXTERN int nxflat_verifyheader(const struct nxflat_hdr_s *header); ***********************************************************************/ EXTERN int nxflat_init(const char *filename, - struct nxflat_loadinfo_s *loadinfo); + struct nxflat_loadinfo_s *loadinfo); /*********************************************************************** * Name: nxflat_uninit diff --git a/nuttx/include/nuttx/page.h b/nuttx/include/nuttx/page.h index b34094462..2502e16ee 100644 --- a/nuttx/include/nuttx/page.h +++ b/nuttx/include/nuttx/page.h @@ -3,7 +3,7 @@ * This file defines interfaces used to support NuttX On-Demand Paging. * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_PAGE_H -#define __NUTTX_PAGE_H +#ifndef __INCLUDE_NUTTX_PAGE_H +#define __INCLUDE_NUTTX_PAGE_H /**************************************************************************** * Included Files @@ -464,4 +464,4 @@ EXTERN int up_fillpage(FAR _TCB *tcb, FAR void *vpage, up_pgcallback_t pg_callba #endif /* __ASSEMBLY__ */ #endif /* CONFIG_PAGING */ -#endif /* __NUTTX_PAGE_H */ +#endif /* __INCLUDE_NUTTX_PAGE_H */ diff --git a/nuttx/include/nuttx/progmem.h b/nuttx/include/nuttx/progmem.h index 021eb035e..ac5a65940 100644 --- a/nuttx/include/nuttx/progmem.h +++ b/nuttx/include/nuttx/progmem.h @@ -62,76 +62,131 @@ extern "C" { * Public Functions ****************************************************************************/ -/* Return number of pages */ +/**************************************************************************** + * Name: up_progmem_npages + * + * Description: + * Return number of pages + * + ****************************************************************************/ uint16_t up_progmem_npages(void); -/* Is program memory uniform or page size differs */ +/**************************************************************************** + * Name: up_progmem_isuniform + * + * Description: + * Is program memory uniform or page size differs? + * + ****************************************************************************/ bool up_progmem_isuniform(void); -/* Return page size */ +/**************************************************************************** + * Name: up_progmem_pagesize + * + * Description: + * Return page size + * + ****************************************************************************/ uint16_t up_progmem_pagesize(uint16_t page); -/* Address to page conversion - * \param addr Address without flash offet (aligned to page0) - * \return Page or negative value on error - * - * The following errors are reported (errno is not set!) - * - EFAULT: On invalid address - */ +/**************************************************************************** + * Name: up_progmem_getpage + * + * Description: + * Address to page conversion + * + * Input Parameters: + * addr - Address without flash offet (aligned to page0) + * + * Returned Value: + * Page or negative value on error. The following errors are reported + * (errno is not set!): + * + * EFAULT: On invalid address + * + ****************************************************************************/ int up_progmem_getpage(uint32_t addr); -/* Erase selected page. - * \return page size or negative value on error - * - * The following errors are reported (errno is not set!) - * - EFAULT: On invalid page - * - EIO: On unsuccessful erase - * - EROFS: On access to write protected area - * - EACCES: Insufficient permissions (read/write protected) - * - EPERM: If operation is not permitted due to some other constraints - * (i.e. some internal block is not running etc.) - */ +/**************************************************************************** + * Name: up_progmem_erasepage + * + * Description: + * Erase selected page. + * + * Input Parameters: + * page - + * + * Returned Value: + * Page size or negative value on error. The following errors are reported + * (errno is not set!): + * + * EFAULT: On invalid page + * EIO: On unsuccessful erase + * EROFS: On access to write protected area + * EACCES: Insufficient permissions (read/write protected) + * EPERM: If operation is not permitted due to some other constraints + * (i.e. some internal block is not running etc.) + * + ****************************************************************************/ int up_progmem_erasepage(uint16_t page); -/* Checks whether page is erased - * - * Returns number of bytes written or negative value on error. - * If it returns zero then complete page is empty (erased). +/**************************************************************************** + * Name: up_progmem_ispageerased * - * The following errors are reported (errno is not set!) - * - EFAULT: On invalid page - */ + * Description: + * Checks whether page is erased + * + * Input Parameters: + * page - + * + * Returned Value: + * Returns number of bytes written or negative value on error. If it + * returns zero then complete page is empty (erased). + * + * The following errors are reported (errno is not set!) + * EFAULT: On invalid page + * + ****************************************************************************/ int up_progmem_ispageerased(uint16_t page); -/* Program data at given address - * \return bytes written or negative value on error - * \param addr Address without flash offet (aligned to page0) - * \param buf Pointer to buffer - * \param count Number of bytes to write - * - * Note: this function is not limited to single page and nor it requires +/**************************************************************************** + * Name: up_progmem_write + * + * Description: + * Program data at given address + * + * Note: this function is not limited to single page and nor it requires * the address be aligned inside the page boundaries. - * - * The following errors are reported (errno is not set!) - * - EINVAL: if count is not aligned with the flash boundaries (i.e. - * some MCU's require per half-word or even word access) - * - EFAULT: On invalid address - * - EIO: On unsuccessful write - * - EROFS: On access to write protected area - * - EACCES: Insufficient permissions (read/write protected) - * - EPERM: If operation is not permitted due to some other constraints - * (i.e. some internal block is not running etc.) - */ + * + * Input Parameters: + * addr - Address without flash offet (aligned to page0) + * buf - Pointer to buffer + * count - Number of bytes to write * + * + * Returned Value: + * Bytes written or negative value on error. The following errors are + * reported (errno is not set!) + * + * EINVAL: if count is not aligned with the flash boundaries (i.e. + * some MCU's require per half-word or even word access) + * EFAULT: On invalid address + * EIO: On unsuccessful write + * EROFS: On access to write protected area + * EACCES: Insufficient permissions (read/write protected) + * EPERM: If operation is not permitted due to some other constraints + * (i.e. some internal block is not running etc.) + * + ****************************************************************************/ int up_progmem_write(uint32_t addr, const void *buf, size_t count); -/* \todo: Define the following functions and their options: +/* TODO: Define the following functions and their options: * - up_progmem_protect() * - up_progmem_unprotect() */ diff --git a/nuttx/include/nuttx/pthread.h b/nuttx/include/nuttx/pthread.h index 8165f1b84..2bdb88340 100644 --- a/nuttx/include/nuttx/pthread.h +++ b/nuttx/include/nuttx/pthread.h @@ -3,7 +3,7 @@ * Non-standard, NuttX-specific pthread-related declarations. * * Copyright (C) 2011 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 * modification, are permitted provided that the following conditions @@ -63,23 +63,23 @@ * Public Data ****************************************************************************/ +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + /* Default pthread attributes (see sched/pthread_create.c). This global * can only be shared within the kernel- or within the user- address space. */ -extern pthread_attr_t g_default_pthread_attr; +EXTERN pthread_attr_t g_default_pthread_attr; /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#ifdef __cplusplus -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - #undef EXTERN #ifdef __cplusplus } diff --git a/nuttx/include/nuttx/pwm.h b/nuttx/include/nuttx/pwm.h index a920d9dc7..69fa4fc4d 100644 --- a/nuttx/include/nuttx/pwm.h +++ b/nuttx/include/nuttx/pwm.h @@ -250,7 +250,7 @@ extern "C" { * ****************************************************************************/ -int pwm_register(FAR const char *path, FAR struct pwm_lowerhalf_s *dev); +EXTERN int pwm_register(FAR const char *path, FAR struct pwm_lowerhalf_s *dev); /**************************************************************************** * Name: pwm_expired diff --git a/nuttx/include/nuttx/ramdisk.h b/nuttx/include/nuttx/ramdisk.h index 8c93c872a..7d4017c11 100644 --- a/nuttx/include/nuttx/ramdisk.h +++ b/nuttx/include/nuttx/ramdisk.h @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/ramdisk.h + * include/nuttx/ramdisk.h * * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/include/nuttx/regex.h b/nuttx/include/nuttx/regex.h index 7c32af361..030823a6f 100644 --- a/nuttx/include/nuttx/regex.h +++ b/nuttx/include/nuttx/regex.h @@ -3,7 +3,7 @@ * Non-standard, pattern-matching APIs available in lib/. * * Copyright (C) 2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/rtc.h b/nuttx/include/nuttx/rtc.h index 007617a0e..85dea1b4d 100644 --- a/nuttx/include/nuttx/rtc.h +++ b/nuttx/include/nuttx/rtc.h @@ -105,6 +105,7 @@ /**************************************************************************** * Public Types ****************************************************************************/ + /* The form of an alarm callback */ typedef CODE void (*alarmcb_t)(void); diff --git a/nuttx/include/nuttx/rwbuffer.h b/nuttx/include/nuttx/rwbuffer.h index afc9715ed..eb7861872 100644 --- a/nuttx/include/nuttx/rwbuffer.h +++ b/nuttx/include/nuttx/rwbuffer.h @@ -1,8 +1,8 @@ /**************************************************************************** - * inlcude/nuttx/rwbuffer.h + * include/nuttx/rwbuffer.h * * Copyright (C) 2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/sched.h b/nuttx/include/nuttx/sched.h index 6d5d0bab7..90e54706d 100644 --- a/nuttx/include/nuttx/sched.h +++ b/nuttx/include/nuttx/sched.h @@ -1,5 +1,5 @@ /******************************************************************************** - * nuttx/sched.h + * include/nuttx/sched.h * * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/include/nuttx/scsi.h b/nuttx/include/nuttx/scsi.h index 30407049e..6d0aa5b20 100644 --- a/nuttx/include/nuttx/scsi.h +++ b/nuttx/include/nuttx/scsi.h @@ -2,7 +2,7 @@ * include/nuttx/scsi.h * * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: * "SCSI Primary Commands - 3 (SPC-3)," American National Standard diff --git a/nuttx/include/nuttx/sdio.h b/nuttx/include/nuttx/sdio.h index bb0c7acfb..10612db85 100644 --- a/nuttx/include/nuttx/sdio.h +++ b/nuttx/include/nuttx/sdio.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_SDIO_H -#define __NUTTX_SDIO_H +#ifndef __INCLUDE_NUTTX_SDIO_H +#define __INCLUDE_NUTTX_SDIO_H /**************************************************************************** * Included Files @@ -852,4 +852,4 @@ extern "C" { #if defined(__cplusplus) } #endif -#endif /* __NUTTX_SDIO_H */ +#endif /* __INCLUDE_NUTTX_SDIO_H */ diff --git a/nuttx/include/nuttx/symtab.h b/nuttx/include/nuttx/symtab.h index 8f8aa5a7c..b302ab20a 100644 --- a/nuttx/include/nuttx/symtab.h +++ b/nuttx/include/nuttx/symtab.h @@ -2,7 +2,7 @@ * include/nuttx/symtab.h * * Copyright (C) 2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/usb/cdc.h b/nuttx/include/nuttx/usb/cdc.h index 53b19b5a2..627dd77e3 100755 --- a/nuttx/include/nuttx/usb/cdc.h +++ b/nuttx/include/nuttx/usb/cdc.h @@ -2,7 +2,7 @@ * include/nuttx/usb/cdc.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: "Universal Serial Bus Class Definitions for Communication * Devices," Version 1.1, January 19, 1999 diff --git a/nuttx/include/nuttx/usb/composite.h b/nuttx/include/nuttx/usb/composite.h index fc935fd67..98f992bf3 100644 --- a/nuttx/include/nuttx/usb/composite.h +++ b/nuttx/include/nuttx/usb/composite.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_USB_COMPOSITE_H -#define __NUTTX_USB_COMPOSITE_H +#ifndef __INCLUDE_NUTTX_USB_COMPOSITE_H +#define __INCLUDE_NUTTX_USB_COMPOSITE_H /**************************************************************************** * Included Files @@ -183,4 +183,4 @@ EXTERN int composite_ep0submit(FAR struct usbdevclass_driver_s *driver, #endif #endif /* CONFIG_USBDEV_COMPOSITE */ -#endif /* __NUTTX_USB_COMPOSITE_H */ +#endif /* __INCLUDE_NUTTX_USB_COMPOSITE_H */ diff --git a/nuttx/include/nuttx/usb/hid.h b/nuttx/include/nuttx/usb/hid.h index 0b942db4b..5b83f08fc 100644 --- a/nuttx/include/nuttx/usb/hid.h +++ b/nuttx/include/nuttx/usb/hid.h @@ -2,7 +2,7 @@ * include/nuttx/usb/hid.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: * HID Universal Serial Bus (USB), Device Class Definition for Human diff --git a/nuttx/include/nuttx/usb/ohci.h b/nuttx/include/nuttx/usb/ohci.h index 60cf97513..c5f15246b 100644 --- a/nuttx/include/nuttx/usb/ohci.h +++ b/nuttx/include/nuttx/usb/ohci.h @@ -2,7 +2,7 @@ * include/nuttx/usb/ohci.h * * Copyright (C) 2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: "OpenHCI Open Host Controller Interface Specification * for USB," Release 1.0a, Compaq, Microsoft, National Semiconductor, diff --git a/nuttx/include/nuttx/usb/storage.h b/nuttx/include/nuttx/usb/storage.h index 9b9566d40..4c4bf0066 100644 --- a/nuttx/include/nuttx/usb/storage.h +++ b/nuttx/include/nuttx/usb/storage.h @@ -2,7 +2,7 @@ * include/nuttx/usb/storage.h * * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: * "Universal Serial Bus Mass Storage Class, Specification Overview," @@ -40,8 +40,8 @@ * ************************************************************************************/ -#ifndef __NUTTX_USB_STORAGE_H -#define __NUTTX_USB_STORAGE_H +#ifndef __INCLUDE_NUTTX_USB_STORAGE_H +#define __INCLUDE_NUTTX_USB_STORAGE_H /************************************************************************************ * Included Files @@ -128,4 +128,4 @@ struct usbmsc_csw_s * Public Functions ************************************************************************************/ -#endif /* __NUTTX_USB_STORAGE_H */ +#endif /* __INCLUDE_NUTTX_USB_STORAGE_H */ diff --git a/nuttx/include/nuttx/usb/usb.h b/nuttx/include/nuttx/usb/usb.h index 4e38d3283..74b1f6a95 100644 --- a/nuttx/include/nuttx/usb/usb.h +++ b/nuttx/include/nuttx/usb/usb.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __NUTTX_USB_USB_H -#define __NUTTX_USB_USB_H +#ifndef __INCLUDE_NUTTX_USB_USB_H +#define __INCLUDE_NUTTX_USB_USB_H /************************************************************************************ * Included Files @@ -413,4 +413,4 @@ struct usb_iaddesc_s * Public Functions ************************************************************************************/ -#endif // __NUTTX_USB_USB_H +#endif // __INCLUDE_NUTTX_USB_USB_H diff --git a/nuttx/include/nuttx/usb/usbhost.h b/nuttx/include/nuttx/usb/usbhost.h index 5bf1d45a4..133fd4387 100644 --- a/nuttx/include/nuttx/usb/usbhost.h +++ b/nuttx/include/nuttx/usb/usbhost.h @@ -2,7 +2,7 @@ * include/nuttx/usb/usbhost.h * * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: * "Universal Serial Bus Mass Storage Class, Specification Overview," @@ -40,8 +40,8 @@ * ************************************************************************************/ -#ifndef __NUTTX_USB_USBHOST_H -#define __NUTTX_USB_USBHOST_H +#ifndef __INCLUDE_NUTTX_USB_USBHOST_H +#define __INCLUDE_NUTTX_USB_USBHOST_H /************************************************************************************ * Included Files @@ -866,4 +866,4 @@ EXTERN int usbhost_enumerate(FAR struct usbhost_driver_s *drvr, } #endif -#endif /* __NUTTX_USB_USBHOST_H */ +#endif /* __INCLUDE_NUTTX_USB_USBHOST_H */ diff --git a/nuttx/include/nuttx/usb/usbhost_trace.h b/nuttx/include/nuttx/usb/usbhost_trace.h index d0c6db93e..db263c40d 100644 --- a/nuttx/include/nuttx/usb/usbhost_trace.h +++ b/nuttx/include/nuttx/usb/usbhost_trace.h @@ -2,7 +2,7 @@ * include/nuttx/usb/usbhost_trace.h * * Copyright (C) 2010 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nxflat.h b/nuttx/include/nxflat.h index 52645a05a..82e667897 100644 --- a/nuttx/include/nxflat.h +++ b/nuttx/include/nxflat.h @@ -2,7 +2,7 @@ * include/nxflat.h * * Copyright (C) 2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/poll.h b/nuttx/include/poll.h index 82b731bd2..3bf4c4bad 100644 --- a/nuttx/include/poll.h +++ b/nuttx/include/poll.h @@ -2,7 +2,7 @@ * include/poll.h * * Copyright (C) 2008-2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/queue.h b/nuttx/include/queue.h index 17d56ab20..b5aa23690 100644 --- a/nuttx/include/queue.h +++ b/nuttx/include/queue.h @@ -1,8 +1,8 @@ /************************************************************************ - * queue.h + * include/queue.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ************************************************************************/ -#ifndef __QUEUE_H -#define __QUEUE_H +#ifndef __INCLUDE_QUEUE_H +#define __INCLUDE_QUEUE_H /************************************************************************ * Included Files @@ -125,5 +125,5 @@ EXTERN FAR dq_entry_t *dq_remfirst(dq_queue_t *queue); } #endif -#endif /* __QUEUE_H_ */ +#endif /* __INCLUDE_QUEUE_H_ */ diff --git a/nuttx/include/sched.h b/nuttx/include/sched.h index 94f6a1216..4494d8ef5 100644 --- a/nuttx/include/sched.h +++ b/nuttx/include/sched.h @@ -2,7 +2,7 @@ * include/sched.h * * Copyright (C) 2007-2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/signal.h b/nuttx/include/signal.h index 0d0357704..02b222343 100644 --- a/nuttx/include/signal.h +++ b/nuttx/include/signal.h @@ -2,7 +2,7 @@ * include/signal.h * * Copyright (C) 2007-2009, 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ********************************************************************************/ -#ifndef __SIGNAL_H -#define __SIGNAL_H +#ifndef __INCLUDE_SIGNAL_H +#define __INCLUDE_SIGNAL_H /******************************************************************************** * Included Files @@ -234,5 +234,5 @@ EXTERN int sigqueue(int pid, int signo, FAR void *sival_ptr); } #endif -#endif /* __SIGNAL_H */ +#endif /* __INCLUDE_SIGNAL_H */ diff --git a/nuttx/include/stdbool.h b/nuttx/include/stdbool.h index ad73870e3..f11219912 100644 --- a/nuttx/include/stdbool.h +++ b/nuttx/include/stdbool.h @@ -2,7 +2,7 @@ * include/stdbool.h * * Copyright (C) 2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/stddef.h b/nuttx/include/stddef.h index d7785b03a..f08135bf7 100644 --- a/nuttx/include/stddef.h +++ b/nuttx/include/stddef.h @@ -2,7 +2,7 @@ * include/stddef.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __STDDEF_H -#define __STDDEF_H +#ifndef __INCLUDE_STDDEF_H +#define __INCLUDE_STDDEF_H /**************************************************************************** * Included Files @@ -46,4 +46,4 @@ * Type Definitions ****************************************************************************/ -#endif /* __STDDEF_H */ +#endif /* __INCLUDE_STDDEF_H */ diff --git a/nuttx/include/stdint.h b/nuttx/include/stdint.h index 64667c794..4c14d935e 100644 --- a/nuttx/include/stdint.h +++ b/nuttx/include/stdint.h @@ -2,7 +2,7 @@ * include/stdint.h * * Copyright (C) 2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/stdio.h b/nuttx/include/stdio.h index b2b2ae928..82bf0eaf6 100644 --- a/nuttx/include/stdio.h +++ b/nuttx/include/stdio.h @@ -2,7 +2,7 @@ * include/stdio.h * * Copyright (C) 2007-2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/sys/mman.h b/nuttx/include/sys/mman.h index 6d220bef1..ab847b97a 100644 --- a/nuttx/include/sys/mman.h +++ b/nuttx/include/sys/mman.h @@ -2,7 +2,7 @@ * include/sys/mman.h * * Copyright (C) 2008, 2009, 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_MMAN_H -#define __SYS_MMAN_H +#ifndef __INCLUDE_SYS_MMAN_H +#define __INCLUDE_SYS_MMAN_H /**************************************************************************** * Included Files @@ -110,4 +110,4 @@ EXTERN int munmap(FAR void *start, size_t length); } #endif -#endif /* __SYS_MMAN_H */ +#endif /* __INCLUDE_SYS_MMAN_H */ diff --git a/nuttx/include/sys/mount.h b/nuttx/include/sys/mount.h index e9ff0f4b5..194dec8cc 100644 --- a/nuttx/include/sys/mount.h +++ b/nuttx/include/sys/mount.h @@ -2,7 +2,7 @@ * include/sys/mount.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_MOUNT_H -#define __SYS_MOUNT_H +#ifndef __INCLUDE_SYS_MOUNT_H +#define __INCLUDE_SYS_MOUNT_H /**************************************************************************** * Included Files @@ -74,4 +74,4 @@ EXTERN int umount(const char *target); } #endif -#endif /* __SYS_MOUNT_H */ +#endif /* __INCLUDE_SYS_MOUNT_H */ diff --git a/nuttx/include/sys/prctl.h b/nuttx/include/sys/prctl.h index 6af684562..f1441a77a 100644 --- a/nuttx/include/sys/prctl.h +++ b/nuttx/include/sys/prctl.h @@ -46,7 +46,6 @@ /* Supported prctl() commands. * - * * PR_SET_NAME * Set the task (or thread) name for the thread whose ID is in required * arg2 (int), using the value in the location pointed to by required arg1 diff --git a/nuttx/include/sys/select.h b/nuttx/include/sys/select.h index f9e0d573c..1ff074b6c 100644 --- a/nuttx/include/sys/select.h +++ b/nuttx/include/sys/select.h @@ -2,7 +2,7 @@ * include/sys/select.h * * Copyright (C) 2008-2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/sys/socket.h b/nuttx/include/sys/socket.h index 83699bfbd..89ade941f 100644 --- a/nuttx/include/sys/socket.h +++ b/nuttx/include/sys/socket.h @@ -1,8 +1,8 @@ /**************************************************************************** - * sys/socket.h + * include/sys/socket.h * * Copyright (C) 2007, 2009, 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_SOCKET_H -#define __SYS_SOCKET_H +#ifndef __INCLUDE_SYS_SOCKET_H +#define __INCLUDE_SYS_SOCKET_H /**************************************************************************** * Included Files @@ -231,4 +231,4 @@ EXTERN int getsockname(int sockfd, FAR struct sockaddr *addr, } #endif -#endif /* __SYS_SOCKET_H */ +#endif /* __INCLUDE_SYS_SOCKET_H */ diff --git a/nuttx/include/sys/stat.h b/nuttx/include/sys/stat.h index 5aa827f86..1204b15aa 100644 --- a/nuttx/include/sys/stat.h +++ b/nuttx/include/sys/stat.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_STAT_H -#define __SYS_STAT_H +#ifndef __INCLUDE_SYS_STAT_H +#define __INCLUDE_SYS_STAT_H /**************************************************************************** * Included Files @@ -94,9 +94,8 @@ * Type Definitions ****************************************************************************/ -/* This is the simplified struct stat as returned by fstat(). - * This structure provides information about a specific file - * or directory in the file system. +/* This is the simplified struct stat as returned by fstat(). This structure + * provides information about a specific file or directory in the file system. */ struct stat @@ -132,4 +131,4 @@ EXTERN int fstat(int fd, FAR struct stat *buf); } #endif -#endif /* __SYS_STAT_H */ +#endif /* __INCLUDE_SYS_STAT_H */ diff --git a/nuttx/include/sys/statfs.h b/nuttx/include/sys/statfs.h index d37b056c3..70e963dd9 100644 --- a/nuttx/include/sys/statfs.h +++ b/nuttx/include/sys/statfs.h @@ -2,7 +2,7 @@ * include/sys/statfs.h * * Copyright (C) 2007-2009, 2011 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_STATFS_H -#define __SYS_STATFS_H +#ifndef __INCLUDE_SYS_STATFS_H +#define __INCLUDE_SYS_STATFS_H /**************************************************************************** * Included Files @@ -142,4 +142,4 @@ EXTERN int fstatfs(int fd, struct statfs *buf); } #endif -#endif /* __SYS_STATFS_H */ +#endif /* __INCLUDE_SYS_STATFS_H */ diff --git a/nuttx/include/sys/time.h b/nuttx/include/sys/time.h index 2ac8ae004..75dfd7280 100644 --- a/nuttx/include/sys/time.h +++ b/nuttx/include/sys/time.h @@ -2,7 +2,7 @@ * include/sys/time.h * * Copyright (C) 2009 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/sys/types.h b/nuttx/include/sys/types.h index 0c6f72394..6014b9b74 100644 --- a/nuttx/include/sys/types.h +++ b/nuttx/include/sys/types.h @@ -2,7 +2,7 @@ * include/sys/types.h * * Copyright (C) 2007-2009, 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/sys/vfs.h b/nuttx/include/sys/vfs.h index 6625a9fa4..8433893c3 100644 --- a/nuttx/include/sys/vfs.h +++ b/nuttx/include/sys/vfs.h @@ -2,7 +2,7 @@ * include/sys/vfs.h * * Copyright (C) 2007, 2008 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 * modification, are permitted provided that the following conditions @@ -33,15 +33,15 @@ * ****************************************************************************/ -#ifndef __SYS_VFS_H -#define __SYS_VFS_H +#ifndef __INCLUDE_SYS_VFS_H +#define __INCLUDE_SYS_VFS_H /**************************************************************************** * Included Files ****************************************************************************/ -/* sys/vfs.h is just an alternative location for the - * information in sys/statfs.h. +/* sys/vfs.h is just an alternative location for the information in + * sys/statfs.h. */ #include <sys/statfs.h> @@ -58,4 +58,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __SYS_VFS_H */ +#endif /* __INCLUDE_SYS_VFS_H */ diff --git a/nuttx/include/sys/wait.h b/nuttx/include/sys/wait.h index 559b922f3..6af1e971e 100644 --- a/nuttx/include/sys/wait.h +++ b/nuttx/include/sys/wait.h @@ -2,7 +2,7 @@ * include/sys/wait.h * * Copyright (C) 2011 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 * modification, are permitted provided that the following conditions diff --git a/nuttx/include/unistd.h b/nuttx/include/unistd.h index 9713c84d3..e2ad6ff82 100644 --- a/nuttx/include/unistd.h +++ b/nuttx/include/unistd.h @@ -2,7 +2,7 @@ * include/unistd.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __UNISTD_H -#define __UNISTD_H +#ifndef __INCLUDE_UNISTD_H +#define __INCLUDE_UNISTD_H /**************************************************************************** * Included Files @@ -176,4 +176,4 @@ EXTERN int *getoptoptp(void); /* unrecognized option character */ } #endif -#endif /* __UNISTD_H */ +#endif /* __INCLUDE_UNISTD_H */ diff --git a/nuttx/include/wdog.h b/nuttx/include/wdog.h index 85474dd5d..3179c06a4 100644 --- a/nuttx/include/wdog.h +++ b/nuttx/include/wdog.h @@ -2,7 +2,7 @@ * include/wdog.h * * Copyright (C) 2007-2009 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 * modification, are permitted provided that the following conditions @@ -53,14 +53,13 @@ * Global Type Declarations ****************************************************************************/ -/* The arguments are passed as uint32_t values. For systems - * where the sizeof(pointer) < sizeof(uint32_t), the following - * union defines the alignment of the pointer within the - * uint32_t. For example, the SDCC MCS51 general pointer is - * 24-bits, but uint32_t is 32-bits (of course). +/* The arguments are passed as uint32_t values. For systems where the + * sizeof(pointer) < sizeof(uint32_t), the following union defines the + * alignment of the pointer within the uint32_t. For example, the SDCC + * MCS51 general pointer is 24-bits, but uint32_t is 32-bits (of course). * - * For systems where sizeof(pointer) > sizeof(uint32_t), we will - * have to do some redesign. + * For systems where sizeof(pointer) > sizeof(uint32_t), we will have to do + * some redesign. */ union wdparm_u @@ -68,6 +67,7 @@ union wdparm_u FAR void *pvarg; FAR uint32_t *dwarg; }; + typedef union wdparm_u wdparm_t; /* This is the form of the function that is called when the |