Changeset 564 for soft

Timestamp:

May 18, 2015, 6:48:02 PM (9 years ago)

Author:

alain

Message:

Cosmetic.

File:

• soft/giet_vm/giet_boot/boot.c (modified) (2 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -927 +927 @@
     unsigned int         slot;
     unsigned int         entry;
+    unsigned int         type;
+    unsigned int         channel;
 
     mapping_header_t*    header  = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
@@ -944 +946 @@
                 psched = _schedulers[cx][cy][lpid];
         
-                _printf("\n[BOOT] scheduler for proc[%d,%d,%d]\n",
+                _printf("\n[BOOT] interrupt vectors for proc[%d,%d,%d]\n",
                         cx , cy , lpid );
 
                 for ( slot = 0 ; slot < 32 ; slot++ )
                 {
-                    entry = psched->hwi_vector[slot];
-                    if ( (entry & 0xFFFF) != 0 )      
-                    _printf(" - HWI %d / isrtype = %d / channel = %d\n",
-                            slot , (entry & 0xFFFF) , ((entry >> 16) & 0x7FFF) );
+                    entry   = psched->hwi_vector[slot];
+                    type    = entry & 0xFFFF;
+                    channel = entry >> 16;
+                    if ( type != ISR_DEFAULT )      
+                    _printf(" - HWI : index = %d / type = %s / channel = %d\n",
+                            slot , _isr_type_str[type] , channel );
                 }
                 for ( slot = 0 ; slot < 32 ; slot++ )
                 {
-                    entry = psched->wti_vector[slot];
-                    if ( (entry & 0xFFFF) != 0 )      
-                    _printf(" - WTI %d / isrtype = %d / channel = %d\n",
-                            slot , (entry & 0xFFFF) , ((entry >> 16) & 0x7FFF) );
+                    entry   = psched->wti_vector[slot];
+                    type    = entry & 0xFFFF;
+                    channel = entry >> 16;
+                    if ( type != ISR_DEFAULT )      
+                    _printf(" - WTI : index = %d / type = %s / channel = %d\n",
+                            slot , _isr_type_str[type] , channel );
                 }
                 for ( slot = 0 ; slot < 32 ; slot++ )
                 {
-                    entry = psched->pti_vector[slot];
-                    if ( (entry & 0xFFFF) != 0 )      
-                    _printf(" - PTI %d / isrtype = %d / channel = %d\n",
-                            slot , (entry & 0xFFFF) , ((entry >> 16) & 0x7FFF) );
+                    entry   = psched->pti_vector[slot];
+                    type    = entry & 0xFFFF;
+                    channel = entry >> 16;
+                    if ( type != ISR_DEFAULT )      
+                    _printf(" - PTI : index = %d / type = %s / channel = %d\n",
+                            slot , _isr_type_str[type] , channel );
                 }
             }