score: Uncomment unused internal error codes

Update #2825.

3 files changed, 44 insertions, 38 deletions

diff --git a/cpukit/sapi/src/interrtext.c b/cpukit/sapi/src/interrtext.c
index 902493b4b5..860513bf93 100644
--- a/cpukit/sapi/src/interrtext.c
+++ b/cpukit/sapi/src/interrtext.c
@@ -44,10 +44,10 @@ static const char *const internal_error_text[] = {
   "INTERNAL_ERROR_BAD_STACK_HOOK",
   "INTERNAL_ERROR_BAD_ATTRIBUTES",
   "INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY",
-  "OBSOLETE_INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL",
-  "OBSOLETE_INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_FROM_BAD_STATE",
+  "INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL",
+  "INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_FROM_BAD_STATE",
   "INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0",
-  "OBSOLETE_INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP",
+  "INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP",
   "INTERNAL_ERROR_GXX_KEY_ADD_FAILED",
   "INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED",
   "INTERNAL_ERROR_NO_MEMORY_FOR_HEAP",
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h
index 33c000049a..6829216e60 100644
--- a/cpukit/score/include/rtems/score/interr.h
+++ b/cpukit/score/include/rtems/score/interr.h
@@ -133,41 +133,45 @@ typedef enum {
 } Internal_errors_Source;
 
 /**
- *  A list of errors which are generated internally by the executive core.
+ * @brief A list of errors which are generated internally by the executive
+ * core.
+ *
+ * Do not re-use numbers of obsolete error codes.  Uncomment no longer used
+ * error codes.
  */
 typedef enum {
-  INTERNAL_ERROR_NO_CONFIGURATION_TABLE,
-  INTERNAL_ERROR_NO_CPU_TABLE,
-  INTERNAL_ERROR_TOO_LITTLE_WORKSPACE,
-  INTERNAL_ERROR_WORKSPACE_ALLOCATION,
-  INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL,
-  INTERNAL_ERROR_THREAD_EXITTED,
-  INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION,
-  INTERNAL_ERROR_INVALID_NODE,
-  INTERNAL_ERROR_NO_MPCI,
-  INTERNAL_ERROR_BAD_PACKET,
-  INTERNAL_ERROR_OUT_OF_PACKETS,
-  INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS,
-  INTERNAL_ERROR_OUT_OF_PROXIES,
-  INTERNAL_ERROR_INVALID_GLOBAL_ID,
-  INTERNAL_ERROR_BAD_STACK_HOOK,
-  INTERNAL_ERROR_BAD_ATTRIBUTES,
-  INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY,
-  OBSOLETE_INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL,
-  OBSOLETE_INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_FROM_BAD_STATE,
-  INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0,
-  OBSOLETE_INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP,
-  INTERNAL_ERROR_GXX_KEY_ADD_FAILED,
-  INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED,
-  INTERNAL_ERROR_NO_MEMORY_FOR_HEAP,
-  INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR,
-  INTERNAL_ERROR_RESOURCE_IN_USE,
-  INTERNAL_ERROR_RTEMS_INIT_TASK_ENTRY_IS_NULL,
-  INTERNAL_ERROR_POSIX_INIT_THREAD_ENTRY_IS_NULL,
-  INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK,
-  INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_STICKY_FROM_BAD_STATE,
-  INTERNAL_ERROR_BAD_THREAD_DISPATCH_DISABLE_LEVEL,
-  INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT
+  /* INTERNAL_ERROR_NO_CONFIGURATION_TABLE = 0, */
+  /* INTERNAL_ERROR_NO_CPU_TABLE = 1, */
+  INTERNAL_ERROR_TOO_LITTLE_WORKSPACE = 2,
+  INTERNAL_ERROR_WORKSPACE_ALLOCATION = 3,
+  INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL = 4,
+  INTERNAL_ERROR_THREAD_EXITTED = 5,
+  INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION = 6,
+  INTERNAL_ERROR_INVALID_NODE = 7,
+  INTERNAL_ERROR_NO_MPCI = 8,
+  INTERNAL_ERROR_BAD_PACKET = 9,
+  INTERNAL_ERROR_OUT_OF_PACKETS = 10,
+  INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS = 11,
+  INTERNAL_ERROR_OUT_OF_PROXIES = 12,
+  INTERNAL_ERROR_INVALID_GLOBAL_ID = 13,
+  INTERNAL_ERROR_BAD_STACK_HOOK = 14,
+  /* INTERNAL_ERROR_BAD_ATTRIBUTES = 15, */
+  /* INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY = 16, */
+  /* INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL = 17, */
+  /* INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_FROM_BAD_STATE = 18, */
+  INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0 = 19,
+  /* INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP = 20, */
+  INTERNAL_ERROR_GXX_KEY_ADD_FAILED = 21,
+  INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED = 22,
+  INTERNAL_ERROR_NO_MEMORY_FOR_HEAP = 23,
+  INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR = 24,
+  INTERNAL_ERROR_RESOURCE_IN_USE = 25,
+  INTERNAL_ERROR_RTEMS_INIT_TASK_ENTRY_IS_NULL = 26,
+  INTERNAL_ERROR_POSIX_INIT_THREAD_ENTRY_IS_NULL = 27,
+  INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK = 28,
+  INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_STICKY_FROM_BAD_STATE = 29,
+  INTERNAL_ERROR_BAD_THREAD_DISPATCH_DISABLE_LEVEL = 30,
+  INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT = 31
 } Internal_errors_Core_list;
 
 typedef CPU_Uint32ptr Internal_errors_t;
diff --git a/testsuites/sptests/spinternalerror02/spinternalerror02.scn b/testsuites/sptests/spinternalerror02/spinternalerror02.scn
index 2be58f47c7..eaba954906 100644
--- a/testsuites/sptests/spinternalerror02/spinternalerror02.scn
+++ b/testsuites/sptests/spinternalerror02/spinternalerror02.scn
@@ -16,10 +16,10 @@ INTERNAL_ERROR_INVALID_GLOBAL_ID
 INTERNAL_ERROR_BAD_STACK_HOOK
 INTERNAL_ERROR_BAD_ATTRIBUTES
 INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY
-OBSOLETE_INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL
+INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL
 INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_FROM_BAD_STATE
 INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0
-OBSOLETE_INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP
+INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP
 INTERNAL_ERROR_GXX_KEY_ADD_FAILED
 INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED
 INTERNAL_ERROR_NO_MEMORY_FOR_HEAP
@@ -29,6 +29,8 @@ INTERNAL_ERROR_RTEMS_INIT_TASK_ENTRY_IS_NULL
 INTERNAL_ERROR_POSIX_INIT_THREAD_ENTRY_IS_NULL
 INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK
 INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_STICKY_FROM_BAD_STATE
+INTERNAL_ERROR_BAD_THREAD_DISPATCH_DISABLE_LEVEL
+INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT
 ?
 ?
 INTERNAL_ERROR_CORE