mirror of
https://github.com/t-crest/rtems.git
synced 2025-12-05 23:23:23 +00:00
Merge with CVS-HEAD.
This commit is contained in:
@@ -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>
|
2011-04-20 Rohan Kangralkar <rkangral@ece.neu.edu>
|
||||||
|
|
||||||
PR 1781/bsps
|
PR 1781/bsps
|
||||||
@@ -12,6 +16,11 @@
|
|||||||
type of interrupt is identified by the central ISR dispatcher
|
type of interrupt is identified by the central ISR dispatcher
|
||||||
bf52x/interrupt or interrupt/. This simplifies the UART ISR.
|
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>
|
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
|
||||||
|
|
||||||
* configure.ac: Require autoconf-2.68, automake-1.11.1.
|
* configure.ac: Require autoconf-2.68, automake-1.11.1.
|
||||||
|
|||||||
@@ -6,14 +6,12 @@
|
|||||||
* The license and distribution terms for this file may be
|
* The license and distribution terms for this file may be
|
||||||
* found in the file LICENSE in this distribution or at
|
* found in the file LICENSE in this distribution or at
|
||||||
* http://www.rtems.com/license/LICENSE.
|
* http://www.rtems.com/license/LICENSE.
|
||||||
*
|
*/
|
||||||
* Modified:
|
|
||||||
* $ $Author$ Added interrupt support and DMA support
|
/*
|
||||||
*
|
|
||||||
* $Id$
|
* $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <rtems.h>
|
#include <rtems.h>
|
||||||
#include <rtems/libio.h>
|
#include <rtems/libio.h>
|
||||||
#include <rtems/termiostypes.h>
|
#include <rtems/termiostypes.h>
|
||||||
|
|||||||
@@ -7,14 +7,12 @@
|
|||||||
* The license and distribution terms for this file may be
|
* The license and distribution terms for this file may be
|
||||||
* found in the file LICENSE in this distribution or at
|
* found in the file LICENSE in this distribution or at
|
||||||
* http://www.rtems.com/license/LICENSE.
|
* http://www.rtems.com/license/LICENSE.
|
||||||
*
|
*/
|
||||||
* Modified:
|
|
||||||
* $Author$ Added interrupt support and DMA support
|
/*
|
||||||
*
|
|
||||||
* $Id$
|
* $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef _UART_H_
|
#ifndef _UART_H_
|
||||||
#define _UART_H_
|
#define _UART_H_
|
||||||
|
|
||||||
|
|||||||
@@ -33,13 +33,13 @@ void benchmark_timer_initialize( void )
|
|||||||
{
|
{
|
||||||
|
|
||||||
/*reset counters*/
|
/*reset counters*/
|
||||||
asm ("R2 = 0;");
|
__asm__ ("R2 = 0;");
|
||||||
asm ("CYCLES = R2;");
|
__asm__ ("CYCLES = R2;");
|
||||||
asm ("CYCLES2 = R2;");
|
__asm__ ("CYCLES2 = R2;");
|
||||||
/*start counters*/
|
/*start counters*/
|
||||||
asm ("R2 = SYSCFG;");
|
__asm__ ("R2 = SYSCFG;");
|
||||||
asm ("BITSET(R2,1);");
|
__asm__ ("BITSET(R2,1);");
|
||||||
asm ("SYSCFG = R2");
|
__asm__ ("SYSCFG = R2");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,13 +62,13 @@ int benchmark_timer_read( void )
|
|||||||
{
|
{
|
||||||
uint32_t clicks;
|
uint32_t clicks;
|
||||||
uint32_t total;
|
uint32_t total;
|
||||||
register uint32_t cycles asm ("R2");
|
register uint32_t cycles __asm__ ("R2");
|
||||||
|
|
||||||
/* stop counter */
|
/* stop counter */
|
||||||
asm("R2 = SYSCFG;");
|
__asm__ ("R2 = SYSCFG;");
|
||||||
asm("BITCLR(R2,1);");
|
__asm__ ("BITCLR(R2,1);");
|
||||||
asm("SYSCFG = R2;");
|
__asm__ ("SYSCFG = R2;");
|
||||||
asm("R2 = CYCLES;");
|
__asm__ ("R2 = CYCLES;");
|
||||||
|
|
||||||
|
|
||||||
clicks = cycles; /* Clock cycles */
|
clicks = cycles; /* Clock cycles */
|
||||||
|
|||||||
Reference in New Issue
Block a user