Changeset 1053 for trunk/platforms/tsar_generic_iob/arch_info.py

Timestamp:

Sep 15, 2017, 12:32:44 AM (7 years ago)

Author:

alain

Message:

Replace the "vci_mlti_tty" component by the "vci_tty_tsar" component,
in yje tsar_generic_iob platform.
This new component povide two IRQs per channel:

• RX_IRQ, when the read buffer is non-empty
• TX_IRQ, when the write buffer is not full.

The new tsar_generic_iob platform supports up to 8 TTY channels.
The new vci_tty_tsar component is stored in the TSAR SVN.

File:

• trunk/platforms/tsar_generic_iob/arch_info.py (modified) (7 diffs)

trunk/platforms/tsar_generic_iob/arch_info.py

@@ -9 +9 @@
 #########################################################################################
 #  This python script defines a specific instance of "tsar_generic_iob" architecture
-#  for the ALMOS-MK operating system. It is used to generate the "hard_config.h" 
-#  and the "arch_info.bin files, used by bthe ALMOS-MK bootloader.
+#  for the ALMOS-MKH operating system. It is used to generate the "hard_config.h" file, 
+#  used to configure the hardware architecture, and the "arch_info.bin" file, used by 
+#  the ALMOS-MK bootloader.
 #
 #  The constructor prototype format is imposed by the genarch.py application,
@@ -31 +32 @@
 #  - fbf_width      : frame_buffer width = frame_buffer heigth
 #  - ioc_type       : can be 'IOC_BDV','IOC_HBA','IOC_SDC', 'IOC_SPI','NONE'
-#  - io_cxy         : IO cluster identifier
-#  - boot_cxy       : boot cluster identifier
-#  - cache_line     : number of bytes in cache line (in 16,32,64)
 #
 #  The following parameters are imposed by the "tsar_generic_iob" architecture:
@@ -42 +40 @@
 #  - p_width        : number of bits for local processor index
 #  - irqs_per_core  : number of input IRQs per processor
+#  - io_cxy         : IO cluster identifier
+#  - boot_cxy       : boot cluster identifier
+#  - cache_line     : number of bytes in cache line (in 16,32,64)
 ########################################################################################
 
@@ -51 +52 @@
           nb_nics       = 1, 
           fbf_width     = 128,
-          ioc_type      = 'IOC_BDV',
-          io_cxy        = 0,
-          boot_cxy      = 0, 
-          cache_line    = 64):
+          ioc_type      = 'IOC_BDV'):
 
     ### architecture constants
@@ -64 +62 @@
     irqs_per_core = 4           
     devices_max   = 16  
+    boot_cxy      = 0
+    cache_line    = 64
+    io_cxy        = ((x_size-1)<<y_width) + (y_size-1)   # upper right cluster
 
     ### constructor parameters checking
@@ -182 +183 @@
                                    channels = nb_cores )
 
-            archi.addIrq( dstdev = xcu, port = 1, srcdev = dma, channel = 0 )
-            archi.addIrq( dstdev = xcu, port = 2, srcdev = dma, channel = 1 )
-            archi.addIrq( dstdev = xcu, port = 3, srcdev = dma, channel = 2 )
-            archi.addIrq( dstdev = xcu, port = 4, srcdev = dma, channel = 3 )
+            for i in xrange( nb_cores ):
+                archi.addIrq( dstdev = xcu, port = i+1 , srcdev = dma, channel = i )
 
             # define external devices
@@ -244 +243 @@
                 archi.addIrq( dstdev = pic, port = 23, srcdev = tty, channel = 7 , is_rx = True )
 
+                archi.addIrq( dstdev = pic, port = 24, srcdev = tty, channel = 0 , is_rx = False )
+                archi.addIrq( dstdev = pic, port = 25, srcdev = tty, channel = 1 , is_rx = False )
+                archi.addIrq( dstdev = pic, port = 26, srcdev = tty, channel = 2 , is_rx = False )
+                archi.addIrq( dstdev = pic, port = 27, srcdev = tty, channel = 3 , is_rx = False )
+                archi.addIrq( dstdev = pic, port = 28, srcdev = tty, channel = 4 , is_rx = False )
+                archi.addIrq( dstdev = pic, port = 29, srcdev = tty, channel = 5 , is_rx = False )
+                archi.addIrq( dstdev = pic, port = 30, srcdev = tty, channel = 6 , is_rx = False )
+                archi.addIrq( dstdev = pic, port = 31, srcdev = tty, channel = 7 , is_rx = False )
+
             # define cores
             for p in xrange ( nb_cores ):