RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-10-26 Alexandra Kossovsky <sasha@oktet.ru>

Browse Source 
* include/sh/sh4uart.h, sci/sh4uart.c: Minor fixes post merge.
This commit is contained in:
Joel Sherrill
2001-10-26 13:43:58 +00:00
parent 5850c5333a
commit baef9d91b5
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libcpu/sh/sh7750/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-10-26 Alexandra Kossovsky <sasha@oktet.ru>
* include/sh/sh4uart.h, sci/sh4uart.c: Minor fixes post merge.
2001-10-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2001-10-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/sh4uart.h: move to include/sh/sh4uart.h. * include/sh4uart.h: move to include/sh/sh4uart.h.

2
c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h
View File

@@ -112,7 +112,7 @@ sh4uart_reset(sh4uart *uart);
* controller * controller
*/ */
rtems_status_code rtems_status_code
sh4uart_disable(sh4uart *uart); sh4uart_disable(sh4uart *uart, int disable_port);
/* sh4uart_set_attributes -- /* sh4uart_set_attributes --
* This function parse the termios attributes structure and perform * This function parse the termios attributes structure and perform

22
c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c
View File

@@ -19,17 +19,13 @@
#include <rtems.h> #include <rtems.h>
#include <termios.h> #include <termios.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <sh/sh4uart.h> #include <bsp.h>
#include "sh/sh4uart.h"
#ifndef SH4_UART_INTERRUPT_LEVEL #ifndef SH4_UART_INTERRUPT_LEVEL
#define SH4_UART_INTERRUPT_LEVEL 4 #define SH4_UART_INTERRUPT_LEVEL 4
#endif #endif
/* FIXME: ???
#define SH7750_SCSMR_CKS_S SH7750_SCSMR_CKS_DIV1
*/
#define SH7750_SCSMR_CKS_S 0
/* Forward function declarations */ /* Forward function declarations */
static rtems_isr static rtems_isr
sh4uart1_interrupt_transmit(rtems_vector_number vec); sh4uart1_interrupt_transmit(rtems_vector_number vec);
@@ -78,8 +74,8 @@ sh4uart_init(sh4uart *uart, void *tty, int chn, int int_driven)
* Get current peripheral module clock. * Get current peripheral module clock.
* *
* PARAMETERS: none; * PARAMETERS: none;
* Cpu clock is get from SH4_CPU_HZ_Frequency. * Cpu clock is get from CPU_CLOCK_RATE_HZ marco
* This variable should be defined in bsp. * (defined in bspopts.h, included from bsp.h)
* *
* RETURNS: * RETURNS:
* peripheral module clock in Hz. * peripheral module clock in Hz.
@@ -88,7 +84,7 @@ rtems_unsigned32
sh4uart_get_Pph(void) sh4uart_get_Pph(void)
{ {
rtems_unsigned16 frqcr = *(volatile rtems_unsigned16 *)SH7750_FRQCR; rtems_unsigned16 frqcr = *(volatile rtems_unsigned16 *)SH7750_FRQCR;
rtems_unsigned32 Pph = rtems_cpu_configuration_get_clicks_per_second() ; rtems_unsigned32 Pph = CPU_CLOCK_RATE_HZ;
switch (frqcr & SH7750_FRQCR_IFC) switch (frqcr & SH7750_FRQCR_IFC)
{ {
@@ -312,17 +308,19 @@ sh4uart_reset(sh4uart *uart)
* *
* PARAMETERS: * PARAMETERS:
* uart - pointer to UART channel descriptor structure * uart - pointer to UART channel descriptor structure
* disable_port - disable receive and transmit on the port
* *
* RETURNS: * RETURNS:
* RTEMS_SUCCESSFUL if UART closed successfuly, or error code in * RTEMS_SUCCESSFUL if UART closed successfuly, or error code in
* other case * other case
*/ */
rtems_status_code rtems_status_code
sh4uart_disable(sh4uart *uart) sh4uart_disable(sh4uart *uart, int disable_port)
{ {
rtems_status_code rc; rtems_status_code rc;
SCSCR(uart->chn) &= ~(SH7750_SCSCR_TE | SH7750_SCSCR_RE); if (disable_port)
SCSCR(uart->chn) &= ~(SH7750_SCSCR_TE | SH7750_SCSCR_RE);
if (uart->int_driven) if (uart->int_driven)
{ {
@@ -944,3 +942,5 @@ ipl_console_poll_write(int minor, const char *buf, int len)
return 0; return 0;
} }
#endif #endif