bsps: Move legacy console driver to bsps

This patch is a part of the BSP source reorganization.

Update #3285.
This commit is contained in:
Sebastian Huber
2018-04-05 17:07:20 +02:00
parent f0bcae383e
commit b43ea9fed2
33 changed files with 96 additions and 166 deletions

View File

@@ -28,7 +28,7 @@
#include <rtems/termiostypes.h>
#include <rtems/console.h>
#include <libchip/serial.h>
#include "console_private.h"
#include "legacy-console.h"
/*
* console_control

View File

@@ -27,7 +27,7 @@
#include <rtems/termiostypes.h>
#include <libchip/serial.h>
#include "console_private.h"
#include "legacy-console.h"
/*
* Method to return true if the device associated with the

View File

@@ -26,7 +26,7 @@
#include <rtems/termiostypes.h>
#include <libchip/serial.h>
#include "console_private.h"
#include "legacy-console.h"
unsigned long Console_Port_Count = 0;
console_tbl **Console_Port_Tbl = NULL;
@@ -372,3 +372,31 @@ rtems_device_driver console_initialize(
return RTEMS_SUCCESSFUL;
}
/*
* console_read
*
* This routine uses the termios driver to read a character.
*/
rtems_device_driver console_read(
rtems_device_major_number major,
rtems_device_minor_number minor,
void * arg
)
{
return rtems_termios_read (arg);
}
/*
* console_write
*
* this routine uses the termios driver to write a character.
*/
rtems_device_driver console_write(
rtems_device_major_number major,
rtems_device_minor_number minor,
void * arg
)
{
return rtems_termios_write (arg);
}

View File

@@ -65,12 +65,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
librtemsbsp_a_SOURCES += irq.c
# Console
librtemsbsp_a_SOURCES += ../../shared/console.c \
../../shared/console_select.c \
console/console-config.c \
../../shared/console_read.c \
../../shared/console_write.c \
../../shared/console_control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/console-config.c
# I2C
librtemsbsp_a_SOURCES += i2c/bbb-i2c.c

View File

@@ -39,9 +39,10 @@ librtemsbsp_a_SOURCES += startup/pmc.c
librtemsbsp_a_SOURCES += clock/clock.c
librtemsbsp_a_SOURCES += timer/timer.c
# console
librtemsbsp_a_SOURCES += ../../shared/console.c console/uarts.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/uarts.c
librtemsbsp_a_SOURCES += console/dbgu.c
librtemsbsp_a_SOURCES += console/usart.c
# IRQ

View File

@@ -30,9 +30,10 @@ librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
librtemsbsp_a_SOURCES += clock/clockdrv.c
librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
# console
librtemsbsp_a_SOURCES += console/uart.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/uart.c
# timer
librtemsbsp_a_SOURCES += timer/timer.c

View File

@@ -29,9 +29,10 @@ librtemsbsp_a_SOURCES += clock/clock.c
librtemsbsp_a_SOURCES += timer/timer.c
#console
librtemsbsp_a_SOURCES += console/uarts.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/uarts.c
librtemsbsp_a_SOURCES += console/ffuart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c

View File

@@ -56,11 +56,9 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
# Console
librtemsbsp_a_SOURCES += ../../shared/console.c
librtemsbsp_a_SOURCES += ../../shared/console_control.c
librtemsbsp_a_SOURCES += ../../shared/console_read.c
librtemsbsp_a_SOURCES += ../../shared/console_select.c
librtemsbsp_a_SOURCES += ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/console-config.c
librtemsbsp_a_SOURCES += console/uart.c

View File

@@ -69,10 +69,8 @@ librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
librtemsbsp_a_SOURCES += irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../shared/console.c
librtemsbsp_a_SOURCES += ../../shared/console_control.c
librtemsbsp_a_SOURCES += ../../shared/console_read.c
librtemsbsp_a_SOURCES += ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += console/console-config.c
librtemsbsp_a_SOURCES += console/console_select.c
librtemsbsp_a_SOURCES += console/usart.c

View File

