Remove up_assert_code

ChangeLog

@@ -4623,3 +4623,8 @@
 	  KL architecture directory as need to get the interrupt-driven
 	  serial driver to work.  The Freedom KL25Z NSH configuration now
 	  works (2014-4-25).
+	* include/nuttx/assert.h, arch/*/src/*/up_assert.c, and other file:
+	  Remove up_assert_code().  While asserting with an encoded value
+	  could be a good feature, the codes have not be well utilized nor
+	  documented.  Give that situation it is better to remove the API
+	  and reduce the footprint a little (2014-4-25).

Documentation/NuttxPortingGuide.html

@@ -1910,13 +1910,11 @@ The system can be re-made subsequently by just typing <code>make</code>.
 
 <h3><a name="upassert">4.1.13 <code>up_assert()</code></a></h3>
 <p><b>Prototype</b>:<br>
-  <code>void up_assert(FAR const uint8_t *filename, int linenum);</code></br>
+  <code>void up_assert(FAR const uint8_t *filename, int linenum);</code>
-  <code>void up_assert_code(FAR const uint8_t *filename, int linenum, int error_code);</code></br>
 </p>
 
 <p><b>Description</b>.
-  Assertions may be handled in an architecture-specific
+  Assertions may be handled in an architecture-specific way.
-  way.
 </p>
 
 <h3><a name="upschedulesigaction">4.1.14 <code>up_schedule_sigaction()</code></a></h3>

arch/8051/src/up_assert.c

@@ -1,7 +1,7 @@
 /************************************************************************
  * up_assert.c
  *
- *   Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,27 +116,3 @@ void up_assert(const uint8_t *filename, int lineno)
   up_dumpstack();
   _up_assert(EXIT_FAILURE);
 }
-
-/************************************************************************
- * Name: up_assert_code
- ************************************************************************/
-
-void up_assert_code(const uint8_t *filename, int lineno, int errorcode)
-{
-#if CONFIG_TASK_NAME_SIZE > 0
-  struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
-#endif
-
-  up_ledon(LED_ASSERTION);
-
-#if CONFIG_TASK_NAME_SIZE > 0
-  lldbg("Assertion failed at file:%s line: %d task: %s error code: %d\n",
-        filename, lineno, rtcb->name, errorcode);
-#else
-  lldbg("Assertion failed at file:%s line: %d error code: %d\n",
-        filename, lineno, errorcode);
-#endif
-
-  up_dumpstack();
- _up_assert(errorcode);
-}

arch/8051/src/up_blocktask.c

@@ -84,19 +84,15 @@
  ************************************************************************/
 
 void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
-{
-  /* Verify that the context switch can be performed */
-
-  if ((tcb->task_state < FIRST_READY_TO_RUN_STATE) ||
-      (tcb->task_state > LAST_READY_TO_RUN_STATE))
-    {
-      PANIC(OSERR_BADBLOCKSTATE);
-    }
-  else
 {
   FAR struct tcb_s *rtcb = (FAR struct tcb_s*)g_readytorun.head;
   bool switch_needed;
 
+  /* Verify that the context switch can be performed */
+
+  ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
+         (tcb->task_state <= LAST_READY_TO_RUN_STATE));
+
   dbg("Blocking TCB=%p\n", tcb);
 
   /* Remove the tcb task from the ready-to-run list.  If we
@@ -169,4 +165,3 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
         }
     }
 }
-}

arch/8051/src/up_reprioritizertr.c

@@ -99,7 +99,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC(OSERR_BADREPRIORITIZESTATE);
+       PANIC();
     }
   else
     {

arch/8051/src/up_unblocktask.c

@@ -1,7 +1,7 @@
 /************************************************************************
  * up_unblocktask.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,16 +82,12 @@
 
 void up_unblock_task(FAR struct tcb_s *tcb)
 {
+  FAR struct tcb_s *rtcb = (FAR struct tcb_s*)g_readytorun.head;
+
   /* Verify that the context switch can be performed */
 
-  if ((tcb->task_state < FIRST_BLOCKED_STATE) ||
+  ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
-      (tcb->task_state > LAST_BLOCKED_STATE))
+         (tcb->task_state <= LAST_BLOCKED_STATE));
-    {
-      PANIC(OSERR_BADUNBLOCKSTATE);
-    }
-  else
-    {
-      FAR struct tcb_s *rtcb = (FAR struct tcb_s*)g_readytorun.head;
 
   dbg("Unblocking TCB=%p\n", tcb);
 
@@ -163,4 +159,3 @@ void up_unblock_task(FAR struct tcb_s *tcb)
         }
     }
 }
