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/arm/s3c24xx/timer/timer.c

    rc080c343 r8fbe2e6  
    1 /*
    2  * S3C2400 Timer driver
     1/**
     2 * @file
     3 * @brief S3C2400 Timer driver
    34 *
    45 * This uses timer 1 for timing measurments.
    5  *
    6  *  The license and distribution terms for this file may be
    7  *  found in the file LICENSE in this distribution or at
    8  *  http://www.rtems.org/license/LICENSE.
    9  *
    10  * Notes:
    11  *  This file manages the benchmark timer used by the RTEMS Timing Test
    12  *  Suite.  Each measured time period is demarcated by calls to
    13  *  benchmark_timer_initialize() and benchmark_timer_read().  benchmark_timer_read() usually returns
    14  *  the number of microseconds since benchmark_timer_initialize() exitted.
    15  *
    16  *  It is important that the timer start/stop overhead be determined
    17  *  when porting or modifying this code.
    18 */
     6 */
    197
     8/*
     9 * The license and distribution terms for this file may be
     10 * found in the file LICENSE in this distribution or at
     11 * http://www.rtems.org/license/LICENSE.
     12 */
     13
     14#include <bsp.h>
    2015#include <rtems.h>
    21 #include <bsp.h>
     16#include <rtems/btimer.h>
    2217#include <s3c24xx.h>
    2318
     
    7065#define LEAST_VALID       1  /* Don't trust a clicks value lower than this */
    7166
    72 int benchmark_timer_read( void )
     67benchmark_timer_t benchmark_timer_read( void )
    7368{
    7469    uint32_t t;
Note: See TracChangeset for help on using the changeset viewer.