bsps: Move console drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

6 files changed, 3 insertions, 451 deletions

diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index a1fedd768e..b47be73d17 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -25,7 +25,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/TLL6527M/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/TLL6527M/start/interrupt.c
 
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/console/console.c b/c/src/lib/libbsp/bfin/TLL6527M/console/console.c
deleted file mode 100644
index 1871bdbb9d..0000000000
--- a/c/src/lib/libbsp/bfin/TLL6527M/console/console.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- *@file console.c
- *
- *@brief
- *  - This file implements uart console for TLL6527M. TLL6527M has BF527 with
- *  second uart (uart-1) connected to the console.
- *
- * Target:   TLL6527v1-0
- * Compiler:
- *
- * COPYRIGHT (c) 2010 by ECE Northeastern University.
- *
- * 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
- *
- * @author Rohan Kangralkar, ECE, Northeastern University
- *         (kangralkar.r@husky.neu.edu)
- *
- * LastChange:
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <bsp.h>
-#include <rtems/bspIo.h>
-#include <rtems/console.h>
-
-#include <bsp/interrupt.h>
-#include <libcpu/uart.h>
-
-/***************************************************
-LOCAL DEFINES
- ***************************************************/
-
-
-/***************************************************
-STATIC GLOBALS
- ***************************************************/
-/**
- * Declaration of UART
- */
-static bfin_uart_channel_t channels[] = {
-  {"/dev/console",
-    UART1_BASE_ADDRESS,
-    DMA10_BASE_ADDRESS,
-    DMA11_BASE_ADDRESS,
-    CONSOLE_USE_INTERRUPTS,
-    UART_USE_DMA,
-    CONSOLE_BAUDRATE,
-    NULL,
-    0,
-    0}
-};
-
-/**
- * Over all configuration
- */
-static bfin_uart_config_t config = {
-    SCLK,
-    sizeof(channels) / sizeof(channels[0]),
-    channels
-};
-
-
-#if CONSOLE_USE_INTERRUPTS
-/**
- * The Rx and Tx isr will get the same argument
- * The isr will have to find if it was the rx that caused the interrupt or
- * the tx
- */
-static bfin_isr_t bfinUARTISRs[] = {
-#if UART_USE_DMA
-    /* For First uart */
-    {IRQ_DMA10_UART1_RX, bfinUart_rxDmaIsr, (void *)&channels[0], 0},
-    {IRQ_DMA11_UART1_TX, bfinUart_txDmaIsr, (void *)&channels[0], 0},
-    /* For second uart */
-#else
-    /* For First uart */
-    {IRQ_DMA10_UART1_RX, bfinUart_rxIsr, &channels[0], 0},
-    {IRQ_DMA11_UART1_TX, bfinUart_txIsr, &channels[0], 0},
-    /* For second uart */
-#endif
-};
-#endif
-
-
-static void TLL6527_BSP_output_char(char c) {
-
-  bfin_uart_poll_write(0, c);
-}
-
-static int TLL6527_BSP_poll_char(void) {
-
-  return bfin_uart_poll_read(0);
-}
-
-BSP_output_char_function_type     BSP_output_char = TLL6527_BSP_output_char;
-BSP_polling_getchar_function_type BSP_poll_char   = TLL6527_BSP_poll_char;
-
-
-
-rtems_device_driver console_close(rtems_device_major_number major,
-    rtems_device_minor_number minor,
-    void *arg) {
-
-  return rtems_termios_close(arg);
-}
-
-rtems_device_driver console_read(rtems_device_major_number major,
-    rtems_device_minor_number minor,
-    void *arg) {
-
-  return rtems_termios_read(arg);
-}
-
-rtems_device_driver console_write(rtems_device_major_number major,
-    rtems_device_minor_number minor,
-    void *arg) {
-
-  return rtems_termios_write(arg);
-}
-
-rtems_device_driver console_control(rtems_device_major_number major,
-    rtems_device_minor_number minor,
-    void *arg) {
-
-  return rtems_termios_ioctl(arg);
-}
-
-
-
-/*
- *  Open entry point
- */
-rtems_device_driver console_open(rtems_device_major_number major,
-    rtems_device_minor_number minor,
-    void *arg) {
-
-  return bfin_uart_open(major, minor, arg);
-}
-
-
-
-/**
- *
- * This routine initializes the console IO driver.
- *
- * Parameters
- * @param major major number
- * @param minor minor number
- *
- * Output parameters:  NONE
- *
- * @return void
- */
-rtems_device_driver console_initialize(rtems_device_major_number major,
-    rtems_device_minor_number minor,
-    void *arg) {
-  rtems_status_code status = RTEMS_NOT_DEFINED;
-#if CONSOLE_USE_INTERRUPTS
-  int               i      = 0;
-#endif
-
-  status = bfin_uart_initialize(major, &config);
-  if (status != RTEMS_SUCCESSFUL) {
-    rtems_fatal_error_occurred(status);
-  }
-
-#if CONSOLE_USE_INTERRUPTS
-  for (i = 0; i < sizeof(bfinUARTISRs) / sizeof(bfinUARTISRs[0]); i++) {
-    bfin_interrupt_register(&bfinUARTISRs[i]);
-#if INTERRUPT_USE_TABLE
-#else
-    bfin_interrupt_enable(&bfinUARTISRs[i], 1);
-#endif
-  }
-#endif
-
-  return RTEMS_SUCCESSFUL;
-}
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index d86fd55243..e8c3e183f2 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
-librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/bf537Stamp/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/interrupt.c
 
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c b/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c
deleted file mode 100644
index e9fe24cda1..0000000000
--- a/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*  Console driver for bf537Stamp
- */
-
-/*
- *  Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA
- *             written by Allan Hessenflow <allanh@kallisti.com>
- *
- *  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 <rtems.h>
-#include <rtems/libio.h>
-#include <bsp.h>
-#include <rtems/bspIo.h>
-#include <rtems/console.h>
-
-#include <libcpu/bf537.h>
-#include <libcpu/interrupt.h>
-#include <libcpu/uart.h>
-
-/*
-#undef CONSOLE_USE_INTERRUPTS
-#define CONSOLE_USE_INTERRUPTS 1
-*/
-
-static bfin_uart_channel_t channels[] = {
-    {"/dev/console",
-     UART0_BASE_ADDRESS,
-     0,
-     0,
-     CONSOLE_USE_INTERRUPTS,
-     0,
-  #ifdef CONSOLE_FORCE_BAUD
-     CONSOLE_FORCE_BAUD,
-  #else
-     0,
-  #endif
-     NULL,
-     0,
-     0}
-
-#if (!BFIN_ON_SKYEYE)
-,
-  {"/dev/tty1",
-   UART1_BASE_ADDRESS,
-   CONSOLE_USE_INTERRUPTS,
-   0,
-   NULL,
-   0}
-#endif
-};
-
-static bfin_uart_config_t config = {
-  SCLK,
-  sizeof(channels) / sizeof(channels[0]),
-  channels
-};
-
-#if CONSOLE_USE_INTERRUPTS
-static bfin_isr_t bfinUARTISRs[] = {
-  {SIC_DMA8_UART0_RX_VECTOR, bfinUart_rxIsr, 0, 0, NULL},
-  {SIC_DMA10_UART1_RX_VECTOR, bfinUart_rxIsr, 0, 0, NULL},
-  {SIC_DMA9_UART0_TX_VECTOR, bfinUart_txIsr, 0, 0, NULL},
-  {SIC_DMA11_UART1_TX_VECTOR, bfinUart_txIsr, 0, 0, NULL}
-};
-#endif
-
-
-static void bf537Stamp_BSP_output_char(char c) {
-
-  bfin_uart_poll_write(0, c);
-}
-
-static int bf537Stamp_BSP_poll_char(void) {
-
-  return bfin_uart_poll_read(0);
-}
-
-BSP_output_char_function_type BSP_output_char = bf537Stamp_BSP_output_char;
-BSP_polling_getchar_function_type BSP_poll_char = bf537Stamp_BSP_poll_char;
-
-rtems_device_driver console_initialize(rtems_device_major_number major,
-                                       rtems_device_minor_number minor,
-                                       void *arg) {
-  rtems_status_code status;
-#if CONSOLE_USE_INTERRUPTS
-  int i;
-#endif
-
-  status = bfin_uart_initialize(major, &config);
-#if CONSOLE_USE_INTERRUPTS
-  for (i = 0; i < sizeof(bfinUARTISRs) / sizeof(bfinUARTISRs[0]); i++) {
-    bfin_interrupt_register(&bfinUARTISRs[i]);
-    bfin_interrupt_enable(&bfinUARTISRs[i], TRUE);
-  }
-#endif
-
-  if (status != RTEMS_SUCCESSFUL)
-    rtems_fatal_error_occurred(status);
-
-  return RTEMS_SUCCESSFUL;
-}
-
-rtems_device_driver console_open(rtems_device_major_number major,
-                                 rtems_device_minor_number minor,
-                                 void *arg) {
-
-  return bfin_uart_open(major, minor, arg);
-}
-
-rtems_device_driver console_close(rtems_device_major_number major,
-                                  rtems_device_minor_number minor,
-                                  void *arg) {
-
-  return rtems_termios_close(arg);
-}
-
-rtems_device_driver console_read(rtems_device_major_number major,
-                                 rtems_device_minor_number minor,
-                                 void *arg) {
-
-  return rtems_termios_read(arg);
-}
-
-rtems_device_driver console_write(rtems_device_major_number major,
-                                  rtems_device_minor_number minor,
-                                  void *arg) {
-
-  return rtems_termios_write(arg);
-}
-
-rtems_device_driver console_control(rtems_device_major_number major,
-                                    rtems_device_minor_number minor,
-                                    void *arg) {
-
-  return rtems_termios_ioctl(arg);
-}
-
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index f74b1d6710..d5a0685958 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
-librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/eZKit533/console/console-io.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/interrupt.c
 
