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_mwmr/arch.py

    r956 r975  
    5757          nb_procs  = 2,
    5858          nb_ttys   = 1,
    59           fbf_width = 128 ):
     59          fbf_width = 128,
     60          ioc_type  = 'BDV' ):
    6061
    6162    ### define architecture constants
     
    219220                                     arg0 = 32, arg1 = 32, arg2 = 32, arg3 = 16 )
    220221
    221             mapping.addIrq( xcu, index = 0, isrtype = 'ISR_MMC' )
    222             mapping.addIrq( xcu, index = 1, isrtype = 'ISR_MWR' , channel = 2 )
     222            mapping.addIrq( xcu, index = 0, src = mmc,
     223                            isrtype = 'ISR_MMC' )
     224            mapping.addIrq( xcu, index = 1, src = mwr,
     225                            isrtype = 'ISR_MWR' , channel = 2 )
    223226
    224227            for p in xrange ( nb_procs ):
     
    252255                                         ptype = 'PIC', channels = 32 )
    253256
    254                 mapping.addIrq( pic, index = 0,  isrtype = 'ISR_NIC_RX', channel = 0 )
    255                 mapping.addIrq( pic, index = 1,  isrtype = 'ISR_NIC_RX', channel = 1 )
    256 
    257                 mapping.addIrq( pic, index = 2,  isrtype = 'ISR_NIC_TX', channel = 0 )
    258                 mapping.addIrq( pic, index = 3,  isrtype = 'ISR_NIC_TX', channel = 1 )
    259 
    260                 mapping.addIrq( pic, index = 4,  isrtype = 'ISR_CMA'   , channel = 0 )
    261                 mapping.addIrq( pic, index = 5,  isrtype = 'ISR_CMA'   , channel = 1 )
    262                 mapping.addIrq( pic, index = 6,  isrtype = 'ISR_CMA'   , channel = 2 )
    263                 mapping.addIrq( pic, index = 7,  isrtype = 'ISR_CMA'   , channel = 3 )
    264 
    265                 mapping.addIrq( pic, index = 8,  isrtype = 'ISR_BDV'   , channel = 0 )
    266 
    267                 mapping.addIrq( pic, index = 16, isrtype = 'ISR_TTY_RX', channel = 0 )
    268                 mapping.addIrq( pic, index = 17, isrtype = 'ISR_TTY_RX', channel = 1 )
    269                 mapping.addIrq( pic, index = 18, isrtype = 'ISR_TTY_RX', channel = 2 )
    270                 mapping.addIrq( pic, index = 19, isrtype = 'ISR_TTY_RX', channel = 3 )
    271                 mapping.addIrq( pic, index = 20, isrtype = 'ISR_TTY_RX', channel = 4 )
    272                 mapping.addIrq( pic, index = 21, isrtype = 'ISR_TTY_RX', channel = 5 )
    273                 mapping.addIrq( pic, index = 22, isrtype = 'ISR_TTY_RX', channel = 6 )
    274                 mapping.addIrq( pic, index = 23, isrtype = 'ISR_TTY_RX', channel = 7 )
     257                mapping.addIrq( pic, index = 0, src = nic,
     258                                isrtype = 'ISR_NIC_RX', channel = 0 )
     259                mapping.addIrq( pic, index = 1, src = nic,
     260                                isrtype = 'ISR_NIC_RX', channel = 1 )
     261
     262                mapping.addIrq( pic, index = 2, src = nic,
     263                                isrtype = 'ISR_NIC_TX', channel = 0 )
     264                mapping.addIrq( pic, index = 3, src = nic,
     265                                isrtype = 'ISR_NIC_TX', channel = 1 )
     266
     267                mapping.addIrq( pic, index = 4, src = cma,
     268                                isrtype = 'ISR_CMA', channel = 0 )
     269                mapping.addIrq( pic, index = 5, src = cma,
     270                                isrtype = 'ISR_CMA', channel = 1 )
     271                mapping.addIrq( pic, index = 6, src = cma,
     272                                isrtype = 'ISR_CMA', channel = 2 )
     273                mapping.addIrq( pic, index = 7, src = cma,
     274                                isrtype = 'ISR_CMA', channel = 3 )
     275
     276                mapping.addIrq( pic, index = 8, src = bdv,
     277                                isrtype = 'ISR_BDV', channel = 0 )
     278
     279                mapping.addIrq( pic, index = 16, src = tty,
     280                                isrtype = 'ISR_TTY_RX', channel = 0 )
     281                mapping.addIrq( pic, index = 17, src = tty,
     282                                isrtype = 'ISR_TTY_RX', channel = 1 )
     283                mapping.addIrq( pic, index = 18, src = tty,
     284                                isrtype = 'ISR_TTY_RX', channel = 2 )
     285                mapping.addIrq( pic, index = 19, src = tty,
     286                                isrtype = 'ISR_TTY_RX', channel = 3 )
     287                mapping.addIrq( pic, index = 20, src = tty,
     288                                isrtype = 'ISR_TTY_RX', channel = 4 )
     289                mapping.addIrq( pic, index = 21, src = tty,
     290                                isrtype = 'ISR_TTY_RX', channel = 5 )
     291                mapping.addIrq( pic, index = 22, src = tty,
     292                                isrtype = 'ISR_TTY_RX', channel = 6 )
     293                mapping.addIrq( pic, index = 23, src = tty,
     294                                isrtype = 'ISR_TTY_RX', channel = 7 )
    275295
    276296
Note: See TracChangeset for help on using the changeset viewer.