made initialization routine a regular subroutine

6 files changed, 0 insertions, 264 deletions

diff --git a/c/src/exec/score/inline/rtems/score/wkspace.inl b/c/src/exec/score/inline/rtems/score/wkspace.inl
index a2dabfe962..47174a9c9d 100644
--- a/c/src/exec/score/inline/rtems/score/wkspace.inl
+++ b/c/src/exec/score/inline/rtems/score/wkspace.inl
@@ -19,53 +19,6 @@
 
 /*PAGE
  *
- *  _Workspace_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-STATIC INLINE void _Workspace_Handler_initialization(
-  void       *starting_address,
-  unsigned32  size
-)
-{
-  unsigned32 *zero_out_array;
-  unsigned32  index;
-  unsigned32  memory_available;
-
-  if ( !starting_address || !_Addresses_Is_aligned( starting_address ) )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS
-    );
-
-  if ( _CPU_Table.do_zero_of_workspace ) {
-    for( zero_out_array  = (unsigned32 *) starting_address, index = 0 ;
-         index < size / 4 ;
-         index++ )
-      zero_out_array[ index ] = 0;
-  }
-
-  memory_available = _Heap_Initialize(
-    &_Workspace_Area,
-    starting_address,
-    size,
-    CPU_HEAP_ALIGNMENT
-  );
-
-  if ( memory_available == 0 )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_TOO_LITTLE_WORKSPACE
-    );
-}
-
-/*PAGE
- *
  *  _Workspace_Allocate
  *
  *  DESCRIPTION:
diff --git a/c/src/exec/score/inline/wkspace.inl b/c/src/exec/score/inline/wkspace.inl
index a2dabfe962..47174a9c9d 100644
--- a/c/src/exec/score/inline/wkspace.inl
+++ b/c/src/exec/score/inline/wkspace.inl
@@ -19,53 +19,6 @@
 
 /*PAGE
  *
- *  _Workspace_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-STATIC INLINE void _Workspace_Handler_initialization(
-  void       *starting_address,
-  unsigned32  size
-)
-{
-  unsigned32 *zero_out_array;
-  unsigned32  index;
-  unsigned32  memory_available;
-
-  if ( !starting_address || !_Addresses_Is_aligned( starting_address ) )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS
-    );
-
-  if ( _CPU_Table.do_zero_of_workspace ) {
-    for( zero_out_array  = (unsigned32 *) starting_address, index = 0 ;
-         index < size / 4 ;
-         index++ )
-      zero_out_array[ index ] = 0;
-  }
-
-  memory_available = _Heap_Initialize(
-    &_Workspace_Area,
-    starting_address,
-    size,
-    CPU_HEAP_ALIGNMENT
-  );
-
-  if ( memory_available == 0 )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_TOO_LITTLE_WORKSPACE
-    );
-}
-
-/*PAGE
- *
  *  _Workspace_Allocate
  *
  *  DESCRIPTION:
diff --git a/c/src/exec/score/macros/rtems/score/wkspace.inl b/c/src/exec/score/macros/rtems/score/wkspace.inl
index c6483656d8..5efe247fb1 100644
--- a/c/src/exec/score/macros/rtems/score/wkspace.inl
+++ b/c/src/exec/score/macros/rtems/score/wkspace.inl
@@ -19,47 +19,6 @@
 
 /*PAGE
  *
- *  _Workspace_Handler_initialization
- *
- */
-
-#define _Workspace_Handler_initialization( _starting_address, _size ) \
-{ \
-  unsigned32 *zero_out_array; \
-  unsigned32  index; \
-  unsigned32  memory_available; \
-  \
-  if ( !(_starting_address) || !_Addresses_Is_aligned( (_starting_address) ) ) \
-    _Internal_error_Occurred( \
-      INTERNAL_ERROR_CORE, \
-      TRUE, \
-      INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS \
-    ); \
-  \
-  if ( _CPU_Table.do_zero_of_workspace ) { \
-    for( zero_out_array  = (unsigned32 *) (_starting_address), index = 0 ; \
-         index < (_size) / 4 ; \
-         index++ ) \
-      zero_out_array[ index ] = 0; \
-  } \
-  \
-  memory_available =  _Heap_Initialize( \
-    &_Workspace_Area, \
-    (_starting_address), \
-    (_size), \
-    CPU_HEAP_ALIGNMENT \
-  ); \
-  \
-  if ( memory_available == 0 ) \
-    _Internal_error_Occurred( \
-      INTERNAL_ERROR_CORE, \
-      TRUE, \
-      INTERNAL_ERROR_TOO_LITTLE_WORKSPACE \
-    ); \
-}
-
-/*PAGE
- *
  *  _Workspace_Allocate
  *
  */
