Ignore:
Timestamp:
Sep 4, 2014, 1:59:49 PM (5 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
6cd2074
Parents:
c080c343
git-author:
Joel Sherrill <joel.sherrill@…> (09/04/14 13:59:49)
git-committer:
Joel Sherrill <joel.sherrill@…> (09/16/14 21:09:12)
Message:

Use correct prototype of benchmark_timer_read()

This change starts with removing the effectively empty file
timerdrv.h. The prototypes for benchmark_timer_XXX() were in
btimer.h which was not universally used. Thus every use of
timerdrv.h had to be changed to btimer.h. Then the prototypes
for benchmark_timer_read() had to be adjusted to return
benchmark_timer_t rather than int or uint32_t.

I took this opportunity to also correct the file headers to
separate the copyright from the file description comments which
is needed to ensure the copyright isn't propagated into Doxygen
output.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/bfin/timer/timer.c

    rc080c343 r8fbe2e6  
    1 /*  Timer for Blackfin
     1/**
     2 *  @file
     3 *  @brief Timer for Blackfin
    24 *
    35 *  This file manages the benchmark timer used by the RTEMS Timing Test
    46 *  Suite.  Each measured time period is demarcated by calls to
    5  *  benchmark_timer_initialize() and benchmark_timer_read().  benchmark_timer_read() usually returns
    6  *  the number of microseconds since benchmark_timer_initialize() exitted.
    7  *
     7 *  benchmark_timer_initialize() and benchmark_timer_read().
     8 *  benchmark_timer_read() usually returns the number of microseconds
     9 *  since benchmark_timer_initialize() exitted.
     10 */
     11
     12/*
    813 *  Copyright (c) 2006 by Atos Automacao Industrial Ltda.
    914 *             written by Alain Schaefer <alain.schaefer@easc.ch>
     
    1520 */
    1621
    17 
    1822#include <rtems.h>
    1923#include <bsp.h>
     24#include <rtems/btimer.h>
    2025
    21 
    22 uint32_t         Timer_interrupts;
    23 bool benchmark_timer_find_average_overhead;
     26uint32_t  Timer_interrupts;
     27bool      benchmark_timer_find_average_overhead;
    2428
    2529/*
     
    5761#define LEAST_VALID       1  /* Don't trust a clicks value lower than this */
    5862
    59 int benchmark_timer_read( void )
     63benchmark_timer_t benchmark_timer_read( void )
    6064{
    6165  uint32_t          clicks;
Note: See TracChangeset for help on using the changeset viewer.