Changeset 2763f53 in rtems


Ignore:
Timestamp:
Oct 1, 2019, 10:41:47 AM (3 weeks ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
47e5c1d
Parents:
6ae2522
git-author:
Sebastian Huber <sebastian.huber@…> (10/01/19 10:41:47)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/02/19 05:01:36)
Message:

score: Remove superfluous timecounter members

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/include/sys/timetc.h

    r6ae2522 r2763f53  
    4646struct timecounter {
    4747        timecounter_get_t       *tc_get_timecount;
     48#ifndef __rtems__
    4849                /*
    4950                 * This function reads the counter.  It is not required to
     
    5253                 */
    5354        timecounter_pps_t       *tc_poll_pps;
     55#endif /* __rtems__ */
    5456                /*
    5557                 * This function is optional.  It will be called whenever the
     
    6567                /* Name of the timecounter. */
    6668        int                     tc_quality;
     69#ifndef __rtems__
    6770                /*
    6871                 * Used to determine if this timecounter is better than
     
    8184        struct timecounter      *tc_next;
    8285                /* Pointer to the next timecounter. */
    83 #ifndef __rtems__
    8486        timecounter_fill_vdso_timehands_t *tc_fill_vdso_timehands;
    8587        timecounter_fill_vdso_timehands32_t *tc_fill_vdso_timehands32;
  • cpukit/score/src/kern_tc.c

    r6ae2522 r2763f53  
    147147
    148148static struct timecounter dummy_timecounter = {
     149#ifndef __rtems__
    149150        dummy_get_timecount, 0, ~0u, 1000000, "dummy", -1000000
     151#else /* __rtems__ */
     152        dummy_get_timecount, ~(uint32_t)0, 1000000, "dummy", -1000000
     153#endif /* __rtems__ */
    150154};
    151155
     
    196200static struct timehands *volatile timehands = &th0;
    197201struct timecounter *timecounter = &dummy_timecounter;
     202#ifndef __rtems__
    198203static struct timecounter *timecounters = &dummy_timecounter;
    199204
    200 #ifndef __rtems__
    201205int tc_min_ticktock_freq = 1;
    202206#endif /* __rtems__ */
     
    13601364                    tc->tc_quality);
    13611365        }
    1362 #endif /* __rtems__ */
    13631366
    13641367        tc->tc_next = timecounters;
    13651368        timecounters = tc;
    1366 #ifndef __rtems__
    13671369        /*
    13681370         * Set up sysctl tree for this counter.
     
    15671569        bintime_addx(&th->th_offset, th->th_scale * delta);
    15681570
     1571#ifndef __rtems__
    15691572        /*
    15701573         * Hardware latching timecounters may not generate interrupts on
     
    15771580        if (tho->th_counter->tc_poll_pps)
    15781581                tho->th_counter->tc_poll_pps(tho->th_counter);
     1582#endif /* __rtems__ */
    15791583
    15801584        /*
  • testsuites/sptests/sptimecounter01/init.c

    r6ae2522 r2763f53  
    3939static uint32_t test_get_timecount_soft(struct timecounter *tc)
    4040{
    41   test_context *ctx = tc->tc_priv;
     41  test_context *ctx;
    4242
     43  ctx = RTEMS_CONTAINER_OF(tc, test_context, tc_soft);
    4344  ++ctx->tc_soft_counter;
    4445
     
    125126  tc_soft->tc_frequency = soft_freq;
    126127  tc_soft->tc_quality = 1234;
    127   tc_soft->tc_priv = ctx;
    128128  _Timecounter_Install(tc_soft);
    129129  assert(ctx->tc_soft_counter == 3);
Note: See TracChangeset for help on using the changeset viewer.