Ignore:
Timestamp:
Nov 11, 2014, 6:53:54 PM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

    r858 r875  
    2424#  - y_size         : number of clusters in a column
    2525#  - nb_procs       : number of processors per cluster
     26#  - nb_ttys        : number of TTY channels
    2627#  - fbf_width      : frame_buffer width = frame_buffer heigth
    2728#
    2829#  The "hidden" parameters (defined below) are:
    29 #  - NB_TTYS        : number of TTY channels
    3030#  - NB_NICS        : number of NIC channels
    3131#  - X_IO           : cluster_io x coordinate
     
    4444# define architecture constants
    4545PADDR_WIDTH = 40
    46 NB_TTYS = 1
    4746NB_NICS = 2
    4847FBF_WIDTH = 128
     
    6968         y_size=2,
    7069         nb_procs=4,
     70         nb_ttys=1,
    7171         fbf_width=FBF_WIDTH):
    7272    """This function describes the tsar_generic_iob platform and defines its
     
    8282            (y_size == 16))
    8383
    84     assert NB_TTYS == 1
     84    assert ((nb_ttys >= 1) and (nb_ttys <= 16))
    8585
    8686    assert (((X_IO == 0) and (Y_IO == 0)) or
     
    160160
    161161    mapping.addPeriph('TTY', base=tty_base, size=tty_size,
    162                       ptype='TTY', channels=NB_TTYS)
     162                      ptype='TTY', channels=nb_ttys)
    163163
    164164    mapping.addPeriph('NIC', base=nic_base, size=nic_size,
     
    186186    mapping.addIrq(pic, index=7, isrtype='ISR_CMA', channel=3)
    187187    mapping.addIrq(pic, index=8, isrtype='ISR_BDV', channel=0)
    188     mapping.addIrq(pic, index=9, isrtype='ISR_TTY_RX', channel=0)
     188
     189    for i in xrange(nb_ttys):
     190        mapping.addIrq(pic, index=16+i, isrtype='ISR_TTY_RX', channel=i)
    189191
    190192    # hardware components replicated in all clusters
Note: See TracChangeset for help on using the changeset viewer.