[rtems commit] bsp/gensh4: Move libcpu files to BSP
Sebastian Huber
sebh at rtems.org
Fri Dec 8 13:14:44 UTC 2017
Module: rtems
Branch: master
Commit: f2969b5392e131528ac76b3d3ca877faf3535e34
Changeset: http://git.rtems.org/rtems/commit/?id=f2969b5392e131528ac76b3d3ca877faf3535e34
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri Dec 8 13:37:19 2017 +0100
bsp/gensh4: Move libcpu files to BSP
Update #3254.
---
c/src/lib/libbsp/sh/gensh4/Makefile.am | 21 +-
.../sh/sh7750 => libbsp/sh/gensh4}/clock/ckinit.c | 0
.../sci => libbsp/sh/gensh4/console}/sh4uart.c | 0
.../sh/gensh4}/include/rtems/score/iosh7750.h | 0
.../sh/gensh4}/include/rtems/score/ipl.h | 0
.../sh/gensh4}/include/rtems/score/ispsh7750.h | 0
.../sh/gensh4}/include/rtems/score/sh4_regs.h | 0
.../sh/gensh4}/include/rtems/score/sh7750_regs.h | 0
.../sh/gensh4}/include/sh/sh4uart.h | 0
c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg | 1 -
c/src/lib/libbsp/sh/gensh4/preinstall.am | 34 ++
.../score => libbsp/sh/gensh4/startup}/cpu_asm.c | 0
.../score => libbsp/sh/gensh4/startup}/ispsh7750.c | 0
.../sh/sh7750 => libbsp/sh/gensh4}/timer/timer.c | 0
c/src/lib/libcpu/sh/Makefile.am | 38 --
c/src/lib/libcpu/sh/configure.ac | 2 -
c/src/lib/libcpu/sh/preinstall.am | 43 --
c/src/lib/libcpu/sh/sh7750/sci/console.c | 460 ---------------------
18 files changed, 49 insertions(+), 550 deletions(-)
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index a1c8c85..4897d32 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
include $(top_srcdir)/../../../../automake/compile.am
+include_shdir = $(includedir)/sh
+include_rtems_scoredir = $(includedir)/rtems/score
include_bspdir = $(includedir)/bsp
dist_project_lib_DATA = bsp_specs
@@ -9,6 +11,14 @@ dist_project_lib_DATA = bsp_specs
include_HEADERS = include/bsp.h
include_HEADERS += include/tm27.h
+include_sh_HEADERS = include/sh/sh4uart.h
+
+include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h
+include_rtems_score_HEADERS += include/rtems/score/ipl.h
+include_rtems_score_HEADERS += include/rtems/score/iosh7750.h
+include_rtems_score_HEADERS += include/rtems/score/ispsh7750.h
+include_rtems_score_HEADERS += include/rtems/score/sh4_regs.h
+
nodist_include_HEADERS = include/bspopts.h
nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
@@ -33,17 +43,16 @@ libbsp_a_SOURCES += \
../../shared/getentropy-cpucounter.c \
../../shared/gnatinstallhandler.c ../shared/bsphwinit.c
libbsp_a_SOURCES += ../../shared/bspreset.c
+libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7750.c
+libbsp_a_SOURCES += clock/ckinit.c
+libbsp_a_SOURCES += timer/timer.c
# console
libbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c
+libbsp_a_SOURCES += console/sh4uart.c
# hw_init
libbsp_a_SOURCES += hw_init/hw_init.c
-libbsp_a_LIBADD = \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \
- ../../../libcpu/@RTEMS_CPU@/cache.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel
EXTRA_DIST = times
diff --git a/c/src/lib/libcpu/sh/sh7750/clock/ckinit.c b/c/src/lib/libbsp/sh/gensh4/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/clock/ckinit.c
rename to c/src/lib/libbsp/sh/gensh4/clock/ckinit.c
diff --git a/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c b/c/src/lib/libbsp/sh/gensh4/console/sh4uart.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c
rename to c/src/lib/libbsp/sh/gensh4/console/sh4uart.c
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/iosh7750.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/include/rtems/score/iosh7750.h
rename to c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ipl.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/include/rtems/score/ipl.h
rename to c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h
rename to c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh4_regs.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh4_regs.h
rename to c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh7750_regs.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh7750_regs.h
rename to c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h b/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h
rename to c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h
diff --git a/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg b/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg
index 4eb20f9..016262f 100644
--- a/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg
+++ b/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg
@@ -9,7 +9,6 @@
include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7750
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sh/gensh4/preinstall.am b/c/src/lib/libbsp/sh/gensh4/preinstall.am
index a8c5fbc..70723c3 100644
--- a/c/src/lib/libbsp/sh/gensh4/preinstall.am
+++ b/c/src/lib/libbsp/sh/gensh4/preinstall.am
@@ -28,6 +28,16 @@ $(PROJECT_INCLUDE)/$(dirstamp):
@: > $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/sh/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
+ @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
+ @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
@@ -45,6 +55,30 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
+$(PROJECT_INCLUDE)/sh/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h
+
+$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
+
+$(PROJECT_INCLUDE)/rtems/score/ipl.h: include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h
+
+$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
+
+$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
+
+$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
+
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
diff --git a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c b/c/src/lib/libbsp/sh/gensh4/startup/cpu_asm.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
rename to c/src/lib/libbsp/sh/gensh4/startup/cpu_asm.c
diff --git a/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c b/c/src/lib/libbsp/sh/gensh4/startup/ispsh7750.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c
rename to c/src/lib/libbsp/sh/gensh4/startup/ispsh7750.c
diff --git a/c/src/lib/libcpu/sh/sh7750/timer/timer.c b/c/src/lib/libbsp/sh/gensh4/timer/timer.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7750/timer/timer.c
rename to c/src/lib/libbsp/sh/gensh4/timer/timer.c
diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am
index 0566cac..c39db6e 100644
--- a/c/src/lib/libcpu/sh/Makefile.am
+++ b/c/src/lib/libcpu/sh/Makefile.am
@@ -9,43 +9,5 @@ cache_rel_SOURCES = ../shared/src/cache_manager.c
cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache
cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-if sh7750
-# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
-# file name conflicts
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_sh_HEADERS = sh7750/include/sh/sh4uart.h
-include_rtems_score_HEADERS = sh7750/include/rtems/score/sh7750_regs.h
-include_rtems_score_HEADERS += sh7750/include/rtems/score/ipl.h
-include_rtems_score_HEADERS += sh7750/include/rtems/score/iosh7750.h
-include_rtems_score_HEADERS += sh7750/include/rtems/score/ispsh7750.h
-include_rtems_score_HEADERS += sh7750/include/rtems/score/sh4_regs.h
-
-## sh7750/clock
-noinst_PROGRAMS += sh7750/clock.rel
-sh7750_clock_rel_SOURCES = sh7750/clock/ckinit.c
-sh7750_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7750_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7750/sci
-noinst_PROGRAMS += sh7750/sci.rel
-sh7750_sci_rel_SOURCES = sh7750/sci/sh4uart.c
-sh7750_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7750_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7750/score
-noinst_PROGRAMS += sh7750/score.rel
-sh7750_score_rel_SOURCES = sh7750/score/cpu_asm.c sh7750/score/ispsh7750.c
-sh7750_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7750_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7750/timer
-noinst_PROGRAMS += sh7750/timer.rel
-sh7750_timer_rel_SOURCES = sh7750/timer/timer.c
-sh7750_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7750_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/configure.ac b/c/src/lib/libcpu/sh/configure.ac
index 4eb5717..43d10f4 100644
--- a/c/src/lib/libcpu/sh/configure.ac
+++ b/c/src/lib/libcpu/sh/configure.ac
@@ -19,8 +19,6 @@ AM_PROG_CC_C_O
RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
-AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"])
-
RTEMS_AMPOLISH3
# Explicitly list all Makefiles here
diff --git a/c/src/lib/libcpu/sh/preinstall.am b/c/src/lib/libcpu/sh/preinstall.am
index 62de4d7..dba6cc4 100644
--- a/c/src/lib/libcpu/sh/preinstall.am
+++ b/c/src/lib/libcpu/sh/preinstall.am
@@ -5,46 +5,3 @@ $(srcdir)/preinstall.am: Makefile.am
$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
endif
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-if sh7750
-$(PROJECT_INCLUDE)/sh/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
- @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sh/sh4uart.h: sh7750/include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: sh7750/include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
-
-$(PROJECT_INCLUDE)/rtems/score/ipl.h: sh7750/include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: sh7750/include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: sh7750/include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: sh7750/include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
-endif
diff --git a/c/src/lib/libcpu/sh/sh7750/sci/console.c b/c/src/lib/libcpu/sh/sh7750/sci/console.c
deleted file mode 100644
index 0325813..0000000
--- a/c/src/lib/libcpu/sh/sh7750/sci/console.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Console driver for SH-4 UART modules
- *
- * Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russia
- * Author: Alexandra Kossovsky <sasha at oktet.ru>
- *
- * COPYRIGHT (c) 1989-1998.
- * 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 <termios.h>
-#include <rtems/libio.h>
-#include "sh/sh4uart.h"
-
-/* Descriptor structures for two on-chip UART channels */
-sh4uart sh4_uarts[2];
-
-/* Console operations mode:
- * 0 - raw (non-termios) polled input/output
- * 1 - termios-based polled input/output
- * 2 - termios-based interrupt-driven input/output
- * 3 - non-termios over gdb stub
- */
-int console_mode = 3;
-#define CONSOLE_MODE_RAW (0)
-#define CONSOLE_MODE_POLL (1)
-#define CONSOLE_MODE_INT (2)
-#define CONSOLE_MODE_IPL (3)
-
-/* Wrapper functions for SH-4 UART generic driver */
-
-/* console_poll_read --
- * wrapper for poll read function
- *
- * PARAMETERS:
- * minor - minor device number
- *
- * RETURNS:
- * character code readed from UART, or -1 if there is no characters
- * available
- */
-static int
-console_poll_read(int minor)
-{
- return sh4uart_poll_read(&sh4_uarts[minor]);
-}
-
-/* console_interrupt_write --
- * wrapper for interrupt write function
- *
- * PARAMETERS:
- * minor - minor device number
- * buf - output buffer
- * len - output buffer length
- *
- * RETURNS:
- * result code
- */
-static int
-console_interrupt_write(int minor, const char *buf, int len)
-{
- return sh4uart_interrupt_write(&sh4_uarts[minor], buf, len);
-}
-
-/* console_poll_write --
- * wrapper for polling mode write function
- *
- * PARAMETERS:
- * minor - minor device number
- * buf - output buffer
- * len - output buffer length
- *
- * RETURNS:
- * result code
- */
-static int
-console_poll_write(int minor, const char *buf, int len)
-{
- return sh4uart_poll_write(&sh4_uarts[minor], buf, len);
-}
-
-/* console_set_attributes --
- * wrapper for hardware-dependent termios attributes setting
- *
- * PARAMETERS:
- * minor - minor device number
- * t - pointer to the termios structure
- *
- * RETURNS:
- * result code
- */
-static int
-console_set_attributes(int minor, const struct termios *t)
-{
- return sh4uart_set_attributes(&sh4_uarts[minor], t);
-}
-
-/* console_stop_remote_tx --
- * wrapper for stopping data flow from remote party.
- *
- * PARAMETERS:
- * minor - minor device number
- *
- * RETURNS:
- * result code
- */
-static int
-console_stop_remote_tx(int minor)
-{
- if (minor < sizeof(sh4_uarts)/sizeof(sh4_uarts[0]))
- return sh4uart_stop_remote_tx(&sh4_uarts[minor]);
- else
- return RTEMS_INVALID_NUMBER;
-}
-
-/* console_start_remote_tx --
- * wrapper for resuming data flow from remote party.
- *
- * PARAMETERS:
- * minor - minor device number
- *
- */
-static int
-console_start_remote_tx(int minor)
-{
- if (minor < sizeof(sh4_uarts)/sizeof(sh4_uarts[0]))
- return sh4uart_start_remote_tx(&sh4_uarts[minor]);
- else
- return RTEMS_INVALID_NUMBER;
-}
-
-/* console_first_open --
- * wrapper for UART controller initialization functions
- *
- * PARAMETERS:
- * major - major device number
- * minor - minor device number
- * arg - libio device open argument
- *
- * RETURNS:
- * error code
- */
-static int
-console_first_open(int major, int minor, void *arg)
-{
- rtems_libio_open_close_args_t *args = arg;
- rtems_status_code sc;
-
- sc = sh4uart_init(&sh4_uarts[minor], /* uart */
- args->iop->data1, /* tty */
- minor+1, /* channel */
- (console_mode == CONSOLE_MODE_INT));
-
- if (sc == RTEMS_SUCCESSFUL)
- sc = sh4uart_reset(&sh4_uarts[minor]);
-
- return sc;
-}
-
-/* console_last_close --
- * wrapper for UART controller close function
- *
- * PARAMETERS:
- * major - major device number
- * minor - minor device number
- * arg - libio device close argument
- *
- * RETURNS:
- * error code
- */
-static int
-console_last_close(int major, int minor, void *arg)
-{
- return sh4uart_disable(&sh4_uarts[minor]);
-}
-
-/* console_initialize --
- * This routine initializes the console IO drivers and register devices
- * in RTEMS I/O system.
- *
- * PARAMETERS:
- * major - major console device number
- * minor - minor console device number (not used)
- * arg - device initialize argument
- *
- * RETURNS:
- * RTEMS error code (RTEMS_SUCCESSFUL if device initialized successfuly)
- */
-rtems_device_driver
-console_initialize(rtems_device_major_number major,
- rtems_device_minor_number minor,
- void *arg)
-{
- rtems_status_code status;
-
-#ifdef SH4_WITH_IPL
- /* booting from flash we cannot have IPL console */
- if (boot_mode != SH4_BOOT_MODE_IPL && console_mode == CONSOLE_MODE_IPL)
- console_mode = CONSOLE_MODE_INT;
-
- /* break out from gdb if neccessary */
- if (boot_mode == SH4_BOOT_MODE_IPL && console_mode != CONSOLE_MODE_IPL)
- ipl_finish();
-#endif
-
- /*
- * Set up TERMIOS
- */
- if ((console_mode != CONSOLE_MODE_RAW) &&
- (console_mode != CONSOLE_MODE_IPL))
- rtems_termios_initialize ();
-
- /*
- * Register the devices
- */
- status = rtems_io_register_name ("/dev/console", major, 0);
- if (status != RTEMS_SUCCESSFUL)
- rtems_fatal_error_occurred (status);
-
- status = rtems_io_register_name ("/dev/aux", major, 1);
- if (status != RTEMS_SUCCESSFUL)
- rtems_fatal_error_occurred (status);
-
- if (console_mode == CONSOLE_MODE_RAW)
- {
- rtems_status_code sc;
- sc = sh4uart_init(&sh4_uarts[0], /* uart */
- NULL, /* tty */
- 1, /* UART channel number */
- 0); /* Poll-mode */
-
- if (sc == RTEMS_SUCCESSFUL)
- sc = sh4uart_reset(&sh4_uarts[0]);
-
- sc = sh4uart_init(&sh4_uarts[1], /* uart */
- NULL, /* tty */
- 2, /* UART channel number */
- 0); /* Poll-mode */
-
- if (sc == RTEMS_SUCCESSFUL)
- sc = sh4uart_reset(&sh4_uarts[1]);
-
- return sc;
- }
-
- return RTEMS_SUCCESSFUL;
-}
-
-/* console_open --
- * Open console device driver. Pass appropriate termios callback
- * functions to termios library.
- *
- * PARAMETERS:
- * major - major device number for console devices
- * minor - minor device number for console
- * arg - device opening argument
- *
- * RETURNS:
- * RTEMS error code
- */
-rtems_device_driver
-console_open(rtems_device_major_number major,
- rtems_device_minor_number minor,
- void *arg)
-{
- static const rtems_termios_callbacks intr_callbacks = {
- console_first_open, /* firstOpen */
- console_last_close, /* lastClose */
- NULL, /* pollRead */
- console_interrupt_write, /* write */
- console_set_attributes, /* setAttributes */
- console_stop_remote_tx, /* stopRemoteTx */
- console_start_remote_tx, /* startRemoteTx */
- 1 /* outputUsesInterrupts */
- };
- static const rtems_termios_callbacks poll_callbacks = {
- console_first_open, /* firstOpen */
- console_last_close, /* lastClose */
- console_poll_read, /* pollRead */
- console_poll_write, /* write */
- console_set_attributes, /* setAttributes */
- console_stop_remote_tx, /* stopRemoteTx */
- console_start_remote_tx, /* startRemoteTx */
- 0 /* outputUsesInterrupts */
- };
-
- switch (console_mode)
- {
- case CONSOLE_MODE_RAW:
- case CONSOLE_MODE_IPL:
- return RTEMS_SUCCESSFUL;
-
- case CONSOLE_MODE_INT:
- return rtems_termios_open(major, minor, arg, &intr_callbacks);
-
- case CONSOLE_MODE_POLL:
- return rtems_termios_open(major, minor, arg, &poll_callbacks);
-
- default:
- rtems_fatal_error_occurred(0xC07A1310);
- }
-
- return RTEMS_INTERNAL_ERROR;
-}
-
-/* console_close --
- * Close console device.
- *
- * PARAMETERS:
- * major - major device number for console devices
- * minor - minor device number for console
- * arg - device close argument
- *
- * RETURNS:
- * RTEMS error code
- */
-rtems_device_driver
-console_close(rtems_device_major_number major,
- rtems_device_minor_number minor,
- void *arg)
-{
- if ((console_mode != CONSOLE_MODE_RAW) &&
- (console_mode != CONSOLE_MODE_IPL))
- return rtems_termios_close (arg);
- else
- return RTEMS_SUCCESSFUL;
-}
-
-/* console_read --
- * Read from the console device
- *
- * PARAMETERS:
- * major - major device number for console devices
- * minor - minor device number for console
- * arg - device read argument
- *
- * RETURNS:
- * RTEMS error code
- */
-rtems_device_driver
-console_read(rtems_device_major_number major,
- rtems_device_minor_number minor,
- void *arg)
-{
- if ((console_mode != CONSOLE_MODE_RAW) &&
- (console_mode != CONSOLE_MODE_IPL))
- {
- return rtems_termios_read (arg);
- }
- else
- {
- rtems_libio_rw_args_t *argp = arg;
- char *buf = argp->buffer;
- int count = argp->count;
- int n = 0;
- int c;
- while (n < count)
- {
- do {
- c = (console_mode == CONSOLE_MODE_RAW) ?
- sh4uart_poll_read(&sh4_uarts[minor]) :
- ipl_console_poll_read(minor);
- } while (c == -1);
- if (c == '\r')
- c = '\n';
- *(buf++) = c;
- n++;
- if (c == '\n')
- break;
- }
- argp->bytes_moved = n;
- return RTEMS_SUCCESSFUL;
- }
-}
-
-/* console_write --
- * Write to the console device
- *
- * PARAMETERS:
- * major - major device number for console devices
- * minor - minor device number for console
- * arg - device write argument
- *
- * RETURNS:
- * RTEMS error code
- */
-rtems_device_driver
-console_write(rtems_device_major_number major,
- rtems_device_minor_number minor,
- void *arg)
-{
- switch (console_mode)
- {
- case CONSOLE_MODE_POLL:
- case CONSOLE_MODE_INT:
- return rtems_termios_write (arg);
- case CONSOLE_MODE_RAW:
- {
- rtems_libio_rw_args_t *argp = arg;
- char cr = '\r';
- char *buf = argp->buffer;
- int count = argp->count;
- int i;
-
- for (i = 0; i < count; i++)
- {
- if (*buf == '\n')
- sh4uart_poll_write(&sh4_uarts[minor], &cr, 1);
- sh4uart_poll_write(&sh4_uarts[minor], buf, 1);
- buf++;
- }
- argp->bytes_moved = count;
- return RTEMS_SUCCESSFUL;
- }
-#ifdef SH4_WITH_IPL
- case CONSOLE_MODE_IPL:
- {
- rtems_libio_rw_args_t *argp = arg;
- char *buf = argp->buffer;
- int count = argp->count;
- ipl_console_poll_write(minor, buf, count);
- argp->bytes_moved = count;
- return RTEMS_SUCCESSFUL;
- }
-#endif
- default: /* Unreachable */
- return RTEMS_NOT_DEFINED;
- }
-}
-
-/* console_control --
- * Handle console device I/O control (IOCTL)
- *
- * PARAMETERS:
- * major - major device number for console devices
- * minor - minor device number for console
- * arg - device ioctl argument
- *
- * RETURNS:
- * RTEMS error code
- */
-rtems_device_driver
-console_control(rtems_device_major_number major,
- rtems_device_minor_number minor,
- void *arg)
-{
- if ((console_mode != CONSOLE_MODE_RAW) &&
- (console_mode != CONSOLE_MODE_IPL))
- {
- return rtems_termios_ioctl (arg);
- }
- else
- {
- return RTEMS_SUCCESSFUL;
- }
-}
More information about the vc
mailing list