Changeset 1c0b8d7 in rtems


Ignore:
Timestamp:
Nov 18, 2011, 8:11:08 PM (9 years ago)
Author:
Jennifer Averett <Jennifer.Averett@…>
Branches:
4.11, 5, master
Children:
7fc2c2cb
Parents:
7c0273e
Message:

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

PR 1925

  • Makefile.am, preinstall.am, console/serial_mouse_config.c, include/bsp.h, start/start.S: Converted 1386 console to the libchip style console
  • console/conscfg.c, console/console_control.c, console/printk_support.c, console/vgacons.c, console/vgacons.h: New files.
Location:
c/src/lib/libbsp/i386/pc386
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/pc386/ChangeLog

    r7c0273e r1c0b8d7  
     12011-11-18      Jennifer Averett <Jennifer.Averett@OARcorp.com>
     2
     3        PR 1925
     4        * Makefile.am, preinstall.am, console/serial_mouse_config.c,
     5        include/bsp.h, start/start.S: Converted 1386 console to the libchip
     6        style console
     7        * console/conscfg.c, console/console_control.c,
     8        console/printk_support.c, console/vgacons.c, console/vgacons.h: New
     9        files.
     10
    1112011-10-17      Ralf Corsépius <ralf.corsepius@rtems.org>
    212
  • c/src/lib/libbsp/i386/pc386/Makefile.am

    r7c0273e r1c0b8d7  
    6969
    7070include_rtemsdir = $(includedir)/rtems
    71 include_rtems_HEADERS = console/keyboard.h console/kd.h console/ps2_drv.h
     71include_rtems_HEADERS = console/keyboard.h console/kd.h console/ps2_drv.h \
     72    ../../shared/console_private.h console/vgacons.h
    7273
    7374include_HEADERS += ../../i386/shared/comm/i386_io.h
    7475# console
    75 libbsp_a_SOURCES += console/console.c console/inch.c console/outch.c \
     76libbsp_a_SOURCES += console/inch.c console/outch.c \
    7677    console/defkeymap.c console/fb_vga.c console/keyboard.c \
    7778    console/pc_keyb.c console/ps2_mouse.c \
    7879    console/vgainit.c console/vt.c console/videoAsm.S \
    7980    console/kbd_parser.c console/serial_mouse_config.c \
    80     ../../i386/shared/comm/uart.c ../../i386/shared/comm/tty_drv.c
     81    ../../i386/shared/comm/uart.c ../../i386/shared/comm/tty_drv.c \
     82    ../../shared/console.c ../../shared/console_select.c \
     83    ../../shared/console_read.c ../../shared/console_write.c \
     84    console/console_control.c console/conscfg.c console/printk_support.c \
     85    console/vgacons.c
    8186
    8287# gdb
  • c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c

    r7c0273e r1c0b8d7  
    11/*
    2  *  COPYRIGHT (c) 1989-2007.
     2 *  COPYRIGHT (c) 1989-2011.
    33 *  On-Line Applications Research Corporation (OAR).
    44 *
     
    1717#include <fcntl.h>
    1818
     19#include "libchip/serial.h"
     20#include "../../../shared/console_private.h"
     21
    1922/* select which serial port the mouse is connected to */
    20 /* XXX - Hook these somewhere */
    21 #ifdef   SERIAL_MOUSE_COM1
    22   #define SERIAL_MOUSE_COM  1
    23 #elif defined(SERIAL_MOUSE_COM2)
    24   #define SERIAL_MOUSE_COM  2
     23#if defined(SERIAL_MOUSE_COM2)
     24  #define MOUSE_DEVICE "/dev/com2"
    2525#else
    26   /* Select Default to be COM1  */
    27   #define SERIAL_MOUSE_COM  1
     26  #define MOUSE_DEVICE "/dev/com1"
    2827#endif
    2928
    30 extern int BSPConsolePort;
     29static const char *SerialMouseDevice = MOUSE_DEVICE;
    3130
    3231bool bsp_get_serial_mouse_device(
     
    3534)
    3635{
    37   #ifdef SERIAL_MOUSE_COM2
    38     *name = "/dev/ttyS2";
    39   #else
    40     *name = "/dev/ttyS1";
    41   #endif
    42  
     36  const char *consname;
     37
     38  *name = SerialMouseDevice;
    4339  *type = "ms";
    4440
    4541  /* Check if this port is not been used as console */
    46   /* XXX configure the serial port, take boot args additionally */
    47   if ( BSPConsolePort == SERIAL_MOUSE_COM ) {
     42  consname = Console_Port_Tbl[ Console_Port_Minor ]->sDeviceName;
     43  if ( !strcmp(MOUSE_DEVICE, consname) ) {
    4844    printk( "SERIAL MOUSE: port selected as console.(%s)\n", *name );
    4945    rtems_fatal_error_occurred( -1 );
  • c/src/lib/libbsp/i386/pc386/include/bsp.h

    r7c0273e r1c0b8d7  
    202202void breakpoint(void);
    203203
     204#define BSP_MAXIMUM_DEVICES 6
     205
    204206#ifdef __cplusplus
    205207}
  • c/src/lib/libbsp/i386/pc386/preinstall.am

    r7c0273e r1c0b8d7  
    120120PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ps2_drv.h
    121121
     122$(PROJECT_INCLUDE)/rtems/console_private.h: ../../shared/console_private.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     123        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/console_private.h
     124PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/console_private.h
     125
     126$(PROJECT_INCLUDE)/rtems/vgacons.h: console/vgacons.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     127        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vgacons.h
     128PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vgacons.h
     129
    122130$(PROJECT_INCLUDE)/i386_io.h: ../../i386/shared/comm/i386_io.h $(PROJECT_INCLUDE)/$(dirstamp)
    123131        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i386_io.h
  • c/src/lib/libbsp/i386/pc386/start/start.S

    r7c0273e r1c0b8d7  
    210210        call checkCPUtypeSetCr0
    211211
    212 /*---------------------------------------------------------------------+
    213 | Redirect printk (and console) port if desired
    214 +---------------------------------------------------------------------*/
    215         call SYM(BSP_console_select)
    216 
    217212#ifdef __SSE__
    218213        call SYM(enable_sse)
Note: See TracChangeset for help on using the changeset viewer.