-}

arch/arm/src/arm/up_assert.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_assert.c
  *
- *   Copyright (C) 2007-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -291,6 +291,7 @@ void up_assert(const uint8_t *filename, int lineno)
 #endif
 
   up_ledon(LED_ASSERTION);
+
 #ifdef CONFIG_PRINT_TASKNAME
   lldbg("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
@@ -301,26 +302,3 @@ void up_assert(const uint8_t *filename, int lineno)
   up_dumpstate();
   _up_assert(EXIT_FAILURE);
 }
-
-/****************************************************************************
- * Name: up_assert_code
- ****************************************************************************/
-
-void up_assert_code(const uint8_t *filename, int lineno, int errorcode)
-{
-#ifdef CONFIG_PRINT_TASKNAME
-  struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
-#endif
-
-  up_ledon(LED_ASSERTION);
-
-#ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s error code: %d\n",
-        filename, lineno, rtcb->name, errorcode);
-#else
-  lldbg("Assertion failed at file:%s line: %d error code: %d\n",
-        filename, lineno, errorcode);
-#endif
-  up_dumpstate();
-  _up_assert(errorcode);
-}

arch/arm/src/arm/up_blocktask.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_blocktask.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,19 +85,15 @@
  ****************************************************************************/
 
 void up_block_task(struct tcb_s *tcb, tstate_t task_state)
-{
-  /* Verify that the context switch can be performed */
-
-  if ((tcb->task_state < FIRST_READY_TO_RUN_STATE) ||
-      (tcb->task_state > LAST_READY_TO_RUN_STATE))
-    {
-      PANIC(OSERR_BADBLOCKSTATE);
-    }
-  else
 {
   struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
   bool switch_needed;
 
+  /* Verify that the context switch can be performed */
+
+  ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
+         (tcb->task_state <= LAST_READY_TO_RUN_STATE));
+
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
    * most likely case), then a context switch to the next
@@ -164,4 +160,3 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
         }
     }
 }
-}

arch/arm/src/arm/up_dataabort.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_dataabort.c
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -179,7 +179,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
 segfault:
 #endif
   lldbg("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr);
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 }
 
 #else /* CONFIG_PAGING */
@@ -195,7 +195,7 @@ void up_dataabort(uint32_t *regs)
   /* Crash -- possibly showing diagnost debug information. */
 
   lldbg("Data abort. PC: %08x\n", regs[REG_PC]);
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 }
 
 #endif /* CONFIG_PAGING */

arch/arm/src/arm/up_doirq.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_doirq.c
  *
- *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@ void up_doirq(int irq, uint32_t *regs)
 {
   up_ledon(LED_INIRQ);
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
   uint32_t *savestate;
 

arch/arm/src/arm/up_prefetchabort.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/src/up_prefetchabort.c
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -149,6 +149,6 @@ void up_prefetchabort(uint32_t *regs)
 #endif
     {
       lldbg("Prefetch abort. PC: %08x\n", regs[REG_PC]);
-      PANIC(OSERR_ERREXCEPTION);
+      PANIC();
     }
 }

