Ignore:
Timestamp:
Oct 18, 2011, 6:34:02 PM (10 years ago)
Author:
Jennifer Averett <Jennifer.Averett@…>
Branches:
4.11, 5, master
Children:
e1ddcec0
Parents:
00991a3
Message:

2011-10-18 Jennifer Averett <Jennifer.Averett@…>

PR 1917/bsps

  • Makefile.am, console/consolelite.c: Modifications to add dynamic tables for libchip serial drivers.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/virtex/console/consolelite.c

    r00991a3 rd5286a1f  
    122122void xlite_init (int minor )
    123123{
    124    uint32_t base = Console_Port_Tbl[minor].ulCtrlPort1;
     124   uint32_t base = Console_Port_Tbl[minor]->ulCtrlPort1;
    125125
    126126   /* clear status register */
     
    138138)
    139139{
    140    uint32_t base = Console_Port_Tbl[minor].ulCtrlPort1;
     140   uint32_t base = Console_Port_Tbl[minor]->ulCtrlPort1;
    141141
    142142   /* the lite uarts have hardcoded baud & serial parms so no port
     
    168168int xlite_read_polled (int minor )
    169169{
    170    uint32_t base = Console_Port_Tbl[minor].ulCtrlPort1;
     170   uint32_t base = Console_Port_Tbl[minor]->ulCtrlPort1;
    171171
    172172   unsigned int status = xlite_uart_status(base);
     
    187187)
    188188{
    189    uint32_t base = Console_Port_Tbl[minor].ulCtrlPort1;
     189   uint32_t base = Console_Port_Tbl[minor]->ulCtrlPort1;
    190190   int nwrite = 0;
    191191
     
    211211)
    212212{
    213    uint32_t base = Console_Port_Tbl[minor].ulCtrlPort1;
     213   uint32_t base = Console_Port_Tbl[minor]->ulCtrlPort1;
    214214   xlite_write_char(base, c);
    215215   return;
     
    252252
    253253
    254 console_tbl     Console_Port_Tbl[] = {
     254console_tbl     Console_Configuration_Ports[] = {
    255255{
    256256  "/dev/ttyS0",                             /* sDeviceName */
     
    334334
    335335
    336 #define NUM_CONSOLE_PORTS (sizeof(Console_Port_Tbl)/sizeof(console_tbl))
    337 
    338 unsigned long                   Console_Port_Count = NUM_CONSOLE_PORTS;
    339 console_data                    Console_Port_Data[NUM_CONSOLE_PORTS];
    340 rtems_device_minor_number       Console_Port_Minor;
    341 
    342 
    343 
    344 
    345 
    346 
     336#define NUM_CONSOLE_PORTS \
     337  (sizeof(Console_Configuration_Ports)/sizeof(console_tbl))
     338
     339unsigned long Console_Configuration_Count = NUM_CONSOLE_PORTS;
    347340
    348341
Note: See TracChangeset for help on using the changeset viewer.