Changeset e7bde492 in rtems


Ignore:
Timestamp:
Jun 2, 2009, 10:19:44 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
3b8dfa66
Parents:
14eefeab
Message:

2009-06-02 Joel Sherrill <joel.sherrill@…>

  • Makefile.am, configure.ac, preinstall.am, console/uarts.c, include/bsp.h, startup/memmap.c: Add support for /dev/fbcons which is a console type output only device to print to the LCD screen. The video controller (SED) and fonts are copied from MicroMonitor? and proper attribution is made in those files and confirmed by Ed Sutter.
  • console/fbcons.c, console/font8x16.h, console/sed1356.c, console/sed1356_16bit.h, include/sed1356.h: New files.
Location:
c/src/lib/libbsp/arm/csb337
Files:
5 added
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/csb337/ChangeLog

    r14eefeab re7bde492  
     12009-06-02      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        * Makefile.am, configure.ac, preinstall.am, console/uarts.c,
     4        include/bsp.h, startup/memmap.c: Add support for /dev/fbcons which is
     5        a console type output only device to print to the LCD screen. The
     6        video controller (SED) and fonts are copied from MicroMonitor and
     7        proper attribution is made in those files and confirmed by Ed Sutter.
     8        * console/fbcons.c, console/font8x16.h, console/sed1356.c,
     9        console/sed1356_16bit.h, include/sed1356.h: New files.
     10
    1112009-05-28      Joel Sherrill <joel.sherrill@OARcorp.com>
    212
  • c/src/lib/libbsp/arm/csb337/Makefile.am

    r14eefeab re7bde492  
    1313include_HEADERS = include/bsp.h
    1414include_HEADERS += ../../shared/include/tm27.h
     15include_HEADERS += include/sed1356.h
    1516
    1617nodist_include_HEADERS = include/bspopts.h
     
    2021
    2122nodist_include_HEADERS += ../../shared/include/coverhd.h
     23
     24if ENABLE_LCD
     25nodist_include_HEADERS += console/sed1356_16bit.h
     26nodist_include_HEADERS += console/font8x16.h
     27endif
    2228
    2329noinst_LIBRARIES = libbspstart.a
     
    4046# console
    4147libbsp_a_SOURCES += console/uarts.c ../../shared/console.c
     48if ENABLE_LCD
     49libbsp_a_SOURCES += console/sed1356.c console/fbcons.c
     50endif
    4251# abort
    4352libbsp_a_SOURCES += ../shared/abort/abort.c
  • c/src/lib/libbsp/arm/csb337/configure.ac

    r14eefeab re7bde492  
    3030 board when application exits.])
    3131
     32RTEMS_BSPOPTS_SET([ENABLE_LCD],[*],[0])
     33RTEMS_BSPOPTS_HELP([ENABLE_LCD],
     34[If defined, enable use of the SED1356 controller.])
     35
     36AM_CONDITIONAL(ENABLE_LCD,test "$ENABLE_LCD" = "1")
     37
    3238RTEMS_BSPOPTS_SET([BSP_RESET_BOARD_AT_EXIT],[*],[1])
    3339RTEMS_BSPOPTS_HELP([BSP_RESET_BOARD_AT_EXIT],
  • c/src/lib/libbsp/arm/csb337/console/uarts.c

    r14eefeab re7bde492  
    1010 *  The license and distribution terms for this file may be
    1111 *  found in the file LICENSE in this distribution or at
     12 *  http://www.rtems.com/license/LICENSE.
    1213 *
    13  *  http://www.rtems.com/license/LICENSE.
     14 *  FrameBuffer Console Device Support added By Joel Sherrill, 2009.
    1415 *
    1516 *  $Id$
    1617 */
     18
    1719#include <bsp.h>
    1820#include <rtems/libio.h>
     
    2426#include <libchip/serial.h>
    2527#include <libchip/sersupp.h>
     28#include <bspopts.h>
    2629
    27 /* How many serial ports? */
    28 #define NUM_DEVS       1
     30/* rtems console uses the following minor number */
     31rtems_device_minor_number  Console_Port_Minor = 0;
     32extern console_fns dbgu_fns;
     33#if ENABLE_LCD
     34  extern console_fns fbcons_fns;
     35  #define NUM_DEVS       2
     36#else
     37  #define NUM_DEVS       1
     38#endif
    2939
    3040/* These are used by code in console.c */
     
    3242console_data  Console_Port_Data[NUM_DEVS];
    3343
    34 /* rtems console uses the following minor number */
    35 rtems_device_minor_number  Console_Port_Minor = 0;
    36 extern console_fns dbgu_fns;
    3744
    3845/*
     
    4653 */
    4754console_tbl Console_Port_Tbl[] = {
    48     {
    49         "/dev/console",    /* sDeviceName */
    50         SERIAL_CUSTOM,     /* deviceType */
    51         &dbgu_fns,         /* pDeviceFns */
    52         NULL,              /* deviceProbe */
    53         NULL,              /* pDeviceFlow */
    54         0,                 /* ulMargin - NOT USED */
    55         0,                 /* ulHysteresis - NOT USED */
    56         NULL,              /* pDeviceParams */
    57         DBGU_BASE,         /* ulCtrlPort1  - Pointer to DBGU regs */
    58         0,                 /* ulCtrlPort2  - NOT USED */
    59         0,                 /* ulDataPort  - NOT USED */
    60         NULL,              /* getRegister - NOT USED */
    61         NULL,              /* setRegister - NOT USED */
    62         NULL,              /* getData - NOT USED */
    63         NULL,              /* setData - NOT USED */
    64         0,                 /* ulClock - NOT USED */
    65         0                  /* ulIntVector - NOT USED */
    66     }};
     55  {
     56    "/dev/console",    /* sDeviceName */
     57    SERIAL_CUSTOM,     /* deviceType */
     58    &dbgu_fns,         /* pDeviceFns */
     59    NULL,              /* deviceProbe */
     60    NULL,              /* pDeviceFlow */
     61    0,                 /* ulMargin - NOT USED */
     62    0,                 /* ulHysteresis - NOT USED */
     63    NULL,              /* pDeviceParams */
     64    DBGU_BASE,         /* ulCtrlPort1  - Pointer to DBGU regs */
     65    0,                 /* ulCtrlPort2  - NOT USED */
     66    0,                 /* ulDataPort  - NOT USED */
     67    NULL,              /* getRegister - NOT USED */
     68    NULL,              /* setRegister - NOT USED */
     69    NULL,              /* getData - NOT USED */
     70    NULL,              /* setData - NOT USED */
     71    0,                 /* ulClock - NOT USED */
     72    0                  /* ulIntVector - NOT USED */
     73  },
     74#if ENABLE_LCD
     75  {
     76    "/dev/fbcons",     /* sDeviceName */
     77    SERIAL_CUSTOM,     /* deviceType */
     78    &fbcons_fns,       /* pDeviceFns */
     79    NULL,              /* deviceProbe */
     80    NULL,              /* pDeviceFlow */
     81    0,                 /* ulMargin - NOT USED */
     82    0,                 /* ulHysteresis - NOT USED */
     83    NULL,              /* pDeviceParams */
     84    0,                 /* ulCtrlPort1  - Pointer to DBGU regs */
     85    0,                 /* ulCtrlPort2  - NOT USED */
     86    0,                 /* ulDataPort  - NOT USED */
     87    NULL,              /* getRegister - NOT USED */
     88    NULL,              /* setRegister - NOT USED */
     89    NULL,              /* getData - NOT USED */
     90    NULL,              /* setData - NOT USED */
     91    0,                 /* ulClock - NOT USED */
     92    0                  /* ulIntVector - NOT USED */
     93  }
     94#endif
     95};
    6796
    6897
  • c/src/lib/libbsp/arm/csb337/include/bsp.h

    r14eefeab re7bde492  
    3838static inline int32_t BSP_get_baud(void) {return 38400;}
    3939
    40 /* How many serial ports? */
    41 #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1
    42 
    4340#define ST_PIMR_PIV     33      /* 33 ticks of the 32.768Khz clock ~= 1msec */
    4441 
  • c/src/lib/libbsp/arm/csb337/preinstall.am

    r14eefeab re7bde492  
    4646PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
    4747
     48$(PROJECT_INCLUDE)/sed1356.h: include/sed1356.h $(PROJECT_INCLUDE)/$(dirstamp)
     49        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356.h
     50PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356.h
     51
    4852$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
    4953        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
     
    5862PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    5963
     64if ENABLE_LCD
     65$(PROJECT_INCLUDE)/sed1356_16bit.h: console/sed1356_16bit.h $(PROJECT_INCLUDE)/$(dirstamp)
     66        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356_16bit.h
     67PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356_16bit.h
     68
     69$(PROJECT_INCLUDE)/font8x16.h: console/font8x16.h $(PROJECT_INCLUDE)/$(dirstamp)
     70        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/font8x16.h
     71PREINSTALL_FILES += $(PROJECT_INCLUDE)/font8x16.h
     72endif
    6073$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    6174        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
  • c/src/lib/libbsp/arm/csb337/startup/memmap.c

    r14eefeab re7bde492  
    2525    {0x20000000, 0x20000000,  32,    MMU_CACHE_WTHROUGH}, /* SDRAM */
    2626#endif
     27#if ENABLE_LCD
    2728    {0x30000000, 0x30000000,   8,    MMU_CACHE_NONE},     /* video */
     29#endif
    2830    {0x40000000, 0x40000000,   1,    MMU_CACHE_NONE},     /* Expansion CS0 */
    2931    {0x50000000, 0x50000000,   1,    MMU_CACHE_NONE},     /* CF CE 1 */
Note: See TracChangeset for help on using the changeset viewer.