Changeset 12f86efd in rtems for c/src/libchip/shmdr/init.c

Timestamp:

08/11/95 14:23:49 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

0e4c603

Parents:

0b8b971

Message:

minor clean up -- switched to memset for zero'ing SHM

File:

• c/src/libchip/shmdr/init.c (modified) (7 diffs)

c/src/libchip/shmdr/init.c

@@ -23 +23 @@
 
 #include <rtems.h>
-#include "shm.h"
+#include <shm.h>
+
+#include <string.h>    /* memset() */
 
 /*
- * Need a user extension control to install MPCI_Fatal as
- *  a fatal error handler extension
+ * User extension to install MPCI_Fatal as a fatal error
+ * handler extension
  */
-
+ 
 rtems_extensions_table MPCI_Shm_extensions;
 
@@ -39 +41 @@
 )
 {
-  rtems_unsigned32         i, *u32_ptr, *endshm, all_initialized;
+  rtems_unsigned32         i, all_initialized;
   rtems_unsigned32         interrupt_cause, interrupt_value;
   void                    *interrupt_address;
@@ -52 +54 @@
   Shm_Maximum_nodes = Shm_RTEMS_MP_Configuration->maximum_nodes;
 
-  Shm_Get_configuration( Shm_Local_node ,&Shm_Configuration );
+  Shm_Get_configuration( Shm_Local_node, &Shm_Configuration );
 
   Shm_Receive_message_count = 0;
@@ -62 +64 @@
    */
 
-#define PEND Shm_Convert(rtems_build_name( 'P', 'E', 'N', 'D' ))
-#define COMP Shm_Convert(rtems_build_name( 'C', 'O', 'M', 'P' ))
-#define ACTV Shm_Convert(rtems_build_name( 'A', 'C', 'T', 'V' ))
-
-  Shm_Pending_initialization  = PEND;
-  Shm_Initialization_complete = COMP;
-  Shm_Active_node             = ACTV;
+  Shm_Pending_initialization = 
+    Shm_Convert(rtems_build_name( 'P', 'E', 'N', 'D' ));
+  Shm_Initialization_complete = 
+    Shm_Convert(rtems_build_name( 'C', 'O', 'M', 'P' ));
+  Shm_Active_node = 
+    Shm_Convert(rtems_build_name( 'A', 'C', 'T', 'V' ));
 
   /*
@@ -129 +130 @@
      */
 
-    for ( u32_ptr = (rtems_unsigned32 *)Shm_Configuration->base,
-          endshm = (rtems_unsigned32 *)END_SHARED_MEM ;
-          u32_ptr < endshm ; )
-      *u32_ptr++ = 0;
+    (void) memset(
+      (void *) Shm_Configuration->base,
+      0,
+      Shm_Configuration->length
+    );
 
     /*
@@ -175 +177 @@
      */
 
-    all_initialized = 0;
-
-    for ( ; ; ) {
-
-      if ( all_initialized == 1 ) break;
-
+    do {
       all_initialized = 1;
 
@@ -186 +183 @@
         if ( Shm_Node_statuses[ i ].status != Shm_Initialization_complete )
           all_initialized = 0;
-    }
+
+    } while ( all_initialized == 0 );
 
     /*