diff --git a/c/src/exec/score/macros/wkspace.inl b/c/src/exec/score/macros/wkspace.inl
index c6483656d8..5efe247fb1 100644
--- a/c/src/exec/score/macros/wkspace.inl
+++ b/c/src/exec/score/macros/wkspace.inl
@@ -19,47 +19,6 @@
 
 /*PAGE
  *
- *  _Workspace_Handler_initialization
- *
- */
-
-#define _Workspace_Handler_initialization( _starting_address, _size ) \
-{ \
-  unsigned32 *zero_out_array; \
-  unsigned32  index; \
-  unsigned32  memory_available; \
-  \
-  if ( !(_starting_address) || !_Addresses_Is_aligned( (_starting_address) ) ) \
-    _Internal_error_Occurred( \
-      INTERNAL_ERROR_CORE, \
-      TRUE, \
-      INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS \
-    ); \
-  \
-  if ( _CPU_Table.do_zero_of_workspace ) { \
-    for( zero_out_array  = (unsigned32 *) (_starting_address), index = 0 ; \
-         index < (_size) / 4 ; \
-         index++ ) \
-      zero_out_array[ index ] = 0; \
-  } \
-  \
-  memory_available =  _Heap_Initialize( \
-    &_Workspace_Area, \
-    (_starting_address), \
-    (_size), \
-    CPU_HEAP_ALIGNMENT \
-  ); \
-  \
-  if ( memory_available == 0 ) \
-    _Internal_error_Occurred( \
-      INTERNAL_ERROR_CORE, \
-      TRUE, \
-      INTERNAL_ERROR_TOO_LITTLE_WORKSPACE \
-    ); \
-}
-
-/*PAGE
- *
  *  _Workspace_Allocate
  *
  */
diff --git a/cpukit/score/inline/rtems/score/wkspace.inl b/cpukit/score/inline/rtems/score/wkspace.inl
index a2dabfe962..47174a9c9d 100644
--- a/cpukit/score/inline/rtems/score/wkspace.inl
+++ b/cpukit/score/inline/rtems/score/wkspace.inl
@@ -19,53 +19,6 @@
 
 /*PAGE
  *
- *  _Workspace_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-STATIC INLINE void _Workspace_Handler_initialization(
-  void       *starting_address,
-  unsigned32  size
-)
-{
-  unsigned32 *zero_out_array;
-  unsigned32  index;
-  unsigned32  memory_available;
-
-  if ( !starting_address || !_Addresses_Is_aligned( starting_address ) )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS
-    );
-
-  if ( _CPU_Table.do_zero_of_workspace ) {
-    for( zero_out_array  = (unsigned32 *) starting_address, index = 0 ;
-         index < size / 4 ;
-         index++ )
-      zero_out_array[ index ] = 0;
-  }
-
-  memory_available = _Heap_Initialize(
-    &_Workspace_Area,
-    starting_address,
-    size,
-    CPU_HEAP_ALIGNMENT
-  );
-
-  if ( memory_available == 0 )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_TOO_LITTLE_WORKSPACE
-    );
-}
-
-/*PAGE
- *
  *  _Workspace_Allocate
  *
  *  DESCRIPTION:
diff --git a/cpukit/score/macros/rtems/score/wkspace.inl b/cpukit/score/macros/rtems/score/wkspace.inl
index c6483656d8..5efe247fb1 100644
--- a/cpukit/score/macros/rtems/score/wkspace.inl
+++ b/cpukit/score/macros/rtems/score/wkspace.inl
@@ -19,47 +19,6 @@
 
 /*PAGE
  *
- *  _Workspace_Handler_initialization
- *
- */
-
-#define _Workspace_Handler_initialization( _starting_address, _size ) \
-{ \
-  unsigned32 *zero_out_array; \
-  unsigned32  index; \
-  unsigned32  memory_available; \
-  \
-  if ( !(_starting_address) || !_Addresses_Is_aligned( (_starting_address) ) ) \
-    _Internal_error_Occurred( \
-      INTERNAL_ERROR_CORE, \
-      TRUE, \
-      INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS \
-    ); \
-  \
-  if ( _CPU_Table.do_zero_of_workspace ) { \
-    for( zero_out_array  = (unsigned32 *) (_starting_address), index = 0 ; \
-         index < (_size) / 4 ; \
-         index++ ) \
-      zero_out_array[ index ] = 0; \
-  } \
-  \
-  memory_available =  _Heap_Initialize( \
-    &_Workspace_Area, \
-    (_starting_address), \
-    (_size), \
-    CPU_HEAP_ALIGNMENT \
-  ); \
-  \
-  if ( memory_available == 0 ) \
-    _Internal_error_Occurred( \
-      INTERNAL_ERROR_CORE, \
-      TRUE, \
-      INTERNAL_ERROR_TOO_LITTLE_WORKSPACE \
-    ); \
-}
-
-/*PAGE
- *
  *  _Workspace_Allocate
  *
  */