Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • soft/giet_vm/giet_python/mapping.py

    r400 r403  
    997997
    998998        # one and only one type of IOC controller
    999         assert ( use_hba or use_bdv or use_spi )
    1000         assert ( (use_hba and use_bdv) == False )
    1001         assert ( (use_hba and use_spi) == False )
    1002         assert ( (use_bdv and use_spi) == False )
     999        nb_iocs = 0
     1000        if use_hba         : nb_iocs += 1
     1001        if use_bdv         : nb_iocs += 1
     1002        if use_spi         : nb_iocs += 1
     1003        if self.use_ramdisk: nb_iocs += 1
     1004        assert ( nb_iocs == 1 )
    10031005               
    10041006        # Compute total number of processors
     
    11081110        s += '#define USE_IOC_SPI            %d\n'    % use_spi
    11091111        s += '#define USE_IOC_HBA            %d\n'    % use_hba
    1110         s += '\n'
    1111         s += '#define USE_RAMDISK            %d\n'    % self.use_ramdisk
     1112        s += '#define USE_IOC_RDK            %d\n'    % self.use_ramdisk
    11121113        s += '\n'
    11131114        s += '#define FBUF_X_SIZE            %d\n'    % fbf_arg
Note: See TracChangeset for help on using the changeset viewer.