Changeset 288 for branch/giet_vm_ioc_drivers/giet_xml/xml_parser.c

Timestamp:

Feb 3, 2014, 4:42:00 PM (11 years ago)

Author:

cfuguet

Message:

Introducing last changes of trunk into branch.

Location:

branch/giet_vm_ioc_drivers

Files:

• . (modified) (1 prop)
• giet_xml/xml_parser.c (modified) (5 diffs)

branch/giet_vm_ioc_drivers/giet_xml/xml_parser.c

@@ -115 +115 @@
 unsigned int dma_channels     = 0; // max number of DMA channels (per cluster)
 
-unsigned int icu_channels     = 0; // total number of IRQ per processor
+unsigned int icu_channels     = 0; // total number of channels  in ICU/XICU
 unsigned int tty_channels     = 0; // total number of terminals in TTY 
 unsigned int hba_channels     = 0; // total number of channels  in HBA
@@ -128 +128 @@
 unsigned int use_bdv          = 0; // using SoCLIB block device
 unsigned int use_spi          = 0; // using SD Card-SPI
-
 
 ////////////////////////////////////////////////////////////////
@@ -2093 +2092 @@
             }
 
+            // the number of ICU channels must be NB_PROCS * irq_per_proc
+            if (icu_channels != (header->irq_per_proc * proc_loc_index))
+            {
+                printf("[XML ERROR] illegal ICU number of channels. "
+                       "It must be equal to NB_PROCS * IRQ_PER_PROC\n");
+                exit(1);
+            }
+
 #if XML_PARSER_DEBUG
             printf("  end cluster set\n\n");
@@ -2323 +2330 @@
     {
         printf("[XML ERROR] illegal or missing <increment> attribute in mapping\n");
+        exit(1);
+    }
+
+    ///////// get increment attribute
+    value = getIntValue(reader, "irq_per_proc", &ok);
+    if (ok) 
+    {
+#if XML_PARSER_DEBUG
+        printf("  irq_per_proc = %d\n", value);
+#endif
+        header->irq_per_proc = value;
+    }
+    else 
+    {
+        printf("[XML ERROR] illegal or missing <irq_per_proc> attribute in mapping\n");
         exit(1);
     }
@@ -2598 +2620 @@
     file_write(fdout, "\n");
 
-    def_int_write(fdout, "IRQ_PER_PROCESSOR ", icu_channels);
+    def_int_write(fdout, "IRQ_PER_PROCESSOR ", header->irq_per_proc);
 
     file_write(fdout, epil);