Changeset 975 for trunk/platforms/tsar_generic_iob

Timestamp:

Apr 15, 2015, 4:02:09 PM (9 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:

• trunk/platforms/tsar_generic_iob/arch.py (modified) (3 diffs)

trunk/platforms/tsar_generic_iob/arch.py

@@ -221 +221 @@
                                      arg0 = 32, arg1 = 32, arg2 = 32 )
 
-            mapping.addIrq( xcu, index = 0, isrtype = 'ISR_MMC' )
-            mapping.addIrq( xcu, index = 1, isrtype = 'ISR_MWR' )
-
-            mapping.addPeriph( 'MMC', base = mmc_base + offset, 
-                                     size = mmc_size, ptype = 'MMC' )
+            mapping.addPeriph( 'MMC', base = mmc_base + offset,
+                               size = mmc_size, ptype = 'MMC' )
 
             if ( mwr_type == 'GCD' ):
-                mapping.addPeriph( 'MWR', base = mwr_base + offset,
-                                   size = mwr_size, ptype = 'MWR', subtype = 'GCD',
-                                   arg0 = 2, arg1 = 1, arg2 = 1, arg3 = 0 )  
+                mwr = mapping.addPeriph( 'MWR', base = mwr_base + offset,
+                                         size = mwr_size, ptype = 'MWR', subtype = 'GCD',
+                                         arg0 = 2, arg1 = 1, arg2 = 1, arg3 = 0 )
 
             if ( mwr_type == 'DCT' ):
-                mapping.addPeriph( 'MWR', base = mwr_base + offset,
-                                   size = mwr_size, ptype = 'MWR', subtype = 'DCT',
-                                   arg0 = 1, arg1 = 1, arg2 = 1, arg3 = 0 )  
+                mwr = mapping.addPeriph( 'MWR', base = mwr_base + offset,
+                                         size = mwr_size, ptype = 'MWR', subtype = 'DCT',
+                                         arg0 = 1, arg1 = 1, arg2 = 1, arg3 = 0 )
 
             if ( mwr_type == 'CPY' ):
-                mapping.addPeriph( 'MWR', base = mwr_base + offset,
-                                   size = mwr_size, ptype = 'MWR', subtype = 'CPY',
-                                   arg0 = 1, arg1 = 1, arg2 = 1, arg3 = 0 )  
+                mwr = mapping.addPeriph( 'MWR', base = mwr_base + offset,
+                                         size = mwr_size, ptype = 'MWR', subtype = 'CPY',
+                                         arg0 = 1, arg1 = 1, arg2 = 1, arg3 = 0 )
+
+            mapping.addIrq( xcu, index = 0, src = mmc, isrtype = 'ISR_MMC' )
+            mapping.addIrq( xcu, index = 1, src = mwr, isrtype = 'ISR_MWR' )
 
             for p in xrange ( nb_procs ):
@@ -272 +272 @@
                                          ptype = 'PIC', channels = 32 )
 
-                mapping.addIrq( pic, index = 0,  isrtype = 'ISR_NIC_RX', channel = 0 )
-                mapping.addIrq( pic, index = 1,  isrtype = 'ISR_NIC_RX', channel = 1 )
-
-                mapping.addIrq( pic, index = 2,  isrtype = 'ISR_NIC_TX', channel = 0 )
-                mapping.addIrq( pic, index = 3,  isrtype = 'ISR_NIC_TX', channel = 1 )
-
-                mapping.addIrq( pic, index = 4,  isrtype = 'ISR_CMA'   , channel = 0 )
-                mapping.addIrq( pic, index = 5,  isrtype = 'ISR_CMA'   , channel = 1 )
-                mapping.addIrq( pic, index = 6,  isrtype = 'ISR_CMA'   , channel = 2 )
-                mapping.addIrq( pic, index = 7,  isrtype = 'ISR_CMA'   , channel = 3 )
+                mapping.addIrq( pic, index = 0, src = nic,
+                                isrtype = 'ISR_NIC_RX', channel = 0 )
+                mapping.addIrq( pic, index = 1, src = nic,
+                                isrtype = 'ISR_NIC_RX', channel = 1 )
+
+                mapping.addIrq( pic, index = 2, src = nic,
+                                isrtype = 'ISR_NIC_TX', channel = 0 )
+                mapping.addIrq( pic, index = 3, src = nic,
+                                isrtype = 'ISR_NIC_TX', channel = 1 )
+
+                mapping.addIrq( pic, index = 4, src = cma,
+                                isrtype = 'ISR_CMA', channel = 0 )
+                mapping.addIrq( pic, index = 5, src = cma,
+                                isrtype = 'ISR_CMA', channel = 1 )
+                mapping.addIrq( pic, index = 6, src = cma,
+                                isrtype = 'ISR_CMA', channel = 2 )
+                mapping.addIrq( pic, index = 7, src = cma,
+                                isrtype = 'ISR_CMA', channel = 3 )
 
                 if ( ioc_type == 'BDV' ): isr_ioc = 'ISR_BDV'
@@ -287 +295 @@
                 if ( ioc_type == 'SDC' ): isr_ioc = 'ISR_SDC'
 
-                mapping.addIrq( pic, index = 8,  isrtype = isr_ioc     , channel = 0 )
-
-                mapping.addIrq( pic, index = 16, isrtype = 'ISR_TTY_RX', channel = 0 )
-                mapping.addIrq( pic, index = 17, isrtype = 'ISR_TTY_RX', channel = 1 )
-                mapping.addIrq( pic, index = 18, isrtype = 'ISR_TTY_RX', channel = 2 )
-                mapping.addIrq( pic, index = 19, isrtype = 'ISR_TTY_RX', channel = 3 )
-                mapping.addIrq( pic, index = 20, isrtype = 'ISR_TTY_RX', channel = 4 )
-                mapping.addIrq( pic, index = 21, isrtype = 'ISR_TTY_RX', channel = 5 )
-                mapping.addIrq( pic, index = 22, isrtype = 'ISR_TTY_RX', channel = 6 )
-                mapping.addIrq( pic, index = 23, isrtype = 'ISR_TTY_RX', channel = 7 )
+                mapping.addIrq( pic, index = 8, src = ioc,
+                                isrtype = isr_ioc, channel = 0 )
+                mapping.addIrq( pic, index = 16, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 0 )
+                mapping.addIrq( pic, index = 17, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 1 )
+                mapping.addIrq( pic, index = 18, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 2 )
+                mapping.addIrq( pic, index = 19, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 3 )
+                mapping.addIrq( pic, index = 20, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 4 )
+                mapping.addIrq( pic, index = 21, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 5 )
+                mapping.addIrq( pic, index = 22, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 6 )
+                mapping.addIrq( pic, index = 23, src = tty,
+                                isrtype = 'ISR_TTY_RX', channel = 7 )