diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-25 15:19:59 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-25 15:19:59 -0600 |
| commit | 1ffc15c3233c8d61953fc2ebc80b5d3c46fc429f (patch) | |
| tree | 95050f5e635b87d26f4dd98612b05edf632b2a96 /nuttx/include | |
| parent | 5f6e91b0ed1b373d0b4f963b0e0f8f7fe05ec766 (diff) | |
| download | px4-nuttx-1ffc15c3233c8d61953fc2ebc80b5d3c46fc429f.tar.gz px4-nuttx-1ffc15c3233c8d61953fc2ebc80b5d3c46fc429f.tar.bz2 px4-nuttx-1ffc15c3233c8d61953fc2ebc80b5d3c46fc429f.zip | |
Remove up_assert_code
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/assert.h | 15 | ||||
| -rw-r--r-- | nuttx/include/nuttx/arch.h | 5 | ||||
| -rw-r--r-- | nuttx/include/sys/syscall.h | 3 |
3 files changed, 6 insertions, 17 deletions
diff --git a/nuttx/include/assert.h b/nuttx/include/assert.h index f3e2854fc..29eb7a4b3 100644 --- a/nuttx/include/assert.h +++ b/nuttx/include/assert.h @@ -61,9 +61,6 @@ # define ASSERT(f) \ { if (!(f)) up_assert((const uint8_t *)__FILE__, (int)__LINE__); } -# define ASSERTCODE(f, code) \ - { if (!(f)) up_assert_code((const uint8_t *)__FILE__, (int)__LINE__, code); } - # define VERIFY(f) \ { if ((f) < 0) up_assert((const uint8_t *)__FILE__, (int)__LINE__); } @@ -77,16 +74,13 @@ # define DEBUGVERIFY(f) ((void)(f)) # endif /* CONFIG_DEBUG */ -# define PANIC(code) \ - up_assert_code((const uint8_t *)__FILE__, (int)__LINE__, (code)|0x8000) +# define PANIC() \ + up_assert((const uint8_t *)__FILE__, (int)__LINE__) #else # define ASSERT(f) \ { if (!(f)) up_assert(); } -# define ASSERTCODE(f, code) \ - { if (!(f)) up_assert_code(code); } - # define VERIFY(f) \ { if ((f) < 0) up_assert(); } @@ -101,7 +95,7 @@ # endif /* CONFIG_DEBUG */ # define PANIC(code) \ - up_assert_code((code)|0x8000) + up_assert() #endif @@ -131,11 +125,8 @@ extern "C" #ifdef CONFIG_HAVE_FILENAME void up_assert(FAR const uint8_t *filename, int linenum) noreturn_function; -void up_assert_code(FAR const uint8_t *filename, int linenum, int errcode) - noreturn_function; #else void up_assert(void) noreturn_function; -void up_assert_code(int errcode) noreturn_function; #endif #undef EXTERN diff --git a/nuttx/include/nuttx/arch.h b/nuttx/include/nuttx/arch.h index 0382c45ef..480b5fde5 100644 --- a/nuttx/include/nuttx/arch.h +++ b/nuttx/include/nuttx/arch.h @@ -400,11 +400,10 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority); /* Prototype is in unistd.h */ /**************************************************************************** - * Name: up_assert and up_assert_code + * Name: up_assert * * Description: - * Assertions may be handled in an architecture-specific - * way. + * Assertions may be handled in an architecture-specific way. * ****************************************************************************/ /* Prototype is in assert.h */ diff --git a/nuttx/include/sys/syscall.h b/nuttx/include/sys/syscall.h index 664cc1d79..f29dfadde 100644 --- a/nuttx/include/sys/syscall.h +++ b/nuttx/include/sys/syscall.h @@ -94,8 +94,7 @@ #define SYS_task_delete (CONFIG_SYS_RESERVED+22) #define SYS_task_restart (CONFIG_SYS_RESERVED+23) #define SYS_up_assert (CONFIG_SYS_RESERVED+24) -#define SYS_up_assert_code (CONFIG_SYS_RESERVED+25) -#define __SYS_vfork (CONFIG_SYS_RESERVED+26) +#define __SYS_vfork (CONFIG_SYS_RESERVED+25) /* The following can be individually enabled */ |