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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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 );
Note: See TracChangeset for help on using the changeset viewer.