arch/arm/src/arm/up_reprioritizertr.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/arm/up_reprioritizertr.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -98,7 +98,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC(OSERR_BADREPRIORITIZESTATE);
+       PANIC();
     }
   else
     {

arch/arm/src/arm/up_syscall.c

@@ -92,5 +92,5 @@ void up_syscall(uint32_t *regs)
 {
   lldbg("Syscall from 0x%x\n", regs[REG_PC]);
   current_regs = regs;
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 }

arch/arm/src/arm/up_unblocktask.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/arm/up_unblocktask.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,16 +81,12 @@
 
 void up_unblock_task(struct tcb_s *tcb)
 {
+  struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
+
   /* Verify that the context switch can be performed */
 
-  if ((tcb->task_state < FIRST_BLOCKED_STATE) ||
+  ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
-      (tcb->task_state > LAST_BLOCKED_STATE))
+         (tcb->task_state <= LAST_BLOCKED_STATE));
-    {
-      PANIC(OSERR_BADUNBLOCKSTATE);
-    }
-  else
-    {
-      struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
 
   /* Remove the task from the blocked task list */
 
@@ -156,4 +152,3 @@ void up_unblock_task(struct tcb_s *tcb)
         }
     }
 }
-}

arch/arm/src/arm/up_undefinedinsn.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_undefinedinsn.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,5 +77,5 @@ void up_undefinedinsn(uint32_t *regs)
 {
   lldbg("Undefined instruction at 0x%x\n", regs[REG_PC]);
   current_regs = regs;
-  PANIC(OSERR_UNDEFINEDINSN);
+  PANIC();
 }

arch/arm/src/armv6-m/up_assert.c

@@ -307,6 +307,7 @@ void up_assert(const uint8_t *filename, int lineno)
 #endif
 
   up_ledon(LED_ASSERTION);
+
 #ifdef CONFIG_PRINT_TASKNAME
   lldbg("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
@@ -314,28 +315,7 @@ void up_assert(const uint8_t *filename, int lineno)
   lldbg("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
+
   up_dumpstate();
   _up_assert(EXIT_FAILURE);
 }
-
-/****************************************************************************
- * Name: up_assert_code
- ****************************************************************************/
-
-void up_assert_code(const uint8_t *filename, int lineno, int errorcode)
-{
-#ifdef CONFIG_PRINT_TASKNAME
-  struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
-#endif
-
-  up_ledon(LED_ASSERTION);
-#ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s error code: %d\n",
-        filename, lineno, rtcb->name, errorcode);
-#else
-  lldbg("Assertion failed at file:%s line: %d error code: %d\n",
-        filename, lineno, errorcode);
-#endif
-  up_dumpstate();
-  _up_assert(errorcode);
-}

arch/arm/src/armv6-m/up_blocktask.c

@@ -84,19 +84,15 @@
  ****************************************************************************/
 
 void up_block_task(struct tcb_s *tcb, tstate_t task_state)
-{
-  /* Verify that the context switch can be performed */
-
-  if ((tcb->task_state < FIRST_READY_TO_RUN_STATE) ||
-      (tcb->task_state > LAST_READY_TO_RUN_STATE))
-    {
-      PANIC(OSERR_BADBLOCKSTATE);
-    }
-  else
 {
   struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
   bool switch_needed;
 
+  /* Verify that the context switch can be performed */
+
+  ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
+         (tcb->task_state <= LAST_READY_TO_RUN_STATE));
+
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
    * most likely case), then a context switch to the next
@@ -163,4 +159,3 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
         }
     }
 }
-}

arch/arm/src/armv6-m/up_doirq.c

