RCG: Improve feedback from dolphin initialization.

src/fe/dolphin.c

@@ -91,36 +91,36 @@ init_dolphin( int modules )
                                   create_segment_callback,
                                   0,
                                   &segment[ ii ] );
-        // printk("DIS segment alloc status %d\n", err);
+        printk("DIS segment alloc status %d\n", err);
         if ( err )
             return -1;
 
         err = sci_set_local_segment_available( segment[ ii ], 0 );
-        // printk("DIS segment making available status %d\n", err);
+        printk("DIS segment making available status %d\n", err);
         if ( err )
         {
             sci_remove_segment( &segment[ ii ], 0 );
-            return -1;
+            return -2;
         }
 
         err = sci_export_segment( segment[ ii ], 0, DIS_BROADCAST );
-        // printk("DIS segment export status %d\n", err);
+        printk("DIS segment export status %d\n", err);
         if ( err )
         {
             sci_remove_segment( &segment[ ii ], 0 );
-            return -1;
+            return -3;
         }
 
         read_addr = sci_local_kernel_virtual_address( segment[ ii ] );
         if ( read_addr == 0 )
         {
-            // printk("DIS sci_local_kernel_virtual_address returned 0\n");
+            printk("DIS sci_local_kernel_virtual_address returned 0\n");
             sci_remove_segment( &segment[ ii ], 0 );
-            return -1;
+            return -4;
         }
         else
         {
-            // printk("Dolphin memory read at 0x%p\n", read_addr);
+            printk("Dolphin memory read at 0x%p\n", read_addr);
             cdsPciModules.dolphinRead[ ii ] =
                 (volatile unsigned long*)read_addr;
         }
@@ -136,14 +136,13 @@ init_dolphin( int modules )
                                    connect_callback,
                                    0,
                                    &remote_segment_handle[ ii ] );
-        // printk("DIS connect segment status %d\n", err);
+        printk("DIS connect segment status %d\n", err);
         if ( err )
         {
             sci_remove_segment( &segment[ ii ], 0 );
-            return -1;
+            return -5;
         }
 
-        // usleep(20000);
         udelay( MAX_UDELAY );
         udelay( MAX_UDELAY );
         err = sci_map_segment( remote_segment_handle[ ii ],
@@ -151,12 +150,12 @@ init_dolphin( int modules )
                                0,
                                IPC_TOTAL_ALLOC_SIZE,
                                &client_map_handle[ ii ] );
-        // printk("DIS segment mapping status %d\n", err);
+        printk("DIS segment mapping status %d\n", err);
         if ( err )
         {
             sci_disconnect_segment( &remote_segment_handle[ ii ], 0 );
             sci_remove_segment( &segment[ ii ], 0 );
-            return -1;
+            return -6;
         }
 
         addr = sci_kernel_virtual_address_of_mapping( client_map_handle[ ii ] );
@@ -166,11 +165,11 @@ init_dolphin( int modules )
             // sci_kernel_virtual_address_of_mapping\n");
             sci_disconnect_segment( &remote_segment_handle[ ii ], 0 );
             sci_remove_segment( &segment[ ii ], 0 );
-            return -1;
+            return -7;
         }
         else
         {
-            // printk ("Dolphin memory write at 0x%p\n", addr);
+            printk ("Dolphin memory write at 0x%p\n", addr);
             cdsPciModules.dolphinWrite[ ii ] = (volatile unsigned long*)addr;
         }
 

src/fe/moduleLoad.c

@@ -74,8 +74,8 @@ rt_fe_init( void )
     if ( status != 0 )
     {
         printk( "" SYSTEM_NAME_STRING_LOWER
-                ": ERROR: Dolphin Network initialization failed; ret = %d\n",
-                ret );
+                ": ERROR: Dolphin Network initialization failed; status = %d\n",
+                status );
         rt_fe_cleanup( );
         return -6;
     }