Changeset baef9d91 in rtems


Ignore:
Timestamp:
Oct 26, 2001, 1:43:58 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
d6a2391f
Parents:
5850c533
Message:

2001-10-26 Alexandra Kossovsky <sasha@…>

  • include/sh/sh4uart.h, sci/sh4uart.c: Minor fixes post merge.
Location:
c/src/lib/libcpu/sh/sh7750
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/sh/sh7750/ChangeLog

    r5850c533 rbaef9d91  
     12001-10-26      Alexandra Kossovsky <sasha@oktet.ru>
     2
     3        * include/sh/sh4uart.h, sci/sh4uart.c: Minor fixes post merge.
     4
    152001-10-15      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    26
  • c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h

    r5850c533 rbaef9d91  
    113113 */
    114114rtems_status_code
    115 sh4uart_disable(sh4uart *uart);
     115sh4uart_disable(sh4uart *uart, int disable_port);
    116116
    117117/* sh4uart_set_attributes --
  • c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c

    r5850c533 rbaef9d91  
    2020#include <termios.h>
    2121#include <rtems/libio.h>
    22 #include <sh/sh4uart.h>
     22#include <bsp.h>
     23#include "sh/sh4uart.h"
    2324
    2425#ifndef SH4_UART_INTERRUPT_LEVEL
    2526#define SH4_UART_INTERRUPT_LEVEL 4
    2627#endif
    27 
    28 /* FIXME: ???
    29 #define SH7750_SCSMR_CKS_S SH7750_SCSMR_CKS_DIV1
    30  */
    31 #define SH7750_SCSMR_CKS_S     0
    3228
    3329/* Forward function declarations */
     
    7975 *   
    8076 * PARAMETERS: none;
    81  *    Cpu clock is get from SH4_CPU_HZ_Frequency.
    82  *    This variable should be defined in bsp.
     77 *    Cpu clock is get from CPU_CLOCK_RATE_HZ marco
     78 *    (defined in bspopts.h, included from bsp.h)
    8379 *
    8480 * RETURNS:
     
    8985{
    9086    rtems_unsigned16 frqcr = *(volatile rtems_unsigned16 *)SH7750_FRQCR;
    91     rtems_unsigned32 Pph = rtems_cpu_configuration_get_clicks_per_second() ;
     87    rtems_unsigned32 Pph = CPU_CLOCK_RATE_HZ;
    9288
    9389    switch (frqcr & SH7750_FRQCR_IFC)
     
    313309 * PARAMETERS:
    314310 *     uart - pointer to UART channel descriptor structure
     311 *     disable_port - disable receive and transmit on the port
    315312 *
    316313 * RETURNS:
     
    319316 */
    320317rtems_status_code
    321 sh4uart_disable(sh4uart *uart)
     318sh4uart_disable(sh4uart *uart, int disable_port)
    322319{
    323320    rtems_status_code rc;
    324321
    325     SCSCR(uart->chn) &= ~(SH7750_SCSCR_TE | SH7750_SCSCR_RE);
     322    if (disable_port)
     323        SCSCR(uart->chn) &= ~(SH7750_SCSCR_TE | SH7750_SCSCR_RE);
    326324
    327325    if (uart->int_driven)
     
    945943}
    946944#endif
     945
     946
Note: See TracChangeset for help on using the changeset viewer.