fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 05:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'NuttX/master' from git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5027 7fd9a85b-ad96-42d3-883c-3090e2eb8679

Browse Source
This commit is contained in:
px4dev
2012-08-14 09:07:59 -07:00
parent 34118c72ef 3cc812dbad
commit 74980af6c9
45 changed files with 626 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/include/ctype.h
+1 -1
View File
@@ -72,7 +72,7 @@
*
****************************************************************************/
#define isascii(c) ((c) >= 0 && (c) <= 0x7f);
#define isascii(c) ((c) >= 0 && (c) <= 0x7f)
/****************************************************************************
* Name: isprint
nuttx/include/netinet/arp.h
+10 -7
View File
@@ -58,14 +58,17 @@
#define SIOCDARP _ARPIOC(2) /* Delete an ARP mapping */
#define SIOCGARP _ARPIOC(3) /* Get an ARP mapping */
/* Values for the FLAGS field in struct arpreq */
/* Definitions for bits in field arp_flags of struct arpreq. If the
* ATF_NETMASK flag is set, then arp_netmask should be valid. This should
* be set to 0xffffffff, or 0 to remove an existing arp entry.
*/
#define ATF_COM 0x01 /* Lookup complete */
#define ATF_PERM 0x02 /* Permanent entry */
#define ATF_PUBL 0x04 /* Publish entry */
#define ATF_USETRAILERS 0x10 /* Trailers requested */
#define ATF_NETMASK 0x20 /* Use a netmask */
#define ATF_DONTPUB 0x40 /* Don't answer */
#define ATF_COM (1 << 0) /* Lookup complete */
#define ATF_PERM (1 << 1) /* Permanent entry */
#define ATF_PUBL (1 << 2) /* Publish entry */
#define ATF_USETRAILERS (1 << 3) /* Trailers requested (obsolete) */
#define ATF_NETMASK (1 << 4) /* Use a netmask */
#define ATF_DONTPUB (1 << 5) /* Don't answer */
/****************************************************************************
* Public Type Definitions
nuttx/include/nuttx/net/ioctl.h
+1
View File
@@ -149,6 +149,7 @@
/****************************************************************************
* Type Definitions
****************************************************************************/
/* See include/net/if.h */
/****************************************************************************
* Public Function Prototypes
nuttx/include/sys/types.h
+6 -3
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* include/sys/types.h
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -63,8 +63,11 @@
/* NULL is usually defined in stddef.h (which includes this file) */
#ifndef NULL
/* SDCC is sensitive to NULL pointer type conversions */
# ifdef SDCC
/* SDCC is sensitive to NULL pointer type conversions, and C++ defines
* NULL as zero
*/
# if defined(SDCC) || defined(__cplusplus)
# define NULL (0)
# else
# define NULL ((void*)0)