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/libbsp/m68k/mvme167/timer/timer.c

    rc080c343 r8fbe2e6  
    1 /*  timer.c
     1/**
     2 * @file
    23 *
    3  *  This file manages the benchmark timer used by the RTEMS Timing Test Suite.
    4  *  Each measured time period is demarcated by calls to benchmark_timer_initialize() and
    5  *  benchmark_timer_read().  benchmark_timer_read() usually returns the number of microseconds
    6  *  since benchmark_timer_initialize() exitted.
     4 * This file manages the benchmark timer used by the RTEMS Timing Test Suite.
     5 * Each measured time period is demarcated by calls to
     6 * benchmark_timer_initialize() and benchmark_timer_read().
     7 * benchmark_timer_read() usually returns the number of microseconds
     8 * since benchmark_timer_initialize() exitted.
    79 *
    8  *  These functions are prototyped in rtems/c/src/lib/include/timerdrv.h and
    9  *  must be implemented as part of the BSP.
     10 * These functions are prototyped in rtems/btimer.h and
     11 * must be implemented as part of the BSP.
    1012 *
    11  *  This port does not allow the application to select which timer on the
    12  *  MVME167 to use for the timer, nor does it allow the application to
    13  *  configure the timer. The timer uses the VMEchip2 Tick Timer #1. This timer
    14  *  is distinct from the clock, which uses Tick Timer #2 in the VMEchip2.
     13 * This port does not allow the application to select which timer on the
     14 * MVME167 to use for the timer, nor does it allow the application to
     15 * configure the timer. The timer uses the VMEchip2 Tick Timer #1. This timer
     16 * is distinct from the clock, which uses Tick Timer #2 in the VMEchip2.
    1517 *
    16  *  All page references are to the MVME166/MVME167/MVME187 Single Board
    17  *  Computer Programmer's Reference Guide (MVME187PG/D2) with the April 1993
     18 * All page references are to the MVME166/MVME167/MVME187 Single Board
     19 * Computer Programmer's Reference Guide (MVME187PG/D2) with the April 1993
    1820 *  supplements/addenda (MVME187PG/D2A1).
    19  *
     21 */
     22
     23/*
    2024 *  COPYRIGHT (c) 1989-1999.
    2125 *  On-Line Applications Research Corporation (OAR).
     
    105109 *  below this are "noise" and zero is returned.
    106110 */
    107 uint32_t benchmark_timer_read(void)
     111benchmark_timer_t benchmark_timer_read(void)
    108112{
    109113  uint32_t            total;
Note: See TracChangeset for help on using the changeset viewer.