diff options
Diffstat (limited to 'c/src/lib/libcpu/sh/sh7750/sci')
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7750/sci/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/c/src/lib/libcpu/sh/sh7750/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7750/sci/Makefile.am index e37a7e7984..03ce1e95c6 100644 --- a/c/src/lib/libcpu/sh/sh7750/sci/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7750/sci/Makefile.am @@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 PGM = $(ARCH)/sci.rel -C_FILES = console.c sh4uart.c +C_FILES = sh4uart.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -26,4 +26,8 @@ all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) +## FIXME: Moved to libbsp/sh/<BSP>/console/ +## Needs to be reworked to be usable here. +EXTRA_DIST = console.c + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c b/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c index 5c75b23a9f..d7ce0cb54d 100644 --- a/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c +++ b/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c @@ -1,9 +1,6 @@ /* * Generic UART Serial driver for SH-4 processors * - * This driver uses variable SH4_CPU_HZ_Frequency, - * which should be defined in bsp to HZ macro. - * * Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russian Fed. * Author: Alexandra Kossovsky <sasha@oktet.ru> * @@ -22,12 +19,17 @@ #include <rtems.h> #include <termios.h> #include <rtems/libio.h> -#include "sh/sh4uart.h" +#include <sh/sh4uart.h> #ifndef SH4_UART_INTERRUPT_LEVEL #define SH4_UART_INTERRUPT_LEVEL 4 #endif +/* FIXME: ??? +#define SH7750_SCSMR_CKS_S SH7750_SCSMR_CKS_DIV1 + */ +#define SH7750_SCSMR_CKS_S 0 + /* Forward function declarations */ static rtems_isr sh4uart1_interrupt_transmit(rtems_vector_number vec); @@ -86,7 +88,7 @@ rtems_unsigned32 sh4uart_get_Pph(void) { rtems_unsigned16 frqcr = *(volatile rtems_unsigned16 *)SH7750_FRQCR; - rtems_unsigned32 Pph = SH4_CPU_HZ_Frequency; + rtems_unsigned32 Pph = rtems_cpu_configuration_get_clicks_per_second() ; switch (frqcr & SH7750_FRQCR_IFC) { |