Changeset 4667b4d in rtems


Ignore:
Timestamp:
May 25, 2011, 11:23:30 AM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10
Children:
dea1dc20
Parents:
3342963e
Message:

Merge with CVS-HEAD.

Location:
c/src/lib/libcpu/bfin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/bfin/ChangeLog

    r3342963e r4667b4d  
     12011-05-25      Ralf Corsépius <ralf.corsepius@rtems.org>
     2
     3        * serial/uart.c, serial/uart.h: Remove CVS-Author tag.
     4
    152011-04-20  Rohan Kangralkar <rkangral@ece.neu.edu>
    26
     
    1216        type of interrupt is identified by the central ISR dispatcher
    1317        bf52x/interrupt or interrupt/.  This simplifies the UART ISR.
     18
     192011-02-11      Ralf Corsépius <ralf.corsepius@rtems.org>
     20
     21        * timer/timer.c:
     22        Use "__asm__" instead of "asm" for improved c99-compliance.
    1423
    15242011-02-02      Ralf Corsépius <ralf.corsepius@rtems.org>
  • c/src/lib/libcpu/bfin/serial/uart.c

    r3342963e r4667b4d  
    77 *  found in the file LICENSE in this distribution or at
    88 *  http://www.rtems.com/license/LICENSE.
    9  *
    10  *  Modified:
    11  *  $ $Author$ Added interrupt support and DMA support
    12  *
     9 */
     10 
     11/*
    1312 *  $Id$
    1413 */
    15 
    1614
    1715#include <rtems.h>
  • c/src/lib/libcpu/bfin/serial/uart.h

    r3342963e r4667b4d  
    88 *  found in the file LICENSE in this distribution or at
    99 *  http://www.rtems.com/license/LICENSE.
    10  *
    11  *  Modified:
    12  *  $Author$ Added interrupt support and DMA support
    13  *
     10 */
     11 
     12/*
    1413 *  $Id$
    1514 */
    16 
    1715
    1816#ifndef _UART_H_
  • c/src/lib/libcpu/bfin/timer/timer.c

    r3342963e r4667b4d  
    3434
    3535  /*reset counters*/
    36   asm ("R2 = 0;");
    37   asm ("CYCLES = R2;");
    38   asm ("CYCLES2 = R2;");
     36  __asm__ ("R2 = 0;");
     37  __asm__ ("CYCLES = R2;");
     38  __asm__ ("CYCLES2 = R2;");
    3939  /*start counters*/
    40   asm ("R2 = SYSCFG;");
    41   asm ("BITSET(R2,1);");
    42   asm ("SYSCFG = R2");
     40  __asm__ ("R2 = SYSCFG;");
     41  __asm__ ("BITSET(R2,1);");
     42  __asm__ ("SYSCFG = R2");
    4343
    4444}
     
    6363  uint32_t          clicks;
    6464  uint32_t          total;
    65   register uint32_t cycles asm ("R2");
     65  register uint32_t cycles __asm__ ("R2");
    6666
    6767  /* stop counter */
    68   asm("R2 = SYSCFG;");
    69   asm("BITCLR(R2,1);");
    70   asm("SYSCFG = R2;");
    71   asm("R2 = CYCLES;");
     68  __asm__ ("R2 = SYSCFG;");
     69  __asm__ ("BITCLR(R2,1);");
     70  __asm__ ("SYSCFG = R2;");
     71  __asm__ ("R2 = CYCLES;");
    7272
    7373
Note: See TracChangeset for help on using the changeset viewer.