@@ -26,7 +26,7 @@
#include <rtems/termiostypes.h>
#include <libchip/serial.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
#include <bsp/rpi-fb.h>
rtems_device_minor_number BSPPrintkPort = 0;

View File

@@ -31,14 +31,13 @@ librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
librtemsbsp_a_SOURCES += timer/timer.c
librtemsbsp_a_SOURCES += clock/clockdrv.c
# console
librtemsbsp_a_SOURCES += ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/uart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
librtemsbsp_a_SOURCES += irq/irq.c
# debugio
librtemsbsp_a_SOURCES += console/uart.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c

View File

@@ -34,12 +34,10 @@ librtemsbsp_a_SOURCES += timer/timer.c
librtemsbsp_a_SOURCES += clock/clockdrv.c
librtemsbsp_a_SOURCES += clock/support.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/uart.c
librtemsbsp_a_SOURCES += ../../shared/console.c
librtemsbsp_a_SOURCES += ../../shared/console_select.c
librtemsbsp_a_SOURCES += ../../shared/console_read.c
librtemsbsp_a_SOURCES += ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../shared/console_control.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
librtemsbsp_a_SOURCES += irq/irq.c

View File

@@ -56,11 +56,9 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
# Console
librtemsbsp_a_SOURCES += ../../shared/console.c
librtemsbsp_a_SOURCES += ../../shared/console_control.c
librtemsbsp_a_SOURCES += ../../shared/console_read.c
librtemsbsp_a_SOURCES += ../../shared/console_select.c
librtemsbsp_a_SOURCES += ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/console-config.c
librtemsbsp_a_SOURCES += console/usart.c

View File

@@ -81,10 +81,8 @@ librtemsbsp_a_SOURCES += console/serial_mouse_config.c
librtemsbsp_a_SOURCES += ../../i386/shared/comm/uart.c
librtemsbsp_a_SOURCES += ../../i386/shared/comm/tty_drv.c
librtemsbsp_a_SOURCES += ../../i386/shared/realmode_int/realmode_int.c
librtemsbsp_a_SOURCES += ../../shared/console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += console/console_select.c
librtemsbsp_a_SOURCES += ../../shared/console_read.c
librtemsbsp_a_SOURCES += ../../shared/console_write.c
librtemsbsp_a_SOURCES += console/console_control.c
librtemsbsp_a_SOURCES += console/conscfg.c
librtemsbsp_a_SOURCES += console/printk_support.c

View File

@@ -23,7 +23,7 @@
#include <rtems/vgacons.h>
#endif
#include <bsp/irq.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
#if BSP_ENABLE_VGA
#define VGA_CONSOLE_FUNCTIONS &vgacons_fns

View File

@@ -30,7 +30,7 @@
#if BSP_ENABLE_VGA
#include <rtems/keyboard.h>
#endif
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
/*
* console_control

View File

@@ -29,7 +29,7 @@
#include <rtems/termiostypes.h>
#include <bsp/bspimpl.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
#ifdef RTEMS_RUNTIME_CONSOLE_SELECT
#include <crt.h>
#endif

View File

@@ -27,7 +27,7 @@
#include <rtems/bspIo.h>
#include <rtems/pci.h>
#include <bsp/exar17d15x.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
#define MAX_BOARDS 4

View File

@@ -30,7 +30,7 @@
#include <libchip/ns16550.h>
#include <bsp/bspimpl.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
/*
* Used in the stub to print output.

View File

@@ -25,7 +25,7 @@
#include <bsp.h>
#include <libchip/serial.h>
#include <libchip/ns16550.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
rtems_device_minor_number BSPPrintkPort = 0;

View File

@@ -26,7 +26,7 @@
#include <rtems/bspIo.h>
#include <bsp/rtd316.h>
#include <rtems/score/i386.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
#define RTD_CLOCK_RATE (460800 * 32)

View File

@@ -15,7 +15,7 @@
#include <fcntl.h>
#include <libchip/serial.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
/* select which serial port the mouse is connected to */
#if defined(SERIAL_MOUSE_COM2)

View File

