From d7d66d7d4523b904c8ccc6aea3709dc0d5aa5bdc Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 19 Apr 2018 06:28:01 +0200 Subject: bsps: Move console drivers to bsps This patch is a part of the BSP source reorganization. Update #3285. --- c/src/lib/libbsp/or1k/generic_or1k/Makefile.am | 4 +- .../or1k/generic_or1k/console/console-config.c | 55 -------- c/src/lib/libbsp/or1k/generic_or1k/console/uart.c | 152 --------------------- 3 files changed, 2 insertions(+), 209 deletions(-) delete mode 100644 c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c delete mode 100644 c/src/lib/libbsp/or1k/generic_or1k/console/uart.c (limited to 'c/src/lib/libbsp/or1k') diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am index 4f1fbe083b..dd8b7a5c75 100644 --- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am +++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am @@ -51,8 +51,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.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 +librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/console/console-config.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/console/uart.c # Timer librtemsbsp_a_SOURCES += timer/timer.c diff --git a/c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c b/c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c deleted file mode 100644 index 5fc75dcf0c..0000000000 --- a/c/src/lib/libbsp/or1k/generic_or1k/console/console-config.c +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file - * - * @ingroup generic_or1k_uart - * - * @brief Console Configuration. - */ - -/* - * Copyright (c) 2014-2015 Hesham ALMatary - * - * 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 - -#include - -#include -#include -#include - -console_tbl Console_Configuration_Ports [] = { - { - .sDeviceName = "/dev/ttyS0", - .deviceType = SERIAL_CUSTOM, - .pDeviceFns = &generic_or1k_uart_fns, - .deviceProbe = NULL, - .pDeviceFlow = NULL, - .ulCtrlPort1 = OR1K_BSP_UART_BASE, - .ulCtrlPort2 = 0, - .ulClock = OR1K_UART_DEFAULT_BAUD, - .ulIntVector = OR1K_BSP_UART_IRQ - } -}; - -#define PORT_COUNT \ - (sizeof(Console_Configuration_Ports) \ - / sizeof(Console_Configuration_Ports [0])) - -unsigned long Console_Configuration_Count = PORT_COUNT; - -static void output_char(char c) -{ - const console_fns *con = - Console_Configuration_Ports [Console_Port_Minor].pDeviceFns; - - con->deviceWritePolled((int) Console_Port_Minor, c); -} - -BSP_output_char_function_type BSP_output_char = output_char; - -BSP_polling_getchar_function_type BSP_poll_char = NULL; diff --git a/c/src/lib/libbsp/or1k/generic_or1k/console/uart.c b/c/src/lib/libbsp/or1k/generic_or1k/console/uart.c deleted file mode 100644 index 6f8a49443d..0000000000 --- a/c/src/lib/libbsp/or1k/generic_or1k/console/uart.c +++ /dev/null @@ -1,152 +0,0 @@ -/** - * @file - * - * @ingroup generic_or1k_uart - * - * @brief UART support. - */ - -/* - * COPYRIGHT (c) 2014-2015 Hesham ALMatary - * - * 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 -#include -#include -#include -#include -#include - -static void uart_initialize(int minor); -static int uart_first_open(int major, int minor, void *arg); -static int uart_last_close(int major, int minor, void *arg); -static int uart_read_polled(int minor); -static ssize_t uart_write(int minor, const char *buf, size_t len); -static void uart_write_polled(int minor, char c); -static int uart_set_attributes(int minor, const struct termios *t); - -#if 0 -/* - * These will be useful when the driver supports interrupt driven IO. - */ -static rtems_vector_number uart_get_irq_number(const console_tbl *ct) -{ - return ct->ulIntVector; -} - -static uint32_t uart_get_baud(const console_tbl *ct) -{ - return ct->ulClock; -} -#endif - -static void uart_set_baud(int baud) -{ - uint16_t divisor = (OR1K_BSP_CLOCK_FREQ) / (16 * baud); - OR1K_REG(OR1K_BSP_UART_REG_LINE_CTRL) = - OR1K_BSP_UART_REG_LINE_CTRL_DLAB; - - OR1K_REG(OR1K_BSP_UART_REG_DEV_LATCH_LOW) = divisor & 0xff; - - OR1K_REG(OR1K_BSP_UART_REG_DEV_LATCH_HIGH) = - (divisor >> 8); -} - -static void uart_initialize(int minor) -{ - /* Set baud rate */ - uart_set_baud(OR1K_UART_DEFAULT_BAUD); - - /* Set data pattern configuration */ - OR1K_REG(OR1K_BSP_UART_REG_LINE_CTRL) = - OR1K_BSP_UART_REG_LINE_CTRL_WLEN8; - - /* Reset receiver and transmitter */ - OR1K_REG(OR1K_BSP_UART_REG_FIFO_CTRL) = - OR1K_BSP_UART_REG_FIFO_CTRL_ENABLE_FIFO | - OR1K_BSP_UART_REG_FIFO_CTRL_CLEAR_RCVR | - OR1K_BSP_UART_REG_FIFO_CTRL_TRIGGER_14; - - /* Disable all interrupts */ - OR1K_REG(OR1K_BSP_UART_REG_INT_ENABLE) = 0x00; - -} - -static int uart_first_open(int major, int minor, void *arg) -{ - rtems_libio_open_close_args_t *oc = (rtems_libio_open_close_args_t *) arg; - struct rtems_termios_tty *tty = (struct rtems_termios_tty *) oc->iop->data1; - const console_tbl *ct = Console_Port_Tbl [minor]; - console_data *cd = &Console_Port_Data [minor]; - - cd->termios_data = tty; - rtems_termios_set_initial_baud(tty, ct->ulClock); - - return 0; -} - -static int uart_last_close(int major, int minor, void *arg) -{ - return 0; -} - -static int uart_read_polled(int minor) -{ - unsigned char lsr; - - /* Get a character when avaiable */ - do { - lsr = OR1K_REG(OR1K_BSP_UART_REG_LINE_STATUS); - } while ((lsr & OR1K_BSP_UART_REG_LINE_STATUS_DR) - != OR1K_BSP_UART_REG_LINE_STATUS_DR); - - return OR1K_REG(OR1K_BSP_UART_REG_RX); -} - -static void uart_write_polled(int minor, char c) -{ - unsigned char lsr; - - /* Wait until there is no pending data in the transmitter FIFO (empty) */ - do { - lsr = OR1K_REG(OR1K_BSP_UART_REG_LINE_STATUS); - } while (!(lsr & OR1K_BSP_UART_REG_LINE_STATUS_THRE)); - - OR1K_REG(OR1K_BSP_UART_REG_TX) = c; -} - -static ssize_t uart_write( - int minor, - const char *s, - size_t n -) -{ - ssize_t i = 0; - - for (i = 0; i < n; ++i){ - uart_write_polled(minor, s [i]); - } - - return n; -} - -static int uart_set_attributes(int minor, const struct termios *term) -{ - return -1; -} - -const console_fns generic_or1k_uart_fns = { - .deviceProbe = libchip_serial_default_probe, - .deviceFirstOpen = uart_first_open, - .deviceLastClose = uart_last_close, - .deviceRead = uart_read_polled, - .deviceWrite = uart_write, - .deviceInitialize = uart_initialize, - .deviceWritePolled = uart_write_polled, - .deviceSetAttributes = uart_set_attributes, - .deviceOutputUsesInterrupts = false -}; -- cgit v1.2.3