Ignore:
Timestamp:
Jan 31, 2014, 4:10:30 PM (11 years ago)
Author:
cfuguet
Message:

Removing the GIET_MONO_TTY variable on the giet_config.h
file. All the tests on this variable as been replaced by
NB_TTY_CHANNELS == 1.

Location:
branch/giet_vm_ioc_drivers
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branch/giet_vm_ioc_drivers/giet_boot/boot.c

    r283 r285  
    11691169    unsigned int alloc_tim_channel[X_SIZE*Y_SIZE]; // user TIMER allocators
    11701170
    1171     if (!GIET_MONO_TTY) alloc_tty_channel++;
     1171    if (NB_TTY_CHANNELS > 1) alloc_tty_channel++;
    11721172
    11731173    /////////////////////////////////////////////////////////////////////////
     
    13721372                }
    13731373                ctx_tty = alloc_tty_channel;
    1374                 if (!GIET_MONO_TTY) alloc_tty_channel++;
     1374                if (NB_TTY_CHANNELS > 1) alloc_tty_channel++;
    13751375            }
    13761376            // ctx_nic : NIC channel global index provided by the global allocator
  • branch/giet_vm_ioc_drivers/giet_config.h

    r267 r285  
    3737#define GIET_IDLE_TASK_VERBOSITY 1
    3838
    39 #define GIET_MONO_TTY            0          /* Only one terminal is used */
    40 
    4139#define GIET_MAX_ELF_FILES       20         /* max .elf files loaded by boot-loader */
    4240#define GIET_OPEN_FILES_MAX      16         /* max simultaneously open files */
  • branch/giet_vm_ioc_drivers/giet_libs/stdio.c

    r271 r285  
    298298    unsigned int ret;
    299299
    300     if (GIET_MONO_TTY)
     300    if (NB_TTY_CHANNELS == 1)
    301301    {
    302302        ret = sys_call(SYSCALL_TTY_LOCK, 0, 0, 0, 0); // Get TTY lock
     
    328328    }
    329329
    330     if (GIET_MONO_TTY)
     330    if (NB_TTY_CHANNELS == 1)
    331331    {
    332332        ret = sys_call(SYSCALL_TTY_LOCK, 1, 0, 0, 0); // Release TTY lock
     
    412412
    413413return_error:
    414     if (GIET_MONO_TTY)
     414    if (NB_TTY_CHANNELS == 1)
    415415    {
    416416        ret = sys_call(SYSCALL_TTY_LOCK, 1, 0, 0, 0); // Release TTY lock
  • branch/giet_vm_ioc_drivers/mappings/4c_1p_sort_chiplet.xml

    r283 r285  
    3535            </proc>
    3636
    37             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1"  />
     37            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6"  />
    3838            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1"  />
    3939            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1" subtype = "SPI" />
     
    5353            </proc>
    5454
    55             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
     55            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
    5656            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    5757        </cluster>
     
    6767            </proc>
    6868
    69             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
     69            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
    7070            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    7171        </cluster>
     
    8181            </proc>
    8282
    83             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
     83            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
    8484            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    8585        </cluster>
Note: See TracChangeset for help on using the changeset viewer.