@@ -236,7 +236,7 @@ DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, NULL, NULL);
#include <libchip/ns16550.h>
#include <rtems/bspIo.h>
#include <rtems/pci.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
#define MAX_BOARDS 4

View File

@@ -12,7 +12,7 @@
#include <bsp/irq-generic.h>
#include <libchip/serial.h>
#include "../../../shared/console_private.h"
#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
int putDebugChar(int ch); /* write a single character */
int getDebugChar(void); /* read and return a single char */

View File

@@ -41,13 +41,11 @@ librtemsbsp_a_SOURCES += ../shared/clock/mips_timer.S
librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/conscfg.c
librtemsbsp_a_SOURCES += console/printk_support.c
librtemsbsp_a_SOURCES += ../../shared/console.c
librtemsbsp_a_SOURCES += ../../shared/console_select.c
librtemsbsp_a_SOURCES += ../../shared/console_read.c
librtemsbsp_a_SOURCES += ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../shared/console_control.c
# timer
librtemsbsp_a_SOURCES += ../../shared/timerstub.c

View File

@@ -51,11 +51,9 @@ librtemsbsp_a_SOURCES += ../../shared/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/src/stackalloc.c
# Console
librtemsbsp_a_SOURCES += ../../shared/console.c
librtemsbsp_a_SOURCES += ../../shared/console_control.c
librtemsbsp_a_SOURCES += ../../shared/console_read.c
librtemsbsp_a_SOURCES += ../../shared/console_select.c
librtemsbsp_a_SOURCES += ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/console-config.c
librtemsbsp_a_SOURCES += console/uart.c

View File

@@ -38,9 +38,10 @@ librtemsbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bspgetworkarea.c \
librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
# bspconsole
librtemsbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/consolelite.c
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c

View File

@@ -1,44 +0,0 @@
/**
* @file
*
* @ingroup Console
*
* @brief Generic libchip console read extension
*/
/*
* This file is an extension of the generic console driver
* shell used by all console drivers using libchip.
*
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
*/
#include <bsp.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
#include <termios.h>
#include <rtems/termiostypes.h>
#include <rtems/console.h>
#include <libchip/serial.h>
#include "console_private.h"
/*
* console_read
*
* This routine uses the termios driver to read a character.
*/
rtems_device_driver console_read(
rtems_device_major_number major,
rtems_device_minor_number minor,
void * arg
)
{
return rtems_termios_read (arg);
}

View File

@@ -1,44 +0,0 @@
/**
* @file
*
* @ingroup Console
*
* @brief Generic libchip console write extension
*/
/*
* This file is an extension of the generic console driver
* shell used by all console drivers using libchip.
*
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
*/
#include <bsp.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
#include <termios.h>
#include <rtems/termiostypes.h>
#include <rtems/console.h>
#include <libchip/serial.h>
#include "console_private.h"
/*
* console_write
*
* this routine uses the termios driver to write a character.
*/
rtems_device_driver console_write(
rtems_device_major_number major,
rtems_device_minor_number minor,
void * arg
)
{
return rtems_termios_write (arg);
}

View File

@@ -42,9 +42,10 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
# console
librtemsbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
librtemsbsp_a_SOURCES += console/erc32_console.c
# debugio
librtemsbsp_a_SOURCES += console/debugputs.c
# clock

View File

@@ -37,9 +37,10 @@ startup_SOURCES = startup/bspclean.c startup/m5op_sparc.S \
#clock_SOURCES = ../../shared/clock_driver_simidle.c
clock_SOURCES = ../shared/clock/ckinit.c
console_SOURCES = ../../shared/console.c ../shared/console/conscfg.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
console_SOURCES = ../shared/console/conscfg.c
console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
timer_SOURCES = ../../shared/timerstub.c

View File

@@ -50,9 +50,10 @@ mmu_SOURCES = \
#clock_SOURCES = ../../shared/clock_driver_simidle.c
clock_SOURCES = ../shared/clock/ckinit.c
console_SOURCES = ../../shared/console.c ../shared/console/conscfg.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
console_SOURCES = ../shared/console/conscfg.c
console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
timer_SOURCES = ../../shared/timerstub.c