@@ -74,7 +74,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
 {
   up_ledon(LED_INIRQ);
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
   uint32_t *savestate;
 

arch/arm/src/armv6-m/up_hardfault.c

@@ -151,6 +151,6 @@ int up_hardfault(int irq, FAR void *context)
 
   (void)irqsave();
   lldbg("PANIC!!! Hard fault\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
-  return OK;
+  return OK; /* Won't get here */
 }

arch/arm/src/armv6-m/up_reprioritizertr.c

@@ -98,7 +98,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC(OSERR_BADREPRIORITIZESTATE);
+       PANIC();
     }
   else
     {

arch/arm/src/armv6-m/up_unblocktask.c

@@ -80,16 +80,12 @@
 
 void up_unblock_task(struct tcb_s *tcb)
 {
+  struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
+
   /* Verify that the context switch can be performed */
 
-  if ((tcb->task_state < FIRST_BLOCKED_STATE) ||
+  ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
-      (tcb->task_state > LAST_BLOCKED_STATE))
+         (tcb->task_state <= LAST_BLOCKED_STATE));
-    {
-      PANIC(OSERR_BADUNBLOCKSTATE);
-    }
-  else
-    {
-      struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
 
   /* Remove the task from the blocked task list */
 
@@ -153,4 +149,3 @@ void up_unblock_task(struct tcb_s *tcb)
         }
     }
 }
-}

arch/arm/src/armv7-m/up_assert.c

@@ -318,6 +318,7 @@ void up_assert(const uint8_t *filename, int lineno)
 #endif
 
   up_ledon(LED_ASSERTION);
+
 #ifdef CONFIG_PRINT_TASKNAME
   lldbg("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
@@ -325,28 +326,7 @@ void up_assert(const uint8_t *filename, int lineno)
   lldbg("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
+
   up_dumpstate();
   _up_assert(EXIT_FAILURE);
 }
-
-/****************************************************************************
- * Name: up_assert_code
- ****************************************************************************/
-
-void up_assert_code(const uint8_t *filename, int lineno, int errorcode)
-{
-#ifdef CONFIG_PRINT_TASKNAME
-  struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
-#endif
-
-  up_ledon(LED_ASSERTION);
-#ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s error code: %d\n",
-        filename, lineno, rtcb->name, errorcode);
-#else
-  lldbg("Assertion failed at file:%s line: %d error code: %d\n",
-        filename, lineno, errorcode);
-#endif
-  up_dumpstate();
-  _up_assert(errorcode);
-}

arch/arm/src/armv7-m/up_blocktask.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-m/up_blocktask.c
  *
- *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,19 +85,15 @@
  ****************************************************************************/
 
 void up_block_task(struct tcb_s *tcb, tstate_t task_state)
-{
-  /* Verify that the context switch can be performed */
-
-  if ((tcb->task_state < FIRST_READY_TO_RUN_STATE) ||
-      (tcb->task_state > LAST_READY_TO_RUN_STATE))
-    {
-      PANIC(OSERR_BADBLOCKSTATE);
-    }
-  else
 {
   struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
   bool switch_needed;
 
+  /* Verify that the context switch can be performed */
+
+  ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
+         (tcb->task_state <= LAST_READY_TO_RUN_STATE));
+
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
    * most likely case), then a context switch to the next
@@ -164,4 +160,3 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
         }
     }
 }
-}

arch/arm/src/armv7-m/up_doirq.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-m/up_doirq.c
  *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
 {
   up_ledon(LED_INIRQ);
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
   uint32_t *savestate;
 

arch/arm/src/armv7-m/up_hardfault.c

@@ -181,6 +181,6 @@ int up_hardfault(int irq, FAR void *context)
 
   (void)irqsave();
   lldbg("PANIC!!! Hard fault: %08x\n", getreg32(NVIC_HFAULTS));
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return OK;
 }

arch/arm/src/armv7-m/up_memfault.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-m/up_memfault.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -126,6 +126,6 @@ int up_memfault(int irq, FAR void *context)
 #  endif
 #endif
 
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
-  return OK;
+  return OK; /* Won't get here */
 }

arch/arm/src/armv7-m/up_reprioritizertr.c

