diff options
author | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
commit | 88389ea2554c6f56a4fdd86cdd86a1e7b6affc21 (patch) | |
tree | 3ef98ded43e5f3a2cdc30a836a3a7329fe5757bb /nuttx/mm/mm_environment.h | |
parent | 76346bfe19c816491a6982abfa10f48cd9d258f6 (diff) | |
parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
download | px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.gz px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.bz2 px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.zip |
Merge branch 'master' into new_state_machine
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
Diffstat (limited to 'nuttx/mm/mm_environment.h')
-rw-r--r-- | nuttx/mm/mm_environment.h | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/nuttx/mm/mm_environment.h b/nuttx/mm/mm_environment.h deleted file mode 100644 index d28fbf1d7..000000000 --- a/nuttx/mm/mm_environment.h +++ /dev/null @@ -1,131 +0,0 @@ -/**************************************************************************** - * mm/mm_environment.h - * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, 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 __MM_MM_ENVIRONMENT_H -#define __MM_MM_ENVIRONMENT_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -/* The platform configuratioin file will not be included when the memory - * manager is built for the host-based test harness. - */ - -#ifndef MM_TEST -# include <nuttx/config.h> -# include <nuttx/compiler.h> -# include <sys/types.h> -# include <stdlib.h> -# include <string.h> -# include <debug.h> -# include <errno.h> -# include <assert.h> -# include <nuttx/mm.h> -#else -# include <sys/types.h> -# include <string.h> -# include <assert.h> -#endif - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Special definitions used when the memory mnager is built for the host- - * based test harness. - */ - -#ifdef MM_TEST - -/* Fake NuttX dependencies */ - -# define FAR /* Normally in compiler.h */ -# define CONFIG_CPP_HAVE_VARARGS 1 /* Normally in compiler.h */ -# define CONFIG_MM_REGIONS 2 /* Normally in config.h */ -# undef CONFIG_MM_SMALL /* Normally in config.h */ -# define CONFIG_CAN_PASS_STRUCTS 1 /* Normally in config.h */ -# undef CONFIG_SMALL_MEMORY /* Normally in config.h */ - -extern void mm_addregion(FAR void *heapstart, size_t heapsize); - -/* Use the real system errno */ - -# define mm_errno errno - -/* When built for the test harness, we change the names of the exported - * functions so that they do not collide with the host libc names. - */ - -# define malloc mm_malloc -# define memalign mm_memalign -# define realloc mm_realloc -# define zalloc mm_zalloc -# define calloc mm_calloc -# define free mm_free - -/* Use normal libc assertion functions */ - -# undef ASSERT -# define ASSERT(e) assert(e) -# undef DEBUGASSERT -# define DEBUGASSERT(e) assert(e) - -/* Debug macros are always on */ - -# define CONFIG_DEBUG 1 - -# undef mdbg -# define mdbg(format, arg...) printf(format, ##arg) -# undef mvdg -# define mvdbg(format, arg...) printf(format, ##arg) -# undef mlldbg -# define mlldbg(format, arg...) printf(format, ##arg) -# undef mllvdg -# define mllvdbg(format, arg...) printf(format, ##arg) - -#else -# define mm_errno get_errno() -#endif - -/**************************************************************************** - * Public Types - ****************************************************************************/ - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -#endif /* __MM_MM_ENVIRONMENT_H */ |