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

    rc080c343 r8fbe2e6  
    1 /*
    2  * RTL22xx board Timer driver
     1/**
     2 * @file
     3 * @brief RTL22xx board Timer driver
    34 *
    45 * This uses Timer1 for timing measurments.
     6 */
     7
     8/*
     9 * By Ray Xu <rayx.cn@gmail.com>, modify form Mc9328mxl RTEMS DSP
    510 *
    6  *  By Ray xu<rayx.cn@gmail.com>, modify form Mc9328mxl RTEMS DSP
    7  *
    8  *  The license and distribution terms for this file may be
    9  *  found in the file LICENSE in this distribution or at
    10  *  http://www.rtems.org/license/LICENSE.
    11  *
    12  * Notes:
    13  *  This file manages the benchmark timer used by the RTEMS Timing Test
    14  *  Suite.  Each measured time period is demarcated by calls to
    15  *  benchmark_timer_initialize() and benchmark_timer_read().  benchmark_timer_read() usually returns
    16  *  the number of microseconds since benchmark_timer_initialize() exitted.
    17  *
    18  *  It is important that the timer start/stop overhead be determined
    19  *  when porting or modifying this code.
    20 */
     11 * The license and distribution terms for this file may be
     12 * found in the file LICENSE in this distribution or at
     13 * http://www.rtems.org/license/LICENSE.
     14 */
    2115
     16#include <bsp.h>
    2217#include <rtems.h>
    23 #include <bsp.h>
     18#include <rtems/btimer.h>
    2419#include <lpc22xx.h>
    2520#include "lpc_timer.h"
     21
    2622uint32_t g_start;
    2723uint32_t g_freq;
     
    5349#define LEAST_VALID       1  /* Don't trust a clicks value lower than this */
    5450
    55 int benchmark_timer_read( void )
     51benchmark_timer_t benchmark_timer_read( void )
    5652{
    5753  return (T0TC/(LPC22xx_Fpclk/1000000));
Note: See TracChangeset for help on using the changeset viewer.