Changeset 875 for branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

Timestamp:

Nov 11, 2014, 6:53:54 PM (10 years ago)

Author:

cfuguet

Message:

reconf: merge modifications from the trunk/tsar_generic_iob (r874)

r874 commit message:
Introducing support for multiple TTY terminals (up to 16 channels)
in the tsar_generic_iob platform.

File:

• branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py (modified) (6 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

@@ -24 +24 @@
 #  - y_size         : number of clusters in a column
 #  - nb_procs       : number of processors per cluster
+#  - nb_ttys        : number of TTY channels
 #  - fbf_width      : frame_buffer width = frame_buffer heigth
 #
 #  The "hidden" parameters (defined below) are:
-#  - NB_TTYS        : number of TTY channels
 #  - NB_NICS        : number of NIC channels
 #  - X_IO           : cluster_io x coordinate
@@ -44 +44 @@
 # define architecture constants
 PADDR_WIDTH = 40
-NB_TTYS = 1
 NB_NICS = 2
 FBF_WIDTH = 128
@@ -69 +68 @@
          y_size=2,
          nb_procs=4,
+         nb_ttys=1,
          fbf_width=FBF_WIDTH):
     """This function describes the tsar_generic_iob platform and defines its
@@ -82 +82 @@
             (y_size == 16))
 
-    assert NB_TTYS == 1
+    assert ((nb_ttys >= 1) and (nb_ttys <= 16))
 
     assert (((X_IO == 0) and (Y_IO == 0)) or
@@ -160 +160 @@
 
     mapping.addPeriph('TTY', base=tty_base, size=tty_size,
-                      ptype='TTY', channels=NB_TTYS)
+                      ptype='TTY', channels=nb_ttys)
 
     mapping.addPeriph('NIC', base=nic_base, size=nic_size,
@@ -186 +186 @@
     mapping.addIrq(pic, index=7, isrtype='ISR_CMA', channel=3)
     mapping.addIrq(pic, index=8, isrtype='ISR_BDV', channel=0)
-    mapping.addIrq(pic, index=9, isrtype='ISR_TTY_RX', channel=0)
+
+    for i in xrange(nb_ttys):
+        mapping.addIrq(pic, index=16+i, isrtype='ISR_TTY_RX', channel=i)
 
     # hardware components replicated in all clusters