diff --git a/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c b/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c
deleted file mode 100644
index 5bafb3a094..0000000000
--- a/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*  console-io.c
- *
- *  This file contains the hardware specific portions of the TTY driver
- *  for the serial ports for ezkit533.
- *
- *  Copyright (c) 2006 by Atos Automacao Industrial Ltda.
- *             written by Alain Schaefer <alain.schaefer@easc.ch>
- *                    and Antonio Giovanini <antonio@atos.com.br>
- *
- *  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 <rtems.h>
-#include <rtems/libio.h>
-#include <bsp.h>
-#include <rtems/bspIo.h>
-#include <rtems/console.h>
-
-#include <libcpu/bf533.h>
-#include <libcpu/interrupt.h>
-#include <libcpu/uart.h>
-
-static bfin_uart_channel_t channels[] = {
-  {"/dev/console",
-   UART0_BASE_ADDRESS,
-   0,
-   0,
-   CONSOLE_USE_INTERRUPTS,
-   0,
-#ifdef CONSOLE_FORCE_BAUD
-   CONSOLE_FORCE_BAUD,
-#else
-   0,
-#endif
-   NULL,
-   0,
-   0}
-};
-
-static bfin_uart_config_t config = {
-  SCLK,
-  sizeof(channels) / sizeof(channels[0]),
-  channels
-};
-
-#if CONSOLE_USE_INTERRUPTS
-static bfin_isr_t bfinUARTISRs[] = {
-  {SIC_DMA6_UART0_RX_VECTOR, bfinUart_rxIsr, 0, 0, NULL},
-  {SIC_DMA7_UART0_TX_VECTOR, bfinUart_txIsr, 0, 0, NULL},
-};
-#endif
-
-
-static void eZKit533_BSP_output_char(char c) {
-
-  bfin_uart_poll_write(0, c);
-}
-
-static int eZKit533_BSP_poll_char(void) {
-
-  return bfin_uart_poll_read(0);
-}
-
-BSP_output_char_function_type BSP_output_char = eZKit533_BSP_output_char;
-BSP_polling_getchar_function_type BSP_poll_char = eZKit533_BSP_poll_char;
-
-rtems_device_driver console_initialize(rtems_device_major_number major,
-                                       rtems_device_minor_number minor,
-                                       void *arg) {
-  rtems_status_code status;
-#if CONSOLE_USE_INTERRUPTS
-  int i;
-#endif
-
-  status = bfin_uart_initialize(major, &config);
-#if CONSOLE_USE_INTERRUPTS
-  for (i = 0; i < sizeof(bfinUARTISRs) / sizeof(bfinUARTISRs[0]); i++) {
-    bfin_interrupt_register(&bfinUARTISRs[i]);
-    bfin_interrupt_enable(&bfinUARTISRs[i], TRUE);
-  }
-#endif
-
-  if (status != RTEMS_SUCCESSFUL)
-    rtems_fatal_error_occurred(status);
-
-  return RTEMS_SUCCESSFUL;
-}
-
-rtems_device_driver console_open(rtems_device_major_number major,
-                                 rtems_device_minor_number minor,
-                                 void *arg) {
-
-  return bfin_uart_open(major, minor, arg);
-}
-
-rtems_device_driver console_close(rtems_device_major_number major,
-                                  rtems_device_minor_number minor,
-                                  void *arg) {
-
-  return rtems_termios_close(arg);
-}
-
-rtems_device_driver console_read(rtems_device_major_number major,
-                                 rtems_device_minor_number minor,
-                                 void *arg) {
-
-  return rtems_termios_read(arg);
-}
-
-rtems_device_driver console_write(rtems_device_major_number major,
-                                  rtems_device_minor_number minor,
-                                  void *arg) {
-
-  return rtems_termios_write(arg);
-}
-
-rtems_device_driver console_control(rtems_device_major_number major,
-                                    rtems_device_minor_number minor,
-                                    void *arg) {
-
-  return rtems_termios_ioctl(arg);
-}
-