Changeset 00991a3 in rtems


Ignore:
Timestamp:
Oct 18, 2011, 6:33:04 PM (10 years ago)
Author:
Jennifer Averett <Jennifer.Averett@…>
Branches:
4.11, 5, master
Children:
d5286a1f
Parents:
3bb9f198
Message:

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

PR 1917/bsps

  • Makefile.am, preinstall.am, console/config.c, console/mc68360_scc.c, console/ns16550cfg.c, console/printk_support.c: Modifications to add dynamic tables for libchip serial drivers.
Location:
c/src/lib/libbsp/powerpc/ep1a
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/ep1a/ChangeLog

    r3bb9f198 r00991a3  
     12011-10-18      Jennifer Averett <Jennifer.Averett@OARcorp.com>
     2
     3        PR 1917/bsps
     4        * Makefile.am, preinstall.am, console/config.c, console/mc68360_scc.c,
     5        console/ns16550cfg.c, console/printk_support.c: Modifications to add
     6        dynamic tables for libchip serial drivers.
     7
    182011-08-24      Sebastian Huber <sebastian.huber@embedded-brains.de>
    29
  • c/src/lib/libbsp/powerpc/ep1a/Makefile.am

    r3bb9f198 r00991a3  
    4949    ../../powerpc/shared/residual/residual.h \
    5050    ../../powerpc/shared/residual/pnp.h \
    51     ../../powerpc/shared/console/consoleIo.h console/rsPMCQ1.h
     51    ../../powerpc/shared/console/consoleIo.h console/rsPMCQ1.h \
     52    ../../shared/console_private.h
     53
    5254# console
    53 libbsp_a_SOURCES += ../../shared/console.c console/ns16550cfg.c \
     55libbsp_a_SOURCES += console/ns16550cfg.c \
    5456    console/mc68360_scc.c console/rsPMCQ1.c console/alloc360.c \
    5557    console/init68360.c console/config.c console/printk_support.c \
    56     console/config.c
    57 
     58    ../../shared/console.c ../../shared/console_select.c \
     59    ../../shared/console_read.c ../../shared/console_write.c \
     60    ../../shared/console_control.c
     61 
    5862include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
    5963# openpic
  • c/src/lib/libbsp/powerpc/ep1a/console/config.c

    r3bb9f198 r00991a3  
    8282 *
    8383 */
    84 console_tbl     Console_Port_Tbl[] = {
     84console_tbl     Console_Configuration_Ports[] = {
    8585        /*
    8686         *  NS16550 Chips provide first COM1 and COM2 Ports.
     
    364364};
    365365
    366 /* rtems console uses the following minor number */
    367 rtems_device_minor_number  Console_Port_Minor = 0;
    368 
    369 #define NUM_CONSOLE_PORTS (sizeof(Console_Port_Tbl)/sizeof(console_tbl))
    370 unsigned long   Console_Port_Count = NUM_CONSOLE_PORTS;
    371 console_data    Console_Port_Data[NUM_CONSOLE_PORTS];
     366/*
     367 *  Define a variable that contains the number of statically configured
     368 *  console devices.
     369 */
     370unsigned long  Console_Configuration_Count = \
     371    (sizeof(Console_Configuration_Ports)/sizeof(console_tbl));
    372372
    373373static bool config_68360_scc_base_probe(int minor, unsigned long busNo, unsigned long slotNo, int channel)
     
    387387    return false;
    388388
    389   Console_Port_Tbl[minor].pDeviceParams = &chip->port[ channel-1 ];
     389  Console_Port_Tbl[minor]->pDeviceParams = &chip->port[ channel-1 ];
    390390  chip->port[ channel-1 ].minor         = minor;
    391391  return true;
  • c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c

    r3bb9f198 r00991a3  
    4949
    5050#define SYNC     eieio
    51 #define mc68360_scc_Is_422( _minor ) (Console_Port_Tbl[minor].sDeviceName[7] == '4' )
     51#define mc68360_scc_Is_422( _minor ) (Console_Port_Tbl[minor]->sDeviceName[7] == '4' )
    5252
    5353
     
    148148void mc68360_sccShow_Regs(int minor){
    149149  M68360_serial_ports_t  ptr;
    150   ptr   = Console_Port_Tbl[minor].pDeviceParams;
     150  ptr   = Console_Port_Tbl[minor]->pDeviceParams;
    151151
    152152  printk( "scce 0x%08x", &ptr->pSCCR->scce );
     
    344344
    345345
    346   ptr   = Console_Port_Tbl[minor].pDeviceParams;
     346  ptr   = Console_Port_Tbl[minor]->pDeviceParams;
    347347  m360  = ptr->chip->m360;
    348348
     
    403403#ifdef DEBUG_360
    404404  printk("mc68360_scc_initialize_interrupts: minor %d\n", minor );
    405   printk("Console_Port_Tbl[minor].pDeviceParams 0x%08x\n",
    406     Console_Port_Tbl[minor].pDeviceParams );
    407 #endif
    408 
    409   ptr   = Console_Port_Tbl[minor].pDeviceParams;
     405  printk("Console_Port_Tbl[minor]->pDeviceParams 0x%08x\n",
     406    Console_Port_Tbl[minor]->pDeviceParams );
     407#endif
     408
     409  ptr   = Console_Port_Tbl[minor]->pDeviceParams;
    410410  m360  = ptr->chip->m360;
    411411
     
    672672#endif
    673673
    674   ptr   = Console_Port_Tbl[minor].pDeviceParams;
     674  ptr   = Console_Port_Tbl[minor]->pDeviceParams;
    675675
    676676  /*
     
    745745#endif
    746746
    747    ptr   = Console_Port_Tbl[minor].pDeviceParams;
     747   ptr   = Console_Port_Tbl[minor]->pDeviceParams;
    748748   m360  = ptr->chip->m360;
    749749
  • c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c

    r3bb9f198 r00991a3  
    1313
    1414#include <rtems.h>
     15#include <libchip/serial.h>
     16#include <libchip/ns16550.h>
    1517#include <bsp.h>
    16 #include "console.h"
    1718
    1819typedef struct uart_reg
  • c/src/lib/libbsp/powerpc/ep1a/console/printk_support.c

    r3bb9f198 r00991a3  
    1717#include <assert.h>
    1818#include <termios.h>
     19#include <rtems/bspIo.h>
    1920
    20 #include "console.h"
    21 #include <rtems/bspIo.h>
     21rtems_device_minor_number         BSPPrintkPort = 0;
    2222
    2323/* const char arg to be compatible with BSP_output_char decl. */
  • c/src/lib/libbsp/powerpc/ep1a/preinstall.am

    r3bb9f198 r00991a3  
    9494PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rsPMCQ1.h
    9595
     96$(PROJECT_INCLUDE)/bsp/console_private.h: ../../shared/console_private.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     97        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console_private.h
     98PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console_private.h
     99
    96100$(PROJECT_INCLUDE)/bsp/openpic.h: ../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    97101        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
Note: See TracChangeset for help on using the changeset viewer.