Replace *_Get_interrupt_disable() with *_Get()

Uniformly use *_Get() to get an object by identifier with a lock
context.

5 files changed, 10 insertions, 13 deletions

diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c
index ed10c2bc35..3af8283518 100644
--- a/testsuites/smptests/smpmigration02/init.c
+++ b/testsuites/smptests/smpmigration02/init.c
@@ -121,7 +121,7 @@ static Thread_Control *get_thread_by_id(rtems_id task_id)
   ISR_lock_Context lock_context;
   Thread_Control *thread;
 
-  thread = _Thread_Get_interrupt_disable(task_id, &lock_context);
+  thread = _Thread_Get(task_id, &lock_context);
   rtems_test_assert(thread != NULL);
   _ISR_lock_ISR_enable(&lock_context);
 
diff --git a/testsuites/smptests/smpscheduler03/init.c b/testsuites/smptests/smpscheduler03/init.c
index 54735001e6..d6a145c3d5 100644
--- a/testsuites/smptests/smpscheduler03/init.c
+++ b/testsuites/smptests/smpscheduler03/init.c
@@ -103,7 +103,7 @@ static Thread_Control *get_thread_by_id(rtems_id task_id)
   ISR_lock_Context lock_context;
   Thread_Control *thread;
 
-  thread = _Thread_Get_interrupt_disable(task_id, &lock_context);
+  thread = _Thread_Get(task_id, &lock_context);
   rtems_test_assert(thread != NULL);
   _ISR_lock_ISR_enable(&lock_context);
 
diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c
index cbb23abc54..b5044d915f 100644
--- a/testsuites/sptests/spintrcritical22/init.c
+++ b/testsuites/sptests/spintrcritical22/init.c
@@ -36,7 +36,7 @@ static Semaphore_Control *get_semaphore_control(rtems_id id)
   ISR_lock_Context lock_context;
   Semaphore_Control *sem;
 
-  sem = _Semaphore_Get_interrupt_disable(id, &lock_context);
+  sem = _Semaphore_Get(id, &lock_context);
   rtems_test_assert(sem != NULL);
   _ISR_lock_ISR_enable(&lock_context);
 
diff --git a/testsuites/sptests/spintrcritical23/init.c b/testsuites/sptests/spintrcritical23/init.c
index 4857d99585..7b0078657b 100644
--- a/testsuites/sptests/spintrcritical23/init.c
+++ b/testsuites/sptests/spintrcritical23/init.c
@@ -45,7 +45,7 @@ static Thread_Control *get_tcb(rtems_id id)
   ISR_lock_Context lock_context;
   Thread_Control *tcb;
 
-  tcb = _Thread_Get_interrupt_disable(id, &lock_context);
+  tcb = _Thread_Get(id, &lock_context);
   rtems_test_assert(tcb != NULL);
   _ISR_lock_ISR_enable(&lock_context);
 
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 52348df247..da37eee73e 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -506,24 +506,21 @@ void complete_test( void )
 
   benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-      (void) _Thread_Get_interrupt_disable( task_id, &lock_context );
+      (void) _Thread_Get( task_id, &lock_context );
       _ISR_lock_ISR_enable( &lock_context );
     }
   thread_get_time = benchmark_timer_read();
 
   benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-      (void) _Semaphore_Get_interrupt_disable(
-        Semaphore_id,
-        &lock_context
-      );
+      (void) _Semaphore_Get( Semaphore_id, &lock_context );
       _ISR_lock_ISR_enable( &lock_context );
     }
   semaphore_get_time = benchmark_timer_read();
 
   benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-      (void) _Thread_Get_interrupt_disable( 0x3, &lock_context );
+      (void) _Thread_Get( 0x3, &lock_context );
       _ISR_lock_ISR_enable( &lock_context );
     }
   thread_get_invalid_time = benchmark_timer_read();
@@ -687,7 +684,7 @@ void complete_test( void )
   );
 
   put_time(
-    "rtems internal: _Thread_Get_interrupt_disable",
+    "rtems internal: _Thread_Get",
     thread_get_time,
     OPERATION_COUNT,
     0,
@@ -695,7 +692,7 @@ void complete_test( void )
   );
 
   put_time(
-    "rtems internal: _Semaphore_Get_interrupt_disable",
+    "rtems internal: _Semaphore_Get",
     semaphore_get_time,
     OPERATION_COUNT,
     0,
@@ -703,7 +700,7 @@ void complete_test( void )
   );
 
   put_time(
-    "rtems internal: _Thread_Get_interrupt_disable: invalid id",
+    "rtems internal: _Thread_Get: invalid id",
     thread_get_invalid_time,
     OPERATION_COUNT,
     0,