Ignore:
Timestamp:
Apr 15, 2015, 4:02:09 PM (10 years ago)
Author:
cfuguet
Message:

Update arch.py scripts to support the new mapping.py version

  • In this new version, the addIrq() function takes as a supplementary argument the instance of the interrupt generating peripheral.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_leti/arch.py

    r967 r975  
    217217                                         arg0 = 16, arg1 = 16, arg2 = 16 )
    218218
    219                 mapping.addIrq( xcu, index = 8, isrtype = 'ISR_MMC' )
     219                mapping.addIrq( xcu, index = 8, src = mmc, isrtype = 'ISR_MMC' )
    220220
    221221                for p in xrange ( nb_procs ):
     
    244244                                         ptype = 'PIC', channels = 32 )
    245245
    246                 mapping.addIrq( pic, index = 0 , isrtype = 'ISR_NIC_RX', channel = 0 )
    247                 mapping.addIrq( pic, index = 1 , isrtype = 'ISR_NIC_RX', channel = 1 )
    248 
    249                 mapping.addIrq( pic, index = 2 , isrtype = 'ISR_NIC_TX', channel = 0 )
    250                 mapping.addIrq( pic, index = 3 , isrtype = 'ISR_NIC_TX', channel = 1 )
    251 
    252                 mapping.addIrq( pic, index = 4 , isrtype = 'ISR_CMA'   , channel = 0 )
    253                 mapping.addIrq( pic, index = 5 , isrtype = 'ISR_CMA'   , channel = 1 )
    254                 mapping.addIrq( pic, index = 6 , isrtype = 'ISR_CMA'   , channel = 2 )
    255                 mapping.addIrq( pic, index = 7 , isrtype = 'ISR_CMA'   , channel = 3 )
    256 
    257                 if ( ioc_type == 'BDV' ):
    258                     mapping.addIrq( pic, index = 8 , isrtype = 'ISR_BDV'   , channel = 0 )
    259                 if ( ioc_type == 'HBA' ):
    260                     mapping.addIrq( pic, index = 8 , isrtype = 'ISR_HBA'   , channel = 0 )
    261                 if ( ioc_type == 'SDC' ):
    262                     mapping.addIrq( pic, index = 8 , isrtype = 'ISR_SDC'   , channel = 0 )
    263 
    264                 mapping.addIrq( pic, index = 16, isrtype = 'ISR_TTY_RX', channel = 0 )
    265                 mapping.addIrq( pic, index = 17, isrtype = 'ISR_TTY_RX', channel = 1 )
    266                 mapping.addIrq( pic, index = 18, isrtype = 'ISR_TTY_RX', channel = 2 )
    267                 mapping.addIrq( pic, index = 19, isrtype = 'ISR_TTY_RX', channel = 3 )
    268                 mapping.addIrq( pic, index = 20, isrtype = 'ISR_TTY_RX', channel = 4 )
    269                 mapping.addIrq( pic, index = 21, isrtype = 'ISR_TTY_RX', channel = 5 )
    270                 mapping.addIrq( pic, index = 22, isrtype = 'ISR_TTY_RX', channel = 6 )
    271                 mapping.addIrq( pic, index = 23, isrtype = 'ISR_TTY_RX', channel = 7 )
     246                mapping.addIrq( pic, index = 0, src = nic,
     247                                isrtype = 'ISR_NIC_RX', channel = 0 )
     248                mapping.addIrq( pic, index = 1, src = nic,
     249                                isrtype = 'ISR_NIC_RX', channel = 1 )
     250                mapping.addIrq( pic, index = 2, src = nic,
     251                                isrtype = 'ISR_NIC_TX', channel = 0 )
     252                mapping.addIrq( pic, index = 3, src = nic,
     253                                isrtype = 'ISR_NIC_TX', channel = 1 )
     254                mapping.addIrq( pic, index = 4, src = cma,
     255                                isrtype = 'ISR_CMA', channel = 0 )
     256                mapping.addIrq( pic, index = 5, src = cma,
     257                                isrtype = 'ISR_CMA', channel = 1 )
     258                mapping.addIrq( pic, index = 6, src = cma,
     259                                isrtype = 'ISR_CMA', channel = 2 )
     260                mapping.addIrq( pic, index = 7, src = cma,
     261                                isrtype = 'ISR_CMA', channel = 3 )
     262
     263                if   ( ioc_type == 'BDV' ): isr_type = 'ISR_BDV'
     264                elif ( ioc_type == 'HBA' ): isr_type = 'ISR_HBA'
     265                elif ( ioc_type == 'SDC' ): isr_type = 'ISR_SDC'
     266
     267                if ( ioc_type != 'RDK' ):
     268                    mapping.addIrq( pic, index = 8, src = ioc,
     269                                    isrtype = isr_type, channel = 0 )
     270
     271                mapping.addIrq( pic, index = 16, src = tty,
     272                                isrtype = 'ISR_TTY_RX', channel = 0 )
     273                mapping.addIrq( pic, index = 17, src = tty,
     274                                isrtype = 'ISR_TTY_RX', channel = 1 )
     275                mapping.addIrq( pic, index = 18, src = tty,
     276                                isrtype = 'ISR_TTY_RX', channel = 2 )
     277                mapping.addIrq( pic, index = 19, src = tty,
     278                                isrtype = 'ISR_TTY_RX', channel = 3 )
     279                mapping.addIrq( pic, index = 20, src = tty,
     280                                isrtype = 'ISR_TTY_RX', channel = 4 )
     281                mapping.addIrq( pic, index = 21, src = tty,
     282                                isrtype = 'ISR_TTY_RX', channel = 5 )
     283                mapping.addIrq( pic, index = 22, src = tty,
     284                                isrtype = 'ISR_TTY_RX', channel = 6 )
     285                mapping.addIrq( pic, index = 23, src = tty,
     286                                isrtype = 'ISR_TTY_RX', channel = 7 )
    272287
    273288    ###################################
Note: See TracChangeset for help on using the changeset viewer.