@@ -98,7 +98,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC(OSERR_BADREPRIORITIZESTATE);
+       PANIC();
     }
   else
     {

arch/arm/src/armv7-m/up_unblocktask.c

@@ -81,16 +81,12 @@
 
 void up_unblock_task(struct tcb_s *tcb)
 {
+  struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
+
   /* Verify that the context switch can be performed */
 
-  if ((tcb->task_state < FIRST_BLOCKED_STATE) ||
+  ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
-      (tcb->task_state > LAST_BLOCKED_STATE))
+         (tcb->task_state <= LAST_BLOCKED_STATE));
-    {
-      PANIC(OSERR_BADUNBLOCKSTATE);
-    }
-  else
-    {
-      struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
 
   /* Remove the task from the blocked task list */
 
@@ -154,4 +150,3 @@ void up_unblock_task(struct tcb_s *tcb)
         }
     }
 }
-}

arch/arm/src/c5471/c5471_serial.c

@@ -547,7 +547,7 @@ static int up_interrupt(int irq, void *context)
     }
   else
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
 

arch/arm/src/calypso/calypso_serial.c

@@ -607,7 +607,7 @@ static int up_interrupt(int irq, void *context)
     }
   else
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
 

arch/arm/src/dm320/dm320_decodeirq.c

@@ -76,7 +76,7 @@ void up_decodeirq(uint32_t* regs)
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
   lowsyslog("Unexpected IRQ\n");
   current_regs = regs;
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
   /* Decode the interrupt.  First, fetch the interrupt id register. */
 

arch/arm/src/dm320/dm320_serial.c

@@ -485,7 +485,7 @@ static int up_interrupt(int irq, void *context)
     }
   else
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
 

arch/arm/src/imx/imx_decodeirq.c

@@ -76,7 +76,7 @@ void up_decodeirq(uint32_t* regs)
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
   lowsyslog("Unexpected IRQ\n");
   current_regs = regs;
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
   uint32_t* savestate;
   uint32_t regval;

arch/arm/src/imx/imx_serial.c

@@ -799,7 +799,7 @@ static inline struct uart_dev_s *up_mapirq(int irq)
 #endif
 
       default:
-        PANIC(OSERR_INTERNAL);
+        PANIC();
         break;
     }
   return dev;

arch/arm/src/kinetis/kinetis_irq.c

