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

    rc080c343 r8fbe2e6  
     1/**
     2 * @file
     3 * @brief PXA255 timer
     4 */
     5
    16/*
    27 * PXA255 timer by Yang Xi <hiyangxi@gmail.com>
    38 * Copyright (c) 2004 by Jay Monkman <jtm@lopingdog.com>
    49 *
    5  * Notes:
    6  *  This file manages the benchmark timer used by the RTEMS Timing Test
    7  *  Suite.  Each measured time period is demarcated by calls to
    8  *  Timer_initialize() and Read_timer().  Read_timer() usually returns
    9  *  the number of microseconds since Timer_initialize() exitted.
    10  *
    11  *  It is important that the timer start/stop overhead be determined
    12  *  when porting or modifying this code.
    13  *
    14  *  The license and distribution terms for this file may be
    15  *  found in the file LICENSE in this distribution or at
    16  *  http://www.rtems.org/license/LICENSE.
     10 * The license and distribution terms for this file may be
     11 * found in the file LICENSE in this distribution or at
     12 * http://www.rtems.org/license/LICENSE.
    1713 */
    1814
     15#include <bsp.h>
    1916#include <rtems.h>
    20 #include <bsp.h>
     17#include <rtems/btimer.h>
    2118#include <pxa255.h>
    2219
     
    5249#define LEAST_VALID       1  /* Don't trust a clicks value lower than this */
    5350
    54 int benchmark_timer_read(void)
     51benchmark_timer_t benchmark_timer_read(void)
    5552{
    5653
Note: See TracChangeset for help on using the changeset viewer.