Changeset 403

Timestamp:

Sep 9, 2014, 3:02:13 PM (10 years ago)

Author:

cfuguet

Message:

mapping.py: bugfix

• Consider ramdisk in the IOC controller assertion: only one IOC must be instantiated

• Renaming USE_RAMDISK constant to USE_IOC_RDK which is the name used in giet_drivers/ioc_driver.[ch]

File:

• soft/giet_vm/giet_python/mapping.py (modified) (2 diffs)

soft/giet_vm/giet_python/mapping.py

@@ -997 +997 @@
 
         # one and only one type of IOC controller
-        assert ( use_hba or use_bdv or use_spi )
-        assert ( (use_hba and use_bdv) == False )
-        assert ( (use_hba and use_spi) == False )
-        assert ( (use_bdv and use_spi) == False )
+        nb_iocs = 0
+        if use_hba         : nb_iocs += 1
+        if use_bdv         : nb_iocs += 1
+        if use_spi         : nb_iocs += 1
+        if self.use_ramdisk: nb_iocs += 1
+        assert ( nb_iocs == 1 )
                 
         # Compute total number of processors
@@ -1108 +1110 @@
         s += '#define USE_IOC_SPI            %d\n'    % use_spi
         s += '#define USE_IOC_HBA            %d\n'    % use_hba
-        s += '\n'
-        s += '#define USE_RAMDISK            %d\n'    % self.use_ramdisk
+        s += '#define USE_IOC_RDK            %d\n'    % self.use_ramdisk
         s += '\n'
         s += '#define FBUF_X_SIZE            %d\n'    % fbf_arg