Changeset 975 for trunk/platforms/tsar_generic_leti

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_leti/arch.py (modified) (2 diffs)

trunk/platforms/tsar_generic_leti/arch.py

@@ -217 +217 @@
                                          arg0 = 16, arg1 = 16, arg2 = 16 )
 
-                mapping.addIrq( xcu, index = 8, isrtype = 'ISR_MMC' )
+                mapping.addIrq( xcu, index = 8, src = mmc, isrtype = 'ISR_MMC' )
 
                 for p in xrange ( nb_procs ):
@@ -244 +244 @@
                                          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 )
-
-                if ( ioc_type == 'BDV' ):
-                    mapping.addIrq( pic, index = 8 , isrtype = 'ISR_BDV'   , channel = 0 )
-                if ( ioc_type == 'HBA' ):
-                    mapping.addIrq( pic, index = 8 , isrtype = 'ISR_HBA'   , channel = 0 )
-                if ( ioc_type == 'SDC' ):
-                    mapping.addIrq( pic, index = 8 , isrtype = 'ISR_SDC'   , 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 = 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_type = 'ISR_BDV'
+                elif ( ioc_type == 'HBA' ): isr_type = 'ISR_HBA'
+                elif ( ioc_type == 'SDC' ): isr_type = 'ISR_SDC'
+
+                if ( ioc_type != 'RDK' ):
+                    mapping.addIrq( pic, index = 8, src = ioc,
+                                    isrtype = isr_type, 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 )
 
     ###################################