@@ -164,7 +164,7 @@ static int kinetis_nmi(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! NMI received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -172,7 +172,7 @@ static int kinetis_busfault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Bus fault recived\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -180,7 +180,7 @@ static int kinetis_usagefault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Usage fault received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -188,7 +188,7 @@ static int kinetis_pendsv(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! PendSV received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -196,7 +196,7 @@ static int kinetis_dbgmonitor(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Debug Monitor receieved\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -204,7 +204,7 @@ static int kinetis_reserved(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Reserved interrupt\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 #endif

arch/arm/src/kinetis/kinetis_serial.c

@@ -782,7 +782,7 @@ static int up_interrupte(int irq, void *context)
   else
 #endif
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
   DEBUGASSERT(priv);
@@ -871,7 +871,7 @@ static int up_interrupts(int irq, void *context)
   else
 #endif
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
   DEBUGASSERT(priv);

arch/arm/src/kl/kl_irq.c

@@ -138,7 +138,7 @@ static int kl_nmi(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! NMI received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -146,7 +146,7 @@ static int kl_pendsv(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! PendSV received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -154,7 +154,7 @@ static int kl_reserved(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Reserved interrupt\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 #endif

arch/arm/src/kl/kl_serial.c

@@ -528,7 +528,7 @@ static int up_interrupts(int irq, void *context)
   else
 #endif
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
   DEBUGASSERT(priv);

arch/arm/src/lm/lm_irq.c

@@ -146,7 +146,7 @@ static int lm_nmi(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! NMI received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -154,7 +154,7 @@ static int lm_busfault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Bus fault recived\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -162,7 +162,7 @@ static int lm_usagefault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Usage fault received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -170,7 +170,7 @@ static int lm_pendsv(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! PendSV received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -178,7 +178,7 @@ static int lm_dbgmonitor(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Debug Monitor receieved\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -186,7 +186,7 @@ static int lm_reserved(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Reserved interrupt\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 #endif

arch/arm/src/lm/lm_serial.c

@@ -962,7 +962,7 @@ static int up_interrupt(int irq, void *context)
   else
 #endif
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
 

arch/arm/src/lpc17xx/lpc17_i2c.c

@@ -364,7 +364,7 @@ static int i2c_interrupt(int irq, FAR void *context)
   else
 #endif
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
 
 /* Reference UM10360 19.10.5 */    

arch/arm/src/lpc17xx/lpc17_irq.c

@@ -145,7 +145,7 @@ static int lpc17_nmi(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! NMI received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -153,7 +153,7 @@ static int lpc17_busfault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Bus fault recived\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -161,7 +161,7 @@ static int lpc17_usagefault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Usage fault received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -169,7 +169,7 @@ static int lpc17_pendsv(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! PendSV received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -177,7 +177,7 @@ static int lpc17_dbgmonitor(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Debug Monitor receieved\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -185,7 +185,7 @@ static int lpc17_reserved(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Reserved interrupt\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 #endif

arch/arm/src/lpc17xx/lpc17_serial.c

@@ -1068,7 +1068,7 @@ static int up_interrupt(int irq, void *context)
   else
 #endif
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
 

arch/arm/src/lpc214x/lpc214x_decodeirq.c

@@ -114,7 +114,7 @@ static void lpc214x_decodeirq( uint32_t *regs)
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
   lowsyslog("Unexpected IRQ\n");
   current_regs = regs;
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
 
   /* Decode the interrupt. We have to do this by search for the lowest numbered

arch/arm/src/lpc214x/lpc214x_serial.c

@@ -468,7 +468,7 @@ static int up_interrupt(int irq, void *context)
     }
   else
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s*)dev->priv;
 

arch/arm/src/lpc2378/lpc23xx_decodeirq.c

@@ -113,7 +113,7 @@ static void lpc23xx_decodeirq(uint32_t *regs)
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
   lowsyslog("Unexpected IRQ\n");
   current_regs = regs;
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
 
   /* Check which IRQ fires */

arch/arm/src/lpc2378/lpc23xx_serial.c

@@ -598,7 +598,7 @@ static int up_interrupt(int irq, void *context)
     }
   else
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
   priv = (struct up_dev_s *)dev->priv;
 

arch/arm/src/lpc31xx/lpc31_decodeirq.c

@@ -79,7 +79,7 @@ void up_decodeirq(uint32_t *regs)
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
   lowsyslog("Unexpected IRQ\n");
   current_regs = regs;
-  PANIC(OSERR_ERREXCEPTION);
+  PANIC();
 #else
   int index;
   int irq;

arch/arm/src/lpc43xx/lpc43_i2c.c

@@ -370,7 +370,7 @@ static int i2c_interrupt(int irq, FAR void *context)
     else
 #endif
     {
-      PANIC(OSERR_INTERNAL);
+      PANIC();
     }
 
   /* Reference UM10360 19.10.5 */

arch/arm/src/lpc43xx/lpc43_irq.c

@@ -147,7 +147,7 @@ static int lpc43_nmi(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! NMI received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -155,7 +155,7 @@ static int lpc43_busfault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Bus fault recived\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -163,7 +163,7 @@ static int lpc43_usagefault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Usage fault received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -171,7 +171,7 @@ static int lpc43_pendsv(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! PendSV received\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -179,7 +179,7 @@ static int lpc43_dbgmonitor(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Debug Monitor receieved\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 
@@ -187,7 +187,7 @@ static int lpc43_reserved(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Reserved interrupt\n");
-  PANIC(OSERR_UNEXPECTEDISR);
+  PANIC();
   return 0;
 }
 #endif