Merge with CVS-HEAD.

This commit is contained in:
Ralf Corsepius
2011-05-25 11:23:30 +00:00
parent 3342963ed1
commit 4667b4d130
4 changed files with 26 additions and 21 deletions

View File

@@ -1,3 +1,7 @@
2011-05-25 Ralf Corsépius <ralf.corsepius@rtems.org>
* serial/uart.c, serial/uart.h: Remove CVS-Author tag.
2011-04-20 Rohan Kangralkar <rkangral@ece.neu.edu>
PR 1781/bsps
@@ -12,6 +16,11 @@
type of interrupt is identified by the central ISR dispatcher
bf52x/interrupt or interrupt/. This simplifies the UART ISR.
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

View File

@@ -6,13 +6,11 @@
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
* Modified:
* $ $Author$ Added interrupt support and DMA support
*
* $Id$
*/
/*
* $Id$
*/
#include <rtems.h>
#include <rtems/libio.h>

View File

@@ -7,13 +7,11 @@
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
* Modified:
* $Author$ Added interrupt support and DMA support
*
* $Id$
*/
/*
* $Id$
*/
#ifndef _UART_H_
#define _UART_H_

View File

@@ -33,13 +33,13 @@ void benchmark_timer_initialize( void )
{
/*reset counters*/
asm ("R2 = 0;");
asm ("CYCLES = R2;");
asm ("CYCLES2 = R2;");
__asm__ ("R2 = 0;");
__asm__ ("CYCLES = R2;");
__asm__ ("CYCLES2 = R2;");
/*start counters*/
asm ("R2 = SYSCFG;");
asm ("BITSET(R2,1);");
asm ("SYSCFG = R2");
__asm__ ("R2 = SYSCFG;");
__asm__ ("BITSET(R2,1);");
__asm__ ("SYSCFG = R2");
}
@@ -62,13 +62,13 @@ int benchmark_timer_read( void )
{
uint32_t clicks;
uint32_t total;
register uint32_t cycles asm ("R2");
register uint32_t cycles __asm__ ("R2");
/* stop counter */
asm("R2 = SYSCFG;");
asm("BITCLR(R2,1);");
asm("SYSCFG = R2;");
asm("R2 = CYCLES;");
__asm__ ("R2 = SYSCFG;");
__asm__ ("BITCLR(R2,1);");
__asm__ ("SYSCFG = R2;");
__asm__ ("R2 = CYCLES;");
clicks = cycles; /* Clock cycles */