Changeset 288 for branch/giet_vm_ioc_drivers/giet_xml
- Timestamp:
- Feb 3, 2014, 4:42:00 PM (11 years ago)
- Location:
- branch/giet_vm_ioc_drivers
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branch/giet_vm_ioc_drivers
-
Property
svn:mergeinfo
set to
/soft/giet_vm merged eligible
-
Property
svn:mergeinfo
set to
-
branch/giet_vm_ioc_drivers/giet_xml/mapping_info.h
r286 r288 146 146 unsigned int vspaces; // number of virtual spaces 147 147 unsigned int increment; // vseg cluster increment for replicated periphs 148 unsigned int irq_per_proc; // number of IRQ per processor 148 149 149 150 unsigned int cma_cluster; // index of cluster containing CMA controler -
branch/giet_vm_ioc_drivers/giet_xml/xml_driver.c
r286 r288 45 45 "HARD", 46 46 "SOFT", 47 "TIME", 47 48 }; 48 49 … … 235 236 fprintf(fpout, "<?xml version = \"1.0\"?>\n\n"); 236 237 237 fprintf(fpout, "<mapping_info signature = \"0x%x\" \n", header->signature); 238 fprintf(fpout, " name = \"%s\" \n", header->name); 239 fprintf(fpout, " x_size = \"%d\" \n", header->x_size); 240 fprintf(fpout, " y_size = \"%d\" \n", header->y_size); 241 fprintf(fpout, " x_width = \"%d\" \n", header->x_width); 242 fprintf(fpout, " y_width = \"%d\" \n", header->y_width); 243 fprintf(fpout, " vspaces = \"%d\" \n", header->vspaces); 244 fprintf(fpout, " increment = \"%d\" >\n\n", header->vspaces); 238 fprintf(fpout, "<mapping_info signature = \"0x%x\" \n" , header->signature); 239 fprintf(fpout, " name = \"%s\" \n" , header->name); 240 fprintf(fpout, " x_size = \"%d\" \n" , header->x_size); 241 fprintf(fpout, " y_size = \"%d\" \n" , header->y_size); 242 fprintf(fpout, " x_width = \"%d\" \n" , header->x_width); 243 fprintf(fpout, " y_width = \"%d\" \n" , header->y_width); 244 fprintf(fpout, " vspaces = \"%d\" \n" , header->vspaces); 245 fprintf(fpout, " increment = \"%d\" \n" , header->vspaces); 246 fprintf(fpout, " irq_per_proc = \"%d\" >\n\n", header->irq_per_proc); 245 247 246 248 ///////////////////// clusters /////////////////////////////////////////////// -
branch/giet_vm_ioc_drivers/giet_xml/xml_parser.c
r286 r288 115 115 unsigned int dma_channels = 0; // max number of DMA channels (per cluster) 116 116 117 unsigned int icu_channels = 0; // total number of IRQ per processor117 unsigned int icu_channels = 0; // total number of channels in ICU/XICU 118 118 unsigned int tty_channels = 0; // total number of terminals in TTY 119 119 unsigned int hba_channels = 0; // total number of channels in HBA … … 128 128 unsigned int use_bdv = 0; // using SoCLIB block device 129 129 unsigned int use_spi = 0; // using SD Card-SPI 130 131 130 132 131 //////////////////////////////////////////////////////////////// … … 2093 2092 } 2094 2093 2094 // the number of ICU channels must be NB_PROCS * irq_per_proc 2095 if (icu_channels != (header->irq_per_proc * proc_loc_index)) 2096 { 2097 printf("[XML ERROR] illegal ICU number of channels. " 2098 "It must be equal to NB_PROCS * IRQ_PER_PROC\n"); 2099 exit(1); 2100 } 2101 2095 2102 #if XML_PARSER_DEBUG 2096 2103 printf(" end cluster set\n\n"); … … 2323 2330 { 2324 2331 printf("[XML ERROR] illegal or missing <increment> attribute in mapping\n"); 2332 exit(1); 2333 } 2334 2335 ///////// get increment attribute 2336 value = getIntValue(reader, "irq_per_proc", &ok); 2337 if (ok) 2338 { 2339 #if XML_PARSER_DEBUG 2340 printf(" irq_per_proc = %d\n", value); 2341 #endif 2342 header->irq_per_proc = value; 2343 } 2344 else 2345 { 2346 printf("[XML ERROR] illegal or missing <irq_per_proc> attribute in mapping\n"); 2325 2347 exit(1); 2326 2348 } … … 2598 2620 file_write(fdout, "\n"); 2599 2621 2600 def_int_write(fdout, "IRQ_PER_PROCESSOR ", icu_channels);2622 def_int_write(fdout, "IRQ_PER_PROCESSOR ", header->irq_per_proc); 2601 2623 2602 2624 file_write(fdout, epil);
Note: See TracChangeset
for help on using the changeset viewer.